@staix/agent-hub 0.12.16 → 0.12.18

package/src/hub/usage.ts

@@ -4,6 +4,8 @@ import { normalizeUsage, safeModelLabel, type NormalizedUsage } from "../omnirou
 
 export interface UsageRecord {
   id: string;
+  /** True only for a native assistant end_turn row, never a tool-use/compaction message. */
+  completedTurn?: boolean;
   at?: string;
   usage?: NormalizedUsage;
   requestedModel?: string;
@@ -11,6 +13,39 @@ export interface UsageRecord {
   provider?: string;
 }
 
+/** Claude-native counters have separate input/output/cache categories, often no explicit total. */
+export function claudeReportedTokens(usage: NormalizedUsage | undefined): number | undefined {
+  if (!usage) return undefined;
+  if (usage.totalTokens !== undefined) return usage.totalTokens;
+  if (usage.inputTokens === undefined || usage.outputTokens === undefined) return undefined;
+  const total = usage.inputTokens + usage.outputTokens + (usage.cacheReadTokens ?? 0) + (usage.cacheWriteTokens ?? 0);
+  return Number.isSafeInteger(total) && total >= 0 ? total : undefined;
+}
+
+export type ClaudeCompletionWait = { record?: UsageRecord; reason: "verified" | "unavailable" | "baseline" | "before-start" | "superseded" };
+/** After acknowledging Stop, observe its delayed transcript append within a bounded 1200 ms window. */
+export async function waitForClaudeCompletion(read: () => UsageRecord | undefined, current: () => boolean, start: { at: number; baseline?: string }, timeoutMs = 1200): Promise<ClaudeCompletionWait> {
+  const budget = Number.isFinite(timeoutMs) ? Math.min(1200, Math.max(0, timeoutMs)) : 1200;
+  if (budget === 0) return { reason: "unavailable" };
+  const deadline = performance.now() + budget;
+  let reason: ClaudeCompletionWait["reason"] = "unavailable";
+  while (true) {
+    if (!current()) return { reason: "superseded" };
+    const record = read();
+    if (!current()) return { reason: "superseded" };
+    if (performance.now() > deadline) return { reason };
+    const at = typeof record?.at === "string" ? Date.parse(record.at) : NaN;
+    if (record?.completedTurn && Number.isFinite(at)) {
+      if (record.id === start.baseline) reason = "baseline";
+      else if (at < start.at) reason = "before-start";
+      else return { record, reason: "verified" };
+    } else reason = "unavailable";
+    const left = deadline - performance.now();
+    if (left <= 0) return { reason };
+    await Bun.sleep(Math.min(40, left));
+  }
+}
+
 function opaqueId(sessionId: string, messageId: string): string {
   return createHash("sha256").update(sessionId).update("\0").update(messageId).digest("hex");
 }
@@ -30,7 +65,7 @@ export function readClaudeTranscriptUsage(sessionId: string, transcriptPath: str
       // Signal unavailable coverage with a stable opaque id; a repeated poll dedupes in the report.
       return [{ id: opaqueId(sessionId, "transcript-too-large") }];
     }
-    const latest = new Map<string, { usage?: NormalizedUsage; at?: string; servedModel?: string }>();
+    const latest = new Map<string, { usage?: NormalizedUsage; at?: string; servedModel?: string; completedTurn?: boolean }>();
     for (const line of readFileSync(transcriptPath, "utf8").split("\n")) {
       if (!line.trim()) continue;
       try {
@@ -43,7 +78,7 @@ export function readClaudeTranscriptUsage(sessionId: string, transcriptPath: str
         const usage = supportedStopReason ? normalizeUsage(message.usage) : undefined;
         const at = typeof row.timestamp === "string" && Number.isFinite(Date.parse(row.timestamp)) ? new Date(row.timestamp).toISOString() : undefined;
         const servedModel = safeModelLabel(message.model);
-        latest.set(message.id, { ...(usage ? { usage } : {}), ...(at ? { at } : {}), ...(servedModel ? { servedModel } : {}) });
+        latest.set(message.id, { ...(usage ? { usage } : {}), ...(at ? { at } : {}), ...(servedModel ? { servedModel } : {}), ...(message.stop_reason === "end_turn" ? { completedTurn: true } : {}) });
       } catch {
         // A streaming or crash-truncated line is not a record.
       }

package/src/pi/launch.ts

@@ -1,4 +1,5 @@
 import { join } from "node:path";
+import { peerChildEnv } from "../hub/child-process.ts";
 import type { PiOptions, PiModelDescriptor, PiTuiLaunch } from "../adapters/pi.ts";
 
 const modelFor = (backend: PiOptions["backend"], models: PiModelDescriptor[]): string => {
@@ -12,7 +13,7 @@ const modelFor = (backend: PiOptions["backend"], models: PiModelDescriptor[]): s
 
 /** Pure native launch; bridge/relay setup and session validation remain with the adapter. */
 export function buildPiLaunch(opts: Pick<PiOptions, "stateDir" | "cmd" | "mode" | "backend" | "model" | "relay" | "tools" | "preamble" | "maxSteps" | "sessionFile" | "sessionId">, inherited: NodeJS.ProcessEnv, extension: string, bridgePort: number | string, bridgeToken: string): PiTuiLaunch {
-  const env: NodeJS.ProcessEnv = { ...inherited, PI_CODING_AGENT_DIR: join(opts.stateDir, "pi"), AGENTHUB_PI_BRIDGE_URL: `http://127.0.0.1:${bridgePort}`, AGENTHUB_PI_BRIDGE_TOKEN: bridgeToken, AGENTHUB_PI_OWNER_TOKEN: bridgeToken, AGENTHUB_PI_RELAY_URL: opts.relay.url, AGENTHUB_PI_RELAY_TOKEN: opts.relay.token, AGENTHUB_PI_MODELS: JSON.stringify(opts.relay.models), AGENTHUB_PI_TOOLS: JSON.stringify(opts.tools), AGENTHUB_PI_MAX_STEPS: String(opts.maxSteps ?? 30) };
+  const env: NodeJS.ProcessEnv = { ...peerChildEnv("pi", inherited), PI_CODING_AGENT_DIR: join(opts.stateDir, "pi"), AGENTHUB_PI_BRIDGE_URL: `http://127.0.0.1:${bridgePort}`, AGENTHUB_PI_BRIDGE_TOKEN: bridgeToken, AGENTHUB_PI_OWNER_TOKEN: bridgeToken, AGENTHUB_PI_RELAY_URL: opts.relay.url, AGENTHUB_PI_RELAY_TOKEN: opts.relay.token, AGENTHUB_PI_MODELS: JSON.stringify(opts.relay.models), AGENTHUB_PI_TOOLS: JSON.stringify(opts.tools), AGENTHUB_PI_MAX_STEPS: String(opts.maxSteps ?? 30) };
   const args = [ ...(opts.mode === "headless" ? ["--mode", "rpc"] : []), "--provider", "agent-hub-local", "--model", opts.model ?? modelFor(opts.backend, opts.relay.models), "--models", opts.relay.models.map((model) => `agent-hub-local/${model.id}`).join(","), "--no-builtin-tools", "--no-skills", "--no-prompt-templates", "--no-extensions", "--extension", extension, ...(opts.preamble ? ["--append-system-prompt", opts.preamble] : []), "--session-dir", join(opts.stateDir, "pi-sessions")];
   if (opts.sessionFile) args.push("--session", opts.sessionFile); else if (opts.sessionId) args.push("--session-id", opts.sessionId);
   const command = opts.cmd ?? ["pi"];