@mcoda/agents 0.1.36 → 0.1.38

package/dist/adapters/codex/CodexAdapter.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"CodexAdapter.d.ts","sourceRoot":"","sources":["../../../src/adapters/codex/CodexAdapter.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAE,MAAM,eAAe,CAAC;AAC5C,OAAO,EAAE,aAAa,EAAE,YAAY,EAAE,iBAAiB,EAAE,gBAAgB,EAAE,MAAM,oBAAoB,CAAC;AAGtG,qBAAa,YAAa,YAAW,YAAY;IACnC,OAAO,CAAC,MAAM;gBAAN,MAAM,EAAE,aAAa;IAEnC,eAAe,IAAI,OAAO,CAAC,MAAM,EAAE,CAAC;IAIpC,WAAW,IAAI,OAAO,CAAC,WAAW,CAAC;IAYnC,MAAM,CAAC,OAAO,EAAE,iBAAiB,GAAG,OAAO,CAAC,gBAAgB,CAAC;IAmB5D,YAAY,CAAC,OAAO,EAAE,iBAAiB,GAAG,cAAc,CAAC,gBAAgB,EAAE,IAAI,EAAE,OAAO,CAAC;CAoBjG"}
+{"version":3,"file":"CodexAdapter.d.ts","sourceRoot":"","sources":["../../../src/adapters/codex/CodexAdapter.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAE,MAAM,eAAe,CAAC;AAC5C,OAAO,EAAE,aAAa,EAAE,YAAY,EAAE,iBAAiB,EAAE,gBAAgB,EAAE,MAAM,oBAAoB,CAAC;AAmBtG,qBAAa,YAAa,YAAW,YAAY;IACnC,OAAO,CAAC,MAAM;gBAAN,MAAM,EAAE,aAAa;IAEnC,eAAe,IAAI,OAAO,CAAC,MAAM,EAAE,CAAC;IAIpC,WAAW,IAAI,OAAO,CAAC,WAAW,CAAC;IAYnC,MAAM,CAAC,OAAO,EAAE,iBAAiB,GAAG,OAAO,CAAC,gBAAgB,CAAC;IAwB5D,YAAY,CAAC,OAAO,EAAE,iBAAiB,GAAG,cAAc,CAAC,gBAAgB,EAAE,IAAI,EAAE,OAAO,CAAC;CAyBjG"}

package/dist/adapters/codex/CodexAdapter.js

@@ -1,4 +1,18 @@
 import { cliHealthy, runCodexExec, runCodexExecStream } from "./CodexCliRunner.js";
+const extractOutputSchema = (request) => {
+    const candidate = request.metadata?.outputSchema;
+    if (!candidate || typeof candidate !== "object" || Array.isArray(candidate)) {
+        return undefined;
+    }
+    return candidate;
+};
+const extractTimeoutMs = (request) => {
+    const candidate = request.metadata?.timeoutMs;
+    if (typeof candidate !== "number" || !Number.isFinite(candidate) || candidate <= 0) {
+        return undefined;
+    }
+    return Math.floor(candidate);
+};
 export class CodexAdapter {
     constructor(config) {
         this.config = config;
@@ -20,7 +34,7 @@ export class CodexAdapter {
     async invoke(request) {
         const health = cliHealthy(true);
         const cliDetails = health.details;
-        const result = await runCodexExec(request.input, this.config.model);
+        const result = await runCodexExec(request.input, this.config.model, extractOutputSchema(request), extractTimeoutMs(request));
         return {
             output: result.output,
             adapter: this.config.adapter ?? "codex-cli",
@@ -38,7 +52,7 @@ export class CodexAdapter {
     async *invokeStream(request) {
         const health = cliHealthy(true);
         const cliDetails = health.details;
-        for await (const chunk of runCodexExecStream(request.input, this.config.model)) {
+        for await (const chunk of runCodexExecStream(request.input, this.config.model, extractOutputSchema(request), extractTimeoutMs(request))) {
             yield {
                 output: chunk.output,
                 adapter: this.config.adapter ?? "codex-cli",

package/dist/adapters/codex/CodexCliRunner.d.ts

@@ -2,11 +2,11 @@ export declare const cliHealthy: (throwOnError?: boolean) => {
     ok: boolean;
     details?: Record<string, unknown>;
 };
-export declare const runCodexExec: (prompt: string, model?: string) => Promise<{
+export declare const runCodexExec: (prompt: string, model?: string, outputSchema?: Record<string, unknown>, timeoutMs?: number) => Promise<{
     output: string;
     raw: string;
 }>;
-export declare function runCodexExecStream(prompt: string, model?: string): AsyncGenerator<{
+export declare function runCodexExecStream(prompt: string, model?: string, outputSchema?: Record<string, unknown>, timeoutMs?: number): AsyncGenerator<{
     output: string;
     raw: string;
 }, void, unknown>;

package/dist/adapters/codex/CodexCliRunner.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"CodexCliRunner.d.ts","sourceRoot":"","sources":["../../../src/adapters/codex/CodexCliRunner.ts"],"names":[],"mappings":"AAuyBA,eAAO,MAAM,UAAU,GAAI,sBAAoB,KAAG;IAAE,EAAE,EAAE,OAAO,CAAC;IAAC,OAAO,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAA;CA+BjG,CAAC;AAEF,eAAO,MAAM,YAAY,GAAU,QAAQ,MAAM,EAAE,QAAQ,MAAM,KAAG,OAAO,CAAC;IAAE,MAAM,EAAE,MAAM,CAAC;IAAC,GAAG,EAAE,MAAM,CAAA;CAAE,CAS1G,CAAC;AAEF,wBAAuB,kBAAkB,CACvC,MAAM,EAAE,MAAM,EACd,KAAK,CAAC,EAAE,MAAM,GACb,cAAc,CAAC;IAAE,MAAM,EAAE,MAAM,CAAC;IAAC,GAAG,EAAE,MAAM,CAAA;CAAE,EAAE,IAAI,EAAE,OAAO,CAAC,CAgEhE"}
+{"version":3,"file":"CodexCliRunner.d.ts","sourceRoot":"","sources":["../../../src/adapters/codex/CodexCliRunner.ts"],"names":[],"mappings":"AAk1BA,eAAO,MAAM,UAAU,GAAI,sBAAoB,KAAG;IAAE,EAAE,EAAE,OAAO,CAAC;IAAC,OAAO,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAA;CA+BjG,CAAC;AAEF,eAAO,MAAM,YAAY,GACvB,QAAQ,MAAM,EACd,QAAQ,MAAM,EACd,eAAe,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,EACtC,YAAY,MAAM,KACjB,OAAO,CAAC;IAAE,MAAM,EAAE,MAAM,CAAC;IAAC,GAAG,EAAE,MAAM,CAAA;CAAE,CASzC,CAAC;AAEF,wBAAuB,kBAAkB,CACvC,MAAM,EAAE,MAAM,EACd,KAAK,CAAC,EAAE,MAAM,EACd,YAAY,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,EACtC,SAAS,CAAC,EAAE,MAAM,GACjB,cAAc,CAAC;IAAE,MAAM,EAAE,MAAM,CAAC;IAAC,GAAG,EAAE,MAAM,CAAA;CAAE,EAAE,IAAI,EAAE,OAAO,CAAC,CAmFhE"}

package/dist/adapters/codex/CodexCliRunner.js

@@ -1,4 +1,7 @@
 import { spawn, spawnSync } from "node:child_process";
+import { mkdtemp, rm, writeFile } from "node:fs/promises";
+import os from "node:os";
+import path from "node:path";
 const CODEX_MAX_BUFFER_BYTES = 10 * 1024 * 1024;
 const CODEX_REASONING_ENV = "MCODA_CODEX_REASONING_EFFORT";
 const CODEX_REASONING_ENV_FALLBACK = "CODEX_REASONING_EFFORT";
@@ -208,6 +211,7 @@ const parseCodexOutput = (raw) => {
     }
     return message;
 };
+const normalizeComparableAssistantText = (value) => value.replace(/\r\n/g, "\n").trim();
 const normalizeValue = (value) => {
     if (typeof value !== "string")
         return value;
@@ -635,12 +639,35 @@ const extractAssistantText = (parsed) => {
     }
     return null;
 };
-const invokeCodexProcess = async (prompt, model, hooks) => {
+const materializeOutputSchema = async (outputSchema) => {
+    if (!outputSchema || typeof outputSchema !== "object" || Array.isArray(outputSchema)) {
+        return undefined;
+    }
+    const tempDir = await mkdtemp(path.join(os.tmpdir(), "mcoda-codex-schema-"));
+    const schemaPath = path.join(tempDir, "output-schema.json");
+    await writeFile(schemaPath, `${JSON.stringify(outputSchema, null, 2)}\n`, "utf8");
+    return {
+        schemaPath,
+        cleanup: async () => {
+            try {
+                await rm(tempDir, { recursive: true, force: true });
+            }
+            catch {
+                /* ignore cleanup errors */
+            }
+        },
+    };
+};
+const invokeCodexProcess = async (prompt, model, options) => {
     const resolvedModel = model ?? "gpt-5.1-codex-max";
     const sandboxArgs = resolveSandboxArgs();
     const reasoningEffort = resolveReasoningEffort(resolvedModel);
     const codexCommand = resolveCodexCommand();
     const args = [...codexCommand.preArgs, ...sandboxArgs.args, "exec", "--model", resolvedModel, "--json"];
+    const schemaFile = await materializeOutputSchema(options?.outputSchema);
+    if (schemaFile) {
+        args.push("--output-schema", schemaFile.schemaPath);
+    }
     if (!sandboxArgs.bypass) {
         args.push("--full-auto");
     }
@@ -648,141 +675,148 @@ const invokeCodexProcess = async (prompt, model, hooks) => {
         args.push("-c", `model_reasoning_effort=${reasoningEffort}`);
     }
     args.push("-");
-    const timeoutMs = resolveCodexTimeoutMs();
+    const timeoutMs = typeof options?.timeoutMs === "number" && Number.isFinite(options.timeoutMs) && options.timeoutMs > 0
+        ? Math.floor(options.timeoutMs)
+        : resolveCodexTimeoutMs();
     const exitGraceMs = resolveCodexExitGraceMs();
-    return await new Promise((resolve, reject) => {
-        const child = spawn(codexCommand.command, args, { stdio: ["pipe", "pipe", "pipe"] });
-        let raw = "";
-        let stderr = "";
-        let lineBuffer = "";
-        let message = "";
-        let protocolError;
-        let settled = false;
-        let forcedExit = false;
-        let completionTimer;
-        const clearTimers = () => {
-            if (completionTimer) {
-                clearTimeout(completionTimer);
-                completionTimer = undefined;
-            }
-            clearTimeout(timeoutHandle);
-        };
-        const finalizeOutput = () => {
-            const parsedOutput = parseCodexOutput(raw).trim();
-            return parsedOutput || message.trim();
-        };
-        const finishResolve = () => {
-            if (settled)
-                return;
-            settled = true;
-            clearTimers();
-            resolve({ output: finalizeOutput(), raw, forcedExit });
-        };
-        const finishReject = (error) => {
-            if (settled)
-                return;
-            settled = true;
-            clearTimers();
-            reject(error);
-        };
-        const scheduleCompletionGrace = () => {
-            if (settled)
-                return;
-            if (completionTimer) {
-                clearTimeout(completionTimer);
-            }
-            completionTimer = setTimeout(() => {
+    try {
+        return await new Promise((resolve, reject) => {
+            const child = spawn(codexCommand.command, args, { stdio: ["pipe", "pipe", "pipe"] });
+            let raw = "";
+            let stderr = "";
+            let lineBuffer = "";
+            let message = "";
+            let protocolError;
+            let settled = false;
+            let forcedExit = false;
+            let completionTimer;
+            const clearTimers = () => {
+                if (completionTimer) {
+                    clearTimeout(completionTimer);
+                    completionTimer = undefined;
+                }
+                clearTimeout(timeoutHandle);
+            };
+            const finalizeOutput = () => {
+                const parsedOutput = parseCodexOutput(raw).trim();
+                return parsedOutput || message.trim();
+            };
+            const finishResolve = () => {
+                if (settled)
+                    return;
+                settled = true;
+                clearTimers();
+                resolve({ output: finalizeOutput(), raw, forcedExit });
+            };
+            const finishReject = (error) => {
+                if (settled)
+                    return;
+                settled = true;
+                clearTimers();
+                reject(error);
+            };
+            const scheduleCompletionGrace = () => {
+                if (settled)
+                    return;
+                if (completionTimer) {
+                    clearTimeout(completionTimer);
+                }
+                completionTimer = setTimeout(() => {
+                    if (settled)
+                        return;
+                    forcedExit = true;
+                    safeKill(child, "SIGTERM");
+                    scheduleHardKill(child);
+                    finishResolve();
+                }, exitGraceMs);
+                completionTimer.unref();
+            };
+            const handleLine = (line) => {
+                const normalized = line.replace(/\r$/, "");
+                options?.hooks?.onLine?.(normalized);
+                const parsed = safeJsonParse(normalized);
+                const event = extractAssistantText(parsed);
+                if (event) {
+                    if (event.kind === "delta") {
+                        message += event.text;
+                    }
+                    else {
+                        message = event.text;
+                        scheduleCompletionGrace();
+                    }
+                    options?.hooks?.onAssistantEvent?.(event, normalized);
+                }
+                const parsedError = extractProtocolError(parsed);
+                if (parsedError) {
+                    protocolError = parsedError;
+                }
+                if (isCompletionEvent(parsed)) {
+                    scheduleCompletionGrace();
+                }
+            };
+            const timeoutHandle = setTimeout(() => {
                 if (settled)
                     return;
                 forcedExit = true;
                 safeKill(child, "SIGTERM");
                 scheduleHardKill(child);
-                finishResolve();
-            }, exitGraceMs);
-            completionTimer.unref();
-        };
-        const handleLine = (line) => {
-            const normalized = line.replace(/\r$/, "");
-            hooks?.onLine?.(normalized);
-            const parsed = safeJsonParse(normalized);
-            const event = extractAssistantText(parsed);
-            if (event) {
-                if (event.kind === "delta") {
-                    message += event.text;
+                const detail = stderr.trim().length > 0 ? `: ${stderr.trim()}` : "";
+                finishReject(new Error(`AUTH_ERROR: codex CLI timed out after ${timeoutMs}ms${detail}`));
+            }, timeoutMs);
+            timeoutHandle.unref();
+            child.stdout?.setEncoding("utf8");
+            child.stdout?.on("data", (chunk) => {
+                const text = chunk.toString();
+                raw += text;
+                lineBuffer += text;
+                let idx;
+                while ((idx = lineBuffer.indexOf("\n")) !== -1) {
+                    const line = lineBuffer.slice(0, idx);
+                    lineBuffer = lineBuffer.slice(idx + 1);
+                    handleLine(line);
                 }
-                else {
-                    message = event.text;
-                    scheduleCompletionGrace();
+            });
+            child.stderr?.setEncoding("utf8");
+            child.stderr?.on("data", (chunk) => {
+                stderr += chunk.toString();
+            });
+            child.stdin?.on("error", (error) => {
+                if (settled || isIgnorableStdinError(error))
+                    return;
+                finishReject(new Error(`AUTH_ERROR: codex CLI stdin failed (${error.message})`));
+            });
+            child.on("error", (error) => {
+                finishReject(new Error(`AUTH_ERROR: codex CLI failed (${error.message})`));
+            });
+            child.on("close", (code) => {
+                if (lineBuffer.trim()) {
+                    handleLine(lineBuffer);
+                    lineBuffer = "";
                 }
-                hooks?.onAssistantEvent?.(event, normalized);
-            }
-            const parsedError = extractProtocolError(parsed);
-            if (parsedError) {
-                protocolError = parsedError;
-            }
-            if (isCompletionEvent(parsed)) {
-                scheduleCompletionGrace();
-            }
-        };
-        const timeoutHandle = setTimeout(() => {
-            if (settled)
-                return;
-            forcedExit = true;
-            safeKill(child, "SIGTERM");
-            scheduleHardKill(child);
-            const detail = stderr.trim().length > 0 ? `: ${stderr.trim()}` : "";
-            finishReject(new Error(`AUTH_ERROR: codex CLI timed out after ${timeoutMs}ms${detail}`));
-        }, timeoutMs);
-        timeoutHandle.unref();
-        child.stdout?.setEncoding("utf8");
-        child.stdout?.on("data", (chunk) => {
-            const text = chunk.toString();
-            raw += text;
-            lineBuffer += text;
-            let idx;
-            while ((idx = lineBuffer.indexOf("\n")) !== -1) {
-                const line = lineBuffer.slice(0, idx);
-                lineBuffer = lineBuffer.slice(idx + 1);
-                handleLine(line);
-            }
-        });
-        child.stderr?.setEncoding("utf8");
-        child.stderr?.on("data", (chunk) => {
-            stderr += chunk.toString();
-        });
-        child.stdin?.on("error", (error) => {
-            if (settled || isIgnorableStdinError(error))
-                return;
-            finishReject(new Error(`AUTH_ERROR: codex CLI stdin failed (${error.message})`));
-        });
-        child.on("error", (error) => {
-            finishReject(new Error(`AUTH_ERROR: codex CLI failed (${error.message})`));
-        });
-        child.on("close", (code) => {
-            if (lineBuffer.trim()) {
-                handleLine(lineBuffer);
-                lineBuffer = "";
-            }
-            if (settled)
-                return;
-            if ((code ?? 0) !== 0) {
-                finishReject(new Error(`AUTH_ERROR: codex CLI failed (exit ${code ?? 0}): ${stderr || protocolError || "no output"}`));
-                return;
+                if (settled)
+                    return;
+                if ((code ?? 0) !== 0) {
+                    finishReject(new Error(`AUTH_ERROR: codex CLI failed (exit ${code ?? 0}): ${stderr || protocolError || "no output"}`));
+                    return;
+                }
+                if (protocolError && !finalizeOutput()) {
+                    finishReject(new Error(`AUTH_ERROR: codex CLI failed (${protocolError})`));
+                    return;
+                }
+                finishResolve();
+            });
+            try {
+                child.stdin?.write(prompt);
+                child.stdin?.end();
             }
-            if (protocolError && !finalizeOutput()) {
-                finishReject(new Error(`AUTH_ERROR: codex CLI failed (${protocolError})`));
-                return;
+            catch (error) {
+                finishReject(new Error(`AUTH_ERROR: codex CLI stdin failed (${error.message})`));
             }
-            finishResolve();
         });
-        try {
-            child.stdin?.write(prompt);
-            child.stdin?.end();
-        }
-        catch (error) {
-            finishReject(new Error(`AUTH_ERROR: codex CLI stdin failed (${error.message})`));
-        }
-    });
+    }
+    finally {
+        await schemaFile?.cleanup();
+    }
 };
 export const cliHealthy = (throwOnError = false) => {
     if (process.env.MCODA_CLI_STUB === "1") {
@@ -816,17 +850,17 @@ export const cliHealthy = (throwOnError = false) => {
     }
     return { ok: true, details: { version: result.stdout?.toString().trim() } };
 };
-export const runCodexExec = async (prompt, model) => {
+export const runCodexExec = async (prompt, model, outputSchema, timeoutMs) => {
     if (process.env.MCODA_CLI_STUB === "1") {
         const output = `qa-stub:${prompt}`;
         const raw = JSON.stringify({ type: "item.completed", item: { type: "agent_message", text: output } });
         return { output, raw };
     }
     cliHealthy(true);
-    const result = await invokeCodexProcess(prompt, model);
+    const result = await invokeCodexProcess(prompt, model, { outputSchema, timeoutMs });
     return { output: result.output, raw: result.raw };
 };
-export async function* runCodexExecStream(prompt, model) {
+export async function* runCodexExecStream(prompt, model, outputSchema, timeoutMs) {
     if (process.env.MCODA_CLI_STUB === "1") {
         const output = `qa-stub:${prompt}\n`;
         const raw = JSON.stringify({ type: "item.delta", item: { type: "agent_message", text: output } });
@@ -841,28 +875,47 @@ export async function* runCodexExecStream(prompt, model) {
     let done = false;
     let failure;
     let sawDelta = false;
+    let assistantDeltaBuffer = "";
     const notify = () => {
         while (waiters.length) {
             waiters.shift()?.();
         }
     };
     void invokeCodexProcess(prompt, model, {
-        onLine: (line) => {
-            formatter.handleLine(line);
-        },
-        onAssistantEvent: (event, rawLine) => {
-            if (event.kind === "delta") {
-                sawDelta = true;
-                queue.push({ output: event.text, raw: rawLine });
-                notify();
-                return;
-            }
-            if (!sawDelta) {
-                const output = event.text.endsWith("\n") ? event.text : `${event.text}\n`;
+        outputSchema,
+        timeoutMs,
+        hooks: {
+            onLine: (line) => {
+                formatter.handleLine(line);
+            },
+            onAssistantEvent: (event, rawLine) => {
+                if (event.kind === "delta") {
+                    sawDelta = true;
+                    assistantDeltaBuffer += event.text;
+                    queue.push({ output: event.text, raw: rawLine });
+                    notify();
+                    return;
+                }
+                const finalText = event.text;
+                const bufferedText = assistantDeltaBuffer;
+                assistantDeltaBuffer = "";
+                if (!sawDelta) {
+                    const output = finalText.endsWith("\n") ? finalText : `${finalText}\n`;
+                    queue.push({ output, raw: rawLine });
+                    notify();
+                    return;
+                }
+                sawDelta = false;
+                const normalizedFinal = normalizeComparableAssistantText(finalText);
+                const normalizedBuffered = normalizeComparableAssistantText(bufferedText);
+                if (!normalizedFinal || normalizedFinal === normalizedBuffered) {
+                    return;
+                }
+                const suffix = finalText.startsWith(bufferedText) ? finalText.slice(bufferedText.length) : finalText;
+                const output = suffix.endsWith("\n") ? suffix : `${suffix}\n`;
                 queue.push({ output, raw: rawLine });
                 notify();
-            }
-            sawDelta = false;
+            },
         },
     })
         .catch((error) => {

package/dist/adapters/openai/OpenAiAdapter.d.ts

@@ -1,11 +1,30 @@
 import { AgentHealth } from "@mcoda/shared";
 import { AdapterConfig, AgentAdapter, InvocationRequest, InvocationResult } from "../AdapterTypes.js";
+type OpenAiConfig = AdapterConfig & {
+    baseUrl?: string;
+    endpoint?: string;
+    apiBaseUrl?: string;
+    headers?: Record<string, string>;
+    temperature?: number;
+    extraBody?: Record<string, unknown>;
+};
 export declare class OpenAiAdapter implements AgentAdapter {
     private config;
-    constructor(config: AdapterConfig);
+    private baseUrl;
+    private headers;
+    private temperature;
+    private extraBody;
+    constructor(config: OpenAiConfig);
     getCapabilities(): Promise<string[]>;
     healthCheck(): Promise<AgentHealth>;
     invoke(request: InvocationRequest): Promise<InvocationResult>;
     invokeStream(request: InvocationRequest): AsyncGenerator<InvocationResult, void, unknown>;
+    private assertConfig;
+    private ensureBaseUrl;
+    private ensureModel;
+    private ensureApiKey;
+    private buildHeaders;
+    private buildBody;
 }
+export {};
 //# sourceMappingURL=OpenAiAdapter.d.ts.map

package/dist/adapters/openai/OpenAiAdapter.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"OpenAiAdapter.d.ts","sourceRoot":"","sources":["../../../src/adapters/openai/OpenAiAdapter.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAE,MAAM,eAAe,CAAC;AAC5C,OAAO,EAAE,aAAa,EAAE,YAAY,EAAE,iBAAiB,EAAE,gBAAgB,EAAE,MAAM,oBAAoB,CAAC;AAEtG,qBAAa,aAAc,YAAW,YAAY;IACpC,OAAO,CAAC,MAAM;gBAAN,MAAM,EAAE,aAAa;IAEnC,eAAe,IAAI,OAAO,CAAC,MAAM,EAAE,CAAC;IAIpC,WAAW,IAAI,OAAO,CAAC,WAAW,CAAC;IAkBnC,MAAM,CAAC,OAAO,EAAE,iBAAiB,GAAG,OAAO,CAAC,gBAAgB,CAAC;IAgB5D,YAAY,CAAC,OAAO,EAAE,iBAAiB,GAAG,cAAc,CAAC,gBAAgB,EAAE,IAAI,EAAE,OAAO,CAAC;CAWjG"}
+{"version":3,"file":"OpenAiAdapter.d.ts","sourceRoot":"","sources":["../../../src/adapters/openai/OpenAiAdapter.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAE,MAAM,eAAe,CAAC;AAC5C,OAAO,EAAE,aAAa,EAAE,YAAY,EAAE,iBAAiB,EAAE,gBAAgB,EAAE,MAAM,oBAAoB,CAAC;AAwHtG,KAAK,YAAY,GAAG,aAAa,GAAG;IAClC,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,OAAO,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IACjC,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,SAAS,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;CACrC,CAAC;AAEF,qBAAa,aAAc,YAAW,YAAY;IAMpC,OAAO,CAAC,MAAM;IAL1B,OAAO,CAAC,OAAO,CAAS;IACxB,OAAO,CAAC,OAAO,CAAqC;IACpD,OAAO,CAAC,WAAW,CAAqB;IACxC,OAAO,CAAC,SAAS,CAAsC;gBAEnC,MAAM,EAAE,YAAY;IAUlC,eAAe,IAAI,OAAO,CAAC,MAAM,EAAE,CAAC;IAIpC,WAAW,IAAI,OAAO,CAAC,WAAW,CAAC;IAkBnC,MAAM,CAAC,OAAO,EAAE,iBAAiB,GAAG,OAAO,CAAC,gBAAgB,CAAC;IAwC5D,YAAY,CAAC,OAAO,EAAE,iBAAiB,GAAG,cAAc,CAAC,gBAAgB,EAAE,IAAI,EAAE,OAAO,CAAC;IAwFhG,OAAO,CAAC,YAAY;IAMpB,OAAO,CAAC,aAAa;IAIrB,OAAO,CAAC,WAAW;IAOnB,OAAO,CAAC,YAAY;IASpB,OAAO,CAAC,YAAY;IASpB,OAAO,CAAC,SAAS;CAmBlB"}

package/dist/adapters/openai/OpenAiAdapter.js

@@ -1,6 +1,123 @@
+const DEFAULT_BASE_URL = "https://api.openai.com/v1";
+const asString = (value) => (typeof value === "string" ? value : undefined);
+const resolveString = (value) => {
+    const raw = asString(value)?.trim();
+    return raw ? raw : undefined;
+};
+const isRecord = (value) => typeof value === "object" && value !== null && !Array.isArray(value);
+const normalizeBaseUrl = (value) => {
+    const str = resolveString(value);
+    if (!str)
+        return undefined;
+    return str.endsWith("/") ? str.slice(0, -1) : str;
+};
+const resolveBaseUrl = (config) => {
+    const anyConfig = config;
+    const agentConfig = config.agent?.config;
+    return (normalizeBaseUrl(anyConfig.baseUrl) ??
+        normalizeBaseUrl(anyConfig.endpoint) ??
+        normalizeBaseUrl(anyConfig.apiBaseUrl) ??
+        normalizeBaseUrl(agentConfig?.baseUrl) ??
+        normalizeBaseUrl(agentConfig?.endpoint) ??
+        normalizeBaseUrl(agentConfig?.apiBaseUrl) ??
+        DEFAULT_BASE_URL);
+};
+const extractUsage = (usage) => {
+    if (!isRecord(usage))
+        return undefined;
+    const tokensPrompt = typeof usage.prompt_tokens === "number"
+        ? usage.prompt_tokens
+        : typeof usage.promptTokens === "number"
+            ? usage.promptTokens
+            : undefined;
+    const tokensCompletion = typeof usage.completion_tokens === "number"
+        ? usage.completion_tokens
+        : typeof usage.completionTokens === "number"
+            ? usage.completionTokens
+            : undefined;
+    let tokensTotal = typeof usage.total_tokens === "number"
+        ? usage.total_tokens
+        : typeof usage.totalTokens === "number"
+            ? usage.totalTokens
+            : undefined;
+    if (tokensTotal === undefined && typeof tokensPrompt === "number" && typeof tokensCompletion === "number") {
+        tokensTotal = tokensPrompt + tokensCompletion;
+    }
+    if (tokensPrompt === undefined && tokensCompletion === undefined && tokensTotal === undefined) {
+        return undefined;
+    }
+    return { tokensPrompt, tokensCompletion, tokensTotal };
+};
+const collectContentText = (value) => {
+    const direct = asString(value);
+    if (direct !== undefined)
+        return [direct];
+    if (Array.isArray(value))
+        return value.flatMap((entry) => collectContentText(entry));
+    if (!isRecord(value))
+        return [];
+    const partType = resolveString(value.type)?.toLowerCase();
+    if (partType?.startsWith("reasoning"))
+        return [];
+    if (asString(value.text) !== undefined)
+        return [value.text];
+    if (asString(value.output_text) !== undefined)
+        return [value.output_text];
+    if (asString(value.input_text) !== undefined)
+        return [value.input_text];
+    if ("content" in value)
+        return collectContentText(value.content);
+    return [];
+};
+const collectReasoningText = (value) => {
+    const direct = asString(value);
+    if (direct !== undefined)
+        return [direct];
+    if (Array.isArray(value))
+        return value.flatMap((entry) => collectReasoningText(entry));
+    if (!isRecord(value))
+        return [];
+    const partType = resolveString(value.type)?.toLowerCase();
+    if (partType?.startsWith("reasoning")) {
+        if (asString(value.text) !== undefined)
+            return [value.text];
+        if ("content" in value)
+            return collectReasoningText(value.content);
+    }
+    const reasoningFields = [value.reasoning_content, value.reasoning_text, value.summary, value.reasoning];
+    const segments = reasoningFields.flatMap((entry) => collectReasoningText(entry));
+    if (segments.length > 0)
+        return segments;
+    return [];
+};
+const collapseText = (segments) => {
+    const joined = segments.join("");
+    const trimmed = joined.trim();
+    return trimmed ? trimmed : undefined;
+};
+const extractResponseText = (data) => {
+    const payload = isRecord(data) ? data : {};
+    const choices = Array.isArray(payload.choices) ? payload.choices : [];
+    const choice = choices[0];
+    const message = isRecord(choice) && (isRecord(choice.message) ? choice.message : isRecord(choice.delta) ? choice.delta : {})
+        ? (isRecord(choice.message) ? choice.message : choice.delta)
+        : {};
+    const content = collapseText(collectContentText(message.content ?? message));
+    const reasoning = collapseText(collectReasoningText(message.reasoning ?? message));
+    const fallback = resolveString(payload.output_text) ??
+        collapseText(collectContentText(payload.output ?? payload.response ?? payload.data));
+    return { output: content ?? reasoning ?? fallback, reasoning };
+};
 export class OpenAiAdapter {
     constructor(config) {
         this.config = config;
+        this.baseUrl = resolveBaseUrl(config);
+        this.headers = isRecord(config.headers) ? config.headers : undefined;
+        this.temperature = typeof config.temperature === "number" ? config.temperature : undefined;
+        this.extraBody = isRecord(config.extraBody)
+            ? config.extraBody
+            : undefined;
+        this.assertConfig();
     }
     async getCapabilities() {
         return this.config.capabilities;
@@ -19,33 +136,189 @@ export class OpenAiAdapter {
             status: "healthy",
             lastCheckedAt: new Date().toISOString(),
             latencyMs: 0,
-            details: { adapter: "openai-api", model: this.config.model },
+            details: { adapter: "openai-api", model: this.config.model, baseUrl: this.baseUrl },
         };
     }
     async invoke(request) {
-        const authMode = this.config.apiKey ? "api" : "none";
+        const url = this.ensureBaseUrl();
+        const model = this.ensureModel();
+        const apiKey = this.ensureApiKey();
+        const resp = await fetch(`${url}/chat/completions`, {
+            method: "POST",
+            headers: this.buildHeaders(apiKey, false),
+            body: JSON.stringify(this.buildBody(request.input, model, false)),
+        });
+        if (!resp.ok) {
+            const text = await resp.text().catch(() => "");
+            throw new Error(`OpenAI chat completions failed (${resp.status}): ${text}`);
+        }
+        const data = await resp.json().catch(() => ({}));
+        const usage = extractUsage(isRecord(data) ? data.usage : undefined);
+        const { output, reasoning } = extractResponseText(data);
         return {
-            output: `openai-stub:${request.input}`,
+            output: (output ?? JSON.stringify(data)).trim(),
             adapter: this.config.adapter ?? "openai-api",
-            model: this.config.model,
+            model,
             metadata: {
-                mode: authMode,
+                mode: "api",
                 capabilities: this.config.capabilities,
                 prompts: this.config.prompts,
-                authMode,
+                authMode: "api",
                 adapterType: this.config.adapter ?? "openai-api",
+                baseUrl: url,
+                usage: isRecord(data) ? data.usage : undefined,
+                tokensPrompt: usage?.tokensPrompt,
+                tokensCompletion: usage?.tokensCompletion,
+                tokensTotal: usage?.tokensTotal,
+                tokens_prompt: usage?.tokensPrompt,
+                tokens_completion: usage?.tokensCompletion,
+                tokens_total: usage?.tokensTotal,
+                reasoning,
             },
         };
     }
     async *invokeStream(request) {
-        yield {
-            output: `openai-stream:${request.input}`,
-            adapter: this.config.adapter ?? "openai-api",
-            model: this.config.model,
-            metadata: {
-                mode: this.config.apiKey ? "api" : "none",
-                streaming: true,
-            },
+        const url = this.ensureBaseUrl();
+        const model = this.ensureModel();
+        const apiKey = this.ensureApiKey();
+        const resp = await fetch(`${url}/chat/completions`, {
+            method: "POST",
+            headers: this.buildHeaders(apiKey, true),
+            body: JSON.stringify(this.buildBody(request.input, model, true)),
+        });
+        if (!resp.ok || !resp.body) {
+            const text = !resp.ok ? await resp.text().catch(() => "") : "";
+            throw new Error(`OpenAI chat completions (stream) failed (${resp.status}): ${text}`);
+        }
+        const reader = resp.body.getReader();
+        const decoder = new TextDecoder();
+        let buffer = "";
+        let latestUsage;
+        const buildChunk = (payload) => {
+            const data = JSON.parse(payload);
+            const usage = extractUsage(isRecord(data) ? data.usage : undefined);
+            if (usage)
+                latestUsage = usage;
+            const { output, reasoning } = extractResponseText(data);
+            if (!output && !usage)
+                return null;
+            return {
+                output: output ?? "",
+                adapter: this.config.adapter ?? "openai-api",
+                model,
+                metadata: {
+                    mode: "api",
+                    authMode: "api",
+                    adapterType: this.config.adapter ?? "openai-api",
+                    baseUrl: url,
+                    capabilities: this.config.capabilities,
+                    prompts: this.config.prompts,
+                    streaming: true,
+                    usage: isRecord(data) ? data.usage : undefined,
+                    tokensPrompt: latestUsage?.tokensPrompt,
+                    tokensCompletion: latestUsage?.tokensCompletion,
+                    tokensTotal: latestUsage?.tokensTotal,
+                    tokens_prompt: latestUsage?.tokensPrompt,
+                    tokens_completion: latestUsage?.tokensCompletion,
+                    tokens_total: latestUsage?.tokensTotal,
+                    reasoning,
+                    raw: payload,
+                },
+            };
+        };
+        while (true) {
+            const { value, done } = await reader.read();
+            if (done)
+                break;
+            buffer += decoder.decode(value, { stream: true });
+            let idx;
+            while ((idx = buffer.indexOf("\n")) !== -1) {
+                const line = buffer.slice(0, idx).trim();
+                buffer = buffer.slice(idx + 1);
+                if (!line || !line.startsWith("data:"))
+                    continue;
+                const payload = line.slice(5).trim();
+                if (!payload)
+                    continue;
+                if (payload === "[DONE]")
+                    return;
+                try {
+                    const chunk = buildChunk(payload);
+                    if (chunk)
+                        yield chunk;
+                }
+                catch {
+                    // Ignore malformed SSE lines and continue streaming.
+                }
+            }
+        }
+        const tail = buffer.trim();
+        if (!tail)
+            return;
+        const lines = tail.split(/\r?\n/).filter((line) => line.trim().length > 0);
+        for (const line of lines) {
+            const trimmed = line.trim();
+            if (!trimmed.startsWith("data:"))
+                continue;
+            const payload = trimmed.slice(5).trim();
+            if (!payload || payload === "[DONE]")
+                continue;
+            try {
+                const chunk = buildChunk(payload);
+                if (chunk)
+                    yield chunk;
+            }
+            catch {
+                // Ignore malformed SSE lines and continue streaming.
+            }
+        }
+    }
+    assertConfig() {
+        if (!/^https?:\/\//i.test(this.baseUrl)) {
+            throw new Error("OpenAI baseUrl must start with http:// or https://");
+        }
+    }
+    ensureBaseUrl() {
+        return this.baseUrl;
+    }
+    ensureModel() {
+        if (!this.config.model) {
+            throw new Error("OpenAI model is not configured for this agent");
+        }
+        return this.config.model;
+    }
+    ensureApiKey() {
+        if (!this.config.apiKey) {
+            throw new Error(`AUTH_REQUIRED: OpenAI API key missing; run \`mcoda agent auth set ${this.config.agent.slug ?? this.config.agent.id}\``);
+        }
+        return this.config.apiKey;
+    }
+    buildHeaders(apiKey, streaming) {
+        return {
+            Authorization: `Bearer ${apiKey}`,
+            "Content-Type": "application/json",
+            Accept: streaming ? "text/event-stream" : "application/json",
+            ...(this.headers ?? {}),
+        };
+    }
+    buildBody(input, model, stream) {
+        const body = {
+            model,
+            messages: [{ role: "user", content: input }],
+            stream,
         };
+        if (typeof this.temperature === "number") {
+            body.temperature = this.temperature;
+        }
+        if (this.extraBody) {
+            for (const [key, value] of Object.entries(this.extraBody)) {
+                if (body[key] === undefined)
+                    body[key] = value;
+            }
+        }
+        if (stream && body.stream_options === undefined) {
+            body.stream_options = { include_usage: true };
+        }
+        return body;
     }
 }

package/dist/adapters/zhipu/ZhipuApiAdapter.d.ts

@@ -4,7 +4,7 @@ type ZhipuConfig = AdapterConfig & {
     baseUrl?: string;
     headers?: Record<string, string>;
     temperature?: number;
-    thinking?: boolean;
+    thinking?: boolean | Record<string, unknown>;
     extraBody?: Record<string, unknown>;
 };
 export declare class ZhipuApiAdapter implements AgentAdapter {

package/dist/adapters/zhipu/ZhipuApiAdapter.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"ZhipuApiAdapter.d.ts","sourceRoot":"","sources":["../../../src/adapters/zhipu/ZhipuApiAdapter.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAE,MAAM,eAAe,CAAC;AAC5C,OAAO,EAAE,aAAa,EAAE,YAAY,EAAE,iBAAiB,EAAE,gBAAgB,EAAE,MAAM,oBAAoB,CAAC;AA0CtG,KAAK,WAAW,GAAG,aAAa,GAAG;IACjC,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,OAAO,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IACjC,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,QAAQ,CAAC,EAAE,OAAO,CAAC;IACnB,SAAS,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;CACrC,CAAC;AAEF,qBAAa,eAAgB,YAAW,YAAY;IAOtC,OAAO,CAAC,MAAM;IAN1B,OAAO,CAAC,OAAO,CAAS;IACxB,OAAO,CAAC,OAAO,CAAqC;IACpD,OAAO,CAAC,WAAW,CAAqB;IACxC,OAAO,CAAC,QAAQ,CAAsB;IACtC,OAAO,CAAC,SAAS,CAAsC;gBAEnC,MAAM,EAAE,WAAW;IASjC,eAAe,IAAI,OAAO,CAAC,MAAM,EAAE,CAAC;IAIpC,WAAW,IAAI,OAAO,CAAC,WAAW,CAAC;IAkBnC,MAAM,CAAC,OAAO,EAAE,iBAAiB,GAAG,OAAO,CAAC,gBAAgB,CAAC;IA2C5D,YAAY,CAAC,OAAO,EAAE,iBAAiB,GAAG,cAAc,CAAC,gBAAgB,EAAE,IAAI,EAAE,OAAO,CAAC;IA2FhG,OAAO,CAAC,YAAY;IAMpB,OAAO,CAAC,aAAa;IAIrB,OAAO,CAAC,WAAW;IAOnB,OAAO,CAAC,YAAY;IAOpB,OAAO,CAAC,YAAY;IASpB,OAAO,CAAC,SAAS;CAgBlB"}
+{"version":3,"file":"ZhipuApiAdapter.d.ts","sourceRoot":"","sources":["../../../src/adapters/zhipu/ZhipuApiAdapter.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAE,MAAM,eAAe,CAAC;AAC5C,OAAO,EAAE,aAAa,EAAE,YAAY,EAAE,iBAAiB,EAAE,gBAAgB,EAAE,MAAM,oBAAoB,CAAC;AA0DtG,KAAK,WAAW,GAAG,aAAa,GAAG;IACjC,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,OAAO,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IACjC,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,QAAQ,CAAC,EAAE,OAAO,GAAG,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;IAC7C,SAAS,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;CACrC,CAAC;AAEF,qBAAa,eAAgB,YAAW,YAAY;IAOtC,OAAO,CAAC,MAAM;IAN1B,OAAO,CAAC,OAAO,CAAS;IACxB,OAAO,CAAC,OAAO,CAAqC;IACpD,OAAO,CAAC,WAAW,CAAqB;IACxC,OAAO,CAAC,QAAQ,CAAsC;IACtD,OAAO,CAAC,SAAS,CAAsC;gBAEnC,MAAM,EAAE,WAAW;IASjC,eAAe,IAAI,OAAO,CAAC,MAAM,EAAE,CAAC;IAIpC,WAAW,IAAI,OAAO,CAAC,WAAW,CAAC;IAkBnC,MAAM,CAAC,OAAO,EAAE,iBAAiB,GAAG,OAAO,CAAC,gBAAgB,CAAC;IA2C5D,YAAY,CAAC,OAAO,EAAE,iBAAiB,GAAG,cAAc,CAAC,gBAAgB,EAAE,IAAI,EAAE,OAAO,CAAC;IA2FhG,OAAO,CAAC,YAAY;IAMpB,OAAO,CAAC,aAAa;IAIrB,OAAO,CAAC,WAAW;IAOnB,OAAO,CAAC,YAAY;IAOpB,OAAO,CAAC,YAAY;IASpB,OAAO,CAAC,SAAS;CAgBlB"}

package/dist/adapters/zhipu/ZhipuApiAdapter.js

@@ -1,4 +1,5 @@
 const DEFAULT_BASE_URL = "https://open.bigmodel.cn/api/paas/v4";
+const DEFAULT_CODING_BASE_URL = "https://open.bigmodel.cn/api/coding/paas/v4";
 const DEFAULT_TEMPERATURE = 0.1;
 const normalizeBaseUrl = (value) => {
     if (!value)
@@ -9,6 +10,20 @@ const normalizeBaseUrl = (value) => {
     return str.endsWith("/") ? str.slice(0, -1) : str;
 };
 const isRecord = (value) => typeof value === "object" && value !== null && !Array.isArray(value);
+const usesCodingBaseUrl = (model) => {
+    if (!model)
+        return false;
+    const normalized = model.trim().toLowerCase();
+    return normalized === "glm-4.7" || normalized.startsWith("glm-4.7-");
+};
+const defaultBaseUrlForModel = (model) => usesCodingBaseUrl(model) ? DEFAULT_CODING_BASE_URL : DEFAULT_BASE_URL;
+const normalizeThinking = (value) => {
+    if (value === true)
+        return { type: "enabled" };
+    if (value === false)
+        return { type: "disabled" };
+    return isRecord(value) && Object.keys(value).length > 0 ? value : undefined;
+};
 const extractUsage = (usage) => {
     if (!usage || typeof usage !== "object")
         return undefined;
@@ -37,10 +52,10 @@ const extractUsage = (usage) => {
 export class ZhipuApiAdapter {
     constructor(config) {
         this.config = config;
-        this.baseUrl = normalizeBaseUrl(config.baseUrl) ?? DEFAULT_BASE_URL;
+        this.baseUrl = normalizeBaseUrl(config.baseUrl) ?? defaultBaseUrlForModel(config.model);
         this.headers = isRecord(config.headers) ? config.headers : undefined;
         this.temperature = typeof config.temperature === "number" ? config.temperature : undefined;
-        this.thinking = typeof config.thinking === "boolean" ? config.thinking : undefined;
+        this.thinking = normalizeThinking(config.thinking);
         this.extraBody = isRecord(config.extraBody) ? config.extraBody : undefined;
         this.assertConfig();
     }
@@ -242,7 +257,7 @@ export class ZhipuApiAdapter {
         const temperature = this.temperature ?? DEFAULT_TEMPERATURE;
         if (typeof temperature === "number")
             body.temperature = temperature;
-        if (typeof this.thinking === "boolean")
+        if (this.thinking)
             body.thinking = this.thinking;
         if (this.extraBody) {
             for (const [key, value] of Object.entries(this.extraBody)) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mcoda/agents",
-  "version": "0.1.36",
+  "version": "0.1.38",
   "description": "Agent registry and capabilities for mcoda.",
   "type": "module",
   "main": "dist/index.js",
@@ -30,8 +30,8 @@
     "access": "public"
   },
   "dependencies": {
-    "@mcoda/shared": "0.1.36",
-    "@mcoda/db": "0.1.36"
+    "@mcoda/shared": "0.1.38",
+    "@mcoda/db": "0.1.38"
   },
   "scripts": {
     "build": "tsc -p tsconfig.json",