@yeaft/webchat-agent 1.0.414 → 1.0.416

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

package/yeaft/sessions/session-manifest.js

@@ -15,18 +15,25 @@
 import {
   cpSync,
   existsSync,
+  linkSync,
   mkdirSync,
   readFileSync,
   readdirSync,
   rmSync,
   statSync,
+  unlinkSync,
   writeFileSync,
 } from 'fs';
+import { randomUUID } from 'node:crypto';
 import { join } from 'path';
 import { loadSessionMeta } from './session-store.js';
+import { writeAtomic } from '../storage/atomic.js';
 
 export const SESSIONS_MANIFEST_FILE = 'sessions-manifest.json';
 const MANIFEST_VERSION = 1;
+const MANIFEST_LOCK_FILE = 'sessions-manifest.lock';
+const MANIFEST_LOCK_WAIT_MS = 5_000;
+const lockWaitArray = new Int32Array(new SharedArrayBuffer(4));
 
 export function sessionManifestPath(yeaftDir) {
   return join(yeaftDir, SESSIONS_MANIFEST_FILE);
@@ -62,6 +69,10 @@ export function loadSessionsManifest(yeaftDir) {
 }
 
 export function writeSessionsManifest(yeaftDir, sessions) {
+  return withManifestLock(yeaftDir, () => writeSessionsManifestUnlocked(yeaftDir, sessions));
+}
+
+function writeSessionsManifestUnlocked(yeaftDir, sessions) {
   if (!yeaftDir) throw new Error('yeaftDir required');
   mkdirSync(yeaftDir, { recursive: true });
   const manifest = {
@@ -69,7 +80,7 @@ export function writeSessionsManifest(yeaftDir, sessions) {
     generatedAt: new Date().toISOString(),
     sessions: dedupeSessions(sessions).sort((a, b) => String(a.createdAt || '').localeCompare(String(b.createdAt || ''))),
   };
-  writeFileSync(sessionManifestPath(yeaftDir), `${JSON.stringify(manifest, null, 2)}\n`);
+  writeAtomic(sessionManifestPath(yeaftDir), `${JSON.stringify(manifest, null, 2)}\n`);
   return manifest;
 }
 
@@ -171,21 +182,114 @@ export function ensureSessionsManifest(yeaftDir, options) {
     }
   }
 
-  const manifest = writeSessionsManifest(yeaftDir, buildManifestFromLocalSessions(yeaftDir, root));
-  return { created: true, migrated, skipped, migratedIds, skippedIds, manifest };
+  return withManifestLock(yeaftDir, () => {
+    const current = loadSessionsManifest(yeaftDir);
+    const manifest = writeSessionsManifestUnlocked(yeaftDir, [
+      ...(current?.sessions || []),
+      ...buildManifestFromLocalSessions(yeaftDir, root),
+    ]);
+    return {
+      created: !current,
+      migrated,
+      skipped,
+      migratedIds,
+      skippedIds,
+      manifest,
+    };
+  });
 }
 
 export function addOrUpdateManifestSession(yeaftDir, meta, dir) {
-  const current = loadSessionsManifest(yeaftDir) || { sessions: [] };
-  const rows = current.sessions.filter(row => row.id !== meta.id);
-  rows.push(manifestRowFromMeta(meta, dir));
-  return writeSessionsManifest(yeaftDir, rows);
+  return withManifestLock(yeaftDir, () => {
+    const current = loadSessionsManifest(yeaftDir);
+    const recovered = current?.sessions
+      || buildManifestFromLocalSessions(yeaftDir, join(yeaftDir, 'sessions'));
+    const rows = recovered.filter(row => row.id !== meta.id);
+    rows.push(manifestRowFromMeta(meta, dir));
+    return writeSessionsManifestUnlocked(yeaftDir, rows);
+  });
 }
 
 export function removeManifestSession(yeaftDir, sessionId) {
-  const current = loadSessionsManifest(yeaftDir);
-  if (!current) return null;
-  return writeSessionsManifest(yeaftDir, current.sessions.filter(row => row.id !== sessionId));
+  return withManifestLock(yeaftDir, () => {
+    const current = loadSessionsManifest(yeaftDir);
+    if (!current) return null;
+    return writeSessionsManifestUnlocked(yeaftDir, current.sessions.filter(row => row.id !== sessionId));
+  });
+}
+
+export function withSessionManifestLock(yeaftDir, operation) {
+  if (!yeaftDir) throw new Error('yeaftDir required');
+  mkdirSync(yeaftDir, { recursive: true });
+  const lockFile = join(yeaftDir, MANIFEST_LOCK_FILE);
+  const deadline = Date.now() + MANIFEST_LOCK_WAIT_MS;
+  const token = randomUUID();
+  const ownerFile = `${lockFile}.owner.${process.pid}.${token}`;
+  const owner = { pid: process.pid, token, ownerFile };
+  writeFileSync(ownerFile, `${JSON.stringify(owner)}\n`, { flag: 'wx' });
+  for (;;) {
+    try {
+      linkSync(ownerFile, lockFile);
+      break;
+    } catch (error) {
+      if (error?.code !== 'EEXIST') {
+        try { unlinkSync(ownerFile); } catch {}
+        throw error;
+      }
+      reapDeadManifestLock(lockFile);
+      if (Date.now() >= deadline) {
+        try { unlinkSync(ownerFile); } catch {}
+        throw new Error('Timed out waiting for Session manifest lock');
+      }
+      Atomics.wait(lockWaitArray, 0, 0, 25);
+    }
+  }
+  try {
+    return operation();
+  } finally {
+    try {
+      const current = JSON.parse(readFileSync(lockFile, 'utf8'));
+      if (current.token === owner.token) unlinkSync(lockFile);
+    } catch {
+      // A missing lock means another process already recovered this owner.
+    }
+    try { unlinkSync(ownerFile); } catch {}
+  }
+}
+
+function withManifestLock(yeaftDir, operation) {
+  return withSessionManifestLock(yeaftDir, operation);
+}
+
+function reapDeadManifestLock(lockFile) {
+  let observed;
+  try {
+    observed = JSON.parse(readFileSync(lockFile, 'utf8'));
+  } catch {
+    return;
+  }
+  if (!Number.isInteger(observed.pid) || typeof observed.token !== 'string') return;
+  try {
+    process.kill(observed.pid, 0);
+    return;
+  } catch (error) {
+    if (error?.code === 'EPERM') return;
+  }
+  const claim = `${lockFile}.reap.${process.pid}.${randomUUID()}`;
+  try {
+    linkSync(lockFile, claim);
+    const claimed = JSON.parse(readFileSync(claim, 'utf8'));
+    if (claimed.token !== observed.token) return;
+    unlinkSync(lockFile);
+    const expectedOwnerFile = `${lockFile}.owner.${observed.pid}.${observed.token}`;
+    if (observed.ownerFile === expectedOwnerFile) {
+      try { unlinkSync(expectedOwnerFile); } catch {}
+    }
+  } catch {
+    // Another process either recovered or replaced the observed lock.
+  } finally {
+    try { unlinkSync(claim); } catch {}
+  }
 }
 
 function manifestRowFromMeta(meta, dir) {

package/yeaft/stdio-protocol.js

@@ -1,5 +1,6 @@
 import { createInterface } from 'node:readline';
 import { randomUUID } from 'node:crypto';
+import { isReservedVpId, validateVpId } from './sessions/ids.js';
 
 const TERMINAL_STOP_REASONS = new Set([
   'end_turn', 'max_tokens', 'stop_sequence', 'aborted', 'error', 'tool_handoff', 'plan_recorded',
@@ -78,6 +79,62 @@ export function normalizeStreamRoutingIntent(message) {
   });
 }
 
+/**
+ * Read the opt-in formal Session seed supplied by an integration's first
+ * stream-json prompt. Existing Sessions keep their persisted roster; this only
+ * establishes a canonical roster for a previously unknown session id.
+ */
+export function normalizeStreamSessionBootstrap(message) {
+  if (!message || typeof message !== 'object') return null;
+  const hasRoster = Object.hasOwn(message, 'roster');
+  const hasVps = Object.hasOwn(message, 'vps');
+  const hasDefault = Object.hasOwn(message, 'defaultVpId');
+  if (!hasRoster && !hasVps && !hasDefault) return null;
+  if (!hasRoster && !hasVps) {
+    throw new Error('stream-json defaultVpId requires roster or vps');
+  }
+
+  const readRoster = (key) => {
+    const value = message[key];
+    if (!Array.isArray(value)) throw new Error(`stream-json ${key} must be an array`);
+    return value.slice();
+  };
+  const roster = hasRoster ? readRoster('roster') : readRoster('vps');
+  if (hasRoster && hasVps) {
+    const vps = readRoster('vps');
+    if (vps.length !== roster.length || vps.some((vpId, index) => vpId !== roster[index])) {
+      throw new Error('stream-json roster and vps must contain the same VP ids in the same order');
+    }
+  }
+
+  const seen = new Set();
+  for (const vpId of roster) {
+    const verdict = validateVpId(vpId);
+    if (!verdict.ok || isReservedVpId(vpId)) {
+      throw new Error(`stream-json roster contains invalid VP id ${JSON.stringify(vpId)} (${verdict.reason || 'reserved'})`);
+    }
+    if (seen.has(vpId)) throw new Error(`stream-json roster contains duplicate VP id ${vpId}`);
+    seen.add(vpId);
+  }
+
+  let defaultVpId = roster[0] || null;
+  if (hasDefault && message.defaultVpId != null) {
+    defaultVpId = message.defaultVpId;
+    const verdict = validateVpId(defaultVpId);
+    if (!verdict.ok || isReservedVpId(defaultVpId)) {
+      throw new Error(`stream-json defaultVpId is invalid (${verdict.reason || 'reserved'})`);
+    }
+    if (!seen.has(defaultVpId)) {
+      throw new Error(`stream-json defaultVpId ${defaultVpId} is not in roster`);
+    }
+  }
+
+  return Object.freeze({
+    roster: Object.freeze(roster),
+    defaultVpId,
+  });
+}
+
 export function createJsonlWriter(output = process.stdout) {
   return event => { output.write(`${JSON.stringify(event)}\n`); };
 }