@spinalfluid/ultrac 0.1.11 → 0.1.14

package/dist/cli.js

@@ -399,6 +399,7 @@ function modePermissionAccessError(mode, toolName, permission) {
 var EchoProvider = class {
   name = "echo";
   async complete(request) {
+    if (request.messages.some((message) => message.image)) throw Object.assign(new Error("Echo provider cannot inspect image attachments."), { status: 400 });
     const lastUserMessage = [...request.messages].reverse().find((message) => message.role === "user");
     return {
       text: JSON.stringify(
@@ -1136,6 +1137,9 @@ function pinCurrentTurn(units, isUser) {
   }
 }
 function messageChars(message) {
+  if (message && typeof message === "object" && "image" in message && message.image) {
+    return JSON.stringify({ ...message, image: void 0 }).length + 4096 * CHARS_PER_TOKEN;
+  }
   return JSON.stringify(message)?.length ?? 0;
 }
 var noticeSink = (message) => {
@@ -1143,8 +1147,8 @@ var noticeSink = (message) => {
 `);
 };
 var noticed = false;
-function setContextBudgetNotice(sink) {
-  noticeSink = sink;
+function setContextBudgetNotice(sink2) {
+  noticeSink = sink2;
 }
 function resetContextBudgetNotices() {
   noticed = false;
@@ -2044,6 +2048,10 @@ var UltracProvider = class {
         if (chunk.choices[0]?.finish_reason) finishReason = chunk.choices[0].finish_reason;
         const delta = chunk.choices[0]?.delta;
         if (!delta) continue;
+        const reasoning = delta.reasoning_content;
+        if (delta.content || reasoning || delta.tool_calls?.some(
+          (part) => part.id || part.function?.name || part.function?.arguments
+        )) request.onProgress?.();
         if (delta.content) content += delta.content;
         for (const part of delta.tool_calls ?? []) {
           const call = calls.get(part.index) ?? { id: "", name: "", arguments: "" };
@@ -2199,8 +2207,8 @@ async function validateSnapshotWithin(snapshot, timeoutMs) {
   try {
     return await Promise.race([
       snapshot.validate(),
-      new Promise((resolve15) => {
-        timer = setTimeout(() => resolve15(void 0), timeoutMs);
+      new Promise((resolve17) => {
+        timer = setTimeout(() => resolve17(void 0), timeoutMs);
       })
     ]);
   } finally {
@@ -2264,8 +2272,8 @@ async function settleWithin(promise, timeoutMs) {
   try {
     await Promise.race([
       Promise.resolve(promise).catch(() => void 0),
-      new Promise((resolve15) => {
-        timer = setTimeout(resolve15, timeoutMs);
+      new Promise((resolve17) => {
+        timer = setTimeout(resolve17, timeoutMs);
       })
     ]);
   } finally {
@@ -2309,10 +2317,11 @@ function toChatMessages(request) {
   ];
 }
 function toChatMessage(message) {
-  return {
-    role: message.role === "assistant" ? "assistant" : "user",
-    content: message.content
-  };
+  if (message.role === "assistant") return { role: "assistant", content: message.content };
+  return { role: "user", content: message.image ? [
+    { type: "text", text: message.content },
+    { type: "image_url", image_url: { url: message.image.url } }
+  ] : message.content };
 }
 function toNativeChatMessage(message) {
   if (message.role === "tool") {
@@ -2332,6 +2341,10 @@ function toNativeChatMessage(message) {
       }))
     };
   }
+  if (message.role === "user" && message.image) return { role: "user", content: [
+    { type: "text", text: message.content },
+    { type: "image_url", image_url: { url: message.image.url } }
+  ] };
   return { role: message.role, content: message.content };
 }
 function toOpenAiTool(tool) {
@@ -2482,7 +2495,7 @@ var FallbackConfigSchema = z3.object({
   backoffFactor: z3.number().min(1).max(10).default(2),
   /** Randomize backoff to avoid synchronized retries. */
   jitter: z3.boolean().default(true),
-  /** Per-attempt timeout; for text streams it bounds time-to-first-token. 0 disables it. */
+  /** Per-attempt timeout; text streams bound first-token time, native streams bound inactivity. 0 disables it. */
   requestTimeoutMs: z3.number().int().min(0).max(6e5).default(12e4)
 });
 var ProviderTimeoutError = class extends Error {
@@ -2723,17 +2736,17 @@ function computeBackoffDelay(attempt, options) {
   return Math.round(capped * (0.5 + random() * 0.5));
 }
 function defaultSleep(ms, cancel) {
-  return new Promise((resolve15) => {
+  return new Promise((resolve17) => {
     if (cancel?.aborted) {
-      resolve15();
+      resolve17();
       return;
     }
-    const timer = setTimeout(resolve15, ms);
+    const timer = setTimeout(resolve17, ms);
     cancel?.addEventListener(
       "abort",
       () => {
         clearTimeout(timer);
-        resolve15();
+        resolve17();
       },
       { once: true }
     );
@@ -2808,10 +2821,19 @@ var FallbackProvider = class {
     );
   }
   async chatWithTools(request) {
-    return this.run("chatWithTools", request.signal, request.model, (entry, model, signal) => {
+    return this.run("chatWithTools", request.signal, request.model, (entry, model, signal, touch) => {
       if (entry.provider.supportsToolCalling && entry.provider.chatWithTools) {
-        return entry.provider.chatWithTools({ ...request, model, signal });
+        return entry.provider.chatWithTools({
+          ...request,
+          model,
+          signal,
+          onProgress: () => {
+            touch();
+            request.onProgress?.();
+          }
+        });
       }
+      if (request.messages.some((message) => "image" in message && message.image)) throw Object.assign(new Error("This fallback provider cannot inspect image attachments."), { status: 400 });
       return this.chatThroughToolProtocol(entry, model, request, signal);
     });
   }
@@ -2896,7 +2918,8 @@ var FallbackProvider = class {
           const result = await this.withDeadline(
             entry.name,
             signal,
-            (attemptSignal) => invoke(entry, model, attemptSignal)
+            (attemptSignal, touch) => invoke(entry, model, attemptSignal, touch),
+            operation === "chatWithTools"
           );
           this.active = target;
           trace.end({ outcome: "ok" });
@@ -3116,10 +3139,10 @@ var FallbackProvider = class {
     error.name = "AbortError";
     throw error;
   }
-  async withDeadline(provider, signal, run) {
-    const deadline = this.createDeadline(provider, signal);
+  async withDeadline(provider, signal, run, inactivity = false) {
+    const deadline = this.createDeadline(provider, signal, inactivity);
     try {
-      return await deadline.race(run(deadline.signal));
+      return await deadline.race(run(deadline.signal, deadline.touch));
     } finally {
       deadline.clear();
     }
@@ -3129,31 +3152,55 @@ var FallbackProvider = class {
    * only ever rejects while the deadline is live, so clearing it can never leave
    * an unhandled rejection behind.
    */
-  createDeadline(provider, signal) {
+  createDeadline(provider, signal, inactivity = false) {
     if (this.requestTimeoutMs <= 0) {
-      return { signal, race: (promise) => promise, clear: () => void 0 };
+      return { signal, race: (promise) => promise, clear: () => void 0, touch: () => void 0 };
     }
     const controller = new AbortController();
-    const forwardAbort = () => controller.abort(signal?.reason);
+    let cleared = false;
+    let idleTimer;
+    const hardTimer = new AbortController();
+    let rejectExpired;
+    const expired = new Promise((_, reject) => {
+      rejectExpired = reject;
+    });
+    const forwardAbort = () => {
+      const reason = signal?.reason ?? Object.assign(new Error("Request was aborted."), { name: "AbortError" });
+      rejectExpired(reason);
+      controller.abort(reason);
+    };
+    const expire = (timeoutMs) => {
+      const error = new ProviderTimeoutError(timeoutMs, provider);
+      rejectExpired(error);
+      controller.abort(error);
+    };
+    const touch = () => {
+      if (cleared || controller.signal.aborted) return;
+      idleTimer?.abort();
+      const timer = new AbortController();
+      idleTimer = timer;
+      void this.sleep(this.requestTimeoutMs, timer.signal).then(() => {
+        if (!cleared && !timer.signal.aborted) expire(this.requestTimeoutMs);
+      });
+    };
+    touch();
+    if (inactivity) {
+      void this.sleep(3e5, hardTimer.signal).then(() => {
+        if (!cleared && !hardTimer.signal.aborted) expire(3e5);
+      });
+    }
     if (signal) {
       if (signal.aborted) forwardAbort();
       else signal.addEventListener("abort", forwardAbort, { once: true });
     }
-    let cleared = false;
-    const cancelDeadline = new AbortController();
-    const expired = new Promise((_, reject) => {
-      void this.sleep(this.requestTimeoutMs, cancelDeadline.signal).then(() => {
-        if (cleared) return;
-        controller.abort();
-        reject(new ProviderTimeoutError(this.requestTimeoutMs, provider));
-      });
-    });
     return {
       signal: controller.signal,
       race: (promise) => Promise.race([promise, expired]),
+      touch: inactivity ? touch : () => void 0,
       clear: () => {
         cleared = true;
-        cancelDeadline.abort();
+        idleTimer?.abort();
+        hardTimer.abort();
         signal?.removeEventListener("abort", forwardAbort);
       }
     };
@@ -4066,7 +4113,7 @@ function runProcess(command, args, options) {
     });
   }
   const { env: env2, redactedEnvKeys } = createSanitizedProcessEnv();
-  return new Promise((resolve15, reject) => {
+  return new Promise((resolve17, reject) => {
     const child = spawn(command, args, {
       cwd: options.cwd,
       stdio: ["pipe", "pipe", "pipe"],
@@ -4151,7 +4198,7 @@ function runProcess(command, args, options) {
     child.on("error", (error) => {
       finish(() => {
         if (termination === "aborted") {
-          resolve15({
+          resolve17({
             stdout: stdout6.text(),
             stderr: stderr2.text(),
             started,
@@ -4173,7 +4220,7 @@ function runProcess(command, args, options) {
       const stdoutTruncation = stdout6.truncation();
       const stderrTruncation = stderr2.truncation();
       finish(
-        () => resolve15({
+        () => resolve17({
           stdout: stdout6.text(),
           stderr: stderr2.text(),
           started,
@@ -5185,7 +5232,7 @@ function topCounts(values) {
   for (const value of values) {
     counts.set(value, (counts.get(value) ?? 0) + 1);
   }
-  return [...counts.entries()].map(([name, count4]) => ({ name, count: count4 })).sort((a, b) => b.count - a.count || a.name.localeCompare(b.name));
+  return [...counts.entries()].map(([name, count3]) => ({ name, count: count3 })).sort((a, b) => b.count - a.count || a.name.localeCompare(b.name));
 }
 async function collectGitContext(workspace, signal) {
   const statusResult = await runGit(["status", "--short", "--branch"], { cwd: workspace, signal });
@@ -5377,7 +5424,7 @@ var diagnosticsTool = {
     const byFile = summarizeByFile(matched);
     const records = matched.slice(0, input.maxRecords);
     const checkerExit = runs[0].exitCode;
-    const clean = matched.length === 0;
+    const clean2 = matched.length === 0;
     const unparsed = matched.length === 0 && runs.some((run) => run.exitCode !== 0);
     const rawTail = unparsed ? tail(runs.find((run) => run.exitCode !== 0)?.output ?? "", 2e3) : void 0;
     const lines = [
@@ -5394,9 +5441,9 @@ var diagnosticsTool = {
       ...byFile.length ? byFile.slice(0, input.maxFiles).map((entry) => `- ${entry.file}: ${entry.errors} error(s), ${entry.warnings} warning(s)`) : ["- none"],
       byFile.length > input.maxFiles ? `- ...${byFile.length - input.maxFiles} more file(s)` : void 0,
       "",
-      clean ? unparsed ? "No diagnostics parsed, but the checker exited non-zero. Raw output tail:" : "No diagnostics." : `Diagnostics (showing ${records.length} of ${matched.length}):`,
-      ...clean ? rawTail ? [rawTail] : [] : records.map(renderDiagnostic),
-      !clean && matched.length > records.length ? `...${matched.length - records.length} more suppressed` : void 0
+      clean2 ? unparsed ? "No diagnostics parsed, but the checker exited non-zero. Raw output tail:" : "No diagnostics." : `Diagnostics (showing ${records.length} of ${matched.length}):`,
+      ...clean2 ? rawTail ? [rawTail] : [] : records.map(renderDiagnostic),
+      !clean2 && matched.length > records.length ? `...${matched.length - records.length} more suppressed` : void 0
     ].filter((line) => line !== void 0);
     return {
       ok: !runs.some((run) => run.aborted) && (matched.length > 0 || runs.every((run) => run.exitCode === 0)),
@@ -5676,8 +5723,8 @@ function normalizeFilters(workspace, paths) {
 }
 function normalizeDiagnosticPath(workspace, diagnostic) {
   try {
-    const relative2 = toWorkspaceRelative(workspace, resolveInsideWorkspace(workspace, diagnostic.file));
-    return { ...diagnostic, file: relative2.replaceAll("\\", "/") };
+    const relative3 = toWorkspaceRelative(workspace, resolveInsideWorkspace(workspace, diagnostic.file));
+    return { ...diagnostic, file: relative3.replaceAll("\\", "/") };
   } catch {
     return { ...diagnostic, file: diagnostic.file.replaceAll("\\", "/") };
   }
@@ -6090,6 +6137,21 @@ var listFilesTool = {
   }
 };
 var RANGE_MARKER_RESERVE_CHARS = 300;
+async function resolveReadableFile(workspace, path) {
+  try {
+    const target = await resolveReadablePath(workspace, path);
+    const fileStat = await stat4(target);
+    if (!fileStat.isFile()) throw new Error(`Not a file: ${path}`);
+    return { target, fileStat };
+  } catch (error) {
+    const code = error.code;
+    if (code !== "ENOENT" && code !== "ENOTDIR") throw error;
+    throw new Error(
+      `File not found: ${JSON.stringify(path)}. Use list_files to discover the exact workspace path or search_files to locate relevant code, then retry with a confirmed path. No alternate file was read.`,
+      { cause: error }
+    );
+  }
+}
 async function readFilePrefix(target, maxBytes) {
   const handle = await open3(target, "r");
   try {
@@ -6148,11 +6210,7 @@ var readFileTool = {
   description: "Read a UTF-8 text file from inside the workspace. Reads a line range (startLine, maxLines) when the whole file would not fit the tool-result cap, and says where to continue.",
   inputSchema: ReadFileInput,
   async execute(input, context) {
-    const target = await resolveReadablePath(context.workspace, input.path);
-    const fileStat = await stat4(target);
-    if (!fileStat.isFile()) {
-      throw new Error(`Not a file: ${input.path}`);
-    }
+    const { target } = await resolveReadableFile(context.workspace, input.path);
     const { buffer: clipped, totalBytes, stable } = await readFilePrefix(target, input.maxBytes);
     const text = clipped.toString("utf8");
     const clippedByBytes = totalBytes > clipped.byteLength;
@@ -6248,11 +6306,7 @@ var readManyFilesTool = {
     const sections = [];
     let remainingBytes = input.maxTotalBytes;
     for (const path of paths) {
-      const target = await resolveReadablePath(context.workspace, path);
-      const fileStat = await stat4(target);
-      if (!fileStat.isFile()) {
-        throw new Error(`Not a file: ${path}`);
-      }
+      const { target, fileStat } = await resolveReadableFile(context.workspace, path);
       const readBudget = Math.min(input.maxBytesPerFile, remainingBytes);
       if (readBudget <= 0) {
         files.push({ path, bytesRead: 0, totalBytes: fileStat.size, truncated: true });
@@ -6865,12 +6919,12 @@ var builtinSecretRules = [
 ];
 async function resolveArtifact(workspace, requestedPath) {
   const absolute = await resolveInsideWorkspaceReal(workspace, requestedPath);
-  const relative2 = toWorkspaceRelative(workspace, absolute);
+  const relative3 = toWorkspaceRelative(workspace, absolute);
   const info = await stat5(absolute);
   if (!info.isFile()) {
     throw new Error(`Not a file: ${requestedPath}`);
   }
-  return { absolute, relative: relative2 };
+  return { absolute, relative: relative3 };
 }
 function formatMode(mode) {
   return (mode & 511).toString(8).padStart(3, "0");
@@ -6970,8 +7024,8 @@ function shannonEntropy(value) {
     counts.set(char, (counts.get(char) ?? 0) + 1);
   }
   let entropy = 0;
-  for (const count4 of counts.values()) {
-    const probability = count4 / value.length;
+  for (const count3 of counts.values()) {
+    const probability = count3 / value.length;
     entropy -= probability * Math.log2(probability);
   }
   return entropy;
@@ -8796,7 +8850,7 @@ function summarizeDirectories(files) {
     const directory = dirname9(file.path).split(/[\\/]/)[0] || ".";
     counts.set(directory, (counts.get(directory) ?? 0) + 1);
   }
-  return [...counts.entries()].map(([name, count4]) => ({ name, count: count4 })).sort((a, b) => b.count - a.count || a.name.localeCompare(b.name));
+  return [...counts.entries()].map(([name, count3]) => ({ name, count: count3 })).sort((a, b) => b.count - a.count || a.name.localeCompare(b.name));
 }
 function summarizeExtensions(files) {
   const summaries = /* @__PURE__ */ new Map();
@@ -9349,18 +9403,18 @@ function isConcurrencySafe(tool) {
 }
 function planToolBatches(calls, tools) {
   const batches = [];
-  let open9;
+  let open11;
   for (const call of calls) {
     if (!isConcurrencySafe(tools.get(call.tool))) {
       batches.push([call]);
-      open9 = void 0;
+      open11 = void 0;
       continue;
     }
-    if (!open9) {
-      open9 = [];
-      batches.push(open9);
+    if (!open11) {
+      open11 = [];
+      batches.push(open11);
     }
-    open9.push(call);
+    open11.push(call);
   }
   return batches;
 }
@@ -9855,7 +9909,7 @@ async function acquireLock(directory, waitMs) {
       };
     } catch (error) {
       if (error.code !== "EEXIST" || Date.now() >= deadline) throw error;
-      await new Promise((resolve15) => setTimeout(resolve15, 10));
+      await new Promise((resolve17) => setTimeout(resolve17, 10));
     }
   }
 }
@@ -9903,6 +9957,8 @@ function readSessionContextSnapshot(session) {
     const snapshot = session.contextSnapshot;
     if (!snapshot || typeof snapshot !== "object" || snapshot.version !== 1 || !["native", "text", "run"].includes(snapshot.kind) || !Number.isSafeInteger(snapshot.completedSteps) || snapshot.completedSteps < 0 || !Array.isArray(snapshot.messages) || snapshot.messages.some((message) => {
       if (!message || typeof message !== "object" || !["user", "assistant", "system", "tool"].includes(message.role) || typeof message.content !== "string") return true;
+      const image = message.image;
+      if (image !== void 0 && (message.role !== "user" || !image || typeof image.url !== "string" || image.url.length > 7 * 1024 * 1024 || !/^data:image\/(?:png|jpeg|webp);base64,[A-Za-z0-9+/]+={0,2}$/.test(image.url))) return true;
       const native = message;
       return snapshot.kind !== "native" && (message.role === "system" || native.toolCalls !== void 0 || native.toolCallId !== void 0) || native.toolCalls !== void 0 && message.role !== "assistant" || native.toolCallId !== void 0 && message.role !== "tool" || snapshot.kind === "native" && message.role === "tool" && typeof native.toolCallId !== "string" || native.toolCallId !== void 0 && typeof native.toolCallId !== "string" || native.toolCalls !== void 0 && (!Array.isArray(native.toolCalls) || native.toolCalls.some((call) => !call || typeof call.id !== "string" || typeof call.name !== "string" || typeof call.arguments !== "string"));
     }) || !completeContextUnits(snapshot.messages) || (readSessionUserConstraints(session) ?? [{ content: session.task }]).some((constraint) => !snapshot.messages.some((message) => message.role === "user" && message.content === constraint.content))) throw new Error(`Session ${session.id} has an invalid saved context snapshot and cannot be continued safely.`);
@@ -11144,10 +11200,10 @@ async function withHardTimeout(promise, ms, onTimeout) {
     (error) => ({ ok: false, error: error instanceof Error ? error.message : String(error) })
   );
   let timer;
-  const expiry = new Promise((resolve15) => {
+  const expiry = new Promise((resolve17) => {
     timer = setTimeout(() => {
       onTimeout?.();
-      resolve15(void 0);
+      resolve17(void 0);
     }, ms);
   });
   try {
@@ -12304,8 +12360,8 @@ function findFileInText(text, workspace) {
   for (const match of text.matchAll(stackFrame)) {
     const candidate = match[1];
     if (candidate.includes("node_modules") || candidate.includes("/internal/")) continue;
-    const relative2 = relativizeFile(candidate, workspace);
-    if (relative2 !== "unknown") return relative2;
+    const relative3 = relativizeFile(candidate, workspace);
+    if (relative3 !== "unknown") return relative3;
   }
   return null;
 }
@@ -12793,12 +12849,12 @@ async function sendRequest(url, input, approved, signal) {
     // The socket goes to a pinned address; TLS still verifies the name.
     servername: secure && !isIP(hostname) ? hostname : void 0
   };
-  return await new Promise((resolve15, reject) => {
+  return await new Promise((resolve17, reject) => {
     const request = secure ? httpsRequest(options) : httpRequest(options);
     request.on("response", (response) => {
       response.on("error", () => {
       });
-      resolve15({
+      resolve17({
         status: response.statusCode ?? 0,
         statusText: response.statusMessage ?? "",
         ok: (response.statusCode ?? 0) >= 200 && (response.statusCode ?? 0) < 300,
@@ -13277,8 +13333,8 @@ var LOOPBACK_TIMEOUT_MS = 10 * 60 * 1e3;
 async function startLoopbackServer(options) {
   const timeoutMs = options.timeoutMs ?? LOOPBACK_TIMEOUT_MS;
   let settle;
-  const wait = new Promise((resolve15) => {
-    settle = resolve15;
+  const wait = new Promise((resolve17) => {
+    settle = resolve17;
   });
   const server = http.createServer((request, response) => {
     const host = request.headers.host ?? "127.0.0.1";
@@ -13325,10 +13381,10 @@ async function startLoopbackServer(options) {
     settle?.({ ok: false, error: "server_error", description: error.message });
     settle = void 0;
   });
-  const port = await new Promise((resolve15, reject) => {
+  const port = await new Promise((resolve17, reject) => {
     server.listen(0, "127.0.0.1", () => {
       const address = server.address();
-      if (address && typeof address === "object") resolve15(address.port);
+      if (address && typeof address === "object") resolve17(address.port);
       else reject(new Error("loopback server did not bind a port"));
     });
     server.once("error", reject);
@@ -13347,9 +13403,9 @@ async function startLoopbackServer(options) {
     port,
     redirectUri: `http://127.0.0.1:${port}${LOOPBACK_PATH}`,
     wait,
-    close: () => new Promise((resolve15) => {
+    close: () => new Promise((resolve17) => {
       clearTimeout(timer);
-      server.close(() => resolve15());
+      server.close(() => resolve17());
     })
   };
 }
@@ -13463,6 +13519,22 @@ function errorMessage(error) {
   }
   return String(error);
 }
+async function readAccountPlan(credentials, fetchImpl = (input, init) => fetch(input, init)) {
+  if (!credentials) return void 0;
+  try {
+    const response = await fetchImpl(modelsUrl(credentials.baseUrl), {
+      headers: { authorization: `Bearer ${credentials.apiKey}`, accept: "application/json" },
+      redirect: "error",
+      signal: AbortSignal.timeout(2e3)
+    });
+    if (!response.ok) return void 0;
+    const body = await response.json();
+    const plans = { free: "Free", pro: "Pro", team: "Team", ultra: "Ultra" };
+    return typeof body.account?.plan === "string" && Object.hasOwn(plans, body.account.plan) ? plans[body.account.plan] : void 0;
+  } catch {
+    return void 0;
+  }
+}
 
 // src/auth/browser-login.ts
 var BROWSER_LOGIN_REQUEST_TIMEOUT_MS = 15e3;
@@ -13660,7 +13732,7 @@ function silenceTimeoutMs() {
   return Number.isFinite(override) && override > 0 ? override : DEFAULT_NON_TTY_SILENCE_TIMEOUT_MS;
 }
 function ask(rl, question, onSettle) {
-  return new Promise((resolve15) => {
+  return new Promise((resolve17) => {
     let settled = false;
     let silenceTimer;
     const keepAwake = () => {
@@ -13674,7 +13746,7 @@ function ask(rl, question, onSettle) {
       stdin2.off("data", keepAwake);
       rl.close();
       onSettle?.();
-      resolve15(value.trim());
+      resolve17(value.trim());
     };
     if (!stdin2.isTTY) {
       silenceTimer = setTimeout(() => finish(""), silenceTimeoutMs());
@@ -14026,9 +14098,9 @@ var JsonRpcEndpoint = class {
     if (signal?.aborted) {
       return Promise.reject(new JsonRpcRequestAbortedError(method, void 0, false));
     }
-    return new Promise((resolve15, reject) => {
+    return new Promise((resolve17, reject) => {
       const limit = timeoutMs ?? this.defaultTimeoutMs;
-      const entry = { method, resolve: resolve15, reject, signal, dispatched: false };
+      const entry = { method, resolve: resolve17, reject, signal, dispatched: false };
       if (signal) {
         entry.abortHandler = () => {
           this.settle(id, () => reject(new JsonRpcRequestAbortedError(method, id, entry.dispatched)));
@@ -14711,13 +14783,13 @@ function renderMcpStatuses(statuses) {
   }).join("\n");
 }
 function withTimeout(promise, ms, message) {
-  return new Promise((resolve15, reject) => {
+  return new Promise((resolve17, reject) => {
     const timer = setTimeout(() => reject(new Error(`${message} within ${ms}ms.`)), ms);
     timer.unref?.();
     promise.then(
       (value) => {
         clearTimeout(timer);
-        resolve15(value);
+        resolve17(value);
       },
       (error) => {
         clearTimeout(timer);
@@ -15116,14 +15188,14 @@ function redact(secret) {
 // src/notify/channel.ts
 function sleep(ms, signal) {
   if (signal?.aborted) return Promise.resolve(false);
-  return new Promise((resolve15) => {
+  return new Promise((resolve17) => {
     const timer = setTimeout(() => {
       signal?.removeEventListener("abort", onAbort);
-      resolve15(true);
+      resolve17(true);
     }, ms);
     const onAbort = () => {
       clearTimeout(timer);
-      resolve15(false);
+      resolve17(false);
     };
     signal?.addEventListener("abort", onAbort, { once: true });
   });
@@ -15371,7 +15443,7 @@ ${question}${optionLines}`, signal);
         await Promise.allSettled(this.channels.map((channel) => channel.call?.(spoken, wait.signal)));
       })();
       const timeout = sleep(this.timing.timeoutMs, wait.signal).then(() => null);
-      const cancelled = new Promise((resolve15) => wait.signal.addEventListener("abort", () => resolve15(null), { once: true }));
+      const cancelled = new Promise((resolve17) => wait.signal.addEventListener("abort", () => resolve17(null), { once: true }));
       const reply = await Promise.race([...replies, timeout, cancelled]);
       return reply === null ? null : pickOption(reply, options);
     } finally {
@@ -15682,6 +15754,80 @@ function registerTrustCommand(program2) {
   });
 }
 
+// src/core/image-attachments.ts
+import { constants as constants6 } from "fs";
+import { open as open9 } from "fs/promises";
+import { homedir as homedir2 } from "os";
+import { isAbsolute as isAbsolute4 } from "path";
+import { fileURLToPath as fileURLToPath2 } from "url";
+import sharp from "sharp";
+var MAX_SOURCE_BYTES = 20 * 1024 * 1024;
+function imageDrops(text) {
+  const drops = [];
+  const tokens = /"(?:\\.|[^"\\])*"|'[^']*'|(?:\\.|[^\s])+/g;
+  for (const match of text.matchAll(tokens)) {
+    const token = match[0];
+    let path = token.startsWith("'") ? token.slice(1, -1) : token.startsWith('"') ? token.slice(1, -1).replace(/\\([\\"$`])/g, "$1") : token.replace(/\\(.)/g, "$1");
+    if (path.startsWith("file://")) {
+      try {
+        path = fileURLToPath2(path);
+      } catch {
+        continue;
+      }
+    }
+    if (path.startsWith("~/")) path = `${homedir2()}/${path.slice(2)}`;
+    if (!isAbsolute4(path) || !/\.(png|jpe?g|webp)$/i.test(path)) continue;
+    drops.push({ start: match.index, end: match.index + token.length, path, label: `[Image ${drops.length + 1}]` });
+  }
+  return drops;
+}
+function formatImageInput(text, cursor = text.length) {
+  let display = "";
+  let previous = 0;
+  let shift = 0;
+  let adjusted = cursor;
+  for (const drop of imageDrops(text)) {
+    display += text.slice(previous, drop.start) + drop.label;
+    if (cursor >= drop.end) adjusted += drop.label.length - (drop.end - drop.start);
+    else if (cursor > drop.start) adjusted = drop.start + shift + Math.min(drop.label.length, cursor - drop.start);
+    shift += drop.label.length - (drop.end - drop.start);
+    previous = drop.end;
+  }
+  return { text: display + text.slice(previous), cursor: Math.max(0, adjusted) };
+}
+function hasDroppedImage(text) {
+  return imageDrops(text).length > 0;
+}
+async function prepareImageInput(text) {
+  const drops = imageDrops(text);
+  if (!drops.length) return { text };
+  if (drops.length > 1) throw new Error("Attach one image per message. Cosmic currently accepts one image in its active context.");
+  const drop = drops[0];
+  const file = await open9(drop.path, constants6.O_RDONLY | constants6.O_NOFOLLOW | constants6.O_NONBLOCK);
+  let bytes;
+  try {
+    const stat11 = await file.stat();
+    if (!stat11.isFile() || stat11.size > MAX_SOURCE_BYTES) throw new Error("Image must be a regular file no larger than 20 MiB.");
+    const buffer = Buffer.alloc(Math.min(stat11.size, MAX_SOURCE_BYTES) + 1);
+    let used = 0;
+    while (used < buffer.length) {
+      const read = await file.read(buffer, used, buffer.length - used, null);
+      if (!read.bytesRead) break;
+      used += read.bytesRead;
+    }
+    if (used > MAX_SOURCE_BYTES) throw new Error("Image exceeds 20 MiB.");
+    bytes = buffer.subarray(0, used);
+  } finally {
+    await file.close();
+  }
+  const image = sharp(bytes, { limitInputPixels: 4e7, animated: false });
+  const metadata = await image.metadata();
+  if (!["png", "jpeg", "webp"].includes(metadata.format ?? "") || (metadata.pages ?? 1) > 1) throw new Error("Attach a single PNG, JPEG or WebP image.");
+  const normalized = await image.rotate().resize({ width: 1024, height: 1024, fit: "inside", withoutEnlargement: true }).png().toBuffer();
+  if (normalized.length > 5 * 1024 * 1024) throw new Error("Normalized image exceeds the upload limit.");
+  return { text: formatImageInput(text).text, image: { url: `data:image/png;base64,${normalized.toString("base64")}` } };
+}
+
 // src/core/manual-compaction.ts
 async function compactManually(messages, pinned, provider, model, focus = "", signal) {
   const retained = new Set(pinned);
@@ -15959,7 +16105,8 @@ Acknowledge that you have the context and wait for the user's first request.`
   async ask(input, handlers = {}) {
     if (!this.started) await this.start();
     if (!this.firstTask) this.firstTask = input;
-    const asked = { role: "user", content: input };
+    if (handlers.image) for (const message of this.messages) delete message.image;
+    const asked = { role: "user", content: input, ...handlers.image ? { image: handlers.image } : {} };
     this.messages.push(asked);
     this.pinnedMessages.push(asked);
     this.userConstraints.push({ kind: "message", content: input });
@@ -16275,7 +16422,7 @@ Acknowledge that you have the context and wait for the user's first request.`
       constraintVersion: 1,
       userConstraints: [...this.userConstraints],
       mcpResultArchiveVersion: 1,
-      ...this.messages.some(isCompactionSummary) ? { contextSnapshot: { version: 1, kind: "text", messages: snapshotWithConstraints(this.messages, this.userConstraints), completedSteps: this.steps.length } } : {},
+      ...this.messages.some((message) => isCompactionSummary(message) || message.image) ? { contextSnapshot: { version: 1, kind: "text", messages: snapshotWithConstraints(this.messages, this.userConstraints), completedSteps: this.steps.length } } : {},
       // How the last turn ended, so a saved interactive transcript says whether
       // its final message is an answer or the place it ran out of room - the
       // same question `ultrac run` already answers for a one-shot run.
@@ -16490,7 +16637,10 @@ ${context}`
   async ask(input, handlers = {}) {
     if (!this.started) await this.start();
     if (!this.firstTask) this.firstTask = input;
-    const asked = { role: "user", content: input };
+    if (handlers.image) {
+      for (const message of this.messages) if (message.role === "user" || message.role === "system") delete message.image;
+    }
+    const asked = { role: "user", content: input, ...handlers.image ? { image: handlers.image } : {} };
     this.messages.push(asked);
     this.pinnedMessages.push(asked);
     this.userConstraints.push({ kind: "message", content: input });
@@ -16840,7 +16990,7 @@ ${guidance.join("\n")}` : ""}`;
       constraintVersion: 1,
       userConstraints: [...this.userConstraints],
       mcpResultArchiveVersion: 1,
-      ...this.messages.some(isCompactionSummary) ? { contextSnapshot: { version: 1, kind: "native", messages: snapshotWithConstraints(this.messages, this.userConstraints), completedSteps: this.steps.length } } : {},
+      ...this.messages.some((message) => isCompactionSummary(message) || (message.role === "user" || message.role === "system") && message.image) ? { contextSnapshot: { version: 1, kind: "native", messages: snapshotWithConstraints(this.messages, this.userConstraints), completedSteps: this.steps.length } } : {},
       // How the last turn ended, so a saved interactive transcript says whether
       // its final message is an answer or the place it ran out of room - the
       // same question `ultrac run` already answers for a one-shot run.
@@ -16882,10 +17032,10 @@ function boundedInteger(value, name, min, max) {
 }
 function abortableSleep(milliseconds, signal) {
   signal.throwIfAborted();
-  return new Promise((resolve15, reject) => {
+  return new Promise((resolve17, reject) => {
     const timer = setTimeout(() => {
       signal.removeEventListener("abort", abort);
-      resolve15();
+      resolve17();
     }, milliseconds);
     const abort = () => {
       clearTimeout(timer);
@@ -17271,53 +17421,8 @@ function attachProgressUi(options = {}) {
   };
 }
 
-// src/ui/spinner.ts
-import { stdout as stdout4 } from "process";
-var FRAMES = ["\u280B", "\u2819", "\u2839", "\u2838", "\u283C", "\u2834", "\u2826", "\u2827", "\u2807", "\u280F"];
-var Spinner = class {
-  constructor(label = "thinking") {
-    this.label = label;
-  }
-  label;
-  timer;
-  index = 0;
-  holdWhile;
-  held = false;
-  start(holdWhile) {
-    this.holdWhile = holdWhile;
-    if (!stdout4.isTTY || this.timer) return;
-    this.render();
-    this.timer = setInterval(() => this.render(), 90);
-  }
-  update(label) {
-    this.label = label;
-  }
-  stop() {
-    if (this.timer) {
-      clearInterval(this.timer);
-      this.timer = void 0;
-    }
-    if (stdout4.isTTY) {
-      stdout4.clearLine(0);
-      stdout4.cursorTo(0);
-    }
-  }
-  render() {
-    if (this.holdWhile?.()) {
-      if (!this.held) {
-        stdout4.clearLine(0);
-        stdout4.cursorTo(0);
-        this.held = true;
-      }
-      return;
-    }
-    this.held = false;
-    this.index = (this.index + 1) % FRAMES.length;
-    stdout4.clearLine(0);
-    stdout4.cursorTo(0);
-    stdout4.write(`  ${FRAMES[this.index]} ${this.label}\u2026`);
-  }
-};
+// src/ui/activity.ts
+import { stripVTControlCharacters } from "util";
 
 // src/ui/tool-activity.ts
 var VERBS = {
@@ -17390,14 +17495,129 @@ function humanize(value) {
   return words ? `${words[0].toUpperCase()}${words.slice(1)}` : "Tool";
 }
 
+// src/ui/spinner.ts
+import { stdout as stdout4 } from "process";
+var FRAMES = ["\u280B", "\u2819", "\u2839", "\u2838", "\u283C", "\u2834", "\u2826", "\u2827", "\u2807", "\u280F"];
+var Spinner = class {
+  constructor(label = "thinking") {
+    this.label = label;
+  }
+  label;
+  timer;
+  index = 0;
+  holdWhile;
+  held = false;
+  startedAt;
+  start(holdWhile, startedAt = performance.now()) {
+    this.holdWhile = holdWhile;
+    if (this.startedAt !== void 0) return;
+    this.startedAt = startedAt;
+    this.held = false;
+    if (!stdout4.isTTY) return;
+    this.render();
+    this.timer = setInterval(() => this.render(), 90);
+  }
+  update(label) {
+    this.label = label;
+  }
+  stop(completion) {
+    const elapsed = this.startedAt === void 0 ? void 0 : performance.now() - this.startedAt;
+    this.startedAt = void 0;
+    if (this.timer) {
+      clearInterval(this.timer);
+      this.timer = void 0;
+    }
+    if (stdout4.isTTY && elapsed !== void 0) {
+      stdout4.clearLine(0);
+      stdout4.cursorTo(0);
+      if (completion && elapsed >= 1e3) stdout4.write(`  ${completion} ${formatSeconds(elapsed)}.
+`);
+    }
+  }
+  render() {
+    if (this.holdWhile?.()) {
+      if (!this.held) {
+        stdout4.clearLine(0);
+        stdout4.cursorTo(0);
+        this.held = true;
+      }
+      return;
+    }
+    this.held = false;
+    this.index = (this.index + 1) % FRAMES.length;
+    stdout4.clearLine(0);
+    stdout4.cursorTo(0);
+    const milliseconds = performance.now() - (this.startedAt ?? performance.now());
+    const elapsed = milliseconds >= 1e3 ? formatElapsed(milliseconds) : "";
+    const limit = Math.max(0, (stdout4.columns ?? 80) - elapsed.length - 10);
+    let label = "";
+    let cells2 = 0;
+    for (const character of this.label.replace(/[\x00-\x1f\x7f]/g, " ")) {
+      const size = character.codePointAt(0) > 127 ? 2 : 1;
+      if (cells2 + size > limit) break;
+      label += character;
+      cells2 += size;
+    }
+    stdout4.write(`  ${FRAMES[this.index]} ${label}\u2026${elapsed ? ` \xB7 ${elapsed}` : ""}`);
+  }
+};
+function formatSeconds(milliseconds) {
+  const seconds = Math.max(0, milliseconds) / 1e3;
+  const count3 = seconds.toFixed(1).replace(/\.0$/, "");
+  return `${count3} ${count3 === "1" ? "second" : "seconds"}`;
+}
+
+// src/ui/activity.ts
+var sink;
+function setActivitySink(value) {
+  sink = value;
+}
+function getActivitySink() {
+  return sink;
+}
+var clean = (text) => stripVTControlCharacters(text).replace(/[\x00-\x1f\x7f-\x9f]/g, " ");
+function activityEntry(call, result, durationMs) {
+  const fields = ["command", "script", "path", "paths", "query", "pattern", "url", "cwd"];
+  const request = fields.flatMap((key) => {
+    const value = call.input[key];
+    return typeof value === "string" ? [`${key}: ${value}`] : Array.isArray(value) && value.every((item) => typeof item === "string") ? [`${key}: ${value.join(", ")}`] : [];
+  }).join(" \xB7 ");
+  return {
+    label: clean(toolActivityLabel(call)),
+    request: clean(request).slice(0, 4e3),
+    output: clean(result.content).slice(0, 1e3),
+    ok: result.ok,
+    durationMs
+  };
+}
+function activityRows(snapshot, expanded, selected, end) {
+  const failures = snapshot.entries.filter((entry) => !entry.ok).length;
+  const elapsed = snapshot.thinkingMs >= 1e3 ? ` \xB7 Thought for ${formatSeconds(snapshot.thinkingMs)}` : "";
+  const summary = `${expanded ? "\u25BE" : "\u25B8"} \u25CF ${snapshot.entries.length} actions${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) return rows;
+  const last = Math.min(snapshot.entries.length, end);
+  for (let index = Math.max(0, last - 5); index < last; index += 1) {
+    const entry = snapshot.entries[index];
+    const duration = entry.durationMs >= 1e3 ? ` \xB7 Worked for ${formatSeconds(entry.durationMs)}` : "";
+    rows.push({ text: `  ${selected === index ? "\u25BE" : "\u25B8"} \u25CF ${entry.label}${duration}`, ok: entry.ok, entry: index });
+    if (selected === index) {
+      if (entry.request) rows.push({ text: `      ${entry.request}`, entry: index });
+      if (entry.output) rows.push({ text: `      ${entry.output}`, ok: entry.ok, entry: index });
+    }
+  }
+  if (snapshot.entries.length > 5) rows.push({ text: "  Scroll to browse actions \xB7 /output for full saved results" });
+  return rows;
+}
+
 // src/ui/interactive-choice.ts
 var MOUSE_ON = "\x1B[?1006h\x1B[?1000h";
 var MOUSE_OFF = "\x1B[?1000l\x1B[?1006l";
 function displayLabel(value, width2) {
-  const clean = value.replace(/\x1b(?:\[[0-?]*[ -/]*[@-~]|\][^\x07]*(?:\x07|\x1b\\)|.)/g, "").replace(/[\x00-\x1f\x7f-\x9f]/g, " ");
+  const clean2 = value.replace(/\x1b(?:\[[0-?]*[ -/]*[@-~]|\][^\x07]*(?:\x07|\x1b\\)|.)/g, "").replace(/[\x00-\x1f\x7f-\x9f]/g, " ");
   let result = "";
   let used = 0;
-  for (const character of clean) {
+  for (const character of clean2) {
     const size = /[\p{Mark}\u200d\ufe0e\ufe0f]/u.test(character) ? 0 : character.codePointAt(0) < 128 ? 1 : 2;
     if (used + size > width2 - 1) return `${result}\u2026`;
     result += character;
@@ -17410,8 +17630,8 @@ function attachInteractiveChoices(readline, options, settings = {}) {
   const output = settings.output ?? rl.output;
   const prompt = settings.prompt ?? "  \u203A ";
   let resolveReady;
-  const ready = new Promise((resolve15) => {
-    resolveReady = resolve15;
+  const ready = new Promise((resolve17) => {
+    resolveReady = resolve17;
   });
   const original = rl._ttyWrite;
   const priorPrompt = rl.getPrompt();
@@ -17617,6 +17837,15 @@ function attachInteractiveChoices(readline, options, settings = {}) {
 }
 
 // src/ui/slash-completion.ts
+function builtinSlashEntries(commands, help) {
+  const descriptions = /* @__PURE__ */ new Map();
+  for (const line of help.split("\n")) {
+    const match = /^(\/[^\n]+?)\s{2,}(.+)$/.exec(line.trim());
+    if (!match) continue;
+    for (const command of match[1].matchAll(/\/([a-z-]+)/g)) descriptions.set(command[1], match[2]);
+  }
+  return commands.map((command) => ({ text: `/${command}`, label: `/${command}`, description: descriptions.get(command) }));
+}
 function attachSlashCompletion(readline, loadEntries, render, initialEntries = []) {
   const rl = readline;
   const original = rl._ttyWrite;
@@ -17718,11 +17947,11 @@ function attachSlashCompletion(readline, loadEntries, render, initialEntries = [
 
 // src/ui/terminal-layout.ts
 import { Writable } from "stream";
-import { stripVTControlCharacters } from "util";
+import { stripVTControlCharacters as stripVTControlCharacters2 } from "util";
 var CSI = "\x1B[";
 var RESET_REGION = `${CSI}r`;
 var MOUSE_OFF2 = `${CSI}?1000l${CSI}?1002l${CSI}?1003l${CSI}?1006l`;
-var BASE_FOOTER_ROWS = 5;
+var BASE_FOOTER_ROWS = 4;
 var segmenter = new Intl.Segmenter(void 0, { granularity: "grapheme" });
 var cells = (value) => [...segmenter.segment(value)].map(({ segment }) => {
   const code = segment.codePointAt(0) ?? 0;
@@ -17731,7 +17960,7 @@ var cells = (value) => [...segmenter.segment(value)].map(({ segment }) => {
 });
 var width = (text) => cells(text).reduce((sum, cell) => sum + cell.width, 0);
 function plain(value) {
-  return stripVTControlCharacters(value).replace(/[\x00-\x1f\x7f]/g, " ");
+  return stripVTControlCharacters2(value).replace(/[\x00-\x1f\x7f]/g, " ");
 }
 function fit(text, columns) {
   if (columns <= 0) return "";
@@ -17745,7 +17974,6 @@ function fit(text, columns) {
   return result;
 }
 var cup = (row, column = 1) => `${CSI}${row};${column}H`;
-var count3 = (value) => value !== void 0 && Number.isFinite(value) && value >= 0 ? Math.floor(value).toLocaleString("en-US") : "unknown";
 var ComposerOutput = class extends Writable {
   constructor(layout) {
     super();
@@ -17781,6 +18009,7 @@ var TerminalLayout = class {
   details;
   rl;
   prompt = "\u203A ";
+  inputFormatter;
   transcriptRow = 1;
   transcriptColumn = 1;
   wrapPending = false;
@@ -17788,6 +18017,11 @@ var TerminalLayout = class {
   lastFooterTop = 0;
   suggestions = [];
   selected = 0;
+  activity;
+  activityExpanded = false;
+  activitySelected = -1;
+  activityEnd = 0;
+  restoreActivityInput;
   installed = false;
   closed = false;
   suspended = 0;
@@ -17825,11 +18059,15 @@ var TerminalLayout = class {
   get suggestionRows() {
     return Math.min(8, this.suggestions.length, Math.max(0, this.rows - BASE_FOOTER_ROWS - 2));
   }
+  get activityLines() {
+    if (!this.activity) return [];
+    return activityRows(this.activity, this.activityExpanded, this.activitySelected, this.activityEnd).slice(0, Math.max(1, Math.min(10, this.rows - BASE_FOOTER_ROWS - this.suggestionRows - 2)));
+  }
   get contentRows() {
-    return this.rows - BASE_FOOTER_ROWS - this.suggestionRows;
+    return this.rows - BASE_FOOTER_ROWS - this.suggestionRows - this.activityLines.length;
   }
   get inputRow() {
-    return this.rows - 3;
+    return this.rows - 2;
   }
   install() {
     if (this.installed || this.closed || !this.enabled) return this;
@@ -17851,6 +18089,93 @@ var TerminalLayout = class {
   attachReadline(rl) {
     this.rl = rl;
     rl.setPrompt(this.prompt);
+    const reader = rl;
+    const original = reader._ttyWrite;
+    let sequence = "";
+    let sequenceTimer;
+    const wrapper = (text, key) => {
+      if (this.activity && !this.suspended && key?.ctrl && key.name === "o") {
+        this.toggleActivity();
+        return;
+      }
+      const value = key?.sequence ?? text ?? "";
+      if (sequence || value.startsWith("\x1B[<")) {
+        sequence += value;
+        clearTimeout(sequenceTimer);
+        const mouse = /^\x1b\[<(\d+);(\d+);(\d+)([Mm])$/.exec(sequence);
+        if (mouse) {
+          sequence = "";
+          if (!this.suspended) this.activityMouse(Number(mouse[1]), Number(mouse[3]), mouse[4] === "M");
+          return;
+        }
+        if (/^\x1b\[<[0-9;]*$/.test(sequence) && sequence.length < 64) {
+          sequenceTimer = setTimeout(() => {
+            sequence = "";
+          }, 250);
+          return;
+        }
+        const pending = sequence;
+        sequence = "";
+        original.call(reader, pending, key);
+        return;
+      }
+      original.call(reader, text, key);
+    };
+    reader._ttyWrite = wrapper;
+    this.restoreActivityInput = () => {
+      clearTimeout(sequenceTimer);
+      if (reader._ttyWrite === wrapper) reader._ttyWrite = original;
+    };
+    this.paintFooter();
+  }
+  setActivity(snapshot) {
+    this.clearPreviousFooter();
+    const previous = this.activity?.entries.length ?? 0;
+    if (!snapshot.entries.length && !snapshot.finished) {
+      this.activityExpanded = false;
+      this.activitySelected = -1;
+    }
+    this.activity = snapshot;
+    if (this.activityEnd >= previous || !previous) this.activityEnd = snapshot.entries.length;
+    this.reflowActivity();
+  }
+  toggleActivity() {
+    if (!this.activity) return;
+    this.clearPreviousFooter();
+    this.activityExpanded = !this.activityExpanded;
+    this.reflowActivity();
+  }
+  reflowActivity() {
+    if (!this.enabled || !this.installed || this.closed) return;
+    this.transcriptRow = Math.min(this.transcriptRow, this.contentRows);
+    this.rawWrite(`${CSI}1;${this.contentRows}r`);
+    this.paintFooter();
+  }
+  activityMouse(button, row, press) {
+    if (!this.activity || !press) return;
+    if (button === 64 || button === 65) {
+      if (!this.activityExpanded) return;
+      this.clearPreviousFooter();
+      this.activityEnd = Math.max(Math.min(5, this.activity.entries.length), Math.min(this.activity.entries.length, this.activityEnd + (button === 64 ? -1 : 1)));
+      this.activitySelected = -1;
+      this.reflowActivity();
+      return;
+    }
+    if (button !== 0) return;
+    const index = row - this.contentRows - 1;
+    if (index === 0) {
+      this.toggleActivity();
+      return;
+    }
+    const entry = this.activityLines[index]?.entry;
+    if (entry !== void 0) {
+      this.clearPreviousFooter();
+      this.activitySelected = this.activitySelected === entry ? -1 : entry;
+      this.reflowActivity();
+    }
+  }
+  setInputFormatter(formatter) {
+    this.inputFormatter = formatter;
     this.paintFooter();
   }
   setPrompt(prompt) {
@@ -17910,7 +18235,7 @@ var TerminalLayout = class {
       for (let row = first; row <= last; row += 1) erased += `${cup(row)}${CSI}2K`;
       return erased + saved;
     });
-    if (this.wrapPending && !/^[\r\n]/.test(stripVTControlCharacters(formatted))) {
+    if (this.wrapPending && !/^[\r\n]/.test(stripVTControlCharacters2(formatted))) {
       this.rawWrite(`${cup(this.transcriptRow, this.columns)}\r
 `);
       this.transcriptRow = Math.min(this.contentRows, this.transcriptRow + 1);
@@ -17987,8 +18312,10 @@ var TerminalLayout = class {
   composer() {
     const available = this.columns - 4;
     const prompt = fit(this.rl?.getPrompt() ?? this.prompt, Math.min(24, Math.max(2, Math.floor(available / 3))));
-    const input = plain(this.rl?.line ?? "");
-    const cursor = width(plain((this.rl?.line ?? "").slice(0, this.rl?.cursor ?? 0)));
+    const raw = this.rl?.line ?? "";
+    const formatted = this.inputFormatter?.(raw, this.rl?.cursor ?? 0) ?? { text: raw, cursor: this.rl?.cursor ?? 0 };
+    const input = plain(formatted.text);
+    const cursor = width(plain(formatted.text.slice(0, formatted.cursor)));
     const capacity = Math.max(1, available - width(prompt));
     const offset = Math.max(0, cursor - capacity + 1);
     let visible = "";
@@ -18021,29 +18348,48 @@ var TerminalLayout = class {
     const inner = this.columns - 2;
     const border = "\u2500".repeat(inner);
     const composer = this.composer();
-    const status = this.details.status ? `${plain(this.details.status)} \xB7 ` : "";
-    const modelRoom = Math.max(6, this.columns - width(`${status}${this.details.provider} \xB7  \xB7 ${this.details.mode}`));
-    const metadata = `${status}${this.details.provider} \xB7 ${fit(this.details.model, modelRoom)} \xB7 ${this.details.mode}`;
-    const usage = `${count3(this.details.tokens)} reported tokens \xB7 ${count3(this.details.steps)} steps \xB7 est ctx ${count3(this.details.contextUsed)}/${count3(this.details.contextMax)}`;
+    const model = /^cosmic[- ]1$/i.test(this.details.model) ? "Cosmic 1" : this.details.model;
+    const metadata = fit(model, this.columns);
     let frame = "";
+    const activity = this.activityLines;
+    if (activity.length && !this.suspended) frame += `${CSI}?1006h${CSI}?1000h`;
+    activity.forEach((row, index) => {
+      const text = fit(row.text, this.columns);
+      const color = process.env.NO_COLOR || row.ok === void 0 ? "" : `${CSI}${row.ok ? 32 : 31}m`;
+      const dot = text.indexOf("\u25CF");
+      const rendered = dot >= 0 && color ? `${text.slice(0, dot)}${color}\u25CF${CSI}39m${text.slice(dot + 1)}` : text;
+      frame += `${cup(this.contentRows + 1 + index)}${CSI}0m${CSI}2K${rendered}`;
+    });
     const suggestions = this.suggestionRows;
     const first = Math.max(0, Math.min(this.selected - Math.floor(suggestions / 2), this.suggestions.length - suggestions));
+    const commandWidth = Math.min(
+      Math.max(18, ...this.suggestions.map((row) => width(plain(row).split(/ {2,}/)[0] ?? ""))),
+      Math.max(8, Math.floor(this.columns / 3))
+    );
     for (let i = 0; i < suggestions; i += 1) {
       const index = first + i;
       const selected = index === this.selected;
-      frame += `${cup(this.contentRows + 1 + i)}${CSI}2K${selected ? `${CSI}7m` : ""}${fit(`${selected ? "\u203A" : " "} ${this.suggestions[index] ?? ""}`, this.columns)}${CSI}0m`;
+      const entry = plain(this.suggestions[index] ?? "");
+      const match = /^(.+?) {2,}(.+)$/.exec(entry);
+      const command = fit(match?.[1] ?? entry, commandWidth);
+      const description = match?.[2] ?? "";
+      const row = fit(`${selected ? "\u203A" : " "} ${command}${description ? `${" ".repeat(Math.max(0, commandWidth - width(command)) + 6)}${description}` : ""}`, this.columns);
+      const style = process.env.NO_COLOR ? "" : selected ? `${CSI}1m${CSI}39m${CSI}49m` : `${CSI}22m${CSI}39m${CSI}49m`;
+      frame += `${cup(this.contentRows + activity.length + 1 + i)}${CSI}0m${CSI}2K${style}${row}${" ".repeat(this.columns - width(row))}${CSI}0m`;
     }
     const inputText = fit(composer.text, this.columns - 4);
     const paddedInput = inputText + " ".repeat(Math.max(0, this.columns - 4 - width(inputText)));
-    const lines = [`\u250C${border}\u2510`, `\u2502 ${paddedInput} \u2502`, `\u2514${border}\u2518`, fit(metadata, this.columns), fit(usage, this.columns)];
+    const dimBorder = (value) => process.env.NO_COLOR ? value : `${CSI}90m${value}${CSI}39m`;
+    const lines = [dimBorder(`\u250C${border}\u2510`), `${dimBorder("\u2502")} ${paddedInput} ${dimBorder("\u2502")}`, dimBorder(`\u2514${border}\u2518`), metadata];
     lines.forEach((line, index) => {
-      frame += `${cup(this.rows - 4 + index)}${CSI}2K${line}`;
+      frame += `${cup(this.rows - 3 + index)}${CSI}2K${line}`;
     });
     this.rawWrite(`${frame}${cup(this.inputRow, composer.column)}${CSI}?25h`);
   }
   close() {
     if (this.closed) return;
     this.closed = true;
+    this.restoreActivityInput?.();
     if (!this.installed) return;
     this.output.write = this.originalWrite;
     if (this.errorOutput && this.errorOutput !== this.output && this.originalErrorWrite) this.errorOutput.write = this.originalErrorWrite;
@@ -18068,6 +18414,26 @@ function createTerminalLayout(options) {
 
 // src/ui/welcome.ts
 import chalk10, { Chalk } from "chalk";
+import { homedir as homedir3 } from "os";
+import { sep } from "path";
+
+// src/ui/provider-brand.ts
+import { stripVTControlCharacters as stripVTControlCharacters3 } from "util";
+var GOLD = "\x1B[38;2;202;168;103m";
+var DEFAULT_FOREGROUND = "\x1B[39m";
+function safeDisplayText(value) {
+  return stripVTControlCharacters3(value).replace(/[\x00-\x1f\x7f]/g, " ");
+}
+function providerDisplayName(provider) {
+  const name = safeDisplayText(provider);
+  return name.toLowerCase() === "ultrac" ? "spinalfluid" : name;
+}
+function paintProviderSpan(line, offset, provider, color) {
+  if (!color || provider !== "spinalfluid" || offset < 0 || line.slice(offset, offset + provider.length) !== provider) return line;
+  return `${line.slice(0, offset)}${GOLD}${provider}${DEFAULT_FOREGROUND}${line.slice(offset + provider.length)}`;
+}
+
+// src/ui/welcome.ts
 var LOGO = [
   "\u2588\u2588\u2557   \u2588\u2588\u2557\u2588\u2588\u2557  \u2588\u2588\u2588\u2588\u2588\u2588\u2588\u2588\u2557\u2588\u2588\u2588\u2588\u2588\u2588\u2557  \u2588\u2588\u2588\u2588\u2588\u2557  \u2588\u2588\u2588\u2588\u2588\u2588\u2557",
   "\u2588\u2588\u2551   \u2588\u2588\u2551\u2588\u2588\u2551  \u255A\u2550\u2550\u2588\u2588\u2554\u2550\u2550\u255D\u2588\u2588\u2554\u2550\u2550\u2588\u2588\u2557\u2588\u2588\u2554\u2550\u2550\u2588\u2588\u2557\u2588\u2588\u2554\u2550\u2550\u2550\u2550\u255D",
@@ -18079,8 +18445,7 @@ var LOGO = [
 function renderWelcome(info, options = {}) {
   const columns = normalizeColumns(options.columns);
   const paint = new Chalk({ level: options.color === false ? 0 : chalk10.level });
-  const cardWidth = columns;
-  const innerWidth = cardWidth - 4;
+  const innerWidth = columns - 2;
   const wide = columns >= 64;
   const lines = [];
   if (wide) {
@@ -18091,16 +18456,14 @@ function renderWelcome(info, options = {}) {
   } else {
     lines.push("", `  ${paint.bold.white("ULTRAC")} ${paint.gray(`v${info.version}`)}`);
   }
-  const topLabel = wide ? ` ultrac v${info.version} ` : " session ";
-  const topFill = Math.max(0, cardWidth - topLabel.length - 2);
-  lines.push(paint.gray(`\u256D${topLabel}${"\u2500".repeat(topFill)}\u256E`));
-  lines.push(cardLine(`${info.model} via ${info.providerName}`, innerWidth, paint.bold));
-  lines.push(cardLine(`${info.mode} \xB7 ${info.protocol}`, innerWidth, paint.white));
-  lines.push(cardLine(shortenMiddle(info.workspace, innerWidth), innerWidth, paint.gray));
-  lines.push(paint.gray(`\u251C${"\u2500".repeat(cardWidth - 2)}\u2524`));
-  lines.push(cardLine(info.budget, innerWidth, paint.gray));
-  lines.push(cardLine(`logs ${shortenMiddle(info.diagnosticPath, Math.max(8, innerWidth - 5))}`, innerWidth, paint.gray));
-  lines.push(paint.gray(`\u2570${"\u2500".repeat(cardWidth - 2)}\u256F`));
+  const provider = providerDisplayName(info.providerName);
+  const prefix = `${safeDisplayText(info.model)} \xB7 `;
+  const account = `${provider}${info.planName ? ` ${safeDisplayText(info.planName)}` : ""}`;
+  const modelLine = `  ${truncate3(`${prefix}${account}`, innerWidth)}`;
+  lines.push("", paintProviderSpan(modelLine, 2 + prefix.length, provider, paint.level > 0));
+  const home = homedir3();
+  const workspace = info.workspace === home ? "~" : info.workspace.startsWith(`${home}${sep}`) ? `~${info.workspace.slice(home.length)}` : info.workspace;
+  lines.push(paint.gray(`  ${shortenMiddle(safeDisplayText(workspace), innerWidth)}`), "");
   lines.push(
     wide ? `${paint.gray("  /help commands")} ${paint.dim("\xB7")} ${paint.gray("Esc stop")} ${paint.dim("\xB7")} ${paint.gray("Ctrl-C exit")}` : paint.gray("  /help \xB7 Esc \xB7 Ctrl-C")
   );
@@ -18118,10 +18481,6 @@ ${paint.gray("\u2502")}`,
     prompt: paint.bold.white("\u2570\u2500\u276F ")
   };
 }
-function cardLine(value, width2, style) {
-  const clipped = truncate3(value, width2);
-  return `\u2502 ${style(clipped)}${" ".repeat(Math.max(0, width2 - clipped.length))} \u2502`;
-}
 function normalizeColumns(columns) {
   return Number.isFinite(columns) ? Math.max(16, Math.floor(columns)) : 80;
 }
@@ -18137,11 +18496,18 @@ function shortenMiddle(value, width2) {
   return `${value.slice(0, side)}\u2026${value.slice(value.length - (width2 - side - 1))}`;
 }
 
+// src/ui/update-prompt.ts
+import { constants as constants7 } from "fs";
+import { lstat as lstat4, mkdir as mkdir15, open as open10, rename as rename4, unlink as unlink5 } from "fs/promises";
+import { randomBytes as randomBytes5 } from "crypto";
+import { homedir as homedir4 } from "os";
+import { join as join15, parse, resolve as resolve13 } from "path";
+
 // src/update/check.ts
 import { spawn as spawn4 } from "child_process";
 import { randomBytes as randomBytes4 } from "crypto";
 import { readFile as readFile13, rename as rename3, unlink as unlink4, writeFile as writeFile12 } from "fs/promises";
-import { join as join14 } from "path";
+import { isAbsolute as isAbsolute5, join as join14, relative as relative2, resolve as resolve12 } from "path";
 var DEFAULT_MAX_AGE_MS = 24 * 60 * 60 * 1e3;
 var QUERY_TIMEOUT_MS = 5e3;
 var INSTALL_TIMEOUT_MS = 5 * 60 * 1e3;
@@ -18174,17 +18540,67 @@ async function queryLatestVersion(packageName) {
     return void 0;
   }
 }
-async function installLatestVersion(packageName) {
+async function installLatestVersion(packageName, version = "latest") {
+  if (version !== "latest" && !/^\d+\.\d+\.\d+(?:-[0-9A-Za-z.-]+)?(?:\+[0-9A-Za-z.-]+)?$/.test(version)) {
+    throw new Error("Invalid npm release version.");
+  }
   const result = await runNpm(
-    ["install", "--global", `${packageName}@latest`, "--no-audit", "--no-fund"],
+    ["install", "--global", `${packageName}@${version}`, "--no-audit", "--no-fund"],
     { timeoutMs: INSTALL_TIMEOUT_MS, capture: false }
   );
   if (result.code !== 0) {
     throw new Error(
-      `npm could not install ${packageName}@latest. Confirm npm can reach the registry and install global packages.`
+      `npm could not install ${packageName}@${version}. Confirm npm can reach the registry and install global packages.`
     );
   }
 }
+async function installVerifiedVersion(packageName, version) {
+  await installLatestVersion(packageName, version);
+  const result = await runNpm(["list", "--global", packageName, "--depth=0", "--json"], {
+    timeoutMs: QUERY_TIMEOUT_MS,
+    capture: true,
+    maxOutputBytes: 4096
+  });
+  let installedVersion;
+  try {
+    const parsed = JSON.parse(result.stdout);
+    if (typeof parsed === "object" && parsed !== null && "dependencies" in parsed && typeof parsed.dependencies === "object" && parsed.dependencies !== null) {
+      const dependency = parsed.dependencies[packageName];
+      if (typeof dependency === "object" && dependency !== null && "version" in dependency) {
+        installedVersion = dependency.version;
+      }
+    }
+  } catch {
+  }
+  if (result.code !== 0 || installedVersion !== version) {
+    throw new Error("The update could not be verified. Run ultrac update and restart Ultrac.");
+  }
+  try {
+    const globalRoot = await runNpm(["root", "--global"], {
+      timeoutMs: QUERY_TIMEOUT_MS,
+      capture: true,
+      maxOutputBytes: 4096
+    });
+    const root = globalRoot.stdout.trim();
+    if (globalRoot.code !== 0 || !isAbsolute5(root) || root.includes("\n")) throw new Error("Invalid npm root");
+    const packageRoot = join14(root, packageName);
+    const manifest = JSON.parse(await readFile13(join14(packageRoot, "package.json"), "utf8"));
+    if (typeof manifest !== "object" || manifest === null || !("version" in manifest) || manifest.version !== version || !("bin" in manifest)) throw new Error("Invalid package");
+    const bin = manifest.bin;
+    const entry = typeof bin === "string" ? bin : typeof bin === "object" && bin !== null && "ultrac" in bin ? bin.ultrac : void 0;
+    if (typeof entry !== "string") throw new Error("Missing executable");
+    const executable = resolve12(packageRoot, entry);
+    const withinPackage = relative2(packageRoot, executable);
+    if (withinPackage.startsWith("..") || isAbsolute5(withinPackage)) throw new Error("Invalid executable");
+    const probe = await runExecutable(process.execPath, [executable, "--version"], {
+      timeoutMs: QUERY_TIMEOUT_MS,
+      capture: true
+    });
+    if (probe.code !== 0 || probe.stdout.trim() !== version) throw new Error("Invalid executable version");
+  } catch {
+    throw new Error("The installed Ultrac executable could not be verified. Restart and run ultrac --version.");
+  }
+}
 function isNewerVersion(candidate, current) {
   const left = parseVersion(candidate);
   const right = parseVersion(current);
@@ -18237,12 +18653,15 @@ async function writeCache(path, cache) {
   }
 }
 async function runNpm(args, options) {
+  return runExecutable(process.platform === "win32" ? "npm.cmd" : "npm", args, options);
+}
+async function runExecutable(executable, args, options) {
   const env2 = { ...process.env };
   for (const key of Object.keys(env2)) {
     if (key.startsWith("ULTRAC_")) delete env2[key];
   }
-  return new Promise((resolve15) => {
-    const child = spawn4(process.platform === "win32" ? "npm.cmd" : "npm", args, {
+  return new Promise((resolve17) => {
+    const child = spawn4(executable, args, {
       env: env2,
       stdio: options.capture ? ["ignore", "pipe", "ignore"] : "inherit",
       windowsHide: true
@@ -18251,21 +18670,90 @@ async function runNpm(args, options) {
     if (options.capture) {
       child.stdout?.setEncoding("utf8");
       child.stdout?.on("data", (chunk) => {
-        if (stdout6.length <= 256) stdout6 += chunk;
+        const limit = options.maxOutputBytes ?? 256;
+        if (stdout6.length <= limit) stdout6 += chunk.slice(0, limit + 1 - stdout6.length);
       });
     }
     const timer = setTimeout(() => child.kill(), options.timeoutMs);
     child.once("error", () => {
       clearTimeout(timer);
-      resolve15({ code: 1, stdout: "" });
+      resolve17({ code: 1, stdout: "" });
     });
     child.once("close", (code) => {
       clearTimeout(timer);
-      resolve15({ code: code ?? 1, stdout: stdout6 });
+      resolve17({ code: code ?? 1, stdout: stdout6 });
     });
   });
 }
 
+// src/ui/update-prompt.ts
+var UPDATE_CHOICES = ["Update now", "Skip", "Skip until next version"];
+async function offerUpdatePrompt(status, options) {
+  const version = status.latestVersion;
+  if (!options.interactive || options.signal?.aborted || !status.updateAvailable || !version || !validVersion(version) || !validVersion(status.currentVersion) || !isNewerVersion(version, status.currentVersion) || await skippedVersion() === version) return "not_offered";
+  const answer = await options.ask(
+    `Ultrac ${version} is available. You are running ${status.currentVersion}.`,
+    UPDATE_CHOICES,
+    options.signal
+  );
+  if (options.signal?.aborted) return "skip";
+  if (answer === UPDATE_CHOICES[0]) return "update_now";
+  if (answer === UPDATE_CHOICES[2]) {
+    await rememberSkippedVersion(version);
+    return "skip_version";
+  }
+  return "skip";
+}
+function validVersion(version) {
+  return version.length <= 128 && /^\d+\.\d+\.\d+(?:-[0-9A-Za-z.-]+)?(?:\+[0-9A-Za-z.-]+)?$/.test(version);
+}
+async function statePath(create) {
+  const home = resolve13(ultracHomeDir());
+  if (home === parse(home).root || home === resolve13(homedir4())) {
+    throw new Error("Ultrac update preferences require a dedicated ULTRAC_HOME directory.");
+  }
+  if (create) await mkdir15(home, { recursive: true, mode: 448 });
+  const info = await lstat4(home);
+  if (!info.isDirectory() || info.isSymbolicLink()) {
+    throw new Error("Ultrac update preferences require a real home directory.");
+  }
+  return join15(home, "update-preferences.json");
+}
+async function skippedVersion() {
+  try {
+    const path = await statePath(false);
+    const file = await open10(path, constants7.O_RDONLY | constants7.O_NOFOLLOW);
+    try {
+      const info = await file.stat();
+      if (!info.isFile() || info.size > 1024) return void 0;
+      const parsed = JSON.parse(await file.readFile("utf8"));
+      if (typeof parsed !== "object" || parsed === null || !("skippedVersion" in parsed)) return void 0;
+      return typeof parsed.skippedVersion === "string" && validVersion(parsed.skippedVersion) ? parsed.skippedVersion : void 0;
+    } finally {
+      await file.close();
+    }
+  } catch {
+    return void 0;
+  }
+}
+async function rememberSkippedVersion(version) {
+  const path = await statePath(true);
+  const temporary = `${path}.${randomBytes5(8).toString("hex")}.tmp`;
+  try {
+    const file = await open10(temporary, constants7.O_WRONLY | constants7.O_CREAT | constants7.O_EXCL, 384);
+    try {
+      await file.writeFile(`${JSON.stringify({ skippedVersion: version })}
+`, "utf8");
+      await file.sync();
+    } finally {
+      await file.close();
+    }
+    await rename4(temporary, path);
+  } finally {
+    await unlink5(temporary).catch(() => void 0);
+  }
+}
+
 // src/commands/repl.ts
 var HELP = `Commands:
   /help                 Show this help
@@ -18296,7 +18784,7 @@ var HELP = `Commands:
   /whoami               Show sign-in state
   /tools                List available tools
   /logs                 Show the private diagnostic log path
-  /ghost [on|off|status] Quiet activity output; diagnostics stay enabled
+  /ghost [on|off|status]  Quiet activity output; diagnostics stay enabled
   /output [number|list]  Inspect saved tool output (latest by default)
   /memory               List and inspect stored memories
   /skill <name> [args]  Run an installed skill
@@ -18467,6 +18955,7 @@ async function runRepl(options, initialTask = "") {
     bindSignals: false,
     details: { provider: provider.name, model: session.model, mode: session.mode, status: "Idle" }
   }) : void 0;
+  setActivitySink(layout?.enabled ? (snapshot) => layout.setActivity(snapshot) : void 0);
   const refreshDetails = () => {
     if (!layout?.enabled) return;
     const steps = session.toSession().steps;
@@ -18504,7 +18993,8 @@ async function runRepl(options, initialTask = "") {
     workspace,
     useNativeTools ? "native tools" : "json protocol",
     describeBudget(mode, toolSelection, registry),
-    diagnosticPath2
+    diagnosticPath2,
+    provider.name.toLowerCase() === "ultrac" ? await readAccountPlan(await resolveUltracCredentials()) : void 0
   );
   if (mcpRuntime && mcpRuntime.statuses.length > 0) {
     console.log(chalk11.bold("\nMCP servers"));
@@ -18517,15 +19007,14 @@ async function runRepl(options, initialTask = "") {
     throw new Error(`Could not start the session: ${errorMessage2(error)}`, { cause: error });
   }
   const update = await updateCheck;
-  if (update?.updateAvailable && update.latestVersion) {
-    console.log(chalk11.yellow(`
-  \u2191 Update available: ${update.currentVersion} \u2192 ${update.latestVersion}`));
-    console.log(chalk11.gray("    Run `ultrac update` after this session."));
+  if (!stdin5.isTTY && update?.updateAvailable && update.latestVersion) {
+    console.log(chalk11.yellow(`Update available: ${update.currentVersion} \u2192 ${update.latestVersion}. Run ultrac update.`));
   }
   const rl = createInterface3({ input: stdin5, output: layout?.enabled ? layout.outputProxy : stdout5 });
   layout?.attachReadline(rl);
+  layout?.setInputFormatter(formatImageInput);
   refreshDetails();
-  const builtinEntries = BUILTIN_SLASH_COMMANDS.map((command) => ({ text: `/${command}`, label: `/${command}` }));
+  const builtinEntries = builtinSlashEntries(BUILTIN_SLASH_COMMANDS, HELP);
   const slashCompletion = layout?.enabled ? attachSlashCompletion(rl, async () => {
     const [commands, skills] = await Promise.all([listSkillCommands(workspace), listSkills(workspace)]);
     const declared = new Set(commands.commands.map((command) => command.skillName));
@@ -18605,29 +19094,35 @@ async function runRepl(options, initialTask = "") {
     rl.close();
   };
   process.on("SIGTERM", terminate);
-  let turnStartedAt;
-  const footerTimer = setInterval(() => {
-    const seconds = turnStartedAt === void 0 ? void 0 : Math.floor((Date.now() - turnStartedAt) / 1e3);
-    layout?.updateDetails({ status: seconds === void 0 ? "Idle" : `Running ${Math.floor(seconds / 60).toString().padStart(2, "0")}:${(seconds % 60).toString().padStart(2, "0")}` });
-  }, 1e3);
-  footerTimer.unref();
   const withInterrupt = async (run) => {
     turnAbort = new AbortController();
-    turnStartedAt = Date.now();
-    layout?.updateDetails({ status: "Running 00:00" });
+    layout?.updateDetails({ status: "Running" });
     try {
       return await run(turnAbort.signal);
     } finally {
       turnAbort = void 0;
-      turnStartedAt = void 0;
       refreshDetails();
       layout?.updateDetails({ status: "Idle" });
     }
   };
   try {
+    if (update) {
+      const decision = await withInterrupt((signal) => offerUpdatePrompt(update, {
+        interactive: Boolean(stdin5.isTTY && stdout5.isTTY),
+        signal,
+        ask: (text, choices, askSignal) => getAskUserRuntime()(text, [...choices], askSignal)
+      }));
+      if (decision === "update_now") {
+        layout?.close();
+        rl.close();
+        await installVerifiedVersion(packageInfo.name, update.latestVersion);
+        console.log(`Updated to ${update.latestVersion}. Run ultrac again to use the new version.`);
+        return;
+      }
+    }
     if (initialTask) {
       console.log(chalk11.white(`
-\u203A ${initialTask}`));
+\u203A ${formatImageInput(initialTask).text}`));
       await withInterrupt((signal) => runAndCheckpointTurn(session, initialTask, question, signal, persistSession, drainQueuedMessages, () => reader.composing, autonomousRounds));
     }
     while (running) {
@@ -18642,10 +19137,10 @@ async function runRepl(options, initialTask = "") {
       }
       const line = await reader.next();
       if (line === null) break;
-      if (layout?.enabled && line.trim()) console.log(`\u203A ${line.replace(/[\x00-\x1f\x7f]/g, " ")}`);
+      if (layout?.enabled && line.trim()) console.log(`\u203A ${formatImageInput(line).text.replace(/[\x00-\x1f\x7f]/g, " ")}`);
       const raw = line.trim();
       if (!raw) continue;
-      if (raw.startsWith("/")) {
+      if (raw.startsWith("/") && !hasDroppedImage(raw)) {
         const previousSession = session;
         const slashCommand = raw.slice(1).trim().split(/\s+/, 1)[0]?.toLowerCase();
         const handled = await withInterrupt(async (signal) => {
@@ -18658,7 +19153,7 @@ async function runRepl(options, initialTask = "") {
             resetContextBudgetNotices();
             console.log(chalk11.gray("Started a fresh conversation."));
           }, async (prompt) => {
-            await runAndCheckpointTurn(session, prompt, question, signal, persistSession, drainQueuedMessages, () => reader.composing, autonomousRounds);
+            await runAndCheckpointTurn(session, prompt, question, signal, persistSession, drainQueuedMessages, () => reader.composing, autonomousRounds, false);
           }, signal, async (id) => {
             const lineage = await loadSessionLineage(workspace, id);
             const restored = createSession({ model: session.model, mode: session.mode, permissions: session.currentPermissions });
@@ -18681,7 +19176,7 @@ async function runRepl(options, initialTask = "") {
         if (handled === "unhandled") {
           try {
             await withInterrupt((signal) => runSkillCommand(session, raw, workspace, question, async (prompt) => {
-              await runAndCheckpointTurn(session, prompt, question, signal, persistSession, drainQueuedMessages, () => reader.composing, autonomousRounds);
+              await runAndCheckpointTurn(session, prompt, question, signal, persistSession, drainQueuedMessages, () => reader.composing, autonomousRounds, false);
             }));
           } finally {
             await persistSession();
@@ -18696,11 +19191,11 @@ async function runRepl(options, initialTask = "") {
       await withInterrupt((signal) => runAndCheckpointTurn(session, raw, question, signal, persistSession, drainQueuedMessages, () => reader.composing, autonomousRounds));
     }
   } finally {
-    clearInterval(footerTimer);
     slashCompletion?.cleanup();
     process.off("SIGTERM", terminate);
     if (stdin5.isTTY) stdin5.off("keypress", onKeypress);
     setAskUserRuntime(void 0);
+    setActivitySink(void 0);
     rl.close();
     try {
       await saveTranscript(session, writeCheckpoint);
@@ -18711,14 +19206,33 @@ async function runRepl(options, initialTask = "") {
   }
   console.log(chalk11.gray("Goodbye."));
 }
-async function runTurn(session, input, question, signal, drainQueuedMessages, persist, isComposing) {
+async function runTurn(session, input, question, signal, drainQueuedMessages, persist, isComposing, allowImageDrop = true) {
+  const activity = isGhostEnabled(session) ? void 0 : getActivitySink();
+  const entries = [];
+  let thinkingMs = 0;
+  let thinkingStarted;
+  let turnFailed = false;
+  const refreshActivity = (finished = false) => activity?.({ entries: [...entries], thinkingMs, finished, failed: turnFailed });
+  refreshActivity();
   const spinner = new Spinner();
+  const workSpinner = new Spinner("working");
+  const activeTools = /* @__PURE__ */ new Map();
+  let permissionPrompts = 0;
+  const renderWorking = () => {
+    workSpinner.stop();
+    const active = [...activeTools.entries()].at(-1);
+    if (!active || quiet || permissionPrompts || [...activeTools.keys()].some((call) => call.tool === "ask_user")) return;
+    workSpinner.update(`working \xB7 ${toolActivityLabel(active[0])}${activeTools.size > 1 ? ` (+${activeTools.size - 1} active)` : ""}`);
+    workSpinner.start(isComposing, active[1]);
+  };
   const quiet = isGhostEnabled(session);
   const detachProgress = quiet ? () => {
   } : attachProgressUi();
   let deltaChars = 0;
   try {
-    await session.ask(input, {
+    const prepared = allowImageDrop ? await prepareImageInput(input) : { text: input };
+    await session.ask(prepared.text, {
+      ...prepared.image ? { image: prepared.image } : {},
       ...signal ? { signal } : {},
       ...persist ? {
         onCheckpoint: async () => {
@@ -18731,13 +19245,22 @@ async function runTurn(session, input, question, signal, drainQueuedMessages, pe
       },
       onModelStart: () => {
         deltaChars = 0;
-        if (!quiet) spinner.start(isComposing);
+        thinkingStarted = performance.now();
+        if (!quiet) {
+          spinner.update("thinking");
+          spinner.start(isComposing);
+        }
       },
       onModelDelta: (text) => {
         deltaChars += text.length;
         if (!quiet) spinner.update(`thinking (${deltaChars} chars)`);
       },
-      onModelSettled: () => spinner.stop(),
+      onModelSettled: () => {
+        if (thinkingStarted !== void 0) thinkingMs += performance.now() - thinkingStarted;
+        thinkingStarted = void 0;
+        spinner.stop(activity ? void 0 : signal?.aborted ? "Thinking stopped after" : "Thought for");
+        refreshActivity();
+      },
       onAssistantMessage: (message) => {
         if (message.trim()) {
           console.log(`
@@ -18745,9 +19268,24 @@ ${message.trim()}`);
         }
       },
       onToolStart: (call) => {
-        if (!quiet) console.log(chalk11.dim(`  ${toolActivityLabel(call)}`));
+        activeTools.set(call, performance.now());
+        renderWorking();
+        if (!stdout5.isTTY && !quiet) console.log(chalk11.dim(`  ${toolActivityLabel(call)}`));
+      },
+      onToolResult: (call, result) => {
+        workSpinner.stop();
+        const started = activeTools.get(call);
+        activeTools.delete(call);
+        const duration = started === void 0 ? 0 : performance.now() - started;
+        entries.push(activityEntry(call, result, duration));
+        refreshActivity();
+        if (!activity && !quiet) {
+          const dot = result.ok ? chalk11.green("\u25CF") : chalk11.red("\u25CF");
+          console.log(`  ${dot} ${toolActivityLabel(call)}${duration >= 1e3 ? ` \xB7 Worked for ${formatSeconds(duration)}` : ""}`);
+        }
+        printToolResult2(result, Boolean(activity));
+        renderWorking();
       },
-      onToolResult: (_call, result) => printToolResult2(result),
       ...drainQueuedMessages ? {
         drainQueuedMessages,
         onQueuedMessage: (message) => {
@@ -18771,42 +19309,55 @@ ${message.trim()}`);
         console.log(chalk11.gray(`  ${hint}`));
       },
       requestPermission: async (call, permission) => {
-        const prompt = permission === "shell" && call.tool === "run_shell" ? shellApprovalPrompt(call, session.toSession().workspace) : permission === "shell" ? `  ${call.tool} wants shell access. [o]nce (this call only) / [a]lways (all shell tools for this session) / [n]o (this call) / n[e]ver (this session) \u203A ` : `  ${call.tool} wants ${permission} access. [o]nce / [a]lways / [n]o / n[e]ver \u203A `;
-        const rawAnswer = await question(chalk11.yellow(prompt), signal);
-        if (signal?.aborted || rawAnswer === null) return "deny";
-        const answer = rawAnswer.trim().toLowerCase();
-        if (answer === "a" || answer === "always") return "always";
-        if (answer === "o" || answer === "once" || answer === "y" || answer === "yes") return "once";
-        if (answer === "e" || answer === "never") {
-          console.log(
-            chalk11.gray(
-              `  ${permission} refused for the rest of the session \u2014 nothing will ask again. /allow ${permission} undoes it.`
-            )
-          );
-          return "never";
+        permissionPrompts += 1;
+        workSpinner.stop();
+        try {
+          const prompt = permission === "shell" && call.tool === "run_shell" ? shellApprovalPrompt(call, session.toSession().workspace) : permission === "shell" ? `  ${call.tool} wants shell access. [o]nce (this call only) / [a]lways (all shell tools for this session) / [n]o (this call) / n[e]ver (this session) \u203A ` : `  ${call.tool} wants ${permission} access. [o]nce / [a]lways / [n]o / n[e]ver \u203A `;
+          const rawAnswer = await question(chalk11.yellow(prompt), signal);
+          if (signal?.aborted || rawAnswer === null) return "deny";
+          const answer = rawAnswer.trim().toLowerCase();
+          if (answer === "a" || answer === "always") return "always";
+          if (answer === "o" || answer === "once" || answer === "y" || answer === "yes") return "once";
+          if (answer === "e" || answer === "never") {
+            console.log(
+              chalk11.gray(
+                `  ${permission} refused for the rest of the session \u2014 nothing will ask again. /allow ${permission} undoes it.`
+              )
+            );
+            return "never";
+          }
+          return "deny";
+        } finally {
+          permissionPrompts -= 1;
+          renderWorking();
         }
-        return "deny";
       }
     });
     return true;
   } catch (error) {
+    turnFailed = true;
     spinner.stop();
     printTurnError(error);
     return false;
   } finally {
+    spinner.stop();
+    workSpinner.stop();
+    activeTools.clear();
+    if (thinkingStarted !== void 0) thinkingMs += performance.now() - thinkingStarted;
+    refreshActivity(true);
     detachProgress();
   }
 }
-async function runAndCheckpointTurn(session, input, question, signal, persist, drainQueuedMessages, isComposing, maxRounds = 1) {
+async function runAndCheckpointTurn(session, input, question, signal, persist, drainQueuedMessages, isComposing, maxRounds = 1, allowImageDrop = true) {
   try {
-    if (maxRounds === 1) return await runTurn(session, input, question, signal, drainQueuedMessages, persist, isComposing);
+    if (maxRounds === 1) return await runTurn(session, input, question, signal, drainQueuedMessages, persist, isComposing, allowImageDrop);
     let successful = true;
     const result = await runAutonomousLoop({
       maxRounds,
       signal,
       classifyFailure: () => ({ kind: "unknown", retryable: false, failoverable: false, reason: "Interactive provider retries already exhausted." }),
       runRound: async (round, _previous, roundSignal) => {
-        successful = await runTurn(session, round === 1 ? input : AUTONOMOUS_CONTINUE_TASK, question, roundSignal, drainQueuedMessages, persist, isComposing);
+        successful = await runTurn(session, round === 1 ? input : AUTONOMOUS_CONTINUE_TASK, question, roundSignal, drainQueuedMessages, persist, isComposing, allowImageDrop);
         await persist(session);
         const snapshot = session.toSession();
         return successful ? snapshot : { ...snapshot, stopReason: roundSignal.aborted ? "aborted" : "error" };
@@ -19000,7 +19551,7 @@ ${extra}`);
       else {
         for (const field of ["inputTokens", "outputTokens", "totalTokens"]) {
           const counts = reported.flatMap((step) => typeof step.usage?.[field] === "number" ? [step.usage[field]] : []);
-          console.log(`${field}: ${counts.length ? counts.reduce((sum, count4) => sum + count4, 0) : "not reported"}`);
+          console.log(`${field}: ${counts.length ? counts.reduce((sum, count3) => sum + count3, 0) : "not reported"}`);
         }
         console.log(`Counts cover ${reported.length}/${steps.length} agent steps in this session. Compaction calls and ancestor sessions are excluded. Card charges are not inferred from tokens.`);
       }
@@ -19127,6 +19678,8 @@ ${extra}`);
       }
       const entry = results[selected - 1];
       console.log(`${selected}. ${toolActivityLabel(entry.call)} (${entry.result.ok ? "ok" : "failed"})`);
+      const detail = activityEntry(entry.call, entry.result, 0);
+      if (detail.request) console.log(detail.request);
       console.log(entry.result.content);
       for (const warning of getMcpArchiveWarnings(entry.result)) console.log(chalk11.yellow(`Warning: ${warning}`));
       return "ok";
@@ -19205,7 +19758,7 @@ async function runSkillCommand(session, raw, workspace, question, runPrompt) {
       chalk11.gray(`  /${resolved.command.command} \u2192 skill ${resolved.command.skillName} (${resolved.command.scope})`)
     );
     if (runPrompt) await runPrompt(resolved.prompt);
-    else await runTurn(session, resolved.prompt, question);
+    else await runTurn(session, resolved.prompt, question, void 0, void 0, void 0, void 0, false);
     return;
   }
   if (resolved.status === "conflict") {
@@ -19270,7 +19823,7 @@ var LineReader = class {
     const messages = [];
     while (this.queue.length) {
       const next = this.queue[0].trim();
-      if (next.startsWith("/")) break;
+      if (next.startsWith("/") || hasDroppedImage(next)) break;
       this.queue.shift();
       if (next) messages.push(next);
     }
@@ -19283,8 +19836,8 @@ var LineReader = class {
       if (buffered !== void 0) return Promise.resolve(buffered);
     }
     if (this.closed) return Promise.resolve(null);
-    return new Promise((resolve15) => {
-      const waiter = { resolve: resolve15, ...signal ? { signal } : {} };
+    return new Promise((resolve17) => {
+      const waiter = { resolve: resolve17, ...signal ? { signal } : {} };
       if (signal) {
         waiter.onAbort = () => {
           const index = this.waiters.indexOf(waiter);
@@ -19317,11 +19870,12 @@ function handleReplExit(activeTurn) {
   activeTurn?.abort();
   return "exit-session";
 }
-function printBanner(version, providerName, model, mode, workspace, protocol, budget, diagnosticPath2) {
+function printBanner(version, providerName, model, mode, workspace, protocol, budget, diagnosticPath2, planName) {
   console.log(renderWelcome(
     {
       version,
       providerName,
+      planName,
       model,
       mode,
       workspace,
@@ -19346,9 +19900,9 @@ function describeAdvertisedTools(mode, selection, registry = createDefaultToolRe
     names: advertised.map((tool) => tool.name)
   };
 }
-function printToolResult2(result) {
+function printToolResult2(result, collapsed = false) {
   const failure = toolFailurePreview(result);
-  if (failure) console.log(chalk11.red(`    Failed: ${failure}`));
+  if (failure && !collapsed) console.log(chalk11.red(`    Failed: ${failure}`));
   for (const warning of getMcpArchiveWarnings(result)) {
     console.log(chalk11.yellow(indent3(`Warning: ${warning}`)));
   }
@@ -19624,7 +20178,7 @@ ${summary}` : ""}`).catch((error) => console.error(chalk12.yellow(`Could not sen
 }
 
 // src/commands/sessions.ts
-import { resolve as resolve12 } from "path";
+import { resolve as resolve14 } from "path";
 function registerSessionsCommand(program2) {
   const sessions = program2.command("sessions").description("Inspect saved Ultrac session transcripts");
   sessions.command("list").description("List saved sessions").option("-w, --workspace <path>", "Workspace path", ".").option("--json", "Print JSON output", false).option("--max-results <number>", "Maximum sessions to show", "20").action(async (options) => {
@@ -19641,7 +20195,7 @@ function registerSessionsCommand(program2) {
     );
   });
   sessions.command("export").description("Export a saved session as an auditable episode package").argument("<id>", "Session id").option("-w, --workspace <path>", "Workspace path", ".").option("--format <format>", "Output format: markdown or json", "markdown").option("--max-chars <number>", "Maximum characters per model/tool text block in markdown", "4000").option("--outcome <outcome>", "Outcome status: pass, fail, blocked, or unknown", "unknown").option("--notes <text>", "Outcome notes to include in the episode package").option("--out <path>", "Write export to a path inside the workspace instead of stdout").action(async (id, options) => {
-    const workspace = resolve12(options.workspace);
+    const workspace = resolve14(options.workspace);
     const format3 = parseExportFormat(options.format);
     const maxChars = parsePositiveInt2(options.maxChars);
     const outcome = parseOutcomeStatus(options.outcome);
@@ -19658,7 +20212,7 @@ function registerSessionsCommand(program2) {
   });
 }
 async function runSessionTool(tool, input, options) {
-  const workspace = resolve12(options.workspace);
+  const workspace = resolve14(options.workspace);
   const result = await createDefaultToolRegistry().execute(
     { tool, input },
     { workspace, permissions: { write: false, shell: false, network: false } }
@@ -19834,11 +20388,11 @@ function collectToolArtifacts(session, toolName) {
 }
 
 // src/commands/skills.ts
-import { resolve as resolve13 } from "path";
+import { resolve as resolve15 } from "path";
 function registerSkillsCommand(program2) {
   const skills = program2.command("skills").description("Manage Ultrac skills (SKILL.md playbooks)");
   skills.command("list").description("List installed skills").option("-w, --workspace <path>", "Workspace path", ".").action(async (options) => {
-    const installed = await listSkills(resolve13(options.workspace));
+    const installed = await listSkills(resolve15(options.workspace));
     if (!installed.length) {
       console.log("No skills installed. Create one with: ultrac skills create <name> --description <text>");
       return;
@@ -19849,7 +20403,7 @@ function registerSkillsCommand(program2) {
     }
   });
   skills.command("show").description("Show a skill's full instructions").argument("<name>", "Skill name").option("-w, --workspace <path>", "Workspace path", ".").action(async (name, options) => {
-    const skill = await readSkill(resolve13(options.workspace), name);
+    const skill = await readSkill(resolve15(options.workspace), name);
     if (!skill) throw new Error(`No skill named "${name}".`);
     console.log(`# ${skill.name} (${skill.scope})`);
     console.log(`Path: ${skill.path}`);
@@ -19864,7 +20418,7 @@ function registerSkillsCommand(program2) {
       if (options.argumentHint && !command) throw new Error("--argument-hint requires --command.");
       const argumentHint = options.argumentHint?.trim();
       if (argumentHint && (argumentHint.length > 256 || /[\r\n]/.test(argumentHint))) throw new Error("Argument hints must be one line, at most 256 characters.");
-      const skill = await createSkill(resolve13(options.workspace), {
+      const skill = await createSkill(resolve15(options.workspace), {
         name,
         description: options.description,
         whenToUse: options.when,
@@ -19879,7 +20433,7 @@ function registerSkillsCommand(program2) {
     }
   );
   skills.command("path").description("Print the skills directory path for a scope").option("-w, --workspace <path>", "Workspace path", ".").option("--scope <scope>", "global or project", "project").action((options) => {
-    console.log(skillsDir(parseScope2(options.scope), resolve13(options.workspace)));
+    console.log(skillsDir(parseScope2(options.scope), resolve15(options.workspace)));
   });
 }
 function parseScope2(scope) {
@@ -20181,13 +20735,13 @@ var FollowAbortedError = class extends Error {
   }
 };
 function defaultSleep2(ms, signal) {
-  return new Promise((resolve15) => {
-    if (signal?.aborted) return resolve15();
+  return new Promise((resolve17) => {
+    if (signal?.aborted) return resolve17();
     const timer = setTimeout(done, ms);
     function done() {
       signal?.removeEventListener("abort", done);
       clearTimeout(timer);
-      resolve15();
+      resolve17();
     }
     signal?.addEventListener("abort", done, { once: true });
   });
@@ -20620,8 +21174,8 @@ Leaving run ${runId} as it is.
     case "succeeded":
       finishHuman(result.text);
       if (result.toolCalls.length && !result.text) {
-        const count4 = result.toolCalls.length;
-        r.err(chalk13.gray(`Done with ${count4} tool call${count4 === 1 ? "" : "s"} and no text.
+        const count3 = result.toolCalls.length;
+        r.err(chalk13.gray(`Done with ${count3} tool call${count3 === 1 ? "" : "s"} and no text.
 `));
       }
       return result.outputSource === "incomplete" ? EXIT_FAILED : EXIT_DONE;
@@ -20683,11 +21237,11 @@ async function interrupted(r, runId, options, printed) {
 }
 async function resolveDeps(options, deps) {
   if (options.baseUrl) setBaseUrlFlag(options.baseUrl);
-  const resolve15 = deps.credentials ?? (async () => {
+  const resolve17 = deps.credentials ?? (async () => {
     const credentials2 = await resolveUltracCredentials();
     return credentials2 ? { apiKey: credentials2.apiKey, baseUrl: credentials2.baseUrl } : null;
   });
-  const credentials = await resolve15();
+  const credentials = await resolve17();
   if (!credentials) {
     throw new Error("Not signed in to Ultrac. Run `ultrac login` (or set ULTRAC_API_KEY).");
   }
@@ -20786,7 +21340,7 @@ ${run.output}${run.output.endsWith("\n") ? "" : "\n"}`;
 }
 
 // src/commands/tools.ts
-import { resolve as resolve14 } from "path";
+import { resolve as resolve16 } from "path";
 import chalk14 from "chalk";
 function registerToolsCommand(program2) {
   const toolsCommand = program2.command("tools");
@@ -20821,7 +21375,7 @@ ${tools.length} of ${all.length} tools advertised in ${options.mode} mode, ${ser
     const result = await createDefaultToolRegistry().execute(
       { tool, input },
       {
-        workspace: resolve14(options.workspace),
+        workspace: resolve16(options.workspace),
         permissions: {
           write: options.allowWrite,
           shell: options.allowShell,