agent-relay-runner 0.127.5 → 0.127.7

package/src/adapters/claude.ts

@@ -1,5 +1,4 @@
 import { chmodSync, existsSync, mkdirSync, writeFileSync } from "node:fs";
-import { readFile } from "node:fs/promises";
 import { homedir } from "node:os";
 import { dirname, join, resolve } from "node:path";
 import { type Message } from "agent-relay-sdk";
@@ -9,18 +8,22 @@ import { tmuxCommand, tmuxHasSession } from "agent-relay-sdk/tmux-utils";
 import { profileAllowsRelayFeature, type ManagedProcess, type ProviderAdapter, type ProviderConfig, type ProviderStatusUpdate, type RunnerSpawnConfig, type SemanticStatus, type SpawnArgs } from "../adapter";
 import { computeLivenessSignal, type LivenessInputs } from "../liveness";
 import type { LivenessSignal } from "agent-relay-sdk";
-import { collectClaudeSessionEvents } from "./claude-transcript";
-import type { SessionEvent } from "../session-insights";
 import { prepareClaudeProfileHome, profileUsesClaudeHostProviderGlobals } from "../profile-home";
 import { assembleLaunch, materializeLaunchAssembly, sessionStatusLineSettingsArgs, stripSettingsArgs } from "../launch-assembly";
 import { claudeProviderMessageText } from "./claude-delivery";
 import { claudeProbeActivity, readManagedClaudeStatus, resolveClaudePid, type ClaudeProbeActivity } from "./claude-session-probe";
-import { evaluateClaudePromptGatePane, initialClaudePromptGatePaneState, type ClaudePromptGatePaneState } from "../claude-prompt-gates";
+import { evaluateClaudePromptGatePane, initialClaudePromptGatePaneState, type ClaudePromptGatePaneState } from "./claude-prompt-gates";
 import { claudePaneLooksReady, claudePaneIsBusy, claudeRateLimitStatus, claudeConnectionRetryStatus, claudeModelUnavailableStatus } from "./claude-status-detectors";
 import { launcherScriptPathForSession } from "../session-scratch";
+import { ClaudeSessionCapture, collectClaudeTranscriptArchiveSegment, collectClaudeTranscriptSessionEvents } from "./claude-session-capture";
+import { claudePermissionPromptHandler } from "./claude-permission";
 
 export class ClaudeAdapter implements ProviderAdapter {
   readonly provider = "claude";
+  readonly statusSourceId = "claude";
+  private readonly paneSourceId = `${this.statusSourceId}-pane`;
+  readonly stopObligationPath = "claude-stop";
+  readonly permissionPromptHandler = claudePermissionPromptHandler;
   readonly compactSupportsInstructions = true;
   // #352: initial prompt is seeded as Claude's positional launch arg (buildSpawnArgs) — reliable,
   // no send-keys/onboarding race; tells the runner to skip the redundant post-launch delivery.
@@ -31,6 +34,16 @@ export class ClaudeAdapter implements ProviderAdapter {
   private modelUnavailableReported = false;
   private connectionRetryActive = false;
   private promptGatePaneState: ClaudePromptGatePaneState = initialClaudePromptGatePaneState();
+  private readonly sessionCapture = new ClaudeSessionCapture();
+  readonly onSessionEvent = this.sessionCapture.onSessionEvent.bind(this.sessionCapture);
+  readonly onSessionEvents = this.sessionCapture.onSessionEvents.bind(this.sessionCapture);
+  readonly captureSessionTurn = this.sessionCapture.captureSessionTurn.bind(this.sessionCapture);
+  readonly handleUserPrompt = this.sessionCapture.handleUserPrompt.bind(this.sessionCapture);
+  readonly drainSessionTrace = this.sessionCapture.drainReasoningTail.bind(this.sessionCapture);
+  readonly settleSessionTraceForToolUse = this.sessionCapture.settlePollForToolUse.bind(this.sessionCapture);
+  readonly stopSessionTrace = this.sessionCapture.stopSessionTrace.bind(this.sessionCapture);
+  readonly collectSessionEvents = collectClaudeTranscriptSessionEvents;
+  readonly collectSessionArchiveSegment = collectClaudeTranscriptArchiveSegment;
 
   onStatusChange(cb: (status: ProviderStatusUpdate) => void): void {
     this.statusCb = cb;
@@ -91,28 +104,6 @@ export class ClaudeAdapter implements ProviderAdapter {
     return { method: "tmux-inject", command: "/clear" };
   }
 
-  // #183/#184: parse the full Claude transcript into the shared SessionEvent stream. The
-  // runner slices per-segment, so we return the whole transcript's events each call.
-  async collectSessionEvents(_process: ManagedProcess, ctx: { transcriptPath?: string }): Promise<SessionEvent[] | null> {
-    if (!ctx.transcriptPath) return null;
-    let jsonl: string;
-    try {
-      jsonl = await readFile(ctx.transcriptPath, "utf8");
-    } catch {
-      return null;
-    }
-    return collectClaudeSessionEvents(jsonl);
-  }
-
-  async collectSessionArchiveSegment(_process: ManagedProcess, ctx: { transcriptPath?: string }): Promise<string | null> {
-    if (!ctx.transcriptPath) return null;
-    try {
-      return await readFile(ctx.transcriptPath, "utf8");
-    } catch {
-      return null;
-    }
-  }
-
   async interrupt(process: ManagedProcess): Promise<Record<string, unknown>> {
     const session = process.meta?.tmuxSession as string | undefined;
     const socket = process.meta?.tmuxSocket as string | undefined;
@@ -434,6 +425,7 @@ export class ClaudeAdapter implements ProviderAdapter {
       const promptGate = evaluateClaudePromptGatePane(pane, this.promptGatePaneState, {
         sessionName,
         busy: claudePaneIsBusy(pane),
+        sourceId: this.paneSourceId,
       });
       this.promptGatePaneState = promptGate.state;
       if (promptGate.action) {

package/src/{codex-version.ts → adapters/codex-version.ts}

@@ -9,7 +9,7 @@
 // executes CODEX_HOME/hooks.json for these event names (Stop/PreToolUse/…), not just that the
 // version string clears the gate. The version probe is necessary but not sufficient.
 
-import { codexVersionOverrideFromEnv } from "./config";
+import { codexVersionOverrideFromEnv } from "../config";
 
 // Codex releases from this version on ship stable hooks with Claude-compatible events.
 const CODEX_HOOKS_MIN_VERSION = [0, 124, 0] as const;

package/src/adapters/{claude-quota-harvest.ts → provider-quota-harvest.ts}

@@ -8,20 +8,20 @@ const PASSIVE_QUOTA_SAMPLE_STALE_MS = 10 * 60_000;
 const PASSIVE_QUOTA_LEASE_MAX_TTL_MS = 10 * 60_000;
 const PASSIVE_QUOTA_LEASE_PADDING_MS = 60_000;
 
-interface ClaudeQuotaHarvestOptions {
+interface ProviderQuotaHarvestOptions {
   agentId: string;
   provider: string;
   http: () => Pick<RelayHttpClient, "acquireProviderQuotaPublisherLease" | "getProviderQuotaConfig" | "upsertProviderQuota">;
 }
 
-export class ClaudeQuotaHarvest {
+export class ProviderQuotaHarvest {
   private config = { ...DEFAULT_PROVIDER_QUOTA_CONFIG };
   private configRefreshAt = 0;
   private lastReportAt?: number;
   private lease?: { accountKey: string; leaseToken: string; expiresAt: number };
   private nextLeaseAttemptAt?: number;
 
-  constructor(private readonly options: ClaudeQuotaHarvestOptions) {}
+  constructor(private readonly options: ProviderQuotaHarvestOptions) {}
 
   async publish(): Promise<void> {
     if (this.options.provider !== "claude") return;