@versot/vaguspi 0.1.4 → 0.1.6

package/dist/bin.js

@@ -1,7 +1,7 @@
 #!/usr/bin/env node
 
 // apps/cli/src/bin.ts
-import { readFileSync as readFileSync7 } from "node:fs";
+import { existsSync as existsSync9, readFileSync as readFileSync7 } from "node:fs";
 import { parseArgs } from "node:util";
 
 // apps/cli/src/commands/daemon.ts
@@ -870,7 +870,7 @@ var ExtensionUiBridge = class {
 };
 
 // packages/host/engine/dist/vagus-engine.js
-var VagusEngine = class {
+var VagusEngine = class _VagusEngine {
   options;
   sessions = /* @__PURE__ */ new Map();
   /**
@@ -1064,8 +1064,29 @@ var VagusEngine = class {
       if (entry.type !== "message" || !entry.message)
         continue;
       const role = String(entry.message.role);
-      if (role === "toolResult")
+      if (role === "toolResult") {
+        const m = entry.message;
+        if (typeof m.toolCallId === "string") {
+          const tid = m.toolCallId;
+          const res = resultsById.get(tid);
+          views.push({
+            role: "tool",
+            text: "",
+            toolCalls: [{
+              id: tid,
+              name: typeof m.toolName === "string" ? m.toolName : "tool",
+              args: "",
+              ...res ? {
+                result: truncateDisplay(res.result, 2e4),
+                isError: res.isError,
+                ...res.diff !== void 0 ? { diff: res.diff } : {},
+                ...res.patch !== void 0 ? { patch: res.patch } : {}
+              } : {}
+            }]
+          });
+        }
         continue;
+      }
       const entryTs = new Date(entry.timestamp).getTime();
       if (role === "user")
         closeTurn();
@@ -1698,8 +1719,6 @@ var VagusEngine = class {
   closeSessionForCwd(cwd) {
     for (const [sid, session] of this.sessions) {
       if (session.sessionManager?.getCwd() === cwd) {
-        process.stderr.write(`vagus: disposing session ${sid} (cwd=${cwd})
-`);
         try {
           session.dispose();
         } catch (err) {
@@ -1769,10 +1788,9 @@ var VagusEngine = class {
       return void 0;
     }
   }
-  /** Restores an archived project: moves its session files back under `sessions/`. */
   /** Restores an archived project by its encoded dir name (unique identity). */
   async unarchiveProjectByDir(dirKey) {
-    if (!dirKey || dirKey.includes("/") || dirKey.includes("\\") || dirKey.includes(".."))
+    if (!_VagusEngine.isSafeDirKey(dirKey))
       return;
     const agentDir = this.agentDirPath();
     const src = join5(agentDir, "archived", dirKey);
@@ -1824,12 +1842,10 @@ var VagusEngine = class {
   /** Permanently deletes an archived project dir by its encoded dir name.
    *  dirKey (not cwd) is the identity — cwds can repeat across archive dirs. */
   async deleteArchivedProjectByDir(dirKey) {
-    if (!dirKey || dirKey.includes("/") || dirKey.includes("\\") || dirKey.includes(".."))
+    if (!_VagusEngine.isSafeDirKey(dirKey))
       return;
     const agentDir = this.agentDirPath();
     const dir = join5(agentDir, "archived", dirKey);
-    process.stderr.write(`vagus: deleteArchivedProjectByDir dirKey=${dirKey}
-`);
     const prefix = dir + sep;
     for (const [sid, session] of this.sessions) {
       const file = session.sessionManager?.getSessionFile();
@@ -1843,24 +1859,18 @@ var VagusEngine = class {
         });
       }
     }
-    process.stderr.write(`vagus: sessions closed, removing dir...
-`);
     this.rmDirSafe(dir);
-    process.stderr.write(`vagus: archived dir removed OK
-`);
   }
   /** Permanently deletes an archived project's session dir (JSONL). */
   async deleteArchivedProject(cwd) {
     const agentDir = this.agentDirPath();
     const dir = join5(agentDir, "archived", this.encodeCwd(cwd));
-    process.stderr.write(`vagus: deleteArchivedProject cwd=${cwd} dir=${dir}
-`);
     this.closeSessionForCwd(cwd);
-    process.stderr.write(`vagus: sessions closed, removing dir...
-`);
     this.rmDirSafe(dir);
-    process.stderr.write(`vagus: archived dir removed OK
-`);
+  }
+  /** Safe archive-dir name: a plain single path segment, never traversal. */
+  static isSafeDirKey(dirKey) {
+    return dirKey.length > 0 && dirKey !== "." && dirKey !== ".." && !dirKey.includes("/") && !dirKey.includes("\\") && !dirKey.includes("..");
   }
   /**
    * rmSync(recursive) has crashed the daemon natively (0xC0000409 fastfail)
@@ -2026,17 +2036,20 @@ var VagusEngine = class {
     if (!existsSync3(sourceFile))
       throw new Error(`source session file not found: ${sourceFile}`);
     const raw = readFileSync4(sourceFile, "utf8");
-    const lines = raw.split("\n").filter((l) => l.trim().length > 0);
-    const entries = lines.map((l) => JSON.parse(l));
+    const entries = raw.split("\n").filter((l) => l.trim().length > 0).flatMap((l) => {
+      try {
+        return [JSON.parse(l)];
+      } catch {
+        return [];
+      }
+    });
     const header = entries[0];
     if (!header || header.type !== "session")
       throw new Error("source session has no header");
     const targetIdx = entries.findIndex((e) => e.id === entryId);
     if (targetIdx < 0)
       throw new Error(`entry ${entryId} not found in source session`);
-    let endIdx = targetIdx - 1;
-    if (endIdx < 1)
-      endIdx = 1;
+    const endIdx = targetIdx - 1;
     const cwd = session.sessionManager.getCwd() || this.options.cwd;
     const sessionDir = dirname3(sourceFile);
     mkdirSync4(sessionDir, { recursive: true });
@@ -7092,8 +7105,9 @@ function applyHttpProxy() {
       const normalized = /^https?:\/\//.test(proxy) ? proxy : `http://${proxy}`;
       process.env.HTTPS_PROXY = normalized;
       process.env.HTTP_PROXY = normalized;
+      process.env.NO_PROXY ??= "localhost,127.0.0.1";
       setGlobalDispatcher(new EnvHttpProxyAgent());
-      process.stderr.write(`vagus: http proxy enabled \u2192 ${normalized}
+      process.stderr.write(`vagus: http proxy enabled \u2192 ${normalized.replace(/\/\/([^@/]*)@/, "//***@")}
 `);
     }
   } catch (err) {
@@ -7674,10 +7688,10 @@ async function runDaemon() {
   });
   server = new JsonRpcServer({ send: (frame) => transport.send(frame) });
   registerMethods(server);
-  const wsPort = Number(process.env.VAGUS_WS_PORT ?? "19707");
+  const requestedPort = Number(process.env.VAGUS_WS_PORT ?? "19707");
   const wsHost = new WsServerHost();
-  wsHost.listen({
-    port: wsPort,
+  await wsHost.listen({
+    port: requestedPort,
     registerMethods,
     staticDir: process.env.VAGUS_GUI_DIR
   });
@@ -7690,7 +7704,6 @@ async function runDaemon() {
     if (shuttingDown) return;
     shuttingDown = true;
     process.stderr.write(`vagus: daemon shutting down (${signal})
-${new Error("shutdown trace").stack}
 `);
     void (async () => {
       try {
@@ -7704,14 +7717,6 @@ ${new Error("shutdown trace").stack}
   };
   process.on("SIGINT", () => shutdown("SIGINT"));
   process.on("SIGTERM", () => shutdown("SIGTERM"));
-  process.on("beforeExit", (code) => {
-    process.stderr.write(`vagus: daemon beforeExit (event loop empty), code=${code}
-`);
-  });
-  process.on("exit", (code) => {
-    process.stderr.write(`vagus: daemon exit, code=${code}
-`);
-  });
   transport.start();
   process.stderr.write(`pi-web daemon ready (state: ${stateDir})
 `);
@@ -7734,8 +7739,7 @@ import { join as join9 } from "node:path";
 import { fileURLToPath as fileURLToPath3 } from "node:url";
 
 // apps/cli/src/daemon.ts
-import { spawn } from "node:child_process";
-import { execSync } from "node:child_process";
+import { execSync, spawn } from "node:child_process";
 import { existsSync as existsSync7 } from "node:fs";
 import { fileURLToPath as fileURLToPath2 } from "node:url";
 function detectSystemProxy() {
@@ -7772,6 +7776,9 @@ function daemonEntryPath() {
   const source = `${base}.ts`;
   return existsSync7(source) ? source : `${base}.js`;
 }
+function defaultWsPort() {
+  return daemonEntryPath().endsWith(".ts") ? 19708 : 19707;
+}
 function spawnDaemon(options = {}) {
   const entry = daemonEntryPath();
   const args = entry.endsWith(".ts") ? ["--import", "tsx", entry, "daemon"] : [entry, "daemon"];
@@ -7783,7 +7790,8 @@ function spawnDaemon(options = {}) {
       injected.HTTPS_PROXY = sysProxy;
       injected.HTTP_PROXY = sysProxy;
       injected.NO_PROXY = process.env.NO_PROXY ?? "localhost,127.0.0.1";
-      process.stderr.write(`vagus: following system proxy \u2192 ${sysProxy}
+      const redacted = sysProxy.replace(/\/\/([^@/]*)@/, "//***@");
+      process.stderr.write(`vagus: following system proxy \u2192 ${redacted}
 `);
     } else {
       process.stderr.write(`vagus: no system proxy detected (direct connections)
@@ -7800,7 +7808,7 @@ function spawnDaemon(options = {}) {
 }
 
 // apps/cli/src/commands/web.ts
-var DEFAULT_WS_PORT = 19707;
+var DEFAULT_WS_PORT = defaultWsPort();
 function guiDistPath() {
   const prod = fileURLToPath3(new URL("../gui", import.meta.url));
   if (existsSync8(join9(prod, "index.html"))) return prod;
@@ -7865,6 +7873,9 @@ async function runWeb() {
 }
 
 // apps/cli/src/bin.ts
+if (!process.env.VAGUS_WS_PORT && existsSync9(new URL("./commands/daemon.ts", import.meta.url))) {
+  process.env.VAGUS_WS_PORT = "19708";
+}
 var VERSION = JSON.parse(
   readFileSync7(new URL("../package.json", import.meta.url), "utf8")
 ).version;