@clawos-dev/clawd 0.2.454 → 0.2.456

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

@@ -22062,6 +22062,28 @@ var ChannelDeleteResultSchema = external_exports.object({
 
 // ../protocol/src/topic.ts
 var nonBlank2 = external_exports.string().trim().min(1);
+var TOPIC_DECISION_TYPES = ["master-confirmed", "owner-needed"];
+var TOPIC_DECISION_STATUSES = ["open", "resolved"];
+var TOPIC_DECISION_TYPE_MASTER_CONFIRMED = TOPIC_DECISION_TYPES[0];
+var TOPIC_DECISION_TYPE_OWNER_NEEDED = TOPIC_DECISION_TYPES[1];
+var TOPIC_DECISION_STATUS_OPEN = TOPIC_DECISION_STATUSES[0];
+var TOPIC_DECISION_STATUS_RESOLVED = TOPIC_DECISION_STATUSES[1];
+var TopicDecisionTypeSchema = external_exports.enum(TOPIC_DECISION_TYPES);
+var TopicDecisionStatusSchema = external_exports.enum(TOPIC_DECISION_STATUSES);
+var TopicDecisionSchema = external_exports.object({
+  type: TopicDecisionTypeSchema,
+  status: TopicDecisionStatusSchema,
+  question: nonBlank2,
+  recommendation: nonBlank2
+}).superRefine((decision, ctx) => {
+  if (decision.type === TOPIC_DECISION_TYPE_MASTER_CONFIRMED && decision.status !== TOPIC_DECISION_STATUS_RESOLVED) {
+    ctx.addIssue({
+      code: external_exports.ZodIssueCode.custom,
+      path: ["status"],
+      message: "master-confirmed decisions must be resolved"
+    });
+  }
+});
 var TOPIC_STATES = ["planning", "running", "done"];
 var TopicStateSchema = external_exports.enum(TOPIC_STATES);
 var TopicActivityEntrySchema = external_exports.object({
@@ -22071,7 +22093,12 @@ var TopicActivityEntrySchema = external_exports.object({
   target: external_exports.string().optional(),
   reason: external_exports.string().min(1),
   /** 该动作确认的产出物（watcher 返回的 artifacts）；影响面视图的唯一数据源 */
-  artifacts: external_exports.array(nonBlank2).optional()
+  artifacts: external_exports.array(nonBlank2).optional(),
+  /**
+   * Optional decision projection; legacy activity entries omit this field. `open` means the
+   * owner still needs to answer; `resolved` records the conclusion without deleting the question.
+   */
+  decision: TopicDecisionSchema.optional()
 });
 var TopicLineMetaSchema = external_exports.object({
   rejectCount: external_exports.number().int().min(0),
@@ -22178,7 +22205,8 @@ var TopicAppendArgsSchema = external_exports.object({
   target: nonBlank2.optional(),
   reason: nonBlank2,
   /** 该动作确认的产出物；影响面视图只吃这个字段 */
-  artifacts: external_exports.array(nonBlank2).optional()
+  artifacts: external_exports.array(nonBlank2).optional(),
+  decision: TopicActivityEntrySchema.shape.decision
 });
 var TopicRejectArgsSchema = external_exports.object({
   topicId: external_exports.string().min(1),
@@ -23932,7 +23960,7 @@ var METHOD_DOCS = {
     args: TopicSetPlanArgsSchema
   },
   "topic:append": {
-    summary: '\u5F80\u8BDD\u9898\u6D41\u6C34\u8FFD\u52A0\u4E00\u6761\uFF1Breason \u5FC5\u586B\uFF08\u8001\u677F\u4E8B\u540E\u770B\u7684\u662F"\u51ED\u4EC0\u4E48\u8FD9\u4E48\u5224\u65AD"\uFF09',
+    summary: "\u5F80\u8BDD\u9898\u6D41\u6C34\u8FFD\u52A0\u4E00\u6761\uFF1Breason \u5FC5\u586B\u3002Master \u505A\u4EE3\u8001\u677F\u786E\u8BA4\u6216\u5347\u7EA7\u8001\u677F\u51B3\u7B56\u65F6\uFF0C\u5FC5\u987B\u9644 decision\uFF08type/status/question/recommendation\uFF09",
     args: TopicAppendArgsSchema
   },
   "topic:reject": {
@@ -24514,11 +24542,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 +24752,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 +25037,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 +25055,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);