@shivaedev/agent-codex 0.1.0 → 0.2.0

package/dist/adapters/threadTree.js

@@ -0,0 +1,125 @@
+import { Option, Schema } from "effect";
+import { attributed } from "#adapters/attributed.ts";
+import { rawOf, toAgentEvents } from "#adapters/mapping.ts";
+import { ItemNotification, SpawnedThread, ThreadScoped, ThreadSettingsUpdatedNotification } from "#adapters/protocol.ts";
+import { announced, closedWithoutWord, collabEvents, interrupted, subAgentItem, } from "#adapters/subagentItems.ts";
+const decodeScoped = Schema.decodeUnknownOption(ThreadScoped);
+const decodeSpawned = Schema.decodeUnknownOption(SpawnedThread);
+const decodeItem = Schema.decodeUnknownOption(ItemNotification);
+const decodeSettings = Schema.decodeUnknownOption(ThreadSettingsUpdatedNotification);
+// Ownership is tracked even when the application has no event subscriber.
+export function openThreadTree(rootThreadId, claims, sessionModel) {
+    const spawnCalls = new Map();
+    const stated = new Set();
+    const billing = new Map();
+    function owns(threadId) {
+        return threadId === rootThreadId || claims.ownerOf(threadId) === rootThreadId;
+    }
+    function billedOn(threadId) {
+        return billing.get(threadId) ?? sessionModel;
+    }
+    // A thread spends on what the thread that spawned it was spending on, until something names a model for it.
+    function claimed(parent, child) {
+        claims.claim(rootThreadId, child);
+        if (!billing.has(child)) {
+            billing.set(child, billedOn(parent));
+        }
+    }
+    function once(key) {
+        if (stated.has(key)) {
+            return false;
+        }
+        stated.add(key);
+        return true;
+    }
+    function spawnedThread(params) {
+        const spawned = decodeSpawned(params);
+        if (Option.isNone(spawned)) {
+            return [];
+        }
+        const { id, source } = spawned.value.thread;
+        const parent = source.subAgent.threadSpawn.parentThreadId;
+        if (owns(parent)) {
+            claimed(parent, id);
+        }
+        return [];
+    }
+    function collab(item, threadId, raw, started) {
+        for (const receiver of item.receiverThreadIds) {
+            claimed(threadId, receiver);
+            spawnCalls.set(receiver, item.id);
+        }
+        return collabEvents(item, raw, started);
+    }
+    function activity(item, threadId, raw) {
+        claimed(threadId, item.agentThreadId);
+        const node = item.agentThreadId;
+        if (item.kind === "interrupted") {
+            return once(`ended/${node}`) ? [interrupted(item, raw)] : [{ raw, type: "raw" }];
+        }
+        return item.kind !== "started" || !once(`opened/${node}`)
+            ? [{ raw, type: "raw" }]
+            : [announced(item, threadId, spawnCalls.get(node) ?? item.id, raw)];
+    }
+    function lifecycle(notification, threadId) {
+        const decoded = decodeItem(notification.params);
+        if (Option.isNone(decoded)) {
+            return undefined;
+        }
+        const item = subAgentItem(decoded.value.item);
+        if (item === undefined) {
+            return undefined;
+        }
+        const raw = rawOf(notification.method, notification.params);
+        return item.type === "collabAgentToolCall" ? collab(item, threadId, raw, notification.method === "item/started") : activity(item, threadId, raw);
+    }
+    function closed(threadId, params) {
+        const raw = rawOf("thread/closed", params);
+        return once(`ended/${threadId}`) ? [closedWithoutWord(threadId, raw)] : [{ raw, type: "raw" }];
+    }
+    function mapped(notification, threadId, root) {
+        return !root && notification.method === "thread/closed"
+            ? closed(threadId, notification.params)
+            : (lifecycle(notification, threadId) ?? toAgentEvents(notification, billedOn(threadId)));
+    }
+    function rebill(threadId, foundEvents) {
+        for (const mappedEvent of foundEvents) {
+            if (mappedEvent.type === "model.changed") {
+                billing.set(threadId, mappedEvent.model);
+            }
+        }
+    }
+    function settled(notification, threadId) {
+        if (notification.method !== "thread/settings/updated") {
+            return;
+        }
+        const settings = decodeSettings(notification.params);
+        if (Option.isSome(settings)) {
+            billing.set(threadId, settings.value.threadSettings.model);
+        }
+    }
+    function events(notification) {
+        if (notification.method === "thread/started") {
+            return spawnedThread(notification.params);
+        }
+        const scoped = decodeScoped(notification.params);
+        if (Option.isNone(scoped) || !owns(scoped.value.threadId)) {
+            return [];
+        }
+        const threadId = scoped.value.threadId;
+        const root = threadId === rootThreadId;
+        settled(notification, threadId);
+        const found = mapped(notification, threadId, root);
+        rebill(threadId, found);
+        if (root) {
+            return found;
+        }
+        const origin = {
+            node: threadId,
+            spawnedBy: spawnCalls.get(threadId) ?? threadId,
+        };
+        return found.map((event) => attributed(event, origin));
+    }
+    return { events };
+}
+//# sourceMappingURL=threadTree.js.map

package/dist/adapters/threadTree.js.map

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

package/dist/adapters/turnRequests.d.ts

@@ -0,0 +1,13 @@
+import { Effect } from "effect";
+import { UnknownAcceptance } from "@shivaedev/agent/failures.ts";
+import type { ImageInput, Input } from "@shivaedev/agent/run.ts";
+import { AppServer } from "#adapters/server.ts";
+export declare const turnRequests: (threadId: string, settings: {
+    model?: string;
+    effort?: string;
+}) => Effect.Effect<{
+    interrupt: (turnId: string) => Effect.Effect<"draining" | "inactive", import("@shivaedev/agent/failures.ts").BackendUnavailable | import("@shivaedev/agent/failures.ts").ProtocolFailure | import("@shivaedev/agent/failures.ts").Rejected | UnknownAcceptance, never>;
+    start: (input: ImageInput, operationId: string) => Effect.Effect<string, import("@shivaedev/agent/failures.ts").BackendUnavailable | import("@shivaedev/agent/failures.ts").ProtocolFailure | import("@shivaedev/agent/failures.ts").Rejected | UnknownAcceptance, never>;
+    steer: (expectedTurnId: string, input: Input, operationId: string) => Effect.Effect<void, import("@shivaedev/agent/failures.ts").BackendUnavailable | import("@shivaedev/agent/failures.ts").ProtocolFailure | import("@shivaedev/agent/failures.ts").Rejected | UnknownAcceptance, never>;
+}, never, AppServer>;
+//# sourceMappingURL=turnRequests.d.ts.map

package/dist/adapters/turnRequests.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"turnRequests.d.ts","sourceRoot":"","sources":["../../src/adapters/turnRequests.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAC;AAChC,OAAO,EAAE,iBAAiB,EAAE,MAAM,8BAA8B,CAAC;AACjE,OAAO,KAAK,EAAE,UAAU,EAAE,KAAK,EAAE,MAAM,yBAAyB,CAAC;AAGjE,OAAO,EAAE,SAAS,EAAE,MAAM,qBAAqB,CAAC;AAOhD,eAAO,MAAM,YAAY;YAAoF,MAAM;aAAW,MAAM;;wBAG9G,MAAM;mBAaX,UAAU,eAAe,MAAM;4BAWtB,MAAM,SAAS,KAAK,eAAe,MAAM;oBAKjE,CAAC"}

package/dist/adapters/turnRequests.js

@@ -0,0 +1,27 @@
+import { Effect } from "effect";
+import { UnknownAcceptance } from "@shivaedev/agent/failures.ts";
+import { TurnResponse } from "#adapters/protocol.ts";
+import { decode } from "#adapters/reads.ts";
+import { AppServer } from "#adapters/server.ts";
+function userInput(input) {
+    return input.parts.map((part) => part.type === "text" ? { text: part.text, "text_elements": [], type: "text" } : { path: part.path, type: "localImage" });
+}
+export const turnRequests = Effect.fn("Codex.turnRequests")(function* (threadId, settings) {
+    const server = yield* AppServer;
+    return {
+        interrupt: (turnId) => server.request("turn/interrupt", { threadId, turnId }, turnId).pipe(Effect.as("draining"), Effect.catchTag("Rejected", (error) => {
+            if (error.message.includes("no active turn")) {
+                return Effect.succeed("inactive");
+            }
+            if (error.message.includes("timeout waiting")) {
+                return Effect.succeed("draining");
+            }
+            return Effect.fail(error);
+        })),
+        start: (input, operationId) => server.request("turn/start", { clientUserMessageId: operationId, input: userInput(input), threadId, ...settings }, operationId).pipe(Effect.flatMap((value) => decode(TurnResponse, value).pipe(Effect.mapError(() => new UnknownAcceptance({ backend: "codex", message: "Codex accepted a mutation but returned no readable turn", operationId })))), Effect.map(({ turn }) => turn.id)),
+        steer: (expectedTurnId, input, operationId) => server
+            .request("turn/steer", { clientUserMessageId: operationId, expectedTurnId, input: userInput(input), threadId }, operationId)
+            .pipe(Effect.asVoid),
+    };
+});
+//# sourceMappingURL=turnRequests.js.map

package/dist/adapters/turnRequests.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"turnRequests.js","sourceRoot":"","sources":["../../src/adapters/turnRequests.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAC;AAChC,OAAO,EAAE,iBAAiB,EAAE,MAAM,8BAA8B,CAAC;AAEjE,OAAO,EAAE,YAAY,EAAE,MAAM,uBAAuB,CAAC;AACrD,OAAO,EAAE,MAAM,EAAE,MAAM,oBAAoB,CAAC;AAC5C,OAAO,EAAE,SAAS,EAAE,MAAM,qBAAqB,CAAC;AAEhD,SAAS,SAAS,CAAC,KAAiB;IACnC,OAAO,KAAK,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAC/B,IAAI,CAAC,IAAI,KAAK,MAAM,CAAC,CAAC,CAAC,EAAE,IAAI,EAAE,IAAI,CAAC,IAAI,EAAE,eAAe,EAAE,EAAE,EAAE,IAAI,EAAE,MAAM,EAAE,CAAC,CAAC,CAAC,EAAE,IAAI,EAAE,IAAI,CAAC,IAAI,EAAE,IAAI,EAAE,YAAY,EAAE,CACvH,CAAC;AACH,CAAC;AACD,MAAM,CAAC,MAAM,YAAY,GAAG,MAAM,CAAC,EAAE,CAAC,oBAAoB,CAAC,CAAC,QAAQ,CAAC,EAAE,QAAgB,EAAE,QAA6C;IACrI,MAAM,MAAM,GAAG,KAAK,CAAC,CAAC,SAAS,CAAC;IAChC,OAAO;QACN,SAAS,EAAE,CAAC,MAAc,EAAE,EAAE,CAC7B,MAAM,CAAC,OAAO,CAAC,gBAAgB,EAAE,EAAE,QAAQ,EAAE,MAAM,EAAE,EAAE,MAAM,CAAC,CAAC,IAAI,CAClE,MAAM,CAAC,EAAE,CAAC,UAAmB,CAAC,EAC9B,MAAM,CAAC,QAAQ,CAAC,UAAU,EAAE,CAAC,KAAK,EAAE,EAAE;YACrC,IAAI,KAAK,CAAC,OAAO,CAAC,QAAQ,CAAC,gBAAgB,CAAC,EAAE,CAAC;gBAC9C,OAAO,MAAM,CAAC,OAAO,CAAC,UAAmB,CAAC,CAAC;YAC5C,CAAC;YACD,IAAI,KAAK,CAAC,OAAO,CAAC,QAAQ,CAAC,iBAAiB,CAAC,EAAE,CAAC;gBAC/C,OAAO,MAAM,CAAC,OAAO,CAAC,UAAmB,CAAC,CAAC;YAC5C,CAAC;YACD,OAAO,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;QAC3B,CAAC,CAAC,CACF;QACF,KAAK,EAAE,CAAC,KAAiB,EAAE,WAAmB,EAAE,EAAE,CACjD,MAAM,CAAC,OAAO,CAAC,YAAY,EAAE,EAAE,mBAAmB,EAAE,WAAW,EAAE,KAAK,EAAE,SAAS,CAAC,KAAK,CAAC,EAAE,QAAQ,EAAE,GAAG,QAAQ,EAAE,EAAE,WAAW,CAAC,CAAC,IAAI,CACnI,MAAM,CAAC,OAAO,CAAC,CAAC,KAAK,EAAE,EAAE,CACxB,MAAM,CAAC,YAAY,EAAE,KAAK,CAAC,CAAC,IAAI,CAC/B,MAAM,CAAC,QAAQ,CACd,GAAG,EAAE,CAAC,IAAI,iBAAiB,CAAC,EAAE,OAAO,EAAE,OAAO,EAAE,OAAO,EAAE,yDAAyD,EAAE,WAAW,EAAE,CAAC,CAClI,CACD,CACD,EACD,MAAM,CAAC,GAAG,CAAC,CAAC,EAAE,IAAI,EAAE,EAAE,EAAE,CAAC,IAAI,CAAC,EAAE,CAAC,CACjC;QACF,KAAK,EAAE,CAAC,cAAsB,EAAE,KAAY,EAAE,WAAmB,EAAE,EAAE,CACpE,MAAM;aACJ,OAAO,CAAC,YAAY,EAAE,EAAE,mBAAmB,EAAE,WAAW,EAAE,cAAc,EAAE,KAAK,EAAE,SAAS,CAAC,KAAK,CAAC,EAAE,QAAQ,EAAE,EAAE,WAAW,CAAC;aAC3H,IAAI,CAAC,MAAM,CAAC,MAAM,CAAC;KACtB,CAAC;AACH,CAAC,CAAC,CAAC"}

package/dist/adapters/userMessageEvent.d.ts

@@ -0,0 +1,7 @@
+import type { Raw } from "@shivaedev/agent/eventData.ts";
+import type { RunEvent } from "@shivaedev/agent/events.ts";
+import type { KnownItem } from "#adapters/protocolItems.ts";
+export declare function userMessageEvent(item: Extract<KnownItem, {
+    type: "userMessage";
+}>, raw: typeof Raw.Type): RunEvent;
+//# sourceMappingURL=userMessageEvent.d.ts.map

package/dist/adapters/userMessageEvent.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"userMessageEvent.d.ts","sourceRoot":"","sources":["../../src/adapters/userMessageEvent.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,GAAG,EAAE,MAAM,+BAA+B,CAAC;AACzD,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,4BAA4B,CAAC;AAC3D,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,4BAA4B,CAAC;AAW5D,wBAAgB,gBAAgB,CAAC,IAAI,EAAE,OAAO,CAAC,SAAS,EAAE;IAAE,IAAI,EAAE,aAAa,CAAA;CAAE,CAAC,EAAE,GAAG,EAAE,OAAO,GAAG,CAAC,IAAI,GAAG,QAAQ,CAQlH"}

package/dist/adapters/userMessageEvent.js

@@ -0,0 +1,19 @@
+function contentPart(part) {
+    if (part.type === "text") {
+        return { text: part.text, type: "text" };
+    }
+    if (part.type === "localImage") {
+        return { mediaType: "application/octet-stream", path: part.path, type: "image" };
+    }
+    return { kind: "image", payload: JSON.stringify(part), type: "native" };
+}
+export function userMessageEvent(item, raw) {
+    return {
+        raw,
+        role: "user",
+        type: "message",
+        ...(item.clientId === null || item.clientId === undefined ? {} : { inputId: item.clientId }),
+        parts: item.content.map(contentPart),
+    };
+}
+//# sourceMappingURL=userMessageEvent.js.map

package/dist/adapters/userMessageEvent.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"userMessageEvent.js","sourceRoot":"","sources":["../../src/adapters/userMessageEvent.ts"],"names":[],"mappings":"AAIA,SAAS,WAAW,CAAC,IAAoE;IACxF,IAAI,IAAI,CAAC,IAAI,KAAK,MAAM,EAAE,CAAC;QAC1B,OAAO,EAAE,IAAI,EAAE,IAAI,CAAC,IAAI,EAAE,IAAI,EAAE,MAAM,EAAE,CAAC;IAC1C,CAAC;IACD,IAAI,IAAI,CAAC,IAAI,KAAK,YAAY,EAAE,CAAC;QAChC,OAAO,EAAE,SAAS,EAAE,0BAA0B,EAAE,IAAI,EAAE,IAAI,CAAC,IAAI,EAAE,IAAI,EAAE,OAAO,EAAE,CAAC;IAClF,CAAC;IACD,OAAO,EAAE,IAAI,EAAE,OAAO,EAAE,OAAO,EAAE,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,EAAE,IAAI,EAAE,QAAQ,EAAE,CAAC;AACzE,CAAC;AACD,MAAM,UAAU,gBAAgB,CAAC,IAAiD,EAAE,GAAoB;IACvG,OAAO;QACN,GAAG;QACH,IAAI,EAAE,MAAM;QACZ,IAAI,EAAE,SAAS;QACf,GAAG,CAAC,IAAI,CAAC,QAAQ,KAAK,IAAI,IAAI,IAAI,CAAC,QAAQ,KAAK,SAAS,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,EAAE,OAAO,EAAE,IAAI,CAAC,QAAQ,EAAE,CAAC;QAC5F,KAAK,EAAE,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,WAAW,CAAC;KACpC,CAAC;AACH,CAAC"}

package/dist/codex.d.ts

@@ -1,2 +1,11 @@
-export {};
+import { Effect, Layer } from "effect";
+import { Backend } from "@shivaedev/agent/backend.ts";
+import { CodexConfig } from "#config.ts";
+export declare const Codex: import("effect/Context").Service<"@shivaedev/agent-codex/Codex", Readonly<{
+    backend: () => Effect.Effect<import("@shivaedev/agent/backend.ts").ConfiguredBackend, never, never>;
+    census: (rootThreadId: string) => Effect.Effect<import("./adapters/threadSweep.ts").CensusSweep, import("@shivaedev/agent/failures.ts").ReadFailure, never>;
+}>> & {
+    readonly layer: Layer.Layer<"@shivaedev/agent-codex/Codex", import("@shivaedev/agent/failures.ts").BackendUnavailable | import("@shivaedev/agent/failures.ts").ProtocolFailure | import("@shivaedev/agent/failures.ts").Rejected | import("@shivaedev/agent/failures.ts").UnknownAcceptance, CodexConfig>;
+};
+export declare const codexLayer: Layer.Layer<"@shivaedev/agent-codex/Codex" | Backend, import("@shivaedev/agent/failures.ts").BackendUnavailable | import("@shivaedev/agent/failures.ts").ProtocolFailure | import("@shivaedev/agent/failures.ts").Rejected | import("@shivaedev/agent/failures.ts").UnknownAcceptance, CodexConfig>;
 //# sourceMappingURL=codex.d.ts.map

package/dist/codex.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"codex.d.ts","sourceRoot":"","sources":["../src/codex.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,CAAC"}
+{"version":3,"file":"codex.d.ts","sourceRoot":"","sources":["../src/codex.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,QAAQ,CAAC;AACvC,OAAO,EAAE,OAAO,EAAE,MAAM,6BAA6B,CAAC;AAGtD,OAAO,EAAE,WAAW,EAAE,MAAM,YAAY,CAAC;AACzC,eAAO,MAAM,KAAK;;;;;CAQhB,CAAC;AACH,eAAO,MAAM,UAAU,qSAAiH,CAAC"}

package/dist/codex.js

@@ -1,2 +1,16 @@
-export {};
+import { Effect, Layer } from "effect";
+import { Backend } from "@shivaedev/agent/backend.ts";
+import { defineService } from "@shivaedev/service/defineService.ts";
+import { engine } from "#adapters/engine.ts";
+import { CodexConfig } from "#config.ts";
+export const Codex = defineService({
+    id: "@shivaedev/agent-codex/Codex",
+    initialize: Effect.gen(function* () {
+        const config = yield* CodexConfig;
+        return yield* engine(config);
+    }),
+    methods: (state) => state,
+    requires: [CodexConfig],
+});
+export const codexLayer = Layer.effect(Backend)(Effect.flatMap(Codex, (codex) => codex.backend())).pipe(Layer.provideMerge(Codex.layer));
 //# sourceMappingURL=codex.js.map

package/dist/codex.js.map

@@ -1 +1 @@
-{"version":3,"file":"codex.js","sourceRoot":"","sources":["../src/codex.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,CAAC"}
+{"version":3,"file":"codex.js","sourceRoot":"","sources":["../src/codex.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,QAAQ,CAAC;AACvC,OAAO,EAAE,OAAO,EAAE,MAAM,6BAA6B,CAAC;AACtD,OAAO,EAAE,aAAa,EAAE,MAAM,qCAAqC,CAAC;AACpE,OAAO,EAAE,MAAM,EAAE,MAAM,qBAAqB,CAAC;AAC7C,OAAO,EAAE,WAAW,EAAE,MAAM,YAAY,CAAC;AACzC,MAAM,CAAC,MAAM,KAAK,GAAG,aAAa,CAAC;IAClC,EAAE,EAAE,8BAA8B;IAClC,UAAU,EAAE,MAAM,CAAC,GAAG,CAAC,QAAQ,CAAC;QAC/B,MAAM,MAAM,GAAG,KAAK,CAAC,CAAC,WAAW,CAAC;QAClC,OAAO,KAAK,CAAC,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC;IAC9B,CAAC,CAAC;IACF,OAAO,EAAE,CAAC,KAAK,EAAE,EAAE,CAAC,KAAK;IACzB,QAAQ,EAAE,CAAC,WAAW,CAAC;CACvB,CAAC,CAAC;AACH,MAAM,CAAC,MAAM,UAAU,GAAG,KAAK,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC,MAAM,CAAC,OAAO,CAAC,KAAK,EAAE,CAAC,KAAK,EAAE,EAAE,CAAC,KAAK,CAAC,OAAO,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,YAAY,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC,CAAC"}

package/dist/config.d.ts

@@ -0,0 +1,24 @@
+import { Context, type Effect } from "effect";
+export interface DynamicTool {
+    readonly description: string;
+    readonly execute: (input: unknown, callId: string) => Effect.Effect<{
+        readonly ok: boolean;
+        readonly text: string;
+    }>;
+    readonly inputSchema: unknown;
+    readonly name: string;
+}
+export interface CodexConfiguration {
+    readonly args?: readonly string[];
+    readonly baseInstructions?: string;
+    readonly command?: string;
+    readonly cwd?: string;
+    readonly requestTimeoutMs?: number;
+    readonly sandbox?: "read-only" | "workspace-write" | "danger-full-access";
+    readonly tools?: readonly DynamicTool[];
+}
+declare const CodexConfig_base: Context.ServiceClass<CodexConfig, "@shivaedev/agent-codex/CodexConfig", CodexConfiguration>;
+export declare class CodexConfig extends CodexConfig_base {
+}
+export {};
+//# sourceMappingURL=config.d.ts.map

package/dist/config.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"config.d.ts","sourceRoot":"","sources":["../src/config.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,KAAK,MAAM,EAAE,MAAM,QAAQ,CAAC;AAC9C,MAAM,WAAW,WAAW;IAC3B,QAAQ,CAAC,WAAW,EAAE,MAAM,CAAC;IAC7B,QAAQ,CAAC,OAAO,EAAE,CAAC,KAAK,EAAE,OAAO,EAAE,MAAM,EAAE,MAAM,KAAK,MAAM,CAAC,MAAM,CAAC;QAAE,QAAQ,CAAC,EAAE,EAAE,OAAO,CAAC;QAAC,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAA;KAAE,CAAC,CAAC;IACrH,QAAQ,CAAC,WAAW,EAAE,OAAO,CAAC;IAC9B,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC;CACtB;AACD,MAAM,WAAW,kBAAkB;IAClC,QAAQ,CAAC,IAAI,CAAC,EAAE,SAAS,MAAM,EAAE,CAAC;IAClC,QAAQ,CAAC,gBAAgB,CAAC,EAAE,MAAM,CAAC;IACnC,QAAQ,CAAC,OAAO,CAAC,EAAE,MAAM,CAAC;IAC1B,QAAQ,CAAC,GAAG,CAAC,EAAE,MAAM,CAAC;IACtB,QAAQ,CAAC,gBAAgB,CAAC,EAAE,MAAM,CAAC;IACnC,QAAQ,CAAC,OAAO,CAAC,EAAE,WAAW,GAAG,iBAAiB,GAAG,oBAAoB,CAAC;IAC1E,QAAQ,CAAC,KAAK,CAAC,EAAE,SAAS,WAAW,EAAE,CAAC;CACxC;;AACD,qBAAa,WAAY,SAAQ,gBAAwF;CAAG"}

package/dist/config.js

@@ -0,0 +1,4 @@
+import { Context } from "effect";
+export class CodexConfig extends Context.Service()("@shivaedev/agent-codex/CodexConfig") {
+}
+//# sourceMappingURL=config.js.map

package/dist/config.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"config.js","sourceRoot":"","sources":["../src/config.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAe,MAAM,QAAQ,CAAC;AAgB9C,MAAM,OAAO,WAAY,SAAQ,OAAO,CAAC,OAAO,EAAmC,CAAC,oCAAoC,CAAC;CAAG"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@shivaedev/agent-codex",
-  "version": "0.1.0",
+  "version": "0.2.0",
   "description": "Codex integration for Effect applications",
   "homepage": "https://github.com/ShivaeDev/platform/tree/main/packages/agent-codex#readme",
   "bugs": {
@@ -19,7 +19,8 @@
       "source": "./src/*.ts",
       "types": "./dist/*.d.ts",
       "default": "./dist/*.js"
-    }
+    },
+    "#test/*": "./src/test-support/*"
   },
   "exports": {
     "./*.ts": {
@@ -32,12 +33,27 @@
   "files": [
     "dist",
     "src",
+    "!src/**/*.test.ts",
+    "!src/**/*.spec.ts",
+    "!src/**/test-support",
     "CHANGELOG.md",
     "README.md"
   ],
+  "dependencies": {
+    "@shivaedev/agent": "0.2.0",
+    "@shivaedev/service": "0.6.2"
+  },
   "devDependencies": {
+    "@effect/vitest": "4.0.6",
+    "@shivaedev/quality": "0.58.0",
+    "@shivaedev/test-story": "0.37.0",
     "@types/node": "24.19.2",
-    "typescript": "7.0.2"
+    "effect": "4.0.6",
+    "typescript": "7.0.2",
+    "vitest": "5.0.5"
+  },
+  "peerDependencies": {
+    "effect": "4.0.6"
   },
   "engines": {
     "node": ">=24"
@@ -48,7 +64,8 @@
   },
   "scripts": {
     "build": "node --eval \"import('node:fs').then(({ rmSync }) => rmSync('dist', { force: true, recursive: true }))\" && tsc --project tsconfig.build.json",
-    "ready": "pnpm typecheck && pnpm build",
+    "ready": "pnpm typecheck && pnpm test && pnpm build",
+    "test": "vitest run --configLoader native",
     "typecheck": "tsc --noEmit"
   }
 }

package/src/adapters/Request.ts

@@ -0,0 +1,3 @@
+import type { Effect } from "effect";
+import type { BackendFailure } from "@shivaedev/agent/failures.ts";
+export type Request = (method: string, params: unknown, operationId?: string) => Effect.Effect<unknown, BackendFailure>;

package/src/adapters/UserMessageItem.ts

@@ -0,0 +1,28 @@
+import { Schema } from "effect";
+
+const TextContentPart = Schema.Struct({
+	text: Schema.String,
+	textElements: Schema.optional(Schema.Array(Schema.Unknown)),
+	type: Schema.Literal("text"),
+}).pipe(Schema.encodeKeys({ textElements: "text_elements" }));
+
+const ImageContentPart = Schema.Struct({
+	detail: Schema.optional(Schema.NullOr(Schema.String)),
+	type: Schema.Literal("image"),
+	url: Schema.String,
+});
+
+const LocalImageContentPart = Schema.Struct({
+	detail: Schema.optional(Schema.NullOr(Schema.String)),
+	path: Schema.String,
+	type: Schema.Literal("localImage"),
+});
+
+const UserContentPart = Schema.Union([TextContentPart, ImageContentPart, LocalImageContentPart]);
+
+export const UserMessageItem = Schema.Struct({
+	clientId: Schema.optional(Schema.NullOr(Schema.String)),
+	content: Schema.Array(UserContentPart),
+	id: Schema.String,
+	type: Schema.Literal("userMessage"),
+});

package/src/adapters/attributed.ts

@@ -0,0 +1,21 @@
+import type { Origin as OriginSchema } from "@shivaedev/agent/eventData.ts";
+import type { RunEvent as AgentEvent } from "@shivaedev/agent/events.ts";
+
+type Origin = typeof OriginSchema.Type;
+
+export function attributed(event: AgentEvent, origin: Origin): AgentEvent {
+	switch (event.type) {
+		case "message":
+		case "model.changed":
+		case "raw":
+		case "gap":
+		case "thinking":
+		case "tool.completed":
+		case "tool.started":
+		case "execution":
+		case "usage":
+			return { ...event, origin };
+		default:
+			return event;
+	}
+}

package/src/adapters/codexFailure.ts

@@ -0,0 +1,4 @@
+import { ProtocolFailure } from "@shivaedev/agent/failures.ts";
+export function codexFailure(message: string) {
+	return new ProtocolFailure({ backend: "codex", message });
+}

package/src/adapters/connect.ts

@@ -0,0 +1,129 @@
+import { Effect, Schema } from "effect";
+import { type BackendFailure, BackendUnavailable, ProtocolFailure, UnknownAcceptance } from "@shivaedev/agent/failures.ts";
+import type { LineProcess } from "#adapters/process.ts";
+import type { RpcNotification } from "#adapters/rpc.ts";
+import { Envelope, rejected } from "#adapters/rpcProtocol.ts";
+
+interface Pending {
+	readonly complete: (effect: Effect.Effect<unknown, BackendFailure>) => void;
+	readonly operationId: string | undefined;
+}
+export function connect(
+	child: LineProcess,
+	timeoutMs: number,
+	notified: (notification: RpcNotification) => void,
+	serverRequest: (id: number | string, method: string, params: unknown) => void,
+	exited: () => void,
+) {
+	const pending = new Map<number, Pending>();
+	let closed = false;
+	let nextId = 0;
+	function send(message: unknown) {
+		return child.write(JSON.stringify(message));
+	}
+	function unavailable() {
+		return new BackendUnavailable({ backend: "codex", message: "Codex app-server exited" });
+	}
+	function ambiguous(operationId: string, message: string) {
+		return new UnknownAcceptance({ backend: "codex", message, operationId });
+	}
+	child.onExit(() => {
+		closed = true;
+		for (const entry of pending.values()) {
+			entry.complete(
+				Effect.fail(
+					entry.operationId === undefined
+						? unavailable()
+						: ambiguous(entry.operationId, "Codex disconnected after submission; reconcile before retrying"),
+				),
+			);
+		}
+		pending.clear();
+		exited();
+	});
+	child.onLine((line) => {
+		let envelope: typeof Envelope.Type;
+		try {
+			envelope = Schema.decodeUnknownSync(Envelope)(JSON.parse(line));
+		} catch {
+			for (const entry of pending.values()) {
+				entry.complete(
+					Effect.fail(
+						entry.operationId === undefined
+							? new ProtocolFailure({ backend: "codex", message: "Invalid Codex RPC envelope" })
+							: ambiguous(entry.operationId, "Invalid response after mutation"),
+					),
+				);
+			}
+			pending.clear();
+			return;
+		}
+		dispatch(envelope);
+	});
+	function dispatch(envelope: typeof Envelope.Type) {
+		if (envelope.method !== undefined) {
+			if (envelope.id === undefined) {
+				notified({ method: envelope.method, params: envelope.params });
+			} else {
+				serverRequest(envelope.id, envelope.method, envelope.params);
+			}
+			return;
+		}
+		if (typeof envelope.id !== "number") {
+			return;
+		}
+		const entry = pending.get(envelope.id);
+		pending.delete(envelope.id);
+		if (entry === undefined) {
+			return;
+		}
+		if (envelope.error === undefined) {
+			entry.complete(Effect.succeed(envelope.result));
+			return;
+		}
+		const error = rejected(envelope.error);
+		entry.complete(
+			Effect.fail(
+				error._tag === "ProtocolFailure" && entry.operationId !== undefined
+					? ambiguous(entry.operationId, "Invalid rejection after mutation")
+					: error,
+			),
+		);
+	}
+
+	function request(method: string, params: unknown, operationId?: string) {
+		return Effect.callback<unknown, BackendFailure>((complete) => {
+			if (closed) {
+				complete(Effect.fail(unavailable()));
+				return;
+			}
+			nextId += 1;
+			const id = nextId;
+			pending.set(id, { complete, operationId });
+			try {
+				send({ id, method, params });
+			} catch {
+				pending.delete(id);
+				complete(Effect.fail(operationId === undefined ? unavailable() : ambiguous(operationId, "Codex write failed after submission")));
+			}
+			return Effect.sync(() => {
+				pending.delete(id);
+			});
+		}).pipe(
+			Effect.timeout(`${timeoutMs} millis`),
+			Effect.catchTag("TimeoutError", () =>
+				Effect.fail(
+					operationId === undefined
+						? new BackendUnavailable({ backend: "codex", message: `Codex ${method} timed out` })
+						: ambiguous(operationId, `Codex ${method} timed out; reconcile before retrying`),
+				),
+			),
+		);
+	}
+	return {
+		deny: (id: number | string) => send({ error: { code: -32_601, message: "No approval handler configured" }, id }),
+		notify: (method: string, params: unknown) => send({ method, params }),
+		request,
+		respond: (id: number | string, result: unknown) => send({ id, result }),
+	};
+}