@yeaft/webchat-agent 0.1.911 → 0.1.913

package/connection/message-router.js

@@ -37,7 +37,7 @@ import { handleRestartAgent, handleUpgradeAgent } from './upgrade.js';
 import { loadMcpServers, updateMcpConfig } from '../mcp.js';
 import { getLlmConfig, updateLlmConfig, getYeaftSettings, updateYeaftSettings, getSearchSettings, updateSearchSettings, fetchTavilyUsage } from '../yeaft/config-api.js';
 import { fetchModelsDev } from '../yeaft/llm/models-dev.js';
-import { handleYeaftSessionSend, handleYeaftModeSwitch, handleYeaftModelSwitch, resetYeaftSession, handleYeaftLoadHistory, handleYeaftLoadMoreHistory, handleYeaftAbortThread, handleYeaftAbortAll, handleYeaftAbortTurn, handleYeaftVpSubscribe, handleYeaftVpCreate, handleYeaftVpUpdate, handleYeaftVpDelete, handleYeaftVpRead, handleYeaftListSessions, handleYeaftCreateSession, handleYeaftRenameSession, handleYeaftUpdateSession, handleYeaftUpdateSessionConfig, handleYeaftArchiveSession, handleYeaftDeleteSession, handleYeaftSessionAddMember, handleYeaftSessionRemoveMember, handleYeaftSessionSetDefaultVp, handleYeaftDreamTrigger, handleYeaftFetchToolStats, handleYeaftFetchDebugHistory, broadcastLanguageChange, broadcastYeaftSessionSnapshotEager } from '../yeaft/web-bridge.js';
+import { handleYeaftSessionSend, handleYeaftModeSwitch, handleYeaftModelSwitch, resetYeaftSession, handleYeaftLoadHistory, handleYeaftLoadMoreHistory, handleYeaftAbortThread, handleYeaftAbortAll, handleYeaftAbortTurn, handleYeaftVpSubscribe, handleYeaftVpCreate, handleYeaftVpUpdate, handleYeaftVpDelete, handleYeaftVpRead, handleYeaftListSessions, handleYeaftCreateSession, handleYeaftRenameSession, handleYeaftUpdateSession, handleYeaftUpdateSessionConfig, handleYeaftArchiveSession, handleYeaftDeleteSession, handleYeaftSessionAddMember, handleYeaftSessionRemoveMember, handleYeaftSessionSetDefaultVp, handleYeaftScanWorkdirSessions, handleYeaftRestoreSession, handleYeaftDreamTrigger, handleYeaftFetchToolStats, handleYeaftFetchDebugHistory, broadcastLanguageChange, broadcastYeaftSessionSnapshotEager } from '../yeaft/web-bridge.js';
 
 export async function handleMessage(msg) {
   switch (msg.type) {
@@ -578,6 +578,16 @@ export async function handleMessage(msg) {
     case 'yeaft_session_set_default_vp':
       handleYeaftSessionSetDefaultVp(msg);
       break;
+    // feat-yeaft-session-restore: probe + register a session by workdir.
+    // `scan_workdir` is read-only (lists what's on disk + flags whether it's
+    // already in the central registry); `restore` writes the registry entry
+    // and triggers a snapshot rebroadcast so the sidebar updates.
+    case 'yeaft_scan_workdir_sessions':
+      handleYeaftScanWorkdirSessions(msg);
+      break;
+    case 'yeaft_restore_session':
+      handleYeaftRestoreSession(msg);
+      break;
     // Phase 2: session_send is just group_chat (N≥1 fan-out already works).
     case 'yeaft_session_send':
       handleYeaftSessionSend(msg);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@yeaft/webchat-agent",
-  "version": "0.1.911",
+  "version": "0.1.913",
   "description": "Remote agent for Yeaft WebChat — connects worker machines to the central server",
   "main": "index.js",
   "type": "module",

package/yeaft/sessions/index.js

@@ -52,6 +52,8 @@ export {
   snapshotSessions,
   updateSessionConfig,
   updateSessionAnnouncement,
+  scanWorkdirSessions,
+  restoreSessionToRegistry,
 } from './session-crud.js';
 export {
   loadSessionConfig,

package/yeaft/sessions/session-crud.js

@@ -152,6 +152,86 @@ export function unregisterSessionWorkDir(defaultYeaftDir, sessionId) {
   writeWorkDirRegistry(defaultYeaftDir, registry);
 }
 
+/**
+ * Scan the `.yeaft/sessions/` directory under `workDir` and return every
+ * session meta we can read. Read-only: never touches the registry.
+ *
+ * Each returned record carries `workDir` (the normalized path we scanned).
+ * This utility deliberately does NOT decorate `alreadyRegistered` — that
+ * cross-references the central workdir registry, which is a separate
+ * concern owned by the handler / caller (see
+ * `handleYeaftScanWorkdirSessions`). Keeping the utility layer-pure makes
+ * it usable from contexts that don't have / don't care about the registry
+ * (e.g. CLI tools, future per-workdir snapshots).
+ *
+ * Returns `[]` for missing dir / empty dir / unreadable dir — never throws.
+ * Sort is `createdAt` descending (most-recent first) because the restore
+ * UI typically cares about "the session I made yesterday".
+ *
+ * @param {string} workDir — the working directory to scan.
+ * @returns {Array<object>}
+ */
+export function scanWorkdirSessions(workDir) {
+  const normalized = normalizeWorkDir(workDir);
+  if (!normalized) return [];
+  const groupYeaftDir = yeaftDirForWorkDir(normalized);
+  const root = sessionsRoot(groupYeaftDir);
+  if (!existsSync(root)) return [];
+  const out = [];
+  let entries;
+  try {
+    entries = readdirSync(root);
+  } catch {
+    return [];
+  }
+  for (const name of entries) {
+    if (name.startsWith('.')) continue; // skip .archived-* and dotfiles
+    const dir = join(root, name);
+    try { if (!statSync(dir).isDirectory()) continue; } catch { continue; }
+    const meta = loadSessionMeta(dir);
+    if (!meta) continue;
+    out.push({
+      ...meta,
+      workDir: normalized,
+    });
+  }
+  return out.sort((a, b) => String(b.createdAt || '').localeCompare(String(a.createdAt || '')));
+}
+
+/**
+ * Register `(sessionId, workDir)` in the central registry so the next
+ * `snapshotSessions()` includes this session.
+ *
+ * Validates that `<workDir>/.yeaft/sessions/<sessionId>/group.json` exists
+ * and is parseable. Throws:
+ *  - `not_found`   — the session dir is not on disk at this workdir
+ *  - `corrupt_meta` — the dir exists but `group.json` is missing / unreadable
+ *                    / can't be parsed. Surfaced as a distinct code so the
+ *                    UI can tell the user "the file is broken" instead of
+ *                    "you picked the wrong workdir" (review finding I1).
+ *
+ * Idempotent: if the same `(sessionId, workDir)` is already registered,
+ * we still rewrite the entry (with the normalized path) and return the
+ * fresh meta — no error.
+ *
+ * @param {string} defaultYeaftDir
+ * @param {string} sessionId
+ * @param {string} workDir
+ * @returns {object} the session meta, with `workDir` set to the normalized path.
+ */
+export function restoreSessionToRegistry(defaultYeaftDir, sessionId, workDir) {
+  if (!sessionId) throw new SessionCrudError('invalid_session_id', null);
+  const normalized = normalizeWorkDir(workDir);
+  if (!normalized) throw new SessionCrudError('invalid_workdir', sessionId);
+  const groupYeaftDir = yeaftDirForWorkDir(normalized);
+  const dir = join(sessionsRoot(groupYeaftDir), sessionId);
+  if (!existsSync(dir)) throw new SessionCrudError('not_found', sessionId);
+  const meta = loadSessionMeta(dir);
+  if (!meta) throw new SessionCrudError('corrupt_meta', sessionId, `group.json missing or unreadable at ${dir}`);
+  registerSessionWorkDir(defaultYeaftDir, sessionId, normalized);
+  return { ...meta, workDir: normalized };
+}
+
 export function resolveSessionYeaftDir(defaultYeaftDir, sessionId) {
   if (!defaultYeaftDir || !sessionId) return defaultYeaftDir;
   const defaultGroupDir = join(sessionsRoot(defaultYeaftDir), sessionId);

package/yeaft/web-bridge.js

@@ -43,6 +43,9 @@ import {
   snapshotSessions,
   resolveSessionYeaftDir,
   sessionsRoot,
+  scanWorkdirSessions,
+  restoreSessionToRegistry,
+  readWorkDirRegistry,
 } from './sessions/session-crud.js';
 import { openSession, loadSessionMeta } from './sessions/session-store.js';
 import { loadSessionConfig, resolveSessionConfig, SessionConfigError } from './sessions/session-config.js';
@@ -1501,6 +1504,63 @@ export function handleYeaftCreateSession(msg) {
   }
 }
 
+/**
+ * `yeaft_scan_workdir_sessions` — read-only probe: list every yeaft
+ * session physically present under `<workDir>/.yeaft/sessions/` along with
+ * an `alreadyRegistered` flag (so the restore UI can disable sessions
+ * already visible in the sidebar). Never mutates the registry; never
+ * throws on missing/empty directories.
+ *
+ * Pairs with `handleYeaftRestoreSession` for the "Restore session from a
+ * workdir" flow — see plan rosy-snuggling-waterfall.md.
+ */
+export function handleYeaftScanWorkdirSessions(msg) {
+  const requestId = msg && msg.requestId;
+  try {
+    const workDir = String(msg && msg.workDir || '').trim();
+    if (!workDir) throw new SessionCrudError('invalid_workdir', null, 'workDir required');
+    const yeaftDir = ctx.CONFIG?.yeaftDir;
+    // scanWorkdirSessions is a layer-pure utility — it doesn't read the
+    // central workdir registry. The handler is the right layer to fold in
+    // `alreadyRegistered` because that flag couples the per-workdir scan
+    // to a specific agent's registry (the same scan from a CLI tool or
+    // a different agent would compare against a different registry).
+    const sessions = scanWorkdirSessions(workDir);
+    const registry = readWorkDirRegistry(yeaftDir);
+    const decorated = sessions.map(s => ({
+      ...s,
+      alreadyRegistered: Object.prototype.hasOwnProperty.call(registry, s.id),
+    }));
+    sendSessionCrudResult({ op: 'scan_workdir', requestId, ok: true, sessions: decorated });
+  } catch (err) {
+    sendSessionCrudResult({ op: 'scan_workdir', requestId, ok: false, error: sessionErrorPayload(err) });
+  }
+}
+
+/**
+ * `yeaft_restore_session` — register `(sessionId, workDir)` in the
+ * central workdir registry so the next `snapshotSessions()` includes
+ * the session. Validates the session dir exists; rebroadcasts the
+ * snapshot on success so connected sidebars refresh.
+ *
+ * Idempotent: re-restoring an already-registered session succeeds.
+ */
+export function handleYeaftRestoreSession(msg) {
+  const requestId = msg && msg.requestId;
+  const sessionId = msg && msg.sessionId;
+  const workDir = String(msg && msg.workDir || '').trim();
+  try {
+    if (!sessionId) throw new SessionCrudError('invalid_session_id', null);
+    if (!workDir) throw new SessionCrudError('invalid_workdir', sessionId);
+    const yeaftDir = ctx.CONFIG?.yeaftDir;
+    const meta = restoreSessionToRegistry(yeaftDir, sessionId, workDir);
+    sendSessionCrudResult({ op: 'restore', requestId, ok: true, session: meta });
+    sendSessionSnapshotBroadcast();
+  } catch (err) {
+    sendSessionCrudResult({ op: 'restore', requestId, ok: false, error: sessionErrorPayload(err) });
+  }
+}
+
 export function handleYeaftRenameSession(msg) {
   const requestId = msg && msg.requestId;
   // fix-yeaft-delete-and-agent-revert: accept legacy `groupId` in