@yeaft/webchat-agent 1.0.340 → 1.0.342

package/cli.js

@@ -41,8 +41,10 @@ import {
   buildUpgradeInstallCommand,
   buildUpgradeMetadataUrl,
   buildUpgradeVersionCommand,
+  createWindowsUpgradeRun,
   launchWindowsUpgradeScript,
   prepareWindowsUpgradeRunner,
+  releaseWindowsUpgradeLock,
   resolveWindowsNpmCliPath,
   resolveWindowsPm2CliPath,
 } from './upgrade-command.js';
@@ -511,9 +513,9 @@ async function upgrade(args = []) {
     console.log(`Upgrading to ${latest}...`);
 
     if (platform() === 'win32') {
-      // On Windows, the current process locks its own files. npm cannot overwrite
-      // them while this process is running. Spawn a detached Node runner that waits
-      // for us to exit, then runs npm install and optionally restarts the service.
+      // On Windows, the current process locks its own files. A short-lived
+      // bootstrap detaches the updater before this process exits; the updater then
+      // installs the exact version and restores the selected service instance.
       await upgradeWindows(latest, instanceId);
     } else {
       execSync(buildUpgradeInstallCommand(`${pkg.name}@${latest}`), { stdio: 'inherit' });
@@ -544,10 +546,6 @@ async function upgradeWindows(latestVersion, instanceId = DEFAULT_INSTANCE_ID) {
   const logDir = join(configDir, 'logs');
   mkdirSync(logDir, { recursive: true });
 
-  const runnerPath = join(upgradeDir, 'windows-upgrade-runner.js');
-  const commandPath = join(upgradeDir, 'upgrade-command.js');
-  const payloadPath = join(upgradeDir, 'payload.json');
-  const handoffPath = join(upgradeDir, 'started');
   const logPath = join(logDir, 'upgrade.log');
   const ecosystemPath = join(configDir, 'ecosystem.config.cjs');
   const pm2AppName = getPm2AppName(instanceId);
@@ -563,46 +561,70 @@ async function upgradeWindows(latestVersion, instanceId = DEFAULT_INSTANCE_ID) {
     } catch {}
   }
 
+  const run = createWindowsUpgradeRun(upgradeDir);
+  const {
+    runId,
+    lockPath,
+    bootstrapPath,
+    runnerPath,
+    commandPath,
+    payloadPath,
+    handoffPath,
+    authorizePath,
+    cancelPath,
+  } = run;
   const payload = {
+    runId,
+    lockPath,
     parentPid: process.pid,
     packageSpec: `${pkg.name}@${latestVersion}`,
     globalInstall: true,
     installDir: dirname(dirname(__dirname)),
     logPath,
     handoffPath,
+    authorizePath,
+    cancelPath,
+    bootstrapPath,
     runnerPath,
     commandPath,
     payloadPath,
     nodePath: process.execPath,
     npmCliPath,
     pm2CliPath: isPm2 ? pm2CliPath : null,
+    pm2AppName: isPm2 ? pm2AppName : null,
     ecosystemPath: isPm2 ? ecosystemPath : null,
   };
-  prepareWindowsUpgradeRunner({
-    sourceRunnerPath: join(__dirname, 'windows-upgrade-runner.js'),
-    sourceCommandPath: join(__dirname, 'upgrade-command.js'),
-    runnerPath,
-    commandPath,
-    payloadPath,
-    payload,
-  });
+  try {
+    prepareWindowsUpgradeRunner({
+      sourceBootstrapPath: join(__dirname, 'windows-upgrade-bootstrap.js'),
+      sourceRunnerPath: join(__dirname, 'windows-upgrade-runner.js'),
+      sourceCommandPath: join(__dirname, 'upgrade-command.js'),
+      bootstrapPath,
+      runnerPath,
+      commandPath,
+      payloadPath,
+      payload,
+    });
+  } catch (err) {
+    releaseWindowsUpgradeLock(lockPath, runId);
+    throw err;
+  }
 
   const launcher = await launchWindowsUpgradeScript({
+    runId,
     nodePath: process.execPath,
+    bootstrapPath,
     runnerPath,
     payloadPath,
     logPath,
     handoffPath,
+    authorizePath,
+    cancelPath,
+    lockPath,
     spawnProcess: spawn,
-    onHandoff: isPm2
-      ? () => {
-          execFileSync(process.execPath, [pm2CliPath, 'delete', pm2AppName], { stdio: 'pipe' });
-          console.log(`PM2 app ${pm2AppName} deleted after upgrade handoff.`);
-        }
-      : undefined,
   });
-
   console.log(`Upgrade runner spawned via ${launcher}.`);
+
   console.log('This process will exit now. The upgrade will proceed after exit.');
   console.log(`Check upgrade log: ${logPath}`);
   process.exit(0);

package/connection/upgrade.js

@@ -8,8 +8,10 @@ import { getConfigDir, getServiceName, getPm2AppName, getLaunchdPlistPath, DEFAU
 import {
   buildUpgradeInstallCommand,
   buildUpgradeMetadataArgs,
+  createWindowsUpgradeRun,
   launchWindowsUpgradeScript,
   prepareWindowsUpgradeRunner,
+  releaseWindowsUpgradeLock,
   resolveWindowsNpmCliPath,
   resolveWindowsPm2CliPath,
 } from '../upgrade-command.js';
@@ -245,8 +247,8 @@ export async function handleUpgradeAgent() {
       await spawnUnixUpgradeScript(pkgName, installDir, isGlobalInstall, latestVersion, instanceId);
     }
 
-    // Windows deletes PM2 inside the verified handoff callback. Unix keeps the
-    // existing pre-exit behavior because its detached launcher has no marker.
+    // On Windows the detached runner removes the PM2 app only after this
+    // process exits. Unix keeps the existing pre-exit service-manager behavior.
     const isPm2 = !!process.env.pm_id;
     if (!isWindows && isPm2) {
       try {
@@ -271,10 +273,6 @@ async function spawnWindowsUpgradeScript(pkgName, installDir, isGlobalInstall, l
   const logDir = join(configDir, 'logs');
   mkdirSync(logDir, { recursive: true });
 
-  const runnerPath = join(upgradeDir, 'windows-upgrade-runner.js');
-  const commandPath = join(upgradeDir, 'upgrade-command.js');
-  const payloadPath = join(upgradeDir, 'payload.json');
-  const handoffPath = join(upgradeDir, 'started');
   const logPath = join(logDir, 'upgrade.log');
   const ecosystemPath = join(configDir, 'ecosystem.config.cjs');
   const npmCliPath = resolveWindowsNpmCliPath(process.execPath);
@@ -285,45 +283,68 @@ async function spawnWindowsUpgradeScript(pkgName, installDir, isGlobalInstall, l
     throw new Error('PM2 manages this Agent, but its JavaScript CLI entry point could not be resolved');
   }
 
+  const run = createWindowsUpgradeRun(upgradeDir);
+  const {
+    runId,
+    lockPath,
+    bootstrapPath,
+    runnerPath,
+    commandPath,
+    payloadPath,
+    handoffPath,
+    authorizePath,
+    cancelPath,
+  } = run;
   const payload = {
+    runId,
+    lockPath,
     parentPid: process.pid,
     packageSpec: `${pkgName}@${latestVersion}`,
     globalInstall: isGlobalInstall,
     installDir,
     logPath,
     handoffPath,
+    authorizePath,
+    cancelPath,
+    bootstrapPath,
     runnerPath,
     commandPath,
     payloadPath,
     nodePath: process.execPath,
     npmCliPath,
     pm2CliPath,
+    pm2AppName: isPm2 ? getPm2AppName(instanceId) : null,
     ecosystemPath: isPm2 ? ecosystemPath : null,
   };
-  prepareWindowsUpgradeRunner({
-    sourceRunnerPath: fileURLToPath(new URL('../windows-upgrade-runner.js', import.meta.url)),
-    sourceCommandPath: fileURLToPath(new URL('../upgrade-command.js', import.meta.url)),
-    runnerPath,
-    commandPath,
-    payloadPath,
-    payload,
-  });
+  try {
+    prepareWindowsUpgradeRunner({
+      sourceBootstrapPath: fileURLToPath(new URL('../windows-upgrade-bootstrap.js', import.meta.url)),
+      sourceRunnerPath: fileURLToPath(new URL('../windows-upgrade-runner.js', import.meta.url)),
+      sourceCommandPath: fileURLToPath(new URL('../upgrade-command.js', import.meta.url)),
+      bootstrapPath,
+      runnerPath,
+      commandPath,
+      payloadPath,
+      payload,
+    });
+  } catch (err) {
+    releaseWindowsUpgradeLock(lockPath, runId);
+    throw err;
+  }
 
   const launcher = await launchWindowsUpgradeScript({
+    runId,
     nodePath: process.execPath,
+    bootstrapPath,
     runnerPath,
     payloadPath,
     logPath,
     handoffPath,
+    authorizePath,
+    cancelPath,
+    lockPath,
     spawnProcess: spawn,
-    onHandoff: isPm2
-      ? () => {
-          execFileSync(process.execPath, [pm2CliPath, 'delete', getPm2AppName(instanceId)], { stdio: 'pipe', env: safeEnv });
-          console.log('[Agent] PM2 app deleted after upgrade handoff');
-        }
-      : undefined,
   });
-
   console.log(`[Agent] Spawned Windows upgrade runner via ${launcher} (pm2=${isPm2}, dir=${installDir})`);
   await sendToServer({ type: 'upgrade_agent_ack', success: true, version: latestVersion, pendingRestart: true });
 }

package/local-runtime/server/db/connection.js

@@ -702,6 +702,9 @@ export const stmts = {
   updateYeaftProjectInstruction: db.prepare(`
     UPDATE yeaft_projects SET instruction = ?, updated_at = ? WHERE user_id = ? AND id = ?
   `),
+  updateYeaftProjectSortOrder: db.prepare(`
+    UPDATE yeaft_projects SET sort_order = ?, updated_at = ? WHERE user_id = ? AND id = ?
+  `),
   deleteYeaftProject: db.prepare(`
     DELETE FROM yeaft_projects WHERE user_id = ? AND id = ?
   `),

package/local-runtime/server/db/yeaft-project-db.js

@@ -138,6 +138,30 @@ export const yeaftProjectDb = {
     return { projectId: id };
   },
 
+  reorder(userId, projectIds) {
+    const ownerId = requireUserId(userId);
+    const projects = this.list(ownerId);
+    const ids = Array.isArray(projectIds)
+      ? projectIds.map(value => typeof value === 'string' ? value.trim() : '')
+      : [];
+    const currentIds = new Set(projects.map(project => project.id));
+    if (ids.length !== projects.length
+        || ids.some(id => !id || !currentIds.has(id))
+        || new Set(ids).size !== ids.length) {
+      throw new YeaftProjectDbError('invalid_project_order', 'Complete Project order is required');
+    }
+    const now = Date.now();
+    transaction(() => {
+      ids.forEach((id, index) => {
+        const result = stmts.updateYeaftProjectSortOrder.run(index, now, ownerId, id);
+        if (result.changes !== 1) {
+          throw new YeaftProjectDbError('project_order_changed', 'Project identity changed during reorder');
+        }
+      });
+    })();
+    return this.list(ownerId);
+  },
+
   moveSession(userId, {
     agentId,
     sessionId,

package/local-runtime/server/handlers/client-conversation.js

@@ -1336,6 +1336,7 @@ export async function handleClientConversation(clientId, client, msg, checkAgent
         else if (op === 'update_instruction') {
           result = yeaftProjectDb.updateInstruction(client.userId, msg.projectId, msg.instruction);
         } else if (op === 'delete') result = yeaftProjectDb.delete(client.userId, msg.projectId);
+        else if (op === 'reorder') result = yeaftProjectDb.reorder(client.userId, msg.projectIds);
         else if (op === 'move_session') {
           const agentId = msg.targetAgentId || msg.agentId;
           const sessionId = typeof msg.sessionId === 'string' ? msg.sessionId.trim() : '';

package/local-runtime/version.json

@@ -1 +1 @@
-{"version":"1.0.340"}
+{"version":"1.0.342"}