oasis_test 0.1.1 → 0.1.2

package/dist/index.js

@@ -9092,7 +9092,7 @@ var require_compile = __commonJS({
       const schOrFunc = root.refs[ref];
       if (schOrFunc)
         return schOrFunc;
-      let _sch = resolve2.call(this, root, ref);
+      let _sch = resolve.call(this, root, ref);
       if (_sch === void 0) {
         const schema = (_a = root.localRefs) === null || _a === void 0 ? void 0 : _a[ref];
         const { schemaId } = this.opts;
@@ -9119,7 +9119,7 @@ var require_compile = __commonJS({
     function sameSchemaEnv(s1, s2) {
       return s1.schema === s2.schema && s1.root === s2.root && s1.baseId === s2.baseId;
     }
-    function resolve2(root, ref) {
+    function resolve(root, ref) {
       let sch;
       while (typeof (sch = this.refs[ref]) == "string")
         ref = sch;
@@ -9750,7 +9750,7 @@ var require_fast_uri = __commonJS({
       }
       return uri;
     }
-    function resolve2(baseURI, relativeURI, options) {
+    function resolve(baseURI, relativeURI, options) {
       const schemelessOptions = options ? Object.assign({ scheme: "null" }, options) : { scheme: "null" };
       const resolved = resolveComponent(parse2(baseURI, schemelessOptions), parse2(relativeURI, schemelessOptions), schemelessOptions, true);
       schemelessOptions.skipEscape = true;
@@ -10008,7 +10008,7 @@ var require_fast_uri = __commonJS({
     var fastUri = {
       SCHEMES,
       normalize,
-      resolve: resolve2,
+      resolve,
       resolveComponent,
       equal,
       serialize,
@@ -16948,10 +16948,117 @@ var init_wrapper = __esm({
 });
 
 // ../server/src/daemon-hub.ts
+var DaemonHub;
 var init_daemon_hub = __esm({
   "../server/src/daemon-hub.ts"() {
     "use strict";
     init_wrapper();
+    DaemonHub = class _DaemonHub {
+      daemons = /* @__PURE__ */ new Map();
+      wss;
+      ghosts = /* @__PURE__ */ new Map();
+      static GHOST_TTL_MS = 5 * 60 * 1e3;
+      /** 外部可订阅的事件回调 */
+      onDaemonConnected;
+      onDaemonDisconnected;
+      onMessage;
+      messageListeners = /* @__PURE__ */ new Set();
+      /** 多路消息订阅（onMessage 单槽之外的加法；DaemonHubAdapter 等用） */
+      addMessageListener(cb) {
+        this.messageListeners.add(cb);
+        return () => this.messageListeners.delete(cb);
+      }
+      constructor(server, path6 = "/daemon/ws", resolveNode) {
+        this.wss = new import_websocket_server.default({
+          server,
+          path: path6,
+          ...resolveNode ? {
+            verifyClient: (info, cb) => {
+              const authHeader = info.req.headers.authorization ?? "";
+              const token2 = authHeader.startsWith("Bearer ") ? authHeader.slice("Bearer ".length) : "";
+              const nodeId2 = token2 ? resolveNode(token2) : null;
+              if (!nodeId2) {
+                cb(false, 401, "invalid node token");
+                return;
+              }
+              info.req.oasisNodeId = nodeId2;
+              cb(true);
+            }
+          } : {}
+        });
+        this.wss.on("connection", (ws, req) => this.handleConnection(ws, req));
+      }
+      dispatch(daemonId, msg) {
+        const daemon = this.daemons.get(daemonId);
+        if (!daemon) return false;
+        daemon.send(msg);
+        return true;
+      }
+      broadcast(msg) {
+        for (const daemon of this.daemons.values()) daemon.send(msg);
+      }
+      connectedDaemons() {
+        return [...this.daemons.values()];
+      }
+      /** Nodes that disconnected within the last GHOST_TTL_MS ms. */
+      recentlyDisconnected() {
+        const cutoff = Date.now() - _DaemonHub.GHOST_TTL_MS;
+        const result = [];
+        for (const [id, g] of this.ghosts) {
+          if (g.disconnectedAt < cutoff) {
+            this.ghosts.delete(id);
+            continue;
+          }
+          result.push({ daemonId: id, meta: g.meta, disconnectedAt: g.disconnectedAt });
+        }
+        return result;
+      }
+      evictGhost(daemonId) {
+        this.ghosts.delete(daemonId);
+      }
+      handleConnection(ws, req) {
+        const verifiedId = req.oasisNodeId;
+        const daemonId = verifiedId ?? req.headers["x-daemon-id"] ?? `anon-${Date.now()}`;
+        let registered = false;
+        const daemon = {
+          daemonId,
+          meta: { hostname: "unknown", adapters: [], nodeVersion: "unknown" },
+          send: (msg) => {
+            if (ws.readyState === import_websocket.default.OPEN) ws.send(JSON.stringify(msg));
+          },
+          close: () => ws.close()
+        };
+        ws.on("message", (raw) => {
+          let msg;
+          try {
+            msg = JSON.parse(raw.toString());
+          } catch {
+            return;
+          }
+          if (msg.type === "hello") {
+            this.ghosts.delete(daemonId);
+            Object.assign(daemon.meta, msg.meta);
+            if (!registered) {
+              registered = true;
+              this.daemons.set(daemonId, daemon);
+              this.onDaemonConnected?.(daemon);
+            }
+          }
+          this.onMessage?.(daemonId, msg);
+          for (const listener of this.messageListeners) listener(daemonId, msg);
+        });
+        ws.on("close", () => {
+          const d = this.daemons.get(daemonId);
+          if (d) this.ghosts.set(daemonId, { meta: { ...d.meta }, disconnectedAt: Date.now() });
+          this.daemons.delete(daemonId);
+          this.onDaemonDisconnected?.(daemonId);
+        });
+        ws.on("error", (err) => {
+          console.error(`[hub] daemon ${daemonId} error:`, err.message);
+        });
+        daemon.send({ type: "ping" });
+      }
+    };
   }
 });
 
@@ -17178,6 +17285,35 @@ var init_collab = __esm({
 var init_service4 = __esm({
   "../server/src/domains/trace/service.ts"() {
     "use strict";
+    init_src();
+  }
+});
+
+// ../server/src/domains/trace/otlp/redact.ts
+var MASK, TEXT_PATTERNS;
+var init_redact = __esm({
+  "../server/src/domains/trace/otlp/redact.ts"() {
+    "use strict";
+    MASK = "***";
+    TEXT_PATTERNS = [
+      [/\bBearer\s+[A-Za-z0-9._\-]+/gi, "Bearer " + MASK],
+      [/\b(sk|pk)-[A-Za-z0-9]{8,}\b/g, MASK],
+      // OpenAI 风格
+      [/\bgh[pousr]_[A-Za-z0-9]{20,}\b/g, MASK],
+      // GitHub token
+      [/\bxox[baprs]-[A-Za-z0-9-]{10,}\b/g, MASK],
+      // Slack token
+      // key=value / key: "value"（键名敏感时遮值）
+      [/\b(api[_-]?key|secret|password|passwd|token|authorization|access[_-]?token|refresh[_-]?token)(["']?\s*[:=]\s*["']?)([^\s"',}]{6,})/gi, `$1$2${MASK}`]
+    ];
+  }
+});
+
+// ../server/src/domains/trace/otlp/map.ts
+var init_map2 = __esm({
+  "../server/src/domains/trace/otlp/map.ts"() {
+    "use strict";
+    init_redact();
   }
 });
 
@@ -17187,6 +17323,7 @@ var init_routes5 = __esm({
     "use strict";
     init_src();
     init_router();
+    init_map2();
   }
 });
 
@@ -20286,7 +20423,7 @@ var require_dist2 = __commonJS({
     function parse2(stream, callback) {
       const parser = new parser_1.Parser();
       stream.on("data", (buffer) => parser.parse(buffer, callback));
-      return new Promise((resolve2) => stream.on("end", () => resolve2()));
+      return new Promise((resolve) => stream.on("end", () => resolve()));
     }
     exports2.parse = parse2;
   }
@@ -21029,12 +21166,12 @@ var require_client = __commonJS({
           this._connect(callback);
           return;
         }
-        return new this._Promise((resolve2, reject) => {
+        return new this._Promise((resolve, reject) => {
           this._connect((error2) => {
             if (error2) {
               reject(error2);
             } else {
-              resolve2(this);
+              resolve(this);
             }
           });
         });
@@ -21381,8 +21518,8 @@ var require_client = __commonJS({
         } else {
           query = new Query2(config2, values, callback);
           if (!query.callback) {
-            result = new this._Promise((resolve2, reject) => {
-              query.callback = (err, res) => err ? reject(err) : resolve2(res);
+            result = new this._Promise((resolve, reject) => {
+              query.callback = (err, res) => err ? reject(err) : resolve(res);
             }).catch((err) => {
               Error.captureStackTrace(err);
               throw err;
@@ -21466,8 +21603,8 @@ var require_client = __commonJS({
         if (cb) {
           this.connection.once("end", cb);
         } else {
-          return new this._Promise((resolve2) => {
-            this.connection.once("end", resolve2);
+          return new this._Promise((resolve) => {
+            this.connection.once("end", resolve);
           });
         }
       }
@@ -21516,8 +21653,8 @@ var require_pg_pool = __commonJS({
       const cb = function(err, client) {
         err ? rej(err) : res(client);
       };
-      const result = new Promise2(function(resolve2, reject) {
-        res = resolve2;
+      const result = new Promise2(function(resolve, reject) {
+        res = resolve;
         rej = reject;
       }).catch((err) => {
         Error.captureStackTrace(err);
@@ -21578,7 +21715,7 @@ var require_pg_pool = __commonJS({
         if (typeof Promise2.try === "function") {
           return Promise2.try(f);
         }
-        return new Promise2((resolve2) => resolve2(f()));
+        return new Promise2((resolve) => resolve(f()));
       }
       _isFull() {
         return this._clients.length >= this.options.max;
@@ -21971,8 +22108,8 @@ var require_query2 = __commonJS({
     NativeQuery.prototype._getPromise = function() {
       if (this._promise) return this._promise;
       this._promise = new Promise(
-        function(resolve2, reject) {
-          this._once("end", resolve2);
+        function(resolve, reject) {
+          this._once("end", resolve);
           this._once("error", reject);
         }.bind(this)
       );
@@ -22149,12 +22286,12 @@ var require_client2 = __commonJS({
         this._connect(callback);
         return;
       }
-      return new this._Promise((resolve2, reject) => {
+      return new this._Promise((resolve, reject) => {
         this._connect((error2) => {
           if (error2) {
             reject(error2);
           } else {
-            resolve2(this);
+            resolve(this);
           }
         });
       });
@@ -22178,8 +22315,8 @@ var require_client2 = __commonJS({
         query = new NativeQuery(config2, values, callback);
         if (!query.callback) {
           let resolveOut, rejectOut;
-          result = new this._Promise((resolve2, reject) => {
-            resolveOut = resolve2;
+          result = new this._Promise((resolve, reject) => {
+            resolveOut = resolve;
             rejectOut = reject;
           }).catch((err) => {
             Error.captureStackTrace(err);
@@ -22242,8 +22379,8 @@ var require_client2 = __commonJS({
       }
       let result;
       if (!cb) {
-        result = new this._Promise(function(resolve2, reject) {
-          cb = (err) => err ? reject(err) : resolve2();
+        result = new this._Promise(function(resolve, reject) {
+          cb = (err) => err ? reject(err) : resolve();
         });
       }
       this.native.end(function() {
@@ -22393,6 +22530,7 @@ var init_trajectory = __esm({
 // src/index.ts
 var import_node_crypto7 = require("node:crypto");
 var fs5 = __toESM(require("node:fs"));
+var os5 = __toESM(require("node:os"));
 var path5 = __toESM(require("node:path"));
 
 // ../cli/src/serve.ts
@@ -22459,6 +22597,43 @@ function normalizeClaudeStreamLine(line) {
   }
   return [];
 }
+function asNum(v) {
+  return typeof v === "number" && Number.isFinite(v) ? v : 0;
+}
+function newClaudeUsageAcc() {
+  return { input: 0, output: 0, cacheRead: 0, cacheCreation: 0, costUsd: null, saw: false };
+}
+function accumulateClaudeUsage(acc, p) {
+  const type = p["type"];
+  if (type === "assistant") {
+    const msg = p["message"];
+    const u = msg?.usage;
+    if (u && typeof u === "object") {
+      acc.input += asNum(u["input_tokens"]);
+      acc.output += asNum(u["output_tokens"]);
+      acc.cacheRead += asNum(u["cache_read_input_tokens"]);
+      acc.cacheCreation += asNum(u["cache_creation_input_tokens"]);
+      acc.saw = true;
+    }
+  } else if (type === "result") {
+    const c = p["total_cost_usd"];
+    if (typeof c === "number" && Number.isFinite(c)) {
+      acc.costUsd = c;
+      acc.saw = true;
+    }
+  }
+}
+function buildClaudeUsage(acc) {
+  if (!acc.saw) return void 0;
+  return {
+    inputTokens: acc.input,
+    outputTokens: acc.output,
+    totalTokens: acc.input + acc.output,
+    cacheReadTokens: acc.cacheRead,
+    cacheCreationTokens: acc.cacheCreation,
+    costUsdMicros: acc.costUsd != null ? Math.round(acc.costUsd * 1e6) : null
+  };
+}
 function scrubLeakyEnv(env) {
   const LEAKY = /^npm_|^PNPM_|^INIT_CWD$|^OLDPWD$/;
   return Object.fromEntries(Object.entries(env).filter(([k]) => !LEAKY.test(k)));
@@ -22476,14 +22651,35 @@ var ClaudeCodeAdapter = class {
   constructor(opts = {}) {
     this.opts = opts;
   }
+  /**
+   * OTel 接线开关：opts.otel 优先，否则回落环境变量（OASIS_OTEL_ENDPOINT 设了即开）。
+   * 关时返回 {}（无任何 OTEL_* 注入，行为与未接入前一致）。
+   * runId 等进 OTEL_RESOURCE_ATTRIBUTES，让 Claude Code 自带 OTel 的上报归位到本次 run。
+   */
+  resolveOtelEnv(job, runId) {
+    const endpoint = this.opts.otel?.endpoint ?? process.env["OASIS_OTEL_ENDPOINT"];
+    if (!endpoint) return {};
+    const protocol = this.opts.otel?.protocol ?? process.env["OASIS_OTEL_PROTOCOL"] ?? "http/protobuf";
+    const logs = this.opts.otel?.logs ?? process.env["OASIS_OTEL_LOGS"] === "1";
+    return {
+      CLAUDE_CODE_ENABLE_TELEMETRY: "1",
+      OTEL_METRICS_EXPORTER: "otlp",
+      ...logs ? { OTEL_LOGS_EXPORTER: "otlp" } : {},
+      OTEL_EXPORTER_OTLP_PROTOCOL: protocol,
+      OTEL_EXPORTER_OTLP_ENDPOINT: endpoint,
+      // 复用 agent 自己的 bearer 作上报鉴权（与 /api/traces/otlp 的 Bearer 门一致）。
+      OTEL_EXPORTER_OTLP_HEADERS: `Authorization=Bearer ${job.actorToken}`,
+      OTEL_RESOURCE_ATTRIBUTES: `oasis.run_id=${runId},oasis.actor_id=${job.actor},oasis.artifact_id=${job.artifactId}`
+    };
+  }
   async spawn(job) {
     const slug = job.artifactId.replace(/[^a-zA-Z0-9_-]+/g, "_").slice(0, 32);
     const id = `claude-${slug}-${(0, import_node_crypto2.randomUUID)().slice(0, 8)}`;
-    const dir2 = fs.mkdtempSync(
+    const dir = fs.mkdtempSync(
       path.join(this.opts.workRoot ?? os.tmpdir(), "oasis-session-")
     );
     for (const [rel, content] of Object.entries(job.bundle.files)) {
-      const file = path.join(dir2, rel);
+      const file = path.join(dir, rel);
       fs.mkdirSync(path.dirname(file), { recursive: true });
       fs.writeFileSync(file, content);
     }
@@ -22501,8 +22697,9 @@ var ClaudeCodeAdapter = class {
       ...this.opts.model ? ["--model", this.opts.model] : [],
       ...this.opts.extraArgs ?? []
     ];
+    const otelEnv = this.resolveOtelEnv(job, id);
     const child = (0, import_node_child_process3.spawn)(this.opts.claudeBin ?? "claude", args, {
-      cwd: dir2,
+      cwd: dir,
       env: {
         // 凭证泄漏防护：剔除 pnpm/npm 脚本注入的变量——npm_lifecycle_script 等会把 serve 的启动命令
         // （含 `--dir <数据目录>`，即 operator-token 所在）泄给 agent，它据此用 operator 凭证冒充人。
@@ -22514,15 +22711,18 @@ var ClaudeCodeAdapter = class {
         ...this.opts.maxOutputTokens ? { CLAUDE_CODE_MAX_OUTPUT_TOKENS: String(this.opts.maxOutputTokens) } : {},
         ...job.wrapperPaths?.length ? { PATH: `${job.wrapperPaths.map((p) => path.dirname(p)).join(path.delimiter)}${path.delimiter}${job.env?.["PATH"] ?? process.env["PATH"] ?? ""}` } : {},
         OASIS_SERVER: job.server.url,
-        OASIS_TOKEN: job.actorToken
+        OASIS_TOKEN: job.actorToken,
+        // OTel 遥测（默认关；resolveOtelEnv 决定开不开，runId 进 resource 属性自然归位到本次 run）。
+        ...otelEnv
       },
       stdio: ["ignore", "pipe", "pipe"]
     });
-    let transcriptRef = path.join(dir2, "transcript.txt");
+    let transcriptRef = path.join(dir, "transcript.txt");
     const out = fs.createWriteStream(transcriptRef);
     const telemetryCbs = [];
     let eventSeq = 0;
     let lastResult;
+    const usageAcc = newClaudeUsageAcc();
     const outputCbs = [];
     if (this.opts.streamJson) {
       const rl = readline.createInterface({ input: child.stdout });
@@ -22531,6 +22731,7 @@ var ClaudeCodeAdapter = class {
         try {
           const p = JSON.parse(line);
           if (p["type"] === "result") lastResult = p;
+          accumulateClaudeUsage(usageAcc, p);
           if (p["type"] === "stream_event") {
             const evt = p["event"];
             if (evt?.type === "content_block_delta" && evt.delta?.type === "text_delta" && typeof evt.delta.text === "string") {
@@ -22586,7 +22787,7 @@ var ClaudeCodeAdapter = class {
           out.end(() => {
             try {
               fs.renameSync(src, kept);
-              fs.rmSync(dir2, { recursive: true, force: true });
+              fs.rmSync(dir, { recursive: true, force: true });
             } catch {
             }
           });
@@ -22594,7 +22795,8 @@ var ClaudeCodeAdapter = class {
         } catch {
         }
       }
-      exited = { code: killedByUs ? null : code, ...reason ? { reason } : {}, transcriptRef };
+      const usage = buildClaudeUsage(usageAcc);
+      exited = { code: killedByUs ? null : code, ...reason ? { reason } : {}, transcriptRef, ...usage ? { usage } : {} };
       for (const cb of callbacks.splice(0)) cb(exited);
     });
     return {
@@ -22624,6 +22826,102 @@ var fs2 = __toESM(require("node:fs"), 1);
 var os2 = __toESM(require("node:os"), 1);
 var path2 = __toESM(require("node:path"), 1);
 var readline2 = __toESM(require("node:readline"), 1);
+function codexNum(v) {
+  return typeof v === "number" && Number.isFinite(v) ? v : 0;
+}
+function parseCodexTokenUsage(lines) {
+  let last;
+  for (const line of lines) {
+    if (!line || line.indexOf("token_count") === -1) continue;
+    let o;
+    try {
+      o = JSON.parse(line);
+    } catch {
+      continue;
+    }
+    if (o?.type === "event_msg" && o.payload?.type === "token_count" && o.payload.info?.total_token_usage) {
+      last = o.payload.info.total_token_usage;
+    }
+  }
+  if (!last) return void 0;
+  const cacheRead = codexNum(last["cached_input_tokens"]) || codexNum(last["cache_read_input_tokens"]);
+  const inputFresh = Math.max(codexNum(last["input_tokens"]) - cacheRead, 0);
+  const output = codexNum(last["output_tokens"]) + codexNum(last["reasoning_output_tokens"]);
+  return {
+    inputTokens: inputFresh,
+    outputTokens: output,
+    totalTokens: inputFresh + output,
+    // = input+output（不含 cache，与 claude/OTLP 口径一致）
+    cacheReadTokens: cacheRead,
+    cacheCreationTokens: null,
+    // codex 不报 cache 写入
+    costUsdMicros: null
+    // codex rollout 无成本
+  };
+}
+function codexSessionsRoot() {
+  const candidates = [];
+  const ch = process.env["CODEX_HOME"];
+  if (ch) candidates.push(path2.join(ch, "sessions"));
+  const home = process.env["HOME"] || os2.homedir();
+  if (home) candidates.push(path2.join(home, ".codex", "sessions"));
+  for (const c of candidates) {
+    try {
+      if (fs2.statSync(c).isDirectory()) return c;
+    } catch {
+    }
+  }
+  return "";
+}
+function listRecentRollouts(root, sinceMs) {
+  const margin = sinceMs - 6e4;
+  const found = [];
+  const walk = (d) => {
+    let ents;
+    try {
+      ents = fs2.readdirSync(d, { withFileTypes: true });
+    } catch {
+      return;
+    }
+    for (const ent of ents) {
+      const p = path2.join(d, ent.name);
+      if (ent.isDirectory()) walk(p);
+      else if (ent.isFile() && ent.name.startsWith("rollout-") && ent.name.endsWith(".jsonl")) {
+        let m = 0;
+        try {
+          m = fs2.statSync(p).mtimeMs;
+        } catch {
+        }
+        if (m >= margin) found.push({ f: p, m });
+      }
+    }
+  };
+  walk(root);
+  return found.sort((a, b) => b.m - a.m).map((x) => x.f);
+}
+function scanCodexUsage(workdir, sinceMs, sessionsRoot = codexSessionsRoot()) {
+  try {
+    for (const f of listRecentRollouts(sessionsRoot, sinceMs)) {
+      let lines;
+      try {
+        lines = fs2.readFileSync(f, "utf8").split("\n");
+      } catch {
+        continue;
+      }
+      let meta;
+      try {
+        meta = JSON.parse(lines[0] ?? "");
+      } catch {
+        continue;
+      }
+      if (meta?.type === "session_meta" && meta.payload?.cwd === workdir) {
+        return parseCodexTokenUsage(lines);
+      }
+    }
+  } catch {
+  }
+  return void 0;
+}
 function createCodexNormalizeState() {
   return { toolUseIds: /* @__PURE__ */ new Set(), previousAgentMessage: false, lastAgentMessageEndedWithNewline: false };
 }
@@ -22797,9 +23095,10 @@ var CodexAdapter = class {
   async spawn(job) {
     const slug = job.artifactId.replace(/[^a-zA-Z0-9_-]+/g, "_").slice(0, 32);
     const id = `codex-${slug}-${(0, import_node_crypto3.randomUUID)().slice(0, 8)}`;
-    const dir2 = fs2.mkdtempSync(path2.join(this.opts.workRoot ?? os2.tmpdir(), "oasis-session-"));
+    const startedAtMs = Date.now();
+    const dir = fs2.mkdtempSync(path2.join(this.opts.workRoot ?? os2.tmpdir(), "oasis-session-"));
     for (const [rel, content] of Object.entries(job.bundle.files)) {
-      const file = path2.join(dir2, rel);
+      const file = path2.join(dir, rel);
       fs2.mkdirSync(path2.dirname(file), { recursive: true });
       fs2.writeFileSync(file, content);
     }
@@ -22812,13 +23111,13 @@ var CodexAdapter = class {
       "--dangerously-bypass-approvals-and-sandbox",
       "--skip-git-repo-check",
       "-C",
-      dir2,
+      dir,
       ...this.opts.model ? ["--model", this.opts.model] : [],
       ...this.opts.extraArgs ?? [],
       prompt
     ];
     const child = (0, import_node_child_process4.spawn)(this.opts.codexBin ?? "codex", args, {
-      cwd: dir2,
+      cwd: dir,
       env: {
         ...scrubLeakyEnv(process.env),
         ...this.opts.env,
@@ -22829,7 +23128,7 @@ var CodexAdapter = class {
       },
       stdio: ["ignore", "pipe", "pipe"]
     });
-    let transcriptRef = path2.join(dir2, "transcript.txt");
+    let transcriptRef = path2.join(dir, "transcript.txt");
     const out = fs2.createWriteStream(transcriptRef);
     const outputCbs = [];
     const telemetryCbs = [];
@@ -22867,7 +23166,7 @@ var CodexAdapter = class {
           out.end(() => {
             try {
               fs2.renameSync(src, kept);
-              fs2.rmSync(dir2, { recursive: true, force: true });
+              fs2.rmSync(dir, { recursive: true, force: true });
             } catch {
             }
           });
@@ -22889,10 +23188,12 @@ var CodexAdapter = class {
     });
     child.on("exit", (code) => {
       clearTimeout(timer);
+      const usage = scanCodexUsage(dir, startedAtMs);
       finish({
         code: killedByUs ? null : code,
         reason: killedByUs ? "timeout" : code === 0 ? "clean" : "error",
-        transcriptRef
+        transcriptRef,
+        ...usage ? { usage } : {}
       });
     });
     return {
@@ -22936,8 +23237,8 @@ var ACPClient = class {
   seq = 0;
   request(method, params) {
     const id = this.nextId++;
-    return new Promise((resolve2, reject) => {
-      this.pending.set(id, { resolve: resolve2, reject, method });
+    return new Promise((resolve, reject) => {
+      this.pending.set(id, { resolve, reject, method });
       this.write(JSON.stringify({ jsonrpc: "2.0", id, method, params }) + "\n");
     });
   }
@@ -23124,16 +23425,16 @@ async function runACPSession(job, cfg) {
   const slug = job.artifactId.replace(/[^a-zA-Z0-9_-]+/g, "_").slice(0, 32);
   const binTag = path3.basename(cfg.bin).replace(/[^a-zA-Z0-9]/g, "").slice(0, 12) || "acp";
   const id = `${binTag}-${slug}-${(0, import_node_crypto4.randomUUID)().slice(0, 8)}`;
-  const dir2 = fs3.mkdtempSync(path3.join(cfg.workRoot ?? os3.tmpdir(), "oasis-session-"));
+  const dir = fs3.mkdtempSync(path3.join(cfg.workRoot ?? os3.tmpdir(), "oasis-session-"));
   for (const [rel, content] of Object.entries(job.bundle.files)) {
-    const file = path3.join(dir2, rel);
+    const file = path3.join(dir, rel);
     fs3.mkdirSync(path3.dirname(file), { recursive: true });
     fs3.writeFileSync(file, content);
   }
   const task = job.bundle.files["TASK.md"];
   if (!task) throw new Error("bundle \u7F3A TASK.md\uFF08\u88C5\u914D\u5668\u5951\u7EA6\uFF09");
   const child = (0, import_node_child_process5.spawn)(cfg.bin, [...cfg.args ?? [], ...cfg.extraArgs ?? []], {
-    cwd: dir2,
+    cwd: dir,
     env: {
       ...scrubLeakyEnv(process.env),
       ...cfg.env,
@@ -23145,7 +23446,7 @@ async function runACPSession(job, cfg) {
     },
     stdio: ["pipe", "pipe", "pipe"]
   });
-  let transcriptRef = path3.join(dir2, "transcript.txt");
+  let transcriptRef = path3.join(dir, "transcript.txt");
   const transcriptOut = fs3.createWriteStream(transcriptRef);
   const outputCbs = [];
   const telemetryCbs = [];
@@ -23163,7 +23464,7 @@ async function runACPSession(job, cfg) {
         transcriptOut.end(() => {
           try {
             fs3.renameSync(src, kept);
-            fs3.rmSync(dir2, { recursive: true, force: true });
+            fs3.rmSync(dir, { recursive: true, force: true });
           } catch {
           }
         });
@@ -23200,14 +23501,14 @@ async function runACPSession(job, cfg) {
     () => streamingCurrentTurn
   );
   const rl = readline3.createInterface({ input: child.stdout });
-  const readerDone = new Promise((resolve2) => {
+  const readerDone = new Promise((resolve) => {
     rl.on("line", (line) => {
       transcriptOut.write(line + "\n");
       client.handleLine(line);
     });
     rl.on("close", () => {
       client.closeAllPending(new Error("process exited"));
-      resolve2();
+      resolve();
     });
   });
   child.on("error", () => {
@@ -23226,7 +23527,7 @@ async function runACPSession(job, cfg) {
         clientCapabilities: {}
       });
       const sessionRes = await client.request("session/new", {
-        cwd: dir2,
+        cwd: dir,
         mcpServers: [],
         ...cfg.model ? { model: cfg.model } : {}
       });
@@ -23347,15 +23648,15 @@ var readline4 = __toESM(require("node:readline"), 1);
 function materialize(job, workRoot) {
   const slug = job.artifactId.replace(/[^a-zA-Z0-9_-]+/g, "_").slice(0, 32);
   const id = `${slug}-${(0, import_node_crypto5.randomUUID)().slice(0, 8)}`;
-  const dir2 = fs4.mkdtempSync(path4.join(workRoot ?? os4.tmpdir(), "oasis-session-"));
+  const dir = fs4.mkdtempSync(path4.join(workRoot ?? os4.tmpdir(), "oasis-session-"));
   for (const [rel, content] of Object.entries(job.bundle.files)) {
-    const file = path4.join(dir2, rel);
+    const file = path4.join(dir, rel);
     fs4.mkdirSync(path4.dirname(file), { recursive: true });
     fs4.writeFileSync(file, content);
   }
   const task = job.bundle.files["TASK.md"];
   if (!task) throw new Error("bundle \u7F3A TASK.md\uFF08\u88C5\u914D\u5668\u5951\u7EA6\uFF09");
-  return { id, dir: dir2, task };
+  return { id, dir, task };
 }
 function buildEnv(job, extra) {
   return {
@@ -23367,7 +23668,7 @@ function buildEnv(job, extra) {
     OASIS_TOKEN: job.actorToken
   };
 }
-function makeFinish(id, cfg, transcriptRefPtr, transcriptOut, dir2, exitCbs) {
+function makeFinish(id, cfg, transcriptRefPtr, transcriptOut, dir, exitCbs) {
   let exited;
   const finish = (info) => {
     if (exited) return;
@@ -23380,7 +23681,7 @@ function makeFinish(id, cfg, transcriptRefPtr, transcriptOut, dir2, exitCbs) {
         transcriptOut.end(() => {
           try {
             fs4.renameSync(src, kept);
-            fs4.rmSync(dir2, { recursive: true, force: true });
+            fs4.rmSync(dir, { recursive: true, force: true });
           } catch {
           }
         });
@@ -23395,19 +23696,19 @@ function makeFinish(id, cfg, transcriptRefPtr, transcriptOut, dir2, exitCbs) {
   return { finish, exited: () => exited };
 }
 function runStreamJson(job, cfg) {
-  const { id, dir: dir2, task: _task } = materialize(job, cfg.workRoot);
-  const args = [...cfg.buildArgs(job, dir2), ...cfg.extraArgs ?? []];
+  const { id, dir, task: _task } = materialize(job, cfg.workRoot);
+  const args = [...cfg.buildArgs(job, dir), ...cfg.extraArgs ?? []];
   const child = (0, import_node_child_process6.spawn)(cfg.bin, args, {
-    cwd: dir2,
+    cwd: dir,
     env: buildEnv(job, cfg.env),
     stdio: ["ignore", "pipe", "pipe"]
   });
-  const transcriptRefPtr = { value: path4.join(dir2, "transcript.txt") };
+  const transcriptRefPtr = { value: path4.join(dir, "transcript.txt") };
   const transcriptOut = fs4.createWriteStream(transcriptRefPtr.value);
   const outputCbs = [];
   const telemetryCbs = [];
   const exitCbs = [];
-  const { finish, exited } = makeFinish(id, cfg, transcriptRefPtr, transcriptOut, dir2, exitCbs);
+  const { finish, exited } = makeFinish(id, cfg, transcriptRefPtr, transcriptOut, dir, exitCbs);
   let killedByUs = false;
   let seq = 0;
   child.stderr.pipe(transcriptOut);
@@ -23453,18 +23754,18 @@ function runStreamJson(job, cfg) {
   });
 }
 function runOneShotText(job, cfg) {
-  const { id, dir: dir2 } = materialize(job, cfg.workRoot);
-  const args = [...cfg.buildArgs(job, dir2), ...cfg.extraArgs ?? []];
+  const { id, dir } = materialize(job, cfg.workRoot);
+  const args = [...cfg.buildArgs(job, dir), ...cfg.extraArgs ?? []];
   const child = (0, import_node_child_process6.spawn)(cfg.bin, args, {
-    cwd: dir2,
+    cwd: dir,
     env: buildEnv(job, cfg.env),
     stdio: ["ignore", "pipe", "pipe"]
   });
-  const transcriptRefPtr = { value: path4.join(dir2, "transcript.txt") };
+  const transcriptRefPtr = { value: path4.join(dir, "transcript.txt") };
   const transcriptOut = fs4.createWriteStream(transcriptRefPtr.value);
   const outputCbs = [];
   const exitCbs = [];
-  const { finish, exited } = makeFinish(id, cfg, transcriptRefPtr, transcriptOut, dir2, exitCbs);
+  const { finish, exited } = makeFinish(id, cfg, transcriptRefPtr, transcriptOut, dir, exitCbs);
   let killedByUs = false;
   child.stdout.on("data", (chunk) => {
     transcriptOut.write(chunk);
@@ -23551,14 +23852,14 @@ var CursorAdapter = class {
     const opts = this.opts;
     return runStreamJson(job, {
       bin: opts.cursorBin ?? "cursor-agent",
-      buildArgs(job2, dir2) {
+      buildArgs(job2, dir) {
         const task = job2.bundle.files["TASK.md"] ?? "";
         const prompt = job2.systemPrompt ? `${job2.systemPrompt}
 
 ---
 
 ${task}` : task;
-        return ["-p", prompt, "--output-format", "stream-json", "--yolo", "--workspace", dir2, ...opts.model ? ["--model", opts.model] : []];
+        return ["-p", prompt, "--output-format", "stream-json", "--yolo", "--workspace", dir, ...opts.model ? ["--model", opts.model] : []];
       },
       createState: () => ({}),
       normalizeStdout: (line) => normalizeCursor(line),
@@ -23693,14 +23994,14 @@ var OpenCodeAdapter = class {
     const opts = this.opts;
     return runStreamJson(job, {
       bin: opts.openCodeBin ?? "opencode",
-      buildArgs(_job, dir2) {
+      buildArgs(_job, dir) {
         return [
           "run",
           "--format",
           "json",
           "--dangerously-skip-permissions",
           "--dir",
-          dir2,
+          dir,
           ...opts.model ? ["--model", opts.model] : []
         ];
       },
@@ -24014,13 +24315,14 @@ function log2(tag, msg, extra) {
 var RECONNECT_DELAY_MS = 3e3;
 var PING_INTERVAL_MS = 2e4;
 var DaemonWsClient = class {
-  constructor(serverUrl, daemonId, sessions, adapters = ["claude-code"], token2, runtimes = adapters.map((kind) => ({ kind }))) {
-    this.serverUrl = serverUrl;
+  constructor(serverUrl2, daemonId, sessions, adapters = ["claude-code"], token2, runtimes = adapters.map((kind) => ({ kind })), nodeName2) {
+    this.serverUrl = serverUrl2;
     this.daemonId = daemonId;
     this.sessions = sessions;
     this.adapters = adapters;
     this.token = token2;
     this.runtimes = runtimes;
+    this.nodeName = nodeName2;
   }
   ws = null;
   pingTimer = null;
@@ -24107,7 +24409,7 @@ var DaemonWsClient = class {
     if (this.ws?.readyState === import_websocket.default.OPEN) this.ws.send(JSON.stringify(msg));
   }
   buildMeta() {
-    return { hostname: (0, import_node_os.hostname)(), adapters: this.adapters, runtimes: this.runtimes, nodeVersion: process.version };
+    return { hostname: (0, import_node_os.hostname)(), adapters: this.adapters, runtimes: this.runtimes, nodeVersion: process.version, ...this.nodeName ? { nodeName: this.nodeName } : {} };
   }
 };
 
@@ -24209,17 +24511,17 @@ async function startNode(opts) {
       claude
     )
   );
-  const client = new DaemonWsClient(opts.serverUrl, opts.nodeId, sessions, adapters, opts.token, runtimes);
+  const client = new DaemonWsClient(opts.serverUrl, opts.nodeId, sessions, adapters, opts.token, runtimes, opts.nodeName);
   console.log(`[oasis node] ${opts.nodeId} \u2192 ${opts.serverUrl}`);
   client.start();
-  await new Promise((resolve2) => {
+  await new Promise((resolve) => {
     process.on("SIGTERM", () => {
       client.stop();
-      resolve2();
+      resolve();
     });
     process.on("SIGINT", () => {
       client.stop();
-      resolve2();
+      resolve();
     });
   });
 }
@@ -24234,14 +24536,72 @@ for (let i = 0; i < argv.length; i++) {
   const a = argv[i];
   if (a.startsWith("--")) flags.set(a.slice(2), argv[++i] ?? "");
 }
-var dir = flags.get("dir") ?? process.env["OASIS_DIR"] ?? path5.resolve(".oasis");
-var nodeTokenFile = path5.join(dir, "node-token");
-var token = flags.get("token") ?? process.env["OASIS_NODE_TOKEN"] ?? (fs5.existsSync(nodeTokenFile) ? fs5.readFileSync(nodeTokenFile, "utf8").trim() : void 0);
+var stateDir = path5.join(os5.homedir(), ".oasis");
+var stateFile = path5.join(stateDir, "node-state.json");
+var pidFile = path5.join(stateDir, "node.pid");
+function readState() {
+  try {
+    return JSON.parse(fs5.readFileSync(stateFile, "utf8"));
+  } catch {
+    return null;
+  }
+}
+function saveState(s) {
+  fs5.mkdirSync(stateDir, { recursive: true });
+  fs5.writeFileSync(stateFile, JSON.stringify(s), { mode: 384 });
+}
+function checkPid() {
+  try {
+    const pid = parseInt(fs5.readFileSync(pidFile, "utf8").trim(), 10);
+    if (!isNaN(pid)) {
+      try {
+        process.kill(pid, 0);
+        console.error(`[oasis node] already running (PID ${pid})`);
+        process.exit(0);
+      } catch {
+      }
+    }
+  } catch {
+  }
+  fs5.mkdirSync(stateDir, { recursive: true });
+  fs5.writeFileSync(pidFile, String(process.pid));
+}
+function cleanup() {
+  try {
+    fs5.unlinkSync(pidFile);
+  } catch {
+  }
+}
+var serverUrl = flags.get("server-ws") ?? process.env["OASIS_SERVER_WS"] ?? "ws://127.0.0.1:7320/node-gateway";
+var token = flags.get("token") ?? process.env["OASIS_NODE_TOKEN"];
+if (!token) {
+  const saved = readState();
+  if (saved?.serverUrl === serverUrl) token = saved.token;
+}
+if (!token) {
+  console.error("[oasis node] no token \u2014 generate one from the web UI and run with --token <token>");
+  process.exit(1);
+}
+if (flags.has("token")) saveState({ serverUrl, token });
+checkPid();
+var nodeName = flags.get("name") ?? process.env["OASIS_NODE_NAME"];
+var nodeId = flags.get("id") ?? process.env["OASIS_NODE_ID"] ?? `node-${(0, import_node_crypto7.randomUUID)()}`;
+process.on("exit", cleanup);
+process.on("SIGTERM", () => {
+  cleanup();
+  process.exit(0);
+});
+process.on("SIGINT", () => {
+  cleanup();
+  process.exit(0);
+});
 startNode({
-  serverUrl: flags.get("server-ws") ?? process.env["OASIS_SERVER_WS"] ?? "ws://127.0.0.1:7320/node-gateway",
-  nodeId: flags.get("id") ?? process.env["OASIS_NODE_ID"] ?? `node-${(0, import_node_crypto7.randomUUID)()}`,
-  ...token ? { token } : {}
+  serverUrl,
+  nodeId,
+  token,
+  ...nodeName ? { nodeName } : {}
 }).catch((err) => {
   console.error(String(err instanceof Error ? err.message : err));
+  cleanup();
   process.exitCode = 1;
 });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "oasis_test",
-  "version": "0.1.1",
+  "version": "0.1.2",
   "description": "Oasis node daemon — connects to an Oasis server and dispatches AI sessions locally",
   "bin": { "oasis-node": "./dist/index.js" },
   "files": ["dist"],