@agentex/agent 0.0.1 → 0.0.3

package/dist/providers/codex/session.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"session.d.ts","sourceRoot":"","sources":["../../../src/providers/codex/session.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EACV,YAAY,EACZ,cAAc,EAGf,MAAM,gBAAgB,CAAC;AAqFxB,wBAAsB,kBAAkB,CAAC,GAAG,EAAE,cAAc,GAAG,OAAO,CAAC,YAAY,CAAC,CAmDnF"}

package/dist/providers/codex/session.js

@@ -0,0 +1,553 @@
+import { spawn } from "node:child_process";
+import { findBinary } from "../../utils/binary.js";
+import { buildEnv, ensurePathInEnv } from "../../utils/env.js";
+import { injectWorkspaceSkills } from "../../utils/skills.js";
+import { resolveInstructions } from "../../utils/instructions.js";
+import { parseCodexStreamLine } from "./parse.js";
+import { scanCodexSessionUsage } from "./usage-scanner.js";
+// ---------------------------------------------------------------------------
+// JSON-RPC 2.0 helpers
+// ---------------------------------------------------------------------------
+function parseJson(line) {
+    try {
+        const parsed = JSON.parse(line);
+        if (typeof parsed === "object" && parsed !== null && !Array.isArray(parsed)) {
+            return parsed;
+        }
+    }
+    catch { /* skip */ }
+    return null;
+}
+function str(obj, key) {
+    const v = obj[key];
+    return typeof v === "string" ? v : "";
+}
+function num(obj, key) {
+    const v = obj[key];
+    return typeof v === "number" && Number.isFinite(v) ? v : 0;
+}
+function asObj(parent, key) {
+    const v = parent[key];
+    return typeof v === "object" && v !== null && !Array.isArray(v)
+        ? v
+        : {};
+}
+function classifyMessage(msg) {
+    const isRpc = msg["jsonrpc"] === "2.0";
+    if (isRpc) {
+        const hasId = "id" in msg && (typeof msg["id"] === "number" || typeof msg["id"] === "string");
+        const hasMethod = "method" in msg && typeof msg["method"] === "string";
+        const id = typeof msg["id"] === "number" ? msg["id"] : parseInt(String(msg["id"]), 10);
+        if (hasId && hasMethod) {
+            return { kind: "request", id, method: msg["method"], params: asObj(msg, "params") };
+        }
+        if (hasId && !hasMethod) {
+            const errRaw = msg["error"];
+            const error = typeof errRaw === "object" && errRaw !== null
+                ? { code: num(errRaw, "code"), message: str(errRaw, "message") }
+                : undefined;
+            const result = typeof msg["result"] === "object" && msg["result"] !== null
+                ? msg["result"]
+                : undefined;
+            return { kind: "response", id, result, error };
+        }
+        if (hasMethod) {
+            return { kind: "notification", method: msg["method"], params: asObj(msg, "params") };
+        }
+        return null;
+    }
+    // Legacy NDJSON events (from `codex exec --json` format) — have a `type` field
+    if (typeof msg["type"] === "string") {
+        return { kind: "legacy_event", event: msg };
+    }
+    return null;
+}
+// ---------------------------------------------------------------------------
+// createCodexSession
+// ---------------------------------------------------------------------------
+export async function createCodexSession(ctx) {
+    const cwd = ctx.cwd ?? process.cwd();
+    const config = ctx.config ?? {};
+    // Resolve binary
+    const resolved = await findBinary("codex", config.command);
+    // Build env
+    const env = buildEnv(ctx.env);
+    ensurePathInEnv(env);
+    // Inject skills
+    if (config.skillDirs && config.skillDirs.length > 0) {
+        try {
+            await injectWorkspaceSkills(config.skillDirs, cwd);
+        }
+        catch { /* non-fatal */ }
+    }
+    // Resolve instructions
+    const instructions = await resolveInstructions(config.instructionsFile);
+    // Spawn Codex in interactive JSON-RPC mode
+    const args = [...resolved.prefixArgs, "--json"];
+    if (config.skipPermissions)
+        args.push("--dangerously-bypass-approvals-and-sandbox");
+    if (config.extraArgs)
+        args.push(...config.extraArgs);
+    const proc = spawn(resolved.bin, args, {
+        cwd,
+        env,
+        stdio: ["pipe", "pipe", "pipe"],
+    });
+    if (!proc.stdin || !proc.stdout || !proc.stderr) {
+        throw new Error("Failed to open stdio on Codex process");
+    }
+    const session = new CodexSessionImpl(proc, ctx, cwd, config.model ?? null, instructions);
+    // Perform JSON-RPC initialize handshake + thread/start
+    await session.handshake();
+    // Wire up AbortSignal
+    if (ctx.signal) {
+        if (ctx.signal.aborted) {
+            void session.close();
+        }
+        else {
+            ctx.signal.addEventListener("abort", () => void session.close(), { once: true });
+        }
+    }
+    return session;
+}
+// ---------------------------------------------------------------------------
+// Implementation
+// ---------------------------------------------------------------------------
+class CodexSessionImpl {
+    proc;
+    ctx;
+    cwd;
+    model;
+    instructions;
+    _state = "idle";
+    _threadId = null;
+    _lineBuffer = "";
+    _nextId = 1;
+    // Pending outgoing RPC responses (keyed by request id)
+    _pendingRpc = new Map();
+    // Active turn state
+    _turnResolve = null;
+    _turnReject = null;
+    _turnSummary = null;
+    _turnUsage = null;
+    _turnModel = null;
+    _turnIsError = false;
+    _turnErrorMessage = null;
+    _turnStartedAt = null;
+    constructor(proc, ctx, cwd, model, instructions) {
+        this.proc = proc;
+        this.ctx = ctx;
+        this.cwd = cwd;
+        this.model = model;
+        this.instructions = instructions;
+        proc.stdout.setEncoding("utf-8");
+        proc.stdout.on("data", (chunk) => this.handleStdout(chunk));
+        proc.stderr.setEncoding("utf-8");
+        proc.stderr.on("data", (chunk) => {
+            if (this.ctx.onOutput) {
+                try {
+                    void this.ctx.onOutput("stderr", chunk);
+                }
+                catch { /* swallow */ }
+            }
+        });
+        proc.on("exit", (code, signal) => {
+            if (this._state !== "closed") {
+                this._state = "closed";
+                const err = new Error(`Codex process exited unexpectedly (code=${code}, signal=${signal})`);
+                for (const [, pending] of this._pendingRpc)
+                    pending.reject(err);
+                this._pendingRpc.clear();
+                if (this._turnReject) {
+                    this._turnReject(err);
+                    this._turnResolve = null;
+                    this._turnReject = null;
+                }
+            }
+        });
+        proc.on("error", (err) => {
+            if (this._state !== "closed") {
+                this._state = "closed";
+                for (const [, pending] of this._pendingRpc)
+                    pending.reject(err);
+                this._pendingRpc.clear();
+                if (this._turnReject) {
+                    this._turnReject(err);
+                    this._turnResolve = null;
+                    this._turnReject = null;
+                }
+            }
+        });
+    }
+    get sessionId() { return this._threadId; }
+    get state() { return this._state; }
+    // -------------------------------------------------------------------------
+    // JSON-RPC send helpers
+    // -------------------------------------------------------------------------
+    rpcRequest(method, params) {
+        const id = this._nextId++;
+        const msg = { jsonrpc: "2.0", id, method };
+        if (params)
+            msg["params"] = params;
+        this.proc.stdin.write(JSON.stringify(msg) + "\n");
+        return new Promise((resolve, reject) => {
+            this._pendingRpc.set(id, { resolve, reject });
+        });
+    }
+    rpcResponse(id, result) {
+        this.proc.stdin.write(JSON.stringify({ jsonrpc: "2.0", id, result }) + "\n");
+    }
+    // -------------------------------------------------------------------------
+    // Handshake
+    // -------------------------------------------------------------------------
+    async handshake() {
+        // 1. initialize
+        await this.rpcRequest("initialize", {
+            clientInfo: { name: "agentex", version: "1.0.0" },
+            capabilities: {},
+        });
+        // 2. thread/start
+        const threadParams = { cwd: this.cwd };
+        if (this.model)
+            threadParams["model"] = this.model;
+        if (this.instructions)
+            threadParams["developerInstructions"] = this.instructions;
+        const res = await this.rpcRequest("thread/start", threadParams);
+        this._threadId = str(res, "threadId") || str(res, "thread_id") || null;
+    }
+    // -------------------------------------------------------------------------
+    // Public API
+    // -------------------------------------------------------------------------
+    async send(message) {
+        if (this._state === "closed")
+            throw new Error("Session is closed");
+        if (this._state !== "idle")
+            throw new Error("A turn is already in progress");
+        this._state = "thinking";
+        this._turnSummary = null;
+        this._turnUsage = null;
+        this._turnModel = null;
+        this._turnIsError = false;
+        this._turnErrorMessage = null;
+        this._turnStartedAt = new Date();
+        // Start a turn — the completion comes via notifications, not the RPC response
+        const turnParams = { input: message };
+        if (this._threadId)
+            turnParams["threadId"] = this._threadId;
+        this.rpcRequest("turn/start", turnParams).catch(() => {
+            // Turn-level errors arrive via turn.failed notifications
+        });
+        return new Promise((resolve, reject) => {
+            this._turnResolve = resolve;
+            this._turnReject = reject;
+        });
+    }
+    async interrupt() {
+        if (this._state === "idle" || this._state === "closed")
+            return;
+        try {
+            await this.rpcRequest("turn/cancel", {});
+        }
+        catch { /* best effort */ }
+    }
+    async close() {
+        if (this._state === "closed")
+            return;
+        this._state = "closed";
+        this.proc.stdin.end();
+        await new Promise((resolve) => {
+            const timeout = setTimeout(() => {
+                this.proc.kill("SIGKILL");
+                resolve();
+            }, 5000);
+            this.proc.on("exit", () => {
+                clearTimeout(timeout);
+                resolve();
+            });
+            this.proc.kill("SIGTERM");
+        });
+    }
+    // -------------------------------------------------------------------------
+    // Stdout parsing
+    // -------------------------------------------------------------------------
+    handleStdout(chunk) {
+        if (this.ctx.onOutput) {
+            try {
+                void this.ctx.onOutput("stdout", chunk);
+            }
+            catch { /* swallow */ }
+        }
+        this._lineBuffer += chunk;
+        const lines = this._lineBuffer.split("\n");
+        this._lineBuffer = lines.pop() ?? "";
+        for (const line of lines) {
+            const trimmed = line.trim();
+            if (!trimmed)
+                continue;
+            this.handleLine(trimmed);
+        }
+    }
+    handleLine(line) {
+        const raw = parseJson(line);
+        if (!raw)
+            return;
+        const msg = classifyMessage(raw);
+        if (!msg)
+            return;
+        switch (msg.kind) {
+            case "response":
+                this.handleRpcResponse(msg);
+                break;
+            case "request":
+                this.handleServerRequest(msg.id, msg.method, msg.params);
+                break;
+            case "notification":
+                this.handleNotification(msg.method, msg.params, line);
+                break;
+            case "legacy_event":
+                this.handleLegacyEvent(msg.event, line);
+                break;
+        }
+    }
+    // -------------------------------------------------------------------------
+    // RPC response dispatch
+    // -------------------------------------------------------------------------
+    handleRpcResponse(msg) {
+        const pending = this._pendingRpc.get(msg.id);
+        if (!pending)
+            return;
+        this._pendingRpc.delete(msg.id);
+        if (msg.error) {
+            pending.reject(new Error(`JSON-RPC error ${msg.error.code}: ${msg.error.message}`));
+        }
+        else {
+            pending.resolve(msg.result ?? {});
+        }
+    }
+    // -------------------------------------------------------------------------
+    // Server→client requests (tool approval)
+    // -------------------------------------------------------------------------
+    handleServerRequest(id, method, params) {
+        if (method === "item/commandExecution/requestApproval" ||
+            method === "item/fileChange/requestApproval") {
+            void this.handleApproval(id, method, params);
+        }
+        else {
+            // Unknown server request — ack to unblock
+            this.rpcResponse(id, {});
+        }
+    }
+    async handleApproval(id, method, params) {
+        this._state = "waiting_for_approval";
+        if (!this.ctx.onUserInputRequest) {
+            this.rpcResponse(id, { approved: true });
+            if (this._state === "waiting_for_approval")
+                this._state = "thinking";
+            return;
+        }
+        const toolName = method === "item/commandExecution/requestApproval"
+            ? "command_execution"
+            : "file_change";
+        try {
+            const resp = await this.ctx.onUserInputRequest({
+                toolName,
+                input: params,
+                toolUseId: str(params, "id"),
+                description: str(params, "command") || str(params, "path") || undefined,
+            });
+            this.rpcResponse(id, { approved: resp.allow });
+        }
+        catch {
+            this.rpcResponse(id, { approved: false });
+        }
+        if (this._state === "waiting_for_approval")
+            this._state = "thinking";
+    }
+    // -------------------------------------------------------------------------
+    // Notification handling (v2 format)
+    // -------------------------------------------------------------------------
+    handleNotification(method, params, rawLine) {
+        // codex/event — legacy wrapper
+        if (method === "codex/event") {
+            const innerMsg = str(params, "msg");
+            if (innerMsg) {
+                // Try to parse inner message
+                const inner = parseJson(innerMsg);
+                if (inner)
+                    this.handleLegacyEvent(inner, innerMsg);
+            }
+            return;
+        }
+        // Map v2 notification methods to processing
+        if (method === "thread/started") {
+            this._threadId = str(params, "threadId") || str(params, "thread_id") || this._threadId;
+            this.emitStreamEvent(rawLine);
+            return;
+        }
+        if (method === "item/started") {
+            this._state = "tool_executing";
+            this.emitStreamEvent(rawLine);
+            return;
+        }
+        if (method === "item/completed") {
+            this._state = "thinking";
+            this.extractSummaryFromItem(params);
+            this.emitStreamEvent(rawLine);
+            return;
+        }
+        if (method === "turn/completed") {
+            this.handleTurnCompleted(params);
+            return;
+        }
+        if (method === "turn/failed") {
+            this._turnIsError = true;
+            this._turnErrorMessage = str(params, "message") || str(params, "error") || "Turn failed";
+            this.resolveTurn();
+            this.emitStreamEvent(rawLine);
+            return;
+        }
+        // Forward unrecognized notifications
+        this.emitStreamEvent(rawLine);
+    }
+    // -------------------------------------------------------------------------
+    // Legacy event handling (NDJSON events with `type` field)
+    // -------------------------------------------------------------------------
+    handleLegacyEvent(event, rawLine) {
+        const type = str(event, "type");
+        if (type === "thread.started") {
+            this._threadId = str(event, "thread_id") || this._threadId;
+            this.emitStreamEvent(rawLine);
+            return;
+        }
+        if (type === "item.started") {
+            this._state = "tool_executing";
+            this.emitStreamEvent(rawLine);
+            return;
+        }
+        if (type === "item.completed") {
+            this._state = "thinking";
+            this.extractSummaryFromItem(event);
+            this.emitStreamEvent(rawLine);
+            return;
+        }
+        if (type === "turn.completed") {
+            this.handleTurnCompleted(event);
+            return;
+        }
+        if (type === "turn.failed" || type === "error") {
+            this._turnIsError = true;
+            this._turnErrorMessage = str(event, "message") || str(event, "error") || "Turn failed";
+            this.resolveTurn();
+            this.emitStreamEvent(rawLine);
+            return;
+        }
+        this.emitStreamEvent(rawLine);
+    }
+    // -------------------------------------------------------------------------
+    // Shared helpers
+    // -------------------------------------------------------------------------
+    extractSummaryFromItem(params) {
+        const item = typeof params["item"] === "object" && params["item"] !== null
+            ? params["item"]
+            : params;
+        if (str(item, "type") !== "agent_message")
+            return;
+        // Direct text (Codex 0.30+)
+        const directText = str(item, "text");
+        if (directText) {
+            this._turnSummary = directText;
+            return;
+        }
+        // Fallback: content array
+        const content = Array.isArray(item["content"]) ? item["content"] : [];
+        for (const entry of content) {
+            if (typeof entry !== "object" || entry === null || Array.isArray(entry))
+                continue;
+            const block = entry;
+            if (str(block, "type") === "output_text") {
+                const text = str(block, "text");
+                if (text)
+                    this._turnSummary = text;
+            }
+        }
+    }
+    handleTurnCompleted(params) {
+        const usage = typeof params["usage"] === "object" && params["usage"] !== null
+            ? params["usage"]
+            : null;
+        if (usage) {
+            const inputTokens = num(usage, "input_tokens");
+            const outputTokens = num(usage, "output_tokens");
+            if (inputTokens > 0 || outputTokens > 0) {
+                this._turnUsage = { inputTokens, outputTokens };
+            }
+        }
+        const model = str(params, "model");
+        if (model)
+            this._turnModel = model;
+        this.resolveTurn();
+        // Also emit as stream event for the raw line
+        if (this.ctx.onEvent) {
+            try {
+                void this.ctx.onEvent({
+                    type: "result",
+                    text: this._turnSummary ?? "",
+                    cost: null,
+                    isError: this._turnIsError,
+                    timestamp: new Date().toISOString(),
+                });
+            }
+            catch { /* swallow */ }
+        }
+    }
+    resolveTurn() {
+        const resolvedModel = this._turnModel ?? this.model;
+        let usage = this._turnUsage && resolvedModel
+            ? { [resolvedModel]: { inputTokens: this._turnUsage.inputTokens, outputTokens: this._turnUsage.outputTokens } }
+            : undefined;
+        // If no usage from the stream, try scanning session logs
+        if (!usage && this._turnStartedAt) {
+            const startedAt = this._turnStartedAt;
+            const threadId = this._threadId ?? undefined;
+            // Fire-and-forget: scan logs then deliver result
+            void scanCodexSessionUsage({ startedAfter: startedAt, threadId }).then((scanned) => {
+                usage = scanned;
+            }).catch(() => {
+                // Non-fatal — usage stays undefined
+            }).finally(() => {
+                this.deliverTurnResult(usage);
+            });
+            return;
+        }
+        this.deliverTurnResult(usage);
+    }
+    deliverTurnResult(usage) {
+        const result = {
+            summary: this._turnSummary,
+            usage,
+            costUsd: null,
+            status: this._turnIsError ? "failed" : "completed",
+            errorCode: this._turnIsError ? "execution_error" : null,
+            errorMessage: this._turnErrorMessage,
+        };
+        this._state = "idle";
+        if (this._turnResolve) {
+            const resolve = this._turnResolve;
+            this._turnResolve = null;
+            this._turnReject = null;
+            resolve(result);
+        }
+    }
+    emitStreamEvent(rawLine) {
+        if (!this.ctx.onEvent)
+            return;
+        const event = parseCodexStreamLine(rawLine);
+        if (event) {
+            try {
+                void this.ctx.onEvent(event);
+            }
+            catch { /* swallow */ }
+        }
+    }
+}
+//# sourceMappingURL=session.js.map

package/dist/providers/codex/session.js.map

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

package/dist/providers/codex/test.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"test.d.ts","sourceRoot":"","sources":["../../../src/providers/codex/test.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,sBAAsB,EAAE,qBAAqB,EAAoB,MAAM,gBAAgB,CAAC;AAUtG,wBAAsB,oBAAoB,CACxC,GAAG,EAAE,sBAAsB,GAC1B,OAAO,CAAC,qBAAqB,CAAC,CAkDhC"}
+{"version":3,"file":"test.d.ts","sourceRoot":"","sources":["../../../src/providers/codex/test.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,sBAAsB,EAAE,qBAAqB,EAAoB,MAAM,gBAAgB,CAAC;AAUtG,wBAAsB,oBAAoB,CACxC,GAAG,EAAE,sBAAsB,GAC1B,OAAO,CAAC,qBAAqB,CAAC,CA0EhC"}

package/dist/providers/codex/test.js

@@ -1,5 +1,5 @@
 import { findBinary } from "../../utils/binary.js";
-import { buildEnv } from "../../utils/env.js";
+import { resolveAuthForProvider } from "../../utils/auth.js";
 function summarizeStatus(checks) {
     if (checks.some((c) => c.level === "error"))
         return "fail";
@@ -11,7 +11,6 @@ export async function testCodexEnvironment(ctx) {
     const checks = [];
     const config = (ctx.config ?? {});
     const command = typeof config["command"] === "string" ? config["command"] : undefined;
-    // Check binary resolvable
     try {
         await findBinary("codex", command);
         checks.push({
@@ -28,29 +27,46 @@ export async function testCodexEnvironment(ctx) {
             hint: "Install Codex: npm install -g @openai/codex",
         });
     }
-    // Check OPENAI_API_KEY
-    const env = buildEnv(typeof config["env"] === "object" && config["env"] !== null
+    const callerEnv = typeof config["env"] === "object" && config["env"] !== null
         ? config["env"]
-        : undefined);
-    const hasApiKey = typeof env["OPENAI_API_KEY"] === "string" && env["OPENAI_API_KEY"].trim().length > 0;
-    if (hasApiKey) {
+        : undefined;
+    const auth = await resolveAuthForProvider("codex", { env: callerEnv });
+    const apiKey = auth.options.find((o) => o.method === "api_key" && o.source.kind === "env");
+    const subscription = auth.options.find((o) => o.method === "subscription");
+    if (apiKey?.present === true) {
         checks.push({
             code: "codex_openai_api_key_present",
             level: "info",
-            message: "OPENAI_API_KEY is set.",
+            message: "OPENAI_API_KEY is set; Codex will use API-key billing.",
         });
     }
-    else {
+    if (subscription?.present === true) {
         checks.push({
-            code: "codex_openai_api_key_missing",
+            code: "codex_subscription_credentials_present",
+            level: "info",
+            message: "Codex login credentials detected on disk.",
+        });
+    }
+    if (apiKey?.present !== true && subscription?.present !== true) {
+        checks.push({
+            code: "codex_no_auth_detected",
+            level: "warn",
+            message: "No Codex authentication detected.",
+            hint: "Run `codex login` for subscription auth, or set OPENAI_API_KEY for API-key billing.",
+        });
+    }
+    if (apiKey?.present === true && subscription?.present === true) {
+        checks.push({
+            code: "codex_api_key_overrides_subscription",
             level: "warn",
-            message: "OPENAI_API_KEY is not set. Codex may require it for API auth.",
-            hint: "Set OPENAI_API_KEY environment variable.",
+            message: "Both OPENAI_API_KEY and subscription credentials are present. Codex will use the API key (metered billing).",
+            hint: "Unset OPENAI_API_KEY if you intended to use subscription-based auth.",
         });
     }
     return {
         providerType: ctx.providerType,
         status: summarizeStatus(checks),
+        auth,
         checks,
         testedAt: new Date().toISOString(),
     };