@standardagents/code 0.6.4 → 0.6.7

package/dist/index.js

@@ -319,6 +319,25 @@ var ApiClient = class {
       return null;
     }
   }
+  /** Preview the cost of changing to `sessions` parallel sessions (default +1).
+   *  Returns null when billing is unavailable / there's no subscription. */
+  async sessionsQuote(threadId, sessions) {
+    try {
+      return await this.json(`/api/threads/${threadId}/sessions_quote`, {
+        method: "POST",
+        body: JSON.stringify(typeof sessions === "number" ? { sessions } : {})
+      });
+    } catch {
+      return null;
+    }
+  }
+  /** Apply a parallel-session change (charges via Stripe). Throws on failure. */
+  async sessionsUpgrade(threadId, sessions) {
+    return this.json(`/api/threads/${threadId}/sessions_upgrade`, {
+      method: "POST",
+      body: JSON.stringify({ sessions })
+    });
+  }
   // ── skills (instance-global Agent Skills library) ─────────────────────────
   /** Installed skills — metadata only. Includes disabled skills. */
   async listSkills() {
@@ -365,11 +384,17 @@ var ApiClient = class {
 };
 
 // src/permissions.ts
+function riskCeiling(state) {
+  let ceiling = state.level;
+  for (const granted of state.allowRisk) {
+    if (granted > ceiling) ceiling = granted;
+  }
+  return ceiling;
+}
 function decide(state, tool, risk, hasPermissionRequest) {
   const effectiveRisk = typeof risk === "number" ? Math.min(5, Math.max(1, risk)) : hasPermissionRequest ? 3 : 1;
   if (state.alwaysAllow.has(tool)) return "allow";
-  if (state.allowRisk.has(effectiveRisk)) return "allow";
-  return effectiveRisk <= state.level ? "allow" : "ask";
+  return effectiveRisk <= riskCeiling(state) ? "allow" : "ask";
 }
 var CATASTROPHIC_PATTERNS = [
   /\brm\s+(-[a-z]*\s+)*-[a-z]*f[a-z]*\s+(-[a-z]*\s+)*(\/|~|\$HOME|\/\*|\.\s*$|\/\s*$)/i,
@@ -1891,6 +1916,90 @@ var SystemEvents = class {
   }
 };
 
+// src/subagent-streams.ts
+var MAX_PHRASE = 120;
+function cleanPhrase(raw) {
+  const s = raw.replace(/\s+/g, " ").trim();
+  return s.length > MAX_PHRASE ? `${s.slice(0, MAX_PHRASE - 1)}\u2026` : s;
+}
+function prettyToolName(name) {
+  return name.replace(/^provider:/, "").replace(/[_:-]+/g, " ").trim();
+}
+var SubagentActivity = class {
+  constructor(api, onChange, makeStream = (threadId, hooks) => new MessageStream(api, threadId, hooks)) {
+    this.onChange = onChange;
+    this.makeStream = makeStream;
+  }
+  onChange;
+  makeStream;
+  entries = /* @__PURE__ */ new Map();
+  /** The current activity phrase for a subagent's child thread, if any. */
+  phraseFor(threadId) {
+    return this.entries.get(threadId)?.phrase ?? null;
+  }
+  /**
+   * Reconcile the open streams against the authoritative set of RUNNING
+   * subagent child-thread ids (from the parent's registry): open newcomers,
+   * close and forget departed ones.
+   */
+  sync(activeIds) {
+    const want = new Set(activeIds);
+    for (const [id, entry] of [...this.entries]) {
+      if (!want.has(id)) {
+        entry.stream.close();
+        this.entries.delete(id);
+      }
+    }
+    for (const id of want) {
+      if (!this.entries.has(id)) this.open(id);
+    }
+  }
+  open(threadId) {
+    const entry = { stream: null, steps: /* @__PURE__ */ new Map(), phrase: null };
+    const setPhrase = (phrase) => {
+      if (phrase === entry.phrase) return;
+      entry.phrase = phrase;
+      this.onChange(threadId);
+    };
+    const phraseFromSteps = () => {
+      let last = null;
+      for (const v of entry.steps.values()) last = v;
+      return last ?? entry.phrase;
+    };
+    entry.stream = this.makeStream(threadId, {
+      // Streamed output with no tool in flight means the model is composing —
+      // reasoning reads as "thinking", visible answer text as "writing". These
+      // only fire on TRANSITIONS (phrase comparison), not per chunk.
+      onChunk: () => {
+        if (entry.steps.size === 0) setPhrase("writing");
+      },
+      onReasoningChunk: () => {
+        if (entry.steps.size === 0) setPhrase("thinking");
+      },
+      onAssistantText: () => {
+      },
+      onEvent: (eventType, data) => {
+        if (eventType === "tool_call_started" && data?.id) {
+          entry.steps.set(String(data.id), cleanPhrase(String(data.progress || prettyToolName(String(data.name || "")) || "working")));
+          setPhrase(phraseFromSteps());
+        } else if (eventType === "tool_call_done" && data?.id) {
+          entry.steps.delete(String(data.id));
+          setPhrase(phraseFromSteps());
+        }
+      },
+      onError: () => {
+      }
+    });
+    this.entries.set(threadId, entry);
+    void entry.stream.connect();
+  }
+  /** Close every stream (session teardown). */
+  closeAll() {
+    for (const entry of this.entries.values()) entry.stream.close();
+    this.entries.clear();
+  }
+};
+
 // src/wordmill.ts
 var MILL_WORDS = [
   "Working",
@@ -3350,7 +3459,7 @@ var Tui = class _Tui {
       const options = [
         { value: "allow", label: "Allow once", shortcut: "y", color: C.green },
         { value: "always", label: "Always allow this tool", shortcut: "a", color: C.cyan },
-        { value: "always_risk", label: `Allow all level ${risk} this session`, shortcut: "l", color: C.cyan },
+        { value: "always_risk", label: `Allow level ${risk} and below this session`, shortcut: "l", color: C.cyan },
         { value: "deny", label: "Deny", shortcut: "n", color: C.red }
       ];
       let idx = 0;
@@ -4917,6 +5026,8 @@ async function runInteractive(tui, api, threadId, projectDir, machine, resumed,
   let editingQueued = false;
   const shownIds = /* @__PURE__ */ new Set();
   const pendingSent = /* @__PURE__ */ new Map();
+  let lastSent = null;
+  let upgradeInFlight = false;
   let tokensIn = 0;
   let tokensOut = 0;
   let liveOut = 0;
@@ -4986,7 +5097,11 @@ ${c.bold}why: ${req.requestPermission}${c.reset}` : ""}`,
         tui.setGoal(data);
       }
     },
-    onError: () => {
+    // A failed turn whose message is the lease service's at-limit denial → offer
+    // an in-terminal upgrade right where the friction happened. (offerUpgrade /
+    // isSessionLimitError are defined below; this callback only fires mid-session.)
+    onError: (err) => {
+      if (isSessionLimitError(err)) void offerUpgrade({ auto: true });
     }
   });
   const activeSubagents = /* @__PURE__ */ new Map();
@@ -4994,8 +5109,12 @@ ${c.bold}why: ${req.requestPermission}${c.reset}` : ""}`,
   const agentTitlesReady = api.listAgents().then((list) => list.forEach((a) => agentTitles.set(a.name, a.title))).catch(() => {
   });
   const pushSubagents = () => tui.setSubagents(
-    [...activeSubagents.entries()].map(([id, s]) => ({ id, label: s.label, agentName: s.agentName }))
+    [...activeSubagents.entries()].map(([id, s]) => {
+      const detail = subActivity.phraseFor(id) ?? s.registryDetail;
+      return { id, label: `${s.title}${detail ? ` \u2014 ${detail}` : ""}`, agentName: s.agentName };
+    })
   );
+  const subActivity = new SubagentActivity(api, () => pushSubagents());
   const reconcileSubagents = async () => {
     try {
       await agentTitlesReady;
@@ -5005,12 +5124,13 @@ ${c.bold}why: ${req.requestPermission}${c.reset}` : ""}`,
         const status = (s.status || "").trim();
         if (status === "idle" || status === "terminated") continue;
         const oneLineStatus = status.replace(/\s+/g, " ");
-        const detail = oneLineStatus && oneLineStatus !== "running" ? ` \u2014 ${oneLineStatus.slice(0, 80)}` : "";
         activeSubagents.set(s.id, {
-          label: `${subagentLabel(s, agentTitles)}${detail}`,
+          title: subagentLabel(s, agentTitles),
+          registryDetail: oneLineStatus && oneLineStatus !== "running" ? oneLineStatus.slice(0, 80) : "",
           agentName: s.agent_name ?? void 0
         });
       }
+      subActivity.sync(activeSubagents.keys());
       pushSubagents();
     } catch {
     }
@@ -5057,6 +5177,7 @@ ${c.bold}why: ${req.requestPermission}${c.reset}` : ""}`,
     bridge.close();
     stream.close();
     events.close();
+    subActivity.closeAll();
     mcp.closeAll();
     const [, killed2] = await Promise.race([
       Promise.all([stopped2, procsStopped2]),
@@ -5119,6 +5240,7 @@ ${c.bold}why: ${req.requestPermission}${c.reset}` : ""}`,
   const extFor = (mime) => ({ "image/png": "png", "image/jpeg": "jpg", "image/gif": "gif", "image/webp": "webp" })[mime] ?? "bin";
   const toAttachments = (images) => images.map((img) => ({ name: `image-${img.seq}.${extFor(img.mime)}`, mimeType: img.mime, data: img.data }));
   const sendNow = async (text, images = []) => {
+    lastSent = { text, images };
     tui.printUserMessage(text);
     const key = text.trim();
     pendingSent.set(key, (pendingSent.get(key) ?? 0) + 1);
@@ -5157,6 +5279,88 @@ ${c.bold}why: ${req.requestPermission}${c.reset}` : ""}`,
       link?.preauthed ? `${c.gray}\u2192 account dashboard opened in your browser (signed in)${c.reset}` : `${c.gray}\u2192 opened ${target} \u2014 sign in with your account email${c.reset}`
     );
   };
+  const ordinal = (n) => {
+    const s = ["th", "st", "nd", "rd"], v = n % 100;
+    return `${n}${s[(v - 20) % 10] ?? s[v] ?? s[0]}`;
+  };
+  const fmtCost = (q) => typeof q.amount_cents === "number" && q.amount_cents !== 0 ? `$${(Math.abs(q.amount_cents) / 100).toFixed(2)}` : null;
+  const renderUpgradePanel = (q) => {
+    const dots = [];
+    for (let i = 0; i < q.max; i++) {
+      if (i < q.current) dots.push(`${c.teal}\u25CF${c.reset}`);
+      else if (i === q.current) dots.push(`${c.bold}${gradientText("\uFF0B")}${c.reset}`);
+      else dots.push(`${c.dim}\xB7${c.reset}`);
+    }
+    const cost = fmtCost(q);
+    const lines = [
+      "",
+      `${c.bold}${gradientText("\u2726 Add a parallel session")}${c.reset}`,
+      "",
+      `${dots.join(" ")}   ${c.dim}${q.current} of ${q.current} session${q.current === 1 ? "" : "s"} in use${c.reset}`
+    ];
+    if (q.ends_trial) {
+      lines.push(
+        `${c.yellow}Your $5 trial covers 1 session. Adding a ${ordinal(q.sessions)} ends the trial${c.reset}`,
+        `${c.yellow}and starts your $49/mo plan now${cost ? ` \u2014 ${c.bold}${cost} charged today${c.reset}${c.yellow}` : ""}.${c.reset}`
+      );
+    } else if (cost) {
+      lines.push(`Add a ${ordinal(q.sessions)} session at $49/mo \u2014 ${c.bold}${cost} charged now${c.reset}.`);
+    } else {
+      lines.push(`Add a ${ordinal(q.sessions)} session at $49/mo \u2014 prorated on your next invoice.`);
+    }
+    lines.push("");
+    return lines.join("\n");
+  };
+  const offerUpgrade = async (opts = {}) => {
+    if (upgradeInFlight) return;
+    upgradeInFlight = true;
+    try {
+      const quote = await api.sessionsQuote(threadId);
+      if (!quote) {
+        const link = await api.accountLink(threadId).catch(() => null);
+        const target = link?.url ?? "https://standardcode.ai/account";
+        openUrl(target);
+        tui.print(`${c.gray}\u2192 opened ${target} to manage your plan${c.reset}`);
+        return;
+      }
+      if (quote.current >= quote.max) {
+        tui.print(`${c.yellow}You're at the maximum of ${quote.max} parallel sessions.${c.reset}`);
+        return;
+      }
+      tui.print(renderUpgradePanel(quote));
+      const cost = fmtCost(quote);
+      const confirmLabel = quote.ends_trial ? `End trial & start now${cost ? ` \u2014 pay ${cost} today` : ""}` : `Confirm${cost ? ` \u2014 pay ${cost} now` : " \u2014 add the session"}`;
+      const choice = await tui.select(`Add a ${ordinal(quote.sessions)} parallel session?`, [
+        { label: confirmLabel, value: "go" },
+        { label: "Not now", value: "no" }
+      ]);
+      if (choice !== "go") {
+        tui.print(`${c.gray}No change made \u2014 you can upgrade anytime with /upgrade.${c.reset}`);
+        return;
+      }
+      tui.print(`${c.gray}Applying\u2026${c.reset}`);
+      let applied;
+      try {
+        applied = await api.sessionsUpgrade(threadId, quote.sessions);
+      } catch (e) {
+        tui.print(`${c.red}\u2717${c.reset} Upgrade failed: ${e instanceof Error ? e.message : String(e)}`);
+        return;
+      }
+      if (!applied?.ok) {
+        tui.print(`${c.red}\u2717${c.reset} Upgrade failed: ${applied?.error ?? "unknown error"}`);
+        return;
+      }
+      const n = applied.sessions ?? quote.sessions;
+      tui.print(`${c.green}\u2713${c.reset} ${c.bold}${gradientText(`You now have ${n} parallel session${n === 1 ? "" : "s"}.`)}${c.reset}`);
+      if (opts.auto && lastSent) {
+        tui.print(`${c.gray}Continuing\u2026${c.reset}`);
+        await sendNow(lastSent.text, lastSent.images);
+      }
+    } finally {
+      upgradeInFlight = false;
+    }
+  };
+  const isSessionLimitError = (msg) => /thread limit reached|simultaneous (thread|session)s?.*in use|no active standard code subscription/i.test(msg);
   const skillsCtl = {
     list: () => api.listSkills(),
     setEnabled: (name, enabled) => api.setSkillEnabled(name, enabled),
@@ -5214,6 +5418,12 @@ ${c.bold}why: ${req.requestPermission}${c.reset}` : ""}`,
       hint: "billing & sessions, opens in browser",
       run: () => runAccountCommand()
     },
+    {
+      name: "upgrade",
+      label: "Add a parallel session",
+      hint: "run more sessions at once",
+      run: () => offerUpgrade()
+    },
     { name: "background", label: "Background processes", hint: "list / stop", run: () => runProcessMenu(tui, bgMgr) },
     { name: "keybindings", label: "Keyboard shortcuts", run: () => showKeybindings(tui) },
     { name: "update", label: "Check for updates", hint: "check for a newer version", run: () => runUpdateCommand(tui) },
@@ -5314,6 +5524,11 @@ ${c.bold}why: ${req.requestPermission}${c.reset}` : ""}`,
       if (shownIds.has(m.id) || m.status === "pending") continue;
       shownIds.add(m.id);
       const text = messageText(m.content).trim();
+      const denial = typeof m.error === "string" && m.error || text;
+      if (denial && isSessionLimitError(denial)) {
+        void offerUpgrade({ auto: true });
+        continue;
+      }
       if (m.role === "assistant" && text) printAssistant(tui, text);
       else if (m.role === "system" && text) tui.print(`${c.dim}${text}${c.reset}`);
       else if (m.role === "user" && text) {
@@ -5383,6 +5598,7 @@ ${c.bold}why: ${req.requestPermission}${c.reset}` : ""}`,
   bridge.close();
   stream.close();
   events.close();
+  subActivity.closeAll();
   mcp.closeAll();
   const [, killed] = await Promise.race([
     Promise.all([stopped, procsStopped]),
@@ -5552,7 +5768,7 @@ async function runApprovalsMenu(tui, perm, save) {
   }
   const items = [
     ...tools.map((t) => ({ label: `Tool: ${t}`, hint: "always allowed", value: `tool:${t}` })),
-    ...risks.map((r) => ({ label: `All level ${r} risk`, hint: "always allowed", value: `risk:${r}` })),
+    ...risks.map((r) => ({ label: `Risk level ${r} and below`, hint: "auto-accepted", value: `risk:${r}` })),
     { label: "Clear all approvals", hint: "", value: "clear" }
   ];
   const picked = await tui.select(