dominds 1.25.4 → 1.25.6

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,13 @@ 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 COMMAND_OUTPUT_LOG_LIMIT = 2000;
 const IDLE_RESTART_STATE = { kind: 'idle' };
 let runtimeConfig = null;
 let latestObservation = { kind: 'unknown' };
@@ -27,12 +31,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 +72,115 @@ 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;
+}
+function truncateCommandOutput(value) {
+    const raw = typeof value === 'string' ? value.trim() : '';
+    if (raw.length <= COMMAND_OUTPUT_LOG_LIMIT)
+        return raw;
+    return `${raw.slice(0, COMMAND_OUTPUT_LOG_LIMIT)}...[truncated ${raw.length - COMMAND_OUTPUT_LOG_LIMIT} chars]`;
+}
+function formatPathEnvExcerpt(pathEnv) {
+    if (pathEnv === null || pathEnv.trim() === '')
+        return null;
+    const parts = pathEnv.split(path_1.default.delimiter).filter((part) => part.trim() !== '');
+    if (parts.length === 0)
+        return null;
+    const visibleParts = parts.slice(0, 8);
+    const preview = visibleParts.join(path_1.default.delimiter);
+    if (parts.length <= visibleParts.length)
+        return preview;
+    return `${preview}${path_1.default.delimiter}...[+${parts.length - visibleParts.length} more]`;
+}
+function getErrorProp(error, key) {
+    if (typeof error !== 'object' || error === null)
+        return undefined;
+    return error[key];
+}
+function extractCommandFailureDiagnostics(error) {
+    const code = getErrorProp(error, 'code');
+    const signal = getErrorProp(error, 'signal');
+    const killed = getErrorProp(error, 'killed');
+    const cmd = getErrorProp(error, 'cmd');
+    return {
+        message: error instanceof Error ? error.message : String(error),
+        cmd: typeof cmd === 'string' && cmd.trim() !== '' ? cmd : null,
+        code: typeof code === 'string' || typeof code === 'number' ? code : null,
+        signal: typeof signal === 'string' && signal.trim() !== '' ? signal : null,
+        killed: typeof killed === 'boolean' ? killed : null,
+        stdout: truncateCommandOutput(getErrorProp(error, 'stdout')),
+        stderr: truncateCommandOutput(getErrorProp(error, 'stderr')),
+        cwd: process.cwd(),
+        pathEnv: typeof process.env.PATH === 'string' ? process.env.PATH : null,
+    };
+}
+function formatCommandFailureForUi(diagnostics) {
+    const lines = [diagnostics.message];
+    if (diagnostics.cmd !== null) {
+        lines.push(`cmd: ${diagnostics.cmd}`);
+    }
+    if (diagnostics.code !== null) {
+        lines.push(`exit: ${String(diagnostics.code)}`);
+    }
+    if (diagnostics.signal !== null) {
+        lines.push(`signal: ${diagnostics.signal}`);
+    }
+    lines.push(`cwd: ${diagnostics.cwd}`);
+    if (diagnostics.stderr !== '') {
+        lines.push(`stderr: ${diagnostics.stderr}`);
+        return lines.join('\n');
+    }
+    if (diagnostics.stdout !== '') {
+        lines.push(`stdout: ${diagnostics.stdout}`);
+        return lines.join('\n');
+    }
+    const pathEnvExcerpt = formatPathEnvExcerpt(diagnostics.pathEnv);
+    if (pathEnvExcerpt !== null) {
+        lines.push(`PATH: ${pathEnvExcerpt}`);
+    }
+    const lowerMessage = diagnostics.message.toLowerCase();
+    if (diagnostics.code === 'ENOENT' ||
+        lowerMessage.includes('not recognized as an internal or external command') ||
+        lowerMessage.includes('spawn npm enoent')) {
+        lines.push('hint: npm is not available to the server process on PATH');
+    }
+    else if (lowerMessage.includes('econn') ||
+        lowerMessage.includes('etimedout') ||
+        lowerMessage.includes('certificate') ||
+        lowerMessage.includes('self signed') ||
+        lowerMessage.includes('registry')) {
+        lines.push('hint: this looks like a registry, network, proxy, or certificate problem');
+    }
+    else if (diagnostics.code === 1 &&
+        diagnostics.stderr === '' &&
+        diagnostics.stdout === '') {
+        lines.push('hint: npm exited without output; check registry access and npm config in the same shell');
+    }
+    return lines.join('\n');
+}
 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 +196,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 +209,20 @@ async function queryLatestVersion() {
         return { kind: 'ok', latestVersion, checkedAt };
     }
     catch (error) {
+        const diagnostics = extractCommandFailureDiagnostics(error);
+        const errorText = error instanceof Error && error.name === 'AbortError'
+            ? 'npm view dominds version timed out'
+            : formatCommandFailureForUi(diagnostics);
+        log.warn('Dominds latest-version check failed', error, { checkedAt, errorText, diagnostics });
         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 +527,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 +540,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 +563,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 +656,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 +668,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/dist/tools/os.d.ts

@@ -4,6 +4,7 @@
  * Operating system interaction tools for shell command execution.
  * Provides shell_cmd and stop_daemon FuncTools with advanced process management.
  */
+import type { LanguageCode } from '@longrun-ai/kernel/types/language';
 import type { FuncTool, ReminderOwner } from '../tool';
 export declare function resetTrackedDaemonsForTests(): void;
 type ShellSpawnSpec = Readonly<{
@@ -13,6 +14,7 @@ type ShellSpawnSpec = Readonly<{
     windowsVerbatimArguments?: boolean;
 }>;
 export declare function resolveShellCmdSpawnSpecForTests(command: string, shell: string | undefined, platform: NodeJS.Platform): ShellSpawnSpec;
+export declare function detectWindowsShellUsageWarningForTests(command: string, shell: string | undefined, language: LanguageCode, platform: NodeJS.Platform): string | undefined;
 export declare function resolveReadonlyShellSpawnSpecForTests(command: string, platform: NodeJS.Platform): ShellSpawnSpec;
 export declare const shellCmdReminderOwner: ReminderOwner;
 export declare const shellCmdTool: FuncTool;

package/dist/tools/os.js

@@ -12,6 +12,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.getDaemonOutputTool = exports.stopDaemonTool = exports.readonlyShellTool = exports.shellCmdTool = exports.shellCmdReminderOwner = void 0;
 exports.resetTrackedDaemonsForTests = resetTrackedDaemonsForTests;
 exports.resolveShellCmdSpawnSpecForTests = resolveShellCmdSpawnSpecForTests;
+exports.detectWindowsShellUsageWarningForTests = detectWindowsShellUsageWarningForTests;
 exports.resolveReadonlyShellSpawnSpecForTests = resolveReadonlyShellSpawnSpecForTests;
 const time_1 = require("@longrun-ai/kernel/utils/time");
 const child_process_1 = require("child_process");
@@ -645,7 +646,7 @@ async function spawnCmdRunner(init) {
         runnerProcess.send(init);
     });
 }
-function formatCompletedShellCommandOutput(message, t) {
+function formatCompletedShellCommandOutput(message, t, warning) {
     const stdoutHasScrolled = message.stdout.linesScrolledOut > 0;
     const stderrHasScrolled = message.stderr.linesScrolledOut > 0;
     let scrollNotice = '';
@@ -667,7 +668,7 @@ function formatCompletedShellCommandOutput(message, t) {
     if (stderrContent !== '') {
         result += `${t.stderrLabel}\n${fenceConsole}\n${stderrContent}\n${fenceEnd}`;
     }
-    const content = result.trim();
+    const content = prependShellWarning(result.trim(), warning);
     return message.exitCode === 0 ? (0, tool_1.toolSuccess)(content) : (0, tool_1.toolPartialFailure)(content);
 }
 async function removeDaemonRemindersForPid(dlg, pid) {
@@ -818,76 +819,42 @@ function parseGetDaemonOutputArgs(args) {
     }
     return { pid, stdout, stderr };
 }
-function encodePowerShellCommand(command) {
-    return Buffer.from(command, 'utf16le').toString('base64');
-}
-function stripMatchingOuterQuotes(value) {
-    const trimmed = value.trim();
-    if (trimmed.length < 2) {
-        return trimmed;
-    }
-    const first = trimmed[0] ?? '';
-    const last = trimmed[trimmed.length - 1] ?? '';
-    if ((first === '"' && last === '"') || (first === "'" && last === "'")) {
-        return trimmed.slice(1, -1);
-    }
-    return trimmed;
-}
-function resolveDirectWindowsPowerShellCommand(command) {
-    const match = /^\s*(powershell(?:\.exe)?|pwsh(?:\.exe)?)\s+(?:-(?:NoLogo|NoProfile|NonInteractive)\s+)*(?:-|\/)(?:Command|c)\s+([\s\S]+?)\s*$/iu.exec(command);
-    if (match === null) {
-        return null;
+function getWindowsShellLabel(shell) {
+    if (typeof shell !== 'string') {
+        return 'cmd.exe';
     }
-    const shellCommand = match[1] ?? '';
-    const encodedCommand = encodePowerShellCommand(stripMatchingOuterQuotes(match[2] ?? ''));
-    return {
-        command: shellCommand,
-        args: ['-NoLogo', '-NoProfile', '-EncodedCommand', encodedCommand],
-        shellLabel: shellCommand,
-    };
+    const trimmed = shell.trim();
+    return trimmed === '' ? 'cmd.exe' : trimmed;
 }
-function unwrapNestedWindowsCmd(command) {
-    const match = /^\s*cmd(?:\.exe)?\s+(?:\/d\s+)?(?:\/s\s+)?\/c\s+([\s\S]+?)\s*$/iu.exec(command);
-    if (match === null) {
-        return null;
-    }
-    const inner = (match[1] ?? '').trim();
-    if (inner.length < 2) {
-        return inner;
-    }
-    const first = inner[0] ?? '';
-    const last = inner[inner.length - 1] ?? '';
-    if ((first === '"' && last === '"') || (first === "'" && last === "'")) {
-        return inner.slice(1, -1);
+function detectWindowsShellUsageWarning(command, shell, language, platform = process.platform) {
+    if (platform !== 'win32') {
+        return undefined;
     }
-    return inner;
-}
-function normalizeWindowsCmdCommand(command) {
-    const directPowerShell = resolveDirectWindowsPowerShellCommand(command);
-    if (directPowerShell !== null) {
-        return command;
+    const trimmedCommand = command.trimStart();
+    const nestedCmd = /^cmd(?:\.exe)?\s+(?:\/d\s+)?(?:\/s\s+)?\/c\b/iu.test(trimmedCommand);
+    const nestedPowerShell = /^(?:powershell(?:\.exe)?|pwsh(?:\.exe)?)\s+(?:-(?:NoLogo|NoProfile|NonInteractive)\s+)*(?:-|\/)(?:Command|c)\b/iu.test(trimmedCommand);
+    if (!nestedCmd && !nestedPowerShell) {
+        return undefined;
     }
-    const nestedCmd = unwrapNestedWindowsCmd(command);
-    if (nestedCmd !== null) {
-        return nestedCmd.replace(/\\"/g, '"').replace(/^(\s*if\s+(?:not\s+)?exist\s+)'([^'\r\n]+)'/iu, (_whole, prefix, quotedPath) => `${prefix}"${normalizeWindowsPathLiteral(quotedPath)}"`);
+    const shellLabel = getWindowsShellLabel(shell);
+    if (language === 'zh') {
+        return nestedCmd
+            ? `⚠️ 检测到嵌套 shell 写法：${trimmedCommand.startsWith('cmd.exe') ? 'cmd.exe /c' : 'cmd /c'}。shell 参数只负责选择外层执行环境；请直接传入 cmd 原生命令，不要再套一层 cmd /c。当前 shell：${shellLabel}`
+            : `⚠️ 检测到嵌套 shell 写法：${trimmedCommand.startsWith('pwsh') ? 'pwsh -Command' : 'powershell -Command'}。shell 参数只负责选择外层执行环境；请直接传入 PowerShell 原生命令，不要再套一层 -Command。当前 shell：${shellLabel}`;
     }
-    return command.replace(/\\"/g, '"').replace(/^(\s*if\s+(?:not\s+)?exist\s+)'([^'\r\n]+)'/iu, (_whole, prefix, quotedPath) => `${prefix}"${normalizeWindowsPathLiteral(quotedPath)}"`);
+    return nestedCmd
+        ? `⚠️ Nested shell syntax detected: ${trimmedCommand.startsWith('cmd.exe') ? 'cmd.exe /c' : 'cmd /c'}. The shell parameter selects the outer execution environment only; pass a native cmd command and do not add another cmd /c layer. Current shell: ${shellLabel}`
+        : `⚠️ Nested shell syntax detected: ${trimmedCommand.startsWith('pwsh') ? 'pwsh -Command' : 'powershell -Command'}. The shell parameter selects the outer execution environment only; pass a native PowerShell command and do not add another -Command wrapper. Current shell: ${shellLabel}`;
 }
-function normalizeWindowsPathLiteral(pathLiteral) {
-    if (pathLiteral.startsWith('\\\\')) {
-        return pathLiteral;
+function prependShellWarning(content, warning) {
+    if (!warning) {
+        return content;
     }
-    return pathLiteral.replace(/\\{2,}/g, '\\');
+    return `${warning}\n\n${content}`;
 }
 function resolveShellCmdSpawnSpec(command, shell, platform = process.platform) {
     const preferredShell = typeof shell === 'string' && shell.trim() !== '' ? shell.trim() : undefined;
     if (platform === 'win32') {
-        if (!preferredShell) {
-            const directPowerShell = resolveDirectWindowsPowerShellCommand(command);
-            if (directPowerShell !== null) {
-                return directPowerShell;
-            }
-        }
         if (preferredShell) {
             const base = path_1.default.basename(preferredShell).toLowerCase();
             if (base === 'powershell' ||
@@ -896,14 +863,14 @@ function resolveShellCmdSpawnSpec(command, shell, platform = process.platform) {
                 base === 'pwsh.exe') {
                 return {
                     command: preferredShell,
-                    args: ['-NoLogo', '-NoProfile', '-EncodedCommand', encodePowerShellCommand(command)],
+                    args: ['-NoLogo', '-NoProfile', '-Command', command],
                     shellLabel: preferredShell,
                 };
             }
             if (base === 'cmd' || base === 'cmd.exe') {
                 return {
                     command: preferredShell,
-                    args: ['/d', '/c', normalizeWindowsCmdCommand(command)],
+                    args: ['/d', '/c', command],
                     shellLabel: preferredShell,
                     windowsVerbatimArguments: true,
                 };
@@ -916,7 +883,7 @@ function resolveShellCmdSpawnSpec(command, shell, platform = process.platform) {
         }
         return {
             command: 'cmd.exe',
-            args: ['/d', '/c', normalizeWindowsCmdCommand(command)],
+            args: ['/d', '/c', command],
             shellLabel: 'cmd.exe',
             windowsVerbatimArguments: true,
         };
@@ -931,11 +898,14 @@ function resolveShellCmdSpawnSpec(command, shell, platform = process.platform) {
 function resolveShellCmdSpawnSpecForTests(command, shell, platform) {
     return resolveShellCmdSpawnSpec(command, shell, platform);
 }
+function detectWindowsShellUsageWarningForTests(command, shell, language, platform) {
+    return detectWindowsShellUsageWarning(command, shell, language, platform);
+}
 function resolveReadonlyShellSpawnSpec(command, platform = process.platform) {
     if (platform === 'win32') {
         return {
             command: 'cmd.exe',
-            args: ['/d', '/c', normalizeWindowsCmdCommand(command)],
+            args: ['/d', '/c', command],
             shellLabel: 'cmd.exe',
             windowsVerbatimArguments: true,
         };
@@ -1187,7 +1157,7 @@ const shellCmdSchema = {
         },
         shell: {
             type: 'string',
-            description: 'Shell to use for execution (default: bash on Linux/macOS; cmd.exe on Windows). On Windows, powershell.exe/pwsh commands are passed via -EncodedCommand.',
+            description: 'Shell to use for execution (default: bash on Linux/macOS; cmd.exe on Windows). On Windows, choose cmd.exe, powershell.exe, or pwsh explicitly; command must be native to the selected shell.',
         },
         scrollbackLines: {
             type: 'number',
@@ -1536,10 +1506,10 @@ ${statusInfo}`,
 exports.shellCmdTool = {
     type: 'func',
     name: 'shell_cmd',
-    description: 'Execute shell commands with optional timeout. If timeoutSeconds > 0 and command runs longer, it becomes a tracked daemon process. Daemons persist across messages and require explicit stop_daemon or get_daemon_output calls.',
+    description: 'Execute shell commands with optional timeout. If timeoutSeconds > 0 and command runs longer, it becomes a tracked daemon process. On Windows, use shell to choose cmd.exe, powershell.exe, or pwsh, and pass a command that is native to that shell. Do not nest cmd /c or powershell -Command inside another shell command. Daemons persist across messages and require explicit stop_daemon or get_daemon_output calls.',
     descriptionI18n: {
-        en: 'Execute shell commands with optional timeout. If timeoutSeconds > 0 and command runs longer, it becomes a tracked daemon process. Daemons persist across messages and require explicit stop_daemon or get_daemon_output calls.',
-        zh: '执行 shell 命令（支持超时）。如果 timeoutSeconds > 0 且命令运行时间超过超时，将转为可追踪的后台守护进程。守护进程会跨消息持续存在，需要显式调用 stop_daemon 或 get_daemon_output 来管理与查看输出。',
+        en: 'Execute shell commands with optional timeout. If timeoutSeconds > 0 and command runs longer, it becomes a tracked daemon process. On Windows, use shell to choose cmd.exe, powershell.exe, or pwsh, and pass a command that is native to that shell. Do not nest cmd /c or powershell -Command inside another shell command. Daemons persist across messages and require explicit stop_daemon or get_daemon_output calls.',
+        zh: '执行 shell 命令（支持超时）。如果 timeoutSeconds > 0 且命令运行时间超过超时，将转为可追踪的后台守护进程。Windows 上请用 shell 明确选择 cmd.exe、powershell.exe 或 pwsh，并传入该 shell 的原生命令。不要在另一个 shell 命令里再嵌套 cmd /c 或 powershell -Command。守护进程会跨消息持续存在，需要显式调用 stop_daemon 或 get_daemon_output 来管理与查看输出。',
     },
     parameters: shellCmdSchema,
     async call(dlg, caller, args) {
@@ -1548,6 +1518,7 @@ exports.shellCmdTool = {
         const parsedArgs = parseShellCmdArgs(args);
         const { command, shell, scrollbackLines = 500, timeoutSeconds = 5 } = parsedArgs;
         const spawnSpec = resolveShellCmdSpawnSpec(command, shell);
+        const warning = detectWindowsShellUsageWarning(command, shell, language);
         try {
             const { runnerProcess, initialMessage } = await spawnCmdRunner({
                 type: 'init',
@@ -1564,11 +1535,11 @@ exports.shellCmdTool = {
                 scrollbackLines,
             });
             if (initialMessage.type === 'completed') {
-                return formatCompletedShellCommandOutput(initialMessage, t);
+                return formatCompletedShellCommandOutput(initialMessage, t, warning);
             }
             if (initialMessage.type === 'failed') {
                 disconnectRunnerProcess(runnerProcess);
-                return (0, tool_1.toolFailure)(t.failedToExecute(initialMessage.errorText));
+                return (0, tool_1.toolFailure)(prependShellWarning(t.failedToExecute(initialMessage.errorText), warning));
             }
             const daemon = {
                 pid: initialMessage.daemonPid,
@@ -1620,15 +1591,15 @@ exports.shellCmdTool = {
             catch (error) {
                 await bestEffortKillDaemonProcessGroup(reminderSeedMeta);
                 disconnectRunnerProcess(runnerProcess);
-                return (0, tool_1.toolFailure)(t.failedToExecute(error instanceof Error
+                return (0, tool_1.toolFailure)(prependShellWarning(t.failedToExecute(error instanceof Error
                     ? `daemon reminder persistence failed: ${error.message}`
-                    : `daemon reminder persistence failed: ${String(error)}`));
+                    : `daemon reminder persistence failed: ${String(error)}`), warning));
             }
             disconnectRunnerProcess(runnerProcess);
-            return (0, tool_1.toolSuccess)(t.daemonStarted(initialMessage.daemonPid, timeoutSeconds, command));
+            return (0, tool_1.toolSuccess)(prependShellWarning(t.daemonStarted(initialMessage.daemonPid, timeoutSeconds, command), warning));
         }
         catch (error) {
-            return (0, tool_1.toolFailure)(t.failedToExecute(error instanceof Error ? error.message : String(error)));
+            return (0, tool_1.toolFailure)(prependShellWarning(t.failedToExecute(error instanceof Error ? error.message : String(error)), warning));
         }
     },
 };
@@ -2209,10 +2180,11 @@ exports.readonlyShellTool = {
         const t = getOsToolMessages(language);
         const parsedArgs = parseReadonlyShellArgs(args);
         const { command, timeoutMs = 10000 } = parsedArgs;
+        const warning = detectWindowsShellUsageWarning(command, undefined, language);
         if (command.includes('\n') || command.includes('\r')) {
-            return (0, tool_1.toolFailure)(language === 'zh'
+            return (0, tool_1.toolFailure)(prependShellWarning(language === 'zh'
                 ? `❌ readonly_shell 不建议执行多行脚本式命令（检测到换行符）。请用单行命令（允许 |、&&、||）。\n收到：${command}`
-                : `❌ readonly_shell does not allow multi-line script-style commands (newline detected). Use a single-line command (|, &&, || are allowed).\nGot: ${command}`);
+                : `❌ readonly_shell does not allow multi-line script-style commands (newline detected). Use a single-line command (|, &&, || are allowed).\nGot: ${command}`, warning));
         }
         const validation = validateReadonlyShellCommand(command);
         if (!validation.ok) {
@@ -2222,9 +2194,9 @@ exports.readonlyShellTool = {
             const suggestion = language === 'zh'
                 ? getReadonlyShellSuggestionZh(validation.failure)
                 : getReadonlyShellSuggestionEn(validation.failure);
-            return (0, tool_1.toolFailure)(language === 'zh'
+            return (0, tool_1.toolFailure)(prependShellWarning(language === 'zh'
                 ? `❌ readonly_shell 仅允许以下命令前缀：${allowedList}\n另外允许（仅版本探针）：node --version|-v、python3 --version|-V\n脚本执行（如 node -e / python3 -c）一律拒绝。\n另外允许：git -C <相对路径> <show|status|diff|log|blame> ...\n另外允许：cd <相对路径> && <允许命令...>（或 ||）\n说明：通过 |/&&/|| 串联时会按子命令逐段校验。\n被拒子命令段：${rejectedSegmentOrCommand}\n允许的等价写法：${suggestion}\n收到：${command}`
-                : `❌ readonly_shell only allows these command prefixes: ${allowedList}\nAlso allowed (exact version probes only): node --version|-v, python3 --version|-V\nNode/python scripts (for example: node -e, python3 -c) are rejected.\nAlso allowed: git -C <relative-path> <show|status|diff|log|blame> ...\nAlso allowed: cd <relative-path> && <allowed command...> (or ||)\nNote: chains via |/&&/|| are validated segment-by-segment.\nRejected segment: ${rejectedSegmentOrCommand}\nAllowed equivalent: ${suggestion}\nGot: ${command}`);
+                : `❌ readonly_shell only allows these command prefixes: ${allowedList}\nAlso allowed (exact version probes only): node --version|-v, python3 --version|-V\nNode/python scripts (for example: node -e, python3 -c) are rejected.\nAlso allowed: git -C <relative-path> <show|status|diff|log|blame> ...\nAlso allowed: cd <relative-path> && <allowed command...> (or ||)\nNote: chains via |/&&/|| are validated segment-by-segment.\nRejected segment: ${rejectedSegmentOrCommand}\nAllowed equivalent: ${suggestion}\nGot: ${command}`, warning));
         }
         const forbiddenHiddenDir = detectReadonlyShellForbiddenHiddenDirAccess(path_1.default.resolve(process.cwd()), command);
         if (forbiddenHiddenDir) {
@@ -2277,7 +2249,7 @@ exports.readonlyShellTool = {
                         ? `⚠️  输出已截断，约省略 ${omittedBytes} 字节\n`
                         : `⚠️  Output truncated; ~${omittedBytes} bytes omitted\n`
                     : '';
-                let result = `${timeoutMsg}${truncationNotice}`.trimEnd();
+                let result = prependShellWarning(`${timeoutMsg}${truncationNotice}`.trimEnd(), warning);
                 const stdoutContent = (0, output_limit_1.truncateToolOutputText)(stdoutBuffer.getContent(), {
                     toolName: 'readonly_shell_stdout',
                 }).text;
@@ -2308,7 +2280,7 @@ exports.readonlyShellTool = {
                 }).text;
                 const fenceConsole = '```console';
                 const fenceEnd = '```';
-                let result = t.commandCompleted(code, truncationNotice);
+                let result = prependShellWarning(t.commandCompleted(code, truncationNotice), warning);
                 if (stdoutContent) {
                     result += `${t.stdoutLabel}\n${fenceConsole}\n${stdoutContent}\n${fenceEnd}\n\n`;
                 }
@@ -2319,7 +2291,7 @@ exports.readonlyShellTool = {
             });
             childProcess.on('error', (error) => {
                 clearTimeout(timeoutHandle);
-                finish((0, tool_1.toolFailure)(t.failedToExecute(error.message)));
+                finish((0, tool_1.toolFailure)(prependShellWarning(t.failedToExecute(error.message), warning)));
             });
         });
     },

package/dist/tools/prompts/codex_inspect_and_patch_tools/en/tools.md

@@ -15,7 +15,8 @@ Typical uses:
 Windows notes:
 
 - Prefer no-space forward-slash paths such as `D:/path/to/file`
-- Avoid nested `cmd /c "..."`
+- `readonly_shell` runs through the platform default shell; pass native commands for that shell
+- Avoid nested `cmd /c` or `powershell -Command`; obvious nested-shell patterns may only warn and are not rewritten
 
 Example:
 

package/dist/tools/prompts/codex_inspect_and_patch_tools/zh/tools.md

@@ -15,7 +15,8 @@
 Windows 注意：
 
 - 优先使用不带空格的正斜杠路径，如 `D:/path/to/file`
-- 避免嵌套 `cmd /c "..."`
+- `readonly_shell` 通过平台默认 shell 执行；请传入该 shell 的原生命令
+- 避免嵌套 `cmd /c` 或 `powershell -Command`；明显混套模式最多只会警告，不会被改写
 
 示例：
 

package/dist/tools/prompts/os/en/scenarios.md

@@ -194,7 +194,7 @@ shell_cmd({
   command: 'if exist D:/AiWorks/chatgpt-workstation/dist/app.exe echo exists',
 });
 
-// Complex PowerShell command: choose PowerShell explicitly; Dominds encodes the command automatically
+// Complex PowerShell command: choose PowerShell explicitly and keep the command native to that shell
 shell_cmd({
   command: 'Test-Path D:/AiWorks/chatgpt-workstation/dist/app.exe',
   shell: 'powershell.exe',

package/dist/tools/prompts/os/en/tools.md

@@ -32,9 +32,10 @@ Execute Shell command.
 
 **Windows notes:**
 
+- Use `shell` to choose the outer execution environment: `cmd.exe`, `powershell.exe`, or `pwsh`
+- Pass a command that is native to the selected shell; do not nest `cmd /c` or `powershell -Command` inside another shell command
 - With the default `cmd.exe` path, prefer no-space forward-slash paths such as `D:/path/to/file`
-- For complex PowerShell commands, pass `shell: 'powershell.exe'` or `shell: 'pwsh'`; the command is encoded automatically to avoid quote and backslash ambiguity
-- Do not rely on nested `cmd /c "..."`
+- Only very obvious nested-shell patterns may trigger a warning; the tool does not rewrite mixed shell syntax for you
 
 **Returns:**
 

package/dist/tools/prompts/os/zh/scenarios.md

@@ -194,7 +194,7 @@ shell_cmd({
   command: 'if exist D:/AiWorks/chatgpt-workstation/dist/app.exe echo exists',
 });
 
-// 复杂 PowerShell 命令：显式选择 PowerShell，系统会自动编码传递命令
+// 复杂 PowerShell 命令：显式选择 PowerShell，并保持命令为该 shell 的原生命令
 shell_cmd({
   command: 'Test-Path D:/AiWorks/chatgpt-workstation/dist/app.exe',
   shell: 'powershell.exe',

package/dist/tools/prompts/os/zh/tools.md

@@ -32,9 +32,10 @@
 
 **Windows 提示：**
 
+- 使用 `shell` 选择外层执行环境：`cmd.exe`、`powershell.exe` 或 `pwsh`
+- `command` 必须是所选 shell 的原生命令；不要在另一个 shell 命令里嵌套 `cmd /c` 或 `powershell -Command`
 - 默认 `cmd.exe` 路径下，优先使用不带空格的正斜杠路径，如 `D:/path/to/file`
-- 复杂 PowerShell 命令建议显式传 `shell: 'powershell.exe'` 或 `shell: 'pwsh'`；系统会自动用编码方式传递命令，避免引号和反斜杠歧义
-- 不要依赖 `cmd /c "..."`
+- 只有非常明显的混套模式可能触发警告；工具不会替你改写混合 shell 语法
 
 **返回：**
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dominds",
-  "version": "1.25.4",
+  "version": "1.25.6",
   "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",