@elie-laloum/outpost 4.2.0 → 6.0.1

package/dist/application/harness.types.d.ts

@@ -0,0 +1,55 @@
+import type { AgentEvent, CustomAgent } from "../domain/agent.types.ts";
+import type { ModelContentBlock, ModelMessage, ModelProvider, ModelResult, ModelToolCallBlock } from "../domain/model.types.ts";
+import type { SandboxLease } from "../domain/sandbox.types.ts";
+import type { HarnessTool } from "../domain/tool.types.ts";
+import type { DispatchOptions, TurnContext } from "./execution.types.ts";
+export interface HarnessRuntime {
+    readonly agent: CustomAgent;
+    readonly tools: readonly HarnessTool[];
+    readonly modelProvider: ModelProvider;
+    readonly sandbox: SandboxLease;
+    readonly signal: AbortSignal;
+    emit(event: AgentEvent): void;
+    hold(): () => void;
+}
+export interface ToolCallBatch {
+    readonly concurrent: boolean;
+    readonly calls: readonly PreparedCall[];
+}
+export type ValidatedInput = {
+    readonly value: unknown;
+} | {
+    readonly outcome: ToolOutcome;
+};
+export interface ToolOutcome {
+    readonly content: string;
+    readonly isError: boolean;
+}
+export interface HarnessHistory {
+    readonly messages: readonly ModelMessage[];
+    append(message: ModelMessage): Promise<void>;
+    replace(messages: readonly ModelMessage[]): Promise<void>;
+}
+export interface CustomTurnContext extends TurnContext {
+    readonly continuation?: DispatchOptions["continuation"];
+}
+export interface LoopState {
+    readonly history: HarnessHistory;
+    readonly step: number;
+    toolCalls: number;
+}
+export type StopHandler = (runtime: HarnessRuntime, state: LoopState, result: ModelResult, content: readonly ModelContentBlock[]) => Promise<string | undefined>;
+export interface PreparedCall {
+    readonly call: ModelToolCallBlock;
+    readonly tool?: HarnessTool;
+    readonly input?: unknown;
+    readonly outcome?: ToolOutcome;
+}
+export interface ToolDenial {
+    readonly deny: string;
+}
+export type BlockRenderers = {
+    readonly [Type in ModelContentBlock["type"]]: (block: Extract<ModelContentBlock, {
+        type: Type;
+    }>) => string;
+};

package/dist/application/harness.types.js

@@ -0,0 +1,2 @@
+export {};
+//# sourceMappingURL=harness.types.js.map

package/dist/application/harness.types.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"harness.types.js","sourceRoot":"","sources":["../../src/application/harness.types.ts"],"names":[],"mappings":"","sourcesContent":["import type { AgentEvent, CustomAgent } from \"../domain/agent.types.ts\";\nimport type {\n  ModelContentBlock,\n  ModelMessage,\n  ModelProvider,\n  ModelResult,\n  ModelToolCallBlock,\n} from \"../domain/model.types.ts\";\nimport type { SandboxLease } from \"../domain/sandbox.types.ts\";\nimport type { HarnessTool } from \"../domain/tool.types.ts\";\nimport type { DispatchOptions, TurnContext } from \"./execution.types.ts\";\n\nexport interface HarnessRuntime {\n  readonly agent: CustomAgent;\n  readonly tools: readonly HarnessTool[];\n  readonly modelProvider: ModelProvider;\n  readonly sandbox: SandboxLease;\n  readonly signal: AbortSignal;\n  emit(event: AgentEvent): void;\n  hold(): () => void;\n}\n\nexport interface ToolCallBatch {\n  readonly concurrent: boolean;\n  readonly calls: readonly PreparedCall[];\n}\n\nexport type ValidatedInput =\n  { readonly value: unknown } | { readonly outcome: ToolOutcome };\n\nexport interface ToolOutcome {\n  readonly content: string;\n  readonly isError: boolean;\n}\n\nexport interface HarnessHistory {\n  readonly messages: readonly ModelMessage[];\n  append(message: ModelMessage): Promise<void>;\n  replace(messages: readonly ModelMessage[]): Promise<void>;\n}\n\nexport interface CustomTurnContext extends TurnContext {\n  readonly continuation?: DispatchOptions[\"continuation\"];\n}\n\nexport interface LoopState {\n  readonly history: HarnessHistory;\n  readonly step: number;\n  toolCalls: number;\n}\n\nexport type StopHandler = (\n  runtime: HarnessRuntime,\n  state: LoopState,\n  result: ModelResult,\n  content: readonly ModelContentBlock[],\n) => Promise<string | undefined>;\n\nexport interface PreparedCall {\n  readonly call: ModelToolCallBlock;\n  readonly tool?: HarnessTool;\n  readonly input?: unknown;\n  readonly outcome?: ToolOutcome;\n}\n\nexport interface ToolDenial {\n  readonly deny: string;\n}\n\nexport type BlockRenderers = {\n  readonly [Type in ModelContentBlock[\"type\"]]: (\n    block: Extract<ModelContentBlock, { type: Type }>,\n  ) => string;\n};\n"]}

package/dist/application/lifecycle.constants.d.ts

@@ -1,2 +1,2 @@
 export declare const hookDeadlineMs = 600000;
-export declare const warmConfigurationKeys: readonly ["repository", "branch", "provider", "workspace", "copies", "hooks", "limits", "bootstrap", "conversationHome", "includeUncommitted"];
+export declare const warmConfigurationKeys: readonly ["repository", "branch", "sandboxProvider", "workspace", "copies", "hooks", "limits", "bootstrap", "conversationHome", "includeUncommitted"];

package/dist/application/lifecycle.constants.js

@@ -2,7 +2,7 @@ export const hookDeadlineMs = 600_000;
 export const warmConfigurationKeys = [
     "repository",
     "branch",
-    "provider",
+    "sandboxProvider",
     "workspace",
     "copies",
     "hooks",

package/dist/application/lifecycle.constants.js.map

@@ -1 +1 @@
-{"version":3,"file":"lifecycle.constants.js","sourceRoot":"","sources":["../../src/application/lifecycle.constants.ts"],"names":[],"mappings":"AAAA,MAAM,CAAC,MAAM,cAAc,GAAG,OAAO,CAAC;AACtC,MAAM,CAAC,MAAM,qBAAqB,GAAG;IACnC,YAAY;IACZ,QAAQ;IACR,UAAU;IACV,WAAW;IACX,QAAQ;IACR,OAAO;IACP,QAAQ;IACR,WAAW;IACX,kBAAkB;IAClB,oBAAoB;CACZ,CAAC","sourcesContent":["export const hookDeadlineMs = 600_000;\nexport const warmConfigurationKeys = [\n  \"repository\",\n  \"branch\",\n  \"provider\",\n  \"workspace\",\n  \"copies\",\n  \"hooks\",\n  \"limits\",\n  \"bootstrap\",\n  \"conversationHome\",\n  \"includeUncommitted\",\n] as const;\n"]}
+{"version":3,"file":"lifecycle.constants.js","sourceRoot":"","sources":["../../src/application/lifecycle.constants.ts"],"names":[],"mappings":"AAAA,MAAM,CAAC,MAAM,cAAc,GAAG,OAAO,CAAC;AACtC,MAAM,CAAC,MAAM,qBAAqB,GAAG;IACnC,YAAY;IACZ,QAAQ;IACR,iBAAiB;IACjB,WAAW;IACX,QAAQ;IACR,OAAO;IACP,QAAQ;IACR,WAAW;IACX,kBAAkB;IAClB,oBAAoB;CACZ,CAAC","sourcesContent":["export const hookDeadlineMs = 600_000;\nexport const warmConfigurationKeys = [\n  \"repository\",\n  \"branch\",\n  \"sandboxProvider\",\n  \"workspace\",\n  \"copies\",\n  \"hooks\",\n  \"limits\",\n  \"bootstrap\",\n  \"conversationHome\",\n  \"includeUncommitted\",\n] as const;\n"]}

package/dist/application/outpost.types.d.ts

@@ -1,5 +1,5 @@
 import type { Transport, TransportReference } from "../domain/transport.types.ts";
-import type { AgentAdapter } from "../domain/agent.types.ts";
+import type { Agent } from "../domain/agent.types.ts";
 import type { Command, CommandResult } from "../domain/command.types.ts";
 import type { Brief } from "../domain/prompts.types.ts";
 import type { SandboxProvider } from "../domain/sandbox.types.ts";
@@ -21,11 +21,11 @@ export interface WorkspaceOptions {
 }
 export interface Workspace extends WorkspaceRecord {
     dispatch<T = undefined>(options: Omit<SandboxOptions, Exclude<keyof WorkspaceOptions, "hooks" | "label"> | "workspace"> & DispatchOptions<T> & {
-        readonly agent: AgentAdapter;
+        readonly agent: Agent;
     }): Promise<DispatchResult<T>>;
     sandbox(options?: Omit<SandboxOptions, Exclude<keyof WorkspaceOptions, "hooks" | "label"> | "workspace">): Promise<Sandbox>;
     attach(options: Omit<SandboxOptions, Exclude<keyof WorkspaceOptions, "hooks" | "label"> | "workspace"> & AttachOptions & {
-        readonly agent: AgentAdapter;
+        readonly agent: Agent;
     }): Promise<AttachResult>;
     close(options?: {
         readonly preserve?: boolean;
@@ -35,8 +35,8 @@ export interface Workspace extends WorkspaceRecord {
 }
 export interface SandboxOptions extends WorkspaceOptions {
     readonly includeUncommitted?: boolean;
-    readonly agent?: AgentAdapter;
-    readonly provider?: SandboxProvider;
+    readonly agent?: Agent;
+    readonly sandboxProvider?: SandboxProvider;
     readonly workspace?: Workspace;
     readonly hooks?: LifecycleHooks;
     readonly signal?: AbortSignal;
@@ -48,7 +48,7 @@ export interface SandboxOptions extends WorkspaceOptions {
 }
 export interface AttachOptions {
     readonly ask?: VariableQuestion;
-    readonly agent?: AgentAdapter;
+    readonly agent?: Agent;
     readonly brief?: Brief;
     readonly continuation?: {
         readonly id: string;
@@ -69,7 +69,6 @@ export interface DispatchResult<T> extends Execution<T> {
     readonly transcript?: string;
     readonly transcriptReference?: TransportReference;
     readonly logReference?: TransportReference;
-    readonly log?: string;
     readonly retainedDirectory?: string;
     resume<U = undefined>(options: ContinuationOptions<U>): Promise<DispatchResult<U>>;
     fork<U = undefined>(options: ContinuationOptions<U>): Promise<DispatchResult<U>>;

package/dist/application/outpost.types.js.map

@@ -1 +1 @@
-{"version":3,"file":"outpost.types.js","sourceRoot":"","sources":["../../src/application/outpost.types.ts"],"names":[],"mappings":"","sourcesContent":["import type {\n  Transport,\n  TransportReference,\n} from \"../domain/transport.types.ts\";\nimport type { AgentAdapter } from \"../domain/agent.types.ts\";\nimport type { Command, CommandResult } from \"../domain/command.types.ts\";\nimport type { Brief } from \"../domain/prompts.types.ts\";\nimport type { SandboxProvider } from \"../domain/sandbox.types.ts\";\nimport type {\n  BranchPolicy,\n  Commit,\n  Disposal,\n  LifecycleHooks,\n  StageLimits,\n  WorkspaceRecord,\n} from \"../domain/workspace.types.ts\";\nimport type { StorageReservationOptions } from \"../infrastructure/storage-reservations.types.ts\";\nimport type { Logging } from \"../infrastructure/journal.types.ts\";\nimport type {\n  SandboxDiagnosticOptions,\n  SandboxDiagnosticReport,\n} from \"./doctor-sandbox.types.ts\";\nimport type { DispatchOptions, Execution } from \"./execution.types.ts\";\nimport type { VariableQuestion } from \"./interactive-brief.types.ts\";\n\nexport interface WorkspaceOptions {\n  readonly storageQuota?: Omit<StorageReservationOptions, \"signal\">;\n  readonly signal?: AbortSignal;\n  readonly repository?: string;\n  readonly branch?: BranchPolicy;\n  readonly copies?: readonly string[];\n  readonly limits?: StageLimits;\n  readonly label?: string;\n  readonly hooks?: LifecycleHooks;\n}\n\nexport interface Workspace extends WorkspaceRecord {\n  dispatch<T = undefined>(\n    options: Omit<\n      SandboxOptions,\n      Exclude<keyof WorkspaceOptions, \"hooks\" | \"label\"> | \"workspace\"\n    > &\n      DispatchOptions<T> & { readonly agent: AgentAdapter },\n  ): Promise<DispatchResult<T>>;\n  sandbox(\n    options?: Omit<\n      SandboxOptions,\n      Exclude<keyof WorkspaceOptions, \"hooks\" | \"label\"> | \"workspace\"\n    >,\n  ): Promise<Sandbox>;\n  attach(\n    options: Omit<\n      SandboxOptions,\n      Exclude<keyof WorkspaceOptions, \"hooks\" | \"label\"> | \"workspace\"\n    > &\n      AttachOptions & { readonly agent: AgentAdapter },\n  ): Promise<AttachResult>;\n  close(options?: { readonly preserve?: boolean }): Promise<Disposal>;\n  integrate(): Promise<void>;\n  [Symbol.asyncDispose](): Promise<void>;\n}\n\nexport interface SandboxOptions extends WorkspaceOptions {\n  readonly includeUncommitted?: boolean;\n  readonly agent?: AgentAdapter;\n  readonly provider?: SandboxProvider;\n  readonly workspace?: Workspace;\n  readonly hooks?: LifecycleHooks;\n  readonly signal?: AbortSignal;\n  readonly logging?: Logging;\n  readonly bootstrap?: boolean;\n  readonly conversationHome?: string;\n  readonly recoveryTransport?: Transport;\n  readonly activityTransport?: Transport;\n}\n\nexport interface AttachOptions {\n  readonly ask?: VariableQuestion;\n  readonly agent?: AgentAdapter;\n  readonly brief?: Brief;\n  readonly continuation?: { readonly id: string; readonly fork?: boolean };\n  readonly signal?: AbortSignal;\n  readonly terminal?: Command[\"terminal\"];\n}\n\nexport interface AttachResult extends CommandResult, Disposal {\n  readonly commits: readonly Commit[];\n  readonly branch: string;\n  readonly directory: string;\n}\n\nexport interface DispatchResult<T> extends Execution<T> {\n  readonly branch: string;\n  readonly directory: string;\n  readonly commits: readonly Commit[];\n  readonly transcript?: string;\n  readonly transcriptReference?: TransportReference;\n  readonly logReference?: TransportReference;\n  readonly log?: string;\n  readonly retainedDirectory?: string;\n  resume<U = undefined>(\n    options: ContinuationOptions<U>,\n  ): Promise<DispatchResult<U>>;\n  fork<U = undefined>(\n    options: ContinuationOptions<U>,\n  ): Promise<DispatchResult<U>>;\n}\n\nexport type ContinuationOptions<T = undefined> = DispatchOptions<T> &\n  Omit<SandboxOptions, \"agent\">;\n\nexport interface WarmDispatchResult<T> extends Omit<\n  DispatchResult<T>,\n  \"resume\" | \"fork\"\n> {\n  resume<U = undefined>(\n    options: DispatchOptions<U>,\n  ): Promise<WarmDispatchResult<U>>;\n  fork<U = undefined>(\n    options: DispatchOptions<U>,\n  ): Promise<WarmDispatchResult<U>>;\n}\n\nexport interface Sandbox {\n  diagnose(\n    options?: SandboxDiagnosticOptions,\n  ): Promise<SandboxDiagnosticReport>;\n  readonly workspace: Workspace;\n  readonly root: string;\n  dispatch<T = undefined>(\n    options: DispatchOptions<T>,\n  ): Promise<WarmDispatchResult<T>>;\n  resume<T = undefined>(\n    id: string,\n    options: DispatchOptions<T>,\n  ): Promise<WarmDispatchResult<T>>;\n  fork<T = undefined>(\n    id: string,\n    options: DispatchOptions<T>,\n  ): Promise<WarmDispatchResult<T>>;\n  attach(options?: AttachOptions): Promise<AttachResult>;\n  command(command: Command): Promise<CommandResult>;\n  close(options?: { readonly preserve?: boolean }): Promise<Disposal>;\n  [Symbol.asyncDispose](): Promise<void>;\n}\n"]}
+{"version":3,"file":"outpost.types.js","sourceRoot":"","sources":["../../src/application/outpost.types.ts"],"names":[],"mappings":"","sourcesContent":["import type {\n  Transport,\n  TransportReference,\n} from \"../domain/transport.types.ts\";\nimport type { Agent } from \"../domain/agent.types.ts\";\nimport type { Command, CommandResult } from \"../domain/command.types.ts\";\nimport type { Brief } from \"../domain/prompts.types.ts\";\nimport type { SandboxProvider } from \"../domain/sandbox.types.ts\";\nimport type {\n  BranchPolicy,\n  Commit,\n  Disposal,\n  LifecycleHooks,\n  StageLimits,\n  WorkspaceRecord,\n} from \"../domain/workspace.types.ts\";\nimport type { StorageReservationOptions } from \"../infrastructure/storage-reservations.types.ts\";\nimport type { Logging } from \"../infrastructure/journal.types.ts\";\nimport type {\n  SandboxDiagnosticOptions,\n  SandboxDiagnosticReport,\n} from \"./doctor-sandbox.types.ts\";\nimport type { DispatchOptions, Execution } from \"./execution.types.ts\";\nimport type { VariableQuestion } from \"./interactive-brief.types.ts\";\n\nexport interface WorkspaceOptions {\n  readonly storageQuota?: Omit<StorageReservationOptions, \"signal\">;\n  readonly signal?: AbortSignal;\n  readonly repository?: string;\n  readonly branch?: BranchPolicy;\n  readonly copies?: readonly string[];\n  readonly limits?: StageLimits;\n  readonly label?: string;\n  readonly hooks?: LifecycleHooks;\n}\n\nexport interface Workspace extends WorkspaceRecord {\n  dispatch<T = undefined>(\n    options: Omit<\n      SandboxOptions,\n      Exclude<keyof WorkspaceOptions, \"hooks\" | \"label\"> | \"workspace\"\n    > &\n      DispatchOptions<T> & { readonly agent: Agent },\n  ): Promise<DispatchResult<T>>;\n  sandbox(\n    options?: Omit<\n      SandboxOptions,\n      Exclude<keyof WorkspaceOptions, \"hooks\" | \"label\"> | \"workspace\"\n    >,\n  ): Promise<Sandbox>;\n  attach(\n    options: Omit<\n      SandboxOptions,\n      Exclude<keyof WorkspaceOptions, \"hooks\" | \"label\"> | \"workspace\"\n    > &\n      AttachOptions & { readonly agent: Agent },\n  ): Promise<AttachResult>;\n  close(options?: { readonly preserve?: boolean }): Promise<Disposal>;\n  integrate(): Promise<void>;\n  [Symbol.asyncDispose](): Promise<void>;\n}\n\nexport interface SandboxOptions extends WorkspaceOptions {\n  readonly includeUncommitted?: boolean;\n  readonly agent?: Agent;\n  readonly sandboxProvider?: SandboxProvider;\n  readonly workspace?: Workspace;\n  readonly hooks?: LifecycleHooks;\n  readonly signal?: AbortSignal;\n  readonly logging?: Logging;\n  readonly bootstrap?: boolean;\n  readonly conversationHome?: string;\n  readonly recoveryTransport?: Transport;\n  readonly activityTransport?: Transport;\n}\n\nexport interface AttachOptions {\n  readonly ask?: VariableQuestion;\n  readonly agent?: Agent;\n  readonly brief?: Brief;\n  readonly continuation?: { readonly id: string; readonly fork?: boolean };\n  readonly signal?: AbortSignal;\n  readonly terminal?: Command[\"terminal\"];\n}\n\nexport interface AttachResult extends CommandResult, Disposal {\n  readonly commits: readonly Commit[];\n  readonly branch: string;\n  readonly directory: string;\n}\n\nexport interface DispatchResult<T> extends Execution<T> {\n  readonly branch: string;\n  readonly directory: string;\n  readonly commits: readonly Commit[];\n  readonly transcript?: string;\n  readonly transcriptReference?: TransportReference;\n  readonly logReference?: TransportReference;\n  readonly retainedDirectory?: string;\n  resume<U = undefined>(\n    options: ContinuationOptions<U>,\n  ): Promise<DispatchResult<U>>;\n  fork<U = undefined>(\n    options: ContinuationOptions<U>,\n  ): Promise<DispatchResult<U>>;\n}\n\nexport type ContinuationOptions<T = undefined> = DispatchOptions<T> &\n  Omit<SandboxOptions, \"agent\">;\n\nexport interface WarmDispatchResult<T> extends Omit<\n  DispatchResult<T>,\n  \"resume\" | \"fork\"\n> {\n  resume<U = undefined>(\n    options: DispatchOptions<U>,\n  ): Promise<WarmDispatchResult<U>>;\n  fork<U = undefined>(\n    options: DispatchOptions<U>,\n  ): Promise<WarmDispatchResult<U>>;\n}\n\nexport interface Sandbox {\n  diagnose(\n    options?: SandboxDiagnosticOptions,\n  ): Promise<SandboxDiagnosticReport>;\n  readonly workspace: Workspace;\n  readonly root: string;\n  dispatch<T = undefined>(\n    options: DispatchOptions<T>,\n  ): Promise<WarmDispatchResult<T>>;\n  resume<T = undefined>(\n    id: string,\n    options: DispatchOptions<T>,\n  ): Promise<WarmDispatchResult<T>>;\n  fork<T = undefined>(\n    id: string,\n    options: DispatchOptions<T>,\n  ): Promise<WarmDispatchResult<T>>;\n  attach(options?: AttachOptions): Promise<AttachResult>;\n  command(command: Command): Promise<CommandResult>;\n  close(options?: { readonly preserve?: boolean }): Promise<Disposal>;\n  [Symbol.asyncDispose](): Promise<void>;\n}\n"]}

package/dist/application/recovery-retention.js

@@ -1,9 +1,11 @@
 import { planTransportRetention, pruneTransportRetention, } from "./transport-retention.js";
-import { lstat, rm } from "node:fs/promises";
+import { lstat } from "node:fs/promises";
+import { join } from "node:path";
+import { repositoryTransport } from "../infrastructure/repository-transport.js";
+import { repositoryStorageDirectory } from "../infrastructure/repository-transport.constants.js";
 import { OutpostError, invariant } from "../domain/errors.js";
 import { git } from "../infrastructure/git/command.js";
 import { lock, lockPath } from "../infrastructure/git/lock.js";
-import { closedJournal } from "../infrastructure/journal-retention.js";
 import { inspectRecovery } from "./recovery-inspection.js";
 import { retentionPolicy } from "./recovery-retention-policy.js";
 async function workspaceReason(entry, inspection) {
@@ -60,7 +62,7 @@ export async function planRecoveryRetention(options) {
     });
     const entries = [];
     const inspectedAt = new Date().toISOString();
-    const complete = inspection.complete && inspection.git?.complete !== false;
+    let complete = inspection.complete && inspection.git?.complete !== false;
     for (const category of inspection.categories) {
         for (const entry of category.entries) {
             let reason = "RECOVERY_DATA_PROTECTED";
@@ -73,14 +75,6 @@ export async function planRecoveryRetention(options) {
             if (category.name === "workspaces" &&
                 policy.scopes.includes("clean-workspaces"))
                 reason = await workspaceReason(entry, inspection);
-            if (category.name === "logs" &&
-                policy.scopes.includes("closed-logs") &&
-                entry.kind === "file" &&
-                entry.name.endsWith(".jsonl") &&
-                (await closedJournal(entry.path)))
-                reason = "ELIGIBLE";
-            if (category.name === "logs" && entry.name.endsWith(".closed.json"))
-                reason = "CLOSURE_RECORD_PROTECTED";
             if (reason === "ELIGIBLE" &&
                 (!entry.modifiedAt ||
                     Date.parse(inspectedAt) - Date.parse(entry.modifiedAt) <
@@ -102,14 +96,56 @@ export async function planRecoveryRetention(options) {
             });
         }
     }
+    const logs = await planTransportRetention({
+        transporter: repositoryTransport(inspection.repository),
+        policy: {
+            version: 1,
+            scopes: policy.scopes.filter((scope) => scope === "closed-logs"),
+            minAgeMs: policy.minAgeMs,
+        },
+        ...(options.maxEntries === undefined
+            ? {}
+            : { maxEntries: options.maxEntries }),
+    });
+    for (const entry of logs.entries.filter((entry) => entry.category === "logs")) {
+        let bytes = 0;
+        for (const object of entry.objects ?? []) {
+            try {
+                bytes += (await lstat(join(inspection.repository, ".outpost", repositoryStorageDirectory, "objects", `${object.key}.object`))).size;
+            }
+            catch {
+                complete = false;
+            }
+        }
+        const container = entries.findIndex((value) => value.category === "storage" &&
+            value.path ===
+                join(inspection.repository, ".outpost", repositoryStorageDirectory, "objects"));
+        const stored = entries[container];
+        if (!stored || stored.bytes < bytes)
+            complete = false;
+        if (stored)
+            entries[container] = {
+                ...stored,
+                bytes: Math.max(0, stored.bytes - bytes),
+            };
+        entries.push({ ...entry, bytes, eligible: entry.eligible && complete });
+    }
+    complete = complete && logs.complete;
+    if (!complete) {
+        for (let index = 0; index < entries.length; index++) {
+            const entry = entries[index];
+            if (entry.eligible)
+                entries[index] = {
+                    ...entry,
+                    eligible: false,
+                    reason: "INCOMPLETE_INVENTORY",
+                };
+        }
+    }
     const projectedBytes = inspection.usage.bytes -
         entries
             .filter((entry) => entry.eligible)
-            .reduce((sum, entry) => sum +
-            entry.bytes +
-            (entry.category === "logs"
-                ? (entries.find((other) => other.path === `${entry.path}.closed.json`)?.bytes ?? 0)
-                : 0), 0);
+            .reduce((sum, entry) => sum + entry.bytes, 0);
     const workspaces = entries.filter((entry) => entry.category === "workspaces" && !entry.eligible).length;
     const exceeded = (policy.maxBytes !== undefined && projectedBytes > policy.maxBytes) ||
         (policy.maxWorkspaces !== undefined && workspaces > policy.maxWorkspaces);
@@ -170,14 +206,19 @@ export async function pruneRecoveryRetention(plan, options) {
                 }
             }
             else {
-                const release = await lock(plan.repository, `journal:${entry.path}`);
-                try {
-                    invariant(entry.category === "logs" && (await closedJournal(entry.path)), "Journal changed before pruning");
-                    await rm(entry.path);
-                    await rm(`${entry.path}.closed.json`);
-                }
-                finally {
-                    await release();
+                const result = await pruneTransportRetention({
+                    ...plan,
+                    source: "transport",
+                    policy: {
+                        version: 1,
+                        scopes: ["closed-logs"],
+                        minAgeMs: plan.policy.minAgeMs,
+                    },
+                    entries: [candidate],
+                }, { transporter: repositoryTransport(plan.repository) });
+                if (!result.removed.includes(entry.path)) {
+                    retained.push(...result.retained);
+                    continue;
                 }
             }
             removed.push(entry.path);

package/dist/application/recovery-retention.js.map

@@ -1 +1 @@
-{"version":3,"file":"recovery-retention.js","sourceRoot":"","sources":["../../src/application/recovery-retention.ts"],"names":[],"mappings":"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","sourcesContent":["import type { TransportStoreOptions } from \"../domain/transport.types.ts\";\nimport {\n  planTransportRetention,\n  pruneTransportRetention,\n} from \"./transport-retention.ts\";\nimport { lstat, rm } from \"node:fs/promises\";\nimport { OutpostError, invariant } from \"../domain/errors.ts\";\nimport { git } from \"../infrastructure/git/command.ts\";\nimport { lock, lockPath } from \"../infrastructure/git/lock.ts\";\nimport { closedJournal } from \"../infrastructure/journal-retention.ts\";\nimport type { StorageEntry } from \"../infrastructure/storage-inventory.types.ts\";\nimport type { RecoveryInspection } from \"./recovery-inspection.types.ts\";\nimport { inspectRecovery } from \"./recovery-inspection.ts\";\nimport { retentionPolicy } from \"./recovery-retention-policy.ts\";\nimport type {\n  RecoveryPruneResult,\n  RecoveryRetainedEntry,\n  RecoveryQuotaOptions,\n  RecoveryRetentionEntry,\n  RecoveryRetentionOptions,\n  RecoveryRetentionPlan,\n} from \"./recovery-retention.types.ts\";\n\nasync function workspaceReason(\n  entry: StorageEntry,\n  inspection: RecoveryInspection,\n): Promise<string> {\n  if (inspection.resources?.complete === false)\n    return \"RESOURCE_ACTIVITY_UNKNOWN\";\n  if (\n    inspection.resources?.entries.some(\n      (resource) => resource.record?.workspace === entry.path,\n    )\n  )\n    return \"RESOURCE_ACTIVITY_RECORDED\";\n  const workspace = inspection.git?.workspaces.find(\n    (value) => value.path === entry.path,\n  );\n  if (!workspace || workspace.state !== \"registered\")\n    return \"WORKSPACE_UNREGISTERED_OR_UNKNOWN\";\n  if (workspace.branch === null) return \"DETACHED_WORKSPACE\";\n  if (workspace.dirty) return \"DIRTY_WORKSPACE\";\n  if (workspace.locked) return \"GIT_LOCKED_WORKSPACE\";\n  try {\n    await lstat(lockPath(inspection.repository, workspace.branch));\n    return \"OPERATION_LOCK_PRESENT\";\n  } catch (error) {\n    if (!(\n      error &&\n      typeof error === \"object\" &&\n      \"code\" in error &&\n      error.code === \"ENOENT\"\n    ))\n      return \"OWNERSHIP_UNKNOWN\";\n  }\n  try {\n    const ignored = await git(entry.path, [\n      \"ls-files\",\n      \"--others\",\n      \"--ignored\",\n      \"--exclude-standard\",\n      \"-z\",\n    ]);\n    if (ignored.length) return \"IGNORED_FILES\";\n  } catch {\n    return \"WORKSPACE_STATE_UNKNOWN\";\n  }\n  return \"ELIGIBLE\";\n}\n\nexport async function planRecoveryRetention(\n  options: RecoveryRetentionOptions,\n): Promise<RecoveryRetentionPlan> {\n  if (options.transporter) return planTransportRetention(options);\n  retentionPolicy(options.policy);\n  const policy = structuredClone(options.policy);\n  const inspection = await inspectRecovery({\n    ...options,\n    git: true,\n    locks: true,\n    resources: true,\n  });\n  const entries: RecoveryRetentionEntry[] = [];\n  const inspectedAt = new Date().toISOString();\n  const complete = inspection.complete && inspection.git?.complete !== false;\n  for (const category of inspection.categories) {\n    for (const entry of category.entries) {\n      let reason = \"RECOVERY_DATA_PROTECTED\";\n      if (category.name === \"locks\") reason = \"OWNERSHIP_RECORD_PROTECTED\";\n      if (category.name === \"logs\") reason = \"LOG_ACTIVITY_OR_CONTENT_UNKNOWN\";\n      if (category.name === \"workspaces\") reason = \"SCOPE_NOT_SELECTED\";\n      if (\n        category.name === \"workspaces\" &&\n        policy.scopes.includes(\"clean-workspaces\")\n      )\n        reason = await workspaceReason(entry, inspection);\n      if (\n        category.name === \"logs\" &&\n        policy.scopes.includes(\"closed-logs\") &&\n        entry.kind === \"file\" &&\n        entry.name.endsWith(\".jsonl\") &&\n        (await closedJournal(entry.path))\n      )\n        reason = \"ELIGIBLE\";\n      if (category.name === \"logs\" && entry.name.endsWith(\".closed.json\"))\n        reason = \"CLOSURE_RECORD_PROTECTED\";\n      if (\n        reason === \"ELIGIBLE\" &&\n        (!entry.modifiedAt ||\n          Date.parse(inspectedAt) - Date.parse(entry.modifiedAt) <\n            policy.minAgeMs)\n      )\n        reason = \"RETENTION_AGE\";\n      if (reason === \"ELIGIBLE\" && (!complete || !entry.complete))\n        reason = \"INCOMPLETE_INVENTORY\";\n      const workspace = inspection.git?.workspaces.find(\n        (value) => value.path === entry.path,\n      );\n      entries.push({\n        path: entry.path,\n        category: category.name,\n        bytes: entry.bytes,\n        eligible: reason === \"ELIGIBLE\",\n        reason,\n        ...(entry.modifiedAt ? { modifiedAt: entry.modifiedAt } : {}),\n        ...(workspace?.state === \"registered\" && workspace.branch\n          ? { branch: workspace.branch, head: workspace.head }\n          : {}),\n      });\n    }\n  }\n  const projectedBytes =\n    inspection.usage.bytes -\n    entries\n      .filter((entry) => entry.eligible)\n      .reduce(\n        (sum, entry) =>\n          sum +\n          entry.bytes +\n          (entry.category === \"logs\"\n            ? (entries.find(\n                (other) => other.path === `${entry.path}.closed.json`,\n              )?.bytes ?? 0)\n            : 0),\n        0,\n      );\n  const workspaces = entries.filter(\n    (entry) => entry.category === \"workspaces\" && !entry.eligible,\n  ).length;\n  const exceeded =\n    (policy.maxBytes !== undefined && projectedBytes > policy.maxBytes) ||\n    (policy.maxWorkspaces !== undefined && workspaces > policy.maxWorkspaces);\n  return {\n    repository: inspection.repository,\n    policy,\n    inspectedAt,\n    inspection,\n    entries,\n    complete,\n    usageBytes: inspection.usage.bytes,\n    projectedBytes,\n    quota: !complete ? \"unknown\" : exceeded ? \"exceeded\" : \"within\",\n  };\n}\n\nexport async function pruneRecoveryRetention(\n  plan: RecoveryRetentionPlan,\n  options?: TransportStoreOptions,\n): Promise<RecoveryPruneResult> {\n  if (plan.source === \"transport\") {\n    invariant(options, \"Transport retention requires its transporter\");\n    return pruneTransportRetention(plan, options);\n  }\n  invariant(!options, \"Local retention does not accept a transporter\");\n  retentionPolicy(plan.policy);\n  invariant(plan.complete, \"Cannot prune an incomplete retention plan\");\n  const removed: string[] = [];\n  const retained: RecoveryRetainedEntry[] = [];\n  for (const candidate of plan.entries.filter((entry) => entry.eligible)) {\n    const fresh = await planRecoveryRetention({\n      repository: plan.repository,\n      policy: plan.policy,\n    });\n    const entry = fresh.entries.find((value) => value.path === candidate.path);\n    if (\n      !entry?.eligible ||\n      entry.head !== candidate.head ||\n      entry.branch !== candidate.branch ||\n      entry.bytes !== candidate.bytes ||\n      entry.modifiedAt !== candidate.modifiedAt\n    ) {\n      retained.push({ path: candidate.path, reason: \"PLAN_CHANGED\" });\n      continue;\n    }\n    try {\n      if (entry.category === \"workspaces\" && entry.branch) {\n        const release = await lock(plan.repository, entry.branch);\n        try {\n          const status = await git(entry.path, [\n            \"status\",\n            \"--porcelain=v1\",\n            \"--ignored\",\n            \"--untracked-files=all\",\n          ]);\n          invariant(!status.length, \"Workspace changed before pruning\");\n          invariant(\n            (await git(entry.path, [\"rev-parse\", \"HEAD\"])).trim() ===\n              entry.head,\n            \"Workspace HEAD changed before pruning\",\n          );\n          invariant(\n            (\n              await git(entry.path, [\"symbolic-ref\", \"--short\", \"HEAD\"])\n            ).trim() === entry.branch,\n            \"Workspace branch changed before pruning\",\n          );\n          await git(plan.repository, [\"worktree\", \"remove\", entry.path]);\n        } finally {\n          await release();\n        }\n      } else {\n        const release = await lock(plan.repository, `journal:${entry.path}`);\n        try {\n          invariant(\n            entry.category === \"logs\" && (await closedJournal(entry.path)),\n            \"Journal changed before pruning\",\n          );\n          await rm(entry.path);\n          await rm(`${entry.path}.closed.json`);\n        } finally {\n          await release();\n        }\n      }\n      removed.push(entry.path);\n    } catch {\n      retained.push({\n        path: candidate.path,\n        reason: \"REVALIDATION_OR_REMOVAL_FAILED\",\n      });\n    }\n  }\n  return {\n    removed,\n    retained,\n    after: await planRecoveryRetention({\n      repository: plan.repository,\n      policy: plan.policy,\n    }),\n  };\n}\n\nexport async function assertRecoveryQuota(\n  options: RecoveryQuotaOptions,\n): Promise<void> {\n  invariant(\n    Number.isSafeInteger(options.maxBytes) && options.maxBytes >= 0,\n    \"maxBytes must be a nonnegative integer\",\n  );\n  const reserve = options.reserveBytes ?? 0;\n  invariant(\n    Number.isSafeInteger(reserve) && reserve >= 0,\n    \"reserveBytes must be a nonnegative integer\",\n  );\n  const inspection = await inspectRecovery(options);\n  if (\n    !inspection.complete ||\n    inspection.usage.bytes + reserve > options.maxBytes\n  )\n    throw new OutpostError(\n      \"workspace\",\n      \"Outpost storage quota admission refused\",\n      {\n        usageBytes: inspection.usage.bytes,\n        reserveBytes: reserve,\n        maxBytes: options.maxBytes,\n        complete: inspection.complete,\n      },\n    );\n}\n"]}
+{"version":3,"file":"recovery-retention.js","sourceRoot":"","sources":["../../src/application/recovery-retention.ts"],"names":[],"mappings":"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","sourcesContent":["import type { TransportStoreOptions } from \"../domain/transport.types.ts\";\nimport {\n  planTransportRetention,\n  pruneTransportRetention,\n} from \"./transport-retention.ts\";\nimport { lstat } from \"node:fs/promises\";\nimport { join } from \"node:path\";\nimport { repositoryTransport } from \"../infrastructure/repository-transport.ts\";\nimport { repositoryStorageDirectory } from \"../infrastructure/repository-transport.constants.ts\";\nimport { OutpostError, invariant } from \"../domain/errors.ts\";\nimport { git } from \"../infrastructure/git/command.ts\";\nimport { lock, lockPath } from \"../infrastructure/git/lock.ts\";\nimport type { StorageEntry } from \"../infrastructure/storage-inventory.types.ts\";\nimport type { RecoveryInspection } from \"./recovery-inspection.types.ts\";\nimport { inspectRecovery } from \"./recovery-inspection.ts\";\nimport { retentionPolicy } from \"./recovery-retention-policy.ts\";\nimport type {\n  RecoveryPruneResult,\n  RecoveryRetainedEntry,\n  RecoveryQuotaOptions,\n  RecoveryRetentionEntry,\n  RecoveryRetentionOptions,\n  RecoveryRetentionPlan,\n} from \"./recovery-retention.types.ts\";\n\nasync function workspaceReason(\n  entry: StorageEntry,\n  inspection: RecoveryInspection,\n): Promise<string> {\n  if (inspection.resources?.complete === false)\n    return \"RESOURCE_ACTIVITY_UNKNOWN\";\n  if (\n    inspection.resources?.entries.some(\n      (resource) => resource.record?.workspace === entry.path,\n    )\n  )\n    return \"RESOURCE_ACTIVITY_RECORDED\";\n  const workspace = inspection.git?.workspaces.find(\n    (value) => value.path === entry.path,\n  );\n  if (!workspace || workspace.state !== \"registered\")\n    return \"WORKSPACE_UNREGISTERED_OR_UNKNOWN\";\n  if (workspace.branch === null) return \"DETACHED_WORKSPACE\";\n  if (workspace.dirty) return \"DIRTY_WORKSPACE\";\n  if (workspace.locked) return \"GIT_LOCKED_WORKSPACE\";\n  try {\n    await lstat(lockPath(inspection.repository, workspace.branch));\n    return \"OPERATION_LOCK_PRESENT\";\n  } catch (error) {\n    if (!(\n      error &&\n      typeof error === \"object\" &&\n      \"code\" in error &&\n      error.code === \"ENOENT\"\n    ))\n      return \"OWNERSHIP_UNKNOWN\";\n  }\n  try {\n    const ignored = await git(entry.path, [\n      \"ls-files\",\n      \"--others\",\n      \"--ignored\",\n      \"--exclude-standard\",\n      \"-z\",\n    ]);\n    if (ignored.length) return \"IGNORED_FILES\";\n  } catch {\n    return \"WORKSPACE_STATE_UNKNOWN\";\n  }\n  return \"ELIGIBLE\";\n}\n\nexport async function planRecoveryRetention(\n  options: RecoveryRetentionOptions,\n): Promise<RecoveryRetentionPlan> {\n  if (options.transporter) return planTransportRetention(options);\n  retentionPolicy(options.policy);\n  const policy = structuredClone(options.policy);\n  const inspection = await inspectRecovery({\n    ...options,\n    git: true,\n    locks: true,\n    resources: true,\n  });\n  const entries: RecoveryRetentionEntry[] = [];\n  const inspectedAt = new Date().toISOString();\n  let complete = inspection.complete && inspection.git?.complete !== false;\n  for (const category of inspection.categories) {\n    for (const entry of category.entries) {\n      let reason = \"RECOVERY_DATA_PROTECTED\";\n      if (category.name === \"locks\") reason = \"OWNERSHIP_RECORD_PROTECTED\";\n      if (category.name === \"logs\") reason = \"LOG_ACTIVITY_OR_CONTENT_UNKNOWN\";\n      if (category.name === \"workspaces\") reason = \"SCOPE_NOT_SELECTED\";\n      if (\n        category.name === \"workspaces\" &&\n        policy.scopes.includes(\"clean-workspaces\")\n      )\n        reason = await workspaceReason(entry, inspection);\n      if (\n        reason === \"ELIGIBLE\" &&\n        (!entry.modifiedAt ||\n          Date.parse(inspectedAt) - Date.parse(entry.modifiedAt) <\n            policy.minAgeMs)\n      )\n        reason = \"RETENTION_AGE\";\n      if (reason === \"ELIGIBLE\" && (!complete || !entry.complete))\n        reason = \"INCOMPLETE_INVENTORY\";\n      const workspace = inspection.git?.workspaces.find(\n        (value) => value.path === entry.path,\n      );\n      entries.push({\n        path: entry.path,\n        category: category.name,\n        bytes: entry.bytes,\n        eligible: reason === \"ELIGIBLE\",\n        reason,\n        ...(entry.modifiedAt ? { modifiedAt: entry.modifiedAt } : {}),\n        ...(workspace?.state === \"registered\" && workspace.branch\n          ? { branch: workspace.branch, head: workspace.head }\n          : {}),\n      });\n    }\n  }\n  const logs = await planTransportRetention({\n    transporter: repositoryTransport(inspection.repository),\n    policy: {\n      version: 1,\n      scopes: policy.scopes.filter((scope) => scope === \"closed-logs\"),\n      minAgeMs: policy.minAgeMs,\n    },\n    ...(options.maxEntries === undefined\n      ? {}\n      : { maxEntries: options.maxEntries }),\n  });\n  for (const entry of logs.entries.filter(\n    (entry) => entry.category === \"logs\",\n  )) {\n    let bytes = 0;\n    for (const object of entry.objects ?? []) {\n      try {\n        bytes += (\n          await lstat(\n            join(\n              inspection.repository,\n              \".outpost\",\n              repositoryStorageDirectory,\n              \"objects\",\n              `${object.key}.object`,\n            ),\n          )\n        ).size;\n      } catch {\n        complete = false;\n      }\n    }\n    const container = entries.findIndex(\n      (value) =>\n        value.category === \"storage\" &&\n        value.path ===\n          join(\n            inspection.repository,\n            \".outpost\",\n            repositoryStorageDirectory,\n            \"objects\",\n          ),\n    );\n    const stored = entries[container];\n    if (!stored || stored.bytes < bytes) complete = false;\n    if (stored)\n      entries[container] = {\n        ...stored,\n        bytes: Math.max(0, stored.bytes - bytes),\n      };\n    entries.push({ ...entry, bytes, eligible: entry.eligible && complete });\n  }\n  complete = complete && logs.complete;\n  if (!complete) {\n    for (let index = 0; index < entries.length; index++) {\n      const entry = entries[index]!;\n      if (entry.eligible)\n        entries[index] = {\n          ...entry,\n          eligible: false,\n          reason: \"INCOMPLETE_INVENTORY\",\n        };\n    }\n  }\n  const projectedBytes =\n    inspection.usage.bytes -\n    entries\n      .filter((entry) => entry.eligible)\n      .reduce((sum, entry) => sum + entry.bytes, 0);\n  const workspaces = entries.filter(\n    (entry) => entry.category === \"workspaces\" && !entry.eligible,\n  ).length;\n  const exceeded =\n    (policy.maxBytes !== undefined && projectedBytes > policy.maxBytes) ||\n    (policy.maxWorkspaces !== undefined && workspaces > policy.maxWorkspaces);\n  return {\n    repository: inspection.repository,\n    policy,\n    inspectedAt,\n    inspection,\n    entries,\n    complete,\n    usageBytes: inspection.usage.bytes,\n    projectedBytes,\n    quota: !complete ? \"unknown\" : exceeded ? \"exceeded\" : \"within\",\n  };\n}\n\nexport async function pruneRecoveryRetention(\n  plan: RecoveryRetentionPlan,\n  options?: TransportStoreOptions,\n): Promise<RecoveryPruneResult> {\n  if (plan.source === \"transport\") {\n    invariant(options, \"Transport retention requires its transporter\");\n    return pruneTransportRetention(plan, options);\n  }\n  invariant(!options, \"Local retention does not accept a transporter\");\n  retentionPolicy(plan.policy);\n  invariant(plan.complete, \"Cannot prune an incomplete retention plan\");\n  const removed: string[] = [];\n  const retained: RecoveryRetainedEntry[] = [];\n  for (const candidate of plan.entries.filter((entry) => entry.eligible)) {\n    const fresh = await planRecoveryRetention({\n      repository: plan.repository,\n      policy: plan.policy,\n    });\n    const entry = fresh.entries.find((value) => value.path === candidate.path);\n    if (\n      !entry?.eligible ||\n      entry.head !== candidate.head ||\n      entry.branch !== candidate.branch ||\n      entry.bytes !== candidate.bytes ||\n      entry.modifiedAt !== candidate.modifiedAt\n    ) {\n      retained.push({ path: candidate.path, reason: \"PLAN_CHANGED\" });\n      continue;\n    }\n    try {\n      if (entry.category === \"workspaces\" && entry.branch) {\n        const release = await lock(plan.repository, entry.branch);\n        try {\n          const status = await git(entry.path, [\n            \"status\",\n            \"--porcelain=v1\",\n            \"--ignored\",\n            \"--untracked-files=all\",\n          ]);\n          invariant(!status.length, \"Workspace changed before pruning\");\n          invariant(\n            (await git(entry.path, [\"rev-parse\", \"HEAD\"])).trim() ===\n              entry.head,\n            \"Workspace HEAD changed before pruning\",\n          );\n          invariant(\n            (\n              await git(entry.path, [\"symbolic-ref\", \"--short\", \"HEAD\"])\n            ).trim() === entry.branch,\n            \"Workspace branch changed before pruning\",\n          );\n          await git(plan.repository, [\"worktree\", \"remove\", entry.path]);\n        } finally {\n          await release();\n        }\n      } else {\n        const result = await pruneTransportRetention(\n          {\n            ...plan,\n            source: \"transport\",\n            policy: {\n              version: 1,\n              scopes: [\"closed-logs\"],\n              minAgeMs: plan.policy.minAgeMs,\n            },\n            entries: [candidate],\n          },\n          { transporter: repositoryTransport(plan.repository) },\n        );\n        if (!result.removed.includes(entry.path)) {\n          retained.push(...result.retained);\n          continue;\n        }\n      }\n      removed.push(entry.path);\n    } catch {\n      retained.push({\n        path: candidate.path,\n        reason: \"REVALIDATION_OR_REMOVAL_FAILED\",\n      });\n    }\n  }\n  return {\n    removed,\n    retained,\n    after: await planRecoveryRetention({\n      repository: plan.repository,\n      policy: plan.policy,\n    }),\n  };\n}\n\nexport async function assertRecoveryQuota(\n  options: RecoveryQuotaOptions,\n): Promise<void> {\n  invariant(\n    Number.isSafeInteger(options.maxBytes) && options.maxBytes >= 0,\n    \"maxBytes must be a nonnegative integer\",\n  );\n  const reserve = options.reserveBytes ?? 0;\n  invariant(\n    Number.isSafeInteger(reserve) && reserve >= 0,\n    \"reserveBytes must be a nonnegative integer\",\n  );\n  const inspection = await inspectRecovery(options);\n  if (\n    !inspection.complete ||\n    inspection.usage.bytes + reserve > options.maxBytes\n  )\n    throw new OutpostError(\n      \"workspace\",\n      \"Outpost storage quota admission refused\",\n      {\n        usageBytes: inspection.usage.bytes,\n        reserveBytes: reserve,\n        maxBytes: options.maxBytes,\n        complete: inspection.complete,\n      },\n    );\n}\n"]}

package/dist/application/remote-download.js

@@ -13,7 +13,7 @@ export async function downloadChanges(context, synchronized, transfer) {
         .split("\0")
         .filter(Boolean);
     for (const file of incoming) {
-        if (/^\.outpost\/(locks|recovery|workspaces|logs)(\/|$)/i.test(file))
+        if (/^\.outpost\/(locks|recovery|workspaces|logs|conversations)(\/|$)/i.test(file))
             throw new OutpostError("workspace", "Remote file overlaps Outpost runtime state", { file });
         await safeDestination(join(transfer, "incoming"), file);
     }

package/dist/application/remote-download.js.map

@@ -1 +1 @@
-{"version":3,"file":"remote-download.js","sourceRoot":"","sources":["../../src/application/remote-download.ts"],"names":[],"mappings":"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","sourcesContent":["import { cp, mkdir, writeFile } from \"node:fs/promises\";\nimport { dirname, join, posix } from \"node:path\";\nimport { downloadHistory } from \"./remote-history.ts\";\nimport { OutpostError } from \"../domain/errors.ts\";\nimport {\n  fileManifest,\n  parseManifest,\n  sameFile,\n  sameLocalFile,\n} from \"../infrastructure/file-manifest.ts\";\nimport type { FileManifestEntry } from \"../domain/sandbox.types.ts\";\nimport { safeDestination } from \"../infrastructure/files.ts\";\nimport type {\n  RemoteChanges,\n  RemoteWorkspaceContext,\n} from \"./remote-workspace.types.ts\";\n\nexport async function downloadChanges(\n  context: RemoteWorkspaceContext,\n  synchronized: string,\n  transfer: string,\n): Promise<RemoteChanges> {\n  const { workspace, lease, remoteBundle, run } = context;\n  const head = (await run([\"rev-parse\", \"HEAD\"])).trim(),\n    patch = join(transfer, \"remote.patch\");\n  await run([\"diff\", \"--binary\", \"HEAD\", `--output=${remoteBundle}.patch`]);\n  await lease.download(`${remoteBundle}.patch`, patch);\n  const incoming = (\n    await run([\"ls-files\", \"--others\", \"--exclude-standard\", \"-z\"])\n  )\n    .split(\"\\0\")\n    .filter(Boolean);\n  for (const file of incoming) {\n    if (/^\\.outpost\\/(locks|recovery|workspaces|logs)(\\/|$)/i.test(file))\n      throw new OutpostError(\n        \"workspace\",\n        \"Remote file overlaps Outpost runtime state\",\n        { file },\n      );\n    await safeDestination(join(transfer, \"incoming\"), file);\n  }\n  let manifest: readonly FileManifestEntry[] | undefined;\n  if (lease.fileTransfers) {\n    manifest = parseManifest(\n      await lease.fileTransfers.manifest(lease.root, incoming),\n      incoming,\n    );\n    await writeFile(join(transfer, \"manifest.json\"), JSON.stringify(manifest), {\n      mode: 0o600,\n    });\n    const changed: FileManifestEntry[] = [];\n    for (const entry of manifest) {\n      const previous = context.transferred?.get(entry.path);\n      if (\n        previous &&\n        sameFile(previous, entry) &&\n        sameLocalFile(\n          entry,\n          await fileManifest(workspace.directory, entry.path),\n        )\n      ) {\n        const target = await safeDestination(\n          join(transfer, \"incoming\"),\n          entry.path,\n        );\n        await mkdir(dirname(target), { recursive: true });\n        await cp(\n          await safeDestination(workspace.directory, entry.path),\n          target,\n          { dereference: false, verbatimSymlinks: true },\n        );\n        continue;\n      }\n      changed.push(entry);\n    }\n    await lease.fileTransfers.downloadBatch(\n      lease.root,\n      changed,\n      join(transfer, \"incoming\"),\n    );\n    for (const entry of manifest) {\n      if (\n        !sameLocalFile(\n          entry,\n          await fileManifest(join(transfer, \"incoming\"), entry.path),\n        )\n      )\n        throw new OutpostError(\"workspace\", \"Incoming file checksum mismatch\", {\n          file: entry.path,\n        });\n    }\n  } else\n    for (const file of incoming) {\n      await lease.download(\n        posix.join(lease.root, file),\n        await safeDestination(join(transfer, \"incoming\"), file),\n      );\n    }\n  if (head !== synchronized) {\n    await downloadHistory(context, synchronized, head, transfer);\n  }\n\n  return { head, patch, incoming, ...(manifest ? { manifest } : {}) };\n}\n"]}
+{"version":3,"file":"remote-download.js","sourceRoot":"","sources":["../../src/application/remote-download.ts"],"names":[],"mappings":"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","sourcesContent":["import { cp, mkdir, writeFile } from \"node:fs/promises\";\nimport { dirname, join, posix } from \"node:path\";\nimport { downloadHistory } from \"./remote-history.ts\";\nimport { OutpostError } from \"../domain/errors.ts\";\nimport {\n  fileManifest,\n  parseManifest,\n  sameFile,\n  sameLocalFile,\n} from \"../infrastructure/file-manifest.ts\";\nimport type { FileManifestEntry } from \"../domain/sandbox.types.ts\";\nimport { safeDestination } from \"../infrastructure/files.ts\";\nimport type {\n  RemoteChanges,\n  RemoteWorkspaceContext,\n} from \"./remote-workspace.types.ts\";\n\nexport async function downloadChanges(\n  context: RemoteWorkspaceContext,\n  synchronized: string,\n  transfer: string,\n): Promise<RemoteChanges> {\n  const { workspace, lease, remoteBundle, run } = context;\n  const head = (await run([\"rev-parse\", \"HEAD\"])).trim(),\n    patch = join(transfer, \"remote.patch\");\n  await run([\"diff\", \"--binary\", \"HEAD\", `--output=${remoteBundle}.patch`]);\n  await lease.download(`${remoteBundle}.patch`, patch);\n  const incoming = (\n    await run([\"ls-files\", \"--others\", \"--exclude-standard\", \"-z\"])\n  )\n    .split(\"\\0\")\n    .filter(Boolean);\n  for (const file of incoming) {\n    if (\n      /^\\.outpost\\/(locks|recovery|workspaces|logs|conversations)(\\/|$)/i.test(\n        file,\n      )\n    )\n      throw new OutpostError(\n        \"workspace\",\n        \"Remote file overlaps Outpost runtime state\",\n        { file },\n      );\n    await safeDestination(join(transfer, \"incoming\"), file);\n  }\n  let manifest: readonly FileManifestEntry[] | undefined;\n  if (lease.fileTransfers) {\n    manifest = parseManifest(\n      await lease.fileTransfers.manifest(lease.root, incoming),\n      incoming,\n    );\n    await writeFile(join(transfer, \"manifest.json\"), JSON.stringify(manifest), {\n      mode: 0o600,\n    });\n    const changed: FileManifestEntry[] = [];\n    for (const entry of manifest) {\n      const previous = context.transferred?.get(entry.path);\n      if (\n        previous &&\n        sameFile(previous, entry) &&\n        sameLocalFile(\n          entry,\n          await fileManifest(workspace.directory, entry.path),\n        )\n      ) {\n        const target = await safeDestination(\n          join(transfer, \"incoming\"),\n          entry.path,\n        );\n        await mkdir(dirname(target), { recursive: true });\n        await cp(\n          await safeDestination(workspace.directory, entry.path),\n          target,\n          { dereference: false, verbatimSymlinks: true },\n        );\n        continue;\n      }\n      changed.push(entry);\n    }\n    await lease.fileTransfers.downloadBatch(\n      lease.root,\n      changed,\n      join(transfer, \"incoming\"),\n    );\n    for (const entry of manifest) {\n      if (\n        !sameLocalFile(\n          entry,\n          await fileManifest(join(transfer, \"incoming\"), entry.path),\n        )\n      )\n        throw new OutpostError(\"workspace\", \"Incoming file checksum mismatch\", {\n          file: entry.path,\n        });\n    }\n  } else\n    for (const file of incoming) {\n      await lease.download(\n        posix.join(lease.root, file),\n        await safeDestination(join(transfer, \"incoming\"), file),\n      );\n    }\n  if (head !== synchronized) {\n    await downloadHistory(context, synchronized, head, transfer);\n  }\n\n  return { head, patch, incoming, ...(manifest ? { manifest } : {}) };\n}\n"]}

package/dist/application/sandbox-agents.js

@@ -1,18 +1,27 @@
 import { invariant } from "../domain/errors.js";
 import { resolveVariables } from "../infrastructure/settings.js";
+import { authenticateAgent } from "./agent-authentication.js";
 import { prepareAdapter } from "./agent-bootstrap.js";
 import { storageFor } from "./agent-storage.js";
 export function sandboxAgents(context) {
-    const { options, provider, workspace, runtime, prepared, staging } = context;
+    const { options, sandboxProvider, workspace, runtime, prepared, staging } = context;
     const known = new Set();
+    const authenticated = new Map();
     const selectAgent = async (selected, signal) => {
         invariant(selected, "Provide an agent on the sandbox or this operation");
         if (!prepared.has(selected))
-            prepared.set(selected, provider.placement === "remote" && options.bootstrap !== false
+            prepared.set(selected, sandboxProvider.placement === "remote" && options.bootstrap !== false
                 ? await prepareAdapter(selected, runtime, signal)
                 : selected);
-        const variables = await resolveVariables(workspace.repository, selected.variables, provider.variables);
+        const variables = await resolveVariables(workspace.repository, selected.variables, sandboxProvider.variables);
         const adapter = prepared.get(selected);
+        if (adapter.kind === "cli" &&
+            authenticated.get(adapter.name)?.adapter !== adapter)
+            authenticated.set(adapter.name, {
+                adapter,
+                variables: await authenticateAgent(adapter, variables, runtime, sandboxProvider.placement, signal),
+            });
+        const credentials = adapter.kind === "cli" ? authenticated.get(adapter.name)?.variables : {};
         return {
             selected,
             adapter,
@@ -21,7 +30,7 @@ export function sandboxAgents(context) {
                 invoke(command) {
                     return runtime.invoke({
                         ...command,
-                        variables: { ...variables, ...command.variables },
+                        variables: { ...variables, ...credentials, ...command.variables },
                     });
                 },
             },
@@ -35,7 +44,7 @@ export function sandboxAgents(context) {
         invariant(storage, "This adapter does not support native conversations");
         const found = await storage.locate(id, workspace.repository, options.conversationHome);
         if (found.reference !== undefined ||
-            provider.placement !== "host" ||
+            sandboxProvider.placement !== "host" ||
             workspace.directory !== workspace.repository)
             await storage.restore(found, {
                 repository: workspace.repository,

package/dist/application/sandbox-agents.js.map

@@ -1 +1 @@
-{"version":3,"file":"sandbox-agents.js","sourceRoot":"","sources":["../../src/application/sandbox-agents.ts"],"names":[],"mappings":"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","sourcesContent":["import type { AgentAdapter } from \"../domain/agent.types.ts\";\nimport type { Command } from \"../domain/command.types.ts\";\nimport { invariant } from \"../domain/errors.ts\";\nimport { resolveVariables } from \"../infrastructure/settings.ts\";\nimport { prepareAdapter } from \"./agent-bootstrap.ts\";\nimport { storageFor } from \"./agent-storage.ts\";\nimport type {\n  ProvisionedSandbox,\n  SandboxAgents,\n} from \"./sandbox-session.types.ts\";\n\nexport function sandboxAgents(context: ProvisionedSandbox): SandboxAgents {\n  const { options, provider, workspace, runtime, prepared, staging } = context;\n  const known = new Set<string>();\n  const selectAgent = async (\n    selected: AgentAdapter | undefined,\n    signal: AbortSignal,\n  ) => {\n    invariant(selected, \"Provide an agent on the sandbox or this operation\");\n    if (!prepared.has(selected))\n      prepared.set(\n        selected,\n        provider.placement === \"remote\" && options.bootstrap !== false\n          ? await prepareAdapter(selected, runtime, signal)\n          : selected,\n      );\n    const variables = await resolveVariables(\n      workspace.repository,\n      selected.variables,\n      provider.variables,\n    );\n    const adapter = prepared.get(selected)!;\n    return {\n      selected,\n      adapter,\n      executionLease: {\n        ...runtime,\n        invoke(command: Command) {\n          return runtime.invoke({\n            ...command,\n            variables: { ...variables, ...command.variables },\n          });\n        },\n      },\n    };\n  };\n  const conversationKey = (agent: AgentAdapter, id: string) =>\n    `${agent.storage?.name ?? agent.conversations ?? agent.name}:${id}`;\n  const restore = async (id: string, agent: AgentAdapter) => {\n    if (known.has(conversationKey(agent, id))) return;\n    const storage = storageFor(agent);\n    invariant(storage, \"This adapter does not support native conversations\");\n    const found = await storage.locate(\n      id,\n      workspace.repository,\n      options.conversationHome,\n    );\n    if (\n      found.reference !== undefined ||\n      provider.placement !== \"host\" ||\n      workspace.directory !== workspace.repository\n    )\n      await storage.restore(found, {\n        repository: workspace.repository,\n        sandbox: runtime,\n        staging,\n      });\n    known.add(conversationKey(agent, id));\n  };\n\n  return {\n    selectAgent,\n    restore,\n    remember: (agent, id) => {\n      known.add(conversationKey(agent, id));\n    },\n  };\n}\n"]}
+{"version":3,"file":"sandbox-agents.js","sourceRoot":"","sources":["../../src/application/sandbox-agents.ts"],"names":[],"mappings":"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","sourcesContent":["import type { Agent } from \"../domain/agent.types.ts\";\nimport type { Command } from \"../domain/command.types.ts\";\nimport { invariant } from \"../domain/errors.ts\";\nimport { resolveVariables } from \"../infrastructure/settings.ts\";\nimport { authenticateAgent } from \"./agent-authentication.ts\";\nimport { prepareAdapter } from \"./agent-bootstrap.ts\";\nimport { storageFor } from \"./agent-storage.ts\";\nimport type {\n  AuthenticatedAgent,\n  ProvisionedSandbox,\n  SandboxAgents,\n} from \"./sandbox-session.types.ts\";\n\nexport function sandboxAgents(context: ProvisionedSandbox): SandboxAgents {\n  const { options, sandboxProvider, workspace, runtime, prepared, staging } =\n    context;\n  const known = new Set<string>();\n  const authenticated = new Map<string, AuthenticatedAgent>();\n  const selectAgent = async (\n    selected: Agent | undefined,\n    signal: AbortSignal,\n  ) => {\n    invariant(selected, \"Provide an agent on the sandbox or this operation\");\n    if (!prepared.has(selected))\n      prepared.set(\n        selected,\n        sandboxProvider.placement === \"remote\" && options.bootstrap !== false\n          ? await prepareAdapter(selected, runtime, signal)\n          : selected,\n      );\n    const variables = await resolveVariables(\n      workspace.repository,\n      selected.variables,\n      sandboxProvider.variables,\n    );\n    const adapter = prepared.get(selected)!;\n    if (\n      adapter.kind === \"cli\" &&\n      authenticated.get(adapter.name)?.adapter !== adapter\n    )\n      authenticated.set(adapter.name, {\n        adapter,\n        variables: await authenticateAgent(\n          adapter,\n          variables,\n          runtime,\n          sandboxProvider.placement,\n          signal,\n        ),\n      });\n    const credentials =\n      adapter.kind === \"cli\" ? authenticated.get(adapter.name)?.variables : {};\n    return {\n      selected,\n      adapter,\n      executionLease: {\n        ...runtime,\n        invoke(command: Command) {\n          return runtime.invoke({\n            ...command,\n            variables: { ...variables, ...credentials, ...command.variables },\n          });\n        },\n      },\n    };\n  };\n  const conversationKey = (agent: Agent, id: string) =>\n    `${agent.storage?.name ?? agent.conversations ?? agent.name}:${id}`;\n  const restore = async (id: string, agent: Agent) => {\n    if (known.has(conversationKey(agent, id))) return;\n    const storage = storageFor(agent);\n    invariant(storage, \"This adapter does not support native conversations\");\n    const found = await storage.locate(\n      id,\n      workspace.repository,\n      options.conversationHome,\n    );\n    if (\n      found.reference !== undefined ||\n      sandboxProvider.placement !== \"host\" ||\n      workspace.directory !== workspace.repository\n    )\n      await storage.restore(found, {\n        repository: workspace.repository,\n        sandbox: runtime,\n        staging,\n      });\n    known.add(conversationKey(agent, id));\n  };\n\n  return {\n    selectAgent,\n    restore,\n    remember: (agent, id) => {\n      known.add(conversationKey(agent, id));\n    },\n  };\n}\n"]}

package/dist/application/sandbox-attach.js

@@ -1,3 +1,4 @@
+import { invariant } from "../domain/errors.js";
 import { git } from "../infrastructure/git/command.js";
 import { commits } from "../infrastructure/git/history.js";
 import { restoreTerminal } from "../infrastructure/terminal.js";
@@ -5,7 +6,8 @@ import { renderBrief } from "./brief-renderer.js";
 import { executionDefaults } from "./execution.constants.js";
 import { completeBrief } from "./interactive-brief.js";
 export async function attachInSandbox(context, agents, settings) {
-    const { options, provider, workspace, sync, stop } = context;
+    const { options, sandboxProvider, workspace, sync, stop } = context;
+    invariant((settings.agent ?? options.agent)?.kind === "cli", "This harness does not support interactive attachment");
     const { selectAgent, restore } = agents;
     const signal = settings.signal
         ? AbortSignal.any([settings.signal, stop.signal])
@@ -15,8 +17,9 @@ export async function attachInSandbox(context, agents, settings) {
         await restore(settings.continuation.id, selected);
     const brief = await completeBrief(settings.brief, signal, settings.ask);
     const text = brief
-        ? await renderBrief(brief, workspace, executionLease, provider.placement === "host", settings)
+        ? await renderBrief(brief, workspace, executionLease, sandboxProvider.placement === "host", settings)
         : undefined;
+    invariant(adapter.kind === "cli", "This harness does not support interactive attachment");
     const command = adapter.request({
         interactive: true,
         ...(text === undefined ? {} : { text }),

package/dist/application/sandbox-attach.js.map

@@ -1 +1 @@
-{"version":3,"file":"sandbox-attach.js","sourceRoot":"","sources":["../../src/application/sandbox-attach.ts"],"names":[],"mappings":"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","sourcesContent":["import type { CommandResult } from \"../domain/command.types.ts\";\nimport { git } from \"../infrastructure/git/command.ts\";\nimport { commits } from \"../infrastructure/git/history.ts\";\nimport { restoreTerminal } from \"../infrastructure/terminal.ts\";\nimport { renderBrief } from \"./brief-renderer.ts\";\nimport { executionDefaults } from \"./execution.constants.ts\";\nimport { completeBrief } from \"./interactive-brief.ts\";\nimport type { AttachOptions, AttachResult } from \"./outpost.types.ts\";\nimport type {\n  ProvisionedSandbox,\n  SandboxAgents,\n} from \"./sandbox-session.types.ts\";\n\nexport async function attachInSandbox(\n  context: ProvisionedSandbox,\n  agents: SandboxAgents,\n  settings: AttachOptions,\n): Promise<AttachResult> {\n  const { options, provider, workspace, sync, stop } = context;\n  const { selectAgent, restore } = agents;\n  const signal = settings.signal\n    ? AbortSignal.any([settings.signal, stop.signal])\n    : stop.signal;\n  const { selected, adapter, executionLease } = await selectAgent(\n    settings.agent ?? options.agent,\n    signal,\n  );\n  if (settings.continuation) await restore(settings.continuation.id, selected);\n  const brief = await completeBrief(settings.brief, signal, settings.ask);\n  const text = brief\n    ? await renderBrief(\n        brief,\n        workspace,\n        executionLease,\n        provider.placement === \"host\",\n        settings,\n      )\n    : undefined;\n  const command = adapter.request({\n    interactive: true,\n    ...(text === undefined ? {} : { text }),\n    ...(settings.continuation ? { continuation: settings.continuation } : {}),\n  });\n  const baseline = (\n    await git(workspace.directory, [\"rev-parse\", \"HEAD\"])\n  ).trim();\n  let output: CommandResult;\n  try {\n    output = await executionLease.invoke({\n      ...command,\n      ...(settings.terminal ? { terminal: settings.terminal } : {}),\n      deadlineMs: executionDefaults.attachMs,\n      signal: settings.signal\n        ? AbortSignal.any([settings.signal, stop.signal])\n        : stop.signal,\n    });\n  } finally {\n    restoreTerminal();\n    await sync?.pull();\n  }\n  return {\n    ...output,\n    branch: workspace.branch,\n    directory: workspace.directory,\n    commits: await commits(\n      workspace.directory,\n      baseline,\n      options.limits?.collectMs,\n    ),\n  };\n}\n"]}
+{"version":3,"file":"sandbox-attach.js","sourceRoot":"","sources":["../../src/application/sandbox-attach.ts"],"names":[],"mappings":"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","sourcesContent":["import { invariant } from \"../domain/errors.ts\";\nimport type { CommandResult } from \"../domain/command.types.ts\";\nimport { git } from \"../infrastructure/git/command.ts\";\nimport { commits } from \"../infrastructure/git/history.ts\";\nimport { restoreTerminal } from \"../infrastructure/terminal.ts\";\nimport { renderBrief } from \"./brief-renderer.ts\";\nimport { executionDefaults } from \"./execution.constants.ts\";\nimport { completeBrief } from \"./interactive-brief.ts\";\nimport type { AttachOptions, AttachResult } from \"./outpost.types.ts\";\nimport type {\n  ProvisionedSandbox,\n  SandboxAgents,\n} from \"./sandbox-session.types.ts\";\n\nexport async function attachInSandbox(\n  context: ProvisionedSandbox,\n  agents: SandboxAgents,\n  settings: AttachOptions,\n): Promise<AttachResult> {\n  const { options, sandboxProvider, workspace, sync, stop } = context;\n  invariant(\n    (settings.agent ?? options.agent)?.kind === \"cli\",\n    \"This harness does not support interactive attachment\",\n  );\n  const { selectAgent, restore } = agents;\n  const signal = settings.signal\n    ? AbortSignal.any([settings.signal, stop.signal])\n    : stop.signal;\n  const { selected, adapter, executionLease } = await selectAgent(\n    settings.agent ?? options.agent,\n    signal,\n  );\n  if (settings.continuation) await restore(settings.continuation.id, selected);\n  const brief = await completeBrief(settings.brief, signal, settings.ask);\n  const text = brief\n    ? await renderBrief(\n        brief,\n        workspace,\n        executionLease,\n        sandboxProvider.placement === \"host\",\n        settings,\n      )\n    : undefined;\n  invariant(\n    adapter.kind === \"cli\",\n    \"This harness does not support interactive attachment\",\n  );\n  const command = adapter.request({\n    interactive: true,\n    ...(text === undefined ? {} : { text }),\n    ...(settings.continuation ? { continuation: settings.continuation } : {}),\n  });\n  const baseline = (\n    await git(workspace.directory, [\"rev-parse\", \"HEAD\"])\n  ).trim();\n  let output: CommandResult;\n  try {\n    output = await executionLease.invoke({\n      ...command,\n      ...(settings.terminal ? { terminal: settings.terminal } : {}),\n      deadlineMs: executionDefaults.attachMs,\n      signal: settings.signal\n        ? AbortSignal.any([settings.signal, stop.signal])\n        : stop.signal,\n    });\n  } finally {\n    restoreTerminal();\n    await sync?.pull();\n  }\n  return {\n    ...output,\n    branch: workspace.branch,\n    directory: workspace.directory,\n    commits: await commits(\n      workspace.directory,\n      baseline,\n      options.limits?.collectMs,\n    ),\n  };\n}\n"]}

package/dist/application/sandbox-dispatch.js

@@ -9,7 +9,7 @@ import { preflightDispatch } from "./dispatch-validation.js";
 import { execute } from "./execution.js";
 import { notify } from "./observation.js";
 export async function dispatchInSandbox(context, agents, result, dispatch) {
-    const { options, provider, workspace, runtime, sync, stop, staging } = context;
+    const { options, sandboxProvider, workspace, runtime, sync, stop, staging } = context;
     const { selectAgent, restore } = agents;
     await preflightDispatch(dispatch, workspace.repository, dispatch.agent ?? options.agent);
     const signal = dispatch.signal
@@ -34,14 +34,14 @@ export async function dispatchInSandbox(context, agents, result, dispatch) {
             staging,
             ...(options.conversationHome ? { home: options.conversationHome } : {}),
             ...(dispatch.warn ? { warn: dispatch.warn } : {}),
-            local: provider.placement === "host",
+            local: sandboxProvider.placement === "host",
         });
         captured.set(id, location);
         transcript = location;
         return location;
     };
     try {
-        execution = await execute(workspace, executionLease, adapter, provider.placement === "host", {
+        execution = await execute(workspace, executionLease, adapter, sandboxProvider.placement === "host", {
             ...dispatch,
             signal,
             observe(event) {
@@ -100,7 +100,6 @@ export async function dispatchInSandbox(context, agents, result, dispatch) {
             directory: workspace.directory,
             commits: changes,
             transcript: transcript?.file,
-            log: log.file,
             logReference: log.reference,
             transcriptReference: transcript?.reference,
         });
@@ -113,7 +112,6 @@ export async function dispatchInSandbox(context, agents, result, dispatch) {
         directory: workspace.directory,
         commits: changes,
         ...(transcript ? { transcript: transcript.file } : {}),
-        ...(log.file ? { log: log.file } : {}),
         ...(log.reference ? { logReference: log.reference } : {}),
         ...(transcript?.reference
             ? { transcriptReference: transcript.reference }