@minniexcode/codex-switch 0.1.4 → 0.2.0

package/dist/runtime/copilot-adapter.js

@@ -174,6 +174,7 @@ async function createCopilotSession(runtimeClient, payload) {
     try {
         const session = await Promise.resolve(createSession({
             model: typeof payload.model === "string" ? payload.model : undefined,
+            streaming: true,
             ...createSessionOptions(runtimeClient.sdk),
         }));
         if (!session || typeof session !== "object") {
@@ -208,7 +209,16 @@ async function sendSessionRequest(session, prompt, timeoutMs, onStreamEvent) {
             onStreamEvent?.({ type: "delta", delta });
         }
     };
+    const runtimeHandler = (event) => {
+        for (const runtimeEvent of mapCopilotRuntimeEvent(event)) {
+            onStreamEvent?.({ type: "runtime", event: runtimeEvent });
+            if (runtimeEvent.type === "assistant.message_delta" && runtimeEvent.text.length > 0) {
+                onStreamEvent?.({ type: "delta", delta: runtimeEvent.text });
+            }
+        }
+    };
     if (onStreamEvent && session.on) {
+        session.on("event", runtimeHandler);
         session.on("data", deltaHandler);
         session.on("message", deltaHandler);
         session.on("delta", deltaHandler);
@@ -225,6 +235,7 @@ async function sendSessionRequest(session, prompt, timeoutMs, onStreamEvent) {
     }
     finally {
         if (onStreamEvent && session.off) {
+            session.off("event", runtimeHandler);
             session.off("data", deltaHandler);
             session.off("message", deltaHandler);
             session.off("delta", deltaHandler);
@@ -329,7 +340,12 @@ async function stopCopilotClient(client) {
 async function abortCopilotSession(session) {
     const abort = resolveCallable(session, "abort");
     if (abort) {
-        await Promise.resolve(abort());
+        try {
+            await Promise.resolve(abort());
+        }
+        catch {
+            // Session may already be closed or unknown — safe to ignore
+        }
     }
 }
 async function disconnectCopilotSession(session) {
@@ -395,6 +411,115 @@ function extractDelta(event) {
     }
     return null;
 }
+/**
+ * Maps SDK session events into the bridge's stable process-event contract.
+ */
+function mapCopilotRuntimeEvent(event) {
+    if (!event || typeof event !== "object") {
+        return [];
+    }
+    const record = event;
+    const sdkType = readString(record, ["type", "event", "name", "eventName"]) ?? "unknown";
+    const normalizedType = sdkType.replace(/_/g, ".").toLowerCase();
+    const text = readString(record, ["text", "delta", "content", "message", "summary", "description"]);
+    const name = readString(record, ["toolName", "tool", "name"]);
+    const requestId = readString(record, ["requestId", "id", "callId"]);
+    const kind = readString(record, ["kind", "permission", "permissionKind"]);
+    const success = readBoolean(record, ["success", "ok"]);
+    const approved = readBoolean(record, ["approved", "allowed", "accepted"]);
+    const summary = truncateForBridgeLog(text ?? summarizeUnknownObject(record), 600);
+    if (normalizedType === "assistant.intent") {
+        return [{ type: "assistant.intent", text: summary }];
+    }
+    if (normalizedType === "assistant.message.delta" || normalizedType === "assistant.message_delta") {
+        return [{ type: "assistant.message_delta", text: text ?? "" }];
+    }
+    if (normalizedType === "assistant.reasoning.delta" || normalizedType === "assistant.reasoning_delta" || normalizedType === "reasoning.delta") {
+        return [{ type: "assistant.reasoning_delta", text: summary }];
+    }
+    if (normalizedType === "tool.execution.start" || normalizedType === "tool.execution_start") {
+        return [{ type: "tool.execution_start", name, requestId, summary: summary || `Tool started: ${name ?? "unknown"}` }];
+    }
+    if (normalizedType === "tool.execution.progress" || normalizedType === "tool.execution_progress") {
+        return [{ type: "tool.execution_progress", name, requestId, summary }];
+    }
+    if (normalizedType === "tool.execution.partial.result" || normalizedType === "tool.execution.partial_result") {
+        return [{ type: "tool.execution_partial_result", name, requestId, summary }];
+    }
+    if (normalizedType === "tool.execution.complete" || normalizedType === "tool.execution_complete") {
+        return [{ type: "tool.execution_complete", name, requestId, success, summary: summary || `Tool completed: ${name ?? "unknown"}` }];
+    }
+    if (normalizedType === "permission.requested" || normalizedType === "permission.request") {
+        return [{ type: "permission.requested", kind, requestId, summary: summary || `Copilot requested permission: ${kind ?? "unknown"}` }];
+    }
+    if (normalizedType === "permission.completed" || normalizedType === "permission.complete") {
+        return [{ type: "permission.completed", kind, requestId, approved, summary }];
+    }
+    if (normalizedType === "user.input.requested" || normalizedType === "user.input_request" || normalizedType === "user_input.requested") {
+        return [{ type: "user_input.requested", requestId, summary }];
+    }
+    if (normalizedType === "exit.plan.mode.requested" || normalizedType === "exit_plan_mode.requested") {
+        return [{ type: "exit_plan_mode.requested", requestId, summary }];
+    }
+    if (normalizedType === "session.error" || normalizedType === "error") {
+        return [{ type: "session.error", summary }];
+    }
+    if (normalizedType === "session.idle" || normalizedType === "idle") {
+        return [{ type: "session.idle", summary: summary || "Copilot session is idle." }];
+    }
+    return [{ type: "session.unknown", sdkType, summary }];
+}
+function readString(record, keys) {
+    for (const key of keys) {
+        const value = record[key];
+        if (typeof value === "string" && value.length > 0) {
+            return value;
+        }
+        if (value && typeof value === "object") {
+            const nested = value;
+            for (const nestedKey of ["name", "id", "text", "content", "message", "summary"]) {
+                if (typeof nested[nestedKey] === "string" && nested[nestedKey].length > 0) {
+                    return nested[nestedKey];
+                }
+            }
+        }
+    }
+    return undefined;
+}
+function readBoolean(record, keys) {
+    for (const key of keys) {
+        if (typeof record[key] === "boolean") {
+            return record[key];
+        }
+    }
+    return undefined;
+}
+function summarizeUnknownObject(record) {
+    return JSON.stringify(record, (key, value) => {
+        if (isSensitiveKey(key)) {
+            return "[redacted]";
+        }
+        if (typeof value === "string") {
+            return redactSensitiveText(value);
+        }
+        return value;
+    });
+}
+function redactSensitiveText(value) {
+    if (/api[_-]?key|token|authorization|bearer\s+|sk-[a-z0-9_-]+/i.test(value)) {
+        return "[redacted]";
+    }
+    return value;
+}
+function isSensitiveKey(key) {
+    return /^(api[_-]?key|token|access[_-]?token|refresh[_-]?token|authorization|secret|password)$/i.test(key);
+}
+function truncateForBridgeLog(value, maxLength) {
+    if (value.length <= maxLength) {
+        return value;
+    }
+    return `${value.slice(0, maxLength)}... [truncated]`;
+}
 function isAuthReady(status) {
     if (status === true) {
         return true;

package/dist/runtime/copilot-bridge-worker.js

@@ -43,6 +43,9 @@ async function main() {
                 if (event.type === "delta") {
                     options?.onTextDelta?.(event.delta);
                 }
+                else if (event.type === "runtime") {
+                    options?.onRuntimeEvent?.(event.event);
+                }
                 else {
                     options?.onTextDone?.(event.text);
                 }

package/dist/runtime/copilot-bridge.js

@@ -163,13 +163,13 @@ async function probeCopilotBridgeRuntime(provider, persistedState, runtimeDir) {
 /**
  * Starts or reuses a Copilot bridge worker, then verifies its health before returning.
  */
-async function ensureCopilotBridge(providerName, provider, runtimeDir, runtimesDir) {
-    return startOrReuseCopilotBridge(providerName, provider, runtimeDir, runtimesDir);
+async function ensureCopilotBridge(providerName, provider, runtimeDir, runtimesDir, toolHomeDir) {
+    return startOrReuseCopilotBridge(providerName, provider, runtimeDir, runtimesDir, toolHomeDir);
 }
 /**
  * Starts or reuses a Copilot bridge worker and reports the chosen port.
  */
-async function startOrReuseCopilotBridge(providerName, provider, runtimeDir, runtimesDir) {
+async function startOrReuseCopilotBridge(providerName, provider, runtimeDir, runtimesDir, toolHomeDir) {
     if (!(0, providers_1.isCopilotBridgeProvider)(provider)) {
         throw (0, errors_1.cliError)("RUNTIME_PROVIDER_INVALID", "Provider is not backed by a Copilot bridge runtime.", {
             provider: providerName,
@@ -221,7 +221,7 @@ async function startOrReuseCopilotBridge(providerName, provider, runtimeDir, run
     }
     const selectedPort = await selectBridgePort(runtime.bridgeHost, runtime.bridgePort);
     const selectedBaseUrl = `http://${runtime.bridgeHost}:${selectedPort}${runtime.bridgePath}`;
-    const workerPath = path.join(__dirname, "copilot-bridge-worker.js");
+    const workerPath = path.join(__dirname, "copilot-http-bridge-worker.js");
     ensureBridgeLogFile(logPath);
     appendBridgeLifecycleLog(logPath, `worker start provider=${providerName} host=${runtime.bridgeHost} port=${String(selectedPort)} replaced=${String(replaced)}`);
     let child;
@@ -239,6 +239,7 @@ async function startOrReuseCopilotBridge(providerName, provider, runtimeDir, run
                 CODEX_SWITCH_RUNTIME_DIR: runtimeDir ?? "",
                 CODEX_SWITCH_RUNTIMES_DIR: runtimesDir ?? "",
                 CODEX_SWITCH_BRIDGE_LOG_PATH: logPath,
+                CODEX_SWITCH_TOOL_HOME_DIR: toolHomeDir ?? "",
             },
         });
     }
@@ -349,23 +350,27 @@ function createCopilotBridgeRequestHandler(context) {
                         connection: "keep-alive",
                     });
                     const heartbeat = startSseHeartbeat(response);
-                    const payload = await context.executeChatCompletion(body, {
-                        timeoutMs,
-                        onTextDelta: (delta) => {
-                            response.write(`data: ${JSON.stringify({
-                                choices: [
-                                    {
-                                        index: 0,
-                                        delta: { content: delta },
-                                        finish_reason: null,
-                                    },
-                                ],
-                            })}\n\n`);
-                        },
-                    });
-                    clearInterval(heartbeat);
-                    response.write("data: [DONE]\n\n");
-                    response.end();
+                    try {
+                        const payload = await context.executeChatCompletion(body, {
+                            timeoutMs,
+                            onTextDelta: (delta) => {
+                                response.write(`data: ${JSON.stringify({
+                                    choices: [
+                                        {
+                                            index: 0,
+                                            delta: { content: delta },
+                                            finish_reason: null,
+                                        },
+                                    ],
+                                })}\n\n`);
+                            },
+                        });
+                        response.write("data: [DONE]\n\n");
+                        response.end();
+                    }
+                    finally {
+                        clearInterval(heartbeat);
+                    }
                     return;
                 }
                 const payload = await context.executeChatCompletion(body, { timeoutMs });
@@ -389,28 +394,36 @@ function createCopilotBridgeRequestHandler(context) {
                     const responseId = `resp_${Date.now()}`;
                     const messageId = buildResponsesMessageId(responseId);
                     writeResponsesStreamStart(response, responseId, normalized.model, messageId);
+                    writeResponsesReasoningPartAdded(response, responseId);
                     const heartbeat = startSseHeartbeat(response);
                     let text = "";
-                    const payload = await context.executeChatCompletion(chatPayload, {
-                        timeoutMs: normalized.timeoutMs,
-                        onTextDelta: (delta) => {
-                            text += delta;
-                            writeResponsesTextDelta(response, messageId, delta);
-                        },
-                        onTextDone: (doneText) => {
-                            if (text.length === 0) {
-                                text = doneText;
-                                writeResponsesTextDelta(response, messageId, doneText);
-                            }
-                        },
-                    });
-                    clearInterval(heartbeat);
-                    const outputText = text || getChatCompletionText(payload);
-                    if (text.length === 0 && outputText.length > 0) {
-                        writeResponsesTextDelta(response, messageId, outputText);
+                    try {
+                        const payload = await context.executeChatCompletion(chatPayload, {
+                            timeoutMs: normalized.timeoutMs,
+                            onTextDelta: (delta) => {
+                                text += delta;
+                                writeResponsesTextDelta(response, messageId, delta);
+                            },
+                            onTextDone: (doneText) => {
+                                if (text.length === 0) {
+                                    text = doneText;
+                                    writeResponsesTextDelta(response, messageId, doneText);
+                                }
+                            },
+                            onRuntimeEvent: (event) => {
+                                writeResponsesRuntimeEvent(response, responseId, event);
+                            },
+                        });
+                        const outputText = text || getChatCompletionText(payload);
+                        if (text.length === 0 && outputText.length > 0) {
+                            writeResponsesTextDelta(response, messageId, outputText);
+                        }
+                        writeResponsesStreamDone(response, responseId, normalized.model, messageId, outputText);
+                        response.end();
+                    }
+                    finally {
+                        clearInterval(heartbeat);
                     }
-                    writeResponsesStreamDone(response, responseId, normalized.model, messageId, outputText);
-                    response.end();
                     return;
                 }
                 const payload = await context.executeChatCompletion(chatPayload, {
@@ -429,9 +442,15 @@ function createCopilotBridgeRequestHandler(context) {
             response.end(JSON.stringify({ error: { message: "Not found" } }));
         }
         catch (error) {
-            const statusCode = mapBridgeErrorStatus(error);
-            response.writeHead(statusCode, { "content-type": "application/json" });
-            response.end(JSON.stringify({ error: { message: error instanceof Error ? error.message : String(error), code: isCliError(error) ? error.code : "BRIDGE_RUNTIME_FAILURE" } }));
+            if (!response.headersSent) {
+                const statusCode = mapBridgeErrorStatus(error);
+                response.writeHead(statusCode, { "content-type": "application/json" });
+                response.end(JSON.stringify({ error: { message: error instanceof Error ? error.message : String(error), code: isCliError(error) ? error.code : "BRIDGE_RUNTIME_FAILURE" } }));
+            }
+            else if (!response.writableEnded) {
+                response.write(`data: ${JSON.stringify({ error: { message: error instanceof Error ? error.message : String(error), code: isCliError(error) ? error.code : "BRIDGE_RUNTIME_FAILURE" } })}\n\n`);
+                response.end();
+            }
         }
     };
 }
@@ -628,7 +647,7 @@ function writeResponsesStream(response, payload) {
     });
     writeSseEvent(response, "response.output_item.added", {
         type: "response.output_item.added",
-        output_index: 0,
+        output_index: 1,
         item: {
             id: messageId,
             type: "message",
@@ -640,7 +659,7 @@ function writeResponsesStream(response, payload) {
     writeSseEvent(response, "response.content_part.added", {
         type: "response.content_part.added",
         item_id: messageId,
-        output_index: 0,
+        output_index: 1,
         content_index: 0,
         part: {
             type: "output_text",
@@ -651,21 +670,21 @@ function writeResponsesStream(response, payload) {
     writeSseEvent(response, "response.output_text.delta", {
         type: "response.output_text.delta",
         item_id: messageId,
-        output_index: 0,
+        output_index: 1,
         content_index: 0,
         delta: outputText,
     });
     writeSseEvent(response, "response.output_text.done", {
         type: "response.output_text.done",
         item_id: messageId,
-        output_index: 0,
+        output_index: 1,
         content_index: 0,
         text: outputText,
     });
     writeSseEvent(response, "response.content_part.done", {
         type: "response.content_part.done",
         item_id: messageId,
-        output_index: 0,
+        output_index: 1,
         content_index: 0,
         part: {
             type: "output_text",
@@ -675,7 +694,7 @@ function writeResponsesStream(response, payload) {
     });
     writeSseEvent(response, "response.output_item.done", {
         type: "response.output_item.done",
-        output_index: 0,
+        output_index: 1,
         item: completedMessage,
     });
     writeSseEvent(response, "response.completed", {
@@ -707,7 +726,7 @@ function writeResponsesStreamStart(response, responseId, model, messageId) {
     });
     writeSseEvent(response, "response.output_item.added", {
         type: "response.output_item.added",
-        output_index: 0,
+        output_index: 1,
         item: {
             id: messageId,
             type: "message",
@@ -719,7 +738,7 @@ function writeResponsesStreamStart(response, responseId, model, messageId) {
     writeSseEvent(response, "response.content_part.added", {
         type: "response.content_part.added",
         item_id: messageId,
-        output_index: 0,
+        output_index: 1,
         content_index: 0,
         part: {
             type: "output_text",
@@ -735,7 +754,7 @@ function writeResponsesTextDelta(response, messageId, delta) {
     writeSseEvent(response, "response.output_text.delta", {
         type: "response.output_text.delta",
         item_id: messageId,
-        output_index: 0,
+        output_index: 1,
         content_index: 0,
         delta,
     });
@@ -757,14 +776,14 @@ function writeResponsesStreamDone(response, responseId, model, messageId, output
     writeSseEvent(response, "response.output_text.done", {
         type: "response.output_text.done",
         item_id: messageId,
-        output_index: 0,
+        output_index: 1,
         content_index: 0,
         text: outputText,
     });
     writeSseEvent(response, "response.content_part.done", {
         type: "response.content_part.done",
         item_id: messageId,
-        output_index: 0,
+        output_index: 1,
         content_index: 0,
         part: {
             type: "output_text",
@@ -774,7 +793,7 @@ function writeResponsesStreamDone(response, responseId, model, messageId, output
     });
     writeSseEvent(response, "response.output_item.done", {
         type: "response.output_item.done",
-        output_index: 0,
+        output_index: 1,
         item: completedMessage,
     });
     writeSseEvent(response, "response.completed", {
@@ -790,9 +809,132 @@ function writeResponsesStreamDone(response, responseId, model, messageId, output
         },
     });
 }
+function writeResponsesRuntimeEvent(response, responseId, event) {
+    if (event.type === "assistant.message_delta") {
+        return;
+    }
+    if (event.type === "session.unknown") {
+        process.stderr.write(`[${new Date().toISOString()}] bridge runtime event ignored type=${event.sdkType ?? "unknown"} summary=${truncateBridgeText(event.summary ?? "", 240)}\n`);
+        return;
+    }
+    const text = formatRuntimeEventText(event);
+    if (text.length === 0) {
+        return;
+    }
+    writeResponsesReasoningDelta(response, responseId, text);
+    writeResponsesCommentaryItem(response, responseId, text);
+    process.stderr.write(`[${new Date().toISOString()}] bridge runtime event type=${event.type} summary=${truncateBridgeText(text, 240)}\n`);
+}
+function writeResponsesReasoningDelta(response, responseId, text) {
+    const reasoningId = `${responseId}_rs_0`;
+    writeSseEvent(response, "response.reasoning_summary_text.delta", {
+        type: "response.reasoning_summary_text.delta",
+        item_id: reasoningId,
+        output_index: 0,
+        summary_index: 0,
+        delta: text,
+    });
+}
+function writeResponsesReasoningPartAdded(response, responseId) {
+    const reasoningId = `${responseId}_rs_0`;
+    writeSseEvent(response, "response.output_item.added", {
+        type: "response.output_item.added",
+        output_index: 0,
+        item: {
+            id: reasoningId,
+            type: "reasoning",
+            status: "in_progress",
+            summary: [],
+        },
+    });
+    writeSseEvent(response, "response.reasoning_summary_part.added", {
+        type: "response.reasoning_summary_part.added",
+        item_id: reasoningId,
+        output_index: 0,
+        summary_index: 0,
+        part: {
+            type: "summary_text",
+            text: "",
+        },
+    });
+}
+function writeResponsesCommentaryItem(response, responseId, text) {
+    const itemId = `${responseId}_commentary_${Date.now()}_${Math.floor(Math.random() * 100000)}`;
+    writeSseEvent(response, "response.output_item.done", {
+        type: "response.output_item.done",
+        output_index: 1,
+        item: {
+            id: itemId,
+            type: "message",
+            status: "completed",
+            role: "assistant",
+            phase: "commentary",
+            content: [
+                {
+                    type: "output_text",
+                    text,
+                    annotations: [],
+                },
+            ],
+        },
+    });
+}
+function formatRuntimeEventText(event) {
+    switch (event.type) {
+        case "assistant.intent":
+            return truncateBridgeText(event.text ?? "", 600);
+        case "assistant.reasoning_delta":
+            return truncateBridgeText(event.text ?? "", 600);
+        case "tool.execution_start":
+            return truncateBridgeText(`Copilot started ${formatToolName(event.name)}${formatRequestId(event.requestId)}${formatSummarySuffix(event.summary)}`, 600);
+        case "tool.execution_progress":
+            return truncateBridgeText(`Copilot progress ${formatToolName(event.name)}${formatRequestId(event.requestId)}${formatSummarySuffix(event.summary)}`, 600);
+        case "tool.execution_partial_result":
+            return truncateBridgeText(`Copilot partial result ${formatToolName(event.name)}${formatRequestId(event.requestId)}${formatSummarySuffix(event.summary)}`, 600);
+        case "tool.execution_complete":
+            return truncateBridgeText(`Copilot ${event.success === false ? "failed" : "completed"} ${formatToolName(event.name)}${formatRequestId(event.requestId)}${formatSummarySuffix(event.summary)}`, 600);
+        case "permission.requested":
+            return truncateBridgeText(`Copilot requested permission${event.kind ? `: ${event.kind}` : ""}${formatRequestId(event.requestId)}${formatSummarySuffix(event.summary)}`, 600);
+        case "permission.completed":
+            return truncateBridgeText(`Copilot permission ${event.approved === false ? "denied" : "approved"}${event.kind ? `: ${event.kind}` : ""}${formatRequestId(event.requestId)}${formatSummarySuffix(event.summary)}`, 600);
+        case "user_input.requested":
+            return truncateBridgeText(`Copilot requested user input${formatRequestId(event.requestId)}${formatSummarySuffix(event.summary)}`, 600);
+        case "exit_plan_mode.requested":
+            return truncateBridgeText(`Copilot requested to exit plan mode${formatRequestId(event.requestId)}${formatSummarySuffix(event.summary)}`, 600);
+        case "session.error":
+            return truncateBridgeText(`Copilot session error${formatSummarySuffix(event.summary)}`, 600);
+        case "session.idle":
+            return truncateBridgeText(event.summary ?? "", 600);
+        case "assistant.message_delta":
+        case "session.unknown":
+            return "";
+        default:
+            return "";
+    }
+}
+function formatToolName(name) {
+    return name ? `tool ${name}` : "tool";
+}
+function formatRequestId(requestId) {
+    return requestId ? ` (${requestId})` : "";
+}
+function formatSummarySuffix(summary) {
+    if (!summary || summary.length === 0) {
+        return "";
+    }
+    return `: ${summary}`;
+}
+function truncateBridgeText(value, maxLength) {
+    if (value.length <= maxLength) {
+        return value;
+    }
+    return `${value.slice(0, maxLength)}... [truncated]`;
+}
 function startSseHeartbeat(response) {
     return setInterval(() => {
-        response.write(": keep-alive\n\n");
+        if (!response.writableEnded) {
+            response.write(": keep-alive\n\n");
+        }
     }, 15000);
 }
 function getChatCompletionText(payload) {