@kernelonpanic/kitcode 1.4.1 → 1.4.2

package/dist/index.js

@@ -2,6 +2,7 @@
 
 // src/index.ts
 import { Command } from "commander";
+import { statSync } from "fs";
 import { resolve as resolve2 } from "path";
 
 // src/app/add.ts
@@ -108,6 +109,7 @@ import Anthropic from "@anthropic-ai/sdk";
 import OpenAI from "openai";
 
 // src/providers/types.ts
+var INVALID_ARGUMENTS_KEY = "__kitcode_invalid_arguments";
 var ProviderError = class extends Error {
   constructor(message, providerId, status, options) {
     super(message, options);
@@ -344,11 +346,11 @@ function oneLine(text) {
   return text.replace(/\s+/g, " ").trim();
 }
 function redactSecrets(text, knownSecrets = []) {
-  let safe = text.replace(NAMED_SECRET, "$1[redacted]").replace(SECRET, "[redacted]");
+  let safe = text;
   for (const secret of knownSecrets) {
     if (secret.length >= 4) safe = safe.split(secret).join("[redacted]");
   }
-  return safe;
+  return safe.replace(NAMED_SECRET, "$1[redacted]").replace(SECRET, "[redacted]");
 }
 function prop(value, key) {
   if (value === null || typeof value !== "object") return void 0;
@@ -1182,11 +1184,11 @@ var globTool = {
     return `glob(${brief(input.pattern)})`;
   },
   async execute(input, ctx) {
-    const { pattern, path: path15 = "." } = input;
+    const { pattern, path: path16 = "." } = input;
     if (patternEscapes(pattern)) {
       return { content: `Pattern ${pattern} must be relative to the workspace root.`, isError: true };
     }
-    const safe = resolveInside(ctx.cwd, path15);
+    const safe = resolveInside(ctx.cwd, path16);
     if (!safe.ok) return { content: safe.reason, isError: true };
     const entries = await fg(pattern, {
       cwd: safe.path,
@@ -1265,8 +1267,10 @@ function isSubsequence(needle, haystack) {
 
 // src/tools/jobs.ts
 import { spawn } from "child_process";
+import { StringDecoder } from "string_decoder";
 var MAX_JOBS = 8;
 var MAX_JOB_OUTPUT = 1e5;
+var MAX_FINISHED_JOBS = 16;
 var jobs = /* @__PURE__ */ new Map();
 var counter = 0;
 function startJob(command, cwd) {
@@ -1274,6 +1278,8 @@ function startJob(command, cwd) {
   if (live.length >= MAX_JOBS) {
     return { error: `At most ${MAX_JOBS} background commands can run at once.` };
   }
+  pruneFinishedJobs();
+  installExitCleanup();
   counter += 1;
   const id = `bg-${counter}`;
   const child = spawn(command, {
@@ -1295,19 +1301,24 @@ function startJob(command, cwd) {
     truncated: false
   };
   jobs.set(id, job);
-  const collect = (chunk) => {
-    const text = chunk.toString("utf8");
+  const collector = () => {
+    const decoder = new StringDecoder("utf8");
+    return (chunk) => collect(decoder.write(chunk));
+  };
+  const collect = (text) => {
     const room = MAX_JOB_OUTPUT - job.buffer.length;
     if (text.length <= room) {
       job.buffer += text;
       return;
     }
     job.truncated = true;
-    job.buffer = (job.buffer + text).slice(-MAX_JOB_OUTPUT);
-    job.reported = Math.min(job.reported, job.buffer.length);
+    const combined = job.buffer + text;
+    const dropped = combined.length - MAX_JOB_OUTPUT;
+    job.buffer = combined.slice(dropped);
+    job.reported = Math.max(0, job.reported - dropped);
   };
-  child.stdout?.on("data", collect);
-  child.stderr?.on("data", collect);
+  child.stdout?.on("data", collector());
+  child.stderr?.on("data", collector());
   child.on("error", (error) => {
     job.buffer += `
 Command failed to start: ${error.message}`;
@@ -1348,6 +1359,26 @@ function killAllJobs() {
     }
   }
 }
+var exitCleanupInstalled = false;
+function installExitCleanup() {
+  if (exitCleanupInstalled) return;
+  exitCleanupInstalled = true;
+  process.once("exit", killAllJobs);
+  for (const signal of ["SIGTERM", "SIGHUP"]) {
+    const onSignal = () => {
+      killAllJobs();
+      process.off(signal, onSignal);
+      process.kill(process.pid, signal);
+    };
+    process.on(signal, onSignal);
+  }
+}
+function pruneFinishedJobs() {
+  const finished = [...jobs.values()].filter((job) => job.state !== "running");
+  for (const job of finished.slice(0, Math.max(0, finished.length - MAX_FINISHED_JOBS + 1))) {
+    jobs.delete(job.id);
+  }
+}
 function summary(job) {
   return {
     id: job.id,
@@ -1442,12 +1473,12 @@ function openAiEffort(model, effort) {
 }
 
 // src/app/runtime.ts
-import path14 from "path";
+import path15 from "path";
 import { mkdir as mkdir6 } from "fs/promises";
 
 // src/core/session.ts
 import { randomBytes } from "crypto";
-import { readFile as readFile4, readdir, rename as rename3, stat as stat2, unlink, writeFile as writeFile4 } from "fs/promises";
+import { readFile as readFile4, readdir, rename as rename3, rm as rm4, stat as stat2, unlink, writeFile as writeFile4 } from "fs/promises";
 import path5 from "path";
 var MAX_SESSION_BYTES = 5e7;
 function createSession(cwd, model) {
@@ -1548,8 +1579,13 @@ async function deleteSession(query) {
     if (error.code === "ENOENT") throw new Error(`Session no longer exists: ${id}`);
     throw error;
   });
+  await removeCheckpoints(id);
   return id;
 }
+async function removeCheckpoints(id) {
+  assertSessionId(id);
+  await rm4(path5.join(checkpointsDir, id), { recursive: true, force: true }).catch(() => void 0);
+}
 async function deleteAllSessions() {
   let names;
   try {
@@ -1577,6 +1613,7 @@ async function deleteAllSessions() {
     const id = ids[index];
     if (result.status === "fulfilled" || result.reason?.code === "ENOENT") {
       deleted.push(id);
+      await removeCheckpoints(id);
     } else {
       failed.push({
         id,
@@ -1944,7 +1981,7 @@ async function runTurn(cfg, history, hooks, signal) {
       });
     }
     hooks.onEvent({ type: "turn_end", stopReason: outcome.stopReason });
-    return messages;
+    return sanitizeHistory(messages);
   }
 }
 async function consumeStream(cfg, messages, hooks, signal, maxTokens) {
@@ -2144,6 +2181,13 @@ async function runOneCall(cfg, call, hooks, signal) {
   if (!tool) {
     return toolError(call.id, `Unknown tool "${call.name}". Use only the tools provided.`);
   }
+  const invalid = invalidArguments(call.input);
+  if (invalid !== void 0) {
+    return toolError(
+      call.id,
+      `The arguments for "${call.name}" were not valid JSON, so the tool did not run. Call it again with a complete JSON object. Received: ${invalid}`
+    );
+  }
   const summary2 = describeCall(tool, call.input);
   const ctx = {
     cwd: cfg.cwd,
@@ -2241,6 +2285,11 @@ function describeRefusal(refusal) {
   if (refusal?.explanation) parts.push(refusal.explanation);
   return parts.join(" ");
 }
+function invalidArguments(input) {
+  if (typeof input !== "object" || input === null) return void 0;
+  const raw = input[INVALID_ARGUMENTS_KEY];
+  return typeof raw === "string" ? raw : void 0;
+}
 function toolError(toolUseId, content) {
   return { type: "tool_result", toolUseId, content, isError: true };
 }
@@ -2688,11 +2737,13 @@ function assertSessionId2(id) {
 }
 
 // src/core/diagnostics.ts
+import { createHash as createHash3 } from "crypto";
 import { readFile as readFile6, stat as stat4 } from "fs/promises";
 import path7 from "path";
 
 // src/tools/bash.ts
 import { spawn as spawn2 } from "child_process";
+import { StringDecoder as StringDecoder2 } from "string_decoder";
 var DEFAULT_TIMEOUT = 12e4;
 var MAX_TIMEOUT = 6e5;
 var MAX_OUTPUT = 1e5;
@@ -2776,14 +2827,12 @@ var bashTool = {
       };
       let captured = 0;
       let truncated = false;
-      const collect = (buf) => {
-        if (truncated) return;
-        let text;
-        try {
-          text = buf.toString("utf8");
-        } catch {
-          text = buf.toString();
-        }
+      const collector = () => {
+        const decoder = new StringDecoder2("utf8");
+        return (buf) => collect(decoder.write(buf));
+      };
+      const collect = (text) => {
+        if (truncated || text === "") return;
         progress(text);
         if (text.length > MAX_OUTPUT - captured) {
           chunks.push(text.slice(0, MAX_OUTPUT - captured));
@@ -2793,8 +2842,8 @@ var bashTool = {
         chunks.push(text);
         captured += text.length;
       };
-      child.stdout.on("data", collect);
-      child.stderr.on("data", collect);
+      child.stdout.on("data", collector());
+      child.stderr.on("data", collector());
       const killTree2 = () => {
         if (child.pid == null) return;
         if (process.platform === "win32") {
@@ -2857,19 +2906,19 @@ var diagnosticsTool = {
   summarize: () => "automatic project checks",
   execute: async () => ({ content: "" })
 };
-async function detectDiagnosticCommands(cwd, configured = []) {
+async function detectChecks(cwd, configured = []) {
   const custom = configured.map((command) => command.trim()).filter(Boolean);
-  if (custom.length > 0) return custom.slice(0, 8);
-  const commands = [];
+  if (custom.length > 0) return custom.slice(0, 8).map((command) => ({ command }));
+  const checks = [];
   const packageJson = await readPackageJson(path7.join(cwd, "package.json"));
   if (packageJson) {
     const manager = await packageManager(cwd, packageJson.packageManager);
     for (const name of ["lint", "typecheck", "check", "test"]) {
-      if (typeof packageJson.scripts?.[name] === "string") {
-        commands.push(scriptCommand(manager, name));
-      }
+      const body = packageJson.scripts?.[name];
+      if (typeof body === "string") checks.push({ command: scriptCommand(manager, name), runs: body });
     }
   }
+  const commands = [];
   if (await isFile2(path7.join(cwd, "Cargo.toml"))) {
     commands.push("cargo check", "cargo test");
   }
@@ -2877,10 +2926,13 @@ async function detectDiagnosticCommands(cwd, configured = []) {
   if (await isFile2(path7.join(cwd, "pyproject.toml")) || await isFile2(path7.join(cwd, "pytest.ini")) || await isFile2(path7.join(cwd, "tox.ini"))) {
     commands.push("python -m pytest");
   }
-  return [...new Set(commands)].slice(0, 8);
+  for (const command of commands) checks.push({ command });
+  const seen = /* @__PURE__ */ new Set();
+  return checks.filter((check) => !seen.has(check.command) && seen.add(check.command)).slice(0, 8);
 }
 async function runAutomaticDiagnostics(options) {
-  const commands = await detectDiagnosticCommands(options.cwd, options.configuredCommands);
+  const checks = await detectChecks(options.cwd, options.configuredCommands);
+  const commands = checks.map((check) => check.command);
   const summary2 = { commands, failed: [], skipped: false };
   if (options.changedFiles.length === 0 || commands.length === 0 || options.signal.aborted) {
     summary2.skipped = true;
@@ -2896,7 +2948,10 @@ async function runAutomaticDiagnostics(options) {
     });
     return summary2;
   }
-  if (gate === "ask") {
+  const items = checks.map((check) => check.runs ? `${check.command}  \u2192  ${check.runs}` : check.command);
+  const grantName = `${diagnosticsTool.name}#${createHash3("sha256").update(items.join("\n")).digest("hex").slice(0, 16)}`;
+  const granted = gate === "ask" && options.permissions.decide({ ...diagnosticsTool, name: grantName }) === "allow";
+  if (gate === "ask" && !granted) {
     const decision = await options.hooks.requestPermission({
       toolName: diagnosticsTool.name,
       summary: `run ${commands.length} automatic project ${commands.length === 1 ? "check" : "checks"}`,
@@ -2904,7 +2959,7 @@ async function runAutomaticDiagnostics(options) {
       display: {
         kind: "list",
         title: `After changes to ${options.changedFiles.length} ${options.changedFiles.length === 1 ? "file" : "files"}`,
-        items: commands
+        items
       },
       allowAlways: true
     });
@@ -2921,7 +2976,7 @@ async function runAutomaticDiagnostics(options) {
       });
       return summary2;
     }
-    if (decision === "always") options.permissions.grantForSession(diagnosticsTool.name);
+    if (decision === "always") options.permissions.grantForSession(grantName);
   }
   const ctx = {
     cwd: options.cwd,
@@ -2998,10 +3053,51 @@ async function isFile2(file) {
 
 // src/core/attachments.ts
 import { execFile } from "child_process";
-import { lstat as lstat2, mkdtemp, readdir as readdir3, readFile as readFile7, rm as rm4, stat as stat5, writeFile as writeFile6 } from "fs/promises";
+import { lstat as lstat2, mkdtemp, readdir as readdir3, readFile as readFile7, rm as rm5, stat as stat5, writeFile as writeFile6 } from "fs/promises";
 import os2 from "os";
-import path8 from "path";
+import path9 from "path";
 import { fileURLToPath } from "url";
+
+// src/tools/sensitive.ts
+import path8 from "path";
+var sensitiveNames = /* @__PURE__ */ new Set([
+  ".npmrc",
+  ".pypirc",
+  ".git-credentials",
+  ".netrc",
+  ".pgpass",
+  ".my.cnf",
+  ".docker/config.json",
+  "auth.json",
+  "credentials",
+  "credentials.json",
+  "id_rsa",
+  "id_ed25519",
+  "id_dsa",
+  "id_ecdsa",
+  "kubeconfig",
+  "known_hosts",
+  "secret.json",
+  "secrets.json",
+  "tokens.json",
+  "service-account.json"
+]);
+var sensitiveExtensions = /* @__PURE__ */ new Set([".pem", ".key", ".p12", ".pfx", ".jks", ".keystore", ".p8", ".der"]);
+function isSensitivePath(value) {
+  if (typeof value !== "string") return false;
+  const normalized = value.replaceAll("\\", "/").toLowerCase();
+  const name = path8.posix.basename(normalized);
+  if (name === ".env" || name.startsWith(".env.")) return true;
+  if (sensitiveNames.has(name) || sensitiveExtensions.has(path8.posix.extname(name))) return true;
+  return normalized.split("/").some((part) => part === ".ssh" || part === ".aws");
+}
+function mentionsSensitivePattern(value) {
+  if (typeof value !== "string") return false;
+  const lower = value.toLowerCase();
+  return isSensitivePath(lower) || lower.includes(".env") || lower.includes(".npmrc") || lower.includes(".netrc") || lower.includes(".pgpass") || lower.includes("auth.json") || lower.includes("credentials") || lower.includes("kubeconfig") || lower.includes("secret") || lower.includes("tokens.json") || /\.(?:pem|key|p12|pfx|jks|keystore|p8|der)(?:$|[^a-z0-9])/.test(lower);
+}
+
+// src/core/attachments.ts
 var MAX_IMAGE_BYTES = 10 * 1024 * 1024;
 var MAX_TEXT_BYTES = 256 * 1024;
 var MAX_CLIPBOARD_OUTPUT_BYTES = MAX_IMAGE_BYTES + 64 * 1024;
@@ -3031,7 +3127,7 @@ async function loadAttachment(cwd, requestedPath) {
   const resolved = resolveAttachmentPath(cwd, requestedPath);
   const linkInfo = await lstat2(resolved).catch(() => null);
   if (linkInfo?.isSymbolicLink()) {
-    throw new Error(`Cannot attach symbolic links: ${path8.basename(resolved)}`);
+    throw new Error(`Cannot attach symbolic links: ${path9.basename(resolved)}`);
   }
   const info = await stat5(resolved).catch((error) => {
     if (error.code === "ENOENT") throw new Error(`Attachment not found: ${resolved}`);
@@ -3040,7 +3136,7 @@ async function loadAttachment(cwd, requestedPath) {
   if (info.isDirectory()) {
     const attachment = await loadFirstImageFromDirectory(resolved);
     if (attachment) return attachment;
-    throw new Error(`No supported images found in directory: ${path8.basename(resolved)}`);
+    throw new Error(`No supported images found in directory: ${path9.basename(resolved)}`);
   }
   if (!info.isFile()) throw new Error(`Attachment is not a regular file: ${resolved}`);
   return loadResolvedAttachment(resolved, info.size);
@@ -3050,7 +3146,7 @@ async function loadAutomaticAttachment(cwd, requestedPath) {
   const resolved = resolveAttachmentPath(cwd, requestedPath);
   if (isSensitiveAutomaticPath(resolved)) {
     throw new Error(
-      `For safety, sensitive-looking files must be attached explicitly with /attach: ${path8.basename(resolved)}`
+      `For safety, sensitive-looking files must be attached explicitly with /attach: ${path9.basename(resolved)}`
     );
   }
   const linkInfo = await lstat2(resolved).catch(() => null);
@@ -3063,6 +3159,33 @@ async function loadAutomaticAttachment(cwd, requestedPath) {
   if (!info?.isFile()) return null;
   return loadResolvedAttachment(resolved, info.size);
 }
+async function loadMentionAttachment(cwd, requestedPath) {
+  const safe = resolveInside(cwd, normalizeInputPath(requestedPath.trim()));
+  if (!safe.ok || safe.relative === "") return null;
+  if (isSensitivePath(safe.relative) || isSensitiveAutomaticPath(safe.path)) {
+    throw new Error(
+      `For safety, sensitive-looking files must be attached explicitly with /attach: ${path9.basename(safe.path)}`
+    );
+  }
+  const info = await stat5(safe.path).catch(() => null);
+  if (!info?.isFile()) return null;
+  return loadResolvedAttachment(safe.path, info.size);
+}
+function withoutImages(messages) {
+  let removed = 0;
+  const cleaned = messages.map((message) => {
+    if (!message.content.some((block) => block.type === "image")) return message;
+    return {
+      ...message,
+      content: message.content.map((block) => {
+        if (block.type !== "image") return block;
+        removed += 1;
+        return { type: "text", text: `[image ${block.name} removed: the model could not accept it]` };
+      })
+    };
+  });
+  return { messages: cleaned, removed };
+}
 var MAX_PATH_CHARS = 2048;
 function looksLikeAttachmentPath(value) {
   const trimmed = value.trim();
@@ -3070,14 +3193,14 @@ function looksLikeAttachmentPath(value) {
   if (trimmed.length > MAX_PATH_CHARS) return false;
   const candidate = normalizeInputPath(trimmed);
   if (/^file:\/\//i.test(candidate)) return true;
-  if (path8.isAbsolute(candidate)) return true;
+  if (path9.isAbsolute(candidate)) return true;
   if (/^(?:~|\.{1,2})[\\/]/.test(candidate)) return true;
   if (candidate.includes("/") || candidate.includes("\\")) {
     if (trimmed.length > 200) return false;
     return true;
   }
-  const basename3 = path8.basename(candidate).toLowerCase();
-  return path8.extname(basename3) !== "" || AUTO_PATH_NAMES.has(basename3);
+  const basename3 = path9.basename(candidate).toLowerCase();
+  return path9.extname(basename3) !== "" || AUTO_PATH_NAMES.has(basename3);
 }
 async function loadClipboardImage(platform = process.platform, runner = runClipboardCommand) {
   const commands = clipboardCommands(platform);
@@ -3110,7 +3233,7 @@ async function loadClipboardImage(platform = process.platform, runner = runClipb
   throw new Error(`No supported image found in the clipboard. ${hint}`);
 }
 async function loadResolvedAttachment(resolved, size) {
-  const name = safeName(path8.basename(resolved));
+  const name = safeName(path9.basename(resolved));
   const imageLimitCandidate = size <= MAX_IMAGE_BYTES;
   if (!imageLimitCandidate) {
     throw new Error(`Attachment is larger than ${formatBytes(MAX_IMAGE_BYTES)}: ${name}`);
@@ -3128,12 +3251,11 @@ async function loadResolvedAttachment(resolved, size) {
   if (data.length > MAX_TEXT_BYTES) {
     throw new Error(`Text attachment is larger than ${formatBytes(MAX_TEXT_BYTES)}: ${name}`);
   }
-  if (data.includes(0)) throw new Error(`Unsupported binary attachment: ${name}`);
-  let text;
-  try {
-    text = new TextDecoder("utf-8", { fatal: true }).decode(data);
-  } catch {
-    throw new Error(`Attachment is neither a supported image nor UTF-8 text: ${name}`);
+  const text = decodeText(data);
+  if (text === null) {
+    throw new Error(
+      data.includes(0) ? `Unsupported binary attachment: ${name}` : `Attachment is neither a supported image nor UTF-8 text: ${name}`
+    );
   }
   return {
     path: resolved,
@@ -3142,13 +3264,13 @@ async function loadResolvedAttachment(resolved, size) {
   };
 }
 async function loadFirstImageFromDirectory(dirPath) {
-  const IMAGE_EXTENSIONS = /* @__PURE__ */ new Set([".png", ".jpg", ".jpeg", ".gif", ".webp", ".bmp"]);
+  const IMAGE_EXTENSIONS = /* @__PURE__ */ new Set([".png", ".jpg", ".jpeg", ".gif", ".webp"]);
   const entries = await readdir3(dirPath, { withFileTypes: true }).catch(() => null);
   if (!entries) return null;
-  const sorted = entries.filter((entry) => entry.isFile() && IMAGE_EXTENSIONS.has(path8.extname(entry.name).toLowerCase())).sort((a, b) => a.name.localeCompare(b.name));
+  const sorted = entries.filter((entry) => entry.isFile() && IMAGE_EXTENSIONS.has(path9.extname(entry.name).toLowerCase())).sort((a, b) => a.name.localeCompare(b.name));
   if (sorted.length === 0) return null;
   const first2 = sorted[0];
-  const filePath = path8.join(dirPath, first2.name);
+  const filePath = path9.join(dirPath, first2.name);
   const info = await stat5(filePath).catch(() => null);
   if (!info?.isFile()) return null;
   return loadResolvedAttachment(filePath, info.size);
@@ -3158,23 +3280,78 @@ function resolveAttachmentPath(cwd, requestedPath) {
   if (!cleaned) throw new Error("Give a file path: /attach <path>");
   if (/^file:\/\//i.test(cleaned)) {
     try {
-      return path8.normalize(fileURLToPath(cleaned));
+      return path9.normalize(fileURLToPath(cleaned));
     } catch {
       throw new Error(`Invalid local file URL: ${cleaned}`);
     }
   }
-  const expanded = cleaned === "~" ? os2.homedir() : cleaned.startsWith("~/") ? path8.join(os2.homedir(), cleaned.slice(2)) : cleaned;
-  return path8.isAbsolute(expanded) ? path8.normalize(expanded) : path8.resolve(cwd, expanded);
+  const expanded = cleaned === "~" ? os2.homedir() : cleaned.startsWith("~/") ? path9.join(os2.homedir(), cleaned.slice(2)) : cleaned;
+  return path9.isAbsolute(expanded) ? path9.normalize(expanded) : path9.resolve(cwd, expanded);
 }
 function isSensitiveAutomaticPath(file) {
-  const basename3 = path8.basename(file).toLowerCase();
-  return basename3.startsWith(".env.") || SENSITIVE_AUTO_NAMES.has(basename3) || SENSITIVE_AUTO_EXTENSIONS.has(path8.extname(basename3));
+  const basename3 = path9.basename(file).toLowerCase();
+  return (
+    // Also covers ~/.ssh/config, ~/.aws/credentials, .git-credentials and the like.
+    isSensitivePath(file) || basename3.startsWith(".env.") || SENSITIVE_AUTO_NAMES.has(basename3) || SENSITIVE_AUTO_EXTENSIONS.has(path9.extname(basename3))
+  );
 }
 function attachmentLabel(block) {
   if (block.type === "image") return `image: ${block.name}`;
   if (block.type === "file") return `file: ${block.name}`;
   return null;
 }
+function decodeText(data) {
+  try {
+    if (data[0] === 255 && data[1] === 254) return new TextDecoder("utf-16le", { fatal: true }).decode(data);
+    if (data[0] === 254 && data[1] === 255) return new TextDecoder("utf-16be", { fatal: true }).decode(data);
+    if (data.includes(0)) return null;
+    return new TextDecoder("utf-8", { fatal: true }).decode(data);
+  } catch {
+    return null;
+  }
+}
+function imageSize(data, mediaType) {
+  try {
+    if (mediaType === "image/png" && data.length >= 24) {
+      return { width: data.readUInt32BE(16), height: data.readUInt32BE(20) };
+    }
+    if (mediaType === "image/gif" && data.length >= 10) {
+      return { width: data.readUInt16LE(6), height: data.readUInt16LE(8) };
+    }
+    if (mediaType === "image/webp" && data.length >= 30) {
+      const chunk = data.subarray(12, 16).toString("ascii");
+      if (chunk === "VP8X") return { width: data.readUIntLE(24, 3) + 1, height: data.readUIntLE(27, 3) + 1 };
+      if (chunk === "VP8L") {
+        const bits = data.readUInt32LE(21);
+        return { width: (bits & 16383) + 1, height: (bits >> 14 & 16383) + 1 };
+      }
+      if (chunk === "VP8 ") return { width: data.readUInt16LE(26) & 16383, height: data.readUInt16LE(28) & 16383 };
+      return null;
+    }
+    if (mediaType === "image/jpeg") {
+      let offset = 2;
+      while (offset + 9 < data.length) {
+        if (data[offset] !== 255) return null;
+        const marker = data[offset + 1];
+        if (marker === 255) {
+          offset += 1;
+          continue;
+        }
+        if (marker >= 192 && marker <= 207 && marker !== 196 && marker !== 200 && marker !== 204) {
+          return { width: data.readUInt16BE(offset + 7), height: data.readUInt16BE(offset + 5) };
+        }
+        if (marker === 216 || marker === 1 || marker >= 208 && marker <= 215) {
+          offset += 2;
+          continue;
+        }
+        offset += 2 + data.readUInt16BE(offset + 2);
+      }
+    }
+  } catch {
+    return null;
+  }
+  return null;
+}
 function detectImage(data) {
   if (data.length >= 8 && data.subarray(0, 8).equals(Buffer.from([137, 80, 78, 71, 13, 10, 26, 10]))) {
     return "image/png";
@@ -3301,7 +3478,15 @@ var WINDOWS_CLIPBOARD_SCRIPT = String.raw`
 Add-Type -AssemblyName System.Windows.Forms
 Add-Type -AssemblyName System.Drawing
 $image = [System.Windows.Forms.Clipboard]::GetImage()
-if ($null -eq $image) { exit 2 }
+if ($null -eq $image) {
+  # An image file copied in Explorer arrives as a file list, not a bitmap.
+  $files = [System.Windows.Forms.Clipboard]::GetFileDropList()
+  $file = $files | Where-Object { $_ -match '\.(png|jpe?g|gif|webp)$' } | Select-Object -First 1
+  if ($null -eq $file) { exit 2 }
+  $bytes = [System.IO.File]::ReadAllBytes($file)
+  [Console]::OpenStandardOutput().Write($bytes, 0, $bytes.Length)
+  exit 0
+}
 $stream = New-Object System.IO.MemoryStream
 try {
   $image.Save($stream, [System.Drawing.Imaging.ImageFormat]::Png)
@@ -3313,13 +3498,16 @@ try {
 }
 `;
 var MAX_SENT_IMAGE_BYTES = 37e5;
+var MAX_IMAGE_EDGE = 8e3;
 var SHRINK_LONG_EDGE = 2e3;
 async function fitImage(data, mediaType, platform = process.platform, shrink = shrinkWithSystemTools) {
-  if (data.length <= MAX_SENT_IMAGE_BYTES) return { data, mediaType };
-  const dir = await mkdtemp(path8.join(os2.tmpdir(), "kitcode-image-"));
+  const size = imageSize(data, mediaType);
+  const tooTall = size !== null && Math.max(size.width, size.height) > MAX_IMAGE_EDGE;
+  if (data.length <= MAX_SENT_IMAGE_BYTES && !tooTall) return { data, mediaType };
+  const dir = await mkdtemp(path9.join(os2.tmpdir(), "kitcode-image-"));
   try {
-    const input = path8.join(dir, `in${extensionFor(mediaType)}`);
-    const output = path8.join(dir, "out.jpg");
+    const input = path9.join(dir, `in${extensionFor(mediaType)}`);
+    const output = path9.join(dir, "out.jpg");
     await writeFile6(input, data);
     try {
       await shrink(input, output, platform);
@@ -3334,7 +3522,7 @@ async function fitImage(data, mediaType, platform = process.platform, shrink = s
     }
     return { data: shrunk, mediaType: "image/jpeg" };
   } finally {
-    await rm4(dir, { recursive: true, force: true }).catch(() => void 0);
+    await rm5(dir, { recursive: true, force: true }).catch(() => void 0);
   }
 }
 async function shrinkWithSystemTools(input, output, platform) {
@@ -3350,7 +3538,7 @@ async function shrinkWithSystemTools(input, output, platform) {
     await runQuiet("sips", ["-Z", String(SHRINK_LONG_EDGE), "-s", "format", "jpeg", "-s", "formatOptions", "85", input, "--out", output]);
     return;
   }
-  const args = [input, "-resize", `${SHRINK_LONG_EDGE}x${SHRINK_LONG_EDGE}>`, "-background", "white", "-flatten", "-quality", "85", output];
+  const args = [input, "-auto-orient", "-resize", `${SHRINK_LONG_EDGE}x${SHRINK_LONG_EDGE}>`, "-background", "white", "-flatten", "-quality", "85", output];
   try {
     await runQuiet("magick", args);
   } catch {
@@ -3372,6 +3560,12 @@ var WINDOWS_SHRINK_SCRIPT = String.raw`
 Add-Type -AssemblyName System.Drawing
 $source = [System.Drawing.Image]::FromFile($env:KITCODE_IMAGE_IN)
 try {
+  # Apply the EXIF orientation: the re-encoded JPEG drops the flag that kept a
+  # phone photo upright.
+  if ($source.PropertyIdList -contains 0x0112) {
+    $flip = @{ 2 = 'RotateNoneFlipX'; 3 = 'Rotate180FlipNone'; 4 = 'Rotate180FlipX'; 5 = 'Rotate90FlipX'; 6 = 'Rotate90FlipNone'; 7 = 'Rotate270FlipX'; 8 = 'Rotate270FlipNone' }[[int]$source.GetPropertyItem(0x0112).Value[0]]
+    if ($flip) { $source.RotateFlip([System.Drawing.RotateFlipType]$flip) }
+  }
   $edge = [double]$env:KITCODE_IMAGE_EDGE
   $scale = [Math]::Min(1.0, $edge / [Math]::Max($source.Width, $source.Height))
   $width = [Math]::Max(1, [int]($source.Width * $scale))
@@ -3392,7 +3586,7 @@ try {
 }
 `;
 function textMime(file) {
-  const extension = path8.extname(file).toLowerCase();
+  const extension = path9.extname(file).toLowerCase();
   const known = {
     ".json": "application/json",
     ".md": "text/markdown",
@@ -4120,11 +4314,14 @@ import { StdioClientTransport } from "@modelcontextprotocol/sdk/client/stdio.js"
 import { StreamableHTTPClientTransport } from "@modelcontextprotocol/sdk/client/streamableHttp.js";
 
 // src/mcp/bridge.ts
+import { createHash as createHash4 } from "crypto";
 var MAX_RESULT_CHARS = 2e5;
+var TOOL_NAME = /^[a-zA-Z0-9_-]{1,64}$/;
+var MAX_TOOL_NAME = 64;
 function bridgeMcpTool(server, descriptor, call) {
   const tool = descriptor.name;
   return {
-    name: `mcp__${server}__${tool}`,
+    name: mcpToolName(server, tool),
     description: descriptor.description ?? descriptor.title ?? tool,
     inputSchema: inputSchemaOf(descriptor),
     defaultPermission: "ask",
@@ -4133,6 +4330,13 @@ function bridgeMcpTool(server, descriptor, call) {
     execute: (input, ctx) => invoke(call, tool, input, ctx.signal)
   };
 }
+function mcpToolName(server, tool) {
+  const raw = `mcp__${server}__${tool}`;
+  if (TOOL_NAME.test(raw)) return raw;
+  const hash = createHash4("sha256").update(raw).digest("hex").slice(0, 8);
+  const cleaned = raw.replace(/[^a-zA-Z0-9_-]/g, "_");
+  return `${cleaned.slice(0, MAX_TOOL_NAME - hash.length - 1)}_${hash}`;
+}
 function printableInput(input) {
   try {
     return JSON.stringify(input, null, 2);
@@ -4169,10 +4373,15 @@ function renderPart(part) {
 }
 function inputSchemaOf(descriptor) {
   const schema = descriptor.inputSchema;
-  if (schema === null || typeof schema !== "object") {
+  if (schema === null || typeof schema !== "object" || Array.isArray(schema)) {
     return { type: "object", properties: {}, additionalProperties: false };
   }
-  return schema;
+  const record3 = schema;
+  return {
+    ...record3,
+    type: "object",
+    properties: record3.properties && typeof record3.properties === "object" ? record3.properties : {}
+  };
 }
 function argumentPreview(input) {
   if (input === null || typeof input !== "object") return "";
@@ -4191,7 +4400,7 @@ function clip(value) {
 // package.json
 var package_default = {
   name: "@kernelonpanic/kitcode",
-  version: "1.4.1",
+  version: "1.4.2",
   description: "Terminal coding agent with a config you never have to write by hand",
   type: "module",
   license: "MIT",
@@ -4224,7 +4433,6 @@ var package_default = {
   dependencies: {
     "@anthropic-ai/sdk": "^0.115.0",
     "@modelcontextprotocol/sdk": "^1.30.0",
-    build: "^0.1.4",
     chalk: "^6.0.0",
     commander: "^15.0.0",
     "fast-glob": "^3.3.3",
@@ -4260,7 +4468,7 @@ var package_default = {
 
 // src/version.ts
 var KITCODE_VERSION = package_default.version;
-var KITCODE_COMMIT = true ? "be753d255e7675a850d0ca1ee64f790f68d3fd93" : "development";
+var KITCODE_COMMIT = true ? "6b1ec0a742c44892447e71f477c068d8ba514c6a" : "development";
 
 // src/mcp/client.ts
 var clientInfo = { name: "kitcode", version: KITCODE_VERSION };
@@ -4321,6 +4529,7 @@ var blockedEnvKeys = /* @__PURE__ */ new Set([
 function createMcpManager(servers) {
   const serverStates = /* @__PURE__ */ new Map();
   const sessions = /* @__PURE__ */ new Map();
+  const changeListeners = /* @__PURE__ */ new Set();
   for (const [name, config] of Object.entries(servers)) {
     serverStates.set(name, {
       name,
@@ -4342,14 +4551,15 @@ function createMcpManager(servers) {
     serverStates.set(name, { name, status: "connecting", toolCount: 0 });
     const client = new Client(clientInfo);
     client.onclose = () => {
-      if (sessions.delete(name)) {
-        serverStates.set(name, {
-          name,
-          status: "error",
-          toolCount: 0,
-          error: "connection closed"
-        });
-      }
+      if (sessions.get(name)?.client !== client) return;
+      sessions.delete(name);
+      serverStates.set(name, {
+        name,
+        status: "error",
+        toolCount: 0,
+        error: "connection closed"
+      });
+      for (const listener of changeListeners) listener();
     };
     const transport = createTransport(config);
     const stderrTail = captureStderr(transport);
@@ -4415,7 +4625,12 @@ function createMcpManager(servers) {
     tools() {
       return [...sessions.values()].flatMap((session) => session.tools);
     },
-    callTool
+    callTool,
+    /** Called when a server drops on its own, outside connect/disconnect. */
+    onChange(listener) {
+      changeListeners.add(listener);
+      return () => changeListeners.delete(listener);
+    }
   };
 }
 async function handshake(client, transport) {
@@ -4551,8 +4766,8 @@ function balanceEndpoints(baseUrl) {
     endpoint(url.origin, "/v1/balance", genericBalance)
   ];
 }
-function endpoint(origin, path15, parse2) {
-  return { url: `${origin}${path15}`, parse: parse2 };
+function endpoint(origin, path16, parse2) {
+  return { url: `${origin}${path16}`, parse: parse2 };
 }
 function deepSeekBalance(body) {
   const infos = record2(body)?.["balance_infos"];
@@ -4646,7 +4861,7 @@ async function limitedResponseText(response, limit) {
 
 // src/providers/catalog.ts
 import { chmod as chmod4, readFile as readFile8, writeFile as writeFile7 } from "fs/promises";
-import path9 from "path";
+import path10 from "path";
 var MAX_AGE_MS = 24 * 60 * 60 * 1e3;
 var CACHE_VERSION = 3;
 async function loadModels(provider, refresh = false) {
@@ -4671,7 +4886,7 @@ function refreshModels(provider) {
   return loadModels(provider, true);
 }
 function cacheFile(providerId) {
-  return path9.join(cacheDir, "models", `${providerId.replace(/[^\w.-]/g, "_")}.json`);
+  return path10.join(cacheDir, "models", `${providerId.replace(/[^\w.-]/g, "_")}.json`);
 }
 async function readCache(file) {
   try {
@@ -4706,7 +4921,7 @@ function validModel(value) {
 async function writeCache(file, models) {
   const payload = { version: CACHE_VERSION, fetchedAt: Date.now(), models };
   try {
-    await ensureDir(path9.dirname(file));
+    await ensureDir(path10.dirname(file));
     await writeFile7(file, JSON.stringify(payload), { encoding: "utf8", mode: 384 });
     await chmod4(file, 384);
   } catch {
@@ -5212,7 +5427,7 @@ function toContentBlocks2(providerId, thinking, text, calls) {
       type: "tool_use",
       id: call.id || tmpId(position),
       name: call.name,
-      input: parseArguments(providerId, call.name, call.args)
+      input: parseArguments(call.args)
     });
   }
   return content;
@@ -5223,21 +5438,16 @@ function toTextContentBlocks(thinking, text) {
   if (text) content.push({ type: "text", text });
   return content;
 }
-function parseArguments(providerId, toolName, args) {
+function parseArguments(args) {
+  if (args.trim() === "") return {};
   let parsed;
   try {
     parsed = JSON.parse(args);
   } catch {
-    throw new ProviderError(
-      `Tool "${toolName || "unknown"}" returned malformed JSON arguments; the tool was not run.`,
-      providerId
-    );
+    parsed = void 0;
   }
   if (typeof parsed !== "object" || parsed === null || Array.isArray(parsed)) {
-    throw new ProviderError(
-      `Tool "${toolName || "unknown"}" arguments must be a JSON object; the tool was not run.`,
-      providerId
-    );
+    return { [INVALID_ARGUMENTS_KEY]: args.slice(0, 300) };
   }
   return parsed;
 }
@@ -5382,6 +5592,7 @@ function createPermissionEngine(configPermissions) {
       const configured = resolve3(tool, requested);
       if (configured === "deny") return "deny";
       if (current === "plan" && tool.readOnly !== true) return "deny";
+      if (requested === "ask") return bypassEnabled ? "allow" : "ask";
       if (configured === "allow") return "allow";
       if (bypassEnabled) return "allow";
       if (current === "accept" && isFileEdit(tool)) return "allow";
@@ -5494,9 +5705,24 @@ function done(result) {
 // src/tools/edit.ts
 import { readFile as readFile9, stat as stat6 } from "fs/promises";
 
+// src/tools/protected.ts
+import path11 from "path";
+function protectedWritePermission(input, ctx) {
+  const target = input?.path;
+  if (typeof target !== "string") return void 0;
+  const relative2 = ctx ? resolveInside(ctx.cwd, target) : void 0;
+  const candidate = relative2?.ok ? relative2.relative : target;
+  return isProtectedPath(candidate) ? "ask" : void 0;
+}
+function isProtectedPath(value) {
+  const parts = path11.normalize(value).replaceAll("\\", "/").toLowerCase().split("/").filter(Boolean);
+  const name = parts.at(-1) ?? "";
+  return name === "kitcode.json" || name === ".envrc" || parts.includes(".kitcode") || parts.includes(".git");
+}
+
 // src/tools/safe-write.ts
 import { randomUUID as randomUUID3 } from "crypto";
-import { chmod as chmod5, lstat as lstat3, open, rename as rename5, rm as rm5 } from "fs/promises";
+import { chmod as chmod5, lstat as lstat3, open, rename as rename5, rm as rm6 } from "fs/promises";
 import { basename as basename2, dirname as dirname2, join as join2 } from "path";
 var UnsafeFileChangeError = class extends Error {
   constructor(message) {
@@ -5559,7 +5785,7 @@ async function atomicWriteSafeFile(file, data, snapshot) {
     await rename5(temp, file);
   } catch (error) {
     await handle?.close().catch(() => void 0);
-    await rm5(temp, { force: true }).catch(() => void 0);
+    await rm6(temp, { force: true }).catch(() => void 0);
     throw error;
   }
 }
@@ -5650,60 +5876,61 @@ var editTool = {
     additionalProperties: false
   },
   defaultPermission: "ask",
+  permission: protectedWritePermission,
   summarize(input) {
     return `edit(${brief(input.path)})`;
   },
   async preview(input, ctx) {
-    const { path: path15, oldString, newString, replaceAll = false } = input;
-    const safe = resolveInside(ctx.cwd, path15);
+    const { path: path16, oldString, newString, replaceAll = false } = input;
+    const safe = resolveInside(ctx.cwd, path16);
     if (!safe.ok) return { kind: "text", text: safe.reason };
     const info = await stat6(safe.path).catch(() => null);
     if (info && info.size > MAX_FILE_BYTES2) {
-      return { kind: "text", text: `Cannot preview ${path15}: the file is too large.` };
+      return { kind: "text", text: `Cannot preview ${path16}: the file is too large.` };
     }
     const beforeBuffer = await readFile9(safe.path).catch(() => null);
-    if (!beforeBuffer) return { kind: "text", text: `Cannot read ${path15}.` };
+    if (!beforeBuffer) return { kind: "text", text: `Cannot read ${path16}.` };
     if (beforeBuffer.subarray(0, 8192).includes(0)) {
-      return { kind: "text", text: `Cannot preview binary file ${path15}` };
+      return { kind: "text", text: `Cannot preview binary file ${path16}` };
     }
     const before = beforeBuffer.toString("utf8");
     const after = replacement(before, oldString, newString, replaceAll);
-    return after === null ? { kind: "text", text: `Cannot preview edit: oldString is not a valid match in ${path15}.` } : { kind: "diff", path: path15, before, after };
+    return after === null ? { kind: "text", text: `Cannot preview edit: oldString is not a valid match in ${path16}.` } : { kind: "diff", path: path16, before, after };
   },
   async execute(input, ctx) {
-    const { path: path15, oldString, newString, replaceAll = false } = input;
-    const safe = resolveInside(ctx.cwd, path15);
+    const { path: path16, oldString, newString, replaceAll = false } = input;
+    const safe = resolveInside(ctx.cwd, path16);
     if (!safe.ok) return { content: safe.reason, isError: true };
     let snapshot;
     try {
       snapshot = await readSafeFileSnapshot(safe.path, MAX_FILE_BYTES2);
     } catch (error) {
-      return { content: `Cannot edit ${path15}: ${error.message}.`, isError: true };
+      return { content: `Cannot edit ${path16}: ${error.message}.`, isError: true };
     }
-    if (!snapshot.exists) return { content: `Cannot read ${path15}.`, isError: true };
+    if (!snapshot.exists) return { content: `Cannot read ${path16}.`, isError: true };
     const beforeBuffer = snapshot.data;
     if (beforeBuffer.subarray(0, 8192).includes(0)) {
-      return { content: `Cannot edit ${path15}: it is a binary file, not text.`, isError: true };
+      return { content: `Cannot edit ${path16}: it is a binary file, not text.`, isError: true };
     }
     const before = beforeBuffer.toString("utf8");
     const count2 = countOccurrences(before, oldString);
     if (count2 === 0) {
       return {
-        content: `oldString was not found in ${path15}. Read the file again and match the text exactly, including whitespace.`,
+        content: `oldString was not found in ${path16}. Read the file again and match the text exactly, including whitespace.`,
         isError: true
       };
     }
     if (count2 > 1 && !replaceAll) {
       return {
-        content: `oldString matches ${count2} places in ${path15}. Add more surrounding context to identify a single one, or set replaceAll to true.`,
+        content: `oldString matches ${count2} places in ${path16}. Add more surrounding context to identify a single one, or set replaceAll to true.`,
         isError: true
       };
     }
     const after = replacement(before, oldString, newString, replaceAll);
-    if (after === null) return { content: `Could not prepare edit for ${path15}.`, isError: true };
+    if (after === null) return { content: `Could not prepare edit for ${path16}.`, isError: true };
     if (Buffer.byteLength(after, "utf8") > MAX_FILE_BYTES2) {
       return {
-        content: `Cannot edit ${path15}: the result exceeds the ${MAX_FILE_BYTES2 / 1e6} MB limit.`,
+        content: `Cannot edit ${path16}: the result exceeds the ${MAX_FILE_BYTES2 / 1e6} MB limit.`,
         isError: true
       };
     }
@@ -5716,11 +5943,11 @@ var editTool = {
       await atomicWriteSafeFile(safe.path, after, snapshot);
       ctx.checkpoint?.markChanged(safe.path);
     } catch (error) {
-      return { content: `Failed to write ${path15}: ${error.message}`, isError: true };
+      return { content: `Failed to write ${path16}: ${error.message}`, isError: true };
     }
     return {
-      content: `Edited ${path15} (${count2} ${count2 === 1 ? "replacement" : "replacements"})`,
-      display: { kind: "diff", path: path15, before, after }
+      content: `Edited ${path16} (${count2} ${count2 === 1 ? "replacement" : "replacements"})`,
+      display: { kind: "diff", path: path16, before, after }
     };
   }
 };
@@ -5737,45 +5964,6 @@ import { readFile as readFile10, stat as stat7 } from "fs/promises";
 import { join as join3 } from "path";
 import fg3 from "fast-glob";
 
-// src/tools/sensitive.ts
-import path10 from "path";
-var sensitiveNames = /* @__PURE__ */ new Set([
-  ".npmrc",
-  ".pypirc",
-  ".git-credentials",
-  ".netrc",
-  ".pgpass",
-  ".my.cnf",
-  ".docker/config.json",
-  "auth.json",
-  "credentials",
-  "credentials.json",
-  "id_rsa",
-  "id_ed25519",
-  "id_dsa",
-  "id_ecdsa",
-  "kubeconfig",
-  "known_hosts",
-  "secret.json",
-  "secrets.json",
-  "tokens.json",
-  "service-account.json"
-]);
-var sensitiveExtensions = /* @__PURE__ */ new Set([".pem", ".key", ".p12", ".pfx", ".jks", ".keystore", ".p8", ".der"]);
-function isSensitivePath(value) {
-  if (typeof value !== "string") return false;
-  const normalized = value.replaceAll("\\", "/").toLowerCase();
-  const name = path10.posix.basename(normalized);
-  if (name === ".env" || name.startsWith(".env.")) return true;
-  if (sensitiveNames.has(name) || sensitiveExtensions.has(path10.posix.extname(name))) return true;
-  return normalized.split("/").some((part) => part === ".ssh" || part === ".aws");
-}
-function mentionsSensitivePattern(value) {
-  if (typeof value !== "string") return false;
-  const lower = value.toLowerCase();
-  return isSensitivePath(lower) || lower.includes(".env") || lower.includes(".npmrc") || lower.includes(".netrc") || lower.includes(".pgpass") || lower.includes("auth.json") || lower.includes("credentials") || lower.includes("kubeconfig") || lower.includes("secret") || lower.includes("tokens.json") || /\.(?:pem|key|p12|pfx|jks|keystore|p8|der)(?:$|[^a-z0-9])/.test(lower);
-}
-
 // src/tools/regex.ts
 import { Worker } from "worker_threads";
 var MATCH_TIMEOUT_MS = 300;
@@ -5885,16 +6073,16 @@ var grepTool = {
   defaultPermission: "allow",
   readOnly: true,
   permission(input, ctx) {
-    const { path: path15, glob } = input ?? {};
-    if (isSensitivePath(path15) || mentionsSensitivePattern(glob)) return "ask";
-    const safe = ctx && path15 ? resolveInside(ctx.cwd, path15) : void 0;
+    const { path: path16, glob } = input ?? {};
+    if (isSensitivePath(path16) || mentionsSensitivePattern(glob)) return "ask";
+    const safe = ctx && path16 ? resolveInside(ctx.cwd, path16) : void 0;
     return safe?.ok && isSensitivePath(safe.relative) ? "ask" : void 0;
   },
   summarize(input) {
     return `grep(${brief(input.pattern)})`;
   },
   async execute(input, ctx) {
-    const { pattern, path: path15 = ".", glob = "**/*", maxMatches } = input;
+    const { pattern, path: path16 = ".", glob = "**/*", maxMatches } = input;
     if (pattern.length > MAX_PATTERN_CHARS) {
       return {
         content: `Regular expression is limited to ${MAX_PATTERN_CHARS} characters.`,
@@ -5909,10 +6097,10 @@ var grepTool = {
     if (patternEscapes(glob)) {
       return { content: `Glob ${glob} must be relative to the workspace root.`, isError: true };
     }
-    const safe = resolveInside(ctx.cwd, path15);
+    const safe = resolveInside(ctx.cwd, path16);
     if (!safe.ok) return { content: safe.reason, isError: true };
     const target = await stat7(safe.path).catch(() => null);
-    if (!target) return { content: `Path not found: ${path15}`, isError: true };
+    if (!target) return { content: `Path not found: ${path16}`, isError: true };
     const discovered = target.isDirectory() ? (await fg3(glob, {
       cwd: safe.path,
       dot: false,
@@ -5926,7 +6114,8 @@ var grepTool = {
       relative: join3(safe.relative, entry.path),
       size: entry.stats?.size ?? 0
     })) : [{ absolute: safe.path, relative: safe.relative, size: target.size }];
-    const files = discovered.slice(0, MAX_FILES);
+    const sensitiveRequested = isSensitivePath(path16) || isSensitivePath(safe.relative) || mentionsSensitivePattern(glob);
+    const files = (sensitiveRequested ? discovered : discovered.filter((file) => !isSensitivePath(file.relative))).slice(0, MAX_FILES);
     const filesCapped = discovered.length > MAX_FILES;
     const limit = Math.min(maxMatches ?? MAX_MATCHES, MAX_MATCHES);
     const hits = [];
@@ -6002,30 +6191,30 @@ var readTool = {
     return `read(${brief(input.path)})`;
   },
   async execute(input, ctx) {
-    const { path: path15, offset = 1, limit } = input;
-    const safe = resolveInside(ctx.cwd, path15);
+    const { path: path16, offset = 1, limit } = input;
+    const safe = resolveInside(ctx.cwd, path16);
     if (!safe.ok) return { content: safe.reason, isError: true };
     const info = await stat8(safe.path).catch(() => null);
-    if (!info) return { content: `File not found: ${path15}`, isError: true };
+    if (!info) return { content: `File not found: ${path16}`, isError: true };
     if (info.isDirectory()) {
-      return { content: `${path15} is a directory, not a file. Use glob to list its contents.`, isError: true };
+      return { content: `${path16} is a directory, not a file. Use glob to list its contents.`, isError: true };
     }
     if (info.size > MAX_FILE_BYTES4) {
       return {
-        content: `${path15} is ${(info.size / 1e6).toFixed(1)} MB; read is limited to ${MAX_FILE_BYTES4 / 1e6} MB per file. Use grep or another targeted tool instead.`,
+        content: `${path16} is ${(info.size / 1e6).toFixed(1)} MB; read is limited to ${MAX_FILE_BYTES4 / 1e6} MB per file. Use grep or another targeted tool instead.`,
         isError: true
       };
     }
     const buffer = await readFile11(safe.path);
     if (buffer.subarray(0, 4096).includes(0)) {
-      return { content: `${path15} looks like a binary file and cannot be read as text.`, isError: true };
+      return { content: `${path16} looks like a binary file and cannot be read as text.`, isError: true };
     }
     const lines = buffer.toString("utf8").split("\n");
     if (lines.at(-1) === "") lines.pop();
-    if (lines.length === 0) return { content: `${path15} is empty.` };
+    if (lines.length === 0) return { content: `${path16} is empty.` };
     const start = Math.max(1, offset) - 1;
     if (start >= lines.length) {
-      return { content: `${path15} has ${lines.length} lines, so offset ${offset} is past the end.`, isError: true };
+      return { content: `${path16} has ${lines.length} lines, so offset ${offset} is past the end.`, isError: true };
     }
     const window = lines.slice(start, start + Math.min(limit ?? MAX_LINES, MAX_LINES));
     const rendered = [];
@@ -6068,68 +6257,69 @@ var writeTool = {
     additionalProperties: false
   },
   defaultPermission: "ask",
+  permission: protectedWritePermission,
   summarize(input) {
     return `write(${brief(input.path)})`;
   },
   async preview(input, ctx) {
-    const { path: path15, content } = input;
+    const { path: path16, content } = input;
     if (Buffer.byteLength(content, "utf8") > MAX_FILE_BYTES5) {
       return { kind: "text", text: `Write is limited to ${MAX_FILE_BYTES5 / 1e6} MB.` };
     }
-    const safe = resolveInside(ctx.cwd, path15);
+    const safe = resolveInside(ctx.cwd, path16);
     if (!safe.ok) return { kind: "text", text: safe.reason };
     const beforeInfo = await stat9(safe.path).catch(() => null);
     if (beforeInfo && beforeInfo.size > MAX_FILE_BYTES5) {
-      return { kind: "text", text: `Cannot preview ${path15}: the existing file is too large.` };
+      return { kind: "text", text: `Cannot preview ${path16}: the existing file is too large.` };
     }
     const beforeBuffer = await readFile12(safe.path).catch(() => null);
     if (beforeBuffer?.subarray(0, 8192).includes(0)) {
-      return { kind: "text", text: `Cannot preview binary file ${path15}` };
+      return { kind: "text", text: `Cannot preview binary file ${path16}` };
     }
     return {
       kind: "diff",
-      path: path15,
+      path: path16,
       before: beforeBuffer?.toString("utf8") ?? "",
       after: content
     };
   },
   async execute(input, ctx) {
-    const { path: path15, content } = input;
+    const { path: path16, content } = input;
     if (Buffer.byteLength(content, "utf8") > MAX_FILE_BYTES5) {
       return {
-        content: `Cannot write ${path15}: content exceeds the ${MAX_FILE_BYTES5 / 1e6} MB limit.`,
+        content: `Cannot write ${path16}: content exceeds the ${MAX_FILE_BYTES5 / 1e6} MB limit.`,
         isError: true
       };
     }
-    const safe = resolveInside(ctx.cwd, path15);
+    const safe = resolveInside(ctx.cwd, path16);
     if (!safe.ok) return { content: safe.reason, isError: true };
     let target = safe.path;
     let snapshot;
     try {
       await mkdir4(dirname3(target), { recursive: true });
-      const rechecked = resolveInside(ctx.cwd, path15);
+      const rechecked = resolveInside(ctx.cwd, path16);
       if (!rechecked.ok || rechecked.path !== target) {
         return {
-          content: `Cannot write ${path15}: the path changed while its parent was created.`,
+          content: `Cannot write ${path16}: the path changed while its parent was created.`,
           isError: true
         };
       }
       target = rechecked.path;
       snapshot = await readSafeFileSnapshot(target, MAX_FILE_BYTES5);
       if (snapshot.exists && snapshot.data.subarray(0, 8192).includes(0)) {
-        return { content: `Cannot write ${path15}: the existing file is binary, not text.`, isError: true };
+        return { content: `Cannot write ${path16}: the existing file is binary, not text.`, isError: true };
       }
       await ctx.checkpoint?.capture(target);
       await atomicWriteSafeFile(target, content, snapshot);
       ctx.checkpoint?.markChanged(target);
     } catch (error) {
-      return { content: `Failed to write ${path15}: ${error.message}`, isError: true };
+      return { content: `Failed to write ${path16}: ${error.message}`, isError: true };
     }
     const before = snapshot.exists ? snapshot.data.toString("utf8") : "";
     const lines = content === "" ? 0 : content.replace(/\n$/, "").split("\n").length;
     return {
-      content: `${before === "" ? "Created" : "Updated"} ${path15} (${lines} ${lines === 1 ? "line" : "lines"})`,
-      display: { kind: "diff", path: path15, before, after: content }
+      content: `${before === "" ? "Created" : "Updated"} ${path16} (${lines} ${lines === 1 ? "line" : "lines"})`,
+      display: { kind: "diff", path: path16, before, after: content }
     };
   }
 };
@@ -6159,9 +6349,9 @@ function createToolRegistry(tools) {
 
 // src/prompts/library.ts
 import { chmod as chmod6, readFile as readFile13, readdir as readdir4, unlink as unlink3, writeFile as writeFile8 } from "fs/promises";
-import path11 from "path";
+import path12 from "path";
 async function savePrompt(input) {
-  const slug = slugify(input.name);
+  const slug = promptSlug(input.name);
   if (!slug) throw new Error(`Prompt name has no letters or digits to name a file after: ${input.name}`);
   const prompt = {
     slug,
@@ -6171,7 +6361,7 @@ async function savePrompt(input) {
     body: input.body.trim()
   };
   await ensureDir(promptsDir);
-  const file = path11.join(promptsDir, `${slug}.md`);
+  const file = path12.join(promptsDir, `${slug}.md`);
   await writeFile8(file, serialize(prompt), {
     encoding: "utf8",
     mode: 384
@@ -6182,7 +6372,7 @@ async function savePrompt(input) {
 async function getPrompt(slug) {
   assertSlug(slug);
   try {
-    return parse(slug, await readFile13(path11.join(promptsDir, `${slug}.md`), "utf8"));
+    return parse(slug, await readFile13(path12.join(promptsDir, `${slug}.md`), "utf8"));
   } catch (error) {
     if (isMissing(error)) return null;
     throw error;
@@ -6197,16 +6387,27 @@ async function listPrompts() {
     return [];
   }
   const prompts2 = await Promise.all(
-    names.filter((name) => name.endsWith(".md")).map(
-      async (name) => parse(name.slice(0, -3), await readFile13(path11.join(promptsDir, name), "utf8"))
-    )
+    names.filter((name) => name.endsWith(".md") && validSlug(name.slice(0, -3))).map(async (name) => {
+      const text = await readFile13(path12.join(promptsDir, name), "utf8").catch(() => null);
+      return text === null ? null : parse(name.slice(0, -3), text);
+    })
   );
-  return prompts2.sort((a, b) => a.name.localeCompare(b.name));
+  return prompts2.filter((prompt) => prompt !== null).sort((a, b) => a.name.localeCompare(b.name));
 }
 async function deletePrompt(slug) {
   assertSlug(slug);
   try {
-    await unlink3(path11.join(promptsDir, `${slug}.md`));
+    await unlink3(path12.join(promptsDir, `${slug}.md`));
+    return true;
+  } catch (error) {
+    if (isMissing(error)) return false;
+    throw error;
+  }
+}
+async function promptExists(slug) {
+  assertSlug(slug);
+  try {
+    await readFile13(path12.join(promptsDir, `${slug}.md`), "utf8");
     return true;
   } catch (error) {
     if (isMissing(error)) return false;
@@ -6216,11 +6417,16 @@ async function deletePrompt(slug) {
 function isMissing(error) {
   return error.code === "ENOENT";
 }
-function slugify(name) {
-  return name.toLowerCase().replace(/[^a-z0-9]+/g, "-").replace(/^-+|-+$/g, "");
+var RESERVED_NAMES = /^(?:con|prn|aux|nul|com[0-9]|lpt[0-9])$/;
+function promptSlug(name) {
+  const slug = name.normalize("NFC").toLowerCase().replace(/[^\p{L}\p{N}]+/gu, "-").replace(/^-+|-+$/g, "").slice(0, 80).replace(/-+$/, "");
+  return RESERVED_NAMES.test(slug) ? `${slug}-prompt` : slug;
+}
+function validSlug(slug) {
+  return /^[\p{L}\p{N}]+(?:-[\p{L}\p{N}]+)*$/u.test(slug) && !RESERVED_NAMES.test(slug);
 }
 function assertSlug(slug) {
-  if (!/^[a-z0-9]+(?:-[a-z0-9]+)*$/.test(slug)) {
+  if (!validSlug(slug)) {
     throw new Error(`Invalid prompt id: ${slug}`);
   }
 }
@@ -6264,7 +6470,7 @@ function parse(slug, text) {
 
 // src/skills/library.ts
 import { lstat as lstat4, open as open2, readdir as readdir5 } from "fs/promises";
-import path12 from "path";
+import path13 from "path";
 var SKILL_FILE = "SKILL.md";
 var FRONTMATTER_BYTES = 8192;
 var MAX_SKILL_BYTES = 5e6;
@@ -6277,7 +6483,7 @@ async function discoverSkills(dirs) {
     if (!rootInfo?.isDirectory() || rootInfo.isSymbolicLink()) continue;
     const entries = await readdir5(root, { withFileTypes: true }).catch(() => []);
     const found = await Promise.all(
-      entries.filter((entry) => entry.isDirectory() && !entry.isSymbolicLink()).slice(0, MAX_SKILLS_PER_ROOT).map((entry) => readMeta(root, rootInfo, path12.join(root, entry.name)))
+      entries.filter((entry) => entry.isDirectory() && !entry.isSymbolicLink()).slice(0, MAX_SKILLS_PER_ROOT).map((entry) => readMeta(root, rootInfo, path13.join(root, entry.name)))
     );
     for (const meta of found) {
       if (meta && !byName.has(meta.name)) byName.set(meta.name, meta);
@@ -6317,11 +6523,11 @@ function formatSkillCatalogue(skills) {
 async function readMeta(root, rootInfo, dir) {
   const dirInfo = await lstat4(dir).catch(() => null);
   if (!dirInfo?.isDirectory() || dirInfo.isSymbolicLink()) return null;
-  const file = path12.join(dir, SKILL_FILE);
+  const file = path13.join(dir, SKILL_FILE);
   const head = await readFrontmatterBytes(file);
   if (!head) return null;
   const { fields } = parseFrontmatter(head.text);
-  const meta = { name: fields.name || path12.basename(dir), description: fields.description ?? "", dir, file };
+  const meta = { name: fields.name || path13.basename(dir), description: fields.description ?? "", dir, file };
   guards.set(meta, {
     root,
     rootIdentity: identity(rootInfo),
@@ -6393,10 +6599,21 @@ function parseFrontmatter(text) {
   if (lines[0]?.trim() === "---") {
     let i = 1;
     for (; i < lines.length && lines[i].trim() !== "---"; i++) {
-      const colon = lines[i].indexOf(":");
+      const line = lines[i];
+      if (/^\s/.test(line)) continue;
+      const colon = line.indexOf(":");
       if (colon <= 0) continue;
-      const key = lines[i].slice(0, colon).trim();
-      if (key === "name" || key === "description") fields[key] = lines[i].slice(colon + 1).trim();
+      const key = line.slice(0, colon).trim();
+      if (key !== "name" && key !== "description") continue;
+      let value = line.slice(colon + 1).trim();
+      if (/^[>|][+-]?$/.test(value)) {
+        const block = [];
+        while (i + 1 < lines.length && /^\s+\S/.test(lines[i + 1]) && lines[i + 1].trim() !== "---") {
+          block.push(lines[++i].trim());
+        }
+        value = block.join(value.startsWith("|") ? "\n" : " ");
+      }
+      fields[key] = value.replace(/^(["'])(.*)\1$/, "$2").trim();
     }
     bodyStart = Math.min(i + 1, lines.length);
   }
@@ -6404,174 +6621,238 @@ function parseFrontmatter(text) {
 }
 
 // src/skills/install.ts
+import { execFile as execFile2 } from "child_process";
 import { randomUUID as randomUUID4 } from "crypto";
-import { execFileSync } from "child_process";
-import {
-  existsSync as existsSync2,
-  lstatSync,
-  mkdirSync,
-  readFileSync,
-  readdirSync,
-  realpathSync as realpathSync2,
-  rmSync,
-  writeFileSync
-} from "fs";
-import { chmod as chmod7, mkdir as mkdir5 } from "fs/promises";
-import path13 from "path";
-var TMP_DIR = path13.join(skillsDir, ".tmp");
+import { existsSync as existsSync2 } from "fs";
+import { chmod as chmod7, copyFile, lstat as lstat5, mkdir as mkdir5, readdir as readdir6, readFile as readFile14, rename as rename6, rm as rm7 } from "fs/promises";
+import path14 from "path";
+var TMP_DIR = path14.join(skillsDir, ".tmp");
+var SKILL_FILE2 = "SKILL.md";
 var MAX_SKILL_BYTES2 = 5e6;
-async function installSkill(source) {
+var MAX_ARCHIVE_BYTES = 2e7;
+var MAX_SKILL_FILES = 1e3;
+var MAX_SKILL_TOTAL_BYTES = 5e7;
+var MAX_SEARCH_DEPTH = 4;
+var COMMAND_TIMEOUT_MS = 12e4;
+var SKIPPED_DIRS = /* @__PURE__ */ new Set([".git", "node_modules"]);
+async function installSkill(source, run = runCommand) {
+  const trimmed = source.trim();
+  if (!trimmed) throw new Error("Give a skill source: a GitHub URL, an npm package or a local path.");
   await ensureDir(skillsDir);
-  if (isGitHubUrl(source)) {
-    return installFromGitHub(source);
+  if (isGitHubUrl(trimmed)) return installFromGitHub(trimmed, run);
+  if (npmSkillName(trimmed) && !existsSync2(path14.resolve(trimmed))) {
+    return installFromNpm(trimmed, run);
   }
-  if (isNpmPackage(source)) {
-    return installFromNpm(source);
-  }
-  return installFromLocal(source);
+  return installFromLocal(trimmed);
 }
-function isGitHubUrl(input) {
-  try {
-    const url = new URL(input);
-    return url.protocol === "https:" && (url.hostname === "github.com" || url.hostname === "www.github.com");
-  } catch {
-    return false;
+async function uninstallSkill(name) {
+  const dir = safeChildPath(skillsDir, safeSkillName(name));
+  const info = await lstat5(dir).catch(() => null);
+  if (!info) throw new Error(`No installed skill named "${name}" in ${skillsDir}`);
+  if (info.isSymbolicLink() || !info.isDirectory()) {
+    throw new Error(`Refusing to remove ${dir}: it is not a plain skill directory.`);
   }
+  await rm7(dir, { recursive: true, force: true });
+  return dir;
 }
-function isNpmPackage(input) {
-  return npmSkillName(input) !== null;
-}
-async function installFromGitHub(url) {
+async function installFromGitHub(url, run) {
   const { owner, repo, subdir, branch } = parseGitHubUrl(url);
-  const name = safeSkillName(subdir ? path13.posix.basename(subdir) : repo);
-  const skillDir = safeChildPath(skillsDir, name);
-  const tmpDir = safeChildPath(TMP_DIR, `${name}-${randomUUID4()}`);
-  try {
-    mkdirSync(tmpDir, { recursive: true });
-    const cloneUrl = `https://github.com/${owner}/${repo}.git`;
-    const gitArgs = ["clone", "--depth", "1"];
-    if (branch) gitArgs.push("--branch", branch);
-    gitArgs.push(cloneUrl, tmpDir);
-    execFileSync("git", gitArgs, { stdio: "ignore" });
-    const skillFile = subdir ? safeChildPath(tmpDir, ...subdir.split("/"), "SKILL.md") : safeChildPath(tmpDir, "SKILL.md");
-    const body = readSkillFile(skillFile, tmpDir, subdir || repo);
-    removeExistingSkillDir(skillDir);
-    await writeSkillFile(skillDir, body);
-    return { name, dir: skillDir, source: url };
-  } finally {
-    rmSync(tmpDir, { recursive: true, force: true });
-  }
+  return withTempDir(async (tmp) => {
+    const checkout = path14.join(tmp, "r");
+    const args = ["-c", "core.longpaths=true", "clone", "--depth", "1", "--single-branch"];
+    if (branch) args.push("--branch", branch);
+    args.push(`https://github.com/${owner}/${repo}.git`, checkout);
+    try {
+      await run("git", args, { cwd: tmp, env: { ...process.env, GIT_TERMINAL_PROMPT: "0" } });
+    } catch (error) {
+      throw new Error(`Could not clone ${owner}/${repo}${branch ? ` (${branch})` : ""}: ${messageOf2(error)}`);
+    }
+    const start = subdir ? safeChildPath(checkout, ...subdir.split("/")) : checkout;
+    const skillDir = await locateSkillDir(start, url);
+    const fallback = skillDir === checkout ? repo : path14.basename(skillDir);
+    return copyIntoSkills(skillDir, fallback, url);
+  });
 }
-async function installFromNpm(packageName) {
+async function installFromNpm(packageName, run) {
   const parsedName = npmSkillName(packageName);
   if (!parsedName) throw new Error(`Invalid npm package name: ${packageName}`);
-  const name = safeSkillName(parsedName);
-  const skillDir = safeChildPath(skillsDir, name);
-  const tmpDir = safeChildPath(TMP_DIR, `${name}-${randomUUID4()}`);
-  try {
-    mkdirSync(tmpDir, { recursive: true });
-    execFileSync("npm", ["pack", packageName, "--prefix", tmpDir], {
-      stdio: "ignore"
-    });
-    const files = readdirSync(tmpDir);
-    const tarball = files.find((f) => f.endsWith(".tgz"));
-    if (!tarball) {
-      throw new Error(`Could not download npm package "${packageName}"`);
-    }
-    const tarballPath = path13.join(tmpDir, tarball);
-    validateTarball(tarballPath);
-    const extractDir = path13.join(tmpDir, "extracted");
-    mkdirSync(extractDir, { recursive: true });
+  return withTempDir(async (tmp) => {
     try {
-      execFileSync("tar", ["-xzf", tarballPath, "-C", extractDir], { stdio: "ignore" });
-    } catch {
-      const packageDir = path13.join(tmpDir, "node_modules", packageName);
-      if (existsSync2(packageDir)) {
-        const skillFile2 = path13.join(packageDir, "SKILL.md");
-        if (existsSync2(skillFile2)) {
-          const body2 = readSkillFile(skillFile2, packageDir, packageName);
-          await writeSkillFile(skillDir, body2);
-          return { name, dir: skillDir, source: packageName };
-        }
-      }
-      throw new Error("Could not extract the npm package. Is `tar` available?");
+      await run("npm", ["pack", packageName, "--pack-destination", ".", "--silent"], { cwd: tmp });
+    } catch (error) {
+      throw new Error(`Could not download npm package "${packageName}": ${messageOf2(error)}`);
     }
-    const extractedFiles = readdirSync(extractDir);
-    const packageRoot = extractedFiles.find((f) => f === "package");
-    if (!packageRoot) throw new Error("Could not find package root in extracted files");
-    const skillFile = path13.join(extractDir, "package", "SKILL.md");
-    if (!existsSync2(skillFile)) {
-      throw new Error(`No SKILL.md found in npm package "${packageName}"`);
+    const tarball = (await readdir6(tmp)).find((file) => file.endsWith(".tgz"));
+    if (!tarball) throw new Error(`npm did not produce an archive for "${packageName}"`);
+    const archive = path14.join(tmp, tarball);
+    const info = await lstat5(archive);
+    if (!info.isFile() || info.size > MAX_ARCHIVE_BYTES) {
+      throw new Error(`The npm archive exceeds the ${MAX_ARCHIVE_BYTES / 1e6} MB limit.`);
     }
-    const body = readSkillFile(skillFile, extractDir, packageName);
-    await writeSkillFile(skillDir, body);
-    return { name, dir: skillDir, source: packageName };
-  } finally {
-    rmSync(tmpDir, { recursive: true, force: true });
-  }
+    const extracted = path14.join(tmp, "extracted");
+    await mkdir5(extracted);
+    try {
+      await run("tar", ["-xzf", tarball, "-C", "extracted"], { cwd: tmp });
+    } catch (error) {
+      throw new Error(`Could not extract the npm package (is tar available?): ${messageOf2(error)}`);
+    }
+    const skillDir = await locateSkillDir(path14.join(extracted, "package"), packageName);
+    return copyIntoSkills(skillDir, parsedName, packageName);
+  });
 }
-function npmSkillName(input) {
-  if (input.includes("\\") || input.startsWith(".")) return null;
-  const scoped = input.match(/^@[\w.-]+\/([\w.-]+)(?:@[\w.*+-]+)?$/);
-  if (scoped) return scoped[1] ?? null;
-  const unscoped = input.match(/^([\w.-]+)(?:@[\w.*+-]+)?$/);
-  return unscoped?.[1] ?? null;
+async function installFromLocal(source) {
+  const resolved = path14.resolve(source);
+  const info = await lstat5(resolved).catch(() => null);
+  if (!info) throw new Error(`No such file or directory: ${source}`);
+  const start = info.isFile() && path14.basename(resolved) === SKILL_FILE2 ? path14.dirname(resolved) : resolved;
+  const skillDir = await locateSkillDir(start, source);
+  return copyIntoSkills(skillDir, path14.basename(skillDir), resolved);
 }
-function validateTarball(file) {
-  const info = lstatSync(file, { throwIfNoEntry: false });
-  if (!info?.isFile() || info.size > 2e7) {
-    throw new Error("The npm skill archive is missing or exceeds the 20 MB safety limit.");
+async function locateSkillDir(start, source) {
+  const info = await lstat5(start).catch(() => null);
+  if (!info?.isDirectory() || info.isSymbolicLink()) {
+    throw new Error(`"${source}" does not point to a directory.`);
   }
-  const listing = execFileSync("tar", ["-tzf", file], {
-    encoding: "utf8",
-    maxBuffer: 2e6,
-    stdio: ["ignore", "pipe", "ignore"]
-  });
-  const entries = listing.split(/\r?\n/).filter(Boolean);
-  if (entries.length === 0 || entries.length > 1e4) {
-    throw new Error("The npm skill archive has an invalid number of entries.");
+  if (await isPlainFile(path14.join(start, SKILL_FILE2))) return start;
+  const found = [];
+  const walk = async (dir, depth) => {
+    if (depth > MAX_SEARCH_DEPTH || found.length > 50) return;
+    const entries = await readdir6(dir, { withFileTypes: true }).catch(() => []);
+    for (const entry of entries) {
+      if (!entry.isDirectory() || SKIPPED_DIRS.has(entry.name)) continue;
+      const child = path14.join(dir, entry.name);
+      if (await isPlainFile(path14.join(child, SKILL_FILE2))) found.push(child);
+      else await walk(child, depth + 1);
+    }
+  };
+  await walk(start, 1);
+  if (found.length === 1) return found[0];
+  if (found.length === 0) throw new Error(`No ${SKILL_FILE2} found in "${source}".`);
+  const listed = found.slice(0, 20).map((dir) => `  ${path14.relative(start, dir).split(path14.sep).join("/")}`).join("\n");
+  throw new Error(
+    `"${source}" contains ${found.length} skills; install one of them by its own path (for GitHub: .../tree/<branch>/<path>):
+${listed}`
+  );
+}
+async function copyIntoSkills(sourceDir, fallbackName, source) {
+  const skillFile = path14.join(sourceDir, SKILL_FILE2);
+  const skillInfo = await lstat5(skillFile);
+  if (skillInfo.size > MAX_SKILL_BYTES2) {
+    throw new Error(`${SKILL_FILE2} exceeds the ${MAX_SKILL_BYTES2 / 1e6} MB limit.`);
   }
-  for (const entry of entries) {
-    const normalized = entry.replace(/^\.\//, "");
-    if (normalized.includes("\\") || path13.posix.isAbsolute(normalized) || normalized.split("/").some((segment) => segment === "..")) {
-      throw new Error(`Unsafe path in npm skill archive: ${entry}`);
-    }
-  }
-}
-async function installFromLocal(srcPath) {
-  const resolved = path13.resolve(srcPath);
-  let skillDir;
-  let skillFile;
-  const directSkill = path13.join(resolved, "SKILL.md");
-  if (existsSync2(directSkill)) {
-    skillDir = resolved;
-    skillFile = directSkill;
-  } else if (resolved.endsWith("SKILL.md") && existsSync2(resolved)) {
-    skillDir = path13.dirname(resolved);
-    skillFile = resolved;
-  } else {
-    throw new Error(`No SKILL.md found at "${srcPath}"`);
+  const name = safeSkillName(frontmatterName(await readFile14(skillFile, "utf8")) ?? fallbackName);
+  const destination = safeChildPath(skillsDir, name);
+  const existing = await lstat5(destination).catch(() => null);
+  if (existing && (existing.isSymbolicLink() || !existing.isDirectory())) {
+    throw new Error(`Refusing to replace ${destination}: it is not a plain skill directory.`);
+  }
+  await ensureDir(TMP_DIR);
+  const staging = safeChildPath(TMP_DIR, `s-${randomUUID4().slice(0, 8)}`);
+  try {
+    await copyTree(sourceDir, staging);
+    if (existing) await rm7(destination, { recursive: true, force: true });
+    await rename6(staging, destination);
+  } catch (error) {
+    await rm7(staging, { recursive: true, force: true }).catch(() => void 0);
+    throw error;
   }
-  const name = path13.basename(skillDir);
-  const destDir = safeChildPath(skillsDir, safeSkillName(name));
-  const body = readSkillFile(skillFile, skillDir, srcPath);
-  await writeSkillFile(destDir, body);
-  return { name, dir: destDir, source: resolved };
+  return { name, dir: destination, source };
+}
+async function copyTree(from, to) {
+  let files = 0;
+  let bytes = 0;
+  const visit = async (dir, target) => {
+    await mkdir5(target, { recursive: true, mode: 448 });
+    for (const entry of await readdir6(dir, { withFileTypes: true })) {
+      const source = path14.join(dir, entry.name);
+      const destination = path14.join(target, entry.name);
+      if (entry.isDirectory()) {
+        if (!SKIPPED_DIRS.has(entry.name)) await visit(source, destination);
+        continue;
+      }
+      if (!entry.isFile()) continue;
+      const info = await lstat5(source);
+      files += 1;
+      bytes += info.size;
+      if (files > MAX_SKILL_FILES || bytes > MAX_SKILL_TOTAL_BYTES) {
+        throw new Error(
+          `The skill is too large to install (limit ${MAX_SKILL_FILES} files, ${MAX_SKILL_TOTAL_BYTES / 1e6} MB).`
+        );
+      }
+      await copyFile(source, destination);
+      await chmod7(destination, (info.mode & 73) !== 0 ? 448 : 384);
+    }
+  };
+  await visit(from, to);
 }
-async function writeSkillFile(dir, body) {
-  assertInside(skillsDir, dir);
-  const existingDir = lstatSync(dir, { throwIfNoEntry: false });
-  if (existingDir?.isSymbolicLink()) {
-    throw new Error(`Refusing to replace symlinked skill directory: ${dir}`);
+function frontmatterName(text) {
+  const lines = text.replace(/^/, "").split(/\r?\n/);
+  if (lines[0]?.trim() !== "---") return void 0;
+  for (const line of lines.slice(1)) {
+    if (line.trim() === "---") return void 0;
+    const match = /^name\s*:\s*(.+)$/.exec(line);
+    if (match) {
+      const value = match[1].trim().replace(/^(["'])(.*)\1$/, "$2").trim();
+      return /^[A-Za-z0-9][A-Za-z0-9._-]{0,127}$/.test(value) ? value : void 0;
+    }
   }
-  await mkdir5(dir, { recursive: true, mode: 448 });
-  const file = path13.join(dir, "SKILL.md");
-  const existingFile = lstatSync(file, { throwIfNoEntry: false });
-  if (existingFile?.isSymbolicLink()) {
-    throw new Error(`Refusing to replace symlinked skill file: ${file}`);
+  return void 0;
+}
+async function withTempDir(work) {
+  await ensureDir(TMP_DIR);
+  const dir = safeChildPath(TMP_DIR, randomUUID4().slice(0, 8));
+  await mkdir5(dir, { mode: 448 });
+  try {
+    return await work(dir);
+  } finally {
+    await rm7(dir, { recursive: true, force: true }).catch(() => void 0);
+  }
+}
+function runCommand(command, args, options) {
+  const viaShell = process.platform === "win32" && command === "npm";
+  const file = viaShell ? [command, ...args.map(quoteForCmd)].join(" ") : command;
+  return new Promise((resolve3, reject) => {
+    execFile2(
+      file,
+      viaShell ? [] : args,
+      {
+        cwd: options.cwd,
+        env: options.env,
+        shell: viaShell,
+        timeout: COMMAND_TIMEOUT_MS,
+        windowsHide: true,
+        maxBuffer: 4e6
+      },
+      (error, _stdout, stderr) => {
+        if (!error) return resolve3();
+        const code = error.code;
+        if (code === "ENOENT") return reject(new Error(`${command} is not installed or not on PATH`));
+        if (error.killed) {
+          return reject(new Error(`${command} timed out after ${COMMAND_TIMEOUT_MS / 1e3}s`));
+        }
+        const detail = String(stderr ?? "").trim().split(/\r?\n/).filter((line) => line.trim() !== "" && !/^Cloning into /.test(line)).slice(-3).join(" ");
+        reject(new Error(detail || error.message));
+      }
+    );
+  });
+}
+function quoteForCmd(value) {
+  return /^[\w@./:=+-]+$/.test(value) ? value : `"${value.replace(/"/g, '""')}"`;
+}
+function isGitHubUrl(input) {
+  try {
+    const url = new URL(input);
+    return url.protocol === "https:" && (url.hostname === "github.com" || url.hostname === "www.github.com");
+  } catch {
+    return false;
   }
-  writeFileSync(file, body, { encoding: "utf8", mode: 384 });
-  await chmod7(file, 384);
+}
+function npmSkillName(input) {
+  if (input.includes("\\") || input.startsWith(".")) return null;
+  const scoped = input.match(/^@[\w][\w.-]*\/([\w][\w.-]*)(?:@[\w.*+-]+)?$/);
+  if (scoped) return scoped[1] ?? null;
+  const unscoped = input.match(/^([\w][\w.-]*)(?:@[\w.*+-]+)?$/);
+  return unscoped?.[1] ?? null;
 }
 function parseGitHubUrl(url) {
   let parsed;
@@ -6593,11 +6874,13 @@ function parseGitHubUrl(url) {
   const owner = safeGitHubSegment(segments[0], "owner");
   const repo = safeSkillName(segments[1].replace(/\.git$/i, ""));
   if (segments.length === 2) return { owner, repo };
-  if (segments[2] !== "tree" || segments.length < 4) {
+  if (segments[2] !== "tree" && segments[2] !== "blob" || segments.length < 4) {
     throw new Error(`Unsupported GitHub skill URL: ${url}`);
   }
   const branch = safeGitHubSegment(segments[3], "branch");
-  const subdirSegments = segments.slice(4).map((segment) => safeGitHubSegment(segment, "path"));
+  const pathSegments = segments.slice(4);
+  if (segments[2] === "blob" && pathSegments.at(-1) === SKILL_FILE2) pathSegments.pop();
+  const subdirSegments = pathSegments.map((segment) => safeGitHubSegment(segment, "path"));
   return {
     owner,
     repo,
@@ -6606,7 +6889,7 @@ function parseGitHubUrl(url) {
   };
 }
 function safeGitHubSegment(value, kind) {
-  if (value === "" || value === "." || value === ".." || value.length > 255 || /[\0-\x1f\x7f/\\:*?"<>|#%]/.test(value)) {
+  if (value === "" || value === "." || value === ".." || value.startsWith("-") || value.length > 255 || /[\0-\x1f\x7f/\\:*?"<>|#%]/.test(value)) {
     throw new Error(`Unsafe GitHub ${kind}: ${value || "(empty)"}`);
   }
   return value;
@@ -6618,37 +6901,19 @@ function safeSkillName(value) {
   return value;
 }
 function safeChildPath(root, ...segments) {
-  const target = path13.resolve(root, ...segments);
-  assertInside(root, target);
-  return target;
-}
-function assertInside(root, target) {
-  const relative2 = path13.relative(path13.resolve(root), path13.resolve(target));
-  if (relative2 === "" || !path13.isAbsolute(relative2) && relative2 !== ".." && !relative2.startsWith(`..${path13.sep}`)) {
-    return;
+  const target = path14.resolve(root, ...segments);
+  const relative2 = path14.relative(path14.resolve(root), target);
+  if (relative2 !== "" && (path14.isAbsolute(relative2) || relative2 === ".." || relative2.startsWith(`..${path14.sep}`))) {
+    throw new Error(`Path escapes the skills directory: ${target}`);
   }
-  throw new Error(`Path escapes the skills directory: ${target}`);
+  return target;
 }
-function readSkillFile(file, allowedRoot, source) {
-  const info = lstatSync(file, { throwIfNoEntry: false });
-  if (!info?.isFile() || info.isSymbolicLink()) {
-    throw new Error(`No regular SKILL.md found in "${source}"`);
-  }
-  if (info.size > MAX_SKILL_BYTES2) {
-    throw new Error(`SKILL.md in "${source}" exceeds the ${MAX_SKILL_BYTES2 / 1e6} MB limit`);
-  }
-  const root = realpathSync2(allowedRoot);
-  const resolved = realpathSync2(file);
-  assertInside(root, resolved);
-  return readFileSync(resolved, "utf8");
+async function isPlainFile(file) {
+  const info = await lstat5(file).catch(() => null);
+  return Boolean(info?.isFile() && !info.isSymbolicLink());
 }
-function removeExistingSkillDir(dir) {
-  const info = lstatSync(dir, { throwIfNoEntry: false });
-  if (!info) return;
-  if (info.isSymbolicLink()) {
-    throw new Error(`Refusing to remove symlinked skill directory: ${dir}`);
-  }
-  rmSync(dir, { recursive: true, force: true });
+function messageOf2(error) {
+  return error instanceof Error ? error.message : String(error);
 }
 
 // src/tools/skill.ts
@@ -6922,6 +7187,12 @@ async function boot(options) {
   const skillRoots = workspaceTrusted ? [projectSkillsDir(workspaceRoot2), skillsDir] : [skillsDir];
   let skills = await discoverSkills(skillRoots);
   if (skills.length > 0) tools.register([createSkillTool(skills)]);
+  const reloadSkills = async () => {
+    skills = await discoverSkills(skillRoots);
+    skillCatalogue = formatSkillCatalogue(skills);
+    tools.unregister(["skill"]);
+    if (skills.length > 0) tools.register([createSkillTool(skills)]);
+  };
   const mcp = createMcpManager(config.mcp);
   await mcp.connectAll();
   let registeredMcpToolNames = /* @__PURE__ */ new Set();
@@ -6934,6 +7205,7 @@ async function boot(options) {
     );
   };
   syncMcpTools();
+  mcp.onChange(syncMcpTools);
   for (const state of mcp.states()) {
     if (state.status === "error") warnings.push(`MCP "${state.name}": ${state.error ?? "failed"}`);
   }
@@ -7326,7 +7598,7 @@ async function boot(options) {
     },
     async exportSession(id, destination) {
       await persistQueue.catch(() => void 0);
-      const target = destination ? path14.resolve(options.cwd, destination) : path14.join(options.cwd, ".kitcode-exports");
+      const target = destination ? path15.resolve(options.cwd, destination) : path15.join(options.cwd, ".kitcode-exports");
       if (!destination) await mkdir6(target, { recursive: true, mode: 448 });
       return (await exportSession(id, target)).path;
     },
@@ -7553,16 +7825,20 @@ ${lines.join("\n")}` : null;
         hint: prompt.description || void 0
       }));
     },
-    async readPrompt(slug) {
-      const prompt = await getPrompt(slug);
+    async readPrompt(name) {
+      const prompt = await getPrompt(promptSlug(name));
       return prompt?.body ?? "";
     },
     async savePrompt(name, body) {
-      await savePrompt({ name, body });
+      return (await savePrompt({ name, body })).slug;
     },
-    async deletePrompt(slug) {
-      const ok = await deletePrompt(slug);
-      if (!ok) throw new Error(`Prompt "${slug}" not found.`);
+    async promptExists(name) {
+      const slug = promptSlug(name);
+      return slug !== "" && await promptExists(slug);
+    },
+    async deletePrompt(name) {
+      const slug = promptSlug(name);
+      if (!slug || !await deletePrompt(slug)) throw new Error(`Prompt "${name}" not found.`);
     },
     async loadSkill(name) {
       const meta = skills.find((s) => s.name === name);
@@ -7571,15 +7847,25 @@ ${lines.join("\n")}` : null;
     },
     async installSkill(source) {
       const result = await installSkill(source);
-      skills = await discoverSkills(skillRoots);
-      skillCatalogue = formatSkillCatalogue(skills);
-      tools.unregister(["skill"]);
-      if (skills.length > 0) tools.register([createSkillTool(skills)]);
+      await reloadSkills();
       return result;
     },
+    async uninstallSkill(name) {
+      const meta = skills.find((skill) => skill.name === name);
+      if (!meta) throw new Error(`Skill "${name}" not found.`);
+      if (path15.dirname(meta.dir) !== skillsDir) {
+        throw new Error(`Skill "${name}" belongs to this project: delete ${meta.dir} instead.`);
+      }
+      await uninstallSkill(path15.basename(meta.dir));
+      await reloadSkills();
+    },
     async loadAttachment(requestedPath) {
       return (await loadAttachment(options.cwd, requestedPath)).block;
     },
+    summarizeToolCall: (name, input) => tools.get(name)?.summarize(input) ?? name,
+    async loadMentionAttachment(requestedPath) {
+      return (await loadMentionAttachment(options.cwd, requestedPath))?.block ?? null;
+    },
     async loadAutomaticAttachment(requestedPath) {
       return (await loadAutomaticAttachment(options.cwd, requestedPath))?.block ?? null;
     },
@@ -7697,6 +7983,16 @@ ${lines.join("\n")}` : null;
           });
         }
         return next;
+      } catch (error) {
+        const recovered = signal.aborted ? null : imageRejection(error, history);
+        if (!recovered) throw error;
+        hooks.onEvent({
+          type: "notice",
+          level: "error",
+          text: `${error instanceof Error ? error.message : String(error)}
+${recovered.removed === 1 ? "The image was" : `${recovered.removed} images were`} removed from the conversation so the next message can go through. Send a description or a smaller image instead, or switch to a model that accepts images.`
+        });
+        return recovered.messages;
       } finally {
         try {
           await checkpoint.commit();
@@ -7743,6 +8039,14 @@ ${lines.join("\n")}` : null;
     }
   };
 }
+function imageRejection(error, history) {
+  const status = error?.status;
+  if (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);
+  return result.removed > 0 ? result : null;
+}
 function preferredModel(models) {
   for (const preferred of PREFERRED2) {
     const match = models.find((model) => model.id.endsWith(preferred));
@@ -7998,35 +8302,89 @@ function useTerminalSize() {
 
 // src/mcp/add.ts
 var SERVER_NAME = /^[a-zA-Z0-9][a-zA-Z0-9_-]{0,63}$/;
+var ENV_NAME = /^[A-Za-z_][A-Za-z0-9_]*$/;
+var HEADER_NAME = /^[!#$%&'*+.^_`|~0-9A-Za-z-]+$/;
+function parseMcpAddCommand(raw) {
+  const args = splitCommandLine(raw);
+  return args ? parseMcpAddArgs(args) : { ok: false, error: "usage" };
+}
 function parseMcpAddArgs(args) {
-  const [name, first2, ...remaining] = args;
-  if (!name || !first2) return { ok: false, error: "usage" };
+  const [name, ...tail2] = args;
+  if (!name) return { ok: false, error: "usage" };
   if (!SERVER_NAME.test(name)) return { ok: false, error: "invalid-name" };
-  if (first2 === "http") {
-    const [url, ...extra] = remaining;
-    if (!url) return { ok: false, error: "usage" };
+  const env = {};
+  const headers = {};
+  let index = 0;
+  for (; index < tail2.length; index += 1) {
+    const option = tail2[index];
+    if (option === "-e" || option === "--env") {
+      const value = tail2[++index];
+      const eq = value?.indexOf("=") ?? -1;
+      if (!value || eq <= 0 || !ENV_NAME.test(value.slice(0, eq))) return { ok: false, error: "invalid-env" };
+      env[value.slice(0, eq)] = value.slice(eq + 1);
+      continue;
+    }
+    if (option === "-H" || option === "--header") {
+      const value = tail2[++index];
+      const colon = value?.indexOf(":") ?? -1;
+      const key = value && colon > 0 ? value.slice(0, colon).trim() : "";
+      if (!value || !HEADER_NAME.test(key)) return { ok: false, error: "invalid-header" };
+      headers[key] = value.slice(colon + 1).trim();
+      continue;
+    }
+    break;
+  }
+  let rest = tail2.slice(index);
+  let kind;
+  if (rest[0] === "http") {
+    kind = "http";
+    rest = rest.slice(1);
+  } else if (rest[0] === "stdio" || rest[0] === "--") {
+    kind = "stdio";
+    rest = rest.slice(1);
+  }
+  const [target, ...extra] = rest;
+  if (!target) return { ok: false, error: "usage" };
+  kind ??= /^https?:\/\//i.test(target) ? "http" : "stdio";
+  if (kind === "http") {
     if (extra.length > 0) return { ok: false, error: "http-args" };
-    return httpServer(name, url);
-  }
-  if (first2 === "stdio" || first2 === "--") {
-    const [command, ...commandArgs] = remaining;
-    if (!command) return { ok: false, error: "usage" };
-    return stdioServer(name, command, commandArgs);
-  }
-  if (/^https?:\/\//.test(first2)) {
-    if (remaining.length > 0) return { ok: false, error: "http-args" };
-    return httpServer(name, first2);
+    if (Object.keys(env).length > 0) return { ok: false, error: "option-mismatch" };
+    const parsed2 = mcpServerSchema.safeParse({ type: "http", url: target, headers });
+    return parsed2.success ? { ok: true, name, config: parsed2.data } : { ok: false, error: "invalid-url" };
   }
-  return stdioServer(name, first2, remaining);
-}
-function httpServer(name, url) {
-  const parsed = mcpServerSchema.safeParse({ type: "http", url });
-  return parsed.success ? { ok: true, name, config: parsed.data } : { ok: false, error: "invalid-url" };
-}
-function stdioServer(name, command, args) {
-  const parsed = mcpServerSchema.safeParse({ type: "stdio", command, args });
+  if (Object.keys(headers).length > 0) return { ok: false, error: "option-mismatch" };
+  const parsed = mcpServerSchema.safeParse({ type: "stdio", command: target, args: extra, env });
   return parsed.success ? { ok: true, name, config: parsed.data } : { ok: false, error: "usage" };
 }
+function splitCommandLine(raw) {
+  const words2 = [];
+  let current = "";
+  let inWord = false;
+  let quote;
+  for (const char of raw) {
+    if (quote) {
+      if (char === quote) quote = void 0;
+      else current += char;
+      continue;
+    }
+    if (char === '"' || char === "'") {
+      quote = char;
+      inWord = true;
+      continue;
+    }
+    if (/\s/.test(char)) {
+      if (inWord) words2.push(current);
+      current = "";
+      inWord = false;
+      continue;
+    }
+    current += char;
+    inWord = true;
+  }
+  if (quote) return null;
+  if (inWord) words2.push(current);
+  return words2;
+}
 
 // src/ui/speed.ts
 var CHARS_PER_TOKEN = 4;
@@ -8065,21 +8423,21 @@ function readSpeed(meter, busy, now = Date.now()) {
 // src/ui/commands.ts
 var BUSY_SAFE = { runsWhileBusy: true };
 var COMMANDS = [
-  { name: "model", ...BUSY_SAFE },
+  { name: "model", args: "[model]", ...BUSY_SAFE },
   { name: "login" },
   { name: "provider" },
   { name: "logout", args: "[provider]" },
   { name: "key", args: "[provider]" },
   { name: "refresh", args: "[provider]" },
   { name: "effort", ...BUSY_SAFE },
-  { name: "thinking", ...BUSY_SAFE },
+  { name: "thinking", args: "[on|off]", ...BUSY_SAFE },
   { name: "bell", args: "[on|off]", ...BUSY_SAFE },
   { name: "context", args: "[tokens|auto]", ...BUSY_SAFE },
   { name: "budget", args: "[tokens]", ...BUSY_SAFE },
   { name: "theme", args: "[color]", ...BUSY_SAFE },
-  { name: "lang", ...BUSY_SAFE },
-  { name: "prompt", args: "[save <name>|delete <name>]" },
-  { name: "skills", args: "[install <source>]" },
+  { name: "lang", args: "[en|ru]", ...BUSY_SAFE },
+  { name: "prompt", args: "[name|save [name]|delete [name]]" },
+  { name: "skills", args: "[install <source>|remove [name]]" },
   { name: "bypass" },
   { name: "usage", ...BUSY_SAFE },
   { name: "mcp", args: "[add|list|delete|enable|disable]" },
@@ -8098,7 +8456,9 @@ var COMMANDS = [
   { name: "exit", ...BUSY_SAFE }
 ];
 var SUBCOMMANDS = [
-  { name: "mcp add", args: "<name> <url|-- command>" },
+  { name: "skills install", args: "<github-url|npm-package|path>" },
+  { name: "skills remove", args: "[name]" },
+  { name: "mcp add", args: '<name> [-e K=V] [-H "N: V"] <url|-- command>' },
   { name: "mcp list" },
   { name: "mcp delete", args: "[name]" },
   { name: "mcp enable", args: "[name]" },
@@ -8188,10 +8548,10 @@ function mentionSpan(value, cursor) {
   while (end < value.length && !/[\s@]/.test(value[end] ?? "")) end += 1;
   return { start, end, query };
 }
-function completeMention(value, span, path15) {
+function completeMention(value, span, path16) {
   const rest = value.slice(span.end);
   const spaced = rest.startsWith(" ");
-  const inserted = `@${path15}${spaced ? "" : " "}`;
+  const inserted = `@${path16}${spaced ? "" : " "}`;
   return {
     value: value.slice(0, span.start) + inserted + rest,
     cursor: span.start + inserted.length + (spaced ? 1 : 0)
@@ -8200,8 +8560,8 @@ function completeMention(value, span, path15) {
 function extractMentions(text) {
   const found = [];
   for (const match of text.matchAll(MENTION_PATTERN)) {
-    const path15 = (match[1] ?? "").replace(TRAILING_PUNCTUATION, "");
-    if (path15 !== "" && !found.includes(path15)) found.push(path15);
+    const path16 = (match[1] ?? "").replace(TRAILING_PUNCTUATION, "");
+    if (path16 !== "" && !found.includes(path16)) found.push(path16);
   }
   return found;
 }
@@ -8315,7 +8675,7 @@ var en = {
   pickerHelp: (shown, total) => `${shown} of ${total} \xB7 \u2191\u2193 move \xB7 enter pick \xB7 esc cancel`,
   noModel: "no model",
   busy: "working",
-  sessionFor: (elapsed) => `up ${elapsed}`,
+  sessionFor: (elapsed) => `session ${elapsed}`,
   workingFor: (elapsed) => `working ${elapsed}`,
   titleProvider: "Provider",
   titleLogout: "Sign out of a provider",
@@ -8340,17 +8700,22 @@ var en = {
   pasteToken: (id, lines, chars) => `[paste #${id} \xB7 ${lines > 1 ? `${lines} lines` : `${chars} chars`}]`,
   inputRows: (from, to, total) => `lines ${from}\u2013${to} of ${total}`,
   queueHint: "waiting for the current answer \xB7 \u2191/\u2193 pick one to edit \xB7 enter puts it back in its place",
-  configAt: (path15) => `config: ${path15}`,
+  configAt: (path16) => `config: ${path16}`,
   skillsEmpty: "No skills installed. Drop a folder with a SKILL.md into ~/.kitcode/skills or ./.kitcode/skills",
-  skillsInstallUsage: "Usage: /skills install <github-url|npm-package|local-path>",
+  skillsInstallUsage: "Usage: /skills install <github-url|npm-package|local-path> \xB7 /skills remove [name]",
   skillsInstalling: (source) => `Installing skill from "${source}"\u2026`,
   skillsInstalled: (name, source) => `Skill "${name}" installed from "${source}"`,
+  skillsRemoved: (name) => `Skill "${name}" removed`,
+  titleSkillsRemove: "Remove skill",
   mcpStatus: (connected, failed) => `MCP: ${connected} connected, ${failed} failed`,
   mcpEmpty: "No MCP servers configured.",
-  mcpAddUsage: "List: /mcp list \xB7 Enable/disable: /mcp enable|disable [name] \xB7 Delete: /mcp delete [name]\nRemote: /mcp add <name> <https://url>\nLocal: /mcp add <name> -- <command> [args]",
+  mcpAddUsage: 'List: /mcp list \xB7 Enable/disable: /mcp enable|disable [name] \xB7 Delete: /mcp delete [name]\nRemote: /mcp add <name> [-H "Name: value"] <https://url>\nLocal: /mcp add <name> [-e KEY=value] -- <command> [args]\nKeep secrets out of the config with ${env:VAR}, e.g. -H "Authorization: Bearer ${env:TOKEN}"',
   mcpAddInvalidName: "MCP name may contain only letters, numbers, _ and - (up to 64 chars).",
   mcpAddInvalidUrl: "MCP URL must use HTTPS (HTTP is allowed only for localhost).",
   mcpAddHttpArgs: "An HTTP MCP accepts one URL and no command arguments.",
+  mcpAddInvalidEnv: "Environment variables look like -e KEY=value.",
+  mcpAddInvalidHeader: 'Headers look like -H "Name: value".',
+  mcpAddOptionMismatch: "-e is for local (command) servers, -H is for remote (URL) servers.",
   mcpExists: (name) => `MCP server "${name}" already exists.`,
   mcpConnecting: (name) => `Connecting MCP "${name}"\u2026`,
   mcpAdded: (name, tools) => `MCP "${name}" connected and saved \xB7 ${tools} tools`,
@@ -8378,6 +8743,9 @@ var en = {
   attachUsage: "Usage: /attach <image-or-text-file> \xB7 /attach clipboard \xB7 /attach clear",
   attachmentAdded: (name) => `Attached for the next message: ${name}`,
   attachmentsCleared: "Pending attachments cleared.",
+  attachmentsLimit: (max) => `At most ${max} attachments can be queued for one message.`,
+  attachmentsTooLarge: (mb) => `Attachments for one message are limited to about ${mb} MB in total. Send these first or use smaller files.`,
+  mentionAttached: (name) => `Sending with this message: ${name}`,
   compactNothing: "Not enough older conversation to compact yet.",
   compactStarting: "Compacting context\u2026",
   compactDone: (summarised, cleared, before, after) => [
@@ -8386,7 +8754,7 @@ var en = {
     cleared > 0 ? `${cleared} old tool outputs cleared` : "",
     before !== void 0 && after !== void 0 ? `~${tokens(before)} \u2192 ~${tokens(after)} tokens` : ""
   ].filter(Boolean).join(" \xB7 ") + ".",
-  sessionRenameUsage: "Type the title after the command: /sessions rename <id> <title>",
+  sessionRenameUsage: "Type the title after the command: /sessions rename [id] <title>",
   sessionRenamed: (title) => `Session renamed to "${title}".`,
   sessionDeleteAsk: "The saved chat file will be deleted. This cannot be undone.",
   sessionDeleted: (id) => `Session ${id} deleted.`,
@@ -8396,7 +8764,7 @@ var en = {
   sessionDeleteAllFinalBody: "This cannot be undone. Press y only if you want to erase the complete session history.",
   sessionsDeletedAll: (count2) => `All saved chats deleted \xB7 ${count2} sessions removed.`,
   sessionsDeleteAllFailed: (deleted, failed) => `Session cleanup was incomplete \xB7 ${deleted} removed, ${failed} failed.`,
-  sessionExported: (path15) => `Session exported to ${path15}`,
+  sessionExported: (path16) => `Session exported to ${path16}`,
   sessionActionResume: "resume",
   sessionActionRename: "rename",
   sessionActionDelete: "delete",
@@ -8437,11 +8805,19 @@ ${url}`,
   promptUsage: "Usage: /prompt save <name>",
   promptNothing: "Nothing to save yet \u2014 send a message first.",
   promptSaved: (name) => `Saved prompt "${name}"`,
-  promptDeleteUsage: "Usage: /prompt delete <name>",
+  promptDeleteAsk: (name) => `Delete prompt "${name}"?`,
+  promptOverwriteAsk: (name) => `A prompt named "${name}" exists. Replace it?`,
+  promptNameTitle: "Prompt name",
+  sessionNoMatch: (query) => `No saved session matches "${query}".`,
+  sessionAmbiguous: (query, count2) => `"${query}" matches ${count2} sessions; give more of the id.`,
+  sessionsUsage: "Usage: /sessions [list|rename [id] <title>|delete [id|all]|export [id] [path]]",
+  modelNoMatch: (query) => `No single model matches "${query}"; pick one from the list.`,
+  memoryUsage: "/memory show \xB7 /memory set <text> \xB7 /memory clear",
+  memoryEmpty: "Project memory is empty.",
+  memoryClearAsk: "Clear project memory?",
+  memoryReplaceAsk: "Replace all project memory notes with this text?",
   promptDeleted: (name) => `Deleted prompt "${name}"`,
   promptNotFound: (name) => `Prompt "${name}" not found.`,
-  promptSaveAsk: "Save this as a prompt?",
-  promptSaveAskBody: "The text will be saved to a file and can be loaded later with /prompt.",
   promptsEmpty: "No saved prompts. Use /prompt save <name>.",
   unknownCommand: (name) => `Unknown command /${name}. Try /help`,
   didYouMean: (typed, guess) => `Unknown command /${typed}. Did you mean /${guess}?`,
@@ -8536,7 +8912,7 @@ var ru = {
   pickerHelp: (shown, total) => `${shown} \u0438\u0437 ${total} \xB7 \u2191\u2193 \u0432\u044B\u0431\u043E\u0440 \xB7 enter \u2014 \u043E\u043A \xB7 esc \u2014 \u043E\u0442\u043C\u0435\u043D\u0430`,
   noModel: "\u043D\u0435\u0442 \u043C\u043E\u0434\u0435\u043B\u0438",
   busy: "\u0440\u0430\u0431\u043E\u0442\u0430\u044E",
-  sessionFor: (elapsed) => `\u0432 \u0440\u0430\u0431\u043E\u0442\u0435 ${elapsed}`,
+  sessionFor: (elapsed) => `\u0441\u0435\u0441\u0441\u0438\u044F ${elapsed}`,
   workingFor: (elapsed) => `\u0434\u0443\u043C\u0430\u0435\u0442 ${elapsed}`,
   titleProvider: "\u041F\u0440\u043E\u0432\u0430\u0439\u0434\u0435\u0440",
   titleLogout: "\u0412\u044B\u0431\u0440\u0430\u0442\u044C API \u0434\u043B\u044F \u0432\u044B\u0445\u043E\u0434\u0430",
@@ -8561,17 +8937,22 @@ var ru = {
   pasteToken: (id, lines, chars) => `[\u0432\u0441\u0442\u0430\u0432\u043A\u0430 #${id} \xB7 ${lines > 1 ? `${lines} \u0441\u0442\u0440\u043E\u043A` : `${chars} \u0441\u0438\u043C\u0432\u043E\u043B\u043E\u0432`}]`,
   inputRows: (from, to, total) => `\u0441\u0442\u0440\u043E\u043A\u0438 ${from}\u2013${to} \u0438\u0437 ${total}`,
   queueHint: "\u0436\u0434\u0443\u0442 \u0442\u0435\u043A\u0443\u0449\u0435\u0433\u043E \u043E\u0442\u0432\u0435\u0442\u0430 \xB7 \u2191/\u2193 \u2014 \u0432\u044B\u0431\u0440\u0430\u0442\u044C \u043E\u0434\u043D\u043E \u0434\u043B\u044F \u043F\u0440\u0430\u0432\u043A\u0438 \xB7 enter \u0432\u0435\u0440\u043D\u0451\u0442 \u0435\u0433\u043E \u043D\u0430 \u043C\u0435\u0441\u0442\u043E",
-  configAt: (path15) => `\u043A\u043E\u043D\u0444\u0438\u0433: ${path15}`,
+  configAt: (path16) => `\u043A\u043E\u043D\u0444\u0438\u0433: ${path16}`,
   skillsEmpty: "\u0421\u043A\u0438\u043B\u043B\u043E\u0432 \u043D\u0435\u0442. \u041F\u043E\u043B\u043E\u0436\u0438 \u043F\u0430\u043F\u043A\u0443 \u0441 \u0444\u0430\u0439\u043B\u043E\u043C SKILL.md \u0432 ~/.kitcode/skills \u0438\u043B\u0438 ./.kitcode/skills",
-  skillsInstallUsage: "\u0418\u0441\u043F\u043E\u043B\u044C\u0437\u043E\u0432\u0430\u043D\u0438\u0435: /skills install <github-url|npm-\u043F\u0430\u043A\u0435\u0442|\u043B\u043E\u043A\u0430\u043B\u044C\u043D\u044B\u0439-\u043F\u0443\u0442\u044C>",
+  skillsInstallUsage: "\u0418\u0441\u043F\u043E\u043B\u044C\u0437\u043E\u0432\u0430\u043D\u0438\u0435: /skills install <github-url|npm-\u043F\u0430\u043A\u0435\u0442|\u043B\u043E\u043A\u0430\u043B\u044C\u043D\u044B\u0439-\u043F\u0443\u0442\u044C> \xB7 /skills remove [\u0438\u043C\u044F]",
   skillsInstalling: (source) => `\u0423\u0441\u0442\u0430\u043D\u0430\u0432\u043B\u0438\u0432\u0430\u044E \u0441\u043A\u0438\u043B\u043B \u0438\u0437 "${source}"\u2026`,
   skillsInstalled: (name, source) => `\u0421\u043A\u0438\u043B\u043B \xAB${name}\xBB \u0443\u0441\u0442\u0430\u043D\u043E\u0432\u043B\u0435\u043D \u0438\u0437 "${source}"`,
+  skillsRemoved: (name) => `\u0421\u043A\u0438\u043B\u043B \xAB${name}\xBB \u0443\u0434\u0430\u043B\u0451\u043D`,
+  titleSkillsRemove: "\u0423\u0434\u0430\u043B\u0438\u0442\u044C \u0441\u043A\u0438\u043B\u043B",
   mcpStatus: (connected, failed) => `MCP: \u043F\u043E\u0434\u043A\u043B\u044E\u0447\u0435\u043D\u043E ${connected}, \u0441 \u043E\u0448\u0438\u0431\u043A\u043E\u0439 ${failed}`,
   mcpEmpty: "MCP-\u0441\u0435\u0440\u0432\u0435\u0440\u044B \u043F\u043E\u043A\u0430 \u043D\u0435 \u0434\u043E\u0431\u0430\u0432\u043B\u0435\u043D\u044B.",
-  mcpAddUsage: "\u0421\u043F\u0438\u0441\u043E\u043A: /mcp list \xB7 \u0412\u043A\u043B/\u0432\u044B\u043A\u043B: /mcp enable|disable [\u0438\u043C\u044F] \xB7 \u0423\u0434\u0430\u043B\u0438\u0442\u044C: /mcp delete [\u0438\u043C\u044F]\n\u0423\u0434\u0430\u043B\u0451\u043D\u043D\u044B\u0439: /mcp add <\u0438\u043C\u044F> <https://url>\n\u041B\u043E\u043A\u0430\u043B\u044C\u043D\u044B\u0439: /mcp add <\u0438\u043C\u044F> -- <\u043A\u043E\u043C\u0430\u043D\u0434\u0430> [\u0430\u0440\u0433\u0443\u043C\u0435\u043D\u0442\u044B]",
+  mcpAddUsage: '\u0421\u043F\u0438\u0441\u043E\u043A: /mcp list \xB7 \u0412\u043A\u043B/\u0432\u044B\u043A\u043B: /mcp enable|disable [\u0438\u043C\u044F] \xB7 \u0423\u0434\u0430\u043B\u0438\u0442\u044C: /mcp delete [\u0438\u043C\u044F]\n\u0423\u0434\u0430\u043B\u0451\u043D\u043D\u044B\u0439: /mcp add <\u0438\u043C\u044F> [-H "\u0418\u043C\u044F: \u0437\u043D\u0430\u0447\u0435\u043D\u0438\u0435"] <https://url>\n\u041B\u043E\u043A\u0430\u043B\u044C\u043D\u044B\u0439: /mcp add <\u0438\u043C\u044F> [-e \u041A\u041B\u042E\u0427=\u0437\u043D\u0430\u0447\u0435\u043D\u0438\u0435] -- <\u043A\u043E\u043C\u0430\u043D\u0434\u0430> [\u0430\u0440\u0433\u0443\u043C\u0435\u043D\u0442\u044B]\n\u0421\u0435\u043A\u0440\u0435\u0442\u044B \u043B\u0443\u0447\u0448\u0435 \u043D\u0435 \u0445\u0440\u0430\u043D\u0438\u0442\u044C \u0432 \u043A\u043E\u043D\u0444\u0438\u0433\u0435: ${env:VAR}, \u043D\u0430\u043F\u0440\u0438\u043C\u0435\u0440 -H "Authorization: Bearer ${env:TOKEN}"',
   mcpAddInvalidName: "\u0418\u043C\u044F MCP: \u0442\u043E\u043B\u044C\u043A\u043E \u0431\u0443\u043A\u0432\u044B, \u0446\u0438\u0444\u0440\u044B, _ \u0438 - (\u0434\u043E 64 \u0441\u0438\u043C\u0432\u043E\u043B\u043E\u0432).",
   mcpAddInvalidUrl: "URL MCP \u0434\u043E\u043B\u0436\u0435\u043D \u0438\u0441\u043F\u043E\u043B\u044C\u0437\u043E\u0432\u0430\u0442\u044C HTTPS (HTTP \u0440\u0430\u0437\u0440\u0435\u0448\u0451\u043D \u0442\u043E\u043B\u044C\u043A\u043E \u0434\u043B\u044F localhost).",
   mcpAddHttpArgs: "\u0414\u043B\u044F HTTP MCP \u0443\u043A\u0430\u0436\u0438 \u043E\u0434\u0438\u043D URL \u0431\u0435\u0437 \u0430\u0440\u0433\u0443\u043C\u0435\u043D\u0442\u043E\u0432 \u043A\u043E\u043C\u0430\u043D\u0434\u044B.",
+  mcpAddInvalidEnv: "\u041F\u0435\u0440\u0435\u043C\u0435\u043D\u043D\u044B\u0435 \u043E\u043A\u0440\u0443\u0436\u0435\u043D\u0438\u044F \u0437\u0430\u0434\u0430\u044E\u0442\u0441\u044F \u0442\u0430\u043A: -e \u041A\u041B\u042E\u0427=\u0437\u043D\u0430\u0447\u0435\u043D\u0438\u0435.",
+  mcpAddInvalidHeader: '\u0417\u0430\u0433\u043E\u043B\u043E\u0432\u043A\u0438 \u0437\u0430\u0434\u0430\u044E\u0442\u0441\u044F \u0442\u0430\u043A: -H "\u0418\u043C\u044F: \u0437\u043D\u0430\u0447\u0435\u043D\u0438\u0435".',
+  mcpAddOptionMismatch: "-e \u2014 \u0434\u043B\u044F \u043B\u043E\u043A\u0430\u043B\u044C\u043D\u044B\u0445 (\u043A\u043E\u043C\u0430\u043D\u0434\u0430) \u0441\u0435\u0440\u0432\u0435\u0440\u043E\u0432, -H \u2014 \u0434\u043B\u044F \u0443\u0434\u0430\u043B\u0451\u043D\u043D\u044B\u0445 (URL).",
   mcpExists: (name) => `MCP-\u0441\u0435\u0440\u0432\u0435\u0440 \xAB${name}\xBB \u0443\u0436\u0435 \u0441\u0443\u0449\u0435\u0441\u0442\u0432\u0443\u0435\u0442.`,
   mcpConnecting: (name) => `\u041F\u043E\u0434\u043A\u043B\u044E\u0447\u0430\u044E MCP \xAB${name}\xBB\u2026`,
   mcpAdded: (name, tools) => `MCP \xAB${name}\xBB \u043F\u043E\u0434\u043A\u043B\u044E\u0447\u0451\u043D \u0438 \u0441\u043E\u0445\u0440\u0430\u043D\u0451\u043D \xB7 \u0438\u043D\u0441\u0442\u0440\u0443\u043C\u0435\u043D\u0442\u043E\u0432: ${tools}`,
@@ -8599,6 +8980,9 @@ var ru = {
   attachUsage: "\u0418\u0441\u043F\u043E\u043B\u044C\u0437\u043E\u0432\u0430\u043D\u0438\u0435: /attach <\u043A\u0430\u0440\u0442\u0438\u043D\u043A\u0430-\u0438\u043B\u0438-\u0442\u0435\u043A\u0441\u0442\u043E\u0432\u044B\u0439-\u0444\u0430\u0439\u043B> \xB7 /attach clipboard \xB7 /attach clear",
   attachmentAdded: (name) => `\u041F\u0440\u0438\u043A\u0440\u0435\u043F\u043B\u0435\u043D\u043E \u043A \u0441\u043B\u0435\u0434\u0443\u044E\u0449\u0435\u043C\u0443 \u0441\u043E\u043E\u0431\u0449\u0435\u043D\u0438\u044E: ${name}`,
   attachmentsCleared: "\u041E\u0436\u0438\u0434\u0430\u044E\u0449\u0438\u0435 \u0432\u043B\u043E\u0436\u0435\u043D\u0438\u044F \u0443\u0431\u0440\u0430\u043D\u044B.",
+  attachmentsLimit: (max) => `\u041A \u043E\u0434\u043D\u043E\u043C\u0443 \u0441\u043E\u043E\u0431\u0449\u0435\u043D\u0438\u044E \u043C\u043E\u0436\u043D\u043E \u043F\u0440\u0438\u043A\u0440\u0435\u043F\u0438\u0442\u044C \u043D\u0435 \u0431\u043E\u043B\u044C\u0448\u0435 ${max} \u0432\u043B\u043E\u0436\u0435\u043D\u0438\u0439.`,
+  attachmentsTooLarge: (mb) => `\u0412\u043B\u043E\u0436\u0435\u043D\u0438\u044F \u043E\u0434\u043D\u043E\u0433\u043E \u0441\u043E\u043E\u0431\u0449\u0435\u043D\u0438\u044F \u2014 \u043D\u0435 \u0431\u043E\u043B\u044C\u0448\u0435 ~${mb} \u041C\u0411 \u0432 \u0441\u0443\u043C\u043C\u0435. \u041E\u0442\u043F\u0440\u0430\u0432\u044C \u044D\u0442\u0438 \u0441\u043D\u0430\u0447\u0430\u043B\u0430 \u0438\u043B\u0438 \u0432\u043E\u0437\u044C\u043C\u0438 \u0444\u0430\u0439\u043B\u044B \u043F\u043E\u043C\u0435\u043D\u044C\u0448\u0435.`,
+  mentionAttached: (name) => `\u041E\u0442\u043F\u0440\u0430\u0432\u043B\u044F\u044E \u0432\u043C\u0435\u0441\u0442\u0435 \u0441 \u0441\u043E\u043E\u0431\u0449\u0435\u043D\u0438\u0435\u043C: ${name}`,
   compactNothing: "\u041F\u043E\u043A\u0430 \u043D\u0435\u0434\u043E\u0441\u0442\u0430\u0442\u043E\u0447\u043D\u043E \u0441\u0442\u0430\u0440\u044B\u0445 \u0441\u043E\u043E\u0431\u0449\u0435\u043D\u0438\u0439 \u0434\u043B\u044F \u0441\u0436\u0430\u0442\u0438\u044F \u043A\u043E\u043D\u0442\u0435\u043A\u0441\u0442\u0430.",
   compactStarting: "\u0421\u0436\u0430\u0442\u0438\u0435 \u043A\u043E\u043D\u0442\u0435\u043A\u0441\u0442\u0430\u2026",
   compactDone: (summarised, cleared, before, after) => [
@@ -8607,7 +8991,7 @@ var ru = {
     cleared > 0 ? `\u043E\u0447\u0438\u0449\u0435\u043D\u043E \u0441\u0442\u0430\u0440\u044B\u0445 \u0432\u044B\u0432\u043E\u0434\u043E\u0432 \u0438\u043D\u0441\u0442\u0440\u0443\u043C\u0435\u043D\u0442\u043E\u0432: ${cleared}` : "",
     before !== void 0 && after !== void 0 ? `~${tokens(before)} \u2192 ~${tokens(after)} \u0442\u043E\u043A\u0435\u043D\u043E\u0432` : ""
   ].filter(Boolean).join(" \xB7 ") + ".",
-  sessionRenameUsage: "\u0414\u043E\u043F\u0438\u0448\u0438 \u043D\u0430\u0437\u0432\u0430\u043D\u0438\u0435: /sessions rename <id> <\u043D\u0430\u0437\u0432\u0430\u043D\u0438\u0435>",
+  sessionRenameUsage: "\u0414\u043E\u043F\u0438\u0448\u0438 \u043D\u0430\u0437\u0432\u0430\u043D\u0438\u0435: /sessions rename [id] <\u043D\u0430\u0437\u0432\u0430\u043D\u0438\u0435>",
   sessionRenamed: (title) => `\u0421\u0435\u0441\u0441\u0438\u044F \u043F\u0435\u0440\u0435\u0438\u043C\u0435\u043D\u043E\u0432\u0430\u043D\u0430 \u0432 \xAB${title}\xBB.`,
   sessionDeleteAsk: "\u0424\u0430\u0439\u043B \u0441\u043E\u0445\u0440\u0430\u043D\u0451\u043D\u043D\u043E\u0433\u043E \u0447\u0430\u0442\u0430 \u0431\u0443\u0434\u0435\u0442 \u0443\u0434\u0430\u043B\u0451\u043D \u0431\u0435\u0437 \u0432\u043E\u0437\u043C\u043E\u0436\u043D\u043E\u0441\u0442\u0438 \u0432\u043E\u0441\u0441\u0442\u0430\u043D\u043E\u0432\u043B\u0435\u043D\u0438\u044F.",
   sessionDeleted: (id) => `\u0421\u0435\u0441\u0441\u0438\u044F ${id} \u0443\u0434\u0430\u043B\u0435\u043D\u0430.`,
@@ -8617,7 +9001,7 @@ var ru = {
   sessionDeleteAllFinalBody: "\u042D\u0442\u043E \u043D\u0435\u043B\u044C\u0437\u044F \u043E\u0442\u043C\u0435\u043D\u0438\u0442\u044C. \u041D\u0430\u0436\u0438\u043C\u0430\u0439 y \u0442\u043E\u043B\u044C\u043A\u043E \u0435\u0441\u043B\u0438 \u0445\u043E\u0447\u0435\u0448\u044C \u0441\u0442\u0435\u0440\u0435\u0442\u044C \u0432\u0441\u044E \u0438\u0441\u0442\u043E\u0440\u0438\u044E \u0441\u0435\u0441\u0441\u0438\u0439.",
   sessionsDeletedAll: (count2) => `\u0412\u0441\u0435 \u0441\u043E\u0445\u0440\u0430\u043D\u0451\u043D\u043D\u044B\u0435 \u0447\u0430\u0442\u044B \u0443\u0434\u0430\u043B\u0435\u043D\u044B \xB7 \u0441\u0435\u0441\u0441\u0438\u0439: ${count2}.`,
   sessionsDeleteAllFailed: (deleted, failed) => `\u0423\u0434\u0430\u043B\u0435\u043D\u0438\u0435 \u0437\u0430\u0432\u0435\u0440\u0448\u0435\u043D\u043E \u043D\u0435 \u043F\u043E\u043B\u043D\u043E\u0441\u0442\u044C\u044E \xB7 \u0443\u0434\u0430\u043B\u0435\u043D\u043E: ${deleted}, \u043E\u0448\u0438\u0431\u043E\u043A: ${failed}.`,
-  sessionExported: (path15) => `\u0421\u0435\u0441\u0441\u0438\u044F \u044D\u043A\u0441\u043F\u043E\u0440\u0442\u0438\u0440\u043E\u0432\u0430\u043D\u0430: ${path15}`,
+  sessionExported: (path16) => `\u0421\u0435\u0441\u0441\u0438\u044F \u044D\u043A\u0441\u043F\u043E\u0440\u0442\u0438\u0440\u043E\u0432\u0430\u043D\u0430: ${path16}`,
   sessionActionResume: "\u043E\u0442\u043A\u0440\u044B\u0442\u044C",
   sessionActionRename: "\u043F\u0435\u0440\u0435\u0438\u043C\u0435\u043D\u043E\u0432\u0430\u0442\u044C",
   sessionActionDelete: "\u0443\u0434\u0430\u043B\u0438\u0442\u044C",
@@ -8658,11 +9042,19 @@ ${url}`,
   promptUsage: "\u0418\u0441\u043F\u043E\u043B\u044C\u0437\u043E\u0432\u0430\u043D\u0438\u0435: /prompt save <\u0438\u043C\u044F>",
   promptNothing: "\u041F\u043E\u043A\u0430 \u043D\u0435\u0447\u0435\u0433\u043E \u0441\u043E\u0445\u0440\u0430\u043D\u044F\u0442\u044C \u2014 \u0441\u043D\u0430\u0447\u0430\u043B\u0430 \u043E\u0442\u043F\u0440\u0430\u0432\u044C \u0441\u043E\u043E\u0431\u0449\u0435\u043D\u0438\u0435.",
   promptSaved: (name) => `\u041F\u0440\u043E\u043C\u0442 \xAB${name}\xBB \u0441\u043E\u0445\u0440\u0430\u043D\u0451\u043D`,
-  promptDeleteUsage: "\u0418\u0441\u043F\u043E\u043B\u044C\u0437\u043E\u0432\u0430\u043D\u0438\u0435: /prompt delete <\u0438\u043C\u044F>",
+  promptDeleteAsk: (name) => `\u0423\u0434\u0430\u043B\u0438\u0442\u044C \u043F\u0440\u043E\u043C\u0442 \xAB${name}\xBB?`,
+  promptOverwriteAsk: (name) => `\u041F\u0440\u043E\u043C\u0442 \xAB${name}\xBB \u0443\u0436\u0435 \u0435\u0441\u0442\u044C. \u0417\u0430\u043C\u0435\u043D\u0438\u0442\u044C?`,
+  promptNameTitle: "\u041D\u0430\u0437\u0432\u0430\u043D\u0438\u0435 \u043F\u0440\u043E\u043C\u0442\u0430",
+  sessionNoMatch: (query) => `\u041D\u0435\u0442 \u0441\u043E\u0445\u0440\u0430\u043D\u0451\u043D\u043D\u043E\u0439 \u0441\u0435\u0441\u0441\u0438\u0438, \u043F\u043E\u0434\u0445\u043E\u0434\u044F\u0449\u0435\u0439 \u043F\u043E\u0434 \xAB${query}\xBB.`,
+  sessionAmbiguous: (query, count2) => `\xAB${query}\xBB \u043F\u043E\u0434\u0445\u043E\u0434\u0438\u0442 \u043A ${count2} \u0441\u0435\u0441\u0441\u0438\u044F\u043C \u2014 \u0443\u0442\u043E\u0447\u043D\u0438 id.`,
+  sessionsUsage: "\u0418\u0441\u043F\u043E\u043B\u044C\u0437\u043E\u0432\u0430\u043D\u0438\u0435: /sessions [list|rename [id] <\u043D\u0430\u0437\u0432\u0430\u043D\u0438\u0435>|delete [id|all]|export [id] [\u043F\u0443\u0442\u044C]]",
+  modelNoMatch: (query) => `\u041D\u0435\u0442 \u043E\u0434\u043D\u043E\u0439 \u043C\u043E\u0434\u0435\u043B\u0438 \u043F\u043E\u0434 \xAB${query}\xBB \u2014 \u0432\u044B\u0431\u0435\u0440\u0438 \u0438\u0437 \u0441\u043F\u0438\u0441\u043A\u0430.`,
+  memoryUsage: "/memory show \xB7 /memory set <\u0442\u0435\u043A\u0441\u0442> \xB7 /memory clear",
+  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?",
   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.`,
-  promptSaveAsk: "\u0421\u043E\u0445\u0440\u0430\u043D\u0438\u0442\u044C \u043A\u0430\u043A \u043F\u0440\u043E\u043C\u0442?",
-  promptSaveAskBody: "\u0422\u0435\u043A\u0441\u0442 \u0431\u0443\u0434\u0435\u0442 \u0441\u043E\u0445\u0440\u0430\u043D\u0451\u043D \u0432 \u0444\u0430\u0439\u043B \u0438 \u0435\u0433\u043E \u043C\u043E\u0436\u043D\u043E \u0431\u0443\u0434\u0435\u0442 \u0437\u0430\u0433\u0440\u0443\u0437\u0438\u0442\u044C \u043F\u043E\u0437\u0436\u0435 \u0447\u0435\u0440\u0435\u0437 /prompt.",
   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>.",
   unknownCommand: (name) => `\u041D\u0435\u0438\u0437\u0432\u0435\u0441\u0442\u043D\u0430\u044F \u043A\u043E\u043C\u0430\u043D\u0434\u0430 /${name}. \u041F\u043E\u043F\u0440\u043E\u0431\u0443\u0439 /help`,
   didYouMean: (typed, guess) => `\u041D\u0435\u0438\u0437\u0432\u0435\u0441\u0442\u043D\u0430\u044F \u043A\u043E\u043C\u0430\u043D\u0434\u0430 /${typed}. \u041C\u043E\u0436\u0435\u0442 \u0431\u044B\u0442\u044C /${guess}?`,
@@ -9811,10 +10203,10 @@ function StatusBar({ status }) {
       flexDirection: "column",
       children: [
         /* @__PURE__ */ jsxs9(Box9, { width: "100%", alignItems: "flex-start", children: [
-          /* @__PURE__ */ jsx9(Box9, { flexGrow: 1, flexShrink: 1, flexWrap: "wrap", children: details.map((item, index) => /* @__PURE__ */ jsxs9(Text9, { children: [
+          /* @__PURE__ */ jsx9(Box9, { flexGrow: 1, flexShrink: 1, flexWrap: "wrap", children: details.map((item, index) => /* @__PURE__ */ jsx9(Box9, { flexShrink: 0, children: /* @__PURE__ */ jsxs9(Text9, { children: [
             index > 0 && /* @__PURE__ */ jsx9(Text9, { dimColor: true, children: " \xB7 " }),
             item
-          ] }, index)) }),
+          ] }) }, index)) }),
           /* @__PURE__ */ jsx9(Box9, { flexShrink: 0, marginLeft: 2, children: /* @__PURE__ */ jsx9(ContextMeter, { context: status.context }) })
         ] }),
         status.agents.length > 0 && /* @__PURE__ */ jsxs9(Box9, { width: "100%", flexDirection: "column", alignItems: "flex-end", children: [
@@ -9859,6 +10251,8 @@ function ContextMeter({
   context
 }) {
   const theme = useTheme();
+  const { columns } = useTerminalSize();
+  const compact = columns < 80;
   const { window: win, exact } = context;
   const used = exact ? context.used : 0;
   if (win === null || win <= 0) {
@@ -9871,6 +10265,12 @@ function ContextMeter({
   const filled = Math.max(0, Math.min(BAR_WIDTH, Math.round(BAR_WIDTH * pct)));
   const color = pct < 0.6 ? theme.ok : pct < 0.85 ? theme.warn : theme.error;
   const percent = Math.round(pct * 100);
+  if (compact) {
+    return /* @__PURE__ */ jsxs9(Text9, { children: [
+      /* @__PURE__ */ jsx9(Text9, { dimColor: true, children: "ctx " }),
+      /* @__PURE__ */ jsx9(Text9, { color, bold: true, children: `${percent}%` })
+    ] });
+  }
   return /* @__PURE__ */ jsxs9(Text9, { children: [
     /* @__PURE__ */ jsx9(Text9, { dimColor: true, children: "ctx " }),
     /* @__PURE__ */ jsx9(Text9, { color, bold: true, children: `${percent}%`.padStart(4) }),
@@ -10744,8 +11144,7 @@ var BubbleView = memo2(function BubbleView2({
     ] }) });
   }
   if (bubble.kind === "notice") {
-    const color = bubble.level === "error" ? theme.error : bubble.level === "warn" ? theme.warn : theme.accent;
-    return /* @__PURE__ */ jsx11(Box11, { marginTop: 1, children: /* @__PURE__ */ jsx11(Text11, { color, children: bubble.text }) });
+    return /* @__PURE__ */ jsx11(NoticeView, { level: bubble.level, text: bubble.text });
   }
   if (bubble.kind === "assistant") {
     return /* @__PURE__ */ jsx11(AssistantView, { bubble, maxRows });
@@ -10819,6 +11218,24 @@ function wrapVisualLine(line, columns) {
   if (current !== "" || rows.length === 0) rows.push(current);
   return rows;
 }
+var NOTICE_ICONS = { warn: "\u25B2", error: "\u2717" };
+function NoticeView({ level, text }) {
+  const theme = useTheme();
+  const newline = text.indexOf("\n");
+  const headline = newline === -1 ? text : text.slice(0, newline);
+  const details = newline === -1 ? "" : text.slice(newline + 1);
+  if (level === "info") {
+    return /* @__PURE__ */ jsx11(Box11, { marginTop: 1, paddingLeft: 2, children: /* @__PURE__ */ jsx11(Text11, { dimColor: details === "", children: text }) });
+  }
+  const color = level === "error" ? theme.error : theme.warn;
+  return /* @__PURE__ */ jsxs11(Box11, { marginTop: 1, children: [
+    /* @__PURE__ */ jsx11(Box11, { width: 2, flexShrink: 0, children: /* @__PURE__ */ jsx11(Text11, { color, bold: true, children: NOTICE_ICONS[level] }) }),
+    /* @__PURE__ */ jsxs11(Box11, { flexDirection: "column", flexShrink: 1, minWidth: 0, children: [
+      /* @__PURE__ */ jsx11(Text11, { color, bold: level === "error", children: headline }),
+      details !== "" && /* @__PURE__ */ jsx11(Text11, { children: details })
+    ] })
+  ] });
+}
 function ToolView({ bubble }) {
   const theme = useTheme();
   const mark = bubble.state === "running" ? "\u25CC" : bubble.state === "ok" ? "\u25CF" : "\u2717";
@@ -11155,7 +11572,7 @@ function closeAssistant(bubbles) {
     (bubble) => bubble.kind === "assistant" && bubble.streaming ? { ...bubble, streaming: false } : bubble
   );
 }
-function fromHistory(messages) {
+function fromHistory(messages, summarize = (name) => name) {
   let state = emptyTranscript();
   for (const message of messages) {
     if (message.role === "user") {
@@ -11186,7 +11603,7 @@ function fromHistory(messages) {
               kind: "tool",
               id: block.id,
               name: sanitizeTerminalText(block.name),
-              summary: sanitizeTerminalText(block.name),
+              summary: sanitizeTerminalText(safeSummary(summarize, block.name, block.input)),
               state: "ok",
               content: ""
             }
@@ -11249,6 +11666,13 @@ function sanitizeDisplay(display) {
     after: sanitizeTerminalText(display.after)
   };
 }
+function safeSummary(summarize, name, input) {
+  try {
+    return summarize(name, input) || name;
+  } catch {
+    return name;
+  }
+}
 
 // src/ui/App.tsx
 import { jsx as jsx14, jsxs as jsxs13 } from "react/jsx-runtime";
@@ -11258,6 +11682,7 @@ var CUSTOM_ACCENT = "__custom__";
 var BELL_AFTER_MS = 15e3;
 var SUBAGENT_CHAT_EXTRA_ROWS = 4;
 var MAX_ATTACHMENTS = 8;
+var MAX_ATTACHMENT_PAYLOAD = 24e6;
 var CONTEXT_PRESETS = [256e3, 512e3, 1e6];
 function formatContextTokens(tokens2) {
   if (tokens2 >= 1e6) return `${tokens2 / 1e6}M`;
@@ -11279,7 +11704,7 @@ function App({
   const { stdout } = useStdout2();
   const { rows } = useTerminalSize();
   const [transcript, setTranscript] = useState8(
-    () => warnings.reduce((state, text) => pushNotice(state, "warn", text), fromHistory(initialHistory))
+    () => warnings.reduce((state, text) => pushNotice(state, "warn", text), fromHistory(initialHistory, runtime.summarizeToolCall))
   );
   const [transcriptRevision, setTranscriptRevision] = useState8(0);
   const transcriptRef = useRef5(transcript);
@@ -11334,11 +11759,16 @@ function App({
   }, []);
   const appendAttachment = useCallback((block) => {
     if (attachmentsRef.current.length >= MAX_ATTACHMENTS) return false;
+    if (attachmentsRef.current.some((queued) => sameAttachment(queued, block))) return true;
+    const payload = attachmentsRef.current.reduce((sum, queued) => sum + attachmentPayload(queued), 0);
+    if (payload + attachmentPayload(block) > MAX_ATTACHMENT_PAYLOAD) {
+      throw new Error(stringsFor(lang).attachmentsTooLarge(Math.round(MAX_ATTACHMENT_PAYLOAD / 1e6)));
+    }
     const next = [...attachmentsRef.current, block];
     attachmentsRef.current = next;
     setAttachments(next);
     return true;
-  }, []);
+  }, [lang]);
   const flushTranscriptEvents = useCallback(() => {
     if (transcriptTimer.current !== null) {
       clearTimeout(transcriptTimer.current);
@@ -11542,10 +11972,11 @@ function App({
           try {
             const restored = await runtime.resumeSession(choice);
             history.current = restored;
+            replaceAttachments([]);
             setPromptHistory(inputHistoryFromMessages(restored));
             setTranscript(
               pushNotice(
-                fromHistory(restored),
+                fromHistory(restored, runtime.summarizeToolCall),
                 "info",
                 strings.resumed(choice.slice(-6), restored.length)
               )
@@ -11609,12 +12040,18 @@ function App({
             forceRender((n) => n + 1);
             return;
           }
+          const matching = (query) => items.filter((item) => item.key === query || item.key.includes(query));
           let id = action ? rest[1] : void 0;
+          let argsFrom = 2;
+          if (id && (action === "rename" || action === "export") && matching(id).length === 0) {
+            id = void 0;
+            argsFrom = 1;
+          }
           if (!id) id = await pick(strings.titleSessions, items) ?? void 0;
           if (!id) return;
-          const matches = items.filter((item) => item.key === id || item.key.includes(id));
+          const matches = matching(id);
           if (matches.length !== 1) {
-            notice("warn", `No saved session matches "${id}".`);
+            notice("warn", matches.length === 0 ? strings.sessionNoMatch(id) : strings.sessionAmbiguous(id, matches.length));
             return;
           }
           id = matches[0]?.key ?? id;
@@ -11634,13 +12071,13 @@ function App({
               replaceAttachments([]);
               setPromptHistory(inputHistoryFromMessages(restored));
               setTranscript(
-                pushNotice(fromHistory(restored), "info", strings.resumed(id.slice(-6), restored.length))
+                pushNotice(fromHistory(restored, runtime.summarizeToolCall), "info", strings.resumed(id.slice(-6), restored.length))
               );
               setTranscriptRevision((revision) => revision + 1);
               sessionStart.current = Date.now();
               turns.current = 0;
             } else if (action === "rename") {
-              const title = rest.slice(2).join(" ").trim();
+              const title = rest.slice(argsFrom).join(" ").trim();
               if (!title) {
                 setInput(`/sessions rename ${id} `);
                 notice("info", strings.sessionRenameUsage);
@@ -11668,10 +12105,10 @@ function App({
                 notice("info", deletedMessage);
               }
             } else if (action === "export") {
-              const destination = unquoteArg(rest.slice(2).join(" ").trim()) || void 0;
+              const destination = unquoteArg(rest.slice(argsFrom).join(" ").trim()) || void 0;
               notice("info", strings.sessionExported(await runtime.exportSession(id, destination)));
             } else {
-              notice("warn", "Usage: /sessions [list|rename|delete [all]|export]");
+              notice("warn", strings.sessionsUsage);
               return;
             }
           } catch (error) {
@@ -11823,7 +12260,8 @@ ${strings.modelSet(result.nextModel)}` : ""}`;
           return;
         }
         case "lang": {
-          const choice = await pick(
+          const typed = rawRest.toLowerCase();
+          const choice = LANGS.some((entry) => entry.key === typed) ? typed : await pick(
             strings.titleLang,
             LANGS.map((entry) => ({ key: entry.key, label: entry.label }))
           );
@@ -11850,6 +12288,33 @@ ${strings.modelSet(result.nextModel)}` : ""}`;
             }
             return;
           }
+          if (action === "remove" || action === "uninstall") {
+            let name = rest[1];
+            if (!name) {
+              const installed = runtime.listSkills();
+              if (installed.length === 0) {
+                notice("info", strings.skillsEmpty);
+                return;
+              }
+              name = await pick(
+                strings.titleSkillsRemove,
+                installed.map((skill) => ({ key: skill.name, label: skill.name, hint: skill.description || void 0 }))
+              ) ?? void 0;
+              if (!name) return;
+            }
+            try {
+              await runtime.uninstallSkill(name);
+              notice("info", strings.skillsRemoved(name));
+              forceRender((n) => n + 1);
+            } catch (error) {
+              notice("error", error instanceof Error ? error.message : String(error));
+            }
+            return;
+          }
+          if (action) {
+            notice("warn", strings.skillsInstallUsage);
+            return;
+          }
           const skills = runtime.listSkills();
           if (skills.length === 0) {
             notice("info", strings.skillsEmpty);
@@ -11915,7 +12380,7 @@ ${body2}`));
         case "mcp": {
           const action = rest[0]?.toLowerCase();
           if (action === "add") {
-            const parsed = parseMcpAddArgs(rest.slice(1));
+            const parsed = parseMcpAddCommand(rawRest.replace(/^\S+\s*/, ""));
             if (!parsed.ok) {
               const problem = mcpAddProblem(strings, parsed.error);
               notice(
@@ -12058,7 +12523,7 @@ ${strings.mcpAddUsage}`
           }
           if (rawRest.toLowerCase() === "clipboard") {
             if (attachmentsRef.current.length >= MAX_ATTACHMENTS) {
-              notice("warn", `At most ${MAX_ATTACHMENTS} attachments can be queued for one message.`);
+              notice("warn", strings.attachmentsLimit(MAX_ATTACHMENTS));
               return;
             }
             if (clipboardPasteTask.current) return;
@@ -12088,7 +12553,7 @@ ${strings.mcpAddUsage}`
             return;
           }
           if (attachmentsRef.current.length >= MAX_ATTACHMENTS) {
-            notice("warn", `At most ${MAX_ATTACHMENTS} attachments can be queued for one message.`);
+            notice("warn", strings.attachmentsLimit(MAX_ATTACHMENTS));
             return;
           }
           try {
@@ -12116,7 +12581,7 @@ ${strings.mcpAddUsage}`
               history.current = result.history;
               setPromptHistory(inputHistoryFromMessages(result.history));
               setTranscript(
-                pushNotice(fromHistory(result.history), "info", strings.compactDone(result.removedMessages, result.clearedToolResults ?? 0, result.tokensBefore, result.tokensAfter))
+                pushNotice(fromHistory(result.history, runtime.summarizeToolCall), "info", strings.compactDone(result.removedMessages, result.clearedToolResults ?? 0, result.tokensBefore, result.tokensAfter))
               );
               setTranscriptRevision((revision) => revision + 1);
               await runtime.persist(result.history);
@@ -12185,28 +12650,47 @@ ${strings.mcpAddUsage}`
           return;
         }
         case "bell": {
-          const next = rawRest === "on" ? true : rawRest === "off" ? false : !runtime.getBell();
+          const setting = rawRest.toLowerCase();
+          if (setting !== "" && setting !== "on" && setting !== "off") {
+            notice("warn", "/bell [on|off]");
+            return;
+          }
+          const next = setting === "on" ? true : setting === "off" ? false : !runtime.getBell();
           await runtime.setBell(next);
           notice("info", strings.bellState(next));
           return;
         }
         case "thinking": {
-          const next = !runtime.getThinking();
+          const setting = rawRest.toLowerCase();
+          if (setting !== "" && setting !== "on" && setting !== "off") {
+            notice("warn", "/thinking [on|off]");
+            return;
+          }
+          const next = setting === "" ? !runtime.getThinking() : setting === "on";
           await runtime.setThinking(next);
           notice("info", strings.reasoning(next));
           forceRender((n) => n + 1);
           return;
         }
         case "memory": {
-          if (rawRest === "clear") {
-            if (await ask2(lang === "ru" ? "\u041E\u0447\u0438\u0441\u0442\u0438\u0442\u044C \u043F\u0430\u043C\u044F\u0442\u044C \u043F\u0440\u043E\u0435\u043A\u0442\u0430?" : "Clear project memory?")) await runtime.clearMemory();
-          } else if (rawRest.startsWith("set ")) {
-            await runtime.saveMemory(rawRest.slice(4).trim());
-          } else if (rawRest !== "" && rawRest !== "show") {
-            notice("warn", "/memory show | /memory set <text> | /memory clear");
+          const sub = rawRest.split(/\s+/)[0] ?? "";
+          const action = sub.toLowerCase();
+          if (action === "clear") {
+            if (!await ask2(strings.memoryClearAsk, void 0, true)) return;
+            await runtime.clearMemory();
+          } else if (action === "set") {
+            const text = rawRest.slice(sub.length).trim();
+            if (!text) {
+              notice("warn", strings.memoryUsage);
+              return;
+            }
+            if (runtime.readMemory() && !await ask2(strings.memoryReplaceAsk, void 0, true)) return;
+            await runtime.saveMemory(text);
+          } else if (action !== "" && action !== "show") {
+            notice("warn", strings.memoryUsage);
             return;
           }
-          notice("info", runtime.readMemory() || (lang === "ru" ? "\u041F\u0430\u043C\u044F\u0442\u044C \u043F\u0440\u043E\u0435\u043A\u0442\u0430 \u043F\u0443\u0441\u0442\u0430." : "Project memory is empty."));
+          notice("info", runtime.readMemory() || strings.memoryEmpty);
           return;
         }
         case "effort": {
@@ -12224,7 +12708,7 @@ ${strings.mcpAddUsage}`
         case "budget": {
           const current = runtime.getMaxTokensPerTurn();
           if (rest[0]) {
-            const tokens2 = Number(rest[0]);
+            const tokens2 = rest[0] === "0" ? 0 : parseContextTokens(rest[0]) ?? Number.NaN;
             if (tokens2 === 0) {
               await runtime.setMaxTokensPerTurn(0);
               notice("info", strings.budgetUnlimited);
@@ -12298,7 +12782,13 @@ ${strings.mcpAddUsage}`
             notice("warn", strings.noModels);
             return;
           }
-          const choice = await pick(strings.titleModel, items);
+          const typed = rawRest.toLowerCase();
+          const direct = typed ? items.find((item) => item.key.toLowerCase() === typed) ?? (() => {
+            const partial = items.filter((item) => item.key.toLowerCase().includes(typed));
+            return partial.length === 1 ? partial[0] : void 0;
+          })() : void 0;
+          if (typed && !direct) notice("warn", strings.modelNoMatch(rawRest));
+          const choice = direct?.key ?? await pick(strings.titleModel, items);
           if (!choice) return;
           await runtime.setModelRef(choice);
           notice("info", strings.modelSet(choice));
@@ -12327,74 +12817,57 @@ ${strings.mcpAddUsage}`
         }
         case "prompt": {
           const sub = rest[0]?.toLowerCase();
+          const savePromptAs = async (name, body2) => {
+            if (await runtime.promptExists(name) && !await ask2(strings.promptOverwriteAsk(name), void 0, true)) {
+              return;
+            }
+            await runtime.savePrompt(name, body2);
+            notice("info", strings.promptSaved(name));
+          };
           if (sub === "save") {
-            const name = rest.slice(1).join(" ").trim();
-            if (name) {
-              const body2 = lastUserText(history.current);
-              if (!body2) {
-                notice("warn", strings.promptNothing);
-                return;
-              }
-              await runtime.savePrompt(name, body2);
-              notice("info", strings.promptSaved(name));
+            const recent = recentUserMessages(history.current, 20).reverse();
+            if (recent.length === 0) {
+              notice("warn", strings.promptNothing);
               return;
             }
-            const recent = recentUserMessages(history.current, 20);
-            if (recent.length > 0) {
-              const items2 = recent.map((text, i) => ({
-                key: `__recent_${i}__`,
-                label: text.length > 60 ? `${text.slice(0, 60)}\u2026` : text,
-                hint: text.length > 60 ? void 0 : void 0
-              }));
-              items2.push({ key: "__custom__", label: "\u2014 type a custom prompt \u2014" });
-              const choice2 = await pick(strings.titlePrompts, items2);
-              if (!choice2) return;
-              if (choice2 === "__custom__") {
-                setInput("/prompt save ");
-                return;
-              }
-              const index = parseInt(choice2.replace("__recent_", "").replace("__", ""), 10);
-              const body2 = recent[index] ?? "";
-              if (!body2) {
-                notice("warn", strings.promptNothing);
-                return;
-              }
-              if (!await ask2(strings.promptSaveAsk, strings.promptSaveAskBody)) return;
-              const defaultName = body2.split(/\s+/).slice(0, 4).join("-").replace(/[^a-z0-9-]/gi, "").toLowerCase();
-              const nameInput = `${defaultName || "prompt"}`;
-              await runtime.savePrompt(nameInput, body2);
-              notice("info", `${strings.promptSaved(nameInput)}
-Rename the file if you want a different name.`);
+            const typedName = rest.slice(1).join(" ").trim();
+            if (typedName) {
+              await savePromptAs(typedName, lastUserText(history.current));
               return;
             }
-            notice("warn", strings.promptNothing);
+            const choice2 = await pick(
+              strings.titlePrompts,
+              recent.map((text, index) => ({
+                key: String(index),
+                label: text.length > 60 ? `${text.slice(0, 60)}\u2026` : text
+              }))
+            );
+            if (!choice2) return;
+            const body2 = recent[Number(choice2)];
+            if (!body2) return;
+            const name = (await promptInput(strings.promptNameTitle))?.trim();
+            if (!name) return;
+            await savePromptAs(name, body2);
             return;
           }
           if (sub === "delete") {
-            const name = rest.slice(1).join(" ").trim();
-            if (name) {
-              try {
-                await runtime.deletePrompt(name);
-                notice("info", strings.promptDeleted(name));
-              } catch (error) {
-                notice("error", error instanceof Error ? error.message : String(error));
+            let name = rest.slice(1).join(" ").trim() || void 0;
+            if (!name) {
+              const items2 = await runtime.listPromptItems();
+              if (items2.length === 0) {
+                notice("info", strings.promptsEmpty);
+                return;
               }
-              return;
-            }
-            const items2 = await runtime.listPromptItems();
-            if (items2.length === 0) {
-              notice("info", strings.promptsEmpty);
-              return;
-            }
-            const choice2 = await pick(strings.titlePrompts, items2);
-            if (!choice2) return;
-            if (!await ask2(strings.promptDeleteUsage.replace("Usage: ", "").replace("<name>", choice2 || "") + "?", strings.sessionDeleteAsk, true)) return;
-            try {
-              await runtime.deletePrompt(choice2);
-              notice("info", strings.promptDeleted(choice2));
-            } catch (error) {
-              notice("error", error instanceof Error ? error.message : String(error));
+              name = await pick(strings.titlePrompts, items2) ?? void 0;
+              if (!name) return;
             }
+            if (!await ask2(strings.promptDeleteAsk(name), void 0, true)) return;
+            await runtime.deletePrompt(name);
+            notice("info", strings.promptDeleted(name));
+            return;
+          }
+          if (rawRest && await runtime.promptExists(rawRest)) {
+            setInput(await runtime.readPrompt(rawRest));
             return;
           }
           const items = await runtime.listPromptItems();
@@ -12504,11 +12977,10 @@ Rename the file if you want a different name.`);
   const tryQueueAutomaticAttachment = useCallback(
     (requestedPath) => {
       if (!looksLikeAttachmentPath(requestedPath)) return Promise.resolve(false);
-      if (automaticAttachmentTask.current) {
-        return automaticAttachmentTask.current.then(() => false);
-      }
+      const running = automaticAttachmentTask.current;
+      if (running) return running.then(() => tryQueueAutomaticAttachmentRef.current(requestedPath));
       if (attachmentsRef.current.length >= MAX_ATTACHMENTS) {
-        notice("warn", `At most ${MAX_ATTACHMENTS} attachments can be queued for one message.`);
+        notice("warn", strings.attachmentsLimit(MAX_ATTACHMENTS));
         return Promise.resolve(true);
       }
       const paths = splitAttachmentPaths(requestedPath) ?? [requestedPath];
@@ -12521,7 +12993,7 @@ Rename the file if you want a different name.`);
             if (automaticAttachmentTask.current !== task) return true;
             if (!block) continue;
             if (!appendAttachment(block)) {
-              notice("warn", `At most ${MAX_ATTACHMENTS} attachments can be queued for one message.`);
+              notice("warn", strings.attachmentsLimit(MAX_ATTACHMENTS));
               return true;
             }
             added += 1;
@@ -12543,6 +13015,8 @@ Rename the file if you want a different name.`);
     },
     [appendAttachment, notice, runtime, strings]
   );
+  const tryQueueAutomaticAttachmentRef = useRef5(tryQueueAutomaticAttachment);
+  tryQueueAutomaticAttachmentRef.current = tryQueueAutomaticAttachment;
   const listWorkspaceFiles = useCallback(
     (query) => runtime.listWorkspaceFiles(query).catch(() => []),
     [runtime]
@@ -12550,13 +13024,13 @@ Rename the file if you want a different name.`);
   const pasteClipboardImage = useCallback(() => {
     if (clipboardPasteTask.current) return;
     if (attachmentsRef.current.length >= MAX_ATTACHMENTS) {
-      notice("warn", `At most ${MAX_ATTACHMENTS} attachments can be queued for one message.`);
+      notice("warn", strings.attachmentsLimit(MAX_ATTACHMENTS));
       return;
     }
     const task = runtime.loadClipboardImage().then((block) => {
       if (clipboardPasteTask.current !== task) return;
       if (!appendAttachment(block)) {
-        notice("warn", `At most ${MAX_ATTACHMENTS} attachments can be queued for one message.`);
+        notice("warn", strings.attachmentsLimit(MAX_ATTACHMENTS));
         return;
       }
       notice("info", strings.attachmentAdded(attachmentLabel(block) ?? "clipboard image"));
@@ -12612,11 +13086,15 @@ Rename the file if you want a different name.`);
       const queuedAttachments = attachmentsRef.current;
       if (!text && queuedAttachments.length === 0) return;
       const mentioned = [];
-      for (const path15 of extractMentions(text)) {
+      for (const path16 of extractMentions(text)) {
         if (queuedAttachments.length + mentioned.length >= MAX_ATTACHMENTS) break;
         try {
-          mentioned.push(await runtime.loadAttachment(path15));
-        } catch {
+          const block = await runtime.loadMentionAttachment(path16);
+          if (!block) continue;
+          mentioned.push(block);
+          notice("info", strings.mentionAttached(attachmentLabel(block) ?? path16));
+        } catch (error) {
+          if (error instanceof Error && !error.code) notice("warn", error.message);
         }
       }
       if (generation !== attachmentGeneration.current) return;
@@ -12897,6 +13375,12 @@ function mcpAddProblem(strings, error) {
       return strings.mcpAddInvalidUrl;
     case "http-args":
       return strings.mcpAddHttpArgs;
+    case "invalid-env":
+      return strings.mcpAddInvalidEnv;
+    case "invalid-header":
+      return strings.mcpAddInvalidHeader;
+    case "option-mismatch":
+      return strings.mcpAddOptionMismatch;
     case "usage":
       return strings.mcpAddUsage;
   }
@@ -12911,6 +13395,16 @@ function mcpStateLine(strings, state) {
 function formatBalances(balances) {
   return balances.map((item) => `${item.amount} ${item.currency}`).join(" \xB7 ");
 }
+function attachmentPayload(block) {
+  if (block.type === "image") return block.data.length;
+  if (block.type === "file") return Buffer.byteLength(block.text);
+  return 0;
+}
+function sameAttachment(a, b) {
+  if (a.type === "image" && b.type === "image") return a.name === b.name && a.data === b.data;
+  if (a.type === "file" && b.type === "file") return a.name === b.name && a.text === b.text;
+  return false;
+}
 function lastUserText(messages) {
   for (let index = messages.length - 1; index >= 0; index -= 1) {
     const message = messages[index];
@@ -12991,12 +13485,9 @@ program.name("kitcode").description("Terminal coding agent with a config you nev
   if (options.mode && !MODES2.includes(options.mode)) {
     throw new Error(`Unknown mode "${options.mode}". Use normal, accept or plan.`);
   }
-  let cwd = options.cwd;
-  if (cwd) {
-    try {
-      cwd = resolve2(cwd);
-    } catch {
-    }
+  const cwd = options.cwd ? resolve2(options.cwd) : void 0;
+  if (cwd && !statSync(cwd, { throwIfNoEntry: false })?.isDirectory()) {
+    throw new Error(`--cwd is not a directory: ${cwd}`);
   }
   await startTui({
     continueSession: options.continue,
@@ -13049,8 +13540,9 @@ prompts.command("list").description("list saved prompts").action(async () => {
     console.log(`${prompt.slug}	${prompt.name}${prompt.description ? ` \u2014 ${prompt.description}` : ""}`);
   }
 });
-prompts.command("rm").description("delete a saved prompt").argument("<slug>").action(async (slug) => {
-  console.log(await deletePrompt(slug) ? `deleted ${slug}` : `no such prompt: ${slug}`);
+prompts.command("rm").description("delete a saved prompt").argument("<name>").action(async (name) => {
+  const slug = promptSlug(name);
+  console.log(slug && await deletePrompt(slug) ? `deleted ${name}` : `no such prompt: ${name}`);
 });
 program.parseAsync(process.argv).catch((error) => {
   console.error(error instanceof Error ? error.message : String(error));