npm - @bitkyc08/opencodex - Versions diffs - 2.16.0 → 2.17.0 - Mend

@bitkyc08/opencodex 2.16.0 → 2.17.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (17) hide show

package/gui/dist/assets/{index-CZwbOse7.js → index-DOKr6RBR.js} +10 -10
package/gui/dist/index.html +1 -1
package/package.json +1 -1
package/src/cli/export-command.ts +19 -7
package/src/cli/help.ts +1 -1
package/src/cli/registry.ts +2 -2
package/src/clients/config-export.ts +165 -3
package/src/generated/compatibility-version.json +17 -13
package/src/integrations/omp-yaml-source.ts +232 -104
package/src/integrations/registry.ts +14 -0
package/src/integrations/state.ts +4 -3
package/src/integrations/writer-lock.ts +98 -0
package/src/integrations/writer.ts +141 -16
package/src/lib/shadow-call.ts +6 -14
package/src/server/management/integration-routes.ts +21 -14
package/src/server/responses/core.ts +0 -1
package/src/types.ts +5 -5

package/gui/dist/index.html CHANGED Viewed

@@ -16,7 +16,7 @@
         } catch (e) {}
       })();
     </script>
-    <script type="module" crossorigin src="/assets/index-CZwbOse7.js"></script>
+    <script type="module" crossorigin src="/assets/index-DOKr6RBR.js"></script>
     <link rel="stylesheet" crossorigin href="/assets/index-DUCH59lJ.css">
   </head>
   <body>

package/package.json CHANGED Viewed

@@ -1,6 +1,6 @@
 {
   "name": "@bitkyc08/opencodex",
-  "version": "2.16.0",
+  "version": "2.17.0",
   "description": "Universal provider proxy for OpenAI Codex & Claude Code — use any LLM with Codex CLI/App/SDK and Claude Code",
   "type": "module",
   "main": "./bin/package-main.mjs",

package/src/cli/export-command.ts CHANGED Viewed

@@ -62,7 +62,11 @@ export interface ExportCommandDeps extends RuntimeApiDeps {
  * `/api/models` row plus the modality list Pi consumes. The launcher's row type predates
  * the Pi exporter and stops at the fields OpenCode needs.
  */
-type ExportProxyModelRow = OpencodeProxyModelRow & { inputModalities?: string[] };
+type ExportProxyModelRow = OpencodeProxyModelRow & {
+  inputModalities?: string[];
+  reasoningEfforts?: string[];
+  defaultReasoningEffort?: string;
+};
 /** Same authoritativeness rule the serializers apply, for the degraded-count line. */
 function hasContextLimit(model: ExportModel): boolean {
@@ -83,12 +87,21 @@ export function exportModelsFromProxyRows(
   rows: readonly ExportProxyModelRow[],
   config: OcxConfig,
 ): ExportModel[] {
-  const modalities = new Map<string, string[]>();
+  const metadata = new Map<string, Pick<ExportModel, "inputModalities" | "reasoningEfforts" | "defaultReasoningEffort">>();
   for (const row of rows) {
     const namespaced = row.namespaced?.trim();
-    if (namespaced && Array.isArray(row.inputModalities) && row.inputModalities.length > 0) {
-      if (!modalities.has(namespaced)) modalities.set(namespaced, [...row.inputModalities]);
-    }
+    if (!namespaced || metadata.has(namespaced)) continue;
+    metadata.set(namespaced, {
+      ...(Array.isArray(row.inputModalities) && row.inputModalities.length > 0
+        ? { inputModalities: [...row.inputModalities] }
+        : {}),
+      ...(Array.isArray(row.reasoningEfforts) && row.reasoningEfforts.length > 0
+        ? { reasoningEfforts: [...row.reasoningEfforts] }
+        : {}),
+      ...(typeof row.defaultReasoningEffort === "string" && row.defaultReasoningEffort.length > 0
+        ? { defaultReasoningEffort: row.defaultReasoningEffort }
+        : {}),
+    });
   }
   return opencodeCatalogFromProxyRows(rows, config).map(entry => {
     const model: ExportModel = {
@@ -99,8 +112,7 @@ export function exportModelsFromProxyRows(
     if (entry.native) model.native = true;
     if (entry.displayName) model.displayName = entry.displayName;
     if (entry.contextWindow !== undefined) model.contextWindow = entry.contextWindow;
-    const input = modalities.get(entry.namespaced);
-    if (input) model.inputModalities = input;
+    Object.assign(model, metadata.get(entry.namespaced));
     return model;
   });
 }

package/src/cli/help.ts CHANGED Viewed

@@ -58,7 +58,7 @@ Usage:
   ocx memory [--json]         Alias of ocx observe memory
   ocx api-key <sub>           Alias of ocx access key
   ocx access <sub>            External API keys and endpoint information
-  ocx export --client <id>    Print a client config wired to the running proxy (7 clients)
+  ocx export --client <id>    Print a client config wired to the running proxy (8 clients)
   ocx integration client <sub> Enable, disable, inspect or roll back a client integration
   ocx grok <sub>              Grok Build model selection and apply
   ocx system <sub>            Runtime settings, startup, sync, and updates

package/src/cli/registry.ts CHANGED Viewed

@@ -216,8 +216,8 @@ export const CLI_COMMANDS: CliCommandEntry[] = [
   { name: "api-key", usage: "ocx api-key <list|create|remove> ...", summary: "Alias of ocx access key." },
   {
     name: "export",
-    usage: "ocx export --client <opencode|pi|omp|hermes|openclaw|kimi|gajae> [--json] [--out <path>] [--force]",
-    summary: "Print a client config (opencode, Pi, OMP, Hermes, OpenClaw, Kimi Code, Gajae Code) wired to the running proxy.",
+    usage: "ocx export --client <opencode|pi|omp|hermes|openclaw|kimi|gajae|dsh> [--json] [--out <path>] [--force]",
+    summary: "Print a client config (OpenCode, Pi, OMP, Hermes, OpenClaw, Kimi Code, Gajae Code, DeepSeek Harness) wired to the running proxy.",
     details: [
       "--json prints the generated document as JSON on stdout; use --out for the client's native format.",
       "--out <path> writes the native config there and refuses to replace an existing file without --force.",

package/src/clients/config-export.ts CHANGED Viewed

@@ -21,9 +21,10 @@
  */
 import { homedir } from "node:os";
 import { existsSync } from "node:fs";
-import { isAbsolute, join } from "node:path";
+import { isAbsolute, join, resolve } from "node:path";
 import { shouldInjectApiAuthHeader } from "../codex/inject";
 import { FORMAT_MEDIA_TYPE, serializeDocument, type ConfigFormat } from "../integrations/serialize";
+import { providerCodexAccountMode } from "../providers/registry";
 import { probeHostname } from "../server/proxy-liveness";
 import type { OcxConfig } from "../types";
@@ -376,6 +377,28 @@ export function gajaeConfigPath(env: OpencodeLaunchEnv = process.env, home: stri
   return join(gajaeHomeDir(env, home), "agent", "models.yml");
 }
+/** DSH_HOME uses the raw nonblank value; trimming it would name a different path. */
+export function dshHomeDir(env: OpencodeLaunchEnv = process.env, home: string = homedir()): string {
+  const raw = env.DSH_HOME;
+  if (raw === undefined || raw.trim().length === 0) return join(home, ".dsh");
+  if (raw === "~") return home;
+  if (raw.startsWith("~/") || raw.startsWith("~\\")) return join(home, raw.slice(2));
+  if (!isAbsolute(raw)) {
+    throw new ClientPathError(
+      `DSH_HOME must be an absolute path or start with ~; "${raw}" depends on the working directory, `
+      + "so opencodex and DSH would disagree about which settings file it names.",
+    );
+  }
+  // DSH calls node:path.resolve after tilde expansion. Preserve the raw value
+  // for the decision above, then normalize the absolute spelling the same way
+  // so both processes bind ownership and locks to one path string.
+  return resolve(raw);
+}
+export function dshConfigPath(env: OpencodeLaunchEnv = process.env, home: string = homedir()): string {
+  return join(dshHomeDir(env, home), "settings.yaml");
+}
 /**
  * One proxy-routed model destined for a client config. Deliberately narrower than
  * `CatalogModel` so a serializer cannot reach for a field that does not survive the
@@ -414,7 +437,8 @@ export type ExportClientId =
   | "hermes"
   | "openclaw"
   | "kimi"
-  | "gajae";
+  | "gajae"
+  | "dsh";
 export interface ExportClientSpec {
   id: ExportClientId;
@@ -463,7 +487,8 @@ export interface ExportClientSpec {
  */
 function authoritativeContextWindow(contextWindow: number | undefined): number | undefined {
   if (typeof contextWindow === "number" && Number.isFinite(contextWindow) && contextWindow > 0) {
-    return Math.floor(contextWindow);
+    const integer = Math.floor(contextWindow);
+    return integer > 0 ? integer : undefined;
   }
   return undefined;
 }
@@ -522,6 +547,18 @@ function inputModalitiesForClient(
   return kept.length > 0 ? kept : null;
 }
+/** DSH rc.6 accepts text/image; unknown values degrade to text, while audio-only cannot be represented. */
+function dshInputModalities(modalities: readonly string[] | undefined): string[] | null {
+  const declared = modalities ?? [];
+  if (declared.length === 0) return ["text"];
+  const kept: string[] = [];
+  for (const value of declared) {
+    if ((value === "text" || value === "image") && !kept.includes(value)) kept.push(value);
+  }
+  if (kept.length > 0) return kept;
+  return declared.every(value => value === "audio") ? null : ["text"];
+}
 /**
  * Label shared by every client: `"<displayName|id> (<native|provider|routed>)"`. The
  * provider suffix is what makes two same-named models from different upstreams
@@ -770,6 +807,31 @@ export interface GajaeGeneratedConfig {
   providers: Record<string, GajaeProviderBlock>;
 }
+export type DshReasoningEffort = "low" | "medium" | "high" | "xhigh" | "max";
+export type DshWireReasoningEffort = DshReasoningEffort | "ultra";
+export interface DshModelEntry {
+  id: string;
+  name: string;
+  input: string[];
+  contextWindow?: number;
+  reasoningEfforts?: Partial<Record<DshReasoningEffort, DshWireReasoningEffort>>;
+}
+export interface DshProviderBlock {
+  displayName: "OpenCodex";
+  api: "openai-responses";
+  baseURL: string;
+  headers: { Authorization: "Bearer ocx_data_dsh" };
+  models: DshModelEntry[];
+}
+export interface DshGeneratedConfig {
+  "llm-pi-ai": {
+    providers: Record<string, DshProviderBlock>;
+  };
+}
 /**
  * Pi's `~/.pi/agent/models.json` shape. `models` is an ARRAY (identity lives in `id`),
  * unlike OpenCode's keyed object.
@@ -975,6 +1037,84 @@ function buildGajaeClientConfig(ctx: ExportContext): GajaeGeneratedConfig {
   };
 }
+const DSH_EFFORT_ORDER: readonly DshReasoningEffort[] = ["low", "medium", "high", "xhigh", "max"];
+function dshReasoningEfforts(model: ExportModel): DshModelEntry["reasoningEfforts"] {
+  const offered = new Set<string>();
+  for (const raw of model.reasoningEfforts ?? []) {
+    const effort = raw.trim().toLowerCase();
+    if (effort === "ultra" || DSH_EFFORT_ORDER.includes(effort as DshReasoningEffort)) offered.add(effort);
+  }
+  if (offered.size === 0) return undefined;
+  const entries: Array<[DshReasoningEffort, DshWireReasoningEffort]> = [];
+  for (const effort of DSH_EFFORT_ORDER) {
+    if (effort !== "max") {
+      if (offered.has(effort)) entries.push([effort, effort]);
+      continue;
+    }
+    // DSH's key is the selectable level; the value is what it sends on the
+    // wire. Preserve OpenCodex's `ultra` spelling when that is the only
+    // highest effort, exactly like the rc.6 `max: ultra` contract.
+    if (offered.has("max")) entries.push(["max", "max"]);
+    else if (offered.has("ultra")) entries.push(["max", "ultra"]);
+  }
+  return Object.fromEntries(entries);
+}
+function isKnownSafeDshCombo(model: ExportModel, config: OcxConfig): boolean {
+  const combos = (config as { combos?: unknown }).combos;
+  if (typeof combos !== "object" || combos === null || Array.isArray(combos)) return false;
+  const combo = (combos as Record<string, unknown>)[model.id];
+  if (typeof combo !== "object" || combo === null || Array.isArray(combo)) return false;
+  const targets = (combo as { targets?: unknown }).targets;
+  if (!Array.isArray(targets) || targets.length === 0) return false;
+  return targets.every(target => {
+    if (typeof target !== "object" || target === null || Array.isArray(target)) return false;
+    const provider = (target as { provider?: unknown }).provider;
+    const modelId = (target as { model?: unknown }).model;
+    return typeof provider === "string"
+      && provider.length > 0
+      && provider === provider.trim()
+      && provider !== "openai"
+      && typeof modelId === "string"
+      && modelId.length > 0
+      && modelId === modelId.trim();
+  });
+}
+function buildDshClientConfig(ctx: ExportContext): DshGeneratedConfig {
+  const direct = providerCodexAccountMode("openai", ctx.config?.providers?.openai) === "direct";
+  const models: DshModelEntry[] = [];
+  for (const model of normalizeExportModels(ctx.models)) {
+    if (direct && (model.native === true || model.provider === "openai")) continue;
+    if (direct && model.provider === "combo" && (!ctx.config || !isKnownSafeDshCombo(model, ctx.config))) continue;
+    const input = dshInputModalities(model.inputModalities);
+    if (input === null) continue;
+    const contextWindow = authoritativeContextWindow(model.contextWindow);
+    const reasoningEfforts = dshReasoningEfforts(model);
+    models.push({
+      id: model.namespaced,
+      name: exportModelLabel(model),
+      input,
+      ...(contextWindow !== undefined ? { contextWindow } : {}),
+      ...(reasoningEfforts ? { reasoningEfforts } : {}),
+    });
+  }
+  return {
+    "llm-pi-ai": {
+      providers: {
+        [OPENCODE_PROVIDER_ID]: {
+          displayName: "OpenCodex",
+          api: "openai-responses",
+          baseURL: ctx.baseUrl,
+          headers: { Authorization: "Bearer ocx_data_dsh" },
+          models,
+        },
+      },
+    },
+  };
+}
 /**
  * Per-client model counts, read back off the SERIALIZED document rather than
  * recomputed from the input rows: `modelsWithoutLimits` drives a GUI line about
@@ -1019,6 +1159,11 @@ function summarizeGajae(document: unknown): { modelCount: number; modelsWithoutL
   return { modelCount: models.length, modelsWithoutLimits: models.filter(model => model.contextWindow === undefined).length };
 }
+function summarizeDsh(document: unknown): { modelCount: number; modelsWithoutLimits: number } {
+  const models = (document as DshGeneratedConfig | undefined)?.["llm-pi-ai"]?.providers?.[OPENCODE_PROVIDER_ID]?.models ?? [];
+  return { modelCount: models.length, modelsWithoutLimits: models.filter(model => model.contextWindow === undefined).length };
+}
 /** One fragment at `path`, built from this client's own document. */
 function singleFragment(clientId: ExportClientId, path: readonly string[], value: unknown): ManagedContribution {
   return { clientId, fragments: [{ path, value }] };
@@ -1070,6 +1215,11 @@ function buildGajaeContribution(ctx: ExportContext): ManagedContribution {
   return singleFragment("gajae", ["providers", OPENCODE_PROVIDER_ID], doc.providers[OPENCODE_PROVIDER_ID]);
 }
+function buildDshContribution(ctx: ExportContext): ManagedContribution {
+  const doc = buildDshClientConfig(ctx);
+  return singleFragment("dsh", ["llm-pi-ai", "providers", OPENCODE_PROVIDER_ID], doc["llm-pi-ai"].providers[OPENCODE_PROVIDER_ID]);
+}
 export const EXPORT_CLIENTS: Record<ExportClientId, ExportClientSpec> = {
   opencode: {
     id: "opencode",
@@ -1167,6 +1317,18 @@ export const EXPORT_CLIENTS: Record<ExportClientId, ExportClientSpec> = {
     // strict schema with no header field, so the dedicated header has nowhere to go
     loopbackOnly: true,
   },
+  dsh: {
+    id: "dsh",
+    filename: "settings.yaml",
+    destination: env => dshConfigPath(env),
+    apiKeyEnv: "",
+    exportHint: "DSH uses a non-secret loopback bearer placeholder in settings.yaml; loopback needs no key.",
+    build: buildDshClientConfig,
+    format: "yaml",
+    summarize: summarizeDsh,
+    buildContribution: buildDshContribution,
+    loopbackOnly: true,
+  },
 };
 export const EXPORT_CLIENT_IDS: readonly ExportClientId[] = Object.keys(EXPORT_CLIENTS) as ExportClientId[];

package/src/generated/compatibility-version.json CHANGED Viewed

@@ -10,7 +10,7 @@
     },
     {
       "path": "package.json",
-      "sha256": "5c2d417ce3cb466651385bca4d8fee522e0bdf1c6d8c2fc1f84b4cf54574aee1"
+      "sha256": "b8810736c02b3cf34dbd0119082924f56a48e435cd9a0768c68c428f8e128cda"
     },
     {
       "path": "scripts/model-metadata.source.json",
@@ -454,11 +454,11 @@
     },
     {
       "path": "src/cli/export-command.ts",
-      "sha256": "c00b92f6cdaa188334e1635aa98b161bfbb2ce269f4435c4cfacff263478264d"
+      "sha256": "55489975589c8a411cab9d16835390f46a2059968c35344503aff9ffc4bc6e42"
     },
     {
       "path": "src/cli/help.ts",
-      "sha256": "a696a035ce31447412ff5f025d07019ed445dd12c253c8a83ac5ee6c4679d1cb"
+      "sha256": "91c302e213e4d40d5612aee041c5a938d74a06c9a55310eccd45d2ceb08bce4a"
     },
     {
       "path": "src/cli/index.ts",
@@ -514,7 +514,7 @@
     },
     {
       "path": "src/cli/registry.ts",
-      "sha256": "cf65a3022a6b8c97f7926f6057b69c47a9cdc71540798420fc5a06b861e64588"
+      "sha256": "1eb67cf2d3fb58a0b380d4a8cf71fee1ac3ac2123df6f52a4ee878da0e8a60db"
     },
     {
       "path": "src/cli/root.ts",
@@ -558,7 +558,7 @@
     },
     {
       "path": "src/clients/config-export.ts",
-      "sha256": "65344216431c824d1e38d4cee44d955ac4d6115e19e3ff784582bfabec2df70a"
+      "sha256": "4631957993e4d31bc41ecd56791ffed1e6356e3dd9d5107aca1bc9e4c5297de8"
     },
     {
       "path": "src/codex/account-id.ts",
@@ -1054,7 +1054,7 @@
     },
     {
       "path": "src/integrations/omp-yaml-source.ts",
-      "sha256": "58a8769edc6c1f409f2851955e52dba3cdb5e30938d6b7dc19e59b900731d219"
+      "sha256": "ba30982af0520ffe5c841b7254ab6d73e2a9fb53636f3c5096c9fa6ccfc41005"
     },
     {
       "path": "src/integrations/ownership.ts",
@@ -1062,7 +1062,7 @@
     },
     {
       "path": "src/integrations/registry.ts",
-      "sha256": "5666d2e9e1a9086074cd99a9ad66cb6c649a470182b3c7bad4e8cc785b3d87f2"
+      "sha256": "299064969a383a4202e5c243d52d7b8f677a675db04a0661f66be01ae74e25d6"
     },
     {
       "path": "src/integrations/serialize.ts",
@@ -1070,15 +1070,19 @@
     },
     {
       "path": "src/integrations/state.ts",
-      "sha256": "e2446f333ab3b57eebc120bf674f37aff6210cde7cf45628e7ff0ca77ca4d4f0"
+      "sha256": "2b31611ea745ae22d4292719c2deb453efe6d5ea0cecba62d6d4352a30744e77"
     },
     {
       "path": "src/integrations/store.ts",
       "sha256": "195fe1af41fdaf567bfdaef5c457ee2452a77c43fc13475fccc7968676a2b199"
     },
+    {
+      "path": "src/integrations/writer-lock.ts",
+      "sha256": "4e133b69db94784460351a2ce947172fd6499235029fdf866fa3eff2afc477b5"
+    },
     {
       "path": "src/integrations/writer.ts",
-      "sha256": "92cc7c85a6bffa520f0fce57890f45758c712f69a128451be60368444d5ff725"
+      "sha256": "788709e9e0505cc717f5c015110d8fa17246dc5b33185fafc99d8136236f1606"
     },
     {
       "path": "src/lab/artifacts/sanitize.ts",
@@ -1634,7 +1638,7 @@
     },
     {
       "path": "src/lib/shadow-call.ts",
-      "sha256": "c7e58016fa10385efb4acf23660859f7739afd945c25f593fc774da550316197"
+      "sha256": "2e55cf6e560b18337ac1911b38f20a27c1bd985a65e9496783f2a7cf85014bc6"
     },
     {
       "path": "src/lib/sidecar-tracker.ts",
@@ -2190,7 +2194,7 @@
     },
     {
       "path": "src/server/management/integration-routes.ts",
-      "sha256": "37d1cdb0e3f993c0cc190e7079dea20ba6daafcfcde314f4f37fdc93bcdcbf79"
+      "sha256": "a049e2dd40f82793c33b7ac584f14ae6ead7e2524a5b1ee3a218caddc9a3bd86"
     },
     {
       "path": "src/server/management/lab-automation-routes.ts",
@@ -2358,7 +2362,7 @@
     },
     {
       "path": "src/server/responses/core.ts",
-      "sha256": "0817eb37ba0ce9425afd9b9794eccab1095b7563d217652562cb281479f1df48"
+      "sha256": "b8e42c1e0be113256d7318ee6dc3dc4cb7d045867e9e5412ccdfd64fa07111cb"
     },
     {
       "path": "src/server/responses/encrypted-payload.ts",
@@ -2506,7 +2510,7 @@
     },
     {
       "path": "src/types.ts",
-      "sha256": "33f4ee11228bb8faca03c57fdd5000512f70153c2fd446f88d78b0a43056d330"
+      "sha256": "b04403f46247c96634d0c8c6344c1ecc44979980b0456c28140e3aa1da4ab6ca"
     },
     {
       "path": "src/update/badge.ts",