@yeaft/webchat-agent 1.0.40 → 1.0.42

package/connection/buffer.js

@@ -5,6 +5,7 @@ import { encrypt, decrypt, isEncrypted } from '../encryption.js';
 // 需要在断连期间缓冲的消息类型（CLI / Session 输出相关的关键消息）
 export const BUFFERABLE_TYPES = new Set([
   'claude_output', 'yeaft_output', 'yeaft_session_output', 'session_output',
+  'yeaft_history_chunk',
   'turn_completed', 'conversation_closed',
   'session_id_update', 'compact_status', 'slash_commands_update',
   'background_task_started', 'background_task_output',

package/connection/upgrade.js

@@ -2,13 +2,24 @@ import { execFile, execFileSync, spawn } from 'child_process';
 import { writeFileSync, mkdirSync, existsSync, cpSync } from 'fs';
 import { join, dirname } from 'path';
 import { fileURLToPath } from 'url';
-import { platform } from 'os';
+import { platform, homedir } from 'os';
 import ctx from '../context.js';
-import { getConfigDir } from '../service.js';
+import { getConfigDir, getServiceName, getPm2AppName, getLaunchdPlistPath, DEFAULT_INSTANCE_ID } from '../service.js';
 import { sendToServer } from './buffer.js';
 import { stopAgentHeartbeat } from './heartbeat.js';
 
-const PM2_APP_NAME = 'yeaft-agent';
+/**
+ * Resolve the local service instance id for this running agent. Each agent
+ * process is pinned to one instance (set in index.js from
+ * YEAFT_AGENT_INSTANCE / config), so the upgrade flow must target THAT
+ * instance's service unit — not the bare `yeaft-agent` default. Without this,
+ * a named instance (e.g. `server-e7a9eb`) installs the new package but its
+ * systemd unit `yeaft-agent@server-e7a9eb` is never restarted, leaving the
+ * agent permanently offline after a UI-triggered upgrade.
+ */
+export function resolveInstanceId() {
+  return ctx.CONFIG?.instanceId || process.env.YEAFT_AGENT_INSTANCE || DEFAULT_INSTANCE_ID;
+}
 
 // Derive absolute paths for npm/pm2 from current node executable.
 // In launchd/systemd environments, PATH may not include nvm/node dirs,
@@ -203,11 +214,12 @@ export async function handleUpgradeAgent() {
     });
 
     const isWindows = platform() === 'win32';
+    const instanceId = resolveInstanceId();
 
     if (isWindows) {
-      spawnWindowsUpgradeScript(pkgName, installDir, isGlobalInstall, latestVersion);
+      spawnWindowsUpgradeScript(pkgName, installDir, isGlobalInstall, latestVersion, instanceId);
     } else {
-      spawnUnixUpgradeScript(pkgName, installDir, isGlobalInstall, latestVersion);
+      spawnUnixUpgradeScript(pkgName, installDir, isGlobalInstall, latestVersion, instanceId);
     }
 
     // On PM2: delete the app BEFORE exiting so PM2 won't auto-restart the old version.
@@ -215,7 +227,7 @@ export async function handleUpgradeAgent() {
     const isPm2 = !!process.env.pm_id;
     if (isPm2) {
       try {
-        execFileSync(pm2Path, ['delete', PM2_APP_NAME], { stdio: 'pipe', env: safeEnv, ...shellOpt });
+        execFileSync(pm2Path, ['delete', getPm2AppName(instanceId)], { stdio: 'pipe', env: safeEnv, ...shellOpt });
         console.log(`[Agent] PM2 app deleted to prevent auto-restart during upgrade`);
       } catch {
         console.log(`[Agent] PM2 delete skipped (app may not be registered)`);
@@ -230,9 +242,9 @@ export async function handleUpgradeAgent() {
   }
 }
 
-function spawnWindowsUpgradeScript(pkgName, installDir, isGlobalInstall, latestVersion) {
+function spawnWindowsUpgradeScript(pkgName, installDir, isGlobalInstall, latestVersion, instanceId = DEFAULT_INSTANCE_ID) {
   const pid = process.pid;
-  const configDir = getConfigDir();
+  const configDir = getConfigDir(instanceId);
   mkdirSync(configDir, { recursive: true });
   const logDir = join(configDir, 'logs');
   mkdirSync(logDir, { recursive: true });
@@ -355,13 +367,45 @@ function spawnWindowsUpgradeScript(pkgName, installDir, isGlobalInstall, latestV
   sendToServer({ type: 'upgrade_agent_ack', success: true, version: latestVersion, pendingRestart: true });
 }
 
-function spawnUnixUpgradeScript(pkgName, installDir, isGlobalInstall, latestVersion) {
-  const pid = process.pid;
-  const configDir = getConfigDir();
-  mkdirSync(configDir, { recursive: true });
+/**
+ * Build the Unix (systemd/launchd) upgrade shell script as a string.
+ *
+ * Side-effect-free apart from reading the environment FS (`existsSync` to
+ * detect which service manager is installed) — and crucially it does NOT
+ * spawn, so the generated unit names can be asserted in unit tests. The
+ * service-manager target is resolved from `instanceId` via the shared helpers
+ * (`getServiceName` / `getLaunchdPlistPath`), so a named instance restarts
+ * `yeaft-agent@<id>` instead of the bare `yeaft-agent` default.
+ *
+ * @param {object} opts
+ * @param {string} opts.pkgName        npm package name
+ * @param {string} opts.installDir     install dir (local install) — used as cwd
+ * @param {boolean} opts.isGlobalInstall  global vs local npm install
+ * @param {number} opts.pid            pid of the exiting agent to wait on
+ * @param {string} opts.configDir      instance config dir (holds logs/upgrade.log)
+ * @param {string} opts.npmPath        absolute npm path
+ * @param {string} opts.safePath       PATH with nodeBinDir prepended
+ * @param {string} opts.instanceId     local service instance id
+ * @param {boolean} opts.isDarwin      whether the platform is macOS
+ * @returns {string} the upgrade.sh contents
+ */
+export function buildUnixUpgradeScript({
+  pkgName,
+  installDir,
+  isGlobalInstall,
+  pid,
+  configDir,
+  npmPath,
+  safePath,
+  instanceId = DEFAULT_INSTANCE_ID,
+  isDarwin = platform() === 'darwin',
+}) {
   const shPath = join(configDir, 'upgrade.sh');
-  const isSystemd = existsSync(join(process.env.HOME || '', '.config', 'systemd', 'user', 'yeaft-agent.service'));
-  const isLaunchd = platform() === 'darwin' && existsSync(join(process.env.HOME || '', 'Library', 'LaunchAgents', 'com.yeaft.agent.plist'));
+  const serviceName = getServiceName(instanceId);
+  const systemdUnitPath = join(homedir(), '.config', 'systemd', 'user', `${serviceName}.service`);
+  const isSystemd = existsSync(systemdUnitPath);
+  const plistPath = getLaunchdPlistPath(instanceId);
+  const isLaunchd = isDarwin && existsSync(plistPath);
   const cwd = isGlobalInstall ? undefined : installDir;
 
   const shLines = [
@@ -395,12 +439,11 @@ function spawnUnixUpgradeScript(pkgName, installDir, isGlobalInstall, latestVers
   if (isSystemd) {
     shLines.push(
       '# Stop systemd service to prevent restart loop',
-      'systemctl --user stop yeaft-agent 2>/dev/null',
+      `systemctl --user stop "${serviceName}" 2>/dev/null`,
       'sleep 1',
       '',
     );
   } else if (isLaunchd) {
-    const plistPath = join(process.env.HOME || '', 'Library', 'LaunchAgents', 'com.yeaft.agent.plist');
     shLines.push(
       '# Unload launchd service to prevent restart loop',
       `launchctl unload "${plistPath}" 2>/dev/null`,
@@ -430,11 +473,10 @@ function spawnUnixUpgradeScript(pkgName, installDir, isGlobalInstall, latestVers
   if (isSystemd) {
     shLines.push(
       '# Restart systemd service',
-      'systemctl --user start yeaft-agent',
+      `systemctl --user start "${serviceName}"`,
       'echo "[Upgrade] Service restarted via systemd"',
     );
   } else if (isLaunchd) {
-    const plistPath = join(process.env.HOME || '', 'Library', 'LaunchAgents', 'com.yeaft.agent.plist');
     shLines.push(
       '# Reload launchd service',
       `launchctl load "${plistPath}"`,
@@ -445,7 +487,26 @@ function spawnUnixUpgradeScript(pkgName, installDir, isGlobalInstall, latestVers
   // 清理脚本自身
   shLines.push('', `rm -f "${shPath}"`);
 
-  writeFileSync(shPath, shLines.join('\n'), { mode: 0o755 });
+  return shLines.join('\n');
+}
+
+function spawnUnixUpgradeScript(pkgName, installDir, isGlobalInstall, latestVersion, instanceId = DEFAULT_INSTANCE_ID) {
+  const configDir = getConfigDir(instanceId);
+  mkdirSync(configDir, { recursive: true });
+  const shPath = join(configDir, 'upgrade.sh');
+
+  const script = buildUnixUpgradeScript({
+    pkgName,
+    installDir,
+    isGlobalInstall,
+    pid: process.pid,
+    configDir,
+    npmPath,
+    safePath,
+    instanceId,
+  });
+
+  writeFileSync(shPath, script, { mode: 0o755 });
   const child = spawn('bash', [shPath], {
     detached: true,
     stdio: 'ignore',

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@yeaft/webchat-agent",
-  "version": "1.0.40",
+  "version": "1.0.42",
   "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/service/index.js

@@ -34,6 +34,9 @@ export {
   getLaunchdLabel,
   getDefaultYeaftDir,
 } from './config.js';
+// Re-export the launchd plist-path resolver so consumers (e.g. the upgrade
+// flow) reach it via the service barrel instead of deep-importing macos.js.
+export { getLaunchdPlistPath } from './macos.js';
 
 const os = platform();
 

package/service.js

@@ -25,6 +25,7 @@ export {
   getServiceName,
   getPm2AppName,
   getLaunchdLabel,
+  getLaunchdPlistPath,
   getDefaultYeaftDir,
   install,
   uninstall,

package/yeaft/web-bridge.js

@@ -4827,6 +4827,110 @@ export async function handleYeaftLoadHistory(msg) {
     sessionId ? store.loadRecentBySession(sessionId, lim) : store.loadRecent(lim);
   let historyAlreadyReplayed = false;
 
+  const replayHistoryFromStore = () => {
+    // Delta path: caller knows the latest seq (or message id) it has cached
+    // and wants only the messages that arrived after that cursor. Returns
+    // mode:'delta' so the frontend can append+dedupe instead of replacing
+    // the pane.
+    const afterSeqRaw = (msg && Number.isFinite(msg.afterSeq)) ? msg.afterSeq : null;
+    const afterMessageId = (msg && typeof msg.afterMessageId === 'string') ? msg.afterMessageId : null;
+    let afterSeq = afterSeqRaw;
+    if (afterSeq === null && afterMessageId && typeof session.conversationStore.getMessageSeqById === 'function') {
+      afterSeq = session.conversationStore.getMessageSeqById(afterMessageId);
+    }
+    if (sessionId && afterSeq !== null && typeof session.conversationStore.loadAfterSeqByGroup === 'function') {
+      const delta = session.conversationStore.loadAfterSeqByGroup(sessionId, afterSeq);
+      const projectedMessages = emitHistoryChunk({
+        sessionId,
+        messages: delta.messages,
+        mode: 'delta',
+        latestSeq: delta.latestSeq,
+        afterSeq,
+      });
+      sendSessionEvent({
+        type: 'history_loaded',
+        mode: 'delta',
+        count: projectedMessages.length,
+        sessionId,
+        latestSeq: delta.latestSeq,
+        afterSeq,
+      });
+      return;
+    }
+
+    // `msg.limit` is the replay-scrollback request from the frontend (UI
+    // history pane, not engine context). Keep the bootstrap window small so
+    // opening a group can paint the latest messages quickly; older rows are
+    // paged via `yeaft_load_more_history` when the user scrolls upward.
+    const limit = (typeof msg.limit === 'number') ? msg.limit : 10;
+    const visiblePage = sessionId
+      ? loadVisibleGroupHistoryPage(session.conversationStore, sessionId, limit)
+      : { messages: limit > 0 ? pickRecent(session.conversationStore, limit) : [], oldestSeq: null, hasMore: false };
+    // Legacy compact.md is a non-group fallback only. For group replay, reading
+    // it makes every group show "has compact" once any legacy/non-scoped compact
+    // exists, even when this group has no scoped summary.
+    const compactSummary = sessionId ? '' : session.conversationStore.readCompactSummary();
+    const replayEntries = sessionId
+      ? visiblePage.messages
+      : visiblePage.messages
+        .map(projectPersistedToVisibleHistoryEntry)
+        .filter(Boolean);
+
+    let latestSeq = null;
+    if (replayEntries.length > 0 && typeof session.conversationStore.getMessageSeqById === 'function') {
+      const last = replayEntries[replayEntries.length - 1];
+      if (last && last.id) latestSeq = session.conversationStore.getMessageSeqById(last.id);
+    }
+
+    if (sessionId) {
+      emitHistoryChunk({
+        sessionId,
+        messages: replayEntries,
+        mode: 'recent',
+        oldestSeq: visiblePage.oldestSeq,
+        hasMore: visiblePage.hasMore,
+        latestSeq,
+        turns: limit,
+      });
+    } else {
+      emitLegacyHistoryOutputFrames(replayEntries);
+    }
+
+    // Compute the pagination cursor for the bootstrap load so the frontend
+    // knows whether a "Load older messages" hint should be shown and where
+    // to start the next page. For group history, this is computed from the
+    // visible projected page, not raw persisted rows, so reflection/internal
+    // tail rows cannot consume the bootstrap window or create false hasMore.
+    let hasMore = false;
+    let oldestSeq = null;
+    if (sessionId) {
+      hasMore = visiblePage.hasMore;
+      oldestSeq = visiblePage.oldestSeq;
+    }
+
+    // hasCompactSummary used to read a single session-global file, so it was
+    // always true once ANY group/VP in the session had compacted. For group
+    // replay, only scoped per-(group, vp) summaries count; legacy compact.md is
+    // reserved for non-group / pre-scoped 1:1 callers.
+    let hasCompactSummaryFlag = !!compactSummary;
+    if (sessionId && typeof session.conversationStore.hasAnyCompactSummaryForSession === 'function') {
+      hasCompactSummaryFlag = session.conversationStore.hasAnyCompactSummaryForSession(sessionId);
+    }
+
+    sendSessionEvent({
+      type: 'history_loaded',
+      mode: 'recent',
+      count: replayEntries.length,
+      hasCompactSummary: hasCompactSummaryFlag,
+      totalHot: session.conversationStore.countHot(),
+      totalCold: session.conversationStore.countCold(),
+      sessionId,
+      hasMore,
+      oldestSeq,
+      latestSeq,
+    });
+  };
+
   if (!session) {
     const yeaftDir = ctx.CONFIG?.yeaftDir || DEFAULT_YEAFT_DIR;
     const afterSeqRaw = (msg && Number.isFinite(msg.afterSeq)) ? msg.afterSeq : null;
@@ -4878,6 +4982,8 @@ export async function handleYeaftLoadHistory(msg) {
     // hydration handles it.
     if (sessionId) setGroupHistory(sessionId, hydrateGroupHistory(sessionId));
   } else {
+    replayHistoryFromStore();
+    historyAlreadyReplayed = true;
     refreshLiveSessionConfig();
     hydrateYeaftStatusFromSession(session, { reason: 'history_load', emitEvent: true });
   }
@@ -4917,107 +5023,7 @@ export async function handleYeaftLoadHistory(msg) {
 
   if (historyAlreadyReplayed) return;
 
-  // Delta path: caller knows the latest seq (or message id) it has cached
-  // and wants only the messages that arrived after that cursor. Returns
-  // early with mode:'delta' so the frontend can append+dedupe instead of
-  // replacing the pane.
-  const afterSeqRaw = (msg && Number.isFinite(msg.afterSeq)) ? msg.afterSeq : null;
-  const afterMessageId = (msg && typeof msg.afterMessageId === 'string') ? msg.afterMessageId : null;
-  let afterSeq = afterSeqRaw;
-  if (afterSeq === null && afterMessageId && typeof session.conversationStore.getMessageSeqById === 'function') {
-    afterSeq = session.conversationStore.getMessageSeqById(afterMessageId);
-  }
-  if (sessionId && afterSeq !== null && typeof session.conversationStore.loadAfterSeqByGroup === 'function') {
-    const delta = session.conversationStore.loadAfterSeqByGroup(sessionId, afterSeq);
-    const projectedMessages = emitHistoryChunk({
-      sessionId,
-      messages: delta.messages,
-      mode: 'delta',
-      latestSeq: delta.latestSeq,
-      afterSeq,
-    });
-    sendSessionEvent({
-      type: 'history_loaded',
-      mode: 'delta',
-      count: projectedMessages.length,
-      sessionId,
-      latestSeq: delta.latestSeq,
-      afterSeq,
-    });
-    return;
-  }
-
-  // `msg.limit` is the replay-scrollback request from the frontend (UI
-  // history pane, not engine context). Keep the bootstrap window small so
-  // opening a group can paint the latest messages quickly; older rows are
-  // paged via `yeaft_load_more_history` when the user scrolls upward.
-  const limit = (typeof msg.limit === 'number') ? msg.limit : 10;
-  const visiblePage = sessionId
-    ? loadVisibleGroupHistoryPage(session.conversationStore, sessionId, limit)
-    : { messages: limit > 0 ? pickRecent(session.conversationStore, limit) : [], oldestSeq: null, hasMore: false };
-  // Legacy compact.md is a non-group fallback only. For group replay, reading
-  // it makes every group show "has compact" once any legacy/non-scoped compact
-  // exists, even when this group has no scoped summary.
-  const compactSummary = sessionId ? '' : session.conversationStore.readCompactSummary();
-  const replayEntries = sessionId
-    ? visiblePage.messages
-    : visiblePage.messages
-      .map(projectPersistedToVisibleHistoryEntry)
-      .filter(Boolean);
-
-  let latestSeq = null;
-  if (replayEntries.length > 0 && typeof session.conversationStore.getMessageSeqById === 'function') {
-    const last = replayEntries[replayEntries.length - 1];
-    if (last && last.id) latestSeq = session.conversationStore.getMessageSeqById(last.id);
-  }
-
-  if (sessionId) {
-    emitHistoryChunk({
-      sessionId,
-      messages: replayEntries,
-      mode: 'recent',
-      oldestSeq: visiblePage.oldestSeq,
-      hasMore: visiblePage.hasMore,
-      latestSeq,
-      turns: limit,
-    });
-  } else {
-    emitLegacyHistoryOutputFrames(replayEntries);
-  }
-
-  // Compute the pagination cursor for the bootstrap load so the frontend
-  // knows whether a "Load older messages" hint should be shown and where
-  // to start the next page. For group history, this is computed from the
-  // visible projected page, not raw persisted rows, so reflection/internal
-  // tail rows cannot consume the bootstrap window or create false hasMore.
-  let hasMore = false;
-  let oldestSeq = null;
-  if (sessionId) {
-    hasMore = visiblePage.hasMore;
-    oldestSeq = visiblePage.oldestSeq;
-  }
-
-  // hasCompactSummary used to read a single session-global file, so it was
-  // always true once ANY group/VP in the session had compacted. For group
-  // replay, only scoped per-(group, vp) summaries count; legacy compact.md is
-  // reserved for non-group / pre-scoped 1:1 callers.
-  let hasCompactSummaryFlag = !!compactSummary;
-  if (sessionId && typeof session.conversationStore.hasAnyCompactSummaryForSession === 'function') {
-    hasCompactSummaryFlag = session.conversationStore.hasAnyCompactSummaryForSession(sessionId);
-  }
-
-  sendSessionEvent({
-    type: 'history_loaded',
-    mode: 'recent',
-    count: replayEntries.length,
-    hasCompactSummary: hasCompactSummaryFlag,
-    totalHot: session.conversationStore.countHot(),
-    totalCold: session.conversationStore.countCold(),
-    sessionId,
-    hasMore,
-    oldestSeq,
-    latestSeq,
-  });
+  replayHistoryFromStore();
 }
 
 /**