@clawos-dev/clawd 0.2.520 → 0.2.522

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

@@ -6890,6 +6890,7 @@ var require_dist = __commonJS({
 // src/app-builder-plugin/mcp-server.ts
 var mcp_server_exports = {};
 __export(mcp_server_exports, {
+  PUBLISH_INPUT_SCHEMA: () => PUBLISH_INPUT_SCHEMA,
   handleCreateProject: () => handleCreateProject,
   handlePublish: () => handlePublish,
   handleRemoveProject: () => handleRemoveProject,
@@ -21127,6 +21128,14 @@ async function exists(p) {
   }
 }
 var PROJECT_NAME_RE = /^[a-z][a-z0-9-]{0,39}$/;
+var DEPLOY_ENVS = ["integration", "prod"];
+var DeploymentSchema = external_exports.object({
+  /** 公网地址。 */
+  url: external_exports.string().url(),
+  publishedAt: external_exports.string().datetime().optional(),
+  /** 发布那一刻对应的 commit：本地 git 仓库取 HEAD，否则取 pushedCommit；两样都没有时缺席。 */
+  publishedCommit: external_exports.string().min(1).optional()
+});
 var AppProjectMetadataSchema = external_exports.object({
   name: external_exports.string().regex(PROJECT_NAME_RE, {
     message: "kebab-case, \u5C0F\u5199\u5B57\u6BCD\u5F00\u5934\uFF0C\u53EA\u5141\u8BB8\u5C0F\u5199\u5B57\u6BCD / \u6570\u5B57 / -\uFF0C\u6700\u957F 40 \u5B57\u7B26"
@@ -21138,12 +21147,32 @@ var AppProjectMetadataSchema = external_exports.object({
   pushedCommit: external_exports.string().min(1).optional(),
   /** push 那一刻 collect-files.mjs 算的文件树哈希（record-push.mjs 记）；publish 拿它判「有没有没推的改动」。 */
   pushedTreeHash: external_exports.string().min(1).optional(),
-  /** 最近一次发布成功的公网地址。 */
+  /** 每环境一份发布记录。prod 门拿 `integration.publishedCommit` 跟本次要发的 head 比。 */
+  deployments: external_exports.object({
+    integration: DeploymentSchema.optional(),
+    prod: DeploymentSchema.optional()
+  }).optional()
+});
+var StoredMetadataSchema = AppProjectMetadataSchema.extend({
   prodUrl: external_exports.string().url().optional(),
   publishedAt: external_exports.string().datetime().optional(),
-  /** 发布那一刻对应的 commit：本地 git 仓库取 HEAD，否则取 pushedCommit；两样都没有时缺席。 */
   publishedCommit: external_exports.string().min(1).optional()
 });
+function foldLegacy(raw) {
+  const { prodUrl, publishedAt, publishedCommit, ...rest } = raw;
+  if (!prodUrl || rest.deployments?.prod) return rest;
+  return {
+    ...rest,
+    deployments: {
+      ...rest.deployments,
+      prod: {
+        url: prodUrl,
+        ...publishedAt ? { publishedAt } : {},
+        ...publishedCommit ? { publishedCommit } : {}
+      }
+    }
+  };
+}
 var ProjectStore = class {
   /** @param root projects 父目录，例如 `~/.clawd/users/<userId>/` */
   constructor(root) {
@@ -21180,8 +21209,8 @@ var ProjectStore = class {
   async readMeta(name) {
     try {
       const raw = await import_node_fs.promises.readFile(this.metaPath(name), "utf8");
-      const parsed = AppProjectMetadataSchema.safeParse(JSON.parse(raw));
-      return parsed.success ? parsed.data : void 0;
+      const parsed = StoredMetadataSchema.safeParse(JSON.parse(raw));
+      return parsed.success ? foldLegacy(parsed.data) : void 0;
     } catch {
       return void 0;
     }
@@ -21239,8 +21268,11 @@ var ProjectStore = class {
   async delete(name) {
     await import_node_fs.promises.rm(this.projectDir(name), { recursive: true, force: true });
   }
-  async setPublished(name, fields) {
-    return this.patch(name, fields);
+  /** 记一个环境的成功发布；另一个环境那份原样保留。 */
+  async setPublished(name, env, fields) {
+    const current = await this.readMeta(name);
+    if (!current) throw new Error(`project "${name}" not found / \u4E0D\u5B58\u5728`);
+    return this.patch(name, { deployments: { ...current.deployments, [env]: fields } });
   }
   /** 读全量 → 改几个字段 → 校验 → 整份写回。其他字段保持原样。 */
   async patch(name, fields) {
@@ -24957,13 +24989,21 @@ async function runPublish(args) {
     }
     head = meta.pushedCommit;
   }
+  if (args.env === "prod" && (tree.isRepo || meta.repoUrl)) {
+    const verified = meta.deployments?.integration?.publishedCommit;
+    if (!head || verified !== head) {
+      throw new Error(
+        `\u8FD9\u4E2A commit${head ? `\uFF08${head.slice(0, 7)}\uFF09` : ""}\u8FD8\u6CA1\u53D1\u8FC7 integration\uFF1A\u5148 publish({ name: "${name}", env: "integration" })\uFF0C\u8001\u677F\u5728\u6D4B\u8BD5\u5730\u5740\u786E\u8BA4\u6CA1\u95EE\u9898\u540E\u518D\u53D1 prod`
+      );
+    }
+  }
   const logPath = (0, import_node_path5.join)(dir, ".publish.log");
   const log2 = (0, import_node_fs3.createWriteStream)(logPath, { flags: "w" });
   log2.on("error", () => {
   });
-  logger2?.info("app-builder.publish.start", { name, scriptPath: args.scriptPath, head });
+  logger2?.info("app-builder.publish.start", { name, env: args.env, scriptPath: args.scriptPath, head });
   return await new Promise((resolve, reject) => {
-    const child = spawnFn("bash", [args.scriptPath, dir, args.personaRoot], {
+    const child = spawnFn("bash", [args.scriptPath, dir, args.personaRoot, args.env], {
       cwd: dir,
       // 凭据就在本进程 env 里（宿主交进来的），照单全给脚本
       env: process.env,
@@ -24973,12 +25013,12 @@ async function runPublish(args) {
     let stderr = "";
     let partial2 = "";
     let stage = "unknown";
-    let prodUrl = null;
+    let url = null;
     let timedOut = false;
     const feed = (line) => {
       const p = parsePublishLine(line);
       if (p?.kind === "stage") stage = p.stage;
-      else if (p?.kind === "prod-url") prodUrl = p.url;
+      else if (p?.kind === "prod-url") url = p.url;
     };
     child.stdout?.on("data", (d) => {
       const s = d.toString("utf8");
@@ -25013,11 +25053,11 @@ async function runPublish(args) {
       if (partial2) feed(partial2);
       log2.end();
       void (async () => {
-        if (code === 0 && prodUrl) {
+        if (code === 0 && url) {
           const publishedAt = (/* @__PURE__ */ new Date()).toISOString();
           try {
-            await store.setPublished(name, {
-              prodUrl,
+            await store.setPublished(name, args.env, {
+              url,
               publishedAt,
               ...head ? { publishedCommit: head } : {}
             });
@@ -25025,8 +25065,8 @@ async function runPublish(args) {
             reject(new Error(`\u53D1\u5E03\u6210\u529F\u4F46\u5199\u56DE\u5143\u6570\u636E\u5931\u8D25\uFF1A${errMsg(err)}`));
             return;
           }
-          logger2?.info("app-builder.publish.done", { name, prodUrl, head });
-          resolve({ ok: true, prodUrl, commit: head, publishedAt, logPath });
+          logger2?.info("app-builder.publish.done", { name, env: args.env, url, head });
+          resolve({ ok: true, env: args.env, url, commit: head, publishedAt, logPath });
           return;
         }
         const errorSummary = code === 0 ? "\u811A\u672C\u9000\u51FA 0 \u4F46\u6CA1\u6709\u8F93\u51FA ::prod-url:: \u6807\u8BB0\uFF0C\u62FF\u4E0D\u5230\u516C\u7F51\u5730\u5740" : tailStderrLines(stderr, 20) || tailStderrLines(stdout, 20) || `exit ${code ?? signal}`;
@@ -25136,6 +25176,10 @@ async function handleCreateProject(input, ctx) {
     return fail(`createProject failed: ${errMsg2(err)}`);
   }
 }
+var PUBLISH_INPUT_SCHEMA = {
+  name: external_exports.string().min(1).describe("project name"),
+  env: external_exports.enum(DEPLOY_ENVS).describe("integration = test deployment (<name>-<slug>-int) for the user to check first; prod = the real one, only accepted after integration published the same commit")
+};
 async function handlePublish(input, ctx) {
   const miss = missingEnv(ctx.env, ["root", "publishScript", "personaRoot"]);
   if (miss) return fail(`publish: ${miss}`);
@@ -25144,6 +25188,7 @@ async function handlePublish(input, ctx) {
     const r = await runPublish({
       store: new ProjectStore(env.root),
       name: input.name,
+      env: input.env,
       scriptPath: env.publishScript,
       personaRoot: env.personaRoot,
       ...ctx.exec ? { exec: ctx.exec } : {},
@@ -25151,7 +25196,7 @@ async function handlePublish(input, ctx) {
       logger
     });
     if (r.ok) {
-      return ok({ status: "published", name: input.name, prodUrl: r.prodUrl, commit: r.commit, publishedAt: r.publishedAt });
+      return ok({ status: "published", name: input.name, env: r.env, url: r.url, commit: r.commit, publishedAt: r.publishedAt });
     }
     return fail(`\u53D1\u5E03\u5931\u8D25\uFF1A[${r.stage}] \u9636\u6BB5
 ${r.errorSummary}
@@ -25201,9 +25246,9 @@ function registerTools(server, ctx) {
   server.registerTool(
     "publish",
     {
-      title: "Publish the project to the public internet",
-      description: "Run the publish pipeline (build \u2192 deploy to Aliyun FC \u2192 verify) and wait for it to finish. Returns the public URL (and the commit it corresponds to) on success; on failure returns the failed stage, the error tail and the path of the full log. Refuses to run if the project has changes that were not pushed: for a local git repo that means a dirty work tree; for a github-MCP project it recomputes the file tree hash with collect-files.mjs and compares it with what record-push.mjs recorded. Push first, then publish. Never run publish.sh yourself: the credentials only exist in this tool's process.",
-      inputSchema: { name: external_exports.string().min(1).describe("project name") }
+      title: "Publish the project to one environment (integration first, then prod)",
+      description: `Run the publish pipeline (build \u2192 deploy to Aliyun FC \u2192 verify) for ONE environment and wait for it to finish. Two-step release: env="integration" deploys <name>-<slug>-int (test URL, give it to the user to check); env="prod" deploys <name>-<slug> (the real URL) and is only accepted when integration already published the same commit \u2014 otherwise it refuses and tells you to publish integration first. Returns { env, url, commit, publishedAt } on success; on failure returns the failed stage, the error tail and the path of the full log. Also refuses to run if the project has changes that were not pushed: for a local git repo that means a dirty work tree; for a github-MCP project it recomputes the file tree hash with collect-files.mjs and compares it with what record-push.mjs recorded. Push first, then publish. Never run publish.sh yourself: the credentials only exist in this tool's process.`,
+      inputSchema: PUBLISH_INPUT_SCHEMA
     },
     async (input) => handlePublish(input, ctx)
   );
@@ -25234,6 +25279,7 @@ if (isMainModule) {
 }
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
+  PUBLISH_INPUT_SCHEMA,
   handleCreateProject,
   handlePublish,
   handleRemoveProject,

package/dist/cli.cjs

@@ -67647,9 +67647,8 @@ var LoginFlow = class {
     try {
       await this.deps.upsertBinding({
         deviceId: this.deps.getDeviceId(),
-        unionId: identity.unionId,
-        displayName: identity.displayName,
-        avatarUrl: identity.avatarUrl ?? null
+        ttcToken: params.token,
+        identity
       });
     } catch (err) {
       return {
@@ -67736,22 +67735,19 @@ async function upsertDeviceBinding(opts) {
   const doFetch = opts.fetchImpl ?? fetch;
   const ac = new AbortController();
   const timer = setTimeout(() => ac.abort(), opts.timeoutMs ?? DEFAULT_TIMEOUT_MS4);
-  const body = { unionId: opts.unionId };
-  if (opts.avatarUrl != null) body.avatarUrl = opts.avatarUrl;
   let res;
   try {
-    res = await doFetch(`${opts.apiUrl}/api/device-bindings/self`, {
-      method: "PUT",
-      signal: ac.signal,
-      headers: {
-        authorization: `Bearer ${opts.apiKey}`,
-        "x-did": encodeURIComponent(opts.deviceId),
-        "x-name": encodeURIComponent(opts.displayName),
-        "x-scene": "daemon",
-        "content-type": "application/json"
-      },
-      body: JSON.stringify(body)
-    });
+    res = await doFetch(
+      `${opts.apiUrl}/api/device-bindings/self?provider=${encodeURIComponent(opts.provider)}`,
+      {
+        method: "PUT",
+        signal: ac.signal,
+        headers: {
+          authorization: `Bearer ${opts.ttcToken}`,
+          "x-did": encodeURIComponent(opts.deviceId)
+        }
+      }
+    );
   } catch (err) {
     clearTimeout(timer);
     throw new DeviceBindingClientError(
@@ -70380,7 +70376,7 @@ function computeMethodAccess(args) {
 }
 
 // src/version.ts
-var version = "0.2.520".length > 0 ? "0.2.520" : "dev";
+var version = "0.2.522".length > 0 ? "0.2.522" : "dev";
 
 // src/cli-probe/probe.ts
 var fs77 = __toESM(require("fs"), 1);
@@ -73821,24 +73817,25 @@ async function startDaemon(config) {
     ttcAuthBase: TTC_HOSTS.auth,
     getCallbackUrl: () => `http://127.0.0.1:${config.port}/auth/callback`,
     // device_bindings upsert（did ↔ 飞书 unionId 映射）：
-    // deviceId 从 auth.json 稳定读；apiUrl 走同一份 clawosApi；apiKey 复用 CLAWD_TICKETS_API_KEY。
+    // deviceId 从 auth.json 稳定读；apiUrl 走同一份 clawosApi；鉴权 = 刚登录拿到的 TTC JWT。
     // 失败即登录失败（fail-hard，login-flow.spec §upsert 失败）。
     getDeviceId: () => authFile.deviceId,
     upsertBinding: async (opts) => {
       try {
         await upsertDeviceBinding({
           apiUrl: config.clawosApi ?? DEFAULT_CLAWOS_API,
-          apiKey: resolveClawdTicketsApiKey(),
-          ...opts
+          ttcToken: opts.ttcToken,
+          provider: opts.identity.provider,
+          deviceId: opts.deviceId
         });
         logger.info("device-binding upsert succeeded", {
           deviceId: opts.deviceId,
-          unionId: opts.unionId
+          unionId: opts.identity.unionId
         });
       } catch (err) {
         logger.warn("device-binding upsert failed", {
           deviceId: opts.deviceId,
-          unionId: opts.unionId,
+          unionId: opts.identity.unionId,
           error: err instanceof Error ? err.message : String(err)
         });
         throw err;

package/dist/deploy-kit/scripts/ensure-credentials.spec.ts

@@ -249,14 +249,11 @@ printf 'id=%s\\n' "$ALIBABA_CLOUD_ACCESS_KEY_ID"`,
 })
 
 describe('publish.sh', () => {
-  it('用 clawd-fc profile 调 s deploy，不碰用户全局 ~/.s', () => {
-    const log = join(box.root, 's-argv.log')
-    writeSShim(box.bin, log)
+  /** 最小 persona kit + 项目目录；模板只留跟本文件断言相关的占位符。 */
+  function publishFixture(): { ext: string; persona: string } {
     // 严格 shim 的自定义域名查询回空 → publish.sh 在 verify 段 exit 1。deploy 之后的事，
-    // 不影响本用例要断言的凭证行为，省掉 curl shim。
-    const aliyunLog = join(box.root, 'aliyun-argv.log')
-    writeAliyunShim(box.bin, '5566778899001122', aliyunLog)
-
+    // 不影响本用例要断言的凭证 / 渲染行为，省掉 curl shim。
+    writeAliyunShim(box.bin, '5566778899001122', join(box.root, 'aliyun-argv.log'))
     const ext = join(box.root, 'proj')
     const persona = join(box.root, 'persona')
     mkdirSync(join(ext, 'server'), { recursive: true })
@@ -265,39 +262,163 @@ describe('publish.sh', () => {
     writeFileSync(join(box.kit, 'contract', 'bootstrap'), '#!/usr/bin/env bash\n')
     writeFileSync(join(ext, 'ext.conf'), 'APP_NAME=demo\nSLUG=ab12\nCODE_DIR=./server\n')
     writeFileSync(join(persona, 'extension-kit', 'config.env'), 'REGION=cn-hangzhou\n')
-    writeFileSync(join(persona, 'extension-kit', 'contract', 's.yaml.tmpl'), 'name: __DEPLOY_NAME__-app\naccess: clawd-fc\n')
-
+    writeFileSync(
+      join(persona, 'extension-kit', 'contract', 's.yaml.tmpl'),
+      'name: __DEPLOY_NAME__-app\naccess: clawd-fc\nenv: __APP_ENV__\nprefix: __TABLE_PREFIX__\n',
+    )
+    return { ext, persona }
+  }
+  function runPublish(ext: string, persona: string, env: string): void {
     expect(() =>
-      execFileSync('bash', [join(box.kit, 'scripts', 'publish.sh'), ext, persona], {
+      execFileSync('bash', [join(box.kit, 'scripts', 'publish.sh'), ext, persona, env], {
         env: { ...process.env, HOME: box.home, PATH: `${box.bin}:${process.env.PATH}` },
         encoding: 'utf8',
         stdio: 'pipe',
       }),
     ).toThrow() // verify 段无域名 → exit 1，deploy 已经跑过了
+  }
 
-    expect(readFileSync(log, 'utf8')).toContain('deploy -y --access clawd-fc')
+  it('用 clawd-fc profile 调 s deploy，不碰用户全局 ~/.s', () => {
+    const log = join(box.root, 's-argv.log')
+    writeSShim(box.bin, log)
+    const { ext, persona } = publishFixture()
+    runPublish(ext, persona, 'integration')
+    expect(readFileSync(log, 'utf8')).toContain('deploy -y -t s.int.yaml --access clawd-fc')
     expect(userAccessYaml()).toBe(USER_ACCESS_YAML)
   })
-})
 
-describe('remove-extension.sh', () => {
-  it('用 clawd-fc profile 调 s remove，不碰用户全局 ~/.s', () => {
+  // 双环境（spec 2026-09-15-app-builder-integration-env-design §3.2）：同一个项目两个 env 各渲各的
+  // s 文件、各自的 DEPLOY_NAME / TABLE_PREFIX，prod 那份跟双环境之前的值一字不差（老地址不动）。
+  it('integration → s.int.yaml（-int / _int_），prod → s.prod.yaml（老值），两份并存互不覆盖', () => {
+    const log = join(box.root, 's-argv.log')
+    writeSShim(box.bin, log)
+    const { ext, persona } = publishFixture()
+    runPublish(ext, persona, 'integration')
+    runPublish(ext, persona, 'prod')
+    expect(readFileSync(join(ext, 's.int.yaml'), 'utf8')).toBe('name: demo-ab12-int-app\naccess: clawd-fc\nenv: integration\nprefix: demo_ab12_int_\n')
+    expect(readFileSync(join(ext, 's.prod.yaml'), 'utf8')).toBe('name: demo-ab12-app\naccess: clawd-fc\nenv: prod\nprefix: demo_ab12_\n')
+    expect(existsSync(join(ext, 's.yaml'))).toBe(false)
+    const argv = readFileSync(log, 'utf8')
+    expect(argv).toContain('deploy -y -t s.int.yaml --access clawd-fc')
+    expect(argv).toContain('deploy -y -t s.prod.yaml --access clawd-fc')
+  })
+
+  // 存量项目的 .gitignore 是 scaffold 时拷的一次性文件，只有 `s.yaml`：s.int.yaml 渲下去会被当成源码推上 GitHub
+  //（里面有 supabase key）。publish.sh 像 bake SLUG 那样幂等地补一行，模板项目已有的不重复。
+  it('项目 .gitignore 没有 s.*.yaml 就补上（幂等）；没有 .gitignore 也建', () => {
+    writeSShim(box.bin, join(box.root, 's-argv.log'))
+    const { ext, persona } = publishFixture()
+    writeFileSync(join(ext, '.gitignore'), 'node_modules/\ns.yaml\n')
+    runPublish(ext, persona, 'integration')
+    expect(readFileSync(join(ext, '.gitignore'), 'utf8')).toBe('node_modules/\ns.yaml\ns.*.yaml\n')
+    runPublish(ext, persona, 'prod')
+    expect(readFileSync(join(ext, '.gitignore'), 'utf8')).toBe('node_modules/\ns.yaml\ns.*.yaml\n')
+    rmSync(join(ext, '.gitignore'))
+    runPublish(ext, persona, 'integration')
+    expect(readFileSync(join(ext, '.gitignore'), 'utf8')).toBe('s.*.yaml\n')
+  })
+
+  it('缺 env / 非法 env：渲染和 deploy 都不跑', () => {
     const log = join(box.root, 's-argv.log')
     writeSShim(box.bin, log)
+    const { ext, persona } = publishFixture()
+    for (const args of [[ext, persona], [ext, persona, 'staging']]) {
+      expect(() =>
+        execFileSync('bash', [join(box.kit, 'scripts', 'publish.sh'), ...args], {
+          env: { ...process.env, HOME: box.home, PATH: `${box.bin}:${process.env.PATH}` },
+          encoding: 'utf8',
+          stdio: 'pipe',
+        }),
+      ).toThrow(/integration\|prod/)
+    }
+    expect(existsSync(log)).toBe(false)
+    expect(existsSync(join(ext, 's.int.yaml'))).toBe(false)
+  })
+})
 
+describe('remove-extension.sh', () => {
+  function removeFixture(opts: { sFiles: string[]; tables?: string; names?: Record<string, string> }): { ext: string; persona: string } {
     const ext = join(box.root, 'proj')
     const persona = join(box.root, 'persona')
     mkdirSync(ext, { recursive: true })
     mkdirSync(join(persona, 'extension-kit'), { recursive: true })
-    writeFileSync(join(ext, 'ext.conf'), 'APP_NAME=demo\nSLUG=ab12\n')
+    writeFileSync(join(ext, 'ext.conf'), `APP_NAME=demo\nSLUG=ab12\n${opts.tables !== undefined ? `SUPABASE_TABLES="${opts.tables}"\n` : ''}`)
     writeFileSync(join(persona, 'extension-kit', 'config.env'), 'REGION=cn-hangzhou\n')
-
-    execFileSync('bash', [join(box.kit, 'scripts', 'remove-extension.sh'), ext, persona], {
+    for (const f of opts.sFiles) writeFileSync(join(ext, f), `name: ${opts.names?.[f] ?? 'x'}\n`)
+    return { ext, persona }
+  }
+  function runRemove(ext: string, persona: string): string {
+    return execFileSync('bash', [join(box.kit, 'scripts', 'remove-extension.sh'), ext, persona], {
       env: { ...process.env, HOME: box.home, PATH: `${box.bin}:${process.env.PATH}` },
       encoding: 'utf8',
     })
+  }
 
-    expect(readFileSync(log, 'utf8')).toContain('remove -y --access clawd-fc')
+  it('用 clawd-fc profile 调 s remove，不碰用户全局 ~/.s', () => {
+    const log = join(box.root, 's-argv.log')
+    writeSShim(box.bin, log)
+    const { ext, persona } = removeFixture({ sFiles: ['s.int.yaml'] })
+    runRemove(ext, persona)
+    expect(readFileSync(log, 'utf8')).toContain('remove -y -t s.int.yaml --access clawd-fc')
     expect(userAccessYaml()).toBe(USER_ACCESS_YAML)
   })
+
+  // 双环境：两个 env 各 s remove 一次（哪份 s 文件在删哪份；legacy s.yaml 也认），DROP 打两套前缀
+  it('s.int.yaml / s.prod.yaml 各 remove 一次（legacy s.yaml 与 s.prod.yaml 同指 prod 函数，有后者就不再对前者 remove）；基础表名展开成 _int_ 与无标签两套 DROP', () => {
+    const log = join(box.root, 's-argv.log')
+    writeSShim(box.bin, log)
+    const { ext, persona } = removeFixture({ sFiles: ['s.int.yaml', 's.prod.yaml', 's.yaml'], tables: 'visits notes' })
+    const out = runRemove(ext, persona)
+    const argv = readFileSync(log, 'utf8')
+    expect(argv).toContain('remove -y -t s.int.yaml --access clawd-fc')
+    expect(argv).toContain('remove -y -t s.prod.yaml --access clawd-fc')
+    expect(argv).not.toContain('-t s.yaml ')
+    for (const t of ['demo_ab12_int_visits', 'demo_ab12_visits', 'demo_ab12_int_notes', 'demo_ab12_notes']) {
+      expect(out).toContain(`DROP TABLE IF EXISTS public.${t} CASCADE;`)
+    }
+  })
+
+  it('双环境之前的完整表名（带完整前缀 <APP_NAME>_<SLUG>_）只打一条；别的前缀一律按基础名展开，DROP 永远落在自己前缀下', () => {
+    const log = join(box.root, 's-argv.log')
+    writeSShim(box.bin, log)
+    const { ext, persona } = removeFixture({ sFiles: ['s.yaml'], tables: 'demo_ab12_visits' })
+    const out = runRemove(ext, persona)
+    expect(readFileSync(log, 'utf8')).toContain('remove -y -t s.yaml --access clawd-fc')
+    expect(out.match(/DROP TABLE/g)).toHaveLength(1)
+    expect(out).toContain('DROP TABLE IF EXISTS public.demo_ab12_visits CASCADE;')
+    writeFileSync(join(ext, 'ext.conf'), 'APP_NAME=demo\nSLUG=ab12\nSUPABASE_TABLES="demo_other_visits"\n')
+    const out2 = runRemove(ext, persona)
+    expect(out2).not.toContain('public.demo_other_visits ')
+    expect(out2.match(/DROP TABLE IF EXISTS public\.demo_ab12_(int_)?demo_other_visits CASCADE;/g)).toHaveLength(2)
+  })
+
+  // dataclaw 双环境之前 functionName 不带 slug：老 s.yaml 与 s.prod.yaml 指**不同**函数（name: 不同），两份都要拆
+  it('老 s.yaml 的 name 与 s.prod.yaml 不同（指不同函数）：两份都 remove', () => {
+    const log = join(box.root, 's-argv.log')
+    writeSShim(box.bin, log)
+    const { ext, persona } = removeFixture({ sFiles: ['s.prod.yaml', 's.yaml'], names: { 's.yaml': 'demo-app', 's.prod.yaml': 'demo-ab12-app' } })
+    runRemove(ext, persona)
+    const argv = readFileSync(log, 'utf8')
+    expect(argv).toContain('remove -y -t s.prod.yaml --access clawd-fc')
+    expect(argv).toContain('remove -y -t s.yaml --access clawd-fc')
+  })
+
+  // #4：基础名恰好以 <APP_NAME>_ 开头（shop 的 shop_items）不能被当成 legacy 完整名——legacy 判据是完整前缀 <APP_NAME>_<SLUG>_
+  it('基础名以 <APP_NAME>_ 开头（shop_items）仍按基础名展开两套', () => {
+    writeSShim(box.bin, join(box.root, 's-argv.log'))
+    const { ext, persona } = removeFixture({ sFiles: ['s.prod.yaml'], tables: 'demo_items' })
+    const out = runRemove(ext, persona)
+    expect(out).toContain('DROP TABLE IF EXISTS public.demo_ab12_int_demo_items CASCADE;')
+    expect(out).toContain('DROP TABLE IF EXISTS public.demo_ab12_demo_items CASCADE;')
+    expect(out.match(/DROP TABLE/g)).toHaveLength(2)
+  })
+
+  it('从未发布过（没有任何 s 文件）：不调 s remove，退出 0', () => {
+    const log = join(box.root, 's-argv.log')
+    writeSShim(box.bin, log)
+    const { ext, persona } = removeFixture({ sFiles: [] })
+    const out = runRemove(ext, persona)
+    expect(existsSync(log)).toBe(false)
+    expect(out).toContain('从未发布过')
+  })
 })

package/dist/deploy-kit/scripts/new-extension.sh

@@ -33,8 +33,8 @@ SLUG="$(openssl rand -hex 2)"
   echo ""
   echo "# === 全局唯一身份 (scaffold 时锁定,不要改) ==="
   echo "# APP_NAME = 项目名 (人类可读身份);SLUG = 4 位散列防同名冲突"
-  echo "# 派生:DEPLOY_NAME=\${APP_NAME}-\${SLUG} (FC 函数/子域名,DNS-safe 用连字符)"
-  echo "#      表前缀=\${APP_NAME}_\${SLUG}_      (SQL-safe 用下划线)"
+  echo "# 派生:DEPLOY_NAME=\${APP_NAME}-\${SLUG}[-int] (FC 函数/子域名,DNS-safe 用连字符;integration 带 -int)"
+  echo "#      表前缀=\${APP_NAME}_\${SLUG}_[int_]     (SQL-safe 用下划线;integration 带 int_,server 经 env TABLE_PREFIX 取)"
   echo "APP_NAME=${NAME}"
   echo "SLUG=${SLUG}"
 } >> "$DEST/ext.conf"
@@ -62,6 +62,10 @@ render_env_example() {
   if [ ${#sed_args[@]} -eq 0 ]; then cp "$src" "$dst"; else sed "${sed_args[@]}" "$src" > "$dst"; fi
   echo "  📄 渲染 ${dst#$DEST/}（值来自本次进程 env，不写回模板）"
 }
+# 本地 pnpm dev 一律连 integration 那套表（spec 2026-09-15-app-builder-integration-env-design §3.4）：
+# 这两个值在渲 .env 之前就地定死，不从进程 env 取——scaffold 的环境里就算有同名变量也不该漏进来。
+export APP_ENV=integration
+export TABLE_PREFIX="${NAME}_${SLUG}_int_"
 while IFS= read -r f; do render_env_example "$f"; done < <(find "$DEST" -name '*.env.example' -not -path '*/node_modules/*')
 
 echo "✅ 新 extension: $DEST (APP_NAME=${NAME}, SLUG=${SLUG})"

package/dist/deploy-kit/scripts/publish.sh

@@ -1,15 +1,17 @@
 #!/usr/bin/env bash
 # ============================================================
 # 通用一键发布 extension 到阿里云 FC（persona 无关）
-# 用法: publish.sh <extension目录> <persona根目录>
+# 用法: publish.sh <extension目录> <persona根目录> <env>
 #   - <persona根目录>: daemon 按 session persona 解析后传入（.../personas/<id>）
+#   - <env>: integration | prod（必填，无默认）。integration 发到 <APP_NAME>-<SLUG>-int（测试地址），
+#     prod 发到 <APP_NAME>-<SLUG>（老地址不变）。见 spec 2026-09-15-app-builder-integration-env-design
 #   - 平台凭证/脚本骨架/bootstrap 来自本脚本所在的共享 deploy-kit
 #   - persona 注入值/占位符/特化逻辑/persona 密钥来自 <persona根>/extension-kit
 # ============================================================
 set -euo pipefail
 
 KIT_DIR="$(cd "$(dirname "$0")/.." && pwd)"            # 共享 deploy-kit 根
-EXT_DIR="${1:?用法: publish.sh <extension目录> <persona根目录>}"
+EXT_DIR="${1:?用法: publish.sh <extension目录> <persona根目录> <env>}"
 EXT_DIR="$(cd "$EXT_DIR" && pwd)"
 PERSONA_ROOT="${2:?缺 persona 根目录}"
 PERSONA_KIT="$PERSONA_ROOT/extension-kit"
@@ -17,6 +19,9 @@ PERSONA_KIT="$PERSONA_ROOT/extension-kit"
 # 1) 配置：persona config.env（含平台值+注入值）+ extension 自身 ext.conf（覆盖）
 [ -f "$PERSONA_KIT/config.env" ] && source "$PERSONA_KIT/config.env"
 [ -f "$EXT_DIR/ext.conf" ] && source "$EXT_DIR/ext.conf"
+# env 在 source 之后赋值：位置参数是唯一来源，config.env / ext.conf 里就算写了同名变量也盖不过它
+APP_ENV="${3:?缺 env（integration|prod）}"
+case "$APP_ENV" in integration|prod) ;; *) echo "❌ env 只能是 integration|prod，收到：$APP_ENV" >&2; exit 1;; esac
 APP_NAME="${APP_NAME:-$(basename "$EXT_DIR")}"
 CODE_DIR="${CODE_DIR:-./server}"
 FC_ENTRY="${FC_ENTRY:-dist/main.js}"
@@ -26,15 +31,32 @@ BUILD_CMD="${BUILD_CMD:-}"
 # 由 new-extension.sh 锁定 + bake 进 ext.conf。这里的 fallback 兜底两种历史情况:
 #   1) 老项目 (本改动前 scaffold) ext.conf 无 SLUG → 现场生成 + bake,保后续稳定
 #   2) 手动 rm SLUG 或损坏 ext.conf → 同上,fail-safe
-# 派生:
-#   DEPLOY_NAME=${APP_NAME}-${SLUG}  → FC functionName/子域名/s 项目名 (DNS-safe 连字符)
-#   表前缀=${APP_NAME}_${SLUG}_       → Supabase 表 (SQL-safe 下划线,见 remove-extension.sh)
+# 派生 (按 env):
+#   DEPLOY_NAME=${APP_NAME}-${SLUG}[-int]  → FC functionName/子域名/s 项目名 (DNS-safe 连字符)
+#   TABLE_PREFIX=${APP_NAME}_${SLUG}_[int_] → Supabase 表 (SQL-safe 下划线,见 remove-extension.sh)
 if [ -z "${SLUG:-}" ]; then
   SLUG="$(openssl rand -hex 2)"
   printf '\nSLUG=%s\n' "$SLUG" >> "$EXT_DIR/ext.conf"
   echo "  📝 锁定 SLUG=$SLUG (含 4 位散列防同名冲突,已 bake 进 ext.conf)"
 fi
-DEPLOY_NAME="${APP_NAME}-${SLUG}"
+BASE_NAME="${APP_NAME}-${SLUG}"
+# 环境名 integration / prod 是人读的；进资源名的是短标签 ENV_TAG：int / （prod 为空，保持老地址不变）。
+# 一眼看域名：带 -int 的就是测试环境。派生段与 publish.spec.ts 的 DERIVE_SNIPPET 同步。
+if [ "$APP_ENV" = integration ]; then
+  ENV_TAG=int;  DEPLOY_NAME="${BASE_NAME}-int"; TABLE_PREFIX="${APP_NAME}_${SLUG}_int_"
+else
+  ENV_TAG=prod; DEPLOY_NAME="${BASE_NAME}";     TABLE_PREFIX="${APP_NAME}_${SLUG}_"
+fi
+# 两个环境各自的渲染产物；s 用 name: 键状态，DEPLOY_NAME 不同即隔离。
+S_FILE="s.${ENV_TAG}.yaml"
+echo "  🎯 env=$APP_ENV → $DEPLOY_NAME (表前缀 $TABLE_PREFIX, 渲到 $S_FILE)"
+# 渲出来的 s 文件含 supabase key，靠项目 .gitignore 挡在仓库外。模板已有 s.*.yaml；双环境之前 scaffold 的
+# 存量项目只有 s.yaml 一行，s.int.yaml 会被当源码推上 GitHub——像 bake SLUG 一样幂等地补一行（改了
+# .gitignore 下次 publish 会被「先推再发」拦一次，推上去的只是 .gitignore，无害）。
+if ! grep -qxF 's.*.yaml' "$EXT_DIR/.gitignore" 2>/dev/null; then
+  printf 's.*.yaml\n' >> "$EXT_DIR/.gitignore"
+  echo "  📝 .gitignore 补 s.*.yaml (渲出的 s.int.yaml / s.prod.yaml 含 key，不进仓库；记得把 .gitignore 推上去)"
+fi
 
 # 2) 工具链 + 阿里云凭证（分层：shared demo + 可选 local override）
 source "$KIT_DIR/scripts/ensure-toolchain.sh"
@@ -59,6 +81,7 @@ cp "$KIT_DIR/contract/bootstrap" "$EXT_DIR/$CODE_DIR/bootstrap"
 chmod +x "$EXT_DIR/$CODE_DIR/bootstrap"
 
 # 6) 通用占位符替换渲染 s.yaml：扫 persona s.yaml.tmpl 的所有 __X__，从 env 取同名变量
+#（APP_ENV / TABLE_PREFIX 也走这条：模板里 __APP_ENV__ / __TABLE_PREFIX__ 渲进 FC 的 environmentVariables）
 #
 # 自定义域名段按履约拼接（M1b Step 5c）：APP_DOMAIN_SUFFIX 非空 = 部署级履约（域名与通配符
 # 证书都在我们自己的阿里云账号上）→ 把 s.yaml.domain.tmpl 接上；空 = 使用者自带 key，
@@ -110,12 +133,12 @@ for ph in $(grep -oE '__[A-Z0-9_]+__' "$TMPL_RENDER" | sort -u); do
   val="${val//&/\\&}"
   sed_args+=(-e "s|$ph|$val|g")
 done
-sed "${sed_args[@]}" "$TMPL_RENDER" > "$EXT_DIR/s.yaml"
+sed "${sed_args[@]}" "$TMPL_RENDER" > "$EXT_DIR/$S_FILE"
 
 # 7) deploy + verify
 echo "::stage::deploy"
-echo "==> s deploy ($DEPLOY_NAME)"
-( cd "$EXT_DIR" && s deploy -y --access "$S_ACCESS_ALIAS" )
+echo "==> s deploy ($DEPLOY_NAME, env=$APP_ENV)"
+( cd "$EXT_DIR" && s deploy -y -t "$S_FILE" --access "$S_ACCESS_ALIAS" )
 
 echo "::stage::verify"
 # 产物 URL 怎么取，取决于**这个 persona 参不参与 5c 的域名段方案**（判据同上面渲染那步，