@clawos-dev/clawd 0.2.460 → 0.2.461

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

@@ -6893,6 +6893,7 @@ __export(mcp_server_exports, {
   handleCreateProject: () => handleCreateProject,
   handleListProjects: () => handleListProjects,
   handlePublish: () => handlePublish,
+  handleRemoveProject: () => handleRemoveProject,
   handleReportStage: () => handleReportStage,
   handleSetProdUrl: () => handleSetProdUrl,
   handleStartDevServer: () => handleStartDevServer,
@@ -21361,6 +21362,19 @@ var DeployGapSchema = external_exports.object({
   // 建议补的依赖：`cli:python3` 这种。拿不准就不给，让人自己决定。
   suggest: external_exports.string().optional()
 }).strict();
+var DeployPlacementSchema = external_exports.object({
+  /** gateway 的公网地址（入口 A 直接 POST 它；入口 B 由设备目录下发 ws 地址） */
+  gatewayUrl: external_exports.string().min(1),
+  /** 服务设备 id：别人的 clawd 用 `device:connect { deviceId }` 就能连上，本机侧零改动 */
+  serviceDeviceId: external_exports.string().min(1),
+  /** 这次登记为正式的镜像 tag（= 试装通过的那个） */
+  image: external_exports.string().min(1),
+  /** 使用者自带的凭据名字（= 单据里 fulfillment 选了 'user' 的那些）。**只有名字** */
+  userSecrets: external_exports.array(external_exports.string()).default([]),
+  /** 是否进公共设备目录。false = 只有拿到 deviceId 的人连得上 */
+  publicDirectory: external_exports.boolean(),
+  deployedAt: external_exports.number()
+}).strict();
 var DeployReceiptSchema = external_exports.object({
   deployId: external_exports.string().min(1),
   personaId: external_exports.string().min(1),
@@ -21386,6 +21400,23 @@ var DeployReceiptSchema = external_exports.object({
   fulfillment: external_exports.record(external_exports.string(), FulfillmentSchema).default({}),
   /** 试装失败时的缺口清单；成功或没试装过是空数组 */
   gaps: external_exports.array(DeployGapSchema).default([]),
+  /** 试装跑到第几轮了（每次 deploy:trial +1，上限 TRIAL_ROUND_MAX）。重扫清零 */
+  trialRound: external_exports.number().default(0),
+  /**
+   * 试装当前在哪一步的一句人话（「在构镜像」「冒烟任务跑起来了」）。
+   * 单据页要的是「到哪一步了」，不是逐 token 的过程——过程在 gateway 的任务台账里。
+   */
+  trialStage: external_exports.string().optional(),
+  /**
+   * 上一次试装通过的时刻。**deploy:deploy 的前置**——没试装过不让部署，那正是试装存在的理由。
+   * 试装通过后单据回 `ready` 而不是直接 `deployed`：试装的产物是一个用完即弃的镜像，
+   * 部署的产物是一个别人能派活的服务，中间那次决定得留给人。
+   */
+  trialPassedAt: external_exports.number().optional(),
+  /** 试装通过的那个镜像 tag；deploy:deploy 登记的就是它，不重新构一遍 */
+  trialImage: external_exports.string().optional(),
+  /** 部署落点（status 是 deployed 才有） */
+  placement: DeployPlacementSchema.optional(),
   // 扫描 / 试装失败的原因（status 是 scanFailed / failed 时才有意义）
   error: external_exports.string().optional(),
   createdAt: external_exports.number(),
@@ -23929,6 +23960,14 @@ var METHOD_DOCS = {
     summary: "butler \u6536\u5C3E\uFF1A\u7ED9\u51FA\u5192\u70DF\u4EFB\u52A1\u4E0E\u5B58\u7591\u9879\uFF0C\u5355\u636E\u4ECE scanning \u8F6C draft\u3002\u6CA1\u8C03\u5230\u5B83\u5C31\u7B49\u4E8E\u6CA1\u626B\u5B8C\u2014\u2014butler \u4F1A\u8BDD\u7ED3\u675F\u65F6\u5355\u636E\u8FD8\u505C\u5728 scanning\uFF0Cdaemon \u636E\u6B64\u5224 scanFailed\uFF1Bowner-only",
     args: DeployFinishScanArgsSchema
   },
+  "deploy:trial": {
+    summary: "\u8D77\u4E00\u6B21\u8BD5\u88C5\uFF1A**\u4E00\u6B21\u5E26\u81EA\u6BC1\u7684\u771F\u90E8\u7F72**\u2014\u2014\u6309\u5355\u636E\u7684\u6E05\u5355\u6784\u955C\u50CF \u2192 \u63A8\u8FDB k3s \u2192 \u7ECF gateway \u6295\u5582\u5355\u636E\u4E0A\u90A3\u6761\u5192\u70DF\u4EFB\u52A1 \u2192 \u8BA9 persona \u7528\u81EA\u5DF1\u7684\u65B9\u5F0F\u5E72 \u2192 \u8DD1\u5B8C\u8BA9\u5B83\u628A\u5EFA\u51FA\u6765\u7684\u4E1C\u897F\u62C6\u6389\u3002\u524D\u7F6E\u662F `ready`\uFF08\u5C65\u7EA6\u90FD\u9009\u4E86\u3001\u9009\u4E86\u300C\u6211\u6765\u63D0\u4F9B\u300D\u7684\u51ED\u636E\u90FD\u586B\u9F50\u4E86\uFF09\uFF0C\u7F3A\u54EA\u6761\u4F1A\u5728\u9519\u8BEF\u91CC\u70B9\u540D\uFF1B\u8DD1\u51E0\u5341\u5206\u949F\uFF0C\u6240\u4EE5 RPC \u79D2\u56DE `trialing` \u6001\u5355\u636E\uFF0C\u7ED3\u679C\u7531\u540E\u53F0\u56DE\u5199\uFF08UI \u8F6E\u8BE2\uFF09\u3002\u901A\u8FC7 \u2192 \u56DE `ready` \u5E76\u8BB0\u4E0B trialPassedAt\uFF08\u90E8\u7F72\u662F\u4EBA\u7684\u7B2C\u4E8C\u6B21\u51B3\u5B9A\uFF09\uFF1B\u6CA1\u8FC7 \u2192 `failed` + gaps\uFF08agent \u7684\u4EBA\u8BDD\u9519\u56E0\uFF09\uFF0C\u6539\u5B8C\u6E05\u5355\u518D\u8C03\u4E00\u6B21\u5373\u53EF\u3002\u8F6E\u6B21\u6709\u4E0A\u9650\uFF1Bowner-only",
+    args: DeployIdArgsSchema
+  },
+  "deploy:deploy": {
+    summary: "\u628A\u8BD5\u88C5\u901A\u8FC7\u7684\u90A3\u4E2A\u955C\u50CF\u5728 gateway \u767B\u8BB0\u4E3A**\u6B63\u5F0F**\u90E8\u7F72\uFF1A\u4E4B\u540E\u522B\u4EBA\u7684 clawd \u6D3E\u6D3B\u7ED9\u8FD9\u4E2A\u670D\u52A1\u8BBE\u5907\uFF0C\u8D77\u7684\u5C31\u662F\u5B83\u3002\u524D\u7F6E\u662F\u8BD5\u88C5\u901A\u8FC7\u8FC7\uFF08\u6CA1\u9A8C\u8FC7\u4E0D\u8BA9\u53D1\uFF0C\u90A3\u6B63\u662F\u8BD5\u88C5\u5B58\u5728\u7684\u7406\u7531\uFF09\u3002\u56DE\u6765\u7684\u5355\u636E\u5E26 placement\u2014\u2014\u4E91\u4E0A\u5730\u5740 / \u670D\u52A1\u8BBE\u5907 id / \u8C01\u53EF\u8C03\u7528 / \u4F7F\u7528\u8005\u9700\u81EA\u5E26\u54EA\u4E9B\u51ED\u636E\uFF1Bowner-only",
+    args: DeployIdArgsSchema
+  },
   "deploy:remove": {
     summary: "\u5220\u6389\u4E00\u5F20\u90E8\u7F72\u5355\uFF0C\u8FDE\u5E26\u6E05\u6389\u5B83\u7684\u5168\u90E8\u51ED\u636E\u503C\uFF08\u503C\u4E0D\u8BE5\u6BD4\u5355\u636E\u6D3B\u5F97\u4E45\uFF09\uFF1Bowner-only",
     args: DeployIdArgsSchema
@@ -24673,6 +24712,9 @@ var ProjectStore = class {
   }
 };
 
+// src/app-builder-plugin/core.ts
+var import_node_child_process3 = require("child_process");
+
 // src/app-builder-plugin/publish-registry.ts
 var import_node_crypto = require("crypto");
 var PublishJobRegistry = class {
@@ -25085,6 +25127,38 @@ async function createProjectOnDisk(args) {
   }
   return { project, projectDir: store.projectDir(name) };
 }
+var REMOVE_TIMEOUT_MS = 10 * 6e4;
+async function runRemoveExtension(args) {
+  const spawnFn = args.spawnImpl ?? import_node_child_process3.spawn;
+  return await new Promise((resolve, reject) => {
+    const child = spawnFn("bash", [args.script, args.projectDir, args.personaRoot], {
+      // 凭据在 process.env 里（gateway → MCP server 的 per-server env → 本进程）
+      env: process.env,
+      stdio: ["ignore", "pipe", "pipe"]
+    });
+    let stdout = "";
+    let stderr = "";
+    child.stdout?.on("data", (d) => {
+      stdout += d.toString("utf8");
+    });
+    child.stderr?.on("data", (d) => {
+      stderr += d.toString("utf8");
+    });
+    const timer = setTimeout(() => {
+      child.kill("SIGKILL");
+      reject(new Error(`remove-extension timeout (>${REMOVE_TIMEOUT_MS}ms): ${args.projectDir}`));
+    }, REMOVE_TIMEOUT_MS);
+    child.on("error", (err) => {
+      clearTimeout(timer);
+      reject(new Error(`remove-extension spawn failed: ${err.message}`));
+    });
+    child.on("exit", (code) => {
+      clearTimeout(timer);
+      args.logger?.info("app-builder.remove.exit", { projectDir: args.projectDir, code });
+      resolve({ code, stdout, stderr });
+    });
+  });
+}
 
 // src/app-builder-plugin/mcp-server.ts
 var LOG_PATH = process.env.CLAWD_APP_BUILDER_LOG;
@@ -25117,7 +25191,8 @@ function readEnv(env = process.env) {
     ...env.CLAWD_APP_BUILDER_TEMPLATE_DIR ? { templateDir: env.CLAWD_APP_BUILDER_TEMPLATE_DIR } : {},
     ...env.CLAWD_APP_BUILDER_SCAFFOLD_SCRIPT ? { scaffoldScript: env.CLAWD_APP_BUILDER_SCAFFOLD_SCRIPT } : {},
     ...env.CLAWD_APP_BUILDER_PUBLISH_SCRIPT ? { publishScript: env.CLAWD_APP_BUILDER_PUBLISH_SCRIPT } : {},
-    ...env.CLAWD_APP_BUILDER_PERSONA_ROOT ? { personaRoot: env.CLAWD_APP_BUILDER_PERSONA_ROOT } : {}
+    ...env.CLAWD_APP_BUILDER_PERSONA_ROOT ? { personaRoot: env.CLAWD_APP_BUILDER_PERSONA_ROOT } : {},
+    ...env.CLAWD_APP_BUILDER_REMOVE_SCRIPT ? { removeScript: env.CLAWD_APP_BUILDER_REMOVE_SCRIPT } : {}
   };
 }
 function hasDaemon(env) {
@@ -25278,6 +25353,35 @@ ${outcome.errorSummary}`));
   }
   return await done;
 }
+async function handleRemoveProject(input, ctx) {
+  if (hasDaemon(ctx.env)) {
+    return fail(
+      'removeProject is cloud-only. On this host run the script yourself:\n  bash "$HOME/.clawd/deploy-kit/scripts/remove-extension.sh" <projectDir> <personaRoot>'
+    );
+  }
+  const { removeScript, personaRoot } = ctx.env;
+  if (!removeScript) {
+    return fail("removeProject: no daemon, and CLAWD_APP_BUILDER_REMOVE_SCRIPT is not set.");
+  }
+  const store = storeOf(ctx.env);
+  try {
+    const projectDir = store.projectDir(input.name);
+    const r = await runRemoveExtension({
+      script: removeScript,
+      projectDir,
+      personaRoot: personaRoot ?? "",
+      logger: { info: (m, i) => log(m, i), warn: (m, i) => log(m, i) }
+    });
+    const text = `exit=${r.code}
+--- stdout ---
+${r.stdout}
+--- stderr ---
+${r.stderr}`;
+    return r.code === 0 ? ok(text) : fail(text);
+  } catch (err) {
+    return fail(`removeProject failed: ${err instanceof Error ? err.message : String(err)}`);
+  }
+}
 function registerTools(server, ctx) {
   server.registerTool(
     "createProject",
@@ -25353,6 +25457,15 @@ function registerTools(server, ctx) {
     },
     async (input) => handlePublish(input, ctx)
   );
+  server.registerTool(
+    "removeProject",
+    {
+      title: "Tear down a published project",
+      description: "Tear down everything a published project created (FC function / trigger / custom domain, plus the DROP statements for its Supabase tables). Cloud-only: on a host with a local daemon this returns the shell command to run yourself instead. Returns the script output verbatim \u2014 read it, it may ask you to run a few DROPs through the supabase MCP to finish the job.",
+      inputSchema: { name: external_exports.string().min(1).describe("project name") }
+    },
+    async (input) => handleRemoveProject(input, ctx)
+  );
 }
 async function main() {
   const env = readEnv();
@@ -25379,6 +25492,7 @@ if (isMainModule) {
   handleCreateProject,
   handleListProjects,
   handlePublish,
+  handleRemoveProject,
   handleReportStage,
   handleSetProdUrl,
   handleStartDevServer,