@yeaft/webchat-agent 1.0.414 → 1.0.415

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@yeaft/webchat-agent",
-  "version": "1.0.414",
+  "version": "1.0.415",
   "description": "Remote worker agent for Yeaft Web Code Agent — connects the native Yeaft engine, CLI providers, and workbench tools",
   "main": "index.js",
   "type": "module",

package/terminal.js

@@ -62,28 +62,122 @@ function terminalRoutingFields(source) {
   return {
     ...(source?._requestUserId ? { _requestUserId: source._requestUserId } : {}),
     ...(source?._requestClientId ? { _requestClientId: source._requestClientId } : {}),
+    ...(source?._workbenchRequestId ? { _workbenchRequestId: source._workbenchRequestId } : {}),
+    ...(source?.workbenchRouteKey ? { workbenchRouteKey: source.workbenchRouteKey } : {}),
+    ...(source?.workbenchWorkspaceGeneration
+      ? { workbenchWorkspaceGeneration: source.workbenchWorkspaceGeneration }
+      : {}),
   };
 }
 
+function terminalOwner(source) {
+  return {
+    conversationId: source?.conversationId || '',
+    workbenchRouteKey: source?.workbenchRouteKey || '',
+    workbenchWorkspaceGeneration: source?.workbenchWorkspaceGeneration || '',
+  };
+}
+
+function terminalOwnerMatches(term, msg) {
+  if (!term || !msg) return false;
+  const owner = terminalOwner(term);
+  const request = terminalOwner(msg);
+  if (owner.workbenchRouteKey) {
+    return request.workbenchRouteKey === owner.workbenchRouteKey
+      && request.workbenchWorkspaceGeneration === owner.workbenchWorkspaceGeneration
+      && request.conversationId === owner.conversationId;
+  }
+  return !request.workbenchRouteKey
+    && !request.workbenchWorkspaceGeneration
+    && request.conversationId === owner.conversationId;
+}
+
+function rejectTerminalOwnerMismatch(msg, terminalId) {
+  ctx.sendToServer({
+    type: 'terminal_error',
+    conversationId: msg?.conversationId,
+    terminalId,
+    message: 'Terminal owner mismatch',
+    ...terminalRoutingFields(msg),
+  });
+}
+
+/**
+ * Fail closed when the Agent transport loses its Server-side owner state.
+ * Pending creates are cancelled before their backend resolves; established
+ * PTYs are removed from the owner map before kill so synchronous or delayed
+ * exit callbacks cannot affect a replacement terminal with the same id.
+ * No wire event is emitted because the transport is unavailable.
+ */
+export function cleanupTerminalsForDisconnect() {
+  const terminals = [...ctx.terminals.entries()];
+  if (terminals.length === 0) return 0;
+
+  for (const [, term] of terminals) {
+    term.cancelled = true;
+    if (term.timer) {
+      clearTimeout(term.timer);
+      term.timer = null;
+    }
+  }
+  ctx.terminals.clear();
+
+  for (const [, term] of terminals) {
+    if (!term.pty) continue;
+    try { term.pty.kill(); } catch {}
+  }
+  return terminals.length;
+}
+
 export async function handleTerminalCreate(msg) {
   const { conversationId, cols, rows } = msg;
   const terminalId = msg.terminalId || conversationId;
   const conv = ctx.conversations.get(conversationId);
-  const workDir = conv?.workDir || ctx.CONFIG.workDir;
+  const routeScoped = !!msg.workbenchRouteKey;
+  if (routeScoped && !msg.workbenchWorkspaceGeneration) {
+    rejectTerminalOwnerMismatch(msg, terminalId);
+    return;
+  }
+  const workDir = routeScoped
+    ? (msg.workDir || ctx.CONFIG.workDir)
+    : (conv?.workDir || ctx.CONFIG.workDir);
   const routingFields = terminalRoutingFields(msg);
 
-  // 如果已存在终端，先关闭
+  // A terminal id is an object capability. It may only be replaced by its
+  // immutable owner, never by another Session that guessed the id.
   if (ctx.terminals.has(terminalId)) {
     const existing = ctx.terminals.get(terminalId);
+    if (!terminalOwnerMatches(existing, msg)) {
+      rejectTerminalOwnerMismatch(msg, terminalId);
+      return;
+    }
+    existing.cancelled = true;
+    if (existing.timer) {
+      clearTimeout(existing.timer);
+      existing.timer = null;
+    }
+    ctx.terminals.delete(terminalId);
     if (existing.pty) {
       try { existing.pty.kill(); } catch {}
     }
-    if (existing.timer) clearTimeout(existing.timer);
-    ctx.terminals.delete(terminalId);
   }
 
+  const pendingCreation = {
+    pty: null,
+    pending: true,
+    cancelled: false,
+    conversationId,
+    cols: cols || 80,
+    rows: rows || 24,
+    ...terminalOwner(msg),
+    ...routingFields,
+  };
+  ctx.terminals.set(terminalId, pendingCreation);
+
   const pty = await loadNodePty();
+  if (ctx.terminals.get(terminalId) !== pendingCreation || pendingCreation.cancelled) return;
   if (!pty) {
+    ctx.terminals.delete(terminalId);
     ctx.sendToServer({
       type: 'terminal_error',
       conversationId,
@@ -120,40 +214,65 @@ export async function handleTerminalCreate(msg) {
       env: terminalEnv
     });
 
-    // 输出缓冲 - 每 16ms 批量发送
-    let buffer = '';
-    let timer = null;
+    if (ctx.terminals.get(terminalId) !== pendingCreation || pendingCreation.cancelled) {
+      try { ptyProcess.kill(); } catch {}
+      return;
+    }
+
+    const terminalRecord = {
+      pty: ptyProcess,
+      cancelled: false,
+      conversationId,
+      cols: cols || 80,
+      rows: rows || 24,
+      buffer: '',
+      timer: null,
+      ...terminalOwner(msg),
+      ...routingFields,
+    };
+    ctx.terminals.set(terminalId, terminalRecord);
 
+    // Output callbacks are fenced to this exact record. A disconnect or
+    // same-id replacement removes it before kill, so stale data/exit events
+    // cannot leak or delete the replacement.
     ptyProcess.onData(data => {
-      buffer += data;
-      if (!timer) {
-        timer = setTimeout(() => {
+      if (ctx.terminals.get(terminalId) !== terminalRecord || terminalRecord.cancelled) return;
+      terminalRecord.buffer += data;
+      if (!terminalRecord.timer) {
+        terminalRecord.timer = setTimeout(() => {
+          terminalRecord.timer = null;
+          if (ctx.terminals.get(terminalId) !== terminalRecord || terminalRecord.cancelled) {
+            terminalRecord.buffer = '';
+            return;
+          }
           ctx.sendToServer({
             type: 'terminal_output',
             conversationId,
             terminalId,
-            data: buffer,
+            data: terminalRecord.buffer,
             ...routingFields,
           });
-          buffer = '';
-          timer = null;
+          terminalRecord.buffer = '';
         }, 16);
       }
     });
 
     ptyProcess.onExit(({ exitCode }) => {
-      // 发送剩余缓冲
-      if (buffer) {
+      if (ctx.terminals.get(terminalId) !== terminalRecord || terminalRecord.cancelled) return;
+      if (terminalRecord.buffer) {
         ctx.sendToServer({
           type: 'terminal_output',
           conversationId,
           terminalId,
-          data: buffer,
+          data: terminalRecord.buffer,
           ...routingFields,
         });
-        buffer = '';
+        terminalRecord.buffer = '';
+      }
+      if (terminalRecord.timer) {
+        clearTimeout(terminalRecord.timer);
+        terminalRecord.timer = null;
       }
-      if (timer) clearTimeout(timer);
 
       console.log(`[PTY] Process exited for ${terminalId}, code: ${exitCode}`);
       ctx.terminals.delete(terminalId);
@@ -165,16 +284,6 @@ export async function handleTerminalCreate(msg) {
       });
     });
 
-    ctx.terminals.set(terminalId, {
-      pty: ptyProcess,
-      conversationId,
-      cols: cols || 80,
-      rows: rows || 24,
-      buffer: '',
-      timer: null,
-      ...routingFields,
-    });
-
     console.log(`[PTY] Created terminal ${terminalId} for ${conversationId} in ${workDir}`);
     ctx.sendToServer({
       type: 'terminal_created',
@@ -184,6 +293,7 @@ export async function handleTerminalCreate(msg) {
       ...routingFields,
     });
   } catch (e) {
+    if (ctx.terminals.get(terminalId) === pendingCreation) ctx.terminals.delete(terminalId);
     console.error(`[PTY] Failed to create terminal:`, e.message);
     ctx.sendToServer({
       type: 'terminal_error',
@@ -199,6 +309,10 @@ export function handleTerminalInput(msg) {
   const terminalId = msg.terminalId || msg.conversationId;
   const term = ctx.terminals.get(terminalId);
   if (term?.pty) {
+    if (!terminalOwnerMatches(term, msg)) {
+      rejectTerminalOwnerMismatch(msg, terminalId);
+      return;
+    }
     try {
       term.pty.write(msg.data);
     } catch (e) {
@@ -212,6 +326,10 @@ export function handleTerminalResize(msg) {
   const { cols, rows } = msg;
   const term = ctx.terminals.get(terminalId);
   if (term?.pty && cols > 0 && rows > 0) {
+    if (!terminalOwnerMatches(term, msg)) {
+      rejectTerminalOwnerMismatch(msg, terminalId);
+      return;
+    }
     try {
       term.pty.resize(cols, rows);
       term.cols = cols;
@@ -226,11 +344,30 @@ export function handleTerminalClose(msg) {
   const terminalId = msg.terminalId || msg.conversationId;
   const term = ctx.terminals.get(terminalId);
   if (term) {
+    if (!terminalOwnerMatches(term, msg)) {
+      rejectTerminalOwnerMismatch(msg, terminalId);
+      return;
+    }
+    if (term.pending && !term.pty) {
+      term.cancelled = true;
+      ctx.terminals.delete(terminalId);
+      ctx.sendToServer({
+        type: 'terminal_closed',
+        conversationId: term.conversationId || msg.conversationId,
+        terminalId,
+        ...terminalRoutingFields(term),
+      });
+      return;
+    }
+    term.cancelled = true;
+    if (term.timer) {
+      clearTimeout(term.timer);
+      term.timer = null;
+    }
+    ctx.terminals.delete(terminalId);
     if (term.pty) {
       try { term.pty.kill(); } catch {}
     }
-    if (term.timer) clearTimeout(term.timer);
-    ctx.terminals.delete(terminalId);
     console.log(`[PTY] Closed terminal ${terminalId}`);
     ctx.sendToServer({
       type: 'terminal_closed',

package/workbench/file-ops.js

@@ -4,6 +4,7 @@ import { join, basename, dirname, extname } from 'path';
 import { platform } from 'os';
 import ctx from '../context.js';
 import { resolveAndValidatePath, BINARY_EXTENSIONS } from './utils.js';
+import { sendWorkbenchResult } from './request-routing.js';
 
 export async function handleReadFile(msg) {
   const { conversationId, filePath, requestId, _requestUserId, _requestClientId } = msg;
@@ -20,7 +21,7 @@ export async function handleReadFile(msg) {
       // Binary file: read as Buffer, send base64
       const buffer = await readFile(resolved);
       console.log('[Agent] Sending binary file_content:', { filePath: resolved, size: buffer.length, mimeType, conversationId });
-      ctx.sendToServer({
+      sendWorkbenchResult(ctx, msg, {
         type: 'file_content',
         conversationId,
         requestId,
@@ -56,7 +57,7 @@ export async function handleReadFile(msg) {
       };
 
       console.log('[Agent] Sending file_content:', { filePath: resolved, contentLen: content.length, conversationId });
-      ctx.sendToServer({
+      sendWorkbenchResult(ctx, msg, {
         type: 'file_content',
         conversationId,
         requestId,
@@ -69,7 +70,7 @@ export async function handleReadFile(msg) {
       });
     }
   } catch (e) {
-    ctx.sendToServer({
+    sendWorkbenchResult(ctx, msg, {
       type: 'file_content',
       conversationId,
       requestId,
@@ -92,7 +93,7 @@ export async function handleWriteFile(msg) {
     const resolved = resolveAndValidatePath(filePath, workDir);
     await writeFile(resolved, content, 'utf-8');
 
-    ctx.sendToServer({
+    sendWorkbenchResult(ctx, msg, {
       type: 'file_saved',
       conversationId,
       requestId,
@@ -103,7 +104,7 @@ export async function handleWriteFile(msg) {
       success: true
     });
   } catch (e) {
-    ctx.sendToServer({
+    sendWorkbenchResult(ctx, msg, {
       type: 'file_saved',
       conversationId,
       requestId,
@@ -133,7 +134,7 @@ export async function handleListDirectory(msg) {
             drives.push({ name: letter + ':', type: 'directory', size: 0 });
           }
         }
-        ctx.sendToServer({
+        sendWorkbenchResult(ctx, msg, {
           type: 'directory_listing',
           conversationId,
           requestId,
@@ -150,7 +151,7 @@ export async function handleListDirectory(msg) {
           .filter(e => !(e.isDirectory() && SKIP_DIRS.has(e.name)))
           .map(e => ({ name: e.name, type: e.isDirectory() ? 'directory' : 'file', size: 0 }))
           .sort((a, b) => a.name.localeCompare(b.name));
-        ctx.sendToServer({
+        sendWorkbenchResult(ctx, msg, {
           type: 'directory_listing',
           conversationId,
           requestId,
@@ -161,7 +162,7 @@ export async function handleListDirectory(msg) {
         });
       }
     } catch (e) {
-      ctx.sendToServer({
+      sendWorkbenchResult(ctx, msg, {
         type: 'directory_listing',
         conversationId,
         requestId,
@@ -209,7 +210,7 @@ export async function handleListDirectory(msg) {
       return a.name.localeCompare(b.name);
     });
 
-    ctx.sendToServer({
+    sendWorkbenchResult(ctx, msg, {
       type: 'directory_listing',
       conversationId,
       requestId,
@@ -219,7 +220,7 @@ export async function handleListDirectory(msg) {
       entries: result
     });
   } catch (e) {
-    ctx.sendToServer({
+    sendWorkbenchResult(ctx, msg, {
       type: 'directory_listing',
       conversationId,
       requestId,
@@ -251,13 +252,13 @@ export async function handleCreateFile(msg) {
       }
       await writeFile(resolved, '', 'utf-8');
     }
-    ctx.sendToServer({
+    sendWorkbenchResult(ctx, msg, {
       type: 'file_op_result', conversationId, _requestUserId,
       operation: 'create', success: true,
       message: (isDirectory ? 'Directory' : 'File') + ' created: ' + basename(resolved)
     });
   } catch (e) {
-    ctx.sendToServer({
+    sendWorkbenchResult(ctx, msg, {
       type: 'file_op_result', conversationId, _requestUserId,
       operation: 'create', success: false, error: e.message
     });
@@ -293,13 +294,13 @@ export async function handleDeleteFiles(msg) {
       ? 'Deleted: ' + deleted.join(', ') + (errors.length > 0 ? '; Errors: ' + errors.join(', ') : '')
       : 'Failed: ' + errors.join(', ');
 
-    ctx.sendToServer({
+    sendWorkbenchResult(ctx, msg, {
       type: 'file_op_result', conversationId, _requestUserId,
       operation: 'delete', success: deleted.length > 0,
       message, deletedCount: deleted.length, errorCount: errors.length
     });
   } catch (e) {
-    ctx.sendToServer({
+    sendWorkbenchResult(ctx, msg, {
       type: 'file_op_result', conversationId, _requestUserId,
       operation: 'delete', success: false, error: e.message
     });
@@ -341,13 +342,13 @@ export async function handleMoveFiles(msg) {
       ? 'Moved: ' + moved.join(', ') + ' → ' + basename(destResolved) + (errors.length > 0 ? '; Errors: ' + errors.join(', ') : '')
       : 'Failed: ' + errors.join(', ');
 
-    ctx.sendToServer({
+    sendWorkbenchResult(ctx, msg, {
       type: 'file_op_result', conversationId, _requestUserId,
       operation: 'move', success: moved.length > 0,
       message, movedCount: moved.length, errorCount: errors.length
     });
   } catch (e) {
-    ctx.sendToServer({
+    sendWorkbenchResult(ctx, msg, {
       type: 'file_op_result', conversationId, _requestUserId,
       operation: 'move', success: false, error: e.message
     });
@@ -402,13 +403,13 @@ export async function handleCopyFiles(msg) {
       ? 'Copied: ' + copied.join(', ') + (errors.length > 0 ? '; Errors: ' + errors.join(', ') : '')
       : 'Failed: ' + errors.join(', ');
 
-    ctx.sendToServer({
+    sendWorkbenchResult(ctx, msg, {
       type: 'file_op_result', conversationId, _requestUserId,
       operation: 'copy', success: copied.length > 0,
       message, copiedCount: copied.length, errorCount: errors.length
     });
   } catch (e) {
-    ctx.sendToServer({
+    sendWorkbenchResult(ctx, msg, {
       type: 'file_op_result', conversationId, _requestUserId,
       operation: 'copy', success: false, error: e.message
     });
@@ -444,13 +445,13 @@ export async function handleUploadToDir(msg) {
       ? 'Uploaded: ' + saved.join(', ') + (errors.length > 0 ? '; Errors: ' + errors.join(', ') : '')
       : 'Failed: ' + errors.join(', ');
 
-    ctx.sendToServer({
+    sendWorkbenchResult(ctx, msg, {
       type: 'file_op_result', conversationId, _requestUserId,
       operation: 'upload', success: saved.length > 0,
       message, uploadedCount: saved.length, errorCount: errors.length
     });
   } catch (e) {
-    ctx.sendToServer({
+    sendWorkbenchResult(ctx, msg, {
       type: 'file_op_result', conversationId, _requestUserId,
       operation: 'upload', success: false, error: e.message
     });

package/workbench/file-search.js

@@ -1,6 +1,7 @@
 import { readdir, stat } from 'fs/promises';
 import { join, relative, resolve } from 'path';
 import ctx from '../context.js';
+import { sendWorkbenchResult } from './request-routing.js';
 
 export async function handleFileSearch(msg) {
   const { conversationId, query, _requestUserId } = msg;
@@ -10,7 +11,7 @@ export async function handleFileSearch(msg) {
 
   try {
     if (!query || query.trim().length === 0) {
-      ctx.sendToServer({ type: 'file_search_result', conversationId, _requestUserId, query, results: [] });
+      sendWorkbenchResult(ctx, msg, { type: 'file_search_result', conversationId, _requestUserId, query, results: [] });
       return;
     }
 
@@ -51,7 +52,7 @@ export async function handleFileSearch(msg) {
 
     await walk(resolved, 0);
 
-    ctx.sendToServer({
+    sendWorkbenchResult(ctx, msg, {
       type: 'file_search_result',
       conversationId,
       _requestUserId,
@@ -60,6 +61,6 @@ export async function handleFileSearch(msg) {
       truncated: results.length >= MAX_RESULTS
     });
   } catch (e) {
-    ctx.sendToServer({ type: 'file_search_result', conversationId, _requestUserId, query, results: [], error: e.message });
+    sendWorkbenchResult(ctx, msg, { type: 'file_search_result', conversationId, _requestUserId, query, results: [], error: e.message });
   }
 }

package/workbench/git-ops.js

@@ -2,6 +2,7 @@ import { readFile, writeFile } from 'fs/promises';
 import { join, resolve } from 'path';
 import ctx from '../context.js';
 import { execAsync, resolveAndValidatePath, getGitRoot, validateGitPath } from './utils.js';
+import { sendWorkbenchResult } from './request-routing.js';
 
 export async function handleGitStatus(msg) {
   const { conversationId, _requestUserId } = msg;
@@ -58,7 +59,7 @@ export async function handleGitStatus(msg) {
       files.push({ path: displayPath, indexStatus, workTreeStatus });
     }
 
-    ctx.sendToServer({
+    sendWorkbenchResult(ctx, msg, {
       type: 'git_status_result',
       conversationId,
       _requestUserId,
@@ -70,7 +71,7 @@ export async function handleGitStatus(msg) {
       gitRoot
     });
   } catch (e) {
-    ctx.sendToServer({
+    sendWorkbenchResult(ctx, msg, {
       type: 'git_status_result',
       conversationId,
       _requestUserId,
@@ -88,7 +89,7 @@ export async function handleGitDiff(msg) {
   try {
     // 安全检查：验证 filePath 不包含 shell 注入字符
     if (!filePath || /[`$;|&><!\n\r]/.test(filePath)) {
-      ctx.sendToServer({
+      sendWorkbenchResult(ctx, msg, {
         type: 'git_diff_result',
         conversationId,
         _requestUserId,
@@ -114,7 +115,7 @@ export async function handleGitDiff(msg) {
       const fullPath = resolve(gitRoot, filePath);
       const resolved = resolveAndValidatePath(fullPath, gitRoot);
       const content = await readFile(resolved, 'utf-8');
-      ctx.sendToServer({
+      sendWorkbenchResult(ctx, msg, {
         type: 'git_diff_result',
         conversationId,
         _requestUserId,
@@ -148,7 +149,7 @@ export async function handleGitDiff(msg) {
         windowsHide: true
       });
       if (cachedOut.trim()) {
-        ctx.sendToServer({
+        sendWorkbenchResult(ctx, msg, {
           type: 'git_diff_result',
           conversationId,
           _requestUserId,
@@ -167,7 +168,7 @@ export async function handleGitDiff(msg) {
         windowsHide: true
       });
       if (wtOut.trim()) {
-        ctx.sendToServer({
+        sendWorkbenchResult(ctx, msg, {
           type: 'git_diff_result',
           conversationId,
           _requestUserId,
@@ -179,7 +180,7 @@ export async function handleGitDiff(msg) {
       }
     }
 
-    ctx.sendToServer({
+    sendWorkbenchResult(ctx, msg, {
       type: 'git_diff_result',
       conversationId,
       _requestUserId,
@@ -188,7 +189,7 @@ export async function handleGitDiff(msg) {
       diff: stdout
     });
   } catch (e) {
-    ctx.sendToServer({
+    sendWorkbenchResult(ctx, msg, {
       type: 'git_diff_result',
       conversationId,
       _requestUserId,
@@ -210,15 +211,15 @@ export async function handleGitAdd(msg) {
       await execAsync('git add -A', { cwd: gitRoot, timeout: 10000, windowsHide: true });
     } else {
       if (!validateGitPath(filePath)) {
-        ctx.sendToServer({ type: 'git_op_result', conversationId, _requestUserId, operation: 'add', success: false, error: 'Invalid file path' });
+        sendWorkbenchResult(ctx, msg, { type: 'git_op_result', conversationId, _requestUserId, operation: 'add', success: false, error: 'Invalid file path' });
         return;
       }
       await execAsync(`git add -- "${filePath}"`, { cwd: gitRoot, timeout: 10000, windowsHide: true });
     }
 
-    ctx.sendToServer({ type: 'git_op_result', conversationId, _requestUserId, operation: 'add', success: true, message: addAll ? 'All files staged' : `Staged: ${filePath}` });
+    sendWorkbenchResult(ctx, msg, { type: 'git_op_result', conversationId, _requestUserId, operation: 'add', success: true, message: addAll ? 'All files staged' : `Staged: ${filePath}` });
   } catch (e) {
-    ctx.sendToServer({ type: 'git_op_result', conversationId, _requestUserId, operation: 'add', success: false, error: e.message });
+    sendWorkbenchResult(ctx, msg, { type: 'git_op_result', conversationId, _requestUserId, operation: 'add', success: false, error: e.message });
   }
 }
 
@@ -234,15 +235,15 @@ export async function handleGitReset(msg) {
       await execAsync('git reset HEAD', { cwd: gitRoot, timeout: 10000, windowsHide: true });
     } else {
       if (!validateGitPath(filePath)) {
-        ctx.sendToServer({ type: 'git_op_result', conversationId, _requestUserId, operation: 'reset', success: false, error: 'Invalid file path' });
+        sendWorkbenchResult(ctx, msg, { type: 'git_op_result', conversationId, _requestUserId, operation: 'reset', success: false, error: 'Invalid file path' });
         return;
       }
       await execAsync(`git reset HEAD -- "${filePath}"`, { cwd: gitRoot, timeout: 10000, windowsHide: true });
     }
 
-    ctx.sendToServer({ type: 'git_op_result', conversationId, _requestUserId, operation: 'reset', success: true, message: resetAll ? 'All files unstaged' : `Unstaged: ${filePath}` });
+    sendWorkbenchResult(ctx, msg, { type: 'git_op_result', conversationId, _requestUserId, operation: 'reset', success: true, message: resetAll ? 'All files unstaged' : `Unstaged: ${filePath}` });
   } catch (e) {
-    ctx.sendToServer({ type: 'git_op_result', conversationId, _requestUserId, operation: 'reset', success: false, error: e.message });
+    sendWorkbenchResult(ctx, msg, { type: 'git_op_result', conversationId, _requestUserId, operation: 'reset', success: false, error: e.message });
   }
 }
 
@@ -253,15 +254,15 @@ export async function handleGitRestore(msg) {
 
   try {
     if (!validateGitPath(filePath)) {
-      ctx.sendToServer({ type: 'git_op_result', conversationId, _requestUserId, operation: 'restore', success: false, error: 'Invalid file path' });
+      sendWorkbenchResult(ctx, msg, { type: 'git_op_result', conversationId, _requestUserId, operation: 'restore', success: false, error: 'Invalid file path' });
       return;
     }
 
     const gitRoot = await getGitRoot(workDir);
     await execAsync(`git restore -- "${filePath}"`, { cwd: gitRoot, timeout: 10000, windowsHide: true });
-    ctx.sendToServer({ type: 'git_op_result', conversationId, _requestUserId, operation: 'restore', success: true, message: `Restored: ${filePath}` });
+    sendWorkbenchResult(ctx, msg, { type: 'git_op_result', conversationId, _requestUserId, operation: 'restore', success: true, message: `Restored: ${filePath}` });
   } catch (e) {
-    ctx.sendToServer({ type: 'git_op_result', conversationId, _requestUserId, operation: 'restore', success: false, error: e.message });
+    sendWorkbenchResult(ctx, msg, { type: 'git_op_result', conversationId, _requestUserId, operation: 'restore', success: false, error: e.message });
   }
 }
 
@@ -272,7 +273,7 @@ export async function handleGitCommit(msg) {
 
   try {
     if (!commitMessage || !commitMessage.trim()) {
-      ctx.sendToServer({ type: 'git_op_result', conversationId, _requestUserId, operation: 'commit', success: false, error: 'Commit message is required' });
+      sendWorkbenchResult(ctx, msg, { type: 'git_op_result', conversationId, _requestUserId, operation: 'commit', success: false, error: 'Commit message is required' });
       return;
     }
 
@@ -286,13 +287,13 @@ export async function handleGitCommit(msg) {
       const { stdout } = await execAsync(`git commit -F "${tmpFile}"`, {
         cwd: gitRoot, timeout: 30000, windowsHide: true
       });
-      ctx.sendToServer({ type: 'git_op_result', conversationId, _requestUserId, operation: 'commit', success: true, message: stdout.trim() });
+      sendWorkbenchResult(ctx, msg, { type: 'git_op_result', conversationId, _requestUserId, operation: 'commit', success: true, message: stdout.trim() });
     } finally {
       // Clean up temp file
       try { await writeFile(tmpFile, '', 'utf8'); } catch {}
     }
   } catch (e) {
-    ctx.sendToServer({ type: 'git_op_result', conversationId, _requestUserId, operation: 'commit', success: false, error: e.stderr?.trim() || e.message });
+    sendWorkbenchResult(ctx, msg, { type: 'git_op_result', conversationId, _requestUserId, operation: 'commit', success: false, error: e.stderr?.trim() || e.message });
   }
 }
 
@@ -306,8 +307,8 @@ export async function handleGitPush(msg) {
     const { stdout, stderr } = await execAsync('git push', {
       cwd: gitRoot, timeout: 60000, windowsHide: true
     });
-    ctx.sendToServer({ type: 'git_op_result', conversationId, _requestUserId, operation: 'push', success: true, message: (stdout + '\n' + stderr).trim() || 'Push complete' });
+    sendWorkbenchResult(ctx, msg, { type: 'git_op_result', conversationId, _requestUserId, operation: 'push', success: true, message: (stdout + '\n' + stderr).trim() || 'Push complete' });
   } catch (e) {
-    ctx.sendToServer({ type: 'git_op_result', conversationId, _requestUserId, operation: 'push', success: false, error: e.stderr?.trim() || e.message });
+    sendWorkbenchResult(ctx, msg, { type: 'git_op_result', conversationId, _requestUserId, operation: 'push', success: false, error: e.stderr?.trim() || e.message });
   }
 }