dominds 1.25.4 → 1.25.5

package/dist/minds/system-prompt-parts.js

@@ -204,6 +204,11 @@ function getMemoryPromptCopy(ctx) {
                 ? `工作流：先做事 → 再提炼（\`update_reminder\`；必要时整理差遣牒追加条目/更新提案并诉请 \`@${ctx.taskdocMaintainerId}\` 合并写入）→ 然后 \`clear_mind\` 清空噪音。`
                 : '工作流：停止扩张上下文 → 维护足够详尽的接续包提醒项（`add_reminder` 或 `update_reminder`，长度没有技术限制）→ 然后 `clear_mind` 开启新一程。',
             mainDialogWorkflowLine: '工作流：先做事 -> 再提炼（`update_reminder` + `mind_more(progress)`；需要压缩/删旧时先 `recall_taskdoc` 取得 `content_hash`，再用带 `previous_content_hash` 的 `change_mind`；要删除整章文件时用 `never_mind`）-> 然后 `clear_mind` 清空噪音。',
+            ...(ctx.isSideDialog
+                ? {}
+                : {
+                    progressVcsOrderLine: '硬性顺序：先补 `progress`，再动 git。只要这次代码/文档改动准备进 git（add / commit / push），先确认 `progress` 已经写清当前状态、决策、阻塞和下一步；如果还没写清，就先补写。简单判断：改动会进仓库 + `progress` 还没跟上 = 先别动 git。`git status` 只用来确认，不是提交动作。不要把“提交了某个 commit”“push 了”写进 `progress`。',
+                }),
             contextHealthLine: contextHealthLineZh,
             taskdocLogLine: taskdocLogLineZh,
         };
@@ -239,6 +244,11 @@ function getMemoryPromptCopy(ctx) {
             ? `Workflow: do work → distill (\`update_reminder\`; when Taskdoc needs updates, draft append entries, a merged replacement, or a section deletion and ask \`@${ctx.taskdocMaintainerId}\`) → then \`clear_mind\` to drop noise.`
             : 'Workflow: stop expanding context → maintain sufficiently detailed continuation-package reminders (`add_reminder` or `update_reminder`, with no technical length limit) → then `clear_mind` to start a new course.',
         mainDialogWorkflowLine: 'Workflow: do work -> distill (`update_reminder` + `mind_more(progress)`; when compression/deletion is needed, first use `recall_taskdoc` to get `content_hash`, then use `change_mind` with `previous_content_hash`; use `never_mind` when removing a whole section file) -> then `clear_mind` to drop noise.',
+        ...(ctx.isSideDialog
+            ? {}
+            : {
+                progressVcsOrderLine: 'Hard order: update `progress` first, then use git. If this code/docs change is going into git (add / commit / push), make sure `progress` already says the current state, decisions, blockers, and next step; if not, write it first. Simple check: change will enter the repo + `progress` is behind = stop and update `progress` first. `git status` is only for checking, not a commit step. Do not write git events like “committed X” or “ran git push” into progress.',
+            }),
         contextHealthLine: contextHealthLineEn,
         taskdocLogLine: taskdocLogLineEn,
     };
@@ -264,6 +274,7 @@ function buildMemorySystemPrompt(ctx) {
         ...(ctx.agentHasTeamMemoryTools ? [copy.teamMemoryHintLine] : []),
         ...(ctx.agentHasPersonalMemoryTools ? [copy.personalMemoryHintLine] : []),
         ctx.isSideDialog ? copy.sideDialogWorkflowLine : copy.mainDialogWorkflowLine,
+        ...(copy.progressVcsOrderLine === undefined ? [] : [copy.progressVcsOrderLine]),
         copy.contextHealthLine,
         copy.taskdocLogLine,
     ].join('\n');

package/dist/server/dominds-self-update.js

@@ -16,9 +16,12 @@ const util_1 = require("util");
 const time_1 = require("@longrun-ai/kernel/utils/time");
 const log_1 = require("../log");
 const dominds_running_version_1 = require("./dominds-running-version");
-const execFileAsync = (0, util_1.promisify)(child_process_1.execFile);
+const execAsync = (0, util_1.promisify)(child_process_1.exec);
 const log = (0, log_1.createLogger)('dominds-self-update');
 const BACKGROUND_CHECK_INTERVAL_MS = 30 * 60 * 1000;
+const LATEST_VERSION_CHECK_TIMEOUT_MS = 15000;
+const RESTART_PORT_RELEASE_TIMEOUT_MS = 15000;
+const RESTART_PORT_PROBE_INTERVAL_MS = 150;
 const IDLE_RESTART_STATE = { kind: 'idle' };
 let runtimeConfig = null;
 let latestObservation = { kind: 'unknown' };
@@ -27,12 +30,6 @@ let installPromise = null;
 let restartPromise = null;
 let restartState = IDLE_RESTART_STATE;
 let broadcastStatusUpdate = null;
-function getNpmBin() {
-    return process.platform === 'win32' ? 'npm.cmd' : 'npm';
-}
-function getNpxBin() {
-    return process.platform === 'win32' ? 'npx.cmd' : 'npx';
-}
 function normalizeVersionString(value) {
     return value.trim().replace(/^v/i, '');
 }
@@ -74,17 +71,31 @@ function detectRunKind(mode) {
     }
     return 'npm_global';
 }
+function hasInteractiveConsole() {
+    return Boolean(process.stdin.isTTY || process.stdout.isTTY || process.stderr.isTTY);
+}
+function getRestartHelperStdio() {
+    return hasInteractiveConsole() ? 'inherit' : 'ignore';
+}
+function getRestartPortProbeHost(host) {
+    if (host === '0.0.0.0')
+        return '127.0.0.1';
+    if (host === '::')
+        return '::1';
+    return host;
+}
 async function queryLatestVersion() {
     const checkedAt = (0, time_1.formatUnifiedTimestamp)(new Date());
     try {
-        const { stdout } = await execFileAsync(getNpmBin(), ['view', 'dominds', 'version', '--json'], {
+        const { stdout } = await execAsync('npm view dominds version --json', {
             cwd: process.cwd(),
             env: process.env,
             maxBuffer: 1024 * 1024,
-            timeout: 15000,
+            timeout: LATEST_VERSION_CHECK_TIMEOUT_MS,
         });
         const trimmed = stdout.trim();
         if (trimmed === '') {
+            log.warn('Dominds latest-version check returned empty stdout', undefined, { checkedAt });
             return {
                 kind: 'error',
                 errorText: 'npm view dominds version returned empty stdout',
@@ -100,6 +111,10 @@ async function queryLatestVersion() {
         }
         const latestVersion = typeof parsed === 'string' ? parsed.trim() : '';
         if (latestVersion === '') {
+            log.warn('Dominds latest-version check returned an invalid payload', undefined, {
+                checkedAt,
+                stdout: trimmed,
+            });
             return {
                 kind: 'error',
                 errorText: `npm view dominds version returned non-string output: ${trimmed}`,
@@ -109,15 +124,21 @@ async function queryLatestVersion() {
         return { kind: 'ok', latestVersion, checkedAt };
     }
     catch (error) {
+        const errorText = error instanceof Error && error.name === 'AbortError'
+            ? 'npm view dominds version timed out'
+            : error instanceof Error
+                ? error.message
+                : String(error);
+        log.warn('Dominds latest-version check failed', error, { checkedAt, errorText });
         return {
             kind: 'error',
-            errorText: error instanceof Error ? error.message : String(error),
+            errorText,
             checkedAt,
         };
     }
 }
 async function resolveGlobalDomindsCommandAbs() {
-    const { stdout } = await execFileAsync(getNpmBin(), ['prefix', '-g'], {
+    const { stdout } = await execAsync('npm prefix -g', {
         cwd: process.cwd(),
         env: process.env,
         maxBuffer: 1024 * 1024,
@@ -422,7 +443,7 @@ async function installLatestDominds() {
         if (!hasUpdate) {
             throw new Error('No installable Dominds update is currently available');
         }
-        await execFileAsync(getNpmBin(), ['i', '-g', 'dominds@latest'], {
+        await execAsync('npm i -g dominds@latest', {
             cwd: process.cwd(),
             env: process.env,
             maxBuffer: 20 * 1024 * 1024,
@@ -435,7 +456,19 @@ async function installLatestDominds() {
             globalCommandAbs,
         };
         return await getDomindsSelfUpdateStatus();
-    })().finally(() => {
+    })()
+        .catch((error) => {
+        const latestVersion = latestObservation.kind === 'ok' ? latestObservation.latestVersion : null;
+        const checkedAt = latestObservation.kind === 'unknown' ? null : latestObservation.checkedAt;
+        log.error('Dominds version install failed', error, {
+            runKind,
+            currentVersion: getRunningVersion(),
+            latestVersion,
+            checkedAt,
+        });
+        throw error;
+    })
+        .finally(() => {
         installPromise = null;
         publishStatusUpdateSoon();
     });
@@ -446,33 +479,72 @@ function buildRestartArgs(cfg) {
     return ['webui', '-p', String(cfg.port), '-h', cfg.host, '--mode', 'prod', '--nobrowser'];
 }
 function spawnDetachedRestartHelper(params) {
+    const stdioMode = getRestartHelperStdio();
     const helperPayload = JSON.stringify({
         command: params.command,
         args: [...params.args],
         cwd: params.cwd,
-        delayMs: 800,
+        host: getRestartPortProbeHost(params.host),
+        port: params.port,
+        probeIntervalMs: RESTART_PORT_PROBE_INTERVAL_MS,
+        portReleaseTimeoutMs: RESTART_PORT_RELEASE_TIMEOUT_MS,
+        stdioMode,
     });
     const helperScript = [
+        "const net = require('net');",
         "const { spawn } = require('child_process');",
         'const payload = JSON.parse(process.argv[1]);',
-        'setTimeout(() => {',
+        'const detached = payload.stdioMode !== "inherit" || process.platform === "win32";',
+        'function isPortBusy() {',
+        '  return new Promise((resolve) => {',
+        '    const socket = net.createConnection({ host: payload.host, port: payload.port });',
+        '    let settled = false;',
+        '    const finish = (busy) => {',
+        '      if (settled) return;',
+        '      settled = true;',
+        '      socket.destroy();',
+        '      resolve(busy);',
+        '    };',
+        '    socket.once("connect", () => finish(true));',
+        '    socket.once("error", () => finish(false));',
+        '    socket.setTimeout(1000, () => finish(true));',
+        '  });',
+        '}',
+        'async function waitForPortRelease() {',
+        '  const deadline = Date.now() + payload.portReleaseTimeoutMs;',
+        '  let consecutiveIdle = 0;',
+        '  while (Date.now() < deadline) {',
+        '    if (await isPortBusy()) {',
+        '      consecutiveIdle = 0;',
+        '      await new Promise((resolve) => setTimeout(resolve, payload.probeIntervalMs));',
+        '      continue;',
+        '    }',
+        '    consecutiveIdle += 1;',
+        '    if (consecutiveIdle >= 2) return;',
+        '    await new Promise((resolve) => setTimeout(resolve, payload.probeIntervalMs));',
+        '  }',
+        '}',
+        '(async () => {',
         '  try {',
-        "    const child = spawn(payload.command, payload.args, { cwd: payload.cwd, env: process.env, detached: true, stdio: 'ignore' });",
-        '    child.unref();',
+        '    await waitForPortRelease();',
+        "    const child = spawn(payload.command, payload.args, { cwd: payload.cwd, env: process.env, detached, stdio: payload.stdioMode, shell: process.platform === 'win32' });",
+        '    if (detached) child.unref();',
         '    process.exit(0);',
         '  } catch (error) {',
         '    console.error(error instanceof Error ? error.message : String(error));',
         '    process.exit(1);',
         '  }',
-        '}, payload.delayMs);',
+        '})();',
     ].join('\n');
     const helper = (0, child_process_1.spawn)(process.execPath, ['-e', helperScript, helperPayload], {
         cwd: params.cwd,
         env: process.env,
-        detached: true,
-        stdio: 'ignore',
+        detached: stdioMode !== 'inherit' || process.platform === 'win32',
+        stdio: stdioMode,
     });
-    helper.unref();
+    if (stdioMode !== 'inherit' || process.platform === 'win32') {
+        helper.unref();
+    }
 }
 async function stopAndExitForRestart() {
     const cfg = assertRuntimeConfig();
@@ -500,7 +572,7 @@ async function restartDomindsIntoLatest() {
         let command;
         const previousRestartRequiredState = restartState.kind === 'restart_required' ? restartState : null;
         if (runKind === 'npx_latest') {
-            command = getNpxBin();
+            command = 'npx';
             args.unshift('dominds@latest');
             args.unshift('-y');
         }
@@ -512,25 +584,48 @@ async function restartDomindsIntoLatest() {
         }
         restartState = { kind: 'restarting', targetVersion: status.targetVersion };
         publishStatusUpdateSoon();
-        spawnDetachedRestartHelper({
-            command,
-            args,
-            cwd: process.cwd(),
-        });
-        setImmediate(() => {
-            void stopAndExitForRestart().catch((error) => {
-                log.error('Failed to stop Dominds server during restart', error);
-                if (runKind === 'npm_global' && previousRestartRequiredState !== null) {
-                    restartState = previousRestartRequiredState;
+        try {
+            spawnDetachedRestartHelper({
+                command,
+                args,
+                cwd: process.cwd(),
+                host: cfg.host,
+                port: cfg.port,
+            });
+            setImmediate(() => {
+                void stopAndExitForRestart().catch((error) => {
+                    log.error('Failed to stop Dominds server during restart', error);
+                    if (runKind === 'npm_global' && previousRestartRequiredState !== null) {
+                        restartState = previousRestartRequiredState;
+                        publishStatusUpdateSoon();
+                        return;
+                    }
+                    restartState = IDLE_RESTART_STATE;
                     publishStatusUpdateSoon();
-                    return;
-                }
-                restartState = IDLE_RESTART_STATE;
-                publishStatusUpdateSoon();
+                });
             });
-        });
+        }
+        catch (error) {
+            if (previousRestartRequiredState !== null) {
+                restartState = previousRestartRequiredState;
+            }
+            else {
+                restartState = IDLE_RESTART_STATE;
+            }
+            publishStatusUpdateSoon();
+            throw error;
+        }
         return await getDomindsSelfUpdateStatus();
-    })().finally(() => {
+    })()
+        .catch((error) => {
+        const statusSnapshot = restartState.kind === 'restarting' ? restartState : null;
+        log.error('Dominds version restart failed', error, {
+            runKind: detectRunKind(cfg.mode),
+            restartState: statusSnapshot,
+        });
+        throw error;
+    })
+        .finally(() => {
         restartPromise = null;
         publishStatusUpdateSoon();
     });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dominds",
-  "version": "1.25.4",
+  "version": "1.25.5",
   "description": "Dominds CLI and aggregation shell for the LongRun AI kernel/runtime packages.",
   "type": "commonjs",
   "publishConfig": {
@@ -53,8 +53,8 @@
     "yaml": "^2.8.2",
     "zod": "^4.3.6",
     "@longrun-ai/codex-auth": "0.13.0",
-    "@longrun-ai/kernel": "1.15.4",
-    "@longrun-ai/shell": "1.15.4"
+    "@longrun-ai/kernel": "1.15.5",
+    "@longrun-ai/shell": "1.15.5"
   },
   "devDependencies": {
     "@types/node": "^25.3.5",