@jait/gateway 0.1.83 → 0.1.85

package/dist/routes/chat.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"chat.d.ts","sourceRoot":"","sources":["../../src/routes/chat.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,SAAS,CAAC;AAC/C,OAAO,EAAE,KAAK,SAAS,EAAsB,MAAM,cAAc,CAAC;AAClE,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,gBAAgB,CAAC;AAC7C,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,yBAAyB,CAAC;AAC9D,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,sBAAsB,CAAC;AACxD,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,sBAAsB,CAAC;AACzD,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,uBAAuB,CAAC;AACzD,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,sBAAsB,CAAC;AACxD,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,uBAAuB,CAAC;AACxD,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,wBAAwB,CAAC;AAC5D,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,yBAAyB,CAAC;AAE/D,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,UAAU,CAAC;AAC/C,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,8BAA8B,CAAC;AACxE,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,0BAA0B,CAAC;AAsTjE,MAAM,WAAW,aAAa;IAC5B,EAAE,CAAC,EAAE,MAAM,CAAC;IACZ,cAAc,CAAC,EAAE,cAAc,CAAC;IAChC,WAAW,CAAC,EAAE,WAAW,CAAC;IAC1B,YAAY,CAAC,EAAE,YAAY,CAAC;IAC5B,eAAe,CAAC,EAAE,eAAe,CAAC;IAClC,KAAK,CAAC,EAAE,WAAW,CAAC;IACpB,aAAa,CAAC,EAAE,aAAa,CAAC;IAC9B,EAAE,CAAC,EAAE,cAAc,CAAC;IACpB,YAAY,CAAC,EAAE,mBAAmB,CAAC;IACnC,gBAAgB,CAAC,EAAE,gBAAgB,CAAC;IACpC,YAAY,CAAC,EAAE,CACb,QAAQ,EAAE,MAAM,EAChB,KAAK,EAAE,OAAO,EACd,OAAO,EAAE,WAAW,EACpB,OAAO,CAAC,EAAE;QAAE,MAAM,CAAC,EAAE,OAAO,CAAC;QAAC,gBAAgB,CAAC,EAAE,MAAM,CAAA;KAAE,KACtD,OAAO,CAAC,UAAU,CAAC,CAAC;CAC1B;AAED,wBAAgB,kBAAkB,CAChC,GAAG,EAAE,eAAe,EACpB,MAAM,EAAE,SAAS,EACjB,QAAQ,CAAC,EAAE,MAAM,GAAG,aAAa,EACjC,iBAAiB,CAAC,EAAE,cAAc,QAm1CnC"}
+{"version":3,"file":"chat.d.ts","sourceRoot":"","sources":["../../src/routes/chat.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,SAAS,CAAC;AAC/C,OAAO,EAAE,KAAK,SAAS,EAAsB,MAAM,cAAc,CAAC;AAClE,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,gBAAgB,CAAC;AAC7C,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,yBAAyB,CAAC;AAC9D,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,sBAAsB,CAAC;AACxD,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,sBAAsB,CAAC;AACzD,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,uBAAuB,CAAC;AACzD,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,sBAAsB,CAAC;AACxD,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,uBAAuB,CAAC;AACxD,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,wBAAwB,CAAC;AAC5D,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,yBAAyB,CAAC;AAE/D,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,UAAU,CAAC;AAC/C,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,8BAA8B,CAAC;AACxE,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,0BAA0B,CAAC;AAuZjE,MAAM,WAAW,aAAa;IAC5B,EAAE,CAAC,EAAE,MAAM,CAAC;IACZ,cAAc,CAAC,EAAE,cAAc,CAAC;IAChC,WAAW,CAAC,EAAE,WAAW,CAAC;IAC1B,YAAY,CAAC,EAAE,YAAY,CAAC;IAC5B,eAAe,CAAC,EAAE,eAAe,CAAC;IAClC,KAAK,CAAC,EAAE,WAAW,CAAC;IACpB,aAAa,CAAC,EAAE,aAAa,CAAC;IAC9B,EAAE,CAAC,EAAE,cAAc,CAAC;IACpB,YAAY,CAAC,EAAE,mBAAmB,CAAC;IACnC,gBAAgB,CAAC,EAAE,gBAAgB,CAAC;IACpC,YAAY,CAAC,EAAE,CACb,QAAQ,EAAE,MAAM,EAChB,KAAK,EAAE,OAAO,EACd,OAAO,EAAE,WAAW,EACpB,OAAO,CAAC,EAAE;QAAE,MAAM,CAAC,EAAE,OAAO,CAAC;QAAC,gBAAgB,CAAC,EAAE,MAAM,CAAA;KAAE,KACtD,OAAO,CAAC,UAAU,CAAC,CAAC;CAC1B;AAED,wBAAgB,kBAAkB,CAChC,GAAG,EAAE,eAAe,EACpB,MAAM,EAAE,SAAS,EACjB,QAAQ,CAAC,EAAE,MAAM,GAAG,aAAa,EACjC,iBAAiB,CAAC,EAAE,cAAc,QAy4CnC"}

package/dist/routes/chat.js

@@ -1,8 +1,9 @@
 import { randomUUID } from "node:crypto";
 import { inferContextWindow } from "../config.js";
 import { FileSystemSurface } from "../surfaces/filesystem.js";
-import { RemoteCliProvider } from "../providers/remote-cli-provider.js";
 import { resolveWorkspaceRoot } from "../tools/core/get-fs.js";
+import { resolveRemoteNodeForSession, createRemoteToolExecutor } from "../tools/remote-executor.js";
+import { WorkspaceSync } from "../services/workspace-sync.js";
 import { existsSync } from "node:fs";
 import { messages as messagesTable } from "../db/schema.js";
 import { eq } from "drizzle-orm";
@@ -15,6 +16,63 @@ import { buildSystemPrompt } from "../tools/prompts/index.js";
 const sessionHistory = new Map();
 const activeStreams = new Set();
 const sessionAbortControllers = new Map();
+const sessionStreamingState = new Map();
+function getOrCreateAccumulator(sessionId) {
+    let acc = sessionStreamingState.get(sessionId);
+    if (!acc) {
+        acc = { content: "", toolCalls: [], segments: [] };
+        sessionStreamingState.set(sessionId, acc);
+    }
+    return acc;
+}
+/** Append a text token to the streaming accumulator */
+function accumulateToken(sessionId, token) {
+    const acc = getOrCreateAccumulator(sessionId);
+    acc.content += token;
+    const last = acc.segments[acc.segments.length - 1];
+    if (last?.type === "text") {
+        acc.segments[acc.segments.length - 1] = { type: "text", content: last.content + token };
+    }
+    else {
+        acc.segments.push({ type: "text", content: token });
+    }
+}
+/** Record a tool call start in the streaming accumulator */
+function accumulateToolStart(sessionId, callId, tool, args) {
+    const acc = getOrCreateAccumulator(sessionId);
+    acc.toolCalls.push({ callId, tool, args, ok: true, message: "", startedAt: Date.now() });
+    const last = acc.segments[acc.segments.length - 1];
+    if (last?.type === "toolGroup") {
+        if (!last.callIds.includes(callId)) {
+            acc.segments[acc.segments.length - 1] = { type: "toolGroup", callIds: [...last.callIds, callId] };
+        }
+    }
+    else {
+        acc.segments.push({ type: "toolGroup", callIds: [callId] });
+    }
+}
+/** Record streaming output for a tool call */
+function accumulateToolOutput(sessionId, callId, content) {
+    const acc = sessionStreamingState.get(sessionId);
+    if (!acc)
+        return;
+    const tc = acc.toolCalls.find(t => t.callId === callId);
+    if (tc)
+        tc.message = (tc.message || "") + content;
+}
+/** Record a tool call completion */
+function accumulateToolResult(sessionId, callId, ok, message, data) {
+    const acc = sessionStreamingState.get(sessionId);
+    if (!acc)
+        return;
+    const tc = acc.toolCalls.find(t => t.callId === callId);
+    if (tc) {
+        tc.ok = ok;
+        tc.message = message;
+        tc.data = data;
+        tc.completedAt = Date.now();
+    }
+}
 /** Persistent CLI provider sessions — kept alive across turns so the agent retains conversation context */
 const activeCliSessions = new Map();
 const sessionSubscribers = new Map();
@@ -165,13 +223,37 @@ function buildVisibleHistoryEntries(sessionId, history, options) {
     return out;
 }
 function buildVisibleHistoryMessages(sessionId, history, options) {
-    return buildVisibleHistoryEntries(sessionId, history, options).map(({ id, role, content, toolCalls, segments }) => ({
+    const msgs = buildVisibleHistoryEntries(sessionId, history, options).map(({ id, role, content, toolCalls, segments }) => ({
         id,
         role,
         content,
         toolCalls,
         segments,
     }));
+    // If there is a live streaming accumulator for this session, inject a
+    // synthetic assistant message so that reconnecting clients see the partial
+    // content that has been streamed so far.
+    const acc = sessionStreamingState.get(sessionId);
+    if (acc && (acc.content || acc.toolCalls.length > 0)) {
+        const last = msgs[msgs.length - 1];
+        // Merge into the last assistant message if it exists and has no content yet
+        // (the snapshot builder may have emitted a stub). Otherwise append a new one.
+        if (last && last.role === "assistant" && !last.content && !last.toolCalls) {
+            last.content = acc.content;
+            last.toolCalls = acc.toolCalls.length > 0 ? mapPersistedToolCallsForUI(acc.toolCalls) : undefined;
+            last.segments = acc.segments.length > 0 ? acc.segments : undefined;
+        }
+        else {
+            msgs.push({
+                id: `${sessionId}-streaming`,
+                role: "assistant",
+                content: acc.content,
+                toolCalls: acc.toolCalls.length > 0 ? mapPersistedToolCallsForUI(acc.toolCalls) : undefined,
+                segments: acc.segments.length > 0 ? acc.segments : undefined,
+            });
+        }
+    }
+    return msgs;
 }
 // ── System prompt ────────────────────────────────────────────────────
 const SYSTEM_PROMPT = `You are Jait — Just Another Intelligent Tool. You are a capable AI assistant that can run shell commands, read/write files, and manage system surfaces.
@@ -329,48 +411,53 @@ export function registerChatRoutes(app, config, depsOrDb, sessionServiceArg) {
         }
     }
     // ── Tool execution helper ──────────────────────────────────────────
-    async function executeTool(toolName, args, sessionId, auth, onOutputChunk, signal) {
-        if (!toolRegistry) {
-            return { ok: false, message: "Tool registry not available" };
-        }
-        if (signal?.aborted) {
-            return { ok: false, message: "Cancelled" };
-        }
-        const context = {
-            sessionId,
-            actionId: uuidv7(),
-            workspaceRoot: surfaceRegistry
-                ? resolveWorkspaceRoot(surfaceRegistry, sessionId)
-                : process.cwd(),
-            requestedBy: "agent",
-            userId: auth?.userId,
-            apiKeys: auth?.apiKeys,
-            onOutputChunk,
-            signal,
-        };
-        try {
-            const toolPromise = toolExecutor
-                ? toolExecutor(toolName, args, context)
-                : toolRegistry.execute(toolName, args, context, audit);
-            // Race the tool execution against the abort signal so a stuck tool
-            // (e.g. browser launch hanging) doesn't block the cancel flow forever.
-            if (signal && !signal.aborted) {
-                const abortPromise = new Promise((resolve) => {
-                    const onAbort = () => resolve({ ok: false, message: "Cancelled" });
-                    signal.addEventListener("abort", onAbort, { once: true });
-                    // Clean up if the tool finishes first
-                    toolPromise.finally(() => signal.removeEventListener("abort", onAbort));
-                });
-                return await Promise.race([toolPromise, abortPromise]);
+    function makeExecuteTool(executor) {
+        return async function executeTool(toolName, args, sessionId, auth, onOutputChunk, signal) {
+            if (!toolRegistry) {
+                return { ok: false, message: "Tool registry not available" };
             }
-            return await toolPromise;
-        }
-        catch (err) {
-            if (signal?.aborted)
+            if (signal?.aborted) {
                 return { ok: false, message: "Cancelled" };
-            return { ok: false, message: err instanceof Error ? err.message : String(err) };
-        }
+            }
+            const context = {
+                sessionId,
+                actionId: uuidv7(),
+                workspaceRoot: surfaceRegistry
+                    ? resolveWorkspaceRoot(surfaceRegistry, sessionId)
+                    : process.cwd(),
+                requestedBy: "agent",
+                userId: auth?.userId,
+                apiKeys: auth?.apiKeys,
+                onOutputChunk,
+                signal,
+            };
+            try {
+                const effectiveExec = executor ?? toolExecutor;
+                const toolPromise = effectiveExec
+                    ? effectiveExec(toolName, args, context)
+                    : toolRegistry.execute(toolName, args, context, audit);
+                // Race the tool execution against the abort signal so a stuck tool
+                // (e.g. browser launch hanging) doesn't block the cancel flow forever.
+                if (signal && !signal.aborted) {
+                    const abortPromise = new Promise((resolve) => {
+                        const onAbort = () => resolve({ ok: false, message: "Cancelled" });
+                        signal.addEventListener("abort", onAbort, { once: true });
+                        // Clean up if the tool finishes first
+                        toolPromise.finally(() => signal.removeEventListener("abort", onAbort));
+                    });
+                    return await Promise.race([toolPromise, abortPromise]);
+                }
+                return await toolPromise;
+            }
+            catch (err) {
+                if (signal?.aborted)
+                    return { ok: false, message: "Cancelled" };
+                return { ok: false, message: err instanceof Error ? err.message : String(err) };
+            }
+        };
     }
+    /** Default executeTool using the module-level toolExecutor */
+    const executeTool = makeExecuteTool();
     // ══ POST /api/chat — Main chat endpoint with agentic tool loop ═════
     app.post("/api/chat", async (request, reply) => {
         const authUser = await requireAuth(request, reply, config.jwtSecret);
@@ -434,6 +521,12 @@ export function registerChatRoutes(app, config, depsOrDb, sessionServiceArg) {
             ? resolveWorkspaceRoot(surfaceRegistry, sessionId, sessionRecord?.workspacePath)
             : (sessionRecord?.workspacePath?.trim() || process.cwd());
         const promptCtx = { workspaceRoot: wsRoot };
+        // Detect if the workspace lives on a remote node and resolve the
+        // node ID so tool execution can be delegated there.
+        const remoteNodeId = ws ? resolveRemoteNodeForSession(ws, wsRoot) : null;
+        if (remoteNodeId) {
+            console.log(`[chat] session=${sessionId} workspace="${wsRoot}" → remote node ${remoteNodeId}`);
+        }
         if (!sessionHistory.has(sessionId)) {
             sessionHistory.set(sessionId, [
                 { role: "system", content: buildSystemPrompt(chatMode, modelEndpoint, promptCtx) },
@@ -456,11 +549,19 @@ export function registerChatRoutes(app, config, depsOrDb, sessionServiceArg) {
         catch { /* session may not exist */ }
         const streamAbort = new AbortController();
         sessionAbortControllers.set(sessionId, streamAbort);
+        // Build a tool executor that delegates to the remote node when needed.
+        // For remote workspaces, tools like terminal.run and file.write will be
+        // proxied to the node via the tool.op-request/response protocol.
+        const effectiveToolExecutor = (remoteNodeId && ws && toolExecutor)
+            ? createRemoteToolExecutor({ ws, localExecutor: toolExecutor }, remoteNodeId)
+            : toolExecutor;
         let fullContent = "";
         let partialToolCalls = [];
         let resultSegmentsJson;
         let hitMaxRounds = false;
         activeStreams.add(sessionId);
+        // Reset streaming accumulator for this turn so reload snapshots start fresh
+        sessionStreamingState.delete(sessionId);
         let clientDisconnected = false;
         reply.raw.on("close", () => { clientDisconnected = true; });
         const safeWrite = (data) => {
@@ -487,32 +588,31 @@ export function registerChatRoutes(app, config, depsOrDb, sessionServiceArg) {
                 const cliWsRoot = surfaceRegistry
                     ? resolveWorkspaceRoot(surfaceRegistry, sessionId, sessionRecord?.workspacePath)
                     : (sessionRecord?.workspacePath?.trim() || process.cwd());
-                // Detect if the workspace lives on a remote node (e.g. Windows
-                // desktop) and route the CLI provider session there instead of
-                // trying to spawn codex/claude-code locally on the gateway.
+                // CLI providers always run on the gateway. If the workspace path
+                // is on a remote node, sync the files locally first.
                 const pathExistsLocally = existsSync(cliWsRoot);
-                let cliProvider = null;
-                let isRemote = false;
+                let effectiveCwd = cliWsRoot;
+                let workspaceSync = null;
                 if (!pathExistsLocally && ws) {
-                    // Match path platform to connected FsNodes
-                    const isWindowsPath = /^[A-Za-z]:[\\\/]/.test(cliWsRoot);
-                    const expectedPlatform = isWindowsPath ? "windows" : null;
-                    for (const node of ws.getFsNodes()) {
-                        if (node.isGateway)
-                            continue;
-                        if (expectedPlatform && node.platform !== expectedPlatform)
-                            continue;
-                        if (!node.providers?.includes(requestProvider))
-                            continue;
-                        cliProvider = new RemoteCliProvider(ws, node.id, requestProvider);
-                        isRemote = true;
-                        break;
+                    // Find a connected remote node that owns this path
+                    const nodeId = resolveRemoteNodeForSession(ws, cliWsRoot);
+                    if (nodeId) {
+                        workspaceSync = new WorkspaceSync({ ws, nodeId, remotePath: cliWsRoot, sessionId });
+                        try {
+                            safeWrite(`data: ${JSON.stringify({ type: "token", content: "Syncing workspace from remote node...\n" })}\n\n`);
+                            await workspaceSync.pull();
+                            effectiveCwd = workspaceSync.localDir;
+                            console.log(`[chat/cli] Synced remote workspace to ${effectiveCwd}`);
+                        }
+                        catch (err) {
+                            safeWrite(`data: ${JSON.stringify({ type: "error", message: `Failed to sync remote workspace: ${err instanceof Error ? err.message : String(err)}` })}\n\n`);
+                            reply.raw.end();
+                            return;
+                        }
                     }
                 }
-                // Fall back to the local provider if path exists on the gateway
-                if (!cliProvider) {
-                    cliProvider = providerRegistry.get(requestProvider) ?? null;
-                }
+                // Always use the local provider — CLI agents run on the gateway
+                let cliProvider = providerRegistry.get(requestProvider) ?? null;
                 if (!cliProvider) {
                     safeWrite(`data: ${JSON.stringify({ type: "error", message: `Unknown provider: ${requestProvider}` })}\n\n`);
                     reply.raw.end();
@@ -520,11 +620,11 @@ export function registerChatRoutes(app, config, depsOrDb, sessionServiceArg) {
                 }
                 const available = await cliProvider.checkAvailability();
                 if (!available) {
-                    safeWrite(`data: ${JSON.stringify({ type: "error", message: `Provider ${requestProvider} is not available${isRemote ? " on the remote node" : ""}: ${cliProvider.info.unavailableReason ?? "CLI not found"}` })}\n\n`);
+                    safeWrite(`data: ${JSON.stringify({ type: "error", message: `Provider ${requestProvider} is not available: ${cliProvider.info.unavailableReason ?? "CLI not found"}` })}\n\n`);
                     reply.raw.end();
                     return;
                 }
-                console.log(`[chat/cli] session=${sessionId} wsRoot="${cliWsRoot}" session.workspacePath="${sessionRecord?.workspacePath}" surfaces=${surfaceRegistry?.getBySession(sessionId)?.length ?? 0}`);
+                console.log(`[chat/cli] session=${sessionId} wsRoot="${cliWsRoot}" effectiveCwd="${effectiveCwd}" session.workspacePath="${sessionRecord?.workspacePath}" surfaces=${surfaceRegistry?.getBySession(sessionId)?.length ?? 0}`);
                 // Ensure a FileSystemSurface exists for this session so we can
                 // back up files before CLI providers (Codex/Claude) write them,
                 // enabling the keep/discard (undo) flow.
@@ -542,7 +642,7 @@ export function registerChatRoutes(app, config, depsOrDb, sessionServiceArg) {
                             surfaceRegistry.onSurfaceStarted = null;
                             const started = await surfaceRegistry.startSurface("filesystem", fsId, {
                                 sessionId,
-                                workspaceRoot: cliWsRoot,
+                                workspaceRoot: effectiveCwd,
                             });
                             surfaceRegistry.onSurfaceStarted = prevHandler;
                             cliFsSurface = started;
@@ -550,8 +650,8 @@ export function registerChatRoutes(app, config, depsOrDb, sessionServiceArg) {
                         catch { /* best effort */ }
                     }
                 }
-                // Remote providers can't reach the gateway's MCP endpoint
-                const mcpServers = isRemote ? [] : [providerRegistry.buildJaitMcpServerRef(config)];
+                // CLI providers run locally on the gateway — MCP always available
+                const mcpServers = [providerRegistry.buildJaitMcpServerRef(config)];
                 // ── Reuse an existing CLI session if one is alive for this Jait session ──
                 const cachedCliSession = activeCliSessions.get(sessionId);
                 let providerSessionId;
@@ -572,14 +672,14 @@ export function registerChatRoutes(app, config, depsOrDb, sessionServiceArg) {
                     }
                     const session = await cliProvider.startSession({
                         threadId: sessionId,
-                        workingDirectory: cliWsRoot,
+                        workingDirectory: effectiveCwd,
                         mode: "full-access",
                         model: typeof body["model"] === "string" ? body["model"] : undefined,
                         mcpServers,
                     });
                     providerSessionId = session.id;
                     activeCliSessions.set(sessionId, { providerId: requestProvider, providerSessionId, provider: cliProvider });
-                    console.log(`[chat/cli] Started new ${requestProvider}${isRemote ? " (remote)" : ""} session ${providerSessionId} for ${sessionId}`);
+                    console.log(`[chat/cli] Started new ${requestProvider} session ${providerSessionId} for ${sessionId}`);
                 }
                 // Collect full content from CLI provider events
                 const contentChunks = [];
@@ -629,6 +729,7 @@ export function registerChatRoutes(app, config, depsOrDb, sessionServiceArg) {
                             contentChunks.push(event.content);
                             tokenBytesThisBlock += event.content.length;
                             lastSegmentWasText = false; // new text arrived
+                            accumulateToken(sessionId, event.content);
                             safeWrite(`data: ${JSON.stringify({ type: "token", content: event.content })}\n\n`);
                             emitToSubscribers(sessionId, { type: "token", content: event.content });
                             break;
@@ -657,6 +758,7 @@ export function registerChatRoutes(app, config, depsOrDb, sessionServiceArg) {
                             }
                             safeWrite(`data: ${JSON.stringify({ type: "tool_start", call_id: callId, tool: event.tool, args: event.args })}\n\n`);
                             emitToSubscribers(sessionId, { type: "tool_start", call_id: callId, tool: event.tool, args: event.args });
+                            accumulateToolStart(sessionId, callId, event.tool, event.args ?? {});
                             break;
                         }
                         case "tool.output": {
@@ -665,6 +767,7 @@ export function registerChatRoutes(app, config, depsOrDb, sessionServiceArg) {
                             if (tc) {
                                 tc.message = (tc.message || "") + event.content;
                             }
+                            accumulateToolOutput(sessionId, event.callId ?? "", event.content);
                             safeWrite(`data: ${JSON.stringify({ type: "tool_output", call_id: event.callId, content: event.content })}\n\n`);
                             break;
                         }
@@ -680,6 +783,7 @@ export function registerChatRoutes(app, config, depsOrDb, sessionServiceArg) {
                             }
                             safeWrite(`data: ${JSON.stringify({ type: "tool_result", call_id: resultCallId, tool: event.tool, ok: event.ok, message: event.message, data: event.data })}\n\n`);
                             emitToSubscribers(sessionId, { type: "tool_result", call_id: resultCallId, tool: event.tool, ok: event.ok, message: event.message });
+                            accumulateToolResult(sessionId, resultCallId, event.ok, event.message || "", event.data);
                             // Emit file_changed for successful edits → drives the keep/discard UI
                             if (event.ok && event.tool === "edit") {
                                 const editPath = String(tc?.args ? tc.args.path ?? "" : "");
@@ -744,7 +848,7 @@ export function registerChatRoutes(app, config, depsOrDb, sessionServiceArg) {
                     activeCliSessions.delete(sessionId);
                     const freshSession = await cliProvider.startSession({
                         threadId: sessionId,
-                        workingDirectory: cliWsRoot,
+                        workingDirectory: effectiveCwd,
                         mode: "full-access",
                         model: typeof body["model"] === "string" ? body["model"] : undefined,
                         mcpServers,
@@ -789,6 +893,18 @@ export function registerChatRoutes(app, config, depsOrDb, sessionServiceArg) {
                 // Persist assistant message with tool calls and segments
                 history.push({ role: "assistant", content: fullContent, uiToolCalls: cliToolCalls.length > 0 ? cliToolCalls : undefined });
                 persistMessage(sessionId, "assistant", fullContent, cliTcJson, cliSegJson);
+                // Push changed files back to the remote node if workspace was synced
+                if (workspaceSync) {
+                    try {
+                        const { pushed } = await workspaceSync.push();
+                        if (pushed > 0) {
+                            console.log(`[chat/cli] Pushed ${pushed} changed file(s) back to remote node`);
+                        }
+                    }
+                    catch (err) {
+                        console.error(`[chat/cli] Failed to push changes back:`, err);
+                    }
+                }
                 // Session stays alive for the next turn — do NOT stop it.
                 // It will be cleaned up on session error, provider switch, or server shutdown.
             }
@@ -805,6 +921,15 @@ export function registerChatRoutes(app, config, depsOrDb, sessionServiceArg) {
                 const onEvent = (event) => {
                     emitToSubscribers(sessionId, event);
                     safeWrite(`data: ${JSON.stringify(event)}\n\n`);
+                    // ── Update streaming accumulator so reload snapshots include partial content ──
+                    if (event.type === "token")
+                        accumulateToken(sessionId, event.content);
+                    else if (event.type === "tool_start")
+                        accumulateToolStart(sessionId, event.call_id, event.tool, event.args);
+                    else if (event.type === "tool_output")
+                        accumulateToolOutput(sessionId, event.call_id, event.content);
+                    else if (event.type === "tool_result")
+                        accumulateToolResult(sessionId, event.call_id, event.ok, event.message, event.data);
                     // ── Cross-client sync: persist & broadcast state changes ──
                     const ev = event;
                     // Broadcast todo list updates to all session clients and persist to DB
@@ -864,7 +989,11 @@ export function registerChatRoutes(app, config, depsOrDb, sessionServiceArg) {
                     onEvent,
                     onPersist: (sid, role, content, tc, seg) => persistMessage(sid, role, content, tc, seg),
                     log: app.log,
-                }, executeTool, steering);
+                }, 
+                // Use remote-aware executor when workspace is on a remote node
+                effectiveToolExecutor !== toolExecutor
+                    ? makeExecuteTool(effectiveToolExecutor)
+                    : executeTool, steering);
                 fullContent = result.content;
                 partialToolCalls = result.executedToolCalls;
                 resultSegmentsJson = result.segments.length > 0 ? JSON.stringify(result.segments) : undefined;
@@ -913,6 +1042,7 @@ export function registerChatRoutes(app, config, depsOrDb, sessionServiceArg) {
         activeStreams.delete(sessionId);
         sessionAbortControllers.delete(sessionId);
         sessionSteeringControllers.delete(sessionId);
+        sessionStreamingState.delete(sessionId);
         // Clean up in-memory history: remove any dangling assistant tool_calls
         // messages that never got a text response (e.g. cancelled mid-tool-call).
         // This prevents them from showing as "running" on reload.