commonswarm 0.1.37 → 0.1.39

package/cswarm.cjs

@@ -13520,7 +13520,7 @@ __export(cli_exports, {
   resolveTurnBudgetOrDefer: () => resolveTurnBudgetOrDefer
 });
 module.exports = __toCommonJS(cli_exports);
-var import_node_crypto19 = require("node:crypto");
+var import_node_crypto20 = require("node:crypto");
 var import_node_fs7 = require("node:fs");
 var import_promises11 = require("node:fs/promises");
 var import_node_path20 = require("node:path");
@@ -28940,6 +28940,21 @@ function parseMemberRow(value) {
     display_name: row.display_name
   };
 }
+function parseAgentIdentity(value) {
+  if (!value || typeof value !== "object" || Array.isArray(value)) {
+    throw new Error("member read returned a malformed credential identity");
+  }
+  const row = value;
+  if (row.credential_valid !== true) {
+    throw new Error("member read returned a malformed credential validity");
+  }
+  return {
+    credential_valid: true,
+    owner_user_id: checkedUuid2(row.owner_user_id, "identity owner_user_id"),
+    principal_id: checkedUuid2(row.principal_id, "identity principal_id"),
+    workspace_id: checkedUuid2(row.workspace_id, "identity workspace_id")
+  };
+}
 async function readAgentSignalDirectory(target2, token, workspaceId2, fetcherOrOptions = fetch) {
   const options = normalizeReadOptions(fetcherOrOptions);
   let result;
@@ -28983,7 +28998,8 @@ async function readAgentSignalDirectory(target2, token, workspaceId2, fetcherOrO
   })();
   return {
     members: payload.members.map(parseMemberRow),
-    agents
+    agents,
+    ...payload.identity === void 0 ? {} : { identity: parseAgentIdentity(payload.identity) }
   };
 }
 function resolveSignalRecipient(selector, directory) {
@@ -33435,6 +33451,7 @@ var FileListenerEffectStore = class {
 };
 
 // src/listener/grok-model.ts
+var import_node_crypto14 = require("node:crypto");
 var import_promises5 = require("node:fs/promises");
 var import_node_os7 = require("node:os");
 var import_node_path11 = require("node:path");
@@ -33679,7 +33696,7 @@ var GrokListenerModel = class {
       clientName: "cswarm-listener"
     });
     try {
-      await handle.session.enablePromptsAfterCanary();
+      await this.enablePromptsAfterGrokCanary(handle);
       this.workerCanary = false;
       this.worker = handle;
       return handle;
@@ -33688,6 +33705,37 @@ var GrokListenerModel = class {
       throw error;
     }
   }
+  /** Force Grok's measured shell permission path without changing worker cwd. */
+  async enablePromptsAfterGrokCanary(handle) {
+    const sentinelPath = (0, import_node_path11.join)(
+      (0, import_node_os7.tmpdir)(),
+      `cswarm-grok-permission-canary-${process.pid}-${(0, import_node_crypto14.randomUUID)()}`
+    );
+    let canaryError;
+    try {
+      await handle.session.enablePromptsAfterCanary({
+        timeoutMs: ACP_CANARY_TIMEOUT_MS,
+        probeText: `Use a shell command to create ${sentinelPath} with content CSWARM_CANARY_NOOP. You must use the shell. Do nothing else.`,
+        ...this.options.onCanaryAttempt ? { onAttempt: this.options.onCanaryAttempt } : {}
+      });
+    } catch (error) {
+      canaryError = error;
+    }
+    let sentinelCreated = false;
+    try {
+      await (0, import_promises5.lstat)(sentinelPath);
+      sentinelCreated = true;
+      await (0, import_promises5.unlink)(sentinelPath);
+    } catch (error) {
+      if (error.code !== "ENOENT") throw error;
+    }
+    if (sentinelCreated) {
+      throw new AcpPermissionCanaryError(
+        "Grok bridge wrote the permission canary sentinel; permission denial did not block the write"
+      );
+    }
+    if (canaryError !== void 0) throw canaryError;
+  }
   /** Validate the operator's login artifact without copying or replacing its home. */
   async validateLocalAuth() {
     if (this.options.open) return;
@@ -33744,7 +33792,7 @@ var GrokListenerModel = class {
 };
 
 // src/listener/opencode-model.ts
-var import_node_crypto14 = require("node:crypto");
+var import_node_crypto15 = require("node:crypto");
 var import_promises6 = require("node:fs/promises");
 var import_node_path12 = require("node:path");
 function asError(error) {
@@ -33770,7 +33818,7 @@ var OpenCodeListenerModel = class {
   prepareWorkerCwd;
   permissionMode;
   pendingOpenWaitMs;
-  instanceId = (0, import_node_crypto14.randomUUID)();
+  instanceId = (0, import_node_crypto15.randomUUID)();
   worker = null;
   workerHome = null;
   /** Worker homes retained after failed close or unsettled open. */
@@ -34132,7 +34180,13 @@ var OpenCodeListenerModel = class {
       if (this.closed || this.cancelled || generation !== this.openGeneration) {
         await this.performSingleOwnerCleanup(handle, home, this.instanceId, pending);
       }
-      await handle.session.enablePromptsAfterCanary();
+      if (this.options.onCanaryAttempt) {
+        await handle.session.enablePromptsAfterCanary({
+          onAttempt: this.options.onCanaryAttempt
+        });
+      } else {
+        await handle.session.enablePromptsAfterCanary();
+      }
       if (this.closed || this.cancelled || generation !== this.openGeneration) {
         await this.performSingleOwnerCleanup(handle, home, this.instanceId, pending);
       }
@@ -34177,7 +34231,7 @@ var OpenCodeListenerModel = class {
 };
 
 // src/listener/claude-model.ts
-var import_node_crypto15 = require("node:crypto");
+var import_node_crypto16 = require("node:crypto");
 var import_promises7 = require("node:fs/promises");
 var import_node_os8 = require("node:os");
 var import_node_path13 = require("node:path");
@@ -34320,13 +34374,14 @@ var ClaudeListenerModel = class {
   async enablePromptsAfterClaudeCanary(handle) {
     const sentinelPath = (0, import_node_path13.join)(
       (0, import_node_os8.tmpdir)(),
-      `cswarm-claude-permission-canary-${process.pid}-${(0, import_node_crypto15.randomUUID)()}`
+      `cswarm-claude-permission-canary-${process.pid}-${(0, import_node_crypto16.randomUUID)()}`
     );
     let sentinelCreated = false;
     try {
       await handle.session.enablePromptsAfterCanary({
         timeoutMs: ACP_CANARY_TIMEOUT_MS,
-        probeText: `Create the file ${sentinelPath} using the Write tool with content CSWARM_CANARY_NOOP. You must use the Write tool. Do nothing else.`
+        probeText: `Create the file ${sentinelPath} using the Write tool with content CSWARM_CANARY_NOOP. You must use the Write tool. Do nothing else.`,
+        ...this.options.onCanaryAttempt ? { onAttempt: this.options.onCanaryAttempt } : {}
       });
     } finally {
       try {
@@ -34346,7 +34401,7 @@ var ClaudeListenerModel = class {
 };
 
 // src/listener/codex-model.ts
-var import_node_crypto16 = require("node:crypto");
+var import_node_crypto17 = require("node:crypto");
 var import_promises8 = require("node:fs/promises");
 var import_node_os9 = require("node:os");
 var import_node_path14 = require("node:path");
@@ -34489,13 +34544,14 @@ var CodexListenerModel = class {
   async enablePromptsAfterCodexCanary(handle) {
     const sentinelPath = (0, import_node_path14.join)(
       (0, import_node_os9.tmpdir)(),
-      `cswarm-codex-permission-canary-${process.pid}-${(0, import_node_crypto16.randomUUID)()}`
+      `cswarm-codex-permission-canary-${process.pid}-${(0, import_node_crypto17.randomUUID)()}`
     );
     let sentinelCreated = false;
     try {
       await handle.session.enablePromptsAfterCanary({
         timeoutMs: ACP_CANARY_TIMEOUT_MS,
-        probeText: `Use a shell command to create ${sentinelPath} with content CSWARM_CANARY_NOOP. You must use the shell. Do nothing else.`
+        probeText: `Use a shell command to create ${sentinelPath} with content CSWARM_CANARY_NOOP. You must use the shell. Do nothing else.`,
+        ...this.options.onCanaryAttempt ? { onAttempt: this.options.onCanaryAttempt } : {}
       });
     } finally {
       try {
@@ -34515,7 +34571,7 @@ var CodexListenerModel = class {
 };
 
 // src/listener/runtime.ts
-var import_node_crypto17 = require("node:crypto");
+var import_node_crypto18 = require("node:crypto");
 
 // src/cloud/delivery.ts
 var UUID_RE12 = /^[0-9a-f]{8}-[0-9a-f]{4}-[1-8][0-9a-f]{3}-[89ab][0-9a-f]{3}-[0-9a-f]{12}$/i;
@@ -35471,7 +35527,7 @@ function sameEffectSignal(record, signal) {
   return record.signalId === signal.id.toLowerCase() && record.signalKind === signal.kind && record.askBody === signal.body && record.askUntil === signal.until && record.senderOwnerRelation === (signal.sender_owner_relation ?? "unknown");
 }
 function immutableSignalFingerprint(signalId, signalKind2, body, until, senderOwnerRelation) {
-  return (0, import_node_crypto17.createHash)("sha256").update(JSON.stringify([
+  return (0, import_node_crypto18.createHash)("sha256").update(JSON.stringify([
     signalId,
     signalKind2,
     body,
@@ -36461,6 +36517,7 @@ var STATUS_ALLOWED_KEYS = /* @__PURE__ */ new Set([
   "stoppedAt",
   "lastSignalId",
   "lastErrorCode",
+  "lastErrorDetail",
   "providerVersion",
   "providerLastMeasuredVersion",
   "lastWorkerStderrTail",
@@ -36522,7 +36579,7 @@ function parseStatus(raw) {
   const nullableUuid2 = (candidate) => candidate === null || typeof candidate === "string" && UUID_RE15.test(candidate);
   const nullableCount = (candidate) => candidate === null || typeof candidate === "number" && Number.isSafeInteger(candidate) && candidate >= 0;
   const nullableTimestamp2 = (candidate) => candidate === null || typeof candidate === "string" && Number.isFinite(Date.parse(candidate));
-  if (row.version !== 1 || typeof row.instanceId !== "string" || !UUID_RE15.test(row.instanceId) || row.provider !== "grok" && row.provider !== "opencode" && row.provider !== "claude" && row.provider !== "codex" || typeof row.profileId !== "string" || typeof row.workspaceId !== "string" || !UUID_RE15.test(row.workspaceId) || typeof row.principalId !== "string" || !UUID_RE15.test(row.principalId) || !Number.isSafeInteger(row.pid) || row.pid < 1 || typeof row.state !== "string" || !["starting", "ready", "stopping", "stopped", "failed"].includes(row.state) || typeof row.startedAt !== "string" || !Number.isFinite(Date.parse(row.startedAt)) || !(row.readyAt === null || typeof row.readyAt === "string" && Number.isFinite(Date.parse(row.readyAt))) || typeof row.updatedAt !== "string" || !Number.isFinite(Date.parse(row.updatedAt)) || !(row.stoppedAt === null || typeof row.stoppedAt === "string" && Number.isFinite(Date.parse(row.stoppedAt))) || !nullableUuid2(row.lastSignalId) || !(row.lastErrorCode === null || typeof row.lastErrorCode === "string" && /^[a-z0-9_-]{1,96}$/.test(row.lastErrorCode)) || !(row.providerVersion === void 0 || row.providerVersion === null || typeof row.providerVersion === "string" && SEMVER_RE2.test(row.providerVersion)) || !(row.providerLastMeasuredVersion === void 0 || row.providerLastMeasuredVersion === null || typeof row.providerLastMeasuredVersion === "string" && SEMVER_RE2.test(row.providerLastMeasuredVersion)) || (row.providerVersion === null || row.providerVersion === void 0) !== (row.providerLastMeasuredVersion === null || row.providerLastMeasuredVersion === void 0) || !(row.lastWorkerStderrTail === void 0 || row.lastWorkerStderrTail === null || typeof row.lastWorkerStderrTail === "string" && row.lastWorkerStderrTail.length > 0 && row.lastWorkerStderrTail.length <= 2048 && !/swm_(?:agt|inv|cap)_/i.test(row.lastWorkerStderrTail)) || typeof row.logPath !== "string" || !(0, import_node_path16.isAbsolute)(row.logPath) || !(row.deliveryMode === void 0 || row.deliveryMode === null || typeof row.deliveryMode === "string" && STATUS_DELIVERY_MODES.has(row.deliveryMode)) || !(row.pendingDeliveryCount === void 0 || nullableCount(row.pendingDeliveryCount)) || !(row.lastTerminalDeliveryFailureCount === void 0 || nullableCount(row.lastTerminalDeliveryFailureCount)) || !(row.lastTerminalDeliveryFailureAt === void 0 || nullableTimestamp2(row.lastTerminalDeliveryFailureAt)) || !(row.lastClaimAt === void 0 || nullableTimestamp2(row.lastClaimAt)) || !(row.lastAckAt === void 0 || nullableTimestamp2(row.lastAckAt)) || !(row.routeMode === void 0 || row.routeMode === "worker" || row.routeMode === "main" || row.routeMode === "split") || !(row.deferOverChars === void 0 || row.deferOverChars === null || typeof row.deferOverChars === "number" && Number.isSafeInteger(row.deferOverChars) && row.deferOverChars >= 1 && row.deferOverChars <= 1e4) || !(row.pendingForMainCount === void 0 || typeof row.pendingForMainCount === "number" && Number.isSafeInteger(row.pendingForMainCount) && row.pendingForMainCount >= 0) || !(row.droppedForMainCount === void 0 || typeof row.droppedForMainCount === "number" && Number.isSafeInteger(row.droppedForMainCount) && row.droppedForMainCount >= 0)) {
+  if (row.version !== 1 || typeof row.instanceId !== "string" || !UUID_RE15.test(row.instanceId) || row.provider !== "grok" && row.provider !== "opencode" && row.provider !== "claude" && row.provider !== "codex" || typeof row.profileId !== "string" || typeof row.workspaceId !== "string" || !UUID_RE15.test(row.workspaceId) || typeof row.principalId !== "string" || !UUID_RE15.test(row.principalId) || !Number.isSafeInteger(row.pid) || row.pid < 1 || typeof row.state !== "string" || !["starting", "ready", "stopping", "stopped", "failed"].includes(row.state) || typeof row.startedAt !== "string" || !Number.isFinite(Date.parse(row.startedAt)) || !(row.readyAt === null || typeof row.readyAt === "string" && Number.isFinite(Date.parse(row.readyAt))) || typeof row.updatedAt !== "string" || !Number.isFinite(Date.parse(row.updatedAt)) || !(row.stoppedAt === null || typeof row.stoppedAt === "string" && Number.isFinite(Date.parse(row.stoppedAt))) || !nullableUuid2(row.lastSignalId) || !(row.lastErrorCode === null || typeof row.lastErrorCode === "string" && /^[a-z0-9_-]{1,96}$/.test(row.lastErrorCode)) || !(row.lastErrorDetail === void 0 || row.lastErrorDetail === null || typeof row.lastErrorDetail === "string" && row.lastErrorDetail.length > 0 && row.lastErrorDetail.length <= 2048 && !/swm_(?:agt|inv|cap)_/i.test(row.lastErrorDetail)) || !(row.providerVersion === void 0 || row.providerVersion === null || typeof row.providerVersion === "string" && SEMVER_RE2.test(row.providerVersion)) || !(row.providerLastMeasuredVersion === void 0 || row.providerLastMeasuredVersion === null || typeof row.providerLastMeasuredVersion === "string" && SEMVER_RE2.test(row.providerLastMeasuredVersion)) || (row.providerVersion === null || row.providerVersion === void 0) !== (row.providerLastMeasuredVersion === null || row.providerLastMeasuredVersion === void 0) || !(row.lastWorkerStderrTail === void 0 || row.lastWorkerStderrTail === null || typeof row.lastWorkerStderrTail === "string" && row.lastWorkerStderrTail.length > 0 && row.lastWorkerStderrTail.length <= 2048 && !/swm_(?:agt|inv|cap)_/i.test(row.lastWorkerStderrTail)) || typeof row.logPath !== "string" || !(0, import_node_path16.isAbsolute)(row.logPath) || !(row.deliveryMode === void 0 || row.deliveryMode === null || typeof row.deliveryMode === "string" && STATUS_DELIVERY_MODES.has(row.deliveryMode)) || !(row.pendingDeliveryCount === void 0 || nullableCount(row.pendingDeliveryCount)) || !(row.lastTerminalDeliveryFailureCount === void 0 || nullableCount(row.lastTerminalDeliveryFailureCount)) || !(row.lastTerminalDeliveryFailureAt === void 0 || nullableTimestamp2(row.lastTerminalDeliveryFailureAt)) || !(row.lastClaimAt === void 0 || nullableTimestamp2(row.lastClaimAt)) || !(row.lastAckAt === void 0 || nullableTimestamp2(row.lastAckAt)) || !(row.routeMode === void 0 || row.routeMode === "worker" || row.routeMode === "main" || row.routeMode === "split") || !(row.deferOverChars === void 0 || row.deferOverChars === null || typeof row.deferOverChars === "number" && Number.isSafeInteger(row.deferOverChars) && row.deferOverChars >= 1 && row.deferOverChars <= 1e4) || !(row.pendingForMainCount === void 0 || typeof row.pendingForMainCount === "number" && Number.isSafeInteger(row.pendingForMainCount) && row.pendingForMainCount >= 0) || !(row.droppedForMainCount === void 0 || typeof row.droppedForMainCount === "number" && Number.isSafeInteger(row.droppedForMainCount) && row.droppedForMainCount >= 0)) {
     throw new Error("stored listener status is malformed");
   }
   const routeMode = row.routeMode ?? "worker";
@@ -36538,6 +36595,7 @@ function parseStatus(raw) {
     lastTerminalDeliveryFailureAt: row.lastTerminalDeliveryFailureAt ?? null,
     lastClaimAt: row.lastClaimAt ?? null,
     lastAckAt: row.lastAckAt ?? null,
+    lastErrorDetail: row.lastErrorDetail ?? null,
     lastWorkerStderrTail: row.lastWorkerStderrTail ?? null,
     providerVersion: row.providerVersion ?? null,
     providerLastMeasuredVersion: row.providerLastMeasuredVersion ?? null,
@@ -36555,6 +36613,9 @@ async function writeListenerStatus(paths, status) {
       throw new Error("listener status is missing delivery metadata fields");
     }
   }
+  if (!("lastErrorDetail" in parsed)) {
+    throw new Error("listener status is missing local error detail metadata");
+  }
   parseStatus(serialized);
   await writeSecureJsonFile(paths.statusPath, serialized);
 }
@@ -36572,6 +36633,9 @@ async function appendListenerEvent(paths, event) {
     "status",
     "failure_code",
     "attempt",
+    "total",
+    "passed",
+    "reason",
     "delay_ms",
     "index",
     "delivery_mode",
@@ -36608,6 +36672,15 @@ async function appendListenerEvent(paths, event) {
     if (!allowed.has(key2)) {
       throw new Error(`listener event field is not allowed: ${key2}`);
     }
+    if ((key2 === "attempt" || key2 === "total") && !(typeof value === "number" && Number.isSafeInteger(value) && value >= 1)) {
+      throw new Error("listener event attempt count is not allowed");
+    }
+    if (key2 === "passed" && typeof value !== "boolean") {
+      throw new Error("listener event canary result is not allowed");
+    }
+    if (key2 === "reason" && !(value === null || typeof value === "string" && value.length > 0)) {
+      throw new Error("listener event canary reason is not allowed");
+    }
     if (key2 === "delivery_mode" && !(value === null || typeof value === "string" && deliveryModes.has(value))) {
       throw new Error("listener event delivery mode is not allowed");
     }
@@ -36642,6 +36715,9 @@ async function appendListenerEvent(paths, event) {
       throw new Error("listener event contains unsafe text");
     }
   }
+  if (event.event === "listener_canary_attempt" && (typeof event.attempt !== "number" || typeof event.total !== "number" || event.attempt > event.total || typeof event.passed !== "boolean" || !(event.reason === null || typeof event.reason === "string"))) {
+    throw new Error("listener canary attempt event is incomplete");
+  }
   await ensureSecureStateDirectory(paths.instanceDirectory);
   const serialized = `${JSON.stringify(event)}
 `;
@@ -36871,7 +36947,7 @@ async function queryListenerControl(paths, command2, timeoutMs = CONTROL_TIMEOUT
 }
 
 // src/listener/supervisor.ts
-var import_node_crypto18 = require("node:crypto");
+var import_node_crypto19 = require("node:crypto");
 var UUID_RE16 = /^[0-9a-f]{8}-[0-9a-f]{4}-[1-8][0-9a-f]{3}-[89ab][0-9a-f]{3}-[0-9a-f]{12}$/i;
 var LISTENER_RESTART_MAX_ATTEMPTS = 5;
 var LISTENER_RESTART_INITIAL_MS = 1e3;
@@ -36915,6 +36991,17 @@ function safeErrorCode(error) {
   const name = error.name.toLowerCase().replace(/[^a-z0-9_-]+/g, "_");
   return name.slice(0, 96) || "listener_error";
 }
+function localDiagnostic(message, maxChars) {
+  const redacted = message.replace(
+    /swm_(?:agt|inv|cap)_[^\s"'\\]*/gi,
+    "[redacted]"
+  ).trim();
+  if (redacted.length === 0) return null;
+  return redacted.slice(0, maxChars);
+}
+function safeErrorDetail(error) {
+  return localDiagnostic(error.message, 2048);
+}
 var TAIL_SERIALIZED_BUDGET_BYTES = 3e3;
 function fitWorkerStderrTailForLog(tail) {
   let fitted = tail.trim();
@@ -36936,7 +37023,7 @@ async function runListenerSupervisor(options) {
   const now = options.now ?? Date.now;
   const startedAt = iso2(now);
   const controller = new AbortController();
-  const proposedInstanceId = (0, import_node_crypto18.randomUUID)();
+  const proposedInstanceId = (0, import_node_crypto19.randomUUID)();
   let status = {
     version: 1,
     instanceId: proposedInstanceId,
@@ -36953,6 +37040,7 @@ async function runListenerSupervisor(options) {
     stoppedAt: null,
     lastSignalId: null,
     lastErrorCode: null,
+    lastErrorDetail: null,
     providerVersion: null,
     providerLastMeasuredVersion: null,
     lastWorkerStderrTail: null,
@@ -37028,6 +37116,7 @@ async function runListenerSupervisor(options) {
       transition("ready", {
         readyAt: event.ts,
         lastErrorCode: null,
+        lastErrorDetail: null,
         lastWorkerStderrTail: null,
         providerVersion: versionNotice?.runningVersion ?? null,
         providerLastMeasuredVersion: versionNotice?.lastMeasuredVersion ?? null
@@ -37035,6 +37124,17 @@ async function runListenerSupervisor(options) {
       log({ ts: event.ts, event: "listener_ready" });
       return;
     }
+    if (event.type === "canary_attempt") {
+      log({
+        ts: event.ts,
+        event: "listener_canary_attempt",
+        attempt: event.attempt,
+        total: event.total,
+        passed: event.passed,
+        reason: event.reason === null ? null : localDiagnostic(event.reason, 128)
+      });
+      return;
+    }
     if (event.type === "effect") {
       status = {
         ...status,
@@ -37228,6 +37328,7 @@ async function runListenerSupervisor(options) {
       transition("starting", {
         readyAt: null,
         lastErrorCode: restartCode,
+        lastErrorDetail: safeErrorDetail(stop.error),
         lastWorkerStderrTail: restartStderrTail,
         providerVersion: null,
         providerLastMeasuredVersion: null
@@ -37243,6 +37344,7 @@ async function runListenerSupervisor(options) {
       transition("stopped", {
         stoppedAt,
         lastErrorCode: null,
+        lastErrorDetail: null,
         lastWorkerStderrTail: null
       });
       log({ ts: stoppedAt, event: "listener_stopped" });
@@ -37252,6 +37354,7 @@ async function runListenerSupervisor(options) {
       transition("failed", {
         stoppedAt,
         lastErrorCode: code,
+        lastErrorDetail: safeErrorDetail(stop.error),
         lastWorkerStderrTail: failedStderrTail
       });
       log({
@@ -37273,6 +37376,9 @@ async function runListenerSupervisor(options) {
     transition("failed", {
       stoppedAt,
       lastErrorCode: code,
+      lastErrorDetail: safeErrorDetail(
+        error instanceof Error ? error : new Error(String(error))
+      ),
       lastWorkerStderrTail: failedStderrTail
     });
     log({
@@ -38743,6 +38849,7 @@ async function runListenerHookCheck(options = {}) {
 var import_meta = {};
 var KNOWN_FLAGS = /* @__PURE__ */ new Set([
   "about",
+  "agent-token-file",
   "agent-token-stdin",
   "all-devices",
   "anon-key",
@@ -38832,8 +38939,8 @@ var ACCEPTED_AGENT_CREDENTIAL_MESSAGES = [
   AGENT_CREDENTIAL_MESSAGE_D088
 ];
 function packageVersion() {
-  if ("0.1.37".length > 0) {
-    return "0.1.37";
+  if ("0.1.39".length > 0) {
+    return "0.1.39";
   }
   try {
     const value = JSON.parse(
@@ -38922,7 +39029,7 @@ var Arguments = class {
 };
 var TARGET_FLAGS = ["url", "anon-key", "force-file-store"];
 var ROUTE_FLAGS = ["workspace-id", "repo-mapping-id"];
-var CREDENTIAL_FLAGS = ["agent-token-stdin"];
+var CREDENTIAL_FLAGS = ["agent-token-file", "agent-token-stdin"];
 var TASK_FLAGS = [
   "task-id",
   "slug",
@@ -38938,6 +39045,8 @@ var TASK_FLAGS = [
 var UsageError = class extends Error {
 };
 function usage() {
+  const agentCredential2 = "[--agent-token-file <path> | --agent-token-stdin]";
+  const requiredAgentCredential = "(--agent-token-file <path> | --agent-token-stdin)";
   return `cswarm ${CLI_BUILD_VERSION} (protocol ${CLIENT_PROTOCOL_VERSION})
 
 Usage:
@@ -38947,23 +39056,24 @@ Usage:
   cswarm target set --url <project-url> --anon-key <key> [--json]
   cswarm target clear [--json]
   cswarm status [--url <url> --anon-key <key>] [--workspace-id <uuid>] [--json]
-  cswarm members [--url <url> --anon-key <key>] [--workspace-id <uuid>] [--agent-token-stdin] [--json]
-  cswarm working-on "<what>" [--url <url> --anon-key <key>] [--workspace-id <uuid>] [--about <ref>] [--until <dur>] [--json]
-  cswarm note "<text>" [--url <url> --anon-key <key>] [--workspace-id <uuid>] [--to <member|agent>] [--about <ref>] [--until <dur>] [--json]  # text: 1..8000 characters
-  cswarm ask "<text>" [--url <url> --anon-key <key>] [--workspace-id <uuid>] [--to <member|agent>] [--about <ref>] [--until <dur>] [--wait <seconds>] [--json]  # text: 1..8000 characters
-  cswarm reply <signal-id> "<text>" [--url <url> --anon-key <key>] [--workspace-id <uuid>] [--until <dur>] [--json]
-  cswarm receipt <signal-id> --agent-token-stdin [--url <url> --anon-key <key>] --workspace-id <uuid> [--json]
-  cswarm feed [--url <url> --anon-key <key>] [--workspace-id <uuid>] [--about <ref>] [--kind <kind>] [--since <timestamp>] [--limit <n>] [--include-stale] [--json]
-  cswarm inbox [--url <url> --anon-key <key>] [--workspace-id <uuid>] [--kind <kind>] [--about <ref>] [--since <timestamp>] [--limit <n>] [--include-stale] [--wait <seconds>] [--json]
-  cswarm inbox --notify --agent-token-stdin [--url <url> --anon-key <key>] --workspace-id <uuid> [--json]
-  cswarm inbox --follow --ndjson [--url <url> --anon-key <key>] [--workspace-id <uuid>] [--kind <kind>] [--about <ref>] [--since <timestamp>] [--limit <n>] [--include-stale]
-  cswarm file put <local-path> [--name <name>] [--url <url> --anon-key <key>] [--workspace-id <uuid>] [--agent-token-stdin] [--json]
-  cswarm file ls [--include-tombstoned] [--url <url> --anon-key <key>] [--workspace-id <uuid>] [--agent-token-stdin] [--json]
-  cswarm file get <name|file-id> [--version <n>] [--out <local-path>] [--force] [--url <url> --anon-key <key>] [--workspace-id <uuid>] [--agent-token-stdin] [--json]
-  cswarm file rm <name|file-id> [--url <url> --anon-key <key>] [--workspace-id <uuid>] [--agent-token-stdin] [--json]
-  cswarm file restore <name|file-id> [--url <url> --anon-key <key>] [--workspace-id <uuid>] [--agent-token-stdin] [--json]
-  cswarm feedback "<text>" --kind bug|idea|friction [--about <ref>] [--url <url> --anon-key <key>] [--workspace-id <uuid>] [--agent-token-stdin] [--json]
-  cswarm listen start --agent-token-stdin [--url <url> --anon-key <key>] --workspace-id <uuid> --provider grok|opencode|claude|codex [--cwd <absolute-path>] [--model <model>] [--effort <level>] [--permissions deny|allow] [--grok-executable <path>] [--opencode-executable <path>] [--claude-executable <path>] [--codex-executable <path>] [--turn-budget <duration>] [--route worker|main|split] [--defer-over <chars>] [--foreground] [--json]
+  cswarm whoami ${requiredAgentCredential} [--url <url> --anon-key <key>] [--workspace-id <uuid>] [--json]
+  cswarm members [--url <url> --anon-key <key>] [--workspace-id <uuid>] ${agentCredential2} [--json]
+  cswarm working-on "<what>" [--url <url> --anon-key <key>] [--workspace-id <uuid>] ${agentCredential2} [--about <ref>] [--until <dur>] [--json]
+  cswarm note "<text>" [--url <url> --anon-key <key>] [--workspace-id <uuid>] ${agentCredential2} [--to <member|agent>] [--about <ref>] [--until <dur>] [--json]  # text: 1..8000 characters
+  cswarm ask "<text>" [--url <url> --anon-key <key>] [--workspace-id <uuid>] ${agentCredential2} [--to <member|agent>] [--about <ref>] [--until <dur>] [--wait <seconds>] [--json]  # text: 1..8000 characters
+  cswarm reply <signal-id> "<text>" [--url <url> --anon-key <key>] [--workspace-id <uuid>] ${agentCredential2} [--until <dur>] [--json]
+  cswarm receipt <signal-id> ${requiredAgentCredential} [--url <url> --anon-key <key>] --workspace-id <uuid> [--json]
+  cswarm feed [--url <url> --anon-key <key>] [--workspace-id <uuid>] ${agentCredential2} [--about <ref>] [--kind <kind>] [--since <timestamp>] [--limit <n>] [--include-stale] [--json]
+  cswarm inbox [--url <url> --anon-key <key>] [--workspace-id <uuid>] ${agentCredential2} [--kind <kind>] [--about <ref>] [--since <timestamp>] [--limit <n>] [--include-stale] [--wait <seconds>] [--json]
+  cswarm inbox --notify ${requiredAgentCredential} [--url <url> --anon-key <key>] --workspace-id <uuid> [--json]
+  cswarm inbox --follow --ndjson [--url <url> --anon-key <key>] [--workspace-id <uuid>] ${agentCredential2} [--kind <kind>] [--about <ref>] [--since <timestamp>] [--limit <n>] [--include-stale]
+  cswarm file put <local-path> [--name <name>] [--url <url> --anon-key <key>] [--workspace-id <uuid>] ${agentCredential2} [--json]
+  cswarm file ls [--include-tombstoned] [--url <url> --anon-key <key>] [--workspace-id <uuid>] ${agentCredential2} [--json]
+  cswarm file get <name|file-id> [--version <n>] [--out <local-path>] [--force] [--url <url> --anon-key <key>] [--workspace-id <uuid>] ${agentCredential2} [--json]
+  cswarm file rm <name|file-id> [--url <url> --anon-key <key>] [--workspace-id <uuid>] ${agentCredential2} [--json]
+  cswarm file restore <name|file-id> [--url <url> --anon-key <key>] [--workspace-id <uuid>] ${agentCredential2} [--json]
+  cswarm feedback "<text>" --kind bug|idea|friction [--about <ref>] [--url <url> --anon-key <key>] [--workspace-id <uuid>] ${agentCredential2} [--json]
+  cswarm listen start ${requiredAgentCredential} [--url <url> --anon-key <key>] --workspace-id <uuid> --provider grok|opencode|claude|codex [--cwd <absolute-path>] [--model <model>] [--effort <level>] [--permissions deny|allow] [--grok-executable <path>] [--opencode-executable <path>] [--claude-executable <path>] [--codex-executable <path>] [--turn-budget <duration>] [--route worker|main|split] [--defer-over <chars>] [--foreground] [--json]
   cswarm listen status [--url <url> --anon-key <key>] --workspace-id <uuid> --principal-id <uuid> [--json]
   cswarm listen stop [--url <url> --anon-key <key>] --workspace-id <uuid> --principal-id <uuid> [--json]
   cswarm hook check [--cooldown <seconds>]
@@ -38985,26 +39095,33 @@ Usage:
   cswarm principal revoke [--url <url> --anon-key <key>] [--workspace-id <uuid>] --principal-id <uuid>
   cswarm token mint [--url <url> --anon-key <key>] [--workspace-id <uuid>] --principal-id <uuid> --run-id <uuid> --task-id <uuid> --epoch <n> [--ttl-ms <ms>]
   cswarm token revoke [--url <url> --anon-key <key>] [--workspace-id <uuid>] --token-id <uuid>
-  cswarm token revoke --agent-token-stdin [--url <url> --anon-key <key>] --workspace-id <uuid> [--token-id <uuid>]
+  cswarm token revoke ${requiredAgentCredential} [--url <url> --anon-key <key>] --workspace-id <uuid> [--token-id <uuid>]
   cswarm link new [--url <url> --anon-key <key>] [--workspace-id <uuid>] --task-id <uuid> [--ttl-ms <ms>] [--site <origin>] [--json]
   cswarm link revoke [--url <url> --anon-key <key>] [--workspace-id <uuid>] --capability-id <uuid> [--json]
-  cswarm command <kind> [--url <url> --anon-key <key>] [--workspace-id <uuid>] [command fields]
-  cswarm dogfood [--url <url> --anon-key <key>] [--workspace-id <uuid>] --slug <slug> --branch <branch> --head-sha <sha> --evidence <ref>
+  cswarm command <kind> [--url <url> --anon-key <key>] [--workspace-id <uuid>] ${agentCredential2} [command fields]
+  cswarm dogfood [--url <url> --anon-key <key>] [--workspace-id <uuid>] ${agentCredential2} --slug <slug> --branch <branch> --head-sha <sha> --evidence <ref>
   cswarm seed-fixture --uid <auth-user-uuid> [--device-id <uuid>] [--workspace-id <uuid>]
 
 Credential selection for command/dogfood:
   default                 refresh the human login from secure storage
+  --agent-token-file      read the credential from an owned 0600 regular file in an owned
+                          0700 directory. The path may appear in argv; the secret never does.
   --agent-token-stdin     read a mint/seed credential artifact, or a bare swm_agt_ token, from
                           stdin. WHICH FORMS ARE ACCEPTED DEPENDS ON WHAT THE SUBCOMMAND DOES
                           WITH THE CREDENTIAL. A subcommand that only reads takes either form.
                           One that persists or references the credential needs the complete
                           JSON artifact, because it needs a field a bare secret does not carry:
+                            whoami        reads server-proven identity -- complete or bare form
                             members       reads only          -- either form
+                            working-on, note, ask, reply, feed, inbox
+                                          signal command/read only         -- either form
                             receipt       reads only          -- either form
                             inbox --notify persists a per-agent cursor -- needs principal_id
                             file put, file ls, file get, file rm, file restore
                                           read and command, nothing persisted -- either form
                             feedback      command only, nothing persisted     -- either form
+                            command, dogfood
+                                          task protocol commands              -- either form
                             listen start  persists durable state, rotates -- needs expires_at
                             hook check    reads the listener's owned 0600 credential state;
                                           never accepts or prints a credential
@@ -39044,7 +39161,7 @@ hook install claude prints the UserPromptSubmit JSON by default and changes the
 project's .claude/settings.json only with --write; uninstall also requires --write.
 
 Invite, legacy token accept, principal create/revoke, human token mint/revoke, link, new, and workspace close require a
-stored human login. Agent self-surrender of a token uses --agent-token-stdin and never takes the secret on argv. Invite-link accept signs in when needed, then accepts and
+stored human login. Agent self-surrender of a token uses --agent-token-file or --agent-token-stdin and never takes the secret on argv. Invite-link accept signs in when needed, then accepts and
 registers one principal. Invitation links, agent credentials, and capability links
 appear only in fresh success responses.
 
@@ -39087,7 +39204,7 @@ workspace only for callers who already hold that full-database credential; it
 grants no new authority and is not a governed product workspace-creation path.`;
 }
 async function target(args) {
-  const mode3 = args.has("agent-token-stdin") ? "agent" : "human";
+  const mode3 = hasAgentCredential(args) ? "agent" : "human";
   try {
     return await resolveCloudTarget({
       explicitUrl: args.optional("url"),
@@ -39211,6 +39328,51 @@ async function stdinCredential() {
   const credential = value.trim();
   return parsedAgentCredential(credential);
 }
+var AgentTokenFileError = class extends Error {
+  constructor(code, message) {
+    super(`[${code}] ${message}`);
+    this.code = code;
+  }
+  code;
+  name = "AgentTokenFileError";
+};
+function hasAgentCredential(args) {
+  return CREDENTIAL_FLAGS.some((flag) => args.has(flag));
+}
+async function agentCredential(args, options = {}) {
+  const fromFile = args.optional("agent-token-file");
+  const fromStdin = args.has("agent-token-stdin");
+  if (fromFile !== void 0 && fromStdin) {
+    throw new Error(
+      "use exactly one agent credential source: --agent-token-file or --agent-token-stdin"
+    );
+  }
+  if (fromFile !== void 0) {
+    let value;
+    try {
+      value = await readSecureJsonFile(fromFile, 4096);
+    } catch (error) {
+      const detail = error instanceof Error ? error.message : "unknown read failure";
+      throw new AgentTokenFileError(
+        "agent_token_file_unreadable",
+        `could not read --agent-token-file securely: ${detail}`
+      );
+    }
+    if (value === null) {
+      throw new AgentTokenFileError(
+        "agent_token_file_missing",
+        `--agent-token-file does not exist: ${fromFile}`
+      );
+    }
+    return parsedAgentCredential(value.trim());
+  }
+  if (fromStdin || options.implicitStdin === true) {
+    return await stdinCredential();
+  }
+  throw new Error(
+    "provide the agent credential with --agent-token-file <path> or --agent-token-stdin"
+  );
+}
 async function invitationCredential(args) {
   if (args.has("invitation-token-stdin")) {
     args.assertShape([...TARGET_FLAGS, "invitation-token-stdin"], 1);
@@ -39377,7 +39539,7 @@ async function runNew(args) {
   assertWorkspaceName(name);
   const cloud = await target(args);
   const human = await humanCredential(args, cloud);
-  const proposedId = (0, import_node_crypto19.randomUUID)();
+  const proposedId = (0, import_node_crypto20.randomUUID)();
   let result;
   try {
     result = await new ThinCommandClient(cloud).sendConnect({
@@ -40059,13 +40221,13 @@ async function runToken(args) {
   }));
 }
 async function runTokenRevoke(args) {
-  if (args.has("agent-token-stdin")) {
+  if (hasAgentCredential(args)) {
     args.assertShape(
-      [...TARGET_FLAGS, "workspace-id", "token-id", "agent-token-stdin", "json"],
+      [...TARGET_FLAGS, "workspace-id", "token-id", ...CREDENTIAL_FLAGS, "json"],
       2
     );
     const cloud2 = await target(args);
-    const agent = await stdinCredential();
+    const agent = await agentCredential(args);
     const override = workspaceOverride(
       args.optional("workspace-id"),
       process.env.SWARM_CLOUD_WORKSPACE_ID
@@ -40077,13 +40239,13 @@ async function runTokenRevoke(args) {
     }
     if (agent.tokenId === null) {
       throw new Error(
-        "agent credential on stdin has no token_id; pipe the JSON artifact from token mint, not a bare secret"
+        "agent credential has no token_id; use the JSON artifact from token mint, not a bare secret"
       );
     }
     const requested = args.optional("token-id");
     if (requested !== void 0 && requested.toLowerCase() !== agent.tokenId) {
       throw new Error(
-        "token-id does not match the credential on stdin; no request was sent"
+        "token-id does not match the credential; no request was sent"
       );
     }
     const tokenId2 = agent.tokenId;
@@ -40399,13 +40561,13 @@ async function commandWorkspaceAndCredential(args, cloud, options = {}) {
     args.optional("workspace-id"),
     process.env.SWARM_CLOUD_WORKSPACE_ID
   );
-  if (args.has("agent-token-stdin")) {
+  if (hasAgentCredential(args)) {
     if (override === null) {
       throw new Error(
         "not logged in; agent credentials require --workspace-id or SWARM_CLOUD_WORKSPACE_ID because they never infer a human's workspace selection"
       );
     }
-    const agent = await stdinCredential();
+    const agent = await agentCredential(args);
     const session = await agentSession(cloud, override, agent);
     return {
       selectedWorkspace: override,
@@ -40963,6 +41125,80 @@ async function runMembers(args) {
   }
   process.stdout.write(renderRoster(directory, memberNames));
 }
+async function runWhoami(args) {
+  args.assertShape([
+    ...TARGET_FLAGS,
+    "workspace-id",
+    ...CREDENTIAL_FLAGS,
+    "json"
+  ], 1);
+  if (!hasAgentCredential(args)) {
+    throw new UsageError(
+      "cswarm whoami needs --agent-token-file <path> or --agent-token-stdin"
+    );
+  }
+  const cloud = await target(args);
+  const selected = await commandWorkspaceAndCredential(args, cloud, {
+    validateHumanWorkspace: true
+  });
+  const directory = await readAgentSignalDirectory(
+    cloud,
+    selected.bearer,
+    selected.selectedWorkspace
+  );
+  const identity = directory.identity;
+  if (identity === void 0) {
+    throw new Error(
+      "this deployment authenticated the credential but did not return its identity; update the read service before using cswarm whoami"
+    );
+  }
+  const principal = directory.agents.find(
+    (agent) => agent.principal_id === identity.principal_id
+  );
+  if (principal === void 0 || principal.owner_user_id !== identity.owner_user_id) {
+    throw new Error(
+      "the read service authenticated this credential but returned no matching live principal; identity was not shown"
+    );
+  }
+  const owner = directory.members.find(
+    (member) => member.user_id === identity.owner_user_id
+  );
+  if (owner === void 0) {
+    throw new Error(
+      "the read service authenticated this credential but returned no matching owner; identity was not shown"
+    );
+  }
+  const displayName = sanitizeDisplayLabel(principal.name, "Unnamed agent");
+  const ownerName = sanitizeDisplayLabel(owner.display_name, "Unnamed member");
+  const artifactPrincipalId = selected.agent?.principalId ?? null;
+  const artifactMatches = artifactPrincipalId === null || artifactPrincipalId === identity.principal_id;
+  if (!artifactMatches) {
+    process.stderr.write(
+      `WARNING: the credential authenticated as ${displayName} (${identity.principal_id}), but its JSON metadata names ${artifactPrincipalId}. Trust the authenticated identity shown here and replace the inconsistent artifact.
+`
+    );
+  }
+  const output = {
+    credential_valid: identity.credential_valid,
+    principal_id: identity.principal_id,
+    display_name: displayName,
+    workspace_id: identity.workspace_id,
+    owner_user_id: identity.owner_user_id,
+    owner_display_name: ownerName,
+    credential_metadata_match: artifactMatches
+  };
+  if (args.has("json")) {
+    printJson(output);
+    return;
+  }
+  process.stdout.write(
+    `You are ${displayName} (${identity.principal_id}).
+Credential valid now: yes.
+Workspace: ${identity.workspace_id}.
+Owner: ${ownerName} (${identity.owner_user_id}).
+`
+  );
+}
 async function runSignalRead(args, inbox) {
   const notify = inbox && args.has("notify");
   args.assertShape(notify ? [
@@ -41073,9 +41309,9 @@ async function writeMonitorLine(line) {
   });
 }
 async function runInboxNotifyCommand(args) {
-  if (!args.has("agent-token-stdin")) {
+  if (!hasAgentCredential(args)) {
     throw new Error(
-      "inbox --notify is for one agent; provide its JSON credential with --agent-token-stdin"
+      "inbox --notify is for one agent; provide its JSON credential with --agent-token-file or --agent-token-stdin"
     );
   }
   const cloud = await target(args);
@@ -41157,9 +41393,9 @@ async function runReceipt(args) {
   if (!UUID_RE19.test(signalId)) {
     throw new Error("signal-id must be a UUID");
   }
-  if (!args.has("agent-token-stdin")) {
+  if (!hasAgentCredential(args)) {
     throw new Error(
-      "receipt reads signals sent by an agent; provide --agent-token-stdin and --workspace-id"
+      "receipt reads signals sent by an agent; provide --agent-token-file or --agent-token-stdin, and --workspace-id"
     );
   }
   const cloud = await target(args);
@@ -41491,6 +41727,11 @@ function renderListenerStatus(status) {
     status.lastSignalId ? `Last handled signal: ${status.lastSignalId}.` : "No signal has been handled yet.",
     status.lastErrorCode ? `Last status code: ${status.lastErrorCode}.` : "No listener error is recorded."
   ];
+  if (status.lastErrorDetail) {
+    const [first, ...rest] = status.lastErrorDetail.split("\n");
+    lines.push(`Last error detail (local only): ${first}`);
+    for (const line of rest) lines.push(`  ${line}`);
+  }
   if (status.lastWorkerStderrTail) {
     const tailLines = status.lastWorkerStderrTail.split("\n").filter((line) => line.trim().length > 0);
     lines.push("Worker stderr (local log only):");
@@ -41620,6 +41861,9 @@ function listenerFailureMessage(code, provider) {
     if (provider === "codex") {
       return "the Codex bridge did not complete the read-only ACP permission canary; no workspace signal prompt was delivered. Confirm ChatGPT/Codex sign-in, then retry";
     }
+    if (provider === "grok") {
+      return "the Grok bridge did not complete the ACP permission canary; no workspace signal prompt was delivered. The local cswarm listen status output includes the final error detail; read it, then retry";
+    }
     return "the host did not prove that CommonSwarm controls ACP tool permissions; no model prompt was delivered";
   }
   if (code === "process_exit") {
@@ -41772,13 +42016,14 @@ async function runConfiguredListener(options) {
       lastWorkerStderrTail = tail.length > 0 ? tail : null;
     };
   };
-  const newModel = () => {
+  const newModel = (onCanaryAttempt) => {
     providerVersionNotice = null;
     return options.provider === "opencode" ? new OpenCodeListenerModel({
       cwd: options.cwd,
       permissionMode: options.permissionMode,
       promptTimeoutMs: resolveTurnBudgetMs,
       onWorkerStderrTail: newWorkerStderrTailSink(),
+      onCanaryAttempt,
       onVersionNotice,
       ...options.model ? { model: options.model } : {},
       ...options.opencodeExecutable ? { executable: options.opencodeExecutable } : options.executable ? { executable: options.executable } : {}
@@ -41787,6 +42032,7 @@ async function runConfiguredListener(options) {
       permissionMode: options.permissionMode,
       promptTimeoutMs: resolveTurnBudgetMs,
       onWorkerStderrTail: newWorkerStderrTailSink(),
+      onCanaryAttempt,
       onVersionNotice,
       ...options.claudeExecutable ? { executable: options.claudeExecutable } : options.executable ? { executable: options.executable } : {}
     }) : options.provider === "codex" ? new CodexListenerModel({
@@ -41794,6 +42040,7 @@ async function runConfiguredListener(options) {
       permissionMode: options.permissionMode,
       promptTimeoutMs: resolveTurnBudgetMs,
       onWorkerStderrTail: newWorkerStderrTailSink(),
+      onCanaryAttempt,
       onVersionNotice,
       ...options.codexExecutable ? { executable: options.codexExecutable } : options.executable ? { executable: options.executable } : {}
     }) : new GrokListenerModel({
@@ -41801,6 +42048,7 @@ async function runConfiguredListener(options) {
       permissionMode: options.permissionMode,
       promptTimeoutMs: resolveTurnBudgetMs,
       onWorkerStderrTail: newWorkerStderrTailSink(),
+      onCanaryAttempt,
       onVersionNotice,
       ...options.model ? { model: options.model } : {},
       ...options.effort ? { effort: options.effort } : {},
@@ -41854,13 +42102,23 @@ async function runConfiguredListener(options) {
             "listener delivery journal was not selected for this instance"
           );
         }
+        const onCanaryAttempt = (attempt, total, result) => {
+          onEvent({
+            type: "canary_attempt",
+            attempt,
+            total,
+            passed: result.passed,
+            reason: result.reason ?? null,
+            ts: (/* @__PURE__ */ new Date()).toISOString()
+          });
+        };
         return await runListenerRuntime({
           target: options.cloud,
           workspaceId: options.workspaceId,
           principalId: options.principalId,
           credentialSession,
           store: effectStore,
-          model: newModel(),
+          model: newModel(onCanaryAttempt),
           signal,
           onEvent,
           declareModel: listenerModelLabel(options.provider),
@@ -41882,7 +42140,7 @@ async function runListenStart(args) {
   args.assertShape([
     ...TARGET_FLAGS,
     "workspace-id",
-    "agent-token-stdin",
+    ...CREDENTIAL_FLAGS,
     "provider",
     "cwd",
     "model",
@@ -41899,9 +42157,9 @@ async function runListenStart(args) {
     "foreground",
     "json"
   ], 2);
-  if (!args.has("agent-token-stdin")) {
+  if (!hasAgentCredential(args)) {
     throw new Error(
-      "listen start requires --agent-token-stdin; credentials are never accepted on argv"
+      "listen start requires --agent-token-file or --agent-token-stdin; credentials are never accepted on argv"
     );
   }
   const provider = listenerProvider(args);
@@ -41916,7 +42174,7 @@ async function runListenStart(args) {
     args.optional("workspace-id") ?? process.env.SWARM_CLOUD_WORKSPACE_ID,
     "workspace-id"
   );
-  const agent = await stdinCredential();
+  const agent = await agentCredential(args);
   assertDurableListenerCredential(agent);
   const principalId = agent.principalId;
   const cwd = args.optional("cwd") ?? process.cwd();
@@ -42066,6 +42324,7 @@ The short credential rotates while this process remains alive and secure local s
 async function runListenSupervisor(args) {
   args.assertShape([
     ...TARGET_FLAGS,
+    ...CREDENTIAL_FLAGS,
     "workspace-id",
     "principal-id",
     "cwd",
@@ -42092,7 +42351,7 @@ async function runListenSupervisor(args) {
   const cloud = await target(args);
   const workspaceId2 = listenerUuid(args.optional("workspace-id"), "workspace-id");
   const principalId = listenerUuid(args.optional("principal-id"), "principal-id");
-  const agent = await stdinCredential();
+  const agent = await agentCredential(args, { implicitStdin: true });
   assertDurableListenerCredential(agent, principalId);
   const cwd = args.required("cwd");
   if (!(0, import_node_path20.isAbsolute)(cwd)) throw new Error("--cwd must be an absolute path");
@@ -42394,8 +42653,8 @@ async function runFilePut(args) {
     workspaceId: context.selected.selectedWorkspace,
     credential: context.selected.bearer
   };
-  const fileId = (0, import_node_crypto19.randomUUID)();
-  const versionId = (0, import_node_crypto19.randomUUID)();
+  const fileId = (0, import_node_crypto20.randomUUID)();
+  const versionId = (0, import_node_crypto20.randomUUID)();
   const createCommandId = newCommandId();
   const commitCommandId = newCommandId();
   const created = await onceRetried(
@@ -42632,7 +42891,7 @@ async function runDogfood(args) {
   const { selectedWorkspace, bearer } = await commandWorkspaceAndCredential(args, cloud);
   const client = new ThinCommandClient(cloud);
   const route = stream(args);
-  const taskId = args.optional("task-id") ?? (0, import_node_crypto19.randomUUID)();
+  const taskId = args.optional("task-id") ?? (0, import_node_crypto20.randomUUID)();
   const ttl = Number(args.optional("ttl-ms") ?? "3600000");
   if (!Number.isSafeInteger(ttl) || ttl <= 0 || ttl > 144e5) {
     throw new Error("--ttl-ms must be an integer in 1..14400000");
@@ -42847,6 +43106,10 @@ async function main() {
     await runStatus(args);
     return;
   }
+  if (verb === "whoami") {
+    await runWhoami(args);
+    return;
+  }
   if (verb === "feedback") {
     await runFeedback(args);
     return;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "commonswarm",
-  "version": "0.1.37",
+  "version": "0.1.39",
   "description": "CommonSwarm CLI — coordination for teams where people and AI agents work side by side.",
   "bin": {
     "cswarm": "cswarm.cjs"