oasis_test_v2 2.2.67 → 2.2.68

package/dist/index.js

@@ -1303,6 +1303,15 @@ var init_telemetry = __esm({
 });
 
 // ../contract/src/trace.ts
+function legacyScopeIsEmpty(scope2) {
+  return scope2.artifactIds.length === 0 && scope2.chatSessionIds.length === 0 && (scope2.runtimeInstanceIds?.length ?? 0) === 0;
+}
+function legacyScopeMatcher(scope2) {
+  const artifacts = new Set(scope2.artifactIds);
+  const sessions = new Set(scope2.chatSessionIds);
+  const runtimes = new Set(scope2.runtimeInstanceIds ?? []);
+  return (run) => run.artifactId != null && artifacts.has(run.artifactId) || run.chatSessionId != null && sessions.has(run.chatSessionId) || run.runtimeInstanceId != null && runtimes.has(run.runtimeInstanceId);
+}
 var DISPLAY_CNY_PER_USD, USAGE_POINT_FINAL_SEQ;
 var init_trace = __esm({
   "../contract/src/trace.ts"() {
@@ -215505,6 +215514,7 @@ var init_memory_trace_store = __esm({
         return run ? this.decorate(structuredClone(run)) : null;
       }
       async listRuns(filter) {
+        const inScope2 = filter.legacyScope ? legacyScopeMatcher(filter.legacyScope) : null;
         let items = [...this.runs.values()].filter((r) => {
           if (filter.actorId && r.actorId !== filter.actorId) return false;
           if (filter.artifactId && r.artifactId !== filter.artifactId) return false;
@@ -215512,6 +215522,7 @@ var init_memory_trace_store = __esm({
           if (filter.runtimeKind && r.runtimeKind !== filter.runtimeKind) return false;
           if (filter.status && r.status !== filter.status) return false;
           if (filter.rootRunId && r.rootRunId !== filter.rootRunId) return false;
+          if (inScope2 && !inScope2(r)) return false;
           if (filter.from && r.startedAt < filter.from) return false;
           if (filter.to && r.startedAt > filter.to) return false;
           if (filter.excludeAnalysis) {
@@ -216223,6 +216234,7 @@ var init_memory_trace_store = __esm({
       }
       /** 按维度查聚合用量。 */
       async queryUsageStats(filter) {
+        if (filter.legacyScope) return this.queryUsageStatsScoped(filter, filter.legacyScope);
         const gran = filter.granularity ?? "hour";
         const out = [];
         for (const row of this.usageAggregates.values()) {
@@ -216250,6 +216262,59 @@ var init_memory_trace_store = __esm({
         }
         return out.sort((a, b2) => a.bucket < b2.bucket ? 1 : a.bucket > b2.bucket ? -1 : a.actorId.localeCompare(b2.actorId));
       }
+      /**
+       * legacy 共享账本上的按维度用量：绕开聚合行、按租户谓词从 runs 现算
+       * （与 PostgresTraceStore.queryUsageStatsScoped 同口径——聚合行里没有 artifact / chat_session，
+       *  表达不了归属；共用同一份 run 才能对上数）。
+       */
+      async queryUsageStatsScoped(filter, scope2) {
+        if (legacyScopeIsEmpty(scope2)) return [];
+        const inScope2 = legacyScopeMatcher(scope2);
+        const gran = filter.granularity ?? "hour";
+        const acc = /* @__PURE__ */ new Map();
+        for (const run of this.runs.values()) {
+          if (run.usage == null) continue;
+          if (!inScope2(run)) continue;
+          if (filter.actorIds?.length && !filter.actorIds.includes(run.actorId)) continue;
+          if (filter.runtimeInstanceIds?.length && !filter.runtimeInstanceIds.includes(run.runtimeInstanceId ?? "")) continue;
+          if (filter.runtimeKinds?.length && !filter.runtimeKinds.includes(run.runtimeKind)) continue;
+          if (filter.effectiveModels?.length && !filter.effectiveModels.includes(run.effectiveModel ?? "")) continue;
+          const started = new Date(run.startedAt);
+          const bucket2 = gran === "day" ? this.truncDayISO(started) : this.truncHourISO(started);
+          if (filter.from && bucket2 < (gran === "day" ? this.truncDayISO(new Date(filter.from)) : this.truncHourISO(new Date(filter.from)))) continue;
+          if (filter.to && bucket2 > filter.to) continue;
+          const u = run.usage;
+          const input = u.inputTokens ?? 0;
+          const output = u.outputTokens ?? 0;
+          const key2 = `${run.actorId}|${run.runtimeInstanceId ?? ""}|${run.effectiveModel ?? ""}|${bucket2}`;
+          const row = acc.get(key2);
+          if (row) {
+            row.runCount += 1;
+            row.inputTokens += input;
+            row.outputTokens += output;
+            row.totalTokens += u.totalTokens ?? input + output;
+            row.cacheReadTokens += u.cacheReadTokens ?? 0;
+            row.cacheCreationTokens += u.cacheCreationTokens ?? 0;
+            row.costUsdMicros += u.costUsdMicros ?? 0;
+          } else {
+            acc.set(key2, {
+              actorId: run.actorId,
+              runtimeInstanceId: run.runtimeInstanceId ?? null,
+              runtimeKind: run.runtimeKind,
+              effectiveModel: run.effectiveModel ?? null,
+              bucket: bucket2,
+              runCount: 1,
+              inputTokens: input,
+              outputTokens: output,
+              totalTokens: u.totalTokens ?? input + output,
+              cacheReadTokens: u.cacheReadTokens ?? 0,
+              cacheCreationTokens: u.cacheCreationTokens ?? 0,
+              costUsdMicros: u.costUsdMicros ?? 0
+            });
+          }
+        }
+        return [...acc.values()].sort((a, b2) => a.bucket < b2.bucket ? 1 : a.bucket > b2.bucket ? -1 : a.actorId.localeCompare(b2.actorId));
+      }
     };
   }
 });
@@ -244209,8 +244274,14 @@ var init_service7 = __esm({
       listRunLinks(runId) {
         return this.store.listRunLinks(runId);
       }
-      /** run 详情聚合（§4.3）：run + links + toolCalls + children + 派生 stats。 */
-      async getRunDetail(id) {
+      /**
+       * run 详情聚合（§4.3）：run + links + toolCalls + children + 派生 stats。
+       *
+       * `scopeFilters` 由调用方给（HTTP 读面传租户闸门，内部调用不给）：子 run 是用
+       * `listRuns({ rootRunId })` 捞的，共享 legacy 账本上这一步必须带同一条归属谓词，
+       * 否则详情页的「子运行」会成为列表谓词之外的第二个出口。
+       */
+      async getRunDetail(id, scopeFilters = (f2) => f2) {
         const run = await this.store.getRun(id);
         if (!run) return null;
         const [links, toolCalls, events] = await Promise.all([
@@ -244218,7 +244289,7 @@ var init_service7 = __esm({
           this.store.listToolCalls(id),
           this.store.listEvents(id, {})
         ]);
-        const sameRoot = await this.store.listRuns({ rootRunId: run.rootRunId, limit: 1e3 });
+        const sameRoot = await this.store.listRuns(scopeFilters({ rootRunId: run.rootRunId, limit: 1e3 }));
         const children = sameRoot.items.filter((r) => r.parentRunId === id).map((r) => this.withDisplayCost(r));
         const stats = {
           eventCount: events.length,
@@ -244229,9 +244300,14 @@ var init_service7 = __esm({
         };
         return { run: this.withDisplayCost(run), links, toolCalls, children, stats };
       }
-      /** 聚合统计（§4.1 /api/traces/summary）。v1 全量扫描，量大后改投影表。 */
-      async summary() {
-        const { items } = await this.store.listRuns({ limit: 1e3 });
+      /**
+       * 聚合统计（§4.1 /api/traces/summary）。v1 全量扫描，量大后改投影表。
+       *
+       * `filter` 由调用方给：这几个计数是 `listRuns` 扫出来的，共享 legacy 账本上必须带同一条
+       * 归属谓词——轨迹页页头的「共 N 条运行」就是它，不带谓词就是把别家的运行数报给本公司。
+       */
+      async summary(filter = {}) {
+        const { items } = await this.store.listRuns({ ...filter, limit: 1e3 });
         const byStatus = /* @__PURE__ */ new Map();
         const byKind = /* @__PURE__ */ new Map();
         for (const r of items) {
@@ -244499,6 +244575,26 @@ var init_map2 = __esm({
   }
 });
 
+// ../server/src/domains/trace/read-scope.ts
+function scopedTraceFilters(filter, scope2) {
+  return scope2.companyScoped ? filter : { ...filter, legacyScope: scope2.legacyScope };
+}
+function traceReadAllows(scope2) {
+  return scope2.companyScoped ? () => true : legacyScopeMatcher(scope2.legacyScope);
+}
+var COMPANY_SCOPED_TRACE_READ, DENY_ALL_TRACE_READ;
+var init_read_scope = __esm({
+  "../server/src/domains/trace/read-scope.ts"() {
+    "use strict";
+    init_src();
+    COMPANY_SCOPED_TRACE_READ = { companyScoped: true };
+    DENY_ALL_TRACE_READ = {
+      companyScoped: false,
+      legacyScope: { artifactIds: [], chatSessionIds: [], runtimeInstanceIds: [] }
+    };
+  }
+});
+
 // ../server/src/domains/trace/routes.ts
 function parseFilters(q2) {
   const f2 = {};
@@ -244527,36 +244623,53 @@ function parseFilters(q2) {
 }
 function traceDomain(opts) {
   const svc = async (req) => opts.resolveService ? await opts.resolveService(req.auth?.companyId) : opts.service;
+  const scopeOf = async (req) => opts.resolveReadScope ? await opts.resolveReadScope(req.auth?.companyId) : COMPANY_SCOPED_TRACE_READ;
+  const requireRun = async (req) => {
+    const id = req.params.id;
+    const service = await svc(req);
+    const run = await service.getRun(id);
+    if (!run || !traceReadAllows(await scopeOf(req))(run)) {
+      throw new ApiError(404, "NOT_FOUND", `\u6CA1\u6709\u8FD9\u4E2A run\uFF1A${id}`);
+    }
+    return { service, id };
+  };
   return (router) => {
     router.get("/api/traces/runs", async (req) => {
-      return { status: 200, body: await (await svc(req)).listRuns(parseFilters(req.query)) };
+      const filter = scopedTraceFilters(parseFilters(req.query), await scopeOf(req));
+      return { status: 200, body: await (await svc(req)).listRuns(filter) };
     });
     router.get("/api/traces/summary", async (req) => {
-      return { status: 200, body: await (await svc(req)).summary() };
+      return { status: 200, body: await (await svc(req)).summary(scopedTraceFilters({}, await scopeOf(req))) };
     });
     router.get("/api/traces/runs/:id", async (req) => {
-      const detail = await (await svc(req)).getRunDetail(req.params.id);
-      if (!detail) throw new ApiError(404, "NOT_FOUND", `\u6CA1\u6709\u8FD9\u4E2A run\uFF1A${req.params.id}`);
+      const scope2 = await scopeOf(req);
+      const detail = await (await svc(req)).getRunDetail(req.params.id, (f2) => scopedTraceFilters(f2, scope2));
+      if (!detail || !traceReadAllows(scope2)(detail.run)) {
+        throw new ApiError(404, "NOT_FOUND", `\u6CA1\u6709\u8FD9\u4E2A run\uFF1A${req.params.id}`);
+      }
       return { status: 200, body: detail };
     });
     router.get("/api/traces/runs/:id/events", async (req) => {
+      const { service, id } = await requireRun(req);
       const afterSeq = req.query.get("afterSeq") ?? req.query.get("cursor");
       const limit = req.query.get("limit");
       return {
         status: 200,
-        body: await (await svc(req)).listEvents(req.params.id, {
+        body: await service.listEvents(id, {
           ...afterSeq !== null && Number.isFinite(Number(afterSeq)) ? { afterSeq: Number(afterSeq) } : {},
           ...limit !== null && Number.isFinite(Number(limit)) ? { limit: Number(limit) } : {}
         })
       };
     });
     router.get("/api/traces/runs/:id/tool-calls", async (req) => {
-      return { status: 200, body: { items: await (await svc(req)).listToolCalls(req.params.id) } };
+      const { service, id } = await requireRun(req);
+      return { status: 200, body: { items: await service.listToolCalls(id) } };
     });
     router.get("/api/traces/runs/:id/bundle", async (req) => {
       if (!opts.readBundleFile) return { status: 404, body: { error: "bundle not available" } };
       const rel = req.query.get("path");
       if (!rel) return { status: 400, body: { error: "path query required" } };
+      await requireRun(req);
       const content3 = opts.readBundleFile(req.params.id, rel);
       if (content3 == null) return { status: 404, body: { error: "not found" } };
       return { status: 200, body: { path: rel, content: content3 } };
@@ -244568,7 +244681,9 @@ function traceDomain(opts) {
       const runtimeKinds = q2.get("runtimeKind")?.split(",").filter(Boolean);
       const effectiveModels = q2.get("model")?.split(",").filter(Boolean);
       const granularity = q2.get("granularity") ?? "hour";
+      const scope2 = await scopeOf(req);
       const items = await (await svc(req)).queryUsageStats({
+        ...scope2.companyScoped ? {} : { legacyScope: scope2.legacyScope },
         ...actorIds?.length ? { actorIds } : {},
         ...runtimeInstanceIds?.length ? { runtimeInstanceIds } : {},
         ...runtimeKinds?.length ? { runtimeKinds } : {},
@@ -244693,6 +244808,7 @@ var init_routes9 = __esm({
     init_src();
     init_router();
     init_map2();
+    init_read_scope();
   }
 });
 
@@ -244768,6 +244884,7 @@ function createTraceDomain(opts) {
     register: traceDomain({
       service,
       ...resolveService ? { resolveService } : {},
+      ...opts.resolveReadScope ? { resolveReadScope: opts.resolveReadScope } : {},
       readBundleFile: opts.readBundleFile
     })
   };
@@ -244779,6 +244896,7 @@ var init_trace2 = __esm({
     init_routes9();
     init_service7();
     init_routes9();
+    init_read_scope();
     init_sink();
     init_chat_parts();
     init_trace_health();
@@ -257454,6 +257572,18 @@ function companyIdFromMetadata(metadata) {
   const cid = metadata.companyId;
   return typeof cid === "string" && cid.trim() ? cid : void 0;
 }
+function legacyScopeSql(scope2, args, prefix = "") {
+  const parts = [];
+  args.push(scope2.artifactIds);
+  parts.push(`${prefix}artifact_id = ANY($${args.length}::text[])`);
+  args.push(scope2.chatSessionIds);
+  parts.push(`${prefix}chat_session_id = ANY($${args.length}::text[])`);
+  if (scope2.runtimeInstanceIds?.length) {
+    args.push(scope2.runtimeInstanceIds);
+    parts.push(`${prefix}runtime_instance_id = ANY($${args.length}::text[])`);
+  }
+  return `(${parts.join(" OR ")})`;
+}
 function normalizeUsagePoint2(input, now) {
   let seq;
   if (input.kind === "checkpoint") {
@@ -258248,13 +258378,19 @@ var init_postgres_trace = __esm({
         if (filter.runtimeKind) push2((n) => `r.runtime_kind = $${n}`, filter.runtimeKind);
         if (filter.status) push2((n) => `r.status = $${n}`, filter.status);
         if (filter.rootRunId) push2((n) => `r.root_run_id = $${n}`, filter.rootRunId);
+        if (filter.legacyScope) {
+          if (legacyScopeIsEmpty(filter.legacyScope)) return { items: [], nextCursor: null };
+          conds.push(legacyScopeSql(filter.legacyScope, args, "r."));
+        }
         if (filter.from) push2((n) => `r.started_at >= $${n}`, filter.from);
         if (filter.to) push2((n) => `r.started_at <= $${n}`, filter.to);
         if (filter.excludeAnalysis) conds.push(`(r.metadata->>'analyzedRunId') IS NULL`);
         if (filter.cursor) {
+          const cursorArgs = [filter.cursor];
+          const cursorScope = filter.legacyScope ? ` AND ${legacyScopeSql(filter.legacyScope, cursorArgs)}` : "";
           const c = await this.pool.query(
-            `SELECT started_at, id FROM ${this.s}.agent_runs WHERE id = $1`,
-            [filter.cursor]
+            `SELECT started_at, id FROM ${this.s}.agent_runs WHERE id = $1${cursorScope}`,
+            cursorArgs
           );
           if (c.rows[0]) {
             args.push(c.rows[0].started_at);
@@ -259387,6 +259523,7 @@ var init_postgres_trace = __esm({
       }
       /** 按维度查聚合用量。granularity=day 查 daily 表，否则 hourly。 */
       async queryUsageStats(filter) {
+        if (filter.legacyScope) return this.queryUsageStatsScoped(filter, filter.legacyScope);
         const gran = filter.granularity ?? "hour";
         const table = gran === "day" ? "agent_usage_daily" : "agent_usage_hourly";
         const timeCol = gran === "day" ? "day" : "hour";
@@ -259427,6 +259564,67 @@ var init_postgres_trace = __esm({
           costUsdMicros: Number(row.cost_usd_micros)
         }));
       }
+      /**
+       * legacy 共享账本上的按维度用量：**绕开聚合表，按租户谓词从 `agent_runs` 现算**。
+       *
+       * 为什么不能用 `agent_usage_hourly/daily`：那两张表的仲裁键里没有 artifact / chat_session，
+       * 表达不了 {@link LegacyTenantScope}；而且 legacy 落点写入时 `companyIdForWrite` 拿不到
+       * `billingCompanyId`、run.metadata 又不带 companyId，所有未切公司的行都落在同一个
+       * `company_id='default'` 桶里——读它就是所有未切公司互相看见（2026-09-22 泄漏的 usage 面）。
+       *
+       * 口径与 {@link backfillUsageAggregates} 完全一致（只算 `usage` 是对象的 run、按 `started_at`
+       * 落桶、同一组 GROUP BY 键），所以 company-primary 公司读聚合表、legacy 公司现算，两条路
+       * 对同一批 run 给出同一组数字。
+       */
+      async queryUsageStatsScoped(filter, scope2) {
+        if (legacyScopeIsEmpty(scope2)) return [];
+        const gran = filter.granularity ?? "hour";
+        const args = [];
+        const conds = [`jsonb_typeof(usage) = 'object'`, legacyScopeSql(scope2, args)];
+        const push2 = (sql, val) => {
+          args.push(val);
+          conds.push(sql.replace("$$", `$${args.length}`));
+        };
+        if (filter.actorIds?.length) push2(`actor_id = ANY($$)`, filter.actorIds);
+        if (filter.runtimeInstanceIds?.length) push2(`runtime_instance_id = ANY($$)`, filter.runtimeInstanceIds);
+        if (filter.runtimeKinds?.length) push2(`runtime_kind = ANY($$)`, filter.runtimeKinds);
+        if (filter.effectiveModels?.length) push2(`effective_model = ANY($$)`, filter.effectiveModels);
+        const bucket2 = gran === "day" ? `date_trunc('day', started_at::timestamptz)` : `date_trunc('hour', started_at::timestamptz)`;
+        if (filter.from) {
+          push2(`${bucket2} >= $$`, gran === "day" ? this.truncDayISO(new Date(filter.from)) : this.truncHourISO(new Date(filter.from)));
+        }
+        if (filter.to) push2(`${bucket2} <= $$`, filter.to);
+        const r = await this.pool.query(
+          `SELECT actor_id, runtime_instance_id, runtime_kind, effective_model,
+              ${gran === "day" ? `${bucket2}::date::text` : bucket2} AS bucket,
+              COUNT(*)::bigint AS run_count,
+              COALESCE(SUM(COALESCE((usage->>'inputTokens')::bigint, 0)), 0) AS input_tokens,
+              COALESCE(SUM(COALESCE((usage->>'outputTokens')::bigint, 0)), 0) AS output_tokens,
+              COALESCE(SUM(COALESCE((usage->>'totalTokens')::bigint, 0)), 0) AS total_tokens,
+              COALESCE(SUM(COALESCE((usage->>'cacheReadTokens')::bigint, 0)), 0) AS cache_read_tokens,
+              COALESCE(SUM(COALESCE((usage->>'cacheCreationTokens')::bigint, 0)), 0) AS cache_creation_tokens,
+              COALESCE(SUM(COALESCE((usage->>'costUsdMicros')::bigint, 0)), 0) AS cost_usd_micros
+         FROM ${this.s}.agent_runs
+        WHERE ${conds.join(" AND ")}
+        GROUP BY actor_id, runtime_instance_id, runtime_kind, effective_model, ${bucket2}
+        ORDER BY ${bucket2} DESC, runtime_instance_id, actor_id, effective_model`,
+          args
+        );
+        return r.rows.map((row) => ({
+          actorId: row.actor_id,
+          runtimeInstanceId: row.runtime_instance_id ?? null,
+          runtimeKind: row.runtime_kind,
+          effectiveModel: row.effective_model ?? null,
+          bucket: this.formatUsageBucket(row.bucket, gran),
+          runCount: Number(row.run_count),
+          inputTokens: Number(row.input_tokens),
+          outputTokens: Number(row.output_tokens),
+          totalTokens: Number(row.total_tokens),
+          cacheReadTokens: Number(row.cache_read_tokens),
+          cacheCreationTokens: Number(row.cache_creation_tokens),
+          costUsdMicros: Number(row.cost_usd_micros)
+        }));
+      }
       /** hour → 整点 ISO；day → YYYY-MM-DD（优先吃 SQL ::text，Date 兜底用本地日历日）。 */
       formatUsageBucket(raw, gran) {
         if (gran === "day") {
@@ -272317,6 +272515,7 @@ __export(src_exports2, {
   CHAT_TURN_ORPHAN_GRACE_MS: () => CHAT_TURN_ORPHAN_GRACE_MS,
   CLEAR_SESSION_RUNTIME_HINT: () => CLEAR_SESSION_RUNTIME_HINT,
   COMPANY_CROSS_TENANT_PREFIXES: () => COMPANY_CROSS_TENANT_PREFIXES,
+  COMPANY_SCOPED_TRACE_READ: () => COMPANY_SCOPED_TRACE_READ,
   CONSOLE_ROUTE_TABLES: () => CONSOLE_ROUTE_TABLES,
   CONVERSATIONAL_ESCALATION_TOOLS: () => CONVERSATIONAL_ESCALATION_TOOLS,
   CONVERSATIONAL_ETHOS: () => CONVERSATIONAL_ETHOS,
@@ -272345,6 +272544,7 @@ __export(src_exports2, {
   DEFAULT_SIMPLE_QUERY_MAX_CHARS: () => DEFAULT_SIMPLE_QUERY_MAX_CHARS,
   DEFAULT_TERMINAL_MAX_AGE_MS: () => DEFAULT_TERMINAL_MAX_AGE_MS,
   DELIVERY_REPAIR_BATCH: () => DELIVERY_REPAIR_BATCH,
+  DENY_ALL_TRACE_READ: () => DENY_ALL_TRACE_READ,
   DISPATCH_DROP_BACKOFF_MS: () => DISPATCH_DROP_BACKOFF_MS,
   DISPATCH_DROP_GRACE_MS: () => DISPATCH_DROP_GRACE_MS,
   DISPATCH_DROP_MAX_PER_TICK: () => DISPATCH_DROP_MAX_PER_TICK,
@@ -272830,6 +273030,7 @@ __export(src_exports2, {
   scanFrontmatterEntries: () => scanFrontmatterEntries,
   scanSessionOutputs: () => scanSessionOutputs,
   scanZeroOutputBreaker: () => scanZeroOutputBreaker,
+  scopedTraceFilters: () => scopedTraceFilters,
   scoreKnowledgeChunk: () => scoreKnowledgeChunk,
   sealKnowledgeSnapshot: () => sealKnowledgeSnapshot,
   seedRoleCatalog: () => seedRoleCatalog,
@@ -272872,6 +273073,7 @@ __export(src_exports2, {
   toYamlDoubleQuoted: () => toYamlDoubleQuoted,
   touchKey: () => touchKey,
   traceDomain: () => traceDomain,
+  traceReadAllows: () => traceReadAllows,
   trajectoryEventToRunEvent: () => trajectoryEventToRunEvent,
   trustedDelegationInvocationId: () => trustedDelegationInvocationId,
   trustedKnowledgeInvocationId: () => trustedKnowledgeInvocationId,
@@ -277050,6 +277252,8 @@ async function startServe(opts) {
   const trace = createTraceDomain({
     store: traceStore,
     ...pgDsn ? { resolveStore: (cid) => traceStoreFor(cid) } : {},
+    // 轨迹读面的租户闸门。PG 部署必给——不给就是未切 `company-primary` 的公司在共享账本上互相可见。
+    resolveReadScope: (cid) => traceReadScopeFor(cid),
     readBundleFile: (id, rel) => trajReader.readBundleFile(id, rel)
   });
   const traceHealth = createTraceHealth();
@@ -278068,6 +278272,33 @@ async function startServe(opts) {
   const chatTurnsFor = async (companyId) => chatStoreRouter ? (await chatStoreRouter.open(companyId, "chatTurns")).chatTurns ?? chatTurnStore : chatTurnStore;
   const chatItemsFor = async (companyId) => chatStoreRouter ? (await chatStoreRouter.open(companyId, "chatItems")).chatItems : void 0;
   const chatStoreFor = async (companyId) => chatStoreRouter ? (await chatStoreRouter.open(companyId)).chatSessions : chatSessionStore;
+  const traceReadScopeFor = async (companyId) => {
+    if (!pgPool) return COMPANY_SCOPED_TRACE_READ;
+    if (!companyId) return DENY_ALL_TRACE_READ;
+    try {
+      const store = await traceStoreFor(companyId);
+      if (store instanceof CutoverAwareTraceStore && (await store.resolveUsageReadTarget()).companyScoped) {
+        return COMPANY_SCOPED_TRACE_READ;
+      }
+      const [model, sessions, runtimes] = await Promise.all([
+        getEngine(companyId).then((e) => e.kernel.model),
+        chatStoreFor(companyId).then((s2) => s2.listUsageSessionMeta ? s2.listUsageSessionMeta() : []),
+        // 与 usageRead.sources.listRuntimes 同一条读：按公司过滤，归属未定（company_id IS NULL）的存量行不算本公司。
+        nodeStore.listRuntimes(void 0, { companyId })
+      ]);
+      return {
+        companyScoped: false,
+        legacyScope: {
+          artifactIds: [...model.artifacts.keys()],
+          chatSessionIds: sessions.map((s2) => s2.id),
+          runtimeInstanceIds: runtimes.map((r) => r.id)
+        }
+      };
+    } catch (err) {
+      console.warn(`[trace] \u89E3\u6790 ${companyId} \u7684\u8F68\u8FF9\u8BFB\u95F8\u95E8\u5931\u8D25\uFF0C\u672C\u6B21\u6309\u300C\u65E0\u53EF\u89C1\u8BB0\u5F55\u300D\u5904\u7406\uFF1A${String(err)}`);
+      return DENY_ALL_TRACE_READ;
+    }
+  };
   const artifactStateFor = async (companyId) => {
     if (!chatStoreRouter) return artifactStateStore;
     const stores = await chatStoreRouter.open(companyId, "work-order-files");
@@ -287843,7 +288074,7 @@ async function waitForCommandAuthorization(base, headers, draftId, fallback) {
     }
   }
 }
-var CLI_VERSION = "2.2.67" ? "2.2.67" : "dev";
+var CLI_VERSION = "2.2.68" ? "2.2.68" : "dev";
 function apiHeaders(token, company) {
   const headers = {
     authorization: `Bearer ${token}`,
@@ -291649,7 +291880,7 @@ function shimScript() {
 }
 
 // src/index.ts
-var PKG_VERSION = true ? "2.2.67" : "dev";
+var PKG_VERSION = true ? "2.2.68" : "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.67",
+  "version": "2.2.68",
   "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": "4e649f6aa7bc6633070aefaf241972ac1c42f269"
+    "sourceHead": "c84c49eb61b038824f5eb651f7653d8fcf31e318"
   }
 }