@wspc/cli 0.1.1 → 0.1.3

package/dist/cli.js

@@ -1,7 +1,7 @@
 #!/usr/bin/env node
 
 // src/cli.ts
-import { Command as Command66 } from "commander";
+import { Command as Command73 } from "commander";
 import { realpathSync } from "fs";
 import { fileURLToPath } from "url";
 
@@ -930,6 +930,20 @@ var eventIcsDownload = (options) => (options.client ?? client).get({
   url: "/calendar/events/{filename}",
   ...options
 });
+var driveLibraryList = (options) => (options?.client ?? client).get({
+  security: [{ scheme: "bearer", type: "http" }],
+  url: "/drive/libraries",
+  ...options
+});
+var driveLibraryCreate = (options) => (options?.client ?? client).post({
+  security: [{ scheme: "bearer", type: "http" }],
+  url: "/drive/libraries",
+  ...options,
+  headers: {
+    "Content-Type": "application/json",
+    ...options?.headers
+  }
+});
 var driveFileDelete = (options) => (options.client ?? client).post({
   security: [{ scheme: "bearer", type: "http" }],
   url: "/drive/libraries/{id}/files/delete",
@@ -939,11 +953,29 @@ var driveFileDelete = (options) => (options.client ?? client).post({
     ...options.headers
   }
 });
+var driveLibraryDelete = (options) => (options.client ?? client).delete({
+  security: [{ scheme: "bearer", type: "http" }],
+  url: "/drive/libraries/{id}",
+  ...options,
+  headers: {
+    "Content-Type": "application/json",
+    ...options.headers
+  }
+});
 var driveLibraryGet = (options) => (options.client ?? client).get({
   security: [{ scheme: "bearer", type: "http" }],
   url: "/drive/libraries/{id}",
   ...options
 });
+var driveLibraryUpdate = (options) => (options.client ?? client).patch({
+  security: [{ scheme: "bearer", type: "http" }],
+  url: "/drive/libraries/{id}",
+  ...options,
+  headers: {
+    "Content-Type": "application/json",
+    ...options.headers
+  }
+});
 var driveManifestGet = (options) => (options.client ?? client).get({
   security: [{ scheme: "bearer", type: "http" }],
   url: "/drive/libraries/{id}/manifest",
@@ -1432,9 +1464,9 @@ function createConsistencyFetch(opts) {
 }
 
 // src/version.ts
-var VERSION = "0.1.1";
-var SPEC_SHA = "51d0418e";
-var SPEC_FETCHED_AT = "2026-06-21T12:30:00.342Z";
+var VERSION = "0.1.3";
+var SPEC_SHA = "e0bbc1e3";
+var SPEC_FETCHED_AT = "2026-06-22T01:23:52.693Z";
 var API_BASE = "https://api.wspc.ai";
 
 // src/index.ts
@@ -1588,8 +1620,19 @@ async function loadAuthedFetch(opts = {}) {
   const { fetch: fetch2, baseUrl } = await loadClientParts(opts);
   return { fetch: fetch2, baseUrl };
 }
+async function loadRealtimeAuthHeaders(opts = {}) {
+  const { baseUrl, authInterceptor } = await loadClientParts(opts);
+  const verifyUrl = new URL(opts.verifyPath ?? "/auth/me", `${baseUrl.replace(/\/$/, "")}/`);
+  const verifyResponse = await authInterceptor.execute(new Request(verifyUrl));
+  if (!verifyResponse.ok) {
+    throw new Error(`realtime auth failed: HTTP ${verifyResponse.status}`);
+  }
+  const request = await authInterceptor.onRequest(new Request(baseUrl));
+  return { baseUrl, headers: request.headers };
+}
 async function loadSdkClientWithAuthedFetch(opts = {}) {
-  return loadClientParts(opts);
+  const { _rawClient, fetch: fetch2, baseUrl } = await loadClientParts(opts);
+  return { _rawClient, fetch: fetch2, baseUrl };
 }
 async function loadClientParts(opts = {}) {
   const store = opts.store ?? new ConfigStore();
@@ -1609,7 +1652,7 @@ async function loadClientParts(opts = {}) {
       fetch: authedFetch
     })
   );
-  return { _rawClient: rawClient, fetch: authedFetch, baseUrl: resolved.apiBase };
+  return { _rawClient: rawClient, fetch: authedFetch, baseUrl: resolved.apiBase, authInterceptor: interceptor };
 }
 
 // src/handwritten/output/primitives.ts
@@ -1835,22 +1878,24 @@ function render(ctx, data) {
   renderPaginationFooter(data);
 }
 function renderPaginationFooter(data) {
-  if (data === null || typeof data !== "object") return;
-  const d = data;
-  if (typeof d.next_cursor === "string" && d.next_cursor.length > 0) {
-    process.stdout.write(dim(`  \u2026 more results \u2014 re-run with --cursor ${d.next_cursor}`) + "\n");
-  }
-  const id = typeof d.id === "string" ? d.id : "<id>";
-  if (typeof d.children_next_cursor === "string" && d.children_next_cursor.length > 0) {
+  if (!isRecord(data)) return;
+  const nextCursor = getString(data, "next_cursor");
+  if (nextCursor !== void 0 && nextCursor.length > 0) {
+    process.stdout.write(dim(`  \u2026 more results \u2014 re-run with --cursor ${nextCursor}`) + "\n");
+  }
+  const id = getString(data, "id") ?? "<id>";
+  const childrenNextCursor = getString(data, "children_next_cursor");
+  if (childrenNextCursor !== void 0 && childrenNextCursor.length > 0) {
     process.stdout.write(dim(`  \u2026 more children \u2014 wspc todo ls --parent ${id}`) + "\n");
   }
-  if (typeof d.comments_next_cursor === "string" && d.comments_next_cursor.length > 0) {
+  const commentsNextCursor = getString(data, "comments_next_cursor");
+  if (commentsNextCursor !== void 0 && commentsNextCursor.length > 0) {
     process.stdout.write(dim(`  \u2026 more comments \u2014 wspc todo comment ls ${id}`) + "\n");
   }
 }
 function drillDataPath(data, dataPath) {
   if (!dataPath) return data;
-  if (data === null || typeof data !== "object") return data;
+  if (!isRecord(data)) return data;
   const value = data[dataPath];
   return value === void 0 ? data : value;
 }
@@ -1878,9 +1923,9 @@ function renderGeneric(data, hints) {
 }
 function detectShape(data) {
   if (Array.isArray(data)) return "list";
-  if (typeof data === "object" && data !== null) {
+  if (isRecord(data)) {
     const keys = Object.keys(data);
-    const arrayKeys = keys.filter((k) => Array.isArray(data[k]));
+    const arrayKeys = keys.filter((k) => getArray(data, k) !== void 0);
     if (arrayKeys.length === 1) return "list";
     return "object";
   }
@@ -1888,9 +1933,10 @@ function detectShape(data) {
 }
 function extractItems(data) {
   if (Array.isArray(data)) return data;
-  if (typeof data === "object" && data !== null) {
-    for (const v of Object.values(data)) {
-      if (Array.isArray(v)) return v;
+  if (isRecord(data)) {
+    for (const key of Object.keys(data)) {
+      const value = getArray(data, key);
+      if (value !== void 0) return value;
     }
   }
   return [];
@@ -1901,13 +1947,13 @@ function renderList(data, hints) {
     process.stdout.write(dim("  " + (hints?.emptyMessage ?? "no items")) + "\n");
     return;
   }
-  const first = items[0];
+  const first = isRecord(items[0]) ? items[0] : {};
   const columns = pickColumns(first, hints?.columns);
   const format = hints?.format ?? {};
   const headers = columns.map((c) => c.toUpperCase());
   const rows = items.map(
     (item) => columns.map(
-      (col) => formatCell(item[col], format[col], hints?.enumColorMap?.[col])
+      (col) => formatCell(isRecord(item) ? item[col] : void 0, format[col], hints?.enumColorMap?.[col])
     )
   );
   process.stdout.write(table(headers, rows));
@@ -1925,7 +1971,7 @@ function pickColumns(first, hint) {
   return ordered.slice(0, 5);
 }
 function renderObject(data, hints) {
-  if (typeof data !== "object" || data === null) {
+  if (!isRecord(data)) {
     renderScalar(data);
     return;
   }
@@ -1934,7 +1980,7 @@ function renderObject(data, hints) {
   if (topKeys.length === 1) {
     const onlyKey = topKeys[0];
     const inner = obj[onlyKey];
-    if (inner && typeof inner === "object" && !Array.isArray(inner)) {
+    if (isRecord(inner)) {
       obj = inner;
     }
   }
@@ -1945,7 +1991,10 @@ function renderObject(data, hints) {
   }
   const format = hints?.format ?? {};
   const arrayFields = hints?.fields ? [] : Object.keys(obj).filter(
-    (k) => Array.isArray(obj[k]) && obj[k].length > 0
+    (k) => {
+      const value = getArray(obj, k);
+      return value !== void 0 && value.length > 0;
+    }
   );
   const formatted = fields.map((f) => [
     f,
@@ -1974,7 +2023,8 @@ function renderObject(data, hints) {
   for (const f of arrayFields) {
     const uncapped = f === "children" || f === "comments";
     const max = uncapped ? Number.POSITIVE_INFINITY : ARRAY_FIELD_MAX_ITEMS;
-    renderArrayField(f, obj[f], labelWidth, max);
+    const items = getArray(obj, f);
+    if (items !== void 0) renderArrayField(f, items, labelWidth, max);
   }
   const hadAbove = inlineFinal.length > 0 || arrayFields.length > 0;
   blocks.forEach(([f, value], i) => {
@@ -2026,28 +2076,31 @@ function formatArrayItem(item) {
   return JSON.stringify(item);
 }
 function formatTodoLike(item) {
-  if (!item || typeof item !== "object" || Array.isArray(item)) return null;
-  const rec = item;
-  if (typeof rec.id !== "string" || typeof rec.title !== "string") return null;
-  const id = idShort(rec.id);
-  const status = typeof rec.status === "string" ? statusBadge(rec.status) : "";
-  return status ? `${id}  ${status}  ${rec.title}` : `${id}  ${rec.title}`;
+  if (!isRecord(item)) return null;
+  const idValue = getString(item, "id");
+  const title = getString(item, "title");
+  if (idValue === void 0 || title === void 0) return null;
+  const status = getString(item, "status");
+  const id = idShort(idValue);
+  const statusText = status === void 0 ? "" : statusBadge(status);
+  return statusText ? `${id}  ${statusText}  ${title}` : `${id}  ${title}`;
 }
 function formatCommentLike(item) {
-  if (!item || typeof item !== "object" || Array.isArray(item)) return null;
-  const rec = item;
-  if (typeof rec.id !== "string" || typeof rec.content !== "string") return null;
-  const id = idShort(rec.id);
-  const when = rec.created_at !== void 0 ? `${relativeTime(rec.created_at)}  ` : "";
-  const snippet = truncate(rec.content, 60);
+  if (!isRecord(item)) return null;
+  const idValue = getString(item, "id");
+  const content = getString(item, "content");
+  if (idValue === void 0 || content === void 0) return null;
+  const id = idShort(idValue);
+  const when = item.created_at !== void 0 ? `${relativeTime(item.created_at)}  ` : "";
+  const snippet = truncate(content, 60);
   return `${id}  ${when}${snippet}`;
 }
 function formatAttendeeLike(item) {
-  if (!item || typeof item !== "object" || Array.isArray(item)) return null;
-  const rec = item;
-  const email = typeof rec.email === "string" ? rec.email : null;
+  if (!isRecord(item)) return null;
+  const email = getString(item, "email");
   if (!email) return null;
-  const name = typeof rec.display_name === "string" && rec.display_name.length > 0 ? rec.display_name : null;
+  const displayName = getString(item, "display_name");
+  const name = displayName !== void 0 && displayName.length > 0 ? displayName : void 0;
   return name ? `${name} <${email}>` : `<${email}>`;
 }
 function renderScalar(data) {
@@ -2068,6 +2121,17 @@ function renderScalar(data) {
 function isScalar(v) {
   return v === null || typeof v !== "object" && typeof v !== "function";
 }
+function isRecord(value) {
+  return typeof value === "object" && value !== null && !Array.isArray(value);
+}
+function getString(record, key) {
+  const value = record[key];
+  return typeof value === "string" ? value : void 0;
+}
+function getArray(record, key) {
+  const value = record[key];
+  return Array.isArray(value) ? value : void 0;
+}
 function formatCell(value, fmt, colorMap, opts) {
   if (fmt !== "enum-badge" && (value === void 0 || value === null)) return dim("\u2014");
   switch (fmt) {
@@ -2697,9 +2761,174 @@ var eventIcsDownloadCommand = new Command21("ics").description("Download event a
   render({ kind: "event_ics_download", display: { "shape": "raw" } }, result.data);
 });
 
-// src/generated/cli/alias/add.ts
+// src/generated/cli/drive/library/add.ts
 import { Command as Command22 } from "commander";
-var emailAliasCreateCommand = new Command22("add").description("Create a receiving alias").argument("<email>", "email").action(async (email, opts) => {
+var driveLibraryCreateCommand = new Command22("add").description("Create a drive library").argument("<name>", "name").action(async (name, opts) => {
+  const client2 = await loadSdkClient();
+  const result = await driveLibraryCreate({
+    client: client2._rawClient,
+    body: {
+      name
+    }
+  });
+  if (result.error || !result.response?.ok) {
+    process.stderr.write(
+      `HTTP ${result.response?.status ?? "?"}: ${JSON.stringify(result.error ?? "unknown error", null, 2)}
+`
+    );
+    process.exitCode = 1;
+    return;
+  }
+  render({ kind: "drive_library_create", display: { "shape": "object", "columns": ["id", "name", "version", "file_count", "storage_bytes", "updated_at"] } }, result.data);
+});
+
+// src/generated/cli/drive/library/ls.ts
+import { Command as Command23 } from "commander";
+var driveLibraryListCommand = new Command23("ls").description("List drive libraries").option("--limit <value>", "limit").option("--cursor <value>", "cursor").option("--include-deleted <value>", "include_deleted").action(async (opts) => {
+  const client2 = await loadSdkClient();
+  const result = await driveLibraryList({
+    client: client2._rawClient,
+    query: {
+      limit: opts.limit,
+      cursor: opts.cursor,
+      include_deleted: opts.includeDeleted
+    }
+  });
+  if (result.error || !result.response?.ok) {
+    process.stderr.write(
+      `HTTP ${result.response?.status ?? "?"}: ${JSON.stringify(result.error ?? "unknown error", null, 2)}
+`
+    );
+    process.exitCode = 1;
+    return;
+  }
+  render({ kind: "drive_library_list", display: { "shape": "list", "dataPath": "libraries", "columns": ["id", "name", "file_count", "storage_bytes", "updated_at"], "emptyMessage": "no drive libraries" } }, result.data);
+});
+
+// src/generated/cli/drive/file/rm.ts
+import { Command as Command24 } from "commander";
+var driveFileDeleteCommand = new Command24("rm").description("Delete a drive file").argument("<id>", "id").argument("<path>", "path").option("--expected-entry-version <value>", "expected_entry_version").action(async (id, path, opts) => {
+  const client2 = await loadSdkClient();
+  const result = await driveFileDelete({
+    client: client2._rawClient,
+    path: {
+      id
+    },
+    body: {
+      path,
+      expected_entry_version: opts.expectedEntryVersion
+    }
+  });
+  if (result.error || !result.response?.ok) {
+    process.stderr.write(
+      `HTTP ${result.response?.status ?? "?"}: ${JSON.stringify(result.error ?? "unknown error", null, 2)}
+`
+    );
+    process.exitCode = 1;
+    return;
+  }
+  render({ kind: "drive_file_delete", display: { "shape": "object", "dataPath": "entry", "columns": ["path", "entry_version", "deleted_at"] } }, result.data);
+});
+
+// src/generated/cli/drive/library/rm.ts
+import { Command as Command25 } from "commander";
+var driveLibraryDeleteCommand = new Command25("rm").description("Delete a drive library").argument("<id>", "id").option("--expected-version <value>", "expected_version").action(async (id, opts) => {
+  const client2 = await loadSdkClient();
+  const result = await driveLibraryDelete({
+    client: client2._rawClient,
+    path: {
+      id
+    },
+    body: {
+      expected_version: opts.expectedVersion
+    }
+  });
+  if (result.error || !result.response?.ok) {
+    process.stderr.write(
+      `HTTP ${result.response?.status ?? "?"}: ${JSON.stringify(result.error ?? "unknown error", null, 2)}
+`
+    );
+    process.exitCode = 1;
+    return;
+  }
+  render({ kind: "drive_library_delete", display: { "shape": "object", "columns": ["id", "name", "version", "file_count", "storage_bytes", "updated_at"] } }, result.data);
+});
+
+// src/generated/cli/drive/library/show.ts
+import { Command as Command26 } from "commander";
+var driveLibraryGetCommand = new Command26("show").description("Get a drive library").argument("<id>", "id").action(async (id, opts) => {
+  const client2 = await loadSdkClient();
+  const result = await driveLibraryGet({
+    client: client2._rawClient,
+    path: {
+      id
+    }
+  });
+  if (result.error || !result.response?.ok) {
+    process.stderr.write(
+      `HTTP ${result.response?.status ?? "?"}: ${JSON.stringify(result.error ?? "unknown error", null, 2)}
+`
+    );
+    process.exitCode = 1;
+    return;
+  }
+  render({ kind: "drive_library_get", display: { "shape": "object", "columns": ["id", "name", "version", "file_count", "storage_bytes", "updated_at"] } }, result.data);
+});
+
+// src/generated/cli/drive/library/update.ts
+import { Command as Command27 } from "commander";
+var driveLibraryUpdateCommand = new Command27("update").description("Update a drive library").argument("<id>", "id").option("--name <value>", "name").option("--expected-version <value>", "expected_version").action(async (id, opts) => {
+  const client2 = await loadSdkClient();
+  const result = await driveLibraryUpdate({
+    client: client2._rawClient,
+    path: {
+      id
+    },
+    body: {
+      name: opts.name,
+      expected_version: opts.expectedVersion
+    }
+  });
+  if (result.error || !result.response?.ok) {
+    process.stderr.write(
+      `HTTP ${result.response?.status ?? "?"}: ${JSON.stringify(result.error ?? "unknown error", null, 2)}
+`
+    );
+    process.exitCode = 1;
+    return;
+  }
+  render({ kind: "drive_library_update", display: { "shape": "object", "columns": ["id", "name", "version", "file_count", "storage_bytes", "updated_at"] } }, result.data);
+});
+
+// src/generated/cli/drive/manifest/get.ts
+import { Command as Command28 } from "commander";
+var driveManifestGetCommand = new Command28("get").description("Get a drive library manifest").argument("<id>", "id").option("--limit <value>", "limit").option("--cursor <value>", "cursor").option("--include-deleted <value>", "include_deleted").action(async (id, opts) => {
+  const client2 = await loadSdkClient();
+  const result = await driveManifestGet({
+    client: client2._rawClient,
+    path: {
+      id
+    },
+    query: {
+      limit: opts.limit,
+      cursor: opts.cursor,
+      include_deleted: opts.includeDeleted
+    }
+  });
+  if (result.error || !result.response?.ok) {
+    process.stderr.write(
+      `HTTP ${result.response?.status ?? "?"}: ${JSON.stringify(result.error ?? "unknown error", null, 2)}
+`
+    );
+    process.exitCode = 1;
+    return;
+  }
+  render({ kind: "drive_manifest_get", display: { "shape": "list", "dataPath": "entries", "columns": ["path", "entry_version", "size_bytes", "updated_at"], "emptyMessage": "no drive files" } }, result.data);
+});
+
+// src/generated/cli/alias/add.ts
+import { Command as Command29 } from "commander";
+var emailAliasCreateCommand = new Command29("add").description("Create a receiving alias").argument("<email>", "email").action(async (email, opts) => {
   const client2 = await loadSdkClient();
   const result = await emailAliasCreate({
     client: client2._rawClient,
@@ -2719,8 +2948,8 @@ var emailAliasCreateCommand = new Command22("add").description("Create a receivi
 });
 
 // src/generated/cli/alias/ls.ts
-import { Command as Command23 } from "commander";
-var emailAliasListCommand = new Command23("ls").description("List the caller's aliases").option("--include-deleted <value>", "When `true`, include soft-deleted aliases (with `deleted_at` set) alongside active ones. Defaults to `false`.").action(async (opts) => {
+import { Command as Command30 } from "commander";
+var emailAliasListCommand = new Command30("ls").description("List the caller's aliases").option("--include-deleted <value>", "When `true`, include soft-deleted aliases (with `deleted_at` set) alongside active ones. Defaults to `false`.").action(async (opts) => {
   const client2 = await loadSdkClient();
   const result = await emailAliasList({
     client: client2._rawClient,
@@ -2740,8 +2969,8 @@ var emailAliasListCommand = new Command23("ls").description("List the caller's a
 });
 
 // src/generated/cli/domain/add.ts
-import { Command as Command24 } from "commander";
-var emailDomainCreateCommand = new Command24("add").description("Register a custom email domain").argument("<domain>", "domain").action(async (domain, opts) => {
+import { Command as Command31 } from "commander";
+var emailDomainCreateCommand = new Command31("add").description("Register a custom email domain").argument("<domain>", "domain").action(async (domain, opts) => {
   const client2 = await loadSdkClient();
   const result = await emailDomainCreate({
     client: client2._rawClient,
@@ -2761,8 +2990,8 @@ var emailDomainCreateCommand = new Command24("add").description("Register a cust
 });
 
 // src/generated/cli/domain/ls.ts
-import { Command as Command25 } from "commander";
-var emailDomainListCommand = new Command25("ls").description("List cached custom domains").action(async (opts) => {
+import { Command as Command32 } from "commander";
+var emailDomainListCommand = new Command32("ls").description("List cached custom domains").action(async (opts) => {
   const client2 = await loadSdkClient();
   const result = await emailDomainList({
     client: client2._rawClient
@@ -2779,8 +3008,8 @@ var emailDomainListCommand = new Command25("ls").description("List cached custom
 });
 
 // src/generated/cli/alias/rm.ts
-import { Command as Command26 } from "commander";
-var emailAliasDeleteCommand = new Command26("rm").description("Soft-delete an alias").argument("<email>", "email").action(async (email, opts) => {
+import { Command as Command33 } from "commander";
+var emailAliasDeleteCommand = new Command33("rm").description("Soft-delete an alias").argument("<email>", "email").action(async (email, opts) => {
   const client2 = await loadSdkClient();
   const result = await emailAliasDelete({
     client: client2._rawClient,
@@ -2800,8 +3029,8 @@ var emailAliasDeleteCommand = new Command26("rm").description("Soft-delete an al
 });
 
 // src/generated/cli/email/rm.ts
-import { Command as Command27 } from "commander";
-var emailDeleteCommand = new Command27("rm").description("Soft-delete inbound emails").argument("<id...>", "id").action(async (id, opts) => {
+import { Command as Command34 } from "commander";
+var emailDeleteCommand = new Command34("rm").description("Soft-delete inbound emails").argument("<id...>", "id").action(async (id, opts) => {
   const idRaw = id;
   const ids = idRaw.length > 0 ? idRaw : void 0;
   const client2 = await loadSdkClient();
@@ -2823,8 +3052,8 @@ var emailDeleteCommand = new Command27("rm").description("Soft-delete inbound em
 });
 
 // src/generated/cli/domain/rm.ts
-import { Command as Command28 } from "commander";
-var emailDomainDeleteCommand = new Command28("rm").description("Delete a custom email domain").argument("<domain>", "domain").action(async (domain, opts) => {
+import { Command as Command35 } from "commander";
+var emailDomainDeleteCommand = new Command35("rm").description("Delete a custom email domain").argument("<domain>", "domain").action(async (domain, opts) => {
   const client2 = await loadSdkClient();
   const result = await emailDomainDelete({
     client: client2._rawClient,
@@ -2844,8 +3073,8 @@ var emailDomainDeleteCommand = new Command28("rm").description("Delete a custom
 });
 
 // src/generated/cli/domain/show.ts
-import { Command as Command29 } from "commander";
-var emailDomainGetCommand = new Command29("show").description("Get one cached custom domain").argument("<domain>", "domain").action(async (domain, opts) => {
+import { Command as Command36 } from "commander";
+var emailDomainGetCommand = new Command36("show").description("Get one cached custom domain").argument("<domain>", "domain").action(async (domain, opts) => {
   const client2 = await loadSdkClient();
   const result = await emailDomainGet({
     client: client2._rawClient,
@@ -2865,8 +3094,8 @@ var emailDomainGetCommand = new Command29("show").description("Get one cached cu
 });
 
 // src/generated/cli/email/show.ts
-import { Command as Command30 } from "commander";
-var emailGetCommand = new Command30("show").description("Get an inbound email by id").argument("<id>", "id").option("--include-html <value>", "When `true`, fetch the HTML body from R2 and include it as `html_body` in the response. Costs an extra R2 read; omit if you only need text.").option("--include-deleted <value>", "When `true`, allow fetching a soft-deleted email. Defaults to `false` (returns 404 for soft-deleted rows).").action(async (id, opts) => {
+import { Command as Command37 } from "commander";
+var emailGetCommand = new Command37("show").description("Get an inbound email by id").argument("<id>", "id").option("--include-html <value>", "When `true`, fetch the HTML body from R2 and include it as `html_body` in the response. Costs an extra R2 read; omit if you only need text.").option("--include-deleted <value>", "When `true`, allow fetching a soft-deleted email. Defaults to `false` (returns 404 for soft-deleted rows).").action(async (id, opts) => {
   const client2 = await loadSdkClient();
   const result = await emailGet({
     client: client2._rawClient,
@@ -2890,8 +3119,8 @@ var emailGetCommand = new Command30("show").description("Get an inbound email by
 });
 
 // src/generated/cli/email/ls.ts
-import { Command as Command31 } from "commander";
-var emailListCommand = new Command31("ls").description("List inbound emails").option("--limit <value>", "Max items to return (clamped to 1-100). Defaults to 20 server-side.").option("--alias-email <value>", "If set, only return emails received on this full alias email address.").option("--unread-only <value>", "When `true`, only return emails with `is_read=false`.").option("--since <value>", "Unix epoch milliseconds \u2014 only return emails with `received_at >= since`. Useful for incremental sync.").option("--cursor <value>", "Opaque pagination cursor returned in `next_cursor` of a previous response.").option("--include-deleted <value>", "When `true`, also return soft-deleted emails. Defaults to `false`.").action(async (opts) => {
+import { Command as Command38 } from "commander";
+var emailListCommand = new Command38("ls").description("List inbound emails").option("--limit <value>", "Max items to return (clamped to 1-100). Defaults to 20 server-side.").option("--alias-email <value>", "If set, only return emails received on this full alias email address.").option("--unread-only <value>", "When `true`, only return emails with `is_read=false`.").option("--since <value>", "Unix epoch milliseconds \u2014 only return emails with `received_at >= since`. Useful for incremental sync.").option("--cursor <value>", "Opaque pagination cursor returned in `next_cursor` of a previous response.").option("--include-deleted <value>", "When `true`, also return soft-deleted emails. Defaults to `false`.").action(async (opts) => {
   const client2 = await loadSdkClient();
   const result = await emailList({
     client: client2._rawClient,
@@ -2916,8 +3145,8 @@ var emailListCommand = new Command31("ls").description("List inbound emails").op
 });
 
 // src/generated/cli/email/read.ts
-import { Command as Command32 } from "commander";
-var emailMarkReadCommand = new Command32("read").description("Mark inbound emails as read").argument("<id...>", "id").action(async (id, opts) => {
+import { Command as Command39 } from "commander";
+var emailMarkReadCommand = new Command39("read").description("Mark inbound emails as read").argument("<id...>", "id").action(async (id, opts) => {
   const idRaw = id;
   const ids = idRaw.length > 0 ? idRaw : void 0;
   const client2 = await loadSdkClient();
@@ -2939,8 +3168,8 @@ var emailMarkReadCommand = new Command32("read").description("Mark inbound email
 });
 
 // src/generated/cli/email/unread.ts
-import { Command as Command33 } from "commander";
-var emailMarkUnreadCommand = new Command33("unread").description("Mark inbound emails as unread").argument("<id...>", "id").action(async (id, opts) => {
+import { Command as Command40 } from "commander";
+var emailMarkUnreadCommand = new Command40("unread").description("Mark inbound emails as unread").argument("<id...>", "id").action(async (id, opts) => {
   const idRaw = id;
   const ids = idRaw.length > 0 ? idRaw : void 0;
   const client2 = await loadSdkClient();
@@ -2962,8 +3191,8 @@ var emailMarkUnreadCommand = new Command33("unread").description("Mark inbound e
 });
 
 // src/generated/cli/domain/verify.ts
-import { Command as Command34 } from "commander";
-var emailDomainVerifyCommand = new Command34("verify").description("Verify a custom domain with the provider").argument("<domain>", "domain").action(async (domain, opts) => {
+import { Command as Command41 } from "commander";
+var emailDomainVerifyCommand = new Command41("verify").description("Verify a custom domain with the provider").argument("<domain>", "domain").action(async (domain, opts) => {
   const client2 = await loadSdkClient();
   const result = await emailDomainVerify({
     client: client2._rawClient,
@@ -2983,8 +3212,8 @@ var emailDomainVerifyCommand = new Command34("verify").description("Verify a cus
 });
 
 // src/generated/cli/push/config/rm.ts
-import { Command as Command35 } from "commander";
-var pushConfigDeleteCommand = new Command35("rm").description("Remove a push transport").argument("<transport>", "transport").action(async (transport, opts) => {
+import { Command as Command42 } from "commander";
+var pushConfigDeleteCommand = new Command42("rm").description("Remove a push transport").argument("<transport>", "transport").action(async (transport, opts) => {
   const client2 = await loadSdkClient();
   const result = await pushConfigDelete({
     client: client2._rawClient,
@@ -3004,8 +3233,8 @@ var pushConfigDeleteCommand = new Command35("rm").description("Remove a push tra
 });
 
 // src/generated/cli/push/config/set.ts
-import { Command as Command36 } from "commander";
-var pushConfigSetCommand = new Command36("set").description("Register or update a push transport").option("--transport <value>", "Transport discriminator. `telegram` is the only supported value today \u2014 push delivers via a Telegram bot DM. Future transports (web push, iOS/Android, generic webhook) will be added as additional discriminator values.").option("--target-bot-username <value>", "Telegram bot username (with leading `@`, 5\u201332 alphanumeric/underscore characters). This is the bot the user has already started a chat with \u2014 wspc DMs notifications to it via the Telegram Bot API.").action(async (opts) => {
+import { Command as Command43 } from "commander";
+var pushConfigSetCommand = new Command43("set").description("Register or update a push transport").option("--transport <value>", "Transport discriminator. `telegram` is the only supported value today \u2014 push delivers via a Telegram bot DM. Future transports (web push, iOS/Android, generic webhook) will be added as additional discriminator values.").option("--target-bot-username <value>", "Telegram bot username (with leading `@`, 5\u201332 alphanumeric/underscore characters). This is the bot the user has already started a chat with \u2014 wspc DMs notifications to it via the Telegram Bot API.").action(async (opts) => {
   const client2 = await loadSdkClient();
   const result = await pushConfigSet({
     client: client2._rawClient,
@@ -3028,8 +3257,8 @@ var pushConfigSetCommand = new Command36("set").description("Register or update
 });
 
 // src/generated/cli/push/config/show.ts
-import { Command as Command37 } from "commander";
-var pushConfigGetCommand = new Command37("show").description("List the caller's push transports").action(async (opts) => {
+import { Command as Command44 } from "commander";
+var pushConfigGetCommand = new Command44("show").description("List the caller's push transports").action(async (opts) => {
   const client2 = await loadSdkClient();
   const result = await pushConfigGet({
     client: client2._rawClient
@@ -3046,8 +3275,8 @@ var pushConfigGetCommand = new Command37("show").description("List the caller's
 });
 
 // src/generated/cli/push/test.ts
-import { Command as Command38 } from "commander";
-var pushTestCommand = new Command38("test").description("Send a test push notification").option("--transport <value>", "Which transport to send the test message through. Must match a transport the caller has already registered via `POST /push/config`; today only `telegram` is supported.").action(async (opts) => {
+import { Command as Command45 } from "commander";
+var pushTestCommand = new Command45("test").description("Send a test push notification").option("--transport <value>", "Which transport to send the test message through. Must match a transport the caller has already registered via `POST /push/config`; today only `telegram` is supported.").action(async (opts) => {
   const client2 = await loadSdkClient();
   const result = await pushTest({
     client: client2._rawClient,
@@ -3070,8 +3299,8 @@ var pushTestCommand = new Command38("test").description("Send a test push notifi
 });
 
 // src/generated/cli/todo/comment/add.ts
-import { Command as Command39 } from "commander";
-var todoCommentCreateCommand = new Command39("add").description("Add a comment to a todo").argument("<id>", "id").argument("<content>", "content").action(async (id, content, opts) => {
+import { Command as Command46 } from "commander";
+var todoCommentCreateCommand = new Command46("add").description("Add a comment to a todo").argument("<id>", "id").argument("<content>", "content").action(async (id, content, opts) => {
   const client2 = await loadSdkClient();
   const result = await todoCommentCreate({
     client: client2._rawClient,
@@ -3094,8 +3323,8 @@ var todoCommentCreateCommand = new Command39("add").description("Add a comment t
 });
 
 // src/generated/cli/todo/comment/ls.ts
-import { Command as Command40 } from "commander";
-var todoCommentListCommand = new Command40("ls").description("List comments on a todo").argument("<id>", "id").option("--order <value>", "order").option("--include-deleted <value>", "include_deleted").option("--limit <value>", "Max comments to return. Clamped to [1, 200]. Default 50 server-side.").option("--cursor <value>", "Opaque pagination cursor returned in `next_cursor` of a previous response.").action(async (id, opts) => {
+import { Command as Command47 } from "commander";
+var todoCommentListCommand = new Command47("ls").description("List comments on a todo").argument("<id>", "id").option("--order <value>", "order").option("--include-deleted <value>", "include_deleted").option("--limit <value>", "Max comments to return. Clamped to [1, 200]. Default 50 server-side.").option("--cursor <value>", "Opaque pagination cursor returned in `next_cursor` of a previous response.").action(async (id, opts) => {
   const client2 = await loadSdkClient();
   const result = await todoCommentList({
     client: client2._rawClient,
@@ -3121,8 +3350,8 @@ var todoCommentListCommand = new Command40("ls").description("List comments on a
 });
 
 // src/generated/cli/todo/project/add.ts
-import { Command as Command41 } from "commander";
-var projectCreateCommand = new Command41("add").description("Create a project").argument("<name>", "name").option("--default-todo-type-id <value>", "default_todo_type_id").action(async (name, opts) => {
+import { Command as Command48 } from "commander";
+var projectCreateCommand = new Command48("add").description("Create a project").argument("<name>", "name").option("--default-todo-type-id <value>", "default_todo_type_id").action(async (name, opts) => {
   const client2 = await loadSdkClient();
   const result = await projectCreate({
     client: client2._rawClient,
@@ -3143,8 +3372,8 @@ var projectCreateCommand = new Command41("add").description("Create a project").
 });
 
 // src/generated/cli/todo/project/ls.ts
-import { Command as Command42 } from "commander";
-var projectListCommand = new Command42("ls").description("List projects").option("--include-deleted <value>", "Set to `true` to include soft-deleted projects in the response.").action(async (opts) => {
+import { Command as Command49 } from "commander";
+var projectListCommand = new Command49("ls").description("List projects").option("--include-deleted <value>", "Set to `true` to include soft-deleted projects in the response.").action(async (opts) => {
   const client2 = await loadSdkClient();
   const result = await projectList({
     client: client2._rawClient,
@@ -3164,8 +3393,8 @@ var projectListCommand = new Command42("ls").description("List projects").option
 });
 
 // src/generated/cli/todo/rule/add.ts
-import { Command as Command43 } from "commander";
-var recurrenceRuleCreateCommand = new Command43("add").description("Create a recurring todo rule").argument("<title>", "title").option("--rrule <value>", "rrule").option("--dtstart <value>", "dtstart").option("--description <value>", "description").option("--parent-id <value>", "parent_id").option("-p, --project <value>", "Project for the recurrence rule, its template todo, and all materialized instances. Must be an active project in the caller's organization.").option("-t, --type <value>", "type_id").action(async (title, opts) => {
+import { Command as Command50 } from "commander";
+var recurrenceRuleCreateCommand = new Command50("add").description("Create a recurring todo rule").argument("<title>", "title").option("--rrule <value>", "rrule").option("--dtstart <value>", "dtstart").option("--description <value>", "description").option("--parent-id <value>", "parent_id").option("-p, --project <value>", "Project for the recurrence rule, its template todo, and all materialized instances. Must be an active project in the caller's organization.").option("-t, --type <value>", "type_id").action(async (title, opts) => {
   const client2 = await loadSdkClient();
   const result = await recurrenceRuleCreate({
     client: client2._rawClient,
@@ -3191,8 +3420,8 @@ var recurrenceRuleCreateCommand = new Command43("add").description("Create a rec
 });
 
 // src/generated/cli/todo/rule/ls.ts
-import { Command as Command44 } from "commander";
-var recurrenceRuleListCommand = new Command44("ls").description("List recurring todo rules").option("--project-id <value>", "Project id filter. Required. Unknown, cross-organization, or soft-deleted project ids return NOT_FOUND.").option("--user-id <value>", "user_id").action(async (opts) => {
+import { Command as Command51 } from "commander";
+var recurrenceRuleListCommand = new Command51("ls").description("List recurring todo rules").option("--project-id <value>", "Project id filter. Required. Unknown, cross-organization, or soft-deleted project ids return NOT_FOUND.").option("--user-id <value>", "user_id").action(async (opts) => {
   const client2 = await loadSdkClient();
   const result = await recurrenceRuleList({
     client: client2._rawClient,
@@ -3213,7 +3442,7 @@ var recurrenceRuleListCommand = new Command44("ls").description("List recurring
 });
 
 // src/generated/cli/todo/add.ts
-import { Command as Command45 } from "commander";
+import { Command as Command52 } from "commander";
 
 // src/handwritten/utils/parse-json-field.ts
 function parseJsonField(raw, flag) {
@@ -3228,7 +3457,7 @@ function parseJsonField(raw, flag) {
 }
 
 // src/generated/cli/todo/add.ts
-var todoCreateCommand = new Command45("add").description("Create a todo").argument("<title>", "title").option("-p, --project <value>", "Project id to assign this todo to. It must be an active project in the caller's organization.").option("--description <value>", "Free-form details about the todo. Fully supports GFM Markdown (tables, strikethrough, task lists). Stored verbatim; client applications are responsible for rendering. Optional. Passing `null` is strictly rejected.").option("--parent-id <value>", "Parent todo ID (`tod_<ULID>`) to attach this todo as a child under another todo. Omit or pass `null` to create a root-level todo. Nesting is limited to one level; attempting to set a child todo as a parent will trigger `PARENT_IS_CHILD`. To make a subtask appear on every occurrence of a recurring rule, set this to that rule's template todo id (the template id returned when the rule is created); the server re-materializes future occurrences so each carries the subtask.").option("--status <value>", "Initial status of the todo. Omit to default to `open`. Allowed values: `open`, `in_progress`, `done`, `cancelled`.").option("--due-at <value>", 'Optional calendar due date in ISO date-only format (`YYYY-MM-DD`). Stored without timezone offsets to represent the same local calendar day globally. Pass `""` or omit the field to skip setting a due date. Passing `null` is strictly rejected.').option("--idempotency-key <value>", "idempotency_key").option("--type-id <value>", "Type id this todo belongs to. Omit to use the project's default type. When project_id is also supplied, the type must belong to the same project. New server-generated type ids use typ_<ULID>; legacy ids remain accepted.").option("--custom-fields <value>", "Custom field values keyed by the field's immutable `key` (not the human `label`). Each value must match the declared field type: string fields require string values, and string_array fields require string arrays. Providing a key that is not declared on the resolved todo type is strictly rejected with `UNDECLARED_FIELD`. Missing required fields that lack a default value are rejected with `FIELD_REQUIRED`. Defaults declared on the type are auto-applied at create time.").action(async (title, opts) => {
+var todoCreateCommand = new Command52("add").description("Create a todo").argument("<title>", "title").option("-p, --project <value>", "Project id to assign this todo to. It must be an active project in the caller's organization.").option("--description <value>", "Free-form details about the todo. Fully supports GFM Markdown (tables, strikethrough, task lists). Stored verbatim; client applications are responsible for rendering. Optional. Passing `null` is strictly rejected.").option("--parent-id <value>", "Parent todo ID (`tod_<ULID>`) to attach this todo as a child under another todo. Omit or pass `null` to create a root-level todo. Nesting is limited to one level; attempting to set a child todo as a parent will trigger `PARENT_IS_CHILD`. To make a subtask appear on every occurrence of a recurring rule, set this to that rule's template todo id (the template id returned when the rule is created); the server re-materializes future occurrences so each carries the subtask.").option("--status <value>", "Initial status of the todo. Omit to default to `open`. Allowed values: `open`, `in_progress`, `done`, `cancelled`.").option("--due-at <value>", 'Optional calendar due date in ISO date-only format (`YYYY-MM-DD`). Stored without timezone offsets to represent the same local calendar day globally. Pass `""` or omit the field to skip setting a due date. Passing `null` is strictly rejected.').option("--idempotency-key <value>", "idempotency_key").option("--type-id <value>", "Type id this todo belongs to. Omit to use the project's default type. When project_id is also supplied, the type must belong to the same project. New server-generated type ids use typ_<ULID>; legacy ids remain accepted.").option("--custom-fields <value>", "Custom field values keyed by the field's immutable `key` (not the human `label`). Each value must match the declared field type: string fields require string values, and string_array fields require string arrays. Providing a key that is not declared on the resolved todo type is strictly rejected with `UNDECLARED_FIELD`. Missing required fields that lack a default value are rejected with `FIELD_REQUIRED`. Defaults declared on the type are auto-applied at create time.").action(async (title, opts) => {
   const client2 = await loadSdkClient();
   const result = await todoCreate({
     client: client2._rawClient,
@@ -3256,8 +3485,8 @@ var todoCreateCommand = new Command45("add").description("Create a todo").argume
 });
 
 // src/generated/cli/todo/ls.ts
-import { Command as Command46 } from "commander";
-var todoListCommand = new Command46("ls").description("List todos with filters").option("-p, --project <value>", "Filter by project. Required. Unknown, cross-organization, or soft-deleted project ids return NOT_FOUND.").option("--user-id <value>", "user_id").option("--parent-id <value>", "parent_id").option("-s, --status <value>", "status").option("--include-deleted <value>", "include_deleted").option("--include-templates <value>", "include_templates").option("--due-after <value>", "due_after").option("--due-before <value>", "due_before").option("--type-id <value>", "type_id").option("--sort-by <value>", "sort_by").option("--order <value>", "order").option("--include-orphan-fields <value>", "include_orphan_fields").option("--limit <value>", "Max todos to return. Clamped to [1, 200]. Default 50 server-side.").option("--cursor <value>", "Opaque pagination cursor returned in `next_cursor` of a previous response.").action(async (opts) => {
+import { Command as Command53 } from "commander";
+var todoListCommand = new Command53("ls").description("List todos with filters").option("-p, --project <value>", "Filter by project. Required. Unknown, cross-organization, or soft-deleted project ids return NOT_FOUND.").option("--user-id <value>", "user_id").option("--parent-id <value>", "parent_id").option("-s, --status <value>", "status").option("--include-deleted <value>", "include_deleted").option("--include-templates <value>", "include_templates").option("--due-after <value>", "due_after").option("--due-before <value>", "due_before").option("--type-id <value>", "type_id").option("--sort-by <value>", "sort_by").option("--order <value>", "order").option("--include-orphan-fields <value>", "include_orphan_fields").option("--limit <value>", "Max todos to return. Clamped to [1, 200]. Default 50 server-side.").option("--cursor <value>", "Opaque pagination cursor returned in `next_cursor` of a previous response.").action(async (opts) => {
   const client2 = await loadSdkClient();
   const result = await todoList({
     client: client2._rawClient,
@@ -3290,8 +3519,8 @@ var todoListCommand = new Command46("ls").description("List todos with filters")
 });
 
 // src/generated/cli/todo/type/ls.ts
-import { Command as Command47 } from "commander";
-var todoTypeListCommand = new Command47("ls").description("List todo types").option("--project-id <value>", "Project id filter. Required. Unknown, cross-organization, or soft-deleted project ids return NOT_FOUND.").option("--user-id <value>", "user_id").option("--include-deleted <value>", "include_deleted").action(async (opts) => {
+import { Command as Command54 } from "commander";
+var todoTypeListCommand = new Command54("ls").description("List todo types").option("--project-id <value>", "Project id filter. Required. Unknown, cross-organization, or soft-deleted project ids return NOT_FOUND.").option("--user-id <value>", "user_id").option("--include-deleted <value>", "include_deleted").action(async (opts) => {
   const client2 = await loadSdkClient();
   const result = await todoTypeList({
     client: client2._rawClient,
@@ -3313,8 +3542,8 @@ var todoTypeListCommand = new Command47("ls").description("List todo types").opt
 });
 
 // src/generated/cli/todo/comment/rm.ts
-import { Command as Command48 } from "commander";
-var todoCommentDeleteCommand = new Command48("rm").description("Soft-delete a comment").argument("<id>", "id").action(async (id, opts) => {
+import { Command as Command55 } from "commander";
+var todoCommentDeleteCommand = new Command55("rm").description("Soft-delete a comment").argument("<id>", "id").action(async (id, opts) => {
   const client2 = await loadSdkClient();
   const result = await todoCommentDelete({
     client: client2._rawClient,
@@ -3334,8 +3563,8 @@ var todoCommentDeleteCommand = new Command48("rm").description("Soft-delete a co
 });
 
 // src/generated/cli/todo/comment/edit.ts
-import { Command as Command49 } from "commander";
-var todoCommentUpdateCommand = new Command49("edit").description("Edit a comment").argument("<id>", "id").argument("<content>", "content").action(async (id, content, opts) => {
+import { Command as Command56 } from "commander";
+var todoCommentUpdateCommand = new Command56("edit").description("Edit a comment").argument("<id>", "id").argument("<content>", "content").action(async (id, content, opts) => {
   const client2 = await loadSdkClient();
   const result = await todoCommentUpdate({
     client: client2._rawClient,
@@ -3358,8 +3587,8 @@ var todoCommentUpdateCommand = new Command49("edit").description("Edit a comment
 });
 
 // src/generated/cli/todo/rule/rm.ts
-import { Command as Command50 } from "commander";
-var recurrenceRuleDeleteCommand = new Command50("rm").description("Delete a recurring todo rule").argument("<id>", "id").option("--expected-version <value>", "expected_version").action(async (id, opts) => {
+import { Command as Command57 } from "commander";
+var recurrenceRuleDeleteCommand = new Command57("rm").description("Delete a recurring todo rule").argument("<id>", "id").option("--expected-version <value>", "expected_version").action(async (id, opts) => {
   const client2 = await loadSdkClient();
   const result = await recurrenceRuleDelete({
     client: client2._rawClient,
@@ -3382,8 +3611,8 @@ var recurrenceRuleDeleteCommand = new Command50("rm").description("Delete a recu
 });
 
 // src/generated/cli/todo/rule/show.ts
-import { Command as Command51 } from "commander";
-var recurrenceRuleGetCommand = new Command51("show").description("Get a recurring todo rule").argument("<id>", "id").action(async (id, opts) => {
+import { Command as Command58 } from "commander";
+var recurrenceRuleGetCommand = new Command58("show").description("Get a recurring todo rule").argument("<id>", "id").action(async (id, opts) => {
   const client2 = await loadSdkClient();
   const result = await recurrenceRuleGet({
     client: client2._rawClient,
@@ -3403,8 +3632,8 @@ var recurrenceRuleGetCommand = new Command51("show").description("Get a recurrin
 });
 
 // src/generated/cli/todo/rm.ts
-import { Command as Command52 } from "commander";
-var todoDeleteCommand = new Command52("rm").description("Soft-delete a todo").argument("<id>", "id").option("--expected-version <value>", "expected_version").option("--cascade <value>", "cascade").action(async (id, opts) => {
+import { Command as Command59 } from "commander";
+var todoDeleteCommand = new Command59("rm").description("Soft-delete a todo").argument("<id>", "id").option("--expected-version <value>", "expected_version").option("--cascade <value>", "cascade").action(async (id, opts) => {
   const client2 = await loadSdkClient();
   const result = await todoDelete({
     client: client2._rawClient,
@@ -3428,8 +3657,8 @@ var todoDeleteCommand = new Command52("rm").description("Soft-delete a todo").ar
 });
 
 // src/generated/cli/todo/show.ts
-import { Command as Command53 } from "commander";
-var todoGetCommand = new Command53("show").description("Get a todo by id").argument("<id>", "id").option("--include-deleted <value>", "include_deleted").option("--include-orphan-fields <value>", "include_orphan_fields").action(async (id, opts) => {
+import { Command as Command60 } from "commander";
+var todoGetCommand = new Command60("show").description("Get a todo by id").argument("<id>", "id").option("--include-deleted <value>", "include_deleted").option("--include-orphan-fields <value>", "include_orphan_fields").action(async (id, opts) => {
   const client2 = await loadSdkClient();
   const result = await todoGet({
     client: client2._rawClient,
@@ -3454,8 +3683,8 @@ var todoGetCommand = new Command53("show").description("Get a todo by id").argum
 });
 
 // src/generated/cli/todo/update.ts
-import { Command as Command54 } from "commander";
-var todoUpdateCommand = new Command54("update").description("Update a todo").argument("<id>", "id").option("--expected-version <value>", "expected_version").option("--title <value>", "New title. Omit to leave the existing title unchanged. Must be non-empty when supplied.").option("--description <value>", 'New description. Markdown formatted (CommonMark + GFM tables, strikethrough, task lists). Pass empty string `""` explicitly to clear an existing description, or omit to leave unchanged. Passing `null` is strictly rejected.').option("--parent-id <value>", "Re-parent the todo. Pass a valid parent ID to attach under another todo, pass `null` to move it back to the root level, or omit to leave unchanged. Nesting is limited to one level; attempting to set a child todo as a parent will trigger `PARENT_IS_CHILD`.").option("--status <value>", "New status of the todo. Allowed transitions: `open` \u2794 `in_progress` \u2794 `done`. `cancelled` represents a terminal state. Transitioning to `done` automatically emits a `captureTodoCompleted` analytics event. Omit to leave the existing status unchanged.").option("--due-at <value>", 'Update calendar due date in ISO date-only format (`YYYY-MM-DD`). Pass `""` explicitly to clear an existing due date, or omit to leave it unchanged. Passing `null` is strictly rejected.').option("--type-id <value>", "Re-assign this todo to a different active type. The new type must belong to the todo's same project; otherwise the request fails with TYPE_PROJECT_MISMATCH. New server-generated type ids use typ_<ULID>; legacy ids remain accepted.").option("--custom-fields <value>", "PATCH semantics: only the keys present in this map change. Pass `null` for a key (e.g. `custom_fields: { priority: null }`) to explicitly delete that custom field value. Array values are replaced wholesale with no element-level diff. Providing a key that is not declared on the effective todo type is rejected with `UNDECLARED_FIELD`.").option("--user-id <value>", "Reassign the owner (assignee) user ID of this todo. Target user must belong to the same organization.").action(async (id, opts) => {
+import { Command as Command61 } from "commander";
+var todoUpdateCommand = new Command61("update").description("Update a todo").argument("<id>", "id").option("--expected-version <value>", "expected_version").option("--title <value>", "New title. Omit to leave the existing title unchanged. Must be non-empty when supplied.").option("--description <value>", 'New description. Markdown formatted (CommonMark + GFM tables, strikethrough, task lists). Pass empty string `""` explicitly to clear an existing description, or omit to leave unchanged. Passing `null` is strictly rejected.').option("--parent-id <value>", "Re-parent the todo. Pass a valid parent ID to attach under another todo, pass `null` to move it back to the root level, or omit to leave unchanged. Nesting is limited to one level; attempting to set a child todo as a parent will trigger `PARENT_IS_CHILD`.").option("--status <value>", "New status of the todo. Allowed transitions: `open` \u2794 `in_progress` \u2794 `done`. `cancelled` represents a terminal state. Transitioning to `done` automatically emits a `captureTodoCompleted` analytics event. Omit to leave the existing status unchanged.").option("--due-at <value>", 'Update calendar due date in ISO date-only format (`YYYY-MM-DD`). Pass `""` explicitly to clear an existing due date, or omit to leave it unchanged. Passing `null` is strictly rejected.').option("--type-id <value>", "Re-assign this todo to a different active type. The new type must belong to the todo's same project; otherwise the request fails with TYPE_PROJECT_MISMATCH. New server-generated type ids use typ_<ULID>; legacy ids remain accepted.").option("--custom-fields <value>", "PATCH semantics: only the keys present in this map change. Pass `null` for a key (e.g. `custom_fields: { priority: null }`) to explicitly delete that custom field value. Array values are replaced wholesale with no element-level diff. Providing a key that is not declared on the effective todo type is rejected with `UNDECLARED_FIELD`.").option("--user-id <value>", "Reassign the owner (assignee) user ID of this todo. Target user must belong to the same organization.").action(async (id, opts) => {
   const client2 = await loadSdkClient();
   const result = await todoUpdate({
     client: client2._rawClient,
@@ -3514,6 +3743,17 @@ function registerGeneratedCommands(root) {
   root_event.addCommand(eventGetCommand);
   root_event.addCommand(eventUpdateCommand);
   root_event.addCommand(eventIcsDownloadCommand);
+  const root_drive = root.command("drive").description("drive commands");
+  const root_drive_library = root_drive.command("library").description("library commands");
+  root_drive_library.addCommand(driveLibraryCreateCommand);
+  root_drive_library.addCommand(driveLibraryListCommand);
+  root_drive_library.addCommand(driveLibraryDeleteCommand);
+  root_drive_library.addCommand(driveLibraryGetCommand);
+  root_drive_library.addCommand(driveLibraryUpdateCommand);
+  const root_drive_file = root_drive.command("file").description("file commands");
+  root_drive_file.addCommand(driveFileDeleteCommand);
+  const root_drive_manifest = root_drive.command("manifest").description("manifest commands");
+  root_drive_manifest.addCommand(driveManifestGetCommand);
   const root_alias = root.command("alias").description("alias commands");
   root_alias.addCommand(emailAliasCreateCommand);
   root_alias.addCommand(emailAliasListCommand);
@@ -3560,7 +3800,7 @@ function registerGeneratedCommands(root) {
 }
 
 // src/handwritten/commands/login.ts
-import { Command as Command55 } from "commander";
+import { Command as Command62 } from "commander";
 
 // src/handwritten/auth/device-flow.ts
 var DEFAULT_SLEEP = (ms) => new Promise((r) => setTimeout(r, ms));
@@ -3794,7 +4034,7 @@ function resolveLoginTarget(opts, env) {
 function wantsJson(opts, env) {
   return opts.json === true || env.WSPC_OUTPUT === "json";
 }
-var loginCommand = new Command55("login").description("Log in via OAuth device flow (default) or API key").option("--api-key <key>", "Log in with a wspc API key (escape hatch)").option("--api-base <url>", "Target API base URL (default: production)").option("--env <name>", "Config env name to store credentials under").option("--json", "Emit machine-readable events to stdout").action(async (opts) => {
+var loginCommand = new Command62("login").description("Log in via OAuth device flow (default) or API key").option("--api-key <key>", "Log in with a wspc API key (escape hatch)").option("--api-base <url>", "Target API base URL (default: production)").option("--env <name>", "Config env name to store credentials under").option("--json", "Emit machine-readable events to stdout").action(async (opts) => {
   const store = new ConfigStore();
   const { baseUrl, envName } = resolveLoginTarget(opts, process.env);
   const output = wantsJson(opts, process.env) ? { write: () => {
@@ -3813,7 +4053,7 @@ var loginCommand = new Command55("login").description("Log in via OAuth device f
 });
 
 // src/handwritten/commands/logout.ts
-import { Command as Command56 } from "commander";
+import { Command as Command63 } from "commander";
 
 // src/handwritten/auth/logout.ts
 async function runLogout(opts) {
@@ -3841,7 +4081,7 @@ async function runLogout(opts) {
 }
 
 // src/handwritten/commands/logout.ts
-var logoutCommand = new Command56("logout").description("Log out an account (default: the active account in the current env)").argument("[email]", "Email of the account to log out").option("--all", "Log out every account in the current env").action(async (email, opts) => {
+var logoutCommand = new Command63("logout").description("Log out an account (default: the active account in the current env)").argument("[email]", "Email of the account to log out").option("--all", "Log out every account in the current env").action(async (email, opts) => {
   const res = await runLogout({ store: new ConfigStore(), email, all: opts.all });
   if (res.removed.length === 0) {
     process.stdout.write("nothing to log out\n");
@@ -3854,7 +4094,7 @@ var logoutCommand = new Command56("logout").description("Log out an account (def
 });
 
 // src/handwritten/commands/whoami.ts
-import { Command as Command57 } from "commander";
+import { Command as Command64 } from "commander";
 var ENV_DISPLAY = {
   shape: "object",
   fields: ["name", "api_base", "account", "actor", "agent_label"]
@@ -3886,7 +4126,7 @@ async function backfillActiveEmail(store, envName, email, userId) {
     await store.write(cfg);
   }
 }
-var whoamiCommand = new Command57("whoami").description("Show the active env, signed-in account, and organization").action(async () => {
+var whoamiCommand = new Command64("whoami").description("Show the active env, signed-in account, and organization").action(async () => {
   const store = new ConfigStore();
   const config = await store.read();
   let resolved;
@@ -3939,8 +4179,8 @@ function printLoggedOut() {
 }
 
 // src/handwritten/commands/config.ts
-import { Command as Command58 } from "commander";
-var configCommand = new Command58("config").description("Manage wspc local config");
+import { Command as Command65 } from "commander";
+var configCommand = new Command65("config").description("Manage wspc local config");
 registerRenderer("config_show", (data) => {
   const d = data;
   if (d.envs.length === 0) {
@@ -4011,7 +4251,7 @@ configCommand.command("use <env>").description("Switch current_env").action(asyn
 });
 
 // src/handwritten/commands/account.ts
-import { Command as Command59 } from "commander";
+import { Command as Command66 } from "commander";
 async function listAccounts(store) {
   const c = await store.read();
   const envName = c.current_env;
@@ -4052,7 +4292,7 @@ registerRenderer("account_ls", (data) => {
   ]);
   process.stdout.write(table(headers, body));
 });
-var accountCommand = new Command59("account").description("Manage logged-in accounts");
+var accountCommand = new Command66("account").description("Manage logged-in accounts");
 accountCommand.command("ls").description("List accounts in the current env (active marked with \u2713)").action(async () => {
   const accounts = await listAccounts(new ConfigStore());
   render({ kind: "account_ls" }, { accounts });
@@ -4064,7 +4304,7 @@ accountCommand.command("switch <email>").description("Set the active account for
 });
 
 // src/handwritten/commands/todo-done.ts
-import { Command as Command60 } from "commander";
+import { Command as Command67 } from "commander";
 var TODO_UPDATE_DISPLAY = {
   shape: "object",
   format: {
@@ -4082,7 +4322,7 @@ var TODO_UPDATE_DISPLAY = {
     deleted_at: "relative-time"
   }
 };
-var todoDoneCommand = new Command60("done").description("Mark a todo done (sugar for `update <id> --status done`)").argument("<id>", "Todo id").action(async (id) => {
+var todoDoneCommand = new Command67("done").description("Mark a todo done (sugar for `update <id> --status done`)").argument("<id>", "Todo id").action(async (id) => {
   const client2 = await loadSdkClient();
   const result = await todoUpdate({
     client: client2._rawClient,
@@ -4101,7 +4341,7 @@ var todoDoneCommand = new Command60("done").description("Mark a todo done (sugar
 });
 
 // src/handwritten/commands/email/send.ts
-import { Command as Command61 } from "commander";
+import { Command as Command68 } from "commander";
 import { readFile, stat } from "fs/promises";
 import { basename } from "path";
 
@@ -4159,7 +4399,7 @@ async function resolveAttachment(input) {
     `--attach ${input}: neither a readable file nor a valid <prefix>_<ulid>:<idx> reference.`
   );
 }
-var sendCommand = new Command61("send").description("Send an outbound email").requiredOption("--from <alias-email>", "alias email to send from").option("--to <addr...>", "recipient address (repeatable)", []).option("--subject <text>", "subject").option("--text <body>", "plain-text body").option("--text-file <path>", "read text body from file").option("--reply <id>", "inbound email id to reply to").option("--attach <path-or-ref...>", "attachment (file path or eml_xxx:idx)", []).requiredOption("--idempotency-key <key>", "idempotency key").action(async (opts) => {
+var sendCommand = new Command68("send").description("Send an outbound email").requiredOption("--from <alias-email>", "alias email to send from").option("--to <addr...>", "recipient address (repeatable)", []).option("--subject <text>", "subject").option("--text <body>", "plain-text body").option("--text-file <path>", "read text body from file").option("--reply <id>", "inbound email id to reply to").option("--attach <path-or-ref...>", "attachment (file path or eml_xxx:idx)", []).requiredOption("--idempotency-key <key>", "idempotency key").action(async (opts) => {
   const isReply = Boolean(opts.reply);
   const to = opts.to;
   const attachInputs = opts.attach;
@@ -4246,7 +4486,7 @@ var sendCommand = new Command61("send").description("Send an outbound email").re
 });
 
 // src/handwritten/commands/email/attachment.ts
-import { Command as Command62 } from "commander";
+import { Command as Command69 } from "commander";
 import { createWriteStream } from "fs";
 import { Readable } from "stream";
 import { pipeline } from "stream/promises";
@@ -4263,7 +4503,7 @@ function parseContentDispositionFilename(header) {
 }
 
 // src/handwritten/commands/email/attachment.ts
-var attachmentCommand = new Command62("attachment").description("Download an inbound email attachment by index").argument("<email-id>").argument("<idx>").option("--output <path>", "output file path").option("--include-deleted", "allow downloads from soft-deleted parent emails").action(async (emailId, idxArg, opts) => {
+var attachmentCommand = new Command69("attachment").description("Download an inbound email attachment by index").argument("<email-id>").argument("<idx>").option("--output <path>", "output file path").option("--include-deleted", "allow downloads from soft-deleted parent emails").action(async (emailId, idxArg, opts) => {
   const idx = Number(idxArg);
   if (!Number.isInteger(idx) || idx < 0) {
     process.stderr.write(`<idx> must be a non-negative integer (got "${idxArg}")
@@ -4295,7 +4535,7 @@ var attachmentCommand = new Command62("attachment").description("Download an inb
 });
 
 // src/handwritten/commands/drive/bind.ts
-import { Command as Command63 } from "commander";
+import { Command as Command70 } from "commander";
 import { stat as stat2 } from "fs/promises";
 import { resolve } from "path";
 
@@ -4367,9 +4607,12 @@ async function createDriveApi(opts = {}) {
       }
       return payload;
     },
-    async downloadFile(id, path) {
+    async downloadFile(id, path, versionId) {
       const url = driveContentUrl(client2.baseUrl, id);
       url.searchParams.set("path", path);
+      if (versionId !== void 0) {
+        url.searchParams.set("version_id", versionId);
+      }
       const res = await client2.fetch(url, { method: "GET" });
       if (!res.ok) {
         const text = await res.text();
@@ -4384,11 +4627,34 @@ async function createDriveApi(opts = {}) {
 import { mkdir, open, readFile as readFile2, rename, rm, writeFile } from "fs/promises";
 import { randomUUID } from "crypto";
 import { join as join2 } from "path";
-var DRIVE_DIR = ".wspc-drive";
-var STATE_FILE = "state.json";
-function statePath(root) {
-  return join2(root, DRIVE_DIR, STATE_FILE);
-}
+import { DateTime as DateTime4 } from "luxon";
+
+// src/handwritten/commands/drive/clock.ts
+import { DateTime as DateTime3 } from "luxon";
+var systemDriveClock = {
+  now: () => DateTime3.utc()
+};
+function driveIsoTimestamp(clock = systemDriveClock) {
+  const timestamp = clock.now().toISO();
+  if (timestamp === null) {
+    throw new Error("invalid drive clock timestamp");
+  }
+  return timestamp;
+}
+function driveConflictTimestamp(clock = systemDriveClock) {
+  const timestamp = clock.now().toUTC();
+  if (!timestamp.isValid) {
+    throw new Error("invalid drive clock timestamp");
+  }
+  return timestamp.toFormat("yyyyLLdd'T'HHmmss'Z'");
+}
+
+// src/handwritten/commands/drive/state.ts
+var DRIVE_DIR = ".wspc-drive";
+var STATE_FILE = "state.json";
+function statePath(root) {
+  return join2(root, DRIVE_DIR, STATE_FILE);
+}
 async function readDriveState(root) {
   const buf = await readFile2(statePath(root), "utf8");
   const parsed = JSON.parse(buf);
@@ -4397,13 +4663,13 @@ async function readDriveState(root) {
   }
   return parsed;
 }
-async function writeDriveState(root, state) {
+async function writeDriveState(root, state, clock) {
   await mkdir(join2(root, DRIVE_DIR), { recursive: true });
   const tmp = join2(root, DRIVE_DIR, `state.json.tmp-${process.pid}-${randomUUID()}`);
   const snapshot = JSON.stringify(
     {
       ...state,
-      updated_at: (/* @__PURE__ */ new Date()).toISOString()
+      updated_at: driveIsoTimestamp(clock)
     },
     null,
     2
@@ -4422,7 +4688,7 @@ async function writeDriveState(root, state) {
     await rm(tmp, { force: true });
   }
 }
-async function initDriveState(root, libraryId) {
+async function initDriveState(root, libraryId, clock) {
   await mkdir(join2(root, DRIVE_DIR), { recursive: true });
   try {
     const existing = await readDriveState(root);
@@ -4433,7 +4699,7 @@ async function initDriveState(root, libraryId) {
   } catch (err) {
     if (err.code !== "ENOENT") throw err;
   }
-  const now = (/* @__PURE__ */ new Date()).toISOString();
+  const now = driveIsoTimestamp(clock);
   const state = {
     schema_version: 1,
     library_id: libraryId,
@@ -4442,9 +4708,32 @@ async function initDriveState(root, libraryId) {
     entries: {},
     conflicts: {}
   };
-  await writeDriveState(root, state);
+  await writeDriveState(root, state, clock);
   return state;
 }
+async function ensureDriveRealtimeState(root) {
+  return withDriveLock(root, async () => {
+    const state = await readDriveState(root);
+    if (state.realtime?.client_id !== void 0) {
+      return state;
+    }
+    const next = {
+      ...state,
+      realtime: {
+        ...state.realtime,
+        client_id: `drvcli_${randomUUID().replace(/-/g, "")}`
+      }
+    };
+    await writeDriveState(root, next);
+    return next;
+  });
+}
+async function writeDriveRealtimeState(root, realtime) {
+  await withDriveLock(root, async () => {
+    const current = await readDriveState(root);
+    await writeDriveState(root, { ...current, realtime });
+  });
+}
 async function withDriveLock(root, fn) {
   await mkdir(join2(root, DRIVE_DIR), { recursive: true });
   const lockFile = join2(root, DRIVE_DIR, "sync.lock");
@@ -4463,18 +4752,28 @@ async function withDriveLock(root, fn) {
     });
   }
 }
-function isRecord(value) {
+function isRecord2(value) {
   return typeof value === "object" && value !== null && !Array.isArray(value);
 }
 function isDriveStateEntry(value) {
-  return isRecord(value) && typeof value.entry_id === "string" && typeof value.entry_version === "number" && typeof value.size_bytes === "number" && typeof value.last_synced_at === "string" && value.status === "synced" && (value.current_version_id === void 0 || typeof value.current_version_id === "string") && (value.content_sha256 === void 0 || typeof value.content_sha256 === "string") && (value.last_local_sha256 === void 0 || typeof value.last_local_sha256 === "string");
+  return isRecord2(value) && typeof value.entry_id === "string" && typeof value.entry_version === "number" && typeof value.size_bytes === "number" && typeof value.last_synced_at === "string" && value.status === "synced" && (value.current_version_id === void 0 || typeof value.current_version_id === "string") && (value.content_sha256 === void 0 || typeof value.content_sha256 === "string") && (value.last_local_sha256 === void 0 || typeof value.last_local_sha256 === "string");
 }
 function isDriveConflict(value) {
-  return isRecord(value) && typeof value.detected_at === "string" && typeof value.reason === "string" && (value.remote_entry_version === void 0 || typeof value.remote_entry_version === "number") && (value.remote_version_id === void 0 || typeof value.remote_version_id === "string");
+  return isRecord2(value) && typeof value.detected_at === "string" && typeof value.reason === "string" && (value.type === void 0 || value.type === "edit_edit" || value.type === "create_create" || value.type === "delete_edit" || value.type === "edit_delete") && (value.strategy === void 0 || value.strategy === "clean_merge" || value.strategy === "conflict_copy" || value.strategy === "record_only") && (value.base_version_id === void 0 || typeof value.base_version_id === "string") && (value.remote_entry_version === void 0 || typeof value.remote_entry_version === "number") && (value.remote_version_id === void 0 || typeof value.remote_version_id === "string") && (value.conflict_paths === void 0 || Array.isArray(value.conflict_paths) && value.conflict_paths.every((path) => typeof path === "string"));
+}
+function isDriveRealtimeState(value) {
+  const allowedKeys = /* @__PURE__ */ new Set(["client_id", "last_cursor", "last_connected_at", "last_event_at"]);
+  return isRecord2(value) && Object.keys(value).every((key) => allowedKeys.has(key)) && (value.client_id === void 0 || typeof value.client_id === "string" && /^drvcli_[A-Za-z0-9_-]+$/.test(value.client_id)) && (value.last_cursor === void 0 || typeof value.last_cursor === "string") && isOptionalIsoTimestamp(value.last_connected_at) && isOptionalIsoTimestamp(value.last_event_at);
+}
+function isOptionalIsoTimestamp(value) {
+  if (value === void 0) return true;
+  if (typeof value !== "string") return false;
+  if (!/T.*(?:Z|[+-]\d{2}:\d{2})$/.test(value)) return false;
+  return DateTime4.fromISO(value, { setZone: true }).isValid;
 }
 function isValidDriveState(value) {
-  if (!isRecord(value)) return false;
-  if (value.schema_version !== 1 || typeof value.library_id !== "string" || typeof value.created_at !== "string" || typeof value.updated_at !== "string" || !isRecord(value.entries) || !isRecord(value.conflicts)) {
+  if (!isRecord2(value)) return false;
+  if (value.schema_version !== 1 || typeof value.library_id !== "string" || typeof value.created_at !== "string" || typeof value.updated_at !== "string" || !isRecord2(value.entries) || !isRecord2(value.conflicts) || value.realtime !== void 0 && !isDriveRealtimeState(value.realtime)) {
     return false;
   }
   for (const entry of Object.values(value.entries)) {
@@ -4499,7 +4798,7 @@ async function assertExistingDirectory(path) {
   }
 }
 function driveBindCommand() {
-  return new Command63("bind").description("Bind a local folder to an existing Drive library").requiredOption("--library <id>", "existing Drive library id").argument("[path]", "local folder path", ".").action(async (path, opts) => {
+  return new Command70("bind").description("Bind a local folder to an existing Drive library").requiredOption("--library <id>", "existing Drive library id").argument("[path]", "local folder path", ".").action(async (path, opts) => {
     const root = resolve(path);
     await assertExistingDirectory(root);
     const api = await createDriveApi();
@@ -4517,13 +4816,10 @@ function driveBindCommand() {
 }
 
 // src/handwritten/commands/drive/sync.ts
-import { Command as Command64 } from "commander";
-import { createWriteStream as createWriteStream2 } from "fs";
-import { link, mkdir as mkdir2, readFile as readFile3, rename as rename2, rm as rm2, unlink } from "fs/promises";
-import { basename as basename2, dirname, join as join4, resolve as resolve3 } from "path";
-import { createHash as createHash2, randomUUID as randomUUID2 } from "crypto";
-import { Readable as Readable2, Transform } from "stream";
-import { pipeline as pipeline2 } from "stream/promises";
+import { Command as Command71 } from "commander";
+import { mkdir as mkdir3, readFile as readFile4, rm as rm3, writeFile as writeFile3 } from "fs/promises";
+import { basename as basename3, dirname as dirname2, join as join5, posix as pathPosix2, resolve as resolve3 } from "path";
+import { createHash as createHash3, randomUUID as randomUUID3 } from "crypto";
 
 // src/handwritten/commands/drive/decision.ts
 function decideDriveAction(entry, local, remote) {
@@ -4645,6 +4941,141 @@ function resolveInsideRoot(root, drivePath) {
   return absolutePath;
 }
 
+// src/handwritten/commands/drive/manifest.ts
+function normalizeRemoteManifest(root, entries) {
+  const candidates = [];
+  const remoteFiles = {};
+  const pathErrors = [];
+  for (const entry of entries) {
+    try {
+      validateDrivePath(entry.path);
+      resolveInsideRoot(root, entry.path);
+      candidates.push(entry);
+    } catch (error) {
+      pathErrors.push({ path: entry.path, error: error instanceof Error ? error : new Error(String(error)) });
+    }
+  }
+  const byCaseFoldedPath = /* @__PURE__ */ new Map();
+  for (const entry of candidates) {
+    const folded = entry.path.toLowerCase();
+    const group = byCaseFoldedPath.get(folded) ?? [];
+    group.push(entry);
+    byCaseFoldedPath.set(folded, group);
+  }
+  for (const group of byCaseFoldedPath.values()) {
+    if (group.length > 1) {
+      const hasExactDuplicate = new Set(group.map((entry2) => entry2.path)).size < group.length;
+      const reason = hasExactDuplicate ? "REMOTE_PATH_DUPLICATE" : "REMOTE_PATH_CASE_CONFLICT";
+      for (const entry2 of group.sort((left, right) => left.path.localeCompare(right.path))) {
+        pathErrors.push({
+          path: entry2.path,
+          error: new Error(`${reason}: ${entry2.path}`),
+          appendPathResult: true
+        });
+      }
+      continue;
+    }
+    const [entry] = group;
+    if (entry) remoteFiles[entry.path] = entry;
+  }
+  return { remoteFiles, pathErrors };
+}
+
+// src/handwritten/commands/drive/merge.ts
+import { posix as pathPosix } from "path";
+import { TextDecoder } from "util";
+import { diff3Merge } from "node-diff3";
+var MAX_MERGE_TEXT_BYTES = 1024 * 1024;
+var SNIFF_BYTES = 8192;
+var TEXT_EXTENSIONS = /* @__PURE__ */ new Set([
+  ".txt",
+  ".md",
+  ".markdown",
+  ".json",
+  ".yaml",
+  ".yml",
+  ".csv",
+  ".tsv",
+  ".html",
+  ".htm",
+  ".css",
+  ".js",
+  ".jsx",
+  ".ts",
+  ".tsx",
+  ".xml",
+  ".svg"
+]);
+var UTF8_DECODER = new TextDecoder("utf-8", { fatal: true });
+function classifyMergeText(path, bytes, mimeType) {
+  if (bytes.byteLength > MAX_MERGE_TEXT_BYTES) {
+    return { mergeable: false, reason: "too_large" };
+  }
+  if (hasBinaryControlBytes(bytes)) {
+    return { mergeable: false, reason: "binary" };
+  }
+  let text;
+  try {
+    text = UTF8_DECODER.decode(bytes);
+  } catch {
+    return { mergeable: false, reason: "invalid_utf8" };
+  }
+  if (!hasTextHint(path, mimeType)) {
+    return { mergeable: false, reason: "not_text" };
+  }
+  return { mergeable: true, text };
+}
+function mergeText3(base, local, remote) {
+  const localNewline = local.includes("\r\n") ? "\r\n" : "\n";
+  const regions = diff3Merge(normalizeLines(local), normalizeLines(base), normalizeLines(remote));
+  const mergedLines = [];
+  for (const region of regions) {
+    if (region.conflict !== void 0) {
+      return { clean: false };
+    }
+    if (region.ok !== void 0) {
+      mergedLines.push(...region.ok);
+    }
+  }
+  return { clean: true, text: mergedLines.join(localNewline) };
+}
+function conflictCopyPath(path, side, timestamp, versionId) {
+  const parsed = pathPosix.parse(path);
+  const shortVersionId = safeShortVersionId(versionId);
+  const fileName = `${parsed.name}.${side}-conflict-${timestamp}-${shortVersionId}${parsed.ext}`;
+  if (parsed.dir === "") {
+    return fileName;
+  }
+  return pathPosix.join(parsed.dir, fileName);
+}
+function hasBinaryControlBytes(bytes) {
+  const sniffLength = Math.min(bytes.byteLength, SNIFF_BYTES);
+  for (let index = 0; index < sniffLength; index += 1) {
+    const byte = bytes[index];
+    if (byte === void 0) {
+      continue;
+    }
+    if (byte === 0) {
+      return true;
+    }
+    if (byte < 32 && byte !== 9 && byte !== 10 && byte !== 13) {
+      return true;
+    }
+  }
+  return false;
+}
+function hasTextHint(path, mimeType) {
+  const extension = pathPosix.extname(path).toLowerCase();
+  return TEXT_EXTENSIONS.has(extension) || mimeType?.toLowerCase().startsWith("text/") === true;
+}
+function normalizeLines(text) {
+  return text.replace(/\r\n/g, "\n").replace(/\r/g, "\n").split("\n");
+}
+function safeShortVersionId(versionId) {
+  const safeVersionId = versionId.replace(/[^A-Za-z0-9_-]/g, "_");
+  return (safeVersionId.length > 0 ? safeVersionId : "unknown").slice(0, 8);
+}
+
 // src/handwritten/commands/drive/scanner.ts
 import { createHash } from "crypto";
 import { constants as fsConstants } from "fs";
@@ -4722,7 +5153,7 @@ async function scanDriveFiles(root, options = {}) {
 }
 function isInternalSyncArtifactName(name) {
   if (!name.startsWith(".") || !name.endsWith(".tmp")) return false;
-  return name.includes(".wspc-download-") || name.includes(".wspc-backup-");
+  return name.includes(".wspc-download-") || name.includes(".wspc-backup-") || name.includes(".wspc-conflict-") || name.includes(".wspc-merge-");
 }
 async function hashDriveFile(path) {
   const useNoFollow = fsConstants.O_NOFOLLOW !== void 0;
@@ -4765,236 +5196,128 @@ async function hashDriveFile(path) {
   }
 }
 
-// src/handwritten/commands/drive/sync.ts
-function emptySummary() {
-  return {
-    uploaded: 0,
-    downloaded: 0,
-    deleted: 0,
-    unchanged: 0,
-    conflicts: 0,
-    errors: 0,
-    paths: []
-  };
-}
-async function runDriveSyncOnce(root, api) {
-  return withDriveLock(root, async () => {
-    let state = await readDriveState(root);
-    const syncApi = api ?? await createDriveApi();
-    const summary = emptySummary();
-    const blockedPaths = /* @__PURE__ */ new Set();
-    const localFiles = await scanDriveFiles(root, {
-      onPathError: async (path, error) => {
-        await recordPathError(summary, blockedPaths, path, error);
-      }
-    });
-    const remoteFiles = await fetchRemoteManifest(root, state, syncApi, summary, blockedPaths);
-    const paths = Array.from(
-      /* @__PURE__ */ new Set([...Object.keys(localFiles), ...Object.keys(remoteFiles), ...Object.keys(state.entries)])
-    ).filter((path) => !blockedPaths.has(path)).sort((left, right) => left.localeCompare(right));
-    for (const path of paths) {
-      const remote = remoteFiles[path];
-      const action = decideDriveAction(state.entries[path], localFiles[path], remote);
-      const result = await processPath({ root, state, api: syncApi, path, action, remote, local: localFiles[path], summary });
-      state = result.state;
-      if (result.stop) break;
-    }
-    recordUnresolvedConflicts(summary, state);
-    return summary;
+// src/handwritten/commands/drive/local-mutations.ts
+import { createWriteStream as createWriteStream2 } from "fs";
+import { link, mkdir as mkdir2, readFile as readFile3, rename as rename2, rm as rm2, unlink, writeFile as writeFile2 } from "fs/promises";
+import { basename as basename2, dirname, join as join4 } from "path";
+import { createHash as createHash2, randomUUID as randomUUID2 } from "crypto";
+import { Readable as Readable2, Transform } from "stream";
+import { pipeline as pipeline2 } from "stream/promises";
+async function assertLocalStillScanned(localPath, scanned) {
+  const snapshot = await hashDriveFile(localPath).catch((error) => {
+    if (isNotFoundError(error)) return void 0;
+    throw error;
   });
+  if (!snapshot || snapshot.sha256 !== scanned.sha256 || snapshot.sizeBytes !== scanned.size_bytes) {
+    throw new Error("local file changed after scan");
+  }
 }
-function driveSyncCommand(api) {
-  const sync = new Command64("sync").description("Drive sync commands");
-  sync.command("once").description("Run one Drive sync pass").argument("[path]", "local folder path", ".").action(async (path) => {
-    const summary = await runDriveSyncOnce(resolve3(path), api);
-    render({ kind: "drive_sync_once", display: { shape: "object" } }, summary);
-    if (summary.conflicts > 0 || summary.errors > 0) {
-      process.exitCode = 1;
-    }
-  });
-  return sync;
+async function writeMergedLocalFile(root, path, bytes, digest, scanned, onLocalMutation) {
+  const target = resolveInsideRoot(root, path);
+  await mkdir2(dirname(target), { recursive: true });
+  const tmp = join4(dirname(target), `.${basename2(target)}.wspc-merge-${randomUUID2()}.tmp`);
+  try {
+    await writeFile2(tmp, bytes, { flag: "wx" });
+    return await installMergedLocalFile(root, path, tmp, scanned, digest, bytes.byteLength, onLocalMutation);
+  } finally {
+    await rm2(tmp, { force: true }).catch(() => {
+    });
+  }
 }
-async function fetchRemoteManifest(root, state, api, summary, blockedPaths) {
-  const candidates = [];
-  const remoteFiles = {};
-  let cursor;
-  do {
-    const page = await api.getManifest(state.library_id, cursor);
-    for (const entry of page.entries) {
-      try {
-        validateRemoteEntry(root, entry);
-        candidates.push(entry);
-      } catch (error) {
-        await recordPathError(summary, blockedPaths, entry.path, error);
+async function installMergedLocalFile(root, path, tmp, scanned, mergedSha256, mergedSizeBytes, onLocalMutation) {
+  const target = resolveInsideRoot(root, path);
+  const backup = localMutationBackupPath(target);
+  let backupIsScannedLocal = false;
+  try {
+    try {
+      await rename2(target, backup);
+      onLocalMutation();
+    } catch (error) {
+      if (isNotFoundError(error)) {
+        throw new Error("local file changed after scan");
       }
+      throw error;
     }
-    cursor = page.next_cursor ?? void 0;
-  } while (cursor !== void 0);
-  const byCaseFoldedPath = /* @__PURE__ */ new Map();
-  for (const entry of candidates) {
-    const folded = entry.path.toLowerCase();
-    const group = byCaseFoldedPath.get(folded) ?? [];
-    group.push(entry);
-    byCaseFoldedPath.set(folded, group);
-  }
-  for (const group of byCaseFoldedPath.values()) {
-    const exactPathCounts = /* @__PURE__ */ new Map();
-    for (const entry2 of group) {
-      exactPathCounts.set(entry2.path, (exactPathCounts.get(entry2.path) ?? 0) + 1);
+    const backupDigest = await hashDriveFile(backup);
+    if (!backupDigest || backupDigest.sha256 !== scanned.sha256 || backupDigest.sizeBytes !== scanned.size_bytes) {
+      await restoreBackupWhenPossible(backup, target);
+      throw new Error("local file changed after scan");
     }
-    if (group.length > 1) {
-      const hasExactDuplicate = Array.from(exactPathCounts.values()).some((count) => count > 1);
-      const reason = hasExactDuplicate ? "REMOTE_PATH_DUPLICATE" : "REMOTE_PATH_CASE_CONFLICT";
-      for (const entry2 of group.sort((left, right) => left.path.localeCompare(right.path))) {
-        await recordPathError(summary, blockedPaths, entry2.path, new Error(`${reason}: ${entry2.path}`), {
-          appendPathResult: true
+    backupIsScannedLocal = true;
+    try {
+      await installNoOverwrite(tmp, target);
+    } catch (error) {
+      await restoreBackupWhenPossible(backup, target);
+      throw error;
+    }
+    return {
+      finalize: async () => {
+        await rm2(backup, { force: true }).catch(() => {
         });
+      },
+      restore: async () => {
+        await restoreMergedLocalFile(target, backup, scanned.sha256, scanned.size_bytes, mergedSha256, mergedSizeBytes);
       }
-      continue;
+    };
+  } catch (error) {
+    if (!backupIsScannedLocal) {
+      await restoreBackupWhenPossible(backup, target);
     }
-    const [entry] = group;
-    if (entry) remoteFiles[entry.path] = entry;
+    throw error;
   }
-  return remoteFiles;
 }
-function validateRemoteEntry(root, entry) {
-  validateDrivePath(entry.path);
-  resolveInsideRoot(root, entry.path);
+async function restoreMergedLocalFile(target, backup, backupSha256, backupSizeBytes, mergedSha256, mergedSizeBytes) {
+  const quarantine = join4(dirname(target), `.${basename2(target)}.wspc-merge-restore-${randomUUID2()}.tmp`);
+  try {
+    await rename2(target, quarantine);
+  } catch (error) {
+    if (!isNotFoundError(error)) throw error;
+  }
+  const quarantineDigest = await hashDriveFile(quarantine).catch((error) => {
+    if (isNotFoundError(error)) return void 0;
+    throw error;
+  });
+  if (quarantineDigest !== void 0 && (quarantineDigest.sha256 !== mergedSha256 || quarantineDigest.sizeBytes !== mergedSizeBytes)) {
+    await restoreBackupWhenPossible(quarantine, target);
+    return;
+  }
+  const restored = await restoreBackupWhenPossible(backup, target);
+  if (!restored) {
+    await rm2(quarantine, { force: true }).catch(() => {
+    });
+    return;
+  }
+  await unlink(quarantine).catch(() => {
+  });
+  const restoredDigest = await hashDriveFile(target);
+  if (!restoredDigest || restoredDigest.sha256 !== backupSha256 || restoredDigest.sizeBytes !== backupSizeBytes) {
+    throw new Error("local file restore failed");
+  }
 }
-async function processPath(args) {
-  const { root, state, api, path, action, remote, local, summary } = args;
-  summary.paths.push({ path, action: action.type });
-  let durableStateRequired = false;
+async function downloadRemote(root, libraryId, path, api, expectedSha256, entry, onLocalMutation) {
+  const target = resolveInsideRoot(root, path);
+  await mkdir2(dirname(target), { recursive: true });
+  const tmp = join4(dirname(target), `.${basename2(target)}.wspc-download-${randomUUID2()}.tmp`);
   try {
-    if (action.type === "upload_create" || action.type === "upload_update") {
-      const localPath = resolveInsideRoot(root, path);
-      const { body, digest: uploadDigest } = await readStableUploadBody(localPath, local);
-      const uploaded = await api.uploadFile(state.library_id, path, body, uploadDigest, action.expectedEntryVersion);
-      durableStateRequired = true;
-      const nextState = cloneDriveState(state);
-      nextState.entries[path] = stateEntryFromRemote(uploaded.entry, uploadDigest);
-      delete nextState.conflicts[path];
-      await commitDriveState(root, nextState);
-      summary.uploaded += 1;
-      return { state: nextState, stop: false };
-    }
-    if (action.type === "download") {
-      if (!remote) throw new Error("remote entry missing for download");
-      await assertLocalSafeForDownload(root, path, state.entries[path]);
-      const digest = await downloadRemote(root, state.library_id, path, api, remote.content_sha256, state.entries[path], () => {
-        durableStateRequired = true;
-      });
-      const nextState = cloneDriveState(state);
-      nextState.entries[path] = stateEntryFromRemote(remote, digest);
-      delete nextState.conflicts[path];
-      await commitDriveState(root, nextState);
-      summary.downloaded += 1;
-      return { state: nextState, stop: false };
+    const response = await api.downloadFile(libraryId, path);
+    if (!response.body) {
+      throw new Error("download response body missing");
     }
-    if (action.type === "delete_remote") {
-      await assertLocalAbsentBeforeRemoteDelete(root, path);
-      await api.deleteFile(state.library_id, path, action.expectedEntryVersion);
-      durableStateRequired = true;
-      await assertLocalAbsentBeforeRemoteDelete(root, path);
-      const nextState = cloneDriveState(state);
-      delete nextState.entries[path];
-      delete nextState.conflicts[path];
-      await commitDriveState(root, nextState);
-      summary.deleted += 1;
-      return { state: nextState, stop: false };
-    }
-    if (action.type === "delete_local") {
-      await removeLocalIfStillBase(root, path, state.entries[path], () => {
-        durableStateRequired = true;
-      });
-      const nextState = cloneDriveState(state);
-      delete nextState.entries[path];
-      delete nextState.conflicts[path];
-      await commitDriveState(root, nextState);
-      summary.deleted += 1;
-      return { state: nextState, stop: false };
-    }
-    if (action.type === "state_only") {
-      if (!remote) throw new Error("remote entry missing for state update");
-      const nextState = cloneDriveState(state);
-      nextState.entries[path] = stateEntryFromRemote(remote, local?.sha256 ?? remote.content_sha256);
-      delete nextState.conflicts[path];
-      await commitDriveState(root, nextState);
-      summary.unchanged += 1;
-      return { state: nextState, stop: false };
-    }
-    if (action.type === "remove_state") {
-      const nextState = cloneDriveState(state);
-      delete nextState.entries[path];
-      delete nextState.conflicts[path];
-      await commitDriveState(root, nextState);
-      summary.unchanged += 1;
-      return { state: nextState, stop: false };
-    }
-    if (action.type === "conflict") {
-      const nextState = await recordConflict(root, state, path, action.reason, remote);
-      summary.conflicts += 1;
-      return { state: nextState, stop: false };
-    }
-    summary.unchanged += 1;
-  } catch (error) {
-    if (isVersionConflict(error)) {
-      try {
-        const nextState = await recordConflict(root, state, path, "VERSION_CONFLICT", remote);
-        summary.conflicts += 1;
-        summary.paths[summary.paths.length - 1] = { path, action: "conflict" };
-        return { state: nextState, stop: false };
-      } catch (writeError) {
-        await recordPathError(summary, void 0, path, writeError);
-        return { state, stop: durableStateRequired };
-      }
-    }
-    await recordPathError(summary, void 0, path, error);
-    return { state, stop: durableStateRequired };
-  }
-  return { state, stop: false };
-}
-function recordUnresolvedConflicts(summary, state) {
-  const newlyRecorded = new Set(summary.paths.filter((result) => result.action === "conflict").map((result) => result.path));
-  const reportedPaths = new Set(summary.paths.map((result) => result.path));
-  for (const path of Object.keys(state.conflicts).sort((left, right) => left.localeCompare(right))) {
-    if (!newlyRecorded.has(path)) {
-      summary.conflicts += 1;
-    }
-    const existingResult = summary.paths.find((result) => result.path === path);
-    if (existingResult?.action === "unchanged") {
-      existingResult.action = "conflict";
-      continue;
-    }
-    if (!reportedPaths.has(path)) {
-      summary.paths.push({ path, action: "conflict" });
-    }
-  }
-}
-async function downloadRemote(root, libraryId, path, api, expectedSha256, entry, onLocalMutation) {
-  const target = resolveInsideRoot(root, path);
-  await mkdir2(dirname(target), { recursive: true });
-  const tmp = join4(dirname(target), `.${basename2(target)}.wspc-download-${randomUUID2()}.tmp`);
-  try {
-    const response = await api.downloadFile(libraryId, path);
-    if (!response.body) {
-      throw new Error("download response body missing");
-    }
-    const hash = createHash2("sha256");
-    const hashingStream = new Transform({
-      transform(chunk, _encoding, callback) {
-        hash.update(chunk);
-        callback(void 0, chunk);
-      }
-    });
-    await pipeline2(
-      Readable2.fromWeb(response.body),
-      hashingStream,
-      createWriteStream2(tmp, { flags: "wx" })
-    );
-    const digest = hash.digest("hex");
-    if (expectedSha256 !== void 0 && digest !== expectedSha256) {
-      throw new Error(`download hash mismatch: expected ${expectedSha256}, got ${digest}`);
+    const hash = createHash2("sha256");
+    const hashingStream = new Transform({
+      transform(chunk, _encoding, callback) {
+        hash.update(chunk);
+        callback(void 0, chunk);
+      }
+    });
+    await pipeline2(
+      Readable2.fromWeb(response.body),
+      hashingStream,
+      createWriteStream2(tmp, { flags: "wx" })
+    );
+    const digest = hash.digest("hex");
+    if (expectedSha256 !== void 0 && digest !== expectedSha256) {
+      throw new Error(`download hash mismatch: expected ${expectedSha256}, got ${digest}`);
     }
     await installDownloadedFile(root, path, tmp, entry, onLocalMutation);
     return digest;
@@ -5162,7 +5485,431 @@ async function assertLocalAbsentBeforeRemoteDelete(root, path) {
     throw new Error("local file appeared before remote delete");
   }
 }
-function stateEntryFromRemote(remote, localSha256) {
+function isNotFoundError(error) {
+  return error instanceof Error && "code" in error && error.code === "ENOENT";
+}
+function isAlreadyExistsError(error) {
+  return error instanceof Error && "code" in error && error.code === "EEXIST";
+}
+
+// src/handwritten/commands/drive/sync.ts
+function emptySummary() {
+  return {
+    uploaded: 0,
+    downloaded: 0,
+    deleted: 0,
+    unchanged: 0,
+    merged: 0,
+    conflicts: 0,
+    errors: 0,
+    conflict_paths: [],
+    paths: []
+  };
+}
+async function runDriveSyncOnce(root, api, clock = systemDriveClock) {
+  return withDriveLock(root, async () => {
+    let state = await readDriveState(root);
+    const syncApi = api ?? await createDriveApi();
+    const summary = emptySummary();
+    const blockedPaths = /* @__PURE__ */ new Set();
+    const localFiles = await scanDriveFiles(root, {
+      onPathError: async (path, error) => {
+        await recordPathError(summary, blockedPaths, path, error);
+      }
+    });
+    const remoteFiles = await fetchRemoteManifest(root, state, syncApi, summary, blockedPaths);
+    const paths = Array.from(
+      /* @__PURE__ */ new Set([...Object.keys(localFiles), ...Object.keys(remoteFiles), ...Object.keys(state.entries)])
+    ).filter((path) => !blockedPaths.has(path)).sort((left, right) => left.localeCompare(right));
+    for (const path of paths) {
+      const remote = remoteFiles[path];
+      const action = decideDriveAction(state.entries[path], localFiles[path], remote);
+      const result = await processPath({ root, state, api: syncApi, path, action, remote, local: localFiles[path], summary, clock });
+      state = result.state;
+      if (result.stop) break;
+    }
+    recordUnresolvedConflicts(summary, state);
+    return summary;
+  });
+}
+function driveSyncCommand(api) {
+  const sync = new Command71("sync").description("Drive sync commands");
+  sync.command("once").description("Run one Drive sync pass").argument("[path]", "local folder path", ".").action(async (path) => {
+    const summary = await runDriveSyncOnce(resolve3(path), api);
+    render({ kind: "drive_sync_once", display: { shape: "object" } }, summary);
+    if (summary.conflicts > 0 || summary.errors > 0) {
+      process.exitCode = 1;
+    }
+  });
+  return sync;
+}
+async function fetchRemoteManifest(root, state, api, summary, blockedPaths) {
+  const entries = [];
+  let cursor;
+  do {
+    const page = await api.getManifest(state.library_id, cursor);
+    entries.push(...page.entries);
+    cursor = page.next_cursor ?? void 0;
+  } while (cursor !== void 0);
+  const normalized = normalizeRemoteManifest(root, entries);
+  for (const pathError of normalized.pathErrors) {
+    await recordPathError(summary, blockedPaths, pathError.path, pathError.error, {
+      appendPathResult: pathError.appendPathResult
+    });
+  }
+  return normalized.remoteFiles;
+}
+async function processPath(args) {
+  const { root, state, api, path, action, remote, local, summary, clock } = args;
+  summary.paths.push({ path, action: action.type });
+  let durableStateRequired = false;
+  try {
+    if (action.type === "upload_create" || action.type === "upload_update") {
+      const localPath = resolveInsideRoot(root, path);
+      const { body, digest: uploadDigest } = await readStableUploadBody(localPath, local);
+      const uploaded = await api.uploadFile(state.library_id, path, body, uploadDigest, action.expectedEntryVersion);
+      durableStateRequired = true;
+      const nextState = cloneDriveState(state);
+      nextState.entries[path] = stateEntryFromRemote(uploaded.entry, uploadDigest, clock);
+      delete nextState.conflicts[path];
+      await writeDriveState(root, nextState, clock);
+      summary.uploaded += 1;
+      return { state: nextState, stop: false };
+    }
+    if (action.type === "download") {
+      if (!remote) throw new Error("remote entry missing for download");
+      await assertLocalSafeForDownload(root, path, state.entries[path]);
+      const digest = await downloadRemote(root, state.library_id, path, api, remote.content_sha256, state.entries[path], () => {
+        durableStateRequired = true;
+      });
+      const nextState = cloneDriveState(state);
+      nextState.entries[path] = stateEntryFromRemote(remote, digest, clock);
+      delete nextState.conflicts[path];
+      await writeDriveState(root, nextState, clock);
+      summary.downloaded += 1;
+      return { state: nextState, stop: false };
+    }
+    if (action.type === "delete_remote") {
+      await assertLocalAbsentBeforeRemoteDelete(root, path);
+      await api.deleteFile(state.library_id, path, action.expectedEntryVersion);
+      durableStateRequired = true;
+      await assertLocalAbsentBeforeRemoteDelete(root, path);
+      const nextState = cloneDriveState(state);
+      delete nextState.entries[path];
+      delete nextState.conflicts[path];
+      await writeDriveState(root, nextState, clock);
+      summary.deleted += 1;
+      return { state: nextState, stop: false };
+    }
+    if (action.type === "delete_local") {
+      await removeLocalIfStillBase(root, path, state.entries[path], () => {
+        durableStateRequired = true;
+      });
+      const nextState = cloneDriveState(state);
+      delete nextState.entries[path];
+      delete nextState.conflicts[path];
+      await writeDriveState(root, nextState, clock);
+      summary.deleted += 1;
+      return { state: nextState, stop: false };
+    }
+    if (action.type === "state_only") {
+      if (!remote) throw new Error("remote entry missing for state update");
+      const nextState = cloneDriveState(state);
+      nextState.entries[path] = stateEntryFromRemote(remote, local?.sha256 ?? remote.content_sha256, clock);
+      delete nextState.conflicts[path];
+      await writeDriveState(root, nextState, clock);
+      summary.unchanged += 1;
+      return { state: nextState, stop: false };
+    }
+    if (action.type === "remove_state") {
+      const nextState = cloneDriveState(state);
+      delete nextState.entries[path];
+      delete nextState.conflicts[path];
+      await writeDriveState(root, nextState, clock);
+      summary.unchanged += 1;
+      return { state: nextState, stop: false };
+    }
+    if (action.type === "conflict") {
+      if (action.reason === "local_and_remote_changed") {
+        try {
+          const mergedState = await tryResolveConflict({
+            root,
+            state,
+            api,
+            path,
+            remote,
+            local,
+            clock,
+            onLocalMutation: () => {
+              durableStateRequired = true;
+            }
+          });
+          if (mergedState) {
+            summary.merged += 1;
+            summary.paths[summary.paths.length - 1] = { path, action: "merged" };
+            return { state: mergedState, stop: false };
+          }
+        } catch (error) {
+          if (!isLocalChangedDuringMerge(error)) {
+            throw error;
+          }
+          const nextState2 = await recordTypedConflict(root, state, path, action.reason, remote, clock, {
+            type: "edit_edit",
+            strategy: "record_only",
+            reason: "local_changed_during_merge"
+          });
+          summary.conflicts += 1;
+          return { state: nextState2, stop: false };
+        }
+        const conflictCopyState = await recordRemoteConflictCopy({
+          root,
+          state,
+          api,
+          path,
+          reason: action.reason,
+          type: "edit_edit",
+          remote,
+          clock
+        });
+        if (conflictCopyState) {
+          summary.conflicts += 1;
+          return { state: conflictCopyState, stop: false };
+        }
+      }
+      if (action.reason === "local_and_remote_without_base") {
+        const conflictCopyState = await recordRemoteConflictCopy({
+          root,
+          state,
+          api,
+          path,
+          reason: action.reason,
+          type: "create_create",
+          remote,
+          clock
+        });
+        if (conflictCopyState) {
+          summary.conflicts += 1;
+          return { state: conflictCopyState, stop: false };
+        }
+      }
+      if (action.reason === "local_changed_remote_deleted") {
+        const nextState2 = await recordTypedConflict(root, state, path, action.reason, remote, clock, {
+          type: "edit_delete",
+          strategy: "record_only"
+        });
+        summary.conflicts += 1;
+        return { state: nextState2, stop: false };
+      }
+      if (action.reason === "remote_changed_before_delete") {
+        const conflictCopyState = await recordRemoteConflictCopy({
+          root,
+          state,
+          api,
+          path,
+          reason: action.reason,
+          type: "delete_edit",
+          remote,
+          clock
+        });
+        if (conflictCopyState) {
+          summary.conflicts += 1;
+          return { state: conflictCopyState, stop: false };
+        }
+      }
+      const nextState = await recordConflict(root, state, path, action.reason, remote, clock);
+      summary.conflicts += 1;
+      return { state: nextState, stop: false };
+    }
+    summary.unchanged += 1;
+  } catch (error) {
+    if (isVersionConflict(error)) {
+      try {
+        const nextState = await recordConflict(root, state, path, "VERSION_CONFLICT", remote, clock);
+        summary.conflicts += 1;
+        summary.paths[summary.paths.length - 1] = { path, action: "conflict" };
+        return { state: nextState, stop: false };
+      } catch (writeError) {
+        await recordPathError(summary, void 0, path, writeError);
+        return { state, stop: durableStateRequired };
+      }
+    }
+    await recordPathError(summary, void 0, path, error);
+    return { state, stop: durableStateRequired };
+  }
+  return { state, stop: false };
+}
+async function tryResolveConflict(args) {
+  const { root, state, api, path, remote, local, clock, onLocalMutation } = args;
+  const entry = state.entries[path];
+  const baseVersionId = entry?.current_version_id;
+  const remoteVersionId = remote?.current_version_id;
+  if (!entry || !remote || !local || baseVersionId === void 0 || remoteVersionId === void 0) {
+    return void 0;
+  }
+  const localPath = resolveInsideRoot(root, path);
+  let baseBytes;
+  let remoteBytes;
+  try {
+    const [downloadedBaseBytes, downloadedRemoteBytes] = await Promise.all([
+      downloadBytes(api, state.library_id, path, baseVersionId),
+      downloadBytes(api, state.library_id, path, remoteVersionId)
+    ]);
+    baseBytes = downloadedBaseBytes;
+    remoteBytes = downloadedRemoteBytes;
+  } catch (error) {
+    if (isExpectedVersionDownloadMissing(error)) {
+      return void 0;
+    }
+    throw error;
+  }
+  const localBytes = await readFile4(localPath);
+  const baseText = classifyMergeText(path, baseBytes, void 0);
+  const localText = classifyMergeText(path, localBytes, void 0);
+  const remoteText = classifyMergeText(path, remoteBytes, void 0);
+  if (!baseText.mergeable || !localText.mergeable || !remoteText.mergeable) {
+    return void 0;
+  }
+  const merged = mergeText3(baseText.text, localText.text, remoteText.text);
+  if (!merged.clean) {
+    return void 0;
+  }
+  await assertLocalStillScanned(localPath, local);
+  const mergedBytes = new TextEncoder().encode(merged.text);
+  const mergedDigest = createHash3("sha256").update(mergedBytes).digest("hex");
+  const install = await writeMergedLocalFile(root, path, mergedBytes, mergedDigest, local, onLocalMutation);
+  let uploaded;
+  try {
+    uploaded = await api.uploadFile(state.library_id, path, mergedBytes, mergedDigest, remote.entry_version);
+  } catch (error) {
+    await install.restore();
+    throw error;
+  }
+  await install.finalize();
+  const nextState = cloneDriveState(state);
+  nextState.entries[path] = stateEntryFromRemote(uploaded.entry, mergedDigest, clock);
+  delete nextState.conflicts[path];
+  await writeDriveState(root, nextState, clock);
+  return nextState;
+}
+async function downloadBytes(api, libraryId, path, versionId) {
+  const response = await api.downloadFile(libraryId, path, versionId);
+  return new Uint8Array(await response.arrayBuffer());
+}
+async function recordRemoteConflictCopy(args) {
+  const { root, state, api, path, reason, type, remote, clock } = args;
+  const entry = state.entries[path];
+  const remoteVersionId = remote?.current_version_id;
+  if (!remote || remoteVersionId === void 0) {
+    return void 0;
+  }
+  if (await canReuseConflictCopy(root, state.conflicts[path], remoteVersionId)) {
+    return state;
+  }
+  const remoteBytes = await downloadBytes(api, state.library_id, path, remoteVersionId);
+  const copyPath = await writeConflictCopy(root, path, "remote", remoteVersionId, remoteBytes, clock);
+  const nextState = cloneDriveState(state);
+  nextState.conflicts[path] = {
+    detected_at: driveIsoTimestamp(clock),
+    reason,
+    type,
+    strategy: "conflict_copy",
+    base_version_id: entry?.current_version_id,
+    remote_version_id: remoteVersionId,
+    remote_entry_version: remote.entry_version,
+    conflict_paths: [copyPath]
+  };
+  await writeDriveState(root, nextState, clock);
+  return nextState;
+}
+async function canReuseConflictCopy(root, conflict2, remoteVersionId) {
+  if (conflict2?.strategy !== "conflict_copy" || conflict2.remote_version_id !== remoteVersionId || !Array.isArray(conflict2.conflict_paths) || conflict2.conflict_paths.length === 0) {
+    return false;
+  }
+  for (const conflictPath of conflict2.conflict_paths) {
+    try {
+      validateDrivePath(conflictPath);
+      if (!await localFileExists(resolveInsideRoot(root, conflictPath))) {
+        return false;
+      }
+    } catch {
+      return false;
+    }
+  }
+  return true;
+}
+async function writeConflictCopy(root, path, side, versionId, bytes, clock) {
+  const baseCopyPath = conflictCopyPath(path, side, driveConflictTimestamp(clock), versionId);
+  for (let suffix = 1; ; suffix += 1) {
+    const candidate = conflictCopyPathWithSuffix(baseCopyPath, suffix);
+    validateDrivePath(candidate);
+    const target = resolveInsideRoot(root, candidate);
+    await mkdir3(dirname2(target), { recursive: true });
+    for (; ; ) {
+      const tmp = join5(dirname2(target), `.${basename3(target)}.wspc-conflict-${randomUUID3()}.tmp`);
+      let tmpWritten = false;
+      try {
+        await writeFile3(tmp, bytes, { flag: "wx" });
+        tmpWritten = true;
+        await installNoOverwrite(tmp, target);
+        return candidate;
+      } catch (error) {
+        if (tmpWritten) {
+          await rm3(tmp, { force: true }).catch(() => {
+          });
+        }
+        if (error instanceof Error && "code" in error && error.code === "EEXIST") {
+          if (tmpWritten) break;
+          continue;
+        }
+        throw error;
+      }
+    }
+  }
+}
+function conflictCopyPathWithSuffix(path, suffix) {
+  if (suffix === 1) {
+    return path;
+  }
+  const parsed = pathPosix2.parse(path);
+  const fileName = `${parsed.name}-${suffix}${parsed.ext}`;
+  if (parsed.dir === "") {
+    return fileName;
+  }
+  return pathPosix2.join(parsed.dir, fileName);
+}
+function isExpectedVersionDownloadMissing(error) {
+  const structured = error;
+  if (structured?.status === 404 || structured?.status === 410) return true;
+  if (structured?.response?.status === 404 || structured?.response?.status === 410) return true;
+  if (structured?.code === "VERSION_NOT_FOUND" || structured?.code === "NOT_FOUND") return true;
+  return /\b(?:HTTP 40[410]|missing version|version not found|not found)\b/i.test(errorMessage(error));
+}
+function recordUnresolvedConflicts(summary, state) {
+  const newlyRecorded = new Set(summary.paths.filter((result) => result.action === "conflict").map((result) => result.path));
+  const reportedPaths = new Set(summary.paths.map((result) => result.path));
+  for (const path of Object.keys(state.conflicts).sort((left, right) => left.localeCompare(right))) {
+    const conflictPaths = state.conflicts[path]?.conflict_paths;
+    if (conflictPaths) {
+      summary.conflict_paths.push(...conflictPaths);
+    }
+    if (!newlyRecorded.has(path)) {
+      summary.conflicts += 1;
+    }
+    const existingResult = summary.paths.find((result) => result.path === path);
+    if (existingResult?.action === "unchanged") {
+      existingResult.action = "conflict";
+      if (conflictPaths) existingResult.conflict_paths = conflictPaths;
+      continue;
+    }
+    if (existingResult?.action === "conflict" && conflictPaths) {
+      existingResult.conflict_paths = conflictPaths;
+    }
+    if (!reportedPaths.has(path)) {
+      summary.paths.push({ path, action: "conflict", ...conflictPaths ? { conflict_paths: conflictPaths } : {} });
+    }
+  }
+}
+function stateEntryFromRemote(remote, localSha256, clock) {
   return {
     entry_id: remote.id,
     entry_version: remote.entry_version,
@@ -5170,13 +5917,10 @@ function stateEntryFromRemote(remote, localSha256) {
     content_sha256: remote.content_sha256,
     size_bytes: remote.size_bytes,
     last_local_sha256: localSha256,
-    last_synced_at: (/* @__PURE__ */ new Date()).toISOString(),
+    last_synced_at: driveIsoTimestamp(clock),
     status: "synced"
   };
 }
-async function commitDriveState(root, nextState) {
-  await writeDriveState(root, nextState);
-}
 function cloneDriveState(state) {
   return {
     ...state,
@@ -5184,10 +5928,21 @@ function cloneDriveState(state) {
     conflicts: { ...state.conflicts }
   };
 }
-async function recordConflict(root, state, path, reason, remote) {
+async function recordConflict(root, state, path, reason, remote, clock) {
   const nextState = cloneDriveState(state);
-  nextState.conflicts[path] = conflict(reason, remote);
-  await commitDriveState(root, nextState);
+  nextState.conflicts[path] = conflict(reason, remote, clock);
+  await writeDriveState(root, nextState, clock);
+  return nextState;
+}
+async function recordTypedConflict(root, state, path, reason, remote, clock, metadata) {
+  const nextState = cloneDriveState(state);
+  nextState.conflicts[path] = {
+    ...conflict(metadata.reason ?? reason, remote, clock),
+    type: metadata.type,
+    strategy: metadata.strategy,
+    base_version_id: state.entries[path]?.current_version_id
+  };
+  await writeDriveState(root, nextState, clock);
   return nextState;
 }
 async function recordPathError(summary, blockedPaths, path, error, options = {}) {
@@ -5201,9 +5956,9 @@ async function recordPathError(summary, blockedPaths, path, error, options = {})
   void errorMessage(error);
   summary.errors += 1;
 }
-function conflict(reason, remote) {
+function conflict(reason, remote, clock) {
   return {
-    detected_at: (/* @__PURE__ */ new Date()).toISOString(),
+    detected_at: driveIsoTimestamp(clock),
     reason,
     remote_entry_version: remote?.entry_version,
     remote_version_id: remote?.current_version_id
@@ -5217,6 +5972,9 @@ function isVersionConflict(error) {
   if (structured?.code === "VERSION_CONFLICT") return true;
   return [errorMessage(error), structured?.body, structured?.response?.body].some(containsVersionConflict);
 }
+function isLocalChangedDuringMerge(error) {
+  return errorMessage(error) === "local file changed after scan";
+}
 function containsVersionConflict(value) {
   if (value === void 0) return false;
   if (typeof value === "string") return value.includes("VERSION_CONFLICT");
@@ -5226,22 +5984,268 @@ function containsVersionConflict(value) {
     return false;
   }
 }
-function isNotFoundError(error) {
-  return error instanceof Error && "code" in error && error.code === "ENOENT";
-}
-function isAlreadyExistsError(error) {
-  return error instanceof Error && "code" in error && error.code === "EEXIST";
-}
 
 // src/handwritten/commands/drive/watch.ts
-import { Command as Command65 } from "commander";
+import { Command as Command72 } from "commander";
 import chokidar from "chokidar";
 import { relative as relative2, resolve as resolve4 } from "path";
+
+// src/handwritten/commands/drive/realtime.ts
+function createDriveRealtimeSource(args) {
+  const connect = args.connect ?? nativeWebSocketConnector;
+  const clock = args.clock ?? systemDriveClock;
+  const scheduleTimeout = args.setTimeout ?? setTimeout;
+  const cancelTimeout = args.clearTimeout ?? clearTimeout;
+  let currentRealtime = { ...args.realtime };
+  let handlers;
+  let activeSocket;
+  let reconnectTimer;
+  let reconnectDelayMs = 1e3;
+  let stopped = false;
+  let authFailed = false;
+  let connectionId = 0;
+  function clearReconnectTimer() {
+    if (reconnectTimer === void 0) return;
+    cancelTimeout(reconnectTimer);
+    reconnectTimer = void 0;
+  }
+  async function persist(next) {
+    currentRealtime = next;
+    await args.writeRealtimeState(next);
+  }
+  async function persistBestEffort(next) {
+    try {
+      await persist(next);
+    } catch (error) {
+      handlers?.onWarning?.(redactedRealtimeError(error));
+    }
+  }
+  function connectNow() {
+    if (stopped || authFailed) return;
+    clearReconnectTimer();
+    const id = ++connectionId;
+    const url = buildDriveRealtimeUrl(args.baseUrl, args.libraryId, currentRealtime);
+    activeSocket = connect(url, {
+      open() {
+        if (id !== connectionId || stopped || authFailed) return;
+        reconnectDelayMs = 1e3;
+        void persistBestEffort({ ...currentRealtime, last_connected_at: driveIsoTimestamp(clock) }).then(() => handlers?.onConnected());
+      },
+      message(data) {
+        if (id !== connectionId || stopped || authFailed) return;
+        void handleMessage(data).catch((error) => handlers?.onWarning?.(redactedRealtimeError(error)));
+      },
+      close(error) {
+        closeConnection(id, error ?? "close");
+      }
+    }, args.headers === void 0 ? void 0 : { headers: args.headers });
+  }
+  function closeConnection(id, error) {
+    if (id !== connectionId || stopped || authFailed) return;
+    connectionId += 1;
+    const socket = activeSocket;
+    activeSocket = void 0;
+    clearReconnectTimer();
+    socket?.close();
+    if (isRealtimeAuthError(error)) {
+      authFailed = true;
+      handlers?.onAuthFailed(redactedRealtimeError(error));
+      return;
+    }
+    const delayMs = reconnectDelayMs;
+    handlers?.onReconnect(delayMs, redactedRealtimeError(error));
+    reconnectTimer = scheduleTimeout(() => {
+      reconnectTimer = void 0;
+      connectNow();
+    }, delayMs);
+    reconnectDelayMs = Math.min(delayMs * 2, 6e4);
+  }
+  async function handleMessage(data) {
+    const message = parseDriveRealtimeMessage(data);
+    if (message.type === "ready") {
+      if (message.replayed > 0) {
+        handlers?.onEvent(optionalString({ debounce_ms: 2e3, reason: "ready_replay" }, "cursor", message.cursor));
+      }
+      if (message.cursor !== void 0) {
+        await persistBestEffort({ ...currentRealtime, last_cursor: message.cursor });
+      }
+      return;
+    }
+    if (message.type === "library_changed") {
+      handlers?.onEvent(optionalString(optionalString({
+        debounce_ms: 2e3,
+        reason: "library_changed"
+      }, "cursor", message.cursor), "path", message.path));
+      if (message.cursor !== void 0) {
+        await persistBestEffort({ ...currentRealtime, last_cursor: message.cursor, last_event_at: driveIsoTimestamp(clock) });
+      }
+      return;
+    }
+    if (message.type === "resync_required") {
+      const reason = message.reason ?? "resync_required";
+      handlers?.onEvent(optionalString({ immediate: true, reason }, "cursor", message.cursor));
+      if (message.cursor !== void 0 || isInvalidCursorReason(reason)) {
+        await persistBestEffort(resyncRealtimeState(currentRealtime, message.cursor, reason, driveIsoTimestamp(clock)));
+      }
+      return;
+    }
+    if (message.type === "error") {
+      const error = message.message ?? message.code ?? "realtime error";
+      if (isRealtimeAuthError(error) || isRealtimeAuthError(message.code)) {
+        authFailed = true;
+        connectionId += 1;
+        clearReconnectTimer();
+        handlers?.onAuthFailed(redactedRealtimeError(error));
+        activeSocket?.close();
+        activeSocket = void 0;
+        return;
+      }
+      handlers?.onWarning?.(redactedRealtimeError(error));
+      return;
+    }
+    handlers?.onWarning?.("unknown realtime message");
+  }
+  return {
+    async start(nextHandlers) {
+      handlers = nextHandlers;
+      stopped = false;
+      authFailed = false;
+      connectNow();
+    },
+    async close() {
+      stopped = true;
+      clearReconnectTimer();
+      activeSocket?.close();
+      activeSocket = void 0;
+    }
+  };
+}
+function buildDriveRealtimeUrl(baseUrl, libraryId, realtime) {
+  if (realtime.client_id.length === 0) {
+    throw new Error("drive realtime client_id is required");
+  }
+  const url = new URL(baseUrl);
+  url.protocol = url.protocol === "http:" ? "ws:" : "wss:";
+  url.pathname = `/drive/libraries/${encodeURIComponent(libraryId)}/realtime`;
+  url.search = "";
+  url.hash = "";
+  if (realtime.last_cursor !== void 0) {
+    url.searchParams.set("cursor", realtime.last_cursor);
+  }
+  url.searchParams.set("client_id", realtime.client_id);
+  return url;
+}
+function parseDriveRealtimeMessage(raw) {
+  let value;
+  try {
+    value = JSON.parse(raw);
+  } catch {
+    return { type: "unknown" };
+  }
+  if (!isRecord3(value)) {
+    return { type: "unknown" };
+  }
+  const messageType = typeof value.type === "string" ? value.type : void 0;
+  const cursor = typeof value.cursor === "string" ? value.cursor : void 0;
+  if (messageType === "ready") {
+    return optionalString({ type: "ready", replayed: typeof value.replayed === "number" ? value.replayed : 0 }, "cursor", cursor);
+  }
+  if (messageType === "library_changed") {
+    return optionalString(optionalString({ type: "library_changed" }, "cursor", cursor), "path", value.path);
+  }
+  if (messageType === "resync_required") {
+    return optionalString(optionalString({ type: "resync_required" }, "cursor", cursor), "reason", value.reason);
+  }
+  if (messageType === "error") {
+    return optionalString(
+      optionalString({ type: "error" }, "code", value.code),
+      "message",
+      typeof value.message === "string" ? redactedRealtimeError(value.message) : void 0
+    );
+  }
+  return optionalString({ type: "unknown" }, "message_type", messageType);
+}
+function redactedRealtimeError(error) {
+  const text = error instanceof Error ? error.message : String(error);
+  const status = text.match(/\bHTTP\s+(401|403|429|5\d\d)\b/i);
+  if (status?.[1] !== void 0) {
+    return `HTTP ${status[1]}`;
+  }
+  if (/\bauth|authorization\b/i.test(text)) {
+    return "auth failed";
+  }
+  if (/\bnetwork|fetch|close\b/i.test(text)) {
+    return "network error";
+  }
+  return "realtime error";
+}
+function isRecord3(value) {
+  return typeof value === "object" && value !== null && !Array.isArray(value);
+}
+function resyncRealtimeState(realtime, cursor, reason, lastEventAt) {
+  if (isInvalidCursorReason(reason)) {
+    const { last_cursor: _lastCursor, ...next } = realtime;
+    return { ...next, last_event_at: lastEventAt };
+  }
+  return optionalString({ ...realtime, last_event_at: lastEventAt }, "last_cursor", cursor);
+}
+function isInvalidCursorReason(reason) {
+  return /\bcursor[_ -]?(invalid|expired|gone|missing|not[_ -]?found)\b|\binvalid[_ -]?cursor\b/i.test(reason);
+}
+function isRealtimeAuthError(error) {
+  return /\b(401|403|auth|authorization|unauthorized|forbidden)\b/i.test(String(error));
+}
+function optionalString(target, key, value) {
+  if (typeof value !== "string") {
+    return target;
+  }
+  return { ...target, [key]: value };
+}
+function nativeWebSocketConnector(url, handlers, init) {
+  const WebSocketWithInit = WebSocket;
+  const ws = new WebSocketWithInit(url.toString(), init);
+  let closed = false;
+  let pendingError;
+  const closeOnce = (error) => {
+    if (closed) return;
+    closed = true;
+    handlers.close(error);
+  };
+  ws.addEventListener("open", () => handlers.open());
+  ws.addEventListener("message", (event) => handlers.message(String(event.data)));
+  ws.addEventListener("close", (event) => closeOnce(webSocketCloseError(event) ?? pendingError));
+  ws.addEventListener("error", (event) => {
+    pendingError = webSocketError(event);
+    if (isRealtimeAuthError(pendingError)) {
+      closeOnce(pendingError);
+    }
+  });
+  return { close: () => ws.close() };
+}
+function webSocketCloseError(event) {
+  if (event.code === 1e3) return void 0;
+  if (event.code === 4001 || event.code === 4401) return new Error("HTTP 401");
+  if (event.code === 4003 || event.code === 4403) return new Error("HTTP 403");
+  if (event.reason && isRealtimeAuthError(event.reason)) return new Error(event.reason);
+  if (event.reason) return new Error(event.reason);
+  return new Error(`WebSocket close ${event.code}`);
+}
+function webSocketError(event) {
+  if (typeof ErrorEvent !== "undefined" && event instanceof ErrorEvent) {
+    const detail = event.error instanceof Error ? event.error.message : event.message;
+    if (detail) return new Error(detail);
+  }
+  return new Error("network error");
+}
+
+// src/handwritten/commands/drive/watch.ts
 async function runDriveWatch(root, options = {}) {
   const runSync = options.runSync ?? runDriveSyncOnce;
   const debounceMs = options.debounceMs ?? 500;
+  const remoteDebounceMs = options.remoteDebounceMs ?? 2e3;
   const emit = options.onEvent ?? ((event) => render({ kind: "drive_watch", display: { shape: "object" } }, event));
   let debounceTimer;
+  let debounceDeadlineMs;
   let retryTimer;
   let resolveRetryTimer;
   let running = false;
@@ -5269,6 +6273,7 @@ async function runDriveWatch(root, options = {}) {
         } catch (error) {
           if (isAuthError(error) || isFatalWatchError(error) || !isRetryableWatchError(error)) throw error;
           emit({ kind: "drive_watch_retry", delay_ms: backoffMs, error: errorMessage2(error) });
+          if (stopped) return;
           await waitForManagedTimer(backoffMs);
           if (stopped) return;
           backoffMs = Math.min(backoffMs * 2, 6e4);
@@ -5283,6 +6288,27 @@ async function runDriveWatch(root, options = {}) {
     if (debounceTimer === void 0) return;
     clearTimeout(debounceTimer);
     debounceTimer = void 0;
+    debounceDeadlineMs = void 0;
+  }
+  function scheduleSync(delayMs) {
+    if (running) {
+      rerunRequested = true;
+      return;
+    }
+    if (delayMs <= 0) {
+      clearDebounceTimer();
+      requestSync().catch(stopWithError);
+      return;
+    }
+    const deadlineMs = Date.now() + delayMs;
+    if (debounceTimer !== void 0 && debounceDeadlineMs !== void 0 && debounceDeadlineMs <= deadlineMs) return;
+    clearDebounceTimer();
+    debounceDeadlineMs = deadlineMs;
+    debounceTimer = setTimeout(() => {
+      debounceTimer = void 0;
+      debounceDeadlineMs = void 0;
+      requestSync().catch(stopWithError);
+    }, delayMs);
   }
   function clearRetryTimer() {
     if (retryTimer === void 0) return;
@@ -5304,26 +6330,61 @@ async function runDriveWatch(root, options = {}) {
   }
   function stopWithError(error) {
     stopError = error;
+    stopped = true;
     clearDebounceTimer();
     clearRetryTimer();
     stopWatch?.();
   }
-  const state = await (options.readState ?? readDriveState)(root);
-  const source = options.source ?? createChokidarSource(root);
+  let source;
+  let realtimeSource;
   try {
+    let state = await (options.readState ?? readDriveState)(root);
+    realtimeSource = options.once ? void 0 : options.realtimeSource;
+    if (!options.once && realtimeSource === void 0) {
+      state = await ensureDriveRealtimeState(root);
+      const { baseUrl, headers } = await loadRealtimeAuthHeaders({
+        verifyPath: `/drive/libraries/${encodeURIComponent(state.library_id)}`
+      });
+      const realtime = state.realtime;
+      if (realtime === void 0) {
+        throw new Error("drive realtime state is required");
+      }
+      realtimeSource = createDriveRealtimeSource({
+        baseUrl,
+        headers,
+        libraryId: state.library_id,
+        realtime,
+        writeRealtimeState: (next) => writeDriveRealtimeState(root, next)
+      });
+    }
+    source = options.source ?? createChokidarSource(root);
     source.onChange((path) => {
       if (isDriveInternalPath(root, path)) return;
-      if (running) {
-        rerunRequested = true;
-        return;
-      }
-      clearDebounceTimer();
-      debounceTimer = setTimeout(() => {
-        debounceTimer = void 0;
-        requestSync().catch(stopWithError);
-      }, debounceMs);
+      scheduleSync(debounceMs);
     });
     emit({ kind: "drive_watch_started", root, library_id: state.library_id });
+    realtimeSource?.start({
+      onConnected() {
+        emit({ kind: "drive_realtime_connected", library_id: state.library_id });
+      },
+      onEvent(event) {
+        emit(realtimeEvent(event));
+        if (event.immediate) {
+          scheduleSync(0);
+          return;
+        }
+        scheduleSync(event.debounce_ms ?? remoteDebounceMs);
+      },
+      onReconnect(delayMs, error) {
+        emit({ kind: "drive_realtime_reconnecting", delay_ms: delayMs, error });
+      },
+      onAuthFailed(error) {
+        emit({ kind: "drive_realtime_auth_failed", error: error ?? "auth failed" });
+      },
+      onWarning(warning) {
+        emit({ kind: "drive_realtime_warning", warning });
+      }
+    }).catch(stopWithError);
     await requestSync();
     if (options.once) return;
     if (stopError !== void 0) throw stopError;
@@ -5337,11 +6398,11 @@ async function runDriveWatch(root, options = {}) {
     clearDebounceTimer();
     clearRetryTimer();
     cleanupSignalListeners();
-    await source.close();
+    await Promise.all([source?.close(), realtimeSource?.close()]);
   }
 }
 function driveWatchCommand(options = {}) {
-  return new Command65("watch").description("Watch a bound Drive folder and sync local changes").argument("[path]", "local folder path", ".").action(async (path) => {
+  return new Command72("watch").description("Watch a bound Drive folder and sync local changes").argument("[path]", "local folder path", ".").action(async (path) => {
     await runDriveWatch(resolve4(path), options);
   });
 }
@@ -5379,6 +6440,15 @@ function isRetryableWatchError(error) {
 function errorMessage2(error) {
   return error instanceof Error ? error.message : String(error);
 }
+function realtimeEvent(event) {
+  return {
+    kind: "drive_realtime_event",
+    message: "remote update received; syncing",
+    ...event.path === void 0 ? {} : { path: event.path },
+    ...event.reason === void 0 ? {} : { reason: event.reason },
+    ...event.cursor === void 0 ? {} : { cursor: event.cursor }
+  };
+}
 function waitForStopSignal(onRegistered) {
   return new Promise((resolveStop) => {
     const stop = () => resolveStop();
@@ -5396,7 +6466,7 @@ function waitForStopSignal(onRegistered) {
 function mountDriveCommands(program) {
   let drive = program.commands.find((c) => c.name() === "drive");
   if (!drive) {
-    drive = new Command66("drive").description("Drive commands");
+    drive = new Command73("drive").description("Drive commands");
     program.addCommand(drive);
   }
   if (!drive.commands.some((c) => c.name() === "bind")) {
@@ -5422,7 +6492,7 @@ function isCliEntrypoint(argv = process.argv, metaUrl = import.meta.url) {
   }
 }
 function buildProgram() {
-  const program = new Command66().name("wspc").description("Official CLI for wspc.ai").version(`wspc ${VERSION} (spec ${SPEC_SHA}, fetched ${SPEC_FETCHED_AT})`).option("--json", "Output raw JSON (machine-readable)").option("--account <email>", "Run as a specific account (overrides the active account)").hook("preAction", (_thisCommand, actionCommand) => {
+  const program = new Command73().name("wspc").description("Official CLI for wspc.ai").version(`wspc ${VERSION} (spec ${SPEC_SHA}, fetched ${SPEC_FETCHED_AT})`).option("--json", "Output raw JSON (machine-readable)").option("--account <email>", "Run as a specific account (overrides the active account)").hook("preAction", (_thisCommand, actionCommand) => {
     const globals = actionCommand.optsWithGlobals();
     if (globals.json) process.env.WSPC_OUTPUT = "json";
     if (globals.account) process.env.WSPC_ACCOUNT = String(globals.account);