oasis_test 0.1.84 → 0.1.85

package/dist/index.js

@@ -138754,6 +138754,16 @@ function nodeLabel(a) {
   const tail = a.id.split(":").slice(2).join(":");
   return tail ? `\u672A\u547D\u540D ${a.type}\uFF08${tail}\uFF09` : `\u672A\u547D\u540D ${a.type}`;
 }
+function workspaceTitleMap(model) {
+  const titleOf = /* @__PURE__ */ new Map();
+  for (const a of model.artifacts.values()) {
+    if (a.type === "brief") {
+      const title = a.title ?? a.description;
+      if (title) titleOf.set(a.workspace, title);
+    }
+  }
+  return titleOf;
+}
 function isCurrentHeadConcluded2(model, a) {
   return a.currentRev !== null && concludedHead(model, a.id) === a.currentRev;
 }
@@ -141042,6 +141052,56 @@ var init_session_creds = __esm({
   }
 });
 
+// ../connectors/src/_base/refresh.ts
+function isExpiringSoon(expiresAtMs, nowMs, skewMs = CREDENTIAL_REFRESH_SKEW_MS) {
+  if (!expiresAtMs) return true;
+  return nowMs >= expiresAtMs - skewMs;
+}
+async function refreshCredentialsIfNeeded(connector, credentials, opts = {}) {
+  if (!connector.refreshCredentials) {
+    return { status: "unsupported", detail: `${connector.config.slug}: \u51ED\u636E\u4E0D\u8FC7\u671F\uFF0C\u65E0\u9700\u7EED\u671F` };
+  }
+  const nowMs = opts.nowMs ?? Date.now();
+  const skewMs = opts.skewMs ?? CREDENTIAL_REFRESH_SKEW_MS;
+  const expiresAt = readEpochMs(credentials, connector.expiresAtCredentialKey);
+  if (!isExpiringSoon(expiresAt, nowMs, skewMs)) {
+    return { status: "fresh" };
+  }
+  const materialExpiresAt = readEpochMs(credentials, connector.refreshMaterialExpiresAtCredentialKey);
+  if (materialExpiresAt && nowMs >= materialExpiresAt) {
+    return { status: "expired", detail: `${connector.config.slug}: \u7EED\u671F\u6750\u6599\u5DF2\u8FC7\u671F\uFF0C\u9700\u91CD\u65B0\u6388\u6743` };
+  }
+  try {
+    const result = await connector.refreshCredentials(credentials);
+    if (!result) return { status: "not-refreshable", detail: `${connector.config.slug}: \u65E0\u53EF\u7528\u7EED\u671F\u6750\u6599` };
+    return {
+      status: "refreshed",
+      credentials: result.credentials,
+      ...result.expiresAt ? { expiresAt: result.expiresAt } : {}
+    };
+  } catch (err) {
+    return { status: "failed", detail: summarize(err) };
+  }
+}
+function readEpochMs(credentials, key) {
+  if (!key) return void 0;
+  const raw = credentials[key];
+  if (!raw) return void 0;
+  const n = Number(raw);
+  return Number.isFinite(n) && n > 0 ? n : void 0;
+}
+function summarize(err) {
+  const e = err;
+  return (typeof e?.message === "string" ? e.message : String(err)).slice(0, 300);
+}
+var CREDENTIAL_REFRESH_SKEW_MS;
+var init_refresh = __esm({
+  "../connectors/src/_base/refresh.ts"() {
+    "use strict";
+    CREDENTIAL_REFRESH_SKEW_MS = 5 * 60 * 1e3;
+  }
+});
+
 // ../connectors/src/_base/cli-connector.ts
 function summarizeError(err) {
   const e = err;
@@ -141184,13 +141244,32 @@ var init_base = __esm({
     init_tool_home();
     init_wrapper_assets();
     init_session_creds();
+    init_refresh();
     init_cli_connector();
     init_mcp_connector();
   }
 });
 
 // ../connectors/src/feishu/index.ts
-var import_node_child_process7, import_node_util4, import_node_path6, import_node_url2, import_promises3, execFileAsync2, __dirname2, FEISHU_WELL_KNOWN_SKILLS_BASE, FeishuConnector;
+function parseFeishuTokenResponse(data, nowMs) {
+  const accessToken = String(data["access_token"] ?? "");
+  const refreshToken = String(data["refresh_token"] ?? "");
+  const expiresInSec = Number(data["expires_in"] ?? 7200);
+  const refreshExpiresInSec = Number(
+    data["refresh_token_expires_in"] ?? data["refresh_expires_in"] ?? 30 * 24 * 3600
+  );
+  const expiresAtMs = nowMs + expiresInSec * 1e3;
+  return {
+    credentials: {
+      ...accessToken ? { user_access_token: accessToken } : {},
+      ...refreshToken ? { refresh_token: refreshToken } : {},
+      user_token_expires_at: String(expiresAtMs),
+      refresh_token_expires_at: String(nowMs + refreshExpiresInSec * 1e3)
+    },
+    expiresAt: new Date(expiresAtMs)
+  };
+}
+var import_node_child_process7, import_node_util4, import_node_path6, import_node_url2, import_promises3, execFileAsync2, __dirname2, FEISHU_WELL_KNOWN_SKILLS_BASE, FEISHU_TOKEN_URL, FeishuConnector;
 var init_feishu = __esm({
   "../connectors/src/feishu/index.ts"() {
     "use strict";
@@ -141203,6 +141282,7 @@ var init_feishu = __esm({
     execFileAsync2 = (0, import_node_util4.promisify)(import_node_child_process7.execFile);
     __dirname2 = (0, import_node_path6.dirname)((0, import_node_url2.fileURLToPath)(__esm_import_meta_url));
     FEISHU_WELL_KNOWN_SKILLS_BASE = "https://open.feishu.cn/.well-known/skills";
+    FEISHU_TOKEN_URL = "https://open.feishu.cn/open-apis/authen/v2/oauth/token";
     FeishuConnector = class extends CliConnector {
       config = {
         slug: "feishu",
@@ -141220,12 +141300,28 @@ var init_feishu = __esm({
       commandName = "lark-cli";
       requiredCommands = ["lark-cli"];
       envPrefix = "FEISHU_";
-      /** server 侧从 actor 变量表组装凭据的声明（见 provision.ts）。 */
+      /** server 侧从 actor 变量表组装凭据的声明（见 provision.ts）。这些会随 job 下发到节点。 */
       credentialSources = [
         { key: "app_id", from: "FEISHU_APP_ID", required: true },
         { key: "app_secret", from: "FEISHU_APP_SECRET", required: true },
         { key: "user_access_token", from: "FEISHU_USER_ACCESS_TOKEN", required: false }
       ];
+      /**
+       * 续期材料——**只在 server 侧读，不下发节点**。refresh_token 能换出新的 user token，
+       * 属于"长期材料"，没有任何理由让它出现在 agent 所在的机器上。
+       */
+      refreshCredentialSources = [
+        { key: "app_id", from: "FEISHU_APP_ID", required: true },
+        { key: "app_secret", from: "FEISHU_APP_SECRET", required: true },
+        { key: "refresh_token", from: "FEISHU_REFRESH_TOKEN", required: true },
+        { key: "user_token_expires_at", from: "FEISHU_USER_TOKEN_EXPIRES_AT", required: false },
+        { key: "refresh_token_expires_at", from: "FEISHU_REFRESH_TOKEN_EXPIRES_AT", required: false },
+        { key: "user_access_token", from: "FEISHU_USER_ACCESS_TOKEN", required: false }
+      ];
+      /** 过期判定只认这个键——必须与注入时消费的 token 同源（见接口注释里的历史坑）。 */
+      expiresAtCredentialKey = "user_token_expires_at";
+      /** refresh_token 自身 ~30d 过期，过了只能重新授权。 */
+      refreshMaterialExpiresAtCredentialKey = "refresh_token_expires_at";
       /**
        * 绝不允许进入 agent 进程环境的原始变量。
        * 含 APP_ID 与几个过期时间戳：它们本身不算密钥，但同属飞书凭据材料，一并挡在 agent 之外，
@@ -141316,6 +141412,36 @@ var init_feishu = __esm({
         sessionEnv.set("FEISHU_RUN_TMPDIR", creds.dir);
         sessionEnv.set("LARKSUITE_CLI_CONFIG_DIR", configDir);
       }
+      /**
+       * 用 refresh_token 换一对新的 user token（飞书 v2 OAuth）。
+       *
+       * **纯换取，不落库**——持久化由调用方做（server 侧 `oauth.ts`）。这样平台知识
+       * （端点、字段名、~2h/~30d 的寿命）全部收在连接器里，与 GitHub App 的续期共用
+       * `_base/refresh.ts` 那套判定。
+       *
+       * 返回 null＝没有可用的续期材料（未完成授权）。平台报错则抛，由上层收敛成 failed。
+       */
+      async refreshCredentials(credentials) {
+        const appId = credentials["app_id"];
+        const appSecret = credentials["app_secret"];
+        const refreshToken = credentials["refresh_token"];
+        if (!appId || !appSecret || !refreshToken) return null;
+        const resp = await fetch(FEISHU_TOKEN_URL, {
+          method: "POST",
+          headers: { "Content-Type": "application/x-www-form-urlencoded" },
+          body: new URLSearchParams({
+            grant_type: "refresh_token",
+            refresh_token: refreshToken,
+            client_id: appId,
+            client_secret: appSecret
+          }).toString()
+        });
+        const data = await resp.json();
+        if (!resp.ok || data["error"]) {
+          throw new Error(`feishu refresh failed: HTTP ${resp.status} ${String(data["error"] ?? "")}`.trim());
+        }
+        return parseFeishuTokenResponse(data, Date.now());
+      }
       async initNewApp() {
         await new Promise((resolve9, reject) => {
           const proc = (0, import_node_child_process7.spawn)(this.larkBin, ["config", "init", "--new"], { stdio: "inherit" });
@@ -141526,52 +141652,54 @@ var init_scopes = __esm({
 
 // ../connectors/src/feishu/oauth.ts
 async function persistFeishuUserTokens(store, actorId, data, nowMs) {
-  const accessToken = String(data["access_token"] ?? "");
-  const refreshToken = String(data["refresh_token"] ?? "");
-  const expiresInSec = Number(data["expires_in"] ?? 7200);
-  const refreshExpiresInSec = Number(data["refresh_token_expires_in"] ?? data["refresh_expires_in"] ?? 30 * 24 * 3600);
-  const put = (key, value2, encrypted) => store.putVariable({ key, value: value2, scope: "personal", actorId, connectorId: "feishu", encrypted });
-  if (accessToken) await put("FEISHU_USER_ACCESS_TOKEN", accessToken, true);
-  if (refreshToken) await put("FEISHU_REFRESH_TOKEN", refreshToken, true);
-  await put("FEISHU_USER_TOKEN_EXPIRES_AT", String(nowMs + expiresInSec * 1e3), false);
-  await put("FEISHU_REFRESH_TOKEN_EXPIRES_AT", String(nowMs + refreshExpiresInSec * 1e3), false);
+  const { credentials } = parseFeishuTokenResponse(data, nowMs);
+  await persistRefreshedCredentials(store, actorId, credentials);
+}
+async function persistRefreshedCredentials(store, actorId, credentials) {
+  const connector = new FeishuConnector();
+  const secretKeys = new Set(connector.config.schema.filter((f2) => f2.secret).map((f2) => f2.key));
+  for (const src of connector.refreshCredentialSources ?? []) {
+    const value2 = credentials[src.key];
+    if (value2 === void 0) continue;
+    await store.putVariable({
+      key: src.from,
+      value: value2,
+      scope: "personal",
+      actorId,
+      connectorId: "feishu",
+      encrypted: secretKeys.has(src.key)
+    });
+  }
 }
 async function refreshFeishuUserTokenIfNeeded(store, actorId) {
-  const expiresAt = Number(await store.revealVariable("FEISHU_USER_TOKEN_EXPIRES_AT", actorId) ?? 0);
-  const nowMs = Date.now();
-  if (expiresAt && nowMs < expiresAt - REFRESH_SKEW_MS) return;
-  const refreshToken = await store.revealVariable("FEISHU_REFRESH_TOKEN", actorId);
-  const appId = await store.revealResolvedVariable("FEISHU_APP_ID", actorId);
-  const appSecret = await store.revealResolvedVariable("FEISHU_APP_SECRET", actorId);
-  if (!refreshToken || !appId || !appSecret) return;
-  const refreshExpiresAt = Number(await store.revealVariable("FEISHU_REFRESH_TOKEN_EXPIRES_AT", actorId) ?? 0);
-  if (refreshExpiresAt && nowMs >= refreshExpiresAt) {
-    await store.deleteVariable("FEISHU_USER_ACCESS_TOKEN", actorId);
-    await store.deleteVariable("FEISHU_REFRESH_TOKEN", actorId);
-    await store.deleteVariable("FEISHU_USER_TOKEN_EXPIRES_AT", actorId);
-    await store.deleteVariable("FEISHU_REFRESH_TOKEN_EXPIRES_AT", actorId);
+  const connector = new FeishuConnector();
+  const credentials = {};
+  for (const src of connector.refreshCredentialSources ?? []) {
+    const v2 = src.key === "app_id" || src.key === "app_secret" ? await store.revealResolvedVariable(src.from, actorId) : await store.revealVariable(src.from, actorId);
+    if (v2) credentials[src.key] = v2;
+  }
+  const outcome = await refreshCredentialsIfNeeded(connector, credentials);
+  if (outcome.status === "refreshed" && outcome.credentials) {
+    await persistRefreshedCredentials(store, actorId, outcome.credentials);
+    return;
+  }
+  if (outcome.status === "expired") {
+    for (const key of [
+      "FEISHU_USER_ACCESS_TOKEN",
+      "FEISHU_REFRESH_TOKEN",
+      "FEISHU_USER_TOKEN_EXPIRES_AT",
+      "FEISHU_REFRESH_TOKEN_EXPIRES_AT"
+    ]) {
+      await store.deleteVariable(key, actorId);
+    }
     return;
   }
-  const resp = await fetch(FEISHU_TOKEN_URL, {
-    method: "POST",
-    headers: { "Content-Type": "application/x-www-form-urlencoded" },
-    body: new URLSearchParams({
-      grant_type: "refresh_token",
-      refresh_token: refreshToken,
-      client_id: appId,
-      client_secret: appSecret
-    }).toString()
-  });
-  const data = await resp.json();
-  if (!resp.ok || data["error"]) return;
-  await persistFeishuUserTokens(store, actorId, data, nowMs);
 }
-var FEISHU_TOKEN_URL, REFRESH_SKEW_MS;
 var init_oauth = __esm({
   "../connectors/src/feishu/oauth.ts"() {
     "use strict";
-    FEISHU_TOKEN_URL = "https://open.feishu.cn/open-apis/authen/v2/oauth/token";
-    REFRESH_SKEW_MS = 5 * 60 * 1e3;
+    init_refresh();
+    init_feishu();
   }
 });
 
@@ -146518,6 +146646,7 @@ var init_src5 = __esm({
     init_base();
     init_base();
     init_base();
+    init_base();
     init_feishu();
     init_scopes();
     init_oauth();
@@ -151023,6 +151152,7 @@ var init_memory_control_plane_store = __esm({
           else c.avatar = patch.avatar;
         }
         if (patch.status !== void 0) c.status = patch.status;
+        if (patch.onboardingVariant !== void 0) c.onboardingVariant = patch.onboardingVariant;
         this.companies.set(id, c);
       }
       // —— 成员 ——
@@ -157804,7 +157934,7 @@ function clip(text2) {
   const s2 = typeof text2 === "string" ? text2.trim() : "";
   return s2.length > CLIP ? `${s2.slice(0, CLIP)}\u2026` : s2;
 }
-function summarize(kind, payload) {
+function summarize2(kind, payload) {
   const p2 = payload;
   switch (kind) {
     case "report_gap":
@@ -157853,7 +157983,7 @@ async function actorActivity(oplog, actorId, limit = 50) {
   for await (const { op } of oplog.readAll()) {
     if (op.actor !== actorId) continue;
     total++;
-    matched.push({ at: op.timestamp, kind: op.kind, target: op.target, ...summarize(op.kind, op.payload) });
+    matched.push({ at: op.timestamp, kind: op.kind, target: op.target, ...summarize2(op.kind, op.payload) });
     if (matched.length > capped) matched.shift();
   }
   matched.reverse();
@@ -159068,7 +159198,11 @@ function toApiError(e) {
   const code = e.code;
   const message = e instanceof Error ? e.message : String(e);
   if (code === "FORBIDDEN") throw new ApiError(403, code, message);
-  if (code === "ASSISTANT_LAZY_CREATE_FAILED") throw new ApiError(409, code, message);
+  if (code === "ASSISTANT_LAZY_CREATE_FAILED") {
+    const step = e.step;
+    if (step === "no-runtime" || step === "probe-failed") throw new ApiError(503, "ASSISTANT_SERVICE_UNAVAILABLE", message);
+    throw new ApiError(409, code, message);
+  }
   if (code === "AUTO_ASSIGN_OFF") throw new ApiError(409, code, message);
   if (code === "ASSISTANT_ARCHIVED_CANNOT_REACTIVATE") throw new ApiError(409, code, message);
   if (code === "LEGACY_AGENT_NOT_ELIGIBLE_FOR_REBIND") throw new ApiError(409, code, message);
@@ -160136,6 +160270,31 @@ var init_service4 = __esm({
       async get(id) {
         return this.store.getCompany(id);
       }
+      /**
+       * 读取公司的登录后助理引导变体（首个 per-company 配置字段）。
+       * 缺省/未设一律视为 "A"（默认）；**读取失败绝不抛给调用方**——降级到 "A"，
+       * 保证登录后引导流程永远有一个确定的默认路径，不因控制面读故障而阻塞。
+       */
+      async getOnboardingVariant(companyId) {
+        try {
+          const c = await this.store.getCompany(companyId);
+          return c?.onboardingVariant ?? "A";
+        } catch {
+          return "A";
+        }
+      }
+      /**
+       * 设置公司的登录后助理引导变体（"A" | "B"）。公司不存在则抛 404，非法值抛 400。
+       * 权限（owner/admin）由路由层强制。
+       */
+      async setOnboardingVariant(companyId, variant) {
+        if (variant !== "A" && variant !== "B") {
+          throw new CompanyError(400, "BAD_REQUEST", `onboardingVariant \u987B\u4E3A "A" | "B"`);
+        }
+        const company = await this.requireCompany(companyId);
+        await this.store.updateCompany(companyId, { onboardingVariant: variant });
+        return { ...company, onboardingVariant: variant };
+      }
       /** 设置/清除公司头像引用（"blob:<哈希>"；null = 回到默认首字母标识）。 */
       async setAvatar(id, ref2) {
         const company = await this.requireCompany(id);
@@ -160472,6 +160631,13 @@ function companiesDomain(opts) {
     throw e;
   };
   const whoami = (req) => currentUser(req.auth, req.raw.headers);
+  const requireOwnerOrAdmin = async (req, companyId) => {
+    const me = await whoami(req);
+    const member = await service.getMember(companyId, me.accountId);
+    if (!member || member.role !== "owner" && member.role !== "admin") {
+      throw new ApiError(403, "FORBIDDEN", "\u9700\u8981\u8BE5\u516C\u53F8\u7684 owner/admin \u6743\u9650");
+    }
+  };
   return (router) => {
     router.get("/api/companies", async (req) => {
       const me = await whoami(req);
@@ -160483,6 +160649,19 @@ function companiesDomain(opts) {
       if (!company) throw new ApiError(404, "NOT_FOUND", `\u6CA1\u6709\u8FD9\u4E2A\u516C\u53F8\uFF1A${req.params.id}`);
       return { status: 200, body: company };
     });
+    router.patch("/api/companies/:id", async (req) => {
+      const cid = req.params.id;
+      const b2 = req.body ?? {};
+      if (b2.onboardingVariant === void 0) {
+        throw new ApiError(400, "BAD_REQUEST", "\u7F3A\u5C11\u53EF\u66F4\u65B0\u5B57\u6BB5\uFF08onboardingVariant\uFF09");
+      }
+      if (b2.onboardingVariant !== "A" && b2.onboardingVariant !== "B") {
+        throw new ApiError(400, "BAD_REQUEST", `onboardingVariant \u987B\u4E3A "A" | "B"`);
+      }
+      await requireOwnerOrAdmin(req, cid);
+      const company = await service.setOnboardingVariant(cid, b2.onboardingVariant).catch(mapErr);
+      return { status: 200, body: company };
+    });
     router.post("/api/companies", async (req) => {
       const b2 = req.body ?? {};
       const me = await whoami(req);
@@ -162047,14 +162226,10 @@ function buildInbox(model, me, leadOf, resolveActor, markers = [], slaMs, nowIso
   const downstreamCount = (id) => consumersOf(model, id).length;
   const firstSentence = (s2, max = 80) => (s2 ?? "").replace(/\s+/g, " ").trim().slice(0, max);
   const creatorOf = /* @__PURE__ */ new Map();
-  const titleOf = /* @__PURE__ */ new Map();
   for (const a of model.artifacts.values()) {
-    if (a.type === "brief") {
-      creatorOf.set(a.workspace, a.owner);
-      const title = a.title ?? a.description;
-      if (title) titleOf.set(a.workspace, title);
-    }
+    if (a.type === "brief") creatorOf.set(a.workspace, a.owner);
   }
+  const titleOf = workspaceTitleMap(model);
   const staffingSeen = /* @__PURE__ */ new Set();
   for (const a of model.artifacts.values()) {
     if (!isPendingOwner(a.owner) || creatorOf.get(a.workspace) !== me) continue;
@@ -162445,8 +162620,20 @@ function toAuditEntry(op) {
     summary: `${KIND_LABEL[op.kind] ?? op.kind} \xB7 ${op.artifactId}`
   };
 }
-async function buildAudit(oplog, q = {}) {
+function enrichAudit(entry, model, titleOf) {
+  const a = model.artifacts.get(entry.artifactId);
+  if (!a) return { ...entry, visibility: "deleted" };
+  const workspaceTitle = titleOf.get(a.workspace);
+  return {
+    ...entry,
+    nodeName: nodeLabel(a),
+    ...workspaceTitle ? { workspaceTitle } : {},
+    visibility: "ok"
+  };
+}
+async function buildAudit(oplog, q = {}, model) {
   const limit = Math.min(Math.max(q.limit ?? 100, 1), 500);
+  const titleOf = model ? workspaceTitleMap(model) : void 0;
   const items = [];
   let lastCursor = null;
   let truncated = false;
@@ -162456,7 +162643,8 @@ async function buildAudit(oplog, q = {}) {
     if (q.kind && op.kind !== q.kind) continue;
     if (q.from && op.timestamp < q.from) continue;
     if (q.to && op.timestamp > q.to) continue;
-    items.push(toAuditEntry(op));
+    const base = toAuditEntry(op);
+    items.push(model && titleOf ? enrichAudit(base, model, titleOf) : base);
     lastCursor = cursor;
     if (items.length >= limit) {
       truncated = true;
@@ -162469,6 +162657,7 @@ var KIND_LABEL;
 var init_audit = __esm({
   "../server/src/domains/collab/audit.ts"() {
     "use strict";
+    init_node_state();
     KIND_LABEL = {
       spawn_artifact: "\u5EFA\u4EA7\u7269",
       propose_revision: "\u63D0\u4FEE\u8BA2",
@@ -163457,7 +163646,7 @@ function collabDomain(opts) {
       return { status: 200, body: { ok: true } };
     });
     router.get("/api/audit", async (req) => {
-      const { oplog } = await resolveCtx(req.auth.companyId);
+      const { oplog, kernel } = await resolveCtx(req.auth.companyId);
       const q = req.query;
       const audit = {};
       const actor = q.get("actor");
@@ -163472,7 +163661,7 @@ function collabDomain(opts) {
       if (cursor) audit.cursor = cursor;
       const limit = q.get("limit");
       if (limit) audit.limit = Number(limit);
-      return { status: 200, body: await buildAudit(oplog, audit) };
+      return { status: 200, body: await buildAudit(oplog, audit, kernel.model) };
     });
     router.get("/api/dashboard", async (req) => {
       const { kernel, oplog, registry: registry2 } = await resolveCtx(req.auth.companyId);
@@ -165643,7 +165832,7 @@ function validateTriggers(raw) {
 }
 function automationsDomain(opts) {
   const { service } = opts;
-  const summarize2 = async (id) => {
+  const summarize3 = async (id) => {
     const automation = await service.getAutomation(id);
     if (!automation) return null;
     const [triggers, recent] = await Promise.all([
@@ -165668,7 +165857,7 @@ function automationsDomain(opts) {
       return { status: 200, body };
     });
     router.get("/api/automations/:id", async (req) => {
-      const summary = await summarize2(req.params.id);
+      const summary = await summarize3(req.params.id);
       if (!summary) throw new ApiError(404, "NOT_FOUND", `\u6CA1\u6709\u8FD9\u4E2A\u81EA\u52A8\u5316\uFF1A${req.params.id}`);
       return { status: 200, body: summary };
     });
@@ -165698,7 +165887,7 @@ function automationsDomain(opts) {
         ...b2.createdBy !== void 0 ? { createdBy: b2.createdBy } : {},
         ...triggers !== void 0 ? { triggers } : {}
       });
-      const summary = await summarize2(created.id);
+      const summary = await summarize3(created.id);
       return { status: 201, body: summary };
     });
     router.patch("/api/automations/:id", async (req) => {
@@ -165717,7 +165906,7 @@ function automationsDomain(opts) {
         ...b2.enabled !== void 0 ? { enabled: b2.enabled } : {},
         ...triggers !== void 0 ? { triggers } : {}
       });
-      const summary = await summarize2(id);
+      const summary = await summarize3(id);
       return { status: 200, body: summary };
     });
     router.post("/api/automations/:id/enabled", async (req) => {
@@ -165726,7 +165915,7 @@ function automationsDomain(opts) {
       const b2 = req.body ?? {};
       if (typeof b2.enabled !== "boolean") throw new ApiError(400, "BAD_REQUEST", "\u7F3A\u5C11 enabled\uFF08boolean\uFF09");
       await service.setEnabled(id, b2.enabled);
-      const summary = await summarize2(id);
+      const summary = await summarize3(id);
       return { status: 200, body: summary };
     });
     router.post("/api/automations/:id/run-now", async (req) => {
@@ -174895,7 +175084,9 @@ var init_registry3 = __esm({
         dependsOn: ["diagnosis:\u6839\u56E0\u5206\u6790"],
         role: "\u5F00\u53D1",
         ownerRole: "dev",
-        brief: () => `\u6309\u300C\u6839\u56E0\u5206\u6790\u300D\u7ED9\u51FA\u7684\u65B9\u6848\u4FEE\u590D\u5E76\u4EA4\u4ED8\u4EE3\u7801\u3002\u6539\u52A8\u805A\u7126\u6839\u56E0\u3001\u907F\u514D\u8FC7\u5EA6\u6269\u6563\uFF1B\u81EA\u6D4B\u8986\u76D6\u5DE5\u5355\u63CF\u8FF0\u91CC\u6240\u62A5\u7684\u90A3\u6761\u8DEF\u5F84\u3002`
+        brief: () => `**\u4EA7\u51FA**\uFF1A\u6309\u300C\u6839\u56E0\u5206\u6790\u300D\u7ED9\u51FA\u7684\u65B9\u6848\u4FEE\u590D\u5E76\u4EA4\u4ED8\u4EE3\u7801\u3002
+**\u8D1F\u8D23\u5230\u54EA**\uFF1A\u53EA\u6539\u6839\u56E0\u6D89\u53CA\u7684\u90E8\u5206\uFF0C\u907F\u514D\u8FC7\u5EA6\u6269\u6563\uFF1B\u4E0A\u7EBF\u4E0E\u9A8C\u8BC1\u5F52\u4E0B\u6E38\u3002
+**\u4EA4\u4ED8\u524D\u5FC5\u987B\u80FD\u56DE\u7B54**\uFF1A\u2460 \u5DE5\u5355\u63CF\u8FF0\u91CC\u6240\u62A5\u7684\u90A3\u6761\u8DEF\u5F84\uFF0C\u81EA\u6D4B\u8DD1\u901A\u4E86\u5417\u3001\u600E\u4E48\u8DD1\u7684\uFF1F\u2461 \u672C\u6B21\u65B0\u5F15\u5165\u6216\u6539\u5199\u7684\u5224\u65AD\uFF0C\u5728\u5B83\u7684\u6BCF\u4E00\u79CD\u72B6\u6001\u4E0B\u7ED3\u8BBA\u5206\u522B\u662F\u4EC0\u4E48\uFF1F\u2462 \u8BCA\u65AD\u91CC\u7684\u65B9\u6848\u6709\u6CA1\u6709\u54EA\u6761\u4F60\u6CA1\u7167\u505A\u3001\u4E3A\u4EC0\u4E48\uFF1F`
       },
       {
         // 修复与冒烟之间必须隔一道上线核验：dev 收尾的**同一刻**下游就解除阻塞，而那时合并才刚发生、
@@ -174906,7 +175097,9 @@ var init_registry3 = __esm({
         dependsOn: ["dev:\u4FEE\u590D\u5B9E\u73B0"],
         role: "\u8FD0\u7EF4\u90E8\u7F72",
         ownerRole: "devops",
-        brief: () => `\u786E\u8BA4\u300C\u4FEE\u590D\u5B9E\u73B0\u300D\u4EA4\u4ED8\u7684\u90A3\u4E2A commit **\u771F\u7684\u8DD1\u5230\u4E86\u76EE\u6807\u73AF\u5883\u4E0A**\uFF0C\u7136\u540E\u653E\u884C\u4E0B\u6E38\u5192\u70DF\u3002
+        brief: () => `**\u4EA7\u51FA**\uFF1A\u4E00\u4EFD\u90E8\u7F72\u8BB0\u5F55\uFF0C\u786E\u8BA4\u300C\u4FEE\u590D\u5B9E\u73B0\u300D\u4EA4\u4ED8\u7684\u90A3\u4E2A commit **\u771F\u7684\u8DD1\u5230\u4E86\u76EE\u6807\u73AF\u5883\u4E0A**\uFF0C\u7136\u540E\u653E\u884C\u4E0B\u6E38\u5192\u70DF\u3002
+**\u8D1F\u8D23\u5230\u54EA**\uFF1A\u53EA\u786E\u8BA4\u300C\u4E0A\u6CA1\u4E0A\u53BB\u300D\uFF0C\u4E0D\u5224\u65AD\u529F\u80FD\u5BF9\u9519\u2014\u2014\u90A3\u662F\u5192\u70DF\u7684\u4E8B\u3002
+**\u4EA4\u4ED8\u524D\u5FC5\u987B\u80FD\u56DE\u7B54**\uFF1A\u2460 \u4E0A\u7EBF\u7684\u662F\u54EA\u4E2A commit\uFF1F\u2461 \u4E0B\u6E38\u8981\u9A8C\u7684\u662F\u54EA\u4E2A\u73AF\u5883\u5730\u5740\uFF08\u5192\u70DF\u5168\u9760\u8FD9\u6761\u77E5\u9053\u53BB\u54EA\u6D4B\uFF09\uFF1F\u2462 \u63A2\u9488\u5B9E\u9645\u8FD4\u56DE\u4E86\u4EC0\u4E48\uFF1F
 
 **\u5224\u636E\u4E24\u6761\uFF0C\u7F3A\u4E00\u4E0D\u53EF**\uFF1A
 \u2460 \u90E8\u7F72\u6D41\u6C34\u7EBF\u5728\u8BE5 commit \u4E0A\u7684\u8FD0\u884C\u7ED3\u8BBA\u4E3A success\uFF1B
@@ -174916,8 +175109,6 @@ var init_registry3 = __esm({
 
 **\u4F60\u63A5\u5230\u8FD9\u4E2A\u4EFB\u52A1\u65F6\uFF0C\u90E8\u7F72\u516B\u6210\u8FD8\u6CA1\u5B8C\u6210**\uFF08\u5408\u5E76\u5230\u4E0A\u7EBF\u8981\u51E0\u5206\u949F\uFF09\u3002\u505A\u6CD5\uFF1A**\u5728\u540C\u4E00\u4E2A\u56DE\u5408\u91CC\u8F6E\u8BE2\u7740\u7B49**\u2014\u2014\u67E5\u4E00\u6B21\u3001\`sleep\` \u4E00\u4F1A\u513F\u3001\u518D\u67E5\u3002\u6BCF\u8F6E\u628A\u89C2\u5BDF\u5230\u7684\u5199\u4E0B\u6765\uFF08\u7B2C\u51E0\u6B21\u67E5\u3001\u6D41\u6C34\u7EBF\u4EC0\u4E48\u72B6\u6001\u3001\u63A2\u9488\u62A5\u7684\u662F\u54EA\u4E2A sha\uFF09\uFF0C\u8BA9\u4EBA\u5728\u8F68\u8FF9\u91CC\u770B\u5F97\u89C1\u4F60\u5728\u7B49\u4EC0\u4E48\u3002**\u7EDD\u4E0D\u8981\u7ED3\u675F\u56DE\u5408\u53BB\u7B49\u5524\u9192**\uFF08\u90A3\u7C7B\u5DE5\u5177\u5728\u8FD9\u91CC\u5FC5\u6B7B\uFF0C\u4F1A\u53D8\u6210\u96F6\u4EA7\u51FA\u4F1A\u8BDD\uFF09\u3002\u7B49\u5230\u4E0A\u9650\uFF08\u5EFA\u8BAE 10 \u5206\u949F\uFF09\u4ECD\u4E0D\u5230\u4F4D\uFF0C\u5C31**\u5982\u5B9E\u4E0A\u62A5\u7B49\u4E0D\u5230\u3001\u8BF4\u660E\u5361\u5728\u54EA\u4E00\u6B65**\uFF0C\u4E0D\u8BB8\u5047\u88C5\u901A\u8FC7\u3002
 
-**\u4EA7\u51FA\u90E8\u7F72\u8BB0\u5F55**\uFF0C\u5FC5\u987B\u5305\u542B\uFF1A\u4E0A\u7EBF\u7684\u662F\u54EA\u4E2A commit\u3001**\u4E0B\u6E38\u8981\u9A8C\u7684\u662F\u54EA\u4E2A\u73AF\u5883\u5730\u5740**\uFF08\u5192\u70DF\u5168\u9760\u8FD9\u6761\u77E5\u9053\u53BB\u54EA\u6D4B\uFF09\u3001\u63A2\u9488\u5B9E\u9645\u8FD4\u56DE\u4E86\u4EC0\u4E48\u3002
-
 **\u4F60\u8BF4\u901A\u8FC7\u4E0D\u7B97\u6570**\u2014\u2014\u6536\u5C3E\u65F6\u673A\u5668\u4F1A\u62FF\u540C\u6837\u7684\u5224\u636E\u5B9E\u6D4B\u590D\u6838\u4E00\u904D\uFF0C\u5BF9\u4E0D\u4E0A\u4F1A\u6253\u56DE\u3002\u6240\u4EE5\u522B\u53EA\u8BFB\u4EE3\u7801\u5C31\u5224\u5B9A\uFF0C\u4E5F\u522B\u5728\u63A2\u9488\u6253\u4E0D\u901A\u65F6\u731C\u300C\u5E94\u8BE5\u597D\u4E86\u300D\u3002\u82E5\u67E5\u660E\u662F\u73AF\u5883/\u6D41\u6C34\u7EBF\u95EE\u9898\u800C\u4E0D\u662F\u4EE3\u7801\u95EE\u9898\uFF0C\u5982\u5B9E\u4E0A\u62A5\u5347\u7EA7\uFF0C**\u4E0D\u8981\u6253\u56DE\u4E0A\u6E38\u7684\u300C\u4FEE\u590D\u5B9E\u73B0\u300D**\u2014\u2014\u8BA9\u5F00\u53D1\u91CD\u5199\u4EE3\u7801\u89E3\u51B3\u4E0D\u4E86\u90E8\u7F72\u73AF\u5883\u7684\u95EE\u9898\u3002`
       },
       {
@@ -174928,7 +175119,15 @@ var init_registry3 = __esm({
         dependsOn: ["cd:\u4E0A\u7EBF\u6838\u9A8C"],
         role: "\u5192\u70DF\u6D4B\u8BD5",
         ownerRole: "smoke",
-        brief: () => `\u7167\u5DE5\u5355\u63CF\u8FF0\u91CC\u6240\u62A5\u7684\u73B0\u8C61\u5728\u771F\u5B9E\u73AF\u5883\u8D70\u4E00\u904D\uFF0C\u786E\u8BA4\u5B83\u786E\u5B9E\u4E0D\u518D\u51FA\u73B0\uFF1B\u987A\u5E26\u786E\u8BA4\u6539\u52A8\u6CA1\u6709\u660E\u663E\u6253\u574F\u76F4\u63A5\u76F8\u90BB\u7684\u8DEF\u5F84\u3002**\u4E0D\u505A\u5168\u91CF\u56DE\u5F52\u3001\u4E0D\u5199\u6D4B\u8BD5\u8BA1\u5212**\u3002\u4EA7\u51FA\u9A8C\u8BC1\u8BB0\u5F55\uFF1A\u6267\u884C\u4E86\u54EA\u4E9B\u547D\u4EE4\u3001\u770B\u5230\u4EC0\u4E48\u8F93\u51FA\u3001\u636E\u6B64\u5224\u5B9A\u901A\u8FC7\u4E0E\u5426\u3002\u5224\u636E\u6765\u81EA\u5DE5\u5355\u63CF\u8FF0\u672C\u8EAB\u2014\u2014\u6CA1\u6709\u771F\u5B9E\u6267\u884C\u8FC7\u4E0D\u7B97\u9A8C\u8BC1\u8FC7\u3002**\u63CF\u8FF0\u91CC\u6CA1\u6709\u53EF\u6267\u884C\u7684\u590D\u73B0\u65B9\u5F0F\u65F6\uFF0C\u5148\u5982\u5B9E\u8BF4\u660E\u8FD9\u4E00\u70B9\uFF0C\u518D\u7ED9\u51FA\u4F60\u5B9E\u9645\u91C7\u7528\u7684\u9A8C\u8BC1\u65B9\u5F0F**\uFF0C\u4E0D\u8981\u56E0\u4E3A\u300C\u4EE3\u7801\u770B\u8D77\u6765\u5BF9\u300D\u5C31\u5224\u901A\u8FC7\u3002\u9A8C\u4E0D\u8FC7\u5982\u5B9E\u6253\u56DE\u300C\u4FEE\u590D\u5B9E\u73B0\u300D\u5E76\u5199\u6E05\u5361\u5728\u54EA\u4E00\u6B65\u3001\u5B9E\u9645\u770B\u5230\u4EC0\u4E48\u3002`,
+        brief: () => `**\u4EA7\u51FA**\uFF1A\u4E00\u4EFD\u9A8C\u8BC1\u8BB0\u5F55\u2014\u2014\u7167\u5DE5\u5355\u63CF\u8FF0\u91CC\u6240\u62A5\u7684\u73B0\u8C61\u5728\u771F\u5B9E\u73AF\u5883\u8D70\u4E00\u904D\uFF0C\u786E\u8BA4\u5B83\u786E\u5B9E\u4E0D\u518D\u51FA\u73B0\u3002
+**\u8D1F\u8D23\u5230\u54EA**\uFF1A\u53EA\u9A8C\u6240\u62A5\u73B0\u8C61 + \u76F4\u63A5\u76F8\u90BB\u7684\u8DEF\u5F84\u6709\u6CA1\u6709\u88AB\u6253\u574F\uFF1B**\u4E0D\u505A\u5168\u91CF\u56DE\u5F52\u3001\u4E0D\u5199\u6D4B\u8BD5\u8BA1\u5212**\u3002
+**\u4EA4\u4ED8\u524D\u5FC5\u987B\u80FD\u56DE\u7B54**\uFF1A\u2460 \u6BCF\u6761\u9A8C\u6536\u6807\u51C6\u4F60\u5B9E\u9645\u6267\u884C\u4E86\u4EC0\u4E48\u547D\u4EE4/\u64CD\u4F5C\u3001\u770B\u5230\u4E86\u4EC0\u4E48\u8F93\u51FA\uFF1F\u2461 \u6709\u6CA1\u6709\u54EA\u4E00\u6761\u4F60\u6CA1\u80FD\u5B9E\u6D4B\uFF1F\u6CA1\u80FD\u5B9E\u6D4B\u7684\uFF0C\u662F**\u88AB\u6D4B\u7269\u6709\u7F3A\u9677**\u3001\u8FD8\u662F**\u9700\u6C42\u672C\u8EAB\u8C41\u514D**\u3001\u8FD8\u662F**\u4F60\u5361\u4F4F\u4E86\u9700\u8981\u4EBA\u5E2E\u5FD9**\u2014\u2014\u9010\u6761\u8BF4\u6E05\u662F\u54EA\u4E00\u79CD\u3002\u2462 \u76F8\u90BB\u4E09\u533A/\u76F8\u90BB\u8DEF\u5F84\u6539\u52A8\u524D\u540E\u884C\u4E3A\u4E00\u81F4\u5417\uFF1F
+
+\u5224\u636E\u6765\u81EA\u5DE5\u5355\u63CF\u8FF0\u672C\u8EAB\u2014\u2014**\u6CA1\u6709\u771F\u5B9E\u6267\u884C\u8FC7\u4E0D\u7B97\u9A8C\u8BC1\u8FC7**\u3002\u63CF\u8FF0\u91CC\u6CA1\u6709\u53EF\u6267\u884C\u7684\u590D\u73B0\u65B9\u5F0F\u65F6\uFF0C\u5148\u5982\u5B9E\u8BF4\u660E\u8FD9\u4E00\u70B9\uFF0C\u518D\u7ED9\u51FA\u4F60\u5B9E\u9645\u91C7\u7528\u7684\u9A8C\u8BC1\u65B9\u5F0F\uFF0C\u4E0D\u8981\u56E0\u4E3A\u300C\u4EE3\u7801\u770B\u8D77\u6765\u5BF9\u300D\u5C31\u5224\u901A\u8FC7\u3002
+
+**\u300C\u76F8\u90BB\u8DEF\u5F84\u6CA1\u6253\u574F\u300D\u2260\u300C\u65E2\u6709\u6D4B\u8BD5\u5168\u7EFF\u300D**\uFF1A\u672C\u6B21\u65B0\u5F15\u5165\u6216\u6539\u5199\u7684\u5224\u65AD\uFF0C\u5728\u5B83\u7684\u6BCF\u4E00\u79CD\u72B6\u6001\u4E0B\u90FD\u8981\u6709\u5BF9\u5E94\u8BC1\u636E\u3002\u65E7\u5957\u4EF6\u91CC\u672C\u6765\u5C31\u6CA1\u6709\u8FD9\u4E9B\u72B6\u6001\u7684\u7528\u4F8B\uFF0C\u5168\u7EFF\u53EA\u8BC1\u660E\u300C\u6CA1\u6253\u574F\u65E7\u884C\u4E3A\u300D\u3002
+
+\u9A8C\u4E0D\u8FC7\u5982\u5B9E\u6253\u56DE\u300C\u4FEE\u590D\u5B9E\u73B0\u300D\u5E76\u5199\u6E05\u5361\u5728\u54EA\u4E00\u6B65\u3001\u5B9E\u9645\u770B\u5230\u4EC0\u4E48\u3002`,
         isFinalOutput: true
       }
     ];
@@ -184706,8 +184905,10 @@ var init_postgres_control_plane = __esm({
         name       text NOT NULL,
         avatar     text,                        -- "blob:<hash>"\uFF0C\u7A7A=\u9ED8\u8BA4
         status     text NOT NULL,               -- active | suspended
-        created_at timestamptz NOT NULL
+        created_at timestamptz NOT NULL,
+        onboarding_variant text                  -- \u767B\u5F55\u540E\u52A9\u7406\u5F15\u5BFC\u53D8\u4F53 A|B\uFF1BNULL=\u7F3A\u7701\u89C6\u4E3A A
       )`);
+        await pool.query(`ALTER TABLE "${s2}".companies ADD COLUMN IF NOT EXISTS onboarding_variant text`);
         await pool.query(`
       CREATE TABLE IF NOT EXISTS "${s2}".company_members (
         company_id text NOT NULL,
@@ -184752,8 +184953,8 @@ var init_postgres_control_plane = __esm({
       // —— 公司 ——
       async createCompany(c) {
         await this.pool.query(
-          `INSERT INTO ${this.s}.companies (id, slug, name, avatar, status, created_at) VALUES ($1,$2,$3,$4,$5,$6)`,
-          [c.id, c.slug, c.name, c.avatar ?? null, c.status, c.createdAt]
+          `INSERT INTO ${this.s}.companies (id, slug, name, avatar, status, created_at, onboarding_variant) VALUES ($1,$2,$3,$4,$5,$6,$7)`,
+          [c.id, c.slug, c.name, c.avatar ?? null, c.status, c.createdAt, c.onboardingVariant ?? null]
         );
       }
       async getCompany(id) {
@@ -184783,6 +184984,10 @@ var init_postgres_control_plane = __esm({
           args.push(patch.status);
           sets.push(`status = $${args.length}`);
         }
+        if (patch.onboardingVariant !== void 0) {
+          args.push(patch.onboardingVariant);
+          sets.push(`onboarding_variant = $${args.length}`);
+        }
         args.push(id);
         const sql = sets.length ? `UPDATE ${this.s}.companies SET ${sets.join(", ")} WHERE id = $${args.length}` : `SELECT 1 FROM ${this.s}.companies WHERE id = $${args.length}`;
         const r = await this.pool.query(sql, args);
@@ -185046,7 +185251,8 @@ var init_postgres_control_plane = __esm({
       name: row.name,
       ...row.avatar !== null && row.avatar !== void 0 ? { avatar: row.avatar } : {},
       status: row.status,
-      createdAt: new Date(row.created_at).toISOString()
+      createdAt: new Date(row.created_at).toISOString(),
+      ...row.onboarding_variant ? { onboardingVariant: row.onboarding_variant } : {}
     });
     rowToMember = (row) => ({
       companyId: row.company_id,
@@ -192366,7 +192572,7 @@ async function runCli(argv, println = console.log) {
     return uploaded;
   };
   const STAGE_COMMANDS = /* @__PURE__ */ new Set(["link", "spawn", "unlink", "cancel", "freeze", "cancel-part", "edit", "assign", "reopen"]);
-  const GLOBAL_NON_FIELD_FLAGS = /* @__PURE__ */ new Set(["server", "token", "dir", "set-json", "clear"]);
+  const GLOBAL_NON_FIELD_FLAGS = /* @__PURE__ */ new Set(["server", "token", "dir", "set-json", "clear", "workspace"]);
   const SPAWN_OWN_FLAGS = /* @__PURE__ */ new Set(["type", "owner", "workspace", "persistence", "title", "brief", "description", "input", "parts-file"]);
   const EDIT_OWN_FLAGS = /* @__PURE__ */ new Set(["title", "brief"]);
   const fieldsFromFlags = (ownFlags) => {
@@ -194206,7 +194412,7 @@ function syncRuntimeAssets(candidateRoots, binDir) {
 }
 
 // src/index.ts
-var PKG_VERSION = true ? "0.1.84" : "dev";
+var PKG_VERSION = true ? "0.1.85" : "dev";
 var OASIS_DIR = path29.join(os9.homedir(), ".oasis");
 var CONFIG_FILE = path29.join(OASIS_DIR, "node-config.json");
 var PID_FILE = path29.join(OASIS_DIR, "node.pid");
@@ -194279,9 +194485,11 @@ exec node "${BIN_FILE}" "$@"
 function setupAutostart() {
   const cmd = `${process.execPath} "${BIN_FILE}" --_daemon`;
   const home = os9.homedir();
+  const pnpmHome = process.env["PNPM_HOME"] || path29.join(home, ".local", "share", "pnpm");
   const extraBins = [
     path29.join(home, ".npm-global", "bin"),
     path29.join(home, ".local", "bin"),
+    path29.join(pnpmHome, "bin"),
     "/usr/local/bin"
   ];
   const daemonPath = sanitizeDaemonPath([process.env["PATH"] ?? "", ...extraBins].filter(Boolean).join(":"));

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "oasis_test",
-  "version": "0.1.84",
+  "version": "0.1.85",
   "description": "Oasis node daemon + CLI — background daemon, auto-start, full server CLI",
   "bin": {
     "oasis": "./dist/index.js"