@wspc/cli 0.1.3 → 0.1.4

package/dist/cli.js

@@ -1464,9 +1464,9 @@ function createConsistencyFetch(opts) {
 }
 
 // src/version.ts
-var VERSION = "0.1.3";
+var VERSION = "0.1.4";
 var SPEC_SHA = "e0bbc1e3";
-var SPEC_FETCHED_AT = "2026-06-22T01:23:52.693Z";
+var SPEC_FETCHED_AT = "2026-06-22T06:55:37.490Z";
 var API_BASE = "https://api.wspc.ai";
 
 // src/index.ts
@@ -3294,7 +3294,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;
   }
 });
 
@@ -3872,13 +3872,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 +3896,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 +3964,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 +4013,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}"`)}`);
 }
@@ -4057,27 +4065,32 @@ import { Command as Command63 } 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
@@ -4121,10 +4134,9 @@ 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 () => {
   const store = new ConfigStore();
@@ -4199,24 +4211,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,10 +4254,10 @@ 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}
 `);
 });
@@ -4266,15 +4278,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;
@@ -4495,11 +4507,12 @@ 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
@@ -6064,7 +6077,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 +6089,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 +6102,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 +6171,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 +6225,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 +6237,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);