skalpel 2.0.6 → 2.0.8

package/dist/cli/index.js

@@ -1028,6 +1028,23 @@ async function runStart() {
 // src/proxy/server.ts
 import http from "http";
 
+// src/proxy/streaming.ts
+var HOP_BY_HOP = /* @__PURE__ */ new Set([
+  "connection",
+  "keep-alive",
+  "proxy-authenticate",
+  "proxy-authorization",
+  "te",
+  "trailer",
+  "transfer-encoding",
+  "upgrade"
+]);
+var STRIP_HEADERS = /* @__PURE__ */ new Set([
+  ...HOP_BY_HOP,
+  "content-encoding",
+  "content-length"
+]);
+
 // src/proxy/logger.ts
 import fs9 from "fs";
 import path11 from "path";
@@ -1246,7 +1263,7 @@ function readJsonFile(filePath) {
   try {
     return JSON.parse(fs11.readFileSync(filePath, "utf-8"));
   } catch {
-    return {};
+    return null;
   }
 }
 function configureClaudeCode(agent, proxyConfig) {
@@ -1254,7 +1271,7 @@ function configureClaudeCode(agent, proxyConfig) {
   const configDir = path12.dirname(configPath);
   ensureDir(configDir);
   createBackup(configPath);
-  const config = readJsonFile(configPath);
+  const config = readJsonFile(configPath) ?? {};
   if (!config.env || typeof config.env !== "object") {
     config.env = {};
   }
@@ -1306,14 +1323,12 @@ function configureAgent(agent, proxyConfig) {
 }
 function unconfigureClaudeCode(agent) {
   const configPath = agent.configPath ?? path12.join(os7.homedir(), ".claude", "settings.json");
-  const backupPath = `${configPath}.skalpel-backup`;
-  if (fs11.existsSync(backupPath)) {
-    fs11.copyFileSync(backupPath, configPath);
-    fs11.unlinkSync(backupPath);
-    return;
-  }
   if (!fs11.existsSync(configPath)) return;
   const config = readJsonFile(configPath);
+  if (config === null) {
+    console.warn(`  [!] Could not parse ${configPath} \u2014 skipping to avoid data loss. Remove ANTHROPIC_BASE_URL manually if needed.`);
+    return;
+  }
   if (config.env && typeof config.env === "object") {
     delete config.env.ANTHROPIC_BASE_URL;
     if (Object.keys(config.env).length === 0) {
@@ -1321,20 +1336,23 @@ function unconfigureClaudeCode(agent) {
     }
   }
   fs11.writeFileSync(configPath, JSON.stringify(config, null, 2) + "\n");
+  const backupPath = `${configPath}.skalpel-backup`;
+  if (fs11.existsSync(backupPath)) {
+    fs11.unlinkSync(backupPath);
+  }
 }
 function unconfigureCodex(agent) {
   const configDir = process.platform === "win32" ? path12.join(os7.homedir(), "AppData", "Roaming", "codex") : path12.join(os7.homedir(), ".codex");
   const configPath = agent.configPath ?? path12.join(configDir, "config.toml");
+  if (fs11.existsSync(configPath)) {
+    let content = readTomlFile(configPath);
+    content = removeTomlKey(content, "openai_base_url");
+    fs11.writeFileSync(configPath, content);
+  }
   const backupPath = `${configPath}.skalpel-backup`;
   if (fs11.existsSync(backupPath)) {
-    fs11.copyFileSync(backupPath, configPath);
     fs11.unlinkSync(backupPath);
-    return;
   }
-  if (!fs11.existsSync(configPath)) return;
-  let content = readTomlFile(configPath);
-  content = removeTomlKey(content, "openai_base_url");
-  fs11.writeFileSync(configPath, content);
 }
 function unconfigureAgent(agent) {
   switch (agent.name) {
@@ -1570,15 +1588,13 @@ function removeShellEnvVars() {
     const beginIdx = content.indexOf(BEGIN_MARKER);
     const endIdx = content.indexOf(END_MARKER);
     if (beginIdx === -1 || endIdx === -1) continue;
+    const before = content.slice(0, beginIdx);
+    const after = content.slice(endIdx + END_MARKER.length);
+    const cleaned = (before.replace(/\n+$/, "") + after.replace(/^\n+/, "\n")).trimEnd() + "\n";
+    fs13.writeFileSync(profilePath, cleaned);
     const backupPath = `${profilePath}.skalpel-backup`;
     if (fs13.existsSync(backupPath)) {
-      fs13.copyFileSync(backupPath, profilePath);
       fs13.unlinkSync(backupPath);
-    } else {
-      const before = content.slice(0, beginIdx);
-      const after = content.slice(endIdx + END_MARKER.length);
-      const cleaned = (before.replace(/\n+$/, "") + after.replace(/^\n+/, "\n")).trimEnd() + "\n";
-      fs13.writeFileSync(profilePath, cleaned);
     }
     restored.push(profilePath);
   }
@@ -1589,7 +1605,8 @@ function removeShellEnvVars() {
 function print12(msg) {
   console.log(msg);
 }
-async function runUninstall() {
+async function runUninstall(options) {
+  const force = options?.force ?? false;
   const rl = readline3.createInterface({
     input: process.stdin,
     output: process.stdout
@@ -1604,23 +1621,17 @@ async function runUninstall() {
     print12("  Skalpel Uninstall");
     print12("  \u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500");
     print12("");
-    const confirm = await ask("  This will remove Skalpel proxy, service, and agent configurations. Continue? (y/N): ");
-    if (confirm.toLowerCase() !== "y") {
-      print12("  Aborted.");
-      rl.close();
-      return;
+    if (!force) {
+      const confirm = await ask("  This will remove Skalpel proxy, service, and agent configurations. Continue? (y/N): ");
+      if (confirm.toLowerCase() !== "y") {
+        print12("  Aborted.");
+        rl.close();
+        return;
+      }
+      print12("");
     }
-    print12("");
     const config = loadConfig();
     const removed = [];
-    print12("  Stopping proxy...");
-    const stopped = stopProxy(config);
-    if (stopped) {
-      print12("  [+] Proxy stopped");
-      removed.push("proxy process");
-    } else {
-      print12("  [ ] Proxy was not running");
-    }
     print12("  Removing system service...");
     try {
       uninstallService();
@@ -1630,6 +1641,14 @@ async function runUninstall() {
       const msg = err instanceof Error ? err.message : String(err);
       print12(`  [!] Could not remove service: ${msg}`);
     }
+    print12("  Stopping proxy...");
+    const stopped = stopProxy(config);
+    if (stopped) {
+      print12("  [+] Proxy stopped");
+      removed.push("proxy process");
+    } else {
+      print12("  [ ] Proxy was not running");
+    }
     print12("  Removing shell environment variables...");
     const restoredProfiles = removeShellEnvVars();
     if (restoredProfiles.length > 0) {
@@ -1657,13 +1676,25 @@ async function runUninstall() {
     print12("");
     const skalpelDir = path15.join(os10.homedir(), ".skalpel");
     if (fs14.existsSync(skalpelDir)) {
-      const removeDir = await ask("  Remove ~/.skalpel/ directory (contains config and logs)? (y/N): ");
-      if (removeDir.toLowerCase() === "y") {
+      let shouldRemove = force;
+      if (!force) {
+        const removeDir = await ask("  Remove ~/.skalpel/ directory (contains config and logs)? (y/N): ");
+        shouldRemove = removeDir.toLowerCase() === "y";
+      }
+      if (shouldRemove) {
         fs14.rmSync(skalpelDir, { recursive: true, force: true });
         print12("  [+] Removed ~/.skalpel/");
         removed.push("~/.skalpel/ directory");
       }
     }
+    print12("  Clearing npx cache...");
+    try {
+      clearNpxCache();
+      print12("  [+] npx cache cleared");
+      removed.push("npx cache");
+    } catch {
+      print12("  [ ] Could not clear npx cache (not critical)");
+    }
     print12("");
     print12("  \u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500");
     if (removed.length > 0) {
@@ -1682,6 +1713,28 @@ async function runUninstall() {
     throw err;
   }
 }
+function clearNpxCache() {
+  const npxCacheDir = path15.join(os10.homedir(), ".npm", "_npx");
+  if (!fs14.existsSync(npxCacheDir)) return;
+  const entries = fs14.readdirSync(npxCacheDir);
+  for (const entry of entries) {
+    const pkgJsonPath = path15.join(npxCacheDir, entry, "node_modules", "skalpel", "package.json");
+    const pkgJsonAlt = path15.join(npxCacheDir, entry, "node_modules", ".package-lock.json");
+    if (fs14.existsSync(pkgJsonPath)) {
+      fs14.rmSync(path15.join(npxCacheDir, entry), { recursive: true, force: true });
+      continue;
+    }
+    if (fs14.existsSync(pkgJsonAlt)) {
+      try {
+        const content = fs14.readFileSync(pkgJsonAlt, "utf-8");
+        if (content.includes('"skalpel"')) {
+          fs14.rmSync(path15.join(npxCacheDir, entry), { recursive: true, force: true });
+        }
+      } catch {
+      }
+    }
+  }
+}
 
 // src/cli/index.ts
 var require3 = createRequire2(import.meta.url);
@@ -1699,6 +1752,6 @@ program.command("logs").description("View proxy logs").option("-n, --lines <coun
 program.command("config").description("View or edit proxy configuration").argument("[subcommand]", "path | set").argument("[args...]", "Arguments for subcommand").action(runConfig);
 program.command("update").description("Update Skalpel to the latest version").action(runUpdate);
 program.command("setup").description("Run the Skalpel setup wizard").action(runWizard);
-program.command("uninstall").description("Remove Skalpel proxy and configurations").action(runUninstall);
+program.command("uninstall").description("Remove Skalpel proxy and configurations").option("--force", "Skip confirmation prompts and remove everything").action(runUninstall);
 program.parse(process.argv);
 //# sourceMappingURL=index.js.map