oasis_test 0.1.135 → 0.1.136

package/dist/index.js

@@ -157798,9 +157798,12 @@ async function runProtocolSession(job, cfg) {
       unlockWorkdir(dir);
       touchMetaExit(dir, { at: (/* @__PURE__ */ new Date()).toISOString(), ...info.reason ? { reason: info.reason } : {}, runId: id });
     }
+    const extras = cfg.exitExtras?.(state) ?? {};
     exited = {
       ...info,
       ...sid && !info.runtimeSessionId ? { runtimeSessionId: sid } : {},
+      ...extras.usage && !info.usage ? { usage: extras.usage } : {},
+      ...extras.model && !info.model ? { model: extras.model } : {},
       ...info.workdirRef ? {} : { workdirRef: dir },
       ...info.transcriptRef ? {} : { transcriptRef }
     };
@@ -157961,6 +157964,26 @@ var init_protocol_session = __esm({
 function codexNum(v2) {
   return typeof v2 === "number" && Number.isFinite(v2) ? v2 : 0;
 }
+function parseCodexAppServerTurnUsage(params) {
+  const p2 = params;
+  const last = p2?.tokenUsage?.last;
+  if (!last || typeof last !== "object") return void 0;
+  return {
+    input: codexNum(last["inputTokens"]),
+    cacheRead: codexNum(last["cachedInputTokens"]),
+    cacheWrite: codexNum(last["cacheWriteInputTokens"]),
+    output: codexNum(last["outputTokens"]) + codexNum(last["reasoningOutputTokens"])
+  };
+}
+function addCodexBuckets(acc, add) {
+  acc.input += add.input;
+  acc.cacheRead += add.cacheRead;
+  acc.cacheWrite += add.cacheWrite;
+  acc.output += add.output;
+}
+function codexUsageFromBuckets(b2) {
+  return usageFromBuckets(b2);
+}
 function parseCodexSessionId(lines) {
   const first = lines[0];
   if (!first) return void 0;
@@ -158445,7 +158468,17 @@ var init_codex = __esm({
           env: this.opts.env,
           runtimeKind: "codex",
           syncSkills: this.opts.syncSkills,
-          createState: () => ({ threadId: void 0, turnId: void 0, active: false, codex: createCodexNormalizeState() }),
+          createState: () => ({
+            threadId: void 0,
+            turnId: void 0,
+            active: false,
+            codex: createCodexNormalizeState(),
+            // 本次 run 的用量：逐轮累加 `thread/tokenUsage/updated` 的 `last`（见该解析函数注释）。
+            usage: { input: 0, cacheRead: 0, cacheWrite: 0, output: 0 },
+            sawUsage: false,
+            // `thread/started` 会直接给出本会话 rollout 的绝对路径——取实际模型时不必再满盘搜。
+            rolloutPath: void 0
+          }),
           initialCommand: () => ({
             jsonrpc: "2.0",
             method: "initialize",
@@ -158494,6 +158527,14 @@ ${task}` : task;
             if (method === "thread/started") {
               const thread = params?.thread;
               if (typeof thread?.id === "string") state.threadId = thread.id;
+              if (typeof thread?.path === "string") state.rolloutPath = thread.path;
+            }
+            if (method === "thread/tokenUsage/updated") {
+              const turn = parseCodexAppServerTurnUsage(params);
+              if (turn) {
+                addCodexBuckets(state.usage, turn);
+                state.sawUsage = true;
+              }
             }
             if (method === "turn/started") {
               const turn = params?.turn;
@@ -158523,6 +158564,20 @@ ${task}` : task;
             return true;
           },
           runtimeSessionId: (state) => state.threadId,
+          exitExtras: (state) => {
+            let model;
+            if (state.rolloutPath) {
+              try {
+                model = parseCodexModel(fs10.readFileSync(state.rolloutPath, "utf8").split("\n"));
+              } catch {
+              }
+            }
+            model ??= resolvedModel2;
+            return {
+              ...state.sawUsage ? { usage: codexUsageFromBuckets(state.usage) } : {},
+              ...model ? { model } : {}
+            };
+          },
           async append(input, state, send) {
             if (!state.threadId || !state.turnId) return { accepted: false, reason: "rejected" };
             if (input.interrupt) {
@@ -199107,6 +199162,15 @@ function attachmentArgs(args) {
     ...typeof a.contentType === "string" ? { contentType: a.contentType } : {}
   }));
 }
+function coordinatorOfWorkspaceInKernel(kernel, workspaceId) {
+  for (const artifact of kernel.model.artifacts.values()) {
+    if (artifact.workspace !== workspaceId) continue;
+    if (artifact.type !== "brief") continue;
+    const raw = artifact.fields?.["manager"];
+    if (typeof raw === "string" && raw) return raw;
+  }
+  return null;
+}
 function hasOpenHumanChangeRequest2(kernel, artifactId) {
   return hasOpenHumanChangeRequest(kernel.model, artifactId);
 }
@@ -202001,7 +202065,8 @@ async function startOasisServer(opts) {
         if (req.method === "GET" && /^\/api\/chat-sessions\/[^/]+\/stream$/.test(url.pathname)) {
           const sid = decodeURIComponent(url.pathname.split("/")[3] ?? "");
           const cs = await (await chatStoreNowOrNull())?.getSession(sid).catch(() => null) ?? null;
-          if (!cs || cs.humanActorId !== actor) {
+          const canReadStream = !!cs && (cs.humanActorId === actor || !!cs.workspace && cs.aiActorId === coordinatorOfWorkspaceInKernel(engine.kernel, cs.workspace));
+          if (!canReadStream) {
             res.writeHead(404, { "content-type": "application/json" }).end(JSON.stringify({ error: "CHAT_SESSION_NOT_FOUND" }));
             return;
           }
@@ -208731,6 +208796,10 @@ var init_dev_store = __esm({
       async listSessionsByAnalyzedRun(analyzedRunId) {
         return [...this.sessions.values()].filter((s2) => s2.analyzedRunId === analyzedRunId).sort((a, b2) => b2.touchedAt.localeCompare(a.touchedAt)).map((s2) => this.withQuality(s2));
       }
+      /** 语义同 postgres 版：`workspace = ?`，排除分析/后台执行会话，touched_at 倒序。 */
+      async listSessionsByWorkspace(workspace) {
+        return [...this.sessions.values()].filter((s2) => s2.workspace === workspace && !s2.analyzedRunId && s2.visibility !== "internal").sort((a, b2) => b2.touchedAt.localeCompare(a.touchedAt)).map((s2) => this.withQuality(s2));
+      }
       async listAllAnalysisSessions(opts = {}) {
         const limit = opts.limit ?? 100;
         const sorted = [...this.sessions.values()].filter((s2) => !!s2.analyzedRunId).sort((a, b2) => b2.touchedAt.localeCompare(a.touchedAt) || b2.id.localeCompare(a.id));
@@ -226811,6 +226880,29 @@ function createChatSessionsDomain(opts) {
     const n = Number(raw);
     return raw && Number.isInteger(n) && n > 0 ? n : 0;
   }
+  function coordinatorOfWorkspace(workspaceId) {
+    if (!opts.kernel) return null;
+    let manager;
+    for (const artifact of opts.kernel.model.artifacts.values()) {
+      if (artifact.workspace !== workspaceId) continue;
+      if (artifact.type !== "brief") continue;
+      const raw = artifact.fields?.["manager"];
+      if (typeof raw === "string" && raw) {
+        manager = raw;
+        break;
+      }
+    }
+    return manager ? manager : null;
+  }
+  function ensureSessionReadable(session, actor) {
+    if (!session) throw new ApiError(404, "NOT_FOUND", "session not found");
+    if (session.humanActorId === actor) return session;
+    if (session.workspace) {
+      const coordinator = coordinatorOfWorkspace(session.workspace);
+      if (coordinator && session.aiActorId === coordinator) return session;
+    }
+    throw new ApiError(404, "NOT_FOUND", "session not found");
+  }
   async function listRecentTurns(store2, sessionId, turns) {
     if (turns <= 0) return { messages: await store2.listMessages(sessionId), hasMoreBefore: false };
     if (store2.listRecentTurns) return store2.listRecentTurns(sessionId, turns);
@@ -226911,8 +227003,7 @@ function createChatSessionsDomain(opts) {
     });
     router.get("/api/chat-sessions/:id", async (req) => {
       const store2 = await storeFor(req);
-      const session = await store2.getSession(req.params.id);
-      if (!session || session.humanActorId !== req.auth.actor) throw new ApiError(404, "NOT_FOUND", "session not found");
+      const session = ensureSessionReadable(await store2.getSession(req.params.id), req.auth.actor);
       const [window2, curRuntimeId] = await Promise.all([
         listRecentTurns(store2, session.id, parseTurns(req.query?.get("turns"))),
         currentRuntimeId(session.aiActorId)
@@ -227156,6 +227247,15 @@ function createChatSessionsDomain(opts) {
       }
       return { status: 200, body: { items } };
     });
+    router.get("/api/workorders/:workorderId/coordinator-chat-sessions", async (req) => {
+      const workorderId = req.params["workorderId"];
+      const coordinator = coordinatorOfWorkspace(workorderId);
+      if (!coordinator) return { status: 200, body: { items: [] } };
+      const store2 = await storeFor(req);
+      const sessions = await store2.listSessionsByWorkspace(workorderId);
+      const items = sessions.filter((s2) => s2.aiActorId === coordinator);
+      return { status: 200, body: { items } };
+    });
     router.get("/api/chat-sessions/:id/work-orders", async (req) => {
       const store2 = await storeFor(req);
       const session = await store2.getSession(req.params.id);
@@ -240076,6 +240176,22 @@ var init_postgres_chat_sessions = __esm({
         );
         return r.rows.map(rowToSessionWithQuality);
       }
+      async listSessionsByWorkspace(workspace) {
+        const r = await this.pool.query(
+          `SELECT s.*, lm.status AS last_assistant_status, lm.content AS last_assistant_content
+         FROM ${this.s}.chat_sessions s
+         LEFT JOIN LATERAL (
+           SELECT status, content FROM ${this.s}.chat_messages
+           WHERE session_id = s.id AND role = 'assistant'
+           ORDER BY seq DESC LIMIT 1
+         ) lm ON TRUE
+        WHERE s.company_id = $2 AND s.workspace = $1 AND s.analyzed_run_id IS NULL
+          AND s.visibility IS DISTINCT FROM 'internal'
+        ORDER BY s.touched_at DESC`,
+          [workspace, this.companyId]
+        );
+        return r.rows.map(rowToSessionWithQuality);
+      }
       async listSessionsByAnalyzedRun(analyzedRunId) {
         const r = await this.pool.query(
           `SELECT s.*, lm.status AS last_assistant_status, lm.content AS last_assistant_content
@@ -259272,7 +259388,7 @@ function shimScript() {
 }
 
 // src/index.ts
-var PKG_VERSION = true ? "0.1.135" : "dev";
+var PKG_VERSION = true ? "0.1.136" : "dev";
 var LOCAL_BIN = localBin();
 var NPM_PREFIX = npmPrefix();
 var INSTANCE = DEFAULT_INSTANCE;

package/package.json

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