@omnicross/daemon 0.1.3 → 0.1.5

package/dist/cli.cjs

@@ -934,7 +934,7 @@ async function keysRevoke(db, id) {
 // src/commands/launch.ts
 var import_node_child_process2 = require("child_process");
 var import_node_fs21 = require("fs");
-var import_node_path13 = require("path");
+var import_node_path14 = require("path");
 var import_node_util3 = require("util");
 var import_cli_launcher2 = require("@omnicross/cli-launcher");
 
@@ -966,6 +966,7 @@ var CodexOAuthSessionStore = class {
   ttlMs;
   sessions = /* @__PURE__ */ new Map();
   activeSessionId = null;
+  aborters = /* @__PURE__ */ new Map();
   /** Whether a codex sign-in is currently in flight (port 1455 held). */
   isBusy() {
     this.sweep();
@@ -977,13 +978,22 @@ var CodexOAuthSessionStore = class {
     const sessionId = import_node_crypto3.default.randomBytes(24).toString("base64url");
     this.sessions.set(sessionId, { status: "pending", createdAt: Date.now() });
     this.activeSessionId = sessionId;
-    return sessionId;
+    const controller = new AbortController();
+    this.aborters.set(sessionId, controller);
+    return { sessionId, signal: controller.signal };
   }
   /** Settle a flow (done/error) + free the active slot. */
   settle(sessionId, status, error) {
     const prior = this.sessions.get(sessionId);
     this.sessions.set(sessionId, { status, error, createdAt: prior?.createdAt ?? Date.now() });
     if (this.activeSessionId === sessionId) this.activeSessionId = null;
+    this.aborters.delete(sessionId);
+  }
+  cancel(sessionId) {
+    if (!this.sessions.has(sessionId)) return false;
+    this.aborters.get(sessionId)?.abort();
+    this.settle(sessionId, "error", "login: cancelled");
+    return true;
   }
   /** Read a flow's status (token-free), or null when unknown/expired. */
   get(sessionId) {
@@ -1012,13 +1022,13 @@ function handleCodexOAuthStart(deps) {
     );
   }
   const { authUrl, codeVerifier, state } = import_subscriptions.codexOAuth.generateAuthParams();
-  const sessionId = deps.codexSessions.begin();
-  void runCodexLoopback(sessionId, codeVerifier, state, deps);
+  const { sessionId, signal } = deps.codexSessions.begin();
+  void runCodexLoopback(sessionId, codeVerifier, state, signal, deps);
   return { status: 200, body: { authUrl, sessionId } };
 }
-async function runCodexLoopback(sessionId, codeVerifier, state, deps) {
+async function runCodexLoopback(sessionId, codeVerifier, state, signal, deps) {
   try {
-    const code = await deps.codexAwaitLoopback(state);
+    const code = await deps.codexAwaitLoopback(state, void 0, signal);
     const result = await import_subscriptions.codexOAuth.exchangeCodeForTokens(
       { authorizationCode: code, codeVerifier, state },
       deps.oauthExchangeFetch
@@ -1040,6 +1050,10 @@ async function runCodexLoopback(sessionId, codeVerifier, state, deps) {
     deps.codexSessions.settle(sessionId, "error", reason);
   }
 }
+function handleCodexOAuthCancel(sessionId, deps) {
+  if (!deps.codexSessions.cancel(sessionId)) return err(404, "unknown or expired codex sign-in session");
+  return { status: 200, body: { ok: true } };
+}
 function handleCodexOAuthStatus(sessionId, deps) {
   const s = deps.codexSessions.get(sessionId);
   if (!s) return err(404, "unknown or expired codex sign-in session");
@@ -2199,12 +2213,16 @@ function preserveWebhookSecrets(incoming, current) {
 }
 
 // src/audit/auditRuntime.ts
+var import_node_path4 = require("path");
 var import_auditSink = require("@omnicross/core/pipeline/auditSink");
+var import_upstreamTrace = require("@omnicross/core/pipeline/upstreamTrace");
 var writer = null;
 var sweeper = null;
-function setAuditRuntime(w, s) {
+var auditDir = "";
+function setAuditRuntime(w, s, dir) {
   writer = w;
   sweeper = s;
+  auditDir = dir;
 }
 function applyAuditConfig(config) {
   const enabled = config?.enabled === true && writer !== null;
@@ -2216,9 +2234,11 @@ function applyAuditConfig(config) {
       sweeper.configure(config);
       sweeper.start();
     }
+    (0, import_upstreamTrace.setUpstreamTracePath)(config.captureBodies ? (0, import_node_path4.join)(auditDir, "upstream-trace.jsonl") : null);
   } else {
     (0, import_auditSink.setAuditCaptureConfig)(null);
     (0, import_auditSink.setAuditSink)(null);
+    (0, import_upstreamTrace.setUpstreamTracePath)(null);
     if (sweeper) {
       if (config) sweeper.configure(config);
       sweeper.dispose();
@@ -3831,6 +3851,10 @@ async function handleAccounts(req, res, method, rest, deps) {
     const result = handleCodexOAuthStatus(rest[2], deps);
     return writeJson2(res, result.status, result.body);
   }
+  if (method === "DELETE" && rest[0] === "codex" && rest[1] === "oauth" && rest[2]) {
+    const result = handleCodexOAuthCancel(rest[2], deps);
+    return writeJson2(res, result.status, result.body);
+  }
   if (method === "PUT" || method === "POST" || method === "DELETE") {
     const providerId = asSubscriptionProviderId(rest[0]);
     if (!providerId) {
@@ -4078,7 +4102,7 @@ function proxyToOutbound(res, outboundPort, path2, key, body) {
 var import_node_fs6 = require("fs");
 var import_promises = require("fs/promises");
 var import_node_module = require("module");
-var import_node_path4 = __toESM(require("path"), 1);
+var import_node_path5 = __toESM(require("path"), 1);
 var import_meta = {};
 var CONTENT_TYPES = {
   ".html": "text/html; charset=utf-8",
@@ -4099,13 +4123,13 @@ var CONTENT_TYPES = {
 function resolveUiDist() {
   const fromEnv = process.env["OMNICROSS_UI_DIST"];
   if (fromEnv) {
-    return (0, import_node_fs6.existsSync)(import_node_path4.default.join(fromEnv, "index.html")) ? import_node_path4.default.resolve(fromEnv) : null;
+    return (0, import_node_fs6.existsSync)(import_node_path5.default.join(fromEnv, "index.html")) ? import_node_path5.default.resolve(fromEnv) : null;
   }
   try {
     const req = (0, import_node_module.createRequire)(typeof __filename !== "undefined" ? __filename : import_meta.url);
     const pkgJson = req.resolve("@omnicross/ui/package.json");
-    const dist = import_node_path4.default.join(import_node_path4.default.dirname(pkgJson), "dist");
-    return (0, import_node_fs6.existsSync)(import_node_path4.default.join(dist, "index.html")) ? dist : null;
+    const dist = import_node_path5.default.join(import_node_path5.default.dirname(pkgJson), "dist");
+    return (0, import_node_fs6.existsSync)(import_node_path5.default.join(dist, "index.html")) ? dist : null;
   } catch {
     return null;
   }
@@ -4147,16 +4171,16 @@ async function handleUiStatic(req, res, urlPath, uiDist) {
     res.end(JSON.stringify({ error: { type: "bad_request", message: "invalid path" } }));
     return true;
   }
-  const filePath = import_node_path4.default.resolve(uiDist, rel === "" ? "index.html" : rel);
-  if (filePath !== uiDist && !filePath.startsWith(uiDist + import_node_path4.default.sep)) {
+  const filePath = import_node_path5.default.resolve(uiDist, rel === "" ? "index.html" : rel);
+  if (filePath !== uiDist && !filePath.startsWith(uiDist + import_node_path5.default.sep)) {
     res.writeHead(403, { "Content-Type": "application/json" });
     res.end(JSON.stringify({ error: { type: "forbidden", message: "path outside ui root" } }));
     return true;
   }
   let target = filePath;
   if (!(0, import_node_fs6.existsSync)(target) || (0, import_node_fs6.statSync)(target).isDirectory()) {
-    if (import_node_path4.default.extname(rel) === "") {
-      target = import_node_path4.default.join(uiDist, "index.html");
+    if (import_node_path5.default.extname(rel) === "") {
+      target = import_node_path5.default.join(uiDist, "index.html");
     } else {
       res.writeHead(404, { "Content-Type": "application/json" });
       res.end(JSON.stringify({ error: { type: "not_found", message: "no such ui asset" } }));
@@ -4164,14 +4188,14 @@ async function handleUiStatic(req, res, urlPath, uiDist) {
     }
   }
   const body = await (0, import_promises.readFile)(target);
-  const type = CONTENT_TYPES[import_node_path4.default.extname(target).toLowerCase()] ?? "application/octet-stream";
+  const type = CONTENT_TYPES[import_node_path5.default.extname(target).toLowerCase()] ?? "application/octet-stream";
   res.writeHead(200, { "Content-Type": type, "Content-Length": body.length });
   res.end(req.method === "HEAD" ? void 0 : body);
   return true;
 }
 
 // src/admin/version.ts
-var DAEMON_VERSION = true ? "0.1.3" : "0.0.0-dev";
+var DAEMON_VERSION = true ? "0.1.5" : "0.0.0-dev";
 
 // src/admin/AdminServer.ts
 var LOOPBACK_ADDR = "127.0.0.1";
@@ -4426,7 +4450,7 @@ var DEFAULT_TIMEOUT_MS = 5 * 6e4;
 function pageHtml(message) {
   return `<!doctype html><meta charset="utf-8"><title>omnicross login</title><body style="font-family:sans-serif;padding:2rem"><h2>${message}</h2><p>You can close this window and return to the terminal.</p></body>`;
 }
-function awaitLoopbackCode(expectedState, timeoutMs = DEFAULT_TIMEOUT_MS) {
+function awaitLoopbackCode(expectedState, timeoutMs = DEFAULT_TIMEOUT_MS, signal) {
   return new Promise((resolve, reject) => {
     let settled = false;
     const finish = (server2, fn) => {
@@ -4460,6 +4484,12 @@ function awaitLoopbackCode(expectedState, timeoutMs = DEFAULT_TIMEOUT_MS) {
       res.end(pageHtml("Login complete."));
       finish(server, () => resolve(code));
     });
+    const abort = () => finish(server, () => reject(new Error("login: cancelled")));
+    if (signal?.aborted) {
+      abort();
+      return;
+    }
+    signal?.addEventListener("abort", abort, { once: true });
     server.on("error", (err5) => {
       if (settled) return;
       settled = true;
@@ -5418,7 +5448,7 @@ var JsonVoucherDb = class {
 
 // src/ports/JsonSubscriptionCredentialStore.ts
 var import_node_fs14 = require("fs");
-var import_node_path7 = require("path");
+var import_node_path8 = require("path");
 var import_SubscriptionAccountHealth = require("@omnicross/core/pipeline/SubscriptionAccountHealth");
 var import_upstreamFetch3 = require("@omnicross/core/pipeline/upstreamFetch");
 var import_SubscriptionIdentityStore = require("@omnicross/core/provider-proxy/identity/SubscriptionIdentityStore");
@@ -5500,9 +5530,9 @@ function findDuplicateCredentialIds(accounts) {
 // src/ports/external-cli-credentials.ts
 var import_node_fs12 = require("fs");
 var import_node_os2 = require("os");
-var import_node_path5 = require("path");
+var import_node_path6 = require("path");
 function externalStorePath(provider, home = (0, import_node_os2.homedir)()) {
-  return provider === "claude" ? (0, import_node_path5.join)(home, ".claude", ".credentials.json") : (0, import_node_path5.join)(home, ".codex", "auth.json");
+  return provider === "claude" ? (0, import_node_path6.join)(home, ".claude", ".credentials.json") : (0, import_node_path6.join)(home, ".codex", "auth.json");
 }
 function decodeJwtExpiryMs(token) {
   try {
@@ -5565,7 +5595,7 @@ function readExternalCliCredentials(provider, home = (0, import_node_os2.homedir
 // src/ports/external-cli-store.ts
 var import_node_fs13 = require("fs");
 var import_node_os3 = require("os");
-var import_node_path6 = require("path");
+var import_node_path7 = require("path");
 function markerPath(provider, home) {
   return `${externalStorePath(provider, home)}.omnicross-managed`;
 }
@@ -5600,7 +5630,7 @@ function readExistingObject(path2) {
   }
 }
 function writeAtomic(path2, content) {
-  (0, import_node_fs13.mkdirSync)((0, import_node_path6.dirname)(path2), { recursive: true });
+  (0, import_node_fs13.mkdirSync)((0, import_node_path7.dirname)(path2), { recursive: true });
   const temp = `${path2}.omnicross-tmp`;
   (0, import_node_fs13.writeFileSync)(temp, content, "utf8");
   (0, import_node_fs13.renameSync)(temp, path2);
@@ -6271,7 +6301,7 @@ var JsonSubscriptionCredentialStore = class {
    *  → `enc:v1:`; already-`enc:`/`$ENV` untouched) before serializing, so any
    *  write — incl. child 4's future refresh writes — lands encrypted. */
   persist(config) {
-    (0, import_node_fs14.mkdirSync)((0, import_node_path7.dirname)(this.tokensPath), { recursive: true });
+    (0, import_node_fs14.mkdirSync)((0, import_node_path8.dirname)(this.tokensPath), { recursive: true });
     const encrypted = encryptTokens(config, this.box);
     (0, import_node_fs14.writeFileSync)(this.tokensPath, JSON.stringify(encrypted, null, 2) + "\n", "utf8");
   }
@@ -6621,7 +6651,7 @@ var AccountHealthSweeper = class {
 
 // src/audit/AuditPruneSweeper.ts
 var import_node_fs15 = require("fs");
-var import_node_path8 = require("path");
+var import_node_path9 = require("path");
 
 // src/audit/auditFiles.ts
 var AUDIT_FILE_RE = /^audit-(\d{4})-(\d{2})-(\d{2})\.jsonl$/;
@@ -6647,8 +6677,8 @@ function auditFileDateMs(fileName) {
 var DAY_MS = 24 * 60 * 6e4;
 var SWEEP_INTERVAL_MS2 = 60 * 6e4;
 var AuditPruneSweeper = class {
-  constructor(auditDir, logger, config, intervalMs = SWEEP_INTERVAL_MS2, now = Date.now) {
-    this.auditDir = auditDir;
+  constructor(auditDir2, logger, config, intervalMs = SWEEP_INTERVAL_MS2, now = Date.now) {
+    this.auditDir = auditDir2;
     this.logger = logger;
     this.config = config;
     this.intervalMs = intervalMs;
@@ -6704,7 +6734,7 @@ var AuditPruneSweeper = class {
         const dateMs = auditFileDateMs(file);
         if (dateMs === null || dateMs >= cutoff) continue;
         try {
-          (0, import_node_fs15.unlinkSync)((0, import_node_path8.join)(this.auditDir, file));
+          (0, import_node_fs15.unlinkSync)((0, import_node_path9.join)(this.auditDir, file));
           removed += 1;
         } catch (error) {
           this.logger.warn("[AuditPruneSweeper] failed to unlink expired audit file", {
@@ -6728,14 +6758,14 @@ var AuditPruneSweeper = class {
 
 // src/audit/auditReader.ts
 var import_node_fs16 = require("fs");
-var import_node_path9 = require("path");
+var import_node_path10 = require("path");
 var DEFAULT_LIMIT = 200;
 var MAX_LIMIT = 2e3;
-function readAuditRecords(auditDir, query = {}) {
-  if (!(0, import_node_fs16.existsSync)(auditDir)) return [];
+function readAuditRecords(auditDir2, query = {}) {
+  if (!(0, import_node_fs16.existsSync)(auditDir2)) return [];
   let files;
   try {
-    files = (0, import_node_fs16.readdirSync)(auditDir).filter((f) => AUDIT_FILE_RE.test(f));
+    files = (0, import_node_fs16.readdirSync)(auditDir2).filter((f) => AUDIT_FILE_RE.test(f));
   } catch {
     return [];
   }
@@ -6746,7 +6776,7 @@ function readAuditRecords(auditDir, query = {}) {
   for (const file of files.sort().reverse()) {
     let raw;
     try {
-      raw = (0, import_node_fs16.readFileSync)((0, import_node_path9.join)(auditDir, file), "utf8");
+      raw = (0, import_node_fs16.readFileSync)((0, import_node_path10.join)(auditDir2, file), "utf8");
     } catch {
       continue;
     }
@@ -6776,10 +6806,10 @@ function isAuditRecord(value) {
 
 // src/audit/AuditWriter.ts
 var import_node_fs17 = require("fs");
-var import_node_path10 = require("path");
+var import_node_path11 = require("path");
 var AuditWriter = class {
-  constructor(auditDir, logger, defer = (fn) => setTimeout(fn, 0)) {
-    this.auditDir = auditDir;
+  constructor(auditDir2, logger, defer = (fn) => setTimeout(fn, 0)) {
+    this.auditDir = auditDir2;
     this.logger = logger;
     this.defer = defer;
   }
@@ -6812,7 +6842,7 @@ var AuditWriter = class {
       (0, import_node_fs17.mkdirSync)(this.auditDir, { recursive: true });
       this.dirEnsured = true;
     }
-    const file = (0, import_node_path10.join)(this.auditDir, auditFileName(record.ts));
+    const file = (0, import_node_path11.join)(this.auditDir, auditFileName(record.ts));
     (0, import_node_fs17.appendFileSync)(file, JSON.stringify(record) + "\n", "utf8");
   }
 };
@@ -6820,7 +6850,7 @@ var AuditWriter = class {
 // src/billing/BillingPublisher.ts
 var import_node_fs18 = require("fs");
 var import_node_crypto10 = require("crypto");
-var import_node_path11 = require("path");
+var import_node_path12 = require("path");
 var import_upstreamFetch5 = require("@omnicross/core/pipeline/upstreamFetch");
 
 // src/billing/billingFiles.ts
@@ -6891,7 +6921,7 @@ var BillingPublisher = class {
    */
   appendNow(event) {
     this.ensureDir();
-    const file = (0, import_node_path11.join)(this.billingDir, billingFileName(event.ts));
+    const file = (0, import_node_path12.join)(this.billingDir, billingFileName(event.ts));
     (0, import_node_fs18.appendFileSync)(file, JSON.stringify(event) + "\n", "utf8");
   }
   /**
@@ -6941,7 +6971,7 @@ var BillingPublisher = class {
   markDelivered(event) {
     try {
       this.ensureDir();
-      const file = (0, import_node_path11.join)(this.billingDir, deliveredFileName(event.ts));
+      const file = (0, import_node_path12.join)(this.billingDir, deliveredFileName(event.ts));
       (0, import_node_fs18.appendFileSync)(file, JSON.stringify({ id: event.id, deliveredAt: this.now() }) + "\n", "utf8");
     } catch (error) {
       this.logger.warn("[BillingPublisher] failed to append delivery marker", {
@@ -6958,7 +6988,7 @@ var BillingPublisher = class {
 
 // src/billing/billingReader.ts
 var import_node_fs19 = require("fs");
-var import_node_path12 = require("path");
+var import_node_path13 = require("path");
 function readBillingLedger(billingDir) {
   const view = { events: [], deliveredIds: /* @__PURE__ */ new Set() };
   if (!(0, import_node_fs19.existsSync)(billingDir)) return view;
@@ -6995,7 +7025,7 @@ function readBillingStatus(billingDir) {
 function parseLines(dir, file) {
   let raw;
   try {
-    raw = (0, import_node_fs19.readFileSync)((0, import_node_path12.join)(dir, file), "utf8");
+    raw = (0, import_node_fs19.readFileSync)((0, import_node_path13.join)(dir, file), "utf8");
   } catch {
     return [];
   }
@@ -7436,7 +7466,7 @@ function buildDaemon(config, paths) {
     // lines through the injected logger (honors level/format/file sink).
     logger
   });
-  const auditDir = defaultAuditDir(paths.configPath);
+  const auditDir2 = defaultAuditDir(paths.configPath);
   const billingDir = defaultBillingDir(paths.configPath);
   const adminServer = new AdminServer({
     configPath: paths.configPath,
@@ -7477,7 +7507,7 @@ function buildDaemon(config, paths) {
     // the app polls the token-free status. A test seam (`paths.codexAwaitLoopback`)
     // can inject a mock so no real port is bound.
     codexSessions: new CodexOAuthSessionStore(),
-    codexAwaitLoopback: paths.codexAwaitLoopback ?? ((state, timeoutMs) => awaitLoopbackCode(state, timeoutMs)),
+    codexAwaitLoopback: paths.codexAwaitLoopback ?? ((state, timeoutMs, signal) => awaitLoopbackCode(state, timeoutMs, signal)),
     // Migration pack (app-parity child 6, design D2/D3) — the concrete credential
     // store provides BOTH the full DECRYPTED read (`getFullConfig`, export) and
     // the multi-account append (`appendProviderAccount`, import re-encrypts at-
@@ -7512,7 +7542,7 @@ function buildDaemon(config, paths) {
     // date-rotated audit store. Bound to the store dir here so the AdminServer
     // carries no path/store coupling. Records hold IP/UA/bodies → admin-only,
     // NEVER unauth, NEVER on `/health`. Routed in `AdminServer` (not `adminApi.ts`).
-    auditReader: (query) => readAuditRecords(auditDir, query),
+    auditReader: (query) => readAuditRecords(auditDir2, query),
     // billing-event-stream: the AUTHED `GET /admin/api/billing-status` returns the
     // secret-free total/delivered/pending counts of the durable ledger.
     billingStatusReader: () => readBillingStatus(billingDir)
@@ -7522,9 +7552,9 @@ function buildDaemon(config, paths) {
     fetchImpl: (url, init) => (0, import_upstreamFetch7.fetchUpstream)(url, init)
   });
   setWebhookRuntime(webhookDispatcher, (0, import_SubscriptionAccountHealth2.getSharedAccountHealth)());
-  const auditWriter = new AuditWriter(auditDir, logger);
-  const auditPruneSweeper = new AuditPruneSweeper(auditDir, logger, import_audit_types.DEFAULT_AUDIT_CONFIG);
-  setAuditRuntime(auditWriter, auditPruneSweeper);
+  const auditWriter = new AuditWriter(auditDir2, logger);
+  const auditPruneSweeper = new AuditPruneSweeper(auditDir2, logger, import_audit_types.DEFAULT_AUDIT_CONFIG);
+  setAuditRuntime(auditWriter, auditPruneSweeper, auditDir2);
   const billingPublisher = new BillingPublisher(billingDir, logger);
   const billingRetrySweeper = new BillingRetrySweeper(
     billingDir,
@@ -7613,9 +7643,9 @@ function buildCliSpawnPlan(opts) {
   };
 }
 function resolveInPathDefault(candidate) {
-  const segments = (process.env["PATH"] ?? "").split(import_node_path13.delimiter).filter(Boolean);
+  const segments = (process.env["PATH"] ?? "").split(import_node_path14.delimiter).filter(Boolean);
   for (const seg of segments) {
-    const full = (0, import_node_path13.join)(seg, candidate);
+    const full = (0, import_node_path14.join)(seg, candidate);
     if ((0, import_node_fs21.existsSync)(full)) return full;
   }
   return null;