zelari-code 2.41.0 → 2.43.0

package/dist/cli/main.bundled.js

@@ -807,7 +807,7 @@ async function openBrowser(url2) {
         return { bin: "xdg-open", args: [url2] };
     }
   })();
-  return new Promise((resolve9, reject) => {
+  return new Promise((resolve10, reject) => {
     try {
       const child = spawn19(cmd.bin, cmd.args, {
         stdio: "ignore",
@@ -816,9 +816,9 @@ async function openBrowser(url2) {
       child.on("error", (err) => reject(err));
       child.on("spawn", () => {
         child.unref();
-        resolve9();
+        resolve10();
       });
-      setTimeout(() => resolve9(), 100);
+      setTimeout(() => resolve10(), 100);
     } catch (err) {
       reject(err);
     }
@@ -867,7 +867,7 @@ async function waitForLoopbackCallback(options) {
   const host = options.host ?? "127.0.0.1";
   const timeoutMs2 = options.timeoutMs ?? 3e5;
   const expectedPath = options.path.startsWith("/") ? options.path : `/${options.path}`;
-  return new Promise((resolve9, reject) => {
+  return new Promise((resolve10, reject) => {
     let settled = false;
     const server = createServer((req, res) => {
       const url2 = new URL(req.url ?? "/", `http://${host}`);
@@ -896,7 +896,7 @@ async function waitForLoopbackCallback(options) {
       clearTimeout(timer);
       server.close(() => {
         if (err) reject(err);
-        else resolve9(value ?? {});
+        else resolve10(value ?? {});
       });
     };
     server.on("error", (err) => finish2(void 0, err));
@@ -3482,10 +3482,10 @@ function mergeDefs(...defs) {
 function cloneDef(schema) {
   return mergeDefs(schema._zod.def);
 }
-function getElementAtPath(obj, path103) {
-  if (!path103)
+function getElementAtPath(obj, path104) {
+  if (!path104)
     return obj;
-  return path103.reduce((acc, key) => acc?.[key], obj);
+  return path104.reduce((acc, key) => acc?.[key], obj);
 }
 function promiseAllObject(promisesObj) {
   const keys = Object.keys(promisesObj);
@@ -3813,11 +3813,11 @@ function explicitlyAborted(x, startIndex = 0) {
   }
   return false;
 }
-function prefixIssues(path103, issues) {
+function prefixIssues(path104, issues) {
   return issues.map((iss) => {
     var _a3;
     (_a3 = iss).path ?? (_a3.path = []);
-    iss.path.unshift(path103);
+    iss.path.unshift(path104);
     return iss;
   });
 }
@@ -4035,16 +4035,16 @@ function flattenError(error51, mapper = (issue2) => issue2.message) {
 }
 function formatError(error51, mapper = (issue2) => issue2.message) {
   const fieldErrors = { _errors: [] };
-  const processError = (error52, path103 = []) => {
+  const processError = (error52, path104 = []) => {
     for (const issue2 of error52.issues) {
       if (issue2.code === "invalid_union" && issue2.errors.length) {
-        issue2.errors.map((issues) => processError({ issues }, [...path103, ...issue2.path]));
+        issue2.errors.map((issues) => processError({ issues }, [...path104, ...issue2.path]));
       } else if (issue2.code === "invalid_key") {
-        processError({ issues: issue2.issues }, [...path103, ...issue2.path]);
+        processError({ issues: issue2.issues }, [...path104, ...issue2.path]);
       } else if (issue2.code === "invalid_element") {
-        processError({ issues: issue2.issues }, [...path103, ...issue2.path]);
+        processError({ issues: issue2.issues }, [...path104, ...issue2.path]);
       } else {
-        const fullpath = [...path103, ...issue2.path];
+        const fullpath = [...path104, ...issue2.path];
         if (fullpath.length === 0) {
           fieldErrors._errors.push(mapper(issue2));
         } else {
@@ -4071,17 +4071,17 @@ function formatError(error51, mapper = (issue2) => issue2.message) {
 }
 function treeifyError(error51, mapper = (issue2) => issue2.message) {
   const result = { errors: [] };
-  const processError = (error52, path103 = []) => {
+  const processError = (error52, path104 = []) => {
     var _a3, _b;
     for (const issue2 of error52.issues) {
       if (issue2.code === "invalid_union" && issue2.errors.length) {
-        issue2.errors.map((issues) => processError({ issues }, [...path103, ...issue2.path]));
+        issue2.errors.map((issues) => processError({ issues }, [...path104, ...issue2.path]));
       } else if (issue2.code === "invalid_key") {
-        processError({ issues: issue2.issues }, [...path103, ...issue2.path]);
+        processError({ issues: issue2.issues }, [...path104, ...issue2.path]);
       } else if (issue2.code === "invalid_element") {
-        processError({ issues: issue2.issues }, [...path103, ...issue2.path]);
+        processError({ issues: issue2.issues }, [...path104, ...issue2.path]);
       } else {
-        const fullpath = [...path103, ...issue2.path];
+        const fullpath = [...path104, ...issue2.path];
         if (fullpath.length === 0) {
           result.errors.push(mapper(issue2));
           continue;
@@ -4113,8 +4113,8 @@ function treeifyError(error51, mapper = (issue2) => issue2.message) {
 }
 function toDotPath(_path) {
   const segs = [];
-  const path103 = _path.map((seg) => typeof seg === "object" ? seg.key : seg);
-  for (const seg of path103) {
+  const path104 = _path.map((seg) => typeof seg === "object" ? seg.key : seg);
+  for (const seg of path104) {
     if (typeof seg === "number")
       segs.push(`[${seg}]`);
     else if (typeof seg === "symbol")
@@ -17617,13 +17617,13 @@ function resolveRef(ref, ctx) {
   if (!ref.startsWith("#")) {
     throw new Error("External $ref is not supported, only local refs (#/...) are allowed");
   }
-  const path103 = ref.slice(1).split("/").filter(Boolean);
-  if (path103.length === 0) {
+  const path104 = ref.slice(1).split("/").filter(Boolean);
+  if (path104.length === 0) {
     return ctx.rootSchema;
   }
   const defsKey = ctx.version === "draft-2020-12" ? "$defs" : "definitions";
-  if (path103[0] === defsKey) {
-    const key = path103[1];
+  if (path104[0] === defsKey) {
+    const key = path104[1];
     if (!key || !ctx.defs[key]) {
       throw new Error(`Reference not found: ${ref}`);
     }
@@ -18457,17 +18457,17 @@ var init_newlines = __esm({
 });
 
 // packages/core/dist/core/tools/builtin/fileEvents.js
-function fileReadEvent(path103, snapshotId) {
-  return { kind: "file.read", actor: { type: "tool" }, data: { path: path103, snapshotId } };
+function fileReadEvent(path104, snapshotId) {
+  return { kind: "file.read", actor: { type: "tool" }, data: { path: path104, snapshotId } };
 }
-function fileAppliedEvent(path103, snapshotId, bytes) {
-  return { kind: "file.applied", actor: { type: "tool" }, data: { path: path103, snapshotId, bytes } };
+function fileAppliedEvent(path104, snapshotId, bytes) {
+  return { kind: "file.applied", actor: { type: "tool" }, data: { path: path104, snapshotId, bytes } };
 }
-function fileRejectedEvent(path103, reason, hint) {
+function fileRejectedEvent(path104, reason, hint) {
   return {
     kind: "file.rejected",
     actor: { type: "tool" },
-    data: hint === void 0 ? { path: path103, reason } : { path: path103, reason, hint }
+    data: hint === void 0 ? { path: path104, reason } : { path: path104, reason, hint }
   };
 }
 function reReadHint(reject) {
@@ -19066,12 +19066,12 @@ function withNodeDirOnPath(base2) {
     const nodeDir = dirname(process.execPath);
     if (!nodeDir)
       return env;
-    const sep4 = process.platform === "win32" ? ";" : ":";
+    const sep5 = process.platform === "win32" ? ";" : ":";
     const current = env.PATH ?? env.Path ?? "";
-    const parts = current.split(sep4).filter((p3) => p3.length > 0);
+    const parts = current.split(sep5).filter((p3) => p3.length > 0);
     const has = parts.some((p3) => p3.toLowerCase() === nodeDir.toLowerCase());
     if (!has) {
-      env.PATH = `${nodeDir}${sep4}${current}`;
+      env.PATH = `${nodeDir}${sep5}${current}`;
     }
   } catch {
   }
@@ -19086,7 +19086,7 @@ function createBashTool(spawnSeam) {
     timeoutMs: 6e4,
     inputSchema: BashArgsSchema,
     execute: async (args, ctx) => {
-      return new Promise((resolve9) => {
+      return new Promise((resolve10) => {
         const start = Date.now();
         const cwd = args.cwd ?? ctx.cwd;
         const resolved = resolveShell();
@@ -19113,7 +19113,7 @@ function createBashTool(spawnSeam) {
         if (spawnSeam) {
           const seamResult = spawnSeam({ program, argv, cwd, env, signal: ctx.signal });
           if (seamResult.outcome !== "spawned") {
-            resolve9(typedErr(seamResult.reason));
+            resolve10(typedErr(seamResult.reason));
             return;
           }
           child = seamResult.child;
@@ -19140,14 +19140,14 @@ function createBashTool(spawnSeam) {
         });
         const timer = setTimeout(() => {
           child.kill("SIGTERM");
-          resolve9(typedErr(`Bash command timed out after ${args.timeoutMs}ms. If it was waiting for interactive input: stdin is closed \u2014 pass non-interactive flags or create the files directly instead of retrying.`));
+          resolve10(typedErr(`Bash command timed out after ${args.timeoutMs}ms. If it was waiting for interactive input: stdin is closed \u2014 pass non-interactive flags or create the files directly instead of retrying.`));
         }, args.timeoutMs);
         child.on("close", (code) => {
           clearTimeout(timer);
           const cappedStdout = stdout.slice(0, maxBuffer);
           const cappedStderr = stderr.slice(0, maxBuffer);
           const interactive = INTERACTIVE_CANCEL_RE.test(cappedStdout) || INTERACTIVE_CANCEL_RE.test(cappedStderr);
-          resolve9(typedOk({
+          resolve10(typedOk({
             stdout: cappedStdout,
             stderr: cappedStderr,
             exitCode: code ?? -1,
@@ -19159,7 +19159,7 @@ function createBashTool(spawnSeam) {
         });
         child.on("error", (err) => {
           clearTimeout(timer);
-          resolve9(typedErr(err.message));
+          resolve10(typedErr(err.message));
         });
       });
     }
@@ -19304,22 +19304,54 @@ var init_walk = __esm({
 // packages/core/dist/core/tools/builtin/search.js
 import { promises as fs7 } from "node:fs";
 import path10 from "node:path";
+function cleanGlobFragment(g) {
+  let out = g.trim();
+  if (out.startsWith("[") && out.charAt(1) === '"')
+    out = out.slice(1);
+  if (out.endsWith("]") && out.charAt(out.length - 2) === '"')
+    out = out.slice(0, -1);
+  if (out.length >= 2 && (out.charAt(0) === '"' && out.charAt(out.length - 1) === '"' || out.charAt(0) === "'" && out.charAt(out.length - 1) === "'")) {
+    out = out.slice(1, -1).trim();
+  }
+  return out;
+}
+function isJsonArrayString(value) {
+  if (typeof value !== "string")
+    return false;
+  const s = value.trim();
+  if (!s.startsWith("[") || !s.endsWith("]"))
+    return false;
+  try {
+    return Array.isArray(JSON.parse(s));
+  } catch {
+    return false;
+  }
+}
 function coerceStringList(value, fallback) {
   if (value === void 0 || value === null)
     return fallback;
   if (Array.isArray(value)) {
-    const cleaned = value.filter((x) => typeof x === "string" && x.trim().length > 0);
+    const cleaned = value.map((x) => typeof x === "string" ? cleanGlobFragment(x) : x).filter((x) => typeof x === "string" && x.trim().length > 0);
     return cleaned.length > 0 ? cleaned : fallback;
   }
   if (typeof value === "string") {
     const s = value.trim();
     if (!s)
       return fallback;
+    if (s.startsWith("[") && s.endsWith("]")) {
+      try {
+        const parsed = JSON.parse(s);
+        if (Array.isArray(parsed))
+          return coerceStringList(parsed, fallback);
+      } catch {
+      }
+    }
     if (s.includes(",") && !s.includes("{")) {
-      const parts = s.split(",").map((x) => x.trim()).filter(Boolean);
+      const parts = s.split(",").map((x) => cleanGlobFragment(x)).filter(Boolean);
       return parts.length > 0 ? parts : fallback;
     }
-    return [s];
+    const single = cleanGlobFragment(s);
+    return single ? [single] : fallback;
   }
   return fallback;
 }
@@ -19425,7 +19457,7 @@ var init_search = __esm({
     });
     grepContentTool = {
       name: "grep_content",
-      description: `Regex search for content in a file OR recursively in a directory. When path is a directory, include/exclude globs filter which files are searched (default: all files, excluding node_modules/dist/.git/etc.). Glob semantics (grep --include style): a glob without '/' (e.g. "*.md") matches the file basename at ANY depth; a glob with '/' (e.g. "src/*.ts") matches the relative path at exactly that level; "**" is explicit recursion ("**/*.ts" matches at any depth, same as the bare form). include/exclude accept a single glob string (e.g. "*.ts") OR an array of globs. Returns matches with line numbers and context, plus filesWalked/filesInTree counts and a warning when the include globs matched suspiciously few files.`,
+      description: `Regex search for content in a file OR recursively in a directory. When path is a directory, include/exclude globs filter which files are searched (default: all files, excluding node_modules/dist/.git/etc.). Glob semantics (grep --include style): a glob without '/' (e.g. "*.md") matches the file basename at ANY depth; a glob with '/' (e.g. "src/*.ts") matches the relative path at exactly that level; "**" is explicit recursion ("**/*.ts" matches at any depth, same as the bare form). include/exclude accept a single glob string (e.g. "*.ts") OR an array of globs. Stringified-array ('["*.ts"]') or quote-wrapped forms are auto-repaired, with a warning. Returns matches with line numbers and context, plus filesWalked/filesInTree counts and a warning when the include globs matched suspiciously few files.`,
       permissions: ["read"],
       sideEffect: "none",
       timeoutMs: 3e4,
@@ -19440,9 +19472,14 @@ var init_search = __esm({
           const warnings = [];
           if (Array.isArray(rawInclude) && rawInclude.length === 0) {
             warnings.push('DEPRECATED_INPUT: empty include array \u2014 omit the field instead; this will become INVALID_ARGUMENT (planned v1.47). Fell back to ["*"]');
+          } else if (isJsonArrayString(rawInclude)) {
+            warnings.push(`include repaired from stringified-array form to ${JSON.stringify(include)}`);
           } else if (typeof rawInclude === "string") {
             warnings.push(`include coerced from bare string to ${JSON.stringify(include)}`);
           }
+          if (isJsonArrayString(args.exclude)) {
+            warnings.push(`exclude repaired from stringified-array form to ${JSON.stringify(exclude)}`);
+          }
           if (!await isDirectory(absRoot)) {
             let exists = true;
             try {
@@ -20336,11 +20373,11 @@ var init_tools = __esm({
           if (!ctx.addDocument)
             return "Knowledge vault tool not available.";
           const title = args["title"] || "New Document";
-          const path103 = args["path"] || `notes/${title.toLowerCase().replace(/[^a-z0-9]+/g, "-")}`;
+          const path104 = args["path"] || `notes/${title.toLowerCase().replace(/[^a-z0-9]+/g, "-")}`;
           const content = args["content"] || "";
           const tags = args["tags"] || [];
           ctx.addDocument({
-            path: path103,
+            path: path104,
             title,
             content,
             format: "markdown",
@@ -20349,7 +20386,7 @@ var init_tools = __esm({
             workspaceId: ctx.workspaceId
           });
           ctx.addActivity("vault", "created document", title);
-          return `Document "${title}" created at "${path103}".`;
+          return `Document "${title}" created at "${path104}".`;
         }
       }
     ];
@@ -22259,7 +22296,7 @@ var init_nodeProviders = __esm({
         const isWindows = process.platform === "win32";
         const file2 = isWindows ? "cmd.exe" : "/bin/sh";
         const args = isWindows ? ["/d", "/s", "/c", command] : ["-c", command];
-        return await new Promise((resolve9) => {
+        return await new Promise((resolve10) => {
           const child = spawn2(file2, args, {
             cwd,
             shell: false,
@@ -22292,7 +22329,7 @@ var init_nodeProviders = __esm({
           });
           child.on("error", (err) => {
             clearTimeout(timer);
-            resolve9({
+            resolve10({
               exitCode: null,
               stdout,
               stderr: `${stderr}${err.message}`,
@@ -22302,7 +22339,7 @@ var init_nodeProviders = __esm({
           });
           child.on("close", (code) => {
             clearTimeout(timer);
-            resolve9({ exitCode: code, stdout, stderr, durationMs: Date.now() - started, timedOut });
+            resolve10({ exitCode: code, stdout, stderr, durationMs: Date.now() - started, timedOut });
           });
         });
       }
@@ -22380,7 +22417,7 @@ import path16 from "node:path";
 import crypto2 from "node:crypto";
 import { spawn as spawn3 } from "node:child_process";
 async function git(cwd, args) {
-  return await new Promise((resolve9, reject) => {
+  return await new Promise((resolve10, reject) => {
     const child = spawn3("git", args, { cwd, shell: false });
     let stdout = "";
     let stderr = "";
@@ -22389,7 +22426,7 @@ async function git(cwd, args) {
     child.on("error", (err) => reject(err));
     child.on("close", (code) => {
       if (code === 0)
-        resolve9(stdout);
+        resolve10(stdout);
       else
         reject(new Error(`git ${args.join(" ")} failed (${code}): ${stderr.trim()}`));
     });
@@ -25287,16 +25324,16 @@ function runRetentionFromEnv() {
     maxTotalBytes: Number.isFinite(parseMb) && parseMb > 0 ? Math.round(parseMb * 1024 * 1024) : DEFAULT_RUN_RETENTION_MAX_MB * 1024 * 1024
   };
 }
-async function dirSize(path103) {
+async function dirSize(path104) {
   let total = 0;
   let entries;
   try {
-    entries = await readdir(path103, { withFileTypes: true });
+    entries = await readdir(path104, { withFileTypes: true });
   } catch {
     return 0;
   }
   for (const entry of entries) {
-    const child = join3(path103, entry.name);
+    const child = join3(path104, entry.name);
     if (entry.isDirectory())
       total += await dirSize(child);
     else {
@@ -25323,19 +25360,19 @@ async function enforceRunRetention(runsDir, options = {}) {
   for (const entry of entries) {
     if (!entry.isDirectory())
       continue;
-    const path103 = join3(runsDir, entry.name);
+    const path104 = join3(runsDir, entry.name);
     let startedAt = 0;
     let endedAt;
     let completed = false;
     try {
-      const manifest = JSON.parse(await readFile(join3(path103, "manifest.json"), "utf8"));
+      const manifest = JSON.parse(await readFile(join3(path104, "manifest.json"), "utf8"));
       startedAt = manifest.startedAt ?? 0;
       endedAt = manifest.endedAt;
       completed = Boolean(endedAt) && manifest.status !== "running";
     } catch {
       completed = false;
     }
-    infos.push({ name: entry.name, path: path103, startedAt, endedAt, completed, bytes: await dirSize(path103) });
+    infos.push({ name: entry.name, path: path104, startedAt, endedAt, completed, bytes: await dirSize(path104) });
   }
   const remove = async (info) => {
     await rm(info.path, { recursive: true, force: true });
@@ -25893,12 +25930,12 @@ var init_engine = __esm({
        * content digest) and the returned ref carries the event seq when the
        * emitter resolved one.
        */
-      async fsEvidence(observation, path103, sha2562, content, extra = {}) {
+      async fsEvidence(observation, path104, sha2562, content, extra = {}) {
         const digest = sha2562 && content !== void 0 ? sha2562(content) : void 0;
-        const seq = await this.emitEvidence({ observation, path: path103, ...extra, ...digest ? { digest } : {} });
+        const seq = await this.emitEvidence({ observation, path: path104, ...extra, ...digest ? { digest } : {} });
         return {
           tier: "fs-observation",
-          ref: path103,
+          ref: path104,
           capturedAt: Date.now(),
           ...digest ? { digest } : {},
           ...seq !== void 0 ? { seq } : {}
@@ -29044,22 +29081,32 @@ function parseMinimaxStyleToolCalls(text) {
 }
 function parseLooseArgs(body) {
   const args = {};
-  const paramTag = /(?:parameter\s+name=|<\s*)["']?([a-zA-Z_][\w]*)["']?\s*(?:>|=\s*["']?)([^<\]\n]+)/gi;
+  const paramFull = /<parameter\s+name=["']([a-zA-Z_][\w]*)["']\s*>([\s\S]*?)<\/parameter>/gi;
   let m;
-  while ((m = paramTag.exec(body)) !== null) {
+  while ((m = paramFull.exec(body)) !== null) {
+    const key = m[1];
+    if (["invoke", "minimax", "tool_call", "parameter"].includes(key))
+      continue;
+    args[key] = coerceJsonishValue(m[2]);
+  }
+  const rest = body.replace(/<parameter\s+name=["'][a-zA-Z_][\w]*["']\s*>[\s\S]*?<\/parameter>/gi, " ");
+  const paramTag = /(?:parameter\s+name=|<\s*)["']?([a-zA-Z_][\w]*)["']?\s*(?:>|=\s*["']?)([^<\]\n]+)/gi;
+  while ((m = paramTag.exec(rest)) !== null) {
     const key = m[1];
     if (key === "invoke" || key === "minimax" || key === "tool_call")
       continue;
-    args[key] = m[2].replace(/^["']|["']$/g, "").trim();
+    if (args[key] !== void 0)
+      continue;
+    args[key] = coerceJsonishValue(m[2]);
   }
   const lineRe = /(?:^|[\s\[>])([a-zA-Z_][\w]*)\s*[>:=]\s*([^\n<\]]+)/g;
-  while ((m = lineRe.exec(body)) !== null) {
+  while ((m = lineRe.exec(rest)) !== null) {
     const key = m[1];
     if (args[key] !== void 0)
       continue;
     if (["invoke", "name", "minimax", "tool_call", "parameter"].includes(key))
       continue;
-    args[key] = m[2].replace(/^["']|["']$/g, "").trim();
+    args[key] = coerceJsonishValue(m[2]);
   }
   if (Object.keys(args).length === 0) {
     const brace = body.indexOf("{");
@@ -29075,6 +29122,20 @@ function parseLooseArgs(body) {
   }
   return args;
 }
+function coerceJsonishValue(raw) {
+  const t = raw.trim();
+  if (t.startsWith("[") || t.startsWith("{")) {
+    try {
+      return JSON.parse(t);
+    } catch {
+    }
+    try {
+      return JSON.parse(t + (t.startsWith("[") ? "]" : "}"));
+    } catch {
+    }
+  }
+  return t.replace(/^["']|["']$/g, "").trim();
+}
 function tryParseToolArray(raw) {
   let parsed;
   try {
@@ -30504,8 +30565,8 @@ function wrapLegacyStream(legacyStream, params, _messages, _tools) {
       }
       if (done)
         break;
-      await new Promise((resolve9) => {
-        resolveNext = resolve9;
+      await new Promise((resolve10) => {
+        resolveNext = resolve10;
       });
     }
     await promise2;
@@ -30638,11 +30699,11 @@ var init_sessionJsonl = __esm({
        */
       scheduleFlush() {
         if (this.pending.length > 0 && !this.flushDeferred) {
-          let resolve9;
+          let resolve10;
           const promise2 = new Promise((r) => {
-            resolve9 = r;
+            resolve10 = r;
           });
-          this.flushDeferred = { promise: promise2, resolve: resolve9 };
+          this.flushDeferred = { promise: promise2, resolve: resolve10 };
         }
         if (this.flushTimer === null && this.pending.length > 0) {
           this.flushTimer = setTimeout(() => {
@@ -30949,7 +31010,7 @@ var init_lifecycleHookRunner = __esm({
       }
       /** Spawn `command`, write JSON payload to stdin, read stdout until close. */
       execCommand(command, payload, timeoutMs2, cwd) {
-        return new Promise((resolve9, reject) => {
+        return new Promise((resolve10, reject) => {
           const argv = splitHookCommandLine(command);
           if (argv.length === 0) {
             reject(new Error("empty hook command"));
@@ -30983,7 +31044,7 @@ var init_lifecycleHookRunner = __esm({
               reject(new Error(`exited ${code}: ${stderr.trim().slice(0, 200)}`));
               return;
             }
-            resolve9(stdout);
+            resolve10(stdout);
           });
           child.stdin?.on("error", () => {
           });
@@ -31032,7 +31093,17 @@ var init_appServerTypes = __esm({
 
 // packages/core/dist/harness/appServer.js
 import { randomUUID } from "node:crypto";
-import { resolve } from "node:path";
+import { isAbsolute, resolve } from "node:path";
+function resolveSessionWorkspaceRoot(workspaceRoot) {
+  if (typeof workspaceRoot !== "string" || workspaceRoot.trim() === "") {
+    throw new Error("HarnessAppServer: createSession requires a non-empty `workspaceRoot` (it never falls back to process.cwd(): sessions on different workspaces must stay isolated)");
+  }
+  const raw = workspaceRoot.trim();
+  if (!isAbsolute(raw)) {
+    throw new Error(`HarnessAppServer: createSession workspaceRoot must be an absolute path (got '${raw}') \u2014 a relative root would resolve against the server process.cwd() and mix sessions (ADR-0016)`);
+  }
+  return resolve(raw);
+}
 var HarnessAppServer;
 var init_appServer = __esm({
   "packages/core/dist/harness/appServer.js"() {
@@ -31053,7 +31124,7 @@ var init_appServer = __esm({
         this.defaultServicesFactory = options.createWorkspaceServices;
       }
       createSession(options) {
-        const root = resolve(options.workspaceRoot);
+        const root = resolveSessionWorkspaceRoot(options.workspaceRoot);
         const factory = options.createWorkspaceServices ?? this.defaultServicesFactory;
         if (!factory) {
           throw new Error("HarnessAppServer: createWorkspaceServices factory is required");
@@ -31289,6 +31360,7 @@ __export(harness_exports, {
   recordToolResult: () => recordToolResult,
   recordUsage: () => recordUsage,
   resolveRequestSnapshotMode: () => resolveRequestSnapshotMode,
+  resolveSessionWorkspaceRoot: () => resolveSessionWorkspaceRoot,
   runExtensionPreToolUse: () => runExtensionPreToolUse,
   sha256Hex: () => sha256Hex,
   splitHookCommandLine: () => splitHookCommandLine,
@@ -32107,11 +32179,11 @@ var init_synthesisAudit = __esm({
 import { existsSync as existsSync10, readFileSync as readFileSync9, writeFileSync as writeFileSync6 } from "node:fs";
 import { join as join5 } from "node:path";
 function loadNfrSpec(zelariRoot) {
-  const path103 = join5(zelariRoot, "nfr-spec.json");
-  if (!existsSync10(path103))
+  const path104 = join5(zelariRoot, "nfr-spec.json");
+  if (!existsSync10(path104))
     return null;
   try {
-    const raw = JSON.parse(readFileSync9(path103, "utf8"));
+    const raw = JSON.parse(readFileSync9(path104, "utf8"));
     if (raw.version !== 1 || !Array.isArray(raw.targets))
       return null;
     return raw;
@@ -34512,9 +34584,9 @@ var init_types9 = __esm({
 import { readFileSync as readFileSync14 } from "node:fs";
 import { join as join11 } from "node:path";
 function readLessonsDeduped(zelariRoot) {
-  const path103 = join11(zelariRoot, LESSONS_FILE);
+  const path104 = join11(zelariRoot, LESSONS_FILE);
   try {
-    const raw = readFileSync14(path103, "utf8");
+    const raw = readFileSync14(path104, "utf8");
     const byId = /* @__PURE__ */ new Map();
     for (const line of raw.split(/\r?\n/)) {
       if (!line.trim())
@@ -34615,8 +34687,8 @@ function keywordsFrom(check2, signature) {
   return [.../* @__PURE__ */ new Set([...fromId, ...words])].slice(0, 12);
 }
 function writeLesson(zelariRoot, lesson) {
-  const path103 = join12(zelariRoot, LESSONS_FILE);
-  appendFileSync(path103, `${JSON.stringify(lesson)}
+  const path104 = join12(zelariRoot, LESSONS_FILE);
+  appendFileSync(path104, `${JSON.stringify(lesson)}
 `, "utf8");
 }
 function findSimilar(lessons, signature) {
@@ -36584,9 +36656,9 @@ function findCycle(nodes) {
     if (color.get(start) !== WHITE)
       continue;
     const stack = [[start, 0]];
-    const path103 = [];
+    const path104 = [];
     color.set(start, GRAY);
-    path103.push(start);
+    path104.push(start);
     while (stack.length > 0) {
       const top = stack[stack.length - 1];
       const [id3, idx] = top;
@@ -36599,17 +36671,17 @@ function findCycle(nodes) {
           continue;
         const c = color.get(dep);
         if (c === GRAY) {
-          const at = path103.indexOf(dep);
-          return [...path103.slice(at), dep];
+          const at = path104.indexOf(dep);
+          return [...path104.slice(at), dep];
         }
         if (c === WHITE) {
           color.set(dep, GRAY);
-          path103.push(dep);
+          path104.push(dep);
           stack.push([dep, 0]);
         }
       } else {
         color.set(id3, BLACK);
-        path103.pop();
+        path104.pop();
         stack.pop();
       }
     }
@@ -37529,8 +37601,8 @@ var init_runner = __esm({
           failed: [...this.tentaclesById.values()].filter((r) => r.status === "error"),
           pending: []
         };
-        const path103 = await this.host.saveSnapshot(snapshot, ".zelari/kraken/snapshots");
-        this.host.log(`checkpoint: ${label ?? "auto"} \u2192 ${path103}`);
+        const path104 = await this.host.saveSnapshot(snapshot, ".zelari/kraken/snapshots");
+        this.host.log(`checkpoint: ${label ?? "auto"} \u2192 ${path104}`);
         return snapshot;
       }
       callLog(msg, data) {
@@ -38826,7 +38898,7 @@ var CORE_VERSION;
 var init_version = __esm({
   "packages/core/dist/version.js"() {
     "use strict";
-    CORE_VERSION = "2.41.0";
+    CORE_VERSION = "2.43.0";
   }
 });
 
@@ -39309,6 +39381,7 @@ __export(dist_exports, {
   resolveRequestSnapshotMode: () => resolveRequestSnapshotMode,
   resolveResponseLanguage: () => resolveResponseLanguage,
   resolveRoleSystemPrompt: () => resolveRoleSystemPrompt,
+  resolveSessionWorkspaceRoot: () => resolveSessionWorkspaceRoot,
   resolveSessionsDir: () => resolveSessionsDir,
   resolveSkillDependencies: () => resolveSkillDependencies,
   resolveVerifyRetryTool: () => resolveVerifyRetryTool,
@@ -40162,7 +40235,7 @@ ${fallback.output}`
   return primary;
 }
 function runNpm(executor, args, mode, npmCliPath) {
-  return new Promise((resolve9) => {
+  return new Promise((resolve10) => {
     let stdout = "";
     let stderr = "";
     const stdio = ["ignore", "pipe", "pipe"];
@@ -40174,7 +40247,7 @@ function runNpm(executor, args, mode, npmCliPath) {
       stderr += chunk.toString();
     });
     child.on("error", (err) => {
-      resolve9({
+      resolve10({
         ok: false,
         output: stdout + stderr,
         error: err.message,
@@ -40183,7 +40256,7 @@ function runNpm(executor, args, mode, npmCliPath) {
     });
     child.on("close", (code) => {
       const ok = code === 0;
-      resolve9({
+      resolve10({
         ok,
         output: stdout + stderr,
         error: ok ? void 0 : `npm exited with code ${code}`,
@@ -41308,9 +41381,9 @@ function spillToolOutput(fullText, meta3) {
     const rnd = randomBytes3(3).toString("hex");
     const safeTool = (meta3?.toolName ?? "tool").replace(/[^a-zA-Z0-9._-]+/g, "_").slice(0, 32);
     const file2 = `${stamp}-${safeTool}-${hash3}-${rnd}.txt`;
-    const path103 = join14(dir, file2);
-    writeFileSync12(path103, fullText, "utf8");
-    return path103;
+    const path104 = join14(dir, file2);
+    writeFileSync12(path104, fullText, "utf8");
+    return path104;
   } catch {
     return null;
   }
@@ -41356,10 +41429,10 @@ function truncateToolResult(text, capOrOpts = TOOL_RESULT_LINE_CAP) {
 ${tail2}`;
   }
   if (doSpill) {
-    const path103 = spillToolOutput(text, { toolName: opts.toolName });
-    if (path103) {
+    const path104 = spillToolOutput(text, { toolName: opts.toolName });
+    if (path104) {
       const spillNote = `
-\u2026 [full output spilled to: ${path103} \u2014 re-read with read_file if you need the complete text] \u2026`;
+\u2026 [full output spilled to: ${path104} \u2014 re-read with read_file if you need the complete text] \u2026`;
       if (preview.includes("] \u2026\n")) {
         preview = preview.replace("] \u2026\n", `] \u2026${spillNote}
 `);
@@ -41716,8 +41789,15 @@ import path36 from "node:path";
 function radioDir(cwd) {
   return path36.join(cwd, ".zelari", "radio");
 }
+function processFallbackRadioId() {
+  if (fallbackRadioId === null) {
+    fallbackRadioId = `default-${process.pid}-${Date.now().toString(36)}`;
+  }
+  return fallbackRadioId;
+}
 function radioPath(cwd, sessionId2) {
-  const safe = (sessionId2 || "default").replace(/[^a-zA-Z0-9._-]/g, "_").slice(0, 80);
+  const id3 = sessionId2.trim() ? sessionId2 : processFallbackRadioId();
+  const safe = id3.replace(/[^a-zA-Z0-9._-]/g, "_").slice(0, 80);
   return path36.join(radioDir(cwd), `${safe}.jsonl`);
 }
 function appendRadioLine(file2, line) {
@@ -41812,10 +41892,11 @@ function formatKrakenRadioStatus(cwd, sessionId2, limit = 12) {
   });
   return [`Kraken radio (last ${events.length}) session=${sessionId2}:`, ...lines].join("\n");
 }
-var MAX_CACHED_RADIO_FDS, radioFds;
+var fallbackRadioId, MAX_CACHED_RADIO_FDS, radioFds;
 var init_krakenRadio = __esm({
   "src/cli/tools/krakenRadio.ts"() {
     "use strict";
+    fallbackRadioId = null;
     MAX_CACHED_RADIO_FDS = 32;
     radioFds = /* @__PURE__ */ new Map();
   }
@@ -42162,28 +42243,28 @@ var init_storage = __esm({
     VALID_SCALARS = /^(true|false|null|~)$/i;
     Storage = class {
       /** Read a Markdown file with frontmatter. Throws if not found. */
-      read(path103) {
-        if (!existsSync19(path103)) {
-          throw new Error(`File not found: ${path103}`);
+      read(path104) {
+        if (!existsSync19(path104)) {
+          throw new Error(`File not found: ${path104}`);
         }
-        const md = readFileSync17(path103, "utf8");
+        const md = readFileSync17(path104, "utf8");
         return parseFrontmatter(md);
       }
       /** Read a Markdown file; returns null if not found. */
-      readIfExists(path103) {
-        if (!existsSync19(path103)) return null;
-        return this.read(path103);
+      readIfExists(path104) {
+        if (!existsSync19(path104)) return null;
+        return this.read(path104);
       }
       /**
        * Write a Markdown file atomically (tmp + rename). Creates parent dirs.
        * The meta object is serialized as YAML frontmatter; body as Markdown.
        */
-      write(path103, meta3, body) {
-        mkdirSync10(dirname2(path103), { recursive: true });
-        const tmp = path103 + ".tmp-" + process.pid;
+      write(path104, meta3, body) {
+        mkdirSync10(dirname2(path104), { recursive: true });
+        const tmp = path104 + ".tmp-" + process.pid;
         const md = serializeFrontmatter(meta3, body);
         writeFileSync14(tmp, md, "utf8");
-        renameSync2(tmp, path103);
+        renameSync2(tmp, path104);
       }
       /** List all .md files in a directory (non-recursive). */
       listMarkdown(dir) {
@@ -42197,8 +42278,8 @@ var init_storage = __esm({
         const prev2 = this.chains.get(key) ?? Promise.resolve();
         let release = () => {
         };
-        const next = new Promise((resolve9) => {
-          release = resolve9;
+        const next = new Promise((resolve10) => {
+          release = resolve10;
         });
         const chained = prev2.then(() => next);
         this.chains.set(key, chained);
@@ -42294,8 +42375,8 @@ function nextPlanTaskId(store6) {
   return `t${store6.counter}`;
 }
 function writePlanTaskArtifact(rootDir, task) {
-  const path103 = join17(rootDir, "plan-tasks", `${task.id}.md`);
-  mkdirSync11(dirname3(path103), { recursive: true });
+  const path104 = join17(rootDir, "plan-tasks", `${task.id}.md`);
+  mkdirSync11(dirname3(path104), { recursive: true });
   const meta3 = {
     kind: "task",
     id: task.id,
@@ -42316,7 +42397,7 @@ function writePlanTaskArtifact(rootDir, task) {
     task.notes?.trim() ? task.notes.trim() : "_(no notes)_",
     ""
   ].filter((l) => l !== null).join("\n");
-  new Storage().write(path103, meta3, body);
+  new Storage().write(path104, meta3, body);
 }
 function loadHandle(rootDir) {
   const jsonPath = join17(rootDir, "plan.json");
@@ -42994,14 +43075,14 @@ var init_engine2 = __esm({
         parse: parseRuffJson
       }
     ];
-    defaultRunner = (cmd, args, opts) => new Promise((resolve9) => {
+    defaultRunner = (cmd, args, opts) => new Promise((resolve10) => {
       let stdout = "";
       let stderr = "";
       let settled = false;
       const done = (r) => {
         if (settled) return;
         settled = true;
-        resolve9(r);
+        resolve10(r);
       };
       let child;
       try {
@@ -44056,7 +44137,7 @@ async function readChecks(cwd) {
   }
 }
 function runShell(command, cwd, timeoutMs2, signal) {
-  return new Promise((resolve9) => {
+  return new Promise((resolve10) => {
     const isWin = process.platform === "win32";
     const child = spawn8(isWin ? "cmd.exe" : "/bin/sh", isWin ? ["/c", command] : ["-c", command], {
       cwd,
@@ -44070,7 +44151,7 @@ function runShell(command, cwd, timeoutMs2, signal) {
     const finish2 = (exitCode) => {
       if (settled) return;
       settled = true;
-      resolve9({ exitCode, stdout, stderr });
+      resolve10({ exitCode, stdout, stderr });
     };
     const timer = setTimeout(() => {
       try {
@@ -46781,8 +46862,8 @@ ${upstream}` : node.prompt,
         if (ms <= 0) return promise2;
         let timer;
         const TIMED_OUT = Symbol("timeout");
-        const timeout = new Promise((resolve9) => {
-          timer = setTimeout(() => resolve9(TIMED_OUT), ms);
+        const timeout = new Promise((resolve10) => {
+          timer = setTimeout(() => resolve10(TIMED_OUT), ms);
         });
         const raced = await Promise.race([promise2, timeout]).finally(() => {
           if (timer) clearTimeout(timer);
@@ -46791,8 +46872,8 @@ ${upstream}` : node.prompt,
         controller?.abort();
         const graceMs = this.cancelGraceMs ?? resolveCancelGraceMs();
         let graceTimer;
-        const grace = new Promise((resolve9) => {
-          graceTimer = setTimeout(() => resolve9(TIMED_OUT), graceMs);
+        const grace = new Promise((resolve10) => {
+          graceTimer = setTimeout(() => resolve10(TIMED_OUT), graceMs);
         });
         const settled = await Promise.race([promise2, grace]).finally(() => {
           if (graceTimer) clearTimeout(graceTimer);
@@ -47850,7 +47931,10 @@ async function runTentacle(opts) {
     emitActivity({
       type: "agent_ended",
       agentId: id3,
-      reason: info.detail ?? (info.ok === false ? "failed" : "completed"),
+      // t102: `reason` feeds a failure-heuristic on the Desktop; free text in
+      // it (result excerpt) could flip a SUCCESSFUL tentacle to "failed".
+      // Only genuine failures carry detail; successes are enum-only.
+      reason: info.ok === false ? info.detail ?? "failed" : "completed",
       ok: info.ok !== false,
       durationMs: info.durationMs ?? 0,
       ts: Date.now()
@@ -47861,7 +47945,10 @@ async function runTentacle(opts) {
     sub = await deps.createSubAgentContext({
       agent,
       thoroughness,
-      cwd: effectiveCwd
+      cwd: effectiveCwd,
+      // Per-spawn thinking effort (ADR-0017): the factory applies arg > per-kind
+      // env > inherited provider default and reports the winner back on `sub`.
+      ...args.thinkingEffort ? { thinkingEffort: args.thinkingEffort } : {}
     });
   } catch (err) {
     if (worktree) await cleanupKrakenWorktree(worktree);
@@ -47897,6 +47984,8 @@ async function runTentacle(opts) {
       error: "task: no provider configured for the sub-agent (set an API key / run /login)."
     };
   }
+  const requestedThinking = args.thinkingEffort && args.thinkingEffort.toLowerCase() !== "inherit" ? args.thinkingEffort : void 0;
+  const spawnThinking = sub.thinking ?? requestedThinking;
   emitActivity({
     type: "agent_spawned",
     agentId: liveId,
@@ -47904,6 +47993,7 @@ async function runTentacle(opts) {
     title: args.description,
     ...sub.model ? { model: sub.model } : {},
     ...sub.provider ? { provider: sub.provider } : {},
+    ...spawnThinking ? { thinking: spawnThinking } : {},
     ...args.scope && args.scope.length > 0 ? { scope: args.scope } : {},
     ...worktree ? { worktree: worktree.path } : {},
     ts: Date.now()
@@ -48238,7 +48328,8 @@ RESTRICTED in this mode: only agent=${allowedAgents.join("|")} is allowed.` : ""
           description: args.description,
           prompt: args.prompt,
           scope: args.scope,
-          acceptance: args.acceptance
+          acceptance: args.acceptance,
+          ...args.thinkingEffort ? { thinkingEffort: args.thinkingEffort } : {}
         },
         agent,
         thoroughness,
@@ -48394,6 +48485,9 @@ var init_taskTool = __esm({
       ),
       acceptance: external_exports.array(external_exports.string().min(1)).max(16).optional().describe(
         "Optional acceptance checklist (contract). Appended to the prompt as Acceptance criteria."
+      ),
+      thinkingEffort: external_exports.enum(["inherit", "auto", "off", "low", "medium", "high", "xhigh", "max"]).optional().describe(
+        "Thinking effort for THIS tentacle only (ADR-0017), overriding the provider default used by the lead. 'inherit' (and omitting the field) defers to the per-kind default: ZELARI_KRAKEN_<EXPLORE|GENERAL|VERIFY>_THINKING, else the provider thinkingByProvider value. Token budgets are not accepted here \u2014 set ZELARI_KRAKEN_<KIND>_THINKING='budget:<n>' instead. Invalid values are ignored."
       )
     });
     TaskPurposeSchema = external_exports.enum(["candidate"]).optional().describe(
@@ -49910,6 +50004,383 @@ var init_skillTool = __esm({
   }
 });
 
+// src/cli/skillCategories.ts
+var CODING_CATEGORIES_LIST, CODING_CATEGORIES2;
+var init_skillCategories = __esm({
+  "src/cli/skillCategories.ts"() {
+    "use strict";
+    CODING_CATEGORIES_LIST = [
+      "plan",
+      "refactor",
+      "debug",
+      "review",
+      "test",
+      "docs",
+      "ops",
+      "git",
+      "db",
+      "maint"
+    ];
+    CODING_CATEGORIES2 = new Set(CODING_CATEGORIES_LIST);
+  }
+});
+
+// src/cli/skillConfigIo.ts
+import {
+  existsSync as existsSync28,
+  mkdirSync as mkdirSync13,
+  readdirSync as readdirSync6,
+  readFileSync as readFileSync20,
+  rmSync as rmSync3,
+  writeFileSync as writeFileSync16
+} from "node:fs";
+import { dirname as dirname4, join as join20 } from "node:path";
+function ensureBuiltinSkillsLoadedSync() {
+  if (builtinsLoaded) return;
+  for (const spec of BUILTIN_SKILL_MODULES) {
+    try {
+      require?.(spec);
+    } catch {
+    }
+  }
+}
+function getUserSkillsDir() {
+  return join20(zelariHome(), "skills");
+}
+function getProjectSkillsDir(projectRoot) {
+  return join20(projectRoot, ".zelari", "skills");
+}
+function skillFilePath(dir, name) {
+  return join20(dir, name, "SKILL.md");
+}
+function classifyScope(skillPath, projectRoot) {
+  const userDir = getUserSkillsDir().replace(/\\/g, "/");
+  const norm = skillPath.replace(/\\/g, "/");
+  if (norm.startsWith(userDir + "/") || norm === userDir) {
+    return { scope: "user", writable: true };
+  }
+  if (projectRoot) {
+    const projDir = getProjectSkillsDir(projectRoot).replace(/\\/g, "/");
+    if (norm.startsWith(projDir + "/") || norm === projDir) {
+      return { scope: "project", writable: true };
+    }
+  }
+  return { scope: "compat", writable: false };
+}
+function entryFromParsed(parsed, projectRoot) {
+  const { scope, writable } = classifyScope(parsed.sourcePath, projectRoot);
+  return {
+    id: parsed.name,
+    name: parsed.name,
+    description: parsed.description,
+    category: parsed.category,
+    estimatedCost: parsed.estimatedCost,
+    requiredTools: parsed.requiredTools,
+    scope,
+    path: parsed.sourcePath,
+    body: parsed.body,
+    builtin: false,
+    writable
+  };
+}
+function entryFromBuiltin(skill) {
+  return {
+    id: skill.id,
+    name: skill.name || skill.id,
+    description: skill.description || "",
+    category: skill.category,
+    estimatedCost: skill.estimatedCost,
+    requiredTools: skill.requiredTools,
+    scope: "builtin",
+    path: null,
+    // Expose body so Desktop skill picker can expand like `/skill <id>`.
+    body: skill.systemPromptFragment || void 0,
+    builtin: true,
+    writable: false
+  };
+}
+function scanSkillsDir(dir, projectRoot, seen, out) {
+  if (!existsSync28(dir)) return;
+  let entries;
+  try {
+    entries = readdirSync6(dir, { withFileTypes: true }).filter((e) => e.isDirectory()).map((e) => e.name);
+  } catch {
+    return;
+  }
+  for (const entry of entries) {
+    const skillPath = skillFilePath(dir, entry);
+    if (!existsSync28(skillPath)) continue;
+    try {
+      const parsed = parseSkillMd(readFileSync20(skillPath, "utf8"), skillPath);
+      if (!parsed) continue;
+      if (seen.has(parsed.name)) continue;
+      seen.add(parsed.name);
+      out.push(entryFromParsed(parsed, projectRoot));
+    } catch {
+    }
+  }
+}
+function listSkillsSnapshot(projectRoot) {
+  const root = projectRoot && projectRoot.trim() ? projectRoot.trim() : null;
+  const userSkillsDir = getUserSkillsDir();
+  const projectSkillsDir = root ? getProjectSkillsDir(root) : null;
+  const skills = [];
+  const seen = /* @__PURE__ */ new Set();
+  if (root) {
+    scanSkillsDir(join20(root, ".zelari", "skills"), root, seen, skills);
+    scanSkillsDir(join20(root, ".claude", "skills"), root, seen, skills);
+    scanSkillsDir(join20(root, ".opencode", "skills"), root, seen, skills);
+  }
+  scanSkillsDir(userSkillsDir, root, seen, skills);
+  for (const s of listCodingSkills()) {
+    if (seen.has(s.id)) continue;
+    seen.add(s.id);
+    if (s.builtin) {
+      skills.push(entryFromBuiltin(s));
+    }
+  }
+  skills.sort((a, b) => {
+    const order = (s) => s === "project" ? 0 : s === "user" ? 1 : s === "compat" ? 2 : 3;
+    const d = order(a.scope) - order(b.scope);
+    if (d !== 0) return d;
+    return a.id.localeCompare(b.id);
+  });
+  return { userSkillsDir, projectSkillsDir, skills };
+}
+function serializeSkillMd(opts) {
+  const name = opts.name.trim().toLowerCase();
+  const description = opts.description.trim();
+  const body = opts.body.trim();
+  const lines = ["---", `name: ${name}`, `description: ${description}`];
+  const cat = (opts.category ?? "").trim().toLowerCase();
+  if (cat && CODING_CATEGORIES2.has(cat)) {
+    lines.push(`category: ${cat}`);
+  }
+  if (opts.tools && opts.tools.length > 0) {
+    lines.push(`tools: [${opts.tools.map((t) => t.trim()).filter(Boolean).join(", ")}]`);
+  }
+  const cost = (opts.cost ?? "").trim().toLowerCase();
+  if (cost === "low" || cost === "medium" || cost === "high") {
+    lines.push(`cost: ${cost}`);
+  }
+  lines.push("---", "", body, "");
+  return lines.join("\n");
+}
+function upsertSkill(opts) {
+  const name = opts.name.trim().toLowerCase();
+  if (!name || !NAME_RE.test(name)) {
+    return {
+      ok: false,
+      error: "Invalid skill name (use lowercase letters, digits, hyphens; max 64 chars)"
+    };
+  }
+  const description = opts.description.trim();
+  if (!description) {
+    return { ok: false, error: "description is required" };
+  }
+  const body = opts.body.trim();
+  if (!body) {
+    return { ok: false, error: "body is required" };
+  }
+  let dir;
+  if (opts.scope === "user") {
+    dir = getUserSkillsDir();
+  } else {
+    const root = opts.projectRoot?.trim();
+    if (!root) {
+      return {
+        ok: false,
+        error: "projectRoot required for project scope (Open Folder first)"
+      };
+    }
+    dir = getProjectSkillsDir(root);
+  }
+  const path104 = skillFilePath(dir, name);
+  const content = serializeSkillMd({
+    name,
+    description,
+    body,
+    category: opts.category,
+    tools: opts.tools,
+    cost: opts.cost
+  });
+  const parsed = parseSkillMd(content, path104);
+  if (!parsed) {
+    return { ok: false, error: "Generated SKILL.md failed validation" };
+  }
+  mkdirSync13(dirname4(path104), { recursive: true });
+  writeFileSync16(path104, content, "utf8");
+  return { ok: true, path: path104 };
+}
+function removeSkill(opts) {
+  const name = opts.name.trim().toLowerCase();
+  if (!name) {
+    return { ok: false, error: "name is required" };
+  }
+  let dir;
+  if (opts.scope === "user") {
+    dir = getUserSkillsDir();
+  } else {
+    const root = opts.projectRoot?.trim();
+    if (!root) {
+      return { ok: false, error: "projectRoot required for project scope" };
+    }
+    dir = getProjectSkillsDir(root);
+  }
+  const skillDir = join20(dir, name);
+  const path104 = skillFilePath(dir, name);
+  if (!existsSync28(path104) && !existsSync28(skillDir)) {
+    return { ok: false, error: `Skill "${name}" not found in ${dir}` };
+  }
+  try {
+    rmSync3(skillDir, { recursive: true, force: true });
+  } catch (err) {
+    return {
+      ok: false,
+      error: err instanceof Error ? err.message : String(err)
+    };
+  }
+  return { ok: true, path: path104 };
+}
+var NAME_RE, BUILTIN_SKILL_MODULES, builtinsLoaded;
+var init_skillConfigIo = __esm({
+  "src/cli/skillConfigIo.ts"() {
+    "use strict";
+    init_skills2();
+    init_skillsMd();
+    init_skillCategories();
+    init_paths();
+    NAME_RE = /^[a-z0-9][a-z0-9-]{0,63}$/;
+    BUILTIN_SKILL_MODULES = [
+      "@zelari/core/skills/builtin/debugging",
+      "@zelari/core/skills/builtin/docs",
+      "@zelari/core/skills/builtin/git-ops",
+      "@zelari/core/skills/builtin/planning",
+      "@zelari/core/skills/builtin/refactoring",
+      "@zelari/core/skills/builtin/review",
+      "@zelari/core/skills/builtin/unrealEditor",
+      "@zelari/core/skills/builtin/testing",
+      "@zelari/core/skills/builtin/schema-loop",
+      "@zelari/core/skills/builtin/computer-use-cua",
+      "@zelari/core/skills/builtin/qwen-mm-plugins"
+    ];
+    builtinsLoaded = false;
+  }
+});
+
+// src/cli/tools/createSkillTool.ts
+import { existsSync as existsSync29 } from "node:fs";
+import { resolve as resolve3, sep } from "node:path";
+function createCreateSkillTool(opts) {
+  const root = opts?.cwd ?? process.cwd();
+  return {
+    name: "create_skill",
+    description: 'Create a NEW reusable skill (a SKILL.md procedure) that you can invoke in later turns with the `skill` tool or `/skill <name>`. Use it when the user asks to save a procedure as a skill ("salva questa procedura come skill", "crea una skill per X", "make this reusable"), or when you just worked out a repeatable workflow worth persisting. Write `instructions` as a COMPLETE, self-contained markdown procedure (goal, ordered steps, exact commands, verification, pitfalls): it becomes the skill body verbatim. scope=project (default) saves to <cwd>/.zelari/skills and is shared with the repo; scope=user saves to ~/.zelari-code/skills for every project. Creating an existing name fails unless overwrite=true. Does not edit built-in skills.',
+    permissions: ["write"],
+    timeoutMs: 1e4,
+    inputSchema: CreateSkillArgsSchema,
+    execute: async (args) => {
+      const name = typeof args?.name === "string" ? args.name.trim() : "";
+      if (!NAME_RE2.test(name)) {
+        return typedErr(
+          `Invalid skill name ${JSON.stringify(name)}. Use a slug of 2-40 chars: lowercase letters, digits and hyphens, starting with a letter or digit (e.g. "release-checklist").`
+        );
+      }
+      const description = (args?.description ?? "").replace(/\s+/g, " ").trim();
+      if (!description) {
+        return typedErr("description is required: one line explaining when to use this skill.");
+      }
+      const instructions = (args?.instructions ?? "").trim();
+      if (!instructions) {
+        return typedErr(
+          "instructions is required: the markdown body of the skill (goal, steps, commands, pitfalls)."
+        );
+      }
+      const scope = args?.scope === "user" ? "user" : "project";
+      const overwrite = args?.overwrite === true;
+      const dir = scope === "user" ? getUserSkillsDir() : getProjectSkillsDir(root);
+      const skillDir = resolve3(dir, name);
+      const path104 = resolve3(skillDir, "SKILL.md");
+      if (!path104.startsWith(resolve3(dir) + sep)) {
+        return typedErr(
+          `Refused: "${name}" would resolve outside the ${scope} skills directory (${resolve3(dir)}).`
+        );
+      }
+      const existed = existsSync29(path104);
+      if (existed && !overwrite) {
+        return typedErr(
+          `Skill "${name}" already exists at ${path104} \u2014 nothing was written. Call create_skill again with overwrite: true to replace it, or pick another name.`
+        );
+      }
+      const written = upsertSkill({
+        scope,
+        name,
+        description,
+        body: instructions,
+        projectRoot: root
+      });
+      if (!written.ok) {
+        return typedErr(`Could not write SKILL.md for "${name}": ${written.error}`);
+      }
+      let loadable = false;
+      try {
+        loadSkillMdSkills(root);
+        const registered = getCodingSkillById(name);
+        loadable = (registered?.systemPromptFragment ?? "").trim() === instructions;
+      } catch {
+      }
+      const verb = existed ? "Replaced existing skill" : "Created skill";
+      const lines = [
+        `${verb} "${name}" (${scope} scope).`,
+        `Saved to: ${written.path}`
+      ];
+      if (!loadable) {
+        lines.push(
+          `Note: \`${name}\` currently resolves to a DIFFERENT skill already registered from another root (a built-in or an earlier search dir wins), so \`/skill ${name}\` may load that one instead. The file on disk is unchanged.`
+        );
+      }
+      lines.push(
+        `Use it now: \`/skill ${name}\` \u2014 or call the \`skill\` tool with name "${name}". Skills are discovered on demand, so no restart is needed.`
+      );
+      return typedOk({
+        name,
+        scope,
+        path: written.path,
+        overwritten: existed,
+        loadable,
+        message: lines.join("\n")
+      });
+    }
+  };
+}
+var NAME_RE2, CreateSkillArgsSchema;
+var init_createSkillTool = __esm({
+  "src/cli/tools/createSkillTool.ts"() {
+    "use strict";
+    init_zod();
+    init_skills2();
+    init_toolTypes();
+    init_skillConfigIo();
+    init_skillsMd();
+    NAME_RE2 = /^[a-z0-9][a-z0-9-]{1,39}$/;
+    CreateSkillArgsSchema = external_exports.object({
+      name: external_exports.string().regex(NAME_RE2).describe(
+        "Skill id/slug: 2-40 chars, lowercase letters/digits/hyphens, must start with a letter or digit."
+      ),
+      description: external_exports.string().min(1).describe(
+        "One-line description shown in the skill catalog (when to use it). Collapsed to a single line."
+      ),
+      instructions: external_exports.string().min(1).describe(
+        "The skill body, in markdown: goal, step-by-step procedure, exact commands, pitfalls. Becomes the loaded instructions verbatim."
+      ),
+      scope: external_exports.enum(["project", "user"]).optional().describe(
+        "Where to save: 'project' (default) = <cwd>/.zelari/skills (repo-shared); 'user' = ~/.zelari-code/skills (every project)."
+      ),
+      overwrite: external_exports.boolean().optional().describe("Default false: fail if a SKILL.md for that name already exists. Pass true to replace it.")
+    });
+  }
+});
+
 // src/cli/tools/todoTools.ts
 function createTodoWriteTool() {
   return {
@@ -50301,13 +50772,13 @@ async function scanTsbuildinfo(root) {
   return found;
 }
 async function gitStatusPorcelain(root) {
-  return new Promise((resolve9) => {
+  return new Promise((resolve10) => {
     const child = spawn9("git", ["status", "--porcelain"], { cwd: root, shell: false });
     let out = "";
     child.stdout.on("data", (d) => out += d.toString());
     child.stderr.on("data", (d) => out += d.toString());
-    child.on("error", () => resolve9("<git-unavailable>"));
-    child.on("close", (code) => resolve9(code === 0 ? out : `<git-exit-${code ?? "none"}>`));
+    child.on("error", () => resolve10("<git-unavailable>"));
+    child.on("close", (code) => resolve10(code === 0 ? out : `<git-exit-${code ?? "none"}>`));
   });
 }
 async function fingerprintWorkspace(root) {
@@ -50354,14 +50825,14 @@ var init_inspectTypecheckSafety = __esm({
 // src/cli/tools/inspectCommand.ts
 import { spawn as spawn10 } from "node:child_process";
 import { createHash as createHash14 } from "node:crypto";
-import { existsSync as existsSync28, promises as fs23 } from "node:fs";
+import { existsSync as existsSync30, promises as fs23 } from "node:fs";
 import os2 from "node:os";
 import path52 from "node:path";
 function resolveNodeModuleBin(start, rel2) {
   let dir = path52.resolve(start);
   for (; ; ) {
     const candidate = path52.join(dir, "node_modules", rel2);
-    if (existsSync28(candidate)) return candidate;
+    if (existsSync30(candidate)) return candidate;
     const parent = path52.dirname(dir);
     if (parent === dir) return void 0;
     dir = parent;
@@ -50465,12 +50936,12 @@ function buildInspectCommand(op, ctx) {
   }
 }
 function runSpawn(command, argv, opts) {
-  return new Promise((resolve9) => {
+  return new Promise((resolve10) => {
     let child;
     try {
       child = spawn10(command, argv, { cwd: opts.cwd, shell: false });
     } catch (err) {
-      resolve9({ code: null, stdout: "", stderr: String(err), timedOut: false, spawnError: String(err) });
+      resolve10({ code: null, stdout: "", stderr: String(err), timedOut: false, spawnError: String(err) });
       return;
     }
     let stdout = "";
@@ -50492,14 +50963,14 @@ function runSpawn(command, argv, opts) {
       if (settled) return;
       settled = true;
       clearTimeout(timer);
-      resolve9({ code: null, stdout, stderr, timedOut, spawnError: err.message });
+      resolve10({ code: null, stdout, stderr, timedOut, spawnError: err.message });
     });
     child.on("close", (code) => {
       if (settled) return;
       settled = true;
       clearTimeout(timer);
       opts.signal?.removeEventListener("abort", onAbort);
-      resolve9({ code, stdout, stderr, timedOut });
+      resolve10({ code, stdout, stderr, timedOut });
     });
   });
 }
@@ -50784,7 +51255,7 @@ function createExecProcessTool(root, opts = {}) {
         const msg = err instanceof SandboxViolationError ? err.message : String(err);
         return typedErr(`[sandbox] ${msg}`);
       }
-      return new Promise((resolve9) => {
+      return new Promise((resolve10) => {
         const start = Date.now();
         const spec = { ...baseSpec, network: opts.resolveNetwork?.(input) ?? baseSpec.network };
         const res = spawnJailed(spec, {
@@ -50796,11 +51267,11 @@ function createExecProcessTool(root, opts = {}) {
           envExtras: { CI: process.env.CI ?? "1" }
         });
         if (res.outcome === "denied") {
-          resolve9(typedErr(res.reason));
+          resolve10(typedErr(res.reason));
           return;
         }
         if (res.outcome === "failed") {
-          resolve9(typedErr(`exec_process could not launch ${input.program}: ${res.reason}`));
+          resolve10(typedErr(`exec_process could not launch ${input.program}: ${res.reason}`));
           return;
         }
         const meta3 = res.notice ? { status: "complete", warnings: [`os-jail: ${res.notice}`] } : void 0;
@@ -50816,7 +51287,7 @@ function createExecProcessTool(root, opts = {}) {
         const timeoutMs2 = typeof input.timeoutMs === "number" && input.timeoutMs > 0 ? input.timeoutMs : 3e4;
         const timer = setTimeout(() => {
           child.kill("SIGTERM");
-          resolve9(
+          resolve10(
             typedErr(
               `exec_process timed out after ${timeoutMs2}ms running: ${[input.program, ...argv].join(" ")}`
             )
@@ -50824,11 +51295,11 @@ function createExecProcessTool(root, opts = {}) {
         }, timeoutMs2);
         child.on("error", (err) => {
           clearTimeout(timer);
-          resolve9(typedErr(`exec_process could not launch ${input.program}: ${err.message}`));
+          resolve10(typedErr(`exec_process could not launch ${input.program}: ${err.message}`));
         });
         child.on("close", (code) => {
           clearTimeout(timer);
-          resolve9(
+          resolve10(
             typedOk(
               {
                 exitCode: code ?? -1,
@@ -51357,12 +51828,12 @@ var init_client = __esm({
         if (this.closed) return Promise.reject(new Error("LSP transport is closed"));
         const id3 = this.nextId++;
         const msg = { jsonrpc: "2.0", id: id3, method, ...params !== void 0 ? { params } : {} };
-        return new Promise((resolve9, reject) => {
+        return new Promise((resolve10, reject) => {
           const timer = setTimeout(() => {
             this.pending.delete(id3);
             reject(new Error(`LSP request "${method}" timed out after ${this.timeoutMs}ms`));
           }, this.timeoutMs);
-          this.pending.set(id3, { resolve: resolve9, reject, timer });
+          this.pending.set(id3, { resolve: resolve10, reject, timer });
           this.transport.send(encodeMessage(msg));
         });
       }
@@ -51481,7 +51952,7 @@ var init_servers = __esm({
 
 // src/cli/lsp/manager.ts
 import { spawn as spawn11 } from "node:child_process";
-import { readFileSync as readFileSync20 } from "node:fs";
+import { readFileSync as readFileSync21 } from "node:fs";
 import path54 from "node:path";
 function processTransport(child) {
   return {
@@ -51639,8 +52110,8 @@ var init_manager = __esm({
         if (cached2 !== void 0) return cached2;
         let resolveInit;
         let rejectInit;
-        const initialized = new Promise((resolve9, reject) => {
-          resolveInit = resolve9;
+        const initialized = new Promise((resolve10, reject) => {
+          resolveInit = resolve10;
           rejectInit = reject;
         });
         let entry = null;
@@ -51695,7 +52166,7 @@ var init_manager = __esm({
         const uri = pathToUri(file2);
         let text;
         try {
-          text = readFileSync20(file2, "utf8");
+          text = readFileSync21(file2, "utf8");
         } catch {
           text = "";
         }
@@ -51975,7 +52446,7 @@ var init_store2 = __esm({
 });
 
 // src/cli/semantic/index.ts
-import { promises as fs24, existsSync as existsSync29, readFileSync as readFileSync21 } from "node:fs";
+import { promises as fs24, existsSync as existsSync31, readFileSync as readFileSync22 } from "node:fs";
 import path55 from "node:path";
 import { createHash as createHash15 } from "node:crypto";
 function getIndexPath(root) {
@@ -52058,9 +52529,9 @@ async function saveIndex(root, data) {
 }
 function loadIndex(root) {
   const file2 = getIndexPath(root);
-  if (!existsSync29(file2)) return null;
+  if (!existsSync31(file2)) return null;
   try {
-    const parsed = JSON.parse(readFileSync21(file2, "utf8"));
+    const parsed = JSON.parse(readFileSync22(file2, "utf8"));
     if (parsed && Array.isArray(parsed.chunks)) return parsed;
   } catch {
   }
@@ -52165,14 +52636,14 @@ function resolveStreamTimeouts(capabilities) {
   };
 }
 function abortableSleep(ms, signal) {
-  return new Promise((resolve9) => {
-    if (signal?.aborted) return resolve9();
-    const t = setTimeout(resolve9, ms);
+  return new Promise((resolve10) => {
+    if (signal?.aborted) return resolve10();
+    const t = setTimeout(resolve10, ms);
     signal?.addEventListener(
       "abort",
       () => {
         clearTimeout(t);
-        resolve9();
+        resolve10();
       },
       { once: true }
     );
@@ -53046,8 +53517,8 @@ async function runBrowserCheck(options, loader) {
   const failedRequests = [];
   const evaluateResults = [];
   const base2 = { ok: false, consoleErrors, pageErrors, failedRequests };
-  const resolve9 = loader ?? (() => loadPlaywright(options.cwd ?? process.cwd()));
-  const pw = await resolve9();
+  const resolve10 = loader ?? (() => loadPlaywright(options.cwd ?? process.cwd()));
+  const pw = await resolve10();
   if (!pw) {
     return {
       ...base2,
@@ -53422,18 +53893,18 @@ __export(targets_exports, {
 });
 import {
   chmodSync,
-  existsSync as existsSync30,
-  mkdirSync as mkdirSync13,
-  readFileSync as readFileSync22,
-  writeFileSync as writeFileSync16
+  existsSync as existsSync32,
+  mkdirSync as mkdirSync14,
+  readFileSync as readFileSync23,
+  writeFileSync as writeFileSync17
 } from "node:fs";
-import { dirname as dirname4, join as join20 } from "node:path";
+import { dirname as dirname5, join as join21 } from "node:path";
 import { spawn as spawn12 } from "node:child_process";
 function getSshTargetsPath() {
-  return join20(zelariHome(), "ssh-targets.json");
+  return join21(zelariHome(), "ssh-targets.json");
 }
 function getSshSecretsPath() {
-  return join20(zelariHome(), "ssh-secrets.json");
+  return join21(zelariHome(), "ssh-secrets.json");
 }
 function normalizeAuth(auth) {
   if (auth === "keyPath") return "keyPath";
@@ -53441,21 +53912,21 @@ function normalizeAuth(auth) {
   return "agent";
 }
 function readSecrets() {
-  const path103 = getSshSecretsPath();
-  if (!existsSync30(path103)) return {};
+  const path104 = getSshSecretsPath();
+  if (!existsSync32(path104)) return {};
   try {
-    return JSON.parse(readFileSync22(path103, "utf8"));
+    return JSON.parse(readFileSync23(path104, "utf8"));
   } catch {
     return {};
   }
 }
 function writeSecrets(data) {
-  const path103 = getSshSecretsPath();
-  mkdirSync13(dirname4(path103), { recursive: true });
-  writeFileSync16(path103, `${JSON.stringify(data, null, 2)}
+  const path104 = getSshSecretsPath();
+  mkdirSync14(dirname5(path104), { recursive: true });
+  writeFileSync17(path104, `${JSON.stringify(data, null, 2)}
 `, "utf8");
   try {
-    chmodSync(path103, 384);
+    chmodSync(path104, 384);
   } catch {
   }
 }
@@ -53484,10 +53955,10 @@ function deleteSshPassword(id3) {
   writeSecrets({ passwords });
 }
 function readStore2() {
-  const path103 = getSshTargetsPath();
-  if (!existsSync30(path103)) return [];
+  const path104 = getSshTargetsPath();
+  if (!existsSync32(path104)) return [];
   try {
-    const parsed = JSON.parse(readFileSync22(path103, "utf8"));
+    const parsed = JSON.parse(readFileSync23(path104, "utf8"));
     const list = Array.isArray(parsed.targets) ? parsed.targets : [];
     return list.filter(
       (t) => t && typeof t.id === "string" && typeof t.host === "string" && typeof t.user === "string"
@@ -53502,11 +53973,11 @@ function readStore2() {
   }
 }
 function writeStore2(targets) {
-  const path103 = getSshTargetsPath();
-  mkdirSync13(dirname4(path103), { recursive: true });
+  const path104 = getSshTargetsPath();
+  mkdirSync14(dirname5(path104), { recursive: true });
   const clean = targets.map(({ hasPassword: _hp, ...t }) => t);
-  writeFileSync16(
-    path103,
+  writeFileSync17(
+    path104,
     `${JSON.stringify({ targets: clean }, null, 2)}
 `,
     "utf8"
@@ -53606,17 +54077,17 @@ function buildSshBaseArgs(target) {
   return args;
 }
 function ensureAskpassHelper() {
-  const dir = join20(zelariHome(), "ssh-helpers");
-  mkdirSync13(dir, { recursive: true });
-  const cjs = join20(dir, "askpass.cjs");
-  writeFileSync16(
+  const dir = join21(zelariHome(), "ssh-helpers");
+  mkdirSync14(dir, { recursive: true });
+  const cjs = join21(dir, "askpass.cjs");
+  writeFileSync17(
     cjs,
     "process.stdout.write(process.env.ZELARI_SSH_ASKPASS_PASS || '');\n",
     "utf8"
   );
   if (process.platform === "win32") {
-    const cmd = join20(dir, "askpass.cmd");
-    writeFileSync16(
+    const cmd = join21(dir, "askpass.cmd");
+    writeFileSync17(
       cmd,
       `@echo off\r
 node "%~dp0askpass.cjs"\r
@@ -53625,8 +54096,8 @@ node "%~dp0askpass.cjs"\r
     );
     return cmd;
   }
-  const sh = join20(dir, "askpass.sh");
-  writeFileSync16(
+  const sh = join21(dir, "askpass.sh");
+  writeFileSync17(
     sh,
     `#!/bin/sh
 exec node "$(dirname "$0")/askpass.cjs"
@@ -53640,9 +54111,9 @@ exec node "$(dirname "$0")/askpass.cjs"
   return sh;
 }
 function runSsh(target, remoteCommand, timeoutMs2 = 6e4) {
-  return new Promise((resolve9) => {
+  return new Promise((resolve10) => {
     if (target.auth === "password" && !getSshPassword(target.id)) {
-      resolve9({
+      resolve10({
         code: 1,
         stdout: "",
         stderr: "No password stored for this target \u2014 edit target and set password"
@@ -53674,7 +54145,7 @@ function runSsh(target, remoteCommand, timeoutMs2 = 6e4) {
     });
     const timer = setTimeout(() => {
       child.kill("SIGTERM");
-      resolve9({
+      resolve10({
         code: 124,
         stdout,
         stderr: stderr + "\n[ssh] timeout"
@@ -53682,7 +54153,7 @@ function runSsh(target, remoteCommand, timeoutMs2 = 6e4) {
     }, timeoutMs2);
     child.on("error", (err) => {
       clearTimeout(timer);
-      resolve9({
+      resolve10({
         code: 127,
         stdout,
         stderr: err.message.includes("ENOENT") ? "ssh not found on PATH \u2014 install OpenSSH client" : err.message
@@ -53690,7 +54161,7 @@ function runSsh(target, remoteCommand, timeoutMs2 = 6e4) {
     });
     child.on("close", (code) => {
       clearTimeout(timer);
-      resolve9({ code: code ?? 1, stdout, stderr });
+      resolve10({ code: code ?? 1, stdout, stderr });
     });
   });
 }
@@ -53699,9 +54170,9 @@ function readSshPublicKey(keyOrPubPath) {
   if (!raw) return { ok: false, error: "Empty path" };
   const candidates = raw.endsWith(".pub") ? [raw] : [`${raw}.pub`, raw];
   for (const p3 of candidates) {
-    if (!existsSync30(p3)) continue;
+    if (!existsSync32(p3)) continue;
     try {
-      const content = readFileSync22(p3, "utf8").trim();
+      const content = readFileSync23(p3, "utf8").trim();
       if (!content) continue;
       if (/BEGIN .*PRIVATE KEY/i.test(content)) {
         return {
@@ -53752,11 +54223,11 @@ function formatSshTargetsForPrompt() {
   ];
   for (const t of targets) {
     const tags = t.tags?.length ? ` tags=[${t.tags.join(",")}]` : "";
-    const path103 = t.defaultRemotePath ? ` remotePath=${t.defaultRemotePath}` : "";
+    const path104 = t.defaultRemotePath ? ` remotePath=${t.defaultRemotePath}` : "";
     const allow = t.allowedCommands?.length ? ` allowed=${t.allowedCommands.join("|")}` : " allowed=status-only";
     const auth = t.auth === "password" ? " auth=password" : t.auth === "keyPath" ? " auth=key" : " auth=agent";
     lines.push(
-      `- id=${t.id} name=${t.name} ${t.user}@${t.host}:${t.port ?? 22}${auth}${path103}${tags}${allow}`
+      `- id=${t.id} name=${t.name} ${t.user}@${t.host}:${t.port ?? 22}${auth}${path104}${tags}${allow}`
     );
   }
   return lines.join("\n");
@@ -54467,14 +54938,14 @@ function backoffDelay2(attempt, retryAfterHeader) {
   return Math.min(BACKOFF_BASE_MS2 * 2 ** attempt, BACKOFF_CAP_MS2);
 }
 function abortableSleep2(ms, signal) {
-  return new Promise((resolve9) => {
-    if (signal?.aborted) return resolve9();
-    const t = setTimeout(resolve9, ms);
+  return new Promise((resolve10) => {
+    if (signal?.aborted) return resolve10();
+    const t = setTimeout(resolve10, ms);
     signal?.addEventListener(
       "abort",
       () => {
         clearTimeout(t);
-        resolve9();
+        resolve10();
       },
       { once: true }
     );
@@ -54930,14 +55401,18 @@ function activePermissionPreset() {
   return parsePermissionPreset(process.env.ZELARI_PERMISSION_PRESET) ?? "standard";
 }
 function defaultPermissionPolicy(overrides) {
-  const preset = PERMISSION_PRESETS[activePermissionPreset()];
+  const presetName = activePermissionPreset();
+  const preset = PERMISSION_PRESETS[presetName];
   return {
     read: parseAction(process.env.ZELARI_PERMISSION_READ, preset.read),
     write: parseAction(process.env.ZELARI_PERMISSION_WRITE, preset.write),
     execute: parseAction(process.env.ZELARI_PERMISSION_EXECUTE, preset.execute),
     network: parseAction(process.env.ZELARI_PERMISSION_NETWORK, preset.network),
     ui: "allow",
-    auto: isAutoPermissions(),
+    // yolo means "go alone": residual asks auto-approve without a UI handler
+    // (no more "denied timed out" piles on unattended builds). Explicit
+    // ZELARI_AUTO=1 keeps working for every preset; deny is never promoted.
+    auto: isAutoPermissions() || presetName === "yolo",
     ...overrides
   };
 }
@@ -55141,7 +55616,7 @@ __export(folderTrust_exports, {
   trustFolder: () => trustFolder,
   untrustFolder: () => untrustFolder
 });
-import { existsSync as existsSync31, mkdirSync as mkdirSync14, readFileSync as readFileSync23, writeFileSync as writeFileSync17 } from "node:fs";
+import { existsSync as existsSync33, mkdirSync as mkdirSync15, readFileSync as readFileSync24, writeFileSync as writeFileSync18 } from "node:fs";
 import path60 from "node:path";
 function trustStorePath() {
   return _overrideStorePath ?? trustConfigPath();
@@ -55152,7 +55627,7 @@ function normalize6(p3) {
 }
 function readStore3() {
   try {
-    const raw = readFileSync23(trustStorePath(), "utf8");
+    const raw = readFileSync24(trustStorePath(), "utf8");
     const parsed = JSON.parse(raw);
     if (parsed && Array.isArray(parsed.folders)) return parsed;
     return DEFAULT_STORE;
@@ -55163,8 +55638,8 @@ function readStore3() {
 function writeStore3(store6) {
   const p3 = trustStorePath();
   try {
-    mkdirSync14(path60.dirname(p3), { recursive: true });
-    writeFileSync17(p3, JSON.stringify(store6, null, 2), "utf8");
+    mkdirSync15(path60.dirname(p3), { recursive: true });
+    writeFileSync18(p3, JSON.stringify(store6, null, 2), "utf8");
   } catch (err) {
     throw new Error(
       `failed to persist trust store ${p3}: ${err instanceof Error ? err.message : String(err)}`
@@ -55219,7 +55694,7 @@ function getTrustStorePath() {
   return trustStorePath();
 }
 function hasTrustStore() {
-  return existsSync31(trustStorePath());
+  return existsSync33(trustStorePath());
 }
 function _setTrustStorePathForTests(p3) {
   _overrideStorePath = p3;
@@ -55235,13 +55710,13 @@ var init_folderTrust = __esm({
 });
 
 // src/cli/safety/lifecycleHooks.ts
-import { join as join21 } from "node:path";
-import { readdirSync as readdirSync6, statSync as statSync3 } from "node:fs";
+import { join as join22 } from "node:path";
+import { readdirSync as readdirSync7, statSync as statSync3 } from "node:fs";
 function globalHooksDir() {
-  return join21(zelariHome(), "hooks");
+  return join22(zelariHome(), "hooks");
 }
 function projectHooksDir(projectRoot) {
-  return join21(projectRoot, ".zelari", "hooks");
+  return join22(projectRoot, ".zelari", "hooks");
 }
 function resolveHookFailureMode(override, env = process.env) {
   const v = override?.trim().toLowerCase();
@@ -55254,7 +55729,7 @@ function fingerprintHookDirs(dirs) {
   for (const dir of dirs) {
     let names;
     try {
-      names = readdirSync6(dir).filter((f) => f.endsWith(".json")).sort();
+      names = readdirSync7(dir).filter((f) => f.endsWith(".json")).sort();
     } catch {
       parts.push(`${dir}:missing`);
       continue;
@@ -55268,7 +55743,7 @@ function fingerprintHookDirs(dirs) {
       continue;
     }
     for (const name of names) {
-      const full = join21(dir, name);
+      const full = join22(dir, name);
       try {
         const st = statSync3(full);
         parts.push(`${full}:${st.mtimeMs}:${st.size}`);
@@ -55553,8 +56028,8 @@ function networkClaimsForUrls(urls) {
 }
 function mcpClaimFromName(registryName) {
   const rest = registryName.startsWith("mcp_") ? registryName.slice("mcp_".length) : "";
-  const sep4 = rest.indexOf("_");
-  return sep4 <= 0 || sep4 === rest.length - 1 ? null : { kind: "mcp", server: rest.slice(0, sep4), tool: rest.slice(sep4 + 1) };
+  const sep5 = rest.indexOf("_");
+  return sep5 <= 0 || sep5 === rest.length - 1 ? null : { kind: "mcp", server: rest.slice(0, sep5), tool: rest.slice(sep5 + 1) };
 }
 function browserActionUrls(a) {
   const actions = Array.isArray(a["actions"]) ? a["actions"] : [];
@@ -55968,9 +56443,11 @@ __export(toolRegistry_exports, {
   createKrakenSubAgentContextFactory: () => createKrakenSubAgentContextFactory,
   getCliToolCatalogEntries: () => getCliToolCatalogEntries,
   registerCliToolsIntoCouncilCatalog: () => registerCliToolsIntoCouncilCatalog,
+  resolveTentacleThinkingInput: () => resolveTentacleThinkingInput,
+  tentacleThinkingEnvKey: () => tentacleThinkingEnvKey,
   wrapWithSandbox: () => wrapWithSandbox
 });
-import { existsSync as existsSync32 } from "node:fs";
+import { existsSync as existsSync34 } from "node:fs";
 import path63 from "node:path";
 function createBuiltinToolRegistry(options = {}) {
   const root = options.root ?? process.cwd();
@@ -56059,9 +56536,11 @@ function createBuiltinToolRegistry(options = {}) {
   const gauntletParent = options.gauntletParent === true;
   const allowMutators = !readOnly && !verifyMode && !gauntletParent;
   const allowBash = (allowMutators || verifyMode) && !gauntletParent;
-  if (isParent && allowMutators && sessionId2) {
-    registry4.setToolResultListener(createTaskTouchGuard({ projectRoot: root, sessionId: sessionId2 }));
-    void runTaskStalenessCheck({ projectRoot: root, sessionId: sessionId2 });
+  if (isParent && allowMutators && options.sessionId) {
+    registry4.setToolResultListener(
+      createTaskTouchGuard({ projectRoot: root, sessionId: options.sessionId })
+    );
+    void runTaskStalenessCheck({ projectRoot: root, sessionId: options.sessionId });
   }
   const permPolicy = options.permissionPolicy ?? defaultPermissionPolicy();
   const agentPolicySet = (() => {
@@ -56127,6 +56606,10 @@ function createBuiltinToolRegistry(options = {}) {
   if (skillTool) {
     registry4.register(skillTool);
   }
+  const skillCreateTool = enableSkill ? withPerm(createCreateSkillTool({ cwd: root })) : null;
+  if (skillCreateTool) {
+    registry4.register(skillCreateTool);
+  }
   const enableTodos = options.enableTodos !== false && options.readOnly !== true && !gauntletParent && profile === "full";
   const todoWrite = enableTodos ? withPerm(createTodoWriteTool()) : null;
   const todoRead = enableTodos ? withPerm(createTodoReadTool()) : null;
@@ -56154,6 +56637,7 @@ function createBuiltinToolRegistry(options = {}) {
     ...allowBash ? [safeBash, safeExecProcess] : [],
     ...askUserTool ? [askUserTool] : [],
     ...skillTool ? [skillTool] : [],
+    ...skillCreateTool ? [skillCreateTool] : [],
     ...todoWrite ? [todoWrite] : [],
     ...todoRead ? [todoRead] : [],
     ...planTaskToolsWrapped.length > 0 ? planTaskToolsWrapped : []
@@ -56337,9 +56821,29 @@ function taskAgentToProfile(agent) {
   if (agent === "verify") return "verify";
   return "explore";
 }
+function tentacleThinkingEnvKey(agent) {
+  if (agent === "explore") return "ZELARI_KRAKEN_EXPLORE_THINKING";
+  if (agent === "verify") return "ZELARI_KRAKEN_VERIFY_THINKING";
+  return "ZELARI_KRAKEN_GENERAL_THINKING";
+}
+function resolveTentacleThinkingInput(agent, taskArg, env = process.env) {
+  const fromArg = typeof taskArg === "string" ? taskArg.trim() : "";
+  const argWins = fromArg.length > 0 && fromArg.toLowerCase() !== "inherit";
+  const key = tentacleThinkingEnvKey(agent);
+  const raw = (argWins ? fromArg : (env[key] ?? "").trim()).trim();
+  if (!raw) return void 0;
+  if (isValidThinkingInput(raw)) return raw.toLowerCase();
+  if (!warnedThinkingInputs.has(raw)) {
+    warnedThinkingInputs.add(raw);
+    console.warn(
+      `[kraken] ignoring invalid thinking effort "${raw}" for the ${agent} tentacle (${key}); using the provider default.`
+    );
+  }
+  return void 0;
+}
 function createKrakenSubAgentContextFactory(opts) {
   const { root, audit, sessionId: sessionId2, provider: providerOverride, model: modelOverride, parentPolicy, onPermissionAsk } = opts;
-  return async ({ agent, cwd: subCwd }) => {
+  return async ({ agent, cwd: subCwd, thinkingEffort }) => {
     const cfg = providerOverride ? await providerConfigFor(providerOverride) : await providerFromEnv();
     if (!cfg) return null;
     const { resolveKrakenSubModelAsync: resolveKrakenSubModelAsync2, parseQualifiedModelRef: parseQualifiedModelRef2 } = await Promise.resolve().then(() => (init_krakenModel(), krakenModel_exports));
@@ -56358,6 +56862,8 @@ function createKrakenSubAgentContextFactory(opts) {
       }
     }
     const subCfg = { ...effCfg, model };
+    const thinkingInput = resolveTentacleThinkingInput(agent, thinkingEffort, process.env);
+    if (thinkingInput) subCfg.thinking = parseThinkingSpec(thinkingInput);
     const subProfile = taskAgentToProfile(agent);
     const subRoot = subCwd || root;
     const agentPolicyForSubProfile = defaultPermissionPolicy({ auto: true });
@@ -56394,6 +56900,9 @@ function createKrakenSubAgentContextFactory(opts) {
       providerStream,
       model,
       provider: subCfg.providerId,
+      // E (thinking): report the spec actually applied so the parent's
+      // `agent_spawned` event can surface it (arg > kind env > inherited).
+      ...subCfg.thinking !== void 0 ? { thinking: stringifyThinkingSpec(subCfg.thinking) } : {},
       ...model !== parentModel ? {
         fallback: {
           model: parentModel,
@@ -56617,7 +57126,7 @@ function claimedSourcePath(token, args, root) {
     const candidate = path63.isAbsolute(cleaned) ? path63.normalize(cleaned) : path63.resolve(base2, cleaned);
     try {
       const contained = resolveSandboxedPath(candidate, { root });
-      if (existsSync32(contained)) return contained;
+      if (existsSync34(contained)) return contained;
     } catch {
     }
   }
@@ -56851,7 +57360,7 @@ function redactForAudit(args) {
   }
   return out;
 }
-var HARNESS_BUILTIN_NAMES, DIAG_SOURCE_EXTENSIONS, EXEC_DIAGNOSTICS_MAX_FILES;
+var HARNESS_BUILTIN_NAMES, warnedThinkingInputs, DIAG_SOURCE_EXTENSIONS, EXEC_DIAGNOSTICS_MAX_FILES;
 var init_toolRegistry = __esm({
   "src/cli/toolRegistry.ts"() {
     "use strict";
@@ -56873,6 +57382,7 @@ var init_toolRegistry = __esm({
     init_krakenSelectTool();
     init_askUser();
     init_skillTool();
+    init_createSkillTool();
     init_todoTools();
     init_planTaskTools();
     init_inspectCommand();
@@ -56890,6 +57400,7 @@ var init_toolRegistry = __esm({
     init_openai_compatible();
     init_resolveStream();
     init_providerConfig();
+    init_thinking();
     init_crossProviderFailover();
     init_keyStore();
     init_toolPermissions();
@@ -56924,6 +57435,7 @@ var init_toolRegistry = __esm({
       "fetch_url",
       "web_search"
     ]);
+    warnedThinkingInputs = /* @__PURE__ */ new Set();
     DIAG_SOURCE_EXTENSIONS = new Set(
       DEFAULT_PROVIDERS.flatMap((p3) => p3.extensions)
     );
@@ -56932,7 +57444,7 @@ var init_toolRegistry = __esm({
 });
 
 // src/cli/metrics.ts
-import { promises as fs27, existsSync as existsSync33, statSync as statSync4, renameSync as renameSync4, appendFileSync as appendFileSync3, mkdirSync as mkdirSync15 } from "node:fs";
+import { promises as fs27, existsSync as existsSync35, statSync as statSync4, renameSync as renameSync4, appendFileSync as appendFileSync3, mkdirSync as mkdirSync16 } from "node:fs";
 import path64 from "node:path";
 async function readMetrics(file2) {
   let raw = "";
@@ -56983,7 +57495,7 @@ var init_metrics3 = __esm({
       writeQueue = Promise.resolve();
       constructor(file2) {
         this.file = file2 ?? metricsPath();
-        mkdirSync15(path64.dirname(this.file), { recursive: true });
+        mkdirSync16(path64.dirname(this.file), { recursive: true });
       }
       /** Metrics file path — doctor/summary readers use this. */
       get filePath() {
@@ -56998,12 +57510,12 @@ var init_metrics3 = __esm({
       }
       /** Append a single record synchronously (file I/O). */
       append(rec) {
-        return new Promise((resolve9, reject) => {
+        return new Promise((resolve10, reject) => {
           try {
             this.maybeRotate();
             const line = JSON.stringify(rec) + "\n";
             appendFileSync3(this.file, line, { encoding: "utf-8" });
-            resolve9();
+            resolve10();
           } catch (err) {
             reject(err);
           }
@@ -57018,7 +57530,7 @@ var init_metrics3 = __esm({
       }
       /** If the file is over the rotation threshold, rotate it. */
       maybeRotate() {
-        if (!existsSync33(this.file)) return;
+        if (!existsSync35(this.file)) return;
         try {
           const stat8 = statSync4(this.file);
           if (stat8.size >= METRICS_ROTATE_BYTES) {
@@ -58300,7 +58812,7 @@ var init_sqliteCodec = __esm({
 });
 
 // src/cli/memory/sqliteRpc.ts
-import { existsSync as existsSync34 } from "node:fs";
+import { existsSync as existsSync36 } from "node:fs";
 import { fileURLToPath as fileURLToPath2, pathToFileURL as pathToFileURL2 } from "node:url";
 import * as path69 from "node:path";
 import { Worker } from "node:worker_threads";
@@ -58313,7 +58825,7 @@ function isBusy(error51) {
 function resolveWorkerUrl() {
   const here = path69.dirname(fileURLToPath2(import.meta.url));
   const direct = path69.join(here, "sqliteWorker.mjs");
-  if (existsSync34(direct)) return pathToFileURL2(direct);
+  if (existsSync36(direct)) return pathToFileURL2(direct);
   return pathToFileURL2(path69.join(here, "memory", "sqliteWorker.mjs"));
 }
 var SqliteWorkerRpc;
@@ -58388,8 +58900,8 @@ var init_sqliteRpc = __esm({
         const worker = this.worker;
         if (!worker) return Promise.reject(new Error("SQLite worker is not open."));
         const id3 = this.nextId++;
-        return new Promise((resolve9, reject) => {
-          this.pending.set(id3, { resolve: resolve9, reject });
+        return new Promise((resolve10, reject) => {
+          this.pending.set(id3, { resolve: resolve10, reject });
           worker.postMessage({ id: id3, operation, args });
         });
       }
@@ -58400,7 +58912,7 @@ var init_sqliteRpc = __esm({
             return await this.request(operation, args);
           } catch (error51) {
             if (!isBusy(error51) || attempt >= 3) throw error51;
-            await new Promise((resolve9) => setTimeout(resolve9, 25 * 2 ** attempt));
+            await new Promise((resolve10) => setTimeout(resolve10, 25 * 2 ** attempt));
             attempt += 1;
           }
         }
@@ -60024,8 +60536,8 @@ __export(conversationContext_exports, {
   setHistory: () => setHistory,
   setLastClarification: () => setLastClarification
 });
-import { existsSync as existsSync35 } from "node:fs";
-import { join as join27 } from "node:path";
+import { existsSync as existsSync37 } from "node:fs";
+import { join as join28 } from "node:path";
 function getHistory() {
   return history;
 }
@@ -60034,7 +60546,7 @@ function setHistory(messages) {
   history = projected === messages ? [...messages] : projected;
 }
 function compactInPlace(cwd = process.cwd()) {
-  const durableStatePresent = existsSync35(join27(cwd, ".zelari", "state", "HEAD.json"));
+  const durableStatePresent = existsSync37(join28(cwd, ".zelari", "state", "HEAD.json"));
   history = applySessionSurface(compactHistory(history, { durableStatePresent }));
 }
 function appendMessages(msgs) {
@@ -60416,7 +60928,7 @@ var init_mode = __esm({
 });
 
 // src/cli/headless.ts
-import { readFileSync as readFileSync24 } from "node:fs";
+import { readFileSync as readFileSync25 } from "node:fs";
 import path73 from "node:path";
 function resolveHeadlessCwd(opts) {
   const raw = typeof opts.cwd === "string" ? opts.cwd.trim() : "";
@@ -60479,7 +60991,7 @@ function parseHeadlessFlags(argv) {
       const next = argv[i + 1];
       if (next) {
         try {
-          const fromFile = readFileSync24(next, "utf-8");
+          const fromFile = readFileSync25(next, "utf-8");
           if (fromFile.trim()) task = fromFile;
         } catch {
         }
@@ -60528,7 +61040,7 @@ function parseHeadlessFlags(argv) {
         let raw = null;
         if (arg === "--history-file") {
           try {
-            raw = readFileSync24(next, "utf-8");
+            raw = readFileSync25(next, "utf-8");
           } catch {
             raw = null;
           }
@@ -60630,7 +61142,7 @@ function parseHeadlessFlags(argv) {
       const next = argv[i + 1];
       if (next) {
         try {
-          const fromFile = readFileSync24(next, "utf-8");
+          const fromFile = readFileSync25(next, "utf-8");
           if (fromFile.trim()) krakenGraph = fromFile;
         } catch {
         }
@@ -61319,13 +61831,13 @@ __export(claudeProvider_exports, {
 });
 import { spawn as spawn13 } from "node:child_process";
 function waitForExit(child, timeoutMs2 = 2e3) {
-  return new Promise((resolve9) => {
-    if (child.exitCode != null) return resolve9(child.exitCode);
-    const timer = setTimeout(() => resolve9(child.exitCode ?? null), timeoutMs2);
+  return new Promise((resolve10) => {
+    if (child.exitCode != null) return resolve10(child.exitCode);
+    const timer = setTimeout(() => resolve10(child.exitCode ?? null), timeoutMs2);
     timer.unref?.();
     child.once("exit", (code) => {
       clearTimeout(timer);
-      resolve9(code ?? null);
+      resolve10(code ?? null);
     });
   });
 }
@@ -61528,13 +62040,13 @@ var planDetect_exports = {};
 __export(planDetect_exports, {
   hasWorkspacePlan: () => hasWorkspacePlan
 });
-import { existsSync as existsSync36, readFileSync as readFileSync25 } from "node:fs";
-import { join as join28 } from "node:path";
+import { existsSync as existsSync38, readFileSync as readFileSync26 } from "node:fs";
+import { join as join29 } from "node:path";
 function hasWorkspacePlan(projectRoot = process.cwd()) {
-  const planPath = join28(resolveWorkspaceRoot(projectRoot), "plan.json");
-  if (!existsSync36(planPath)) return false;
+  const planPath = join29(resolveWorkspaceRoot(projectRoot), "plan.json");
+  if (!existsSync38(planPath)) return false;
   try {
-    const parsed = JSON.parse(readFileSync25(planPath, "utf8"));
+    const parsed = JSON.parse(readFileSync26(planPath, "utf8"));
     return Array.isArray(parsed.phases) && parsed.phases.length > 0;
   } catch {
     return false;
@@ -61548,14 +62060,14 @@ var init_planDetect = __esm({
 });
 
 // src/cli/workspace/projectInstructions.ts
-import { existsSync as existsSync37, readFileSync as readFileSync26 } from "node:fs";
-import { join as join29 } from "node:path";
+import { existsSync as existsSync39, readFileSync as readFileSync27 } from "node:fs";
+import { join as join30 } from "node:path";
 function loadProjectInstructions(projectRoot = process.cwd(), maxChars = MAX_CHARS) {
   for (const name of CANDIDATES) {
-    const full = join29(projectRoot, name);
-    if (!existsSync37(full)) continue;
+    const full = join30(projectRoot, name);
+    if (!existsSync39(full)) continue;
     try {
-      let raw = readFileSync26(full, "utf8");
+      let raw = readFileSync27(full, "utf8");
       raw = raw.replace(/\r\n/g, "\n").trim();
       if (!raw) continue;
       if (raw.length <= maxChars) {
@@ -61599,8 +62111,8 @@ __export(workspaceSummary_exports, {
   buildWorkspaceSummary: () => buildWorkspaceSummary,
   buildZelariReadHint: () => buildZelariReadHint
 });
-import { existsSync as existsSync38, readFileSync as readFileSync27, readdirSync as readdirSync7, statSync as statSync5 } from "node:fs";
-import { join as join30, relative as relative2 } from "node:path";
+import { existsSync as existsSync40, readFileSync as readFileSync28, readdirSync as readdirSync8, statSync as statSync5 } from "node:fs";
+import { join as join31, relative as relative2 } from "node:path";
 function buildWorkspaceSummary(projectRoot = process.cwd(), options = {}) {
   const { maxEntries = 30, maxChars = 3500, maxDeps = 24, maxScripts = 16 } = options;
   const name = safeProjectName(projectRoot);
@@ -61633,11 +62145,11 @@ function formatTaskLine(t) {
 }
 function buildPlanSummary(projectRoot = process.cwd(), options) {
   const zelariRoot = resolveWorkspaceRoot(projectRoot);
-  const planPath = join30(zelariRoot, "plan.json");
-  if (!existsSync38(planPath)) return null;
+  const planPath = join31(zelariRoot, "plan.json");
+  if (!existsSync40(planPath)) return null;
   let plan;
   try {
-    plan = JSON.parse(readFileSync27(planPath, "utf8"));
+    plan = JSON.parse(readFileSync28(planPath, "utf8"));
   } catch {
     return null;
   }
@@ -61776,8 +62288,8 @@ function pickNextTask(open2) {
   )[0];
 }
 function buildZelariReadHint(projectRoot = process.cwd()) {
-  const planPath = join30(resolveWorkspaceRoot(projectRoot), "plan.json");
-  if (!existsSync38(planPath)) return "";
+  const planPath = join31(resolveWorkspaceRoot(projectRoot), "plan.json");
+  if (!existsSync40(planPath)) return "";
   return [
     "# Council workspace detected (.zelari/) \u2014 DRAFT vault",
     "`.zelari/plan.json` and `.zelari/docs/` hold **design hypotheses**, not verified product state.",
@@ -61792,10 +62304,10 @@ function safeProjectName(root) {
   }
 }
 function readPackageJson2(projectRoot) {
-  const p3 = join30(projectRoot, "package.json");
-  if (!existsSync38(p3)) return null;
+  const p3 = join31(projectRoot, "package.json");
+  if (!existsSync40(p3)) return null;
   try {
-    return JSON.parse(readFileSync27(p3, "utf8"));
+    return JSON.parse(readFileSync28(p3, "utf8"));
   } catch {
     return null;
   }
@@ -61836,7 +62348,7 @@ function readBuildScripts(projectRoot, maxScripts = 16) {
 function listShallow(projectRoot, maxEntries) {
   const out = [];
   try {
-    const top = readdirSync7(projectRoot, { withFileTypes: true }).filter(
+    const top = readdirSync8(projectRoot, { withFileTypes: true }).filter(
       (e) => !e.name.startsWith(".") && e.name !== "node_modules" && e.name !== "dist"
     ).sort((a, b) => a.name.localeCompare(b.name));
     let count = 0;
@@ -61845,11 +62357,11 @@ function listShallow(projectRoot, maxEntries) {
         out.push(`\u2026 (+${top.length - count} more)`);
         break;
       }
-      const rel2 = relative2(projectRoot, join30(projectRoot, entry.name));
+      const rel2 = relative2(projectRoot, join31(projectRoot, entry.name));
       if (entry.isDirectory()) {
         let inner = "";
         try {
-          const sub = readdirSync7(join30(projectRoot, entry.name), {
+          const sub = readdirSync8(join31(projectRoot, entry.name), {
             withFileTypes: true
           }).filter((e) => !e.name.startsWith(".")).slice(0, 4).map((e) => e.name);
           if (sub.length > 0)
@@ -61897,12 +62409,12 @@ var init_workspaceSummary = __esm({
 });
 
 // src/cli/workspace/buildLessonsSummary.ts
-import { existsSync as existsSync39 } from "node:fs";
-import { join as join31 } from "node:path";
+import { existsSync as existsSync41 } from "node:fs";
+import { join as join32 } from "node:path";
 function buildLessonsSummary(projectRoot = process.cwd(), taskText) {
   if (process.env["ZELARI_LESSONS"] === "0") return null;
   const zelariRoot = resolveWorkspaceRoot(projectRoot);
-  if (!existsSync39(join31(zelariRoot, "lessons.jsonl"))) return null;
+  if (!existsSync41(join32(zelariRoot, "lessons.jsonl"))) return null;
   const lessons = recallLessons(zelariRoot, {
     maxLessons: 5,
     maxBytes: 2048,
@@ -61923,8 +62435,8 @@ var composeContext_exports = {};
 __export(composeContext_exports, {
   composeProjectContext: () => composeProjectContext
 });
-import { existsSync as existsSync40, readdirSync as readdirSync8, readFileSync as readFileSync28 } from "node:fs";
-import { join as join32 } from "node:path";
+import { existsSync as existsSync42, readdirSync as readdirSync9, readFileSync as readFileSync29 } from "node:fs";
+import { join as join33 } from "node:path";
 function cap2(text, max, label) {
   if (!text || text.length <= max) return { text: text || "", truncated: false };
   return {
@@ -61936,19 +62448,19 @@ function cap2(text, max, label) {
 }
 function buildDesignIndex(projectRoot, maxChars) {
   const root = resolveWorkspaceRoot(projectRoot);
-  if (!existsSync40(root)) return "";
+  if (!existsSync42(root)) return "";
   const lines = [
     "# Design vault index (.zelari/) \u2014 HYPOTHESES only",
     "Full design docs are NOT product source of truth. Open with list_files / read_file / searchDocuments if needed."
   ];
-  const docsDir = join32(root, "docs");
-  if (existsSync40(docsDir)) {
+  const docsDir = join33(root, "docs");
+  if (existsSync42(docsDir)) {
     try {
-      const docs = readdirSync8(docsDir).filter((n) => n.endsWith(".md")).slice(0, 12);
+      const docs = readdirSync9(docsDir).filter((n) => n.endsWith(".md")).slice(0, 12);
       if (docs.length > 0) {
         lines.push("", "## docs/ (titles only)");
         for (const d of docs) lines.push(`- .zelari/docs/${d}`);
-        if (readdirSync8(docsDir).filter((n) => n.endsWith(".md")).length > 12) {
+        if (readdirSync9(docsDir).filter((n) => n.endsWith(".md")).length > 12) {
           lines.push("- \u2026 (more under .zelari/docs/)");
         }
       }
@@ -61956,14 +62468,14 @@ function buildDesignIndex(projectRoot, maxChars) {
     }
   }
   for (const name of ["risks.md", "plan.json", "nfr-spec.json"]) {
-    if (existsSync40(join32(root, name))) {
+    if (existsSync42(join33(root, name))) {
       lines.push(`- .zelari/${name} present`);
     }
   }
-  const decisionsDir = join32(root, "decisions");
-  if (existsSync40(decisionsDir)) {
+  const decisionsDir = join33(root, "decisions");
+  if (existsSync42(decisionsDir)) {
     try {
-      const n = readdirSync8(decisionsDir).filter((f) => f.endsWith(".md")).length;
+      const n = readdirSync9(decisionsDir).filter((f) => f.endsWith(".md")).length;
       if (n > 0) lines.push(`- .zelari/decisions/ (${n} ADR file(s) \u2014 treat proposed as non-binding)`);
     } catch {
     }
@@ -62062,17 +62574,17 @@ function composeProjectContext(input) {
 }
 function readDurableHeadSync(projectRoot) {
   try {
-    const headPath = join32(projectRoot, ".zelari", "state", "HEAD.json");
-    if (!existsSync40(headPath)) return "";
-    const head = JSON.parse(readFileSync28(headPath, "utf8"));
+    const headPath = join33(projectRoot, ".zelari", "state", "HEAD.json");
+    if (!existsSync42(headPath)) return "";
+    const head = JSON.parse(readFileSync29(headPath, "utf8"));
     if (!head?.id) return "";
-    const metaPath = join32(projectRoot, ".zelari", "state", "commits", `${head.id}.json`);
-    if (!existsSync40(metaPath)) return "";
-    const meta3 = JSON.parse(readFileSync28(metaPath, "utf8"));
-    const discPath = meta3.artifactDir ? join32(projectRoot, ".zelari", "state", meta3.artifactDir, "discoveries.json") : join32(projectRoot, ".zelari", "state", "artifacts", head.id, "discoveries.json");
+    const metaPath = join33(projectRoot, ".zelari", "state", "commits", `${head.id}.json`);
+    if (!existsSync42(metaPath)) return "";
+    const meta3 = JSON.parse(readFileSync29(metaPath, "utf8"));
+    const discPath = meta3.artifactDir ? join33(projectRoot, ".zelari", "state", meta3.artifactDir, "discoveries.json") : join33(projectRoot, ".zelari", "state", "artifacts", head.id, "discoveries.json");
     let discoveries = [];
-    if (existsSync40(discPath)) {
-      discoveries = JSON.parse(readFileSync28(discPath, "utf8"));
+    if (existsSync42(discPath)) {
+      discoveries = JSON.parse(readFileSync29(discPath, "utf8"));
     }
     const reusable = discoveries.filter((d) => d.reusable !== false);
     const lines = [
@@ -62146,14 +62658,14 @@ __export(stubs_exports, {
   resolveWorkspaceRoot: () => resolveWorkspaceRoot
 });
 import {
-  existsSync as existsSync41,
-  readdirSync as readdirSync9,
-  writeFileSync as writeFileSync18,
-  readFileSync as readFileSync29,
-  mkdirSync as mkdirSync16,
+  existsSync as existsSync43,
+  readdirSync as readdirSync10,
+  writeFileSync as writeFileSync19,
+  readFileSync as readFileSync30,
+  mkdirSync as mkdirSync17,
   renameSync as renameSync5
 } from "node:fs";
-import { join as join33, basename as basename4, dirname as dirname9, relative as relative3 } from "node:path";
+import { join as join34, basename as basename4, dirname as dirname10, relative as relative3 } from "node:path";
 function createWorkspaceContext(projectRoot = process.cwd()) {
   const rootDir = resolveWorkspaceRoot(projectRoot);
   return {
@@ -62163,14 +62675,14 @@ function createWorkspaceContext(projectRoot = process.cwd()) {
   };
 }
 function planJsonPath(ctx) {
-  return join33(ctx.rootDir, "plan.json");
+  return join34(ctx.rootDir, "plan.json");
 }
 function readPlan(ctx) {
   const jsonPath = planJsonPath(ctx);
-  if (existsSync41(jsonPath)) {
+  if (existsSync43(jsonPath)) {
     try {
       const parsed = JSON.parse(
-        readFileSync29(jsonPath, "utf8")
+        readFileSync30(jsonPath, "utf8")
       );
       const { phases, tasks, milestones, ...root } = parsed;
       return {
@@ -62182,8 +62694,8 @@ function readPlan(ctx) {
     } catch {
     }
   }
-  const path103 = workspaceFile(ctx.rootDir, "plan");
-  const doc = ctx.storage.readIfExists(path103);
+  const path104 = workspaceFile(ctx.rootDir, "plan");
+  const doc = ctx.storage.readIfExists(path104);
   if (!doc) return { phases: [], tasks: [], milestones: [] };
   const meta3 = doc.meta;
   return {
@@ -62194,9 +62706,9 @@ function readPlan(ctx) {
 }
 function writePlan(ctx, summary) {
   const jsonPath = planJsonPath(ctx);
-  mkdirSync16(dirname9(jsonPath), { recursive: true });
+  mkdirSync17(dirname10(jsonPath), { recursive: true });
   const tmp = jsonPath + ".tmp-" + process.pid;
-  writeFileSync18(
+  writeFileSync19(
     tmp,
     JSON.stringify(
       {
@@ -62276,9 +62788,9 @@ function renderPlanBody(summary) {
   return lines.join("\n");
 }
 function nextAdrId(ctx) {
-  const decisionsDir = join33(ctx.rootDir, "decisions");
-  if (!existsSync41(decisionsDir)) return "001";
-  const existing = readdirSync9(decisionsDir).filter((f) => f.endsWith(".md")).map((f) => f.match(/^(\d+)-/)).filter((m) => !!m).map((m) => parseInt(m[1], 10));
+  const decisionsDir = join34(ctx.rootDir, "decisions");
+  if (!existsSync43(decisionsDir)) return "001";
+  const existing = readdirSync10(decisionsDir).filter((f) => f.endsWith(".md")).map((f) => f.match(/^(\d+)-/)).filter((m) => !!m).map((m) => parseInt(m[1], 10));
   const max = existing.length === 0 ? 0 : Math.max(...existing);
   return String(max + 1).padStart(3, "0");
 }
@@ -62322,7 +62834,7 @@ function addTaskRecord(ctx, summary, phaseId, t, options) {
     // plan.json record (they already live in tags + the artifact body md).
     files: t.fileRefs
   });
-  const taskPath = join33(ctx.rootDir, "plan-tasks", `${id3}.md`);
+  const taskPath = join34(ctx.rootDir, "plan-tasks", `${id3}.md`);
   const meta3 = {
     kind: "task",
     id: id3,
@@ -62364,7 +62876,7 @@ function addMilestoneRecord(ctx, summary, input) {
     dueDate: input.dueDate,
     targetVersion: version2
   });
-  const path103 = join33(ctx.rootDir, "milestones", `${id3}.md`);
+  const path104 = join34(ctx.rootDir, "milestones", `${id3}.md`);
   const meta3 = {
     kind: "milestone",
     id: id3,
@@ -62381,7 +62893,7 @@ function addMilestoneRecord(ctx, summary, input) {
     `Target version: ${version2}`,
     ""
   ].join("\n");
-  ctx.storage.write(path103, meta3, body);
+  ctx.storage.write(path104, meta3, body);
   return { id: id3, created: true };
 }
 function readPlanSummary(ctx) {
@@ -62585,7 +63097,7 @@ function addIdeaStub(ctx) {
         const tags = args["tags"] ?? [];
         const category = args["category"] ?? "General";
         const id3 = `${nextAdrId(ctx)}-${slugify3(title)}`;
-        const path103 = workspaceArtifact(ctx.rootDir, "decisions", id3);
+        const path104 = workspaceArtifact(ctx.rootDir, "decisions", id3);
         const meta3 = {
           kind: "adr",
           status: "proposed",
@@ -62611,7 +63123,7 @@ function addIdeaStub(ctx) {
           ...consequences.map((c) => `- ${c}`),
           ""
         ].join("\n");
-        ctx.storage.write(path103, meta3, body);
+        ctx.storage.write(path104, meta3, body);
         return `ADR ${id3} created: "${title}". Status: proposed. Promote to accepted via /update ADR or manual edit.`;
       });
     }
@@ -62662,8 +63174,8 @@ function createNfrSpecStub(ctx) {
           },
           planFeatureKeywords: Array.isArray(args["planFeatureKeywords"]) ? args["planFeatureKeywords"] : void 0
         };
-        const outPath = join33(ctx.rootDir, "nfr-spec.json");
-        writeFileSync18(outPath, JSON.stringify(spec, null, 2), "utf8");
+        const outPath = join34(ctx.rootDir, "nfr-spec.json");
+        writeFileSync19(outPath, JSON.stringify(spec, null, 2), "utf8");
         return `NFR spec written to nfr-spec.json (${targets.length} target(s)).`;
       });
     }
@@ -62693,14 +63205,14 @@ function createDocumentStub(ctx) {
           ctx.storage.write(risksPath, riskMeta, content);
           return `Document "${title}" created at risks.md (workspace root).`;
         }
-        const path103 = workspaceArtifact(ctx.rootDir, "docs", slug);
+        const path104 = workspaceArtifact(ctx.rootDir, "docs", slug);
         const meta3 = {
           kind: "doc",
           id: slug,
           date: (/* @__PURE__ */ new Date()).toISOString().slice(0, 10),
           tags
         };
-        ctx.storage.write(path103, meta3, content);
+        ctx.storage.write(path104, meta3, content);
         return `Document "${title}" created at docs/${slug}.md.`;
       });
     }
@@ -62726,18 +63238,18 @@ function searchDocumentsStub(ctx) {
         (w) => w.length >= 3 && w !== "or" && w !== "and" && w !== "the"
       );
       const files = [
-        ...ctx.storage.listMarkdown(join33(ctx.rootDir, "decisions")),
-        ...ctx.storage.listMarkdown(join33(ctx.rootDir, "docs")),
-        ...ctx.storage.listMarkdown(join33(ctx.rootDir, "reviews")),
-        ...ctx.storage.listMarkdown(join33(ctx.rootDir, "plan-tasks")),
-        ...ctx.storage.listMarkdown(join33(ctx.rootDir, "milestones")),
+        ...ctx.storage.listMarkdown(join34(ctx.rootDir, "decisions")),
+        ...ctx.storage.listMarkdown(join34(ctx.rootDir, "docs")),
+        ...ctx.storage.listMarkdown(join34(ctx.rootDir, "reviews")),
+        ...ctx.storage.listMarkdown(join34(ctx.rootDir, "plan-tasks")),
+        ...ctx.storage.listMarkdown(join34(ctx.rootDir, "milestones")),
         workspaceFile(ctx.rootDir, "plan"),
         workspaceFile(ctx.rootDir, "risks")
       ];
       const results = [];
       for (const file2 of files) {
-        if (!existsSync41(file2)) continue;
-        const raw = readFileSync29(file2, "utf8");
+        if (!existsSync43(file2)) continue;
+        const raw = readFileSync30(file2, "utf8");
         const content = raw.toLowerCase();
         let idx = -1;
         let matchLen = 0;
@@ -62788,9 +63300,9 @@ function linkDocumentsStub(ctx) {
         const toId = args["toId"] ?? args["targetId"] ?? args["targetPathOrTitle"];
         if (!fromId || !toId) return "linkDocuments requires fromId and toId.";
         const allFiles = [
-          ...ctx.storage.listMarkdown(join33(ctx.rootDir, "decisions")),
-          ...ctx.storage.listMarkdown(join33(ctx.rootDir, "docs")),
-          ...ctx.storage.listMarkdown(join33(ctx.rootDir, "reviews"))
+          ...ctx.storage.listMarkdown(join34(ctx.rootDir, "decisions")),
+          ...ctx.storage.listMarkdown(join34(ctx.rootDir, "docs")),
+          ...ctx.storage.listMarkdown(join34(ctx.rootDir, "reviews"))
         ];
         const source2 = allFiles.find((f) => {
           try {
@@ -62821,9 +63333,9 @@ function getDocumentBacklinksStub(ctx) {
       const targetId = args["targetId"] ?? args["id"];
       if (!targetId) return "getDocumentBacklinks requires targetId.";
       const allFiles = [
-        ...ctx.storage.listMarkdown(join33(ctx.rootDir, "decisions")),
-        ...ctx.storage.listMarkdown(join33(ctx.rootDir, "docs")),
-        ...ctx.storage.listMarkdown(join33(ctx.rootDir, "reviews"))
+        ...ctx.storage.listMarkdown(join34(ctx.rootDir, "decisions")),
+        ...ctx.storage.listMarkdown(join34(ctx.rootDir, "docs")),
+        ...ctx.storage.listMarkdown(join34(ctx.rootDir, "reviews"))
       ];
       const backlinks = [];
       for (const file2 of allFiles) {
@@ -63067,9 +63579,10 @@ var init_mcpClient = __esm({
     MAX_LIST_PAGES = 50;
     MCP_PROTOCOL_VERSION = "2025-03-26";
     McpClient = class {
-      constructor(serverName, config2) {
+      constructor(serverName, config2, spawnCwd) {
         this.serverName = serverName;
         this.config = config2;
+        this.spawnCwd = spawnCwd;
         this.defaultTimeoutMs = config2.timeoutMs ?? DEFAULT_REQUEST_TIMEOUT_MS;
         this.serial = config2.serial ?? this.transportKind() === "http";
       }
@@ -63116,7 +63629,11 @@ var init_mcpClient = __esm({
         const spawnOpts = {
           stdio: ["pipe", "pipe", "pipe"],
           env: { ...process.env, ...this.config.env ?? {} },
-          windowsHide: true
+          windowsHide: true,
+          // MCP servers are project-scoped: their cwd is the session project
+          // root, not the CLI process cwd (the Desktop launches the CLI from its
+          // install dir, so "." entries would jail themselves to the app folder).
+          cwd: this.spawnCwd
         };
         const child = process.platform === "win32" ? spawn14(buildCmdLine(command, this.config.args ?? []), {
           ...spawnOpts,
@@ -63235,7 +63752,7 @@ var init_mcpClient = __esm({
         if (!transport && !child)
           return Promise.reject(new Error(`[mcp:${this.serverName}] not started`));
         const id3 = this.nextId++;
-        return new Promise((resolve9, reject) => {
+        return new Promise((resolve10, reject) => {
           const timer = setTimeout(() => {
             this.pending.delete(id3);
             reject(
@@ -63244,7 +63761,7 @@ var init_mcpClient = __esm({
               )
             );
           }, timeoutMs2);
-          this.pending.set(id3, { resolve: resolve9, reject, timer });
+          this.pending.set(id3, { resolve: resolve10, reject, timer });
           if (transport) {
             void transport.send({ id: id3, method, params }, timeoutMs2);
           } else {
@@ -63313,22 +63830,22 @@ var init_mcpClient = __esm({
 
 // src/cli/mcp/mcpConfigIo.ts
 import {
-  existsSync as existsSync42,
-  mkdirSync as mkdirSync17,
-  readFileSync as readFileSync30,
-  writeFileSync as writeFileSync19
+  existsSync as existsSync44,
+  mkdirSync as mkdirSync18,
+  readFileSync as readFileSync31,
+  writeFileSync as writeFileSync20
 } from "node:fs";
-import { dirname as dirname10, join as join34 } from "node:path";
+import { dirname as dirname11, join as join35 } from "node:path";
 function getUserMcpPath() {
-  return join34(zelariHome(), "mcp.json");
+  return join35(zelariHome(), "mcp.json");
 }
 function getProjectMcpPath(projectRoot) {
-  return join34(projectRoot, ".zelari", "mcp.json");
+  return join35(projectRoot, ".zelari", "mcp.json");
 }
-function readFile10(path103) {
-  if (!existsSync42(path103)) return {};
+function readFile10(path104) {
+  if (!existsSync44(path104)) return {};
   try {
-    const parsed = JSON.parse(readFileSync30(path103, "utf8"));
+    const parsed = JSON.parse(readFileSync31(path104, "utf8"));
     const out = {};
     for (const [name, cfg] of Object.entries(parsed.mcpServers ?? {})) {
       const hasCommand = !!cfg && typeof cfg.command === "string" && !!cfg.command.trim();
@@ -63350,10 +63867,10 @@ function readFile10(path103) {
     return {};
   }
 }
-function writeFile4(path103, servers) {
-  mkdirSync17(dirname10(path103), { recursive: true });
+function writeFile4(path104, servers) {
+  mkdirSync18(dirname11(path104), { recursive: true });
   const body = { mcpServers: servers };
-  writeFileSync19(path103, `${JSON.stringify(body, null, 2)}
+  writeFileSync20(path104, `${JSON.stringify(body, null, 2)}
 `, "utf8");
 }
 function listMcpServers(projectRoot) {
@@ -63375,6 +63892,46 @@ function listMcpServers(projectRoot) {
   };
   return { userPath, projectPath, servers, merged };
 }
+function requireEnvKey(key) {
+  if (!ENV_KEY_RE.test(key)) {
+    throw new Error(
+      `Invalid env key "${key}" \u2014 use letters, digits, _ (no leading digit)`
+    );
+  }
+  return key;
+}
+function parseMcpEnvFlag(raw) {
+  if (raw.length === 0) return void 0;
+  const env = {};
+  for (const value of raw) {
+    const text = value.trim();
+    if (text.startsWith("{") || text.startsWith("[")) {
+      let parsed;
+      try {
+        parsed = JSON.parse(text);
+      } catch {
+        throw new Error(`--env is not valid JSON: ${text}`);
+      }
+      if (!parsed || typeof parsed !== "object" || Array.isArray(parsed)) {
+        throw new Error('--env JSON must be an object of "KEY": "VALUE" pairs');
+      }
+      for (const [key2, val] of Object.entries(parsed)) {
+        if (typeof val !== "string") {
+          throw new Error(`--env "${key2}" must map to a string value`);
+        }
+        env[requireEnvKey(key2)] = val;
+      }
+      continue;
+    }
+    const eq = text.indexOf("=");
+    const key = eq > 0 ? text.slice(0, eq).trim() : "";
+    if (!key) {
+      throw new Error(`Invalid --env "${text}" \u2014 use KEY=VALUE or a JSON object`);
+    }
+    env[requireEnvKey(key)] = text.slice(eq + 1);
+  }
+  return env;
+}
 function upsertMcpServer(opts) {
   const name = opts.name.trim();
   if (!name || !/^[a-zA-Z0-9_-]+$/.test(name)) {
@@ -63391,9 +63948,9 @@ function upsertMcpServer(opts) {
       error: "either command (stdio) or url (http) is required"
     };
   }
-  let path103;
+  let path104;
   if (opts.scope === "user") {
-    path103 = getUserMcpPath();
+    path104 = getUserMcpPath();
   } else {
     const root = opts.projectRoot?.trim();
     if (!root) {
@@ -63402,39 +63959,46 @@ function upsertMcpServer(opts) {
         error: "projectRoot required for project scope (Open Folder first)"
       };
     }
-    path103 = getProjectMcpPath(root);
+    path104 = getProjectMcpPath(root);
   }
-  const current = readFile10(path103);
+  const current = readFile10(path104);
+  const previous = current[name];
   current[name] = {
     command: hasCommand ? opts.config.command.trim() : void 0,
     args: opts.config.args,
-    env: opts.config.env,
+    // Back-compat: callers that only flip `enabled` (Desktop toggle) or that
+    // have no env channel at all (`--set-mcp` without `--env`) must not wipe
+    // env written by hand or by another tool. An explicit env always wins —
+    // including `{}`, which clears it.
+    env: opts.config.env ?? previous?.env,
     type: hasUrl ? "http" : opts.config.type === "http" ? "http" : "stdio",
     url: hasUrl ? opts.config.url.trim() : void 0,
     timeoutMs: opts.config.timeoutMs,
     serial: opts.config.serial,
     enabled: opts.config.enabled !== false
   };
-  writeFile4(path103, current);
-  return { ok: true, path: path103 };
+  writeFile4(path104, current);
+  return { ok: true, path: path104 };
 }
 function removeMcpServer(opts) {
-  const path103 = opts.scope === "user" ? getUserMcpPath() : opts.projectRoot ? getProjectMcpPath(opts.projectRoot) : null;
-  if (!path103) {
+  const path104 = opts.scope === "user" ? getUserMcpPath() : opts.projectRoot ? getProjectMcpPath(opts.projectRoot) : null;
+  if (!path104) {
     return { ok: false, error: "projectRoot required for project scope" };
   }
-  const current = readFile10(path103);
+  const current = readFile10(path104);
   if (!(opts.name in current)) {
-    return { ok: false, error: `Server "${opts.name}" not found in ${path103}` };
+    return { ok: false, error: `Server "${opts.name}" not found in ${path104}` };
   }
   delete current[opts.name];
-  writeFile4(path103, current);
-  return { ok: true, path: path103 };
+  writeFile4(path104, current);
+  return { ok: true, path: path104 };
 }
+var ENV_KEY_RE;
 var init_mcpConfigIo = __esm({
   "src/cli/mcp/mcpConfigIo.ts"() {
     "use strict";
     init_paths();
+    ENV_KEY_RE = /^[A-Za-z_][A-Za-z0-9_]*$/;
   }
 });
 
@@ -63601,21 +64165,21 @@ __export(mcpManager_exports, {
   readMcpConfig: () => readMcpConfig,
   registerMcpTools: () => registerMcpTools
 });
-import { existsSync as existsSync43, readFileSync as readFileSync31 } from "node:fs";
-import { join as join35 } from "node:path";
+import { existsSync as existsSync45, readFileSync as readFileSync32 } from "node:fs";
+import { join as join36 } from "node:path";
 function readMcpConfig(projectRoot = process.cwd(), opts) {
   const merged = {};
   const paths = [];
   if (process.env["ZELARI_MCP_USER"] !== "0") {
-    paths.push(join35(zelariHome(), "mcp.json"));
+    paths.push(join36(zelariHome(), "mcp.json"));
   }
   if (!opts?.skipProjectMcp) {
-    paths.push(join35(projectRoot, ".zelari", "mcp.json"));
+    paths.push(join36(projectRoot, ".zelari", "mcp.json"));
   }
   for (const p3 of paths) {
-    if (!existsSync43(p3)) continue;
+    if (!existsSync45(p3)) continue;
     try {
-      const parsed = JSON.parse(readFileSync31(p3, "utf8"));
+      const parsed = JSON.parse(readFileSync32(p3, "utf8"));
       for (const [name, cfg] of Object.entries(parsed.mcpServers ?? {})) {
         const hasCommand = !!cfg && typeof cfg.command === "string" && cfg.command.length > 0;
         const hasUrl = !!cfg && typeof cfg.url === "string" && /^https?:\/\//i.test(cfg.url);
@@ -63631,7 +64195,7 @@ async function ensureLoaded(projectRoot) {
   if (state2.loaded) return;
   state2.loaded = true;
   const trusted = isFolderTrusted(projectRoot);
-  if (!trusted && existsSync43(join35(projectRoot, ".zelari", "mcp.json"))) {
+  if (!trusted && existsSync45(join36(projectRoot, ".zelari", "mcp.json"))) {
     state2.warnings.push(
       "[mcp] project .zelari/mcp.json ignored \u2014 folder not trusted (run /trust or `zelari-code --trust` to enable project MCP)"
     );
@@ -63645,7 +64209,7 @@ async function ensureLoaded(projectRoot) {
       );
       continue;
     }
-    const client = new McpClient(name, cfg);
+    const client = new McpClient(name, cfg, projectRoot);
     try {
       await client.start();
       const tools = await client.listTools();
@@ -63895,15 +64459,15 @@ __export(agentsMd_exports, {
   serializeAgentsMd: () => serializeAgentsMd,
   updateAgentsMd: () => updateAgentsMd
 });
-import { existsSync as existsSync44, readFileSync as readFileSync32, writeFileSync as writeFileSync20 } from "node:fs";
+import { existsSync as existsSync46, readFileSync as readFileSync33, writeFileSync as writeFileSync21 } from "node:fs";
 import { createHash as createHash24 } from "node:crypto";
-import { join as join36 } from "node:path";
+import { join as join37 } from "node:path";
 import { readFile as readFile11 } from "node:fs/promises";
 async function readPackageJson3(projectRoot) {
-  const path103 = join36(projectRoot, "package.json");
-  if (!existsSync44(path103)) return null;
+  const path104 = join37(projectRoot, "package.json");
+  if (!existsSync46(path104)) return null;
   try {
-    return JSON.parse(await readFile11(path103, "utf8"));
+    return JSON.parse(await readFile11(path104, "utf8"));
   } catch {
     return null;
   }
@@ -63925,8 +64489,8 @@ async function genTechStack(ctx) {
   ].join("\n");
 }
 async function genDecisions(ctx) {
-  const decisionsDir = join36(ctx.rootDir, "decisions");
-  if (!existsSync44(decisionsDir)) return "_No ADRs yet._";
+  const decisionsDir = join37(ctx.rootDir, "decisions");
+  if (!existsSync46(decisionsDir)) return "_No ADRs yet._";
   const files = ctx.storage.listMarkdown(decisionsDir).sort();
   const accepted = [];
   const proposed = [];
@@ -63951,9 +64515,9 @@ async function genDecisions(ctx) {
 }
 async function genConventions(ctx) {
   const lines = [];
-  const claudeMd = join36(ctx.projectRoot, "CLAUDE.MD");
-  if (existsSync44(claudeMd)) {
-    const content = readFileSync32(claudeMd, "utf8");
+  const claudeMd = join37(ctx.projectRoot, "CLAUDE.MD");
+  if (existsSync46(claudeMd)) {
+    const content = readFileSync33(claudeMd, "utf8");
     const match = content.match(/## Architecture rules[\s\S]+?(?=\n## |\n*$)/);
     if (match) {
       lines.push('<!-- Extracted from CLAUDE.MD "Architecture rules" -->');
@@ -63985,9 +64549,9 @@ async function genBuild(ctx) {
   ].join("\n");
 }
 async function genOpenQuestions(ctx) {
-  const path103 = join36(ctx.rootDir, "risks.md");
-  if (!existsSync44(path103)) return "_No open questions._";
-  const content = readFileSync32(path103, "utf8");
+  const path104 = join37(ctx.rootDir, "risks.md");
+  if (!existsSync46(path104)) return "_No open questions._";
+  const content = readFileSync33(path104, "utf8");
   const lines = content.split("\n");
   const questions = [];
   let currentTitle = "";
@@ -64061,9 +64625,9 @@ function titleCase(id3) {
   return id3.split("-").map((w) => w[0].toUpperCase() + w.slice(1)).join(" ");
 }
 async function updateAgentsMd(ctx, projectRoot) {
-  const agentsPath = join36(projectRoot, "AGENTS.MD");
-  if (existsSync44(agentsPath)) {
-    const content = readFileSync32(agentsPath, "utf8");
+  const agentsPath = join37(projectRoot, "AGENTS.MD");
+  if (existsSync46(agentsPath)) {
+    const content = readFileSync33(agentsPath, "utf8");
     const hasAnyMarker = AUTO_SECTIONS.some((id3) => content.includes(MARKER_OPEN(id3)));
     if (!hasAnyMarker) {
       return {
@@ -64078,8 +64642,8 @@ async function updateAgentsMd(ctx, projectRoot) {
     newSections.set(id3, await GENERATORS[id3](ctx));
   }
   let manualContent = "";
-  if (existsSync44(agentsPath)) {
-    const { manualBlocks } = parseAgentsMd(readFileSync32(agentsPath, "utf8"));
+  if (existsSync46(agentsPath)) {
+    const { manualBlocks } = parseAgentsMd(readFileSync33(agentsPath, "utf8"));
     manualContent = manualBlocks.after;
   } else {
     const projectName2 = projectName(projectRoot);
@@ -64095,7 +64659,7 @@ async function updateAgentsMd(ctx, projectRoot) {
       ""
     ].join("\n");
   }
-  const oldContent = existsSync44(agentsPath) ? readFileSync32(agentsPath, "utf8") : "";
+  const oldContent = existsSync46(agentsPath) ? readFileSync33(agentsPath, "utf8") : "";
   const { sections: oldSections } = parseAgentsMd(oldContent);
   const changedSections = [];
   for (const id3 of AUTO_SECTIONS) {
@@ -64107,7 +64671,7 @@ async function updateAgentsMd(ctx, projectRoot) {
     return { changed: false, sections: [] };
   }
   const newContent = serializeAgentsMd(manualContent, newSections);
-  writeFileSync20(agentsPath, newContent, "utf8");
+  writeFileSync21(agentsPath, newContent, "utf8");
   return { changed: true, sections: changedSections };
 }
 function hash2(s) {
@@ -64232,12 +64796,12 @@ var init_completeDesign = __esm({
 });
 
 // src/cli/workspace/planDriftCheck.ts
-import { existsSync as existsSync45, readFileSync as readFileSync33, readdirSync as readdirSync10, statSync as statSync6, writeFileSync as writeFileSync21 } from "node:fs";
-import { join as join37 } from "node:path";
+import { existsSync as existsSync47, readFileSync as readFileSync34, readdirSync as readdirSync11, statSync as statSync6, writeFileSync as writeFileSync22 } from "node:fs";
+import { join as join38 } from "node:path";
 function findCanonicalDoc(rootDir) {
-  const docsDir = join37(rootDir, "docs");
-  if (!existsSync45(docsDir)) return null;
-  const candidates = readdirSync10(docsDir).filter((f) => /^plan-canonical.*\.md$/i.test(f)).map((f) => ({ f, mtime: statSync6(join37(docsDir, f)).mtimeMs })).sort((a, b) => b.mtime - a.mtime);
+  const docsDir = join38(rootDir, "docs");
+  if (!existsSync47(docsDir)) return null;
+  const candidates = readdirSync11(docsDir).filter((f) => /^plan-canonical.*\.md$/i.test(f)).map((f) => ({ f, mtime: statSync6(join38(docsDir, f)).mtimeMs })).sort((a, b) => b.mtime - a.mtime);
   return candidates.length > 0 ? candidates[0].f : null;
 }
 function parseCanonicalDoc(text) {
@@ -64261,9 +64825,9 @@ function versionKey(value) {
 function firstString2(v) {
   return typeof v === "string" && v.trim().length > 0 ? v : null;
 }
-function readFileSyncSafe(path103) {
+function readFileSyncSafe(path104) {
   try {
-    return readFileSync33(path103, "utf8");
+    return readFileSync34(path104, "utf8");
   } catch {
     return null;
   }
@@ -64272,13 +64836,13 @@ async function runPlanDriftCheck(rootDir) {
   if (process.env["ZELARI_DRIFT_CHECK"] === "0") {
     return { ran: false, reason: "ZELARI_DRIFT_CHECK=0 (disabled)" };
   }
-  const planPath = join37(rootDir, "plan.json");
-  if (!existsSync45(planPath)) {
+  const planPath = join38(rootDir, "plan.json");
+  if (!existsSync47(planPath)) {
     return { ran: false, reason: ".zelari/plan.json missing (not design-phase)" };
   }
   let plan;
   try {
-    plan = JSON.parse(readFileSync33(planPath, "utf8"));
+    plan = JSON.parse(readFileSync34(planPath, "utf8"));
   } catch {
     return { ran: false, reason: ".zelari/plan.json corrupt" };
   }
@@ -64288,7 +64852,7 @@ async function runPlanDriftCheck(rootDir) {
   const milestones = Array.isArray(plan.milestones) ? plan.milestones : [];
   const phaseIds = new Set(phases.map((p3) => typeof p3.id === "string" ? p3.id : "").filter(Boolean));
   const canonicalName = findCanonicalDoc(rootDir);
-  const canonicalText = canonicalName ? readFileSyncSafe(join37(rootDir, "docs", canonicalName)) : null;
+  const canonicalText = canonicalName ? readFileSyncSafe(join38(rootDir, "docs", canonicalName)) : null;
   if (canonicalText !== null) {
     const { activePhases, blockedPrefixes } = parseCanonicalDoc(canonicalText);
     for (const id3 of activePhases) {
@@ -64367,8 +64931,8 @@ async function runPlanDriftCheck(rootDir) {
   const canonicalParsed = canonicalName !== null && canonicalText !== null;
   let reportPath;
   try {
-    reportPath = join37(rootDir, "drift-report.json");
-    writeFileSync21(
+    reportPath = join38(rootDir, "drift-report.json");
+    writeFileSync22(
       reportPath,
       JSON.stringify(
         {
@@ -64404,8 +64968,8 @@ var init_planDriftCheck = __esm({
 
 // src/cli/workspace/projectSmoke.ts
 import { spawn as spawn15 } from "node:child_process";
-import { existsSync as existsSync46, readFileSync as readFileSync34 } from "node:fs";
-import { join as join38 } from "node:path";
+import { existsSync as existsSync48, readFileSync as readFileSync35 } from "node:fs";
+import { join as join39 } from "node:path";
 function pickSmokeScript(scripts) {
   if (!scripts) return null;
   for (const name of SMOKE_SCRIPT_PRIORITY) {
@@ -64417,13 +64981,13 @@ async function runProjectSmoke(projectRoot, timeoutMs2 = DEFAULT_TIMEOUT_MS3) {
   if (process.env["ZELARI_SMOKE"] === "0") {
     return { ran: false, reason: "ZELARI_SMOKE=0 (disabled)" };
   }
-  const pkgPath = join38(projectRoot, "package.json");
-  if (!existsSync46(pkgPath)) {
+  const pkgPath = join39(projectRoot, "package.json");
+  if (!existsSync48(pkgPath)) {
     return { ran: false, reason: "no package.json (skipped)" };
   }
   let scripts = {};
   try {
-    const pkg = JSON.parse(readFileSync34(pkgPath, "utf8"));
+    const pkg = JSON.parse(readFileSync35(pkgPath, "utf8"));
     scripts = pkg.scripts ?? {};
   } catch {
     return { ran: false, reason: "package.json unreadable (skipped)" };
@@ -64510,7 +65074,7 @@ __export(evidenceFromSpine_exports, {
   collectSessionEvidenceRefs: () => collectSessionEvidenceRefs,
   evidenceRefsFromEventLines: () => evidenceRefsFromEventLines
 });
-import { existsSync as existsSync47, readFileSync as readFileSync35 } from "node:fs";
+import { existsSync as existsSync49, readFileSync as readFileSync36 } from "node:fs";
 import path75 from "node:path";
 function asRecord2(v) {
   return v && typeof v === "object" && !Array.isArray(v) ? v : void 0;
@@ -64550,8 +65114,8 @@ function evidenceRefsFromEventLines(lines) {
 function collectSessionEvidenceRefs(sessionId2) {
   try {
     const file2 = path75.join(sessionsDir(), sessionId2, "events.jsonl");
-    if (!existsSync47(file2)) return [];
-    return evidenceRefsFromEventLines(readFileSync35(file2, "utf8").split("\n"));
+    if (!existsSync49(file2)) return [];
+    return evidenceRefsFromEventLines(readFileSync36(file2, "utf8").split("\n"));
   } catch {
     return [];
   }
@@ -64574,8 +65138,8 @@ __export(postCouncilHook_exports, {
   runPostCouncilHook: () => runPostCouncilHook
 });
 import { spawn as spawn16 } from "node:child_process";
-import { existsSync as existsSync48, readFileSync as readFileSync36 } from "node:fs";
-import { join as join39 } from "node:path";
+import { existsSync as existsSync50, readFileSync as readFileSync37 } from "node:fs";
+import { join as join40 } from "node:path";
 async function runCompleteDesignPostProcessor(ctx, options) {
   if (options?.runMode === "implementation") {
     return {
@@ -64586,9 +65150,9 @@ async function runCompleteDesignPostProcessor(ctx, options) {
   if (process.env["ZELARI_COMPLETE_DESIGN"] === "0") {
     return { ran: false, reason: "ZELARI_COMPLETE_DESIGN=0 (disabled)" };
   }
-  const planJsonPath2 = join39(ctx.rootDir, "plan.json");
-  const scriptPath = join39(ctx.projectRoot, "complete-design.mjs");
-  if (!existsSync48(planJsonPath2)) {
+  const planJsonPath2 = join40(ctx.rootDir, "plan.json");
+  const scriptPath = join40(ctx.projectRoot, "complete-design.mjs");
+  if (!existsSync50(planJsonPath2)) {
     return {
       ran: false,
       reason: ".zelari/plan.json missing (not design-phase)"
@@ -64596,7 +65160,7 @@ async function runCompleteDesignPostProcessor(ctx, options) {
   }
   let phaseCount = 0;
   try {
-    const parsed = JSON.parse(readFileSync36(planJsonPath2, "utf8"));
+    const parsed = JSON.parse(readFileSync37(planJsonPath2, "utf8"));
     phaseCount = Array.isArray(parsed.phases) ? parsed.phases.length : 0;
   } catch {
     return { ran: false, reason: ".zelari/plan.json corrupt" };
@@ -64604,7 +65168,7 @@ async function runCompleteDesignPostProcessor(ctx, options) {
   if (phaseCount === 0) {
     return { ran: false, reason: ".zelari/plan.json has no phases" };
   }
-  if (!existsSync48(scriptPath)) {
+  if (!existsSync50(scriptPath)) {
     try {
       const builtin = await runBuiltinCompleteDesign(ctx);
       return {
@@ -64799,8 +65363,8 @@ async function runPostCouncilHook(ctx, options) {
           sources: scope.sources
         } : void 0
       });
-      const path103 = writeCouncilCompletion(ctx.rootDir, completion);
-      completionHook = { ran: true, path: path103, completion };
+      const path104 = writeCouncilCompletion(ctx.rootDir, completion);
+      completionHook = { ran: true, path: path104, completion };
     } catch (err) {
       completionHook = {
         ran: true,
@@ -64840,10 +65404,10 @@ __export(councilFeedback_exports, {
 });
 import {
   promises as fs33,
-  existsSync as existsSync49,
-  readFileSync as readFileSync37,
-  writeFileSync as writeFileSync22,
-  mkdirSync as mkdirSync18
+  existsSync as existsSync51,
+  readFileSync as readFileSync38,
+  writeFileSync as writeFileSync23,
+  mkdirSync as mkdirSync19
 } from "node:fs";
 import path76 from "node:path";
 var FeedbackStore;
@@ -64949,9 +65513,9 @@ var init_councilFeedback = __esm({
       }
       // --- persistence ---------------------------------------------------------
       load() {
-        if (!existsSync49(this.file)) return;
+        if (!existsSync51(this.file)) return;
         try {
-          const raw = readFileSync37(this.file, "utf-8");
+          const raw = readFileSync38(this.file, "utf-8");
           const parsed = JSON.parse(raw);
           if (parsed && Array.isArray(parsed.entries)) {
             this.entries = parsed.entries.filter(
@@ -64962,8 +65526,8 @@ var init_councilFeedback = __esm({
         }
       }
       save() {
-        mkdirSync18(path76.dirname(this.file), { recursive: true });
-        writeFileSync22(
+        mkdirSync19(path76.dirname(this.file), { recursive: true });
+        writeFileSync23(
           this.file,
           JSON.stringify({ entries: this.entries }, null, 2),
           { encoding: "utf-8", mode: 384 }
@@ -65036,7 +65600,7 @@ __export(ledger_exports, {
   ledgerStats: () => ledgerStats,
   readLedger: () => readLedger
 });
-import { appendFileSync as appendFileSync4, existsSync as existsSync50, mkdirSync as mkdirSync19, readFileSync as readFileSync38 } from "node:fs";
+import { appendFileSync as appendFileSync4, existsSync as existsSync52, mkdirSync as mkdirSync20, readFileSync as readFileSync39 } from "node:fs";
 import path77 from "node:path";
 function evolutionMode(env = process.env) {
   return env[EVOLUTION_ENV] === "shadow" ? "shadow" : "0";
@@ -65050,7 +65614,7 @@ function appendLedgerEntry(cwd, entry) {
   }
   try {
     const file2 = ledgerPath(cwd);
-    mkdirSync19(path77.dirname(file2), { recursive: true });
+    mkdirSync20(path77.dirname(file2), { recursive: true });
     appendFileSync4(file2, `${JSON.stringify(entry)}
 `, "utf8");
     return { written: true, path: file2 };
@@ -65063,10 +65627,10 @@ function appendLedgerEntry(cwd, entry) {
 }
 function readLedger(cwd) {
   const file2 = ledgerPath(cwd);
-  if (!existsSync50(file2)) return [];
+  if (!existsSync52(file2)) return [];
   let raw;
   try {
-    raw = readFileSync38(file2, "utf8");
+    raw = readFileSync39(file2, "utf8");
   } catch {
     return [];
   }
@@ -66286,7 +66850,7 @@ function safeSocketPath(socketPath) {
   return socketPath.trim();
 }
 function startPermissionBroker(socketPath, handlers, opts) {
-  const path103 = safeSocketPath(socketPath);
+  const path104 = safeSocketPath(socketPath);
   const requestTimeoutMs = opts?.requestTimeoutMs ?? PERMISSION_BROKER_DEFAULT_TIMEOUT_MS;
   const sockets = /* @__PURE__ */ new Set();
   const server = createServer2((socket) => {
@@ -66383,13 +66947,13 @@ function startPermissionBroker(socketPath, handlers, opts) {
       });
     }
   }
-  return new Promise((resolve9, reject) => {
+  return new Promise((resolve10, reject) => {
     const onError = (err) => reject(err);
     server.once("error", onError);
-    server.listen(path103, () => {
+    server.listen(path104, () => {
       server.removeListener("error", onError);
-      resolve9({
-        socketPath: path103,
+      resolve10({
+        socketPath: path104,
         stop: () => new Promise((res) => {
           for (const s of sockets) s.destroy();
           sockets.clear();
@@ -66400,7 +66964,7 @@ function startPermissionBroker(socketPath, handlers, opts) {
             if (done) return;
             done = true;
             if (process.platform !== "win32") {
-              unlink(path103, () => res());
+              unlink(path104, () => res());
             } else {
               res();
             }
@@ -66413,11 +66977,11 @@ function startPermissionBroker(socketPath, handlers, opts) {
   });
 }
 function requestBrokerAsk(socketPath, ask, opts) {
-  const path103 = safeSocketPath(socketPath);
+  const path104 = safeSocketPath(socketPath);
   const requestTimeoutMs = opts?.requestTimeoutMs ?? PERMISSION_BROKER_DEFAULT_TIMEOUT_MS;
   const connectTimeoutMs = opts?.connectTimeoutMs ?? PERMISSION_BROKER_DEFAULT_CONNECT_TIMEOUT_MS;
-  return new Promise((resolve9, reject) => {
-    const socket = connect(path103);
+  return new Promise((resolve10, reject) => {
+    const socket = connect(path104);
     let buffer = "";
     let settled = false;
     const settle = (fn) => {
@@ -66432,7 +66996,7 @@ function requestBrokerAsk(socketPath, ask, opts) {
       settle(
         () => reject(
           new Error(
-            `permission broker unavailable at "${path103}" (connect timed out after ${connectTimeoutMs}ms)`
+            `permission broker unavailable at "${path104}" (connect timed out after ${connectTimeoutMs}ms)`
           )
         )
       );
@@ -66469,7 +67033,7 @@ function requestBrokerAsk(socketPath, ask, opts) {
         }
         if (msg?.t === "answer" && msg.id === ask.id) {
           const { t: _t, id: _id, ...answer } = msg;
-          settle(() => resolve9(answer));
+          settle(() => resolve10(answer));
           return;
         }
       }
@@ -67249,8 +67813,8 @@ __export(prereqChecks_exports, {
   runPrereqChecks: () => runPrereqChecks
 });
 import { execSync, spawnSync as spawnSync2 } from "node:child_process";
-import { existsSync as existsSync52 } from "node:fs";
-import { dirname as dirname12 } from "node:path";
+import { existsSync as existsSync54 } from "node:fs";
+import { dirname as dirname13 } from "node:path";
 function isWslBashPath2(p3) {
   if (!p3 || typeof p3 !== "string") return false;
   const n = p3.replace(/\//g, "\\").toLowerCase();
@@ -67356,16 +67920,16 @@ function resolveAgentShellSync() {
 function agentProbeEnv() {
   const env = { ...process.env };
   try {
-    const nodeDir = dirname12(process.execPath);
+    const nodeDir = dirname13(process.execPath);
     if (!nodeDir) return env;
-    const sep4 = process.platform === "win32" ? ";" : ":";
+    const sep5 = process.platform === "win32" ? ";" : ":";
     const current = env.PATH ?? env.Path ?? "";
-    const parts = current.split(sep4).filter((p3) => p3.length > 0);
+    const parts = current.split(sep5).filter((p3) => p3.length > 0);
     const has = parts.some(
       (p3) => p3.toLowerCase() === nodeDir.toLowerCase()
     );
     if (!has) {
-      env.PATH = `${nodeDir}${sep4}${current}`;
+      env.PATH = `${nodeDir}${sep5}${current}`;
     }
   } catch {
   }
@@ -67373,7 +67937,7 @@ function agentProbeEnv() {
 }
 function existsSyncSafe2(p3) {
   try {
-    return existsSync52(p3);
+    return existsSync54(p3);
   } catch {
     return false;
   }
@@ -67620,7 +68184,7 @@ var init_prereqChecks = __esm({
 });
 
 // src/cli/plugins/prefs.ts
-import { existsSync as existsSync53, readFileSync as readFileSync40, writeFileSync as writeFileSync23, mkdirSync as mkdirSync20 } from "node:fs";
+import { existsSync as existsSync55, readFileSync as readFileSync41, writeFileSync as writeFileSync24, mkdirSync as mkdirSync21 } from "node:fs";
 import path85 from "node:path";
 function getPluginPrefsPath() {
   return pluginsPrefsPath();
@@ -67628,8 +68192,8 @@ function getPluginPrefsPath() {
 function getPluginPrefs() {
   const file2 = getPluginPrefsPath();
   try {
-    if (!existsSync53(file2)) return { ...DEFAULTS2, dontAskAgain: {} };
-    const raw = readFileSync40(file2, "utf-8");
+    if (!existsSync55(file2)) return { ...DEFAULTS2, dontAskAgain: {} };
+    const raw = readFileSync41(file2, "utf-8");
     const parsed = JSON.parse(raw);
     if (parsed && typeof parsed === "object" && parsed.dontAskAgain && typeof parsed.dontAskAgain === "object") {
       const clean = {};
@@ -67644,8 +68208,8 @@ function getPluginPrefs() {
 }
 function writePluginPrefs(prefs) {
   const file2 = getPluginPrefsPath();
-  mkdirSync20(path85.dirname(file2), { recursive: true });
-  writeFileSync23(file2, JSON.stringify(prefs, null, 2), {
+  mkdirSync21(path85.dirname(file2), { recursive: true });
+  writeFileSync24(file2, JSON.stringify(prefs, null, 2), {
     encoding: "utf-8",
     mode: 384
   });
@@ -67681,7 +68245,7 @@ __export(registry_exports, {
   findPlugin: () => findPlugin,
   isBinaryOnPath: () => isBinaryOnPath
 });
-import { existsSync as existsSync54 } from "node:fs";
+import { existsSync as existsSync56 } from "node:fs";
 import path86 from "node:path";
 function detectLocalBin(bin) {
   return (cwd) => {
@@ -67698,11 +68262,11 @@ function isBinaryOnPath(bin, opts = {}) {
     return false;
   }
   const platform = opts.platform ?? process.platform;
-  const exists = opts.exists ?? existsSync54;
+  const exists = opts.exists ?? existsSync56;
   const pathEnv = opts.pathEnv ?? process.env.PATH ?? "";
   const pathMod = platform === "win32" ? path86.win32 : path86.posix;
-  const sep4 = platform === "win32" ? ";" : ":";
-  const dirs = pathEnv.split(sep4).filter((d) => d.length > 0);
+  const sep5 = platform === "win32" ? ";" : ":";
+  const dirs = pathEnv.split(sep5).filter((d) => d.length > 0);
   const candidates = [bin];
   if (platform === "win32") {
     const pathExt = opts.pathExt ?? process.env.PATHEXT ?? ".EXE;.CMD;.BAT;.COM";
@@ -68442,8 +69006,8 @@ __export(atMentions_exports, {
   extractAtMentions: () => extractAtMentions,
   hasAtMentions: () => hasAtMentions
 });
-import { existsSync as existsSync57, readFileSync as readFileSync42, statSync as statSync9 } from "node:fs";
-import { basename as basename5, isAbsolute as isAbsolute4, relative as relative5, resolve as resolve6, sep as sep2 } from "node:path";
+import { existsSync as existsSync59, readFileSync as readFileSync43, statSync as statSync9 } from "node:fs";
+import { basename as basename5, isAbsolute as isAbsolute5, relative as relative5, resolve as resolve7, sep as sep3 } from "node:path";
 function isImagePath(abs) {
   const ext = abs.split(".").pop()?.toLowerCase() ?? "";
   return ext in IMAGE_MIME_BY_EXT;
@@ -68457,9 +69021,9 @@ function isProbablyText(name, head) {
   return !head.includes("\0") && /[\x09\x0a\x0d\x20-\x7e]/.test(head.slice(0, 200));
 }
 function underRoot(abs, root) {
-  const a = resolve6(abs);
-  const r = resolve6(root);
-  const prefix = r.endsWith(sep2) ? r : r + sep2;
+  const a = resolve7(abs);
+  const r = resolve7(root);
+  const prefix = r.endsWith(sep3) ? r : r + sep3;
   return a === r || a.startsWith(prefix);
 }
 function extractAtMentions(text) {
@@ -68486,7 +69050,7 @@ function extractAtMentions(text) {
   return out;
 }
 function resolveMention(token, cwd) {
-  const abs = isAbsolute4(token) ? resolve6(token) : resolve6(cwd, token);
+  const abs = isAbsolute5(token) ? resolve7(token) : resolve7(cwd, token);
   if (!underRoot(abs, cwd) && !isImagePath(abs)) {
     return {
       raw: token,
@@ -68496,7 +69060,7 @@ function resolveMention(token, cwd) {
       note: "outside project root \u2014 skipped"
     };
   }
-  if (!existsSync57(abs)) {
+  if (!existsSync59(abs)) {
     return {
       raw: token,
       path: token,
@@ -68548,7 +69112,7 @@ function resolveMention(token, cwd) {
         note: `image too large (${Math.round(st.size / 1024)} KB) \u2014 path only`
       };
     }
-    const dataBase64 = readFileSync42(abs).toString("base64");
+    const dataBase64 = readFileSync43(abs).toString("base64");
     return {
       raw: token,
       path: rel2,
@@ -68559,7 +69123,7 @@ function resolveMention(token, cwd) {
     };
   }
   try {
-    const buf = readFileSync42(abs);
+    const buf = readFileSync43(abs);
     const head = buf.subarray(0, 800).toString("utf8");
     if (!isProbablyText(abs, head)) {
       return {
@@ -69458,7 +70022,7 @@ var init_liveTurnAbort = __esm({
 });
 
 // src/cli/headless/policyGate.ts
-import { isAbsolute as isAbsolute5, resolve as resolve7 } from "node:path";
+import { isAbsolute as isAbsolute6, resolve as resolve8 } from "node:path";
 import { randomUUID as randomUUID9 } from "node:crypto";
 function checkStrictPolicyLoad(root, opts) {
   if (isPolicyEngineDisabled()) return { blocked: false, warnings: [] };
@@ -69467,7 +70031,7 @@ function checkStrictPolicyLoad(root, opts) {
     return { blocked: false, warnings: set2.warnings };
   } catch (err) {
     if (!(err instanceof PolicyLoadError)) throw err;
-    const file2 = isAbsolute5(err.file) ? err.file : resolve7(root, err.file);
+    const file2 = isAbsolute6(err.file) ? err.file : resolve8(root, err.file);
     return {
       blocked: true,
       warnings: [],
@@ -69720,27 +70284,27 @@ var init_sandboxedFs = __esm({
 });
 
 // src/cli/extensions/loader.ts
-import { join as join45 } from "node:path";
-import { readdirSync as readdirSync11, readFileSync as readFileSync43 } from "node:fs";
+import { join as join46 } from "node:path";
+import { readdirSync as readdirSync12, readFileSync as readFileSync44 } from "node:fs";
 import { createHash as createHash25 } from "node:crypto";
 import { pathToFileURL as pathToFileURL3 } from "node:url";
 function globalExtensionsDir() {
-  return join45(zelariHome(), "extensions");
+  return join46(zelariHome(), "extensions");
 }
 function projectExtensionsDir(projectRoot) {
-  return join45(projectRoot, ".zelari", "extensions");
+  return join46(projectRoot, ".zelari", "extensions");
 }
 function sha256File(file2) {
-  return createHash25("sha256").update(readFileSync43(file2)).digest("hex");
+  return createHash25("sha256").update(readFileSync44(file2)).digest("hex");
 }
 function candidateFiles(dir) {
   let names;
   try {
-    names = readdirSync11(dir);
+    names = readdirSync12(dir);
   } catch {
     return [];
   }
-  return names.filter((n) => EXTENSION_FILE_EXTS.has(n.slice(n.lastIndexOf(".")).toLowerCase())).sort().map((n) => join45(dir, n));
+  return names.filter((n) => EXTENSION_FILE_EXTS.has(n.slice(n.lastIndexOf(".")).toLowerCase())).sort().map((n) => join46(dir, n));
 }
 function extractExtension(mod) {
   const m = mod;
@@ -69769,7 +70333,7 @@ async function loadExtensionsFromDirs(dirs, options = {}) {
     if (files.length === 0) continue;
     let lock = null;
     try {
-      lock = JSON.parse(readFileSync43(join45(dir.path, EXTENSIONS_LOCK_FILE), "utf8"));
+      lock = JSON.parse(readFileSync44(join46(dir.path, EXTENSIONS_LOCK_FILE), "utf8"));
     } catch {
       lock = null;
       if (dirHasLockFile(dir.path)) {
@@ -69836,7 +70400,7 @@ function basenameOf(file2) {
 }
 function dirHasLockFile(dir) {
   try {
-    readFileSync43(join45(dir, EXTENSIONS_LOCK_FILE));
+    readFileSync44(join46(dir, EXTENSIONS_LOCK_FILE));
     return true;
   } catch {
     return false;
@@ -72692,7 +73256,10 @@ ${ragContext}` : slicePrompt;
       if (opts.output === "json") {
         emitEvent({ type: "verification_run", ...missionVerificationPayload });
       }
-      await writeProofSafe(missionGate, { surface: "mission", sessionId: spine.sessionId }, projectRoot);
+      surfaceOpsKnowledgeNotices(
+        await writeProofSafe(missionGate, { surface: "mission", sessionId: spine.sessionId }, projectRoot),
+        opts
+      );
       if (missionGate.blocked) {
         exitCode = strictGateExitCode(missionGate);
         spine.missionPhase("verification", "mission-strict-blocked");
@@ -72789,6 +73356,11 @@ var init_runHeadless = __esm({
       ["krakenExploreModel", "ZELARI_KRAKEN_EXPLORE_MODEL"],
       ["krakenGeneralModel", "ZELARI_KRAKEN_GENERAL_MODEL"],
       ["krakenVerifyModel", "ZELARI_KRAKEN_VERIFY_MODEL"],
+      // Per-tentacle thinking effort (ADR-0017) — same per-kind mapping as the
+      // models above; the spawn factory reads them to override thinkingByProvider.
+      ["krakenExploreThinking", "ZELARI_KRAKEN_EXPLORE_THINKING"],
+      ["krakenGeneralThinking", "ZELARI_KRAKEN_GENERAL_THINKING"],
+      ["krakenVerifyThinking", "ZELARI_KRAKEN_VERIFY_THINKING"],
       ["krakenPlannerModel", "ZELARI_KRAKEN_PLANNER_MODEL"],
       ["krakenDelegation", "ZELARI_KRAKEN_DELEGATION"]
     ];
@@ -73179,270 +73751,6 @@ var init_desktopConfig = __esm({
   }
 });
 
-// src/cli/skillCategories.ts
-var CODING_CATEGORIES_LIST, CODING_CATEGORIES2;
-var init_skillCategories = __esm({
-  "src/cli/skillCategories.ts"() {
-    "use strict";
-    CODING_CATEGORIES_LIST = [
-      "plan",
-      "refactor",
-      "debug",
-      "review",
-      "test",
-      "docs",
-      "ops",
-      "git",
-      "db",
-      "maint"
-    ];
-    CODING_CATEGORIES2 = new Set(CODING_CATEGORIES_LIST);
-  }
-});
-
-// src/cli/skillConfigIo.ts
-import {
-  existsSync as existsSync59,
-  mkdirSync as mkdirSync23,
-  readdirSync as readdirSync12,
-  readFileSync as readFileSync44,
-  rmSync as rmSync4,
-  writeFileSync as writeFileSync25
-} from "node:fs";
-import { dirname as dirname14, join as join47 } from "node:path";
-function ensureBuiltinSkillsLoadedSync() {
-  if (builtinsLoaded) return;
-  for (const spec of BUILTIN_SKILL_MODULES) {
-    try {
-      require?.(spec);
-    } catch {
-    }
-  }
-}
-function getUserSkillsDir() {
-  return join47(zelariHome(), "skills");
-}
-function getProjectSkillsDir(projectRoot) {
-  return join47(projectRoot, ".zelari", "skills");
-}
-function skillFilePath(dir, name) {
-  return join47(dir, name, "SKILL.md");
-}
-function classifyScope(skillPath, projectRoot) {
-  const userDir = getUserSkillsDir().replace(/\\/g, "/");
-  const norm = skillPath.replace(/\\/g, "/");
-  if (norm.startsWith(userDir + "/") || norm === userDir) {
-    return { scope: "user", writable: true };
-  }
-  if (projectRoot) {
-    const projDir = getProjectSkillsDir(projectRoot).replace(/\\/g, "/");
-    if (norm.startsWith(projDir + "/") || norm === projDir) {
-      return { scope: "project", writable: true };
-    }
-  }
-  return { scope: "compat", writable: false };
-}
-function entryFromParsed(parsed, projectRoot) {
-  const { scope, writable } = classifyScope(parsed.sourcePath, projectRoot);
-  return {
-    id: parsed.name,
-    name: parsed.name,
-    description: parsed.description,
-    category: parsed.category,
-    estimatedCost: parsed.estimatedCost,
-    requiredTools: parsed.requiredTools,
-    scope,
-    path: parsed.sourcePath,
-    body: parsed.body,
-    builtin: false,
-    writable
-  };
-}
-function entryFromBuiltin(skill) {
-  return {
-    id: skill.id,
-    name: skill.name || skill.id,
-    description: skill.description || "",
-    category: skill.category,
-    estimatedCost: skill.estimatedCost,
-    requiredTools: skill.requiredTools,
-    scope: "builtin",
-    path: null,
-    // Expose body so Desktop skill picker can expand like `/skill <id>`.
-    body: skill.systemPromptFragment || void 0,
-    builtin: true,
-    writable: false
-  };
-}
-function scanSkillsDir(dir, projectRoot, seen, out) {
-  if (!existsSync59(dir)) return;
-  let entries;
-  try {
-    entries = readdirSync12(dir, { withFileTypes: true }).filter((e) => e.isDirectory()).map((e) => e.name);
-  } catch {
-    return;
-  }
-  for (const entry of entries) {
-    const skillPath = skillFilePath(dir, entry);
-    if (!existsSync59(skillPath)) continue;
-    try {
-      const parsed = parseSkillMd(readFileSync44(skillPath, "utf8"), skillPath);
-      if (!parsed) continue;
-      if (seen.has(parsed.name)) continue;
-      seen.add(parsed.name);
-      out.push(entryFromParsed(parsed, projectRoot));
-    } catch {
-    }
-  }
-}
-function listSkillsSnapshot(projectRoot) {
-  const root = projectRoot && projectRoot.trim() ? projectRoot.trim() : null;
-  const userSkillsDir = getUserSkillsDir();
-  const projectSkillsDir = root ? getProjectSkillsDir(root) : null;
-  const skills = [];
-  const seen = /* @__PURE__ */ new Set();
-  if (root) {
-    scanSkillsDir(join47(root, ".zelari", "skills"), root, seen, skills);
-    scanSkillsDir(join47(root, ".claude", "skills"), root, seen, skills);
-    scanSkillsDir(join47(root, ".opencode", "skills"), root, seen, skills);
-  }
-  scanSkillsDir(userSkillsDir, root, seen, skills);
-  for (const s of listCodingSkills()) {
-    if (seen.has(s.id)) continue;
-    seen.add(s.id);
-    if (s.builtin) {
-      skills.push(entryFromBuiltin(s));
-    }
-  }
-  skills.sort((a, b) => {
-    const order = (s) => s === "project" ? 0 : s === "user" ? 1 : s === "compat" ? 2 : 3;
-    const d = order(a.scope) - order(b.scope);
-    if (d !== 0) return d;
-    return a.id.localeCompare(b.id);
-  });
-  return { userSkillsDir, projectSkillsDir, skills };
-}
-function serializeSkillMd(opts) {
-  const name = opts.name.trim().toLowerCase();
-  const description = opts.description.trim();
-  const body = opts.body.trim();
-  const lines = ["---", `name: ${name}`, `description: ${description}`];
-  const cat = (opts.category ?? "").trim().toLowerCase();
-  if (cat && CODING_CATEGORIES2.has(cat)) {
-    lines.push(`category: ${cat}`);
-  }
-  if (opts.tools && opts.tools.length > 0) {
-    lines.push(`tools: [${opts.tools.map((t) => t.trim()).filter(Boolean).join(", ")}]`);
-  }
-  const cost = (opts.cost ?? "").trim().toLowerCase();
-  if (cost === "low" || cost === "medium" || cost === "high") {
-    lines.push(`cost: ${cost}`);
-  }
-  lines.push("---", "", body, "");
-  return lines.join("\n");
-}
-function upsertSkill(opts) {
-  const name = opts.name.trim().toLowerCase();
-  if (!name || !NAME_RE.test(name)) {
-    return {
-      ok: false,
-      error: "Invalid skill name (use lowercase letters, digits, hyphens; max 64 chars)"
-    };
-  }
-  const description = opts.description.trim();
-  if (!description) {
-    return { ok: false, error: "description is required" };
-  }
-  const body = opts.body.trim();
-  if (!body) {
-    return { ok: false, error: "body is required" };
-  }
-  let dir;
-  if (opts.scope === "user") {
-    dir = getUserSkillsDir();
-  } else {
-    const root = opts.projectRoot?.trim();
-    if (!root) {
-      return {
-        ok: false,
-        error: "projectRoot required for project scope (Open Folder first)"
-      };
-    }
-    dir = getProjectSkillsDir(root);
-  }
-  const path103 = skillFilePath(dir, name);
-  const content = serializeSkillMd({
-    name,
-    description,
-    body,
-    category: opts.category,
-    tools: opts.tools,
-    cost: opts.cost
-  });
-  const parsed = parseSkillMd(content, path103);
-  if (!parsed) {
-    return { ok: false, error: "Generated SKILL.md failed validation" };
-  }
-  mkdirSync23(dirname14(path103), { recursive: true });
-  writeFileSync25(path103, content, "utf8");
-  return { ok: true, path: path103 };
-}
-function removeSkill(opts) {
-  const name = opts.name.trim().toLowerCase();
-  if (!name) {
-    return { ok: false, error: "name is required" };
-  }
-  let dir;
-  if (opts.scope === "user") {
-    dir = getUserSkillsDir();
-  } else {
-    const root = opts.projectRoot?.trim();
-    if (!root) {
-      return { ok: false, error: "projectRoot required for project scope" };
-    }
-    dir = getProjectSkillsDir(root);
-  }
-  const skillDir = join47(dir, name);
-  const path103 = skillFilePath(dir, name);
-  if (!existsSync59(path103) && !existsSync59(skillDir)) {
-    return { ok: false, error: `Skill "${name}" not found in ${dir}` };
-  }
-  try {
-    rmSync4(skillDir, { recursive: true, force: true });
-  } catch (err) {
-    return {
-      ok: false,
-      error: err instanceof Error ? err.message : String(err)
-    };
-  }
-  return { ok: true, path: path103 };
-}
-var NAME_RE, BUILTIN_SKILL_MODULES, builtinsLoaded;
-var init_skillConfigIo = __esm({
-  "src/cli/skillConfigIo.ts"() {
-    "use strict";
-    init_skills2();
-    init_skillsMd();
-    init_skillCategories();
-    init_paths();
-    NAME_RE = /^[a-z0-9][a-z0-9-]{0,63}$/;
-    BUILTIN_SKILL_MODULES = [
-      "@zelari/core/skills/builtin/debugging",
-      "@zelari/core/skills/builtin/docs",
-      "@zelari/core/skills/builtin/git-ops",
-      "@zelari/core/skills/builtin/planning",
-      "@zelari/core/skills/builtin/refactoring",
-      "@zelari/core/skills/builtin/review",
-      "@zelari/core/skills/builtin/unrealEditor",
-      "@zelari/core/skills/builtin/testing",
-      "@zelari/core/skills/builtin/schema-loop",
-      "@zelari/core/skills/builtin/computer-use-cua",
-      "@zelari/core/skills/builtin/qwen-mm-plugins"
-    ];
-    builtinsLoaded = false;
-  }
-});
-
 // src/cli/memory/jsonApi.ts
 var jsonApi_exports = {};
 __export(jsonApi_exports, {
@@ -73809,8 +74117,8 @@ async function startMemoryMcpServer(options) {
   let stopped = false;
   let finalizePromise;
   let resolveClosed = () => void 0;
-  const closed = new Promise((resolve9) => {
-    resolveClosed = resolve9;
+  const closed = new Promise((resolve10) => {
+    resolveClosed = resolve10;
   });
   const adapter = new MemoryMcpAdapter({
     service,
@@ -73957,8 +74265,8 @@ function startPermissionMcpServer(opts) {
   });
   let closedResolve = () => {
   };
-  const closed = new Promise((resolve9) => {
-    closedResolve = resolve9;
+  const closed = new Promise((resolve10) => {
+    closedResolve = resolve10;
   });
   let stopped = false;
   const send = (obj) => {
@@ -74211,7 +74519,7 @@ var init_permissionCli = __esm({
 
 // src/cli/companion/config.ts
 import {
-  existsSync as existsSync60,
+  existsSync as existsSync61,
   mkdirSync as mkdirSync24,
   readFileSync as readFileSync45,
   writeFileSync as writeFileSync26
@@ -74229,17 +74537,17 @@ function getCompanionTokenPath() {
 }
 function ensureHome() {
   const home = getZelariHome();
-  if (!existsSync60(home)) {
+  if (!existsSync61(home)) {
     mkdirSync24(home, { recursive: true });
   }
 }
 function loadCompanionConfig() {
-  const path103 = getCompanionConfigPath();
-  if (!existsSync60(path103)) {
+  const path104 = getCompanionConfigPath();
+  if (!existsSync61(path104)) {
     return { projects: [] };
   }
   try {
-    const raw = JSON.parse(readFileSync45(path103, "utf8"));
+    const raw = JSON.parse(readFileSync45(path104, "utf8"));
     const projects = Array.isArray(raw.projects) ? raw.projects.filter(
       (p3) => p3 && typeof p3.path === "string" && p3.path.trim() && typeof (p3.id ?? p3.name) === "string"
     ).map((p3) => ({
@@ -74277,16 +74585,16 @@ function loadOrCreateToken(explicit) {
     return { token: explicit.trim(), created: false };
   }
   ensureHome();
-  const path103 = getCompanionTokenPath();
-  if (existsSync60(path103)) {
-    const t = readFileSync45(path103, "utf8").trim();
+  const path104 = getCompanionTokenPath();
+  if (existsSync61(path104)) {
+    const t = readFileSync45(path104, "utf8").trim();
     if (t) return { token: t, created: false };
   }
   const token = randomBytes7(24).toString("base64url");
-  writeFileSync26(path103, token + "\n", "utf8");
+  writeFileSync26(path104, token + "\n", "utf8");
   try {
     const fs50 = __require("node:fs");
-    fs50.chmodSync?.(path103, 384);
+    fs50.chmodSync?.(path104, 384);
   } catch {
   }
   return { token, created: true };
@@ -74311,17 +74619,17 @@ function mergeProjects(cfg, extraPaths) {
     byId.set(p3.id, p3);
   }
   for (const raw of extraPaths) {
-    const path103 = raw.trim();
-    if (!path103) continue;
-    let id3 = slugFromPath(path103);
+    const path104 = raw.trim();
+    if (!path104) continue;
+    let id3 = slugFromPath(path104);
     let n = 2;
-    while (byId.has(id3) && byId.get(id3).path !== path103) {
-      id3 = `${slugFromPath(path103)}-${n++}`;
+    while (byId.has(id3) && byId.get(id3).path !== path104) {
+      id3 = `${slugFromPath(path104)}-${n++}`;
     }
     byId.set(id3, {
       id: id3,
-      name: slugFromPath(path103),
-      path: path103
+      name: slugFromPath(path104),
+      path: path104
     });
   }
   return [...byId.values()];
@@ -74407,11 +74715,11 @@ function createServePermissionBridge(write, timeoutMs2 = 12e4) {
     onPermissionAsk(payload) {
       const requestId = `perm-${Date.now()}-${++seq}`;
       const categories = payload.categories && payload.categories.length > 0 ? payload.categories : payload.category ? payload.category.split(",").map((c) => c.trim()).filter(Boolean) : [];
-      return new Promise((resolve9) => {
+      return new Promise((resolve10) => {
         const timer = setTimeout(() => {
           settle(requestId, "deny", true);
         }, timeoutMs2);
-        pending.set(requestId, { resolve: resolve9, timer, payload });
+        pending.set(requestId, { resolve: resolve10, timer, payload });
         write(
           JSON.stringify({
             type: "permission.request",
@@ -74521,11 +74829,11 @@ function createServeAskUserBridge(write, timeoutMs2 = askUserTimeoutMs()) {
       const choices = req.choices.map((c) => c.trim()).filter(Boolean);
       if (choices.length < 2) return Promise.resolve(null);
       const requestId = `ask-${Date.now()}-${++seq}`;
-      return new Promise((resolve9) => {
+      return new Promise((resolve10) => {
         const timer = setTimeout(() => {
           settle(requestId, null, true);
         }, timeoutMs2);
-        pending.set(requestId, { resolve: resolve9, timer });
+        pending.set(requestId, { resolve: resolve10, timer });
         write(
           JSON.stringify({
             type: "ask_user.request",
@@ -74625,11 +74933,13 @@ __export(harnessServer_exports, {
   bindHarnessTurnOptions: () => bindHarnessTurnOptions,
   createCliRunTurn: () => createCliRunTurn,
   createCliWorkspaceServices: () => createCliWorkspaceServices,
+  resolveSessionCreateRoot: () => resolveSessionCreateRoot,
   resolveTurnLspProvider: () => resolveTurnLspProvider,
   runHarnessServer: () => runHarnessServer,
   startHarnessServer: () => startHarnessServer
 });
 import { createInterface as createInterface3 } from "node:readline";
+import path99 from "node:path";
 import { randomUUID as randomUUID12 } from "node:crypto";
 function createCliWorkspaceServices(workspaceRoot) {
   const mode = activePolicyLoadMode();
@@ -74655,6 +74965,23 @@ function createCliWorkspaceServices(workspaceRoot) {
     }
   };
 }
+function resolveSessionCreateRoot(params, cwd = process.cwd()) {
+  const raw = params.workspaceRoot;
+  if (typeof raw !== "string" || raw.trim() === "") {
+    return {
+      ok: false,
+      message: "session.create requires a non-empty string `workspaceRoot` (the sidecar never substitutes its own cwd: sessions on different workspaces must stay isolated)"
+    };
+  }
+  const root = raw.trim();
+  if (!path99.isAbsolute(root)) {
+    return {
+      ok: false,
+      message: `session.create workspaceRoot must be an absolute path (got '${root}') \u2014 a relative root would resolve against the sidecar cwd (${cwd}) and mix conversations (ADR-0016)`
+    };
+  }
+  return { ok: true, root };
+}
 function bindHarnessTurnOptions(input, workspaceRoot) {
   const turnInput = input;
   if (typeof turnInput.task !== "string" || turnInput.task.length === 0) {
@@ -74760,9 +75087,12 @@ function startHarnessServer(options = {}) {
         };
       }
       case "session.create": {
-        const root = typeof params.workspaceRoot === "string" ? params.workspaceRoot : process.cwd();
+        const resolved = resolveSessionCreateRoot(params);
+        if (!resolved.ok) {
+          return { id: req.id ?? null, ok: false, error: { code: "bad_request", message: resolved.message } };
+        }
         const session = server.createSession({
-          workspaceRoot: root,
+          workspaceRoot: resolved.root,
           runTurn: options.runTurn ?? createCliRunTurn(
             asRegistryAskHandler(permissionBridge),
             askUserBridge.onAskUser
@@ -74984,8 +75314,8 @@ var init_harnessClient = __esm({
           );
         }
         const id3 = this.nextId++;
-        return new Promise((resolve9, reject) => {
-          this.pending.set(id3, { resolve: resolve9, reject });
+        return new Promise((resolve10, reject) => {
+          this.pending.set(id3, { resolve: resolve10, reject });
           this.transport.write(JSON.stringify({ id: id3, method, params }));
         });
       }
@@ -75480,8 +75810,8 @@ __export(serve_exports, {
   runCompanionServe: () => runCompanionServe
 });
 import { createServer as createServer3 } from "node:http";
-import { existsSync as existsSync61 } from "node:fs";
-import { resolve as resolve8 } from "node:path";
+import { existsSync as existsSync62 } from "node:fs";
+import { resolve as resolve9 } from "node:path";
 function readBody(req, max = 2e6) {
   return new Promise((resolveBody, reject) => {
     const chunks = [];
@@ -75528,8 +75858,8 @@ async function runCompanionServe(opts = {}) {
   const { token, created } = loadOrCreateToken(opts.token);
   let projects = mergeProjects(fileCfg, opts.projects ?? []);
   projects = projects.filter((p3) => {
-    const abs = resolve8(p3.path);
-    if (!existsSync61(abs)) {
+    const abs = resolve9(p3.path);
+    if (!existsSync62(abs)) {
       process.stderr.write(
         `[zelari-code serve] skip missing project path: ${p3.path}
 `
@@ -75548,7 +75878,7 @@ async function runCompanionServe(opts = {}) {
     });
   }
   if (projects.length === 0) {
-    const cwd = resolve8(process.cwd());
+    const cwd = resolve9(process.cwd());
     projects = [
       {
         id: "default",
@@ -75580,9 +75910,9 @@ async function runCompanionServe(opts = {}) {
       return;
     }
     const url2 = parseUrl(req);
-    const path103 = url2.pathname.replace(/\/+$/, "") || "/";
+    const path104 = url2.pathname.replace(/\/+$/, "") || "/";
     try {
-      if (req.method === "GET" && (path103 === "/health" || path103 === "/v1/health")) {
+      if (req.method === "GET" && (path104 === "/health" || path104 === "/v1/health")) {
         sendJson2(res, 200, {
           ok: true,
           service: "zelari-companion",
@@ -75594,18 +75924,18 @@ async function runCompanionServe(opts = {}) {
         });
         return;
       }
-      if (path103.startsWith("/v1")) {
+      if (path104.startsWith("/v1")) {
         if (!tokenMatches(token, getBearer(req))) {
           sendJson2(res, 401, { ok: false, error: "unauthorized" });
           return;
         }
       }
-      if (req.method === "GET" && path103 === "/v1/config") {
+      if (req.method === "GET" && path104 === "/v1/config") {
         const snap = buildDesktopConfigSnapshot();
         sendJson2(res, 200, { ok: true, ...snap });
         return;
       }
-      if (req.method === "GET" && path103 === "/v1/projects") {
+      if (req.method === "GET" && path104 === "/v1/projects") {
         sendJson2(res, 200, {
           ok: true,
           projects: projects.map((p3) => ({
@@ -75616,7 +75946,7 @@ async function runCompanionServe(opts = {}) {
         });
         return;
       }
-      if (req.method === "GET" && path103 === "/v1/runs") {
+      if (req.method === "GET" && path104 === "/v1/runs") {
         sendJson2(res, 200, {
           ok: true,
           active: runs.getActive(),
@@ -75634,7 +75964,7 @@ async function runCompanionServe(opts = {}) {
         });
         return;
       }
-      if (req.method === "POST" && path103 === "/v1/runs") {
+      if (req.method === "POST" && path104 === "/v1/runs") {
         const raw = await readBody(req);
         let body = {};
         try {
@@ -75682,7 +76012,7 @@ async function runCompanionServe(opts = {}) {
         });
         return;
       }
-      const eventsMatch = /^\/v1\/runs\/([^/]+)\/events$/.exec(path103);
+      const eventsMatch = /^\/v1\/runs\/([^/]+)\/events$/.exec(path104);
       if (req.method === "GET" && eventsMatch) {
         const runId = eventsMatch[1];
         const run = runs.getRun(runId);
@@ -75747,7 +76077,7 @@ async function runCompanionServe(opts = {}) {
         }, 500);
         return;
       }
-      const cancelMatch = /^\/v1\/runs\/([^/]+)\/cancel$/.exec(path103);
+      const cancelMatch = /^\/v1\/runs\/([^/]+)\/cancel$/.exec(path104);
       if (req.method === "POST" && cancelMatch) {
         const runId = cancelMatch[1];
         const result = runs.cancel(runId);
@@ -75758,7 +76088,7 @@ async function runCompanionServe(opts = {}) {
         sendJson2(res, 200, { ok: true, cancelled: runId });
         return;
       }
-      const steerMatch = /^\/v1\/runs\/([^/]+)\/steer$/.exec(path103);
+      const steerMatch = /^\/v1\/runs\/([^/]+)\/steer$/.exec(path104);
       if (req.method === "POST" && steerMatch) {
         const runId = steerMatch[1];
         const raw = await readBody(req);
@@ -75924,26 +76254,26 @@ __export(doctor_exports, {
   runDoctor: () => runDoctor
 });
 import { execSync as execSync2 } from "node:child_process";
-import { existsSync as existsSync62, readFileSync as readFileSync46, readlinkSync, statSync as statSync10 } from "node:fs";
+import { existsSync as existsSync63, readFileSync as readFileSync46, readlinkSync, statSync as statSync10 } from "node:fs";
 import { createRequire as createRequire3 } from "node:module";
 import { fileURLToPath as fileURLToPath3 } from "node:url";
-import path99 from "node:path";
+import path100 from "node:path";
 function findPackageRoot(start) {
   let dir = start;
   for (let i = 0; i < 6; i += 1) {
-    const candidate = path99.join(dir, "package.json");
-    if (existsSync62(candidate)) {
+    const candidate = path100.join(dir, "package.json");
+    if (existsSync63(candidate)) {
       try {
         const pkg = JSON.parse(readFileSync46(candidate, "utf8"));
         if (pkg.name === "zelari-code") return dir;
       } catch {
       }
     }
-    const parent = path99.dirname(dir);
+    const parent = path100.dirname(dir);
     if (parent === dir) break;
     dir = parent;
   }
-  return path99.resolve(__dirname3, "..", "..", "..");
+  return path100.resolve(__dirname3, "..", "..", "..");
 }
 function tryExec(cmd) {
   try {
@@ -75957,7 +76287,7 @@ function tryExec(cmd) {
 }
 function readPackageJson4() {
   try {
-    const pkgPath = path99.join(packageRoot, "package.json");
+    const pkgPath = path100.join(packageRoot, "package.json");
     return JSON.parse(readFileSync46(pkgPath, "utf8"));
   } catch {
     return null;
@@ -75969,7 +76299,7 @@ function getGlobalPrefix() {
   return (process.env.npm_config_prefix || process.env.NPM_CONFIG_PREFIX || "").trim();
 }
 function isSourceCheckout() {
-  return existsSync62(path99.join(packageRoot, "src", "cli", "main.ts")) && existsSync62(path99.join(packageRoot, "apps", "desktop", "package.json"));
+  return existsSync63(path100.join(packageRoot, "src", "cli", "main.ts")) && existsSync63(path100.join(packageRoot, "apps", "desktop", "package.json"));
 }
 function checkShim(pkgName) {
   const prefix = getGlobalPrefix();
@@ -75978,10 +76308,10 @@ function checkShim(pkgName) {
   }
   const isWin = process.platform === "win32";
   const shimName = isWin ? "zelari-code.cmd" : "zelari-code";
-  const shimPath = path99.join(prefix, shimName);
-  if (!existsSync62(shimPath)) {
-    const localBin = path99.join(packageRoot, "bin", "zelari-code.js");
-    if (isSourceCheckout() && existsSync62(localBin)) {
+  const shimPath = path100.join(prefix, shimName);
+  if (!existsSync63(shimPath)) {
+    const localBin = path100.join(packageRoot, "bin", "zelari-code.js");
+    if (isSourceCheckout() && existsSync63(localBin)) {
       return WARN(
         `global shim not found at ${shimPath}
          source checkout \u2014 using ${localBin}
@@ -76014,8 +76344,8 @@ function checkShim(pkgName) {
          fix:  npm install -g ${pkgName}@latest --force`
       );
     }
-    const resolved = path99.resolve(path99.dirname(shimPath), target);
-    const expected = path99.join(
+    const resolved = path100.resolve(path100.dirname(shimPath), target);
+    const expected = path100.join(
       prefix,
       "node_modules",
       pkgName,
@@ -76057,8 +76387,8 @@ function checkNode(pkg) {
   return OK(`node ${raw} (engines.node ${enginesNode ?? ">= 20.0.0"})`);
 }
 function checkBundle() {
-  const bundle = path99.join(packageRoot, "dist", "cli", "main.bundled.js");
-  if (!existsSync62(bundle)) {
+  const bundle = path100.join(packageRoot, "dist", "cli", "main.bundled.js");
+  if (!existsSync63(bundle)) {
     return FAIL(
       `dist/cli/main.bundled.js missing at ${bundle}
          fix:  npm run build:cli   (then reinstall or run via tsx)`
@@ -76078,7 +76408,7 @@ function checkRuntimeDeps() {
   const missing = [];
   for (const dep of required2) {
     try {
-      const localReq = createRequire3(path99.join(packageRoot, "package.json"));
+      const localReq = createRequire3(path100.join(packageRoot, "package.json"));
       localReq.resolve(dep);
     } catch {
       missing.push(dep);
@@ -76355,7 +76685,7 @@ var init_doctor = __esm({
     init_metrics3();
     init_contextGrowthSummary();
     require3 = createRequire3(import.meta.url);
-    __dirname3 = path99.dirname(fileURLToPath3(import.meta.url));
+    __dirname3 = path100.dirname(fileURLToPath3(import.meta.url));
     packageRoot = findPackageRoot(__dirname3);
     OK = (message) => ({
       ok: true,
@@ -76463,8 +76793,8 @@ __export(userSettings_exports, {
   resolveUserSettings: () => resolveUserSettings,
   settingsOverrides: () => settingsOverrides
 });
-import { existsSync as existsSync63, readFileSync as readFileSync47 } from "node:fs";
-import path100 from "node:path";
+import { existsSync as existsSync64, readFileSync as readFileSync47 } from "node:fs";
+import path101 from "node:path";
 function parseBool(raw) {
   const v = raw.trim().toLowerCase();
   if (["1", "true", "yes", "on"].includes(v)) return true;
@@ -76479,7 +76809,7 @@ function parseEnum(values, raw) {
   return values.includes(v) ? v : void 0;
 }
 function loadFileLayer(file2, origin, warnings) {
-  if (!existsSync63(file2)) return {};
+  if (!existsSync64(file2)) return {};
   let raw;
   try {
     raw = readFileSync47(file2, "utf8");
@@ -76531,8 +76861,8 @@ function envValueFor(key, env) {
 function resolveUserSettings(opts = {}) {
   const cwd = opts.cwd ?? process.cwd();
   const env = opts.env ?? process.env;
-  const userPath = path100.join(zelariHome(), SETTINGS_FILE_NAME);
-  const projectPath = path100.join(cwd, ".zelari", SETTINGS_FILE_NAME);
+  const userPath = path101.join(zelariHome(), SETTINGS_FILE_NAME);
+  const projectPath = path101.join(cwd, ".zelari", SETTINGS_FILE_NAME);
   const warnings = [];
   const userLayer = loadFileLayer(userPath, "user", warnings);
   const projectLayer = loadFileLayer(projectPath, "project", warnings);
@@ -76590,8 +76920,8 @@ function printSettingsReport(opts = {}) {
   }
   lines.push("");
   lines.push("layers:");
-  lines.push(`  user:    ${r.userPath} (${existsSync63(r.userPath) ? "loaded" : "not found"})`);
-  lines.push(`  project: ${r.projectPath} (${existsSync63(r.projectPath) ? "loaded" : "not found"})`);
+  lines.push(`  user:    ${r.userPath} (${existsSync64(r.userPath) ? "loaded" : "not found"})`);
+  lines.push(`  project: ${r.projectPath} (${existsSync64(r.projectPath) ? "loaded" : "not found"})`);
   if (r.warnings.length > 0) {
     lines.push("");
     lines.push("warnings:");
@@ -76746,8 +77076,8 @@ __export(inspectSession_exports, {
   renderInspectReport: () => renderInspectReport,
   runInspectSession: () => runInspectSession
 });
-import path101 from "node:path";
-import { existsSync as existsSync64 } from "node:fs";
+import path102 from "node:path";
+import { existsSync as existsSync65 } from "node:fs";
 function formatLimit(limit) {
   return `${Math.round(limit / 1e3)}k`;
 }
@@ -76780,13 +77110,13 @@ function renderInspectReport(state3) {
 }
 async function runInspectSession(opts) {
   const sessionsDir2 = resolveSessionsDir({ workspaceRoot: opts.cwd ?? process.cwd() });
-  const sessionDir = path101.join(sessionsDir2, opts.sessionId);
-  const eventsPath = path101.join(sessionDir, "events.jsonl");
-  if (!existsSync64(sessionDir)) {
+  const sessionDir = path102.join(sessionsDir2, opts.sessionId);
+  const eventsPath = path102.join(sessionDir, "events.jsonl");
+  if (!existsSync65(sessionDir)) {
     console.error(`zelari-code inspect: no session directory at ${sessionDir}`);
     return 1;
   }
-  if (!existsSync64(eventsPath)) {
+  if (!existsSync65(eventsPath)) {
     console.error(`zelari-code inspect: session directory has no events.jsonl at ${eventsPath}`);
     return 1;
   }
@@ -76815,14 +77145,14 @@ __export(inspect_exports, {
   collectInspectReport: () => collectInspectReport,
   runInspect: () => runInspect
 });
-import path102 from "node:path";
-import { existsSync as existsSync65, readFileSync as readFileSync48, readdirSync as readdirSync13 } from "node:fs";
+import path103 from "node:path";
+import { existsSync as existsSync66, readFileSync as readFileSync48, readdirSync as readdirSync13 } from "node:fs";
 async function collectInspectReport(cwd = process.cwd()) {
   ensureBuiltinSkillsLoadedSync();
   const snap = listSkillsSnapshot(cwd);
   const mcp = listMcpServers(cwd);
-  const userMcpPath = path102.join(zelariHome(), "mcp.json");
-  const projectMcpPath = path102.join(cwd, ".zelari", "mcp.json");
+  const userMcpPath = path103.join(zelariHome(), "mcp.json");
+  const projectMcpPath = path103.join(cwd, ".zelari", "mcp.json");
   const globalHooks = globalHooksDir();
   const projectHooks = projectHooksDir(cwd);
   const projectTrusted = isFolderTrusted(cwd);
@@ -76848,11 +77178,11 @@ async function collectInspectReport(cwd = process.cwd()) {
       folders: listTrustedFolders()
     },
     configSources: [
-      { path: userMcpPath, exists: existsSync65(userMcpPath) },
-      { path: projectMcpPath, exists: existsSync65(projectMcpPath) },
-      { path: path102.join(zelariHome(), "provider.json"), exists: existsSync65(path102.join(zelariHome(), "provider.json")) },
-      { path: path102.join(cwd, ".zelari", "AGENTS.md"), exists: existsSync65(path102.join(cwd, ".zelari", "AGENTS.md")) },
-      { path: path102.join(cwd, "AGENTS.md"), exists: existsSync65(path102.join(cwd, "AGENTS.md")) }
+      { path: userMcpPath, exists: existsSync66(userMcpPath) },
+      { path: projectMcpPath, exists: existsSync66(projectMcpPath) },
+      { path: path103.join(zelariHome(), "provider.json"), exists: existsSync66(path103.join(zelariHome(), "provider.json")) },
+      { path: path103.join(cwd, ".zelari", "AGENTS.md"), exists: existsSync66(path103.join(cwd, ".zelari", "AGENTS.md")) },
+      { path: path103.join(cwd, "AGENTS.md"), exists: existsSync66(path103.join(cwd, "AGENTS.md")) }
     ],
     skills: {
       total: snap.skills.length,
@@ -76865,7 +77195,7 @@ async function collectInspectReport(cwd = process.cwd()) {
       user: mcp.servers.filter((s) => s.scope === "user").map((s) => ({ name: s.name, enabled: s.enabled !== false })),
       project: mcp.servers.filter((s) => s.scope === "project").map((s) => ({ name: s.name, enabled: s.enabled !== false })),
       projectTrusted,
-      projectConfigExists: existsSync65(projectMcpPath)
+      projectConfigExists: existsSync66(projectMcpPath)
     },
     hooks: {
       global: {
@@ -76892,12 +77222,12 @@ function listJsonFiles(dir) {
 }
 function findAgentsMd(cwd) {
   const candidates = [
-    path102.join(cwd, "AGENTS.md"),
-    path102.join(cwd, ".zelari", "AGENTS.md")
+    path103.join(cwd, "AGENTS.md"),
+    path103.join(cwd, ".zelari", "AGENTS.md")
   ];
   const found = [];
   for (const c of candidates) {
-    if (existsSync65(c)) {
+    if (existsSync66(c)) {
       try {
         const text = readFileSync48(c, "utf8");
         found.push(`${c} (${text.length} bytes)`);
@@ -77352,12 +77682,12 @@ function mergeChanges(unstaged, staged, untrackedPaths) {
   return [...byPath.values()].sort((a, b) => churn(b) - churn(a));
 }
 function runGit(args, cwd) {
-  return new Promise((resolve9, reject) => {
+  return new Promise((resolve10, reject) => {
     execFile(
       "git",
       args,
       { cwd, timeout: 5e3, windowsHide: true, maxBuffer: 4 * 1024 * 1024 },
-      (err, stdout) => err ? reject(err) : resolve9(stdout)
+      (err, stdout) => err ? reject(err) : resolve10(stdout)
     );
   });
 }
@@ -79936,7 +80266,7 @@ init_toolPermissions();
 init_askUserTimeout();
 function createPermissionAskHandler(opts) {
   const { setPicker: setPicker2, appendSystem: appendSystem2 } = opts;
-  return (req) => new Promise((resolve9) => {
+  return (req) => new Promise((resolve10) => {
     const cats = req.categories;
     const catLabel = cats.length === 1 ? cats[0] : cats.join("+") || "action";
     const title = `Allow tool "${req.toolName}"?`;
@@ -79962,7 +80292,7 @@ ${detail}${note}${claimsBlock}
       cancelAskTimeout();
       setPicker2(null);
       if (note2) appendSystem2?.(note2, Date.now());
-      resolve9(ok);
+      resolve10(ok);
     };
     cancelAskTimeout = armPickerTimeout(
       () => finish2(
@@ -80161,10 +80491,10 @@ function useChatTurn(params) {
           }
         } catch {
         }
-        const onAskUser = setPicker2 ? (req) => new Promise((resolve9) => {
+        const onAskUser = setPicker2 ? (req) => new Promise((resolve10) => {
           const choices = req.choices ?? [];
           if (choices.length < 2) {
-            resolve9(null);
+            resolve10(null);
             return;
           }
           setLastClarification({
@@ -80188,7 +80518,7 @@ _(${req.context})_` : "") + "\n\u2192 scegli dalla lista (il turno continua dopo
             settled = true;
             cancelAskTimeout();
             setPicker2(null);
-            resolve9(value);
+            resolve10(value);
           };
           cancelAskTimeout = armPickerTimeout(
             () => {
@@ -81134,10 +81464,10 @@ async function dispatchCouncilPromptImpl(text, deps, overrides = {}) {
   const { composeProjectContext: composeProjectContext2 } = await Promise.resolve().then(() => (init_composeContext(), composeContext_exports));
   const { FeedbackStore: FeedbackStore2 } = await Promise.resolve().then(() => (init_councilFeedback(), councilFeedback_exports));
   const workPhase = getPhase();
-  const onAskUserCouncil = setPicker2 ? (req) => new Promise((resolve9) => {
+  const onAskUserCouncil = setPicker2 ? (req) => new Promise((resolve10) => {
     const choices = req.choices ?? [];
     if (choices.length < 2) {
-      resolve9(null);
+      resolve10(null);
       return;
     }
     setLastClarification({
@@ -81161,7 +81491,7 @@ _(${req.context})_` : "") + "\n\u2192 scegli dalla lista (il membro riprende dop
       settled = true;
       cancelAskTimeout();
       setPicker2(null);
-      resolve9(value);
+      resolve10(value);
     };
     cancelAskTimeout = armPickerTimeout(
       () => {
@@ -81343,10 +81673,10 @@ _(${req.context})_` : "") + "\n\u2192 scegli dalla lista (il membro riprende dop
         appendSystem(setMessages, message, Date.now());
       },
       // v1.8.0: pause council when a member asks a structured question.
-      onClarification: setPicker2 ? (req) => new Promise((resolve9) => {
+      onClarification: setPicker2 ? (req) => new Promise((resolve10) => {
         const choices = req.choices ?? [];
         if (choices.length < 2) {
-          resolve9(null);
+          resolve10(null);
           return;
         }
         setLastClarification({
@@ -81367,7 +81697,7 @@ _(${req.context})_` : "") + "\n\u2192 scegli dalla lista (il membro riprende dop
           if (settled) return;
           settled = true;
           setPicker2(null);
-          resolve9(value);
+          resolve10(value);
         };
         setPicker2({
           kind: "clarification",
@@ -82025,10 +82355,10 @@ function usePermissionBroker(opts) {
       setPicker: setPicker2,
       appendSystem: (msg, at) => appendSystem(setMessages, msg, at ?? Date.now())
     });
-    const onQuestion = (req) => new Promise((resolve9) => {
+    const onQuestion = (req) => new Promise((resolve10) => {
       const choices = (req.choices ?? []).map((c) => String(c).trim()).filter((c) => c.length > 0);
       if (choices.length < 2) {
-        resolve9(null);
+        resolve10(null);
         return;
       }
       let settled = false;
@@ -82038,7 +82368,7 @@ function usePermissionBroker(opts) {
         settled = true;
         cancelWaitTimeout?.();
         setPicker2(null);
-        resolve9(value);
+        resolve10(value);
       };
       const waitTimeoutMs = askUserTimeoutMs();
       cancelWaitTimeout = armPickerTimeout(() => {
@@ -82107,7 +82437,7 @@ init_mode();
 init_ledger();
 
 // src/cli/evolution/proposals.ts
-import { existsSync as existsSync51, readFileSync as readFileSync39 } from "node:fs";
+import { existsSync as existsSync53, readFileSync as readFileSync40 } from "node:fs";
 import path81 from "node:path";
 var PROPOSALS_REL = path81.join(".zelari", "evolution", "proposals.jsonl");
 function proposalsPath(cwd) {
@@ -82115,10 +82445,10 @@ function proposalsPath(cwd) {
 }
 function readProposalStore(cwd) {
   const file2 = proposalsPath(cwd);
-  if (!existsSync51(file2)) return [];
+  if (!existsSync53(file2)) return [];
   let raw;
   try {
-    raw = readFileSync39(file2, "utf8");
+    raw = readFileSync40(file2, "utf8");
   } catch {
     return [];
   }
@@ -84008,7 +84338,7 @@ async function handleKrakenFanout(ctx, raw) {
     }
     return;
   }
-  const absCsv = isAbsolute3(parsed.args.csv_path) ? parsed.args.csv_path : joinPath(ctx.cwd, parsed.args.csv_path);
+  const absCsv = isAbsolute4(parsed.args.csv_path) ? parsed.args.csv_path : joinPath(ctx.cwd, parsed.args.csv_path);
   try {
     await fs39.access(absCsv);
   } catch {
@@ -84044,7 +84374,7 @@ async function handleKrakenFanout(ctx, raw) {
     );
   }
 }
-function isAbsolute3(p3) {
+function isAbsolute4(p3) {
   return /^([A-Za-z]:[\\/]|[\\/])/.test(p3);
 }
 function joinPath(a, b) {
@@ -84416,7 +84746,7 @@ ${browsers.output}` : "") + (browsers.ok ? "" : `
   return result;
 }
 function runPlaywrightInstallChromium(cwd, executor) {
-  return new Promise((resolve9) => {
+  return new Promise((resolve10) => {
     let stdout = "";
     let stderr = "";
     const stdio = ["ignore", "pipe", "pipe"];
@@ -84429,7 +84759,7 @@ function runPlaywrightInstallChromium(cwd, executor) {
       stderr += chunk.toString();
     });
     child.on("error", (err) => {
-      resolve9({
+      resolve10({
         ok: false,
         output: stdout + stderr,
         error: err.message,
@@ -84438,7 +84768,7 @@ function runPlaywrightInstallChromium(cwd, executor) {
     });
     child.on("close", (code) => {
       const ok = code === 0;
-      resolve9({
+      resolve10({
         ok,
         output: stdout + stderr,
         exitCode: code,
@@ -84448,7 +84778,7 @@ function runPlaywrightInstallChromium(cwd, executor) {
   });
 }
 function runNpm2(executor, args, cwd, mode, npmCliPath) {
-  return new Promise((resolve9) => {
+  return new Promise((resolve10) => {
     let stdout = "";
     let stderr = "";
     const stdio = ["ignore", "pipe", "pipe"];
@@ -84460,7 +84790,7 @@ function runNpm2(executor, args, cwd, mode, npmCliPath) {
       stderr += chunk.toString();
     });
     child.on("error", (err) => {
-      resolve9({
+      resolve10({
         ok: false,
         output: stdout + stderr,
         error: err.message,
@@ -84469,7 +84799,7 @@ function runNpm2(executor, args, cwd, mode, npmCliPath) {
     });
     child.on("close", (code) => {
       const ok = code === 0;
-      resolve9({
+      resolve10({
         ok,
         output: stdout + stderr,
         exitCode: code,
@@ -84568,7 +84898,7 @@ ${lineage}
 
 // src/cli/branchManager.ts
 init_paths();
-import { promises as fs42, existsSync as existsSync55, readFileSync as readFileSync41, writeFileSync as writeFileSync24, mkdirSync as mkdirSync21, statSync as statSync7, rmSync as rmSync3 } from "node:fs";
+import { promises as fs42, existsSync as existsSync57, readFileSync as readFileSync42, writeFileSync as writeFileSync25, mkdirSync as mkdirSync22, statSync as statSync7, rmSync as rmSync4 } from "node:fs";
 import path88 from "node:path";
 var META_FILENAME = "meta.json";
 var SESSIONS_SUBDIR = "sessions";
@@ -84589,11 +84919,11 @@ function sessionsPathFor(name, baseDir) {
 }
 function readBranchMeta(name, baseDir) {
   const metaPath = metaPathFor(name, baseDir);
-  if (!existsSync55(metaPath)) {
+  if (!existsSync57(metaPath)) {
     throw new BranchNotFoundError(`Branch "${name}" not found`);
   }
   try {
-    const raw = readFileSync41(metaPath, "utf-8");
+    const raw = readFileSync42(metaPath, "utf-8");
     const parsed = JSON.parse(raw);
     if (!parsed || typeof parsed !== "object" || typeof parsed.name !== "string" || typeof parsed.createdAt !== "number" || typeof parsed.fromSessionId !== "string") {
       throw new BranchCorruptError(`Branch "${name}" meta.json is malformed`);
@@ -84610,8 +84940,8 @@ function readBranchMeta(name, baseDir) {
 }
 function writeBranchMeta(name, baseDir, meta3) {
   const metaPath = metaPathFor(name, baseDir);
-  mkdirSync21(path88.dirname(metaPath), { recursive: true });
-  writeFileSync24(metaPath, JSON.stringify(meta3, null, 2), "utf-8");
+  mkdirSync22(path88.dirname(metaPath), { recursive: true });
+  writeFileSync25(metaPath, JSON.stringify(meta3, null, 2), "utf-8");
 }
 async function countSessions(name, baseDir) {
   const sessionsPath = sessionsPathFor(name, baseDir);
@@ -84649,7 +84979,7 @@ var SessionNotFoundError = class extends Error {
 };
 function branchExists(name, baseDir = getBranchesBaseDir()) {
   const bp = branchPathFor(name, baseDir);
-  return existsSync55(bp) && existsSync55(metaPathFor(name, baseDir));
+  return existsSync57(bp) && existsSync57(metaPathFor(name, baseDir));
 }
 async function createBranch(name, fromSessionId, baseDir = getBranchesBaseDir(), sessionsBaseDir = getSessionsBaseDir()) {
   if (!name || name.trim().length === 0) {
@@ -84662,12 +84992,12 @@ async function createBranch(name, fromSessionId, baseDir = getBranchesBaseDir(),
     throw new BranchAlreadyExistsError(name);
   }
   const sourcePath = path88.join(sessionsBaseDir, `${fromSessionId}.jsonl`);
-  if (!existsSync55(sourcePath)) {
+  if (!existsSync57(sourcePath)) {
     throw new SessionNotFoundError(`Source session "${fromSessionId}" not found at ${sourcePath}`);
   }
   const branchPath = branchPathFor(name, baseDir);
   const branchSessionsPath = sessionsPathFor(name, baseDir);
-  mkdirSync21(branchSessionsPath, { recursive: true });
+  mkdirSync22(branchSessionsPath, { recursive: true });
   const destPath = path88.join(branchSessionsPath, `${fromSessionId}.jsonl`);
   await fs42.copyFile(sourcePath, destPath);
   const meta3 = {
@@ -84695,7 +85025,7 @@ async function listBranches(baseDir = getBranchesBaseDir()) {
   const results = [];
   for (const entry of entries) {
     const metaPath = metaPathFor(entry, baseDir);
-    if (!existsSync55(metaPath)) continue;
+    if (!existsSync57(metaPath)) continue;
     try {
       const meta3 = readBranchMeta(entry, baseDir);
       const sessionCount = await countSessions(entry, baseDir);
@@ -84883,7 +85213,7 @@ async function handleWorkspaceReset(ctx, force) {
 init_provider2();
 
 // src/cli/skillHistory.ts
-import { promises as fs44, existsSync as existsSync56, statSync as statSync8, renameSync as renameSync6, appendFileSync as appendFileSync5, mkdirSync as mkdirSync22 } from "node:fs";
+import { promises as fs44, existsSync as existsSync58, statSync as statSync8, renameSync as renameSync6, appendFileSync as appendFileSync5, mkdirSync as mkdirSync23 } from "node:fs";
 init_paths();
 var SKILL_HISTORY_ROTATE_BYTES = 10 * 1024 * 1024;
 async function readSkillHistory(file2) {
@@ -86294,9 +86624,9 @@ init_metrics3();
 init_providerConfig();
 
 // src/cli/wizard/firstRun.ts
-import { existsSync as existsSync58 } from "node:fs";
+import { existsSync as existsSync60 } from "node:fs";
 function shouldRunWizard(input) {
-  const exists = input.exists ?? existsSync58;
+  const exists = input.exists ?? existsSync60;
   if (input.hasResetConfigFlag) {
     return { shouldRun: true, reason: "--reset-config flag forced wizard" };
   }
@@ -86769,8 +87099,8 @@ function normalizeDraft(raw, sourceUrl, provider, model) {
   let name = String(o.name ?? "").trim().toLowerCase().replace(/[^a-z0-9-]+/g, "-").replace(/^-+|-+$/g, "").slice(0, 64);
   if (!name || !/^[a-z0-9][a-z0-9-]{0,63}$/.test(name)) {
     try {
-      const path103 = new URL(sourceUrl).pathname.split("/").filter(Boolean).pop()?.replace(/\.[a-z0-9]+$/i, "").toLowerCase().replace(/[^a-z0-9-]+/g, "-").replace(/^-+|-+$/g, "").slice(0, 48);
-      name = path103 && /^[a-z0-9]/.test(path103) ? path103 : "imported-skill";
+      const path104 = new URL(sourceUrl).pathname.split("/").filter(Boolean).pop()?.replace(/\.[a-z0-9]+$/i, "").toLowerCase().replace(/[^a-z0-9-]+/g, "-").replace(/^-+|-+$/g, "").slice(0, 48);
+      name = path104 && /^[a-z0-9]/.test(path104) ? path104 : "imported-skill";
     } catch {
       name = "imported-skill";
     }
@@ -86933,7 +87263,7 @@ function runPreflight() {
 }
 async function backgroundUpdateCheck() {
   if (process.env.ANATHEMA_DEV === "1") return;
-  await new Promise((resolve9) => setTimeout(resolve9, 3e3));
+  await new Promise((resolve10) => setTimeout(resolve10, 3e3));
   try {
     const { checkForUpdate: checkForUpdate2 } = await Promise.resolve().then(() => (init_updater(), updater_exports));
     const info = await checkForUpdate2();
@@ -87183,7 +87513,7 @@ proposals: npm run evolve:propose \u2014 decisions in npm run evolve:decide (P1:
   }
   if (argv.includes("--help") || argv.includes("-h")) {
     console.log(
-      "zelari-code \u2014 AI Council coding agent CLI.\n\nUsage: zelari-code [options]\n\nOptions:\n  --version, -v       Print version and exit\n  --help, -h          Print this help and exit\n  --doctor [--json]   Diagnose install health (shim, bundle, PATH, deps,\n                      node/git/bash in the agent shell)\n  --inspect [--json]  Unified project inspection (config, skills, MCP,\n                      hooks, plugins, AGENTS.md, trust status)\n  --trust [path]      Trust the cwd (or path) so project MCP + hooks load\n  --fix-path          Add the npm global prefix to the user PATH\n                      (Windows only; fixes 'command not found' after install)\n  --fix-budget        Set recommended ZELARI_MAX_TOOL_LOOP_HARD=180,\n                      ZELARI_MAX_TOOL_LOOP_ITERATIONS=60, ZELARI_CONTEXT_LIMIT=400000\n                      at User scope (prevents the agent stopping mid-task)\n  --permission-mcp <socket>  MCP stdio server for external agent permission prompts\n                      (spawned by claude --permission-prompt-tool)\n  --memory-mcp       Optional MCP stdio server for project memory\n    --cwd <path>      Trusted project root (requires ZELARI_MEMORY_MCP=1)\n    --client-id <id>  Stable local owner identity for private memories\n  --memory-json <json>  Read-only project-memory bridge for Zelari Desktop\n  --skip-checks       Skip the boot-time prerequisite check\n                      (alias for ZELARI_SKIP_PREFLIGHT=1)\n  --no-wizard         Skip the first-run wizard\n  --reset-config      Re-run the wizard (clears provider.json on commit)\n  --headless          Run a single task without mounting the TUI\n    --task <text>       Task prompt (required in headless mode)\n    --output json|plain Output format (default: json)\n    --mode kraken|council|zelari  Dispatch mode (default: kraken; agent=alias)\n                      zelari/mission mode auto-scopes slices from open tasks in .zelari/plan.json\n    --council          Alias for --mode council\n    --phase plan|build  Work phase (default: build)\n    --provider <id>    Provider override (default: active)\n    --model <id>       Model override (default: provider default)\n    --profile <id>     Capability profile (minimal/v1|kraken/v1|council/v1|mission/v1)\n    --resume <id>      Continue a 2.0 spine session\n    --resume-mission   Resume .zelari/mission-state.json (not the spine)\n    --export-session <path>  Write zelari-session-export/1 after the run\n    --strict-done      Evidence-based BUILD completion gate\n    --allow-unverified  Exit 0 when strict is ON but nothing could be verified (M1.2)\n    --task-file <path>  Read the task prompt from a file (Windows argv cap)\n    --once             Single-cycle run (cron/git-hook triggers, ADR-0014)\n    --kraken-graph <goal>  Plan + execute a Kraken task graph\n                      (variant: --kraken-graph-file <path>; kill-switch\n                      ZELARI_KRAKEN_GRAPH=0)\n    --plan-only        Serialize the graph plan to .zelari/radio/ and exit 0\n    --run-plan <id>    Execute a pre-built .zelari/radio/plan-<id>.json\n    --gauntlet         Host-driven gauntlet loop (builder/critic tentacles)\n  --session-export <id>  Print a portable 2.0 session export (no LLM)\n  serve               Companion host for Android/remote clients (Tailscale)\n    --bind <ip>       Listen address (default: 127.0.0.1; use Tailscale IP)\n    --port <n>        Port (default: 7421)\n    --token <secret>  Bearer token (default: ~/.zelari-code/companion.token)\n    --project <path>  Allowlisted project root (repeatable)\n    --save-projects   Persist --project list to companion.json\n  --serve-harness     Long-lived harness kernel for hosts (NDJSON JSON-RPC\n                      on stdin/stdout; Desktop/companion transport)\n  --print-config      Print provider/model config as JSON (no secrets)\n  --print-settings    Print zelari.config.json values + the origin of\n                      each (default < user < project < env)\n  --permissions <p>   Permission preset: strict | standard | yolo \u2014 changes\n                      category DEFAULTS only (env vars and policy files win)\n  --evolve-status     Evolution ledger stats (read-only; ADR-0036; the\n                      ledger is written only when ZELARI_EVOLUTION=shadow)\n  --plugins-status    JSON status of optional plugins (Playwright, eslint, \u2026)\n  --plugins-install <id>  Install plugin (playwright also fetches Chromium)\n    --cwd <path>       Workspace for -D installs (default: process.cwd())\n  --set-config        Persist provider/model/endpoint\n    --provider <id>    Set active provider\n    --model <id>       Set model for that provider\n    --endpoint <url>   Custom OpenAI-compatible base URL\n    --endpoint-clear   Remove custom endpoint override\n    --thinking <spec>  Thinking effort (auto|off|low|medium|high|budget:N)\n  --set-key           Store an API key (never printed back)\n    --provider <id>    Provider id (required)\n    --key <secret>     API key (required)\n  --login-oauth       Start subscription OAuth (grok, chatgpt, anthropic)\n    --provider <id>    grok | chatgpt | anthropic\n    --code <paste>    Anthropic magic-link code (CODE#STATE)\n    --no-browser      Do not open the system browser\n  --refresh-oauth     Force-refresh an OAuth access token\n    --provider <id>    grok | chatgpt | anthropic\n  --logout-oauth      Clear stored OAuth credentials\n    --provider <id>    grok | chatgpt | anthropic\n  --discover-models   Refresh model list for a provider\n    --provider <id>    Provider (default: active)\n  --print-mcp         Print MCP server config (user + project)\n    --cwd <path>      Project root for .zelari/mcp.json\n  --set-mcp           Add/update an MCP server entry\n    --name <id>       Server name (required)\n    --command <bin>   Executable for stdio servers\n    --url <endpoint>  Streamable HTTP endpoint (e.g. UE 5.8 editor)\n    --args <json>     JSON array of args (stdio, optional)\n    --timeout <ms>    Per-server request timeout (http, optional)\n    --scope user|project  Default: user\n    --enabled true|false  Default: true\n    --cwd <path>      Required when scope=project\n  --set-mcp-preset    Install a named MCP preset (e.g. cua)\n    --preset cua      Cua Driver desktop computer-use (MCP)\n    --preset unreal-mcp  Unreal Engine 5.8+ editor (MCP over HTTP)\n    --scope user|project  Default: user\n    --cwd <path>      Required when scope=project\n  --remove-mcp        Remove an MCP server entry\n    --name <id> --scope user|project [--cwd <path>]\n  --print-skills      Print skills (builtin + user + project)\n    --cwd <path>      Project root for .zelari/skills\n  --set-skill         Add/update a SKILL.md skill\n    --name <id>       Skill id (required)\n    --description <t> One-line description (required)\n    --body <text>     Markdown instructions (required)\n    --category <c>    plan|refactor|debug|review|test|docs|ops|git|db|maint\n    --tools <csv>     Comma-separated required tools (optional)\n    --cost <l>        low|medium|high (default: medium)\n    --scope user|project  Default: user\n    --cwd <path>      Required when scope=project\n  --remove-skill      Remove a user/project SKILL.md\n    --name <id> --scope user|project [--cwd <path>]\n  --generate-skill-from-url  Fetch URL + draft skill via model (JSON)\n    --url <https://...>  Required\n    --provider <id>   Override active provider\n    --model <name>    Override model for the selected provider\n  --print-ssh-targets Print SSH deploy/monitor targets\n  --set-ssh-target    Upsert target (--json '{...}' or flags)\n  --remove-ssh-target --id <id>\n  --test-ssh-target   --id <id>  (BatchMode ssh true)\n  --print-ssh-pubkey  --path <private-or-.pub>  (display public key)\n\nEnvironment:\n  ZELARI_NO_WIZARD=1    Skip the first-run wizard\n  ZELARI_SKIP_PREFLIGHT=1  Skip the boot prerequisite check\n  ZELARI_NO_PLUGIN_PROMPT=1  Skip the boot plugin-install prompt\n  ZELARI_MEMORY_MCP=1  Enable the optional external memory MCP server\n  ANATHEMA_DEV=1        Disable background update check + preflight\n"
+      "zelari-code \u2014 AI Council coding agent CLI.\n\nUsage: zelari-code [options]\n\nOptions:\n  --version, -v       Print version and exit\n  --help, -h          Print this help and exit\n  --doctor [--json]   Diagnose install health (shim, bundle, PATH, deps,\n                      node/git/bash in the agent shell)\n  --inspect [--json]  Unified project inspection (config, skills, MCP,\n                      hooks, plugins, AGENTS.md, trust status)\n  --trust [path]      Trust the cwd (or path) so project MCP + hooks load\n  --fix-path          Add the npm global prefix to the user PATH\n                      (Windows only; fixes 'command not found' after install)\n  --fix-budget        Set recommended ZELARI_MAX_TOOL_LOOP_HARD=180,\n                      ZELARI_MAX_TOOL_LOOP_ITERATIONS=60, ZELARI_CONTEXT_LIMIT=400000\n                      at User scope (prevents the agent stopping mid-task)\n  --permission-mcp <socket>  MCP stdio server for external agent permission prompts\n                      (spawned by claude --permission-prompt-tool)\n  --memory-mcp       Optional MCP stdio server for project memory\n    --cwd <path>      Trusted project root (requires ZELARI_MEMORY_MCP=1)\n    --client-id <id>  Stable local owner identity for private memories\n  --memory-json <json>  Read-only project-memory bridge for Zelari Desktop\n  --skip-checks       Skip the boot-time prerequisite check\n                      (alias for ZELARI_SKIP_PREFLIGHT=1)\n  --no-wizard         Skip the first-run wizard\n  --reset-config      Re-run the wizard (clears provider.json on commit)\n  --headless          Run a single task without mounting the TUI\n    --task <text>       Task prompt (required in headless mode)\n    --output json|plain Output format (default: json)\n    --mode kraken|council|zelari  Dispatch mode (default: kraken; agent=alias)\n                      zelari/mission mode auto-scopes slices from open tasks in .zelari/plan.json\n    --council          Alias for --mode council\n    --phase plan|build  Work phase (default: build)\n    --provider <id>    Provider override (default: active)\n    --model <id>       Model override (default: provider default)\n    --profile <id>     Capability profile (minimal/v1|kraken/v1|council/v1|mission/v1)\n    --resume <id>      Continue a 2.0 spine session\n    --resume-mission   Resume .zelari/mission-state.json (not the spine)\n    --export-session <path>  Write zelari-session-export/1 after the run\n    --strict-done      Evidence-based BUILD completion gate\n    --allow-unverified  Exit 0 when strict is ON but nothing could be verified (M1.2)\n    --task-file <path>  Read the task prompt from a file (Windows argv cap)\n    --once             Single-cycle run (cron/git-hook triggers, ADR-0014)\n    --kraken-graph <goal>  Plan + execute a Kraken task graph\n                      (variant: --kraken-graph-file <path>; kill-switch\n                      ZELARI_KRAKEN_GRAPH=0)\n    --plan-only        Serialize the graph plan to .zelari/radio/ and exit 0\n    --run-plan <id>    Execute a pre-built .zelari/radio/plan-<id>.json\n    --gauntlet         Host-driven gauntlet loop (builder/critic tentacles)\n  --session-export <id>  Print a portable 2.0 session export (no LLM)\n  serve               Companion host for Android/remote clients (Tailscale)\n    --bind <ip>       Listen address (default: 127.0.0.1; use Tailscale IP)\n    --port <n>        Port (default: 7421)\n    --token <secret>  Bearer token (default: ~/.zelari-code/companion.token)\n    --project <path>  Allowlisted project root (repeatable)\n    --save-projects   Persist --project list to companion.json\n  --serve-harness     Long-lived harness kernel for hosts (NDJSON JSON-RPC\n                      on stdin/stdout; Desktop/companion transport)\n  --print-config      Print provider/model config as JSON (no secrets)\n  --print-settings    Print zelari.config.json values + the origin of\n                      each (default < user < project < env)\n  --permissions <p>   Permission preset: strict | standard | yolo \u2014 changes\n                      category DEFAULTS only (env vars and policy files win);\n                      yolo also auto-approves residual asks (unattended runs)\n  --evolve-status     Evolution ledger stats (read-only; ADR-0036; the\n                      ledger is written only when ZELARI_EVOLUTION=shadow)\n  --plugins-status    JSON status of optional plugins (Playwright, eslint, \u2026)\n  --plugins-install <id>  Install plugin (playwright also fetches Chromium)\n    --cwd <path>       Workspace for -D installs (default: process.cwd())\n  --set-config        Persist provider/model/endpoint\n    --provider <id>    Set active provider\n    --model <id>       Set model for that provider\n    --endpoint <url>   Custom OpenAI-compatible base URL\n    --endpoint-clear   Remove custom endpoint override\n    --thinking <spec>  Thinking effort (auto|off|low|medium|high|budget:N)\n  --set-key           Store an API key (never printed back)\n    --provider <id>    Provider id (required)\n    --key <secret>     API key (required)\n  --login-oauth       Start subscription OAuth (grok, chatgpt, anthropic)\n    --provider <id>    grok | chatgpt | anthropic\n    --code <paste>    Anthropic magic-link code (CODE#STATE)\n    --no-browser      Do not open the system browser\n  --refresh-oauth     Force-refresh an OAuth access token\n    --provider <id>    grok | chatgpt | anthropic\n  --logout-oauth      Clear stored OAuth credentials\n    --provider <id>    grok | chatgpt | anthropic\n  --discover-models   Refresh model list for a provider\n    --provider <id>    Provider (default: active)\n  --print-mcp         Print MCP server config (user + project)\n    --cwd <path>      Project root for .zelari/mcp.json\n  --set-mcp           Add/update an MCP server entry\n    --name <id>       Server name (required)\n    --command <bin>   Executable for stdio servers\n    --url <endpoint>  Streamable HTTP endpoint (e.g. UE 5.8 editor)\n    --args <json>     JSON array of args (stdio, optional)\n    --env <json|K=V>  Env for the server: JSON object or KEY=VALUE,\n                      repeatable (omit to keep the stored env)\n    --timeout <ms>    Per-server request timeout (http, optional)\n    --scope user|project  Default: user\n    --enabled true|false  Default: true\n    --cwd <path>      Required when scope=project\n  --set-mcp-preset    Install a named MCP preset (e.g. cua)\n    --preset cua      Cua Driver desktop computer-use (MCP)\n    --preset unreal-mcp  Unreal Engine 5.8+ editor (MCP over HTTP)\n    --scope user|project  Default: user\n    --cwd <path>      Required when scope=project\n  --remove-mcp        Remove an MCP server entry\n    --name <id> --scope user|project [--cwd <path>]\n  --print-skills      Print skills (builtin + user + project)\n    --cwd <path>      Project root for .zelari/skills\n  --set-skill         Add/update a SKILL.md skill\n    --name <id>       Skill id (required)\n    --description <t> One-line description (required)\n    --body <text>     Markdown instructions (required)\n    --category <c>    plan|refactor|debug|review|test|docs|ops|git|db|maint\n    --tools <csv>     Comma-separated required tools (optional)\n    --cost <l>        low|medium|high (default: medium)\n    --scope user|project  Default: user\n    --cwd <path>      Required when scope=project\n  --remove-skill      Remove a user/project SKILL.md\n    --name <id> --scope user|project [--cwd <path>]\n  --generate-skill-from-url  Fetch URL + draft skill via model (JSON)\n    --url <https://...>  Required\n    --provider <id>   Override active provider\n    --model <name>    Override model for the selected provider\n  --print-ssh-targets Print SSH deploy/monitor targets\n  --set-ssh-target    Upsert target (--json '{...}' or flags)\n  --remove-ssh-target --id <id>\n  --test-ssh-target   --id <id>  (BatchMode ssh true)\n  --print-ssh-pubkey  --path <private-or-.pub>  (display public key)\n\nEnvironment:\n  ZELARI_NO_WIZARD=1    Skip the first-run wizard\n  ZELARI_SKIP_PREFLIGHT=1  Skip the boot prerequisite check\n  ZELARI_NO_PLUGIN_PROMPT=1  Skip the boot plugin-install prompt\n  ZELARI_MEMORY_MCP=1  Enable the optional external memory MCP server\n  ANATHEMA_DEV=1        Disable background update check + preflight\n"
     );
     process.exit(0);
   }
@@ -87223,6 +87553,11 @@ proposals: npm run evolve:propose \u2014 decisions in npm run evolve:decide (P1:
         if (!Array.isArray(parsed)) throw new Error("--args must be a JSON array");
         args = parsed.map(String);
       }
+      const envValues = [];
+      for (let i = 0; i < argv.length - 1; i++) {
+        if (argv[i] === "--env") envValues.push(argv[i + 1]);
+      }
+      const env = parseMcpEnvFlag(envValues);
       const timeoutMs2 = timeoutRaw !== void 0 ? Number(timeoutRaw) : void 0;
       if (timeoutMs2 !== void 0 && (!Number.isFinite(timeoutMs2) || timeoutMs2 <= 0)) {
         throw new Error("--timeout must be a positive number of milliseconds");
@@ -87238,7 +87573,7 @@ proposals: npm run evolve:propose \u2014 decisions in npm run evolve:decide (P1:
         scope,
         name,
         projectRoot: cwd,
-        config: url2 ? { type: "http", url: url2, timeoutMs: timeoutMs2, serial: true, enabled } : { command, args, enabled }
+        config: url2 ? { type: "http", url: url2, timeoutMs: timeoutMs2, serial: true, enabled, env } : { command, args, env, enabled }
       });
       if (!result.ok) throw new Error(result.error);
       console.log(JSON.stringify({ ok: true, path: result.path, name, scope }));
@@ -87729,7 +88064,7 @@ function main() {
         closeMcpClients2();
       } catch {
       }
-      await new Promise((resolve9) => setImmediate(resolve9));
+      await new Promise((resolve10) => setImmediate(resolve10));
       process.exit(code);
     }).catch(async (err) => {
       console.error(