dahrk-node 0.1.15 → 0.1.17

package/dist/main.js

@@ -902,6 +902,10 @@ function mapUsage2(u) {
 
 // ../../packages/executor-worktree/src/codex-adapter.ts
 var COALESCE_MS2 = Number(process.env.DAHRK_COALESCE_MS ?? process.env.SKAKEL_COALESCE_MS ?? 40);
+var CODEX_COST_UNAVAILABLE_NOTE = "codex-adapter: cost reporting unavailable for the Codex runtime (the SDK reports tokens, not price); costUsd left unset, not $0\n";
+function warnCostUnavailable(write = (s) => void process.stderr.write(s)) {
+  write(CODEX_COST_UNAVAILABLE_NOTE);
+}
 function runtimeEnvOptions2(ctx) {
   if (!ctx.runtimeEnv) return {};
   const env = {};
@@ -961,6 +965,7 @@ function createCodexRunner() {
       }
       captureThreadId(t);
       if (cancelled) status = "fail";
+      warnCostUnavailable();
       return { status, ...sessionId ? { sessionId } : {} };
     },
     async runInteractive(ctx, turns, onTrace) {
@@ -1031,6 +1036,7 @@ function createCodexRunner() {
         summary = "(stage cancelled)";
       }
       captureThreadId(t);
+      warnCostUnavailable();
       return { status, summary, ...sessionId ? { sessionId } : {} };
     },
     async summarise(ctx) {
@@ -1186,6 +1192,10 @@ function createPiRunner(deps = {}) {
   const captureSessionId = (s) => {
     if (s.sessionId) sessionId = s.sessionId;
   };
+  const readSessionCost = (s) => {
+    const cost = s.getSessionStats?.()?.cost;
+    return typeof cost === "number" ? cost : void 0;
+  };
   return {
     runtime: "pi",
     async runBatch(ctx, onTrace) {
@@ -1209,7 +1219,8 @@ function createPiRunner(deps = {}) {
       }
       captureSessionId(s);
       if (cancelled) status = "fail";
-      return { status, ...sessionId ? { sessionId } : {} };
+      const costUsd = readSessionCost(s);
+      return { status, ...sessionId ? { sessionId } : {}, ...costUsd !== void 0 ? { costUsd } : {} };
     },
     async runInteractive(ctx, turns, onTrace) {
       const emit = makeEmit("pi", onTrace);
@@ -1304,7 +1315,13 @@ function createPiRunner(deps = {}) {
       }
       unsub();
       captureSessionId(s);
-      return { status, summary, ...sessionId ? { sessionId } : {} };
+      const costUsd = readSessionCost(s);
+      return {
+        status,
+        summary,
+        ...sessionId ? { sessionId } : {},
+        ...costUsd !== void 0 ? { costUsd } : {}
+      };
     },
     async summarise(ctx) {
       if (!session) return "(no summary: session not established)";
@@ -1354,7 +1371,9 @@ async function defaultCreatePiSession(ctx) {
   let model;
   if (ctx.config.model) {
     const resolved = resolveCliModel({ cliModel: ctx.config.model, modelRegistry });
-    if (!resolved?.error) model = resolved?.model;
+    if (!resolved?.error) {
+      model = pickAuthedModel(resolved?.model, modelRegistry.getAvailable());
+    }
   }
   const stageComplete = defineTool({
     name: PI_STAGE_COMPLETE_TOOL,
@@ -1379,6 +1398,17 @@ var PROVIDER_BY_ENV = {
   GEMINI_API_KEY: "google",
   GOOGLE_API_KEY: "google"
 };
+function modelFamily(id) {
+  const last = id.split(".").pop() ?? id;
+  return last.replace(/-v\d+:\d+$/, "").toLowerCase();
+}
+function pickAuthedModel(resolved, available) {
+  if (!resolved || !available?.length) return resolved;
+  const providers = new Set(available.map((m) => m.provider));
+  if (providers.has(resolved.provider)) return resolved;
+  const family = modelFamily(resolved.id);
+  return available.find((m) => modelFamily(m.id) === family) ?? resolved;
+}
 
 // ../../packages/executor-worktree/src/git-service.ts
 import { execFileSync } from "child_process";
@@ -6265,6 +6295,7 @@ async function runUpdate(inputs, deps = {}) {
     d.out(hint(`You are on ${current}. See https://www.npmjs.com/package/dahrk-node for releases.`));
     return 1;
   }
+  d.saveResult({ updateCheckedAt: new Date(d.now()).toISOString(), updateLatest: latest });
   if (!isNewer(latest, current)) {
     d.out(verdict("ok", `Already on the latest version (${current}).`));
     return 0;
@@ -6352,6 +6383,10 @@ var defaultDeps4 = () => ({
   binPath: process.argv[1],
   fetchLatest: fetchLatestVersion,
   runUpgrade: spawnUpgrade,
+  // The same cache the daemon's periodic check writes (`updateCheckDeps` in main.ts), so both writers agree
+  // on where "what the registry last said" lives and `status` has one place to read it from.
+  saveResult: (patch) => writeState(process.env, patch),
+  now: () => Date.now(),
   nodeRunning: nodeIsRunning,
   interactive: isInteractive,
   confirm,
@@ -6367,7 +6402,8 @@ var defaultDeps4 = () => ({
 });
 
 // src/update-check.ts
-var DEFAULT_INTERVAL_MS = 24 * 60 * 60 * 1e3;
+var DEFAULT_INTERVAL_MS = 6 * 60 * 60 * 1e3;
+var STALE_AFTER_INTERVALS = 4;
 var FETCH_TIMEOUT_MS = 1500;
 function checkSuppressed(env) {
   return Boolean(env.DAHRK_NO_UPDATE_CHECK || env.NO_UPDATE_NOTIFIER || env.CI);
@@ -6400,7 +6436,8 @@ async function checkForUpdate(currentVersion, deps) {
   if (checkSuppressed(deps.env)) return void 0;
   const state = deps.readState();
   if (!shouldCheck(deps.now(), state.updateCheckedAt, checkIntervalMs(deps.env), deps.env)) {
-    return cachedUpdate(state, currentVersion, deps.binPath);
+    const cached = cachedUpdate(state, currentVersion, deps.binPath);
+    return cached.kind === "available" ? cached : void 0;
   }
   let latest;
   try {
@@ -6412,10 +6449,12 @@ async function checkForUpdate(currentVersion, deps) {
   if (!isNewer(latest, currentVersion)) return void 0;
   return { current: currentVersion, latest, channel: detectChannel(deps.binPath) };
 }
+var isStale = (checkedAt, now, intervalMs) => now - checkedAt >= intervalMs * STALE_AFTER_INTERVALS;
 function cachedUpdate(state, currentVersion, binPath) {
-  const latest = state.updateLatest;
-  if (!latest || !isNewer(latest, currentVersion)) return void 0;
-  return { current: currentVersion, latest, channel: detectChannel(binPath) };
+  const { updateLatest: latest, updateCheckedAt } = state;
+  const checkedAt = updateCheckedAt ? Date.parse(updateCheckedAt) : NaN;
+  if (!latest || !Number.isFinite(checkedAt)) return { kind: "unknown" };
+  return isNewer(latest, currentVersion) ? { kind: "available", checkedAt, current: currentVersion, latest, channel: detectChannel(binPath) } : { kind: "current", checkedAt };
 }
 
 // src/status.ts
@@ -6454,7 +6493,13 @@ function presenceHints(f) {
 }
 function renderStatus(f) {
   const v = presenceVerdict(f);
-  const lines = ["", verdict(v.level, v.text), ""];
+  const lines = ["", verdict(v.level, v.text)];
+  if (f.update?.kind === "available") {
+    lines.push(
+      verdict("warn", `Update available: ${f.clientVersion} ${arrow()} ${f.update.latest}`) + `    ${dim("run `dahrk update`")}`
+    );
+  }
+  lines.push("");
   const { nodeId, name, tenantId, enrolToken } = f.state;
   if (enrolToken) {
     const who = name ? name : "yes";
@@ -6465,12 +6510,7 @@ function renderStatus(f) {
     lines.push(kv("Enrolled", `no  ${dim("run `dahrk start --token <token>` once to enrol")}`));
   }
   lines.push(kv("Node id", nodeId ?? dim("not yet minted (first `dahrk start` mints one)")));
-  lines.push(
-    kv(
-      "Client",
-      f.update ? `${f.clientVersion}  ${dim(`(update available: ${f.update.latest} - run \`dahrk update\`)`)}` : f.clientVersion
-    )
-  );
+  lines.push(kv("Client", `${f.clientVersion}${currency(f)}`));
   const conn = f.connection ? `  ${dim(`(${f.connection.event} ${ago(f.now - f.connection.at)}${f.connection.detail ? `, ${f.connection.detail}` : ""})`)}` : "";
   lines.push(kv("Hub", `${f.hubUrl}${conn}`));
   const installed = f.runtimes.filter((r) => r.installed);
@@ -6491,6 +6531,19 @@ function renderStatus(f) {
   lines.push("", dim(`  State file: ${f.stateFile}`));
   return lines;
 }
+function currency(f) {
+  const u = f.update;
+  if (!u) return "";
+  if (u.kind === "unknown") {
+    return `  ${dim("update status unknown - run `dahrk update --check`")}`;
+  }
+  const age = ago(f.now - u.checkedAt);
+  if (isStale(u.checkedAt, f.now, f.updateIntervalMs)) {
+    return `  ${dim(`as of ${age} - run \`dahrk update --check\` to refresh`)}`;
+  }
+  if (u.kind === "available") return `  ${dim(`(checked ${age})`)}`;
+  return `  ${symbol("ok")} ${dim(`up to date (checked ${age})`)}`;
+}
 function jobLine(j, now) {
   const where = j.stageId ? `${j.runId} ${dim("/")} ${j.stageId}` : `${j.runId} ${dim(`(${j.kind})`)}`;
   return `${where}  ${dim(humanDuration(now - j.startedAt))}`;
@@ -6530,6 +6583,7 @@ async function gatherFacts(inputs, deps) {
     runtimes: await deps.probeRuntimes(),
     presence,
     jobs,
+    updateIntervalMs: checkIntervalMs(deps.env),
     now: deps.now(),
     ...service ? { service } : {},
     ...connection ? { connection } : {},
@@ -6567,7 +6621,7 @@ async function runStatus(inputs, deps) {
 }
 
 // src/main.ts
-var CLIENT_VERSION = "0.1.15";
+var CLIENT_VERSION = "0.1.17";
 var DEFAULT_HUB_URL = "wss://api.dahrk.ai";
 var list = (v) => (v ?? "").split(",").map((s) => s.trim()).filter(Boolean);
 var RUNTIMES2 = ["claude-code", "codex", "pi"];
@@ -6757,6 +6811,9 @@ async function stop(env, force) {
   if (code === 0 || code === STOP_FOREIGN_NODE) setDesired(env, "stopped");
   return code;
 }
+var updateStateDeps = (env) => ({
+  saveResult: (patch) => writeState(env, patch)
+});
 function updateCheckDeps(env) {
   return {
     env,
@@ -6774,7 +6831,7 @@ async function offerUpdate(env) {
   out(renderUpdateNotice(available));
   if (!isInteractive()) return;
   if (!await confirm("Update now?")) return;
-  const code = await runUpdate({ currentVersion: CLIENT_VERSION, check: false });
+  const code = await runUpdate({ currentVersion: CLIENT_VERSION, check: false }, updateStateDeps(env));
   if (code !== 0) out(hint("Update failed; starting the node on the current version anyway."));
 }
 function scheduleUpdateChecks(env) {
@@ -6924,11 +6981,14 @@ async function main() {
       break;
     }
     case "update":
-      process.exitCode = await runUpdate({
-        currentVersion: CLIENT_VERSION,
-        check: parsed.flags.check,
-        verbose: parsed.flags.verbose
-      });
+      process.exitCode = await runUpdate(
+        {
+          currentVersion: CLIENT_VERSION,
+          check: parsed.flags.check,
+          verbose: parsed.flags.verbose
+        },
+        updateStateDeps(applyEnvAliases(process.env))
+      );
       break;
     case "start":
       process.exitCode = await start(parsed.flags);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dahrk-node",
-  "version": "0.1.15",
+  "version": "0.1.17",
   "private": false,
   "license": "Apache-2.0",
   "type": "module",