@spinalfluid/ultrac 0.1.9 → 0.1.14

package/dist/cli.js

@@ -286,7 +286,7 @@ var agentModePresets = {
       "Prefer narrow, reversible changes.",
       "Keep final answers concise and include verification status."
     ],
-    tools: [...coreTools, "list_sessions", "read_session", "search_sessions"],
+    tools: [...coreTools, "create_skill", "list_sessions", "read_session", "search_sessions"],
     externalTools: true
   },
   plan: {
@@ -331,6 +331,7 @@ var agentModePresets = {
     ],
     tools: [
       ...coreTools,
+      "create_skill",
       "ast_search",
       "repo_handbook",
       "verification_plan",
@@ -398,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(
@@ -1135,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) => {
@@ -1142,8 +1147,8 @@ var noticeSink = (message) => {
 `);
 };
 var noticed = false;
-function setContextBudgetNotice(sink) {
-  noticeSink = sink;
+function setContextBudgetNotice(sink2) {
+  noticeSink = sink2;
 }
 function resetContextBudgetNotices() {
   noticed = false;
@@ -1222,20 +1227,20 @@ function compactRun(input, options = {}) {
 }
 async function compactShape(shape, options) {
   const reserveChars = options.summarise ? Math.max(0, options.reserveChars ?? shape.reserveChars ?? 0) : 0;
-  const plain = planKeepingSummaries(shape, shape.messages, reserveChars);
+  const plain2 = planKeepingSummaries(shape, shape.messages, reserveChars);
   const skip = (reason) => ({
-    ...reserveChars > 0 ? planKeepingSummaries(shape, shape.messages, shape.reserveChars ?? 0) : plain,
+    ...reserveChars > 0 ? planKeepingSummaries(shape, shape.messages, shape.reserveChars ?? 0) : plain2,
     compacted: false,
     summarisedMessages: 0,
     summarisedTurns: 0,
     skipped: reason
   });
-  if (plain.dropped.length === 0) return skip("nothing-dropped");
+  if (plain2.dropped.length === 0) return skip("nothing-dropped");
   if (!options.summarise) return skip("no-summariser");
-  const source = plain.dropped.filter((message2) => !isCompactionSummary(message2));
+  const source = plain2.dropped.filter((message2) => !isCompactionSummary(message2));
   if (source.length === 0) return skip("only-summaries");
   const ceiling = options.maxSummaryChars ?? DEFAULT_MAX_SUMMARY_CHARS;
-  const slack = plain.usage.promptLimitChars - plain.usage.totalChars - summaryEnvelopeChars();
+  const slack = plain2.usage.promptLimitChars - plain2.usage.totalChars - summaryEnvelopeChars();
   const maxChars = Math.min(ceiling, slack);
   if (maxChars < MIN_SUMMARY_CHARS) return skip("no-room");
   const transcript = renderDroppedTranscript(source, {
@@ -1260,21 +1265,21 @@ async function compactShape(shape, options) {
   const text = truncateToLine(summary.trim(), maxChars);
   if (!text) return skip("summariser-empty");
   const message = compactionSummaryMessage(text);
-  const plan = replan(shape, plain, message);
+  const plan = replan(shape, plain2, message);
   if (!plan) return skip("would-drop-more");
   return {
     ...plan,
     // The re-plan saw a transcript the span was already out of, so it has
     // nothing to report about it. What was dropped is what `plain` dropped.
-    dropped: plain.dropped,
-    droppedMessages: plain.droppedMessages,
-    droppedTurns: plain.droppedTurns,
-    droppedChars: plain.droppedChars,
+    dropped: plain2.dropped,
+    droppedMessages: plain2.droppedMessages,
+    droppedTurns: plain2.droppedTurns,
+    droppedChars: plain2.droppedChars,
     compacted: true,
     summary: text,
-    summarisedMessages: plain.dropped.length,
-    summarisedTurns: plain.droppedTurns,
-    warning: compactionWarning(plan, plain)
+    summarisedMessages: plain2.dropped.length,
+    summarisedTurns: plain2.droppedTurns,
+    warning: compactionWarning(plan, plain2)
   };
 }
 function planKeepingSummaries(shape, messages, reserveChars) {
@@ -1290,8 +1295,8 @@ function planKeepingSummaries(shape, messages, reserveChars) {
     return shape.plan(messages, callerPinned, reserveChars);
   }
 }
-function replan(shape, plain, summary) {
-  const kept = plain.messages;
+function replan(shape, plain2, summary) {
+  const kept = plain2.messages;
   const insertAt = kept.findIndex((message) => message.role !== "system");
   const at = insertAt < 0 ? kept.length : insertAt;
   const next = [...kept.slice(0, at), summary, ...kept.slice(at)];
@@ -1307,9 +1312,9 @@ function replan(shape, plain, summary) {
   if (!kept.every((message) => survived.has(message))) return void 0;
   return plan;
 }
-function compactionWarning(plan, plain) {
-  const turns = plural2(plain.droppedTurns, "earlier turn");
-  const messages = plural2(plain.dropped.length, "message");
+function compactionWarning(plan, plain2) {
+  const turns = plural2(plain2.droppedTurns, "earlier turn");
+  const messages = plural2(plain2.dropped.length, "message");
   return `Context budget: compacted ${turns} (${messages}) into a summary to stay under the ${count2(plan.usage.promptLimitChars)}-character prompt limit. The summary is in the transcript in their place; the recent turns are untouched.`;
 }
 function truncateToLine(text, maxChars) {
@@ -2043,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: "" };
@@ -2198,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 {
@@ -2263,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 {
@@ -2308,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") {
@@ -2331,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) {
@@ -2481,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 {
@@ -2722,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 }
     );
@@ -2807,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);
     });
   }
@@ -2895,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" });
@@ -3115,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();
     }
@@ -3128,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);
       }
     };
@@ -4065,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"],
@@ -4083,7 +4131,7 @@ function runProcess(command, args, options) {
     });
     const untrack = trackProcessGroup(child.pid);
     const stdout6 = createCapture(maxBytes);
-    const stderr = createCapture(maxBytes);
+    const stderr2 = createCapture(maxBytes);
     let settled = false;
     let started = false;
     let termination;
@@ -4139,7 +4187,7 @@ function runProcess(command, args, options) {
     };
     const onAbort = () => beginTermination("aborted");
     child.stdout.on("data", (chunk) => stdout6.push(chunk));
-    child.stderr.on("data", (chunk) => stderr.push(chunk));
+    child.stderr.on("data", (chunk) => stderr2.push(chunk));
     child.stdout.on("error", () => {
     });
     child.stderr.on("error", () => {
@@ -4150,9 +4198,9 @@ function runProcess(command, args, options) {
     child.on("error", (error) => {
       finish(() => {
         if (termination === "aborted") {
-          resolve15({
+          resolve17({
             stdout: stdout6.text(),
-            stderr: stderr.text(),
+            stderr: stderr2.text(),
             started,
             aborted: true,
             exitCode: null,
@@ -4160,7 +4208,7 @@ function runProcess(command, args, options) {
             timedOut: false,
             timeoutMs,
             ...stdout6.truncation() ? { stdoutTruncation: stdout6.truncation() } : {},
-            ...stderr.truncation() ? { stderrTruncation: stderr.truncation() } : {},
+            ...stderr2.truncation() ? { stderrTruncation: stderr2.truncation() } : {},
             redactedEnvKeys
           });
           return;
@@ -4170,11 +4218,11 @@ function runProcess(command, args, options) {
     });
     child.on("close", (exitCode, signal) => {
       const stdoutTruncation = stdout6.truncation();
-      const stderrTruncation = stderr.truncation();
+      const stderrTruncation = stderr2.truncation();
       finish(
-        () => resolve15({
+        () => resolve17({
           stdout: stdout6.text(),
-          stderr: stderr.text(),
+          stderr: stderr2.text(),
           started,
           aborted: termination === "aborted",
           exitCode,
@@ -5376,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 = [
@@ -5393,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)),
@@ -5675,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("\\", "/") };
   }
@@ -6089,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 {
@@ -6147,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;
@@ -6247,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 });
@@ -6864,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");
@@ -8082,6 +8137,213 @@ async function loadSkillsContext(workspace) {
   }).join("\n") + notice;
 }
 
+// src/skills/commands.ts
+var BUILTIN_SLASH_COMMANDS = [
+  "doctor",
+  "mcp",
+  "continue",
+  "autonomous",
+  "skill",
+  "update",
+  "logs",
+  "ghost",
+  "output",
+  "usage",
+  "max-steps",
+  "resume",
+  "deny",
+  "plan",
+  "review",
+  "coding",
+  "status",
+  "context",
+  "compact",
+  "diff",
+  "sessions",
+  "save",
+  "test",
+  "init",
+  "new",
+  "allow",
+  "clear",
+  "exit",
+  "help",
+  "memory",
+  "mode",
+  "model",
+  "permissions",
+  "quit",
+  "skills",
+  "tools",
+  "whoami"
+];
+var COMMAND_NAME_RE = /^[a-z0-9]+(?:-[a-z0-9]+)*$/;
+var MAX_COMMAND_LENGTH = 64;
+function parseSlashInput(input) {
+  const trimmed = input.trim();
+  if (!trimmed.startsWith("/")) return null;
+  const rest = trimmed.slice(1);
+  const match = rest.match(/^(\S+)(?:\s+([\s\S]*))?$/);
+  if (!match) return null;
+  return { command: match[1], args: (match[2] ?? "").trim() };
+}
+function isBuiltinSlashCommand(command) {
+  return BUILTIN_SLASH_COMMANDS.includes(command.toLowerCase());
+}
+function normalizeCommandName(value) {
+  const candidate = value.trim().replace(/^\/+/, "").trim();
+  if (!candidate) {
+    throw new Error("Slash command name is empty; expected kebab-case, for example: open-pr.");
+  }
+  if (candidate.length > MAX_COMMAND_LENGTH) {
+    throw new Error(
+      `Slash command name "${candidate}" is longer than ${MAX_COMMAND_LENGTH} characters.`
+    );
+  }
+  if (!COMMAND_NAME_RE.test(candidate)) {
+    throw new Error(
+      `Invalid slash command name "${candidate}": use kebab-case - lowercase letters, digits, and single hyphens, no spaces or slashes (for example: open-pr).`
+    );
+  }
+  return candidate;
+}
+async function collectEntries(workspace) {
+  const skills = await discoverSkills(workspace);
+  const claimed = /* @__PURE__ */ new Map();
+  const conflicts = [];
+  for (const skill of skills) {
+    let declaration;
+    try {
+      declaration = skill.command ?? null;
+    } catch (error) {
+      conflicts.push({
+        command: "",
+        skillName: skill.name,
+        scope: skill.scope,
+        path: skill.path,
+        reason: "invalid",
+        message: `Skill "${skill.name}" (${skill.scope}) was skipped: ${error instanceof Error ? error.message : String(error)}`
+      });
+      continue;
+    }
+    if (!declaration) continue;
+    let command;
+    try {
+      command = normalizeCommandName(declaration.raw);
+    } catch (error) {
+      conflicts.push({
+        command: declaration.raw,
+        skillName: skill.name,
+        scope: skill.scope,
+        path: skill.path,
+        reason: "invalid",
+        message: `Skill "${skill.name}" (${skill.scope}) declares a malformed command: ${error instanceof Error ? error.message : String(error)}`
+      });
+      continue;
+    }
+    if (isBuiltinSlashCommand(command)) {
+      conflicts.push({
+        command,
+        skillName: skill.name,
+        scope: skill.scope,
+        path: skill.path,
+        reason: "builtin",
+        message: `Skill "${skill.name}" (${skill.scope}) declares /${command}, which is a built-in command. Built-ins always win - rename the command: key in ${skill.path}.`
+      });
+      continue;
+    }
+    const entry = {
+      skill,
+      command: {
+        command,
+        skillName: skill.name,
+        description: skill.description,
+        argumentHint: declaration.argumentHint,
+        scope: skill.scope,
+        path: skill.path
+      }
+    };
+    const existing = claimed.get(command);
+    if (!existing) {
+      claimed.set(command, entry);
+      continue;
+    }
+    const winner = existing.skill.scope === "global" && skill.scope === "project" ? entry : existing;
+    const loser = winner === entry ? existing : entry;
+    claimed.set(command, winner);
+    conflicts.push({
+      command,
+      skillName: loser.skill.name,
+      scope: loser.skill.scope,
+      path: loser.skill.path,
+      reason: "duplicate",
+      message: `/${command} is declared by both "${winner.skill.name}" (${winner.skill.scope}) and "${loser.skill.name}" (${loser.skill.scope}). "${winner.skill.name}" wins; rename the command: key in ${loser.skill.path}.`
+    });
+  }
+  const entries = [...claimed.values()].sort((a, b) => a.command.command.localeCompare(b.command.command));
+  return { entries, conflicts };
+}
+async function listSkillCommands(workspace) {
+  const { entries, conflicts } = await collectEntries(workspace);
+  return { commands: entries.map((entry) => entry.command), conflicts };
+}
+function buildSkillCommandPrompt(skill, command, args) {
+  const argumentLine = command.argumentHint ? `Arguments (${command.argumentHint}): ${args || "(none provided)"}` : `Arguments: ${args || "(none provided)"}`;
+  const header = [
+    `The user ran the /${command.command} slash command, which runs the "${skill.name}" skill (${skill.scope}).`,
+    skill.description ? `Description: ${skill.description}` : void 0,
+    argumentLine,
+    skill.permissions.length ? `Permissions needed: ${skill.permissions.join(", ")}` : void 0,
+    "Follow the instructions below now, applying the arguments where they are relevant."
+  ].filter(Boolean).join("\n");
+  return `${header}
+
+--- instructions ---
+${skill.body}`;
+}
+async function resolveSkillCommand(workspace, input) {
+  const parsed = parseSlashInput(input);
+  if (!parsed) return { status: "not-a-command" };
+  const command = parsed.command.toLowerCase();
+  if (isBuiltinSlashCommand(command)) {
+    return { status: "builtin", command };
+  }
+  const { entries, conflicts } = await collectEntries(workspace);
+  const match = entries.find((entry) => entry.command.command === command);
+  if (!match) {
+    const related = conflicts.filter((conflict) => conflict.command === command);
+    if (related.length) {
+      return {
+        status: "conflict",
+        command,
+        message: related.map((conflict) => conflict.message).join("\n"),
+        conflicts: related
+      };
+    }
+    return {
+      status: "unknown",
+      command,
+      available: entries.map((entry) => entry.command.command)
+    };
+  }
+  return {
+    status: "ok",
+    command: match.command,
+    skill: match.skill,
+    args: parsed.args,
+    prompt: buildSkillCommandPrompt(match.skill, match.command, parsed.args)
+  };
+}
+function formatSkillCommandHelp(index) {
+  if (!index.commands.length) return "";
+  const lines = index.commands.map((command) => {
+    const invocation = command.argumentHint ? `/${command.command} ${command.argumentHint}` : `/${command.command}`;
+    const description = command.description || `Run the ${command.skillName} skill`;
+    return `  ${invocation.padEnd(22)}${description} (skill: ${command.skillName})`;
+  });
+  return ["Skill commands:", ...lines].join("\n");
+}
+
 // src/tools/workspace/skill-tools.ts
 var SkillInput = z17.object({
   name: z17.string().min(1).describe("Name of the skill to load, as shown in the skills list.")
@@ -8128,6 +8390,26 @@ var listSkillsTool = {
     };
   }
 };
+var CreateSkillInput = z17.object({
+  name: z17.string().min(1).max(80),
+  description: z17.string().trim().min(1).max(512),
+  body: z17.string().trim().min(1).max(6e4),
+  command: z17.string().min(1).max(64).optional(),
+  argumentHint: z17.string().max(256).optional()
+});
+var createSkillTool = {
+  name: "create_skill",
+  description: "Create a project SKILL.md with instructions; never overwrites. Trust is required before loading project skills.",
+  permissions: ["write"],
+  inputSchema: CreateSkillInput,
+  async execute(input, context) {
+    const command = input.command ? normalizeCommandName(input.command) : void 0;
+    if (command && isBuiltinSlashCommand(command)) throw new Error(`/${command} is reserved.`);
+    if (input.argumentHint && (!command || /[\r\n]/.test(input.argumentHint))) throw new Error("Argument hint requires a command and a single line.");
+    const skill = await createSkill(context.workspace, { ...input, command, scope: "project" });
+    return { changed: true, content: `Created ${skill.name}: ${skill.path}. Project skills require workspace trust before use.`, data: { name: skill.name, path: skill.path } };
+  }
+};
 
 // src/tools/workspace/todo-tools.ts
 import { z as z18 } from "zod";
@@ -9121,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;
 }
@@ -9627,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));
     }
   }
 }
@@ -9675,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.`);
@@ -10916,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 {
@@ -11351,8 +11635,8 @@ function tokenizeCommand(command) {
 function renderCommandLine(plan) {
   return [plan.command, ...plan.args].join(" ");
 }
-function parseTestOutput(runner, stdout6, stderr, workspace) {
-  const combined = [stdout6, stderr].filter(Boolean).join("\n");
+function parseTestOutput(runner, stdout6, stderr2, workspace) {
+  const combined = [stdout6, stderr2].filter(Boolean).join("\n");
   if (runner === "vitest" || runner === "jest") {
     const report = extractJestStyleReport(stdout6) ?? extractJestStyleReport(combined);
     if (report) return parseJestStyleReport(report, workspace);
@@ -12076,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;
 }
@@ -12565,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,
@@ -12798,64 +13082,67 @@ function decodeCodePoint(value, fallback) {
 // src/tools/workspace.ts
 function createDefaultToolRegistry() {
   const { todoWriteTool, todoReadTool } = createTodoTools();
-  return new ToolRegistry().register(listFilesTool).register(readFileTool).register(readManyFilesTool).register(searchFilesTool).register(astSearchTool).register(inspectProjectTool).register(inspectArtifactTool).register(hexDumpTool).register(extractStringsTool).register(scanSecretsTool).register(fileTimelineTool).register(repoMapTool).register(repoHandbookTool).register(contextBundleTool).register(verificationPlanTool).register(verificationReportTool).register(writeFileTool).register(replaceInFileTool).register(multiEditTool).register(applyPatchTool).register(gitStatusTool).register(gitWorktreeSummaryTool).register(gitDiffTool).register(gitLogTool).register(gitShowTool).register(gitBlameTool).register(gitCommitTool).register(gitPushTool).register(runPackageScriptTool).register(runTestsTool).register(diagnosticsTool).register(listSessionsTool).register(readSessionTool).register(searchSessionsTool).register(fetchUrlTool).register(runShellTool).register(listProcessesTool).register(memoryWriteTool).register(memoryReadTool).register(memoryListTool).register(memorySearchTool).register(memoryDeleteTool).register(skillTool).register(listSkillsTool).register(todoWriteTool).register(todoReadTool).register(taskTool).register(askUserTool);
+  return new ToolRegistry().register(listFilesTool).register(readFileTool).register(readManyFilesTool).register(searchFilesTool).register(astSearchTool).register(inspectProjectTool).register(inspectArtifactTool).register(hexDumpTool).register(extractStringsTool).register(scanSecretsTool).register(fileTimelineTool).register(repoMapTool).register(repoHandbookTool).register(contextBundleTool).register(verificationPlanTool).register(verificationReportTool).register(writeFileTool).register(replaceInFileTool).register(multiEditTool).register(applyPatchTool).register(gitStatusTool).register(gitWorktreeSummaryTool).register(gitDiffTool).register(gitLogTool).register(gitShowTool).register(gitBlameTool).register(gitCommitTool).register(gitPushTool).register(runPackageScriptTool).register(runTestsTool).register(diagnosticsTool).register(listSessionsTool).register(readSessionTool).register(searchSessionsTool).register(fetchUrlTool).register(runShellTool).register(listProcessesTool).register(memoryWriteTool).register(memoryReadTool).register(memoryListTool).register(memorySearchTool).register(memoryDeleteTool).register(skillTool).register(listSkillsTool).register(createSkillTool).register(todoWriteTool).register(todoReadTool).register(taskTool).register(askUserTool);
 }
 
 // src/commands/doctor.ts
 function registerDoctorCommand(program2) {
   program2.command("doctor").description("Check the local ultrac setup").option("-w, --workspace <path>", "Workspace path", ".").option("--json", "Print JSON output", false).action(async (options) => {
-    const workspace = resolve7(options.workspace);
-    const workspaceReady = await stat10(workspace).then((entry) => entry.isDirectory(), () => false);
-    const [nodeMajor = 0, nodeMinor = 0] = process.versions.node.split(".").map(Number);
-    const nodeReady = nodeMajor > 22 || nodeMajor === 22 && nodeMinor >= 12;
-    const config = await loadConfig(workspace).catch(() => null);
-    const configExists = await hasConfig(workspace);
-    const isGitRepo = await pathExists(resolve7(workspace, ".git"));
-    const ultracCredentials = await resolveUltracCredentials();
-    const baseUrl = ultracCredentials ? { baseUrl: ultracCredentials.baseUrl, source: ultracCredentials.baseUrlSource } : resolveBaseUrl();
-    const tools = createDefaultToolRegistry().list();
-    const toolSchemasReady = tools.every((tool) => tool.inputSchema && typeof tool.inputSchema === "object");
-    const checks = [
-      { label: "node", value: `${process.versions.node} (requires >=22.12.0)`, ok: nodeReady },
-      {
-        label: "workspace",
-        value: workspaceReady ? workspace : `${workspace} - must be an accessible directory`,
-        ok: workspaceReady
-      },
-      { label: "git repository", value: isGitRepo ? "found" : "not found", ok: isGitRepo },
-      {
-        label: "config",
-        value: config ? configExists ? configPath(workspace) : "using defaults" : `unable to load configuration - check ${configPath(workspace)} and local trust settings`,
-        ok: config !== null
-      },
-      {
-        label: "tool schemas",
-        value: `${tools.length} exported`,
-        ok: toolSchemasReady
-      },
-      { label: "provider", value: config?.provider ?? "unavailable", ok: config !== null },
-      { label: "model", value: config?.model ?? "unavailable", ok: config !== null },
-      {
-        label: "Ultrac sign-in",
-        value: ultracCredentials ? `signed in via ${describeKeySource(ultracCredentials)}` : "not signed in - run `ultrac login` or set ULTRAC_API_KEY",
-        ok: config?.provider !== "ultrac" || Boolean(ultracCredentials)
-      },
-      {
-        label: "Ultrac API base URL",
-        value: `${baseUrl.baseUrl} via ${describeBaseUrlSource(baseUrl.source)}`,
-        ok: true
-      }
-    ];
-    if (options.json) {
-      console.log(JSON.stringify({ ok: checks.every((check) => check.ok), checks }, null, 2));
-    } else {
-      checks.forEach((check) => printCheck(check));
-    }
-    if (checks.some((check) => !check.ok)) {
-      process.exitCode = 1;
-    }
+    await runDoctor(options.workspace, options.json);
   });
 }
+async function runDoctor(workspacePath, json = false, setExitCode = true) {
+  const workspace = resolve7(workspacePath);
+  const workspaceReady = await stat10(workspace).then((entry) => entry.isDirectory(), () => false);
+  const [nodeMajor = 0, nodeMinor = 0] = process.versions.node.split(".").map(Number);
+  const nodeReady = nodeMajor > 22 || nodeMajor === 22 && nodeMinor >= 12;
+  const config = await loadConfig(workspace).catch(() => null);
+  const configExists = await hasConfig(workspace);
+  const isGitRepo = await pathExists(resolve7(workspace, ".git"));
+  const ultracCredentials = await resolveUltracCredentials();
+  const baseUrl = ultracCredentials ? { baseUrl: ultracCredentials.baseUrl, source: ultracCredentials.baseUrlSource } : resolveBaseUrl();
+  const tools = createDefaultToolRegistry().list();
+  const toolSchemasReady = tools.every((tool) => tool.inputSchema && typeof tool.inputSchema === "object");
+  const checks = [
+    { label: "node", value: `${process.versions.node} (requires >=22.12.0)`, ok: nodeReady },
+    {
+      label: "workspace",
+      value: workspaceReady ? workspace : `${workspace} - must be an accessible directory`,
+      ok: workspaceReady
+    },
+    { label: "git repository", value: isGitRepo ? "found" : "not found", ok: isGitRepo },
+    {
+      label: "config",
+      value: config ? configExists ? configPath(workspace) : "using defaults" : `unable to load configuration - check ${configPath(workspace)} and local trust settings`,
+      ok: config !== null
+    },
+    {
+      label: "tool schemas",
+      value: `${tools.length} exported`,
+      ok: toolSchemasReady
+    },
+    { label: "provider", value: config?.provider ?? "unavailable", ok: config !== null },
+    { label: "model", value: config?.model ?? "unavailable", ok: config !== null },
+    {
+      label: "Ultrac sign-in",
+      value: ultracCredentials ? `signed in via ${describeKeySource(ultracCredentials)}` : "not signed in - run `ultrac login` or set ULTRAC_API_KEY",
+      ok: config?.provider !== "ultrac" || Boolean(ultracCredentials)
+    },
+    {
+      label: "Ultrac API base URL",
+      value: `${baseUrl.baseUrl} via ${describeBaseUrlSource(baseUrl.source)}`,
+      ok: true
+    }
+  ];
+  if (json) {
+    console.log(JSON.stringify({ ok: checks.every((check) => check.ok), checks }, null, 2));
+  } else {
+    checks.forEach((check) => printCheck(check));
+  }
+  if (setExitCode && checks.some((check) => !check.ok)) {
+    process.exitCode = 1;
+  }
+}
 async function pathExists(path) {
   try {
     await access2(path);
@@ -13046,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";
@@ -13094,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);
@@ -13116,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());
     })
   };
 }
@@ -13232,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;
@@ -13429,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 = () => {
@@ -13443,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());
@@ -13795,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)));
@@ -14480,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);
@@ -14885,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 });
   });
@@ -15140,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 {
@@ -15277,7 +15580,7 @@ function registerNotifyCommand(program2) {
 
 // src/commands/repl.ts
 import { createInterface as createInterface3, emitKeypressEvents } from "readline";
-import { stdin as stdin5, stdout as stdout5 } from "process";
+import { stdin as stdin5, stdout as stdout5, stderr } from "process";
 import chalk11 from "chalk";
 
 // src/config/budget.ts
@@ -15451,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);
@@ -15728,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 });
@@ -16044,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.
@@ -16259,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 });
@@ -16609,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.
@@ -16633,6 +17014,152 @@ function noteNativeCompactionFallback(reason) {
   );
 }
 
+// src/core/autonomous.ts
+import { createHash as createHash7, randomUUID as randomUUID5 } from "crypto";
+var AUTONOMOUS_CONTINUE_TASK = "Continue the task from where the previous round stopped. Check what is already done, finish the rest, and verify it.";
+var DEFAULT_AUTONOMOUS_MAX_ROUNDS = 5;
+var AUTONOMOUS_MAX_STEPS = 200;
+var DEFAULT_AUTONOMOUS_MAX_ELAPSED_MS = 6 * 60 * 60 * 1e3;
+var DEFAULT_AUTONOMOUS_BASE_DELAY_MS = 1e3;
+var DEFAULT_AUTONOMOUS_MAX_DELAY_MS = 3e4;
+var DEFAULT_AUTONOMOUS_STALL_ROUNDS = 3;
+function shouldResume(stopReason) {
+  return stopReason === "max-steps" || stopReason === "error";
+}
+function boundedInteger(value, name, min, max) {
+  if (!Number.isSafeInteger(value) || value < min || value > max) throw new Error(`${name} must be an integer from ${min} to ${max}.`);
+  return value;
+}
+function abortableSleep(milliseconds, signal) {
+  signal.throwIfAborted();
+  return new Promise((resolve17, reject) => {
+    const timer = setTimeout(() => {
+      signal.removeEventListener("abort", abort);
+      resolve17();
+    }, milliseconds);
+    const abort = () => {
+      clearTimeout(timer);
+      signal.removeEventListener("abort", abort);
+      reject(signal.reason);
+    };
+    signal.addEventListener("abort", abort, { once: true });
+    if (signal.aborted) abort();
+  });
+}
+function progress(session, startStep = 0) {
+  const hash = createHash7("sha256");
+  let completedTools = 0;
+  hash.update(session.finalMessage ?? "");
+  for (const step of (session.steps ?? []).slice(startStep)) {
+    hash.update(step.modelText ?? "");
+    for (const tool of step.toolResults ?? []) {
+      completedTools += 1;
+      hash.update(tool.call.tool);
+      hash.update(tool.result.ok ? "ok" : "failed");
+      hash.update(tool.result.content ?? "");
+      try {
+        hash.update(JSON.stringify(tool.call.input));
+      } catch {
+        hash.update("unserializable-input");
+      }
+    }
+  }
+  return { fingerprint: hash.digest("hex"), completedTools };
+}
+async function runAutonomousLoop(options) {
+  boundedInteger(options.maxRounds, "maxRounds", 1, 1e3);
+  const maxElapsedMs = boundedInteger(options.maxElapsedMs ?? DEFAULT_AUTONOMOUS_MAX_ELAPSED_MS, "maxElapsedMs", 1, 7 * 24 * 60 * 60 * 1e3);
+  const baseDelay = boundedInteger(options.baseDelayMs ?? DEFAULT_AUTONOMOUS_BASE_DELAY_MS, "baseDelayMs", 0, 3e5);
+  const maxDelay = boundedInteger(options.maxDelayMs ?? DEFAULT_AUTONOMOUS_MAX_DELAY_MS, "maxDelayMs", baseDelay, 3e5);
+  const stallLimit = boundedInteger(options.stallRounds ?? DEFAULT_AUTONOMOUS_STALL_ROUNDS, "stallRounds", 1, 1e3);
+  const now = options.now ?? (() => performance.now());
+  const started = now();
+  const elapsed = () => Math.max(0, now() - started);
+  const budget = new AbortController();
+  const deadline = setTimeout(() => budget.abort(new DOMException("Autonomous elapsed budget reached.", "TimeoutError")), maxElapsedMs);
+  deadline.unref?.();
+  const signal = options.signal ? AbortSignal.any([options.signal, budget.signal]) : budget.signal;
+  const sleep2 = options.sleep ?? abortableSleep;
+  const id = randomUUID5();
+  let previous;
+  let lastFingerprint;
+  let lastSessionId;
+  let lastStepCount = 0;
+  let stalls = 0;
+  let consecutiveErrors = 0;
+  try {
+    signal.throwIfAborted();
+    for (let round = 1; ; round += 1) {
+      const roundStart = now();
+      diagnosticEvent("round.start", { id, round, maxRounds: options.maxRounds, elapsedMs: elapsed() });
+      let session;
+      try {
+        session = await options.runRound(round, previous, signal);
+      } catch (error) {
+        diagnosticEvent("round.end", { id, round, reason: signal.aborted ? "aborted" : "exception", elapsedMs: elapsed(), durationMs: Math.max(0, now() - roundStart) });
+        throw error;
+      }
+      const stepCount = session.steps?.length ?? 0;
+      const startStep = session.id === lastSessionId && stepCount > lastStepCount ? lastStepCount : 0;
+      const current = progress(session, startStep);
+      lastSessionId = session.id;
+      lastStepCount = stepCount;
+      const unchanged = lastFingerprint !== void 0 && current.fingerprint === lastFingerprint;
+      stalls = unchanged ? stalls + 1 : 0;
+      lastFingerprint = current.fingerprint;
+      const classification = session.stopReason === "error" ? options.classifyFailure?.(session) : void 0;
+      consecutiveErrors = session.stopReason === "error" ? consecutiveErrors + 1 : 0;
+      let haltReason;
+      if (session.stopReason === "completed") haltReason = "completed";
+      else if (budget.signal.aborted || elapsed() >= maxElapsedMs) haltReason = "elapsed_budget";
+      else if (signal.aborted || session.stopReason === "aborted") haltReason = "aborted";
+      else if (classification && !classification.retryable) haltReason = "permanent_error";
+      else if (!shouldResume(session.stopReason)) haltReason = "stopped";
+      else if (stalls >= stallLimit) haltReason = "stalled";
+      else if (round >= options.maxRounds) haltReason = "max_rounds";
+      const retryDelay = Math.min(maxDelay, baseDelay * 2 ** Math.min(30, consecutiveErrors - 1));
+      if (!haltReason && session.stopReason === "error" && elapsed() + retryDelay >= maxElapsedMs) haltReason = "elapsed_budget";
+      diagnosticEvent("round.end", {
+        id,
+        round,
+        sessionId: session.id,
+        reason: haltReason ?? session.stopReason,
+        failureKind: classification?.kind,
+        attempt: consecutiveErrors,
+        completedTools: current.completedTools,
+        elapsedMs: elapsed(),
+        durationMs: Math.max(0, now() - roundStart)
+      });
+      if (haltReason === "stalled") diagnosticEvent("round.stall", { id, round, repeats: stalls, completedTools: current.completedTools, elapsedMs: elapsed() });
+      await options.onRoundEnd?.(round, session, !haltReason);
+      if (haltReason) return { session, rounds: round, haltReason };
+      if (session.stopReason === "error") {
+        const delayMs = retryDelay;
+        if (elapsed() + delayMs >= maxElapsedMs) return { session, rounds: round, haltReason: "elapsed_budget" };
+        diagnosticEvent("round.retry", {
+          id,
+          round,
+          nextRound: round + 1,
+          attempt: consecutiveErrors,
+          failureKind: classification?.kind ?? "unclassified",
+          delayMs,
+          elapsedMs: elapsed()
+        });
+        try {
+          await sleep2(delayMs, signal);
+        } catch (error) {
+          if (!signal.aborted) throw error;
+          return { session, rounds: round, haltReason: budget.signal.aborted ? "elapsed_budget" : "aborted" };
+        }
+      }
+      if (signal.aborted || elapsed() >= maxElapsedMs) return { session, rounds: round, haltReason: budget.signal.aborted || elapsed() >= maxElapsedMs ? "elapsed_budget" : "aborted" };
+      previous = session;
+    }
+  } finally {
+    clearTimeout(deadline);
+  }
+}
+
 // src/commands/session-checkpoint.ts
 var SESSION_CHECKPOINT_FAILURE_WARNING = "Warning: the latest session checkpoint could not be saved; progress since the previous checkpoint may be lost.";
 function createSessionCheckpointWriter(workspace, onFailure) {
@@ -16690,7 +17217,7 @@ function printSession(session, sessionPath2, options = {}) {
     }
     for (const toolResult of step.toolResults) {
       const status = toolResult.result.ok ? chalk8.green("ok") : chalk8.red("failed");
-      console.log(chalk8.cyan(toolResult.call.tool), status);
+      console.log(chalk8.white(toolResult.call.tool), status);
       console.log(chalk8.gray(indent2(formatToolOutput(toolResult.result.content, { verbose: options.verboseTools, failed: !toolResult.result.ok, hint: "Use --verbose-tools or inspect the saved session for full output." }))));
     }
   }
@@ -16710,13 +17237,13 @@ function printTools(tools) {
   for (const tool of tools) {
     const permissionText = tool.permissions.length ? chalk8.yellow(` [${tool.permissions.join(", ")}]`) : "";
     const optionalText = tool.optionalPermissions.length ? chalk8.gray(` [optional: ${tool.optionalPermissions.join(", ")}]`) : "";
-    console.log(`${chalk8.cyan(tool.name)}${permissionText}${optionalText}`);
+    console.log(`${chalk8.white(tool.name)}${permissionText}${optionalText}`);
     console.log(chalk8.gray(indent2(tool.description)));
   }
 }
 function printToolResult(result, options = {}) {
   const status = result.ok ? chalk8.green("ok") : chalk8.red("failed");
-  console.log(`${chalk8.cyan(result.tool)} ${status}`);
+  console.log(`${chalk8.white(result.tool)} ${status}`);
   console.log(chalk8.gray(indent2(formatToolOutput(result.content, { verbose: options.verboseTools, failed: !result.ok, hint: "Use --verbose-tools or --result-json for full output." }))));
 }
 function indent2(value) {
@@ -16734,222 +17261,21 @@ function formatToolOutput(content, options = {}) {
 \u2026 ${hidden ? `${hidden} more lines` : "Long lines shortened"}. ${options.hint ?? "Full output remains available in the saved session."}`;
 }
 
-// src/skills/commands.ts
-var BUILTIN_SLASH_COMMANDS = [
-  "logs",
-  "ghost",
-  "output",
-  "usage",
-  "max-steps",
-  "resume",
-  "deny",
-  "plan",
-  "review",
-  "coding",
-  "status",
-  "context",
-  "compact",
-  "diff",
-  "sessions",
-  "save",
-  "test",
-  "init",
-  "new",
-  "allow",
-  "clear",
-  "exit",
-  "help",
-  "memory",
-  "mode",
-  "model",
-  "permissions",
-  "quit",
-  "skills",
-  "tools",
-  "whoami"
-];
-var COMMAND_NAME_RE = /^[a-z0-9]+(?:-[a-z0-9]+)*$/;
-var MAX_COMMAND_LENGTH = 64;
-function parseSlashInput(input) {
-  const trimmed = input.trim();
-  if (!trimmed.startsWith("/")) return null;
-  const rest = trimmed.slice(1);
-  const match = rest.match(/^(\S+)(?:\s+([\s\S]*))?$/);
-  if (!match) return null;
-  return { command: match[1], args: (match[2] ?? "").trim() };
-}
-function isBuiltinSlashCommand(command) {
-  return BUILTIN_SLASH_COMMANDS.includes(command.toLowerCase());
-}
-function normalizeCommandName(value) {
-  const candidate = value.trim().replace(/^\/+/, "").trim();
-  if (!candidate) {
-    throw new Error("Slash command name is empty; expected kebab-case, for example: open-pr.");
-  }
-  if (candidate.length > MAX_COMMAND_LENGTH) {
-    throw new Error(
-      `Slash command name "${candidate}" is longer than ${MAX_COMMAND_LENGTH} characters.`
-    );
-  }
-  if (!COMMAND_NAME_RE.test(candidate)) {
-    throw new Error(
-      `Invalid slash command name "${candidate}": use kebab-case - lowercase letters, digits, and single hyphens, no spaces or slashes (for example: open-pr).`
-    );
+// src/ui/progress.ts
+import { stdout as stdout3 } from "process";
+import chalk9 from "chalk";
+var PENDING_GLYPH = "\u25CB";
+var DONE_GLYPH = "\u25CF";
+var REPAINT_MS = 100;
+function formatTokens(tokens) {
+  if (!Number.isFinite(tokens) || tokens <= 0) return "0";
+  if (tokens < 1e3) return String(Math.floor(tokens));
+  if (tokens < 1e6) {
+    const tenths2 = Math.floor(tokens / 100);
+    return `${Math.floor(tenths2 / 10)}.${tenths2 % 10}k`;
   }
-  return candidate;
-}
-async function collectEntries(workspace) {
-  const skills = await discoverSkills(workspace);
-  const claimed = /* @__PURE__ */ new Map();
-  const conflicts = [];
-  for (const skill of skills) {
-    let declaration;
-    try {
-      declaration = skill.command ?? null;
-    } catch (error) {
-      conflicts.push({
-        command: "",
-        skillName: skill.name,
-        scope: skill.scope,
-        path: skill.path,
-        reason: "invalid",
-        message: `Skill "${skill.name}" (${skill.scope}) was skipped: ${error instanceof Error ? error.message : String(error)}`
-      });
-      continue;
-    }
-    if (!declaration) continue;
-    let command;
-    try {
-      command = normalizeCommandName(declaration.raw);
-    } catch (error) {
-      conflicts.push({
-        command: declaration.raw,
-        skillName: skill.name,
-        scope: skill.scope,
-        path: skill.path,
-        reason: "invalid",
-        message: `Skill "${skill.name}" (${skill.scope}) declares a malformed command: ${error instanceof Error ? error.message : String(error)}`
-      });
-      continue;
-    }
-    if (isBuiltinSlashCommand(command)) {
-      conflicts.push({
-        command,
-        skillName: skill.name,
-        scope: skill.scope,
-        path: skill.path,
-        reason: "builtin",
-        message: `Skill "${skill.name}" (${skill.scope}) declares /${command}, which is a built-in command. Built-ins always win - rename the command: key in ${skill.path}.`
-      });
-      continue;
-    }
-    const entry = {
-      skill,
-      command: {
-        command,
-        skillName: skill.name,
-        description: skill.description,
-        argumentHint: declaration.argumentHint,
-        scope: skill.scope,
-        path: skill.path
-      }
-    };
-    const existing = claimed.get(command);
-    if (!existing) {
-      claimed.set(command, entry);
-      continue;
-    }
-    const winner = existing.skill.scope === "global" && skill.scope === "project" ? entry : existing;
-    const loser = winner === entry ? existing : entry;
-    claimed.set(command, winner);
-    conflicts.push({
-      command,
-      skillName: loser.skill.name,
-      scope: loser.skill.scope,
-      path: loser.skill.path,
-      reason: "duplicate",
-      message: `/${command} is declared by both "${winner.skill.name}" (${winner.skill.scope}) and "${loser.skill.name}" (${loser.skill.scope}). "${winner.skill.name}" wins; rename the command: key in ${loser.skill.path}.`
-    });
-  }
-  const entries = [...claimed.values()].sort((a, b) => a.command.command.localeCompare(b.command.command));
-  return { entries, conflicts };
-}
-async function listSkillCommands(workspace) {
-  const { entries, conflicts } = await collectEntries(workspace);
-  return { commands: entries.map((entry) => entry.command), conflicts };
-}
-function buildSkillCommandPrompt(skill, command, args) {
-  const argumentLine = command.argumentHint ? `Arguments (${command.argumentHint}): ${args || "(none provided)"}` : `Arguments: ${args || "(none provided)"}`;
-  const header = [
-    `The user ran the /${command.command} slash command, which runs the "${skill.name}" skill (${skill.scope}).`,
-    skill.description ? `Description: ${skill.description}` : void 0,
-    argumentLine,
-    skill.permissions.length ? `Permissions needed: ${skill.permissions.join(", ")}` : void 0,
-    "Follow the instructions below now, applying the arguments where they are relevant."
-  ].filter(Boolean).join("\n");
-  return `${header}
-
---- instructions ---
-${skill.body}`;
-}
-async function resolveSkillCommand(workspace, input) {
-  const parsed = parseSlashInput(input);
-  if (!parsed) return { status: "not-a-command" };
-  const command = parsed.command.toLowerCase();
-  if (isBuiltinSlashCommand(command)) {
-    return { status: "builtin", command };
-  }
-  const { entries, conflicts } = await collectEntries(workspace);
-  const match = entries.find((entry) => entry.command.command === command);
-  if (!match) {
-    const related = conflicts.filter((conflict) => conflict.command === command);
-    if (related.length) {
-      return {
-        status: "conflict",
-        command,
-        message: related.map((conflict) => conflict.message).join("\n"),
-        conflicts: related
-      };
-    }
-    return {
-      status: "unknown",
-      command,
-      available: entries.map((entry) => entry.command.command)
-    };
-  }
-  return {
-    status: "ok",
-    command: match.command,
-    skill: match.skill,
-    args: parsed.args,
-    prompt: buildSkillCommandPrompt(match.skill, match.command, parsed.args)
-  };
-}
-function formatSkillCommandHelp(index) {
-  if (!index.commands.length) return "";
-  const lines = index.commands.map((command) => {
-    const invocation = command.argumentHint ? `/${command.command} ${command.argumentHint}` : `/${command.command}`;
-    const description = command.description || `Run the ${command.skillName} skill`;
-    return `  ${invocation.padEnd(22)}${description} (skill: ${command.skillName})`;
-  });
-  return ["Skill commands:", ...lines].join("\n");
-}
-
-// src/ui/progress.ts
-import { stdout as stdout3 } from "process";
-import chalk9 from "chalk";
-var PENDING_GLYPH = "\u25CB";
-var DONE_GLYPH = "\u25CF";
-var REPAINT_MS = 100;
-function formatTokens(tokens) {
-  if (!Number.isFinite(tokens) || tokens <= 0) return "0";
-  if (tokens < 1e3) return String(Math.floor(tokens));
-  if (tokens < 1e6) {
-    const tenths2 = Math.floor(tokens / 100);
-    return `${Math.floor(tenths2 / 10)}.${tenths2 % 10}k`;
-  }
-  const tenths = Math.floor(tokens / 1e5);
-  return `${Math.floor(tenths / 10)}.${tenths % 10}M`;
+  const tenths = Math.floor(tokens / 1e5);
+  return `${Math.floor(tenths / 10)}.${tenths % 10}M`;
 }
 function formatElapsed(ms) {
   if (!Number.isFinite(ms) || ms <= 0) return "0s";
@@ -16964,12 +17290,12 @@ function formatElapsed(ms) {
 }
 function formatProgressLine(snapshot) {
   const finished = snapshot.done >= snapshot.total;
-  const glyph = finished ? chalk9.green(DONE_GLYPH) : chalk9.cyan(PENDING_GLYPH);
+  const glyph = finished ? chalk9.green(DONE_GLYPH) : chalk9.white(PENDING_GLYPH);
   const noun = snapshot.total === 1 ? "agent" : "agents";
   const stats = [`${snapshot.done}/${snapshot.total} ${noun} done`, formatElapsed(snapshot.elapsedMs)];
   if (snapshot.tokens !== void 0) stats.push(`\u2193 ${formatTokens(snapshot.tokens)} tokens`);
   const rendered = stats.map((stat11) => chalk9.dim(stat11)).join(chalk9.dim(" \xB7 "));
-  return `  ${glyph} ${chalk9.cyan(snapshot.label)}  ${snapshot.description}  ${rendered}`;
+  return `  ${glyph} ${chalk9.white(snapshot.label)}  ${snapshot.description}  ${rendered}`;
 }
 var ProgressLine = class {
   constructor(label, description, total) {
@@ -17095,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 = {
@@ -17203,19 +17484,956 @@ function compact2(value, max = 64) {
   if (!value) return "";
   return truncate2(value.replace(/\s+/g, " "), max);
 }
-function quote(value, max = 48) {
-  return value ? `\u201C${compact2(value, max)}\u201D` : "";
+function quote(value, max = 48) {
+  return value ? `\u201C${compact2(value, max)}\u201D` : "";
+}
+function truncate2(value, max) {
+  return value.length > max ? `${value.slice(0, Math.max(1, max - 1))}\u2026` : value;
+}
+function humanize(value) {
+  const words = value.replace(/[_-]+/g, " ").trim();
+  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 clean2 = value.replace(/\x1b(?:\[[0-?]*[ -/]*[@-~]|\][^\x07]*(?:\x07|\x1b\\)|.)/g, "").replace(/[\x00-\x1f\x7f-\x9f]/g, " ");
+  let result = "";
+  let used = 0;
+  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;
+    used += size;
+  }
+  return result;
+}
+function attachInteractiveChoices(readline, options, settings = {}) {
+  const rl = readline;
+  const output = settings.output ?? rl.output;
+  const prompt = settings.prompt ?? "  \u203A ";
+  let resolveReady;
+  const ready = new Promise((resolve17) => {
+    resolveReady = resolve17;
+  });
+  const original = rl._ttyWrite;
+  const priorPrompt = rl.getPrompt();
+  const priorLine = rl.line;
+  const priorCursor = rl.cursor;
+  const priorHistory = rl.history?.slice();
+  let injected = false;
+  let selected = 0;
+  let disposed = false;
+  let mouse = false;
+  let optionRow = null;
+  let reportPending = false;
+  let reportTimer;
+  let sequenceTimer;
+  let sequence = "";
+  const maxRow = () => settings.maxRow?.() ?? output?.rows ?? 1e4;
+  const columns = () => Math.max(16, output?.columns ?? 80);
+  const write = (text) => {
+    output?.write(text);
+  };
+  const labels = () => options.map((option, index) => {
+    const prefix = `  ${selected === index ? "\u203A" : " "} ${index + 1}. `;
+    const text = `${prefix}${displayLabel(option, columns() - 9)}`;
+    return selected === index ? `\x1B[7m${text}\x1B[0m` : text;
+  });
+  const restoreLine = () => {
+    if (!original || !rl.terminal || rl.closed) return;
+    if (rl.line) {
+      original.call(rl, void 0, { name: "end" });
+      original.call(rl, void 0, { name: "u", ctrl: true });
+    }
+    if (priorLine) {
+      original.call(rl, priorLine, {});
+      for (const _character of Array.from(priorLine.slice(priorCursor))) original.call(rl, void 0, { name: "left" });
+    }
+  };
+  const cleanup = () => {
+    if (disposed) return;
+    disposed = true;
+    clearTimeout(reportTimer);
+    clearTimeout(sequenceTimer);
+    if (rl._ttyWrite === intercept) rl._ttyWrite = original;
+    rl.off("line", onLine);
+    rl.off("close", cleanup);
+    output?.off("resize", onResize);
+    output?.off("error", cleanup);
+    settings.signal?.removeEventListener("abort", cleanup);
+    try {
+      if (mouse) write(MOUSE_OFF);
+    } catch {
+    }
+    mouse = false;
+    rl.setPrompt(priorPrompt);
+    if (injected && priorHistory && rl.history) rl.history.splice(0, rl.history.length, ...priorHistory);
+    try {
+      restoreLine();
+    } catch {
+    }
+    resolveReady(false);
+  };
+  function onLine() {
+    cleanup();
+  }
+  function redraw() {
+    if (disposed || rl.line || options.length + 2 > maxRow()) return;
+    write("\x1B7");
+    if (optionRow !== null) write(`\x1B[${optionRow};1H`);
+    else write(`\x1B[${options.length + 1}A\r`);
+    for (const label of labels()) write(`\x1B[2K${label}
+\r`);
+    write("\x1B8");
+  }
+  function choose(index) {
+    if (disposed || !original || index < 0 || index >= options.length) return;
+    selected = index;
+    injected = true;
+    if (rl.line) {
+      original.call(rl, void 0, { name: "end" });
+      original.call(rl, void 0, { name: "u", ctrl: true });
+    }
+    original.call(rl, String(index + 1), {});
+    original.call(rl, "\r", { name: "return", sequence: "\r" });
+  }
+  function requestPosition() {
+    if (disposed) return;
+    optionRow = null;
+    reportPending = true;
+    clearTimeout(reportTimer);
+    write("\x1B[6n");
+    reportTimer = setTimeout(() => {
+      reportPending = false;
+      resolveReady(false);
+    }, Math.max(1, settings.cursorReportTimeoutMs ?? 250));
+  }
+  function onResize() {
+    if (disposed) return;
+    if (mouse) write(MOUSE_OFF);
+    mouse = false;
+    optionRow = null;
+    requestPosition();
+  }
+  function consumeControl(value) {
+    const position = /^\x1b\[(\d+);(\d+)R$/.exec(value);
+    if (position) {
+      const row = Number(position[1]);
+      const column = Number(position[2]);
+      if (reportPending && row > options.length + 1 && row <= maxRow() && column >= 1 && column <= columns()) {
+        optionRow = row - options.length - 1;
+        reportPending = false;
+        clearTimeout(reportTimer);
+        write(MOUSE_ON);
+        mouse = true;
+        resolveReady(true);
+      }
+      return true;
+    }
+    const click = /^\x1b\[<(\d+);(\d+);(\d+)([Mm])$/.exec(value);
+    if (click) {
+      const button = Number(click[1]);
+      const x = Number(click[2]);
+      const y = Number(click[3]);
+      if (mouse && optionRow !== null && click[4] === "M" && button < 32 && (button & 3) === 0 && x >= 1 && x <= columns() && y <= maxRow()) choose(y - optionRow);
+      return true;
+    }
+    return false;
+  }
+  function intercept(text, key) {
+    if (disposed) {
+      original?.call(rl, text, key);
+      return;
+    }
+    const value = key?.sequence ?? text ?? "";
+    if (sequence || value.startsWith("\x1B[<") || /^\x1b\[\d/.test(value)) {
+      sequence += value;
+      clearTimeout(sequenceTimer);
+      if (consumeControl(sequence)) {
+        sequence = "";
+        return;
+      }
+      if (/^\x1b\[(?:<[0-9;]*|[0-9;]*)$/.test(sequence) && sequence.length < 64) {
+        sequenceTimer = setTimeout(() => {
+          sequence = "";
+        }, 250);
+        return;
+      }
+      const unrecognized = sequence;
+      sequence = "";
+      original?.call(rl, unrecognized, key);
+      return;
+    }
+    if (!rl.line && (key?.name === "up" || key?.name === "down")) {
+      selected = (selected + (key.name === "down" ? 1 : options.length - 1)) % options.length;
+      redraw();
+      return;
+    }
+    if (!rl.line && (key?.name === "return" || key?.name === "enter")) {
+      choose(selected);
+      return;
+    }
+    if (key?.ctrl && key.name === "c") cleanup();
+    if (key?.ctrl && key.name === "d" && !rl.line) {
+      original?.call(rl, text, key);
+      cleanup();
+      return;
+    }
+    original?.call(rl, text, key);
+  }
+  if (settings.signal?.aborted) {
+    disposed = true;
+    resolveReady(false);
+    return { cleanup, ready };
+  }
+  if (!output || !rl.terminal || !output.isTTY || process.env.TERM === "dumb" || !original || !options.length) {
+    options.forEach((option, index) => write(`  ${index + 1}. ${displayLabel(option, columns() - 6)}
+`));
+    write(prompt);
+    resolveReady(false);
+    disposed = true;
+    return { cleanup, ready };
+  }
+  try {
+    if (priorLine) {
+      original.call(rl, void 0, { name: "end" });
+      original.call(rl, void 0, { name: "u", ctrl: true });
+    }
+    rl.setPrompt(prompt);
+    rl._ttyWrite = intercept;
+    rl.once("line", onLine);
+    rl.once("close", cleanup);
+    output.on("resize", onResize);
+    output.on("error", cleanup);
+    settings.signal?.addEventListener("abort", cleanup, { once: true });
+    for (const label of labels()) write(`${label}\r
+`);
+    write("  \u2191/\u2193 and Enter, a number, or your own answer.\r\n");
+    rl.prompt();
+    requestPosition();
+  } catch (error) {
+    cleanup();
+    throw error;
+  }
+  return { cleanup, ready };
+}
+
+// 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;
+  let entries = [...initialEntries];
+  let matches = [];
+  let selected = 0;
+  let disposed = false;
+  let suppressed = false;
+  let opened = false;
+  let epoch = 0;
+  let handledEscape = false;
+  const clear = () => {
+    matches = [];
+    selected = 0;
+    render([], 0);
+  };
+  const refresh = () => {
+    if (disposed || suppressed) return;
+    const line = rl.line;
+    const skillPrefix = /^\/skill\s+([a-z0-9-]*)$/i.exec(line);
+    if (!/^\/[a-z0-9-]*$/i.test(line) && !skillPrefix) {
+      opened = false;
+      epoch += 1;
+      clear();
+      return;
+    }
+    if (!opened) {
+      opened = true;
+      const request = ++epoch;
+      void loadEntries().then((items) => {
+        if (disposed || request !== epoch || !opened) return;
+        entries = items;
+        refresh();
+      }).catch(() => {
+        if (!disposed && request === epoch) clear();
+      });
+    }
+    const query = (skillPrefix?.[1] ?? line.slice(1)).toLowerCase();
+    matches = entries.filter((entry) => (!skillPrefix || entry.skill) && (entry.text.toLowerCase().includes(query) || entry.label.toLowerCase().includes(query)));
+    selected = Math.min(selected, Math.max(0, matches.length - 1));
+    render(matches.map((entry) => `${entry.label}${entry.description ? `  ${entry.description}` : ""}`.replace(/[\x00-\x1f\x7f]/g, " ")), selected);
+  };
+  const wrapper = function(text, key) {
+    if (!suppressed && matches.length) {
+      if (key?.name === "escape") {
+        handledEscape = true;
+        setTimeout(() => {
+          handledEscape = false;
+        }, 0);
+        opened = false;
+        epoch += 1;
+        clear();
+        return;
+      }
+      if (key?.name === "up" || key?.name === "down") {
+        selected = (selected + (key.name === "up" ? -1 : 1) + matches.length) % matches.length;
+        render(matches.map((entry) => `${entry.label}${entry.description ? `  ${entry.description}` : ""}`.replace(/[\x00-\x1f\x7f]/g, " ")), selected);
+        return;
+      }
+      if (key?.name === "tab" || key?.name === "return" || key?.name === "enter") {
+        const choice = matches[selected];
+        suppressed = true;
+        try {
+          rl.write(null, { ctrl: true, name: "u" });
+          rl.write(`${choice.text} `);
+        } finally {
+          suppressed = false;
+          opened = false;
+          epoch += 1;
+          clear();
+        }
+        return;
+      }
+    }
+    original.call(this, text, key);
+    refresh();
+  };
+  rl._ttyWrite = wrapper;
+  return {
+    handledEscape: () => handledEscape,
+    suspend: () => {
+      suppressed = true;
+      opened = false;
+      epoch += 1;
+      clear();
+    },
+    resume: () => {
+      suppressed = false;
+      refresh();
+    },
+    cleanup: () => {
+      disposed = true;
+      epoch += 1;
+      clear();
+      if (rl._ttyWrite === wrapper) rl._ttyWrite = original;
+    }
+  };
+}
+
+// src/ui/terminal-layout.ts
+import { Writable } from "stream";
+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 = 4;
+var segmenter = new Intl.Segmenter(void 0, { granularity: "grapheme" });
+var cells = (value) => [...segmenter.segment(value)].map(({ segment }) => {
+  const code = segment.codePointAt(0) ?? 0;
+  const wide = /\p{Extended_Pictographic}/u.test(segment) || code >= 4352 && (code <= 4447 || code === 9001 || code === 9002 || code >= 11904 && code <= 42191 || code >= 44032 && code <= 55203 || code >= 63744 && code <= 64255 || code >= 65040 && code <= 65135 || code >= 65281 && code <= 65376 || code >= 65504 && code <= 65510 || code >= 131072);
+  return { text: segment, width: /^\p{Mark}+$/u.test(segment) ? 0 : wide ? 2 : 1 };
+});
+var width = (text) => cells(text).reduce((sum, cell) => sum + cell.width, 0);
+function plain(value) {
+  return stripVTControlCharacters2(value).replace(/[\x00-\x1f\x7f]/g, " ");
+}
+function fit(text, columns) {
+  if (columns <= 0) return "";
+  let result = "";
+  let used = 0;
+  for (const cell of cells(plain(text))) {
+    if (used + cell.width > columns) break;
+    result += cell.text;
+    used += cell.width;
+  }
+  return result;
+}
+var cup = (row, column = 1) => `${CSI}${row};${column}H`;
+var ComposerOutput = class extends Writable {
+  constructor(layout) {
+    super();
+    this.layout = layout;
+  }
+  layout;
+  get isTTY() {
+    return this.layout.enabled;
+  }
+  get columns() {
+    return this.layout.columns;
+  }
+  get rows() {
+    return this.layout.rows;
+  }
+  _write(chunk, _encoding, callback) {
+    try {
+      this.layout.writeComposer(chunk);
+      callback();
+    } catch (error) {
+      callback(error instanceof Error ? error : new Error("Terminal output failed"));
+    }
+  }
+};
+var TerminalLayout = class {
+  outputProxy;
+  enabled;
+  output;
+  errorOutput;
+  originalWrite;
+  originalErrorWrite;
+  rawWrite;
+  details;
+  rl;
+  prompt = "\u203A ";
+  inputFormatter;
+  transcriptRow = 1;
+  transcriptColumn = 1;
+  wrapPending = false;
+  savedTranscript;
+  lastFooterTop = 0;
+  suggestions = [];
+  selected = 0;
+  activity;
+  activityExpanded = false;
+  activitySelected = -1;
+  activityEnd = 0;
+  restoreActivityInput;
+  installed = false;
+  closed = false;
+  suspended = 0;
+  paintQueued = false;
+  bindSignals;
+  resize = () => {
+    if (this.closed || !this.enabled) return;
+    this.clearPreviousFooter();
+    this.transcriptRow = Math.min(this.transcriptRow, this.contentRows);
+    this.transcriptColumn = Math.min(this.transcriptColumn, this.columns);
+    this.rawWrite(`${CSI}1;${this.contentRows}r`);
+    this.outputProxy.emit("resize");
+    this.paintFooter();
+  };
+  exit = () => {
+    this.close();
+  };
+  constructor(options) {
+    this.output = options.output;
+    this.errorOutput = options.errorOutput;
+    this.details = { ...options.details };
+    this.bindSignals = options.bindSignals !== false;
+    this.originalWrite = options.output.write;
+    this.rawWrite = options.output.write.bind(options.output);
+    this.originalErrorWrite = options.errorOutput?.write;
+    this.enabled = Boolean(options.output.isTTY && (options.output.columns ?? 80) >= 12 && (options.output.rows ?? 24) >= 7);
+    this.outputProxy = new ComposerOutput(this);
+  }
+  get columns() {
+    return Math.max(12, this.output.columns ?? 80);
+  }
+  get rows() {
+    return Math.max(7, this.output.rows ?? 24);
+  }
+  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 - this.activityLines.length;
+  }
+  get inputRow() {
+    return this.rows - 2;
+  }
+  install() {
+    if (this.installed || this.closed || !this.enabled) return this;
+    this.installed = true;
+    this.output.write = ((chunk, encoding, callback) => this.writeTranscript(chunk, encoding, callback));
+    if (this.errorOutput && this.errorOutput !== this.output) this.errorOutput.write = this.output.write;
+    this.output.on("resize", this.resize);
+    this.output.on("error", this.exit);
+    if (this.errorOutput !== this.output) this.errorOutput?.on("error", this.exit);
+    process.once("exit", this.exit);
+    if (this.bindSignals) {
+      process.once("SIGINT", this.exit);
+      process.once("SIGTERM", this.exit);
+    }
+    this.rawWrite(`${CSI}2J${cup(1)}${CSI}1;${this.contentRows}r`);
+    this.paintFooter();
+    return this;
+  }
+  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) {
+    this.prompt = prompt;
+    this.rl?.setPrompt(prompt);
+    this.paintFooter();
+  }
+  updateDetails(details) {
+    this.details = { ...this.details, ...details };
+    this.paintFooter();
+  }
+  setSuggestions(items, selectedIndex = 0) {
+    if (this.enabled && this.installed && !this.closed) this.clearPreviousFooter();
+    this.suggestions = [...items];
+    this.selected = Math.max(0, Math.min(items.length - 1, selectedIndex));
+    if (this.enabled && this.installed && !this.closed) {
+      this.transcriptRow = Math.min(this.transcriptRow, this.contentRows);
+      this.rawWrite(`${CSI}1;${this.contentRows}r`);
+      this.paintFooter();
+    }
+  }
+  /** Freeze the footer and focus choices in the transcript; its reserved rows stay visible. */
+  suspend() {
+    if (this.closed || !this.enabled) return;
+    this.suspended += 1;
+    this.rawWrite(cup(this.transcriptRow, this.transcriptColumn));
+  }
+  resume() {
+    if (this.suspended > 0) this.suspended -= 1;
+    if (!this.suspended) this.paintFooter();
+  }
+  writeComposer(chunk) {
+    if (this.closed || !this.enabled || !this.installed) {
+      this.rawWrite(chunk);
+      return;
+    }
+    if (this.suspended) {
+      this.writeTranscript(chunk);
+      return;
+    }
+    if (!this.paintQueued) {
+      this.paintQueued = true;
+      queueMicrotask(() => {
+        this.paintQueued = false;
+        if (!this.closed && !this.suspended) this.paintFooter();
+      });
+    }
+  }
+  writeTranscript(chunk, encoding, callback) {
+    if (this.closed || !this.enabled || !this.installed) return this.rawWrite(chunk, encoding, callback);
+    const text = typeof chunk === "string" ? chunk : Buffer.from(chunk).toString(typeof encoding === "string" ? encoding : "utf8");
+    const formatted = text.replace(/(?<!\r)\n/g, "\r\n").replace(/\x1b\[([012]?)J/g, (_escape, mode) => {
+      const saved = cup(this.transcriptRow, this.transcriptColumn);
+      const first = mode === "2" || mode === "1" ? 1 : this.transcriptRow;
+      const last = mode === "1" ? this.transcriptRow : this.contentRows;
+      let erased = "";
+      for (let row = first; row <= last; row += 1) erased += `${cup(row)}${CSI}2K`;
+      return erased + saved;
+    });
+    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);
+      this.transcriptColumn = 1;
+      this.wrapPending = false;
+    }
+    this.rawWrite(cup(this.transcriptRow, this.transcriptColumn));
+    const accepted = this.rawWrite(
+      formatted,
+      typeof encoding === "string" ? encoding : void 0,
+      typeof encoding === "function" ? encoding : callback
+    );
+    this.trackTranscript(formatted);
+    if (!this.suspended) this.placeInputCursor();
+    return accepted;
+  }
+  trackTranscript(text) {
+    const parts = text.split(/(\x1b\[[0-?]*[ -/]*[@-~]|\x1b\][^\x07]*(?:\x07|\x1b\\)|\x1b.)/g);
+    for (const part of parts) {
+      if (part === "\x1B7") {
+        this.savedTranscript = { row: this.transcriptRow, column: this.transcriptColumn, wrapPending: this.wrapPending };
+      } else if (part === "\x1B8") {
+        if (this.savedTranscript) {
+          this.transcriptRow = this.savedTranscript.row;
+          this.transcriptColumn = this.savedTranscript.column;
+          this.wrapPending = this.savedTranscript.wrapPending;
+        }
+      } else if (part.startsWith("\x1B[")) {
+        const match = /^\x1b\[([\d;]*)([A-GHf])$/.exec(part);
+        if (!match) continue;
+        const values = match[1].split(";").map((value) => Number(value) || 1);
+        const n = values[0];
+        this.wrapPending = false;
+        if (match[2] === "A") this.transcriptRow -= n;
+        else if (match[2] === "B") this.transcriptRow += n;
+        else if (match[2] === "C") this.transcriptColumn += n;
+        else if (match[2] === "D") this.transcriptColumn -= n;
+        else if (match[2] === "G") this.transcriptColumn = n;
+        else if (match[2] === "H" || match[2] === "f") {
+          this.transcriptRow = n;
+          this.transcriptColumn = values[1] ?? 1;
+        }
+      } else if (!part.startsWith("\x1B")) {
+        for (const cell of cells(part)) {
+          if (cell.text === "\r" || cell.text === "\r\n") {
+            this.wrapPending = false;
+            this.transcriptColumn = 1;
+            if (cell.text === "\r\n") this.transcriptRow += 1;
+          } else if (cell.text === "\n") {
+            this.wrapPending = false;
+            this.transcriptColumn = 1;
+            this.transcriptRow += 1;
+          } else if (cell.text === "\b") this.transcriptColumn -= 1;
+          else if (cell.text === "	") this.transcriptColumn += 8 - (this.transcriptColumn - 1) % 8;
+          else {
+            if (this.wrapPending || this.transcriptColumn + cell.width - 1 > this.columns) {
+              this.transcriptColumn = 1;
+              this.transcriptRow += 1;
+              this.wrapPending = false;
+            }
+            this.transcriptColumn += cell.width;
+            if (this.transcriptColumn > this.columns) {
+              this.transcriptColumn = this.columns;
+              this.wrapPending = true;
+            }
+          }
+          this.transcriptRow = Math.min(this.contentRows, this.transcriptRow);
+        }
+      }
+      this.transcriptRow = Math.max(1, Math.min(this.contentRows, this.transcriptRow));
+      this.transcriptColumn = Math.max(1, Math.min(this.columns, this.transcriptColumn));
+    }
+  }
+  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 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 = "";
+    let used = 0;
+    let skipped = 0;
+    for (const cell of cells(input)) {
+      if (skipped + cell.width <= offset) {
+        skipped += cell.width;
+        continue;
+      }
+      if (used + cell.width > capacity) break;
+      visible += cell.text;
+      used += cell.width;
+    }
+    return { text: `${prompt}${visible}`, column: Math.min(this.columns - 1, 3 + width(prompt) + cursor - skipped) };
+  }
+  placeInputCursor() {
+    const composer = this.composer();
+    this.rawWrite(`${cup(this.inputRow, composer.column)}${CSI}?25h`);
+  }
+  clearPreviousFooter() {
+    if (!this.lastFooterTop) return;
+    let clear = "";
+    for (let row = this.lastFooterTop; row <= this.rows; row += 1) clear += `${cup(row)}${CSI}2K`;
+    this.rawWrite(clear);
+  }
+  paintFooter() {
+    if (!this.enabled || !this.installed || this.closed || this.suspended) return;
+    this.lastFooterTop = this.contentRows + 1;
+    const inner = this.columns - 2;
+    const border = "\u2500".repeat(inner);
+    const composer = this.composer();
+    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;
+      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 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 - 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;
+    this.output.off("resize", this.resize);
+    this.output.off("error", this.exit);
+    if (this.errorOutput !== this.output) this.errorOutput?.off("error", this.exit);
+    process.off("exit", this.exit);
+    process.off("SIGINT", this.exit);
+    process.off("SIGTERM", this.exit);
+    try {
+      this.rawWrite(`${RESET_REGION}${MOUSE_OFF2}${CSI}?25h`);
+      this.clearPreviousFooter();
+      this.rawWrite(`${cup(this.transcriptRow, this.transcriptColumn)}\r
+`);
+    } catch {
+    }
+  }
+};
+function createTerminalLayout(options) {
+  return new TerminalLayout(options).install();
+}
+
+// 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 truncate2(value, max) {
-  return value.length > max ? `${value.slice(0, Math.max(1, max - 1))}\u2026` : value;
+function providerDisplayName(provider) {
+  const name = safeDisplayText(provider);
+  return name.toLowerCase() === "ultrac" ? "spinalfluid" : name;
 }
-function humanize(value) {
-  const words = value.replace(/[_-]+/g, " ").trim();
-  return words ? `${words[0].toUpperCase()}${words.slice(1)}` : "Tool";
+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
-import chalk10, { Chalk } from "chalk";
 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",
@@ -17227,29 +18445,25 @@ var LOGO = [
 function renderWelcome(info, options = {}) {
   const columns = normalizeColumns(options.columns);
   const paint = new Chalk({ level: options.color === false ? 0 : chalk10.level });
-  const cardWidth = Math.min(88, Math.max(42, columns));
-  const innerWidth = cardWidth - 4;
+  const innerWidth = columns - 2;
   const wide = columns >= 64;
   const lines = [];
   if (wide) {
     lines.push("");
     for (let index = 0; index < LOGO.length; index += 1) {
-      const color = index < 2 ? paint.hex("#38BDF8") : index < 4 ? paint.hex("#22D3EE") : paint.hex("#A78BFA");
-      lines.push(`  ${color(LOGO[index])}`);
+      lines.push(`  ${paint.bold.white(LOGO[index])}`);
     }
   } else {
-    lines.push("", `  ${paint.bold.hex("#22D3EE")("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.cyan(`\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.cyan(`\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.cyan(`\u2570${"\u2500".repeat(cardWidth - 2)}\u256F`));
+    lines.push("", `  ${paint.bold.white("ULTRAC")} ${paint.gray(`v${info.version}`)}`);
+  }
+  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")
   );
@@ -17257,40 +18471,43 @@ function renderWelcome(info, options = {}) {
 }
 function renderComposer(columns = 80, color = true) {
   const paint = new Chalk({ level: color ? chalk10.level : 0 });
-  const width = Math.min(88, Math.max(28, normalizeColumns(columns)));
+  const width2 = normalizeColumns(columns);
   const label = " message ";
-  const fill = Math.max(1, width - label.length - 2);
+  const fill = Math.max(1, width2 - label.length - 2);
   return {
     frame: `
-${paint.cyan(`\u256D\u2500${label}${"\u2500".repeat(fill)}`)}
-${paint.cyan("\u2502")}`,
-    prompt: paint.bold.hex("#22D3EE")("\u2570\u2500\u276F ")
+${paint.gray(`\u256D\u2500${label}${"\u2500".repeat(fill)}`)}
+${paint.gray("\u2502")}`,
+    prompt: paint.bold.white("\u2570\u2500\u276F ")
   };
 }
-function cardLine(value, width, style) {
-  const clipped = truncate3(value, width);
-  return `\u2502 ${style(clipped)}${" ".repeat(Math.max(0, width - clipped.length))} \u2502`;
-}
 function normalizeColumns(columns) {
-  return Number.isFinite(columns) ? Math.max(28, Math.floor(columns)) : 80;
+  return Number.isFinite(columns) ? Math.max(16, Math.floor(columns)) : 80;
 }
-function truncate3(value, width) {
-  if (value.length <= width) return value;
-  if (width <= 1) return "\u2026";
-  return `${value.slice(0, width - 1)}\u2026`;
+function truncate3(value, width2) {
+  if (value.length <= width2) return value;
+  if (width2 <= 1) return "\u2026";
+  return `${value.slice(0, width2 - 1)}\u2026`;
 }
-function shortenMiddle(value, width) {
-  if (value.length <= width) return value;
-  if (width < 9) return truncate3(value, width);
-  const side = Math.floor((width - 1) / 2);
-  return `${value.slice(0, side)}\u2026${value.slice(value.length - (width - side - 1))}`;
+function shortenMiddle(value, width2) {
+  if (value.length <= width2) return value;
+  if (width2 < 9) return truncate3(value, width2);
+  const side = Math.floor((width2 - 1) / 2);
+  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;
@@ -17323,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);
@@ -17386,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
@@ -17400,24 +18670,97 @@ 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
+  /doctor               Check local setup
+  /mcp                  Show connected MCP servers
+  /continue [focus]     Continue unfinished work
+  /autonomous [on|off|status]  Continue step-limited turns (up to five rounds)
   /model [name]         Show or set the model
   /mode [name]          Show or set the agent mode (${agentModeNames.join(", ")})
   /permissions [readonly|workspace|full]  Show or set permissions
@@ -17441,9 +18784,10 @@ 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
   /skills               List installed skills
   /update               Show how to install an available CLI update
   /clear                Start a fresh conversation
@@ -17543,7 +18887,7 @@ async function runRepl(options, initialTask = "") {
   const hasFallbackChain = Boolean(config.fallback?.chain?.length);
   if (providerName === "ultrac" && !hasFallbackChain && !await resolveUltracCredentials()) {
     console.log(chalk11.yellow("You are not signed in to Ultrac."));
-    console.log(`Run ${chalk11.cyan("ultrac login")} first, or start with ${chalk11.cyan("--provider echo")}.`);
+    console.log(`Run ${chalk11.white("ultrac login")} first, or start with ${chalk11.white("--provider echo")}.`);
     process.exitCode = EXIT_REPL_NOT_STARTED;
     return;
   }
@@ -17605,10 +18949,38 @@ async function runRepl(options, initialTask = "") {
     mode,
     permissions: basePermissions
   });
+  const layout = stdin5.isTTY && stdout5.isTTY && process.env.TERM !== "dumb" ? createTerminalLayout({
+    output: stdout5,
+    errorOutput: stderr,
+    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;
+    const sum = (key) => {
+      const values = steps.flatMap((step) => typeof step.usage?.[key] === "number" ? [step.usage[key]] : []);
+      return values.length ? values.reduce((a, b) => a + b, 0) : void 0;
+    };
+    const context = session.contextStatus();
+    layout.updateDetails({
+      contextUsed: context.estimatedPromptTokens,
+      contextMax: context.contextTokens,
+      provider: provider.name,
+      model: session.model,
+      mode: session.mode,
+      tokens: sum("totalTokens"),
+      inputTokens: sum("inputTokens"),
+      outputTokens: sum("outputTokens"),
+      steps: steps.length
+    });
+  };
   const writeCheckpoint = createSessionCheckpointWriter(workspace, (message) => {
     console.error(chalk11.yellow(message));
   });
   const persistSession = async (target = session) => {
+    refreshDetails();
     const snapshot = target.toSession();
     if (!hasSavedSessionContent(snapshot)) return null;
     return writeCheckpoint(snapshot);
@@ -17621,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"));
@@ -17630,29 +19003,66 @@ async function runRepl(options, initialTask = "") {
   try {
     await session.start();
   } catch (error) {
+    layout?.close();
     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."));
-  }
-  const rl = createInterface3({ input: stdin5, output: stdout5 });
+  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 = 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));
+    return [
+      ...builtinEntries,
+      ...commands.commands.map((command) => ({ text: `/${command.command}`, label: `/${command.command}`, description: command.description, skill: true })),
+      ...skills.filter((skill) => !declared.has(skill.name)).map((skill) => ({ text: `/skill ${skill.name}`, label: `/skill ${skill.name}`, description: skill.description, skill: true }))
+    ];
+  }, (rows, index) => layout.setSuggestions(rows, index), builtinEntries) : void 0;
   const reader = new LineReader(rl);
   const question = async (prompt, signal) => {
-    stdout5.write(prompt);
-    return reader.nextFresh(signal);
+    slashCompletion?.suspend();
+    try {
+      if (layout?.enabled) {
+        console.log(prompt);
+        layout.setPrompt("\u203A ");
+      } else stdout5.write(prompt);
+      return await reader.nextFresh(signal);
+    } finally {
+      layout?.setPrompt("\u203A ");
+      slashCompletion?.resume();
+    }
   };
   const drainQueuedMessages = () => reader.drainQueuedMessages();
+  let autonomousRounds = 1;
   setAskUserRuntime(async (text, options2, signal) => {
-    console.log(chalk11.cyan(`
+    console.log(chalk11.white(`
   ? ${text}`));
-    if (options2?.length) {
-      options2.forEach((option, index) => console.log(chalk11.gray(`     ${index + 1}. ${option}`)));
-      console.log(chalk11.gray("     (type a number, or answer in your own words)"));
+    let rawAnswer;
+    if (options2?.length && layout?.enabled) {
+      slashCompletion?.suspend();
+      layout.setPrompt("\u203A ");
+      let choices;
+      try {
+        choices = attachInteractiveChoices(rl, options2, { signal, output: stdout5, prompt: "\u203A ", maxRow: () => layout.contentRows });
+        rawAnswer = await reader.nextFresh(signal);
+      } finally {
+        choices?.cleanup();
+        layout.setPrompt("\u203A ");
+        slashCompletion?.resume();
+      }
+    } else {
+      if (options2?.length) {
+        options2.forEach((option, index) => console.log(chalk11.gray(`     ${index + 1}. ${option}`)));
+        console.log(chalk11.gray("     (type a number, or answer in your own words)"));
+      }
+      rawAnswer = await question(chalk11.white("  \u203A "), signal);
     }
-    const rawAnswer = await question(chalk11.cyan("  \u203A "), signal);
     if (signal?.aborted) return null;
     const answer = (rawAnswer ?? "").trim();
     const picked = Number.parseInt(answer, 10);
@@ -17672,7 +19082,7 @@ async function runRepl(options, initialTask = "") {
   rl.on("SIGINT", exitSession);
   const onKeypress = (_input, key) => {
     if (!key || key.name !== "escape" || key.ctrl || key.meta) return;
-    handleReplEscape(turnAbort);
+    if (!slashCompletion?.handledEscape()) handleReplEscape(turnAbort);
   };
   if (stdin5.isTTY) {
     emitKeypressEvents(stdin5, rl);
@@ -17686,31 +19096,51 @@ async function runRepl(options, initialTask = "") {
   process.on("SIGTERM", terminate);
   const withInterrupt = async (run) => {
     turnAbort = new AbortController();
+    layout?.updateDetails({ status: "Running" });
     try {
       return await run(turnAbort.signal);
     } finally {
       turnAbort = 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.cyan(`
-\u203A ${initialTask}`));
-      await withInterrupt((signal) => runAndCheckpointTurn(session, initialTask, question, signal, persistSession, drainQueuedMessages, () => reader.composing));
+      console.log(chalk11.white(`
+\u203A ${formatImageInput(initialTask).text}`));
+      await withInterrupt((signal) => runAndCheckpointTurn(session, initialTask, question, signal, persistSession, drainQueuedMessages, () => reader.composing, autonomousRounds));
     }
     while (running) {
-      if (stdout5.isTTY) {
+      if (layout?.enabled) {
+        layout.setPrompt("\u203A ");
+      } else if (stdout5.isTTY) {
         const composer = renderComposer(stdout5.columns, true);
         console.log(composer.frame);
         stdout5.write(composer.prompt);
       } else {
-        stdout5.write(chalk11.cyan("\n\u203A "));
+        stdout5.write(chalk11.white("\n\u203A "));
       }
       const line = await reader.next();
       if (line === null) break;
+      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) => {
@@ -17723,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);
+            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 });
@@ -17732,7 +19162,11 @@ async function runRepl(options, initialTask = "") {
             session = restored;
             resetContextBudgetNotices();
             console.log(`Restored ${lineage.sessions.length} saved session(s). Permissions were kept from the current session.`);
-          });
+          }, { mcpStatus: () => mcpRuntime?.statuses ?? [], autonomous: (setting) => {
+            if (setting === "on") autonomousRounds = 5;
+            if (setting === "off") autonomousRounds = 1;
+            return autonomousRounds;
+          } });
         });
         if (handled === "exit") {
           running = false;
@@ -17741,7 +19175,9 @@ async function runRepl(options, initialTask = "") {
         setSubagentRuntime({ provider, model: session.model, mode: session.mode, registry });
         if (handled === "unhandled") {
           try {
-            await runSkillCommand(session, raw, workspace, question);
+            await withInterrupt((signal) => runSkillCommand(session, raw, workspace, question, async (prompt) => {
+              await runAndCheckpointTurn(session, prompt, question, signal, persistSession, drainQueuedMessages, () => reader.composing, autonomousRounds, false);
+            }));
           } finally {
             await persistSession();
           }
@@ -17752,26 +19188,51 @@ async function runRepl(options, initialTask = "") {
         }
         continue;
       }
-      await withInterrupt((signal) => runAndCheckpointTurn(session, raw, question, signal, persistSession, drainQueuedMessages, () => reader.composing));
+      await withInterrupt((signal) => runAndCheckpointTurn(session, raw, question, signal, persistSession, drainQueuedMessages, () => reader.composing, autonomousRounds));
     }
   } finally {
+    slashCompletion?.cleanup();
     process.off("SIGTERM", terminate);
     if (stdin5.isTTY) stdin5.off("keypress", onKeypress);
     setAskUserRuntime(void 0);
+    setActivitySink(void 0);
     rl.close();
-    await saveTranscript(session, writeCheckpoint);
-    mcpRuntime?.close();
+    try {
+      await saveTranscript(session, writeCheckpoint);
+    } finally {
+      mcpRuntime?.close();
+      layout?.close();
+    }
   }
   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 () => {
@@ -17784,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(`
@@ -17798,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) => {
@@ -17824,35 +19309,65 @@ ${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) {
+async function runAndCheckpointTurn(session, input, question, signal, persist, drainQueuedMessages, isComposing, maxRounds = 1, allowImageDrop = true) {
   try {
-    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, allowImageDrop);
+        await persist(session);
+        const snapshot = session.toSession();
+        return successful ? snapshot : { ...snapshot, stopReason: roundSignal.aborted ? "aborted" : "error" };
+      },
+      onRoundEnd: (round, _snapshot, willResume) => {
+        if (willResume) console.log(chalk11.gray(`Continuing unfinished work: round ${round + 1}/${maxRounds}.`));
+      }
+    });
+    if (result.haltReason !== "completed" && result.haltReason !== "aborted") console.log(chalk11.gray(`Automatic continuation stopped: ${result.haltReason}. Session preserved.`));
+    return successful;
   } finally {
     await persist(session);
   }
@@ -17919,11 +19434,41 @@ function slashCommandChangesSession(raw) {
 function errorMessage2(error) {
   return error instanceof Error ? error.message : String(error);
 }
-async function handleSlashCommand(raw, session, providerName, workspace, onClear, runPrompt, signal, resume) {
+async function handleSlashCommand(raw, session, providerName, workspace, onClear, runPrompt, signal, resume, services) {
   const [name, ...rest] = raw.slice(1).split(/\s+/);
   const command = (name ?? "").toLowerCase();
   const argument = rest.join(" ").trim();
   switch (command) {
+    case "doctor":
+      await runDoctor(workspace, false, false);
+      return "ok";
+    case "mcp": {
+      const statuses = services?.mcpStatus?.() ?? [];
+      console.log(statuses.length ? renderMcpStatuses(statuses) : "No connected MCP servers. Configure with ultrac mcp add, approve with ultrac trust, then restart the session.");
+      return "ok";
+    }
+    case "autonomous": {
+      const setting = argument || "status";
+      if (setting !== "on" && setting !== "off" && setting !== "status") {
+        console.log("Usage: /autonomous on|off|status");
+        return "ok";
+      }
+      if (!services?.autonomous) {
+        console.log("Automatic continuation is available in the interactive session.");
+        return "ok";
+      }
+      const rounds = services.autonomous(setting);
+      console.log(`Automatic continuation ${rounds > 1 ? "on" : "off"}: up to ${rounds} round(s), with checkpoint, elapsed and stall limits.`);
+      return "ok";
+    }
+    case "continue": {
+      if (!runPrompt || !hasSavedSessionContent(session.toSession())) {
+        console.log("No current task to continue. Start a task or use /resume <id>.");
+        return "ok";
+      }
+      await runPrompt(`${AUTONOMOUS_CONTINUE_TASK}${argument ? ` Focus: ${argument}` : ""}`);
+      return "ok";
+    }
     case "logs": {
       console.log(currentDiagnosticLogPath() ?? "Diagnostic logging has not been configured for this process.");
       return "ok";
@@ -18133,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";
@@ -18158,6 +19705,20 @@ ${extra}`);
       }
       return "ok";
     }
+    case "skill": {
+      const [skillName, ...args] = argument.split(/\s+/);
+      if (!skillName || !runPrompt) {
+        console.log("Usage: /skill <name> [args]");
+        return "ok";
+      }
+      const skill = await readSkill(workspace, skillName);
+      if (!skill) {
+        console.log(`No available skill named ${skillName}. Use /skills to list them.`);
+        return "ok";
+      }
+      await runPrompt(buildSkillCommandPrompt(skill, { command: "skill", skillName: skill.name, description: skill.description, scope: skill.scope, path: skill.path }, args.join(" ")));
+      return "ok";
+    }
     case "skills": {
       const skills = await listSkills(workspace);
       if (!skills.length) {
@@ -18190,13 +19751,14 @@ ${extra}`);
       return "unhandled";
   }
 }
-async function runSkillCommand(session, raw, workspace, question) {
+async function runSkillCommand(session, raw, workspace, question, runPrompt) {
   const resolved = await resolveSkillCommand(workspace, raw);
   if (resolved.status === "ok") {
     console.log(
       chalk11.gray(`  /${resolved.command.command} \u2192 skill ${resolved.command.skillName} (${resolved.command.scope})`)
     );
-    await runTurn(session, resolved.prompt, question);
+    if (runPrompt) await runPrompt(resolved.prompt);
+    else await runTurn(session, resolved.prompt, question, void 0, void 0, void 0, void 0, false);
     return;
   }
   if (resolved.status === "conflict") {
@@ -18261,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);
     }
@@ -18274,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);
@@ -18308,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,
@@ -18337,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}`)));
   }
@@ -18370,148 +19933,6 @@ function indent3(value) {
 // src/commands/run.ts
 import { basename as basename3 } from "path";
 import chalk12 from "chalk";
-
-// src/core/autonomous.ts
-import { createHash as createHash7, randomUUID as randomUUID5 } from "crypto";
-var AUTONOMOUS_CONTINUE_TASK = "Continue the task from where the previous round stopped. Check what is already done, finish the rest, and verify it.";
-var DEFAULT_AUTONOMOUS_MAX_ROUNDS = 5;
-var AUTONOMOUS_MAX_STEPS = 200;
-var DEFAULT_AUTONOMOUS_MAX_ELAPSED_MS = 6 * 60 * 60 * 1e3;
-var DEFAULT_AUTONOMOUS_BASE_DELAY_MS = 1e3;
-var DEFAULT_AUTONOMOUS_MAX_DELAY_MS = 3e4;
-var DEFAULT_AUTONOMOUS_STALL_ROUNDS = 3;
-function shouldResume(stopReason) {
-  return stopReason === "max-steps" || stopReason === "error";
-}
-function boundedInteger(value, name, min, max) {
-  if (!Number.isSafeInteger(value) || value < min || value > max) throw new Error(`${name} must be an integer from ${min} to ${max}.`);
-  return value;
-}
-function abortableSleep(milliseconds, signal) {
-  signal.throwIfAborted();
-  return new Promise((resolve15, reject) => {
-    const timer = setTimeout(() => {
-      signal.removeEventListener("abort", abort);
-      resolve15();
-    }, milliseconds);
-    const abort = () => {
-      clearTimeout(timer);
-      signal.removeEventListener("abort", abort);
-      reject(signal.reason);
-    };
-    signal.addEventListener("abort", abort, { once: true });
-    if (signal.aborted) abort();
-  });
-}
-function progress(session) {
-  const hash = createHash7("sha256");
-  let completedTools = 0;
-  hash.update(session.finalMessage ?? "");
-  for (const step of session.steps ?? []) {
-    hash.update(step.modelText ?? "");
-    for (const tool of step.toolResults ?? []) {
-      completedTools += 1;
-      hash.update(tool.call.tool);
-      hash.update(tool.result.ok ? "ok" : "failed");
-      hash.update(tool.result.content ?? "");
-      try {
-        hash.update(JSON.stringify(tool.call.input));
-      } catch {
-        hash.update("unserializable-input");
-      }
-    }
-  }
-  return { fingerprint: hash.digest("hex"), completedTools };
-}
-async function runAutonomousLoop(options) {
-  boundedInteger(options.maxRounds, "maxRounds", 1, 1e3);
-  const maxElapsedMs = boundedInteger(options.maxElapsedMs ?? DEFAULT_AUTONOMOUS_MAX_ELAPSED_MS, "maxElapsedMs", 1, 7 * 24 * 60 * 60 * 1e3);
-  const baseDelay = boundedInteger(options.baseDelayMs ?? DEFAULT_AUTONOMOUS_BASE_DELAY_MS, "baseDelayMs", 0, 3e5);
-  const maxDelay = boundedInteger(options.maxDelayMs ?? DEFAULT_AUTONOMOUS_MAX_DELAY_MS, "maxDelayMs", baseDelay, 3e5);
-  const stallLimit = boundedInteger(options.stallRounds ?? DEFAULT_AUTONOMOUS_STALL_ROUNDS, "stallRounds", 1, 1e3);
-  const now = options.now ?? (() => performance.now());
-  const started = now();
-  const elapsed = () => Math.max(0, now() - started);
-  const budget = new AbortController();
-  const deadline = setTimeout(() => budget.abort(new DOMException("Autonomous elapsed budget reached.", "TimeoutError")), maxElapsedMs);
-  deadline.unref?.();
-  const signal = options.signal ? AbortSignal.any([options.signal, budget.signal]) : budget.signal;
-  const sleep2 = options.sleep ?? abortableSleep;
-  const id = randomUUID5();
-  let previous;
-  let lastFingerprint;
-  let stalls = 0;
-  let consecutiveErrors = 0;
-  try {
-    signal.throwIfAborted();
-    for (let round = 1; ; round += 1) {
-      const roundStart = now();
-      diagnosticEvent("round.start", { id, round, maxRounds: options.maxRounds, elapsedMs: elapsed() });
-      let session;
-      try {
-        session = await options.runRound(round, previous, signal);
-      } catch (error) {
-        diagnosticEvent("round.end", { id, round, reason: signal.aborted ? "aborted" : "exception", elapsedMs: elapsed(), durationMs: Math.max(0, now() - roundStart) });
-        throw error;
-      }
-      const current = progress(session);
-      const unchanged = lastFingerprint !== void 0 && current.fingerprint === lastFingerprint;
-      stalls = unchanged ? stalls + 1 : 0;
-      lastFingerprint = current.fingerprint;
-      const classification = session.stopReason === "error" ? options.classifyFailure?.(session) : void 0;
-      consecutiveErrors = session.stopReason === "error" ? consecutiveErrors + 1 : 0;
-      let haltReason;
-      if (session.stopReason === "completed") haltReason = "completed";
-      else if (budget.signal.aborted || elapsed() >= maxElapsedMs) haltReason = "elapsed_budget";
-      else if (signal.aborted || session.stopReason === "aborted") haltReason = "aborted";
-      else if (classification && !classification.retryable) haltReason = "permanent_error";
-      else if (!shouldResume(session.stopReason)) haltReason = "stopped";
-      else if (stalls >= stallLimit) haltReason = "stalled";
-      else if (round >= options.maxRounds) haltReason = "max_rounds";
-      const retryDelay = Math.min(maxDelay, baseDelay * 2 ** Math.min(30, consecutiveErrors - 1));
-      if (!haltReason && session.stopReason === "error" && elapsed() + retryDelay >= maxElapsedMs) haltReason = "elapsed_budget";
-      diagnosticEvent("round.end", {
-        id,
-        round,
-        sessionId: session.id,
-        reason: haltReason ?? session.stopReason,
-        failureKind: classification?.kind,
-        attempt: consecutiveErrors,
-        completedTools: current.completedTools,
-        elapsedMs: elapsed(),
-        durationMs: Math.max(0, now() - roundStart)
-      });
-      if (haltReason === "stalled") diagnosticEvent("round.stall", { id, round, repeats: stalls, completedTools: current.completedTools, elapsedMs: elapsed() });
-      await options.onRoundEnd?.(round, session, !haltReason);
-      if (haltReason) return { session, rounds: round, haltReason };
-      if (session.stopReason === "error") {
-        const delayMs = retryDelay;
-        if (elapsed() + delayMs >= maxElapsedMs) return { session, rounds: round, haltReason: "elapsed_budget" };
-        diagnosticEvent("round.retry", {
-          id,
-          round,
-          nextRound: round + 1,
-          attempt: consecutiveErrors,
-          failureKind: classification?.kind ?? "unclassified",
-          delayMs,
-          elapsedMs: elapsed()
-        });
-        try {
-          await sleep2(delayMs, signal);
-        } catch (error) {
-          if (!signal.aborted) throw error;
-          return { session, rounds: round, haltReason: budget.signal.aborted ? "elapsed_budget" : "aborted" };
-        }
-      }
-      if (signal.aborted || elapsed() >= maxElapsedMs) return { session, rounds: round, haltReason: budget.signal.aborted || elapsed() >= maxElapsedMs ? "elapsed_budget" : "aborted" };
-      previous = session;
-    }
-  } finally {
-    clearTimeout(deadline);
-  }
-}
-
-// src/commands/run.ts
 function parsePositiveInt(value, flag) {
   const parsed = Number.parseInt(value, 10);
   if (!Number.isInteger(parsed) || parsed < 1 || String(parsed) !== value.trim()) {
@@ -18757,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) => {
@@ -18774,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);
@@ -18791,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 } }
@@ -18967,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;
@@ -18982,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}`);
@@ -18997,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,
@@ -19012,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) {
@@ -19314,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 });
   });
@@ -19816,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).");
   }
@@ -19919,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");
@@ -19954,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,