svamp-cli 0.1.34 → 0.1.36

package/dist/cli.mjs

@@ -91,7 +91,7 @@ async function main() {
   } else if (!subcommand || subcommand === "start") {
     await handleInteractiveCommand();
   } else if (subcommand === "--version" || subcommand === "-v") {
-    const pkg = await import('./package-D2n0SOTg.mjs').catch(() => ({ default: { version: "unknown" } }));
+    const pkg = await import('./package-DqJE7fYO.mjs').catch(() => ({ default: { version: "unknown" } }));
     console.log(`svamp version: ${pkg.default.version}`);
   } else {
     console.error(`Unknown command: ${subcommand}`);
@@ -100,7 +100,7 @@ async function main() {
   }
 }
 async function handleInteractiveCommand() {
-  const { runInteractive } = await import('./run-COUdcjR7.mjs');
+  const { runInteractive } = await import('./run-CZxKcatI.mjs');
   const interactiveArgs = subcommand === "start" ? args.slice(1) : args;
   let directory = process.cwd();
   let resumeSessionId;

package/dist/{package-D2n0SOTg.mjs → package-DqJE7fYO.mjs}

@@ -1,5 +1,5 @@
 var name = "svamp-cli";
-var version = "0.1.34";
+var version = "0.1.36";
 var description = "Svamp CLI — AI workspace daemon on Hypha Cloud";
 var author = "Amun AI AB";
 var license = "SEE LICENSE IN LICENSE";

package/dist/{run-COUdcjR7.mjs → run-CZxKcatI.mjs}

@@ -233,7 +233,7 @@ async function runLocalMode(opts) {
   log(`[local] Spawning: claude ${args.join(" ")}`);
   const claudeBin = findClaudeBinary();
   if (!claudeBin) {
-    console.error("Claude Code CLI not found. Install with: npm install -g @anthropic-ai/claude-code");
+    process.stderr.write("Claude Code CLI not found. Install with: npm install -g @anthropic-ai/claude-code\n");
     return { type: "exit", code: 1 };
   }
   process.stdin.pause();
@@ -293,14 +293,15 @@ async function runRemoteMode(opts) {
   } catch {
   }
   if (!claudeBin || !existsSync(claudeBin)) {
-    console.error("Claude Code CLI not found.");
+    process.stderr.write("Claude Code CLI not found.\n");
     return "exit";
   }
-  console.log("\n\x1B[90m" + "\u2550".repeat(50) + "\x1B[0m");
-  console.log("\x1B[36m  Remote mode\x1B[0m \u2014 processing message from web app");
-  console.log("\x1B[90m  Press Space Space to switch to local mode\x1B[0m");
-  console.log("\x1B[90m  Press Ctrl-C Ctrl-C to exit\x1B[0m");
-  console.log("\x1B[90m" + "\u2550".repeat(50) + "\x1B[0m\n");
+  const print = (s) => process.stderr.write(s + "\n");
+  print("\n\x1B[90m" + "\u2550".repeat(50) + "\x1B[0m");
+  print("\x1B[36m  Remote mode\x1B[0m \u2014 processing message from web app");
+  print("\x1B[90m  Press Space Space to switch to local mode\x1B[0m");
+  print("\x1B[90m  Press Ctrl-C Ctrl-C to exit\x1B[0m");
+  print("\x1B[90m" + "\u2550".repeat(50) + "\x1B[0m\n");
   let exitReason = null;
   let lastSpace = 0;
   let lastCtrlC = 0;
@@ -385,7 +386,7 @@ async function runRemoteMode(opts) {
         continue;
       }
       if (!exitReason && !abortController.signal.aborted) {
-        console.log("\n\x1B[90m  Agent idle. Waiting for next message...\x1B[0m");
+        process.stderr.write("\n\x1B[90m  Agent idle. Waiting for next message...\x1B[0m\n");
       }
     }
   } finally {
@@ -401,10 +402,8 @@ async function runClaudeTurn(opts) {
     "--output-format",
     "stream-json",
     "--verbose",
-    "--input-format",
-    "stream-json",
-    "--permission-prompt-tool",
-    "stdio"
+    "--print",
+    opts.message
   ];
   if (opts.hookSettingsPath) {
     args.push("--settings", opts.hookSettingsPath);
@@ -412,24 +411,19 @@ async function runClaudeTurn(opts) {
   if (opts.sessionId) {
     args.push("--resume", opts.sessionId);
   }
-  const claudeMode = mapPermissionMode(opts.permissionMode);
-  if (claudeMode) {
-    args.push("--permission-mode", claudeMode);
-  }
+  const claudeMode = mapPermissionMode(opts.permissionMode) || "bypassPermissions";
+  args.push("--permission-mode", claudeMode);
   if (opts.claudeArgs) {
     args.push(...opts.claudeArgs);
   }
   opts.log(`[remote] Spawning: claude ${args.join(" ")}`);
+  const spawnEnv = { ...process.env, CLAUDE_CODE_ENTRYPOINT: "sdk-ts" };
+  delete spawnEnv.CLAUDECODE;
   const child = spawn(opts.claudeBin, args, {
     stdio: ["pipe", "pipe", "pipe"],
     cwd: opts.cwd,
-    env: process.env
-  });
-  const userMsg = JSON.stringify({
-    type: "user",
-    message: { role: "user", content: opts.message }
+    env: spawnEnv
   });
-  child.stdin.write(userMsg + "\n");
   child.stdin.end();
   opts.onThinkingChange(true);
   let currentText = "";
@@ -455,10 +449,6 @@ async function runClaudeTurn(opts) {
       } catch {
         return;
       }
-      if (msg.type === "control_request") {
-        handleControlRequest(msg, child, opts.log);
-        return;
-      }
       handleSDKMessage(msg, opts, (text) => {
         process.stdout.write(text);
         currentText += text;
@@ -538,28 +528,6 @@ function handleSDKMessage(msg, opts, write) {
       opts.log(`[remote] Unknown msg type: ${msg.type}`);
   }
 }
-function handleControlRequest(msg, child, log) {
-  const request = msg.request;
-  const requestId = msg.request_id;
-  if (request?.subtype === "can_use_tool") {
-    log(`[remote] Auto-approving tool: ${request.tool_name}`);
-    const response = JSON.stringify({
-      type: "control_response",
-      response: {
-        subtype: "success",
-        request_id: requestId,
-        response: {
-          behavior: "allow",
-          updatedInput: request.input
-        }
-      }
-    });
-    try {
-      child.stdin.write(response + "\n");
-    } catch {
-    }
-  }
-}
 function mapPermissionMode(mode) {
   const map = {
     "default": "default",
@@ -667,17 +635,11 @@ async function runInteractive(options) {
   const token = process.env.HYPHA_TOKEN;
   if (serverUrl && token) {
     try {
-      const origLog = console.log;
-      const origWarn = console.warn;
-      console.log = () => {
-      };
-      console.warn = () => {
-      };
+      suppressHyphaLogs();
       server = await connectToHypha({ serverUrl, token, name: "svamp-interactive" });
-      console.log = origLog;
-      console.warn = origWarn;
       log("Connected to Hypha");
     } catch (err) {
+      restoreConsoleLogs();
       console.error(`\x1B[33mNote:\x1B[0m Could not connect to Hypha (${err.message}). Running in offline mode.`);
     }
   } else {
@@ -720,6 +682,7 @@ async function runInteractive(options) {
     lifecycleState: "running",
     flavor: "claude"
   };
+  let currentMode = "local";
   if (server) {
     const callbacks = {
       onUserMessage: (content, _meta) => {
@@ -744,6 +707,46 @@ async function runInteractive(options) {
         log("[hypha] Kill requested");
         cleanup();
         process.exit(0);
+      },
+      // File system operations — run locally since we have direct access
+      onBash: async (command, execCwd) => {
+        const { execSync } = await import('child_process');
+        const result = execSync(command, {
+          cwd: execCwd || cwd,
+          encoding: "utf-8",
+          timeout: 3e4,
+          maxBuffer: 1024 * 1024
+        });
+        return { output: result };
+      },
+      onReadFile: async (path) => {
+        const { readFileSync: readFileSync2 } = await import('fs');
+        return readFileSync2(path, "utf-8");
+      },
+      onWriteFile: async (path, content) => {
+        const { writeFileSync } = await import('fs');
+        writeFileSync(path, content, "utf-8");
+      },
+      onListDirectory: async (path) => {
+        const { readdirSync, statSync } = await import('fs');
+        const { join: joinPath } = await import('path');
+        return readdirSync(path).map((name) => {
+          try {
+            const st = statSync(joinPath(path, name));
+            return { name, type: st.isDirectory() ? "directory" : "file", size: st.size };
+          } catch {
+            return { name, type: "unknown", size: 0 };
+          }
+        });
+      },
+      onRipgrep: async (rgArgs, execCwd) => {
+        const { execSync } = await import('child_process');
+        return execSync(`rg ${rgArgs}`, {
+          cwd: execCwd || cwd,
+          encoding: "utf-8",
+          timeout: 15e3,
+          maxBuffer: 1024 * 1024
+        });
       }
     };
     try {
@@ -756,6 +759,7 @@ async function runInteractive(options) {
       );
       log(`Session service registered: svamp-session-${sessionId}`);
     } catch (err) {
+      restoreConsoleLogs();
       console.error(`\x1B[33mNote:\x1B[0m Could not register session on Hypha (${err.message}).`);
     }
   }
@@ -799,6 +803,7 @@ async function runInteractive(options) {
       messageWaiter.resolve(null);
       messageWaiter = null;
     }
+    restoreConsoleLogs();
   };
   let exiting = false;
   const handleExit = async () => {
@@ -813,12 +818,14 @@ async function runInteractive(options) {
   if (options.resumeSessionId) ; else if (options.continueSession) {
     claudeArgs.push("--continue");
   }
+  restoreConsoleLogs();
   console.log(`\x1B[36mSvamp interactive mode\x1B[0m`);
   if (server && sessionService) {
     console.log(`\x1B[90mSession synced to Hypha \u2014 visible in the web app\x1B[0m`);
     console.log(`\x1B[90mSession ID: ${sessionId.slice(0, 8)}\x1B[0m`);
   }
   console.log("");
+  if (server) suppressHyphaLogs();
   try {
     const exitCode = await loop({
       cwd,
@@ -829,7 +836,11 @@ async function runInteractive(options) {
       log,
       onModeChange: (mode) => {
         log(`Mode changed: ${mode}`);
+        currentMode = mode;
         if (sessionService) {
+          sessionService.updateAgentState({
+            controlledByUser: mode === "local"
+          });
           sessionService.updateMetadata({ ...metadata, lifecycleState: "running" });
           sessionService.sendKeepAlive(false, mode);
         }
@@ -893,5 +904,68 @@ function readMachineId() {
     return null;
   }
 }
+let _origLog = null;
+let _origWarn = null;
+let _origInfo = null;
+let _origStdoutWrite = null;
+const HYPHA_LOG_PATTERNS = [
+  "WebSocket connection",
+  "Connection established",
+  "reporting services",
+  "Successfully registered",
+  "Subscribing to",
+  "Successfully subscribed",
+  "Cleaning up all sessions",
+  "Cleaned up session",
+  "ClTaned up",
+  "Cleaned up ",
+  "Handling disconnection",
+  "Client ws-user-",
+  "WebSocket connection disconnected",
+  "disconnected, cleaning up",
+  "HYPHA SESSION",
+  "Listener registered",
+  "local RPC disconnection"
+];
+function isHyphaLogLine(text) {
+  return HYPHA_LOG_PATTERNS.some((p) => text.includes(p));
+}
+function suppressHyphaLogs() {
+  if (_origLog) return;
+  _origLog = console.log;
+  _origWarn = console.warn;
+  _origInfo = console.info;
+  _origStdoutWrite = process.stdout.write.bind(process.stdout);
+  console.log = (...args) => {
+    if (DEBUG) _origLog.call(console, "[hypha-log]", ...args);
+  };
+  console.warn = (...args) => {
+    if (DEBUG) _origWarn.call(console, "[hypha-warn]", ...args);
+  };
+  console.info = (...args) => {
+    if (DEBUG) _origInfo.call(console, "[hypha-info]", ...args);
+  };
+  process.stdout.write = function(chunk, ...rest) {
+    const text = typeof chunk === "string" ? chunk : chunk?.toString?.() || "";
+    if (isHyphaLogLine(text)) {
+      if (DEBUG) _origStdoutWrite(`[hypha-stdout] ${text}`);
+      return true;
+    }
+    return _origStdoutWrite.call(process.stdout, chunk, ...rest);
+  };
+}
+function restoreConsoleLogs() {
+  if (!_origLog) return;
+  console.log = _origLog;
+  console.warn = _origWarn;
+  console.info = _origInfo;
+  if (_origStdoutWrite) {
+    process.stdout.write = _origStdoutWrite;
+  }
+  _origLog = null;
+  _origWarn = null;
+  _origInfo = null;
+  _origStdoutWrite = null;
+}
 
 export { runInteractive };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "svamp-cli",
-  "version": "0.1.34",
+  "version": "0.1.36",
   "description": "Svamp CLI — AI workspace daemon on Hypha Cloud",
   "author": "Amun AI AB",
   "license": "SEE LICENSE IN LICENSE",