@clawos-dev/clawd 0.2.454 → 0.2.455

package/dist/app-builder-plugin/mcp-server.cjs

@@ -24514,11 +24514,13 @@ var ProjectStore = class {
    * spec 2026-06-02 §5.6.3：scaffold 对 assistant 不可见，避免 assistant 被诱导去"读 example
    * 代码再参考"。assistant 进 project 时目录已是完整模板，直接 pnpm install 即可。
    */
-  async scaffold(name, templateSrcDir, scaffoldScriptPath) {
+  async scaffold(name, templateSrcDir, scaffoldScriptPath, extraEnv) {
     const destDir = this.projectDir(name);
     return await new Promise((resolve, reject) => {
       const child = (0, import_node_child_process.spawn)("bash", [scaffoldScriptPath, name, templateSrcDir, destDir], {
-        env: { ...process.env, PATH: process.env.PATH ?? "" },
+        // extraEnv 排在 PATH **之前**：凭据表里若混进一条名叫 PATH 的条目，顶掉 PATH 会让
+        // 脚本以「命令找不到」的形态崩在离现场很远的地方。
+        env: { ...process.env, ...extraEnv ?? {}, PATH: process.env.PATH ?? "" },
         stdio: ["ignore", "pipe", "pipe"]
       });
       let stdout = "";
@@ -24722,7 +24724,11 @@ async function startPublishJob(deps, args) {
   }
   const child = spawn2("bash", [args.scriptPath, projDir, args.personaRoot ?? ""], {
     cwd: projDir,
-    env: process.env,
+    // 宿主给的 env 覆盖在 process.env 之上：daemon 进程本身没有这些变量（它们只在这一个
+    // 子进程里活着）。云上宿主不传 extraEnv，凭据本来就在容器 env 里。
+    // PATH 排在最后（与 ProjectStore.scaffold 同款）：extraEnv 里若混进一条名叫 PATH 的条目，
+    // 顶掉 PATH 会让脚本以「命令找不到」的形态崩在离现场很远的地方。
+    env: { ...process.env, ...args.extraEnv ?? {}, PATH: process.env.PATH ?? "" },
     stdio: ["ignore", "pipe", "pipe"]
   });
   const jobId = registry2.create({
@@ -25003,7 +25009,8 @@ function createPublishService() {
           name: args.name,
           sessionId: args.sessionId,
           scriptPath: args.scriptPath,
-          personaRoot: args.personaRoot
+          personaRoot: args.personaRoot,
+          ...args.extraEnv ? { extraEnv: args.extraEnv } : {}
         }
       );
     },
@@ -25020,7 +25027,7 @@ async function createProjectOnDisk(args) {
   const { store, name, templateSrcDir, scaffoldScript, logger } = args;
   const project = await store.create(name, args.reservedPorts);
   try {
-    const result = await store.scaffold(name, templateSrcDir, scaffoldScript);
+    const result = await store.scaffold(name, templateSrcDir, scaffoldScript, args.extraEnv);
     logger?.info("app-builder.scaffold.done", { name, stdout: result.stdout.slice(0, 200) });
   } catch (err) {
     const message = err instanceof Error ? err.message : String(err);