dsh-vibe-math 2.7.0 → 2.7.1

package/vibe-math-v2/math-engines.js

@@ -22,14 +22,47 @@ export const MATH_ENGINES = {
     candidates: ['python3', 'python', 'py'], winPrefix: ['-3'],
     versionArgv: ['--version'], versionRe: '(\\d+\\.\\d+\\.\\d+)',
     scriptArgv: ['<script>'], evalArgv: ['-c', '<expr>'], stdinArgv: ['-'], ext: '.py',
-    probeCode: "import importlib.util,sys;print('|'.join('%s:%s'%(p,'ok' if importlib.util.find_spec(p) else 'missing') for p in sys.argv[1:]))",
-    packageProbe: { argv: ['-c', '<probeCode>', '<pkgs>'], parse: 'pairs' },
+    // round-7 (live): NO shell metacharacters (`|`, `%`) in any probe argv - a real host rejected
+    // them with a null spawn. One line per package: "name ok|missing".
+    probeCode: "import importlib.util,sys\nfor p in sys.argv[1:]: print(p, 'ok' if importlib.util.find_spec(p) is not None else 'missing')",
+    // round-7 (finding 6, found on the real bundled python): the probe code iterates `sys.argv[1:]`,
+    // so the names must be SEPARATE argv items - the old comma-joined `<pkgs>` made it look up one
+    // package literally named "numpy,pandas" and reported everything missing.
+    packageProbe: { argv: ['-c', '<probeCode>', '<pkgs...>'], parse: 'pairs' },
     license: 'free', argErrorHints: ARG_ERROR_HINTS,
     install: {
       manager: 'pip',
       userArgv: ['<exe>', '-m', 'pip', 'install', '--user', '<pkg>'],
       systemArgv: ['<exe>', '-m', 'pip', 'install', '<pkg>'],
       uninstallArgv: ['<exe>', '-m', 'pip', 'uninstall', '-y', '<pkg>'],
+      // Round-6 (B): DISPATCH by the detected interpreter environment. `pip` is the documented
+      // fallback; the module picks conda/mamba/uv only when the interpreter's OWN environment says so
+      // (detect, don't guess) and the plan states which manager it assumed.
+      managers: {
+        conda: {
+          detect: 'conda-markers',
+          userArgv: ['conda', 'install', '-y', '-c', 'conda-forge', '<pkg>'],
+          uninstallArgv: ['conda', 'remove', '-y', '<pkg>'],
+          systemUnsupportedReason: 'conda 环境是用户级的；系统级安装不在 conda 的概念里（本工具只出用户级计划）',
+        },
+        mamba: {
+          detect: 'conda-markers',
+          userArgv: ['mamba', 'install', '-y', '-c', 'conda-forge', '<pkg>'],
+          uninstallArgv: ['mamba', 'remove', '-y', '<pkg>'],
+          systemUnsupportedReason: 'mamba 环境是用户级的；系统级安装不在 mamba 的概念里（本工具只出用户级计划）',
+        },
+        uv: {
+          detect: 'uv-next-to-interpreter',
+          userArgv: ['uv', 'pip', 'install', '<pkg>'],
+          uninstallArgv: ['uv', 'pip', 'uninstall', '<pkg>'],
+          systemUnsupportedReason: 'uv 装进当前虚拟环境（用户级）；系统级需要发行版包管理器，本工具只出用户级计划',
+        },
+        pip: {
+          detect: 'fallback',
+          systemArgv: ['<exe>', '-m', 'pip', 'install', '<pkg>'],
+          uninstallArgv: ['<exe>', '-m', 'pip', 'uninstall', '-y', '<pkg>'],
+        },
+      },
     },
     userInstall: { windows: 'winget install --id Python.Python.3.12', macos: 'brew install python', linux: 'apt install python3' },
   },
@@ -38,13 +71,16 @@ export const MATH_ENGINES = {
     candidates: ['Rscript', 'R'],
     versionArgv: ['--version'], versionRe: '(\\d+\\.\\d+\\.\\d+)',
     scriptArgv: ['<script>'], evalArgv: ['-e', '<expr>'], stdinArgv: ['--no-save', '--slave'], ext: '.R',
-    probeCode: "cat(paste(sapply(strsplit('__PKGS__',',')[[1]],function(p) paste0(p,':',requireNamespace(p,quietly=TRUE))),collapse='|'))",
+    // round-7 (live): line-per-package, no `|` in the argv.
+    probeCode: "for (p in strsplit('__PKGS__',',')[[1]]) cat(p, if (requireNamespace(p, quietly=TRUE)) 'ok' else 'missing', '\\n')",
     packageProbe: { argv: ['-e', '<probeCode>'], parse: 'pairs' },
     license: 'free', argErrorHints: ARG_ERROR_HINTS,
     install: {
       manager: 'r',
       userArgv: ['<exe>', '-e', "install.packages('__PKG__',lib=Sys.getenv('R_LIBS_USER'),repos='https://cloud.r-project.org')"],
       uninstallArgv: ['<exe>', '-e', "remove.packages('__PKG__',lib=Sys.getenv('R_LIBS_USER'))"],
+      // Round-6 (C): user-only BY DESIGN, and the refusal now says why per engine.
+      systemUnsupportedReason: 'R 的用户库是 R_LIBS_USER；系统级安装要写发行版的包目录（需 root 或发行版包管理器），本工具只出用户级计划',
     },
     userInstall: { windows: 'winget install --id RProject.R', macos: 'brew install r', linux: 'apt install r-base' },
   },
@@ -54,13 +90,15 @@ export const MATH_ENGINES = {
     versionArgv: ['--version'], versionRe: '(\\d+\\.\\d+\\.\\d+)',
     scriptArgv: ['--no-gui', '--quiet', '<script>'], evalArgv: ['--no-gui', '--quiet', '--eval', '<expr>'],
     stdinArgv: ['--no-gui', '--quiet'], ext: '.m',
-    probeCode: "s=pkg('list'); n={'__QPKGS__'}; for i=1:numel(n); printf('%s:%s|',n{i},merge(any(cellfun(@(x) strcmp(x.name,n{i}),s)),'ok','missing')); end",
+    // round-7 (live): line-per-package via disp, no `|` and no `%` in the argv.
+    probeCode: "s=pkg('list'); n={'__QPKGS__'}; for i=1:numel(n); if any(cellfun(@(x) strcmp(x.name,n{i}),s)); disp([n{i} ' ok']); else; disp([n{i} ' missing']); end; end",
     packageProbe: { argv: ['--no-gui', '--quiet', '--eval', '<probeCode>'], parse: 'pairs' },
     license: 'free', argErrorHints: ARG_ERROR_HINTS,
     install: {
       manager: 'octave-pkg',
       userArgv: ['<exe>', '--no-gui', '--quiet', '--eval', "pkg install -forge __PKG__"],
       uninstallArgv: ['<exe>', '--no-gui', '--quiet', '--eval', 'pkg uninstall __PKG__'],
+      systemUnsupportedReason: 'Octave 的 pkg install 装进用户包目录；系统级要写 Octave 的 share/packages（需 root），本工具只出用户级计划',
     },
     userInstall: { windows: 'winget install --id GNU.Octave', macos: 'brew install octave', linux: 'apt install octave' },
   },
@@ -76,6 +114,7 @@ export const MATH_ENGINES = {
       manager: 'julia-pkg',
       userArgv: ['<exe>', '-e', 'using Pkg; Pkg.add("__PKG__")'],
       uninstallArgv: ['<exe>', '-e', 'using Pkg; Pkg.rm("__PKG__")'],
+      systemUnsupportedReason: 'Julia 的 Pkg.add 装进当前活动环境 / 用户 depot（JULIA_DEPOT_PATH）；系统级不是 Julia 的概念，本工具只出用户级计划',
     },
     userInstall: { windows: 'winget install --id Julialang.Julia', macos: 'brew install julia', linux: 'apt install julia' },
   },
@@ -84,7 +123,8 @@ export const MATH_ENGINES = {
     candidates: ['matlab'],
     versionArgv: ['-batch', 'disp(version)'], versionRe: '(\\d+\\.\\d+)',
     scriptArgv: ['-batch', "run('<script>')"], evalArgv: ['-batch', '<expr>'], stdinArgv: null, ext: '.m',
-    probeCode: "t={'__QPKGS__'}; for i=1:numel(t); printf('%s:%d|',t{i},license('test',t{i})); end",
+    // round-7 (live): no `|`/`%` in any probe argv (a real host rejected such argv with a null spawn).
+    probeCode: "t={'__QPKGS__'}; for i=1:numel(t); if license('test',t{i}); disp([t{i} ' ok']); else; disp([t{i} ' missing']); end; end",
     packageProbe: { argv: ['-batch', '<probeCode>'], parse: 'pairs' },
     license: 'commercial', argErrorHints: ARG_ERROR_HINTS,
     licenseProbe: { argv: ['-batch', "disp(license('test','MATLAB'))"], okWhen: 'trim-1' },
@@ -96,7 +136,8 @@ export const MATH_ENGINES = {
     candidates: ['maple'],
     versionArgv: ['--version'], versionRe: '(\\d+\\.\\d+)',
     scriptArgv: ['-q', '<script>'], evalArgv: ['-q', '-c', '<expr>'], stdinArgv: null, ext: '.mpl',
-    probeCode: 'for p in ["__PKGS__"] do try with(p) catch: printf("%s:missing|", p); next end try; printf("%s:ok|", p) end do',
+    // round-7 (live): `print` instead of printf so the argv carries no `|`/`%`.
+    probeCode: 'for p in ["__PKGS__"] do try with(p) catch: print(p, " missing"); next end try; print(p, " ok") end do',
     packageProbe: { argv: ['-q', '-c', '<probeCode>'], parse: 'pairs' },
     license: 'commercial', argErrorHints: ARG_ERROR_HINTS,
     licenseProbe: { argv: ['-q', '-c', 'printf("1")'], okWhen: 'exit-0' },

package/vibe-math-v2/vibe-math-v2.js

@@ -30,6 +30,7 @@ import {
   MATH_TOOL_DESCRIPTION,
   MATH_TOOL_SCHEMA,
   MATH_ARCHIVE_WORKFLOW_LINE,
+  MATH_SUBSTITUTION_RULE_LINE,
   MATH_PERSONA_TOOL_LINE,
   MATH_RULE_LINES,
   normalizeMathParams,
@@ -536,6 +537,11 @@ export function apply(ctx) {
     // **可选能力，按宿主实际情况声明**：宿主 fs 没有 listDir 就不给这个回调（模块据此跳过
     // "每项目 run 目录数 >200" 的保留检查，而不是每次运行都白问一次）。
     listDir: (typeof fs.listDir === 'function') ? mathListDir : undefined,
+    // round-7 (fix 2): DSH's own bundled runtimes (`<home>/.dsh/dsh-runtimes/*/dependencies/<engine>/`)
+    // as a LAST resort after PATH. Only generic roots are supplied here; the module globs the tree
+    // name (never `dsh-primary-runtime`) and only accepts the descriptor's own candidate names.
+    runtimeRoots: () => { const env = process.env.DSH_HOME; if (env) return [String(env)]; const home = String(process.env.HOME || process.env.USERPROFILE || ''); return home ? [home.replace(/[\\/]+$/, '') + '/.dsh'] : [] },
+    listDirAbs: async function (abs) { try { const t = await fsTarget(abs); const st = await fs.stat(t); if (!st) return []; return (await fs.listDir(t)) || [] } catch (e) { return [] } },
     writeText: async function (rel, text) { return await writeText(rel, text) },
     readText: async function (rel) { return await readText(rel) },
     exists: mathExists,
@@ -557,7 +563,15 @@ export function apply(ctx) {
   async function refreshMathProbe(force) {
     if (params.mathComputation === 'off') { mathProbe = null; mathProbeAt = 0; return null }
     if (!mathTool) return null
-    try { mathProbe = await mathTool.probe(force ? { refresh: true } : undefined); mathProbeAt = now() } catch (e) { mathProbe = null }
+    try {
+      mathProbe = await mathTool.probe(force ? { refresh: true } : undefined)
+      mathProbeAt = now()
+      // 规则漂移自检（A 项）：可用性行必须带"替代必须声明（诚实性）"这条规则。这里引用**常量**
+      // 而不是比对文本——模块以后改措辞不会误报，只有整条规则从 MATH_RULE_LINES 里消失才会响。
+      if (mathProbe && mathAvailabilityLine(mathProbe, 'zh', params.mathMode).indexOf(MATH_SUBSTITUTION_RULE_LINE) === -1) {
+        console.error('vibe-math-v2: 可用性行缺少替代声明规则（MATH_SUBSTITUTION_RULE_LINE）')
+      }
+    } catch (e) { mathProbe = null }
     return mathProbe
   }
   /** 心跳里的 TTL 刷新（每拍一次布尔判断，成本可忽略）。 */
@@ -4074,6 +4088,8 @@ export function apply(ctx) {
     mathProbe: function () { return mathProbe },
     // P2a：persona 两个文本块必须含的「归档→编辑→重跑」规则（文本取自共享模块常量，persona 不手抄）。
     mathArchiveWorkflowLine: MATH_ARCHIVE_WORKFLOW_LINE,
+    // A 项：替代声明规则（文本由共享模块给出；persona 两块与每轮可用性行都必须带它）。
+    mathSubstitutionRuleLine: MATH_SUBSTITUTION_RULE_LINE,
     leanQueueSize: function () { return leanQueue.length },
     leanJobsPublic: function () { const out = []; for (const j of leanJobs.values()) out.push(leanJobPublic(j)); return out },
     // childOwner 裁剪用：这个会话当前仍"可能再发 subagent/end"的 child（在册的 + 任务正在等的）。

package/vibe-math-v3/agent.cordis.yml

@@ -68,6 +68,7 @@
         mode.
 
       - math_computation {op: probe|run|receipt|install, engine, mode: code|file|expr, …} — 先 probe 预检引擎/包/许可，再调引擎计算并把脚本与输出归档成可复核回执；缺引擎/缺包只报告与给安装指引/计划；shell 兜底不算归档。
+      - 替代必须声明（诚实性）：当替代方案改变了**精确性或结论强度**时（精确符号解 → 数值近似、闭式解 → 采样/求积、改了精度/容差/假设、换了算法类），结论里**必须写明**，不得读起来像得到了原本（精确/所要求的）结果；拿不到精确结果就直说。
       - 归档→编辑→重跑：mode:'code' 的脚本原件在回执的 scriptPath（Computation/<id>/script.<ext>），你可以用普通文件工具打开并编辑它；编辑后用 mode:'file' 指向它重跑，会写出一份**新回执/新 attempt**（含新的 scriptHash）。**旧回执对修改后的代码无效**——报告里必须引用与当前代码哈希一致的那份回执；工具会在 scriptChanged / scriptChangedDuringRun 为 true 时显式告警。
 
       A /vibe slash command mirrors the main controls (/vibe start [override]|resume [override]|pause|abort|status|report|mode
@@ -159,6 +160,7 @@
         mode.
 
       - math_computation {op: probe|run|receipt|install, engine, mode: code|file|expr, …} — 先 probe 预检引擎/包/许可，再调引擎计算并把脚本与输出归档成可复核回执；缺引擎/缺包只报告与给安装指引/计划；shell 兜底不算归档。
+      - 替代必须声明（诚实性）：当替代方案改变了**精确性或结论强度**时（精确符号解 → 数值近似、闭式解 → 采样/求积、改了精度/容差/假设、换了算法类），结论里**必须写明**，不得读起来像得到了原本（精确/所要求的）结果；拿不到精确结果就直说。
       - 归档→编辑→重跑：mode:'code' 的脚本原件在回执的 scriptPath（Computation/<id>/script.<ext>），你可以用普通文件工具打开并编辑它；编辑后用 mode:'file' 指向它重跑，会写出一份**新回执/新 attempt**（含新的 scriptHash）。**旧回执对修改后的代码无效**——报告里必须引用与当前代码哈希一致的那份回执；工具会在 scriptChanged / scriptChangedDuringRun 为 true 时显式告警。
 
       A /vibe slash command mirrors the main controls (/vibe start [override]|resume [override]|pause|abort|status|report|mode