codesavant 4.0.0 → 4.0.2

package/dist/cli.js

@@ -43059,9 +43059,9 @@ var init_config = __esm(() => {
 
 // src/settings.ts
 import { existsSync as existsSync13 } from "fs";
-import { mkdir as mkdir12, readFile as readFile19, writeFile as writeFile4 } from "fs/promises";
-import { homedir as homedir8 } from "os";
-import { join as join16 } from "path";
+import { mkdir as mkdir11, readFile as readFile19, writeFile as writeFile4 } from "fs/promises";
+import { homedir as homedir7 } from "os";
+import { join as join14 } from "path";
 async function loadSettings(path) {
   if (!existsSync13(path)) {
     return {};
@@ -43087,12 +43087,12 @@ async function loadUserSettings() {
   return loadSettings(USER_SETTINGS_PATH);
 }
 async function loadProjectSettings(cwd2 = process.cwd()) {
-  return loadSettings(join16(cwd2, PROJECT_SETTINGS_PATH));
+  return loadSettings(join14(cwd2, PROJECT_SETTINGS_PATH));
 }
-async function saveUserSettings(settings, homeDir = homedir8()) {
-  const settingsDir = join16(homeDir, ".codesavant");
-  const settingsPath = join16(settingsDir, "settings.json");
-  await mkdir12(settingsDir, { recursive: true });
+async function saveUserSettings(settings, homeDir = homedir7()) {
+  const settingsDir = join14(homeDir, ".codesavant");
+  const settingsPath = join14(settingsDir, "settings.json");
+  await mkdir11(settingsDir, { recursive: true });
   const existing = await loadSettings(settingsPath);
   const merged = deepMerge(existing, settings);
   await writeFile4(settingsPath, JSON.stringify(merged, null, 2), {
@@ -43102,7 +43102,7 @@ async function saveUserSettings(settings, homeDir = homedir8()) {
 var USER_SETTINGS_PATH, PROJECT_SETTINGS_PATH = ".codesavant/settings.json", PartialConfigSchema;
 var init_settings = __esm(() => {
   init_config();
-  USER_SETTINGS_PATH = join16(homedir8(), ".codesavant", "settings.json");
+  USER_SETTINGS_PATH = join14(homedir7(), ".codesavant", "settings.json");
   PartialConfigSchema = ConfigSchema.partial();
 });
 
@@ -45606,7 +45606,7 @@ var require_semver2 = __commonJS((exports, module) => {
 });
 
 // src/marketplace/types.ts
-import { readFile as readFile24, mkdir as mkdir15 } from "fs/promises";
+import { readFile as readFile24, mkdir as mkdir14 } from "fs/promises";
 import { existsSync as existsSync15 } from "fs";
 import { dirname as dirname13 } from "path";
 
@@ -45643,7 +45643,7 @@ class InstallRecordStore {
     await this.save(existing.map((r) => r.slug === slug ? { ...r, pinned: false } : r));
   }
   async save(records) {
-    await mkdir15(dirname13(this.filePath), { recursive: true });
+    await mkdir14(dirname13(this.filePath), { recursive: true });
     await atomicWriteFile(this.filePath, JSON.stringify(records, null, 2));
   }
 }
@@ -45693,9 +45693,9 @@ var init_types2 = __esm(() => {
 
 // src/marketplace/installer.ts
 import { createHash as createHash5, timingSafeEqual } from "crypto";
-import { homedir as homedir11 } from "os";
-import { join as join21, dirname as dirname14 } from "path";
-import { mkdir as mkdir16 } from "fs/promises";
+import { homedir as homedir10 } from "os";
+import { join as join19, dirname as dirname14 } from "path";
+import { mkdir as mkdir15 } from "fs/promises";
 function normalizeContent(content) {
   return content.replace(/\r\n/g, `
 `);
@@ -45721,8 +45721,8 @@ class SkillInstaller {
   constructor(deps = {}) {
     this.fetchFn = deps.fetch ?? globalThis.fetch.bind(globalThis);
     this.writeFn = deps.atomicWrite ?? atomicWriteFile;
-    this.skillsDir = deps.skillsDir ?? join21(homedir11(), ".codesavant", "skills");
-    this.installStore = deps.installStore ?? new InstallRecordStore(join21(homedir11(), ".codesavant", "marketplace-installs.json"));
+    this.skillsDir = deps.skillsDir ?? join19(homedir10(), ".codesavant", "skills");
+    this.installStore = deps.installStore ?? new InstallRecordStore(join19(homedir10(), ".codesavant", "marketplace-installs.json"));
     this.localSkillChecker = deps.localSkillChecker;
   }
   async previewInstall(skill2) {
@@ -45756,8 +45756,8 @@ class SkillInstaller {
     if (!verifyHash(content, expectedHash)) {
       throw new HashMismatchError(expectedHash, hashContent(content));
     }
-    const targetPath = join21(this.skillsDir, skill2.slug, "SKILL.md");
-    await mkdir16(dirname14(targetPath), { recursive: true });
+    const targetPath = join19(this.skillsDir, skill2.slug, "SKILL.md");
+    await mkdir15(dirname14(targetPath), { recursive: true });
     await this.writeFn(targetPath, content);
     const record = {
       slug: skill2.slug,
@@ -46705,7 +46705,7 @@ async function hook(token, request2, route, parameters) {
   endpoint2.headers.authorization = withAuthorizationPrefix(token);
   return request2(endpoint2);
 }
-var b64url = "(?:[a-zA-Z0-9_-]+)", sep2 = "\\.", jwtRE, isJWT, createTokenAuth = function createTokenAuth2(token) {
+var b64url = "(?:[a-zA-Z0-9_-]+)", sep = "\\.", jwtRE, isJWT, createTokenAuth = function createTokenAuth2(token) {
   if (!token) {
     throw new Error("[@octokit/auth-token] No token passed to createTokenAuth");
   }
@@ -46718,7 +46718,7 @@ var b64url = "(?:[a-zA-Z0-9_-]+)", sep2 = "\\.", jwtRE, isJWT, createTokenAuth =
   });
 };
 var init_dist_bundle4 = __esm(() => {
-  jwtRE = new RegExp(`^${b64url}${sep2}${b64url}${sep2}${b64url}$`);
+  jwtRE = new RegExp(`^${b64url}${sep}${b64url}${sep}${b64url}$`);
   isJWT = jwtRE.test.bind(jwtRE);
 });
 
@@ -49964,8 +49964,8 @@ var require_light = __commonJS((exports, module) => {
         return this.Promise.resolve();
       }
       yieldLoop(t = 0) {
-        return new this.Promise(function(resolve12, reject) {
-          return setTimeout(resolve12, t);
+        return new this.Promise(function(resolve11, reject) {
+          return setTimeout(resolve11, t);
         });
       }
       computePenalty() {
@@ -50176,15 +50176,15 @@ var require_light = __commonJS((exports, module) => {
         return this._queue.length === 0;
       }
       async _tryToRun() {
-        var args, cb, error, reject, resolve12, returned, task2;
+        var args, cb, error, reject, resolve11, returned, task2;
         if (this._running < 1 && this._queue.length > 0) {
           this._running++;
-          ({ task: task2, args, resolve: resolve12, reject } = this._queue.shift());
+          ({ task: task2, args, resolve: resolve11, reject } = this._queue.shift());
           cb = await async function() {
             try {
               returned = await task2(...args);
               return function() {
-                return resolve12(returned);
+                return resolve11(returned);
               };
             } catch (error1) {
               error = error1;
@@ -50199,13 +50199,13 @@ var require_light = __commonJS((exports, module) => {
         }
       }
       schedule(task2, ...args) {
-        var promise, reject, resolve12;
-        resolve12 = reject = null;
+        var promise, reject, resolve11;
+        resolve11 = reject = null;
         promise = new this.Promise(function(_resolve, _reject) {
-          resolve12 = _resolve;
+          resolve11 = _resolve;
           return reject = _reject;
         });
-        this._queue.push({ task: task2, args, resolve: resolve12, reject });
+        this._queue.push({ task: task2, args, resolve: resolve11, reject });
         this._tryToRun();
         return promise;
       }
@@ -50609,14 +50609,14 @@ var require_light = __commonJS((exports, module) => {
               counts = this._states.counts;
               return counts[0] + counts[1] + counts[2] + counts[3] === at;
             };
-            return new this.Promise((resolve12, reject) => {
+            return new this.Promise((resolve11, reject) => {
               if (finished()) {
-                return resolve12();
+                return resolve11();
               } else {
                 return this.on("done", () => {
                   if (finished()) {
                     this.removeAllListeners("done");
-                    return resolve12();
+                    return resolve11();
                   }
                 });
               }
@@ -50709,9 +50709,9 @@ var require_light = __commonJS((exports, module) => {
             options2 = parser$5.load(options2, this.jobDefaults);
           }
           task2 = (...args2) => {
-            return new this.Promise(function(resolve12, reject) {
+            return new this.Promise(function(resolve11, reject) {
               return fn(...args2, function(...args3) {
-                return (args3[0] != null ? reject : resolve12)(args3);
+                return (args3[0] != null ? reject : resolve11)(args3);
               });
             });
           };
@@ -51388,7 +51388,7 @@ function getCachedAuthentication(state, auth2) {
   return newScope === currentScope ? authentication : false;
 }
 async function wait(seconds) {
-  await new Promise((resolve12) => setTimeout(resolve12, seconds * 1000));
+  await new Promise((resolve11) => setTimeout(resolve11, seconds * 1000));
 }
 async function waitForAccessToken(request2, clientId, clientType, verification) {
   try {
@@ -52302,7 +52302,7 @@ async function sendRequestWithRetries(state, request2, options2, createdAt, retr
     ++retries;
     const awaitTime = retries * 1000;
     state.log.warn(`[@octokit/auth-app] Retrying after 401 response to account for token replication delay (retry: ${retries}, wait: ${awaitTime / 1000}s)`);
-    await new Promise((resolve12) => setTimeout(resolve12, awaitTime));
+    await new Promise((resolve11) => setTimeout(resolve11, awaitTime));
     return sendRequestWithRetries(state, request2, options2, createdAt, retries);
   }
 }
@@ -53675,19 +53675,19 @@ var init_dist_bundle14 = __esm(() => {
 });
 
 // src/marketplace/registry.ts
-import { readFile as readFile26, mkdir as mkdir18 } from "fs/promises";
+import { readFile as readFile26, mkdir as mkdir17 } from "fs/promises";
 import { existsSync as existsSync16 } from "fs";
-import { homedir as homedir12 } from "os";
-import { join as join23, dirname as dirname15 } from "path";
+import { homedir as homedir11 } from "os";
+import { join as join21, dirname as dirname15 } from "path";
 
 class RegistryClient {
   octokit;
   cachePath;
   cacheTTLMs;
-  constructor(token, cacheTTLMs = 3600000, cacheDir = join23(homedir12(), ".codesavant"), octokitInstance) {
+  constructor(token, cacheTTLMs = 3600000, cacheDir = join21(homedir11(), ".codesavant"), octokitInstance) {
     this.octokit = octokitInstance ?? new Octokit2({ auth: token });
     this.cacheTTLMs = cacheTTLMs;
-    this.cachePath = join23(cacheDir, "marketplace-cache.json");
+    this.cachePath = join21(cacheDir, "marketplace-cache.json");
   }
   async search(query, tag) {
     const cacheKey = `${query}:${tag ?? ""}`;
@@ -53736,7 +53736,7 @@ class RegistryClient {
     }
   }
   async writeCache(cache4) {
-    await mkdir18(dirname15(this.cachePath), { recursive: true });
+    await mkdir17(dirname15(this.cachePath), { recursive: true });
     await atomicWriteFile(this.cachePath, JSON.stringify(cache4, null, 2));
   }
 }
@@ -53757,13 +53757,13 @@ var exports_marketplace_server = {};
 __export(exports_marketplace_server, {
   startMarketplaceServer: () => startMarketplaceServer
 });
-import { join as join26 } from "path";
+import { join as join24 } from "path";
 import { existsSync as existsSync19 } from "fs";
-import { homedir as homedir15 } from "os";
+import { homedir as homedir14 } from "os";
 function startMarketplaceServer() {
-  const uiDistPath = join26(import.meta.dir, "..", "..", "dist", "marketplace-ui");
-  const hasUI = existsSync19(join26(uiDistPath, "index.html"));
-  const installStore = new InstallRecordStore(join26(homedir15(), ".codesavant", "marketplace-installs.json"));
+  const uiDistPath = join24(import.meta.dir, "..", "..", "dist", "marketplace-ui");
+  const hasUI = existsSync19(join24(uiDistPath, "index.html"));
+  const installStore = new InstallRecordStore(join24(homedir14(), ".codesavant", "marketplace-installs.json"));
   const installer = new SkillInstaller({ installStore });
   const registry = new RegistryClient;
   const server = Bun.serve({
@@ -53775,11 +53775,11 @@ function startMarketplaceServer() {
         return ok ? undefined : new Response("WS upgrade failed", { status: 400 });
       }
       if (hasUI) {
-        const filePath = url.pathname === "/" || url.pathname === "" ? join26(uiDistPath, "index.html") : join26(uiDistPath, url.pathname);
+        const filePath = url.pathname === "/" || url.pathname === "" ? join24(uiDistPath, "index.html") : join24(uiDistPath, url.pathname);
         if (existsSync19(filePath)) {
           return new Response(Bun.file(filePath));
         }
-        return new Response(Bun.file(join26(uiDistPath, "index.html")));
+        return new Response(Bun.file(join24(uiDistPath, "index.html")));
       }
       return new Response(`<html><body><h1>CodeSavant Marketplace</h1><p>Web UI not found. Run: bun run build:marketplace</p></body></html>`, { headers: { "Content-Type": "text/html" } });
     },
@@ -53831,8 +53831,8 @@ var init_marketplace_server = __esm(() => {
 // src/cli.ts
 import { existsSync as existsSync20 } from "fs";
 import { readFile as readFile29 } from "fs/promises";
-import { homedir as homedir16 } from "os";
-import { join as join27 } from "path";
+import { homedir as homedir15 } from "os";
+import { join as join25 } from "path";
 import { parseArgs } from "util";
 
 // node_modules/ink/build/render.js
@@ -62429,13 +62429,37 @@ var PermissionConfigSchema = exports_external.object({
 var MAX_RAW_OUTPUT_LINES = 200;
 var MAX_STACK_LINES = 5;
 var ERROR_PATTERNS = [
+  {
+    type: "build_error",
+    pattern: /ERROR in|Failed to compile|Build failed|esbuild.*error/i
+  },
+  {
+    type: "port_conflict",
+    pattern: /EADDRINUSE|address already in use|port.*already in use/i
+  },
+  {
+    type: "network_error",
+    pattern: /ECONNREFUSED|ETIMEDOUT|fetch failed|getaddrinfo.*ENOTFOUND/i
+  },
+  {
+    type: "permission_error",
+    pattern: /EACCES|Permission denied|sudo.*required/i
+  },
+  {
+    type: "type_error",
+    pattern: /error TS\d+|Type '.*' is not assignable|mypy.*error/i
+  },
+  {
+    type: "dependency_error",
+    pattern: /Module not found|No such file or directory.*node_modules|ImportError|ModuleNotFoundError/i
+  },
   {
     type: "test_failure",
-    pattern: /FAIL|\u2717|\u2718|test.*failed|expect.*received|Expected:.*Received:/i
+    pattern: /FAIL|\u2717|\u2718|test.*failed|expect.*received|Expected:.*Received:|FAILED|pytest.*error|cargo test.*FAILED|--- FAIL:/i
   },
   {
     type: "compile_error",
-    pattern: /error TS\d+|Cannot find module|SyntaxError.*\.tsx?/i
+    pattern: /Cannot find module|SyntaxError.*\.tsx?|rustc.*error|javac.*error|gcc.*error|g\+\+.*error|go.*build.*error/i
   },
   {
     type: "lint_error",
@@ -62447,7 +62471,7 @@ var ERROR_PATTERNS = [
   },
   {
     type: "runtime_error",
-    pattern: /TypeError|ReferenceError|RangeError|at\s+\S+\s+\(/i
+    pattern: /TypeError|ReferenceError|RangeError|NullPointerException|panic:|SIGSEGV|Traceback.*most recent|at\s+\S+\s+\(/i
   }
 ];
 var FILE_LINE_PATTERN = /(?:\()?([a-zA-Z0-9_\-./]+\.[a-zA-Z]+):(\d+)(?::\d+)?(?:\))?/;
@@ -62528,12 +62552,12 @@ function truncateRawOutput(output) {
 }
 // src/recovery/output-truncator.ts
 var DEFAULTS = {
-  maxLines: 100,
+  maxLines: 300,
   headFraction: 0.3,
   tailFraction: 0.3,
   errorFraction: 0.4
 };
-var ERROR_LINE_PATTERN = /error|Error|FAIL|failed|panic|exception|at\s+\S+\s+\(/i;
+var ERROR_LINE_PATTERN = /error|Error|FAIL|failed|panic|exception|at\s+\S+\s+\(|^ERROR in|^error\[|^\u2717|^\u00D7|^\s*\u25CF|^Caused by:|^thread .* panicked|Traceback|EACCES|EADDRINUSE|ECONNREFUSED|Module not found/i;
 function truncateOutput(output, options2) {
   if (output.length === 0) {
     return output;
@@ -62575,7 +62599,6 @@ var DESTRUCTIVE_VERBS = new Set([
   "rm",
   "rmdir",
   "del",
-  "mv",
   "chmod",
   "chown",
   "kill",
@@ -62588,7 +62611,14 @@ var DESTRUCTIVE_TWO_WORD = new Set([
   "git checkout --",
   "drop table",
   "truncate table",
-  "delete from"
+  "delete from",
+  "npm uninstall",
+  "yarn remove",
+  "bun remove",
+  "pip uninstall",
+  "docker rm",
+  "docker rmi",
+  "docker system"
 ]);
 var SAFE_CONTENT_COMMANDS = new Set([
   "echo",
@@ -63969,7 +63999,7 @@ class MemoryResolver {
   }
 }
 // src/agent.ts
-import { join as join13 } from "path";
+import { join as join11 } from "path";
 
 // src/tools/ask-user.ts
 function validateQuestion(q, index) {
@@ -64209,85 +64239,9 @@ function getBackgroundTaskRegistry() {
   }
   return registryInstance;
 }
-// src/safety/path-sandbox.ts
-import { join as join11, resolve as resolve2, sep } from "path";
-import { realpathSync } from "fs";
-import { homedir as homedir5 } from "os";
-function safeRealpath(inputPath) {
-  const absolute = resolve2(inputPath);
-  try {
-    return realpathSync(absolute);
-  } catch {
-    const parts = absolute.split(sep).filter(Boolean);
-    let existing = sep;
-    let remainingIndex = 0;
-    for (let i = 0;i < parts.length; i++) {
-      const candidate = join11(existing, parts[i]);
-      try {
-        existing = realpathSync(candidate);
-        remainingIndex = i + 1;
-      } catch {
-        remainingIndex = i;
-        break;
-      }
-    }
-    const remaining = parts.slice(remainingIndex).join(sep);
-    return remaining ? join11(existing, remaining) : existing;
-  }
-}
-function getAllowedPrefixes(cwd2) {
-  return [
-    safeRealpath(cwd2),
-    safeRealpath(resolve2(homedir5(), ".codesavant")),
-    safeRealpath(resolve2(homedir5(), ".config"))
-  ];
-}
-function isPathAllowed(inputPath, cwd2) {
-  const resolved = safeRealpath(inputPath);
-  const allowed = getAllowedPrefixes(cwd2);
-  return allowed.some((prefix) => resolved === prefix || resolved.startsWith(prefix + sep));
-}
-function validateCommandPaths(command, cwd2) {
-  const patterns = [
-    /(?:^|\s)(\/[^\s;|&"'`]+)/g,
-    /"(\/[^"]+)"/g,
-    /'(\/[^']+)'/g
-  ];
-  for (const pattern of patterns) {
-    let match;
-    while ((match = pattern.exec(command)) !== null) {
-      const extractedPath = match[1];
-      if (!isPathAllowed(extractedPath, cwd2)) {
-        const resolvedPath = safeRealpath(extractedPath);
-        return {
-          command,
-          violatingPath: resolvedPath,
-          reason: `Path "${resolvedPath}" is outside the project directory and known config directories`
-        };
-      }
-    }
-  }
-  return null;
-}
-
-// src/safety/sandbox-logger.ts
-import { appendFile as appendFile3, mkdir as mkdir9 } from "fs/promises";
-import { join as join12 } from "path";
-async function logSandboxViolation(violation, projectDir) {
-  const logDir = join12(projectDir, ".codesavant");
-  const logPath = join12(logDir, "sandbox.log");
-  await mkdir9(logDir, { recursive: true });
-  const entry = `[${new Date().toISOString()}] BLOCKED: ${violation.command}
-  Path: ${violation.violatingPath}
-  Reason: ${violation.reason}
-
-`;
-  await appendFile3(logPath, entry, "utf-8");
-}
-
 // src/tools/bash.ts
 var DEFAULT_TIMEOUT = 120000;
-var MAX_OUTPUT_LENGTH = 50000;
+var MAX_OUTPUT_LENGTH = 200000;
 function parseGitCommand(command) {
   const trimmed = command.trim();
   const commitMatch = trimmed.match(/git\s+commit\s+.*-m\s+["']([^"']+)["']/);
@@ -64346,20 +64300,6 @@ async function executeBash(params, context) {
       };
     }
   }
-  const violation = validateCommandPaths(params.command, context.cwd);
-  if (violation) {
-    await logSandboxViolation(violation, context.cwd);
-    return {
-      success: false,
-      error: `Command blocked: ${violation.reason}
-
-Attempted command: ${violation.command}
-Violating path: ${violation.violatingPath}
-
-To fix: Use paths within your project directory (${context.cwd})`,
-      durationMs: Date.now() - startTime
-    };
-  }
   if (isDestructiveCommand(params.command)) {
     return {
       success: false,
@@ -64370,10 +64310,15 @@ This command may cause data loss. Please confirm execution.`,
       durationMs: Date.now() - startTime
     };
   }
-  return new Promise((resolve3) => {
+  const effectiveCwd = context.currentWorkingDir ?? context.cwd;
+  const actualCommand = params.run_in_background ? params.command : `${params.command}
+__CODESAVANT_EXIT=$?
+echo "__CODESAVANT_CWD=$(pwd)"
+exit $__CODESAVANT_EXIT`;
+  return new Promise((resolve2) => {
     try {
-      const proc = Bun.spawn(["bash", "-c", params.command], {
-        cwd: context.cwd,
+      const proc = Bun.spawn(["bash", "-c", actualCommand], {
+        cwd: effectiveCwd,
         env: { ...process.env },
         stdout: "pipe",
         stderr: "pipe"
@@ -64383,7 +64328,22 @@ This command may cause data loss. Please confirm execution.`,
       let timedOut = false;
       const timeoutId = setTimeout(() => {
         timedOut = true;
-        proc.kill();
+        try {
+          proc.kill();
+        } catch {}
+        let output = stdout;
+        if (stderr) {
+          output += (output ? `
+` : "") + stderr;
+        }
+        output = output.trimEnd();
+        output = truncateOutput(output, { maxLines: 100 });
+        resolve2({
+          success: false,
+          error: `Command timed out after ${timeout}ms`,
+          output: output || undefined,
+          durationMs: Date.now() - startTime
+        });
       }, timeout);
       if (params.run_in_background) {
         clearTimeout(timeoutId);
@@ -64393,7 +64353,7 @@ This command may cause data loss. Please confirm execution.`,
           command: params.command,
           proc
         });
-        resolve3({
+        resolve2({
           success: true,
           output: `Started background process (PID: ${proc.pid}, Task ID: ${taskId})`,
           durationMs: Date.now() - startTime,
@@ -64428,6 +64388,8 @@ This command may cause data loss. Please confirm execution.`,
         await Promise.all([readStdout(), readStderr()]);
         const exitCode = await proc.exited;
         clearTimeout(timeoutId);
+        if (timedOut)
+          return;
         if (context.hookExecutor) {
           await context.hookExecutor.executeHooks("post_bash", {
             command: params.command,
@@ -64444,39 +64406,75 @@ This command may cause data loss. Please confirm execution.`,
             stderr
           });
         }
-        let output = stdout;
-        if (stderr) {
-          output += (output ? `
-` : "") + stderr;
-        }
-        output = output.trimEnd();
-        output = truncateOutput(output, { maxLines: 100 });
-        if (output.length > MAX_OUTPUT_LENGTH) {
-          output = `${output.slice(0, MAX_OUTPUT_LENGTH)}
+        const cwdMatch = stdout.match(/__CODESAVANT_CWD=(.+)/);
+        if (cwdMatch && exitCode === 0) {
+          const newCwd = cwdMatch[1].trim();
+          if (newCwd !== effectiveCwd) {
+            context.previousWorkingDir = effectiveCwd;
+          }
+          context.currentWorkingDir = newCwd;
+        }
+        stdout = stdout.replace(/__CODESAVANT_CWD=.+\n?/, "");
+        const parts = [];
+        const trimmedStdout = stdout.trimEnd();
+        const trimmedStderr = stderr.trimEnd();
+        if (exitCode === 0) {
+          let output = trimmedStdout;
+          if (trimmedStderr) {
+            output += (output ? `
+` : "") + trimmedStderr;
+          }
+          output = output || "(no output)";
+          output = truncateOutput(output, { maxLines: 300 });
+          if (output.length > MAX_OUTPUT_LENGTH) {
+            output = `${output.slice(0, MAX_OUTPUT_LENGTH)}
 ... (output truncated)`;
-        }
-        if (timedOut) {
-          resolve3({
-            success: false,
-            error: `Command timed out after ${timeout}ms`,
-            output: output || undefined,
-            durationMs: Date.now() - startTime
+          }
+          resolve2({
+            success: true,
+            output,
+            durationMs: Date.now() - startTime,
+            metadata: {
+              exitCode,
+              pid: proc.pid,
+              stdout: trimmedStdout,
+              stderr: trimmedStderr
+            }
           });
         } else {
-          resolve3({
-            success: exitCode === 0,
-            output: output || (exitCode === 0 ? "(no output)" : undefined),
-            error: exitCode !== 0 ? `Exit code: ${exitCode}` : undefined,
+          if (trimmedStdout) {
+            parts.push(`[stdout]
+${trimmedStdout}`);
+          }
+          if (trimmedStderr) {
+            parts.push(`[stderr]
+${trimmedStderr}`);
+          }
+          parts.push(`[exit code: ${exitCode}]`);
+          let output = parts.join(`
+
+`);
+          output = truncateOutput(output, { maxLines: 300 });
+          if (output.length > MAX_OUTPUT_LENGTH) {
+            output = `${output.slice(0, MAX_OUTPUT_LENGTH)}
+... (output truncated)`;
+          }
+          resolve2({
+            success: false,
+            output,
+            error: `Exit code: ${exitCode}`,
             durationMs: Date.now() - startTime,
             metadata: {
               exitCode,
-              pid: proc.pid
+              pid: proc.pid,
+              stdout: trimmedStdout,
+              stderr: trimmedStderr
             }
           });
         }
       })();
     } catch (error) {
-      resolve3({
+      resolve2({
         success: false,
         error: error instanceof Error ? error.message : String(error),
         durationMs: Date.now() - startTime
@@ -64487,7 +64485,55 @@ This command may cause data loss. Please confirm execution.`,
 var bashTool = {
   definition: {
     name: "Bash",
-    description: "Execute shell commands",
+    description: `Executes a bash command and returns its output.
+
+The working directory persists between commands, but shell state (variables, aliases, functions) does not. Each command runs in a fresh bash shell from the persisted working directory.
+
+IMPORTANT: Avoid using this tool to run cat, head, tail, grep, rg, find, sed, awk, or echo commands when a dedicated tool is available. Use the appropriate dedicated tool instead:
+ - File search: Use Glob (NOT find or ls)
+ - Content search: Use Grep (NOT grep or rg)
+ - Read files: Use Read (NOT cat/head/tail)
+ - Edit files: Use Edit (NOT sed/awk)
+ - Write files: Use Write (NOT echo >/cat <<EOF)
+
+# Command Best Practices
+ - Always quote file paths that contain spaces with double quotes
+ - Use && to chain dependent commands, not separate tool calls
+ - Make independent tool calls in parallel when possible
+ - Avoid unnecessary sleep commands \u2014 run commands directly or use run_in_background
+ - You may specify a timeout in milliseconds (default 120000ms / 2 minutes)
+ - Use run_in_background for long-running processes (servers, watchers)
+
+# Git Safety
+ - NEVER force push to main/master
+ - Prefer new commits over amending existing commits
+ - Stage specific files by name rather than using git add -A or git add .
+ - NEVER skip hooks (--no-verify) unless explicitly asked
+ - Pass commit messages via HEREDOC for proper formatting:
+   git commit -m "$(cat <<'EOF'
+   Commit message here.
+   EOF
+   )"
+
+# Debugging Workflow
+When a command fails:
+1. Read the error output \u2014 identify the file, line number, and error type
+2. Use the Read tool to examine the relevant source file
+3. Fix the root cause, not symptoms
+4. Re-run the original command to verify the fix
+5. If the fix creates new errors, address them before moving on
+
+Do NOT:
+- Retry the same failing command expecting different results
+- Add try/catch or error suppression to hide errors
+- Skip failing tests \u2014 fix them
+
+# Project Awareness
+- Node.js/React/Next.js: Check package.json scripts, use npm/yarn/bun as appropriate
+- Python: Check for venv, requirements.txt, pyproject.toml
+- Rust: Use cargo commands, check Cargo.toml
+- Go: Use go build/test, check go.mod
+- When build errors are unclear, read framework config files (tsconfig.json, vite.config.ts, etc.)`,
     parameters: [
       {
         name: "command",
@@ -64527,9 +64573,9 @@ defaultRegistry.register(bashTool);
 // src/tools/edit.ts
 init_atomic_write();
 import { readFile as readFile12 } from "fs/promises";
-import { isAbsolute, normalize, resolve as resolve3 } from "path";
+import { isAbsolute, normalize, resolve as resolve2 } from "path";
 function validatePath(filePath, cwd2) {
-  const absolutePath = isAbsolute(filePath) ? normalize(filePath) : resolve3(cwd2, filePath);
+  const absolutePath = isAbsolute(filePath) ? normalize(filePath) : resolve2(cwd2, filePath);
   if (absolutePath.includes("\x00")) {
     throw new Error("Invalid path: null bytes not allowed");
   }
@@ -64648,12 +64694,12 @@ var editTool = {
 defaultRegistry.register(editTool);
 
 // src/tools/glob.ts
-import { isAbsolute as isAbsolute2, resolve as resolve4 } from "path";
+import { isAbsolute as isAbsolute2, resolve as resolve3 } from "path";
 var {Glob: Glob3 } = globalThis.Bun;
 async function executeGlob(params, context) {
   const startTime = Date.now();
   try {
-    const searchDir = params.path ? isAbsolute2(params.path) ? params.path : resolve4(context.cwd, params.path) : context.cwd;
+    const searchDir = params.path ? isAbsolute2(params.path) ? params.path : resolve3(context.cwd, params.path) : context.cwd;
     if (searchDir.includes("\x00")) {
       throw new Error("Invalid path: null bytes not allowed");
     }
@@ -64711,12 +64757,12 @@ defaultRegistry.register(globTool);
 
 // src/tools/grep.ts
 import { readFile as readFile13 } from "fs/promises";
-import { isAbsolute as isAbsolute3, resolve as resolve5 } from "path";
+import { isAbsolute as isAbsolute3, resolve as resolve4 } from "path";
 var {Glob: Glob4 } = globalThis.Bun;
 async function executeGrep(params, context) {
   const startTime = Date.now();
   try {
-    const searchPath = params.path ? isAbsolute3(params.path) ? params.path : resolve5(context.cwd, params.path) : context.cwd;
+    const searchPath = params.path ? isAbsolute3(params.path) ? params.path : resolve4(context.cwd, params.path) : context.cwd;
     if (searchPath.includes("\x00")) {
       throw new Error("Invalid path: null bytes not allowed");
     }
@@ -64838,7 +64884,7 @@ var grepTool = {
 defaultRegistry.register(grepTool);
 
 // src/tools/lsp.ts
-import { isAbsolute as isAbsolute4, resolve as resolve6 } from "path";
+import { isAbsolute as isAbsolute4, resolve as resolve5 } from "path";
 
 // src/lsp/manager.ts
 import { spawn } from "child_process";
@@ -64866,9 +64912,9 @@ class JsonRpcClient {
     const message = `Content-Length: ${Buffer.byteLength(body)}\r
 \r
 ${body}`;
-    return new Promise((resolve6, reject) => {
+    return new Promise((resolve5, reject) => {
       this.pending.set(id, {
-        resolve: resolve6,
+        resolve: resolve5,
         reject
       });
       this.config.write(message);
@@ -65197,7 +65243,7 @@ async function executeLsp(params, context) {
   }
   let resolvedPath;
   if (params.filePath) {
-    resolvedPath = isAbsolute4(params.filePath) ? params.filePath : resolve6(context.cwd, params.filePath);
+    resolvedPath = isAbsolute4(params.filePath) ? params.filePath : resolve5(context.cwd, params.filePath);
   }
   if (mcpManager?.isServerConnected?.()) {
     try {
@@ -65393,9 +65439,9 @@ defaultRegistry.register(lspTool);
 
 // src/tools/notebook-edit.ts
 import { readFile as readFile14, writeFile as writeFile2 } from "fs/promises";
-import { isAbsolute as isAbsolute5, normalize as normalize2, resolve as resolve7 } from "path";
+import { isAbsolute as isAbsolute5, normalize as normalize2, resolve as resolve6 } from "path";
 function validatePath2(filePath, cwd2) {
-  const absolutePath = isAbsolute5(filePath) ? normalize2(filePath) : resolve7(cwd2, filePath);
+  const absolutePath = isAbsolute5(filePath) ? normalize2(filePath) : resolve6(cwd2, filePath);
   if (absolutePath.includes("\x00")) {
     throw new Error("Invalid path: null bytes not allowed");
   }
@@ -65638,7 +65684,7 @@ defaultRegistry.register(notebookEditTool);
 
 // src/tools/notebook-read.ts
 import { readFile as readFile15 } from "fs/promises";
-import { isAbsolute as isAbsolute6, resolve as resolve8 } from "path";
+import { isAbsolute as isAbsolute6, resolve as resolve7 } from "path";
 async function executeNotebookRead(params, context) {
   const startTime = Date.now();
   if (!params.notebook_path) {
@@ -65648,7 +65694,7 @@ async function executeNotebookRead(params, context) {
       durationMs: Date.now() - startTime
     };
   }
-  const resolvedPath = isAbsolute6(params.notebook_path) ? params.notebook_path : resolve8(context.cwd, params.notebook_path);
+  const resolvedPath = isAbsolute6(params.notebook_path) ? params.notebook_path : resolve7(context.cwd, params.notebook_path);
   try {
     const content = await readFile15(resolvedPath, "utf-8");
     const notebook = JSON.parse(content);
@@ -65878,9 +65924,9 @@ defaultRegistry.register(exitPlanModeTool);
 
 // src/tools/read.ts
 import { readFile as readFile16, stat as stat4 } from "fs/promises";
-import { isAbsolute as isAbsolute7, normalize as normalize3, resolve as resolve9 } from "path";
+import { isAbsolute as isAbsolute7, normalize as normalize3, resolve as resolve8 } from "path";
 function validatePath3(filePath, cwd2) {
-  const absolutePath = isAbsolute7(filePath) ? normalize3(filePath) : resolve9(cwd2, filePath);
+  const absolutePath = isAbsolute7(filePath) ? normalize3(filePath) : resolve8(cwd2, filePath);
   if (absolutePath.includes("\x00")) {
     throw new Error("Invalid path: null bytes not allowed");
   }
@@ -66784,7 +66830,7 @@ async function executeTaskOutput(params, _context) {
           }
         };
       }
-      await new Promise((resolve10) => setTimeout(resolve10, pollInterval));
+      await new Promise((resolve9) => setTimeout(resolve9, pollInterval));
       elapsed += pollInterval;
     }
     return {
@@ -67350,10 +67396,10 @@ defaultRegistry.register(webSearchTool);
 // src/tools/write.ts
 init_atomic_write();
 import { existsSync as existsSync11 } from "fs";
-import { mkdir as mkdir10 } from "fs/promises";
-import { dirname as dirname10, isAbsolute as isAbsolute8, normalize as normalize4, resolve as resolve10 } from "path";
+import { mkdir as mkdir9 } from "fs/promises";
+import { dirname as dirname10, isAbsolute as isAbsolute8, normalize as normalize4, resolve as resolve9 } from "path";
 function validatePath4(filePath, cwd2) {
-  const absolutePath = isAbsolute8(filePath) ? normalize4(filePath) : resolve10(cwd2, filePath);
+  const absolutePath = isAbsolute8(filePath) ? normalize4(filePath) : resolve9(cwd2, filePath);
   if (absolutePath.includes("\x00")) {
     throw new Error("Invalid path: null bytes not allowed");
   }
@@ -67378,7 +67424,7 @@ async function executeWrite(params, context) {
     }
     const dir = dirname10(filePath);
     if (!existsSync11(dir)) {
-      await mkdir10(dir, { recursive: true });
+      await mkdir9(dir, { recursive: true });
     }
     await atomicWriteFile(filePath, params.content);
     if (context.hookExecutor) {
@@ -67869,19 +67915,19 @@ class SubagentSpawner {
     return true;
   }
   async waitForCompletion(agentId) {
-    return new Promise((resolve11, reject) => {
+    return new Promise((resolve10, reject) => {
       const checkInterval = setInterval(() => {
         const result = this.getResult(agentId);
         if (result) {
           clearInterval(checkInterval);
-          resolve11(result);
+          resolve10(result);
         }
         const status = this.getStatus(agentId);
         if (status?.status === "failed" || status?.status === "timeout") {
           clearInterval(checkInterval);
           const failedResult = this.getResult(agentId);
           if (failedResult) {
-            resolve11(failedResult);
+            resolve10(failedResult);
           } else {
             reject(new Error(`Agent ${agentId} failed`));
           }
@@ -67996,14 +68042,14 @@ class SubagentSpawner {
       agentType: agent.config.type,
       agentId: agent.id
     });
-    return new Promise((resolve11) => {
+    return new Promise((resolve10) => {
       setImmediate(() => {
         const output = `[${agent.config.type} agent]
 Prompt: ${agent.config.prompt.slice(0, 100)}${agent.config.prompt.length > 100 ? "..." : ""}
 Allowed tools: ${allowedTools.join(", ")}
 
 Execution completed.`;
-        resolve11({
+        resolve10({
           success: true,
           output,
           durationMs: Date.now() - agent.startTime,
@@ -68391,7 +68437,7 @@ class Agent {
       this.unifiedSkillLoader = createUnifiedSkillLoader(this.context.cwd, this.trustStoreInstance);
       await this.unifiedSkillLoader.loadManifests();
       this.skillCreatorInstance = createSkillCreator(this.context.cwd, this.unifiedSkillLoader, this.trustStoreInstance);
-      const proposalStorePath = join13(this.context.cwd, ".codesavant", "pending-proposals.json");
+      const proposalStorePath = join11(this.context.cwd, ".codesavant", "pending-proposals.json");
       const proposalStore = new ProposalStore(proposalStorePath);
       this.approvalGateInstance = createApprovalGate(this.skillCreatorInstance, this.trustStoreInstance, proposalStore);
       this.kitLoaderInstance = createKitLoader({
@@ -68971,8 +69017,8 @@ Blocking tool "${call.name}" executed. ${remainingCalls} subsequent tool call${r
   }
   async runBrainWriter() {
     try {
-      const globalDir = join13(this.context.homeDir, ".codesavant", "brain");
-      const projectDir = join13(this.context.cwd, ".codesavant", "memory");
+      const globalDir = join11(this.context.homeDir, ".codesavant", "brain");
+      const projectDir = join11(this.context.cwd, ".codesavant", "memory");
       const config = {
         globalDir,
         projectDir,
@@ -69105,9 +69151,9 @@ function createAgent(config, context) {
 
 // src/memory.ts
 import { existsSync as existsSync12 } from "fs";
-import { mkdir as mkdir11, readFile as readFile18, writeFile as writeFile3 } from "fs/promises";
-import { homedir as homedir6 } from "os";
-import { dirname as dirname11, isAbsolute as isAbsolute9, join as join14, resolve as resolve11 } from "path";
+import { mkdir as mkdir10, readFile as readFile18, writeFile as writeFile3 } from "fs/promises";
+import { homedir as homedir5 } from "os";
+import { dirname as dirname11, isAbsolute as isAbsolute9, join as join12, resolve as resolve10 } from "path";
 var {Glob: Glob5 } = globalThis.Bun;
 var MANAGED_MEMORY_FILENAME = "MANAGED.md";
 var USER_MEMORY_FILENAME = "SAVANT.md";
@@ -69119,8 +69165,8 @@ class MemoryLoader {
   cwd;
   constructor(cwd2, config = {}) {
     this.cwd = cwd2;
-    this.userDir = config.userDir ?? join14(homedir6(), ".codesavant");
-    this.projectDir = config.projectDir ?? join14(cwd2, ".codesavant");
+    this.userDir = config.userDir ?? join12(homedir5(), ".codesavant");
+    this.projectDir = config.projectDir ?? join12(cwd2, ".codesavant");
   }
   getUserDir() {
     return this.userDir;
@@ -69131,9 +69177,9 @@ class MemoryLoader {
   async loadAll() {
     const entries = [];
     const levels = [
-      { level: "managed", path: join14(this.userDir, MANAGED_MEMORY_FILENAME) },
-      { level: "user", path: join14(this.userDir, USER_MEMORY_FILENAME) },
-      { level: "project", path: join14(this.projectDir, USER_MEMORY_FILENAME) }
+      { level: "managed", path: join12(this.userDir, MANAGED_MEMORY_FILENAME) },
+      { level: "user", path: join12(this.userDir, USER_MEMORY_FILENAME) },
+      { level: "project", path: join12(this.projectDir, USER_MEMORY_FILENAME) }
     ];
     for (const { level, path } of levels) {
       if (existsSync12(path)) {
@@ -69148,7 +69194,7 @@ class MemoryLoader {
     return entries;
   }
   async loadWithImports(filePath, visited) {
-    const absolutePath = isAbsolute9(filePath) ? filePath : resolve11(this.cwd, filePath);
+    const absolutePath = isAbsolute9(filePath) ? filePath : resolve10(this.cwd, filePath);
     if (visited.has(absolutePath)) {
       throw new Error(`Circular import detected: ${absolutePath}`);
     }
@@ -69175,7 +69221,7 @@ class MemoryLoader {
           } catch {}
         }
       } else {
-        const resolvedPath = isAbsolute9(importPath) ? importPath : resolve11(dir, importPath);
+        const resolvedPath = isAbsolute9(importPath) ? importPath : resolve10(dir, importPath);
         if (existsSync12(resolvedPath)) {
           try {
             importedContent = await this.loadWithImports(resolvedPath, new Set(visited));
@@ -69200,7 +69246,7 @@ class MemoryLoader {
     const path = this.getPathForLevel(level);
     const dir = dirname11(path);
     if (!existsSync12(dir)) {
-      await mkdir11(dir, { recursive: true });
+      await mkdir10(dir, { recursive: true });
     }
     await writeFile3(path, content, "utf-8");
   }
@@ -69221,9 +69267,9 @@ ${content}` : content;
   getPathForLevel(level) {
     switch (level) {
       case "user":
-        return join14(this.userDir, USER_MEMORY_FILENAME);
+        return join12(this.userDir, USER_MEMORY_FILENAME);
       case "project":
-        return join14(this.projectDir, USER_MEMORY_FILENAME);
+        return join12(this.projectDir, USER_MEMORY_FILENAME);
       case "managed":
         throw new Error("Cannot modify managed memory");
     }
@@ -69234,8 +69280,8 @@ function createMemoryLoader(cwd2, config) {
 }
 
 // src/context.ts
-import { homedir as homedir7 } from "os";
-import { join as join15 } from "path";
+import { homedir as homedir6 } from "os";
+import { join as join13 } from "path";
 var DEFAULT_SYSTEM_PROMPT = `You are CodeSavant, an AI-powered software engineering assistant.
 
 ## Communication Guidelines
@@ -69253,6 +69299,27 @@ You help developers with:
 - Executing commands and managing files
 - Solving technical problems
 
+## Debugging & Error Recovery
+
+When a command fails:
+1. Read the error output carefully \u2014 identify the file, line, and error type
+2. Read the relevant source file to understand context
+3. Fix the root cause (not symptoms)
+4. Re-run the original command to verify the fix
+5. If the fix creates new errors, address them before moving on
+
+Do NOT:
+- Retry the same command hoping for different results
+- Add try/catch or error suppression to hide errors
+- Skip failing tests \u2014 fix them
+- Assume an error is transient without evidence
+
+When debugging build/test failures:
+- Check if dependencies are installed (node_modules, venv, etc.)
+- Check if the correct runtime version is available
+- Read framework config files when build errors are unclear
+- Run the build/test command the project actually uses (check package.json scripts, Makefile, etc.)
+
 ## Environment`;
 async function buildContext(config) {
   const parts = [];
@@ -69263,13 +69330,13 @@ async function buildContext(config) {
   let memoryEntries = [];
   if (config.memory !== false) {
     const loader = createMemoryLoader(config.cwd, { userDir: config.userDir });
-    const userHome = config.userDir || homedir7();
-    const brainDir = config.brainDir || join15(userHome, ".codesavant", "brain");
+    const userHome = config.userDir || homedir6();
+    const brainDir = config.brainDir || join13(userHome, ".codesavant", "brain");
     let brainStore;
     try {
       brainStore = new BrainStore({
         globalDir: brainDir,
-        projectDir: join15(config.cwd, ".codesavant", "memory")
+        projectDir: join13(config.cwd, ".codesavant", "memory")
       });
     } catch {}
     const resolver = new MemoryResolver({
@@ -69705,7 +69772,7 @@ class HttpTransport {
         }
         if (attempt < retryCount) {
           const delay = calculateBackoffDelay(attempt, baseDelay, DEFAULT_MAX_DELAY, true);
-          await new Promise((resolve12) => setTimeout(resolve12, delay));
+          await new Promise((resolve11) => setTimeout(resolve11, delay));
         }
       }
     }
@@ -69794,7 +69861,7 @@ class SseTransport {
           break;
         }
         if (attempt < retryCount) {
-          await new Promise((resolve12) => setTimeout(resolve12, retryDelay));
+          await new Promise((resolve11) => setTimeout(resolve11, retryDelay));
         }
       }
     }
@@ -69836,7 +69903,7 @@ class StdioTransport {
     if (this.connected) {
       return;
     }
-    return new Promise((resolve12, reject) => {
+    return new Promise((resolve11, reject) => {
       try {
         this.process = spawn2(this.config.command, this.config.args ?? [], {
           cwd: this.config.cwd,
@@ -69869,7 +69936,7 @@ class StdioTransport {
           this.process?.stdout?.off("data", onFirstData);
           clearTimeout(readyTimeout);
           this.connected = true;
-          resolve12();
+          resolve11();
         };
         this.process.stdout.once("data", onFirstData);
         const readyTimeout = setTimeout(() => {
@@ -69878,7 +69945,7 @@ class StdioTransport {
             return;
           if (this.process && !this.process.killed) {
             this.connected = true;
-            resolve12();
+            resolve11();
           } else {
             reject(new Error("Process failed to start within timeout"));
             this.cleanup();
@@ -69906,7 +69973,7 @@ class StdioTransport {
       method,
       params: params ?? {}
     });
-    return new Promise((resolve12, reject) => {
+    return new Promise((resolve11, reject) => {
       const timeout = setTimeout(() => {
         this.pendingRequests.delete(id);
         reject(new Error(`Request timeout: ${method}`));
@@ -69914,7 +69981,7 @@ class StdioTransport {
       this.pendingRequests.set(id, {
         resolve: (value) => {
           clearTimeout(timeout);
-          resolve12(value);
+          resolve11(value);
         },
         reject: (error) => {
           clearTimeout(timeout);
@@ -70386,8 +70453,8 @@ class HookExecutor {
         stdout: "pipe",
         stderr: "pipe"
       });
-      const timeoutPromise = new Promise((resolve12) => {
-        setTimeout(() => resolve12("timeout"), timeout);
+      const timeoutPromise = new Promise((resolve11) => {
+        setTimeout(() => resolve11("timeout"), timeout);
       });
       const exitPromise = proc.exited.then(() => "completed");
       const race = await Promise.race([exitPromise, timeoutPromise]);
@@ -70466,7 +70533,7 @@ function createHookExecutor(config) {
   return new HookExecutor(config);
 }
 // src/index.ts
-var VERSION = "3.4.1";
+var VERSION = "4.0.2";
 
 // src/notifications/notifier.ts
 import { randomUUID as randomUUID4 } from "crypto";
@@ -70980,10 +71047,10 @@ var jsx_dev_runtime4 = __toESM(require_jsx_dev_runtime(), 1);
 // src/onboarding/detection.ts
 init_settings();
 import { existsSync as existsSync14 } from "fs";
-import { join as join17 } from "path";
+import { join as join15 } from "path";
 async function checkOnboardingNeeded(homeDir, requestedProvider) {
-  const settingsDir = join17(homeDir, ".codesavant");
-  const settingsPath = join17(settingsDir, "settings.json");
+  const settingsDir = join15(homeDir, ".codesavant");
+  const settingsPath = join15(settingsDir, "settings.json");
   if (!existsSync14(settingsDir)) {
     return {
       needsOnboarding: true,
@@ -71053,7 +71120,7 @@ function OnboardingOrchestrator({
     setApiKey(submittedApiKey);
     setStep("validation");
     setValidationStatus("validating");
-    await new Promise((resolve12) => setTimeout(resolve12, 500));
+    await new Promise((resolve11) => setTimeout(resolve11, 500));
     if (submittedApiKey.length > 0) {
       setValidationStatus("success");
     } else {
@@ -71448,8 +71515,8 @@ async function* parseBedrockStream(response) {
 // src/providers/bedrock-auth.ts
 import { createHash as createHash4, createHmac } from "crypto";
 import { readFile as readFile20 } from "fs/promises";
-import { homedir as homedir9 } from "os";
-import { join as join18 } from "path";
+import { homedir as homedir8 } from "os";
+import { join as join16 } from "path";
 var defaultFileReader = async (path) => {
   try {
     return await readFile20(path, "utf-8");
@@ -71529,10 +71596,10 @@ function parseConfigFile(content) {
   return result;
 }
 function getCredentialsFilePath() {
-  return process.env.AWS_SHARED_CREDENTIALS_FILE || join18(homedir9(), ".aws", "credentials");
+  return process.env.AWS_SHARED_CREDENTIALS_FILE || join16(homedir8(), ".aws", "credentials");
 }
 function getConfigFilePath() {
-  return process.env.AWS_CONFIG_FILE || join18(homedir9(), ".aws", "config");
+  return process.env.AWS_CONFIG_FILE || join16(homedir8(), ".aws", "config");
 }
 function getProfileName(profile) {
   return profile || process.env.AWS_PROFILE || "default";
@@ -72098,7 +72165,7 @@ async function* parseOpenAIStreamWithTimeout(response, provider, chunkTimeout) {
         throw new Error(`Stream timeout: no data received for ${Math.round(timeSinceLastChunk / 1000)}s`);
       }
       const readPromise = reader.read();
-      const timeoutPromise = new Promise((resolve12) => setTimeout(() => resolve12({ done: true, value: undefined }), Math.min(5000, chunkTimeout - timeSinceLastChunk)));
+      const timeoutPromise = new Promise((resolve11) => setTimeout(() => resolve11({ done: true, value: undefined }), Math.min(5000, chunkTimeout - timeSinceLastChunk)));
       const { done, value } = await Promise.race([readPromise, timeoutPromise]);
       if (value) {
         lastChunkTime = Date.now();
@@ -72267,8 +72334,8 @@ var createDeepSeekProvider = createOpenAICompatProvider({
 });
 // src/providers/gemini-auth.ts
 import { readFile as readFile21 } from "fs/promises";
-import { homedir as homedir10 } from "os";
-import { join as join19 } from "path";
+import { homedir as homedir9 } from "os";
+import { join as join17 } from "path";
 var GOOGLE_AUTH_URL = "https://accounts.google.com/o/oauth2/v2/auth";
 var GOOGLE_TOKEN_URL = "https://oauth2.googleapis.com/token";
 var DEFAULT_SCOPE = "https://www.googleapis.com/auth/cloud-platform";
@@ -72400,7 +72467,7 @@ async function loadApplicationDefaultCredentials(_options) {
       return result;
     }
   }
-  const defaultPath = join19(homedir10(), ".config", "gcloud", "application_default_credentials.json");
+  const defaultPath = join17(homedir9(), ".config", "gcloud", "application_default_credentials.json");
   return loadCredentialsFromPath(defaultPath);
 }
 async function loadCredentialsFromPath(path) {
@@ -73068,8 +73135,8 @@ function createRouter(config) {
 // src/repl-ink.tsx
 import { existsSync as existsSync17 } from "fs";
 import { readFile as readFile27 } from "fs/promises";
-import { homedir as homedir13 } from "os";
-import { join as join24 } from "path";
+import { homedir as homedir12 } from "os";
+import { join as join22 } from "path";
 var import_react34 = __toESM(require_react(), 1);
 
 // src/background-tasks.ts
@@ -73484,7 +73551,7 @@ class CommandRegistry {
   }
 }
 // src/commands/history.ts
-import { readFile as readFile22, writeFile as writeFile6, mkdir as mkdir13 } from "fs/promises";
+import { readFile as readFile22, writeFile as writeFile6, mkdir as mkdir12 } from "fs/promises";
 import { dirname as dirname12 } from "path";
 
 class CommandHistory {
@@ -73507,7 +73574,7 @@ class CommandHistory {
       this.data = data;
     }
     try {
-      await mkdir13(dirname12(this.historyPath), { recursive: true });
+      await mkdir12(dirname12(this.historyPath), { recursive: true });
       await writeFile6(this.historyPath, JSON.stringify(this.data, null, 2));
     } catch {}
   }
@@ -76200,22 +76267,22 @@ function generateSlug(prompt) {
 }
 // src/craft-orchestrator/persistence.ts
 init_atomic_write();
-import { mkdir as mkdir14, readFile as readFile23, readdir as readdir5, unlink as unlink5, stat as stat5 } from "fs/promises";
-import { join as join20 } from "path";
+import { mkdir as mkdir13, readFile as readFile23, readdir as readdir5, unlink as unlink5, stat as stat5 } from "fs/promises";
+import { join as join18 } from "path";
 class CraftPersistence {
   baseDir;
   constructor(baseDir) {
-    this.baseDir = baseDir ?? join20(process.cwd(), ".codesavant", "craft");
+    this.baseDir = baseDir ?? join18(process.cwd(), ".codesavant", "craft");
   }
   async save(state) {
-    const slugDir = join20(this.baseDir, state.slug);
-    await mkdir14(slugDir, { recursive: true });
-    const filePath = join20(slugDir, "state.json");
+    const slugDir = join18(this.baseDir, state.slug);
+    await mkdir13(slugDir, { recursive: true });
+    const filePath = join18(slugDir, "state.json");
     const content = JSON.stringify(state, null, 2);
     await atomicWriteFile(filePath, content);
   }
   async load(slug) {
-    const filePath = join20(this.baseDir, slug, "state.json");
+    const filePath = join18(this.baseDir, slug, "state.json");
     try {
       const content = await readFile23(filePath, "utf-8");
       const data = JSON.parse(content);
@@ -76234,7 +76301,7 @@ class CraftPersistence {
     }
   }
   async clear(slug) {
-    const filePath = join20(this.baseDir, slug, "state.json");
+    const filePath = join18(this.baseDir, slug, "state.json");
     try {
       await unlink5(filePath);
     } catch (error) {
@@ -76250,7 +76317,7 @@ class CraftPersistence {
       const sessions = [];
       for (const entry of entries) {
         if (entry.isDirectory()) {
-          const stateFile = join20(this.baseDir, entry.name, "state.json");
+          const stateFile = join18(this.baseDir, entry.name, "state.json");
           try {
             await stat5(stateFile);
             sessions.push(entry.name);
@@ -76266,13 +76333,13 @@ class CraftPersistence {
     }
   }
   async saveResearchArtifact(slug, name, content) {
-    const slugDir = join20(this.baseDir, slug);
-    await mkdir14(slugDir, { recursive: true });
-    const filePath = join20(slugDir, name);
+    const slugDir = join18(this.baseDir, slug);
+    await mkdir13(slugDir, { recursive: true });
+    const filePath = join18(slugDir, name);
     await atomicWriteFile(filePath, content);
   }
   async loadResearchArtifact(slug, name) {
-    const filePath = join20(this.baseDir, slug, name);
+    const filePath = join18(this.baseDir, slug, name);
     try {
       return await readFile23(filePath, "utf-8");
     } catch (error) {
@@ -81708,8 +81775,8 @@ init_installer();
 init_dist_bundle14();
 var import_gray_matter6 = __toESM(require_gray_matter(), 1);
 import { createHash as createHash6 } from "crypto";
-import { mkdir as mkdir17, writeFile as writeFile7, rm } from "fs/promises";
-import { join as join22 } from "path";
+import { mkdir as mkdir16, writeFile as writeFile7, rm } from "fs/promises";
+import { join as join20 } from "path";
 import { tmpdir } from "os";
 function normalizeContent2(s) {
   return s.replace(/\r\n/g, `
@@ -81727,7 +81794,7 @@ class SkillPublisher {
   constructor(deps = {}) {
     this.octokit = deps.octokit;
     this.gitInstance = deps.git;
-    this.tempDir = deps.tempDir ?? join22(tmpdir(), `codesavant-publish-${Date.now()}`);
+    this.tempDir = deps.tempDir ?? join20(tmpdir(), `codesavant-publish-${Date.now()}`);
     this.getGitConfigFn = deps.getGitConfig ?? this.defaultGetGitConfig.bind(this);
   }
   async buildPublishDraft(skillContent) {
@@ -81829,10 +81896,10 @@ class SkillPublisher {
       repo: repo.name,
       names: ["codesavant-skill", ...draft.tags]
     });
-    await mkdir17(this.tempDir, { recursive: true });
-    await writeFile7(join22(this.tempDir, "SKILL.md"), draft.skillContent, "utf-8");
-    await writeFile7(join22(this.tempDir, "manifest.json"), draft.manifestContent, "utf-8");
-    await writeFile7(join22(this.tempDir, "README.md"), draft.readmeContent, "utf-8");
+    await mkdir16(this.tempDir, { recursive: true });
+    await writeFile7(join20(this.tempDir, "SKILL.md"), draft.skillContent, "utf-8");
+    await writeFile7(join20(this.tempDir, "manifest.json"), draft.manifestContent, "utf-8");
+    await writeFile7(join20(this.tempDir, "README.md"), draft.readmeContent, "utf-8");
     const git = this.gitInstance ?? simpleGit(this.tempDir);
     await git.init();
     await git.addConfig("user.email", draft.authorEmail || "noreply@codesavant.dev");
@@ -82258,7 +82325,7 @@ async function handleCheckpointCommand(agent, args) {
 async function handleMemoryCommand(agent) {
   const session = agent.getSession();
   const cwd2 = session?.metadata.cwd ?? agent.getCwd();
-  const projectPath = join24(cwd2, ".codesavant", "SAVANT.md");
+  const projectPath = join22(cwd2, ".codesavant", "SAVANT.md");
   if (existsSync17(projectPath)) {
     try {
       const content = await readFile27(projectPath, "utf-8");
@@ -82721,7 +82788,7 @@ function ReplInternal({
   const { theme: currentTheme, setTheme: setCurrentTheme } = useTheme();
   const backgroundTaskManager = import_react34.useMemo(() => createBackgroundTaskManager(), []);
   const commandRegistry = import_react34.useMemo(() => new CommandRegistry, []);
-  const commandHistory = import_react34.useMemo(() => new CommandHistory(join24(homedir13(), ".codesavant", "command-history.json")), []);
+  const commandHistory = import_react34.useMemo(() => new CommandHistory(join22(homedir12(), ".codesavant", "command-history.json")), []);
   import_react34.useEffect(() => {
     async function initRegistry() {
       const builtinDescriptions = {
@@ -83356,7 +83423,7 @@ Enter number to review, or "skip" to exit:`
               localSkillChecker: agent.getUnifiedSkillLoader()
             }),
             versionManager: new VersionManager,
-            installStore: new InstallRecordStore(join24(homedir13(), ".codesavant", "marketplace-installs.json"))
+            installStore: new InstallRecordStore(join22(homedir12(), ".codesavant", "marketplace-installs.json"))
           });
           setMessages((prev) => [
             ...prev,
@@ -83568,8 +83635,8 @@ Follow this skill's process for the user's request below.`
 
 `)
                   }]);
-                  return new Promise((resolve12) => {
-                    setCraftQuestionResolve(() => resolve12);
+                  return new Promise((resolve11) => {
+                    setCraftQuestionResolve(() => resolve11);
                   });
                 },
                 showRoadmap: (formatted) => {
@@ -83585,8 +83652,8 @@ Follow this skill's process for the user's request below.`
 
 Options: approve | feedback | abort`
                   }]);
-                  return new Promise((resolve12) => {
-                    setCraftApproval({ request: request2, resolve: resolve12 });
+                  return new Promise((resolve11) => {
+                    setCraftApproval({ request: request2, resolve: resolve11 });
                   });
                 },
                 getFeedback: async () => {
@@ -83594,8 +83661,8 @@ Options: approve | feedback | abort`
                     role: "system",
                     content: "Enter your feedback for the roadmap:"
                   }]);
-                  return new Promise((resolve12) => {
-                    setCraftFeedbackResolve(() => resolve12);
+                  return new Promise((resolve11) => {
+                    setCraftFeedbackResolve(() => resolve11);
                   });
                 },
                 showProgress: (message) => {
@@ -83613,8 +83680,8 @@ ${request2.content}
 
 Options: continue | pause | abort`
                   }]);
-                  return new Promise((resolve12) => {
-                    setCraftCheckIn({ request: request2, resolve: resolve12 });
+                  return new Promise((resolve11) => {
+                    setCraftCheckIn({ request: request2, resolve: resolve11 });
                   });
                 }
               };
@@ -83957,11 +84024,11 @@ Run: /plugin publish ${skillFilePath}`
     }
   }, [pendingQuestion]);
   const questionHandler = import_react34.useCallback(async (question) => {
-    return new Promise((resolve12) => {
+    return new Promise((resolve11) => {
       setPendingQuestion({
         question,
         resolve: (selectedIndices, labels) => {
-          resolve12({ selectedIndices, labels });
+          resolve11({ selectedIndices, labels });
         }
       });
     });
@@ -84127,14 +84194,14 @@ function renderRepl(props) {
 import { randomUUID as randomUUID5 } from "crypto";
 import { existsSync as existsSync18 } from "fs";
 import {
-  appendFile as appendFile4,
-  mkdir as mkdir19,
+  appendFile as appendFile3,
+  mkdir as mkdir18,
   readdir as readdir6,
   readFile as readFile28,
   writeFile as writeFile8
 } from "fs/promises";
-import { homedir as homedir14 } from "os";
-import { join as join25 } from "path";
+import { homedir as homedir13 } from "os";
+import { join as join23 } from "path";
 
 // src/sessions/types.ts
 var SESSIONS_DIR = ".codesavant/sessions";
@@ -84160,7 +84227,7 @@ function generateSessionTitle(content) {
 class SessionStorage {
   baseDir;
   constructor(baseDir) {
-    this.baseDir = baseDir ?? join25(homedir14(), SESSIONS_DIR);
+    this.baseDir = baseDir ?? join23(homedir13(), SESSIONS_DIR);
   }
   getBaseDir() {
     return this.baseDir;
@@ -84202,7 +84269,7 @@ class SessionStorage {
     const messagesPath = this.getMessagesPath(sessionId);
     const line = `${JSON.stringify(fullMessage)}
 `;
-    await appendFile4(messagesPath, line, "utf-8");
+    await appendFile3(messagesPath, line, "utf-8");
     if (metadata) {
       metadata.updatedAt = Date.now();
       metadata.messageCount++;
@@ -84248,7 +84315,7 @@ class SessionStorage {
     const sessions = [];
     for (const file of metadataFiles) {
       try {
-        const content = await readFile28(join25(this.baseDir, file), "utf-8");
+        const content = await readFile28(join23(this.baseDir, file), "utf-8");
         sessions.push(JSON.parse(content));
       } catch {}
     }
@@ -84277,14 +84344,14 @@ class SessionStorage {
   }
   async ensureDir() {
     if (!existsSync18(this.baseDir)) {
-      await mkdir19(this.baseDir, { recursive: true });
+      await mkdir18(this.baseDir, { recursive: true });
     }
   }
   getMetadataPath(sessionId) {
-    return join25(this.baseDir, `${sessionId}.meta.json`);
+    return join23(this.baseDir, `${sessionId}.meta.json`);
   }
   getMessagesPath(sessionId) {
-    return join25(this.baseDir, `${sessionId}.jsonl`);
+    return join23(this.baseDir, `${sessionId}.jsonl`);
   }
   async getMetadata(sessionId) {
     const path2 = this.getMetadataPath(sessionId);
@@ -84507,7 +84574,7 @@ function validateOptions(options2) {
   }
 }
 async function loadHooksFromSettings(cwd2) {
-  const settingsPath = join27(cwd2, ".codesavant", "settings.json");
+  const settingsPath = join25(cwd2, ".codesavant", "settings.json");
   if (!existsSync20(settingsPath)) {
     return {};
   }
@@ -84557,7 +84624,7 @@ async function main() {
     const mode = getExecutionMode(options2);
     if (mode === "interactive") {
       const requestedProvider = options2.provider;
-      const onboardingCheck = await checkOnboardingNeeded(homedir16(), requestedProvider);
+      const onboardingCheck = await checkOnboardingNeeded(homedir15(), requestedProvider);
       if (onboardingCheck.needsOnboarding) {
         let configuredProviders = null;
         const { waitUntilExit: waitUntilExit2 } = render_default(import_react35.default.createElement(OnboardingOrchestrator, {
@@ -84701,7 +84768,7 @@ Warning: Provider "${onboardingCheck.missingProvider}" is not configured.`);
             console.error("[Compaction failed]", error instanceof Error ? error.message : String(error));
           }
         }
-      }, { cwd: options2.cwd, homeDir: homedir16(), sessionId });
+      }, { cwd: options2.cwd, homeDir: homedir15(), sessionId });
       const context = await buildContext({
         cwd: options2.cwd,
         memory: true