fix(api): Make OpaqueRef<Cell<T>> unwrap to Cell<T>

packages/api/index.ts

@@ -180,12 +180,12 @@ export interface IKeyableOpaque<T> {
   key<K extends PropertyKey>(
     this: IsThisObject,
     valueKey: K,
-  ): unknown extends K ? OpaqueRef<any>
-    : K extends keyof UnwrapCell<T> ? (0 extends (1 & T) ? OpaqueRef<any>
-        : UnwrapCell<T>[K] extends never ? OpaqueRef<any>
-        : UnwrapCell<T>[K] extends BrandedCell<infer U> ? OpaqueRef<U>
-        : OpaqueRef<UnwrapCell<T>[K]>)
-    : OpaqueRef<any>;
+  ): unknown extends K ? OpaqueCell<any>
+    : K extends keyof UnwrapCell<T> ? (0 extends (1 & T) ? OpaqueCell<any>
+        : UnwrapCell<T>[K] extends never ? OpaqueCell<any>
+        : UnwrapCell<T>[K] extends BrandedCell<infer U> ? OpaqueCell<U>
+        : OpaqueCell<UnwrapCell<T>[K]>)
+    : OpaqueCell<any>;
 }
 
 /**
@@ -352,12 +352,16 @@ export interface WriteonlyCell<T>
  * OpaqueRef is a variant of OpaqueCell with recursive proxy behavior.
  * Each key access returns another OpaqueRef, allowing chained property access.
  * This is temporary until AST transformation handles .key() automatically.
+ *
+ * OpaqueRef<Cell<T>> unwraps to Cell<T>.
  */
-export type OpaqueRef<T> =
-  & OpaqueCell<T>
-  & (T extends Array<infer U> ? Array<OpaqueRef<U>>
-    : T extends object ? { [K in keyof T]: OpaqueRef<T[K]> }
-    : T);
+export type OpaqueRef<T> = T extends BrandedCell<any> ? T
+  :
+    & OpaqueCell<T>
+    & (T extends Array<infer U> ? Array<OpaqueRef<U>>
+      : T extends BrandedCell<any> ? T
+      : T extends object ? { [K in keyof T]: OpaqueRef<T[K]> }
+      : T);
 
 // ============================================================================
 // CellLike and Opaque - Utility types for accepting cells

packages/generated-patterns/integration/patterns/counter-conditional-branch.pattern.ts

@@ -12,7 +12,7 @@ import {
 
 interface ConditionalBranchArgs {
   value: Default<number, 0>;
-  enabled: Default<boolean, false>;
+  enabled: Cell<Default<boolean, false>>;
 }
 
 const toggleFlag = handler(

packages/generated-patterns/integration/patterns/counter-conditional-child-instantiation.pattern.ts

@@ -102,7 +102,11 @@ export const counterWithConditionalChildInstantiation = recipe<
       ) => {
         const existing = childSlot.get();
         if (!state.active) {
-          if (existing !== undefined) childSlot.set(undefined);
+          if (existing !== undefined) {
+            (childSlot as unknown as Cell<ChildCounterState | undefined>).set(
+              undefined,
+            );
+          }
           return state.active;
         }
         if (existing === undefined) {

packages/runner/src/builder/module.ts

@@ -6,6 +6,7 @@ import type {
   ModuleFactory,
   NodeRef,
   Opaque,
+  OpaqueCell,
   OpaqueRef,
   Schema,
   SchemaWithoutCell,
@@ -41,7 +42,7 @@ export function createNodeFactory<T = any, R = any>(
     const node: NodeRef = { module, inputs, outputs, frame: getTopFrame() };
 
     connectInputAndOutputs(node);
-    outputs.connect(node);
+    (outputs as OpaqueCell<R>).connect(node);
 
     return outputs;
   }, module);
@@ -160,7 +161,7 @@ export function handler<E, T>(
     const stream = opaqueRef<E>(undefined, eventSchema);
 
     // Set stream marker (cast to E as stream is typed for the events it accepts)
-    stream.set({ $stream: true } as E);
+    (stream as OpaqueCell<E>).set({ $stream: true } as E);
     const node: NodeRef = {
       module,
       inputs: { $ctx: props, $event: stream },
@@ -169,7 +170,7 @@ export function handler<E, T>(
     };
 
     connectInputAndOutputs(node);
-    stream.connect(node);
+    (stream as OpaqueCell<E>).connect(node);
 
     return stream;
   }, module);

packages/runner/src/builder/node-utils.ts

@@ -7,7 +7,7 @@ import {
   makeOpaqueRef,
   type NodeRef,
   type Opaque,
-  type OpaqueRef,
+  OpaqueCell,
 } from "./types.ts";
 import { ContextualFlowControl } from "../cfc.ts";
 import { traverseValue } from "./traverse-utils.ts";
@@ -56,7 +56,7 @@ export function applyInputIfcToOutput<T, R>(
   const cfc = new ContextualFlowControl();
   traverseValue(inputs, (item: unknown) => {
     if (isOpaqueCell(item)) {
-      const { schema: inputSchema, rootSchema } = (item as OpaqueRef<T>)
+      const { schema: inputSchema, rootSchema } = (item as OpaqueCell<T>)
         .export();
       if (inputSchema !== undefined) {
         ContextualFlowControl.joinSchema(
@@ -81,7 +81,7 @@ function attachCfcToOutputs<T, R>(
   lubClassification: string,
 ) {
   if (isOpaqueCell(outputs)) {
-    const exported = (outputs as OpaqueRef<T>).export();
+    const exported = (outputs as OpaqueCell<T>).export();
     const outputSchema = exported.schema ?? true;
     // we may have fields in the output schema, so incorporate those
     const joined = new Set<string>([lubClassification]);
@@ -99,7 +99,7 @@ function attachCfcToOutputs<T, R>(
       ...outpuSchemaObj,
       ifc,
     };
-    (outputs as OpaqueRef<T>).setSchema(cfcSchema);
+    (outputs as OpaqueCell<T>).setSchema(cfcSchema);
     return;
   } else if (isRecord(outputs)) {
     // Descend into objects and arrays

packages/runner/src/builder/opaque-ref.ts

@@ -103,7 +103,13 @@ export function opaqueRef<T>(
       export: () => {
         // Store's schema won't be the same as ours as a nested proxy
         // We also don't adjust the defaultValue to be relative to our path
-        return { cell: top, ...store, path, rootSchema, schema: nestedSchema };
+        return {
+          cell: top as OpaqueCell<T>,
+          ...store,
+          path,
+          rootSchema,
+          schema: nestedSchema,
+        };
       },
       unsafe_bindToRecipeAndPath: (
         recipe: Recipe,

packages/runner/src/builder/recipe.ts

@@ -11,6 +11,7 @@ import {
   type Node,
   type NodeRef,
   type Opaque,
+  type OpaqueCell,
   type OpaqueRef,
   type Recipe,
   type RecipeFactory,
@@ -293,7 +294,7 @@ function factoryFromRecipe<T, R>(
 
   // Collect default values for the inputs
   const defaults = toJSONWithLegacyAliases(
-    inputs.export().defaultValue ?? {},
+    (inputs as OpaqueCell<T>).export().defaultValue ?? {},
     paths,
     true,
   )!;
@@ -386,7 +387,7 @@ function factoryFromRecipe<T, R>(
     };
 
     connectInputAndOutputs(node);
-    outputs.connect(node);
+    (outputs as OpaqueCell<R>).connect(node);
 
     return outputs;
   }, recipe) satisfies RecipeFactory<T, R>;

packages/ts-transformers/test/fixtures/closures/map-handler-reference-with-type-arg-no-name.expected.tsx

@@ -77,8 +77,7 @@ export default recipe({
                                 properties: {
                                     count: {
                                         type: "number",
-                                        asCell: true,
-                                        asOpaque: true
+                                        asCell: true
                                     }
                                 },
                                 required: ["count"]

packages/ts-transformers/test/fixtures/closures/map-handler-reference.expected.tsx

@@ -77,8 +77,7 @@ export default recipe({
                                 properties: {
                                     count: {
                                         type: "number",
-                                        asCell: true,
-                                        asOpaque: true
+                                        asCell: true
                                     }
                                 },
                                 required: ["count"]

recipes/simple-draw.tsx

@@ -168,7 +168,7 @@ export const UserSession = recipe<
                     y={derive(m, (msg) => msg.y)}
                     hidden={ifElse(
                       derive(m, (msg) => msg.hidden === true),
-                      "true",
+                      "true" as const,
                       undefined,
                     )}
                     onpositionchange={updateMessagePosition({