@clawos-dev/clawd 0.2.731 → 0.2.733

package/dist/dispatch/mcp-server.cjs

@@ -21456,12 +21456,6 @@ var EnvPackageSchema = external_exports.object({
    */
   aptVersion: external_exports.string().optional()
 });
-var EnvSecretSchema = external_exports.object({
-  name: external_exports.string().min(1),
-  // 解析出的值注入到哪些环境变量。一份凭据可含多个字段（AK 是 id+secret 两个，
-  // supabase 是 url/anon/service-role/jwt 四个），所以是数组不是单值。
-  env: external_exports.array(external_exports.string().min(1)).min(1)
-});
 var ConnectorNameSchema = external_exports.string().regex(/^[a-z0-9-]+$/, "\u8FDE\u63A5\u5668\u540D\u53EA\u80FD\u662F\u5C0F\u5199\u5B57\u6BCD\u3001\u6570\u5B57\u548C\u77ED\u6A2A\u7EBF");
 var CONNECTOR_KINDS = ["proxy", "env"];
 var CONNECTOR_RUNNERS = ["mcp", "cli"];
@@ -21469,6 +21463,10 @@ var CONNECTOR_PROTOCOLS = ["bearer", "lark-sidecar"];
 var CREDENTIAL_SOURCES = ["none", "shared", "personal"];
 var CONNECTOR_AUTHS = ["oauth", "fields"];
 var ConnectorFieldSchema = external_exports.string().regex(/^[A-Z][A-Z0-9_]*$/, "\u8981\u586B\u7684\u53D8\u91CF\u540D\u53EA\u80FD\u662F\u5927\u5199\u5B57\u6BCD\u3001\u6570\u5B57\u548C\u4E0B\u5212\u7EBF\uFF0C\u4E14\u4EE5\u5B57\u6BCD\u5F00\u5934");
+var EnvVarSchema = external_exports.object({
+  name: external_exports.string().min(1),
+  env: external_exports.array(ConnectorFieldSchema).min(1)
+});
 var EnvConnectorSchema = external_exports.object({
   name: ConnectorNameSchema,
   kind: external_exports.enum(CONNECTOR_KINDS),
@@ -21493,6 +21491,12 @@ var normalizeLegacyManifest = (v) => {
     const { assets: _dropped, ...rest } = o;
     o = rest;
   }
+  if ("secrets" in o && Array.isArray(o.secrets)) {
+    const { secrets, ...rest } = o;
+    const fields = new Set((Array.isArray(rest.connectors) ? rest.connectors : []).flatMap((c) => Array.isArray(c?.fields) ? c.fields : []));
+    const legacy = secrets.map((g) => ({ ...g, env: Array.isArray(g?.env) ? g.env.filter((e) => !fields.has(e)) : g?.env })).filter((g) => !Array.isArray(g.env) || g.env.length > 0);
+    o = { ...rest, envVars: [...Array.isArray(rest.envVars) ? rest.envVars : [], ...legacy] };
+  }
   return o;
 };
 var PublisherTestSchema = external_exports.object({
@@ -21504,12 +21508,13 @@ var PublisherTestSchema = external_exports.object({
 var MANIFEST_BODY = {
   test: PublisherTestSchema.optional(),
   packages: external_exports.array(EnvPackageSchema),
-  secrets: external_exports.array(EnvSecretSchema),
+  /** 环境变量（见 `EnvVarSchema`）。缺省空：没声明就是没有。 */
+  envVars: external_exports.array(EnvVarSchema).default([]),
   /**
    * 装了哪些连接器（design 2026-09-11-mcp-connector §3.1）。一条一个对象，形状见 `EnvConnectorSchema`。
    *
-   * 不复用 secrets：那段说的是「需要一份值，由部署者填」；连接器的凭据谁出是单据上点出来的，
-   * 三种来源里只有「共享」才落到 Secrets，而且靠 `sharedConnectorSecrets` 在消费处并入，不写进那段。
+   * 凭据归连接器自己（`fields`），不进 envVars：谁出是单据上点出来的，
+   * 三种来源里只有「共享」才落到 Secrets，而且靠 `sharedConnectorSecrets` 在消费处并入。
    *
    * **缺省空而不是必填**：本机上已有的单据不用为此重扫一遍；没声明就是没装。
    */
@@ -21523,7 +21528,7 @@ var EnvironmentManifestSchema = external_exports.preprocess(normalizeLegacyManif
   ...MANIFEST_BODY
 }).strict());
 var EnvEvidenceSchema = external_exports.object({
-  // 这条证据支持的是哪一项：`${kind}:${name}`，如 'package:aliyun' / 'secret:aliyun-ak' / 'connector:feishu'
+  // 这条证据支持的是哪一项：`${kind}:${name}`，如 'package:aliyun' / 'env:aliyun-ak' / 'connector:feishu'
   target: external_exports.string().min(1),
   reason: external_exports.string().min(1),
   file: external_exports.string().min(1),
@@ -22028,7 +22033,7 @@ var DeployRerunJobArgsSchema = external_exports.object({
 }).strict();
 var DeployReportFindingArgsSchema = external_exports.object({
   personaId: external_exports.string().min(1),
-  kind: external_exports.enum(["package", "secret", "connector"]),
+  kind: external_exports.enum(["package", "env", "connector"]),
   // 该条目在 manifest 对应数组里的内容（形状随 kind 变，handler 按 kind 收窄校验）
   // connector 的 item 是 butler 报的 CLI 连接器（{ name, fields? }），daemon 补齐 kind / runner / id 后落进清单；
   // MCP 连接器不经这里——由 daemon 从 .mcp.json 机械列出（design 2026-09-11-mcp-connector §3.2）
@@ -24091,7 +24096,7 @@ var METHOD_DOCS = {
     }
   },
   "deploy:reportFinding": {
-    summary: "\u626B\u63CF\u4E2D\u7684 butler \u9010\u6761\u4E0A\u62A5\u4E00\u4E2A\u53D1\u73B0\uFF08cli / secret / asset\uFF09\u3002**\u8FB9\u626B\u8FB9\u62A5**\uFF0C\u9875\u9762\u968F\u4E4B\u4E00\u70B9\u70B9\u586B\u5145\uFF1B\u540C (kind,name) \u91CD\u590D\u4E0A\u62A5\u5373\u8986\u76D6\u3002\u53EA\u56DE\u626B\u63CF\u5386\u53F2 `scans`\uFF08\u540C deploy:patch\uFF09\uFF0C\u4E0D\u56DE\u6574\u4EFD\u72B6\u6001\uFF1Bowner-only\u2014\u2014butler \u4F1A\u8BDD\u672C\u8EAB\u8DD1\u5728 owner \u6A21\u5F0F",
+    summary: "\u626B\u63CF\u4E2D\u7684 butler \u9010\u6761\u4E0A\u62A5\u4E00\u4E2A\u53D1\u73B0\uFF08package / env / connector\uFF09\u3002**\u8FB9\u626B\u8FB9\u62A5**\uFF0C\u9875\u9762\u968F\u4E4B\u4E00\u70B9\u70B9\u586B\u5145\uFF1B\u540C (kind,name) \u91CD\u590D\u4E0A\u62A5\u5373\u8986\u76D6\u3002\u53EA\u56DE\u626B\u63CF\u5386\u53F2 `scans`\uFF08\u540C deploy:patch\uFF09\uFF0C\u4E0D\u56DE\u6574\u4EFD\u72B6\u6001\uFF1Bowner-only\u2014\u2014butler \u4F1A\u8BDD\u672C\u8EAB\u8DD1\u5728 owner \u6A21\u5F0F",
     args: DeployReportFindingArgsSchema
   },
   "deploy:finishScan": {