@spinalfluid/ultrac 0.1.18 → 0.1.21

package/README.md

@@ -10,12 +10,12 @@ between input and output. The hosted API supports streaming and native tool call
 
 ```bash
 npm install -g @spinalfluid/ultrac
-ultrac login
-ultrac doctor
 ultrac
 ```
 
-The npm package is public. Model access still requires an approved Ultrac account and `ultrac login`.
+The npm package is public. The first interactive `ultrac` launch opens browser sign-in automatically
+and continues into the same terminal session after verification. Model access requires an approved
+Ultrac account. You can also sign in explicitly with `ultrac login`.
 Requires Node.js >= 22.12.0. The command is `ultrac`; the package is `@spinalfluid/ultrac`.
 The unrelated public packages named `ultrac` and `ultracode` are different products.
 
@@ -764,3 +764,14 @@ when a tool needs an ungranted permission.
 These presets do not bypass operating-system permissions or the restrictions of a read-only
 agent mode. Approval dialogs offer separate choices for one call, the session, denial, or
 session-long refusal, with keyboard selection in interactive terminals.
+
+After a terminal permission selection, the approval dialog collapses to the tool, permission,
+and selected choice. Activity and progress messages stay in chronological transcript order,
+with spacing between groups; command details remain available through the activity dropdown.
+
+Progress prose comes from the model and describes the actual work or verified findings. The CLI
+does not generate periodic tool-count, failure-count, or model-waiting messages.
+
+Use `/permissions` to open the interactive permission-mode picker, `/permissions status` to
+inspect grants, or `/permissions readonly`, `/permissions workspace`, and `/permissions full`
+to change modes directly for the current session.

package/dist/cli.js

@@ -10834,6 +10834,8 @@ ${mode.instructions.map((instruction) => `- ${instruction}`).join("\n")}
 ${autonomyLines}
 ${UNTRUSTED_CONTENT_GUIDANCE}
 
+For long tasks, occasionally give a brief user-facing update about the current work or verified findings. Avoid repetitive updates, tool-call counts, failure counts, and boilerplate about waiting for the model. Do not invent findings or claim work that has not happened.
+
 ${nativeTools ? "Write complete code files or append complete sections across tool calls for large implementations. Verify files with tests or a compiler. Never replace requested code with placeholders or ellipses. Keep final explanations concise. Use the provided native function tools for actions. Do not put a JSON tool-call protocol in your answer. When the requested work is complete, give the final answer without calling more tools." : `Respond only with a JSON object:
 {
   "message": "short user-facing status or final answer",
@@ -13809,13 +13811,9 @@ function registerLoginCommand(program2) {
       );
     }
     let apiKey = options.key?.trim();
-    let email;
-    let keyId;
     if (!apiKey && !options.manual) {
-      const signedIn = await browserLogin(baseUrl, options.browser);
-      apiKey = signedIn.apiKey;
-      email = signedIn.email;
-      keyId = signedIn.keyId;
+      await signInWithBrowser({ baseUrl, browser: options.browser });
+      return;
     } else if (!apiKey) {
       const loginUrl = loginUrlFor(baseUrl);
       console.log(`Create an API key at ${chalk4.cyan(loginUrl)} and paste it below.`);
@@ -13828,7 +13826,7 @@ function registerLoginCommand(program2) {
         stdin3.isTTY ? "No API key provided. Nothing was saved." : "No API key provided on stdin. Nothing was saved. Set ULTRAC_API_KEY for non-interactive use or pass an existing key with --key."
       );
     }
-    await verifyAndStore({ apiKey, baseUrl, email, keyId, pasted: Boolean(options.manual || options.key) });
+    await verifyAndStore({ apiKey, baseUrl, pasted: Boolean(options.manual || options.key) });
   });
   program2.command("logout").description("Remove stored Ultrac credentials").action(async () => {
     const stored = await readCredentials();
@@ -13859,6 +13857,11 @@ function registerLoginCommand(program2) {
     if (stored?.createdAt) console.log(`  since:    ${stored.createdAt}`);
   });
 }
+async function signInWithBrowser(input) {
+  const baseUrl = assertAllowedUltracBaseUrl(input.baseUrl);
+  const signedIn = await browserLogin(baseUrl, input.browser !== false);
+  await verifyAndStore({ ...signedIn, baseUrl, showStartupHint: !input.continueSession });
+}
 async function browserLogin(baseUrl, shouldOpen) {
   try {
     return await loginWithBrowser({
@@ -13903,7 +13906,7 @@ async function verifyAndStore(input) {
   });
   console.log(chalk4.green(`Signed in. Credentials saved to ${path}`));
   if (input.email) console.log(chalk4.gray(`  ${input.email}`));
-  console.log(chalk4.gray("Run `ultrac` to start an interactive session."));
+  if (input.showStartupHint !== false) console.log(chalk4.gray("Run `ultrac` to start an interactive session."));
 }
 async function revokeStoredKey(apiKey, baseUrl) {
   const url = currentKeyUrl(baseUrl);
@@ -17005,6 +17008,8 @@ ${mode.instructions.map((instruction) => `- ${instruction}`).join("\n")}
 
 ${UNTRUSTED_CONTENT_GUIDANCE}
 
+For long tasks, occasionally give a brief user-facing update about the current work or verified findings. Avoid repetitive updates, tool-call counts, failure counts, and boilerplate about waiting for the model. Do not invent findings or claim work that has not happened.
+
 For large code generation, write complete files or append complete sections across multiple tool calls. Verify the files with the project tests or compiler. Never use ellipses or placeholders for requested implementation, and do not declare success with unfinished code. Keep final explanations concise; code completeness takes priority over response brevity.
 
 Use the provided tools to inspect and change the workspace. Prefer narrow, reversible changes and
@@ -17636,6 +17641,16 @@ function formatSeconds(milliseconds) {
 
 // src/ui/activity.ts
 var sink;
+var messageSink;
+function setActivityMessageSink(value) {
+  messageSink = value;
+}
+function writeActivityMessage(text) {
+  if (messageSink) messageSink(text);
+  else console.log(`
+${text}
+`);
+}
 var workingSink;
 function setWorkingSink(value) {
   workingSink = value;
@@ -17670,7 +17685,7 @@ function activityRows(snapshot, expanded, selected, end) {
   const summary = `${expanded ? "\u25BE" : "\u25B8"} \u25CF ${snapshot.entries.length} ${snapshot.entries.length === 1 ? "tool call" : "tool calls"}${failures ? ` \xB7 ${failures} failed` : ""}${snapshot.finished ? elapsed : ""} \xB7 Ctrl+O details`;
   const rows = [{ text: summary, ok: failures || snapshot.failed ? false : snapshot.finished ? true : void 0 }];
   if (!expanded) {
-    if (!snapshot.finished) for (let index = Math.max(0, snapshot.entries.length - 3); index < snapshot.entries.length; index += 1) {
+    if (!snapshot.finished || snapshot.preview) for (let index = Math.max(0, snapshot.entries.length - 3); index < snapshot.entries.length; index += 1) {
       const entry = snapshot.entries[index];
       rows.push({ text: `  \u25CF ${entry.label}`, ok: entry.ok, entry: index });
     }
@@ -17690,32 +17705,6 @@ function activityRows(snapshot, expanded, selected, end) {
   return rows;
 }
 
-// src/ui/task-progress.ts
-function startTaskProgress(options) {
-  let lastMessage = performance.now();
-  let lastState = "";
-  let stopped = false;
-  const timer = setInterval(() => {
-    if (stopped || options.holdWhile?.()) return;
-    const state = options.snapshot();
-    if (!state.activeTool && !state.waitingForModel) return;
-    const fingerprint = `${state.completed}:${state.failed}:${state.activeTool ?? "model"}`;
-    if (performance.now() - lastMessage < (fingerprint === lastState ? 6e4 : 3e4)) return;
-    const completed = state.completed ? `I have completed ${state.completed} tool ${state.completed === 1 ? "call" : "calls"}.${state.failed ? ` Of those, ${state.failed} failed.` : ""} ` : "";
-    const current = state.activeTool ? `I am running the ${state.activeTool} tool.` : "I am waiting for the model's next response.";
-    options.write(`${completed}${current}`);
-    lastMessage = performance.now();
-    lastState = fingerprint;
-  }, 5e3);
-  timer.unref?.();
-  return { markMessage: () => {
-    lastMessage = performance.now();
-  }, stop: () => {
-    stopped = true;
-    clearInterval(timer);
-  } };
-}
-
 // src/ui/interactive-choice.ts
 var MOUSE_ON = "\x1B[?1006h\x1B[?1000h";
 var MOUSE_OFF = "\x1B[?1000l\x1B[?1006l";
@@ -18117,6 +18106,9 @@ var TerminalLayout = class {
   prompt = "\u203A ";
   inputFormatter;
   transcriptRow = 1;
+  transientBlocks = /* @__PURE__ */ new Set();
+  activityOffset = 0;
+  totalActivityEntries = 0;
   transcriptColumn = 1;
   wrapPending = false;
   savedTranscript;
@@ -18230,7 +18222,61 @@ var TerminalLayout = class {
     };
     this.paintFooter();
   }
+  beginTransientBlock() {
+    const anchor = { row: this.transcriptRow };
+    this.transientBlocks.add(anchor);
+    return anchor;
+  }
+  collapseTransientBlock(anchor, summary) {
+    if (!this.transientBlocks.delete(anchor) || this.closed) return;
+    const start = Math.max(1, Math.min(anchor.row, this.transcriptRow));
+    const removed = Math.max(0, this.transcriptRow - start);
+    if (removed) this.rawWrite(`${cup(start)}${CSI}${removed}M`);
+    this.rawWrite(`${cup(start)}${CSI}2K`);
+    for (const item of this.completedActivities) if (item.row >= start) item.row -= removed;
+    this.completedActivities = this.completedActivities.filter((item) => item.row >= 1);
+    this.transcriptRow = start;
+    this.transcriptColumn = 1;
+    this.wrapPending = false;
+    this.writeTranscript(`${summary}
+
+`);
+    this.paintFooter();
+  }
+  writeActivityMessage(text) {
+    const item = this.liveActivity;
+    if (item) {
+      if (item.snapshot.entries.length) {
+        item.snapshot = { ...item.snapshot, finished: true, preview: true };
+        if (item.row >= 2) this.rawWrite(`${cup(item.row - 1)}${CSI}2K`);
+        this.redrawCompleted(item);
+      } else {
+        const start = Math.max(1, item.row - 1);
+        const removed = item.row >= 1 ? Math.max(0, Math.min(item.height + (item.row >= 2 ? 1 : 0), this.transcriptRow - start)) : 0;
+        if (removed) this.rawWrite(`${cup(start)}${CSI}${removed}M`);
+        this.transcriptRow -= removed;
+        this.completedActivities = this.completedActivities.filter((entry) => entry !== item);
+      }
+      this.liveActivity = void 0;
+    }
+    this.activityOffset = this.totalActivityEntries;
+    this.writeTranscript(`
+${text}
+
+`);
+    if (item) {
+      const snapshot = { ...item.snapshot, entries: [], finished: false, preview: false };
+      this.writeTranscript(`
+${this.colorActivityRow(activityRows(snapshot, false, -1, 0)[0])}
+`);
+      this.liveActivity = { snapshot, row: this.transcriptRow - 1, height: 1, expanded: false, selected: -1, end: 0 };
+      this.completedActivities.push(this.liveActivity);
+    }
+  }
   setActivity(snapshot) {
+    if (!this.liveActivity && snapshot.entries.length < this.totalActivityEntries) this.activityOffset = 0;
+    this.totalActivityEntries = snapshot.entries.length;
+    snapshot = { ...snapshot, entries: snapshot.entries.slice(this.activityOffset) };
     this.activity = snapshot;
     if (!this.enabled || !this.installed || this.closed) return;
     if (!this.liveActivity && !snapshot.finished) {
@@ -18257,9 +18303,13 @@ ${this.colorActivityRow(activityRows(snapshot, false, -1, snapshot.entries.lengt
     }
     this.completedActivities = this.completedActivities.filter((entry) => entry !== item);
     this.liveActivity = void 0;
-    this.writeTranscript(`${this.colorActivityRow(activityRows(snapshot, false, -1, snapshot.entries.length)[0])}
+    this.activityOffset = 0;
+    this.totalActivityEntries = 0;
+    if (snapshot.entries.length) {
+      this.writeTranscript(`${this.colorActivityRow(activityRows(snapshot, false, -1, snapshot.entries.length)[0])}
 `);
-    this.completedActivities.push({ ...item, row: this.transcriptRow - 1, height: 1, expanded: false, selected: -1 });
+      this.completedActivities.push({ ...item, row: this.transcriptRow - 1, height: 1, expanded: false, selected: -1 });
+    }
     this.paintFooter();
   }
   setWorkingStatus(text) {
@@ -18290,6 +18340,7 @@ ${this.colorActivityRow(activityRows(item.snapshot, false, -1, item.end)[0])}
     return dot >= 0 && color ? `${text.slice(0, dot)}${color}\u25CF${CSI}39m${text.slice(dot + 1)}` : text;
   }
   shiftCompleted(rows) {
+    for (const anchor of this.transientBlocks) anchor.row -= rows;
     for (const item of this.completedActivities) item.row -= rows;
     this.completedActivities = this.completedActivities.filter((item) => item.row >= 1);
   }
@@ -18313,7 +18364,7 @@ ${this.colorActivityRow(activityRows(item.snapshot, false, -1, item.end)[0])}
   }
   toggleActivity() {
     if (this.liveActivity && (this.liveActivity.row < 2 || this.liveActivity.row + this.liveActivity.height > this.contentRows)) this.setWorkingStatus("working\u2026");
-    const item = this.liveActivity ?? this.completedActivities.at(-1);
+    const item = this.liveActivity?.snapshot.entries.length ? this.liveActivity : [...this.completedActivities].reverse().find((entry) => entry.snapshot.entries.length > 0) ?? this.liveActivity;
     if (item) {
       item.expanded = !item.expanded;
       this.redrawCompleted(item);
@@ -18926,7 +18977,7 @@ var HELP = `Commands:
   /autonomous [on|off|status]  Continue step-limited turns (up to five rounds)
   /model [name]         Show or set the model
   /mode [name]          Show or set the agent mode (${agentModeNames.join(", ")})
-  /permissions [readonly|workspace|full]  Show or set permissions
+  /permissions [readonly|workspace|full|status]  Choose or set tool access
   /deny <perm>          Revoke a permission for this session
   /plan [task]          Plan without workspace edits
   /review [focus]       Review current changes without editing
@@ -19049,6 +19100,10 @@ async function runRepl(options, initialTask = "") {
     throw new Error("--max-steps must be a positive integer.");
   }
   const hasFallbackChain = Boolean(config.fallback?.chain?.length);
+  if (providerName === "ultrac" && !hasFallbackChain && !await resolveUltracCredentials() && stdin5.isTTY && stdout5.isTTY) {
+    console.log("Opening browser sign-in\u2026");
+    await signInWithBrowser({ baseUrl: resolveBaseUrl().baseUrl, continueSession: true });
+  }
   if (providerName === "ultrac" && !hasFallbackChain && !await resolveUltracCredentials()) {
     console.log(chalk11.yellow("You are not signed in to Ultrac."));
     console.log(`Run ${chalk11.white("ultrac login")} first, or start with ${chalk11.white("--provider echo")}.`);
@@ -19125,6 +19180,7 @@ async function runRepl(options, initialTask = "") {
   }) : void 0;
   setActivitySink(layout?.enabled ? (snapshot) => layout.setActivity(snapshot) : void 0);
   setWorkingSink(layout?.enabled ? (text) => layout.setWorkingStatus(text) : void 0);
+  setActivityMessageSink(layout?.enabled ? (text) => layout.writeActivityMessage(text) : void 0);
   const refreshDetails = () => {
     if (!layout?.enabled) return;
     const steps = session.toSession().steps;
@@ -19209,36 +19265,44 @@ async function runRepl(options, initialTask = "") {
   };
   const drainQueuedMessages = () => reader.drainQueuedMessages();
   let autonomousRounds = 5;
-  setAskUserRuntime(async (text, options2, signal) => {
-    console.log(chalk11.white(`
+  setAskUserRuntime(async (text, options2, signal, presentation) => {
+    const block = presentation && layout?.enabled ? layout.beginTransientBlock() : void 0;
+    let resolvedAnswer = null;
+    try {
+      console.log(chalk11.white(`
   ? ${text}`));
-    let rawAnswer;
-    if (options2?.length && layout?.enabled) {
-      slashCompletion?.suspend();
-      layout.setPrompt("\u203A ");
-      let choices;
-      try {
-        choices = attachInteractiveChoices(rl, options2, { signal, output: stdout5, prompt: "\u203A ", maxRow: () => layout.contentRows });
-        rawAnswer = await reader.nextFresh(signal);
-      } finally {
-        choices?.cleanup();
+      let rawAnswer;
+      if (options2?.length && layout?.enabled) {
+        slashCompletion?.suspend();
         layout.setPrompt("\u203A ");
-        slashCompletion?.resume();
+        let choices;
+        try {
+          choices = attachInteractiveChoices(rl, options2, { signal, output: stdout5, prompt: "\u203A ", maxRow: () => layout.contentRows });
+          rawAnswer = await reader.nextFresh(signal);
+        } finally {
+          choices?.cleanup();
+          layout.setPrompt("\u203A ");
+          slashCompletion?.resume();
+        }
+      } else {
+        if (options2?.length) {
+          options2.forEach((option, index) => console.log(chalk11.gray(`     ${index + 1}. ${option}`)));
+          console.log(chalk11.gray("     (type a number, or answer in your own words)"));
+        }
+        rawAnswer = await question(chalk11.white("  \u203A "), signal);
       }
-    } else {
-      if (options2?.length) {
-        options2.forEach((option, index) => console.log(chalk11.gray(`     ${index + 1}. ${option}`)));
-        console.log(chalk11.gray("     (type a number, or answer in your own words)"));
+      if (signal?.aborted) return null;
+      const answer = (rawAnswer ?? "").trim();
+      const picked = Number.parseInt(answer, 10);
+      if (options2?.length && String(picked) === answer && picked >= 1 && picked <= options2.length) {
+        resolvedAnswer = options2[picked - 1];
+        return resolvedAnswer;
       }
-      rawAnswer = await question(chalk11.white("  \u203A "), signal);
-    }
-    if (signal?.aborted) return null;
-    const answer = (rawAnswer ?? "").trim();
-    const picked = Number.parseInt(answer, 10);
-    if (options2?.length && String(picked) === answer && picked >= 1 && picked <= options2.length) {
-      return options2[picked - 1];
+      resolvedAnswer = rawAnswer === null ? null : answer;
+      return resolvedAnswer;
+    } finally {
+      if (block && presentation) layout?.collapseTransientBlock(block, presentation.collapseSummary(signal?.aborted ? null : resolvedAnswer));
     }
-    return answer;
   });
   let running = true;
   let turnAbort;
@@ -19366,6 +19430,7 @@ async function runRepl(options, initialTask = "") {
     setAskUserRuntime(void 0);
     setActivitySink(void 0);
     setWorkingSink(void 0);
+    setActivityMessageSink(void 0);
     rl.close();
     try {
       await saveTranscript(session, writeCheckpoint);
@@ -19405,17 +19470,6 @@ async function runTurn(session, input, question, signal, drainQueuedMessages, pe
   const detachProgress = quiet ? () => {
   } : attachProgressUi();
   let deltaChars = 0;
-  const progress2 = quiet ? void 0 : startTaskProgress({
-    snapshot: () => ({
-      completed: entries.length,
-      failed: entries.filter((entry) => !entry.ok).length,
-      activeTool: [...activeTools.keys()].at(-1)?.tool,
-      waitingForModel: thinkingStarted !== void 0
-    }),
-    holdWhile: () => permissionPrompts > 0 || [...activeTools.keys()].some((call) => call.tool === "ask_user"),
-    write: (text) => console.log(`
-${text}`)
-  });
   try {
     const prepared = allowImageDrop ? await prepareImageInput(input) : { text: input };
     await session.ask(prepared.text, {
@@ -19450,9 +19504,7 @@ ${text}`)
       },
       onAssistantMessage: (message) => {
         if (message.trim()) {
-          progress2?.markMessage();
-          console.log(`
-${message.trim()}`);
+          writeActivityMessage(message.trim());
         }
       },
       onToolStart: (call) => {
@@ -19513,7 +19565,11 @@ ${message.trim()}`);
   Answer: `;
           const choices = ["Allow once", "Allow for this session", "Deny this call", "Never allow this permission this session"];
           const asker = getAskUserRuntime();
-          const rawAnswer = asker ? await asker(prompt.split("\n").slice(0, -5).join("\n"), choices, signal) : await question(chalk11.yellow(prompt), signal);
+          const rawAnswer = asker ? await asker(prompt.split("\n").slice(0, -5).join("\n"), choices, signal, { collapseSummary: (value) => {
+            const answer2 = value?.trim().toLowerCase();
+            const label = !answer2 ? "Cancelled" : ["a", "always", "2", choices[1].toLowerCase()].includes(answer2) ? choices[1] : ["o", "once", "y", "yes", "1", choices[0].toLowerCase()].includes(answer2) ? choices[0] : ["e", "never", "4", choices[3].toLowerCase()].includes(answer2) ? choices[3] : choices[2];
+            return `  ${call.tool} \xB7 ${permission} permission: ${label}`;
+          } }) : await question(chalk11.yellow(prompt), signal);
           if (signal?.aborted || rawAnswer === null) return "deny";
           const answer = rawAnswer.trim().toLowerCase();
           if (answer === "a" || answer === "always" || answer === "2" || answer === choices[1].toLowerCase()) return "always";
@@ -19545,7 +19601,6 @@ ${message.trim()}`);
     activeTools.clear();
     if (thinkingStarted !== void 0) thinkingMs += performance.now() - thinkingStarted;
     refreshActivity(true);
-    progress2?.stop();
     detachProgress();
   }
 }
@@ -19823,15 +19878,43 @@ ${extra}`);
       return "ok";
     }
     case "permissions": {
-      if (argument) {
-        if (!["readonly", "workspace", "full"].includes(argument)) {
-          console.log("Usage: /permissions [readonly|workspace|full]");
+      let selectedMode = argument.toLowerCase();
+      const modes = ["readonly", "workspace", "full"];
+      const choices = ["Readonly: no write, shell, or network access", "Workspace: file writes; shell and network denied", "Full access: no tool approval prompts"];
+      const resolveMode = (value) => {
+        if (value === null) return void 0;
+        const text = value.trim().toLowerCase();
+        const index = choices.findIndex((choice) => choice.toLowerCase() === text);
+        if (index >= 0) return modes[index];
+        if (["1", "2", "3"].includes(text)) return modes[Number(text) - 1];
+        return modes.includes(text) ? text : void 0;
+      };
+      const asker = getAskUserRuntime();
+      if (!selectedMode && asker) {
+        const answer = await asker("Choose tool permissions for this session.", choices, signal, {
+          collapseSummary: (value) => {
+            const mode2 = resolveMode(value);
+            return mode2 ? `  Permission mode: ${mode2}` : "  Permission mode unchanged.";
+          }
+        });
+        if (signal?.aborted || answer === null) return "ok";
+        const mode = resolveMode(answer);
+        if (!mode) {
+          console.log("Permission mode unchanged. Use /permissions readonly|workspace|full.");
+          return "ok";
+        }
+        selectedMode = mode;
+      }
+      if (selectedMode && selectedMode !== "status") {
+        if (!modes.includes(selectedMode)) {
+          console.log("Usage: /permissions [readonly|workspace|full|status]");
           return "ok";
         }
         for (const permission of ["write", "shell", "network"]) {
-          session.setPermission(permission, argument === "full" || argument === "workspace" && permission === "write");
+          session.setPermission(permission, selectedMode === "full" || selectedMode === "workspace" && permission === "write");
         }
-        console.log(argument === "full" ? "Full access: file, shell, and network tools run without approval prompts for this session." : "Permissions updated. Ungranted tools are denied without prompting; /allow restores access.");
+        if (argument) console.log(selectedMode === "full" ? "Full access: file, shell, and network tools run without approval prompts for this session." : `Permission mode: ${selectedMode}. Ungranted tools are denied without prompting.`);
+        return "ok";
       }
       const p = session.currentPermissions;
       console.log(`write: ${p.write}  shell: ${p.shell}  network: ${p.network}`);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@spinalfluid/ultrac",
-  "version": "0.1.18",
+  "version": "0.1.21",
   "license": "SEE LICENSE IN LICENSE",
   "description": "Ultrac terminal agent harness for Cosmic 1, with local tools, browser sign-in, streamed answers, and resumable sessions.",
   "author": "Aditya Pundir",