@yaag/runtime 0.6.0 → 0.6.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@yaag/runtime",
-  "version": "0.6.0",
+  "version": "0.6.1",
   "publishConfig": {
     "access": "public"
   },

package/src/{agent-usage.ts → agent/agent-usage.ts}

@@ -1,4 +1,4 @@
-import type { Frame, TokenBreakdown } from "./transport.ts";
+import type { Frame, TokenBreakdown } from "../transport/index.ts";
 
 export interface AgentUsageSnapshot {
   readonly tokens: TokenBreakdown;

package/src/{agent.ts → agent/agent.ts}

@@ -1,13 +1,13 @@
 import type { Static, TSchema } from "typebox";
+import type { EffectiveAskOptions } from "../ask/index.ts";
+import { exchangeAsk } from "../ask/index.ts";
+import { ReportResultTool } from "../ask-contract/index.ts";
+import { agentError } from "../errors.ts";
+import type { EventSink } from "../events.ts";
+import type { AgentStats, AgentTransport } from "../transport/index.ts";
+import { Connection } from "../transport/index.ts";
+import type { AskOptions, Handle, ResolvedSpawnOptions, StructuredAskOptions } from "../types.ts";
 import { AgentUsage } from "./agent-usage.ts";
-import { exchangeAsk } from "./ask-exchange.ts";
-import type { EffectiveAskOptions } from "./ask-hash.ts";
-import { Connection } from "./connection.ts";
-import { agentError } from "./errors.ts";
-import type { EventSink } from "./events.ts";
-import { ReportResultTool } from "./report-result.ts";
-import type { AgentStats, AgentTransport } from "./transport.ts";
-import type { AskOptions, Handle, ResolvedSpawnOptions, StructuredAskOptions } from "./types.ts";
 
 export interface AgentOptions {
   readonly name: string;

package/src/{define-agent.ts → agent/define-agent.ts}

@@ -1,7 +1,7 @@
-import type { ModelSpec, ThinkingSpec } from "./model-resolution.ts";
-import type { AskOptions } from "./types.ts";
+import type { ModelSpec, ThinkingSpec } from "../model/index.ts";
+import type { AskOptions } from "../types.ts";
 
-export type { ThinkingLevel } from "./types.ts";
+export type { ThinkingLevel } from "../types.ts";
 
 /** What `defineAgent` is given: the policy of one Agent, never its topology. */
 export interface AgentConfig {

package/src/agent/index.ts

@@ -0,0 +1,13 @@
+/**
+ * Public surface of the `agent/` module: the Agent handle and spawn.
+ * Files inside this directory import each other directly.
+ */
+export { Agent } from "./agent.ts";
+export {
+  type AgentConfig,
+  type AgentDefinition,
+  agentDefinitionConfig,
+  defineAgent,
+  isAgentDefinition,
+} from "./define-agent.ts";
+export { makeSpawn } from "./spawn.ts";

package/src/{spawn.ts → agent/spawn.ts}

@@ -1,20 +1,20 @@
 import { resolve } from "node:path";
-import { Agent } from "./agent.ts";
-import { uniqueAgentName } from "./agent-names.ts";
-import { type AgentDefinition, agentDefinitionConfig, isAgentDefinition } from "./define-agent.ts";
-import { YaagError } from "./errors.ts";
-import type { EventSink } from "./events.ts";
-import { resolveExtensionPaths } from "./extension-paths.ts";
-import { normalizeModelResolution } from "./model-resolution.ts";
-import type { RunContext } from "./run-context.ts";
-import type { AgentTransport, TransportFactory, TransportStartup } from "./transport.ts";
+import { YaagError } from "../errors.ts";
+import type { EventSink } from "../events.ts";
+import { resolveExtensionPaths } from "../extension/index.ts";
+import { normalizeModelResolution } from "../model/index.ts";
+import type { RunContext } from "../run/index.ts";
+import type { AgentTransport, TransportFactory, TransportStartup } from "../transport/index.ts";
 import type {
   AskOptions,
   Handle,
   ResolvedSpawnOptions,
   SpawnOptions,
   SpawnOverrides,
-} from "./types.ts";
+} from "../types.ts";
+import { Agent } from "./agent.ts";
+import { uniqueAgentName } from "./agent-names.ts";
+import { type AgentDefinition, agentDefinitionConfig, isAgentDefinition } from "./define-agent.ts";
 
 /** Dependencies for one Run's Agent-spawn gate. */
 export interface SpawnDependencies {

package/src/{ask-activity.ts → ask/ask-activity.ts}

@@ -1,6 +1,6 @@
-import type { AgentActivity } from "./events.ts";
-import type { Frame } from "./transport.ts";
-import { TOOL_ARGS_GIST_MAX_CHARS } from "./wire-constants.ts";
+import type { AgentActivity } from "../events.ts";
+import type { Frame } from "../transport/index.ts";
+import { TOOL_ARGS_GIST_MAX_CHARS } from "../wire-constants.ts";
 
 /** Reports complete Ask activity transitions derived from already-observed frames. */
 export class AskActivityTracker {

package/src/{ask-exchange-events.ts → ask/ask-exchange-events.ts}

@@ -1,7 +1,7 @@
-import type { AgentActivity, AskOutputChannel, EventSink } from "./events.ts";
-import { agentAskPath, childPath } from "./node-path.ts";
-import type { NodeSnapshot } from "./node-tracker.ts";
-import { promptGist } from "./prompt-gist.ts";
+import type { AgentActivity, AskOutputChannel, EventSink } from "../events.ts";
+import type { NodeSnapshot } from "../node/index.ts";
+import { agentAskPath, childPath } from "../node/index.ts";
+import { promptGist } from "../prompt/index.ts";
 import type { SettlementCause } from "./stall-watchdog.ts";
 
 /** What one finished Ask reports in its `ask_end` Lifecycle Event. */

package/src/{ask-exchange-options.ts → ask/ask-exchange-options.ts}

@@ -1,9 +1,8 @@
+import type { ReportResultTool } from "../ask-contract/index.ts";
+import type { EventSink } from "../events.ts";
+import type { AgentTransport, Connection, Frame } from "../transport/index.ts";
+import type { ResolvedSpawnOptions } from "../types.ts";
 import type { EffectiveAskOptions } from "./ask-hash.ts";
-import type { Connection } from "./connection.ts";
-import type { EventSink } from "./events.ts";
-import type { ReportResultTool } from "./report-result.ts";
-import type { AgentTransport, Frame } from "./transport.ts";
-import type { ResolvedSpawnOptions } from "./types.ts";
 
 /** A frame consumer whose lifetime exceeds one Ask; the Agent's AgentUsage satisfies it. */
 export interface FrameObserver {

package/src/{ask-exchange.ts → ask/ask-exchange.ts}

@@ -1,36 +1,40 @@
 import type { TSchema } from "typebox";
+import type { AskOutputContract } from "../ask-contract/index.ts";
+import {
+  AskLimit,
+  LEGACY_ASK_OUTPUT_EXTRACTION_POLICY,
+  REPORT_RESULT_WRAP_UP,
+  ReportResultCall,
+  ReportResultSteering,
+  resolvePlaybackAskOutput,
+  resolvePlaybackReportedResult,
+} from "../ask-contract/index.ts";
+import {
+  type AskLimitOutcome,
+  type AskStalledOutcome,
+  agentError,
+  askLimitError,
+  askStalledError,
+  isYaagError,
+} from "../errors.ts";
+import { NodeTracker } from "../node/index.ts";
+import type { AskPlayback } from "../transport/index.ts";
+import { FrameGapTracker } from "../transport/index.ts";
 import { AskActivityTracker } from "./ask-activity.ts";
-import type { AskOutputContract } from "./ask-contract-identity.ts";
 import { type AskEndOutcome, AskEvents } from "./ask-exchange-events.ts";
 import type { AskExchangeOptions } from "./ask-exchange-options.ts";
 import { askHash, askMarkerContext, structuredOutputContract } from "./ask-hash.ts";
-import { AskLimit } from "./ask-limit.ts";
-import { LEGACY_ASK_OUTPUT_EXTRACTION_POLICY, resolvePlaybackAskOutput } from "./ask-output.ts";
 import { AskOutputSteering } from "./ask-output-steering.ts";
 import { AskOutputTail } from "./ask-output-tail.ts";
 import { awaitAskSettlement } from "./ask-settlement.ts";
 import { AskTurn } from "./ask-turn.ts";
-import {
-  type AskLimitOutcome,
-  type AskStalledOutcome,
-  agentError,
-  askLimitError,
-  askStalledError,
-  isYaagError,
-} from "./errors.ts";
-import { FrameGapTracker } from "./frame-gap.ts";
 import { IdleKillSignal, IdleWatch } from "./idle-watch.ts";
-import { NodeTracker } from "./node-tracker.ts";
-import { ReportResultCall } from "./report-result.ts";
-import { REPORT_RESULT_WRAP_UP, resolvePlaybackReportedResult } from "./report-result-output.ts";
-import { ReportResultSteering } from "./report-result-steering.ts";
 import {
   type SettlementCause,
   StallSignal,
   StallWatchdog,
   stallBudgetMs,
 } from "./stall-watchdog.ts";
-import type { AskPlayback } from "./transport.ts";
 
 export type { AskExchangeOptions } from "./ask-exchange-options.ts";
 /** Runs one Ask's transport exchange, including controls and structured-output correction. */

package/src/{ask-hash.ts → ask/ask-hash.ts}

@@ -1,8 +1,8 @@
 import type { TSchema } from "typebox";
-import { type AskOutputContract, createAskOutputContract } from "./ask-contract-identity.ts";
-import type { AskOutputExtractionPolicy } from "./ask-output.ts";
-import type { AskMarkerContext } from "./transport.ts";
-import type { AskOptions, ResolvedSpawnOptions, StructuredAskOptions } from "./types.ts";
+import type { AskOutputExtractionPolicy } from "../ask-contract/index.ts";
+import { type AskOutputContract, createAskOutputContract } from "../ask-contract/index.ts";
+import type { AskMarkerContext } from "../transport/index.ts";
+import type { AskOptions, ResolvedSpawnOptions, StructuredAskOptions } from "../types.ts";
 
 /** The combined option shape used internally after Definition defaults merge. */
 export type EffectiveAskOptions = AskOptions | StructuredAskOptions<TSchema>;

package/src/{ask-output-steering.ts → ask/ask-output-steering.ts}

@@ -4,7 +4,7 @@ import {
   formatAskOutputCorrection,
   invalidAskOutputError,
   validateAskOutput,
-} from "./ask-output.ts";
+} from "../ask-contract/index.ts";
 
 export interface AskOutputSteeringOptions {
   readonly agent: string;

package/src/{ask-output-tail.ts → ask/ask-output-tail.ts}

@@ -1,10 +1,10 @@
-import type { AskOutputChannel } from "./events.ts";
-import type { Frame } from "./transport.ts";
+import type { AskOutputChannel } from "../events.ts";
+import type { Frame } from "../transport/index.ts";
 import {
   ASK_OUTPUT_FLUSH_INTERVAL_MS,
   ASK_OUTPUT_MAX_BYTES,
   ASK_OUTPUT_TRUNCATION_MARKER,
-} from "./wire-constants.ts";
+} from "../wire-constants.ts";
 
 /** The timer boundary used to test output batching without changing its wire rate. */
 export interface AskOutputTailScheduler<Handle = unknown> {

package/src/{ask-settlement.ts → ask/ask-settlement.ts}

@@ -1,4 +1,4 @@
-import { YaagError } from "./errors.ts";
+import { YaagError } from "../errors.ts";
 
 export interface AwaitAskSettlementOptions {
   readonly settled: Promise<void>;

package/src/{ask-turn.ts → ask/ask-turn.ts}

@@ -1,4 +1,4 @@
-import type { Frame } from "./transport.ts";
+import type { Frame } from "../transport/index.ts";
 
 interface AssistantEnd {
   readonly stopReason: string | null;

package/src/{idle-watch.ts → ask/idle-watch.ts}

@@ -1,5 +1,5 @@
-import type { AskStalledOutcome } from "./errors.ts";
-import type { Frame } from "./transport.ts";
+import type { AskStalledOutcome } from "../errors.ts";
+import type { Frame } from "../transport/index.ts";
 
 /** Fixed time allowed for `agent_settled` to arrive after the idle abort. */
 export const IDLE_ABORT_SETTLE_MS = 5_000;

package/src/ask/index.ts

@@ -0,0 +1,7 @@
+/**
+ * Public surface of the `ask/` module: the live Ask exchange.
+ * Files inside this directory import each other directly.
+ */
+export { exchangeAsk } from "./ask-exchange.ts";
+export { askHash, askMarkerContext, type EffectiveAskOptions } from "./ask-hash.ts";
+export type { SettlementCause } from "./stall-watchdog.ts";

package/src/{stall-watchdog.ts → ask/stall-watchdog.ts}

@@ -1,7 +1,6 @@
-import type { CommandResponse } from "./connection.ts";
-import type { AskStalledOutcome } from "./errors.ts";
-import { readAgentProgress } from "./pi-state.ts";
-import type { Frame } from "./transport.ts";
+import type { AskStalledOutcome } from "../errors.ts";
+import type { CommandResponse, Frame } from "../transport/index.ts";
+import { readAgentProgress } from "../transport/index.ts";
 
 /** Silence allowed on a live Ask before the Stall Watchdog probes the Agent. */
 export const DEFAULT_STALL_MS = 600_000;

package/src/{ask-limit.ts → ask-contract/ask-limit.ts}

@@ -1,7 +1,7 @@
-import type { AskLimitKind, AskLimitOutcome } from "./errors.ts";
+import type { AskLimitKind, AskLimitOutcome } from "../errors.ts";
+import type { Frame } from "../transport/index.ts";
+import type { AskOptions } from "../types.ts";
 import { REPORT_RESULT_TOOL_NAME } from "./report-result.ts";
-import type { Frame } from "./transport.ts";
-import type { AskOptions } from "./types.ts";
 
 /**
  * True for a call to yaag's private result tool.

package/src/{ask-output.ts → ask-contract/ask-output.ts}

@@ -1,9 +1,9 @@
 import type { TSchema } from "typebox";
 import { Value } from "typebox/value";
-import type { AskInvalidOutputOutcome } from "./errors.ts";
-import { YaagError } from "./errors.ts";
-import type { AskInvalidOutputPlayback } from "./transport.ts";
-import { formatValidationErrors } from "./validation-errors.ts";
+import type { AskInvalidOutputOutcome } from "../errors.ts";
+import { YaagError } from "../errors.ts";
+import type { AskInvalidOutputPlayback } from "../transport/index.ts";
+import { formatValidationErrors } from "../validation-errors.ts";
 
 /** Versioned extraction behavior, and part of Ask identity in a Cassette. */
 export const ASK_OUTPUT_EXTRACTION_POLICY = "report-result-tool/v1";

package/src/ask-contract/index.ts

@@ -0,0 +1,36 @@
+/**
+ * Public surface of the `ask-contract/` module: what an Ask declares and how it settles.
+ * Files inside this directory import each other directly.
+ */
+export {
+  type AskOutputContract,
+  type CanonicalJsonObject,
+  createAskOutputContract,
+  validateCanonicalOutputSchema,
+  validateExtractionPolicy,
+} from "./ask-contract-identity.ts";
+export { AskLimit, DEFAULT_WRAP_UP_PROMPT } from "./ask-limit.ts";
+export {
+  type AskOutputExtractionPolicy,
+  DEFAULT_MAX_STEERS,
+  formatAskOutputCorrection,
+  invalidAskOutputError,
+  LEGACY_ASK_OUTPUT_EXTRACTION_POLICY,
+  resolvePlaybackAskOutput,
+  validateAskOutput,
+} from "./ask-output.ts";
+export {
+  isReportResultCommandFrame,
+  REPORT_RESULT_EXTENSION_PATH,
+  REPORT_RESULT_TOOL_NAME,
+  type ReportedResult,
+  ReportResultCall,
+  ReportResultTool,
+  reportResultCommandMessage,
+} from "./report-result.ts";
+export {
+  REPORT_RESULT_CORRECTION,
+  REPORT_RESULT_WRAP_UP,
+  resolvePlaybackReportedResult,
+} from "./report-result-output.ts";
+export { ReportResultSteering } from "./report-result-steering.ts";

package/src/{report-result-output.ts → ask-contract/report-result-output.ts}

@@ -1,10 +1,10 @@
 import type { TSchema } from "typebox";
 import { Value } from "typebox/value";
+import type { AskInvalidOutputPlayback } from "../transport/index.ts";
+import { formatValidationErrors } from "../validation-errors.ts";
 import type { AskOutputResult } from "./ask-output.ts";
 import { invalidAskOutputError } from "./ask-output.ts";
 import type { ReportedResult } from "./report-result.ts";
-import type { AskInvalidOutputPlayback } from "./transport.ts";
-import { formatValidationErrors } from "./validation-errors.ts";
 
 /** The one correction an Agent gets when it settles without reporting a result. */
 export const REPORT_RESULT_CORRECTION =

package/src/{report-result.ts → ask-contract/report-result.ts}

@@ -1,6 +1,6 @@
 import { fileURLToPath } from "node:url";
+import type { Frame } from "../transport/index.ts";
 import type { CanonicalJsonObject } from "./ask-contract-identity.ts";
-import type { Frame } from "./transport.ts";
 
 /** The internal tool a schema-bearing Ask settles from (ADR-0032). */
 export const REPORT_RESULT_TOOL_NAME = "report_result";

package/src/{cassette-loader.ts → cassette/cassette-loader.ts}

@@ -1,8 +1,6 @@
 import { Value } from "typebox/value";
-import {
-  validateCanonicalOutputSchema,
-  validateExtractionPolicy,
-} from "./ask-contract-identity.ts";
+import { validateCanonicalOutputSchema, validateExtractionPolicy } from "../ask-contract/index.ts";
+import { formatValidationErrors } from "../validation-errors.ts";
 import {
   CASSETTE_VERSION,
   type Cassette,
@@ -10,7 +8,6 @@ import {
   type CassetteAsk,
 } from "./cassette.ts";
 import { CassetteSchema } from "./cassette-schema.ts";
-import { formatValidationErrors } from "./validation-errors.ts";
 
 /**
  * Reads and validates one Cassette artifact before replay begins.

package/src/{cassette-replay.ts → cassette/cassette-replay.ts}

@@ -1,8 +1,8 @@
+import type { ReportedResult } from "../ask-contract/index.ts";
+import { isReportResultCommandFrame, ReportResultCall } from "../ask-contract/index.ts";
+import type { AgentStats, AskMarker, AskPlayback, Frame } from "../transport/index.ts";
+import { FrameQueue } from "../transport/index.ts";
 import type { CassetteAgent } from "./cassette.ts";
-import { FrameQueue } from "./frame-queue.ts";
-import type { ReportedResult } from "./report-result.ts";
-import { isReportResultCommandFrame, ReportResultCall } from "./report-result.ts";
-import type { AgentStats, AskMarker, AskPlayback, Frame } from "./transport.ts";
 
 /**
  * Replays one Cassette Agent's frame streams at the transport seam.

package/src/{cassette-schema.ts → cassette/cassette-schema.ts}

@@ -1,7 +1,7 @@
 import { type Static, Type } from "typebox";
-import type { CanonicalJsonObject } from "./ask-contract-identity.ts";
+import type { CanonicalJsonObject } from "../ask-contract/index.ts";
+import type { Frame } from "../transport/index.ts";
 import type { CassetteArtifact } from "./cassette.ts";
-import type { Frame } from "./transport.ts";
 
 /**
  * Structure-only mirror of the hand-written Cassette interfaces; `cassette.ts`

package/src/{cassette.ts → cassette/cassette.ts}

@@ -1,6 +1,6 @@
-import type { CanonicalJsonObject } from "./ask-contract-identity.ts";
-import type { AskLimitOutcome, AskStalledOutcome } from "./errors.ts";
-import type { RunOutcome } from "./events.ts";
+import type { CanonicalJsonObject } from "../ask-contract/index.ts";
+import type { AskLimitOutcome, AskStalledOutcome } from "../errors.ts";
+import type { RunOutcome } from "../events.ts";
 import type {
   AgentStats,
   AskCompletion,
@@ -10,8 +10,8 @@ import type {
   Frame,
   OpenOptions,
   WorktreeResolution,
-} from "./transport.ts";
-import type { ThinkingLevel } from "./types.ts";
+} from "../transport/index.ts";
+import type { ThinkingLevel } from "../types.ts";
 
 /** The Cassette format this runtime writes; the loader also reads version 1. */
 export const CASSETTE_VERSION = 2 as const;

package/src/{checkpoint-dir.ts → cassette/checkpoint-dir.ts}

@@ -9,12 +9,20 @@ export const CHECKPOINT_TEMP_MAX_AGE_MS = 24 * 60 * 60 * 1000;
 
 const CHECKPOINT_SUFFIX = join("yaag", "checkpoints");
 
+/**
+ * The part of the environment this module reads. It is structural on purpose:
+ * the vendored declaration tree compiles with no ambient Node globals.
+ */
+export interface CheckpointEnvironment {
+  readonly [name: string]: string | undefined;
+}
+
 /**
  * Resolves where a stopped Run publishes its checkpoint when `--record` set no
  * path: `YAAG_CHECKPOINT_DIR`, then an absolute `XDG_STATE_HOME`, then
  * `$HOME/.local/state`. A relative `XDG_STATE_HOME` is ignored (XDG spec).
  */
-export function resolveCheckpointDirectory(env: NodeJS.ProcessEnv = process.env): string {
+export function resolveCheckpointDirectory(env: CheckpointEnvironment = process.env): string {
   const override = env["YAAG_CHECKPOINT_DIR"];
   if (override !== undefined && override !== "") return override;
   const xdg = env["XDG_STATE_HOME"];

package/src/cassette/index.ts

@@ -0,0 +1,37 @@
+/**
+ * Public surface of the `cassette/` module: record, replay, checkpoint, and resume.
+ * Files inside this directory import each other directly.
+ */
+
+export {
+  CASSETTE_VERSION,
+  type Cassette,
+  type CassetteAgent,
+  type CassetteArtifact,
+  type CassetteAsk,
+  CassetteCollector,
+  type CassetteGit,
+  type CassetteRun,
+  type CassetteSink,
+  type CassetteSpawn,
+} from "./cassette.ts";
+export { assertReplayable, interruptedResumeWarning, loadCassette } from "./cassette-loader.ts";
+export { publishCassette } from "./cassette-publish.ts";
+export {
+  checkpointFileName,
+  cleanStaleCheckpointTemp,
+  resolveCheckpointDirectory,
+} from "./checkpoint-dir.ts";
+export { createCheckpointFlusher, flushingSink } from "./checkpoint-flush.ts";
+export { recordingTransport } from "./recording-transport.ts";
+export { replayMismatch } from "./replay-divergence.ts";
+export { replayTransport } from "./replay-transport.ts";
+export { programIdentityWarning } from "./resume-identity.ts";
+export { resumeTransport } from "./resume-transport.ts";
+export {
+  type ProgramIdentity,
+  publishRunCheckpoint,
+  type RunCheckpointResult,
+  resolveRunIdentity,
+  writeRecordingDiagnostic,
+} from "./run-checkpoint.ts";

package/src/{recording-transport.ts → cassette/recording-transport.ts}

@@ -1,5 +1,3 @@
-import type { CassetteSink } from "./cassette.ts";
-import { readGitFacts } from "./git-facts.ts";
 import type {
   AgentStats,
   AgentTransport,
@@ -11,7 +9,9 @@ import type {
   TransportFactory,
   TransportStartup,
   TransportStartupObserver,
-} from "./transport.ts";
+} from "../transport/index.ts";
+import type { CassetteSink } from "./cassette.ts";
+import { readGitFacts } from "./git-facts.ts";
 
 /**
  * Wraps a transport factory and records frames at the public transport seam.

package/src/{replay-divergence.ts → cassette/replay-divergence.ts}

@@ -1,6 +1,6 @@
+import { YaagError } from "../errors.ts";
+import type { AskMarker, AskMarkerContext, OpenOptions } from "../transport/index.ts";
 import type { CassetteAgent, CassetteAsk, CassetteSpawn } from "./cassette.ts";
-import { YaagError } from "./errors.ts";
-import type { AskMarker, AskMarkerContext, OpenOptions } from "./transport.ts";
 
 /** A pure description of the first strict replay identity mismatch. */
 export interface ReplayMismatch {

package/src/{replay-transport.ts → cassette/replay-transport.ts}

@@ -1,6 +1,3 @@
-import type { Cassette } from "./cassette.ts";
-import { CassetteReplay } from "./cassette-replay.ts";
-import { replayMismatch, strictReplay } from "./replay-divergence.ts";
 import type {
   AgentStats,
   AgentTransport,
@@ -10,7 +7,10 @@ import type {
   OpenOptions,
   TransportFactory,
   TransportStartupObserver,
-} from "./transport.ts";
+} from "../transport/index.ts";
+import type { Cassette } from "./cassette.ts";
+import { CassetteReplay } from "./cassette-replay.ts";
+import { replayMismatch, strictReplay } from "./replay-divergence.ts";
 
 /**
  * Creates a strict Cassette-backed transport factory without starting pi.

package/src/{resume-preconditions.ts → cassette/resume-preconditions.ts}

@@ -1,6 +1,6 @@
 import { stat } from "node:fs/promises";
+import { YaagError } from "../errors.ts";
 import type { CassetteAgent } from "./cassette.ts";
-import { YaagError } from "./errors.ts";
 
 /**
  * Validates that a recorded Agent can safely continue from its persisted session.

package/src/{resume-transport.ts → cassette/resume-transport.ts}

@@ -1,8 +1,3 @@
-import type { Cassette, CassetteAgent } from "./cassette.ts";
-import { CassetteReplay } from "./cassette-replay.ts";
-import { FrameQueue } from "./frame-queue.ts";
-import { replayMismatch } from "./replay-divergence.ts";
-import { checkResumePreconditions } from "./resume-preconditions.ts";
 import type {
   AgentStats,
   AgentTransport,
@@ -13,7 +8,12 @@ import type {
   OpenOptions,
   TransportFactory,
   TransportStartupObserver,
-} from "./transport.ts";
+} from "../transport/index.ts";
+import { FrameQueue } from "../transport/index.ts";
+import type { Cassette, CassetteAgent } from "./cassette.ts";
+import { CassetteReplay } from "./cassette-replay.ts";
+import { replayMismatch } from "./replay-divergence.ts";
+import { checkResumePreconditions } from "./resume-preconditions.ts";
 
 /**
  * Creates a Cassette-prefix transport that continues with live pi at divergence.

package/src/{run-checkpoint.ts → cassette/run-checkpoint.ts}

@@ -1,8 +1,8 @@
 import { mkdir, unlink } from "node:fs/promises";
 import { dirname } from "node:path";
+import type { RunOutcome } from "../events.ts";
 import type { CassetteCollector, CassetteRun } from "./cassette.ts";
 import { publishCassette } from "./cassette-publish.ts";
-import type { RunOutcome } from "./events.ts";
 import { sha256Hex } from "./program-hash.ts";
 
 /** What a resume is about to re-execute; resolved once, at Run start. */

package/src/errors.ts

@@ -7,9 +7,9 @@ export interface AskLimitOutcome {
   readonly count: number;
 }
 
-import type { AgentProgress } from "./pi-state.ts";
+import type { AgentProgress } from "./transport/index.ts";
 
-export type { AgentProgress } from "./pi-state.ts";
+export type { AgentProgress } from "./transport/index.ts";
 
 /** The recorded result when yaag rejects an Ask because no frame arrived within `idleMs`. */
 export interface AskStalledOutcome {

package/src/events.ts

@@ -6,10 +6,10 @@
  * activity, output, and usage observations. v0 renders them as stderr lines; the
  * dedicated fd arrives with the extension.
  */
-import type { SettlementCause } from "./stall-watchdog.ts";
-import type { TokenBreakdown, WorktreeResolution } from "./transport.ts";
+import type { SettlementCause } from "./ask/index.ts";
+import type { TokenBreakdown, WorktreeResolution } from "./transport/index.ts";
 
-export type { SettlementCause } from "./stall-watchdog.ts";
+export type { SettlementCause } from "./ask/index.ts";
 
 /**
  * A Run's outcome (ADR-0022). `paused` arrives with the pause slice.

package/src/extension/index.ts

@@ -0,0 +1,5 @@
+/**
+ * Public surface of the `extension/` module: extension source discovery.
+ * Files inside this directory import each other directly.
+ */
+export { resolveExtensionPaths } from "./extension-paths.ts";