@yeaft/webchat-agent 1.0.413 → 1.0.415

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 });
   }
 }

package/workbench/request-routing.js

@@ -0,0 +1,16 @@
+export function workbenchRequestRouting(source) {
+  return {
+    ...(source?._workbenchRequestId ? { _workbenchRequestId: source._workbenchRequestId } : {}),
+    ...(source?.workbenchRouteKey ? { workbenchRouteKey: source.workbenchRouteKey } : {}),
+    ...(source?.workbenchWorkspaceGeneration
+      ? { workbenchWorkspaceGeneration: source.workbenchWorkspaceGeneration }
+      : {}),
+  };
+}
+
+export function sendWorkbenchResult(ctx, request, result) {
+  ctx.sendToServer({
+    ...result,
+    ...workbenchRequestRouting(request),
+  });
+}

package/yeaft/cli.js

@@ -25,6 +25,7 @@
 
 import { createInterface } from 'readline';
 import { randomUUID } from 'node:crypto';
+import { realpathSync } from 'node:fs';
 import { resolve } from 'node:path';
 import { fileURLToPath } from 'node:url';
 import { join } from 'path';
@@ -35,13 +36,16 @@ import { listModels, resolveModel, parseModelRef, resolveContextWindow, resolveM
 import { buildSystemPrompt } from './prompts.js';
 import { searchMessages } from './conversation/search.js';
 import { ConversationStore } from './conversation/persist.js';
-import { snapshotSessions } from './sessions/session-crud.js';
+import { sessionsRoot, snapshotSessions } from './sessions/session-crud.js';
 import { loadSessionConfig, resolveSessionConfig } from './sessions/session-config.js';
+import { createSession } from './sessions/session-store.js';
+import { addOrUpdateManifestSession, withSessionManifestLock } from './sessions/session-manifest.js';
 import { validateSessionId } from './sessions/ids.js';
 import {
   createJsonlWriter,
   JsonlInput,
   normalizeStreamRoutingIntent,
+  normalizeStreamSessionBootstrap,
   runStreamTurn,
   runStreamSessionTurn,
 } from './stdio-protocol.js';
@@ -900,6 +904,7 @@ async function runStreamJson(config, args) {
   let taskEventIntakeOpen = true;
   let hadError = false;
   let singleEngineTail = Promise.resolve();
+  let streamSessionBootstrapOpen = false;
 
   const loadStreamHistory = () => conversationStore.loadRecentBySession(sessionId, 20).map(message => ({
     role: message.role,
@@ -1033,6 +1038,16 @@ async function runStreamJson(config, args) {
 
   configureStreamEngine(engine, null);
   sessionRunner = createCliSessionRunner({ loaded, sessionId, workDir, configureEngine: configureStreamEngine });
+  if (sessionRunner) {
+    snapshotSessions(loaded.yeaftDir);
+    const meta = sessionRunner.meta;
+    if (meta) addOrUpdateManifestSession(
+      loaded.yeaftDir,
+      meta,
+      join(sessionsRoot(loaded.yeaftDir), sessionId),
+    );
+  }
+  streamSessionBootstrapOpen = !sessionRunner;
 
   write({
     type: 'system',
@@ -1091,6 +1106,47 @@ async function runStreamJson(config, args) {
   };
 
   const runPrompt = async (prompt, message = null) => {
+    if (streamSessionBootstrapOpen) {
+      streamSessionBootstrapOpen = false;
+      const bootstrap = normalizeStreamSessionBootstrap(message);
+      if (bootstrap) {
+        let workspaceKey = '';
+        try { workspaceKey = realpathSync(resolve(workDir)); } catch { /* leave empty */ }
+        withSessionManifestLock(loaded.yeaftDir, () => {
+          sessionRunner = createCliSessionRunner({
+            loaded,
+            sessionId,
+            workDir,
+            configureEngine: configureStreamEngine,
+          });
+          if (sessionRunner) return;
+          const handle = createSession(sessionsRoot(loaded.yeaftDir), {
+            id: sessionId,
+            name: sessionId,
+            roster: bootstrap.roster,
+            defaultVpId: bootstrap.defaultVpId,
+            workDir,
+            workspaceKey,
+          });
+          handle.close();
+        });
+        if (!sessionRunner) {
+          sessionRunner = createCliSessionRunner({
+            loaded,
+            sessionId,
+            workDir,
+            configureEngine: configureStreamEngine,
+          });
+        }
+        if (!sessionRunner) throw new Error(`Failed to initialize formal stream-json Session ${sessionId}`);
+        const meta = sessionRunner.meta;
+        if (meta) addOrUpdateManifestSession(
+          loaded.yeaftDir,
+          meta,
+          join(sessionsRoot(loaded.yeaftDir), sessionId),
+        );
+      }
+    }
     const routingIntent = normalizeStreamRoutingIntent(message);
     if (routingIntent && !sessionRunner) {
       throw new Error('stream-json VP selectors require an existing formal Session with a persisted roster');