@4pm/cli 1.5.1 → 1.5.2

package/dist/index.js

@@ -32990,6 +32990,7 @@ var CLI_SLASH_COMMANDS = [
   { name: "collapse", usage: "/collapse [N]", description: "Collapse an expanded \u25B8[N] block" },
   { name: "reconnect", usage: "/reconnect", description: "Reconnect to the server now (skip the backoff)" },
   { name: "whoami", usage: "/whoami", description: "Show this machine account + its teams & projects" },
+  { name: "ai-profile", usage: "/ai-profile [list|use <n>|reset]", description: "List AI profiles / switch which one runs" },
   { name: "config", usage: "/config [show|init|set <k> <v>|delete <k>]", description: "View / init / update / delete profile config" },
   { name: "claude-cmd", usage: "/claude-cmd /context", description: "Run an AI-CLI slash command (e.g. /context, /usage)" },
   { name: "clear", usage: "/clear", description: "Clear the transcript" },
@@ -33038,7 +33039,10 @@ var listWorkersQuerySchema = baseRequestSchema.extend({
   /** Only workers whose live CPU/memory/disk usage % ≥ the given threshold (0–100). */
   minCpuPct: external_exports.coerce.number().min(0).max(100).optional(),
   minMemPct: external_exports.coerce.number().min(0).max(100).optional(),
-  minDiskPct: external_exports.coerce.number().min(0).max(100).optional()
+  minDiskPct: external_exports.coerce.number().min(0).max(100).optional(),
+  /** Hide workers with no cli attached (clis = 0). The web defaults this on; unchecking the
+   *  "show empty CLIs" box drops it so empty workers are listed too. */
+  hideEmptyClis: external_exports.enum(["true", "false"]).transform((v) => v === "true").optional()
 });
 var updateWorkerRequestSchema = external_exports.object({
   name: external_exports.string().min(1).max(100).optional()
@@ -34051,11 +34055,29 @@ import { spawn as spawn2 } from "child_process";
 var KILL_GRACE_MS = 5e3;
 async function runCommand(dispatch, emit, opts) {
   let seq = 0;
-  const child = spawn2(dispatch.cmd, dispatch.args ?? [], {
-    cwd: dispatch.path,
-    env: { ...process.env, ...dispatch.env },
-    shell: false
+  let child;
+  try {
+    child = spawn2(dispatch.cmd, dispatch.args ?? [], {
+      cwd: dispatch.path,
+      env: { ...process.env, ...dispatch.env },
+      shell: false
+    });
+  } catch (err) {
+    emit({
+      commandId: dispatch.commandId,
+      seq: seq++,
+      chunk: `spawn error: ${err.message}
+`,
+      done: true,
+      exitCode: -1
+    });
+    return;
+  }
+  child.stdin?.on("error", () => {
   });
+  if (opts?.stdin != null) {
+    child.stdin?.write(opts.stdin);
+  }
   child.stdin?.end();
   const timeoutMs = opts?.timeoutMs && opts.timeoutMs > 0 ? opts.timeoutMs : 0;
   let timedOut = false;
@@ -34255,12 +34277,16 @@ function isOutOfCredits(text) {
     text
   );
 }
-function runAttempt(commandId, cmd, args, cwd2, env3, onChunk, timeoutMs) {
+function runAttempt(commandId, cmd, args, stdin, cwd2, env3, onChunk, timeoutMs) {
   return new Promise((resolve8) => {
-    void runCommand({ commandId, cmd, args, path: cwd2, env: env3 }, (out) => {
-      if (out.chunk) onChunk(out.chunk);
-      if (out.done) resolve8(out.exitCode ?? -1);
-    }, timeoutMs > 0 ? { timeoutMs } : void 0);
+    runCommand(
+      { commandId, cmd, args, path: cwd2, env: env3 },
+      (out) => {
+        if (out.chunk) onChunk(out.chunk);
+        if (out.done) resolve8(out.exitCode ?? -1);
+      },
+      { stdin, ...timeoutMs > 0 ? { timeoutMs } : {} }
+    ).catch(() => resolve8(-1));
   });
 }
 async function runAiFailover(plan, commandId, cwd2, handlers, timeoutMs = 0) {
@@ -34281,7 +34307,7 @@ async function runAiFailover(plan, commandId, cwd2, handlers, timeoutMs = 0) {
         handlers.onChunk(text);
       }
     };
-    finalExit = await runAttempt(commandId, attempt.cmd, attempt.args, cwd2, attempt.env, emit, timeoutMs);
+    finalExit = await runAttempt(commandId, attempt.cmd, attempt.args, attempt.stdin, cwd2, attempt.env, emit, timeoutMs);
     const tail = parser.flush();
     if (tail) {
       captured += tail;
@@ -34358,6 +34384,52 @@ function setWorkingCredential(profileDir2, key) {
   } catch {
   }
 }
+var PINNED_CREDENTIAL_KEY = "__pinned__";
+function getPinnedCredential(profileDir2) {
+  return readState(profileDir2)[PINNED_CREDENTIAL_KEY] ?? null;
+}
+function setPinnedCredential(profileDir2, key) {
+  const state = readState(profileDir2);
+  if (state[PINNED_CREDENTIAL_KEY] === key) return;
+  state[PINNED_CREDENTIAL_KEY] = key;
+  try {
+    writeFileSync4(statePath(profileDir2), JSON.stringify(state, null, 2), "utf8");
+  } catch {
+  }
+}
+function clearPinnedCredential(profileDir2) {
+  const state = readState(profileDir2);
+  if (!(PINNED_CREDENTIAL_KEY in state)) return;
+  delete state[PINNED_CREDENTIAL_KEY];
+  try {
+    writeFileSync4(statePath(profileDir2), JSON.stringify(state, null, 2), "utf8");
+  } catch {
+  }
+}
+
+// src/utils/time.ts
+function formatTimestampInZone(date, timeZone) {
+  const build = (tz) => {
+    const parts = new Intl.DateTimeFormat("en-CA", {
+      ...tz ? { timeZone: tz } : {},
+      hour12: false,
+      year: "numeric",
+      month: "2-digit",
+      day: "2-digit",
+      hour: "2-digit",
+      minute: "2-digit",
+      second: "2-digit"
+    }).formatToParts(date);
+    const get2 = (type) => parts.find((p) => p.type === type)?.value ?? "";
+    const hour = get2("hour") === "24" ? "00" : get2("hour");
+    return `${get2("year")}/${get2("month")}/${get2("day")} ${hour}:${get2("minute")}:${get2("second")}`;
+  };
+  try {
+    return build(timeZone);
+  } catch {
+    return build();
+  }
+}
 
 // src/utils/ai-cli.ts
 import { readFileSync as readFileSync8 } from "fs";
@@ -34463,7 +34535,7 @@ function folderScopeGuard(folder, prompt) {
     prompt
   ].join("\n");
 }
-function buildRunArgs(profile, cmd, prompt, resumeId, oneShot = false) {
+function buildRunArgs(profile, cmd, resumeId, oneShot = false) {
   const extras = profile.args ?? [];
   const model = profile.model?.trim();
   const modelArgs = model ? ["--model", model] : [];
@@ -34471,7 +34543,7 @@ function buildRunArgs(profile, cmd, prompt, resumeId, oneShot = false) {
   const turns = profile.maxTurns;
   const perProfileTurns = !oneShot && cmd.includes("claude") && typeof turns === "number" && turns > 0 ? [`--max-turns=${Math.floor(turns)}`] : [];
   const oneShotExtra = oneShot ? oneShotArgs(cmd) : perProfileTurns;
-  return [...requiredArgs(cmd), ...resumeArgs, ...extras, ...modelArgs, ...oneShotExtra, prompt];
+  return [...requiredArgs(cmd), ...resumeArgs, ...extras, ...modelArgs, ...oneShotExtra];
 }
 function claudeHomeDirs(config) {
   const dirs = profileDirs(claudeProfilesOf(config));
@@ -34522,7 +34594,7 @@ function planUnifiedRun(prompt, config, workingCredential, resume, oneShot) {
     return {
       cmd: active,
       attempts: [
-        { cmd: active, label: "default", dir: null, key: null, args: buildRunArgs({ profile: "" }, active, prompt, void 0, oneShot), env: { ...baseEnv } }
+        { cmd: active, label: "default", dir: null, key: null, args: buildRunArgs({ profile: "" }, active, void 0, oneShot), stdin: prompt, env: { ...baseEnv } }
       ]
     };
   }
@@ -34540,7 +34612,8 @@ function planUnifiedRun(prompt, config, workingCredential, resume, oneShot) {
     label: cred.label?.trim() || profileDisplayLabel(dir2),
     dir: dir2,
     key,
-    args: buildRunArgs(cred, cmd, prompt, resume.get(key), oneShot),
+    args: buildRunArgs(cred, cmd, resume.get(key), oneShot),
+    stdin: prompt,
     env: envVar ? { ...baseEnv, [envVar]: dir2 } : { ...baseEnv }
   }));
   return { cmd: attempts[0]?.cmd ?? DEFAULT_AI_CLI, attempts };
@@ -34552,7 +34625,7 @@ function planLegacyRun(prompt, config, workingDir, resume, oneShot) {
   const defaultPlan = {
     cmd,
     attempts: [
-      { cmd, label: "default", dir: null, key: null, args: buildRunArgs({ profile: "" }, cmd, prompt, void 0, oneShot), env: { ...baseEnv } }
+      { cmd, label: "default", dir: null, key: null, args: buildRunArgs({ profile: "" }, cmd, void 0, oneShot), stdin: prompt, env: { ...baseEnv } }
     ]
   };
   if (!envVar) return defaultPlan;
@@ -34569,7 +34642,8 @@ function planLegacyRun(prompt, config, workingDir, resume, oneShot) {
       label: profileDisplayLabel(dir2),
       dir: dir2,
       key,
-      args: buildRunArgs(profile, cmd, prompt, resume.get(key), oneShot),
+      args: buildRunArgs(profile, cmd, resume.get(key), oneShot),
+      stdin: prompt,
       env: { ...baseEnv, [envVar]: dir2 }
     };
   });
@@ -36948,6 +37022,70 @@ function runWhoami(ctx) {
     ctx.print(`projects: ${w.projects.length ? w.projects.map((p) => p.name).join(", ") : "(none)"}`);
   });
 }
+function aiProfileLabel(c) {
+  return c.label?.trim() || profileDisplayLabel(resolveHomePath(c.profile));
+}
+function runAiProfile(ctx) {
+  const dir2 = ctx.info.profileDir;
+  const config = readProfileConfig(dir2);
+  const list = Array.isArray(config.aiProfiles) ? config.aiProfiles : [];
+  const [sub, ...rest] = ctx.args;
+  const action = (sub ?? "list").toLowerCase();
+  if (action === "list") {
+    if (list.length === 0) {
+      ctx.print("No AI profiles configured (config.aiProfiles is empty).", "warn");
+      ctx.print("This worker may use a legacy per-provider config \u2014 /config show to inspect.");
+      return;
+    }
+    const pinned = getPinnedCredential(dir2);
+    const working = getWorkingCredential(dir2);
+    ctx.print("AI profiles (config order = failover priority) \xB7 /ai-profile use <n> to switch:");
+    list.forEach((c, i) => {
+      const usable = isUsableCredential(c);
+      const key = usable ? credentialKey(c.provider, resolveHomePath(c.profile)) : null;
+      const flags = [];
+      if (key && key === pinned) flags.push("pinned");
+      else if (key && !pinned && key === working) flags.push("active");
+      if (c.enabled === false) flags.push("disabled");
+      const model = c.model?.trim() ? ` \xB7 model=${c.model.trim()}` : "";
+      const flagStr = flags.length ? `  (${flags.join(", ")})` : "";
+      const marker = key && key === pinned ? "*" : " ";
+      ctx.print(`  ${marker}[${i + 1}] ${c.provider.padEnd(11)} ${aiProfileLabel(c)}${model}${flagStr}`);
+    });
+    if (pinned) {
+      ctx.print("A profile is pinned \u2014 tried first every prompt; /ai-profile reset returns to auto.");
+    }
+    return;
+  }
+  if (action === "reset" || action === "auto" || action === "clear") {
+    clearPinnedCredential(dir2);
+    ctx.print("\u2714 AI profile pin cleared \u2014 failover is back to automatic (config order / remembered).");
+    const working = getWorkingCredential(dir2);
+    ctx.setActiveProfile(working ? labelFromCredentialKey(working) : null);
+    return;
+  }
+  if (action === "use" || action === "switch") {
+    const n = Number(rest[0]);
+    if (!Number.isInteger(n) || n < 1 || n > list.length) {
+      ctx.print(`usage: /ai-profile use <n>   (n = 1-${list.length || "?"} from /ai-profile list)`, "error");
+      return;
+    }
+    const cred = list[n - 1];
+    if (!isUsableCredential(cred)) {
+      const why = cred.enabled === false ? "it is disabled" : "it has no usable profile dir / provider";
+      ctx.print(`Profile [${n}] "${aiProfileLabel(cred)}" can't be used \u2014 ${why}.`, "error");
+      return;
+    }
+    const credDir = resolveHomePath(cred.profile);
+    setPinnedCredential(dir2, credentialKey(cred.provider, credDir));
+    ctx.setActiveProfile(profileDisplayLabel(credDir));
+    ctx.print(
+      `\u2714 switched to ${cred.provider} profile "${aiProfileLabel(cred)}" \u2014 tried first from the next prompt (failover keeps the rest as backup).`
+    );
+    return;
+  }
+  ctx.print(`Unknown /ai-profile subcommand "${sub}". Use: list | use <n> | reset.`, "error");
+}
 function runFold(ctx, action) {
   if (ctx.maxBlock === 0) {
     ctx.print("No collapsible blocks on screen.", "warn");
@@ -37037,6 +37175,12 @@ var COMMANDS = [
     description: "Show this machine account + its teams & projects",
     run: runWhoami
   },
+  {
+    name: "ai-profile",
+    usage: "/ai-profile [list|use <n>|reset]",
+    description: "List AI profiles / switch which one runs (ADR-0250)",
+    run: runAiProfile
+  },
   {
     name: "config",
     usage: "/config [show|init|set <k> <v>|delete <k>]",
@@ -37417,6 +37561,9 @@ var WsClient = class {
   reconnectEntryId = null;
   /** Org-configured reconnect cap (seconds) from the last ws_token — overrides env. */
   orgReconnectMaxSec = null;
+  /** Org timezone (IANA) from the last ws_token (ADR-0132) — a rented worker follows its renter's
+   *  org; used to stamp the AI-run start time on the `aireq` transcript marker (ADR-0249). */
+  orgTimezone = "UTC";
   /** Env override for the reconnect cap (seconds); resolved once at construction. */
   envReconnectMaxSec = envReconnectMaxSec();
   /** Process start (ms) — uptime for a web-dispatched `/status` (ADR-0249). */
@@ -37601,6 +37748,9 @@ var WsClient = class {
         if (typeof token.reconnectMaxBackoffSec === "number") {
           this.orgReconnectMaxSec = token.reconnectMaxBackoffSec;
         }
+        if (typeof token.timezone === "string" && token.timezone) {
+          this.orgTimezone = token.timezone;
+        }
         if (typeof token.autoUpdateDaily === "boolean") {
           this.updateScheduler.configure({
             autoUpdateDaily: token.autoUpdateDaily,
@@ -38288,9 +38438,10 @@ var WsClient = class {
     const unified = isUnifiedConfig(config);
     const mode = config.aiFailoverMode ?? "remember";
     const workingDir = unified ? null : getWorkingProfile(this.context.profileDir, cmd);
-    const workingCred = unified && mode === "remember" ? getWorkingCredential(this.context.profileDir) : null;
+    const pinnedCred = unified ? getPinnedCredential(this.context.profileDir) : null;
+    const workingCred = unified ? pinnedCred ?? (mode === "remember" ? getWorkingCredential(this.context.profileDir) : null) : null;
     const startDir = unified ? null : this.profileUnderSessionPressure(config, cmd, workingDir);
-    const startCred = unified ? this.credentialUnderSessionPressure(config, workingCred) : null;
+    const startCred = unified && !pinnedCred ? this.credentialUnderSessionPressure(config, workingCred) : null;
     if (startDir && startDir !== workingDir) {
       this.bus.push({
         source: origin,
@@ -38322,7 +38473,8 @@ ${guardedPrompt}`;
     }
     const plan = planAiRun(effectivePrompt, config, hint, resume, oneShot);
     const markerArgs = plan.attempts[0]?.args ?? [];
-    this.bus.push({ source: origin, kind: "aireq", text: `${plan.cmd} \u2039 ${prompt}` });
+    const startStamp = formatTimestampInZone(/* @__PURE__ */ new Date(), this.orgTimezone);
+    this.bus.push({ source: origin, kind: "aireq", text: `${startStamp} ${plan.cmd} \u2039 ${prompt}` });
     logger.info("command.ai", { commandId, origin, cmd: plan.cmd, profiles: plan.attempts.length });
     if (origin === "local") {
       this.send(WsChannels.COMMAND_ANNOUNCE, {
@@ -38557,6 +38709,8 @@ ${guardedPrompt}`;
       submitAi: () => {
       },
       // only /claude-cmd uses this, and it is special-cased above
+      // /ai-profile use/reset from the web Console updates the shared header too (ADR-0250).
+      setActiveProfile: (label) => this.bus.setActiveProfile(label),
       reconnect: () => this.reconnectNow(),
       expand: () => emit("Use the web console's fold viewer to expand blocks."),
       collapse: () => emit("Use the web console's fold viewer to collapse blocks."),
@@ -45263,12 +45417,17 @@ function textColor(line) {
   if (line.kind === "exit") return "green";
   return void 0;
 }
+var START_STAMP_RE = /^(\d{4}\/\d{2}\/\d{2} \d{2}:\d{2}:\d{2} )/;
 function AiMarkerLine({ line }) {
   const arrow = line.kind === "aireq" ? "\u2039" : "\u203A";
   const idx = line.text.indexOf(arrow);
   if (idx < 0) return /* @__PURE__ */ (0, import_jsx_runtime2.jsx)(Text, { children: line.text || " " });
+  const before = line.text.slice(0, idx);
+  const stamp = line.kind === "aireq" ? START_STAMP_RE.exec(before)?.[1] ?? "" : "";
+  const name = stamp ? before.slice(stamp.length) : before;
   return /* @__PURE__ */ (0, import_jsx_runtime2.jsxs)(Text, { children: [
-    /* @__PURE__ */ (0, import_jsx_runtime2.jsx)(Text, { color: "cyan", bold: true, children: line.text.slice(0, idx) }),
+    stamp ? /* @__PURE__ */ (0, import_jsx_runtime2.jsx)(Text, { dimColor: true, children: stamp }) : null,
+    /* @__PURE__ */ (0, import_jsx_runtime2.jsx)(Text, { color: "cyan", bold: true, children: name }),
     /* @__PURE__ */ (0, import_jsx_runtime2.jsx)(Text, { dimColor: true, children: arrow }),
     /* @__PURE__ */ (0, import_jsx_runtime2.jsx)(Text, { children: line.text.slice(idx + 1) })
   ] });
@@ -45685,6 +45844,9 @@ function App2({
           setPendingConfirm({ prompt, onYes });
         },
         submitAi: (aiInput) => bus.submitLocal(aiInput),
+        // /ai-profile use/reset updates the header's active-profile label at once (ADR-0250);
+        // the bus event feeds the React state (see the onActiveProfile subscription above).
+        setActiveProfile: (label) => bus.setActiveProfile(label),
         reconnect: () => bus.requestReconnect(),
         expand: expandFold,
         collapse: collapseFold,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@4pm/cli",
-  "version": "1.5.1",
+  "version": "1.5.2",
   "private": false,
   "description": "4PM CLI — drives Claude/Codex CLIs on AI worker machines (Node + TypeScript)",
   "license": "LicenseRef-4PM-Source-Available",