@zythum02/fello-server 0.1.48 → 0.1.49

package/out/server/main.js

@@ -1800,11 +1800,11 @@ function createWebUIModule() {
         }
       });
     });
-    return new Promise((resolve8, reject) => {
+    return new Promise((resolve9, reject) => {
       const listenPort = options?.port && options.port > 0 ? options.port : 0;
       httpServer.listen(listenPort, "0.0.0.0", () => {
         isEnabled = true;
-        resolve8({ url: getWebUIUrl(httpServer.address()) });
+        resolve9({ url: getWebUIUrl(httpServer.address()) });
       });
       httpServer.on("error", reject);
     });
@@ -2189,7 +2189,7 @@ import { join as join12 } from "path";
 
 // src/shared/zod/mcp-search-schema.ts
 import { z } from "zod";
-var searchRequestSchema = z.object({
+var grepRequestSchema = z.object({
   pattern: z.string().describe("Search pattern (literal text by default, set regex=true for regex)."),
   path: z.string().describe(
     "Directory or file(s) to search. Accepts: relative path (relative to project root), absolute path (POSIX or Windows), or file:// URI."
@@ -2204,20 +2204,10 @@ var searchRequestSchema = z.object({
   invertMatch: z.boolean().optional().describe("Show lines that do NOT match the pattern (-v)."),
   wordMatch: z.boolean().optional().describe("Only match whole words (-w).")
 });
-var searchRespondSchema = z.object({
+var grepRespondSchema = z.object({
   output: z.string(),
   code: z.number()
 });
-var rgRequestSchema = z.object({
-  args: z.array(z.string()).describe(
-    "Raw ripgrep CLI arguments (e.g. ['-i', 'pattern', 'src/']). The pattern and path are included in this array."
-  )
-});
-var rgRespondSchema = z.object({
-  output: z.string(),
-  code: z.number(),
-  stderr: z.string().optional()
-});
 var fileOutlineRequestSchema = z.object({
   path: z.string().describe(
     "File path to analyze. Accepts: relative path (relative to project root), absolute path (POSIX or Windows), or file:// URI."
@@ -2226,6 +2216,20 @@ var fileOutlineRequestSchema = z.object({
 var fileOutlineRespondSchema = z.object({
   outline: z.string().describe("Structural outline of the file in text format.")
 });
+var globRequestSchema = z.object({
+  pattern: z.string().describe("Glob pattern, e.g. '**/*.rs', 'src/**/*.{ts,tsx}'."),
+  path: z.string().optional().describe("Root directory to search from. Defaults to project root."),
+  limit: z.number().int().positive().optional().describe("Maximum number of results to return."),
+  maxDepth: z.number().int().positive().optional().describe("Maximum directory depth to traverse."),
+  dot: z.boolean().optional().describe("Include dotfiles (hidden files/directories). Default: false."),
+  onlyFiles: z.boolean().optional().describe("Only match files, not directories. Default: false (includes directories)."),
+  gitignore: z.boolean().optional().describe("Respect .gitignore patterns. Default: true.")
+});
+var globRespondSchema = z.object({
+  filePaths: z.array(z.string()),
+  totalFiles: z.number(),
+  truncated: z.boolean()
+});
 
 // src/backend/search/file-outline.ts
 import { extname, join as join10, isAbsolute as isAbsolute4, resolve as resolve3, relative as relative5 } from "path";
@@ -2648,7 +2652,7 @@ var LANGUAGES = [
   }
 ];
 async function parseInChild(filePath, config, cwd, timeout = 3e4) {
-  return new Promise((resolve8, reject) => {
+  return new Promise((resolve9, reject) => {
     const modulePath = join10(process.scriptsPath, "/worker-file-outline/worker.mjs");
     const child = fork(modulePath, [], { execArgv: [], cwd });
     const timer = setTimeout(() => {
@@ -2657,7 +2661,7 @@ async function parseInChild(filePath, config, cwd, timeout = 3e4) {
     }, timeout);
     child.on("message", (msg) => {
       clearTimeout(timer);
-      if (msg.type === "result") resolve8({ symbols: msg.symbols, totalLines: msg.totalLines });
+      if (msg.type === "result") resolve9({ symbols: msg.symbols, totalLines: msg.totalLines });
       else reject(new Error(msg.error));
     });
     child.on("error", (err) => {
@@ -2820,7 +2824,7 @@ import { join as join11, isAbsolute as isAbsolute5, resolve as resolve4, relativ
 import { fileURLToPath as fileURLToPath4 } from "url";
 import { fork as fork2 } from "child_process";
 function ripgrepInChild(args2, cwd, timeout = 3e4) {
-  return new Promise((resolve8, reject) => {
+  return new Promise((resolve9, reject) => {
     const child = fork2(join11(process.scriptsPath, "worker-ripgrep/worker.mjs"), [], { cwd });
     const timer = setTimeout(() => {
       child.kill();
@@ -2829,7 +2833,7 @@ function ripgrepInChild(args2, cwd, timeout = 3e4) {
     child.on("message", (msg) => {
       clearTimeout(timer);
       if (msg.type === "error") reject(new Error(msg.error));
-      else resolve8({ code: msg.code, stdout: msg.stdout, stderr: msg.stderr });
+      else resolve9({ code: msg.code, stdout: msg.stdout, stderr: msg.stderr });
     });
     child.on("error", (err) => {
       clearTimeout(timer);
@@ -2852,7 +2856,7 @@ function normalizePath2(inputPath, cwd) {
   }
   return resolve4(cwd ?? process.cwd(), inputPath);
 }
-async function search(options) {
+async function grep(options) {
   const args2 = [];
   args2.push("--heading");
   args2.push("--line-number");
@@ -2874,16 +2878,38 @@ async function search(options) {
   const { code, stdout } = await ripgrepInChild(args2, options.projectDir, options.timeout);
   return { output: stdout || "", code };
 }
-async function rg(options) {
-  const { code, stdout, stderr } = await ripgrepInChild(
-    options.args,
-    options.projectDir,
-    options.timeout
-  );
+
+// src/backend/search/glob.ts
+import { globby } from "globby";
+import { isAbsolute as isAbsolute6, resolve as resolve5 } from "path";
+import { fileURLToPath as fileURLToPath5 } from "url";
+function normalizePath3(inputPath, cwd) {
+  if (inputPath.startsWith("file://")) {
+    return fileURLToPath5(inputPath);
+  }
+  if (isAbsolute6(inputPath)) {
+    return inputPath;
+  }
+  return resolve5(cwd ?? process.cwd(), inputPath);
+}
+async function glob(options) {
+  const cwd = options.path ? normalizePath3(options.path, options.projectDir) : options.projectDir;
+  const entries = await globby(options.pattern, {
+    cwd,
+    dot: options.dot ?? false,
+    onlyFiles: options.onlyFiles ?? false,
+    markDirectories: true,
+    gitignore: options.gitignore ?? true,
+    deep: options.maxDepth
+  });
+  entries.sort();
+  const limit = options.limit ?? 500;
+  const truncated = entries.length > limit;
+  const filePaths = truncated ? entries.slice(0, limit) : entries;
   return {
-    output: stdout || "",
-    code,
-    stderr: stderr || void 0
+    filePaths,
+    totalFiles: entries.length,
+    truncated
   };
 }
 
@@ -2892,21 +2918,21 @@ function createSearchModule(_ctx) {
   return { registerSearchRoute, buildSearchMcpServer };
 }
 function registerSearchRoute(server, projectDir) {
-  server.registry("search/search", async (payload) => {
-    const params = searchRequestSchema.parse(payload);
-    const result = await search({ projectDir, ...params });
-    return searchRespondSchema.parse(result);
-  });
-  server.registry("search/rg", async (payload) => {
-    const params = rgRequestSchema.parse(payload);
-    const result = await rg({ projectDir, ...params });
-    return rgRespondSchema.parse(result);
+  server.registry("search/grep", async (payload) => {
+    const params = grepRequestSchema.parse(payload);
+    const result = await grep({ projectDir, ...params });
+    return grepRespondSchema.parse(result);
   });
   server.registry("search/file_outline", async (payload) => {
     const params = fileOutlineRequestSchema.parse(payload);
     const result = await fileOutline({ projectDir, ...params });
     return fileOutlineRespondSchema.parse(result);
   });
+  server.registry("search/glob", async (payload) => {
+    const params = globRequestSchema.parse(payload);
+    const result = await glob({ projectDir, ...params });
+    return globRespondSchema.parse(result);
+  });
 }
 function buildSearchMcpServer(options) {
   return {
@@ -2988,13 +3014,13 @@ function createAskUserModule(ctx, deps) {
         });
       }
     }
-    return new Promise((resolve8) => {
+    return new Promise((resolve9) => {
       const timeoutId = setTimeout(() => {
         const pending = pendingRequests.get(askUserId);
         if (pending) {
           pendingRequests.delete(askUserId);
           const response = { value: null, reason: "timeout" };
-          resolve8(response);
+          resolve9(response);
           sendEvent("ask-user-response", {
             sessionId,
             askUserId,
@@ -3005,7 +3031,7 @@ function createAskUserModule(ctx, deps) {
           console.warn(`[askUser] timeout fired but no pending request found for ${askUserId}`);
         }
       }, USER_REQUEST_TIMEOUT_MS);
-      pendingRequests.set(askUserId, { resolve: resolve8, timeoutId, sessionId, request });
+      pendingRequests.set(askUserId, { resolve: resolve9, timeoutId, sessionId, request });
     });
   }
   async function getPendingAskUserRequests({ sessionId }) {
@@ -3073,8 +3099,8 @@ function createAskUserModule(ctx, deps) {
 
 // src/backend/share-to-user.ts
 import { randomUUID as randomUUID3 } from "crypto";
-import { join as join14 } from "path";
-import { fileURLToPath as fileURLToPath5 } from "url";
+import { join as join14, relative as relative7, isAbsolute as isAbsolute7 } from "path";
+import { fileURLToPath as fileURLToPath6 } from "url";
 import { readFile as readFile5, writeFile } from "fs/promises";
 import { existsSync as existsSync6, mkdirSync as mkdirSync6 } from "fs";
 import * as mimeTypes3 from "mime-types";
@@ -3123,23 +3149,29 @@ function createShareToUserModule(ctx, deps) {
     const { sessionId, type, uri, data, name, mimeType } = options;
     const resolvedMimeType = resolveMimeType(name, mimeType);
     if (type === "project" && uri) {
+      const session = storage.getSession(sessionId);
+      if (!session) throw new Error(`Session not found: ${sessionId}`);
+      let projectPath = uri.startsWith("file://") ? fileURLToPath6(uri) : uri;
+      if (isAbsolute7(projectPath)) {
+        const rel = relative7(session.cwd, projectPath);
+        if (!rel.startsWith("..") && !isAbsolute7(rel)) {
+          projectPath = rel;
+        }
+      }
       const ilinkBridge2 = deps.ilink.getBridge();
       const ilinkActiveSessionId2 = deps.ilink.getActiveSessionId();
       if (ilinkBridge2?.isConnected && sessionId === ilinkActiveSessionId2) {
         const toUserId = ilinkBridge2.userId;
         if (toUserId) {
-          const session = storage.getSession(sessionId);
-          if (session) {
-            deps.ilink.appendMediaBuffer({
-              filePath: join14(session.cwd, uri),
-              name,
-              toUserId,
-              mimeType: resolvedMimeType
-            });
-          }
+          deps.ilink.appendMediaBuffer({
+            filePath: join14(session.cwd, projectPath),
+            name,
+            toUserId,
+            mimeType: resolvedMimeType
+          });
         }
       }
-      return { name, projectPath: uri, mimeType: resolvedMimeType };
+      return { name, projectPath, mimeType: resolvedMimeType };
     }
     const shareId = randomUUID3();
     const shareDir = storage.sessionShareDir(sessionId);
@@ -3157,7 +3189,7 @@ function createShareToUserModule(ctx, deps) {
           if (!response.ok) throw new Error(`HTTP ${response.status}: ${response.statusText}`);
           buffer = Buffer.from(await response.arrayBuffer());
         } else {
-          const sourcePath = uri.startsWith("file://") ? fileURLToPath5(uri) : uri;
+          const sourcePath = uri.startsWith("file://") ? fileURLToPath6(uri) : uri;
           buffer = await readFile5(sourcePath);
         }
       } catch (err) {
@@ -3249,9 +3281,9 @@ function spawnStdioAgent(options) {
       proc.stdin.end();
     } catch {
     }
-    await new Promise((resolve8) => {
+    await new Promise((resolve9) => {
       if (proc.exitCode !== null) {
-        resolve8();
+        resolve9();
         return;
       }
       let killTimer = null;
@@ -3259,13 +3291,13 @@ function spawnStdioAgent(options) {
         if (killTimer) {
           clearTimeout(killTimer);
         }
-        resolve8();
+        resolve9();
       };
       proc.once("exit", onExit);
       killProcessGroup(proc, "SIGTERM");
       killTimer = setTimeout(() => {
         killProcessGroup(proc, "SIGKILL");
-        resolve8();
+        resolve9();
       }, 2e3);
     });
   }
@@ -3381,7 +3413,7 @@ var AgentClientProxy = class {
 };
 
 // src/agents/acp-client-tools.ts
-import { resolve as resolve5 } from "path";
+import { resolve as resolve6 } from "path";
 import { tool } from "ai";
 import { z as z4 } from "zod";
 
@@ -3574,7 +3606,7 @@ Always prefer using line/limit to read specific sections, or use the Search MCP'
         if (!connection) {
           throw new Error("ACP connection is not available.");
         }
-        const filename = resolve5(cwd ?? params.cwd, path2);
+        const filename = resolve6(cwd ?? params.cwd, path2);
         let title = `ReadFile ${filename}`;
         if (line || limit) {
           title += `:${line ?? 0}`;
@@ -3681,7 +3713,7 @@ Always prefer using line/limit to read specific sections, or use the Search MCP'
         if (!connection) {
           throw new Error("ACP connection is not available.");
         }
-        const filename = resolve5(cwd ?? params.cwd, path2);
+        const filename = resolve6(cwd ?? params.cwd, path2);
         let title = `WriteFile ${filename}`;
         const toolCall = {
           toolCallId,
@@ -3766,7 +3798,7 @@ Use exact string matching for oldText and set replaceAll=true when needed.`,
         if (!connection) {
           throw new Error("ACP connection is not available.");
         }
-        const filename = resolve5(cwd ?? params.cwd, path2);
+        const filename = resolve6(cwd ?? params.cwd, path2);
         const title = `EditFile ${filename}`;
         const toolCall = {
           toolCallId,
@@ -3946,8 +3978,8 @@ Avoid destructive commands and prefer deterministic, non-interactive commands.`,
           try {
             const waitPromise = terminal.waitForExit();
             if (timeoutMs) {
-              const timeoutPromise = new Promise((resolve8) => {
-                setTimeout(() => resolve8(null), timeoutMs);
+              const timeoutPromise = new Promise((resolve9) => {
+                setTimeout(() => resolve9(null), timeoutMs);
               });
               const waitResult = await Promise.race([waitPromise, timeoutPromise]);
               if (waitResult === null) {
@@ -4287,7 +4319,7 @@ function toEnvRecord(env) {
 }
 function inferToolKind(name) {
   const normalized = name.toLowerCase();
-  if (normalized.includes("read") || normalized.includes("list") || normalized.includes("search")) {
+  if (normalized.includes("read") || normalized.includes("list") || normalized.includes("search") || normalized.includes("grep") || normalized.includes("glob")) {
     return "read";
   }
   if (normalized.includes("write") || normalized.includes("edit") || normalized.includes("update")) {
@@ -4568,7 +4600,7 @@ Working style:
 File reading & editing strategy:
 - ReadFile will REJECT full reads of files over 100KB. Use line/limit to read specific sections, or set force=true if you genuinely need the full file content (rare).
 - Use the Search MCP's file_outline tool to preview file structure before reading (function/class/interface names with line ranges). Supports TypeScript, JavaScript, TSX, Python, Go, C, C++, Swift, Kotlin, Dart.
-- Use the Search MCP's search tool (structured) or rg tool (raw args) to search file contents instead of reading entire files.
+- Use the Search MCP's grep tool (structured pattern search) or glob tool (file finder) to search file contents instead of reading entire files.
 - EditFile uses exact string matching (StrReplace style). Use unique surrounding code context in oldText to make matches precise. Set replaceAll=true when you intend to replace all occurrences.
 - You do NOT need to re-read a file after editing it \u2014 the changes are already saved.
 
@@ -4592,7 +4624,7 @@ import { tool as tool3 } from "ai";
 import { z as z6 } from "zod";
 
 // src/agents/image-tools.ts
-import { resolve as resolve6 } from "path";
+import { resolve as resolve7 } from "path";
 import { readFile as readFile6 } from "fs/promises";
 import mime from "mime-types";
 import { tool as tool2, generateText } from "ai";
@@ -4629,7 +4661,7 @@ Provide a specific query describing what you want to know about the image \u2014
           });
         }
         try {
-          const absPath = resolve6(params.cwd, imgPath);
+          const absPath = resolve7(params.cwd, imgPath);
           const buffer = await readFile6(absPath);
           const base64 = buffer.toString("base64");
           const mimeType = mime.lookup(absPath) || "image/png";
@@ -5832,11 +5864,11 @@ var AgentTerminalManager = class {
     if (terminal.isFinished) {
       return { exitCode: terminal.exitCode, signal: terminal.signal };
     }
-    return new Promise((resolve8) => {
+    return new Promise((resolve9) => {
       const originalOnExit = terminal.onExit;
       terminal.onExit = (code, signal) => {
         originalOnExit(code, signal);
-        resolve8({ exitCode: code, signal });
+        resolve9({ exitCode: code, signal });
       };
     });
   }
@@ -6004,7 +6036,14 @@ var ACPBridge = class {
   }
   async connect() {
     const acpId = this.id;
-    const proc = this.options.agentInfo.type === "stdio" ? spawnStdioAgent({ ...this.options.agentInfo, cwd: this.options.cwd }) : this.options.agentInfo.provider === "openai-compatible" ? spawnOpenaiCompatibleApiAgent(this.options.agentInfo) : (() => {
+    const proc = this.options.agentInfo.type === "stdio" ? spawnStdioAgent({
+      ...this.options.agentInfo,
+      cwd: this.options.cwd,
+      env: {
+        ...this.options.agentEnv,
+        ...this.options.agentInfo.env
+      }
+    }) : this.options.agentInfo.provider === "openai-compatible" ? spawnOpenaiCompatibleApiAgent(this.options.agentInfo) : (() => {
       throw new Error(`Unsupported api provider: ${this.options.agentInfo.provider}`);
     })();
     this.process = proc;
@@ -6319,7 +6358,9 @@ var ACPBridge = class {
   }
   async sendPrompt(params) {
     if (!this.connection) throw new Error("Not connected");
-    return this.connection.agent.request(methods3.agent.session.prompt, params);
+    const res = await this.connection.agent.request(methods3.agent.session.prompt, params);
+    this.options.onPromptCompleted?.(params.sessionId, res);
+    return res;
   }
   async cancel(params) {
     if (!this.connection) return;
@@ -6378,6 +6419,27 @@ var AcpAdapter = class {
   handleExtNotification(_method, _params, _currentSessionId, _agentId) {
     return [];
   }
+  /**
+   * Agent process env vars to inject when spawning the agent. Protocol-
+   * specific environment needed by the agent process (e.g.
+   * CODEBUDDY_DEFER_TOOL_LOADING for CodeBuddy). Aggregated by
+   * adapters.ts and applied by ACPBridge when spawning a stdio agent;
+   * agent-specific agentInfo.env still takes precedence.
+   */
+  getAgentEnv() {
+    return {};
+  }
+  /**
+   * Called by the bridge when a prompt round completes, with the full
+   * PromptResponse in hand. Adapters that do turn-boundary / replay detection
+   * override this to extract the agent's own protocol-clock timestamp and
+   * freeze the boundary. Default no-op — only protocol-specific adapters
+   * (e.g. CodeBuddy, which stamps PromptResponse._meta with
+   * codebuddy.ai/requestId + timestamp) need it; generic adapters have no
+   * protocol timestamp to work from.
+   */
+  handlePromptCompleted(_sessionId, _res) {
+  }
   // ── State lifecycle (default no-ops) ───────────────────────────────
   rekey(_oldKey, _newKey) {
   }
@@ -6398,22 +6460,46 @@ var CODEBUDDY_STATUS_MAP = {
 var CodebuddyAdapter = class extends AcpAdapter {
   stateMap = /* @__PURE__ */ new Map();
   /**
-   * Per-session max _meta.timestamp for content chunks
-   * (agent_message_chunk / agent_thought_chunk). Used to detect
-   * replayed chunks whose timestamp is earlier than the max seen
-   * for the same session. Only content chunks with
-   * codebuddy.ai/requestId participate — other notification types
-   * (tool_call, session_info_update, etc.) are not tracked.
+   * Per-session turn-boundary timestamp (epoch ms, from the agent's own
+   * protocol clock). Frozen when a prompt completes (via handlePromptCompleted),
+   * so content chunks emitted afterwards with an earlier protocol timestamp
+   * are previous-turn replays. Only CodeBuddy stamps PromptResponse._meta
+   * with a protocol timestamp, so this stays here rather than in the base.
+   */
+  turnBoundaryTs = /* @__PURE__ */ new Map();
+  /**
+   * CodeBuddy spawn env.
+   */
+  getAgentEnv() {
+    return {
+      CODEBUDDY_DEFER_TOOL_LOADING: "0",
+      CODEBUDDY_DISABLE_AUTO_MEMORY: "1"
+    };
+  }
+  /**
+   * Freeze the turn-boundary on prompt completion. Only CodeBuddy stamps the
+   * PromptResponse._meta with codebuddy.ai/requestId + a protocol timestamp,
+   * so this stays here rather than in the generic bridge — the agent's own
+   * clock is the boundary used to drop replayed prior-turn chunks (avoids
+   * timezone / clock-skew issues that wall-clock Date.now() would introduce).
    */
-  sessionUpdateTimestamp = /* @__PURE__ */ new Map();
+  handlePromptCompleted(sessionId, res) {
+    const meta = res._meta;
+    if (meta && typeof meta["codebuddy.ai/requestId"] === "string") {
+      const ts = Date.parse(typeof meta["timestamp"] === "string" ? meta["timestamp"] : "");
+      if (!isNaN(ts)) this.turnBoundaryTs.set(sessionId, ts);
+    }
+  }
   /**
    * One unified hook for all notification processing:
    *
-   * 1. Replay detection — drop agent_message_chunk / agent_thought_chunk
-   *    whose _meta.timestamp is earlier than the max seen for the same
-   *    session. CodeBuddy sometimes re-sends previous responses during
-   *    a new prompt; these replayed chunks carry original (earlier)
-   *    timestamps. Only applies to chunks that carry codebuddy.ai/requestId.
+   * 1. Replay detection — the adapter freezes a turn-boundary timestamp in
+   *    handlePromptCompleted() when a prompt completes (using the agent's own
+   *    protocol clock). Drop agent_message_chunk / agent_thought_chunk whose
+   *    _meta.timestamp is earlier than that boundary: CodeBuddy re-broadcasts
+   *    the previous turn's messages when a new prompt begins, and those
+   *    re-emitted chunks carry the previous turn's (earlier) timestamps. Only
+   *    applies to chunks that carry codebuddy.ai/requestId.
    * 2. memberEvent chunk routing — rewrite notification.sessionId from
    *    parent to member sessionId (CodeBuddy stamps all member chunks
    *    with the parent session).
@@ -6434,13 +6520,10 @@ var CodebuddyAdapter = class extends AcpAdapter {
     if (typeof requestId === "string" && typeof metaTimestamp === "string" && (sessionUpdate === "agent_message_chunk" || sessionUpdate === "agent_thought_chunk")) {
       const ts = Date.parse(metaTimestamp);
       if (!isNaN(ts)) {
-        const maxTs = this.sessionUpdateTimestamp.get(currentSessionId);
-        if (maxTs !== void 0 && ts < maxTs) {
+        const boundary = this.turnBoundaryTs.get(currentSessionId);
+        if (boundary !== void 0 && ts < boundary) {
           return null;
         }
-        if (maxTs === void 0 || ts > maxTs) {
-          this.sessionUpdateTimestamp.set(currentSessionId, ts);
-        }
       }
     }
     const memberEvent = meta?.["codebuddy.ai/memberEvent"];
@@ -6560,14 +6643,19 @@ var CodebuddyAdapter = class extends AcpAdapter {
       this.stateMap.delete(oldKey);
       this.stateMap.set(newKey, state);
     }
+    const boundary = this.turnBoundaryTs.get(oldKey);
+    if (boundary !== void 0) {
+      this.turnBoundaryTs.delete(oldKey);
+      this.turnBoundaryTs.set(newKey, boundary);
+    }
   }
   cleanup(sessionKey) {
     this.stateMap.delete(sessionKey);
-    this.sessionUpdateTimestamp.delete(sessionKey);
+    this.turnBoundaryTs.delete(sessionKey);
   }
   clearAll() {
     this.stateMap.clear();
-    this.sessionUpdateTimestamp.clear();
+    this.turnBoundaryTs.clear();
   }
 };
 
@@ -6675,6 +6763,10 @@ var codebuddyAdapter = new CodebuddyAdapter();
 var kiroAdapter = new KiroAdapter();
 var adapters = [codebuddyAdapter, kiroAdapter];
 var extNotificationSpecs = adapters.flatMap((a) => a.extNotificationSpecs);
+var agentEnv = Object.assign(
+  {},
+  ...adapters.map((a) => a.getAgentEnv())
+);
 
 // src/backend/agent/resolve-agent-info.ts
 function resolveAgentInfo(agentId) {
@@ -6789,6 +6881,7 @@ function createBridgeConnectModule(ctx, deps) {
       agentInfo,
       cwd,
       extNotificationSpecs,
+      agentEnv,
       onSessionConnect: (connection) => {
         currentSessionId = `${agentId}:${connection.sessionId}`;
         storage.updateSession(currentSessionId, { connectionStatus: "connected" }, false);
@@ -6863,6 +6956,13 @@ function createBridgeConnectModule(ctx, deps) {
           console.error("write terminal output error: ", { sessionId, terminalId, err });
         }
         sendEvent("agent-terminal-output", { sessionId, terminalId, data });
+      },
+      // On prompt completion, hand the full PromptResponse to each adapter so
+      // it can freeze its own turn-boundary (CodeBuddy extracts its protocol
+      // timestamp; other adapters are no-ops).
+      onPromptCompleted: (sessionId, res) => {
+        const key = `${agentId}:${sessionId}`;
+        for (const a of adapters) a.handlePromptCompleted(key, res);
       }
     });
     let newConnectPromise;
@@ -7186,16 +7286,16 @@ import {
   copyFile
 } from "fs/promises";
 import * as mimeTypes4 from "mime-types";
-import { dirname as dirname7, join as join17, relative as relative8, extname as extname2, basename as basename3 } from "path";
+import { dirname as dirname7, join as join17, relative as relative9, extname as extname2, basename as basename3 } from "path";
 
 // src/backend/project/git-utils.ts
 import { execFile, spawn as spawn3 } from "child_process";
-import { dirname as dirname6, relative as relative7 } from "path";
+import { dirname as dirname6, relative as relative8 } from "path";
 import { promisify } from "util";
 var execFileAsync = promisify(execFile);
 async function getGitIgnoredPaths(cwd, relPaths) {
   if (relPaths.length === 0) return /* @__PURE__ */ new Set();
-  return new Promise((resolve8) => {
+  return new Promise((resolve9) => {
     const child = spawn3("git", ["check-ignore", "-z", "--stdin"], {
       cwd,
       timeout: 3e3,
@@ -7205,19 +7305,19 @@ async function getGitIgnoredPaths(cwd, relPaths) {
     });
     const chunks = [];
     child.stdout.on("data", (chunk) => chunks.push(chunk));
-    child.on("error", () => resolve8(/* @__PURE__ */ new Set()));
+    child.on("error", () => resolve9(/* @__PURE__ */ new Set()));
     child.on("close", () => {
       const ignored = /* @__PURE__ */ new Set();
       for (const p of Buffer.concat(chunks).toString("utf8").split("\0")) {
         if (p) ignored.add(toPosixPath(p));
       }
-      resolve8(ignored);
+      resolve9(ignored);
     });
     try {
       child.stdin.write(relPaths.join("\0") + "\0");
       child.stdin.end();
     } catch {
-      resolve8(/* @__PURE__ */ new Set());
+      resolve9(/* @__PURE__ */ new Set());
     }
   });
 }
@@ -7259,7 +7359,7 @@ async function getGitStatus(cwd) {
 async function readGitHeadFile(targetPath, encoding) {
   try {
     const cwd = dirname6(targetPath);
-    const relPath = relative7(cwd, targetPath);
+    const relPath = relative8(cwd, targetPath);
     const { stdout } = await execFileAsync("git", ["show", `HEAD:./${relPath}`], {
       cwd,
       maxBuffer: 10 * 1024 * 1024,
@@ -7279,7 +7379,7 @@ var IGNORE_NAME_SET = /* @__PURE__ */ new Set([".git", ".svn", ".hg"]);
 var SEARCH_IGNORE_NAME_SET = /* @__PURE__ */ new Set(["node_modules", "vendor", "__pycache__"]);
 function hasForbiddenSegment(fullPath, cwd, ...nameSets) {
   if (fullPath === cwd) return false;
-  const relPath = relative8(cwd, fullPath);
+  const relPath = relative9(cwd, fullPath);
   if (!relPath) return false;
   const segments = relPath.split(/[\\/]+/);
   for (let i = 0; i < segments.length; i++) {
@@ -7323,7 +7423,7 @@ function createFilesystemState(ctx) {
         if (!s) continue;
         if (hasForbiddenSegment(full, cwd, IGNORE_NAME_SET, SEARCH_IGNORE_NAME_SET)) continue;
         if (fileScene.has(full)) continue;
-        const rel = relative8(cwd, full);
+        const rel = relative9(cwd, full);
         const posixRel = toPosixPath(rel);
         allFiles.push({ id: posixRel, filename: rel, isFolder: s.isDirectory() });
         if (s.isDirectory()) await collect(full);
@@ -7335,12 +7435,12 @@ function createFilesystemState(ctx) {
   async function getSystemFilePath({
     projectId,
     path: inputPath,
-    isAbsolute: isAbsolute6
+    isAbsolute: isAbsolute8
   }) {
     const project = storage.getProject(projectId);
     if (!project) throw new Error("Project not found");
-    if (isAbsolute6) return resolveSafePath(project.cwd, inputPath);
-    return relative8(project.cwd, resolveSafePath(project.cwd, inputPath));
+    if (isAbsolute8) return resolveSafePath(project.cwd, inputPath);
+    return relative9(project.cwd, resolveSafePath(project.cwd, inputPath));
   }
   async function copyFileToWorkspace({
     projectId,
@@ -7363,7 +7463,7 @@ function createFilesystemState(ctx) {
     }
     await copyFile(sourcePath, destPath);
     markProjectFsDirty(projectId);
-    return { success: true, destPath: toPosixPath(relative8(cwd, destPath)) };
+    return { success: true, destPath: toPosixPath(relative9(cwd, destPath)) };
   }
   async function readUrlAsDataUrl({ url: inputUrl, mimeType }) {
     const MAX_FILE_SIZE = 20 * 1024 * 1024;
@@ -7418,7 +7518,7 @@ function createFilesystemState(ctx) {
         fileScene.add(full);
         const s = await stat4(full).catch(() => null);
         if (!s) continue;
-        const rel = relative8(cwd, full);
+        const rel = relative9(cwd, full);
         results.push({ id: toPosixPath(rel), filename: rel, isFolder: s.isDirectory() });
         if (results.length >= SEARCH_MAX_RESULTS) break;
       }
@@ -7458,7 +7558,7 @@ function createFilesystemState(ctx) {
       const s = await stat4(full).catch(() => null);
       if (!s) continue;
       if (hasForbiddenSegment(full, cwd, IGNORE_NAME_SET)) continue;
-      const relId = toPosixPath(relative8(cwd, full));
+      const relId = toPosixPath(relative9(cwd, full));
       results.push({ id: relId, name, isFolder: s.isDirectory(), ignored: false });
     }
     results.sort((a, b) => {
@@ -7737,7 +7837,7 @@ async function startSocketServer(socketPath) {
     res.writeHead(404, { "Content-Type": "application/json" });
     res.end(JSON.stringify({ error: "Not found" }));
   });
-  return new Promise((resolve8, reject) => {
+  return new Promise((resolve9, reject) => {
     server.listen(socketPath, () => {
       const serverRef = {
         stop: () => {
@@ -7757,7 +7857,7 @@ async function startSocketServer(socketPath) {
         },
         socketPath
       };
-      resolve8(serverRef);
+      resolve9(serverRef);
     });
     server.on("error", (err) => {
       console.error("[socket-server] Failed to start:", err);
@@ -8826,7 +8926,7 @@ function createSessionModule(ctx, deps) {
     askUser,
     shareToUser,
     skills,
-    search: search2,
+    search,
     memory,
     imageGeneration,
     toolbox,
@@ -8836,7 +8936,7 @@ function createSessionModule(ctx, deps) {
     skills,
     askUser,
     shareToUser,
-    search: search2,
+    search,
     memory,
     imageGeneration,
     toolbox
@@ -8854,7 +8954,7 @@ function createSessionModule(ctx, deps) {
     const server = await startSocketServer(options.socketPath);
     toolbox.registerToolboxRoute(server, options.project.cwd);
     skills.registerSkillsRoute(server, options.project.cwd);
-    search2.registerSearchRoute(server, options.project.cwd);
+    search.registerSearchRoute(server, options.project.cwd);
     imageGeneration.registerImageGenerationRoute(server, sessionId);
     memory.registerMemoryRoute(server, options.project.id, sessionId);
     askUser.registerAskUserRoute(server, sessionId);
@@ -9113,7 +9213,7 @@ function createSessionModule(ctx, deps) {
             `[SendPrompt] Killed ${killed} agent terminal(s) from previous generation for session ${sessionId}`
           );
       }
-      await new Promise((resolve8) => setTimeout(resolve8, 30));
+      await new Promise((resolve9) => setTimeout(resolve9, 30));
     }
     if (!session.title) {
       const firstTextContent = contents.find((c) => c.type === "text");
@@ -10016,6 +10116,7 @@ function createInferenceModule(_ctx, deps) {
       agentInfo,
       cwd,
       extNotificationSpecs,
+      agentEnv,
       onSessionConnect: (connection) => {
         currentSessionId = `${agentId}:${connection.sessionId}`;
       },
@@ -10985,7 +11086,7 @@ function createImageGenerationModule(ctx, deps) {
 }
 
 // src/backend/toolbox.ts
-import { join as join23, resolve as resolve7, dirname as dirname9, basename as basename4, extname as extname3 } from "path";
+import { join as join23, resolve as resolve8, dirname as dirname9, basename as basename4, extname as extname3 } from "path";
 import { writeFile as writeFile6 } from "fs/promises";
 import { createHash as createHash6, randomUUID as randomUUID13, randomInt } from "crypto";
 import * as qr from "qr-image";
@@ -11232,15 +11333,15 @@ function createToolboxModule(_ctx) {
     });
     server.registry("toolbox/image-metadata", async (payload) => {
       const { path: imgPath } = imageMetadataRequestSchema.parse(payload);
-      const absPath = resolve7(projectDir, imgPath);
+      const absPath = resolve8(projectDir, imgPath);
       const sharp = await getSharp();
       const metadata = await sharp(absPath).metadata();
       return { result: extractMetadata(metadata) };
     });
     server.registry("toolbox/image-thumbnail", async (payload) => {
       const { path: imgPath, width, output } = imageThumbnailRequestSchema.parse(payload);
-      const absPath = resolve7(projectDir, imgPath);
-      const outputPath = output ? resolve7(projectDir, output) : join23(
+      const absPath = resolve8(projectDir, imgPath);
+      const outputPath = output ? resolve8(projectDir, output) : join23(
         dirname9(absPath),
         `${basename4(absPath, extname3(absPath))}.thumb${width}${extname3(absPath)}`
       );
@@ -11251,7 +11352,7 @@ function createToolboxModule(_ctx) {
     });
     server.registry("toolbox/image-resize", async (payload) => {
       const { path: imgPath, width, height, fit, output } = imageResizeRequestSchema.parse(payload);
-      const absPath = resolve7(projectDir, imgPath);
+      const absPath = resolve8(projectDir, imgPath);
       const sharp = await getSharp();
       const resized = await sharp(absPath).resize({ width, height, fit }).toBuffer();
       const resizedMeta = await sharp(resized).metadata();
@@ -11259,15 +11360,15 @@ function createToolboxModule(_ctx) {
       const actualHeight = resizedMeta.height ?? height ?? 0;
       const ext = extname3(absPath);
       const base = basename4(absPath, ext);
-      const outputPath = output ? resolve7(projectDir, output) : join23(dirname9(absPath), `${base}.${actualWidth}x${actualHeight}${ext}`);
+      const outputPath = output ? resolve8(projectDir, output) : join23(dirname9(absPath), `${base}.${actualWidth}x${actualHeight}${ext}`);
       await writeFile6(outputPath, resized);
       const metadata = await sharp(outputPath).metadata();
       return { result: { output: outputPath, metadata: extractMetadata(metadata) } };
     });
     server.registry("toolbox/image-convert", async (payload) => {
       const { path: imgPath, format, quality, output } = imageConvertRequestSchema.parse(payload);
-      const absPath = resolve7(projectDir, imgPath);
-      const outputPath = output ? resolve7(projectDir, output) : join23(dirname9(absPath), `${basename4(absPath, extname3(absPath))}.${format}`);
+      const absPath = resolve8(projectDir, imgPath);
+      const outputPath = output ? resolve8(projectDir, output) : join23(dirname9(absPath), `${basename4(absPath, extname3(absPath))}.${format}`);
       const sharp = await getSharp();
       let pipeline = sharp(absPath);
       const opts = {};
@@ -11279,7 +11380,7 @@ function createToolboxModule(_ctx) {
     });
     server.registry("toolbox/image-qrcode", async (payload) => {
       const { text, output, size, margin, errorCorrection } = qrCodeRequestSchema.parse(payload);
-      const outputPath = resolve7(projectDir, output ?? "qrcode.png");
+      const outputPath = resolve8(projectDir, output ?? "qrcode.png");
       const png = qr.imageSync(text, {
         type: "png",
         size,
@@ -11328,11 +11429,11 @@ function initBackend(emitter) {
   const askUser = createAskUserModule(ctx, { ilink: ilink.state });
   const shareToUser = createShareToUserModule(ctx, { ilink: ilink.state });
   const skills = createSkillsModule(ctx);
-  const search2 = createSearchModule(ctx);
+  const search = createSearchModule(ctx);
   const watcher2 = createWatcherModule(ctx);
   const toolbox = createToolboxModule(ctx);
   const bridgeConnect = createBridgeConnectModule(ctx, { askUser });
-  const _inference = createInferenceModule(ctx, { skills, search: search2, toolbox });
+  const _inference = createInferenceModule(ctx, { skills, search, toolbox });
   const memory = createMemoryModule(ctx, { inference: _inference });
   const imageGeneration = createImageGenerationModule(ctx, { ilink: ilink.state });
   const session = createSessionModule(ctx, {
@@ -11340,7 +11441,7 @@ function initBackend(emitter) {
     askUser,
     shareToUser,
     skills,
-    search: search2,
+    search,
     memory,
     imageGeneration,
     toolbox,
@@ -11725,7 +11826,7 @@ function initBackend(emitter) {
     await ilink.stopIlink({ logout: false });
     session.clearSession();
     await bridgeConnect.clearAll();
-    await new Promise((resolve8) => setTimeout(resolve8, 100));
+    await new Promise((resolve9) => setTimeout(resolve9, 100));
     terminal.killAllTerminals();
     await watcher2.stopAll();
     for (const file of await readdir2(TEMP_DIR)) {
@@ -11736,7 +11837,7 @@ function initBackend(emitter) {
 }
 
 // package.json
-var version = "0.1.48";
+var version = "0.1.49";
 
 // src/server/main.ts
 var port;