@usine/agents 0.3.0 → 0.5.0

package/dist/pi/usage.js

@@ -1,29 +1,47 @@
-import { TokenCount } from "@usine/core/agent/session";
-import { Option, Schema } from "effect";
-const Count = Schema.Int.check(Schema.isGreaterThanOrEqualTo(0));
+import { TokenBreakdown, TokenCount, UsdAmount } from "@usine/core/agent/session";
+import { flow, Option, Schema } from "effect";
+import { UsageCount } from "../protocol/count.js";
+const Dollars = Schema.Finite.check(Schema.isGreaterThanOrEqualTo(0));
 const PiUsage = Schema.Struct({
     role: Schema.Literal("assistant"),
-    usage: Schema.Struct({ totalTokens: Count }),
+    usage: Schema.Struct({
+        input: UsageCount,
+        output: UsageCount,
+        cacheWrite: UsageCount,
+        cost: Schema.optionalKey(Schema.Struct({ total: Dollars })),
+    }),
+});
+/**
+ * Returns the usage of one completed Pi assistant message: output plus uncached input, where cache
+ * writes count and cache reads do not, and the dollar cost if Pi reports one.
+ */
+export const piMessageUsage = flow(Schema.decodeUnknownOption(PiUsage), Option.map(({ usage }) => ({
+    totalTokens: TokenCount.make(usage.output + usage.input + usage.cacheWrite),
+    costUsd: Option.map(Option.fromNullishOr(usage.cost), ({ total }) => UsdAmount.make(total)),
+})));
+/** Adds a message's usage to a session total; the cost is `Some` once any message has a cost. */
+export const addUsage = (total, message) => ({
+    totalTokens: TokenCount.make(total.totalTokens + message.totalTokens),
+    costUsd: Option.isNone(message.costUsd)
+        ? total.costUsd
+        : Option.some(UsdAmount.make(Option.getOrElse(total.costUsd, () => 0) + message.costUsd.value)),
 });
-/** Pi assistant usage is per completed message, including cache tokens. */
-export const piMessageTokens = Schema.decodeUnknownOption(PiUsage);
 const ClaudeAssistantUsage = Schema.Struct({
     type: Schema.Literal("assistant"),
     message: Schema.Struct({
         id: Schema.NonEmptyString,
         usage: Schema.Struct({
-            input_tokens: Count,
-            output_tokens: Count,
-            cache_read_input_tokens: Schema.optionalKey(Schema.NullOr(Count)),
-            cache_creation_input_tokens: Schema.optionalKey(Schema.NullOr(Count)),
+            input_tokens: UsageCount,
+            output_tokens: UsageCount,
+            cache_creation_input_tokens: Schema.optionalKey(Schema.NullOr(UsageCount)),
         }),
     }),
 });
 const ClaudeModelUsage = Schema.Struct({
-    inputTokens: Count,
-    outputTokens: Count,
-    cacheReadInputTokens: Count,
-    cacheCreationInputTokens: Count,
+    inputTokens: UsageCount,
+    outputTokens: UsageCount,
+    cacheCreationInputTokens: UsageCount,
+    costUSD: Schema.optionalKey(Dollars),
 });
 const ClaudeResultUsage = Schema.Struct({
     type: Schema.Literal("result"),
@@ -31,42 +49,70 @@ const ClaudeResultUsage = Schema.Struct({
 });
 const decodeAssistant = Schema.decodeUnknownOption(ClaudeAssistantUsage);
 const decodeResult = Schema.decodeUnknownOption(ClaudeResultUsage);
-/** Tracks Claude's live message usage and reconciles its cumulative query meter at each result.
- * Repeated blocks with the same message id count only their additional tokens.
- * The SDK's result.usage is per-turn and excludes auxiliary work; modelUsage
- * includes that work and stays cumulative across streaming-input turns.
+/**
+ * Returns a Claude token meter: live message usage between results, reconciled with the cumulative
+ * `modelUsage` at each result. Consumption is output plus input plus cache creation, because the
+ * SDK's input counts exclude cache reads and writes; repeated blocks with one message ID count only
+ * their added tokens. The cost is the SDK's `costUSD` estimate and changes only at a result.
  */
 export const claudeTokenMeter = () => {
     let total = 0;
+    let cost = Option.none();
     const messages = new Map();
     return (message) => {
         const assistant = decodeAssistant(message);
         if (Option.isSome(assistant)) {
             const { id, usage } = assistant.value.message;
-            const consumed = usage.input_tokens +
-                usage.output_tokens +
-                (usage.cache_read_input_tokens ?? 0) +
-                (usage.cache_creation_input_tokens ?? 0);
+            const consumed = usage.output_tokens + usage.input_tokens + (usage.cache_creation_input_tokens ?? 0);
             const previous = messages.get(id) ?? 0;
             total += Math.max(0, consumed - previous);
             messages.set(id, Math.max(previous, consumed));
-            return Option.some(TokenCount.make(total));
+            return Option.some({ totalTokens: TokenCount.make(total), costUsd: cost });
         }
         const result = decodeResult(message);
         if (Option.isNone(result))
             return Option.none();
-        const consumed = Object.values(result.value.modelUsage).reduce((sum, usage) => sum +
-            usage.inputTokens +
-            usage.outputTokens +
-            usage.cacheReadInputTokens +
-            usage.cacheCreationInputTokens, 0);
+        const models = Object.values(result.value.modelUsage);
+        const consumed = models.reduce((sum, usage) => sum + usage.outputTokens + usage.inputTokens + usage.cacheCreationInputTokens, 0);
         total = Math.max(total, consumed);
-        return Option.some(TokenCount.make(total));
+        const priced = models.flatMap(({ costUSD }) => (costUSD === undefined ? [] : [costUSD]));
+        if (priced.length > 0)
+            cost = Option.some(UsdAmount.make(priced.reduce((sum, value) => sum + value, 0)));
+        return Option.some({ totalTokens: TokenCount.make(total), costUsd: cost });
+    };
+};
+const NO_USAGE = { totalTokens: TokenCount.make(0), costUsd: Option.none() };
+/**
+ * Returns a Claude token meter for a session that another process can resume. `read` returns the
+ * session's usage: the current process's, as `claudeTokenMeter` reads it, plus the earlier
+ * processes'. `restart` starts on a new process, which Claude counts from zero.
+ */
+export const claudeSessionMeter = () => {
+    let earlier = NO_USAGE;
+    let current = NO_USAGE;
+    let meter = claudeTokenMeter();
+    return {
+        read: (message) => Option.map(meter(message), (usage) => {
+            current = usage;
+            return addUsage(earlier, usage);
+        }),
+        restart: () => {
+            earlier = addUsage(earlier, current);
+            current = NO_USAGE;
+            meter = claudeTokenMeter();
+        },
     };
 };
-/** Codex's thread meter is cumulative across turns on the same thread. */
-export const CodexTokenUsage = Schema.Struct({
-    threadId: Schema.NonEmptyString,
-    tokenUsage: Schema.Struct({ total: Schema.Struct({ totalTokens: TokenCount }) }),
+/**
+ * Returns a Codex thread's consumption: output plus uncached input. The thread's `totalTokens` counts
+ * the whole context on every turn, so it is not used.
+ */
+export const codexThreadTokens = (total) => TokenCount.make(total.outputTokens + Math.max(0, total.inputTokens - total.cachedInputTokens));
+/** Returns a Codex thread's tokens per billing rate. */
+export const codexTokenBreakdown = (total) => new TokenBreakdown({
+    input: Math.max(0, total.inputTokens - total.cachedInputTokens - total.cacheWriteInputTokens),
+    cachedInput: total.cachedInputTokens,
+    cacheWrite: total.cacheWriteInputTokens,
+    output: total.outputTokens,
 });
 //# sourceMappingURL=usage.js.map

package/dist/pi/usage.js.map

@@ -1 +1 @@
-{"version":3,"file":"usage.js","sourceRoot":"","sources":["../../src/pi/usage.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"usage.js","sourceRoot":"","sources":["../../src/pi/usage.ts"],"names":[],"mappings":"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"}

package/dist/preflight/command.d.ts

@@ -1,7 +1,19 @@
-import { HarnessUnavailableError } from "@usine/core/agent/capability";
+import type { Harness } from "@usine/core/agent/brain";
+import { HarnessUnavailableError, type HarnessCapability } from "@usine/core/agent/capability";
 import { Effect } from "effect";
-import { ChildProcessSpawner } from "effect/unstable/process";
+import { type ChildHost } from "../child-host/child-host.ts";
 import { SessionOperationError } from "../runtime.ts";
-/** Runs a bounded readiness command without retaining its potentially sensitive diagnostics. */
-export declare const probeCommand: (harness: "claude" | "codex" | "pi", capability: "binary" | "login" | "version", command: string, args: readonly string[]) => Effect.Effect<string, HarnessUnavailableError | SessionOperationError, ChildProcessSpawner.ChildProcessSpawner>;
+/** Returns the error for a readiness command that exited non-zero; the message includes the command but not its output. */
+export declare const probeFailed: (harness: Harness, capability: HarnessCapability, command: string, args: ReadonlyArray<string>) => HarnessUnavailableError;
+/**
+ * Runs a readiness command on `host` with a 30-second timeout and returns its trimmed stdout and
+ * exit code; stderr is discarded. If the remote host is unreachable or the command times out, fails
+ * with `SessionOperationError`.
+ */
+export declare const probeOutput: (host: import("../child-host/child-host.ts").LocalProcess | import("../child-host/child-host.ts").RemoteShell, environment: Readonly<Record<string, string>>, harness: "claude" | "codex" | "pi", capability: "binary" | "login" | "version", command: string, args: readonly string[]) => Effect.Effect<{
+    stdout: string;
+    exitCode: import("effect/process/ChildProcessSpawner").ExitCode;
+}, HarnessUnavailableError | SessionOperationError, import("effect/process/ChildProcessSpawner").ChildProcessSpawner>;
+/** Runs a readiness command and returns its trimmed stdout. Fails with `HarnessUnavailableError` if the command exits non-zero. */
+export declare const probeCommand: (host: ChildHost, environment: Readonly<Record<string, string>>, harness: Harness, capability: HarnessCapability, command: string, args: ReadonlyArray<string>) => Effect.Effect<string, HarnessUnavailableError | SessionOperationError, import("effect/process/ChildProcessSpawner").ChildProcessSpawner>;
 //# sourceMappingURL=command.d.ts.map

package/dist/preflight/command.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"command.d.ts","sourceRoot":"","sources":["../../src/preflight/command.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,uBAAuB,EAA0B,MAAM,8BAA8B,CAAC;AAC/F,OAAO,EAAE,MAAM,EAAkB,MAAM,QAAQ,CAAC;AAChD,OAAO,EAAgB,mBAAmB,EAAE,MAAM,yBAAyB,CAAC;AAE5E,OAAO,EAAE,qBAAqB,EAAE,MAAM,eAAe,CAAC;AAEtD,gGAAgG;AAChG,eAAO,MAAM,YAAY,+OAmDvB,CAAC"}
+{"version":3,"file":"command.d.ts","sourceRoot":"","sources":["../../src/preflight/command.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,yBAAyB,CAAC;AACvD,OAAO,EAAE,uBAAuB,EAAE,KAAK,iBAAiB,EAAE,MAAM,8BAA8B,CAAC;AAC/F,OAAO,EAAE,MAAM,EAAU,MAAM,QAAQ,CAAC;AACxC,OAAO,EAAE,KAAK,SAAS,EAAe,MAAM,6BAA6B,CAAC;AAE1E,OAAO,EAAE,qBAAqB,EAAE,MAAM,eAAe,CAAC;AAEtD,2HAA2H;AAC3H,eAAO,MAAM,WAAW,YACb,OAAO,cACJ,iBAAiB,WACpB,MAAM,QACT,aAAa,CAAC,MAAM,CAAC,4BAMzB,CAAC;AAEL;;;;GAIG;AACH,eAAO,MAAM,WAAW;;;qHAuCtB,CAAC;AAEH,mIAAmI;AACnI,eAAO,MAAM,YAAY,SACjB,SAAS,eACF,QAAQ,CAAC,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC,WACpC,OAAO,cACJ,iBAAiB,WACpB,MAAM,QACT,aAAa,CAAC,MAAM,CAAC,6IAQ1B,CAAC"}

package/dist/preflight/command.js

@@ -1,35 +1,33 @@
 import { HarnessUnavailableError } from "@usine/core/agent/capability";
-import { Effect, Option, Stream } from "effect";
-import { ChildProcess, ChildProcessSpawner } from "effect/unstable/process";
-import { homedir } from "node:os";
+import { Effect, Option } from "effect";
+import { SSH_FAILURE } from "../child-host/child-host.js";
+import { hostOutput } from "../child-host/command.js";
 import { SessionOperationError } from "../runtime.js";
-/** Runs a bounded readiness command without retaining its potentially sensitive diagnostics. */
-export const probeCommand = Effect.fn("HarnessPreflight.command")(function* (harness, capability, command, args) {
-    yield* Effect.annotateCurrentSpan({ harness, capability });
-    const spawner = yield* ChildProcessSpawner.ChildProcessSpawner;
-    return yield* Effect.scoped(Effect.gen(function* () {
-        const handle = yield* spawner.spawn(ChildProcess.make(command, args, {
-            cwd: homedir(),
-            detached: false,
-            forceKillAfter: "2 seconds",
-        }));
-        const [stdout, , exitCode] = yield* Effect.all([
-            handle.stdout.pipe(Stream.decodeText(), Stream.mkString),
-            handle.stderr.pipe(Stream.runDrain),
-            handle.exitCode,
-        ], { concurrency: "unbounded" });
-        if (exitCode !== 0)
-            return yield* new HarnessUnavailableError({
-                harness,
-                capability,
-                message: `${command} ${args.join(" ")} failed; check the Worker's ${harness} installation and login`,
-            });
-        return stdout.trim();
-    })).pipe(Effect.timeout("30 seconds"), Effect.catchTags({
+/** Returns the error for a readiness command that exited non-zero; the message includes the command but not its output. */
+export const probeFailed = (harness, capability, command, args) => new HarnessUnavailableError({
+    harness,
+    capability,
+    message: `${command} ${args.join(" ")} failed. Check the ${harness} installation and login on the worker.`,
+});
+/**
+ * Runs a readiness command on `host` with a 30-second timeout and returns its trimmed stdout and
+ * exit code; stderr is discarded. If the remote host is unreachable or the command times out, fails
+ * with `SessionOperationError`.
+ */
+export const probeOutput = Effect.fn("HarnessPreflight.command")(function* (host, environment, harness, capability, command, args) {
+    yield* Effect.annotateCurrentSpan({ harness, capability, host: host._tag });
+    return yield* hostOutput(host, { environment, command, args }).pipe(Effect.flatMap((output) => host._tag === "RemoteShell" && output.exitCode === SSH_FAILURE
+        ? Effect.fail(new SessionOperationError({
+            operation: "launch",
+            sessionId: Option.none(),
+            message: `Can't reach ${host.destination} to run ${command}`,
+            cause: new Error(`${host.ssh.command} exited with code ${SSH_FAILURE}`),
+        }))
+        : Effect.succeed(output)), Effect.timeout("30 seconds"), Effect.catchTags({
         PlatformError: () => new HarnessUnavailableError({
             harness,
             capability,
-            message: `Worker cannot execute ${command}`,
+            message: `The worker can't run ${command}`,
         }),
         TimeoutError: (cause) => new SessionOperationError({
             operation: "launch",
@@ -39,4 +37,8 @@ export const probeCommand = Effect.fn("HarnessPreflight.command")(function* (har
         }),
     }));
 });
+/** Runs a readiness command and returns its trimmed stdout. Fails with `HarnessUnavailableError` if the command exits non-zero. */
+export const probeCommand = (host, environment, harness, capability, command, args) => probeOutput(host, environment, harness, capability, command, args).pipe(Effect.flatMap(({ stdout, exitCode }) => exitCode === 0
+    ? Effect.succeed(stdout)
+    : Effect.fail(probeFailed(harness, capability, command, args))));
 //# sourceMappingURL=command.js.map

package/dist/preflight/command.js.map

@@ -1 +1 @@
-{"version":3,"file":"command.js","sourceRoot":"","sources":["../../src/preflight/command.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,uBAAuB,EAA0B,MAAM,8BAA8B,CAAC;AAC/F,OAAO,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAC;AAChD,OAAO,EAAE,YAAY,EAAE,mBAAmB,EAAE,MAAM,yBAAyB,CAAC;AAC5E,OAAO,EAAE,OAAO,EAAE,MAAM,SAAS,CAAC;AAClC,OAAO,EAAE,qBAAqB,EAAE,MAAM,eAAe,CAAC;AAEtD,gGAAgG;AAChG,MAAM,CAAC,MAAM,YAAY,GAAG,MAAM,CAAC,EAAE,CAAC,0BAA0B,CAAC,CAAC,QAAQ,CAAC,EACzE,OAAgB,EAChB,UAA6B,EAC7B,OAAe,EACf,IAA2B;IAE3B,KAAK,CAAC,CAAC,MAAM,CAAC,mBAAmB,CAAC,EAAE,OAAO,EAAE,UAAU,EAAE,CAAC,CAAC;IAC3D,MAAM,OAAO,GAAG,KAAK,CAAC,CAAC,mBAAmB,CAAC,mBAAmB,CAAC;IAC/D,OAAO,KAAK,CAAC,CAAC,MAAM,CAAC,MAAM,CACzB,MAAM,CAAC,GAAG,CAAC,QAAQ,CAAC;QAClB,MAAM,MAAM,GAAG,KAAK,CAAC,CAAC,OAAO,CAAC,KAAK,CACjC,YAAY,CAAC,IAAI,CAAC,OAAO,EAAE,IAAI,EAAE;YAC/B,GAAG,EAAE,OAAO,EAAE;YACd,QAAQ,EAAE,KAAK;YACf,cAAc,EAAE,WAAW;SAC5B,CAAC,CACH,CAAC;QACF,MAAM,CAAC,MAAM,EAAE,AAAD,EAAG,QAAQ,CAAC,GAAG,KAAK,CAAC,CAAC,MAAM,CAAC,GAAG,CAC5C;YACE,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,MAAM,CAAC,UAAU,EAAE,EAAE,MAAM,CAAC,QAAQ,CAAC;YACxD,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,MAAM,CAAC,QAAQ,CAAC;YACnC,MAAM,CAAC,QAAQ;SAChB,EACD,EAAE,WAAW,EAAE,WAAW,EAAE,CAC7B,CAAC;QACF,IAAI,QAAQ,KAAK,CAAC;YAChB,OAAO,KAAK,CAAC,CAAC,IAAI,uBAAuB,CAAC;gBACxC,OAAO;gBACP,UAAU;gBACV,OAAO,EAAE,GAAG,OAAO,IAAI,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,+BAA+B,OAAO,yBAAyB;aACrG,CAAC,CAAC;QACL,OAAO,MAAM,CAAC,IAAI,EAAE,CAAC;IACvB,CAAC,CAAC,CACH,CAAC,IAAI,CACJ,MAAM,CAAC,OAAO,CAAC,YAAY,CAAC,EAC5B,MAAM,CAAC,SAAS,CAAC;QACf,aAAa,EAAE,GAAG,EAAE,CAClB,IAAI,uBAAuB,CAAC;YAC1B,OAAO;YACP,UAAU;YACV,OAAO,EAAE,yBAAyB,OAAO,EAAE;SAC5C,CAAC;QACJ,YAAY,EAAE,CAAC,KAAK,EAAE,EAAE,CACtB,IAAI,qBAAqB,CAAC;YACxB,SAAS,EAAE,QAAQ;YACnB,SAAS,EAAE,MAAM,CAAC,IAAI,EAAE;YACxB,OAAO,EAAE,GAAG,OAAO,4BAA4B;YAC/C,KAAK;SACN,CAAC;KACL,CAAC,CACH,CAAC;AACJ,CAAC,CAAC,CAAC"}
+{"version":3,"file":"command.js","sourceRoot":"","sources":["../../src/preflight/command.ts"],"names":[],"mappings":"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"}

package/dist/preflight/preflight.d.ts

@@ -1,13 +1,25 @@
 import type { BrainSpec } from "@usine/core/agent/brain";
 import { HarnessReady, HarnessUnavailableError } from "@usine/core/agent/capability";
-import { Effect } from "effect";
+import { Effect, Option } from "effect";
+import type { ChildHost } from "../child-host/child-host.ts";
 import { SessionOperationError } from "../runtime.ts";
 import { CodexAppServer } from "../pi/codex/app-server.ts";
 import { PiSdk } from "../pi/sdk.ts";
-/** Baseline Codex CLI version used by the pinned app-server protocol conformance gate. */
-export declare const CODEX_CLI_VERSION = "0.144.0";
-/** Verifies a rostered brain through supplied process and SDK services; starts no prompt. */
-export declare const verifyHarness: (brain: BrainSpec) => Effect.Effect<HarnessReady, HarnessUnavailableError | SessionOperationError, import("effect/unstable/process/ChildProcessSpawner").ChildProcessSpawner | CodexAppServer | PiSdk>;
-/** Checks only the requested brain using the worker user's configuration, without running a prompt or logging in. */
-export declare const preflight: (brain: BrainSpec) => Effect.Effect<HarnessReady, HarnessUnavailableError | SessionOperationError, import("effect/unstable/process/ChildProcessSpawner").ChildProcessSpawner>;
+/** The Codex CLI version of the pinned app-server protocol package used by the conformance check. */
+export declare const CODEX_CLI_VERSION = "0.159.2";
+/**
+ * The Codex CLI versions that preflight accepts, the conformance baseline first. Adding a version
+ * needs a review of its generated protocol types and a run of the live contracts.
+ */
+export declare const supportedCodexVersions: ReadonlyArray<string>;
+/** Returns the error for `codex --version` output that names no supported Codex CLI version. */
+export declare const unsupportedCodexVersion: (version: string) => Option.Option<HarnessUnavailableError>;
+/**
+ * Checks `brain` on `host` without starting a prompt; each check process gets `environment` as its
+ * complete local environment, or on top of the remote host's environment (ADR 0011). Fails with
+ * `HarnessUnavailableError` for Pi on a remote host.
+ */
+export declare const verifyHarness: (brain: BrainSpec, host: import("../child-host/child-host.ts").LocalProcess | import("../child-host/child-host.ts").RemoteShell, environment: Readonly<Record<string, string>>) => Effect.Effect<HarnessReady, HarnessUnavailableError | SessionOperationError, import("effect/process/ChildProcessSpawner").ChildProcessSpawner | CodexAppServer | PiSdk>;
+/** Checks only `brain` on `host`, with `environment` and the Worker user's configuration; does not run a prompt or log in. */
+export declare const preflight: (brain: BrainSpec, host: ChildHost, environment: Readonly<Record<string, string>>) => Effect.Effect<HarnessReady, HarnessUnavailableError | SessionOperationError, import("effect/process/ChildProcessSpawner").ChildProcessSpawner>;
 //# sourceMappingURL=preflight.d.ts.map

package/dist/preflight/preflight.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"preflight.d.ts","sourceRoot":"","sources":["../../src/preflight/preflight.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,yBAAyB,CAAC;AACzD,OAAO,EAAE,YAAY,EAAE,uBAAuB,EAAE,MAAM,8BAA8B,CAAC;AACrF,OAAO,EAAE,MAAM,EAAkB,MAAM,QAAQ,CAAC;AAEhD,OAAO,EAAE,qBAAqB,EAAoB,MAAM,eAAe,CAAC;AACxE,OAAO,EAAE,cAAc,EAAsB,MAAM,2BAA2B,CAAC;AAE/E,OAAO,EAAE,KAAK,EAAyB,MAAM,cAAc,CAAC;AAG5D,0FAA0F;AAC1F,eAAO,MAAM,iBAAiB,YAAY,CAAC;AAW3C,6FAA6F;AAC7F,eAAO,MAAM,aAAa,wMA4GzB,CAAC;AAEF,qHAAqH;AACrH,eAAO,MAAM,SAAS,UAAW,SAAS,4JACgD,CAAC"}
+{"version":3,"file":"preflight.d.ts","sourceRoot":"","sources":["../../src/preflight/preflight.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,yBAAyB,CAAC;AACzD,OAAO,EAEL,YAAY,EACZ,uBAAuB,EACxB,MAAM,8BAA8B,CAAC;AACtC,OAAO,EAAE,MAAM,EAAE,MAAM,EAAU,MAAM,QAAQ,CAAC;AAEhD,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,6BAA6B,CAAC;AAC7D,OAAO,EAAE,qBAAqB,EAAoB,MAAM,eAAe,CAAC;AACxE,OAAO,EAAE,cAAc,EAAsB,MAAM,2BAA2B,CAAC;AAE/E,OAAO,EAAE,KAAK,EAAyB,MAAM,cAAc,CAAC;AAG5D,qGAAqG;AACrG,eAAO,MAAM,iBAAiB,YAAY,CAAC;AAE3C;;;GAGG;AACH,eAAO,MAAM,sBAAsB,EAAE,aAAa,CAAC,MAAM,CAMxD,CAAC;AAEF,gGAAgG;AAChG,eAAO,MAAM,uBAAuB,YAAa,MAAM,KAAG,MAAM,CAAC,MAAM,CAAC,uBAAuB,CASxF,CAAC;AAYR;;;;GAIG;AACH,eAAO,MAAM,aAAa,4VAsIzB,CAAC;AAEF,8HAA8H;AAC9H,eAAO,MAAM,SAAS,UACb,SAAS,QACV,SAAS,eACF,QAAQ,CAAC,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC,mJAK5C,CAAC"}

package/dist/preflight/preflight.js

@@ -1,42 +1,69 @@
-import { HarnessReady, HarnessUnavailableError } from "@usine/core/agent/capability";
+import { HarnessReady, HarnessUnavailableError, } from "@usine/core/agent/capability";
 import { Effect, Option, Schema } from "effect";
 import { homedir } from "node:os";
 import { SessionOperationError, WorkingDirectory } from "../runtime.js";
 import { CodexAppServer, codexAppServerLive } from "../pi/codex/app-server.js";
 import { initializeCodex, verifyCodexAccount } from "../pi/codex/account.js";
 import { PiSdk, piSdkLive, usePiStart } from "../pi/sdk.js";
-import { probeCommand } from "./command.js";
-/** Baseline Codex CLI version used by the pinned app-server protocol conformance gate. */
-export const CODEX_CLI_VERSION = "0.144.0";
-// Additional exact builds require generated-type review and the live contracts.
-const supportedCodexVersions = [CODEX_CLI_VERSION, "0.153.4"];
+import { probeCommand, probeFailed, probeOutput } from "./command.js";
+/** The Codex CLI version of the pinned app-server protocol package used by the conformance check. */
+export const CODEX_CLI_VERSION = "0.159.2";
+/**
+ * The Codex CLI versions that preflight accepts, the conformance baseline first. Adding a version
+ * needs a review of its generated protocol types and a run of the live contracts.
+ */
+export const supportedCodexVersions = [
+    CODEX_CLI_VERSION,
+    "0.159.0",
+    "0.159.1",
+    "0.159.3",
+    "0.153.4",
+];
+/** Returns the error for `codex --version` output that names no supported Codex CLI version. */
+export const unsupportedCodexVersion = (version) => supportedCodexVersions.some((supported) => version === `codex-cli ${supported}`)
+    ? Option.none()
+    : Option.some(new HarnessUnavailableError({
+        harness: "codex",
+        capability: "version",
+        message: `The worker has ${/^codex-cli [0-9]+\.[0-9]+\.[0-9]+$/u.test(version) ? version : "an unrecognized Codex version"}. Install a supported Codex CLI version: ${supportedCodexVersions.join(", ")}.`,
+    }));
 const ClaudeAuthentication = Schema.Struct({
     loggedIn: Schema.Boolean,
     authMethod: Schema.String,
     apiProvider: Schema.String,
 });
-/** Verifies a rostered brain through supplied process and SDK services; starts no prompt. */
-export const verifyHarness = Effect.fn("HarnessPreflight.verify")(function* (brain) {
-    yield* Effect.annotateCurrentSpan({ harness: brain.harness, model: brain.model });
+const decodeClaudeAuthentication = Schema.decodeUnknownOption(Schema.fromJsonString(ClaudeAuthentication));
+const CLAUDE_AUTH_STATUS = ["auth", "status", "--json"];
+/**
+ * Checks `brain` on `host` without starting a prompt; each check process gets `environment` as its
+ * complete local environment, or on top of the remote host's environment (ADR 0011). Fails with
+ * `HarnessUnavailableError` for Pi on a remote host.
+ */
+export const verifyHarness = Effect.fn("HarnessPreflight.verify")(function* (brain, host, environment) {
+    yield* Effect.annotateCurrentSpan({
+        harness: brain.harness,
+        model: brain.model,
+        host: host._tag,
+    });
     const loginError = (message) => new HarnessUnavailableError({
         harness: brain.harness,
         capability: "login",
         message,
     });
+    const probe = (capability, command, args) => probeCommand(host, environment, brain.harness, capability, command, args);
     switch (brain.harness) {
         case "codex": {
-            const version = yield* probeCommand("codex", "binary", "codex", ["--version"]);
-            if (!supportedCodexVersions.some((supported) => version === `codex-cli ${supported}`))
-                return yield* new HarnessUnavailableError({
-                    harness: "codex",
-                    capability: "version",
-                    message: `Worker has ${/^codex-cli [0-9]+\.[0-9]+\.[0-9]+$/u.test(version) ? version : "an unrecognized Codex version"}; supported Codex CLI versions: ${supportedCodexVersions.join(", ")}`,
-                });
+            const version = yield* probe("binary", "codex", ["--version"]);
+            const unsupported = unsupportedCodexVersion(version);
+            if (Option.isSome(unsupported))
+                return yield* unsupported.value;
             yield* Effect.scoped(Effect.gen(function* () {
                 const server = yield* CodexAppServer;
                 const connection = yield* server.open({
                     cwd: WorkingDirectory.make(homedir()),
                     sessionId: Option.none(),
+                    environment,
+                    host,
                 });
                 yield* initializeCodex(connection);
                 yield* verifyCodexAccount(connection, brain.model);
@@ -44,37 +71,50 @@ export const verifyHarness = Effect.fn("HarnessPreflight.verify")(function* (bra
             break;
         }
         case "claude": {
-            yield* probeCommand("claude", "binary", "claude", ["--version"]);
-            const response = yield* probeCommand("claude", "login", "claude", [
-                "auth",
-                "status",
-                "--json",
-            ]);
-            const auth = yield* Schema.decodeUnknownEffect(Schema.fromJsonString(ClaudeAuthentication))(response).pipe(Effect.mapError(() => loginError("Claude returned an unrecognized login status")));
-            if (!auth.loggedIn || auth.authMethod !== "claude.ai" || auth.apiProvider !== "firstParty")
-                return yield* loginError("Claude requires a subscription login; run claude auth login on the Worker");
+            yield* probe("binary", "claude", ["--version"]);
+            const status = yield* probeOutput(host, environment, "claude", "login", "claude", CLAUDE_AUTH_STATUS);
+            // Claude prints the same status and exits 1 when not logged in.
+            const auth = status.exitCode === 0 || status.exitCode === 1
+                ? decodeClaudeAuthentication(status.stdout)
+                : Option.none();
+            if (Option.isNone(auth))
+                return yield* status.exitCode === 0
+                    ? loginError("Claude returned an unrecognized login status")
+                    : probeFailed("claude", "login", "claude", CLAUDE_AUTH_STATUS);
+            const { loggedIn, authMethod, apiProvider } = auth.value;
+            if (status.exitCode !== 0 ||
+                !loggedIn ||
+                authMethod !== "claude.ai" ||
+                apiProvider !== "firstParty")
+                return yield* loginError("Claude Code needs a subscription login. Run claude auth login on the worker.");
             break;
         }
         case "pi": {
-            // Pi is the SDK installed with this run host, not a separate CLI binary.
+            if (host._tag === "RemoteShell")
+                return yield* new HarnessUnavailableError({
+                    harness: "pi",
+                    capability: "binary",
+                    message: "Pi children run only on local workers",
+                });
+            // Pi runs from the SDK installed with this process, not from a CLI binary.
             const sdk = yield* PiSdk;
             yield* usePiStart((signal) => sdk.start({
                 cwd: homedir(),
+                environment: Option.some(environment),
                 extensions: [],
-                model: Option.some(brain.model),
+                model: brain.model,
                 signal,
                 thinkingLevel: brain.effort,
-                toolMode: "repository",
             }), (cause) => new SessionOperationError({
                 operation: "launch",
                 sessionId: Option.none(),
-                message: `Pi could not check authentication for ${brain.model}`,
+                message: `Can't check Pi authentication for "${brain.model}"`,
                 cause,
             }), (acquired) => Effect.gen(function* () {
                 const result = acquired.result;
                 yield* Effect.sync(acquired.dispose);
                 if (result._tag !== "Started" || result.pool !== "apiKeys")
-                    return yield* loginError(`Pi child model ${brain.model} requires an available model, supported effort, and API-key authentication`);
+                    return yield* loginError(`Pi child model "${brain.model}" is unavailable, doesn't support effort ${brain.effort}, or doesn't use an API key`);
             }));
             break;
         }
@@ -82,6 +122,7 @@ export const verifyHarness = Effect.fn("HarnessPreflight.verify")(function* (bra
     yield* Effect.logInfo("Worker harness verified", {
         harness: brain.harness,
         model: brain.model,
+        host: host._tag,
     });
     return new HarnessReady({ harness: brain.harness });
 }, (effect, brain) => effect.pipe(Effect.timeout("60 seconds"), Effect.catchTag("TimeoutError", (cause) => new SessionOperationError({
@@ -95,6 +136,6 @@ export const verifyHarness = Effect.fn("HarnessPreflight.verify")(function* (bra
     errorTag: error._tag,
     message: error.message,
 }))));
-/** Checks only the requested brain using the worker user's configuration, without running a prompt or logging in. */
-export const preflight = (brain) => verifyHarness(brain).pipe(Effect.provide(codexAppServerLive), Effect.provide(piSdkLive));
+/** Checks only `brain` on `host`, with `environment` and the Worker user's configuration; does not run a prompt or log in. */
+export const preflight = (brain, host, environment) => verifyHarness(brain, host, environment).pipe(Effect.provide(codexAppServerLive), Effect.provide(piSdkLive));
 //# sourceMappingURL=preflight.js.map

package/dist/preflight/preflight.js.map

@@ -1 +1 @@
-{"version":3,"file":"preflight.js","sourceRoot":"","sources":["../../src/preflight/preflight.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"preflight.js","sourceRoot":"","sources":["../../src/preflight/preflight.ts"],"names":[],"mappings":"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"}

package/dist/prompt.d.ts

@@ -1,26 +1,29 @@
-import type { AgentPersona, AgentName } from "@usine/core/agent";
+import { type AgentPersona, type AgentName } from "@usine/core/agent";
 import type { AttemptTask } from "@usine/core/attempt";
+import type { SalvagePushed } from "@usine/core/attempt/salvage";
 import type { RepositoryName } from "@usine/core/repository";
-import type { Schema } from "effect";
-/** The recorded trigger context, Agent instructions, and effective task presented to the parent. */
+import { Option, type Schema } from "effect";
+/** The trigger context, Agent instructions, and task for the parent prompt. */
 export interface PromptParts {
     readonly repository: RepositoryName;
     readonly payload: Schema.Json;
     readonly agent: AgentName;
     readonly persona: AgentPersona;
     readonly task: AttemptTask;
+    /** The previous Attempt's salvage checked out in the workspace, if the Run is retrying. */
+    readonly resume: Option.Option<SalvagePushed>;
+    /** The previous Attempt's salvage that conflicts with the current revision and is not in the workspace. */
+    readonly conflictingSalvage: Option.Option<SalvagePushed>;
 }
-/** The Agent's standing instructions and the focused task the parent delegates to a child. */
+/** The Agent instructions and delegated task for a child prompt. */
 export interface ChildPromptParts {
     readonly agent: AgentName;
     readonly persona: AgentPersona;
-    /** Free text authored by the parent model, not the rendered loop task. */
+    /** Free text written by the parent model, not the rendered Loop task. */
     readonly task: string;
 }
-/** The attribution line every GitHub comment or review written by an Agent ends with. */
-export declare const githubSignature: (agent: AgentName) => string;
-/** Builds the parent's instructions from the saved payload, effective task, and Agent persona, including GitHub attribution. */
+/** Returns the parent's instructions, including GitHub attribution. */
 export declare const assemblePrompt: (parts: PromptParts) => string;
-/** Builds a child's instructions from the delegated task and Agent persona, including GitHub attribution. */
+/** Returns a child's instructions, including GitHub attribution. */
 export declare const assembleChildPrompt: (parts: ChildPromptParts) => string;
 //# sourceMappingURL=prompt.d.ts.map

package/dist/prompt.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"prompt.d.ts","sourceRoot":"","sources":["../src/prompt.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,YAAY,EAAE,SAAS,EAAE,MAAM,mBAAmB,CAAC;AACjE,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,qBAAqB,CAAC;AACvD,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,wBAAwB,CAAC;AAC7D,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAC;AAErC,oGAAoG;AACpG,MAAM,WAAW,WAAW;IAC1B,QAAQ,CAAC,UAAU,EAAE,cAAc,CAAC;IACpC,QAAQ,CAAC,OAAO,EAAE,MAAM,CAAC,IAAI,CAAC;IAC9B,QAAQ,CAAC,KAAK,EAAE,SAAS,CAAC;IAC1B,QAAQ,CAAC,OAAO,EAAE,YAAY,CAAC;IAC/B,QAAQ,CAAC,IAAI,EAAE,WAAW,CAAC;CAC5B;AAED,8FAA8F;AAC9F,MAAM,WAAW,gBAAgB;IAC/B,QAAQ,CAAC,KAAK,EAAE,SAAS,CAAC;IAC1B,QAAQ,CAAC,OAAO,EAAE,YAAY,CAAC;IAC/B,0EAA0E;IAC1E,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC;CACvB;AAED,yFAAyF;AACzF,eAAO,MAAM,eAAe,UAAW,SAAS,KAAG,MAAmC,CAAC;AAYvF,gIAAgI;AAChI,eAAO,MAAM,cAAc,UAAW,WAAW,KAAG,MAoBtC,CAAC;AAEf,6GAA6G;AAC7G,eAAO,MAAM,mBAAmB,UAAW,gBAAgB,KAAG,MAWhD,CAAC"}
+{"version":3,"file":"prompt.d.ts","sourceRoot":"","sources":["../src/prompt.ts"],"names":[],"mappings":"AAAA,OAAO,EAAmB,KAAK,YAAY,EAAE,KAAK,SAAS,EAAE,MAAM,mBAAmB,CAAC;AACvF,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,qBAAqB,CAAC;AACvD,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,6BAA6B,CAAC;AACjE,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,wBAAwB,CAAC;AAC7D,OAAO,EAAE,MAAM,EAAE,KAAK,MAAM,EAAE,MAAM,QAAQ,CAAC;AAG7C,+EAA+E;AAC/E,MAAM,WAAW,WAAW;IAC1B,QAAQ,CAAC,UAAU,EAAE,cAAc,CAAC;IACpC,QAAQ,CAAC,OAAO,EAAE,MAAM,CAAC,IAAI,CAAC;IAC9B,QAAQ,CAAC,KAAK,EAAE,SAAS,CAAC;IAC1B,QAAQ,CAAC,OAAO,EAAE,YAAY,CAAC;IAC/B,QAAQ,CAAC,IAAI,EAAE,WAAW,CAAC;IAC3B,2FAA2F;IAC3F,QAAQ,CAAC,MAAM,EAAE,MAAM,CAAC,MAAM,CAAC,aAAa,CAAC,CAAC;IAC9C,2GAA2G;IAC3G,QAAQ,CAAC,kBAAkB,EAAE,MAAM,CAAC,MAAM,CAAC,aAAa,CAAC,CAAC;CAC3D;AAED,oEAAoE;AACpE,MAAM,WAAW,gBAAgB;IAC/B,QAAQ,CAAC,KAAK,EAAE,SAAS,CAAC;IAC1B,QAAQ,CAAC,OAAO,EAAE,YAAY,CAAC;IAC/B,yEAAyE;IACzE,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC;CACvB;AAqCD,uEAAuE;AACvE,eAAO,MAAM,cAAc,UAAW,WAAW,KAAG,MAuBtC,CAAC;AAEf,oEAAoE;AACpE,eAAO,MAAM,mBAAmB,UAAW,gBAAgB,KAAG,MAahD,CAAC"}