Fix welcome-pack Catalog typing so ensureDir returns a VNode.

importExpandedTree stamps folder metadata on the node from ensureDir, so WelcomePackFs must match Catalog instead of returning only an id.

Co-authored-by: Cursor <cursoragent@cursor.com>

Author: pgodwin

src/fs/welcome-pack.test.ts

@@ -30,6 +30,20 @@ function ascii(s: string): Uint8Array {
   return b;
 }
 
+function dirNode(id: number, parentId: number, name: string): VNode {
+  return {
+    id,
+    parentId,
+    name,
+    isDir: true,
+    data: new Uint8Array(),
+    resource: new Uint8Array(),
+    finderInfo: new Uint8Array(32),
+    createDate: 1,
+    modDate: 1,
+  };
+}
+
 function mockStore(): WelcomePackStore & {
   files: Map<string, { id: number; isDir: boolean; name: string }>;
   blobs: { parentId: number; name: string }[];
@@ -64,9 +78,9 @@ function mockStore(): WelcomePackStore & {
     async ensureDir(parentId, name) {
       const k = key(parentId, name);
       const existing = files.get(k);
-      if (existing?.isDir) return existing;
-      const node = { id: nextId++, isDir: true, name };
-      files.set(k, node);
+      if (existing?.isDir) return dirNode(existing.id, parentId, name);
+      const node = dirNode(nextId++, parentId, name);
+      files.set(k, { id: node.id, isDir: true, name });
       byId.set(node.id, { parentId, name });
       return node;
     },

src/fs/welcome-pack.ts

@@ -6,7 +6,7 @@ import { be32 } from '../protocol/binary';
 import { AS_MAGIC, AD_MAGIC, buildAppleSingle } from './appledouble';
 import { expandIncoming, isExpandableArchive, type ExpandedNode } from './expand-incoming';
 import { importExpandedTree, type ImportItemTrack } from './import-transfer';
-import type { VNode } from './virtual-fs';
+import type { Catalog } from './virtual-fs';
 import { log } from '../util/logger';
 
 export const WELCOME_PACK_BASE = '/welcome';
@@ -36,23 +36,12 @@ export type WelcomePackProgress = {
   }) => ImportItemTrack | undefined;
 };
 
-export type WelcomePackFs = {
-  rootId(): number;
+export type WelcomePackFs = Pick<
+  Catalog,
+  'rootId' | 'ensureDir' | 'beginBatch' | 'endBatch' | 'createFile' | 'put' | 'remove'
+> & {
   lookup(parentId: number, name: string): Promise<{ id: number; isDir: boolean } | undefined>;
-  ensureDir(parentId: number, name: string): Promise<{ id: number }>;
-  beginBatch(): void;
-  endBatch(): void;
   importBlob(parentId: number, file: File): Promise<unknown>;
-  createFile(
-    parentId: number,
-    name: string,
-    data: Uint8Array,
-    resource?: Uint8Array,
-    finderInfo?: Uint8Array,
-    onBytes?: (n: number) => void,
-  ): Promise<VNode>;
-  put(node: VNode): Promise<void>;
-  remove(id: number): Promise<void>;
 };
 
 export type WelcomePackStore = WelcomePackFs & {