dsh-vibe-math 2.7.0 → 2.7.1

package/vibe-math-v5/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-v5/vibe-math-v5.js

@@ -67,6 +67,8 @@ import {
   MATH_RULE_LINES_EN,
   MATH_ARCHIVE_WORKFLOW_LINE,
   MATH_ARCHIVE_WORKFLOW_LINE_EN,
+  MATH_SUBSTITUTION_RULE_LINE,
+  MATH_SUBSTITUTION_RULE_LINE_EN,
   normalizeMathParams,
   probeMathEngines,
   registerMathComputation,
@@ -2902,6 +2904,11 @@ export function apply(ctx) {
       // reports MATH_NO_SUBPROCESS before engine detection), and let it check the retention cap.
       hasSubprocess: () => { const sub = subprocessOf(); return !!(sub && typeof sub.spawn === 'function') },
       listDir: (rel) => mathListDirRel(rel),
+      // round-7 (fix 2): DSH's own bundled runtimes (`<home>/.dsh/dsh-runtimes/*/dependencies/<engine>/`)
+      // as a LAST resort after PATH. Generic roots only; the module globs the tree name and accepts
+      // only 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 (abs) => { try { const t = await fs.resolve(String(abs)); const st = await fs.stat(t); if (!st) return []; return (await fs.listDir(t)) || [] } catch (e) { return [] } },
       log: (kind, msg) => mathLog(kind, msg),
     }
     // The DYNAMIC per-round availability line: computed from a (cached) probe when the prompt is
@@ -2923,6 +2930,10 @@ export function apply(ctx) {
         // `scriptChanged` actionable for a member).
         if (mathLineZh.indexOf(MATH_ARCHIVE_WORKFLOW_LINE) === -1) console.error('vibe-math-v5: the math availability line lost the archive workflow rule')
         if (mathLineEn.indexOf(MATH_ARCHIVE_WORKFLOW_LINE_EN) === -1) console.error('vibe-math-v5: the EN math availability line lost the archive workflow rule')
+        // Round-6 (A): an undeclared SUBSTITUTION must never read like the exact result — the
+        // honesty rule has to reach the prompt in both languages.
+        if (mathLineZh.indexOf(MATH_SUBSTITUTION_RULE_LINE) === -1) console.error('vibe-math-v5: the math availability line lost the substitution-honesty rule')
+        if (mathLineEn.indexOf(MATH_SUBSTITUTION_RULE_LINE_EN) === -1) console.error('vibe-math-v5: the EN math availability line lost the substitution-honesty rule')
         return mathLineZh
       } catch (e) {
         // A probe failure must never break prompt construction: keep whatever we had.
@@ -2935,11 +2946,12 @@ export function apply(ctx) {
       const line = lang === 'en' ? mathLineEn : mathLineZh
       if (line) return '\n' + line
       // Fallback: when the dynamic line could not be built, the member still needs to know the
-      // tool exists, how to cite it, and (P2a) that an edited script needs a NEW receipt.
+      // tool exists, how to cite it, that an edited script needs a NEW receipt, and (round 6) that
+      // a substitution weakening exactness must be declared.
       if (String(params.mathComputation) === 'off') return ''
       return lang === 'en'
-        ? '\n' + MATH_PERSONA_TOOL_LINE + '\n' + MATH_ARCHIVE_WORKFLOW_LINE_EN
-        : '\n' + MATH_PERSONA_TOOL_LINE + '\n' + MATH_ARCHIVE_WORKFLOW_LINE
+        ? '\n' + MATH_PERSONA_TOOL_LINE + '\n' + MATH_ARCHIVE_WORKFLOW_LINE_EN + '\n' + MATH_SUBSTITUTION_RULE_LINE_EN
+        : '\n' + MATH_PERSONA_TOOL_LINE + '\n' + MATH_ARCHIVE_WORKFLOW_LINE + '\n' + MATH_SUBSTITUTION_RULE_LINE
     }
     // Push the tool section into a prompt under construction (a no-op in the 'off' mode, which
     // is the "off means zero mention" discipline).