@tangle-network/agent-provider-cli-bridge 0.7.8 → 0.8.0

package/dist/retained-stream.js

@@ -19,7 +19,7 @@ class CliBridgeRunCancelledError extends Error {
         this.name = "CliBridgeRunCancelledError";
     }
 }
-export async function* streamCliBridgeTurn(options, turn, requestBody, transport, runId, lastEventId, signal, onResponse, readAuthoritativeRun) {
+export async function* streamCliBridgeTurn(options, turn, requestBody, transport, runId, lastEventId, signal, onResponse, readAuthoritativeRun, validateCanonicalEvent) {
     const reconnect = requestBody === undefined;
     const replay = retainedReplayRequest(lastEventId);
     const response = await transport.fetch(reconnect
@@ -74,7 +74,8 @@ export async function* streamCliBridgeTurn(options, turn, requestBody, transport
     let textBoundaryPending = false;
     let sawProtocolEnd = false;
     let protocol = "unknown";
-    let canonicalTerminalSeen = false;
+    let canonicalTerminalStatus;
+    let canonicalTerminalEvent;
     let terminalFrameSeen = false;
     let cancelledTerminalSeen = false;
     let terminalFrame;
@@ -92,7 +93,7 @@ export async function* streamCliBridgeTurn(options, turn, requestBody, transport
                 throw new Error("cli-bridge mixed canonical and OpenAI stream formats");
             }
             protocol = "canonical";
-            if (canonicalTerminalSeen) {
+            if (canonicalTerminalStatus !== undefined) {
                 throw new Error("cli-bridge emitted an event after canonical terminal status");
             }
             const event = retainedCanonicalEvent(frame, {
@@ -105,8 +106,14 @@ export async function* streamCliBridgeTurn(options, turn, requestBody, transport
             if (!event) {
                 throw new Error("cli-bridge emitted an empty canonical event");
             }
-            canonicalTerminalSeen = isTerminalCanonicalEvent(event);
-            yield event;
+            validateCanonicalEvent?.(event);
+            if (isTerminalCanonicalEvent(event)) {
+                canonicalTerminalStatus = event.normalized.status;
+                canonicalTerminalEvent = event;
+            }
+            else {
+                yield event;
+            }
             continue;
         }
         if (protocol === "canonical") {
@@ -253,9 +260,29 @@ export async function* streamCliBridgeTurn(options, turn, requestBody, transport
         yield* retainedEventsWithIdentity(frameEvents, frame.id, runId, sessionId, turn.executionId, replay.anchor);
     }
     if (protocol === "canonical") {
-        if (!canonicalTerminalSeen) {
+        if (canonicalTerminalStatus === undefined) {
             throw new Error("cli-bridge canonical stream ended without terminal status");
         }
+        const snapshot = await terminalRunSnapshot(runId, readAuthoritativeRun);
+        const expectedStatus = canonicalTerminalStatus === "completed"
+            ? "done"
+            : canonicalTerminalStatus === "failed"
+                ? "error"
+                : "cancelled";
+        if (snapshot.status !== expectedStatus) {
+            throw new Error(`cli-bridge canonical terminal status ${JSON.stringify(canonicalTerminalStatus)} contradicts retained run status ${JSON.stringify(snapshot.status)}`);
+        }
+        if (!canonicalTerminalEvent) {
+            throw new Error("cli-bridge canonical terminal event was not retained");
+        }
+        yield canonicalTerminalEvent;
+        return;
+    }
+    if (!sawProtocolEnd &&
+        reconnect &&
+        lastEventId !== undefined &&
+        protocol === "unknown") {
+        await terminalRunSnapshot(runId, readAuthoritativeRun);
         return;
     }
     if (!sawProtocolEnd) {

package/dist/wire.d.ts

@@ -1,8 +1,13 @@
-import type { TokenUsage } from "@tangle-network/agent-interface";
+import type { AgentProfile, AgentProfileRef, TokenUsage } from "@tangle-network/agent-interface";
 import type { AgentTurnInput, CreateAgentEnvironmentInput } from "@tangle-network/agent-interface/environment-provider";
 import type { CliBridgeProviderOptions } from "./provider-options.js";
-import type { CliBridgeRunSnapshot } from "./retained-run-state.js";
+import type { CliBridgeRun, CliBridgeRunSnapshot } from "./retained-run-state.js";
 export declare function toChatCompletionsBody(options: CliBridgeProviderOptions, environmentInput: CreateAgentEnvironmentInput, turn: AgentTurnInput, runId: string): Record<string, unknown>;
+export declare function resolveBridgeModel(options: CliBridgeProviderOptions, environmentInput: CreateAgentEnvironmentInput, turn: AgentTurnInput, profile: AgentProfile | undefined): string;
+export declare function toRetainedSessionBody(options: CliBridgeProviderOptions, environmentInput: CreateAgentEnvironmentInput, profile: AgentProfile | undefined, sessionId: string, model: string): Record<string, unknown>;
+/** Encode the exact retained turn contract without moving posture into metadata. */
+export declare function toRetainedTurnBody(turn: AgentTurnInput, run: CliBridgeRun, providerName: string): Record<string, unknown>;
+export declare function inlineProfile(profile: AgentProfileRef): AgentProfile | undefined;
 export interface CliBridgeSseFrame {
     readonly data: string;
     readonly id?: string;

package/dist/wire.js

@@ -1,8 +1,11 @@
 import { createHash } from "node:crypto";
-import { AgentExactRunControlRefSchema } from "@tangle-network/agent-interface";
+import { AgentExactRunControlRefSchema, RequestedInteractionsSchema, } from "@tangle-network/agent-interface";
 export function toChatCompletionsBody(options, environmentInput, turn, runId) {
     const profile = inlineProfile(environmentInput.profile);
     const execution = executionFromInput(options, environmentInput);
+    const interactions = turn.interactions === undefined
+        ? undefined
+        : RequestedInteractionsSchema.parse(turn.interactions);
     return {
         model: resolveBridgeModel(options, environmentInput, turn, profile),
         messages: messagesFromTurn(turn),
@@ -17,6 +20,7 @@ export function toChatCompletionsBody(options, environmentInput, turn, runId) {
         ...(environmentInput.env ? { env: environmentInput.env } : {}),
         ...(environmentInput.workspace?.cwd ? { cwd: environmentInput.workspace.cwd } : {}),
         ...(execution ? { execution } : {}),
+        ...(interactions === undefined ? {} : { interactions }),
         metadata: {
             ...(environmentInput.metadata ?? {}),
             ...(turn.context ?? {}),
@@ -24,7 +28,7 @@ export function toChatCompletionsBody(options, environmentInput, turn, runId) {
         },
     };
 }
-function resolveBridgeModel(options, environmentInput, turn, profile) {
+export function resolveBridgeModel(options, environmentInput, turn, profile) {
     const harness = environmentInput.backend ?? profile?.harness;
     const model = turn.model ?? options.defaultModel ?? profile?.model?.default;
     const provider = profile?.model?.provider;
@@ -43,6 +47,77 @@ function resolveBridgeModel(options, environmentInput, turn, profile) {
         return `${harness}/${provider}/${model}`;
     return `${harness}/${model}`;
 }
+export function toRetainedSessionBody(options, environmentInput, profile, sessionId, model) {
+    const execution = retainedExecutionFromInput(options, environmentInput);
+    return {
+        id: sessionId,
+        model,
+        interaction_policy: "interactive",
+        ...(options.defaultMode ? { mode: options.defaultMode } : {}),
+        ...(environmentInput.workspace?.cwd !== undefined
+            ? { cwd: environmentInput.workspace.cwd }
+            : {}),
+        ...(execution !== undefined ? { execution } : {}),
+        ...(profile ? { agent_profile: profile } : {}),
+        ...(environmentInput.env !== undefined ? { env: environmentInput.env } : {}),
+        ...(environmentInput.metadata !== undefined
+            ? { metadata: environmentInput.metadata }
+            : {}),
+        ...(environmentInput.providerOptions !== undefined
+            ? { provider_options: environmentInput.providerOptions }
+            : {}),
+    };
+}
+/** Encode the exact retained turn contract without moving posture into metadata. */
+export function toRetainedTurnBody(turn, run, providerName) {
+    assertRetainedTurnInputSupported(turn);
+    const interactions = RequestedInteractionsSchema.parse(turn.interactions ?? {});
+    const content = {};
+    if (turn.prompt !== undefined) {
+        if (turn.prompt.length === 0) {
+            throw new Error("cli-bridge retained sessions require a non-empty message");
+        }
+        content.message = turn.prompt;
+    }
+    if (turn.parts !== undefined) {
+        if (turn.parts.length === 0) {
+            throw new Error("cli-bridge retained sessions require non-empty input parts");
+        }
+        content.parts = turn.parts;
+    }
+    if (turn.prompt === undefined && turn.parts === undefined) {
+        throw new Error("cli-bridge retained sessions require a non-empty message or input parts");
+    }
+    return {
+        ...content,
+        turn_id: run.turnId,
+        execution_id: run.executionId,
+        run_id: run.id,
+        provider: providerName,
+        environment_id: run.environmentId,
+        ...(turn.interactions === undefined ? {} : { interactions }),
+        ...(turn.context !== undefined ? { context: turn.context } : {}),
+        ...(turn.providerOptions !== undefined
+            ? { provider_options: turn.providerOptions }
+            : {}),
+    };
+}
+function assertRetainedTurnInputSupported(turn) {
+    const unsupported = [];
+    if (turn.timeoutMs !== undefined)
+        unsupported.push("timeoutMs");
+    if (turn.controlRef !== undefined)
+        unsupported.push("controlRef");
+    if (turn.contextTransfer !== undefined)
+        unsupported.push("contextTransfer");
+    if (turn.nativeContinuation !== undefined)
+        unsupported.push("nativeContinuation");
+    if (turn.detach === true)
+        unsupported.push("detach");
+    if (unsupported.length > 0) {
+        throw new Error(`cli-bridge retained turns cannot represent ${unsupported.join(", ")}`);
+    }
+}
 /** Keep task messages separate from the profile's harness-owned prompt controls. */
 function messagesFromTurn(turn) {
     return [{ role: "user", content: contentFromTurn(turn) }];
@@ -52,7 +127,7 @@ function contentFromTurn(turn) {
         return turn.parts;
     return turn.prompt ?? "";
 }
-function inlineProfile(profile) {
+export function inlineProfile(profile) {
     return typeof profile === "string" ? undefined : profile;
 }
 function executionFromInput(options, input) {
@@ -66,6 +141,34 @@ function executionFromInput(options, input) {
         ...(input.workspace.gitRef ? { gitRef: input.workspace.gitRef } : {}),
     };
 }
+function retainedExecutionFromInput(options, input) {
+    const unsupported = [];
+    if (typeof input.profile === "string")
+        unsupported.push("named profile");
+    if (input.workspace?.environment !== undefined)
+        unsupported.push("workspace.environment");
+    if (input.workspace?.image !== undefined)
+        unsupported.push("workspace.image");
+    if (input.workspace?.repoUrl !== undefined)
+        unsupported.push("workspace.repoUrl");
+    if (input.workspace?.gitRef !== undefined)
+        unsupported.push("workspace.gitRef");
+    if (input.workspace?.providerOptions !== undefined) {
+        unsupported.push("workspace.providerOptions");
+    }
+    if (input.resources !== undefined)
+        unsupported.push("resources");
+    if (input.secrets !== undefined)
+        unsupported.push("secrets");
+    if (unsupported.length > 0) {
+        throw new Error(`cli-bridge retained sessions cannot represent ${unsupported.join(", ")}`);
+    }
+    const execution = executionFromInput(options, input);
+    if (execution?.kind === "sandbox") {
+        throw new Error("cli-bridge retained sessions cannot execute in a sandbox; use one-shot execution");
+    }
+    return execution;
+}
 export async function* parseSse(body) {
     const decoder = new TextDecoder();
     let buffer = "";
@@ -227,7 +330,7 @@ export function runSnapshot(value) {
     const terminal = parsed.terminal;
     if (typeof id !== "string" ||
         (requestDigest !== undefined && !requestDigest.success) ||
-        !["running", "done", "error", "cancelled"].includes(String(status)) ||
+        !["running", "done", "error", "cancelled", "unknown"].includes(String(status)) ||
         typeof terminal !== "boolean") {
         throw new Error("cli-bridge run status returned an invalid snapshot");
     }

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@tangle-network/agent-provider-cli-bridge",
-  "version": "0.7.8",
-  "description": "AgentEnvironmentProvider adapter for cli-bridge /v1/chat/completions",
+  "version": "0.8.0",
+  "description": "AgentEnvironmentProvider adapter for cli-bridge retained sessions and one-shot turns",
   "type": "module",
   "license": "MIT",
   "main": "./dist/index.js",
@@ -25,6 +25,12 @@
   "files": [
     "dist/index.d.ts",
     "dist/index.js",
+    "dist/environment-identity.d.ts",
+    "dist/environment-identity.js",
+    "dist/capability-discovery.d.ts",
+    "dist/capability-discovery.js",
+    "dist/interaction-response.d.ts",
+    "dist/interaction-response.js",
     "dist/observation.d.ts",
     "dist/observation.js",
     "dist/provider-options.d.ts",
@@ -39,6 +45,8 @@
     "dist/retained-event-cursor.js",
     "dist/retained-execution.d.ts",
     "dist/retained-execution.js",
+    "dist/retained-native.d.ts",
+    "dist/retained-native.js",
     "dist/retained-run-state.d.ts",
     "dist/retained-run-state.js",
     "dist/retained-stream.d.ts",
@@ -60,9 +68,10 @@
     "vitest": "^4.1.5"
   },
   "scripts": {
-    "build": "tsc -p tsconfig.json",
+    "build": "pnpm run clean && tsc -p tsconfig.build.json",
     "check-types": "tsc --noEmit",
     "clean": "rm -rf dist",
-    "test": "vitest run"
+    "test": "vitest run src",
+    "test:integration": "test -n \"$CLI_BRIDGE_INTEGRATION_ROOT\" || { echo 'CLI_BRIDGE_INTEGRATION_ROOT is required; see README' >&2; exit 1; }; vitest run tests/cli-bridge.integration.test.ts"
   }
 }