@uncensoredcode/openbridge 0.1.1 → 0.1.2

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@uncensoredcode/openbridge",
-  "version": "0.1.1",
+  "version": "0.1.2",
   "description": "OpenBridge runtime, server, and CLI for bridging AI providers through a unified interface.",
   "packageManager": "bun@1.3.11",
   "type": "module",

package/packages/runtime/dist/tool-name-aliases.js

@@ -1,5 +1,6 @@
 const PROVIDER_TOOL_NAME_ALIASES = {
-    execute_shell_command: "bash"
+    execute_shell_command: "bash",
+    code_interpreter: "bash"
 };
 function normalizeProviderToolName(name) {
     const trimmed = name.trim();

package/packages/server/dist/bridge/chat-completions/chat-completion-service.js

@@ -36,7 +36,7 @@ const EXPLICIT_CHAT_COMPLETION_HEADER_KEYS = [
     "x-thread-id"
 ];
 async function handleBridgeChatCompletionRequest(input) {
-    const body = input.body;
+    const body = normalizeRecoverableChatCompletionRequest(input.body);
     assertSupportedChatCompletionRequest(body);
     const resolvedModel = resolveBridgeModel(input.providerStore.list(), body.model);
     if (!resolvedModel) {
@@ -300,6 +300,29 @@ const chatCompletionsRequestSchema = z
     metadata: z.record(z.string(), z.unknown()).optional()
 })
     .strict();
+function normalizeRecoverableChatCompletionRequest(body) {
+    const messages = normalizeRecoverableChatCompletionMessages(body.messages);
+    return messages === body.messages
+        ? body
+        : {
+            ...body,
+            messages
+        };
+}
+function normalizeRecoverableChatCompletionMessages(messages) {
+    const normalized = [];
+    let changed = false;
+    for (const message of messages) {
+        const previous = normalized.at(-1);
+        if (message.role === "user" && previous?.role === "user") {
+            normalized[normalized.length - 1] = message;
+            changed = true;
+            continue;
+        }
+        normalized.push(message);
+    }
+    return changed ? normalized : messages;
+}
 function assertSupportedChatCompletionRequest(body) {
     if (body.n !== undefined && body.n !== 1) {
         throw unsupportedChatCompletionsRequest("n", "Only n=1 is currently supported by the standalone bridge chat completions endpoint.");

package/packages/server/dist/bridge/stores/local-session-package-store.js

@@ -5,7 +5,7 @@ import { z } from "zod";
 import { bridgeApiErrorModule } from "../../shared/bridge-api-error.js";
 import { providerStoreModule } from "./provider-store.js";
 import { sessionPackageStoreModule } from "./session-package-store.js";
-const { buildSessionPackageMetadata, cloneConfig, cloneInstalledProviderPackage, cloneProvider, cloneSessionPackage, cloneSessionPackageMetadata, inferProviderFromSessionPackage, installedProviderPackageSchema, sessionPackageDeleteResponseSchema, sessionPackageSchema, sessionPackageMetadataSchema } = sessionPackageStoreModule;
+const { buildQwenConversationRequestBody, buildSessionPackageMetadata, cloneConfig, cloneInstalledProviderPackage, cloneProvider, cloneSessionPackage, cloneSessionPackageMetadata, inferProviderFromSessionPackage, installedProviderPackageSchema, sessionPackageDeleteResponseSchema, sessionPackageSchema, sessionPackageMetadataSchema } = sessionPackageStoreModule;
 const { createProviderRequestSchema, providerDeleteResponseSchema, providerSchema } = providerStoreModule;
 const { BridgeApiError } = bridgeApiErrorModule;
 const SESSION_VAULT_VERSION = 1;
@@ -315,7 +315,7 @@ function createLocalSessionPackageStore(options) {
             return null;
         }
         const entry = readVaultEntry(metadata);
-        return decryptInstalledPackage(entry, key);
+        return normalizeInstalledProviderPackage(decryptInstalledPackage(entry, key));
     }
     function readVaultIndex() {
         if (!existsSync(indexPath)) {
@@ -372,6 +372,53 @@ function createLocalSessionPackageStore(options) {
         return path.join(entriesPath, `${handle}.json`);
     }
 }
+function normalizeInstalledProviderPackage(installed) {
+    const transport = readInstalledQwenTransport(installed.provider.config);
+    if (!transport) {
+        return installed;
+    }
+    const request = readInstalledTransportRequest(transport);
+    if (!request || !("body" in request)) {
+        return installed;
+    }
+    const normalizedBody = buildQwenConversationRequestBody(request.body);
+    if (JSON.stringify(normalizedBody) === JSON.stringify(request.body)) {
+        return installed;
+    }
+    return installedProviderPackageSchema.parse({
+        provider: {
+            ...cloneProvider(installed.provider),
+            config: {
+                ...cloneConfig(installed.provider.config),
+                transport: {
+                    ...transport,
+                    request: {
+                        ...request,
+                        body: normalizedBody
+                    }
+                }
+            }
+        },
+        session: installed.session ? cloneSessionPackage(installed.session) : null
+    });
+}
+function readInstalledQwenTransport(config) {
+    const transport = typeof config.transport === "object" &&
+        config.transport !== null &&
+        !Array.isArray(config.transport)
+        ? config.transport
+        : null;
+    const request = readInstalledTransportRequest(transport);
+    const url = typeof request?.url === "string" ? request.url.trim() : "";
+    return /^https:\/\/chat\.qwen\.ai\/api\/v2\/chat\/completions\b/u.test(url) ? transport : null;
+}
+function readInstalledTransportRequest(transport) {
+    return typeof transport?.request === "object" &&
+        transport.request !== null &&
+        !Array.isArray(transport.request)
+        ? transport.request
+        : null;
+}
 function encryptInstalledPackage(metadata, value, key) {
     const iv = crypto.randomBytes(12);
     const cipher = crypto.createCipheriv("aes-256-gcm", key, iv);

package/packages/server/dist/bridge/stores/session-package-store.d.ts

@@ -165,6 +165,7 @@ declare function inferProviderFromSessionPackage(input: {
     createdAt: string;
     updatedAt: string;
 };
+declare function buildQwenConversationRequestBody(requestBody: unknown): unknown;
 export declare const sessionPackageStoreModule: {
     sessionPackageSchema: z.ZodObject<{
         schemaVersion: z.ZodOptional<z.ZodNumber>;
@@ -274,6 +275,7 @@ export declare const sessionPackageStoreModule: {
         }, z.core.$strict>>;
     }, z.core.$strict>;
     createInMemorySessionPackageStore: typeof createInMemorySessionPackageStore;
+    buildQwenConversationRequestBody: typeof buildQwenConversationRequestBody;
     buildSessionPackageStatus: typeof buildSessionPackageStatus;
     cloneProvider: typeof cloneProvider;
     cloneConfig: typeof cloneConfig;

package/packages/server/dist/bridge/stores/session-package-store.js

@@ -416,7 +416,9 @@ function inferQwenConversationTransport(selectedRequest, value) {
                 method: String(selectedRequest.method).toUpperCase(),
                 url: "https://chat.qwen.ai/api/v2/chat/completions?chat_id={{conversationId}}",
                 headers: {},
-                ...(requestBody === undefined ? {} : { body: requestBody })
+                ...(requestBody === undefined
+                    ? {}
+                    : { body: buildQwenConversationRequestBody(requestBody) })
             },
             response: {
                 contentPaths: DEFAULT_SSE_CONTENT_PATHS,
@@ -926,6 +928,60 @@ function buildQwenBootstrapRequestBody(selectedRequest) {
         project_id: projectId
     };
 }
+function buildQwenConversationRequestBody(requestBody) {
+    if (typeof requestBody !== "object" || requestBody === null || Array.isArray(requestBody)) {
+        return requestBody;
+    }
+    const base = structuredClone(requestBody);
+    if ("chat_id" in base) {
+        base.chat_id = "{{conversationId}}";
+    }
+    if ("model" in base) {
+        base.model = "{{modelId}}";
+    }
+    if ("timestamp" in base) {
+        base.timestamp = "{{unixTimestampSec}}";
+    }
+    if ("parent_id" in base) {
+        base.parent_id = "{{parentIdOrNull}}";
+    }
+    if (Array.isArray(base.messages) && base.messages.length > 0) {
+        base.messages = base.messages.map((message, index) => index === 0 ? buildQwenConversationUserMessage(message) : message);
+    }
+    return base;
+}
+function buildQwenConversationUserMessage(message) {
+    if (typeof message !== "object" || message === null || Array.isArray(message)) {
+        return {
+            fid: "{{messageId}}",
+            role: "user",
+            content: "{{prompt}}"
+        };
+    }
+    const nextMessage = structuredClone(message);
+    nextMessage.fid = "{{messageId}}";
+    nextMessage.role = "user";
+    nextMessage.content = "{{prompt}}";
+    if ("timestamp" in nextMessage) {
+        nextMessage.timestamp = "{{unixTimestampSec}}";
+    }
+    if ("models" in nextMessage) {
+        nextMessage.models = ["{{modelId}}"];
+    }
+    if ("parentId" in nextMessage) {
+        nextMessage.parentId = "{{parentIdOrNull}}";
+    }
+    if ("parent_id" in nextMessage) {
+        nextMessage.parent_id = "{{parentIdOrNull}}";
+    }
+    if ("childrenIds" in nextMessage && Array.isArray(nextMessage.childrenIds)) {
+        nextMessage.childrenIds = [];
+    }
+    if ("children_ids" in nextMessage && Array.isArray(nextMessage.children_ids)) {
+        nextMessage.children_ids = [];
+    }
+    return nextMessage;
+}
 function buildOpenAiConversationRequestBody(requestBody) {
     const base = requestBody ? structuredClone(requestBody) : {};
     const capturedMessage = Array.isArray(requestBody?.messages) &&
@@ -1516,6 +1572,7 @@ export const sessionPackageStoreModule = {
     sessionPackageMetadataSchema,
     installedProviderPackageSchema,
     createInMemorySessionPackageStore,
+    buildQwenConversationRequestBody,
     buildSessionPackageStatus,
     cloneProvider,
     cloneConfig,

package/packages/server/dist/cli/index.d.ts

@@ -1,4 +1,13 @@
 export declare const cliModule: {
+    buildDetachedServerLaunchCommand: (input: {
+        scriptPath: string;
+        argv: string[];
+        execPath: string;
+        execArgv: string[];
+    }) => {
+        command: string;
+        args: string[];
+    };
     getBridgeServerCliHelpText: () => string;
     parseBridgeServerCliArgs: (input: {
         argv: string[];

package/packages/server/dist/cli/index.js

@@ -1,5 +1,6 @@
 import { runBridgeServerCliModule } from "./run-bridge-server-cli.js";
 export const cliModule = {
+    buildDetachedServerLaunchCommand: runBridgeServerCliModule.buildDetachedServerLaunchCommand,
     getBridgeServerCliHelpText: runBridgeServerCliModule.getBridgeServerCliHelpText,
     parseBridgeServerCliArgs: runBridgeServerCliModule.parseBridgeServerCliArgs,
     runBridgeServerCli: runBridgeServerCliModule.runBridgeServerCli

package/packages/server/dist/cli/run-bridge-server-cli.d.ts

@@ -121,13 +121,24 @@ type SpawnDetachedServerProcessInput = {
 type SpawnDetachedServerProcessResult = {
     pid: number;
 };
+type DetachedServerLaunchCommand = {
+    command: string;
+    args: string[];
+};
 declare function runBridgeServerCli(input: RunBridgeServerCliInput): Promise<number>;
 declare function parseBridgeServerCliArgs(input: {
     argv: string[];
     env?: NodeJS.ProcessEnv;
 }): BridgeServerCliCommand;
 declare function getBridgeServerCliHelpText(): string;
+declare function buildDetachedServerLaunchCommand(input: {
+    scriptPath: string;
+    argv: string[];
+    execPath: string;
+    execArgv: string[];
+}): DetachedServerLaunchCommand;
 export declare const runBridgeServerCliModule: {
+    buildDetachedServerLaunchCommand: typeof buildDetachedServerLaunchCommand;
     runBridgeServerCli: typeof runBridgeServerCli;
     parseBridgeServerCliArgs: typeof parseBridgeServerCliArgs;
     getBridgeServerCliHelpText: typeof getBridgeServerCliHelpText;

package/packages/server/dist/cli/run-bridge-server-cli.js

@@ -99,7 +99,8 @@ async function runBridgeServerCli(input) {
         }
         if (command.kind === "status") {
             const status = await getServerStatus(command.config, input.fetchImpl);
-            writeJson(stdout, status);
+            const { logPath: _logPath, ...statusOutput } = status;
+            writeJson(stdout, statusOutput);
             return status.running && status.healthy !== false ? 0 : 1;
         }
         if (command.kind === "stop") {
@@ -271,13 +272,11 @@ async function runBridgeServerCli(input) {
             const statusMessage = readyState === null
                 ? [
                     `Bridge server started in background (pid ${daemon.pid}).`,
-                    `Logs: ${processFiles.logPath}`,
                     `Startup is still pending; check status with "openbridge status".`
                 ].join("\n")
                 : [
                     `Bridge server started in background (pid ${readyState.pid}).`,
-                    `Base URL: ${readyState.baseUrl}`,
-                    `Logs: ${readyState.logPath}`
+                    `Base URL: ${readyState.baseUrl}`
                 ].join("\n");
             stdout.write(`${statusMessage}\n`);
             return 0;
@@ -1178,7 +1177,13 @@ async function defaultSpawnDetachedServerProcess(input) {
     });
     const logHandle = await open(input.logPath, "a", 0o600);
     try {
-        const child = spawn(process.execPath, [scriptPath, ...input.argv], {
+        const launch = buildDetachedServerLaunchCommand({
+            scriptPath,
+            argv: input.argv,
+            execPath: process.execPath,
+            execArgv: process.execArgv
+        });
+        const child = spawn(launch.command, launch.args, {
             cwd: input.cwd,
             env: input.env,
             detached: true,
@@ -1196,6 +1201,12 @@ async function defaultSpawnDetachedServerProcess(input) {
         await logHandle.close();
     }
 }
+function buildDetachedServerLaunchCommand(input) {
+    return {
+        command: input.execPath,
+        args: [...input.execArgv, input.scriptPath, ...input.argv]
+    };
+}
 function toForegroundStartArgv(argv) {
     const normalized = argv.length === 0 || argv[0]?.startsWith("--") ? ["start", ...argv] : [...argv];
     if (normalized[0] !== "start") {
@@ -1280,6 +1291,7 @@ function requireConfigPath(value, key) {
     return value;
 }
 export const runBridgeServerCliModule = {
+    buildDetachedServerLaunchCommand,
     runBridgeServerCli,
     parseBridgeServerCliArgs,
     getBridgeServerCliHelpText