u1s1-cli 1.11.6 → 1.11.7

package/dist/agent-setup.js

@@ -438,10 +438,11 @@ export default async function (pi) {
   });
 
   // ---- 隐藏各内置工具 ----
-  const { createReadTool, createBashTool, createEditTool, createWriteTool, createGrepTool, createFindTool, createLsTool } = await import("@earendil-works/pi-coding-agent");
+  const { createReadTool, createBashTool, createEditTool, createWriteTool, createGrepTool, createFindTool, createLsTool, SettingsManager } = await import("@earendil-works/pi-coding-agent");
   const { Text } = await import("@earendil-works/pi-tui");
 
-  function hideTool(name, orig) {
+  // pick(ctx) 可按会话上下文换一个同 schema 的实际执行工具(bash 按 shellPath 选)
+  function hideTool(name, orig, pick = () => orig) {
     pi.registerTool({
       name,
       label: name,
@@ -449,8 +450,8 @@ export default async function (pi) {
       parameters: orig.parameters,
       // 自己管外壳：不用默认的 Box 包装，空内容才不会产生空行
       renderShell: "self",
-      async execute(toolCallId, params, signal, onUpdate) {
-        return orig.execute(toolCallId, params, signal, onUpdate);
+      async execute(toolCallId, params, signal, onUpdate, ctx) {
+        return pick(ctx).execute(toolCallId, params, signal, onUpdate);
       },
       renderCall() {
         return new Text("", 0, 0);
@@ -474,7 +475,19 @@ export default async function (pi) {
   // 模型跑的 shell 命令拿不到 U1S1_API_KEY / U1S1_EP_KEY_* 等密钥(进程级守卫之外的显式一层)
   const { stripSecretEnv } = await import(${JSON.stringify(new URL("./secret-env.js", import.meta.url).href)});
   hideTool("read", createReadTool(cwd));
-  hideTool("bash", createBashTool(cwd, { spawnHook: (spawnContext) => ({ ...spawnContext, env: stripSecretEnv(spawnContext.env) }) }));
+  // 覆盖内置 bash 后 pi 不再替我们传 shellPath:不传就走 pi 的兜底,Git 不在 Program Files 时
+  // 会命中 System32 的 WSL 转发器,全部命令失败。与内置同源读 settings.json 的 shellPath
+  // (Windows 上由 shell-doctor 验活写入);项目级设置要看信任,故首次执行时按 ctx 解析一次
+  const bashOptions = { spawnHook: (spawnContext) => ({ ...spawnContext, env: stripSecretEnv(spawnContext.env) }) };
+  let bash;
+  const bashFor = (ctx) => {
+    if (!bash) {
+      const shellPath = SettingsManager.create(ctx?.cwd ?? cwd, undefined, { projectTrusted: ctx?.isProjectTrusted() ?? false }).getShellPath();
+      bash = createBashTool(cwd, { ...bashOptions, shellPath });
+    }
+    return bash;
+  };
+  hideTool("bash", createBashTool(cwd, bashOptions), bashFor);
   hideTool("edit", createEditTool(cwd));
   hideTool("write", createWriteTool(cwd));
   hideTool("grep", createGrepTool(cwd));

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "u1s1-cli",
-  "version": "1.11.6",
+  "version": "1.11.7",
   "description": "u1s1 — 有一说一,最省心的 AI 编程搭子。终端里用中文说需求,AI 帮你读文件、改代码、跑命令。",
   "type": "module",
   "bin": {