@wspc/cli 0.1.1 → 0.1.2

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.2";
+var SPEC_SHA = "e0bbc1e3";
+var SPEC_FETCHED_AT = "2026-06-21T13:29:36.026Z";
 var API_BASE = "https://api.wspc.ai";
 
 // src/index.ts
@@ -2697,9 +2729,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 +2916,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 +2937,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 +2958,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 +2976,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 +2997,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 +3020,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 +3041,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 +3062,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 +3087,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 +3113,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 +3136,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 +3159,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 +3180,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 +3201,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 +3225,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 +3243,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 +3267,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 +3291,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 +3318,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 +3340,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 +3361,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 +3388,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 +3410,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 +3425,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 +3453,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 +3487,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 +3510,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 +3531,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 +3555,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 +3579,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 +3600,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 +3625,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 +3651,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 +3711,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 +3768,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 +4002,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 +4021,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 +4049,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 +4062,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 +4094,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 +4147,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 +4219,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 +4260,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 +4272,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 +4290,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 +4309,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 +4367,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 +4454,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 +4471,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 +4503,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 +4575,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();
@@ -4470,7 +4681,7 @@ 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");
 }
 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 isRecord(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 isValidDriveState(value) {
   if (!isRecord(value)) return false;
@@ -4499,7 +4710,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,10 +4728,10 @@ function driveBindCommand() {
 }
 
 // src/handwritten/commands/drive/sync.ts
-import { Command as Command64 } from "commander";
+import { Command as Command71 } 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 { 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, posix as pathPosix2, 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";
@@ -4595,6 +4806,102 @@ function getRemoteStatus(entry, remote) {
   return "changed";
 }
 
+// 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, now, versionId) {
+  const parsed = pathPosix.parse(path);
+  const timestamp = now.toISOString().replace(/[-:]/g, "").replace(/\.\d{3}Z$/, "Z");
+  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/path-policy.ts
 import { isAbsolute, relative, resolve as resolve2, sep } from "path";
 var UTF8_SEGMENT_LIMIT = 255;
@@ -4722,7 +5029,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;
@@ -4772,8 +5079,10 @@ function emptySummary() {
     downloaded: 0,
     deleted: 0,
     unchanged: 0,
+    merged: 0,
     conflicts: 0,
     errors: 0,
+    conflict_paths: [],
     paths: []
   };
 }
@@ -4804,7 +5113,7 @@ async function runDriveSyncOnce(root, api) {
   });
 }
 function driveSyncCommand(api) {
-  const sync = new Command64("sync").description("Drive sync commands");
+  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);
@@ -4932,6 +5241,88 @@ async function processPath(args) {
       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,
+            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, {
+            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
+        });
+        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
+        });
+        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, {
+          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
+        });
+        if (conflictCopyState) {
+          summary.conflicts += 1;
+          return { state: conflictCopyState, stop: false };
+        }
+      }
       const nextState = await recordConflict(root, state, path, action.reason, remote);
       summary.conflicts += 1;
       return { state: nextState, stop: false };
@@ -4954,23 +5345,268 @@ async function processPath(args) {
   }
   return { state, stop: false };
 }
+async function tryResolveConflict(args) {
+  const { root, state, api, path, remote, local, 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 readFile3(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 = createHash2("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);
+  delete nextState.conflicts[path];
+  await commitDriveState(root, nextState);
+  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 } = 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);
+  const nextState = cloneDriveState(state);
+  nextState.conflicts[path] = {
+    detected_at: (/* @__PURE__ */ new Date()).toISOString(),
+    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 commitDriveState(root, nextState);
+  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) {
+  const baseCopyPath = conflictCopyPath(path, side, /* @__PURE__ */ new Date(), versionId);
+  for (let suffix = 1; ; suffix += 1) {
+    const candidate = conflictCopyPathWithSuffix(baseCopyPath, suffix);
+    validateDrivePath(candidate);
+    const target = resolveInsideRoot(root, candidate);
+    await mkdir2(dirname(target), { recursive: true });
+    for (; ; ) {
+      const tmp = join4(dirname(target), `.${basename2(target)}.wspc-conflict-${randomUUID2()}.tmp`);
+      let tmpWritten = false;
+      try {
+        await writeFile2(tmp, bytes, { flag: "wx" });
+        tmpWritten = true;
+        await installNoOverwrite(tmp, target);
+        return candidate;
+      } catch (error) {
+        if (tmpWritten) {
+          await rm2(tmp, { force: true }).catch(() => {
+          });
+        }
+        if (isAlreadyExistsError(error)) {
+          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));
+}
+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 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" });
+      summary.paths.push({ path, action: "conflict", ...conflictPaths ? { conflict_paths: conflictPaths } : {} });
     }
   }
 }
+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 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;
+    }
+    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");
+    }
+    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);
+      }
+    };
+  } catch (error) {
+    if (!backupIsScannedLocal) {
+      await restoreBackupWhenPossible(backup, target);
+    }
+    throw error;
+  }
+}
+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 downloadRemote(root, libraryId, path, api, expectedSha256, entry, onLocalMutation) {
   const target = resolveInsideRoot(root, path);
   await mkdir2(dirname(target), { recursive: true });
@@ -5190,6 +5826,17 @@ async function recordConflict(root, state, path, reason, remote) {
   await commitDriveState(root, nextState);
   return nextState;
 }
+async function recordTypedConflict(root, state, path, reason, remote, metadata) {
+  const nextState = cloneDriveState(state);
+  nextState.conflicts[path] = {
+    ...conflict(metadata.reason ?? reason, remote),
+    type: metadata.type,
+    strategy: metadata.strategy,
+    base_version_id: state.entries[path]?.current_version_id
+  };
+  await commitDriveState(root, nextState);
+  return nextState;
+}
 async function recordPathError(summary, blockedPaths, path, error, options = {}) {
   blockedPaths?.add(path);
   const lastPath = summary.paths.at(-1);
@@ -5217,6 +5864,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");
@@ -5234,7 +5884,7 @@ function isAlreadyExistsError(error) {
 }
 
 // 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";
 async function runDriveWatch(root, options = {}) {
@@ -5341,7 +5991,7 @@ async function runDriveWatch(root, options = {}) {
   }
 }
 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);
   });
 }
@@ -5396,7 +6046,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 +6072,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);