@kernelonpanic/kitcode 1.4.2 → 1.4.5

package/dist/index.js

@@ -81,6 +81,14 @@ var configSchema = z.object({
   // Manual override for the model's context window. Unset means the window
   // comes from the provider catalogue or the endpoint's model list.
   contextWindow: z.number().int().min(1e3).max(1e7).optional(),
+  // Extra instructions appended to the built-in system prompt on every turn.
+  systemPrompt: z.string().max(2e4).optional(),
+  // When false, systemPrompt is kept in the config but not sent to the model.
+  systemPromptEnabled: z.boolean().default(true),
+  // Hard cap on model calls in one turn. Higher values let large refactors
+  // finish; 0 disables the cap entirely (use with care — a runaway loop will
+  // keep burning tokens until you press Esc).
+  maxTurnSteps: z.number().int().min(0).max(1e3).default(256),
   maxTokens: z.number().int().positive().max(2e5).default(64e3),
   budget: budgetSchema.default({
     maxTokensPerTurn: 1e7,
@@ -170,7 +178,10 @@ function describeProviderFailure(error, providerId, knownSecrets = []) {
 }
 function statusOf(error) {
   const value = prop(error, "status") ?? prop(error, "statusCode");
-  return typeof value === "number" && value >= 100 ? value : void 0;
+  if (typeof value === "number" && value >= 100) return value;
+  const code = prop(error, "code") ?? prop(prop(error, "error"), "code");
+  const numeric = typeof code === "string" && /^\d{3}$/.test(code) ? Number(code) : code;
+  return typeof numeric === "number" && numeric >= 400 && numeric <= 599 ? numeric : void 0;
 }
 function isUserAbort(error, signal) {
   return signal?.aborted === true || abortKind(error) === "user";
@@ -1440,13 +1451,20 @@ function resolveEffort(effort, messages) {
   return text.length > 500 || HARD_TASK.test(text) ? "high" : "medium";
 }
 var rejected = /* @__PURE__ */ new Set();
+var capped = /* @__PURE__ */ new Map();
+var RANK = { low: 0, medium: 1, high: 2, xhigh: 3, max: 4 };
 function markEffortRejected(providerId, model) {
   rejected.add(`${providerId}/${model}`);
 }
+function markEffortCapped(providerId, model, level) {
+  capped.set(`${providerId}/${model}`, level);
+}
 function effectiveEffort(kind, model, effort, messages, providerId) {
   if (providerId !== void 0 && rejected.has(`${providerId}/${model}`)) return void 0;
   const requested = resolveEffort(effort, messages);
-  return kind === "openai" ? openAiEffort(model, requested) : anthropicEffort(model, requested);
+  const level = kind === "openai" ? openAiEffort(model, requested) : anthropicEffort(model, requested);
+  const cap = providerId === void 0 ? void 0 : capped.get(`${providerId}/${model}`);
+  return level && cap && RANK[level] > RANK[cap] ? cap : level;
 }
 function anthropicEffort(model, effort) {
   if (!effort) return void 0;
@@ -1878,7 +1896,7 @@ function validSessionId(id) {
 var MAX_PAUSE_RESUMES = 5;
 var MAX_RETRIES2 = 3;
 var INITIAL_BACKOFF_MS = 1e3;
-var MAX_TURN_STEPS = 64;
+var DEFAULT_MAX_TURN_STEPS = 256;
 function createExecutionLane() {
   let tail2 = Promise.resolve();
   return {
@@ -1890,6 +1908,8 @@ function createExecutionLane() {
   };
 }
 async function runTurn(cfg, history, hooks, signal) {
+  const maxTurnSteps = cfg.maxTurnSteps ?? DEFAULT_MAX_TURN_STEPS;
+  const hasStepCap = maxTurnSteps > 0;
   const permissionLane = cfg.permissionLane ?? createExecutionLane();
   const originalHooks = hooks;
   hooks = {
@@ -1904,11 +1924,12 @@ async function runTurn(cfg, history, hooks, signal) {
       hooks.onEvent({ type: "turn_end", stopReason: "aborted" });
       return sanitizeHistory(messages);
     }
-    if (++steps > MAX_TURN_STEPS) {
+    steps += 1;
+    if (hasStepCap && steps > maxTurnSteps) {
       hooks.onEvent({
         type: "notice",
         level: "warn",
-        text: `Stopped after ${MAX_TURN_STEPS} model calls without finishing, to avoid burning tokens in a loop. Ask again with a narrower request.`
+        text: `Stopped after ${maxTurnSteps} model calls without finishing, to avoid burning tokens in a loop. Ask again with a narrower request.`
       });
       hooks.onEvent({ type: "turn_end", stopReason: "max_tokens" });
       return messages;
@@ -2137,18 +2158,18 @@ function sleep(ms, signal) {
     signal.addEventListener("abort", onAbort, { once: true });
   });
 }
+var CHARS_PER_TOKEN = 4;
 function estimateRequestTokens(cfg, messages) {
   let characters3 = cfg.system.length;
   try {
     characters3 += JSON.stringify(
       messages,
-      (_key, value) => typeof value === "object" && value !== null && value.type === "image" ? `[image:${"#".repeat(2e3)}]` : value
+      (_key, value) => typeof value === "object" && value !== null && value.type === "image" ? `[image:${"#".repeat(6e3)}]` : value
     ).length;
     characters3 += JSON.stringify(cfg.tools.schemas()).length;
   } catch {
-    return Math.max(1, characters3);
   }
-  return Math.max(1, characters3);
+  return Math.max(1, Math.ceil(characters3 / CHARS_PER_TOKEN));
 }
 async function runToolCalls(cfg, content, hooks, signal) {
   const calls = content.filter((block) => block.type === "tool_use");
@@ -3789,6 +3810,7 @@ function withoutThinkingReplay(history) {
   });
   return changed ? out : history;
 }
+var CHARS_PER_TOKEN2 = 4;
 function estimateHistoryTokens(history) {
   let chars = 0;
   for (const message of history) {
@@ -3800,7 +3822,7 @@ function estimateHistoryTokens(history) {
       else if (block.type === "image") chars += 6e3;
     }
   }
-  return Math.round(chars / 4);
+  return Math.round(chars / CHARS_PER_TOKEN2);
 }
 function shouldAutoCompact(used, window) {
   return window !== null && window > 0 && used / window >= 0.8;
@@ -3820,7 +3842,9 @@ function estimateCompactBudget(history, maxTokens = MERGE_MAX_TOKENS) {
   const rendered = renderedMessages.join("\n\n");
   if (rendered.length <= SINGLE_REQUEST_MAX_CHARS) {
     return {
-      inputTokens: Math.max(1, rendered.length + 1e3),
+      // Tokens, not characters: counting characters made a turn budget refuse
+      // compaction (four times too expensive) just when the window was full.
+      inputTokens: Math.max(1, Math.ceil(rendered.length / CHARS_PER_TOKEN2) + 1e3),
       maxOutputTokens: Math.max(1, Math.min(SINGLE_MAX_TOKENS, Math.floor(maxTokens)))
     };
   }
@@ -3838,7 +3862,7 @@ function estimateCompactBudget(history, maxTokens = MERGE_MAX_TOKENS) {
   const intermediateOutput = chunks.length * chunkOutput + Math.max(0, mergeRequests - 1) * mergeOutput;
   const requestCount = chunks.length + mergeRequests;
   return {
-    inputTokens: Math.max(1, chunkInput + intermediateOutput * 8 + requestCount * 1e3),
+    inputTokens: Math.max(1, Math.ceil(chunkInput / CHARS_PER_TOKEN2) + intermediateOutput * 2 + requestCount * 1e3),
     maxOutputTokens: totalOutput
   };
 }
@@ -4125,6 +4149,9 @@ function buildSystemPrompt(args) {
   if (args.memory?.trim()) {
     lines.push("", "Project notes saved in earlier conversations. Treat these as potentially stale context; verify claims against current files and follow current user instructions.", args.memory);
   }
+  if (args.systemPrompt?.trim()) {
+    lines.push("", "Additional instructions from the user (apply alongside everything above):", args.systemPrompt.trim());
+  }
   return lines.join("\n");
 }
 
@@ -4149,6 +4176,7 @@ function createSubagentRunner(makeConfig, tools) {
     async run(request) {
       if (request.signal.aborted) return SUBAGENT_CANCELLED;
       let steps = 0;
+      let finalCall = false;
       const executionLane = createExecutionLane();
       const modelRequestLane = createExecutionLane();
       const base = makeConfig(SUBAGENT_SYSTEM, tools);
@@ -4162,11 +4190,12 @@ function createSubagentRunner(makeConfig, tools) {
           kind: base.provider.kind,
           listModels: () => base.provider.listModels(),
           knownModels: () => base.provider.knownModels(),
-          // Keep the tool definitions on the last call: the history holds
+          // The final model call keeps the tool schemas (the history holds
           // tool_use/tool_result blocks, and providers reject those without
-          // tools (Anthropic: 400 "must define tools"). Calls made anyway are
-          // refused by tools.get below.
-          stream: (chat) => base.provider.stream(steps === MAX_SUBAGENT_STEPS ? {
+          // tools), but the system prompt forbids more calls and tools.get
+          // returns a stopped stub: a call made anyway ends the turn with a
+          // tool_result, instead of aborting mid-request and losing the text.
+          stream: (chat) => base.provider.stream(finalCall ? {
             ...chat,
             system: `${chat.system}
 
@@ -4174,7 +4203,20 @@ This is your last model call. Do not call tools. Return your findings now, clear
           } : chat)
         },
         tools: {
-          get: (name) => name === TASK_TOOL_NAME || steps >= MAX_SUBAGENT_STEPS ? void 0 : base.tools.get(name),
+          get: (name) => {
+            if (name === TASK_TOOL_NAME) return void 0;
+            const tool = base.tools.get(name);
+            if (!tool) return void 0;
+            if (!finalCall) return tool;
+            return {
+              ...tool,
+              permission: () => "allow",
+              execute: () => Promise.resolve({
+                content: "Tool budget exhausted: this was your last model call. Write the final answer now from what you already gathered.",
+                isError: true
+              })
+            };
+          },
           schemas: () => base.tools.schemas().filter((schema) => schema.name !== TASK_TOOL_NAME)
         },
         system: `${SUBAGENT_SYSTEM}
@@ -4185,7 +4227,11 @@ Working directory: ${base.cwd}`
       const signal = AbortSignal.any([request.signal, limit.signal]);
       const hooks = {
         onEvent(event) {
-          if (event.type === "turn_start" && ++steps > MAX_SUBAGENT_STEPS) limit.abort();
+          if (event.type === "turn_start") {
+            ++steps;
+            if (steps > MAX_SUBAGENT_STEPS + 1) limit.abort();
+            else if (steps >= MAX_SUBAGENT_STEPS) finalCall = true;
+          }
           if (event.type === "tool_start") request.onProgress(brief(event.summary, 80));
           if (event.type === "subagent_start" || event.type === "subagent_end" || event.type === "subagent_event") return;
           request.onEvent?.(event);
@@ -4400,7 +4446,7 @@ function clip(value) {
 // package.json
 var package_default = {
   name: "@kernelonpanic/kitcode",
-  version: "1.4.2",
+  version: "1.4.5",
   description: "Terminal coding agent with a config you never have to write by hand",
   type: "module",
   license: "MIT",
@@ -4468,7 +4514,22 @@ var package_default = {
 
 // src/version.ts
 var KITCODE_VERSION = package_default.version;
-var KITCODE_COMMIT = true ? "6b1ec0a742c44892447e71f477c068d8ba514c6a" : "development";
+var KITCODE_COMMIT = true ? "aac7d92efa29456e6757bdef12abafb489064dbe" : "development";
+function kitcodeUserAgent(sdkUserAgent2) {
+  return `KitCode/${KITCODE_VERSION} ${sdkUserAgent2}`.trim();
+}
+function sdkUserAgent(client) {
+  const read = client?.getUserAgent;
+  try {
+    return typeof read === "function" ? String(read.call(client)) : "";
+  } catch {
+    return "";
+  }
+}
+function withKitcodeUserAgent(sdkUserAgent2, configured = {}) {
+  const overridden = Object.keys(configured).some((name) => name.toLowerCase() === "user-agent");
+  return overridden ? { ...configured } : { "User-Agent": kitcodeUserAgent(sdkUserAgent2), ...configured };
+}
 
 // src/mcp/client.ts
 var clientInfo = { name: "kitcode", version: KITCODE_VERSION };
@@ -5047,13 +5108,14 @@ var KNOWN_MODELS = [
   knownModel("claude-fable-5", "Claude Fable 5", 1e6, 128e3)
 ];
 function createAnthropicProvider(args) {
-  const client = new Anthropic2({
+  const options = {
     apiKey: args.apiKey,
     baseURL: args.baseUrl,
-    defaultHeaders: args.headers,
     maxRetries: MAX_RETRIES,
     timeout: args.timeoutMs ?? REQUEST_TIMEOUT_MS
-  });
+  };
+  const userAgent = sdkUserAgent(new Anthropic2(options));
+  const client = new Anthropic2({ ...options, defaultHeaders: withKitcodeUserAgent(userAgent, args.headers) });
   return {
     id: args.id,
     kind: "anthropic",
@@ -5062,7 +5124,35 @@ function createAnthropicProvider(args) {
     knownModels: () => KNOWN_MODELS
   };
 }
+var thinkingRejected = /* @__PURE__ */ new Set();
 async function* streamTurn(client, providerId, apiKey2, req) {
+  const key = `${providerId}/${req.model}`;
+  let thinking = req.thinking === true && !thinkingRejected.has(key);
+  for (; ; ) {
+    let streamed = false;
+    try {
+      for await (const event of streamOnce(client, providerId, apiKey2, req, thinking)) {
+        if (event.type !== "rate_limits" && event.type !== "usage") streamed = true;
+        yield event;
+      }
+      return;
+    } catch (error) {
+      if (!streamed && thinking && refusesThinking(error)) {
+        thinkingRejected.add(key);
+        thinking = false;
+        continue;
+      }
+      throw error;
+    }
+  }
+}
+function refusesThinking(error) {
+  if (!(error instanceof ProviderError)) return false;
+  if (error.status !== void 0 && error.status !== 400 && error.status !== 422) return false;
+  const cause = error.cause instanceof Error ? error.cause.message : "";
+  return /thinking|budget_tokens|adaptive/i.test(`${error.message} ${cause}`);
+}
+async function* streamOnce(client, providerId, apiKey2, req, thinkingOn) {
   const params = {
     model: req.model,
     max_tokens: req.maxTokens,
@@ -5070,7 +5160,7 @@ async function* streamTurn(client, providerId, apiKey2, req) {
     messages: toMessageParams(req.messages),
     tools: toToolParams(req.tools)
   };
-  if (req.thinking) {
+  if (thinkingOn) {
     const thinking2 = thinkingParam(req.model, req.maxTokens);
     if (thinking2) params.thinking = thinking2;
   }
@@ -5232,7 +5322,7 @@ var THINKING_BUDGET = 16e3;
 var MIN_THINKING_BUDGET = 1024;
 function thinkingParam(model, maxTokens) {
   const id = (model.split("/").at(-1) ?? model).replace(/^(?:[a-z]{2}\.)?anthropic\./, "");
-  if (!BUDGET_THINKING.test(id)) return { type: "adaptive", display: "summarized" };
+  if (id.startsWith("claude-") && !BUDGET_THINKING.test(id)) return { type: "adaptive", display: "summarized" };
   const budget = Math.min(THINKING_BUDGET, maxTokens - 1);
   return budget >= MIN_THINKING_BUDGET ? { type: "enabled", budget_tokens: budget } : void 0;
 }
@@ -5252,13 +5342,14 @@ var FINISH_REASONS = {
   content_filter: "refusal"
 };
 function createOpenAiProvider(args) {
-  const client = new OpenAI2({
+  const options = {
     baseURL: args.baseUrl,
     apiKey: args.apiKey,
-    defaultHeaders: args.headers,
     maxRetries: MAX_RETRIES,
     timeout: args.timeoutMs ?? REQUEST_TIMEOUT_MS
-  });
+  };
+  const userAgent = sdkUserAgent(new OpenAI2(options));
+  const client = new OpenAI2({ ...options, defaultHeaders: withKitcodeUserAgent(userAgent, args.headers) });
   return {
     id: args.id,
     kind: "openai",
@@ -5275,7 +5366,7 @@ async function* streamTurn2(client, providerId, apiKey2, req) {
   for (; ; ) {
     let streamed = false;
     try {
-      for await (const event of streamOnce(client, providerId, apiKey2, req, effort, thinkingOff, tokenField)) {
+      for await (const event of streamOnce2(client, providerId, apiKey2, req, effort, thinkingOff, tokenField)) {
         if (event.type !== "rate_limits" && event.type !== "usage") streamed = true;
         yield event;
       }
@@ -5288,8 +5379,14 @@ async function* streamTurn2(client, providerId, apiKey2, req) {
         continue;
       }
       if (effort && rejectsField(error, /reasoning|effort/i)) {
-        markEffortRejected(providerId, req.model);
-        effort = void 0;
+        const lower = effort === "xhigh" || effort === "max" ? "high" : effort === "high" ? "medium" : void 0;
+        if (lower) {
+          markEffortCapped(providerId, req.model, lower);
+          effort = lower;
+        } else {
+          markEffortRejected(providerId, req.model);
+          effort = void 0;
+        }
         continue;
       }
       if (thinkingOff && rejectsField(error, /thinking/i)) {
@@ -5314,11 +5411,12 @@ function thinkingOffParams(model) {
   return void 0;
 }
 function rejectsField(error, field2) {
-  if (!(error instanceof ProviderError) || error.status !== 400 && error.status !== 422) return false;
+  if (!(error instanceof ProviderError)) return false;
+  if (error.status !== void 0 && error.status !== 400 && error.status !== 422) return false;
   const cause = error.cause instanceof Error ? error.cause.message : "";
   return field2.test(`${error.message} ${cause}`);
 }
-async function* streamOnce(client, providerId, apiKey2, req, effort, thinkingOff, tokenField) {
+async function* streamOnce2(client, providerId, apiKey2, req, effort, thinkingOff, tokenField) {
   let text = "";
   let thinking = "";
   let finishReason = null;
@@ -7227,7 +7325,8 @@ async function boot(options) {
     cwd: options.cwd,
     toolNames: tools.list().map((tool) => tool.name),
     skills: skillCatalogue,
-    memory: projectMemory
+    memory: projectMemory,
+    systemPrompt: config.systemPromptEnabled ? config.systemPrompt : void 0
   });
   let modelRef = session.model || config.model || "";
   if (options.modelRef) modelRef = options.modelRef;
@@ -7297,6 +7396,7 @@ async function boot(options) {
       maxTokens: config.maxTokens,
       effort: config.effort,
       thinking: config.thinking,
+      maxTurnSteps: config.maxTurnSteps,
       budget: activeBudget,
       checkpoint: activeCheckpoint,
       trimContext: (messages) => trimForWindow(resolved.provider.kind, messages)
@@ -7677,6 +7777,31 @@ async function boot(options) {
         draft.lang = lang;
       });
     },
+    getSystemPrompt: () => config.systemPrompt ?? "",
+    isSystemPromptEnabled: () => config.systemPromptEnabled && config.systemPrompt !== void 0 && config.systemPrompt.trim() !== "",
+    async setSystemPrompt(text) {
+      const trimmed = text.trim();
+      await persistConfig((draft) => {
+        if (trimmed === "") delete draft.systemPrompt;
+        else draft.systemPrompt = trimmed;
+      });
+    },
+    async setSystemPromptEnabled(enabled) {
+      await persistConfig((draft) => {
+        draft.systemPromptEnabled = enabled;
+      });
+    },
+    async loadSystemPromptFile(requestedPath) {
+      const { readFile: readFile15 } = await import("fs/promises");
+      const resolved = path15.resolve(options.cwd, requestedPath);
+      return readFile15(resolved, "utf8");
+    },
+    getMaxTurnSteps: () => config.maxTurnSteps,
+    async setMaxTurnSteps(steps) {
+      await persistConfig((draft) => {
+        draft.maxTurnSteps = steps;
+      });
+    },
     getAccent: () => config.theme.accent,
     async setAccent(value) {
       await persistConfig((draft) => {
@@ -8041,7 +8166,7 @@ ${recovered.removed === 1 ? "The image was" : `${recovered.removed} images were`
 }
 function imageRejection(error, history) {
   const status = error?.status;
-  if (typeof status !== "number" || ![400, 413, 415, 422].includes(status)) return null;
+  if (status !== void 0 && (typeof status !== "number" || ![400, 413, 415, 422].includes(status))) return null;
   const message = error instanceof Error ? error.message : String(error);
   if (status !== 413 && !/image|vision|multi-?modal/i.test(message)) return null;
   const result = withoutImages(history);
@@ -8257,7 +8382,7 @@ function validateKey(value) {
 import { render } from "ink";
 
 // src/ui/App.tsx
-import { Box as Box14, Text as Text13, useApp, useInput as useInput3, useStdout as useStdout2 } from "ink";
+import { Box as Box14, Text as Text13, useApp, useInput as useInput4, useStdout as useStdout2 } from "ink";
 import { useCallback, useEffect as useEffect4, useMemo as useMemo6, useRef as useRef5, useState as useState8 } from "react";
 
 // src/ui/terminal-size.ts
@@ -8387,7 +8512,7 @@ function splitCommandLine(raw) {
 }
 
 // src/ui/speed.ts
-var CHARS_PER_TOKEN = 4;
+var CHARS_PER_TOKEN3 = 4;
 var MIN_LIVE_MS = 1e3;
 function createSpeedMeter() {
   return { streamedChars: 0, firstTokenAt: null, last: null };
@@ -8414,7 +8539,7 @@ function readSpeed(meter, busy, now = Date.now()) {
   if (busy && meter.firstTokenAt !== null && meter.streamedChars > 0) {
     const ms = now - meter.firstTokenAt;
     if (ms >= MIN_LIVE_MS) {
-      return { tokensPerSecond: meter.streamedChars / CHARS_PER_TOKEN / (ms / 1e3), live: true };
+      return { tokensPerSecond: meter.streamedChars / CHARS_PER_TOKEN3 / (ms / 1e3), live: true };
     }
   }
   return meter.last === null || !Number.isFinite(meter.last) ? null : { tokensPerSecond: meter.last, live: false };
@@ -8443,6 +8568,8 @@ var COMMANDS = [
   { name: "mcp", args: "[add|list|delete|enable|disable]" },
   { name: "attach", args: "<path|clipboard|clear>" },
   { name: "memory", args: "[show|set <text>|clear]" },
+  { name: "systemp", args: "[set <text>|clear]", ...BUSY_SAFE },
+  { name: "steps", args: "[count]", ...BUSY_SAFE },
   { name: "compact" },
   { name: "update" },
   { name: "checker", ...BUSY_SAFE },
@@ -8816,6 +8943,17 @@ ${url}`,
   memoryEmpty: "Project memory is empty.",
   memoryClearAsk: "Clear project memory?",
   memoryReplaceAsk: "Replace all project memory notes with this text?",
+  systemPromptTitle: "System prompt addition",
+  systemPromptUsage: "/systemp [show] \xB7 /systemp set <text> \xB7 /systemp clear",
+  systemPromptEmpty: "No extra system prompt. Set one with /systemp set <text>.",
+  systemPromptSet: "System prompt addition saved.",
+  systemPromptCleared: "System prompt addition cleared.",
+  systemPromptEnabled: "System prompt enabled.",
+  systemPromptDisabled: "System prompt disabled (kept in config).",
+  stepsCurrent: (n) => n === 0 ? "Model calls per turn: unlimited" : `Model calls per turn: ${n}`,
+  stepsSet: (n) => `Model calls per turn set to ${n}`,
+  stepsUnlimited: "Model calls per turn: unlimited (0). The turn budget still applies.",
+  stepsInvalid: "Usage: /steps <0-1000> (0 = unlimited)",
   promptDeleted: (name) => `Deleted prompt "${name}"`,
   promptNotFound: (name) => `Prompt "${name}" not found.`,
   promptsEmpty: "No saved prompts. Use /prompt save <name>.",
@@ -8858,6 +8996,8 @@ ${url}`,
     theme: "change the accent colour",
     lang: "change the interface language",
     memory: "view, replace or clear project memory",
+    systemp: "view, set, load from file, or toggle the extra system prompt",
+    steps: "cap model calls per turn",
     prompt: "insert or save a prompt",
     "prompt save": "save the current or recent text as a prompt",
     "prompt delete": "delete a saved prompt",
@@ -9053,6 +9193,17 @@ ${url}`,
   memoryEmpty: "\u041F\u0430\u043C\u044F\u0442\u044C \u043F\u0440\u043E\u0435\u043A\u0442\u0430 \u043F\u0443\u0441\u0442\u0430.",
   memoryClearAsk: "\u041E\u0447\u0438\u0441\u0442\u0438\u0442\u044C \u043F\u0430\u043C\u044F\u0442\u044C \u043F\u0440\u043E\u0435\u043A\u0442\u0430?",
   memoryReplaceAsk: "\u0417\u0430\u043C\u0435\u043D\u0438\u0442\u044C \u0432\u0441\u0435 \u0437\u0430\u043C\u0435\u0442\u043A\u0438 \u043F\u0430\u043C\u044F\u0442\u0438 \u043F\u0440\u043E\u0435\u043A\u0442\u0430 \u044D\u0442\u0438\u043C \u0442\u0435\u043A\u0441\u0442\u043E\u043C?",
+  systemPromptTitle: "\u0414\u043E\u043F\u043E\u043B\u043D\u0435\u043D\u0438\u0435 \u043A \u0441\u0438\u0441\u0442\u0435\u043C\u043D\u043E\u043C\u0443 \u043F\u0440\u043E\u043C\u043F\u0442\u0443",
+  systemPromptUsage: "/systemp [show] \xB7 /systemp set <\u0442\u0435\u043A\u0441\u0442> \xB7 /systemp clear",
+  systemPromptEmpty: "\u0414\u043E\u043F\u043E\u043B\u043D\u0435\u043D\u0438\u044F \u043A \u0441\u0438\u0441\u0442\u0435\u043C\u043D\u043E\u043C\u0443 \u043F\u0440\u043E\u043C\u043F\u0442\u0443 \u043D\u0435\u0442. \u0417\u0430\u0434\u0430\u0439 \u0447\u0435\u0440\u0435\u0437 /systemp set <\u0442\u0435\u043A\u0441\u0442>.",
+  systemPromptSet: "\u0414\u043E\u043F\u043E\u043B\u043D\u0435\u043D\u0438\u0435 \u043A \u0441\u0438\u0441\u0442\u0435\u043C\u043D\u043E\u043C\u0443 \u043F\u0440\u043E\u043C\u043F\u0442\u0443 \u0441\u043E\u0445\u0440\u0430\u043D\u0435\u043D\u043E.",
+  systemPromptCleared: "\u0414\u043E\u043F\u043E\u043B\u043D\u0435\u043D\u0438\u0435 \u043A \u0441\u0438\u0441\u0442\u0435\u043C\u043D\u043E\u043C\u0443 \u043F\u0440\u043E\u043C\u043F\u0442\u0443 \u0443\u0434\u0430\u043B\u0435\u043D\u043E.",
+  systemPromptEnabled: "\u0414\u043E\u043F\u043E\u043B\u043D\u0435\u043D\u0438\u0435 \u043A \u0441\u0438\u0441\u0442\u0435\u043C\u043D\u043E\u043C\u0443 \u043F\u0440\u043E\u043C\u043F\u0442\u0443 \u0432\u043A\u043B\u044E\u0447\u0435\u043D\u043E.",
+  systemPromptDisabled: "\u0414\u043E\u043F\u043E\u043B\u043D\u0435\u043D\u0438\u0435 \u043A \u0441\u0438\u0441\u0442\u0435\u043C\u043D\u043E\u043C\u0443 \u043F\u0440\u043E\u043C\u043F\u0442\u0443 \u0432\u044B\u043A\u043B\u044E\u0447\u0435\u043D\u043E (\u0441\u043E\u0445\u0440\u0430\u043D\u0435\u043D\u043E \u0432 \u043A\u043E\u043D\u0444\u0438\u0433\u0435).",
+  stepsCurrent: (n) => n === 0 ? "\u0412\u044B\u0437\u043E\u0432\u043E\u0432 \u043C\u043E\u0434\u0435\u043B\u0438 \u0437\u0430 \u0445\u043E\u0434: \u0431\u0435\u0437 \u043B\u0438\u043C\u0438\u0442\u0430" : `\u0412\u044B\u0437\u043E\u0432\u043E\u0432 \u043C\u043E\u0434\u0435\u043B\u0438 \u0437\u0430 \u0445\u043E\u0434: ${n}`,
+  stepsSet: (n) => `\u0412\u044B\u0437\u043E\u0432\u043E\u0432 \u043C\u043E\u0434\u0435\u043B\u0438 \u0437\u0430 \u0445\u043E\u0434 \u0443\u0441\u0442\u0430\u043D\u043E\u0432\u043B\u0435\u043D\u043E: ${n}`,
+  stepsUnlimited: "\u0412\u044B\u0437\u043E\u0432\u043E\u0432 \u043C\u043E\u0434\u0435\u043B\u0438 \u0437\u0430 \u0445\u043E\u0434: \u0431\u0435\u0437 \u043B\u0438\u043C\u0438\u0442\u0430 (0). \u0411\u044E\u0434\u0436\u0435\u0442 \u0442\u043E\u043A\u0435\u043D\u043E\u0432 \u0432\u0441\u0451 \u0435\u0449\u0451 \u0434\u0435\u0439\u0441\u0442\u0432\u0443\u0435\u0442.",
+  stepsInvalid: "\u0418\u0441\u043F\u043E\u043B\u044C\u0437\u043E\u0432\u0430\u043D\u0438\u0435: /steps <0-1000> (0 = \u0431\u0435\u0437 \u043B\u0438\u043C\u0438\u0442\u0430)",
   promptDeleted: (name) => `\u041F\u0440\u043E\u043C\u0442 \xAB${name}\xBB \u0443\u0434\u0430\u043B\u0451\u043D`,
   promptNotFound: (name) => `\u041F\u0440\u043E\u043C\u0442 \xAB${name}\xBB \u043D\u0435 \u043D\u0430\u0439\u0434\u0435\u043D.`,
   promptsEmpty: "\u0421\u043E\u0445\u0440\u0430\u043D\u0451\u043D\u043D\u044B\u0445 \u043F\u0440\u043E\u043C\u0442\u043E\u0432 \u043D\u0435\u0442. \u0418\u0441\u043F\u043E\u043B\u044C\u0437\u0443\u0439 /prompt save <\u0438\u043C\u044F>.",
@@ -9095,6 +9246,8 @@ ${url}`,
     theme: "\u0441\u043C\u0435\u043D\u0438\u0442\u044C \u0446\u0432\u0435\u0442 \u0430\u043A\u0446\u0435\u043D\u0442\u0430",
     lang: "\u0441\u043C\u0435\u043D\u0438\u0442\u044C \u044F\u0437\u044B\u043A \u0438\u043D\u0442\u0435\u0440\u0444\u0435\u0439\u0441\u0430",
     memory: "\u043F\u043E\u043A\u0430\u0437\u0430\u0442\u044C, \u0437\u0430\u043C\u0435\u043D\u0438\u0442\u044C \u0438\u043B\u0438 \u043E\u0447\u0438\u0441\u0442\u0438\u0442\u044C \u043F\u0430\u043C\u044F\u0442\u044C \u043F\u0440\u043E\u0435\u043A\u0442\u0430",
+    systemp: "\u043F\u043E\u043A\u0430\u0437\u0430\u0442\u044C, \u0437\u0430\u0434\u0430\u0442\u044C, \u0437\u0430\u0433\u0440\u0443\u0437\u0438\u0442\u044C \u0438\u0437 \u0444\u0430\u0439\u043B\u0430 \u0438\u043B\u0438 \u0432\u043A\u043B\u044E\u0447\u0438\u0442\u044C/\u0432\u044B\u043A\u043B\u044E\u0447\u0438\u0442\u044C \u0434\u043E\u043F\u043E\u043B\u043D\u0435\u043D\u0438\u0435 \u043A \u0441\u0438\u0441\u0442\u0435\u043C\u043D\u043E\u043C\u0443 \u043F\u0440\u043E\u043C\u043F\u0442\u0443",
+    steps: "\u043B\u0438\u043C\u0438\u0442 \u0432\u044B\u0437\u043E\u0432\u043E\u0432 \u043C\u043E\u0434\u0435\u043B\u0438 \u0437\u0430 \u0445\u043E\u0434",
     prompt: "\u0432\u0441\u0442\u0430\u0432\u0438\u0442\u044C \u0438\u043B\u0438 \u0441\u043E\u0445\u0440\u0430\u043D\u0438\u0442\u044C \u043F\u0440\u043E\u043C\u0442",
     skills: "\u0441\u043F\u0438\u0441\u043E\u043A \u0443\u0441\u0442\u0430\u043D\u043E\u0432\u043B\u0435\u043D\u043D\u044B\u0445 \u0441\u043A\u0438\u043B\u043B\u043E\u0432",
     "prompt delete": "\u0443\u0434\u0430\u043B\u0438\u0442\u044C \u0441\u043E\u0445\u0440\u0430\u043D\u0451\u043D\u043D\u044B\u0439 \u043F\u0440\u043E\u043C\u0442",
@@ -9273,18 +9426,30 @@ function LanguagePicker({ onPick }) {
 }
 
 // src/ui/components/Onboarding.tsx
-import { Box as Box4, Text as Text4 } from "ink";
+import { Box as Box4, Text as Text4, useInput as useInput2 } from "ink";
 import Spinner from "ink-spinner";
 import TextInput from "ink-text-input";
 import { useState as useState2 } from "react";
 import { jsx as jsx4, jsxs as jsxs4 } from "react/jsx-runtime";
-function Onboarding({ onSubmit }) {
+function Onboarding({
+  onSubmit,
+  onCancel
+}) {
   const theme = useTheme();
   const strings = useStrings();
   const [step, setStep] = useState2("url");
   const [url, setUrl] = useState2("");
   const [key, setKey] = useState2("");
   const [error, setError] = useState2("");
+  useInput2((_input, inputKey) => {
+    if (!inputKey.escape || step === "working") return;
+    if (step === "key") {
+      setError("");
+      setStep("url");
+    } else {
+      onCancel?.();
+    }
+  });
   const submitKey = async (value) => {
     if (value.trim() === "") return;
     setStep("working");
@@ -10290,13 +10455,12 @@ function ContextMeter({
 }
 
 // src/ui/components/SubagentChat.tsx
-import { Box as Box12, Text as Text12, useInput as useInput2 } from "ink";
+import { Box as Box12, Text as Text12, useInput as useInput3 } from "ink";
 import { useState as useState7 } from "react";
 
 // src/ui/components/Transcript.tsx
 import { Box as Box11, Static, Text as Text11 } from "ink";
 import { memo as memo2, useEffect as useEffect3, useMemo as useMemo5, useRef as useRef4, useState as useState6 } from "react";
-import Spinner2 from "ink-spinner";
 import stringWidth4 from "string-width";
 
 // src/ui/markdown.tsx
@@ -11186,10 +11350,7 @@ function AssistantView({ bubble: source, maxRows }) {
   return /* @__PURE__ */ jsxs11(Box11, { flexDirection: "column", marginTop: 1, children: [
     frameThinking !== "" && /* @__PURE__ */ jsx11(Box11, { flexDirection: "column", maxHeight: thinkingBudget, overflowY: "hidden", children: /* @__PURE__ */ jsx11(Markdown, { dim: true, children: frameThinking }) }),
     bubble.streaming ? /* @__PURE__ */ jsx11(Text11, { children: frameText }) : /* @__PURE__ */ jsx11(Markdown, { children: bubble.text }),
-    bubble.streaming && bubble.text === "" && /* @__PURE__ */ jsxs11(Text11, { dimColor: true, children: [
-      /* @__PURE__ */ jsx11(Spinner2, { type: "dots" }),
-      " thinking"
-    ] })
+    bubble.streaming && bubble.text === "" && /* @__PURE__ */ jsx11(Text11, { dimColor: true, children: "thinking\u2026" })
   ] });
 }
 function clipTextToRows(text, maxRows, columns) {
@@ -11350,7 +11511,7 @@ function SubagentChat({
   const strings = useStrings();
   const [offset, setOffset] = useState7(0);
   const total = bubble?.bubbles.length ?? 0;
-  useInput2((_input, key) => {
+  useInput3((_input, key) => {
     if (key.escape) onClose();
     else if (key.upArrow) setOffset((value) => Math.min(Math.max(0, total - 1), value + 1));
     else if (key.downArrow) setOffset((value) => Math.max(0, value - 1));
@@ -11399,25 +11560,44 @@ function SubagentChat({
 
 // src/ui/components/TerminalViewport.tsx
 import { Box as Box13 } from "ink";
-import { jsx as jsx13 } from "react/jsx-runtime";
-var INTERACTIVE_CHROME_ROWS = 11;
+import { jsx as jsx13, jsxs as jsxs13 } from "react/jsx-runtime";
+var CHROME_ROWS = 16;
 var MAX_LIVE_ROWS = 11;
 var MIN_LIVE_ROWS = 4;
-function liveTranscriptRows(rows) {
+var BOTTOM_SLACK_ROWS = 3;
+function liveTranscriptRows(rows, chromeRows) {
   if (!Number.isFinite(rows)) return MAX_LIVE_ROWS;
-  return Math.max(MIN_LIVE_ROWS, Math.min(MAX_LIVE_ROWS, Math.floor(rows) - INTERACTIVE_CHROME_ROWS - 2));
+  const chrome = chromeRows ?? CHROME_ROWS;
+  const budget = Math.floor(rows) - chrome - BOTTOM_SLACK_ROWS - 1;
+  return Math.max(MIN_LIVE_ROWS, Math.min(MAX_LIVE_ROWS, budget));
 }
 function TerminalViewport({ children, rows }) {
   const { columns } = useTerminalSize();
-  return /* @__PURE__ */ jsx13(
+  const liveRows = liveTranscriptRows(rows);
+  const items = Array.isArray(children) ? children : [children];
+  const [transcript, ...chromeChildren] = items;
+  return /* @__PURE__ */ jsxs13(
     Box13,
     {
-      width: columns,
+      width: columns - 1,
       maxWidth: "100%",
       flexDirection: "column",
-      maxHeight: liveTranscriptRows(rows) + INTERACTIVE_CHROME_ROWS,
+      maxHeight: liveRows + CHROME_ROWS,
       overflowY: "hidden",
-      children
+      children: [
+        /* @__PURE__ */ jsx13(
+          Box13,
+          {
+            flexDirection: "column",
+            flexShrink: 1,
+            minHeight: 0,
+            maxHeight: liveRows,
+            overflowY: "hidden",
+            children: transcript
+          }
+        ),
+        /* @__PURE__ */ jsx13(Box13, { flexDirection: "column", flexShrink: 0, children: chromeChildren })
+      ]
     }
   );
 }
@@ -11675,7 +11855,7 @@ function safeSummary(summarize, name, input) {
 }
 
 // src/ui/App.tsx
-import { jsx as jsx14, jsxs as jsxs13 } from "react/jsx-runtime";
+import { jsx as jsx14, jsxs as jsxs14 } from "react/jsx-runtime";
 var EFFORTS = ["auto", "low", "medium", "high", "xhigh", "max"];
 var STREAM_FRAME_MS = 50;
 var CUSTOM_ACCENT = "__custom__";
@@ -11957,6 +12137,7 @@ function App({
           });
           sessionStart.current = Date.now();
           turns.current = 0;
+          speedMeter.current = createSpeedMeter();
           void runtime.persist([]).catch(
             (error) => notice("error", error instanceof Error ? error.message : String(error))
           );
@@ -12693,6 +12874,68 @@ ${strings.mcpAddUsage}`
           notice("info", runtime.readMemory() || strings.memoryEmpty);
           return;
         }
+        case "systemp": {
+          const sub = rest[0]?.toLowerCase();
+          if (sub === "set") {
+            const text = rawRest.replace(/^\S+\s*/, "").trim();
+            if (!text) {
+              const typed = await promptInput(strings.systemPromptTitle);
+              if (!typed || typed.trim() === "") return;
+              await runtime.setSystemPrompt(typed);
+              notice("info", strings.systemPromptSet);
+              return;
+            }
+            await runtime.setSystemPrompt(text);
+            notice("info", strings.systemPromptSet);
+            return;
+          }
+          if (sub === "load") {
+            const filePath = rawRest.replace(/^\S+\s*/, "").trim();
+            if (!filePath) {
+              notice("warn", strings.systemPromptUsage);
+              return;
+            }
+            try {
+              const text = await runtime.loadSystemPromptFile(filePath);
+              await runtime.setSystemPrompt(text);
+              notice("info", strings.systemPromptSet);
+            } catch (error) {
+              notice("error", error instanceof Error ? error.message : String(error));
+            }
+            return;
+          }
+          if (sub === "clear") {
+            if (!runtime.getSystemPrompt()) {
+              notice("info", strings.systemPromptEmpty);
+              return;
+            }
+            await runtime.setSystemPrompt("");
+            notice("info", strings.systemPromptCleared);
+            return;
+          }
+          if (sub === "on") {
+            await runtime.setSystemPromptEnabled(true);
+            notice("info", strings.systemPromptEnabled);
+            return;
+          }
+          if (sub === "off") {
+            await runtime.setSystemPromptEnabled(false);
+            notice("info", strings.systemPromptDisabled);
+            return;
+          }
+          if (sub !== void 0 && sub !== "" && sub !== "show") {
+            notice("warn", strings.systemPromptUsage);
+            return;
+          }
+          const current = runtime.getSystemPrompt();
+          if (!current) {
+            notice("info", strings.systemPromptEmpty);
+            return;
+          }
+          const enabled = runtime.isSystemPromptEnabled();
+          notice("info", (enabled ? "" : "[disabled] ") + current);
+          return;
+        }
         case "effort": {
           notice("info", runtime.effortDescription(history.current));
           const choice = EFFORTS.includes(rawRest) ? rawRest : await pick(
@@ -12705,6 +12948,21 @@ ${strings.mcpAddUsage}`
           forceRender((n) => n + 1);
           return;
         }
+        case "steps": {
+          const current = runtime.getMaxTurnSteps();
+          if (!rest[0]) {
+            notice("info", strings.stepsCurrent(current));
+            return;
+          }
+          const parsed = Number(rest[0]);
+          if (!Number.isInteger(parsed) || parsed < 0 || parsed > 1e3) {
+            notice("warn", strings.stepsInvalid);
+            return;
+          }
+          await runtime.setMaxTurnSteps(parsed);
+          notice("info", parsed === 0 ? strings.stepsUnlimited : strings.stepsSet(parsed));
+          return;
+        }
         case "budget": {
           const current = runtime.getMaxTokensPerTurn();
           if (rest[0]) {
@@ -13194,13 +13452,16 @@ ${strings.mcpAddUsage}`
             notice("info", `${summary2}
 ${strings.configAt(runtime.configPath())}`);
             return summary2;
+          },
+          onCancel: () => {
+            if (!runtime.needsSetup()) setSetup(false);
           }
         }
       )
     );
   }
   return shell(
-    /* @__PURE__ */ jsxs13(TerminalViewport, { rows, children: [
+    /* @__PURE__ */ jsxs14(TerminalViewport, { rows, children: [
       /* @__PURE__ */ jsx14(
         Transcript,
         {
@@ -13330,10 +13591,10 @@ function TextInputOverlay({
   const submit = useCallback(() => {
     onAnswer(value || null);
   }, [value, onAnswer]);
-  useInput3((_input, key) => {
+  useInput4((_input, key) => {
     if (key.escape) onCancel();
   });
-  return /* @__PURE__ */ jsxs13(Box14, { flexDirection: "column", children: [
+  return /* @__PURE__ */ jsxs14(Box14, { flexDirection: "column", children: [
     /* @__PURE__ */ jsx14(Text13, { dimColor: true, children: title }),
     /* @__PURE__ */ jsx14(
       TextInput2,
@@ -13453,10 +13714,15 @@ function clearTerminal() {
   if (process.stdout.isTTY) process.stdout.write("\x1B[2J\x1B[3J\x1B[H");
 }
 var TUI_RENDER_OPTIONS = {
-  // Keep unchanged streamed lines in place instead of clearing and redrawing
-  // the whole live region on every frame.
-  incrementalRendering: true,
-  maxFps: 30
+  // Incremental rendering is off: Ink's incremental diff races with its own
+  // <Static> commits and leaves stale rows behind (the prompt frame appears
+  // twice). Standard rendering clears the whole frame each time — a little
+  // more work, but no stale lines.
+  incrementalRendering: false,
+  // Throttling defers writes; when a bubble closes into <Static> mid-stream,
+  // the deferred frame and the static write race and leave stale rows behind.
+  // Unthrottled renders cost a little CPU but keep every frame consistent.
+  maxFps: 0
 };
 async function startTui(options) {
   const { runtime, history, warnings, shutdown } = await boot({