oasis_test_v2 2.2.37 → 2.2.38

package/dist/index.js

@@ -19656,7 +19656,7 @@ function groupRequirementsForPreview(rows) {
   const out = [];
   for (const [key, b2] of groups) {
     if (b2.source === "type") {
-      out.push({ source: "type", eligible: [], quorum: 1, roles: [key] });
+      out.push({ source: "type", eligible: b2.eligible, quorum: 1, roles: [key] });
     } else {
       out.push({ source: b2.source, eligible: b2.eligible, quorum: 1 });
     }
@@ -20139,9 +20139,14 @@ var init_kernel_bridge = __esm({
         const nodeReqs = a.reviewers ?? [];
         if (nodeReqs.length > 0) {
           const requirements2 = groupRequirementsForPreview(nodeReqs);
-          const namedActors2 = nodeReqs.filter((r) => r.source !== "type").map((r) => ({ actor: r.actor, source: r.source }));
+          const listed = nodeReqs.filter((r) => r.source !== "type").map((r) => ({ actor: r.actor, source: r.source }));
+          for (const r of nodeReqs) {
+            if (r.source === "type" && !listed.some((n) => n.actor === r.actor)) {
+              listed.push({ actor: r.actor, source: "type" });
+            }
+          }
           return {
-            reviewers: namedActors2,
+            reviewers: listed,
             quorum: requirements2.length,
             requirements: requirements2,
             typeName: a.type
@@ -203935,6 +203940,19 @@ function resolveCallbackBase(supplied, requestHost) {
   }
   return `${parsed.origin}${parsed.pathname.replace(/\/+$/, "")}`;
 }
+function companyAmbiguousError(actor, companies) {
+  return new ApiError(
+    400,
+    "COMPANY_AMBIGUOUS",
+    `\u65E0\u6CD5\u786E\u5B9A\u5F53\u524D\u516C\u53F8\uFF1A${actor} \u5C5E\u4E8E\u591A\u5BB6\u516C\u53F8\uFF08${companies.join("\u3001")}\uFF09\uFF0C\u672C\u6B21\u8BF7\u6C42\u6CA1\u6709\u6307\u5B9A\u3002\u8BF7\u7528 x-oasis-company \u5934\u6307\u5B9A\u516C\u53F8 id \u6216 slug\uFF08CLI\uFF1A--company <\u516C\u53F8> \u6216 $OASIS_COMPANY\uFF09\u3002`,
+    { companies: [...companies] }
+  );
+}
+function writeApiError(res, err) {
+  res.writeHead(err.status, { "content-type": "application/json" }).end(JSON.stringify({
+    error: { code: err.code, message: err.message, ...err.details ?? {} }
+  }));
+}
 function toApiError(err) {
   if (err instanceof ApiError) return err;
   const message = err instanceof Error ? err.message : String(err);
@@ -206280,6 +206298,10 @@ async function startOasisServer(opts) {
         }
         if (url.pathname.startsWith("/api/files/")) {
           const company = opts.resolveCompanyContext ? await opts.resolveCompanyContext(actor, req.headers, url.pathname) : void 0;
+          if (company?.kind === "ambiguous") {
+            writeApiError(res, companyAmbiguousError(actor, company.companies));
+            return;
+          }
           if (company && company.kind !== "ok") {
             res.writeHead(403, { "content-type": "application/json" }).end(JSON.stringify({
               error: { code: "FORBIDDEN", message: "\u65E0\u6743\u8BFB\u53D6\u8BE5\u516C\u53F8\u7684\u6587\u4EF6" }
@@ -206320,6 +206342,10 @@ async function startOasisServer(opts) {
         const rawBody = Buffer.concat(chunks).toString("utf8");
         const companyCtx = opts.resolveCompanyContext ? await opts.resolveCompanyContext(actor, req.headers, url.pathname) : void 0;
         const currentCompanyId = companyCtx?.kind === "ok" ? companyCtx.companyId : void 0;
+        if (companyCtx?.kind === "ambiguous") {
+          writeApiError(res, companyAmbiguousError(actor, companyCtx.companies));
+          return;
+        }
         const connectorActorsService = async (companyId) => opts.actors ? (await opts.actors.resolveCtx(companyId ?? currentCompanyId)).service : void 0;
         const wodrafts = opts.resolveWorkorderDrafts ? await opts.resolveWorkorderDrafts(currentCompanyId) : opts.workorderDrafts;
         const wodraftPlannerIssues = (opts.resolveWorkorderDraftPlannerIssues && await opts.resolveWorkorderDraftPlannerIssues(currentCompanyId)) ?? opts.workorderDraftPlannerIssues ?? defaultDraftPlannerIssuesStore;
@@ -264502,6 +264528,10 @@ async function startServe(opts) {
     const raw = headers["x-oasis-company"];
     const selector = typeof raw === "string" && raw ? raw : void 0;
     const me = await companies.currentUser({ actor }, headers);
+    if (!selector && authz.startsWith("Bearer ")) {
+      const active = (await companies.service.listForUser(me.accountId)).filter((c) => c.status === "active");
+      if (active.length > 1) return { kind: "ambiguous", companies: active.map((c) => c.id) };
+    }
     const ctx = await companies.service.resolveCurrentCompany(me.accountId, selector);
     if (!ctx) return { kind: "not-found", ...selector !== void 0 ? { selector } : {} };
     return ctx.isMember ? { kind: "ok", companyId: ctx.company.id } : { kind: "forbidden" };
@@ -271144,7 +271174,7 @@ function declaredBooleanFlags() {
   }
   return out;
 }
-var GLOBAL_FLAGS = Object.freeze(/* @__PURE__ */ new Set(["server", "token", "dir", "workspace"]));
+var GLOBAL_FLAGS = Object.freeze(/* @__PURE__ */ new Set(["server", "token", "dir", "workspace", "company"]));
 var BEHAVIORAL_FLAGS = Object.freeze(/* @__PURE__ */ new Set(["set-json", "clear"]));
 var COMMAND_DECLS = {
   // —— 基础设施 ——
@@ -272918,8 +272948,9 @@ async function runConnectorEffectCli(argv) {
 var USAGE_HEADER = `oasis \u2014\u2014 artifact-centric \u534F\u4F5C\u5185\u6838 CLI\uFF08\u670D\u52A1\u7AEF\u7626\u5BA2\u6237\u7AEF\uFF09
 
 \u547D\u4EE4\u603B\u89C8\uFF08\u6309\u5206\u7EC4\u5217\u51FA\uFF1B\u5355\u6761\u8BE6\u60C5\u4E0E\u53C2\u6570\u7528 \`oasis help <\u547D\u4EE4>\` \u6216 \`oasis <\u547D\u4EE4> --help\`\uFF09\uFF1A`;
-var USAGE_FOOTER = `\u901A\u7528\u53C2\u6570\uFF08\u6240\u6709\u547D\u4EE4\u901A\u7528\uFF09: [--server http://127.0.0.1:7320] [--token <t>] [--dir .oasis]
-      token \u89E3\u6790\u987A\u5E8F: --token > $OASIS_TOKEN > <dir>/operator-token\uFF08serve \u542F\u52A8\u65F6\u5199\u5230 <dir>/operator-token\uFF0C\u672C\u673A CLI \u81EA\u52A8\u8BFB\u53D6\uFF09`;
+var USAGE_FOOTER = `\u901A\u7528\u53C2\u6570\uFF08\u6240\u6709\u547D\u4EE4\u901A\u7528\uFF09: [--server http://127.0.0.1:7320] [--token <t>] [--dir .oasis] [--company <\u516C\u53F8 id \u6216 slug>]
+      token \u89E3\u6790\u987A\u5E8F: --token > $OASIS_TOKEN > <dir>/operator-token\uFF08serve \u542F\u52A8\u65F6\u5199\u5230 <dir>/operator-token\uFF0C\u672C\u673A CLI \u81EA\u52A8\u8BFB\u53D6\uFF09
+      \u516C\u53F8\u89E3\u6790\u987A\u5E8F: --company > $OASIS_COMPANY > \u670D\u52A1\u7AEF\u63A8\u65AD\uFF08token \u81EA\u5E26\u516C\u53F8\u7684\u6309 token\uFF1B\u8FD0\u7EF4/\u4EBA\u7C7B token \u6309\u8D26\u53F7\u6240\u5C5E\u516C\u53F8\uFF09`;
 var USAGE = `${USAGE_HEADER}
 
 ${buildCommandIndex()}
@@ -273160,8 +273191,13 @@ async function waitForCommandAuthorization(base, headers, draftId, fallback) {
     }
   }
 }
-function makeClient(base, token) {
-  const baseHeaders = { authorization: `Bearer ${token}`, "content-type": "application/json" };
+function apiHeaders(token, company) {
+  const headers = { authorization: `Bearer ${token}`, "content-type": "application/json" };
+  if (company) headers["x-oasis-company"] = company;
+  return headers;
+}
+function makeClient(base, token, opts = {}) {
+  const baseHeaders = apiHeaders(token, opts.company);
   const chatSessionId = process.env["OASIS_CHAT_SESSION_ID"];
   if (chatSessionId) baseHeaders["x-chat-session-id"] = chatSessionId;
   const headers = baseHeaders;
@@ -273622,7 +273658,8 @@ async function runCli(argv, println = console.log, progressln = console.error) {
   if (!token) {
     throw new Error(`\u65E0 token\uFF1A\u5148 oasis serve\uFF08\u4F1A\u751F\u6210 ${tokenFile}\uFF09\uFF0C\u6216\u663E\u5F0F --token / $OASIS_TOKEN`);
   }
-  const api = makeClient(base, token);
+  const companySelector = (flags.get("company") ?? process.env["OASIS_COMPANY"])?.trim() || void 0;
+  const api = makeClient(base, token, companySelector ? { company: companySelector } : {});
   if (command === "reconcile-terminal-runs") {
     const runIds = flags.get("run-ids")?.split(",").map((x2) => x2.trim()).filter(Boolean);
     const rows = await api.post("/api/admin/reconcile-terminal-runs", { execute: flags.get("execute") === "true", ...runIds ? { runIds } : {} });
@@ -273744,8 +273781,9 @@ async function runCli(argv, println = console.log, progressln = console.error) {
   switch (command) {
     // 委派一位专家（提案 §7）。四个子形态共用一条命令，靠给了哪个 flag 分流。
     //
-    // ⚠️ **没有 `--company`**：公司与父会话身份一律从签名 claims 取（不变量 3 / §6.1.2）。
-    //   加一个 `--company` 就是把这份保证亲手拆掉——那等于允许 agent 写到别人名下。
+    // ⚠️ **没有自己的 `--company`**：公司与父会话身份一律从签名 claims 取（不变量 3 / §6.1.2）。
+    //   往请求体里加一个公司参数就是把这份保证亲手拆掉——那等于允许 agent 写到别人名下。
+    //   全局 `--company` 只发 `x-oasis-company` 头，服务端对带公司 claims 的 token 不看这个头（见 apiHeaders）。
     // ⚠️ **没有 `--wait-ms`**：一期只做异步。理由不是墙钟不够（chat 墙钟 120 分钟），是三条：
     //   阻塞期间主会话那一轮一直挂着（用户看着「正在输入」十几分钟、他这期间说的话只能排队）、
     //   一个进程挂着空等不产出任何东西、这十几分钟里 serve 重启或节点掉线那一轮就白丢了
@@ -275199,7 +275237,7 @@ ${res.warning}`);
           throw forbidden(e) ?? e;
         }
         const where = scope === "project" ? `\u9879\u76EE ${projectId2}` : scope === "personal" ? `\u5458\u5DE5 ${actorId}` : "\u5168\u7EC4\u7EC7";
-        println(`\u5DF2\u5199\u5165 ${key}\uFF08${where}\uFF0C\u6295\u9012=${delivery}\uFF09`);
+        println(`\u5DF2\u5199\u5165 ${key}\uFF08${companySelector ? `\u516C\u53F8 ${companySelector} \xB7 ` : ""}${where}\uFF0C\u6295\u9012=${delivery}\uFF09`);
         break;
       }
       if (sub === "rm") {
@@ -275215,7 +275253,7 @@ ${res.warning}`);
         } catch (e) {
           throw forbidden(e) ?? e;
         }
-        println(`\u5DF2\u5220\u9664 ${key}\uFF08${scope === "project" ? `\u9879\u76EE ${projectId2}` : scope === "personal" ? `\u5458\u5DE5 ${actorId}` : "\u5168\u7EC4\u7EC7"}\uFF09`);
+        println(`\u5DF2\u5220\u9664 ${key}\uFF08${companySelector ? `\u516C\u53F8 ${companySelector} \xB7 ` : ""}${scope === "project" ? `\u9879\u76EE ${projectId2}` : scope === "personal" ? `\u5458\u5DE5 ${actorId}` : "\u5168\u7EC4\u7EC7"}\uFF09`);
         break;
       }
       throw new Error(`\u672A\u77E5\u5B50\u547D\u4EE4\uFF1Aoasis var ${sub ?? ""}
@@ -275603,7 +275641,7 @@ ${res.warning}`);
     // A3：成图事务（与 intervene 同管线、分语义命名——铺图不是手术）
     case "intervene": {
       const plan = JSON.parse(readFileArg(need(flags, "file")));
-      const headers = { authorization: `Bearer ${token}`, "content-type": "application/json" };
+      const headers = apiHeaders(token, companySelector);
       const previewRes = await fetch(`${base}/api/intervention/preview`, {
         method: "POST",
         headers,
@@ -276646,7 +276684,7 @@ function shimScript() {
 }
 
 // src/index.ts
-var PKG_VERSION = true ? "2.2.37" : "dev";
+var PKG_VERSION = true ? "2.2.38" : "dev";
 var LOCAL_BIN = localBin();
 var NPM_PREFIX = npmPrefix();
 var INSTANCE = DEFAULT_INSTANCE;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "oasis_test_v2",
-  "version": "2.2.37",
+  "version": "2.2.38",
   "description": "Oasis node daemon + CLI — background daemon, auto-start, full server CLI",
   "bin": {
     "oasis": "./dist/index.js"
@@ -26,6 +26,6 @@
     "node": ">=20"
   },
   "oasisRelease": {
-    "sourceHead": "e9498c25c512b5edf75fde28c132f60d079b20a0"
+    "sourceHead": "55454aeb4d2b4d5b0b530b8777cd1b62d86803c5"
   }
 }