fix(default-app): fix deletion in default app and minor cleanups (commontoolsinc#1942)

* chore(runner): minor type cleanup related to wishes

* fix(default-app): fix deletion + other cleanups

* simplified types, etc. in wish.ts again

* allow schema to be inferred

Author: seefeldb

packages/patterns/default-app.tsx

@@ -23,10 +23,8 @@ import BacklinksIndex, { type MentionableCharm } from "./backlinks-index.tsx";
 import ChatList from "./chatbot-list-view.tsx";
 import { calculator, readWebpage, searchWeb } from "./common-tools.tsx";
 
-export type Charm = {
+type MinimalCharm = {
   [NAME]?: string;
-  [UI]?: unknown;
-  [key: string]: any;
 };
 
 type CharmsListInput = void;
@@ -43,28 +41,27 @@ interface CharmsListOutput {
 
 const visit = handler<
   Record<string, never>,
-  { charm: any }
+  { charm: Cell<MinimalCharm> }
 >((_, state) => {
   return navigateTo(state.charm);
 }, { proxy: true });
 
 const removeCharm = handler<
   Record<string, never>,
   {
-    charm: any;
-    allCharms: Cell<any[]>;
+    charm: Cell<MinimalCharm>;
+    allCharms: Cell<MinimalCharm[]>;
   }
 >((_, state) => {
-  const charmName = state.charm[NAME];
   const allCharmsValue = state.allCharms.get();
-  const index = allCharmsValue.findIndex((c: any) => c[NAME] === charmName);
+  const index = allCharmsValue.findIndex((c: any) => state.charm.equals(c));
 
   if (index !== -1) {
     const charmListCopy = [...allCharmsValue];
-    console.log("charmListCopy before", charmListCopy);
+    console.log("charmListCopy before", charmListCopy.length);
     charmListCopy.splice(index, 1);
-    console.log("charmListCopy after", charmListCopy);
-    state.allCharms.set(charmListCopy);
+    console.log("charmListCopy after", charmListCopy.length);
+    state.allCharms.resolveAsCell().set(charmListCopy);
   }
 });
 
@@ -238,37 +235,36 @@ export default recipe<CharmsListInput, CharmsListOutput>(
                 </tr>
               </thead>
               <tbody>
-                {derive(allCharms, (allCharms) =>
-                  allCharms.map((charm: any) => (
-                    <tr>
-                      <td>{charm[NAME] || "Untitled Charm"}</td>
-                      <td>
-                        <ct-hstack gap="2">
-                          <ct-button
-                            size="sm"
-                            onClick={visit({ charm })}
-                          >
-                            Visit
-                          </ct-button>
-                          <ct-button
-                            size="sm"
-                            variant="destructive"
-                            onClick={removeCharm({ charm, allCharms })}
-                          >
-                            Remove
-                          </ct-button>
-                        </ct-hstack>
-                      </td>
-                    </tr>
-                  )))}
+                {allCharms.map((charm) => (
+                  <tr>
+                    <td>{charm?.[NAME] || "Untitled Charm"}</td>
+                    <td>
+                      <ct-hstack gap="2">
+                        <ct-button
+                          size="sm"
+                          onClick={visit({ charm })}
+                        >
+                          Visit
+                        </ct-button>
+                        <ct-button
+                          size="sm"
+                          variant="destructive"
+                          onClick={removeCharm({ charm, allCharms })}
+                        >
+                          Remove
+                        </ct-button>
+                      </ct-hstack>
+                    </td>
+                  </tr>
+                ))}
               </tbody>
             </ct-table>
           </ct-vstack>
         </ct-screen>
       ),
       sidebarUI: (
         <div>
-          {/* TODO(bf): why any? */}
+          {/* TODO(bf): Remove once we fix types to not require ReactNode */}
           {omnibot.ui.attachmentsAndTools as any}
           {omnibot.ui.chatLog as any}
         </div>

packages/runner/src/builtins/wish.ts

@@ -24,12 +24,11 @@ function resolveWishTarget(
   runtime: IRuntime,
   space: MemorySpace,
   tx: IExtendedStorageTransaction,
-): Cell<unknown> | undefined {
-  const path = resolution.path ? [...resolution.path] : [];
+): Cell<any> | undefined {
   return runtime.getCellFromEntityId(
     space,
     resolution.entityId,
-    path,
+    resolution.path,
     undefined,
     tx,
   );
@@ -61,10 +60,6 @@ function parseWishTarget(target: string): ParsedWishTarget | undefined {
   return undefined;
 }
 
-function segmentToPropertyKey(segment: string): PropertyKey {
-  return /^\d+$/.test(segment) ? Number(segment) : segment;
-}
-
 type WishContext = {
   runtime: IRuntime;
   tx: IExtendedStorageTransaction;
@@ -90,20 +85,14 @@ function getSpaceCell(ctx: WishContext): Cell<unknown> {
 }
 
 function resolvePath(
-  base: Cell<unknown>,
+  base: Cell<any>,
   path: readonly string[],
-  ctx: WishContext,
 ): Cell<unknown> {
-  let current = base.withTx(ctx.tx);
+  let current = base;
   for (const segment of path) {
-    const keyed = current.key(segmentToPropertyKey(segment) as never);
-    try {
-      current = keyed.resolveAsCell().withTx(ctx.tx);
-    } catch {
-      current = keyed.withTx(ctx.tx);
-    }
+    current = current.key(segment);
   }
-  return current;
+  return current.resolveAsCell();
 }
 
 function resolveBase(
@@ -210,13 +199,12 @@ export function wish(
     const combinedPath = baseResolution.pathPrefix
       ? [...baseResolution.pathPrefix, ...parsed.path]
       : parsed.path;
-    const resolvedCell = resolvePath(baseResolution.cell, combinedPath, ctx);
-    const resolvedWithTx = resolvedCell.withTx(tx);
+    const resolvedCell = resolvePath(baseResolution.cell, combinedPath);
 
-    if (hasDefault && resolvedWithTx.get() === undefined) {
-      sendResult(tx, defaultCell);
+    if (resolvedCell.get() !== undefined) {
+      sendResult(tx, resolvedCell);
     } else {
-      sendResult(tx, resolvedWithTx);
+      sendResult(tx, hasDefault ? defaultCell : undefined);
     }
   };
 }

packages/runner/src/runtime.ts

@@ -132,14 +132,14 @@ export interface IRuntime {
   getCellFromEntityId<S extends JSONSchema = JSONSchema>(
     space: MemorySpace,
     entityId: EntityId,
-    path: PropertyKey[],
+    path: readonly PropertyKey[],
     schema: S,
     tx?: IExtendedStorageTransaction,
   ): Cell<Schema<S>>;
   getCellFromEntityId<T>(
     space: MemorySpace,
     entityId: EntityId,
-    path?: PropertyKey[],
+    path?: readonly PropertyKey[],
     schema?: JSONSchema,
     tx?: IExtendedStorageTransaction,
   ): Cell<T>;
@@ -490,21 +490,21 @@ export class Runtime implements IRuntime {
   getCellFromEntityId<T>(
     space: MemorySpace,
     entityId: EntityId | string,
-    path?: PropertyKey[],
+    path?: readonly PropertyKey[],
     schema?: JSONSchema,
     tx?: IExtendedStorageTransaction,
   ): Cell<T>;
   getCellFromEntityId<S extends JSONSchema = JSONSchema>(
     space: MemorySpace,
     entityId: EntityId | string,
-    path: PropertyKey[],
+    path: readonly PropertyKey[],
     schema: S,
     tx?: IExtendedStorageTransaction,
   ): Cell<Schema<S>>;
   getCellFromEntityId(
     space: MemorySpace,
     entityId: EntityId | string,
-    path: PropertyKey[] = [],
+    path: readonly PropertyKey[] = [],
     schema?: JSONSchema,
     tx?: IExtendedStorageTransaction,
   ): Cell<any> {