npm - @bitkyc08/opencodex - Versions diffs - 2.7.20 → 2.7.21 - Mend

@bitkyc08/opencodex 2.7.20 → 2.7.21

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 (12) hide show

package/gui/dist/assets/{index-BpqkH5f_.css → index-CILVKWmx.css} +1 -1
package/gui/dist/assets/index-DYIS0tTL.js +40 -0
package/gui/dist/index.html +2 -2
package/package.json +1 -1
package/src/claude/agents-inject.ts +33 -2
package/src/claude/inbound.ts +10 -1
package/src/server/claude-messages.ts +51 -15
package/src/server/management-api.ts +4 -2
package/src/server/request-log.ts +1 -0
package/src/usage/log.ts +2 -0
package/src/usage/summary.ts +24 -6
package/gui/dist/assets/index-BH-RbAg4.js +0 -40

package/gui/dist/index.html CHANGED Viewed

@@ -16,8 +16,8 @@
         } catch (e) {}
       })();
     </script>
-    <script type="module" crossorigin src="/assets/index-BH-RbAg4.js"></script>
-    <link rel="stylesheet" crossorigin href="/assets/index-BpqkH5f_.css">
+    <script type="module" crossorigin src="/assets/index-DYIS0tTL.js"></script>
+    <link rel="stylesheet" crossorigin href="/assets/index-CILVKWmx.css">
   </head>
   <body>
     <div id="root"></div>

package/package.json CHANGED Viewed

@@ -1,6 +1,6 @@
 {
   "name": "@bitkyc08/opencodex",
-  "version": "2.7.20",
+  "version": "2.7.21",
   "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/claude/agents-inject.ts CHANGED Viewed

@@ -15,15 +15,17 @@ import { lstatSync, mkdirSync, readdirSync, readFileSync, renameSync, unlinkSync
 import { join } from "node:path";
 import type { OcxConfig } from "../types";
 import { claudeCodeAlias, claudeCodeNativeAlias } from "./alias";
-import { resolveAutoContext, withOneMillionMarker } from "./context-windows";
+import { resolveAutoContext, stripOneMillionMarker, withOneMillionMarker } from "./context-windows";
 import { claudeConfigDir } from "./gateway-cache";
 import { DEFAULT_SUBAGENT_MODELS } from "../config";
+import { effectiveBlockedSkillNames, resolveInboundModel } from "./inbound";
 export interface ClaudeAgentDef {
   file: string;
   name: string;
   model: string;
   description: string;
+  blockedSkills: readonly string[];
 }
 const OWNED_PREFIX = "ocx-";
@@ -63,6 +65,15 @@ function entryParts(entry: string): { alias: string; id: string; provider: strin
 export function buildClaudeAgentDefs(config: OcxConfig, windows: Record<string, number>, configDir = claudeConfigDir()): ClaudeAgentDef[] {
   const auto = resolveAutoContext(config.claudeCode);
+  const blockedSkills = effectiveBlockedSkillNames(config.claudeCode);
+  const blockedSkillsFor = (model: string): readonly string[] => {
+    const unmarked = stripOneMillionMarker(model);
+    const nativePassthrough = config.claudeCode?.nativePassthrough !== false
+      && !unmarked.includes("/")
+      && /^(claude|anthropic)(?:-|$)/i.test(unmarked)
+      && resolveInboundModel(unmarked, config.claudeCode) === unmarked;
+    return nativePassthrough ? [] : blockedSkills;
+  };
   const defs: ClaudeAgentDef[] = [];
   const usedNames = new Set<string>();
   const coveredModels = new Set<string>();
@@ -76,7 +87,13 @@ export function buildClaudeAgentDefs(config: OcxConfig, windows: Record<string,
     let unique = name;
     for (let i = 2; usedNames.has(unique); i++) unique = `${name}-${i}`;
     usedNames.add(unique);
-    defs.push({ file: `${OWNED_PREFIX}${unique}.md`, name: `${OWNED_PREFIX}${unique}`, model, description });
+    defs.push({
+      file: `${OWNED_PREFIX}${unique}.md`,
+      name: `${OWNED_PREFIX}${unique}`,
+      model,
+      description,
+      blockedSkills: blockedSkillsFor(model),
+    });
   };
   // Default roster applies only when the field is UNSET — an explicit [] is
@@ -100,12 +117,25 @@ export function buildClaudeAgentDefs(config: OcxConfig, windows: Record<string,
       name: `${OWNED_PREFIX}self`,
       model: marked,
       description: `Self-clone: delegate to your default main model (${marked}), synced from the /model picker at launch. ${NO_MODEL_ARG}`,
+      blockedSkills: blockedSkillsFor(marked),
     });
   }
   return defs;
 }
+function skillNameLiteral(name: string): string {
+  return JSON.stringify(name)
+    .replaceAll("`", "\\u0060")
+    .replaceAll("<", "\\u003c")
+    .replaceAll(">", "\\u003e");
+}
 function renderAgentDef(def: ClaudeAgentDef): string {
+  const blockedSkillGuard = def.blockedSkills.length === 0 ? [] : [
+    "",
+    `Do not invoke blocked Claude Code skills: ${def.blockedSkills.map(skillNameLiteral).join(", ")}.`,
+    "Their document bundles are intentionally omitted for routed models; continue without loading them.",
+  ];
   // YAML frontmatter: model ids carry dots/brackets — always double-quote scalars.
   return [
     "---",
@@ -125,6 +155,7 @@ function renderAgentDef(def: ClaudeAgentDef): string {
     `IDENTITY: your ACTUAL underlying model is \`${def.model}\` — the opencodex proxy routes this`,
     "session there regardless of what model name the Claude Code harness displays or claims.",
     "If asked which model you are, answer with the id above; do not guess a Claude model name.",
+    ...blockedSkillGuard,
     "",
     "Complete the dispatched task directly and report results concisely. This file is",
     "auto-generated by opencodex (`ocx claude`) from the featured subagent roster —",

package/src/claude/inbound.ts CHANGED Viewed

@@ -130,6 +130,15 @@ function pushUserMessage(input: Rec[], blocks: Rec[]): void {
  */
 export const DEFAULT_BLOCKED_SKILLS = ["claude-api"];
+/** Shared effective policy for proxy elision and generated routed-agent guards. */
+export function effectiveBlockedSkillNames(cc?: Pick<OcxClaudeCodeConfig, "blockedSkills">): string[] {
+  const names = cc?.blockedSkills ?? DEFAULT_BLOCKED_SKILLS;
+  return [...new Set(names
+    .filter((name): name is string => typeof name === "string")
+    .map(name => name.trim().toLowerCase())
+    .filter(name => name.length > 0))];
+}
 /**
  * ocx-route directive (devlog 072): injected agent-definition bodies carry
  * `<!-- ocx-route: <model> -->` because Claude Code 2.1.207 ignores custom
@@ -395,7 +404,7 @@ export function anthropicToResponsesTranslation(raw: unknown, cc?: OcxClaudeCode
   const systemParts: string[] = [];
   const topLevelSystem = systemToInstructions(raw.system);
   if (topLevelSystem !== undefined) systemParts.push(topLevelSystem);
-  const blockedNames = (cc?.blockedSkills ?? DEFAULT_BLOCKED_SKILLS).map(n => n.toLowerCase()).filter(n => n.length > 0);
+  const blockedNames = effectiveBlockedSkillNames(cc);
   const elide: SkillElisionContext = {
     callIds: blockedSkillCallIds(raw.messages, blockedNames),
     names: blockedNames,

package/src/server/claude-messages.ts CHANGED Viewed

@@ -19,6 +19,7 @@ import {
   responsesJsonToAnthropicMessage,
   responsesSseToAnthropicSse,
 } from "../claude/outbound";
+import { clearableDeadline } from "../lib/abort";
 import { estimateTokens } from "../lib/token-estimate";
 import { routeModel } from "../router";
 import type { OcxConfig } from "../types";
@@ -204,24 +205,22 @@ async function anthropicNativePassthrough(
   });
   headers.set("content-type", "application/json");
-  const timeoutSignal = AbortSignal.timeout(config.connectTimeoutMs ?? 120_000);
-  const upstreamSignal = AbortSignal.any([req.signal, timeoutSignal]);
-  let upstream: Response;
-  try {
-    upstream = await fetch(`${base}${pathname}${search}`, {
-      method: "POST",
-      headers,
-      body: JSON.stringify(body),
-      signal: upstreamSignal,
-    });
-  } catch (err) {
-    if (timeoutSignal.aborted && upstreamSignal.reason === timeoutSignal.reason) {
-      finalize(504, { closeReason: "non_stream" });
-      return anthropicErrorResponse(504, "anthropic passthrough timed out waiting for response headers", "timeout_error");
-    }
+  const result = await fetchWithHeaderDeadline(
+    `${base}${pathname}${search}`,
+    { method: "POST", headers, body: JSON.stringify(body) },
+    config.connectTimeoutMs ?? 120_000,
+    req.signal,
+  );
+  if (result.kind === "timeout") {
+    finalize(504, { closeReason: "non_stream" });
+    return anthropicErrorResponse(504, "anthropic passthrough timed out waiting for response headers", "timeout_error");
+  }
+  if (result.kind === "error") {
+    const err = result.error;
     finalize(502, { closeReason: "non_stream" });
     return anthropicErrorResponse(502, `anthropic passthrough failed: ${err instanceof Error ? err.message : String(err)}`, "api_error");
   }
+  const upstream = result.upstream;
   const contentType = upstream.headers.get("content-type") ?? "application/json";
   if (upstream.ok && contentType.includes("text/event-stream") && upstream.body) {
@@ -250,6 +249,43 @@ async function anthropicNativePassthrough(
   });
 }
+/**
+ * Header-phase fetch guarded by a clearable deadline (PR #136 follow-up hardening).
+ *
+ * The deadline covers ONLY the wait for response headers; once `fetch` settles —
+ * fulfilled OR rejected — the timer must die. The `finally` block guarantees
+ * `clear()` on every path (success, upstream reject, deadline expiry), fixing the
+ * timer leak where a rejected fetch left the deadline running until expiry.
+ * `didExpire()` stays truthful after `clear()` (see src/lib/abort.ts), so timeout
+ * classification inside the catch is unaffected by the finally cleanup.
+ *
+ * `makeDeadline`/`fetchImpl` are injectable for deterministic unit tests.
+ */
+export type HeaderDeadlineFetchResult =
+  | { kind: "response"; upstream: Response }
+  | { kind: "timeout" }
+  | { kind: "error"; error: unknown };
+export async function fetchWithHeaderDeadline(
+  input: string | URL,
+  init: RequestInit,
+  timeoutMs: number,
+  parent?: AbortSignal,
+  makeDeadline: typeof clearableDeadline = clearableDeadline,
+  fetchImpl: typeof fetch = fetch,
+): Promise<HeaderDeadlineFetchResult> {
+  const deadline = makeDeadline(timeoutMs, parent);
+  try {
+    const upstream = await fetchImpl(input, { ...init, signal: deadline.signal });
+    return { kind: "response", upstream };
+  } catch (error) {
+    if (deadline.didExpire()) return { kind: "timeout" };
+    return { kind: "error", error };
+  } finally {
+    deadline.clear();
+  }
+}
 export async function handleClaudeMessages(
   req: Request,
   config: OcxConfig,

package/src/server/management-api.ts CHANGED Viewed

@@ -27,7 +27,7 @@ import { fetchProviderQuotaReports } from "../providers/quota";
 import { DEFAULT_PROVIDER_CONTEXT_CAP, globalContextCapValue, providerContextCap, providerContextCaps, setAllProviderContextCaps, setGlobalContextCapValue, setProviderContextCap } from "../providers/context-cap";
 import { readUsageEntries } from "../usage/log";
 import { getUsageDebugLogEntries } from "../usage/debug";
-import { parseRange, summarizeUsage } from "../usage/summary";
+import { parseRange, parseUsageSurface, summarizeUsage } from "../usage/summary";
 import { stripCodexRuntimeProviderFields } from "../codex/auth-context";
 import { getProviderRegistryEntry } from "../providers/registry";
 import { getDebugLogEntries } from "../lib/debug-log-buffer";
@@ -358,12 +358,14 @@ export async function handleManagementAPI(req: Request, url: URL, config: OcxCon
   if (url.pathname === "/api/usage" && req.method === "GET") {
     const range = parseRange(url.searchParams.get("range"));
+    const surface = parseUsageSurface(url.searchParams.get("surface"));
     const now = Date.now();
     try {
-      return jsonResponse(summarizeUsage(readUsageEntries(), range, now));
+      return jsonResponse(summarizeUsage(readUsageEntries(), range, now, surface));
     } catch {
       return jsonResponse({
         range,
+        surface,
         since: null,
         generatedAt: now,
         summary: {

package/src/server/request-log.ts CHANGED Viewed

@@ -89,6 +89,7 @@ export function addRequestLog(entry: RequestLogEntry) {
       timestamp: entry.timestamp,
       provider: entry.provider,
       model: entry.model,
+      ...(entry.surface === "claude" ? { surface: entry.surface } : {}),
       ...(entry.resolvedModel ? { resolvedModel: entry.resolvedModel } : {}),
       status: entry.status,
       durationMs: entry.durationMs,

package/src/usage/log.ts CHANGED Viewed

@@ -11,6 +11,7 @@ export interface PersistedUsageEntry {
   timestamp: number;
   provider: string;
   model: string;
+  surface?: "claude";
   resolvedModel?: string;
   status: number;
   durationMs: number;
@@ -68,6 +69,7 @@ function normalizeUsageEntry(entry: PersistedUsageEntry): PersistedUsageEntry {
     timestamp: entry.timestamp,
     provider: entry.provider,
     model: entry.model,
+    ...(entry.surface === "claude" ? { surface: entry.surface } : {}),
     ...(entry.resolvedModel ? { resolvedModel: entry.resolvedModel } : {}),
     status: entry.status,
     durationMs: entry.durationMs,

package/src/usage/summary.ts CHANGED Viewed

@@ -3,6 +3,7 @@ import { usageDisplayTotalTokens } from "./totals";
 import type { PersistedUsageEntry, UsageStatus } from "./log";
 export type UsageRange = "7d" | "30d" | "all";
+export type UsageSurface = "all" | "codex" | "claude";
 export interface UsageSummaryTotals {
   requests: number;
@@ -63,6 +64,7 @@ export interface UsageProvider {
 export interface UsageSummary {
   range: UsageRange;
+  surface: UsageSurface;
   since: number | null;
   generatedAt: number;
   summary: UsageSummaryTotals;
@@ -78,6 +80,11 @@ export function parseRange(input: string | null | undefined): UsageRange {
   return "30d";
 }
+export function parseUsageSurface(input: string | null | undefined): UsageSurface {
+  if (input === "codex" || input === "claude") return input;
+  return "all";
+}
 function rangeWindow(range: UsageRange, now: number): { since: number | null; days: number } {
   if (range === "7d") return { since: now - 7 * DAY_MS, days: 7 };
   if (range === "30d") return { since: now - 30 * DAY_MS, days: 30 };
@@ -270,22 +277,33 @@ function buildProviders(entries: PersistedUsageEntry[], totalTokens: number): Us
   return providers.sort((a, b) => b.requests - a.requests);
 }
-export function summarizeUsage(entries: PersistedUsageEntry[], range: UsageRange, now: number): UsageSummary {
+export function summarizeUsage(
+  entries: PersistedUsageEntry[],
+  range: UsageRange,
+  now: number,
+  surface: UsageSurface = "all",
+): UsageSummary {
   const { since } = rangeWindow(range, now);
-  const inRange = since === null ? entries : entries.filter(e => e.timestamp >= since);
+  const filteredEntries = entries.filter(entry => {
+    if (since !== null && entry.timestamp < since) return false;
+    if (surface === "claude") return entry.surface === "claude";
+    if (surface === "codex") return entry.surface !== "claude";
+    return true;
+  });
   const totals = blankTotals();
-  for (const entry of inRange) {
+  for (const entry of filteredEntries) {
     bumpStatus(totals, entry.usageStatus);
     addTokens(totals, entry);
   }
   finalizeCoverage(totals);
   return {
     range,
+    surface,
     since,
     generatedAt: now,
     summary: totals,
-    days: buildDayGrid(range, since, now, inRange),
-    models: buildModels(inRange, totals.totalTokens),
-    providers: buildProviders(inRange, totals.totalTokens),
+    days: buildDayGrid(range, since, now, filteredEntries),
+    models: buildModels(filteredEntries, totals.totalTokens),
+    providers: buildProviders(filteredEntries, totals.totalTokens),
   };
 }