@spinalfluid/ultrac 0.1.6 → 0.1.9

package/dist/cli.js

@@ -548,6 +548,9 @@ function ensurePrivateDirectory(path) {
   }
   chmodSync(path, 448);
 }
+function currentDiagnosticLogPath() {
+  return diagnosticPath;
+}
 function diagnosticEvent(event, fields = {}) {
   if (!diagnosticPath) return;
   const record3 = {
@@ -8040,7 +8043,9 @@ async function createSkill(workspace, input) {
       name,
       description: input.description.trim(),
       ...input.whenToUse ? { when_to_use: input.whenToUse.trim() } : {},
-      ...permissions.length ? { permissions } : {}
+      ...permissions.length ? { permissions } : {},
+      ...input.command ? { command: input.command } : {},
+      ...input.argumentHint ? { "argument-hint": input.argumentHint } : {}
     },
     input.body?.trim() || `# ${name}
 
@@ -8057,7 +8062,8 @@ Describe the steps the agent should follow when this skill is invoked.`
     whenToUse: input.whenToUse?.trim(),
     permissions,
     body: document,
-    path
+    path,
+    ...input.command ? { command: { raw: input.command, argumentHint: input.argumentHint } } : {}
   };
 }
 async function loadSkillsContext(workspace) {
@@ -8831,6 +8837,124 @@ import { z as z25 } from "zod";
 import { mkdir as mkdir11, writeFile as writeFile8 } from "fs/promises";
 import { join as join9 } from "path";
 
+// src/core/periodic-compaction.ts
+var DEFAULT_SUMMARY_INTERVAL_STEPS = 12;
+var MIN_PERIODIC_HISTORY_CHARS = 12e3;
+function summaryIntervalSteps(value = process.env.ULTRAC_SUMMARY_INTERVAL_STEPS) {
+  if (value === void 0 || value.trim() === "") return DEFAULT_SUMMARY_INTERVAL_STEPS;
+  if (!/^\d+$/.test(value) || !Number.isSafeInteger(Number(value)) || Number(value) > 1e3) throw new Error("ULTRAC_SUMMARY_INTERVAL_STEPS must be an integer from 0 to 1000.");
+  return Number(value);
+}
+function completeContextUnits(messages) {
+  const units = [];
+  for (const message of messages) {
+    if (message.role === "tool") {
+      const previous = units.at(-1);
+      if (!previous || previous[0].role !== "assistant") return null;
+      previous.push(message);
+    } else units.push([message]);
+  }
+  for (const unit of units) {
+    const first = unit[0];
+    if (first.role !== "assistant") continue;
+    if (!first.toolCalls?.length) {
+      if (unit.slice(1).some((message) => "toolCallId" in message)) return null;
+      continue;
+    }
+    const ids = new Set(first.toolCalls.map((call) => call.id));
+    const results = unit.slice(1).map((message) => message.toolCallId);
+    if (ids.size !== first.toolCalls.length || results.length !== ids.size || results.some((id) => !id || !ids.has(id)) || new Set(results).size !== ids.size) return null;
+  }
+  return units;
+}
+var PeriodicCompactor = class {
+  constructor(options = {}) {
+    this.options = options;
+  }
+  options;
+  lastAttemptStep = 0;
+  async compact(messages, pinned, provider, model, completedSteps, signal) {
+    const unchanged = () => ({ messages: [...messages], compacted: false });
+    const interval = this.options.intervalSteps ?? summaryIntervalSteps();
+    if (!interval || signal?.aborted || completedSteps - this.lastAttemptStep < interval) return unchanged();
+    const units = completeContextUnits(messages);
+    if (!units) return unchanged();
+    const recent = new Set(units.filter((unit) => unit[0].role === "assistant").slice(-2));
+    const pinnedSet = new Set(pinned);
+    const history = units.filter((unit) => !recent.has(unit) && !unit.some((message) => message.role === "user" || message.role === "system" || pinnedSet.has(message) || isCompactionSummary(message))).flat();
+    const removedChars = history.reduce((size, message) => size + JSON.stringify(message).length, 0);
+    if (history.length < 2 || removedChars < (this.options.minHistoryChars ?? MIN_PERIODIC_HISTORY_CHARS)) return unchanged();
+    this.lastAttemptStep = completedSteps;
+    const trace = startDiagnosticSpan("context.compaction", { path: "periodic", completedSteps, compactedMessageCount: history.length }, 5e3);
+    const controller = new AbortController();
+    let rejectCancelled;
+    const interrupted2 = new Promise((_resolve, reject) => {
+      rejectCancelled = reject;
+    });
+    const abort = () => {
+      controller.abort();
+      rejectCancelled(new Error("summary_interrupted"));
+    };
+    const timer = setTimeout(abort, this.options.timeoutMs ?? DEFAULT_SUMMARY_TIMEOUT_MS);
+    signal?.addEventListener("abort", abort, { once: true });
+    if (signal?.aborted) abort();
+    try {
+      const completion = await Promise.race([provider.complete({ model, system: summaryInstructions(DEFAULT_MAX_SUMMARY_CHARS), messages: [{ role: "user", content: renderDroppedTranscript(history, { maxTranscriptChars: DEFAULT_MAX_TRANSCRIPT_CHARS }) }], signal: controller.signal, context: { purpose: "compaction_summary", compactedMessages: history.length } }), interrupted2]);
+      if (controller.signal.aborted) {
+        trace.end({ outcome: "skipped", reason: "interrupted" });
+        return unchanged();
+      }
+      const summary = completion.text.trim();
+      if (!summary || summary.length > DEFAULT_MAX_SUMMARY_CHARS || summary.length + 300 >= removedChars) {
+        trace.end({ outcome: "skipped", reason: "invalid-summary" });
+        return unchanged();
+      }
+      const removed = new Set(history);
+      const compacted = messages.filter((message) => !removed.has(message));
+      const firstRemoved = messages.findIndex((message) => removed.has(message));
+      const insertion = messages.slice(0, firstRemoved).filter((message) => !removed.has(message)).length;
+      compacted.splice(insertion, 0, compactionSummaryMessage(summary));
+      if (!completeContextUnits(compacted)) {
+        trace.end({ outcome: "skipped", reason: "invalid-pairing" });
+        return unchanged();
+      }
+      trace.end({ outcome: "compacted", summaryChars: summary.length });
+      return { messages: compacted, compacted: true };
+    } catch {
+      trace.end({ outcome: "failed", reason: controller.signal.aborted ? "interrupted" : "summary-failed" });
+      return unchanged();
+    } finally {
+      clearTimeout(timer);
+      signal?.removeEventListener("abort", abort);
+    }
+  }
+};
+function snapshotMessages(messages) {
+  const result = [];
+  for (let index = 0; index < messages.length; index += 1) {
+    const message = messages[index];
+    const native = message;
+    if (native.role !== "assistant" || !native.toolCalls?.length) {
+      result.push(message);
+      continue;
+    }
+    const replies = [];
+    while (messages[index + 1]?.role === "tool") replies.push(messages[++index]);
+    const ids = new Set(replies.map((reply) => reply.toolCallId));
+    const calls = native.toolCalls.filter((call) => ids.has(call.id));
+    const completedIds = new Set(calls.map((call) => call.id));
+    const base = { role: native.role, content: native.content };
+    result.push({ ...base, ...calls.length ? { toolCalls: calls } : {} });
+    result.push(...replies.filter((reply) => completedIds.has(reply.toolCallId)));
+  }
+  return result;
+}
+function snapshotWithConstraints(messages, constraints) {
+  const snapshot = snapshotMessages(messages);
+  for (const constraint of constraints) if (!snapshot.some((message) => message.role === "user" && message.content === constraint.content)) snapshot.push({ role: "user", content: constraint.content });
+  return snapshot;
+}
+
 // src/core/progress-events.ts
 var listeners = /* @__PURE__ */ new Set();
 function onAgentProgress(listener) {
@@ -8997,18 +9121,18 @@ function isConcurrencySafe(tool) {
 }
 function planToolBatches(calls, tools) {
   const batches = [];
-  let open8;
+  let open9;
   for (const call of calls) {
     if (!isConcurrencySafe(tools.get(call.tool))) {
       batches.push([call]);
-      open8 = void 0;
+      open9 = void 0;
       continue;
     }
-    if (!open8) {
-      open8 = [];
-      batches.push(open8);
+    if (!open9) {
+      open9 = [];
+      batches.push(open9);
     }
-    open8.push(call);
+    open9.push(call);
   }
   return batches;
 }
@@ -9546,6 +9670,17 @@ function readSessionUserConstraints(session) {
   }
   return constraints;
 }
+function readSessionContextSnapshot(session) {
+  if (session.contextSnapshot !== void 0) {
+    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 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.`);
+  }
+  return session.contextSnapshot;
+}
 function createSessionId(date = /* @__PURE__ */ new Date()) {
   const stamp = date.toISOString().replace(/[:.]/g, "-");
   return `${stamp}-${randomBytes3(4).toString("hex")}`;
@@ -9823,6 +9958,7 @@ function validateSession(value, expectedId, label) {
   if (!isSafeSessionId(sessionId) || sessionId !== expectedId || session.parentSessionId !== void 0 && (typeof session.parentSessionId !== "string" || !isSafeSessionId(session.parentSessionId) || normalizedSessionId(session.parentSessionId) !== session.parentSessionId) || typeof session.task !== "string" || typeof session.workspace !== "string" || typeof session.provider !== "string" || typeof session.model !== "string" || typeof session.startedAt !== "string" || typeof session.endedAt !== "string" || typeof session.finalMessage !== "string" || !isToolPermissions(session.permissions) || !Array.isArray(session.steps) || session.mcpResultArchiveVersion !== void 0 && session.mcpResultArchiveVersion !== 1 || session.mode !== void 0 && !isAgentModeName2(session.mode) || session.stopReason !== void 0 && !isStopReason(session.stopReason) || session.subagents !== void 0 && !Array.isArray(session.subagents)) {
     invalid();
   }
+  readSessionContextSnapshot(value);
   const steps = session.steps;
   for (const stepValue of steps) {
     if (!stepValue || typeof stepValue !== "object" || Array.isArray(stepValue)) invalid();
@@ -9933,6 +10069,7 @@ var AgentRunner = class {
     ];
     const pinnedMessages = [...constraintMessages];
     const steps = [];
+    const periodicCompactor = new PeriodicCompactor();
     const toolsByName = new Map(
       registered.map((tool) => [tool.name, tool])
     );
@@ -9955,7 +10092,8 @@ var AgentRunner = class {
       ...subagents2.length ? { subagents: subagents2 } : {},
       constraintVersion: 1,
       userConstraints: [...userConstraints],
-      mcpResultArchiveVersion: 1
+      mcpResultArchiveVersion: 1,
+      ...messages.some((message) => message.role === "user" && message.content.startsWith("[compacted-context]")) ? { contextSnapshot: { version: 1, kind: "run", messages: snapshotWithConstraints(messages, userConstraints), completedSteps: steps.length } } : {}
     });
     const depth = options.depth ?? 0;
     const isTopLevel = depth === 0;
@@ -9964,6 +10102,7 @@ var AgentRunner = class {
       try {
         await options.onCheckpoint(buildSession(void 0, listSubagentTranscripts()));
       } catch {
+        diagnosticEvent("session.checkpoint", { outcome: "failed", path: "run" });
       }
     };
     let stopReason = "max-steps";
@@ -9981,6 +10120,11 @@ var AgentRunner = class {
         transcriptKind: "run",
         fileProvenance
       };
+      const periodic = await periodicCompactor.compact(messages, [...pinnedMessages, taskMessage], options.provider, options.model, steps.length, options.signal);
+      if (periodic.compacted) {
+        messages.splice(0, messages.length, ...periodic.messages);
+        await checkpoint();
+      }
       await compactIfNeeded(options, messages, system, taskMessage, pinnedMessages, requestContext);
       if (options.signal?.aborted) {
         stopReason = "aborted";
@@ -10294,7 +10438,7 @@ var NOTHING_RESTORED = {
   legacyMcpResults: 0
 };
 function restorePreviousTranscript(sessions, maxToolResultChars, fileProvenance) {
-  if (sessions.length === 0 || sessions.every((session) => session.steps.length === 0)) return NOTHING_RESTORED;
+  if (sessions.length === 0 || sessions.every((session) => session.steps.length === 0 && !readSessionContextSnapshot(session))) return NOTHING_RESTORED;
   const messages = [];
   let toolResults = 0;
   let truncatedResults = 0;
@@ -10302,6 +10446,11 @@ function restorePreviousTranscript(sessions, maxToolResultChars, fileProvenance)
   let steps = 0;
   for (const session of sessions) {
     steps += session.steps.length;
+    const snapshot = readSessionContextSnapshot(session);
+    if (snapshot?.kind === "run" || snapshot?.kind === "text") {
+      messages.splice(0, messages.length, ...snapshot.messages);
+      continue;
+    }
     for (const step of session.steps) {
       const content = step.parsed ? JSON.stringify(step.parsed) : step.modelText;
       if (content) messages.push({ role: "assistant", content });
@@ -10316,6 +10465,7 @@ function restorePreviousTranscript(sessions, maxToolResultChars, fileProvenance)
         fileProvenance?.set(entry.message, toolResultFileProvenance(result, entry.truncated));
       }
     }
+    if (snapshot) messages.push(...snapshot.messages.filter((message) => message.role === "user" && message.content.startsWith("[compacted-context]")).map((message) => ({ role: "user", content: message.content })));
   }
   return { messages, steps, toolResults, truncatedResults, legacyMcpResults };
 }
@@ -13522,7 +13672,10 @@ function buildHarnessManifest() {
 }
 
 // src/commands/mcp.ts
-import { resolve as resolve9 } from "path";
+import { resolve as resolve9, dirname as dirname12, join as join12 } from "path";
+import { constants as constants5 } from "fs";
+import { lstat as lstat3, mkdir as mkdir14, open as open8, rename as rename2, unlink as unlink3 } from "fs/promises";
+import { randomUUID as randomUUID4 } from "crypto";
 import chalk5 from "chalk";
 
 // src/mcp/client.ts
@@ -14348,7 +14501,47 @@ function asError(error) {
 
 // src/commands/mcp.ts
 function registerMcpCommand(program2) {
-  const mcpCommand = program2.command("mcp").description("Inspect the MCP servers this workspace connects to");
+  const mcpCommand = program2.command("mcp").description("Configure and inspect workspace MCP servers");
+  mcpCommand.command("add <name> <command> [args...]").description("Add a stdio MCP server without starting it").option("-w, --workspace <path>", "Workspace directory", process.cwd()).option("--env <NAME=value>", "Explicit child environment value; prefer --env-pass for credentials", collect, []).option("--env-pass <NAME>", "Forward a named parent environment variable", collect, []).option("--cwd <path>", "Server working directory").option("--timeout <milliseconds>", "Per-request timeout", "30000").option("--disabled", "Keep the server disabled", false).option("--force", "Replace an existing server with this name", false).action(async (name, command, args, options) => {
+    validateServerName(name);
+    const env2 = {};
+    for (const entry of options.env) {
+      const separator = entry.indexOf("=");
+      if (separator < 1) throw new Error("--env must use NAME=value.");
+      const key = entry.slice(0, separator);
+      validateEnvironmentName(key);
+      Object.defineProperty(env2, key, { value: entry.slice(separator + 1), enumerable: true, configurable: true });
+    }
+    options.envPass.forEach(validateEnvironmentName);
+    const spec = McpServerSchema.parse({
+      command,
+      args,
+      env: env2,
+      envPassthrough: [...new Set(options.envPass)],
+      cwd: options.cwd,
+      enabled: !options.disabled,
+      timeoutMs: Number(options.timeout)
+    });
+    const workspace = await assertWorkspaceExists(options.workspace);
+    await updateMcpConfig(workspace, (config) => {
+      const servers = { ...config.mcpServers ?? {} };
+      if (Object.hasOwn(servers, name) && !options.force) throw new Error(`MCP server ${name} already exists. Use --force to replace it.`);
+      servers[name] = spec;
+      return { ...config, mcpServers: servers };
+    });
+    console.log(`Added MCP server ${name}. Run ultrac trust in this workspace to approve the updated settings.`);
+  });
+  mcpCommand.command("remove <name>").description("Remove a workspace MCP server").option("-w, --workspace <path>", "Workspace directory", process.cwd()).action(async (name, options) => {
+    validateServerName(name);
+    const workspace = await assertWorkspaceExists(options.workspace);
+    await updateMcpConfig(workspace, (config) => {
+      const servers = { ...config.mcpServers ?? {} };
+      if (!Object.hasOwn(servers, name)) throw new Error(`No MCP server named ${name}.`);
+      delete servers[name];
+      return { ...config, mcpServers: servers };
+    });
+    console.log(`Removed MCP server ${name}. Reapprove changed workspace settings with ultrac trust if required.`);
+  });
   mcpCommand.command("list", { isDefault: true }).description("Connect every configured server and report what it exports").option("-w, --workspace <path>", "Workspace directory", process.cwd()).option("--json", "Print the result as JSON", false).action(async (options) => {
     const workspace = resolve9(options.workspace);
     const loaded = await loadConfigWithTrust(workspace);
@@ -14374,6 +14567,7 @@ function registerMcpCommand(program2) {
     }
     const runtime = await withRuntime(workspace, servers, (active) => active);
     try {
+      if (runtime.statuses.some((status) => !status.ok)) process.exitCode = 1;
       if (options.json) {
         console.log(JSON.stringify({ servers: runtime.statuses }, null, 2));
         return;
@@ -14396,7 +14590,7 @@ function registerMcpCommand(program2) {
       runtime.close();
     }
   });
-  mcpCommand.command("call <server> <tool>").description("Call one MCP tool directly, for checking a server by hand").option("-w, --workspace <path>", "Workspace directory", process.cwd()).option("--input <json>", "Tool arguments as a JSON object", "{}").action(async (server, tool, options) => {
+  mcpCommand.command("call <server> <tool>").description("Call one MCP tool directly, for checking a server by hand").option("-w, --workspace <path>", "Workspace directory", process.cwd()).option("--input <json>", "Tool arguments as a JSON object", "{}").option("--json", "Print the result as JSON", false).action(async (server, tool, options) => {
     const workspace = resolve9(options.workspace);
     const loaded = await loadConfigWithTrust(workspace);
     const spec = loaded.config.mcpServers?.[server];
@@ -14414,6 +14608,7 @@ function registerMcpCommand(program2) {
     } catch (error) {
       throw new Error(`--input must be a JSON object: ${error instanceof Error ? error.message : String(error)}`);
     }
+    if (!input || typeof input !== "object" || Array.isArray(input)) throw new Error("--input must be a JSON object.");
     const runtime = await withRuntime(workspace, { [server]: spec }, (active) => active);
     try {
       const status = runtime.statuses[0];
@@ -14438,6 +14633,68 @@ function registerMcpCommand(program2) {
     }
   });
 }
+function collect(value, previous) {
+  return [...previous, value];
+}
+function validateServerName(name) {
+  if (!/^[A-Za-z0-9][A-Za-z0-9_.-]{0,79}$/.test(name) || name.includes("__") || ["constructor", "prototype"].includes(name)) {
+    throw new Error("MCP server names must contain letters, numbers, dots, single underscores, or hyphens.");
+  }
+}
+function validateEnvironmentName(name) {
+  if (!/^[A-Za-z_][A-Za-z0-9_]*$/.test(name)) throw new Error("Environment variable names must contain letters, numbers, or underscores.");
+}
+async function updateMcpConfig(workspace, update) {
+  const target = configPath(workspace);
+  await resolveInsideWorkspaceReal(workspace, target);
+  await mkdir14(dirname12(target), { recursive: true, mode: 448 });
+  await resolveInsideWorkspaceReal(workspace, target);
+  const lockPath = `${target}.mcp-lock`;
+  const lock = await open8(lockPath, "wx", 384).catch((error) => {
+    if (error.code === "EEXIST") throw new Error("Another MCP configuration update is in progress.");
+    throw error;
+  });
+  const temporary = join12(dirname12(target), `.mcp-config-${randomUUID4()}.tmp`);
+  try {
+    let config = defaultConfig();
+    const existing = await lstat3(target).catch((error) => {
+      if (error.code === "ENOENT") return null;
+      throw error;
+    });
+    if (existing) {
+      if (!existing.isFile() || existing.isSymbolicLink() || existing.size > 1048576) throw new Error("MCP config must be a regular JSON file no larger than 1 MiB.");
+      const handle2 = await open8(target, constants5.O_RDONLY | constants5.O_NOFOLLOW);
+      try {
+        const content = await handle2.readFile("utf8");
+        try {
+          config = JSON.parse(content);
+        } catch {
+          throw new Error("Workspace config is not valid JSON.");
+        }
+      } finally {
+        await handle2.close();
+      }
+      if (!config || typeof config !== "object" || Array.isArray(config)) throw new Error("Workspace config must be a JSON object.");
+      if (!UltracConfigSchema.safeParse(config).success) throw new Error("Workspace config does not match the Ultrac configuration schema.");
+    }
+    const next = update(config);
+    UltracConfigSchema.parse(next);
+    const handle = await open8(temporary, "wx", 384);
+    try {
+      await handle.writeFile(`${JSON.stringify(next, null, 2)}
+`, "utf8");
+      await handle.sync();
+    } finally {
+      await handle.close();
+    }
+    await resolveInsideWorkspaceReal(workspace, target);
+    await rename2(temporary, target);
+  } finally {
+    await unlink3(temporary).catch(() => void 0);
+    await lock.close();
+    await unlink3(lockPath).catch(() => void 0);
+  }
+}
 async function withRuntime(workspace, servers, use) {
   const packageInfo = readPackageInfo();
   const runtime = await connectMcpServers(servers, {
@@ -14554,7 +14811,7 @@ import chalk6 from "chalk";
 
 // src/notify/config.ts
 import { chmod as chmod3, readFile as readFile12, rm as rm4, writeFile as writeFile11 } from "fs/promises";
-import { join as join12 } from "path";
+import { join as join13 } from "path";
 import { z as z31 } from "zod";
 var TelegramSchema = z31.object({
   botToken: z31.string().min(1),
@@ -14580,7 +14837,7 @@ var NotifyConfigSchema = z31.object({
   answerTimeoutSeconds: z31.number().int().min(30).max(86400).default(1800)
 });
 function notifyConfigPath() {
-  return join12(ultracHomeDir(), "notify.json");
+  return join13(ultracHomeDir(), "notify.json");
 }
 async function readStoredNotifyConfig() {
   let text;
@@ -15019,7 +15276,7 @@ function registerNotifyCommand(program2) {
 }
 
 // src/commands/repl.ts
-import { createInterface as createInterface3 } from "readline";
+import { createInterface as createInterface3, emitKeypressEvents } from "readline";
 import { stdin as stdin5, stdout as stdout5 } from "process";
 import chalk11 from "chalk";
 
@@ -15197,6 +15454,9 @@ function registerTrustCommand(program2) {
 // src/core/manual-compaction.ts
 async function compactManually(messages, pinned, provider, model, focus = "", signal) {
   const retained = new Set(pinned);
+  const units = completeContextUnits(messages);
+  if (!units) throw new Error("Compaction found incomplete tool units; original context was kept.");
+  for (const unit of units) if (unit.some((message) => retained.has(message))) for (const message of unit) retained.add(message);
   const history = messages.filter(
     (message) => message.role !== "system" && !retained.has(message) && !isCompactionSummary(message)
   );
@@ -15252,6 +15512,10 @@ Give extra attention to this user-supplied focus: ${focus}` : ""
 }
 
 // src/core/interactive.ts
+var SKIPPED_FOR_QUEUED_MESSAGE = "Skipped; a new user message was queued after the previous tool. Follow that message instead of retrying this call.";
+function skippedForQueuedMessage(tool) {
+  return { tool, ok: false, content: SKIPPED_FOR_QUEUED_MESSAGE };
+}
 function permissionDeniedMessage(tool, permission, sticky) {
   const denied = `User denied ${permission} permission for ${tool}.`;
   if (!sticky) return denied;
@@ -15310,6 +15574,7 @@ var InteractiveSession = class {
   started = false;
   /** How the last turn ended. Absent until one has. */
   lastStopReason;
+  periodicCompactor = new PeriodicCompactor();
   pinnedMessages = [];
   /** Tools described in this turn's system prompt. `/mode` can change it. */
   advertisedTools() {
@@ -15348,6 +15613,7 @@ var InteractiveSession = class {
   }
   async restoreSessions(sessions) {
     if (this.steps.length || this.userConstraints.length) throw new Error("Restore requires a fresh session.");
+    for (const saved of sessions) readSessionContextSnapshot(saved);
     await this.start();
     this.parentSessionId = sessions.at(-1)?.id;
     this.firstTask = sessions.at(-1)?.task ?? "";
@@ -15368,6 +15634,17 @@ var InteractiveSession = class {
         for (const { call, result } of step.toolResults) this.messages.push({ role: "tool", content: JSON.stringify({ call, result: capResultForTranscript(result, this.options.maxToolResultChars) }) });
       }
     }
+    const snapshot = sessions.at(-1)?.contextSnapshot;
+    if (snapshot && snapshot.kind !== "text") this.messages.push(...snapshot.messages.filter(isCompactionSummary).map((message) => ({ role: "user", content: message.content })));
+    if (snapshot?.kind === "text") {
+      this.messages.splice(0, this.messages.length, ...snapshot.messages);
+      this.pinnedMessages.splice(0, this.pinnedMessages.length, ...this.messages.filter((message) => message.role === "user" && !isCompactionSummary(message)));
+      for (const constraint of this.userConstraints) if (!this.messages.some((message) => message.role === "user" && message.content === constraint.content)) {
+        const message = { role: "user", content: constraint.content };
+        this.messages.push(message);
+        this.pinnedMessages.push(message);
+      }
+    }
   }
   contextStatus() {
     const mode = getAgentModePreset(this.activeMode);
@@ -15430,6 +15707,7 @@ Acknowledge that you have the context and wait for the user's first request.`
     try {
       await handlers.onCheckpoint(this.toSession());
     } catch {
+      diagnosticEvent("session.checkpoint", { outcome: "failed", path: "interactive" });
     }
   }
   appendQueuedMessages(handlers) {
@@ -15472,6 +15750,11 @@ Acknowledge that you have the context and wait for the user's first request.`
           modePreset
         );
         const turn = this.steps.length + 1;
+        const periodic = await this.periodicCompactor.compact(this.messages, this.pinnedMessages, this.options.provider, this.activeModel, this.steps.length, handlers.signal);
+        if (periodic.compacted) {
+          this.messages.splice(0, this.messages.length, ...periodic.messages);
+          await this.checkpoint(handlers);
+        }
         await this.compactIfNeeded(system, handlers, turn);
         handlers.onModelStart?.();
         let text;
@@ -15512,12 +15795,13 @@ Acknowledge that you have the context and wait for the user's first request.`
         this.messages.push({ role: "assistant", content: JSON.stringify(parsed) });
         this.steps.push(step);
         await this.checkpoint(handlers);
-        for (const call of parsed.toolCalls) {
+        for (let callIndex = 0; callIndex < parsed.toolCalls.length; callIndex += 1) {
+          const call = parsed.toolCalls[callIndex];
           if (handlers.signal?.aborted) break;
           const authorization = await this.authorize(call, handlers);
           if (handlers.signal?.aborted) break;
           if (authorization.denied) {
-            const result2 = {
+            const result = {
               tool: call.tool,
               ok: false,
               content: authorization.message ?? permissionDeniedMessage(
@@ -15527,24 +15811,33 @@ Acknowledge that you have the context and wait for the user's first request.`
               )
             };
             if (authorization.permission) handlers.onToolDenied?.(call, authorization.permission);
-            step.toolResults.push({ call, result: result2 });
-            this.pushToolResult(call, result2);
+            step.toolResults.push({ call, result });
+            this.pushToolResult(call, result);
+            await this.checkpoint(handlers);
+          } else {
+            handlers.onToolStart?.(call);
+            const modeAllowlist = getEnforcedModeToolAllowlist(this.activeMode);
+            const rawResult = await this.registry.execute(call, {
+              workspace: this.options.workspace,
+              permissions: getEffectiveModePermissions(this.activeMode, authorization.permissions),
+              ...handlers.signal ? { signal: handlers.signal } : {},
+              ...modeAllowlist ? { modeAllowlist } : {}
+            });
+            const result = await this.mcpResultArchive.store(rawResult, this.options.maxToolResultChars);
+            handlers.onToolResult?.(call, result);
+            step.toolResults.push({ call, result });
+            this.pushToolResult(call, result);
             await this.checkpoint(handlers);
-            continue;
           }
-          handlers.onToolStart?.(call);
-          const modeAllowlist = getEnforcedModeToolAllowlist(this.activeMode);
-          const rawResult = await this.registry.execute(call, {
-            workspace: this.options.workspace,
-            permissions: getEffectiveModePermissions(this.activeMode, authorization.permissions),
-            ...handlers.signal ? { signal: handlers.signal } : {},
-            ...modeAllowlist ? { modeAllowlist } : {}
-          });
-          const result = await this.mcpResultArchive.store(rawResult, this.options.maxToolResultChars);
-          handlers.onToolResult?.(call, result);
-          step.toolResults.push({ call, result });
-          this.pushToolResult(call, result);
-          await this.checkpoint(handlers);
+          if (this.appendQueuedMessages(handlers) > 0) {
+            for (const skipped of parsed.toolCalls.slice(callIndex + 1)) {
+              const result = skippedForQueuedMessage(skipped.tool);
+              step.toolResults.push({ call: skipped, result });
+              this.pushToolResult(skipped, result);
+              await this.checkpoint(handlers);
+            }
+            break;
+          }
         }
         if (handlers.signal?.aborted) {
           stopReason = "aborted";
@@ -15604,7 +15897,7 @@ Acknowledge that you have the context and wait for the user's first request.`
             mode: this.activeMode,
             purpose: "turn"
           }),
-          // The turn's own signal: a Ctrl-C abandons the summary, not the turn.
+          // The turn's own signal: Esc abandons the summary, not the turn.
           ...handlers.signal ? { signal: handlers.signal } : {}
         }
       );
@@ -15751,6 +16044,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 } } : {},
       // 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.
@@ -15803,6 +16097,7 @@ var NativeSession = class {
   started = false;
   /** How the last turn ended. Absent until one has. */
   lastStopReason;
+  periodicCompactor = new PeriodicCompactor();
   pinnedMessages = [];
   /**
    * The tools this turn advertises. Resolved per turn rather than once in the
@@ -15844,6 +16139,7 @@ var NativeSession = class {
   }
   async restoreSessions(sessions) {
     if (this.steps.length || this.userConstraints.length) throw new Error("Restore requires a fresh session.");
+    for (const saved of sessions) readSessionContextSnapshot(saved);
     await this.start();
     this.parentSessionId = sessions.at(-1)?.id;
     this.firstTask = sessions.at(-1)?.task ?? "";
@@ -15871,6 +16167,17 @@ var NativeSession = class {
         }
       }
     }
+    const snapshot = sessions.at(-1)?.contextSnapshot;
+    if (snapshot && snapshot.kind !== "native") this.messages.push(...snapshot.messages.filter(isCompactionSummary).map((message) => ({ role: "user", content: message.content })));
+    if (snapshot?.kind === "native") {
+      this.messages.splice(0, this.messages.length, ...snapshot.messages);
+      this.pinnedMessages.splice(0, this.pinnedMessages.length, ...this.messages.filter((message) => message.role === "user" && !isCompactionSummary(message)));
+      for (const constraint of this.userConstraints) if (!this.messages.some((message) => message.role === "user" && message.content === constraint.content)) {
+        const message = { role: "user", content: constraint.content };
+        this.messages.push(message);
+        this.pinnedMessages.push(message);
+      }
+    }
   }
   contextStatus() {
     const system = this.systemPrompt();
@@ -15931,6 +16238,7 @@ ${context}`
     try {
       await handlers.onCheckpoint(this.toSession());
     } catch {
+      diagnosticEvent("session.checkpoint", { outcome: "failed", path: "interactive" });
     }
   }
   appendQueuedMessages(handlers) {
@@ -15969,6 +16277,11 @@ ${context}`
         this.refreshSystemPrompt();
         const tools = toToolSchemas(this.advertisedTools());
         const turn = this.steps.length + 1;
+        const periodic = await this.periodicCompactor.compact(this.messages, this.pinnedMessages, this.options.provider, this.activeModel, this.steps.length, handlers.signal);
+        if (periodic.compacted) {
+          this.messages.splice(0, this.messages.length, ...periodic.messages);
+          await this.checkpoint(handlers);
+        }
         await this.compactIfNeeded(tools, handlers, turn);
         handlers.onModelStart?.();
         let response;
@@ -16029,13 +16342,14 @@ ${context}`
           }
           continue;
         }
-        for (const call of response.toolCalls) {
+        for (let callIndex = 0; callIndex < response.toolCalls.length; callIndex += 1) {
+          const call = response.toolCalls[callIndex];
           if (handlers.signal?.aborted) break;
           const displayCall = { tool: call.name, input: safeParseArgs(call.arguments) };
           const authorization = await this.authorize(call.name, handlers, displayCall);
           if (handlers.signal?.aborted) break;
           if (authorization.denied) {
-            const result2 = {
+            const result = {
               tool: call.name,
               ok: false,
               content: authorization.message ?? permissionDeniedMessage(
@@ -16045,27 +16359,37 @@ ${context}`
               )
             };
             if (authorization.permission) handlers.onToolDenied?.(displayCall, authorization.permission);
-            step.toolResults.push({ call: displayCall, result: result2 });
-            this.pushToolResult(call, result2);
+            step.toolResults.push({ call: displayCall, result });
+            this.pushToolResult(call, result);
+            await this.checkpoint(handlers);
+          } else {
+            handlers.onToolStart?.(displayCall);
+            const modeAllowlist = getEnforcedModeToolAllowlist(this.activeMode);
+            const rawResult = await this.registry.execute(
+              { tool: call.name, input: displayCall.input },
+              {
+                workspace: this.options.workspace,
+                permissions: getEffectiveModePermissions(this.activeMode, authorization.permissions),
+                ...handlers.signal ? { signal: handlers.signal } : {},
+                ...modeAllowlist ? { modeAllowlist } : {}
+              }
+            );
+            const result = await this.mcpResultArchive.store(rawResult, this.options.maxToolResultChars);
+            handlers.onToolResult?.(displayCall, result);
+            step.toolResults.push({ call: displayCall, result });
+            this.pushToolResult(call, result);
             await this.checkpoint(handlers);
-            continue;
           }
-          handlers.onToolStart?.(displayCall);
-          const modeAllowlist = getEnforcedModeToolAllowlist(this.activeMode);
-          const rawResult = await this.registry.execute(
-            { tool: call.name, input: displayCall.input },
-            {
-              workspace: this.options.workspace,
-              permissions: getEffectiveModePermissions(this.activeMode, authorization.permissions),
-              ...handlers.signal ? { signal: handlers.signal } : {},
-              ...modeAllowlist ? { modeAllowlist } : {}
+          if (this.appendQueuedMessages(handlers) > 0) {
+            for (const skipped of response.toolCalls.slice(callIndex + 1)) {
+              const skippedCall = { tool: skipped.name, input: safeParseArgs(skipped.arguments) };
+              const result = skippedForQueuedMessage(skipped.name);
+              step.toolResults.push({ call: skippedCall, result });
+              this.pushToolResult(skipped, result);
+              await this.checkpoint(handlers);
             }
-          );
-          const result = await this.mcpResultArchive.store(rawResult, this.options.maxToolResultChars);
-          handlers.onToolResult?.(displayCall, result);
-          step.toolResults.push({ call: displayCall, result });
-          this.pushToolResult(call, result);
-          await this.checkpoint(handlers);
+            break;
+          }
         }
         if (handlers.signal?.aborted) {
           stopReason = "aborted";
@@ -16121,7 +16445,7 @@ ${context}`
             mode: this.activeMode,
             purpose: "turn"
           }),
-          // The turn's own signal: a Ctrl-C abandons the summary, not the turn.
+          // The turn's own signal: Esc abandons the summary, not the turn.
           ...handlers.signal ? { signal: handlers.signal } : {}
         }
       );
@@ -16285,6 +16609,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 } } : {},
       // 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.
@@ -16335,6 +16660,16 @@ function createSessionCheckpointWriter(workspace, onFailure) {
   return Object.assign(writeCheckpoint, { warnFailure });
 }
 
+// src/ui/ghost.ts
+var quietSessions = /* @__PURE__ */ new WeakSet();
+function isGhostEnabled(session) {
+  return quietSessions.has(session);
+}
+function setGhostEnabled(session, enabled) {
+  if (enabled) quietSessions.add(session);
+  else quietSessions.delete(session);
+}
+
 // src/ui/output.ts
 import chalk8 from "chalk";
 var stopReasonDetail = {
@@ -16348,7 +16683,7 @@ function stopReasonLine(stopReason) {
   const detail = stopReasonDetail[reason] ?? "partial answer";
   return `Stopped: ${reason} (${detail})`;
 }
-function printSession(session, sessionPath2) {
+function printSession(session, sessionPath2, options = {}) {
   for (const step of session.steps) {
     if (step.parsed?.message) {
       console.log(chalk8.gray(`step ${step.index + 1}:`), step.parsed.message);
@@ -16356,7 +16691,7 @@ function printSession(session, sessionPath2) {
     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.gray(indent2(toolResult.result.content)));
+      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." }))));
     }
   }
   if (session.finalMessage) {
@@ -16379,17 +16714,31 @@ function printTools(tools) {
     console.log(chalk8.gray(indent2(tool.description)));
   }
 }
-function printToolResult(result) {
+function printToolResult(result, options = {}) {
   const status = result.ok ? chalk8.green("ok") : chalk8.red("failed");
   console.log(`${chalk8.cyan(result.tool)} ${status}`);
-  console.log(chalk8.gray(indent2(result.content)));
+  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) {
   return value.split("\n").map((line) => `  ${line}`).join("\n");
 }
+function formatToolOutput(content, options = {}) {
+  if (options.verbose) return content;
+  const lines = content.split(/\r?\n/);
+  const shown = lines.length <= 6 ? lines : options.failed ? [...lines.slice(0, 3), ...lines.slice(-3)] : lines.slice(0, 6);
+  const clipped = shown.some((line) => line.length > 200);
+  const preview = shown.map((line) => line.length > 200 ? `${line.slice(0, 199)}\u2026` : line).join("\n");
+  const hidden = lines.length - shown.length;
+  if (!hidden && !clipped) return preview;
+  return `${preview}
+\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",
@@ -16756,7 +17105,10 @@ var Spinner = class {
   label;
   timer;
   index = 0;
-  start() {
+  holdWhile;
+  held = false;
+  start(holdWhile) {
+    this.holdWhile = holdWhile;
     if (!stdout4.isTTY || this.timer) return;
     this.render();
     this.timer = setInterval(() => this.render(), 90);
@@ -16775,6 +17127,15 @@ var Spinner = class {
     }
   }
   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);
@@ -16890,7 +17251,7 @@ function renderWelcome(info, options = {}) {
   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(
-    wide ? `${paint.gray("  /help commands")} ${paint.dim("\xB7")} ${paint.gray("/exit quit")} ${paint.dim("\xB7")} ${paint.gray("Ctrl-C interrupt")}` : paint.gray("  /help \xB7 /exit \xB7 Ctrl-C")
+    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")
   );
   return lines.join("\n");
 }
@@ -16928,14 +17289,14 @@ function shortenMiddle(value, width) {
 // src/update/check.ts
 import { spawn as spawn4 } from "child_process";
 import { randomBytes as randomBytes4 } from "crypto";
-import { readFile as readFile13, rename as rename2, unlink as unlink3, writeFile as writeFile12 } from "fs/promises";
-import { join as join13 } from "path";
+import { readFile as readFile13, rename as rename3, unlink as unlink4, writeFile as writeFile12 } from "fs/promises";
+import { join as join14 } from "path";
 var DEFAULT_MAX_AGE_MS = 24 * 60 * 60 * 1e3;
 var QUERY_TIMEOUT_MS = 5e3;
 var INSTALL_TIMEOUT_MS = 5 * 60 * 1e3;
 async function checkForUpdate(options) {
   const now = options.now ?? Date.now();
-  const cachePath = options.cachePath ?? join13(await ensureUltracHome(), "update-check.json");
+  const cachePath = options.cachePath ?? join14(await ensureUltracHome(), "update-check.json");
   const maxAgeMs = options.maxAgeMs ?? DEFAULT_MAX_AGE_MS;
   let latestVersion;
   if (!options.force) {
@@ -17019,9 +17380,9 @@ async function writeCache(path, cache) {
   try {
     await writeFile12(temporary, `${JSON.stringify(cache)}
 `, { encoding: "utf8", mode: 384, flag: "wx" });
-    await rename2(temporary, path);
+    await rename3(temporary, path);
   } catch {
-    await unlink3(temporary).catch(() => void 0);
+    await unlink4(temporary).catch(() => void 0);
   }
 }
 async function runNpm(args, options) {
@@ -17079,11 +17440,18 @@ var HELP = `Commands:
   /allow <perm>         Grant a permission for this session (write, shell, network)
   /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
+  /output [number|list]  Inspect saved tool output (latest by default)
   /memory               List and inspect stored memories
   /skills               List installed skills
   /update               Show how to install an available CLI update
   /clear                Start a fresh conversation
   /exit, /quit          End the session
+Keys:
+  Type during a turn    Queue a follow-up for after the current tool call
+  Esc                   Stop the current turn; the session stays open
+  Ctrl-C                Exit and save the session
 Custom commands come from skills that declare a 'command:' key in their
 frontmatter; built-ins always win a name clash. Type anything else to talk to Ultrac.`;
 var EXIT_REPL_NOT_STARTED = 1;
@@ -17295,12 +17663,21 @@ async function runRepl(options, initialTask = "") {
   });
   let running = true;
   let turnAbort;
-  rl.on("SIGINT", () => {
-    if (handleReplInterrupt(turnAbort) === "abort-turn") return;
+  const exitSession = () => {
+    handleReplExit(turnAbort);
     running = false;
     console.log(chalk11.gray("\nExiting ultrac\u2026"));
     rl.close();
-  });
+  };
+  rl.on("SIGINT", exitSession);
+  const onKeypress = (_input, key) => {
+    if (!key || key.name !== "escape" || key.ctrl || key.meta) return;
+    handleReplEscape(turnAbort);
+  };
+  if (stdin5.isTTY) {
+    emitKeypressEvents(stdin5, rl);
+    stdin5.on("keypress", onKeypress);
+  }
   const terminate = () => {
     running = false;
     turnAbort?.abort();
@@ -17319,7 +17696,7 @@ async function runRepl(options, initialTask = "") {
     if (initialTask) {
       console.log(chalk11.cyan(`
 \u203A ${initialTask}`));
-      await withInterrupt((signal) => runAndCheckpointTurn(session, initialTask, question, signal, persistSession, drainQueuedMessages));
+      await withInterrupt((signal) => runAndCheckpointTurn(session, initialTask, question, signal, persistSession, drainQueuedMessages, () => reader.composing));
     }
     while (running) {
       if (stdout5.isTTY) {
@@ -17346,7 +17723,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);
+            await runAndCheckpointTurn(session, prompt, question, signal, persistSession, drainQueuedMessages, () => reader.composing);
           }, signal, async (id) => {
             const lineage = await loadSessionLineage(workspace, id);
             const restored = createSession({ model: session.model, mode: session.mode, permissions: session.currentPermissions });
@@ -17375,10 +17752,11 @@ async function runRepl(options, initialTask = "") {
         }
         continue;
       }
-      await withInterrupt((signal) => runAndCheckpointTurn(session, raw, question, signal, persistSession, drainQueuedMessages));
+      await withInterrupt((signal) => runAndCheckpointTurn(session, raw, question, signal, persistSession, drainQueuedMessages, () => reader.composing));
     }
   } finally {
     process.off("SIGTERM", terminate);
+    if (stdin5.isTTY) stdin5.off("keypress", onKeypress);
     setAskUserRuntime(void 0);
     rl.close();
     await saveTranscript(session, writeCheckpoint);
@@ -17386,9 +17764,11 @@ async function runRepl(options, initialTask = "") {
   }
   console.log(chalk11.gray("Goodbye."));
 }
-async function runTurn(session, input, question, signal, drainQueuedMessages, persist) {
+async function runTurn(session, input, question, signal, drainQueuedMessages, persist, isComposing) {
   const spinner = new Spinner();
-  const detachProgress = attachProgressUi();
+  const quiet = isGhostEnabled(session);
+  const detachProgress = quiet ? () => {
+  } : attachProgressUi();
   let deltaChars = 0;
   try {
     await session.ask(input, {
@@ -17404,11 +17784,11 @@ async function runTurn(session, input, question, signal, drainQueuedMessages, pe
       },
       onModelStart: () => {
         deltaChars = 0;
-        spinner.start();
+        if (!quiet) spinner.start(isComposing);
       },
       onModelDelta: (text) => {
         deltaChars += text.length;
-        spinner.update(`thinking (${deltaChars} chars)`);
+        if (!quiet) spinner.update(`thinking (${deltaChars} chars)`);
       },
       onModelSettled: () => spinner.stop(),
       onAssistantMessage: (message) => {
@@ -17418,14 +17798,14 @@ ${message.trim()}`);
         }
       },
       onToolStart: (call) => {
-        console.log(chalk11.dim(`  ${toolActivityLabel(call)}`));
+        if (!quiet) console.log(chalk11.dim(`  ${toolActivityLabel(call)}`));
       },
       onToolResult: (_call, result) => printToolResult2(result),
       ...drainQueuedMessages ? {
         drainQueuedMessages,
-        onQueuedMessage: () => {
+        onQueuedMessage: (message) => {
           spinner.stop();
-          console.log(chalk11.dim("  Queued message added to the current turn."));
+          console.log(chalk11.dim(`  Queued for after the current tool: ${message}`));
         }
       } : {},
       onToolDenied: (call, permission) => {
@@ -17470,9 +17850,9 @@ ${message.trim()}`);
     detachProgress();
   }
 }
-async function runAndCheckpointTurn(session, input, question, signal, persist, drainQueuedMessages) {
+async function runAndCheckpointTurn(session, input, question, signal, persist, drainQueuedMessages, isComposing) {
   try {
-    return await runTurn(session, input, question, signal, drainQueuedMessages, persist);
+    return await runTurn(session, input, question, signal, drainQueuedMessages, persist, isComposing);
   } finally {
     await persist(session);
   }
@@ -17544,6 +17924,21 @@ async function handleSlashCommand(raw, session, providerName, workspace, onClear
   const command = (name ?? "").toLowerCase();
   const argument = rest.join(" ").trim();
   switch (command) {
+    case "logs": {
+      console.log(currentDiagnosticLogPath() ?? "Diagnostic logging has not been configured for this process.");
+      return "ok";
+    }
+    case "ghost": {
+      if (argument && !["on", "off", "status"].includes(argument.toLowerCase())) {
+        console.log("Usage: /ghost [on|off|status]");
+        return "ok";
+      }
+      if (argument.toLowerCase() !== "status") {
+        setGhostEnabled(session, argument ? argument.toLowerCase() === "on" : !isGhostEnabled(session));
+      }
+      console.log(`Ghost mode: ${isGhostEnabled(session) ? "on" : "off"}. Quiet activity output; private diagnostics remain enabled. Network routing and permissions are unchanged.`);
+      return "ok";
+    }
     case "help": {
       console.log(HELP);
       const index = await listSkillCommands(workspace);
@@ -17721,6 +18116,27 @@ ${extra}`);
       }
       return "ok";
     }
+    case "output": {
+      const results = session.toSession().steps.flatMap((step) => step.toolResults);
+      if (!results.length) {
+        console.log("No saved tool output in this session.");
+        return "ok";
+      }
+      if (argument === "list") {
+        for (const [index, entry2] of results.entries()) console.log(`${index + 1}. ${toolActivityLabel(entry2.call)} (${entry2.result.ok ? "ok" : "failed"})`);
+        return "ok";
+      }
+      const selected = argument ? Number(argument) : results.length;
+      if (!Number.isSafeInteger(selected) || selected < 1 || selected > results.length) {
+        console.log(`Usage: /output [1-${results.length}|list]`);
+        return "ok";
+      }
+      const entry = results[selected - 1];
+      console.log(`${selected}. ${toolActivityLabel(entry.call)} (${entry.result.ok ? "ok" : "failed"})`);
+      console.log(entry.result.content);
+      for (const warning of getMcpArchiveWarnings(entry.result)) console.log(chalk11.yellow(`Warning: ${warning}`));
+      return "ok";
+    }
     case "tools": {
       const names = session.advertisedToolNames;
       console.log(`Advertised to the model this turn (${names.length}): ${names.join(", ")}`);
@@ -17801,10 +18217,8 @@ async function runSkillCommand(session, raw, workspace, question) {
   console.log(chalk11.red("Unknown command. Try /help."));
 }
 var LineReader = class {
-  queue = [];
-  waiters = [];
-  closed = false;
   constructor(rl) {
+    this.rl = rl;
     rl.on("line", (line) => {
       const waiter = this.waiters.shift();
       if (waiter) {
@@ -17820,6 +18234,10 @@ var LineReader = class {
       }
     });
   }
+  rl;
+  queue = [];
+  waiters = [];
+  closed = false;
   next(signal) {
     return this.waitForLine(signal, true);
   }
@@ -17830,6 +18248,10 @@ var LineReader = class {
   nextFresh(signal) {
     return this.waitForLine(signal, false);
   }
+  /** True while the user is typing a line that has not been submitted yet. */
+  get composing() {
+    return this.rl.line.length > 0;
+  }
   /**
    * Drain ordinary messages in arrival order. A slash command is a control
    * boundary and remains queued for the main REPL loop along with everything
@@ -17875,11 +18297,15 @@ var LineReader = class {
     waiter.resolve(line);
   }
 };
-function handleReplInterrupt(activeTurn) {
+function handleReplEscape(activeTurn) {
   if (activeTurn && !activeTurn.signal.aborted) {
     activeTurn.abort();
     return "abort-turn";
   }
+  return "idle";
+}
+function handleReplExit(activeTurn) {
+  activeTurn?.abort();
   return "exit-session";
 }
 function printBanner(version, providerName, model, mode, workspace, protocol, budget, diagnosticPath2) {
@@ -17946,23 +18372,142 @@ 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";
 }
-async function runAutonomousLoop(options) {
-  if (!Number.isInteger(options.maxRounds) || options.maxRounds < 1) {
-    throw new Error("maxRounds must be a positive integer.");
+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;
-  for (let round = 1; ; round += 1) {
-    const session = await options.runRound(round, previous);
-    const willResume = shouldResume(session.stopReason) && round < options.maxRounds && !options.signal?.aborted;
-    await options.onRoundEnd?.(round, session, willResume);
-    if (!willResume) return { session, rounds: round };
-    previous = session;
+  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);
   }
 }
 
@@ -17975,7 +18520,6 @@ function parsePositiveInt(value, flag) {
   return parsed;
 }
 var EXIT_INCOMPLETE_RUN = 2;
-var AUTONOMOUS_ERROR_BACKOFF_MS = 15e3;
 var NOTIFY_SUMMARY_CHARS = 1200;
 function registerRunCommand(program2) {
   program2.command("run").alias("chat").description("Run a one-shot coding agent task").argument("<task...>", "Task for the agent").option("-w, --workspace <path>", "Workspace path", ".").option("--provider <name>", "Provider: ultrac (default) or echo (offline test stub)").option("--model <model>", "Model name").option("--base-url <url>", "Ultrac API base URL (overrides ULTRAC_BASE_URL and the stored login)").option("--mode <name>", `Agent mode: ${agentModeNames.join(", ")}`).option("--max-steps <number>", "Maximum agent steps").option("--no-native-tools", "Use the legacy JSON tool protocol").option("--allow-write", "Allow file writes", false).option("--allow-shell", "Grant the model broad, unsandboxed shell access", false).option("--allow-network", "Allow HTTP(S) URL fetches", false).option("--continue <id>", "Continue from a saved session id").option("--tools <list>", "Tools to advertise: `all`, or a comma-separated list. Default: the mode's set").option("--context-tokens <number>", "Model context window in tokens (default 262144)").option("--max-tool-result-chars <number>", "Cap on one tool result in the transcript (default 6000)").option(
@@ -17986,7 +18530,7 @@ function registerRunCommand(program2) {
     "--autonomous",
     `Run with no human in the loop: write, shell and network are granted, each round may take up to ${AUTONOMOUS_MAX_STEPS} steps, and a round that runs out of steps or fails resumes on its own. With a phone channel configured (\`ultrac notify setup\`), questions go to your phone and you are told when it finishes.`,
     false
-  ).option("--max-rounds <number>", `With --autonomous: how many times a run may resume itself (default ${DEFAULT_AUTONOMOUS_MAX_ROUNDS})`).option("--notify", "Send ask_user questions and the final result to your phone (see `ultrac notify setup`)", false).option("--json", "Print the session JSON", false).action(async (taskParts, options) => {
+  ).option("--max-rounds <number>", `With --autonomous: how many times a run may resume itself (default ${DEFAULT_AUTONOMOUS_MAX_ROUNDS})`).option("--notify", "Send ask_user questions and the final result to your phone (see `ultrac notify setup`)", false).option("--verbose-tools", "Print complete tool results instead of previews", false).option("--json", "Print the session JSON", false).action(async (taskParts, options) => {
     const task = taskParts.join(" ").trim();
     if (!task) {
       throw new Error("A task is required.");
@@ -18100,14 +18644,17 @@ function registerRunCommand(program2) {
         shell: options.allowShell || config.permissions.shell,
         network: options.allowNetwork || config.permissions.network
       };
+      const roundFailures = /* @__PURE__ */ new Map();
       let result;
       try {
         result = await runAutonomousLoop({
           maxRounds,
           signal: controller.signal,
-          runRound: async (round, previous) => {
+          classifyFailure: (session) => roundFailures.get(session.id),
+          runRound: async (round, previous, roundSignal) => {
             const lineage = previous ? await loadSessionLineage(workspace, previous.id) : previousSessionLineage;
             let lastCheckpoint;
+            let checkpointFailed = false;
             try {
               const { session } = await runner.run({
                 task: previous ? AUTONOMOUS_CONTINUE_TASK : task,
@@ -18121,22 +18668,30 @@ function registerRunCommand(program2) {
                 previousSessionLineage: lineage,
                 ...toolSelection ? { tools: toolSelection } : {},
                 permissions,
-                signal: controller.signal,
+                signal: roundSignal,
                 ...autonomous ? { autonomous: { phone: Boolean(notifier) } } : {},
                 // Write the session after every step, atomically, so a run that dies
                 // partway - a crash, a kill, a closed laptop mid-scan - is on disk up to
                 // its last completed step and can be resumed with --continue rather than
                 // restarted from nothing.
                 onCheckpoint: async (session2) => {
-                  lastCheckpoint = session2;
-                  await writeCheckpoint(session2);
+                  try {
+                    const checkpointPath = await writeCheckpoint(session2);
+                    checkpointFailed = !checkpointPath;
+                    if (checkpointPath) lastCheckpoint = await loadSession(workspace, session2.id);
+                  } catch (error) {
+                    checkpointFailed = true;
+                    throw error;
+                  }
                 }
               });
               return session;
             } catch (error) {
-              if (!autonomous || !lastCheckpoint || controller.signal.aborted) throw error;
+              if (!autonomous || !lastCheckpoint || checkpointFailed || roundSignal.aborted) throw error;
+              const classification = classifyProviderError(error);
+              roundFailures.set(lastCheckpoint.id, classification);
               console.error(
-                chalk12.yellow(`Round ${round} failed: ${error.message}. Resuming from its last checkpoint.`)
+                chalk12.yellow(`Round ${round} failed (${classification.kind}). The latest checkpoint is saved.`)
               );
               return { ...lastCheckpoint, stopReason: "error" };
             }
@@ -18149,7 +18704,6 @@ function registerRunCommand(program2) {
                 `Round ${round} stopped (${session.stopReason}); resuming in round ${round + 1} of ${maxRounds}.`
               )
             );
-            if (session.stopReason === "error") await sleep(AUTONOMOUS_ERROR_BACKOFF_MS, controller.signal);
           }
         });
       } catch (error) {
@@ -18170,16 +18724,19 @@ function registerRunCommand(program2) {
           { cause: error }
         );
       }
+      if (["stalled", "elapsed_budget", "permanent_error"].includes(result.haltReason ?? "")) {
+        console.error(chalk12.yellow(`Autonomous recovery stopped: ${result.haltReason}. The latest checkpoint is saved.`));
+      }
       const stopReason = result.session.stopReason;
       for (const warning of getSessionMcpArchiveWarnings(result.session)) {
         console.error(chalk12.yellow(`Warning: ${warning}`));
       }
       if (options.json) {
         console.log(
-          JSON.stringify({ sessionPath: sessionPath2, stopReason: stopReason ?? null, session: result.session }, null, 2)
+          JSON.stringify({ sessionPath: sessionPath2, stopReason: stopReason ?? null, haltReason: result.haltReason ?? null, rounds: result.rounds, session: result.session }, null, 2)
         );
       } else {
-        printSession(result.session, sessionPath2);
+        printSession(result.session, sessionPath2, { verboseTools: options.verboseTools });
       }
       if (notifier) {
         const outcome = stopReason === "completed" ? "finished" : `stopped without finishing (${stopReason ?? "unknown"})`;
@@ -18433,17 +18990,25 @@ function registerSkillsCommand(program2) {
     console.log("");
     console.log(skill.body);
   });
-  skills.command("create").description("Scaffold a new SKILL.md").argument("<name>", "Skill name (kebab-case)").requiredOption("--description <text>", "One-line description").option("--when <text>", "When the agent should use this skill").option("--permissions <list>", "Comma-separated: write,shell,network").option("--scope <scope>", "global or project", "project").option("-w, --workspace <path>", "Workspace path", ".").action(
+  skills.command("create").description("Scaffold a new SKILL.md").argument("<name>", "Skill name (kebab-case)").requiredOption("--description <text>", "One-line description").option("--when <text>", "When the agent should use this skill").option("--permissions <list>", "Comma-separated: write,shell,network").option("--scope <scope>", "global or project", "project").option("--command <name>", "Expose this skill as a custom slash command").option("--argument-hint <text>", "Describe the slash command arguments").option("-w, --workspace <path>", "Workspace path", ".").action(
     async (name, options) => {
+      const command = options.command ? normalizeCommandName(options.command) : void 0;
+      if (command && isBuiltinSlashCommand(command)) throw new Error(`/${command} is a built-in command. Choose another skill command name.`);
+      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), {
         name,
         description: options.description,
         whenToUse: options.when,
         permissions: parsePermissions(options.permissions),
-        scope: parseScope2(options.scope)
+        scope: parseScope2(options.scope),
+        command,
+        argumentHint
       });
       console.log(`Created ${skill.scope} skill "${skill.name}" at ${skill.path}`);
       console.log("Edit that file to add the step-by-step instructions.");
+      if (command) console.log(`Invoke this skill with /${command}${argumentHint ? ` ${argumentHint}` : ""} in a trusted workspace.`);
     }
   );
   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) => {
@@ -19384,7 +19949,7 @@ ${tools.length} of ${all.length} tools advertised in ${options.mode} mode, ${ser
       );
     }
   });
-  toolsCommand.command("run").description("Execute one built-in agent tool").argument("<tool>", "Tool name").argument("[input]", "JSON object input", "{}").option("-w, --workspace <path>", "Workspace path", ".").option("--allow-write", "Allow file writes", false).option("--allow-shell", "Allow this tool to execute unsandboxed shell commands", false).option("--allow-network", "Allow HTTP(S) URL fetches", false).option("--result-json", "Print the tool result as JSON", false).action(async (tool, inputText, options) => {
+  toolsCommand.command("run").description("Execute one built-in agent tool").argument("<tool>", "Tool name").argument("[input]", "JSON object input", "{}").option("-w, --workspace <path>", "Workspace path", ".").option("--allow-write", "Allow file writes", false).option("--allow-shell", "Allow this tool to execute unsandboxed shell commands", false).option("--allow-network", "Allow HTTP(S) URL fetches", false).option("--verbose-tools", "Print the complete tool result", false).option("--result-json", "Print the tool result as JSON", false).action(async (tool, inputText, options) => {
     const input = parseToolInput(inputText);
     const result = await createDefaultToolRegistry().execute(
       { tool, input },
@@ -19400,7 +19965,7 @@ ${tools.length} of ${all.length} tools advertised in ${options.mode} mode, ${ser
     if (options.resultJson) {
       console.log(JSON.stringify({ result }, null, 2));
     } else {
-      printToolResult(result);
+      printToolResult(result, { verboseTools: options.verboseTools });
     }
     if (!result.ok) {
       process.exitCode = 1;