npm - remote-codex - Versions diffs - 0.11.31 → 0.11.33 - Mend

remote-codex 0.11.31 → 0.11.33

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

package/README.md +12 -4
package/apps/relay-server/dist/index.js +2956 -164
package/apps/supervisor-api/dist/index.js +497 -54
package/apps/supervisor-web/dist/assets/index-CdjTdnJt.css +1 -0
package/apps/supervisor-web/dist/assets/index-DIi8wTEY.js +21 -0
package/apps/supervisor-web/dist/assets/thread-ui-B9eC2H4u.js +3677 -0
package/apps/supervisor-web/dist/index.html +3 -3
package/bin/remote-codex.mjs +6 -3
package/package.json +1 -1
package/packages/agent-runtime/src/types.ts +13 -0
package/packages/claude/src/runtimeAdapter.test.ts +121 -1
package/packages/claude/src/runtimeAdapter.ts +131 -0
package/packages/codex/src/appServerManager.ts +16 -0
package/packages/codex/src/runtimeAdapter.test.ts +44 -0
package/packages/codex/src/runtimeAdapter.ts +66 -0
package/packages/db/migrations/0029_thread_turn_delivery.sql +19 -0
package/packages/db/src/repositories.ts +96 -1
package/packages/db/src/schema.ts +20 -0
package/packages/shared/src/index.ts +199 -6
package/scripts/run-web-service.mjs +2 -2
package/scripts/service-manager.mjs +2 -2
package/apps/supervisor-web/dist/assets/index-BkwJP0KB.js +0 -6
package/apps/supervisor-web/dist/assets/index-CJFMmjP5.css +0 -1
package/apps/supervisor-web/dist/assets/thread-ui-BOqbjoiB.js +0 -3677

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-BkwJP0KB.js"></script>
+    <script type="module" crossorigin src="/assets/index-DIi8wTEY.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-BOqbjoiB.js">
+    <link rel="modulepreload" crossorigin href="/assets/thread-ui-B9eC2H4u.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-CJFMmjP5.css">
+    <link rel="stylesheet" crossorigin href="/assets/index-CdjTdnJt.css">
   </head>
   <body class="bg-stone-950">
     <div id="root"></div>

package/bin/remote-codex.mjs CHANGED Viewed

@@ -851,9 +851,9 @@ What it starts:
   API          http://SERVICE_API_HOST:SERVICE_API_PORT
 Environment:
-  SERVICE_HOST              Web listen host. Default 127.0.0.1.
+  SERVICE_HOST              Web listen host. Default 0.0.0.0.
   SERVICE_PORT              Web listen port. Default ${defaultServicePort}.
-  SERVICE_API_HOST          API listen host. Default 127.0.0.1.
+  SERVICE_API_HOST          API listen host. Default 0.0.0.0.
   SERVICE_API_PORT          API listen port. Default ${defaultApiPort}.
   REMOTE_CODEX_SERVICE_DIR  Service state/log directory.
   LOG_LEVEL                 API log level. Default warn for service mode.
@@ -871,7 +871,10 @@ Supervisor configuration forwarded to the API:
   OPENCODE_COMMAND          OpenCode executable. Default opencode.
 Example:
-  SERVICE_HOST=127.0.0.1 SERVICE_PORT=4173 remote-codex start
+  remote-codex start
+Restrict the service to this machine:
+  SERVICE_HOST=127.0.0.1 SERVICE_API_HOST=127.0.0.1 remote-codex start
 Expose over Tailscale after start:
   tailscale serve --bg http://127.0.0.1:${defaultServicePort}

package/package.json CHANGED Viewed

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

package/packages/agent-runtime/src/types.ts CHANGED Viewed

@@ -582,4 +582,17 @@ export interface AgentRuntime extends EventEmitter {
   getGoal?(providerSessionId: string): Promise<AgentGoal | null>;
   setGoal?(input: SetAgentGoalInput): Promise<AgentGoal>;
   clearGoal?(providerSessionId: string): Promise<boolean>;
+  getSubscriptionUsage?(): Promise<{
+    provider: 'codex' | 'claude';
+    authKind: 'subscription' | 'apiKey' | 'unknown';
+    observedAt: string;
+    stale: boolean;
+    windows: Array<{
+      id: string;
+      durationMinutes: number | null;
+      label: string;
+      usedPercent: number;
+      resetsAt: string | null;
+    }>;
+  } | null>;
 }

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

@@ -15,6 +15,7 @@ interface Query extends AsyncIterable<SDKMessage> {
   interrupt(): Promise<void>;
   supportedModels(): Promise<any[]>;
   mcpServerStatus(): Promise<any[]>;
+  usage_EXPERIMENTAL_MAY_CHANGE_DO_NOT_RELY_ON_THIS_API_YET(): Promise<any>;
 }
 function wait(ms = 0) {
@@ -29,7 +30,7 @@ class FakeQuery implements Query {
   constructor(
     private readonly messages: SDKMessage[],
-    private readonly options: { holdOpen?: boolean } = {},
+    private readonly options: { holdOpen?: boolean; usage?: Record<string, any> } = {},
   ) {}
   [Symbol.asyncIterator]() {
@@ -104,6 +105,12 @@ class FakeQuery implements Query {
   async getContextUsage(): Promise<any> {
     return {};
   }
+  async usage_EXPERIMENTAL_MAY_CHANGE_DO_NOT_RELY_ON_THIS_API_YET(): Promise<any> {
+    if (!this.options.usage) {
+      throw new Error('Structured usage unavailable in this fixture.');
+    }
+    return this.options.usage;
+  }
   async readFile(): Promise<any> {
     return {};
   }
@@ -208,6 +215,119 @@ function makeAdapter(
 }
 describe('ClaudeRuntimeAdapter', () => {
+  it('actively reads Claude subscription windows from the structured usage API', async () => {
+    const adapter = makeAdapter(() => new FakeQuery(
+      [systemInit(), result()],
+      {
+        usage: {
+          subscription_type: 'max',
+          rate_limits_available: true,
+          rate_limits: {
+            five_hour: {
+              utilization: 23,
+              resets_at: '2027-01-15T08:00:00.000Z',
+            },
+            seven_day: {
+              utilization: 84,
+              resets_at: '2027-01-20T08:00:00.000Z',
+            },
+          },
+        },
+      },
+    ));
+    await adapter.start();
+    await adapter.startSession({
+      cwd: '/tmp/workspace',
+      model: 'sonnet',
+      approvalMode: 'guarded',
+      sandboxMode: 'workspace-write',
+    });
+    await expect(adapter.getSubscriptionUsage()).resolves.toMatchObject({
+      provider: 'claude',
+      authKind: 'subscription',
+      windows: [
+        {
+          id: 'five_hour',
+          label: '5h',
+          usedPercent: 23,
+          resetsAt: '2027-01-15T08:00:00.000Z',
+        },
+        {
+          id: 'seven_day',
+          label: '7d',
+          usedPercent: 84,
+          resetsAt: '2027-01-20T08:00:00.000Z',
+        },
+      ],
+    });
+  });
+  it('captures Claude subscription rate-limit windows from SDK events', async () => {
+    const adapter = makeAdapter(() => [
+      systemInit(),
+      {
+        type: 'rate_limit_event',
+        rate_limit_info: {
+          status: 'allowed',
+          rateLimitType: 'five_hour',
+          utilization: 0.23,
+          resetsAt: 1_800_000_000,
+        },
+        uuid: '00000000-0000-4000-8000-000000000003',
+        session_id: 'claude-session-1',
+      },
+      {
+        type: 'rate_limit_event',
+        rate_limit_info: {
+          status: 'allowed_warning',
+          rateLimitType: 'seven_day',
+          utilization: 0.84,
+          resetsAt: 1_800_086_400,
+        },
+        uuid: '00000000-0000-4000-8000-000000000004',
+        session_id: 'claude-session-1',
+      },
+      result(),
+    ]);
+    await adapter.start();
+    await expect(adapter.getSubscriptionUsage()).resolves.toMatchObject({
+      provider: 'claude',
+      authKind: 'unknown',
+      windows: [],
+    });
+    await adapter.startSession({
+      cwd: '/tmp/workspace',
+      model: 'sonnet',
+      approvalMode: 'guarded',
+      sandboxMode: 'workspace-write',
+    });
+    await expect(adapter.getSubscriptionUsage()).resolves.toMatchObject({
+      provider: 'claude',
+      authKind: 'subscription',
+      stale: false,
+      windows: [
+        {
+          id: 'five_hour',
+          durationMinutes: 300,
+          label: '5h',
+          usedPercent: 23,
+          resetsAt: new Date(1_800_000_000 * 1000).toISOString(),
+        },
+        {
+          id: 'seven_day',
+          durationMinutes: 10_080,
+          label: '7d',
+          usedPercent: 84,
+          resetsAt: new Date(1_800_086_400 * 1000).toISOString(),
+        },
+      ],
+    });
+  });
   it('passes the configured Claude executable to the SDK', async () => {
     const sdkOptions: Record<string, unknown>[] = [];
     const adapter = new ClaudeRuntimeAdapter({

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

@@ -99,6 +99,19 @@ interface Query extends AsyncIterable<SDKMessage> {
   interrupt(): Promise<void>;
   supportedModels(): Promise<ModelInfo[]>;
   mcpServerStatus(): Promise<McpServerStatus[]>;
+  usage_EXPERIMENTAL_MAY_CHANGE_DO_NOT_RELY_ON_THIS_API_YET?(): Promise<SDKUsageResponse>;
+}
+interface SDKUsageWindow {
+  utilization: number | null;
+  resets_at: string | null;
+}
+interface SDKUsageResponse {
+  subscription_type: string | null;
+  rate_limits_available: boolean;
+  rate_limits: {
+    five_hour?: SDKUsageWindow | null;
+    seven_day?: SDKUsageWindow | null;
+  } | null;
 }
 interface SDKMessage {
   type: string;
@@ -119,6 +132,19 @@ interface SDKMessage {
   modelUsage?: unknown;
   errors?: string[];
   stop_reason?: string;
+  rate_limit_info?: SDKRateLimitInfo;
+}
+interface SDKRateLimitInfo {
+  status: 'allowed' | 'allowed_warning' | 'rejected';
+  resetsAt?: number;
+  rateLimitType?:
+    | 'five_hour'
+    | 'seven_day'
+    | 'seven_day_opus'
+    | 'seven_day_sonnet'
+    | 'seven_day_overage_included'
+    | 'overage';
+  utilization?: number;
 }
 interface SDKUserMessage {
   type: 'user';
@@ -1222,6 +1248,12 @@ export class ClaudeRuntimeAdapter extends EventEmitter implements AgentRuntime {
   private readonly sessionModels = new Map<string, string | null>();
   private readonly sessionApprovalModes = new Map<string, StartAgentSessionInput['approvalMode']>();
   private readonly liveUserPrompts = new Map<string, Map<string, string>>();
+  private readonly subscriptionUsageWindows = new Map<
+    'five_hour' | 'seven_day',
+    { usedPercent: number; resetsAt: string | null }
+  >();
+  private subscriptionAuthKind: 'subscription' | 'apiKey' | 'unknown' = 'unknown';
+  private subscriptionUsageObservedAt: string | null = null;
   private readonly clientApp: string;
   private sdkLoadError: string | null = null;
@@ -1242,6 +1274,93 @@ export class ClaudeRuntimeAdapter extends EventEmitter implements AgentRuntime {
     return { ...this.status };
   }
+  async getSubscriptionUsage() {
+    const observedAt = this.subscriptionUsageObservedAt ?? new Date().toISOString();
+    const windows = [...this.subscriptionUsageWindows.entries()].map(([id, window]) => ({
+      id,
+      durationMinutes: id === 'five_hour' ? 300 : 10_080,
+      label: id === 'five_hour' ? '5h' : '7d',
+      usedPercent: window.usedPercent,
+      resetsAt: window.resetsAt,
+    }));
+    return {
+      provider: 'claude' as const,
+      authKind: this.subscriptionAuthKind,
+      observedAt,
+      stale: false,
+      windows,
+    };
+  }
+  private captureRateLimit(message: SDKMessage) {
+    if (message.type !== 'rate_limit_event') {
+      return;
+    }
+    const info = message.rate_limit_info;
+    if (
+      !info
+      || (info.rateLimitType !== 'five_hour' && info.rateLimitType !== 'seven_day')
+      || typeof info.utilization !== 'number'
+      || !Number.isFinite(info.utilization)
+    ) {
+      return;
+    }
+    this.subscriptionUsageWindows.set(info.rateLimitType, {
+      usedPercent: Math.max(0, Math.min(100, info.utilization * 100)),
+      resetsAt: typeof info.resetsAt === 'number'
+        ? new Date(info.resetsAt * 1000).toISOString()
+        : null,
+    });
+    this.subscriptionAuthKind = 'subscription';
+    this.subscriptionUsageObservedAt = new Date().toISOString();
+  }
+  private async captureStructuredSubscriptionUsage(query: Query) {
+    const getUsage = query.usage_EXPERIMENTAL_MAY_CHANGE_DO_NOT_RELY_ON_THIS_API_YET;
+    if (!getUsage) {
+      return;
+    }
+    try {
+      const usage = await getUsage.call(query);
+      const nextWindows = new Map<
+        'five_hour' | 'seven_day',
+        { usedPercent: number; resetsAt: string | null }
+      >();
+      const addWindow = (
+        id: 'five_hour' | 'seven_day',
+        window: SDKUsageWindow | null | undefined,
+      ) => {
+        if (
+          typeof window?.utilization !== 'number'
+          || !Number.isFinite(window.utilization)
+        ) {
+          return;
+        }
+        nextWindows.set(id, {
+          usedPercent: Math.max(0, Math.min(100, window.utilization)),
+          resetsAt: typeof window.resets_at === 'string' ? window.resets_at : null,
+        });
+      };
+      addWindow('five_hour', usage.rate_limits?.five_hour);
+      addWindow('seven_day', usage.rate_limits?.seven_day);
+      this.subscriptionUsageWindows.clear();
+      for (const [id, window] of nextWindows) {
+        this.subscriptionUsageWindows.set(id, window);
+      }
+      this.subscriptionAuthKind = usage.subscription_type
+        ? 'subscription'
+        : usage.rate_limits_available
+          ? 'subscription'
+          : 'apiKey';
+      this.subscriptionUsageObservedAt = new Date().toISOString();
+    } catch {
+      // This SDK method is experimental. Rate-limit events remain the
+      // compatibility fallback for Claude versions that do not expose it.
+    }
+  }
   private updateToolboxItemsFromSystemInit(message: SDKMessage) {
     this.managementSchema.toolboxItems = buildClaudeToolboxItems(
       normalizeClaudeSlashCommands(message.slash_commands),
@@ -1405,9 +1524,15 @@ export class ClaudeRuntimeAdapter extends EventEmitter implements AgentRuntime {
     let providerSessionId: string | null = null;
     let model: string | null = input.model;
     const rawMessages: SDKMessage[] = [];
+    let capturedStructuredUsage = false;
     try {
       for await (const message of query) {
         rawMessages.push(message);
+        if (!capturedStructuredUsage) {
+          capturedStructuredUsage = true;
+          await this.captureStructuredSubscriptionUsage(query);
+        }
+        this.captureRateLimit(message);
         if (message.type === 'system' && message.subtype === 'init') {
           this.updateToolboxItemsFromSystemInit(message);
           const sessionId = message.session_id;
@@ -1696,9 +1821,15 @@ export class ClaudeRuntimeAdapter extends EventEmitter implements AgentRuntime {
     const rawMessages: SDKMessage[] = [];
     let terminalStatus: AgentTurn['status'] | null = null;
     let terminalError: string | null = null;
+    let capturedStructuredUsage = false;
     try {
       for await (const message of state.query) {
         rawMessages.push(message);
+        if (!capturedStructuredUsage) {
+          capturedStructuredUsage = true;
+          await this.captureStructuredSubscriptionUsage(state.query);
+        }
+        this.captureRateLimit(message);
         this.consumeMessage(state, message);
         const status = queryResultStatus(message);
         if (status) {

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

@@ -320,6 +320,22 @@ export class CodexAppServerManager extends EventEmitter {
     return response.data.map(mapModel);
   }
+  async readAccount() {
+    await this.ensureReady();
+    return this.client!.request<{
+      account: { type: string } | null;
+      requiresOpenaiAuth: boolean;
+    }>('account/read', { refreshToken: false });
+  }
+  async readAccountRateLimits() {
+    await this.ensureReady();
+    return this.client!.request<{
+      rateLimits: unknown;
+      rateLimitsByLimitId?: Record<string, unknown> | null;
+    }>('account/rateLimits/read', null);
+  }
   async listThreads(): Promise<CodexThreadRecord[]> {
     await this.ensureReady();
     const response = await this.client!.request<{ data: any[] }>('thread/list', {

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

@@ -27,6 +27,22 @@ class FakeCodexManager extends EventEmitter {
       items: [],
     };
   }
+  async readAccount() {
+    return { account: { type: 'chatgpt' }, requiresOpenaiAuth: true };
+  }
+  async readAccountRateLimits() {
+    return {
+      rateLimits: {},
+      rateLimitsByLimitId: {
+        codex: {
+          primary: { usedPercent: 40, windowDurationMins: 300, resetsAt: 1_800_000_000 },
+          secondary: { usedPercent: 75, windowDurationMins: 10_080, resetsAt: 1_800_604_800 },
+        },
+      },
+    };
+  }
 }
 describe('CodexRuntimeAdapter', () => {
@@ -73,4 +89,32 @@ describe('CodexRuntimeAdapter', () => {
       { type: 'text', text: '.', text_elements: [] },
     ]);
   });
+  it('maps ChatGPT rate-limit windows without assuming fixed durations', async () => {
+    const adapter = new CodexRuntimeAdapter(new FakeCodexManager() as never);
+    await expect(adapter.getSubscriptionUsage()).resolves.toMatchObject({
+      provider: 'codex',
+      authKind: 'subscription',
+      stale: false,
+      windows: [
+        { id: 'primary', label: '5h', durationMinutes: 300, usedPercent: 40 },
+        { id: 'secondary', label: '7d', durationMinutes: 10_080, usedPercent: 75 },
+      ],
+    });
+  });
+  it('hides subscription windows for API-key authentication', async () => {
+    const manager = new FakeCodexManager();
+    manager.readAccount = async () => ({
+      account: { type: 'apiKey' },
+      requiresOpenaiAuth: true,
+    });
+    const adapter = new CodexRuntimeAdapter(manager as never);
+    await expect(adapter.getSubscriptionUsage()).resolves.toMatchObject({
+      authKind: 'apiKey',
+      windows: [],
+    });
+  });
 });

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

@@ -484,6 +484,20 @@ function mapCodexNotification(event: CodexServerEvent): AgentRuntimeEvent | null
   }
 }
+function formatRateLimitWindowLabel(
+  durationMinutes: number | null,
+  fallback: string,
+) {
+  if (durationMinutes === null) return fallback;
+  if (durationMinutes % (60 * 24) === 0) {
+    return `${durationMinutes / (60 * 24)}d`;
+  }
+  if (durationMinutes % 60 === 0) {
+    return `${durationMinutes / 60}h`;
+  }
+  return `${durationMinutes}m`;
+}
 function mapCodexRuntimeError(error: unknown): never {
   if (error instanceof AgentRuntimeError) {
     throw error;
@@ -617,6 +631,58 @@ export class CodexRuntimeAdapter extends EventEmitter implements AgentRuntime {
     return mapStatus(this.manager.getStatus());
   }
+  async getSubscriptionUsage() {
+    const account = await codexRuntimeCall(() => this.manager.readAccount());
+    if (account.account?.type === 'apiKey') {
+      return {
+        provider: 'codex' as const,
+        authKind: 'apiKey' as const,
+        observedAt: new Date().toISOString(),
+        stale: false,
+        windows: [],
+      };
+    }
+    if (account.account?.type !== 'chatgpt') {
+      return null;
+    }
+    const response = await codexRuntimeCall(() =>
+      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,
+      }];
+    });
+    return {
+      provider: 'codex' as const,
+      authKind: 'subscription' as const,
+      observedAt: new Date().toISOString(),
+      stale: false,
+      windows,
+    };
+  }
   start() {
     return codexRuntimeCall(() => this.manager.start());
   }

package/packages/db/migrations/0029_thread_turn_delivery.sql ADDED Viewed

@@ -0,0 +1,19 @@
+ALTER TABLE threads ADD COLUMN active_turn_collaboration_mode TEXT;
+ALTER TABLE thread_pending_steers
+  ADD COLUMN delivery TEXT NOT NULL DEFAULT 'steer';
+ALTER TABLE thread_pending_steers
+  ADD COLUMN turn_config_json TEXT;
+CREATE TABLE IF NOT EXISTS thread_prompt_requests (
+  id TEXT PRIMARY KEY,
+  thread_id TEXT NOT NULL,
+  client_request_id TEXT NOT NULL,
+  status TEXT NOT NULL,
+  created_at TEXT NOT NULL,
+  updated_at TEXT NOT NULL
+);
+CREATE UNIQUE INDEX IF NOT EXISTS thread_prompt_requests_thread_client_request_idx
+  ON thread_prompt_requests(thread_id, client_request_id);