npm - remote-codex - Versions diffs - 0.11.35 → 0.11.37 - Mend

remote-codex 0.11.35 → 0.11.37

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

package/README.md +195 -18
package/apps/supervisor-api/dist/index.js +183 -45
package/apps/supervisor-web/dist/assets/index-P0J5du_C.css +1 -0
package/apps/supervisor-web/dist/assets/index-pkf-_mec.js +21 -0
package/apps/supervisor-web/dist/assets/{thread-ui-CK1xSLOW.js → thread-ui-xWvswa2v.js} +57 -24
package/apps/supervisor-web/dist/index.html +3 -3
package/package.json +1 -1
package/packages/codex/src/runtimeAdapter.test.ts +100 -1
package/packages/codex/src/runtimeAdapter.ts +95 -28
package/packages/codex/src/types.ts +8 -2
package/packages/db/src/repositories.ts +16 -0
package/apps/supervisor-web/dist/assets/index-C14vD5Hp.js +0 -21
package/apps/supervisor-web/dist/assets/index-DYIjFImB.css +0 -1

package/apps/supervisor-web/dist/index.html CHANGED Viewed

@@ -10,16 +10,16 @@
     <link rel="apple-touch-icon" sizes="180x180" href="/apple-touch-icon.png" />
     <link rel="manifest" href="/site.webmanifest" />
     <title>Remote Codex</title>
-    <script type="module" crossorigin src="/assets/index-C14vD5Hp.js"></script>
+    <script type="module" crossorigin src="/assets/index-pkf-_mec.js"></script>
     <link rel="modulepreload" crossorigin href="/assets/react-vendor-Dfg_6BLf.js">
     <link rel="modulepreload" crossorigin href="/assets/ui-vendor-CuR8GHb0.js">
     <link rel="modulepreload" crossorigin href="/assets/graph-vendor-DVQUpZ8C.js">
     <link rel="modulepreload" crossorigin href="/assets/terminal-vendor-C5bTa-Ka.js">
     <link rel="modulepreload" crossorigin href="/assets/markdown-vendor-RZk8L7-L.js">
-    <link rel="modulepreload" crossorigin href="/assets/thread-ui-CK1xSLOW.js">
+    <link rel="modulepreload" crossorigin href="/assets/thread-ui-xWvswa2v.js">
     <link rel="stylesheet" crossorigin href="/assets/graph-vendor-C5ap-Sga.css">
     <link rel="stylesheet" crossorigin href="/assets/terminal-vendor-Beg8tuEN.css">
-    <link rel="stylesheet" crossorigin href="/assets/index-DYIjFImB.css">
+    <link rel="stylesheet" crossorigin href="/assets/index-P0J5du_C.css">
   </head>
   <body class="bg-stone-950">
     <div id="root"></div>

package/package.json CHANGED Viewed

@@ -1,6 +1,6 @@
 {
   "name": "remote-codex",
-  "version": "0.11.35",
+  "version": "0.11.37",
   "description": "Local web supervisor for Codex workspaces and threads.",
   "license": "MIT",
   "type": "module",

package/packages/codex/src/runtimeAdapter.test.ts CHANGED Viewed

@@ -32,7 +32,7 @@ class FakeCodexManager extends EventEmitter {
     return { account: { type: 'chatgpt' }, requiresOpenaiAuth: true };
   }
-  async readAccountRateLimits() {
+  async readAccountRateLimits(): Promise<any> {
     return {
       rateLimits: {},
       rateLimitsByLimitId: {
@@ -46,6 +46,63 @@ class FakeCodexManager extends EventEmitter {
 }
 describe('CodexRuntimeAdapter', () => {
+  it('does not terminate a turn while Codex is retrying an upstream request', () => {
+    const manager = new FakeCodexManager();
+    const adapter = new CodexRuntimeAdapter(manager as never);
+    const events: unknown[] = [];
+    adapter.on('event', (event) => events.push(event));
+    manager.emit('notification', {
+      method: 'error',
+      params: {
+        threadId: 'thread-1',
+        turnId: 'turn-1',
+        willRetry: true,
+        error: {
+          message: 'Reconnecting... 1/5',
+          additionalDetails: 'unexpected status 404 Not Found',
+        },
+      },
+    });
+    expect(events).toEqual([]);
+  });
+  it('preserves detailed upstream errors when the final retry fails', () => {
+    const manager = new FakeCodexManager();
+    const adapter = new CodexRuntimeAdapter(manager as never);
+    const events: unknown[] = [];
+    adapter.on('event', (event) => events.push(event));
+    manager.emit('notification', {
+      method: 'error',
+      params: {
+        threadId: 'thread-1',
+        turnId: 'turn-1',
+        willRetry: false,
+        error: {
+          message: 'Upstream request failed.',
+          additionalDetails: JSON.stringify({
+            error: {
+              message: 'Model "gpt-5.6-sol" is not supported by any configured account in this group',
+              type: 'model_not_found',
+            },
+          }),
+        },
+      },
+    });
+    expect(events).toEqual([
+      expect.objectContaining({
+        type: 'turn.failed',
+        providerSessionId: 'thread-1',
+        providerTurnId: 'turn-1',
+        error: 'Model "gpt-5.6-sol" is not supported by any configured account in this group',
+        willRetry: false,
+      }),
+    ]);
+  });
   it('converts prompt photo tokens into structured local image input', async () => {
     const manager = new FakeCodexManager();
     const adapter = new CodexRuntimeAdapter(manager as never);
@@ -104,6 +161,48 @@ describe('CodexRuntimeAdapter', () => {
     });
   });
+  it('uses the populated backward-compatible snapshot when a named bucket is empty', async () => {
+    const manager = new FakeCodexManager();
+    manager.readAccountRateLimits = async () => ({
+      rateLimits: {
+        primary: {
+          usedPercent: 63,
+          windowDurationMins: 10_080,
+          resetsAt: 1_800_604_800,
+        },
+      },
+      rateLimitsByLimitId: { codex: { primary: null, secondary: null } },
+    });
+    const adapter = new CodexRuntimeAdapter(manager as never);
+    await expect(adapter.getSubscriptionUsage()).resolves.toMatchObject({
+      provider: 'codex',
+      authKind: 'subscription',
+      windows: [
+        { id: 'primary', label: '7d', durationMinutes: 10_080, usedPercent: 63 },
+      ],
+    });
+  });
+  it('normalizes legacy snake-case rate-limit window fields', async () => {
+    const manager = new FakeCodexManager();
+    manager.readAccountRateLimits = async () => ({
+      rateLimits: {
+        primary: {
+          used_percent: 12,
+          window_minutes: 300,
+          resets_at: 1_800_000_000,
+        },
+      },
+      rateLimitsByLimitId: null,
+    });
+    const adapter = new CodexRuntimeAdapter(manager as never);
+    await expect(adapter.getSubscriptionUsage()).resolves.toMatchObject({
+      windows: [{ label: '5h', durationMinutes: 300, usedPercent: 12 }],
+    });
+  });
   it('hides subscription windows for API-key authentication', async () => {
     const manager = new FakeCodexManager();
     manager.readAccount = async () => ({

package/packages/codex/src/runtimeAdapter.ts CHANGED Viewed

@@ -45,6 +45,7 @@ import {
   CodexThreadRecord,
   CodexThreadStatus,
   CodexThreadGoalRecord,
+  CodexTurnError,
   CodexTurnRecord,
   CodexTurnItem,
   CodexServerEvent,
@@ -208,7 +209,52 @@ function mapModel(model: Awaited<ReturnType<CodexAppServerManager['listModels']>
 }
 function mapTurn(turn: CodexTurnRecord): AgentTurn {
-  return codexTurnToAgentTurn(turn);
+  const mapped = codexTurnToAgentTurn(turn);
+  return turn.error
+    ? {
+        ...mapped,
+        error: { message: codexTurnErrorMessage(turn.error) },
+      }
+    : mapped;
+}
+function nestedUpstreamErrorMessage(value: string | null | undefined) {
+  if (!value) {
+    return null;
+  }
+  try {
+    const parsed = JSON.parse(value) as unknown;
+    if (typeof parsed !== 'object' || parsed === null) {
+      return null;
+    }
+    const error = 'error' in parsed ? parsed.error : parsed;
+    if (typeof error !== 'object' || error === null || !('message' in error)) {
+      return null;
+    }
+    return typeof error.message === 'string' && error.message.trim()
+      ? error.message.trim()
+      : null;
+  } catch {
+    return null;
+  }
+}
+function codexTurnErrorMessage(error: CodexTurnError) {
+  const message = error.message?.trim() || 'Turn failed unexpectedly.';
+  const details = error.additionalDetails?.trim();
+  if (!details) {
+    return message;
+  }
+  const upstreamMessage = nestedUpstreamErrorMessage(details);
+  if (upstreamMessage && !message.includes(upstreamMessage)) {
+    return upstreamMessage;
+  }
+  if (message.includes(details)) {
+    return message;
+  }
+  return `${message}\n\n${details}`;
 }
 function mapGoal(goal: CodexThreadGoalRecord): AgentGoal {
@@ -467,15 +513,18 @@ function mapCodexNotification(event: CodexServerEvent): AgentRuntimeEvent | null
       const params = event.params as {
         threadId: string;
         turnId: string;
-        error: { message?: string };
+        error: CodexTurnError;
         willRetry: boolean;
       };
+      if (params.willRetry) {
+        return null;
+      }
       return {
         type: 'turn.failed',
         provider: 'codex',
         providerSessionId: params.threadId,
         providerTurnId: params.turnId,
-        error: params.error.message ?? 'Turn failed unexpectedly.',
+        error: codexTurnErrorMessage(params.error),
         willRetry: params.willRetry,
       };
     }
@@ -498,6 +547,41 @@ function formatRateLimitWindowLabel(
   return `${durationMinutes}m`;
 }
+function recordOrNull(value: unknown): Record<string, unknown> | null {
+  return value && typeof value === 'object' && !Array.isArray(value)
+    ? (value as Record<string, unknown>)
+    : null;
+}
+function rateLimitWindowsFromSnapshot(snapshot: unknown) {
+  const record = recordOrNull(snapshot);
+  if (!record) return [];
+  return ['primary', 'secondary'].flatMap((id) => {
+    const window = recordOrNull(record[id]);
+    if (!window) return [];
+    const usedPercent = Number(window.usedPercent ?? window.used_percent);
+    if (!Number.isFinite(usedPercent)) return [];
+    const duration = Number(
+      window.windowDurationMins ??
+        window.window_duration_mins ??
+        window.windowMinutes ??
+        window.window_minutes,
+    );
+    const durationMinutes = Number.isFinite(duration) ? duration : null;
+    const resetsAt = Number(window.resetsAt ?? window.resets_at);
+    return [{
+      id,
+      durationMinutes,
+      label: formatRateLimitWindowLabel(durationMinutes, id),
+      usedPercent: Math.max(0, Math.min(100, usedPercent)),
+      resetsAt: Number.isFinite(resetsAt)
+        ? new Date(resetsAt * 1000).toISOString()
+        : null,
+    }];
+  });
+}
 function mapCodexRuntimeError(error: unknown): never {
   if (error instanceof AgentRuntimeError) {
     throw error;
@@ -649,31 +733,14 @@ export class CodexRuntimeAdapter extends EventEmitter implements AgentRuntime {
       this.manager.readAccountRateLimits(),
     );
     const buckets = response.rateLimitsByLimitId;
-    const snapshot =
-      (buckets && (buckets.codex ?? Object.values(buckets)[0])) ??
-      response.rateLimits;
-    const record = snapshot && typeof snapshot === 'object'
-      ? (snapshot as Record<string, unknown>)
-      : {};
-    const windows = ['primary', 'secondary'].flatMap((id) => {
-      const value = record[id];
-      if (!value || typeof value !== 'object') return [];
-      const window = value as Record<string, unknown>;
-      const usedPercent = Number(window.usedPercent);
-      if (!Number.isFinite(usedPercent)) return [];
-      const duration = Number(window.windowDurationMins);
-      const durationMinutes = Number.isFinite(duration) ? duration : null;
-      const resetsAt = Number(window.resetsAt);
-      return [{
-        id,
-        durationMinutes,
-        label: formatRateLimitWindowLabel(durationMinutes, id),
-        usedPercent: Math.max(0, Math.min(100, usedPercent)),
-        resetsAt: Number.isFinite(resetsAt)
-          ? new Date(resetsAt * 1000).toISOString()
-          : null,
-      }];
-    });
+    const candidates = [
+      response.rateLimits,
+      buckets?.codex,
+      ...Object.values(buckets ?? {}),
+    ];
+    const windows = candidates
+      .map(rateLimitWindowsFromSnapshot)
+      .sort((left, right) => right.length - left.length)[0] ?? [];
     return {
       provider: 'codex' as const,
       authKind: 'subscription' as const,

package/packages/codex/src/types.ts CHANGED Viewed

@@ -135,7 +135,7 @@ export interface CodexTurnItem {
 export interface CodexTurnRecord {
   id: string;
   status: CodexTurnStatus;
-  error: { message?: string } | null;
+  error: CodexTurnError | null;
   items: CodexTurnItem[];
 }
@@ -401,6 +401,12 @@ export interface CodexErrorEvent {
   willRetry: boolean;
 }
+export interface CodexTurnError {
+  message: string;
+  additionalDetails?: string | null;
+  codexErrorInfo?: unknown;
+}
 export type CodexServerEvent =
   | { method: 'thread/started'; params: { thread: CodexThreadRecord } }
   | { method: 'thread/status/changed'; params: { threadId: string; status: CodexThreadStatus } }
@@ -416,5 +422,5 @@ export type CodexServerEvent =
   | { method: 'turn/plan/updated'; params: { threadId: string; turnId: string; explanation: string | null; plan: Array<{ step: string; status: string }> } }
   | { method: 'turn/completed'; params: { threadId: string; turn: CodexTurnRecord } }
   | { method: 'item/agentMessage/delta'; params: CodexOutputDeltaEvent }
-  | { method: 'error'; params: { error: { message?: string }; willRetry: boolean; threadId: string; turnId: string } }
+  | { method: 'error'; params: { error: CodexTurnError; willRetry: boolean; threadId: string; turnId: string } }
   | { method: string; params: Record<string, unknown> };

package/packages/db/src/repositories.ts CHANGED Viewed

@@ -558,6 +558,22 @@ export function deleteThreadPendingSteerRecordById(db: DatabaseClient, id: strin
   db.delete(threadPendingSteers).where(eq(threadPendingSteers.id, id)).run();
 }
+export function updateThreadPendingSteerRecordDelivery(
+  db: DatabaseClient,
+  id: string,
+  delivery: 'steer' | 'continuation',
+  turnId: string,
+) {
+  db.update(threadPendingSteers)
+    .set({
+      delivery,
+      turnId,
+      updatedAt: new Date().toISOString(),
+    })
+    .where(eq(threadPendingSteers.id, id))
+    .run();
+}
 export function deleteThreadPendingSteerRecordsByThreadId(
   db: DatabaseClient,
   threadId: string,