@wspc/cli 0.1.3 → 0.1.5

package/dist/cli.js

@@ -1,7 +1,7 @@
 #!/usr/bin/env node
 
 // src/cli.ts
-import { Command as Command73 } from "commander";
+import { Command as Command74 } from "commander";
 import { realpathSync } from "fs";
 import { fileURLToPath } from "url";
 
@@ -1178,6 +1178,11 @@ var todoCommentUpdate = (options) => (options.client ?? client).patch({
     ...options.headers
   }
 });
+var projectDelete = (options) => (options.client ?? client).delete({
+  security: [{ scheme: "bearer", type: "http" }],
+  url: "/todo/projects/{id}",
+  ...options
+});
 var recurrenceRuleDelete = (options) => (options.client ?? client).delete({
   security: [{ scheme: "bearer", type: "http" }],
   url: "/todo/recurrence-rules/{id}",
@@ -1464,9 +1469,9 @@ function createConsistencyFetch(opts) {
 }
 
 // src/version.ts
-var VERSION = "0.1.3";
-var SPEC_SHA = "e0bbc1e3";
-var SPEC_FETCHED_AT = "2026-06-22T01:23:52.693Z";
+var VERSION = "0.1.5";
+var SPEC_SHA = "706a2577";
+var SPEC_FETCHED_AT = "2026-06-22T07:51:02.058Z";
 var API_BASE = "https://api.wspc.ai";
 
 // src/index.ts
@@ -3294,7 +3299,7 @@ var pushTestCommand = new Command45("test").description("Send a test push notifi
   }
   render({ kind: "push_test", display: { "shape": "object", "fields": ["ok", "status", "detail", "durationMs"], "format": { "ok": "bool-badge" } } }, result.data);
   if (result.data?.ok === false) {
-    process.exit(1);
+    process.exitCode = 1;
   }
 });
 
@@ -3586,9 +3591,30 @@ var todoCommentUpdateCommand = new Command56("edit").description("Edit a comment
   render({ kind: "todo_comment_update", display: { "shape": "object", "format": { "id": "id-short", "todo_id": "id-short", "user_id": "id-short", "created_at": "relative-time", "updated_at": "relative-time", "deleted_at": "relative-time" } } }, result.data);
 });
 
-// src/generated/cli/todo/rule/rm.ts
+// src/generated/cli/todo/project/rm.ts
 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) => {
+var projectDeleteCommand = new Command57("rm").description("Soft-delete a project").argument("<id>", "id").action(async (id, opts) => {
+  const client2 = await loadSdkClient();
+  const result = await projectDelete({
+    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: "project_delete", display: { "shape": "object", "format": { "id": "id-short", "org_id": "id-short", "creator_user_id": "id-short", "default_todo_type_id": "id-short", "name": "truncate", "created_at": "relative-time", "updated_at": "relative-time", "deleted_at": "relative-time" } } }, result.data);
+});
+
+// src/generated/cli/todo/rule/rm.ts
+import { Command as Command58 } from "commander";
+var recurrenceRuleDeleteCommand = new Command58("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,
@@ -3611,8 +3637,8 @@ var recurrenceRuleDeleteCommand = new Command57("rm").description("Delete a recu
 });
 
 // src/generated/cli/todo/rule/show.ts
-import { Command as Command58 } from "commander";
-var recurrenceRuleGetCommand = new Command58("show").description("Get a recurring todo rule").argument("<id>", "id").action(async (id, opts) => {
+import { Command as Command59 } from "commander";
+var recurrenceRuleGetCommand = new Command59("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,
@@ -3632,8 +3658,8 @@ var recurrenceRuleGetCommand = new Command58("show").description("Get a recurrin
 });
 
 // src/generated/cli/todo/rm.ts
-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) => {
+import { Command as Command60 } from "commander";
+var todoDeleteCommand = new Command60("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,
@@ -3657,8 +3683,8 @@ var todoDeleteCommand = new Command59("rm").description("Soft-delete a todo").ar
 });
 
 // src/generated/cli/todo/show.ts
-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) => {
+import { Command as Command61 } from "commander";
+var todoGetCommand = new Command61("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,
@@ -3683,8 +3709,8 @@ var todoGetCommand = new Command60("show").description("Get a todo by id").argum
 });
 
 // src/generated/cli/todo/update.ts
-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) => {
+import { Command as Command62 } from "commander";
+var todoUpdateCommand = new Command62("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,
@@ -3785,6 +3811,7 @@ function registerGeneratedCommands(root) {
   const root_todo_project = root_todo.command("project").description("project commands");
   root_todo_project.addCommand(projectCreateCommand);
   root_todo_project.addCommand(projectListCommand);
+  root_todo_project.addCommand(projectDeleteCommand);
   const root_todo_rule = root_todo.command("rule").description("rule commands");
   root_todo_rule.addCommand(recurrenceRuleCreateCommand);
   root_todo_rule.addCommand(recurrenceRuleListCommand);
@@ -3800,7 +3827,7 @@ function registerGeneratedCommands(root) {
 }
 
 // src/handwritten/commands/login.ts
-import { Command as Command62 } from "commander";
+import { Command as Command63 } from "commander";
 
 // src/handwritten/auth/device-flow.ts
 var DEFAULT_SLEEP = (ms) => new Promise((r) => setTimeout(r, ms));
@@ -3872,13 +3899,15 @@ async function ensureClientId(opts) {
     apiBase: opts.baseUrl,
     fetchImpl: opts.fetchImpl
   });
-  const c = await opts.store.read();
-  const existing = c.envs[opts.envName]?.client_id;
+  let existing;
+  await opts.store.update((c) => {
+    existing = c.envs[opts.envName]?.client_id;
+    if (existing) return;
+    const targetEnv = c.envs[opts.envName] ??= { api_base: opts.baseUrl, accounts: {} };
+    targetEnv.api_base = opts.baseUrl;
+    targetEnv.accounts ??= {};
+  });
   if (existing) return existing;
-  const targetEnv = c.envs[opts.envName] ??= { api_base: opts.baseUrl, accounts: {} };
-  targetEnv.api_base = opts.baseUrl;
-  targetEnv.accounts ??= {};
-  await opts.store.write(c);
   const res = await fetchImpl(`${opts.baseUrl}/auth/oauth/register`, {
     method: "POST",
     headers: { "content-type": "application/json" },
@@ -3894,12 +3923,18 @@ async function ensureClientId(opts) {
   }
   const body = await res.json();
   if (!body.client_id) throw new Error("client_registration_failed: missing client_id in response");
-  const fresh = await opts.store.read();
-  const env = fresh.envs[opts.envName] ?? { api_base: opts.baseUrl, accounts: {} };
-  env.client_id = body.client_id;
-  fresh.envs[opts.envName] = env;
-  await opts.store.write(fresh);
-  return body.client_id;
+  let clientId = body.client_id;
+  await opts.store.update((c) => {
+    const env = c.envs[opts.envName] ??= { api_base: opts.baseUrl, accounts: {} };
+    env.api_base = opts.baseUrl;
+    env.accounts ??= {};
+    if (env.client_id) {
+      clientId = env.client_id;
+      return;
+    }
+    env.client_id = body.client_id;
+  });
+  return clientId;
 }
 
 // src/handwritten/auth/fetch-me.ts
@@ -3956,36 +3991,36 @@ async function runLogin(opts) {
   const now = opts.now ?? Date.now;
   const me = opts.fetchMe ?? ((o) => fetchMe(o));
   if (opts.apiKey) {
-    const initial = await opts.store.read();
-    getOrCreateEnv(initial, envName, opts.baseUrl);
-    initial.current_env = envName;
-    await opts.store.write(initial);
+    await opts.store.update((initial) => {
+      getOrCreateEnv(initial, envName, opts.baseUrl);
+      initial.current_env = envName;
+    });
     const who2 = await me({
       baseUrl: opts.baseUrl,
       token: opts.apiKey,
       store: opts.store,
       envName
     });
-    const c2 = await opts.store.read();
-    const env2 = getOrCreateEnv(c2, envName, opts.baseUrl);
-    const prev2 = env2.accounts[who2.email] ?? { email: who2.email };
-    const acct2 = env2.accounts[who2.email] = {
-      ...prev2,
-      email: who2.email,
-      user_id: who2.user_id,
-      api_key: opts.apiKey
-    };
-    delete acct2.refresh_token;
-    delete acct2.access_token;
-    delete acct2.access_token_expires_at;
-    env2.current_account = who2.email;
-    if (who2.email !== LEGACY_ACCOUNT_KEY) delete env2.accounts[LEGACY_ACCOUNT_KEY];
-    c2.current_env = envName;
-    await opts.store.write(c2);
+    await opts.store.update((c) => {
+      const env = getOrCreateEnv(c, envName, opts.baseUrl);
+      const prev = env.accounts[who2.email] ?? { email: who2.email };
+      const acct = env.accounts[who2.email] = {
+        ...prev,
+        email: who2.email,
+        user_id: who2.user_id,
+        api_key: opts.apiKey
+      };
+      delete acct.refresh_token;
+      delete acct.access_token;
+      delete acct.access_token_expires_at;
+      env.current_account = who2.email;
+      if (who2.email !== LEGACY_ACCOUNT_KEY) delete env.accounts[LEGACY_ACCOUNT_KEY];
+      c.current_env = envName;
+    });
     opts.output.write(`${green("\u2713")} logged in (api key) as ${bold(who2.email)} ${dim(`\u2192 env "${envName}"`)}`);
     return;
   }
-  const ensureClient = opts.ensureClient ?? ((env2) => ensureClientId({ store: opts.store, envName: env2, baseUrl: opts.baseUrl }));
+  const ensureClient = opts.ensureClient ?? ((env) => ensureClientId({ store: opts.store, envName: env, baseUrl: opts.baseUrl }));
   const clientId = opts.clientId ?? await ensureClient(envName);
   const flow = opts.deviceFlow ?? runDeviceFlow;
   const result = await flow({
@@ -4005,22 +4040,22 @@ async function runLogin(opts) {
     store: opts.store,
     envName
   });
-  const c = await opts.store.read();
-  const env = getOrCreateEnv(c, envName, opts.baseUrl);
-  const prev = env.accounts[who.email] ?? { email: who.email };
-  const acct = env.accounts[who.email] = {
-    ...prev,
-    email: who.email,
-    user_id: who.user_id,
-    refresh_token: result.refresh_token,
-    access_token: result.access_token,
-    access_token_expires_at: now() + result.expires_in * 1e3
-  };
-  delete acct.api_key;
-  env.current_account = who.email;
-  if (who.email !== LEGACY_ACCOUNT_KEY) delete env.accounts[LEGACY_ACCOUNT_KEY];
-  c.current_env = envName;
-  await opts.store.write(c);
+  await opts.store.update((c) => {
+    const env = getOrCreateEnv(c, envName, opts.baseUrl);
+    const prev = env.accounts[who.email] ?? { email: who.email };
+    const acct = env.accounts[who.email] = {
+      ...prev,
+      email: who.email,
+      user_id: who.user_id,
+      refresh_token: result.refresh_token,
+      access_token: result.access_token,
+      access_token_expires_at: now() + result.expires_in * 1e3
+    };
+    delete acct.api_key;
+    env.current_account = who.email;
+    if (who.email !== LEGACY_ACCOUNT_KEY) delete env.accounts[LEGACY_ACCOUNT_KEY];
+    c.current_env = envName;
+  });
   opts.output.writeJson({ event: "login_success", email: who.email });
   opts.output.write(`${green("\u2713")} logged in as ${bold(who.email)} ${dim(`\u2192 env "${envName}"`)}`);
 }
@@ -4034,7 +4069,7 @@ function resolveLoginTarget(opts, env) {
 function wantsJson(opts, env) {
   return opts.json === true || env.WSPC_OUTPUT === "json";
 }
-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) => {
+var loginCommand = new Command63("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: () => {
@@ -4053,35 +4088,40 @@ var loginCommand = new Command62("login").description("Log in via OAuth device f
 });
 
 // src/handwritten/commands/logout.ts
-import { Command as Command63 } from "commander";
+import { Command as Command64 } from "commander";
 
 // src/handwritten/auth/logout.ts
 async function runLogout(opts) {
-  const c = await opts.store.read();
-  const envName = opts.envName ?? c.current_env;
-  if (!envName || !c.envs[envName]) return { removed: [] };
-  const env = c.envs[envName];
-  env.accounts ??= {};
-  if (opts.all) {
-    const removed = Object.keys(env.accounts);
-    env.accounts = {};
-    env.current_account = void 0;
-    await opts.store.write(c);
-    return { removed };
-  }
-  const target = opts.email ?? env.current_account ?? (Object.keys(env.accounts).length === 1 ? Object.keys(env.accounts)[0] : void 0);
-  if (!target || !env.accounts[target]) return { removed: [] };
-  delete env.accounts[target];
-  if (env.current_account === target) {
-    const remaining = Object.keys(env.accounts);
-    env.current_account = remaining.length === 1 ? remaining[0] : void 0;
-  }
-  await opts.store.write(c);
-  return { removed: [target], newActive: env.current_account };
+  let removed = [];
+  let newActive;
+  let removedSingleAccount = false;
+  await opts.store.update((c) => {
+    const envName = opts.envName ?? c.current_env;
+    if (!envName || !c.envs[envName]) return;
+    const env = c.envs[envName];
+    env.accounts ??= {};
+    if (opts.all) {
+      removed = Object.keys(env.accounts);
+      env.accounts = {};
+      env.current_account = void 0;
+      return;
+    }
+    const target = opts.email ?? env.current_account ?? (Object.keys(env.accounts).length === 1 ? Object.keys(env.accounts)[0] : void 0);
+    if (!target || !env.accounts[target]) return;
+    delete env.accounts[target];
+    removed = [target];
+    removedSingleAccount = true;
+    if (env.current_account === target) {
+      const remaining = Object.keys(env.accounts);
+      env.current_account = remaining.length === 1 ? remaining[0] : void 0;
+    }
+    newActive = env.current_account;
+  });
+  return removedSingleAccount ? { removed, newActive } : { removed };
 }
 
 // src/handwritten/commands/logout.ts
-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) => {
+var logoutCommand = new Command64("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");
@@ -4094,7 +4134,7 @@ var logoutCommand = new Command63("logout").description("Log out an account (def
 });
 
 // src/handwritten/commands/whoami.ts
-import { Command as Command64 } from "commander";
+import { Command as Command65 } from "commander";
 var ENV_DISPLAY = {
   shape: "object",
   fields: ["name", "api_base", "account", "actor", "agent_label"]
@@ -4121,12 +4161,11 @@ registerRenderer("whoami", (data) => {
   }
 });
 async function backfillActiveEmail(store, envName, email, userId) {
-  const cfg = await store.read();
-  if (rekeyLegacyAccount(cfg, envName, email, userId)) {
-    await store.write(cfg);
-  }
+  await store.update((cfg) => {
+    rekeyLegacyAccount(cfg, envName, email, userId);
+  });
 }
-var whoamiCommand = new Command64("whoami").description("Show the active env, signed-in account, and organization").action(async () => {
+var whoamiCommand = new Command65("whoami").description("Show the active env, signed-in account, and organization").action(async () => {
   const store = new ConfigStore();
   const config = await store.read();
   let resolved;
@@ -4179,8 +4218,8 @@ function printLoggedOut() {
 }
 
 // src/handwritten/commands/config.ts
-import { Command as Command65 } from "commander";
-var configCommand = new Command65("config").description("Manage wspc local config");
+import { Command as Command66 } from "commander";
+var configCommand = new Command66("config").description("Manage wspc local config");
 registerRenderer("config_show", (data) => {
   const d = data;
   if (d.envs.length === 0) {
@@ -4199,24 +4238,24 @@ registerRenderer("config_show", (data) => {
   process.stdout.write(table(headers, rows));
 });
 async function setConfigKey(store, key, value) {
-  const c = await store.read();
-  const resolved = resolveAccount(c, { accountOverride: process.env.WSPC_ACCOUNT });
-  const env = c.envs[resolved.envName];
-  if (!env) throw new Error(`env "${resolved.envName}" not found`);
-  const acct = env.accounts[resolved.email];
-  if (!acct) throw new Error(`account "${resolved.email}" not found`);
-  switch (key) {
-    case "actor":
-      if (value !== "user" && value !== "agent") throw new Error("actor must be 'user' or 'agent'");
-      acct.actor = value;
-      break;
-    case "agent-label":
-      acct.agent_label = value;
-      break;
-    default:
-      throw new Error(`unknown config key: ${key}`);
-  }
-  await store.write(c);
+  await store.update((c) => {
+    const resolved = resolveAccount(c, { accountOverride: process.env.WSPC_ACCOUNT });
+    const env = c.envs[resolved.envName];
+    if (!env) throw new Error(`env "${resolved.envName}" not found`);
+    const acct = env.accounts[resolved.email];
+    if (!acct) throw new Error(`account "${resolved.email}" not found`);
+    switch (key) {
+      case "actor":
+        if (value !== "user" && value !== "agent") throw new Error("actor must be 'user' or 'agent'");
+        acct.actor = value;
+        break;
+      case "agent-label":
+        acct.agent_label = value;
+        break;
+      default:
+        throw new Error(`unknown config key: ${key}`);
+    }
+  });
 }
 configCommand.command("show").description("List configured envs (tokens redacted, current marked with \u2713)").action(async () => {
   const c = await new ConfigStore().read();
@@ -4242,16 +4281,16 @@ configCommand.command("set <key> <value>").description("Set a field on the activ
 });
 configCommand.command("use <env>").description("Switch current_env").action(async (env) => {
   const store = new ConfigStore();
-  const c = await store.read();
-  if (!c.envs[env]) throw new Error(`env "${env}" not found`);
-  c.current_env = env;
-  await store.write(c);
+  await store.update((c) => {
+    if (!c.envs[env]) throw new Error(`env "${env}" not found`);
+    c.current_env = env;
+  });
   process.stdout.write(`\u2713 current_env=${env}
 `);
 });
 
 // src/handwritten/commands/account.ts
-import { Command as Command66 } from "commander";
+import { Command as Command67 } from "commander";
 async function listAccounts(store) {
   const c = await store.read();
   const envName = c.current_env;
@@ -4266,15 +4305,15 @@ async function listAccounts(store) {
   }));
 }
 async function switchAccount(store, email) {
-  const c = await store.read();
-  const envName = c.current_env;
-  if (!envName || !c.envs[envName]) throw new Error("no current env; run `wspc login` first");
-  const env = c.envs[envName];
-  if (!env.accounts?.[email]) {
-    throw new Error(`no account '${email}' in env '${envName}'. Run \`wspc account ls\` or \`wspc login\`.`);
-  }
-  env.current_account = email;
-  await store.write(c);
+  await store.update((c) => {
+    const envName = c.current_env;
+    if (!envName || !c.envs[envName]) throw new Error("no current env; run `wspc login` first");
+    const env = c.envs[envName];
+    if (!env.accounts?.[email]) {
+      throw new Error(`no account '${email}' in env '${envName}'. Run \`wspc account ls\` or \`wspc login\`.`);
+    }
+    env.current_account = email;
+  });
 }
 registerRenderer("account_ls", (data) => {
   const rows = data.accounts;
@@ -4292,7 +4331,7 @@ registerRenderer("account_ls", (data) => {
   ]);
   process.stdout.write(table(headers, body));
 });
-var accountCommand = new Command66("account").description("Manage logged-in accounts");
+var accountCommand = new Command67("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 });
@@ -4304,7 +4343,7 @@ accountCommand.command("switch <email>").description("Set the active account for
 });
 
 // src/handwritten/commands/todo-done.ts
-import { Command as Command67 } from "commander";
+import { Command as Command68 } from "commander";
 var TODO_UPDATE_DISPLAY = {
   shape: "object",
   format: {
@@ -4322,7 +4361,7 @@ var TODO_UPDATE_DISPLAY = {
     deleted_at: "relative-time"
   }
 };
-var todoDoneCommand = new Command67("done").description("Mark a todo done (sugar for `update <id> --status done`)").argument("<id>", "Todo id").action(async (id) => {
+var todoDoneCommand = new Command68("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,
@@ -4341,7 +4380,8 @@ var todoDoneCommand = new Command67("done").description("Mark a todo done (sugar
 });
 
 // src/handwritten/commands/email/send.ts
-import { Command as Command68 } from "commander";
+import { Command as Command69 } from "commander";
+import { randomUUID } from "crypto";
 import { readFile, stat } from "fs/promises";
 import { basename } from "path";
 
@@ -4399,7 +4439,7 @@ async function resolveAttachment(input) {
     `--attach ${input}: neither a readable file nor a valid <prefix>_<ulid>:<idx> reference.`
   );
 }
-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) => {
+var sendCommand = new Command69("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)", []).option("--idempotency-key <key>", "idempotency key (auto-generated if omitted)").action(async (opts) => {
   const isReply = Boolean(opts.reply);
   const to = opts.to;
   const attachInputs = opts.attach;
@@ -4457,7 +4497,9 @@ var sendCommand = new Command68("send").description("Send an outbound email").re
   const body = {
     from_alias_email: opts.from,
     text,
-    idempotency_key: opts.idempotencyKey
+    // Server requires an idempotency_key; a fresh random one makes each send a
+    // distinct request, which is the right default for one-shot CLI sends.
+    idempotency_key: opts.idempotencyKey ?? randomUUID()
   };
   if (isReply) {
     body.in_reply_to_email_id = opts.reply;
@@ -4486,7 +4528,7 @@ var sendCommand = new Command68("send").description("Send an outbound email").re
 });
 
 // src/handwritten/commands/email/attachment.ts
-import { Command as Command69 } from "commander";
+import { Command as Command70 } from "commander";
 import { createWriteStream } from "fs";
 import { Readable } from "stream";
 import { pipeline } from "stream/promises";
@@ -4495,15 +4537,16 @@ import { pipeline } from "stream/promises";
 function parseContentDispositionFilename(header) {
   if (!header) return void 0;
   if (!header.toLowerCase().startsWith("attachment")) return void 0;
-  const quoted = header.match(/filename="([^"]+)"/i);
-  if (quoted) return quoted[1];
+  const quoted = header.match(/filename="([^"]*)"/i);
   const unquoted = header.match(/filename=([^;\s]+)/i);
-  if (unquoted) return unquoted[1];
-  return void 0;
+  const filename = quoted?.[1] ?? unquoted?.[1];
+  if (!filename || filename === "." || filename === "..") return void 0;
+  if (filename.includes("/") || filename.includes("\\")) return void 0;
+  return filename;
 }
 
 // src/handwritten/commands/email/attachment.ts
-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) => {
+var attachmentCommand = new Command70("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}")
@@ -4535,7 +4578,7 @@ var attachmentCommand = new Command69("attachment").description("Download an inb
 });
 
 // src/handwritten/commands/drive/bind.ts
-import { Command as Command70 } from "commander";
+import { Command as Command71 } from "commander";
 import { stat as stat2 } from "fs/promises";
 import { resolve } from "path";
 
@@ -4625,7 +4668,7 @@ async function createDriveApi(opts = {}) {
 
 // src/handwritten/commands/drive/state.ts
 import { mkdir, open, readFile as readFile2, rename, rm, writeFile } from "fs/promises";
-import { randomUUID } from "crypto";
+import { randomUUID as randomUUID2 } from "crypto";
 import { join as join2 } from "path";
 import { DateTime as DateTime4 } from "luxon";
 
@@ -4665,7 +4708,7 @@ async function readDriveState(root) {
 }
 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 tmp = join2(root, DRIVE_DIR, `state.json.tmp-${process.pid}-${randomUUID2()}`);
   const snapshot = JSON.stringify(
     {
       ...state,
@@ -4721,7 +4764,7 @@ async function ensureDriveRealtimeState(root) {
       ...state,
       realtime: {
         ...state.realtime,
-        client_id: `drvcli_${randomUUID().replace(/-/g, "")}`
+        client_id: `drvcli_${randomUUID2().replace(/-/g, "")}`
       }
     };
     await writeDriveState(root, next);
@@ -4798,7 +4841,7 @@ async function assertExistingDirectory(path) {
   }
 }
 function driveBindCommand() {
-  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) => {
+  return new Command71("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();
@@ -4816,10 +4859,10 @@ function driveBindCommand() {
 }
 
 // src/handwritten/commands/drive/sync.ts
-import { Command as Command71 } from "commander";
+import { Command as Command72 } 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";
+import { createHash as createHash3, randomUUID as randomUUID4 } from "crypto";
 
 // src/handwritten/commands/drive/decision.ts
 function decideDriveAction(entry, local, remote) {
@@ -5200,7 +5243,7 @@ async function hashDriveFile(path) {
 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 { createHash as createHash2, randomUUID as randomUUID3 } from "crypto";
 import { Readable as Readable2, Transform } from "stream";
 import { pipeline as pipeline2 } from "stream/promises";
 async function assertLocalStillScanned(localPath, scanned) {
@@ -5215,7 +5258,7 @@ async function assertLocalStillScanned(localPath, scanned) {
 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`);
+  const tmp = join4(dirname(target), `.${basename2(target)}.wspc-merge-${randomUUID3()}.tmp`);
   try {
     await writeFile2(tmp, bytes, { flag: "wx" });
     return await installMergedLocalFile(root, path, tmp, scanned, digest, bytes.byteLength, onLocalMutation);
@@ -5267,7 +5310,7 @@ async function installMergedLocalFile(root, path, tmp, scanned, mergedSha256, me
   }
 }
 async function restoreMergedLocalFile(target, backup, backupSha256, backupSizeBytes, mergedSha256, mergedSizeBytes) {
-  const quarantine = join4(dirname(target), `.${basename2(target)}.wspc-merge-restore-${randomUUID2()}.tmp`);
+  const quarantine = join4(dirname(target), `.${basename2(target)}.wspc-merge-restore-${randomUUID3()}.tmp`);
   try {
     await rename2(target, quarantine);
   } catch (error) {
@@ -5297,7 +5340,7 @@ async function restoreMergedLocalFile(target, backup, backupSha256, backupSizeBy
 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`);
+  const tmp = join4(dirname(target), `.${basename2(target)}.wspc-download-${randomUUID3()}.tmp`);
   try {
     const response = await api.downloadFile(libraryId, path);
     if (!response.body) {
@@ -5431,7 +5474,7 @@ async function localFileExists(path) {
   return digest !== void 0;
 }
 function localMutationBackupPath(target) {
-  return join4(dirname(target), `.${basename2(target)}.wspc-backup-${randomUUID2()}.tmp`);
+  return join4(dirname(target), `.${basename2(target)}.wspc-backup-${randomUUID3()}.tmp`);
 }
 function expectedLocalBaseSha256(entry) {
   return entry?.last_local_sha256 ?? entry?.content_sha256;
@@ -5533,7 +5576,7 @@ async function runDriveSyncOnce(root, api, clock = systemDriveClock) {
   });
 }
 function driveSyncCommand(api) {
-  const sync = new Command71("sync").description("Drive sync commands");
+  const sync = new Command72("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);
@@ -5845,7 +5888,7 @@ async function writeConflictCopy(root, path, side, versionId, bytes, clock) {
     const target = resolveInsideRoot(root, candidate);
     await mkdir3(dirname2(target), { recursive: true });
     for (; ; ) {
-      const tmp = join5(dirname2(target), `.${basename3(target)}.wspc-conflict-${randomUUID3()}.tmp`);
+      const tmp = join5(dirname2(target), `.${basename3(target)}.wspc-conflict-${randomUUID4()}.tmp`);
       let tmpWritten = false;
       try {
         await writeFile3(tmp, bytes, { flag: "wx" });
@@ -5986,7 +6029,7 @@ function containsVersionConflict(value) {
 }
 
 // src/handwritten/commands/drive/watch.ts
-import { Command as Command72 } from "commander";
+import { Command as Command73 } from "commander";
 import chokidar from "chokidar";
 import { relative as relative2, resolve as resolve4 } from "path";
 
@@ -6064,7 +6107,11 @@ function createDriveRealtimeSource(args) {
     const message = parseDriveRealtimeMessage(data);
     if (message.type === "ready") {
       if (message.replayed > 0) {
-        handlers?.onEvent(optionalString({ debounce_ms: 2e3, reason: "ready_replay" }, "cursor", message.cursor));
+        handlers?.onEvent({
+          debounce_ms: 2e3,
+          reason: "ready_replay",
+          ...message.cursor === void 0 ? {} : { cursor: message.cursor }
+        });
       }
       if (message.cursor !== void 0) {
         await persistBestEffort({ ...currentRealtime, last_cursor: message.cursor });
@@ -6072,10 +6119,12 @@ function createDriveRealtimeSource(args) {
       return;
     }
     if (message.type === "library_changed") {
-      handlers?.onEvent(optionalString(optionalString({
+      handlers?.onEvent({
         debounce_ms: 2e3,
-        reason: "library_changed"
-      }, "cursor", message.cursor), "path", message.path));
+        reason: "library_changed",
+        ...message.cursor === void 0 ? {} : { cursor: message.cursor },
+        ...message.path === void 0 ? {} : { path: message.path }
+      });
       if (message.cursor !== void 0) {
         await persistBestEffort({ ...currentRealtime, last_cursor: message.cursor, last_event_at: driveIsoTimestamp(clock) });
       }
@@ -6083,7 +6132,11 @@ function createDriveRealtimeSource(args) {
     }
     if (message.type === "resync_required") {
       const reason = message.reason ?? "resync_required";
-      handlers?.onEvent(optionalString({ immediate: true, reason }, "cursor", message.cursor));
+      handlers?.onEvent({
+        immediate: true,
+        reason,
+        ...message.cursor === void 0 ? {} : { cursor: message.cursor }
+      });
       if (message.cursor !== void 0 || isInvalidCursorReason(reason)) {
         await persistBestEffort(resyncRealtimeState(currentRealtime, message.cursor, reason, driveIsoTimestamp(clock)));
       }
@@ -6148,22 +6201,37 @@ function parseDriveRealtimeMessage(raw) {
   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);
+    return {
+      type: "ready",
+      replayed: typeof value.replayed === "number" ? value.replayed : 0,
+      ...cursor === void 0 ? {} : { cursor }
+    };
   }
   if (messageType === "library_changed") {
-    return optionalString(optionalString({ type: "library_changed" }, "cursor", cursor), "path", value.path);
+    return {
+      type: "library_changed",
+      ...cursor === void 0 ? {} : { cursor },
+      ...typeof value.path === "string" ? { path: value.path } : {}
+    };
   }
   if (messageType === "resync_required") {
-    return optionalString(optionalString({ type: "resync_required" }, "cursor", cursor), "reason", value.reason);
+    return {
+      type: "resync_required",
+      ...cursor === void 0 ? {} : { cursor },
+      ...typeof value.reason === "string" ? { 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 {
+      type: "error",
+      ...typeof value.code === "string" ? { code: value.code } : {},
+      ...typeof value.message === "string" ? { message: redactedRealtimeError(value.message) } : {}
+    };
   }
-  return optionalString({ type: "unknown" }, "message_type", messageType);
+  return {
+    type: "unknown",
+    ...messageType === void 0 ? {} : { message_type: messageType }
+  };
 }
 function redactedRealtimeError(error) {
   const text = error instanceof Error ? error.message : String(error);
@@ -6187,7 +6255,11 @@ function resyncRealtimeState(realtime, cursor, reason, lastEventAt) {
     const { last_cursor: _lastCursor, ...next } = realtime;
     return { ...next, last_event_at: lastEventAt };
   }
-  return optionalString({ ...realtime, last_event_at: lastEventAt }, "last_cursor", cursor);
+  return {
+    ...realtime,
+    last_event_at: lastEventAt,
+    ...cursor === void 0 ? {} : { last_cursor: cursor }
+  };
 }
 function isInvalidCursorReason(reason) {
   return /\bcursor[_ -]?(invalid|expired|gone|missing|not[_ -]?found)\b|\binvalid[_ -]?cursor\b/i.test(reason);
@@ -6195,12 +6267,6 @@ function isInvalidCursorReason(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);
@@ -6402,7 +6468,7 @@ async function runDriveWatch(root, options = {}) {
   }
 }
 function driveWatchCommand(options = {}) {
-  return new Command72("watch").description("Watch a bound Drive folder and sync local changes").argument("[path]", "local folder path", ".").action(async (path) => {
+  return new Command73("watch").description("Watch a bound Drive folder and sync local changes").argument("[path]", "local folder path", ".").action(async (path) => {
     await runDriveWatch(resolve4(path), options);
   });
 }
@@ -6466,7 +6532,7 @@ function waitForStopSignal(onRegistered) {
 function mountDriveCommands(program) {
   let drive = program.commands.find((c) => c.name() === "drive");
   if (!drive) {
-    drive = new Command73("drive").description("Drive commands");
+    drive = new Command74("drive").description("Drive commands");
     program.addCommand(drive);
   }
   if (!drive.commands.some((c) => c.name() === "bind")) {
@@ -6492,7 +6558,7 @@ function isCliEntrypoint(argv = process.argv, metaUrl = import.meta.url) {
   }
 }
 function buildProgram() {
-  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 program = new Command74().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);