@yeaft/webchat-agent 1.0.119 → 1.0.121

package/connection/upgrade-worker-template.js

@@ -8,6 +8,7 @@ const os = require('os');
 const PKG = process.argv[2];
 const TARGET = process.argv[3];
 const LOGFILE = process.argv[4];
+const REGISTRY = process.argv[5];
 
 function log(msg) {
   const line = '[Upgrade-Worker] ' + msg;
@@ -75,7 +76,13 @@ try {
   const tmpDir = fs.mkdtempSync(path.join(os.tmpdir(), 'yeaft-upgrade-'));
   log('Temp dir: ' + tmpDir);
 
-  const packOutput = execFileSync('npm', ['pack', PKG, '--pack-destination', tmpDir], {
+  const packOutput = execFileSync('npm', [
+    'pack',
+    PKG,
+    '--pack-destination',
+    tmpDir,
+    `--registry=${REGISTRY}`,
+  ], {
     shell: process.platform === 'win32', encoding: 'utf8', cwd: tmpDir, timeout: 120000
   }).trim();
   const tgzName = packOutput.split('\n').pop().trim();

package/connection/upgrade.js

@@ -39,6 +39,37 @@ const shellOpt = isWin ? { shell: true, windowsHide: true } : {};
 const currentPath = process.env.PATH || '/usr/bin:/bin:/usr/sbin:/sbin';
 const safePath = currentPath.includes(nodeBinDir) ? currentPath : `${nodeBinDir}:${currentPath}`;
 const safeEnv = { ...process.env, PATH: safePath };
+export const PUBLIC_NPM_REGISTRY = 'https://registry.npmjs.org/';
+
+/**
+ * Build an npm metadata query that bypasses stale local metadata and registry
+ * mirrors. Upgrade decisions must use the package actually published to the
+ * public registry, not a cached `latest` value from a previous release.
+ */
+export function buildNpmMetadataArgs(packageSpec, field) {
+  return [
+    'view',
+    packageSpec,
+    field,
+    `--registry=${PUBLIC_NPM_REGISTRY}`,
+    '--prefer-online',
+    '--prefer-offline=false',
+    '--offline=false',
+  ];
+}
+
+/** Return true only when `latestVersion` is semantically newer. */
+export function isUpgradeAvailable(currentVersion, latestVersion) {
+  const current = parseSemver(currentVersion);
+  const latest = parseSemver(latestVersion);
+  if (!current || !latest) return currentVersion !== latestVersion;
+  return cmpTuple(latest, current) > 0;
+}
+
+/** Build the Windows worker invocation with the same registry used for metadata. */
+export function buildWindowsWorkerCommand(nodePath) {
+  return `"${nodePath.replace(/\//g, '\\')}" "%WORKER%" "%PKG%" "%PKG_DIR%" "%LOGFILE%" "${PUBLIC_NPM_REGISTRY}"`;
+}
 
 // Shared cleanup logic for restart/upgrade
 function cleanupAndExit(exitCode) {
@@ -82,7 +113,7 @@ async function fetchRequiredNodeRange(pkgName, version) {
     const stdout = await new Promise((resolve, reject) => {
       execFile(
         npmPath,
-        ['view', `${pkgName}@${version}`, 'engines.node'],
+        buildNpmMetadataArgs(`${pkgName}@${version}`, 'engines.node'),
         { stdio: 'pipe', env: safeEnv, ...shellOpt },
         (err, out) => { if (err) reject(err); else resolve(out.toString().trim()); },
       );
@@ -154,14 +185,15 @@ export async function handleUpgradeAgent() {
   console.log('[Agent] Upgrade requested, checking for updates...');
   try {
     const pkgName = ctx.pkgName || '@yeaft/webchat-agent';
-    // Check latest version (async to avoid blocking heartbeat)
+    // Force a public-registry refresh so stale Windows npm metadata or a lagging
+    // registry mirror cannot report the installed version as the latest one.
     const latestVersion = await new Promise((resolve, reject) => {
-      execFile(npmPath, ['view', pkgName, 'version'], { stdio: 'pipe', env: safeEnv, ...shellOpt }, (err, stdout) => {
+      execFile(npmPath, buildNpmMetadataArgs(`${pkgName}@latest`, 'version'), { stdio: 'pipe', env: safeEnv, ...shellOpt }, (err, stdout) => {
         if (err) reject(err); else resolve(stdout.toString().trim());
       });
     });
-    if (latestVersion === ctx.agentVersion) {
-      console.log(`[Agent] Already at latest version (${ctx.agentVersion}), skipping upgrade.`);
+    if (!isUpgradeAvailable(ctx.agentVersion, latestVersion)) {
+      console.log(`[Agent] No newer version than ${ctx.agentVersion} is available (registry: ${latestVersion}), skipping upgrade.`);
       await sendToServer({ type: 'upgrade_agent_ack', success: true, alreadyLatest: true, version: ctx.agentVersion });
       return;
     }
@@ -270,7 +302,7 @@ async function spawnWindowsUpgradeScript(pkgName, installDir, isGlobalInstall, l
     '@echo off',
     'setlocal',
     `set PID=${pid}`,
-    `set PKG=${pkgName}@latest`,
+    `set PKG=${pkgName}@${latestVersion}`,
     `set INSTALL_DIR=${installDirWin}`,
     `set PKG_DIR=${pkgDir}`,
     `set LOGFILE=${logPath}`,
@@ -313,7 +345,7 @@ async function spawnWindowsUpgradeScript(pkgName, installDir, isGlobalInstall, l
   // Use Node.js worker for file-level upgrade (avoids EBUSY on directory rename)
   batLines.push(
     'echo [Upgrade] Running upgrade worker at %time%... >> "%LOGFILE%"',
-    `"${process.execPath.replace(/\//g, '\\')}" "%WORKER%" "%PKG%" "%PKG_DIR%" "%LOGFILE%"`,
+    buildWindowsWorkerCommand(process.execPath),
     'if not "%errorlevel%"=="0" (',
     '  echo [Upgrade] Worker failed with exit code %errorlevel% at %time% >> "%LOGFILE%"',
     '  goto CLEANUP',
@@ -390,6 +422,7 @@ async function spawnWindowsUpgradeScript(pkgName, installDir, isGlobalInstall, l
  *
  * @param {object} opts
  * @param {string} opts.pkgName        npm package name
+ * @param {string} opts.targetVersion  exact version selected by the metadata check
  * @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
@@ -402,6 +435,7 @@ async function spawnWindowsUpgradeScript(pkgName, installDir, isGlobalInstall, l
  */
 export function buildUnixUpgradeScript({
   pkgName,
+  targetVersion,
   installDir,
   isGlobalInstall,
   pid,
@@ -422,7 +456,8 @@ export function buildUnixUpgradeScript({
   const shLines = [
     '#!/bin/bash',
     `PID=${pid}`,
-    `PKG="${pkgName}@latest"`,
+    `PKG="${pkgName}@${targetVersion}"`,
+    `REGISTRY="${PUBLIC_NPM_REGISTRY}"`,
     `NPM="${npmPath}"`,
     `LOGFILE="${join(configDir, 'logs', 'upgrade.log')}"`,
     `export PATH="${safePath}"`,
@@ -477,8 +512,8 @@ export function buildUnixUpgradeScript({
 
   // npm install (use absolute path via $NPM variable)
   const npmCmd = isGlobalInstall
-    ? `"$NPM" install -g "$PKG"`
-    : `cd "$INSTALL_DIR" && "$NPM" install "$PKG"`;
+    ? `"$NPM" install -g "$PKG" --registry="$REGISTRY"`
+    : `cd "$INSTALL_DIR" && "$NPM" install "$PKG" --registry="$REGISTRY"`;
 
   shLines.push(
     'echo "[Upgrade] Installing $PKG..."',
@@ -535,6 +570,7 @@ async function spawnUnixUpgradeScript(pkgName, installDir, isGlobalInstall, late
 
   const script = buildUnixUpgradeScript({
     pkgName,
+    targetVersion: latestVersion,
     installDir,
     isGlobalInstall,
     pid: process.pid,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@yeaft/webchat-agent",
-  "version": "1.0.119",
+  "version": "1.0.121",
   "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/yeaft/engine.js

@@ -23,7 +23,7 @@ import { join, resolve as resolvePath } from 'path';
 import { buildSystemPrompt, buildWorkerPrompt } from './prompts.js';
 import { getRuntimePlatformInfo } from './runtime-platform.js';
 import { LLMContextError, LLMAbortError, LLMRateLimitError, LLMServerError, LLMStreamIdleTimeoutError } from './llm/adapter.js';
-import { runMemoryPreflow, buildRelevantScopes } from './sessions/pre-flow.js';
+import { runMemoryPreflow, buildRelevantScopes, memoryScopeLabel } from './sessions/pre-flow.js';
 import { readProjectDoc, pickProjectDocFile, DEFAULT_PROJECT_DOC_MAX_BYTES } from './sessions/project-doc.js';
 import { partitionMessages } from './compact/partition.js';
 import { runCompact as runCompactOrchestrator } from './compact/orchestrator.js';
@@ -905,19 +905,19 @@ export class Engine {
     if (snap.resident.length > 0) {
       parts.push(zh ? '### 常驻记忆' : '### Resident');
       for (const r of snap.resident) {
-        parts.push(`- **${r.scope}**: ${r.summary}`);
+        parts.push(`- **${memoryScopeLabel(r.scope)}**: ${r.summary}`);
       }
     }
     if (snap.recent.length > 0) {
       parts.push(zh ? '### 最近记忆' : '### Recent');
       for (const s of snap.recent) {
-        parts.push(`- (${s.scope}) ${(s.body || '').trim()}`);
+        parts.push(`- (${memoryScopeLabel(s.scope)}) ${(s.body || '').trim()}`);
       }
     }
     if (snap.onDemand.length > 0) {
       parts.push(zh ? '### 按需记忆' : '### OnDemand');
       for (const s of snap.onDemand) {
-        parts.push(`- (${s.scope}) ${(s.body || '').trim()}`);
+        parts.push(`- (${memoryScopeLabel(s.scope)}) ${(s.body || '').trim()}`);
       }
     }
     return parts.join('\n');

package/yeaft/sessions/pre-flow.js

@@ -157,6 +157,24 @@ export function selectRespondingVps(input) {
 }
 
 
+/**
+ * Turn an internal memory scope into the compact label shown to the model.
+ * The active-scope prompt already carries the current session id, so repeating
+ * the full storage path on every memory entry only wastes context. Internal
+ * entries and debug events keep the original scope for ACLs and diagnostics.
+ *
+ * @param {string} scope
+ * @returns {string}
+ */
+export function memoryScopeLabel(scope) {
+  const value = typeof scope === 'string' && scope ? scope : 'unknown';
+  const sessionTopic = /^(?:sessions|session|group)\/[^/]+\/topic\/(.+)$/.exec(value);
+  if (sessionTopic) return `topic: ${sessionTopic[1]}`;
+  if (/^(?:sessions|session|group)\/[^/]+$/.test(value)) return 'session';
+  if (value.startsWith('topic/')) return `topic: ${value.slice(6)}`;
+  return value;
+}
+
 /**
  * Build the heading for a single scope's formatted memory block.
  *
@@ -167,6 +185,8 @@ export function selectRespondingVps(input) {
  * @returns {string}
  */
 function scopeHeading(scope) {
+  const label = memoryScopeLabel(scope);
+  if (label.startsWith('topic: ')) return `## Memory: Topic ${label.slice(7)}`;
   if (scope === 'user') return '## Memory: User';
   // Nested chat scopes first.
   let m = /^chat\/([^/]+)\/vp\/(.+)$/.exec(scope);
@@ -180,10 +200,6 @@ function scopeHeading(scope) {
   if (m) return `## Memory: Session ${m[1]} (user)`;
   m = /^session\/([^/]+)\/feature\/(.+)$/.exec(scope);
   if (m) return `## Memory: Feature ${m[2]}`;
-  m = /^sessions\/([^/]+)\/topic\/(.+)$/.exec(scope);
-  if (m) return `## Memory: Topic ${m[2]}`;
-  m = /^session\/([^/]+)\/topic\/(.+)$/.exec(scope);
-  if (m) return `## Memory: Topic ${m[2]}`;
   // Legacy nested group scopes (un-migrated data).
   m = /^group\/([^/]+)\/vp\/(.+)$/.exec(scope);
   if (m) return `## Memory: VP ${m[2]}`;
@@ -191,8 +207,6 @@ function scopeHeading(scope) {
   if (m) return `## Memory: Session ${m[1]} (user)`;
   m = /^group\/([^/]+)\/feature\/(.+)$/.exec(scope);
   if (m) return `## Memory: Feature ${m[2]}`;
-  m = /^group\/([^/]+)\/topic\/(.+)$/.exec(scope);
-  if (m) return `## Memory: Topic ${m[2]}`;
   if (scope.startsWith('session/')) return `## Memory: Session ${scope.slice(8)}`;
   if (scope.startsWith('group/')) return `## Memory: Session ${scope.slice(6)}`;
   if (scope.startsWith('vp/')) return `## Memory: VP ${scope.slice(3)}`;