remote-codex 0.11.30 → 0.11.32

package/packages/codex/src/runtimeAdapter.ts

@@ -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/codex/src/types.ts

@@ -63,7 +63,9 @@ export type ReasoningEffort =
   | 'low'
   | 'medium'
   | 'high'
-  | 'xhigh';
+  | 'xhigh'
+  | 'max'
+  | 'ultra';
 
 export type CollaborationModeKind = 'default' | 'plan';
 export type SandboxMode = 'read-only' | 'workspace-write' | 'danger-full-access';

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

@@ -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);

package/packages/db/src/repositories.ts

@@ -1,6 +1,6 @@
 import { randomUUID } from 'node:crypto';
 
-import { and, desc, eq, inArray } from 'drizzle-orm';
+import { and, desc, eq, inArray, lt } from 'drizzle-orm';
 
 import { DatabaseClient } from './client';
 import { getDefaultHostRecord } from './client';
@@ -12,6 +12,7 @@ import {
   threadGoals,
   threadHistoryItems,
   threadPendingSteers,
+  threadPromptRequests,
   threadTurnMetadata,
   threads,
   viewerSessions,
@@ -36,6 +37,7 @@ export interface CreateThreadRecordInput {
   fastBaseModel?: string | null;
   fastBaseReasoningEffort?: string | null;
   collaborationMode?: string;
+  activeTurnCollaborationMode?: string | null;
   approvalMode: string;
   sandboxMode?: string | null;
   summaryText?: string | null;
@@ -54,6 +56,7 @@ export interface UpdateThreadRecordInput {
   fastBaseModel?: string | null;
   fastBaseReasoningEffort?: string | null;
   collaborationMode?: string;
+  activeTurnCollaborationMode?: string | null;
   approvalMode?: string;
   sandboxMode?: string | null;
   status?: string;
@@ -83,6 +86,8 @@ export interface CreateThreadPendingSteerRecordInput {
   clientRequestId?: string | null;
   displayPrompt: string;
   submittedPrompt: string;
+  delivery?: 'steer' | 'continuation';
+  turnConfigJson?: string | null;
 }
 
 export interface UpsertThreadHistoryItemRecordInput {
@@ -283,6 +288,7 @@ export function createThreadRecord(db: DatabaseClient, input: CreateThreadRecord
     fastBaseModel: input.fastBaseModel ?? null,
     fastBaseReasoningEffort: input.fastBaseReasoningEffort ?? null,
     collaborationMode: input.collaborationMode ?? 'default',
+    activeTurnCollaborationMode: input.activeTurnCollaborationMode ?? null,
     approvalMode: input.approvalMode,
     sandboxMode: input.sandboxMode ?? null,
     status: 'idle',
@@ -538,6 +544,8 @@ export function createThreadPendingSteerRecord(
     clientRequestId: input.clientRequestId ?? null,
     displayPrompt: input.displayPrompt,
     submittedPrompt: input.submittedPrompt,
+    delivery: input.delivery ?? 'steer',
+    turnConfigJson: input.turnConfigJson ?? null,
     createdAt: now,
     updatedAt: now,
   };
@@ -557,6 +565,93 @@ export function deleteThreadPendingSteerRecordsByThreadId(
   db.delete(threadPendingSteers).where(eq(threadPendingSteers.threadId, threadId)).run();
 }
 
+export function getThreadPromptRequestRecord(
+  db: DatabaseClient,
+  threadId: string,
+  clientRequestId: string,
+) {
+  return db
+    .select()
+    .from(threadPromptRequests)
+    .where(
+      and(
+        eq(threadPromptRequests.threadId, threadId),
+        eq(threadPromptRequests.clientRequestId, clientRequestId),
+      ),
+    )
+    .get();
+}
+
+export function createThreadPromptRequestRecord(
+  db: DatabaseClient,
+  threadId: string,
+  clientRequestId: string,
+) {
+  const now = new Date().toISOString();
+  db.insert(threadPromptRequests)
+    .values({
+      id: randomUUID(),
+      threadId,
+      clientRequestId,
+      status: 'processing',
+      createdAt: now,
+      updatedAt: now,
+    })
+    .onConflictDoNothing()
+    .run();
+  return getThreadPromptRequestRecord(db, threadId, clientRequestId)!;
+}
+
+export function markThreadPromptRequestAccepted(
+  db: DatabaseClient,
+  threadId: string,
+  clientRequestId: string,
+) {
+  db.update(threadPromptRequests)
+    .set({ status: 'accepted', updatedAt: new Date().toISOString() })
+    .where(
+      and(
+        eq(threadPromptRequests.threadId, threadId),
+        eq(threadPromptRequests.clientRequestId, clientRequestId),
+      ),
+    )
+    .run();
+}
+
+export function deleteExpiredThreadPromptRequestRecords(
+  db: DatabaseClient,
+  cutoff: string,
+) {
+  return db
+    .delete(threadPromptRequests)
+    .where(lt(threadPromptRequests.updatedAt, cutoff))
+    .run();
+}
+
+export function deleteThreadPromptRequestRecord(
+  db: DatabaseClient,
+  threadId: string,
+  clientRequestId: string,
+) {
+  db.delete(threadPromptRequests)
+    .where(
+      and(
+        eq(threadPromptRequests.threadId, threadId),
+        eq(threadPromptRequests.clientRequestId, clientRequestId),
+      ),
+    )
+    .run();
+}
+
+export function deleteThreadPromptRequestRecordsByThreadId(
+  db: DatabaseClient,
+  threadId: string,
+) {
+  db.delete(threadPromptRequests)
+    .where(eq(threadPromptRequests.threadId, threadId))
+    .run();
+}
+
 export function listThreadActivityNotesByThreadId(
   db: DatabaseClient,
   threadId: string,

package/packages/db/src/schema.ts

@@ -33,6 +33,7 @@ export const threads = sqliteTable('threads', {
   fastBaseModel: text('fast_base_model'),
   fastBaseReasoningEffort: text('fast_base_reasoning_effort'),
   collaborationMode: text('collaboration_mode').notNull().default('default'),
+  activeTurnCollaborationMode: text('active_turn_collaboration_mode'),
   approvalMode: text('approval_mode'),
   sandboxMode: text('sandbox_mode'),
   status: text('status'),
@@ -113,10 +114,29 @@ export const threadPendingSteers = sqliteTable('thread_pending_steers', {
   clientRequestId: text('client_request_id'),
   displayPrompt: text('display_prompt').notNull(),
   submittedPrompt: text('submitted_prompt').notNull(),
+  delivery: text('delivery').notNull().default('steer'),
+  turnConfigJson: text('turn_config_json'),
   createdAt: text('created_at').notNull(),
   updatedAt: text('updated_at').notNull(),
 });
 
+export const threadPromptRequests = sqliteTable(
+  'thread_prompt_requests',
+  {
+    id: text('id').primaryKey(),
+    threadId: text('thread_id').notNull(),
+    clientRequestId: text('client_request_id').notNull(),
+    status: text('status').notNull(),
+    createdAt: text('created_at').notNull(),
+    updatedAt: text('updated_at').notNull(),
+  },
+  (table) => ({
+    threadClientRequestUnique: uniqueIndex(
+      'thread_prompt_requests_thread_client_request_idx',
+    ).on(table.threadId, table.clientRequestId),
+  }),
+);
+
 export const threadHistoryItems = sqliteTable(
   'thread_history_items',
   {

package/packages/opencode/src/runtimeAdapter.ts

@@ -439,6 +439,13 @@ function openCodeUsageFromTokens(tokens: unknown) {
   const cachedInputTokens = nonNegativeNumberValue(
     tokens.cachedInputTokens ?? tokens.cached_input_tokens ?? cache?.read,
   ) ?? 0;
+  const cacheWriteInputTokens = nonNegativeNumberValue(
+    tokens.cacheWriteInputTokens ??
+      tokens.cache_write_input_tokens ??
+      tokens.cacheWriteTokens ??
+      tokens.cache_write_tokens ??
+      cache?.write,
+  ) ?? 0;
   const totalTokens = nonNegativeNumberValue(tokens.total ?? tokens.totalTokens ?? tokens.total_tokens)
     ?? inputTokens + outputTokens;
 
@@ -451,6 +458,7 @@ function openCodeUsageFromTokens(tokens: unknown) {
       totalTokens,
       inputTokens,
       cachedInputTokens,
+      ...(cacheWriteInputTokens > 0 ? { cacheWriteInputTokens } : {}),
       outputTokens,
       reasoningOutputTokens,
     },
@@ -524,6 +532,13 @@ function turnTokenUsage(messages: unknown[], model: ReturnType<typeof parseModel
       totalTokens: sum.totalTokens + usage.totalTokens,
       inputTokens: sum.inputTokens + usage.inputTokens,
       cachedInputTokens: sum.cachedInputTokens + usage.cachedInputTokens,
+      ...((sum.cacheWriteInputTokens ?? 0) + (usage.cacheWriteInputTokens ?? 0) > 0
+        ? {
+            cacheWriteInputTokens:
+              (sum.cacheWriteInputTokens ?? 0) +
+              (usage.cacheWriteInputTokens ?? 0),
+          }
+        : {}),
       outputTokens: sum.outputTokens + usage.outputTokens,
       reasoningOutputTokens: sum.reasoningOutputTokens + usage.reasoningOutputTokens,
     }), firstRecord);

package/packages/shared/src/index.ts

@@ -1,6 +1,4 @@
-import type {
-  AgentBackendIdDto,
-} from './agent-providers';
+import type { AgentBackendIdDto } from './agent-providers';
 
 export {
   agentBackendIds,
@@ -110,6 +108,9 @@ export interface RelayDeviceDto {
   connectedAt: string | null;
   lastHeartbeatAt: string | null;
   createdAt: string;
+  hostedStatus?: RelayHostedSandboxStatusDto | null;
+  hostedActiveTurnCount?: number;
+  hostedIdleDeadlineAt?: string | null;
 }
 
 export interface RelayAdminUserDto extends RelayUserDto {
@@ -145,6 +146,12 @@ export interface RelayRegistrationSettingsDto {
   enabled: boolean;
   registrationPassword: string | null;
   approvalRequired: boolean;
+  googleAuthEnabled: boolean;
+  githubAuthEnabled: boolean;
+  emailVerificationEnabled: boolean;
+  googleAuthAvailable: boolean;
+  githubAuthAvailable: boolean;
+  emailVerificationAvailable: boolean;
 }
 
 export interface RelayPendingRegistrationDto {
@@ -152,6 +159,7 @@ export interface RelayPendingRegistrationDto {
   email: string;
   username: string;
   createdAt: string;
+  provider?: 'password' | 'google' | 'github';
 }
 
 export type RelayThreadAccessDto = 'read' | 'control';
@@ -297,6 +305,7 @@ export interface RelaySessionDto {
   authenticated: boolean;
   user: RelayUserDto | null;
   registrationEnabled: boolean;
+  registrationSettings?: RelayRegistrationSettingsDto;
 }
 
 export interface RelayLoginResultDto {
@@ -337,6 +346,153 @@ export interface RelayAdminSummaryDto {
   registrationEnabled: boolean;
 }
 
+export type RelayHostedSandboxProviderDto = 'disabled' | 'incus';
+
+export interface RelayHostedSandboxCapabilityDto {
+  provider: RelayHostedSandboxProviderDto;
+  configured: boolean;
+  reachable: boolean;
+  available: boolean;
+  reasonCode: string | null;
+  reason: string | null;
+  checkedAt: string;
+  limits?: {
+    maxInstances: number;
+    maxRunningInstances: number;
+  };
+  capacity?: {
+    totalInstances: number;
+    runningInstances: number;
+  };
+  metrics?: {
+    cpuCount: number;
+    load1: number;
+    loadPerCpu: number;
+    memoryTotalMiB: number;
+    memoryAvailableMiB: number;
+    diskTotalGiB: number;
+    diskAvailableGiB: number;
+    monitorPath: string;
+  };
+  alerts?: Array<{
+    code: 'host_memory_low' | 'host_disk_low' | 'host_load_high';
+    severity: 'warning';
+    message: string;
+  }>;
+}
+
+export type RelayHostedSandboxStatusDto =
+  | 'requested'
+  | 'creating'
+  | 'starting'
+  | 'provisioning'
+  | 'stopped'
+  | 'online'
+  | 'stopping'
+  | 'error'
+  | 'deleting';
+
+export type RelayHostedSandboxOperationActionDto =
+  | 'create'
+  | 'start'
+  | 'stop'
+  | 'snapshot'
+  | 'delete'
+  | 'rotate_credential';
+
+export type RelayHostedSandboxOperationStatusDto =
+  | 'pending'
+  | 'running'
+  | 'succeeded'
+  | 'failed';
+
+export interface RelayHostedSandboxResourcesDto {
+  cpuCount: number;
+  memoryMiB: number;
+  diskGiB: number;
+}
+
+export interface RelayHostedCodexConfigDto {
+  modelProvider: string;
+  model: string;
+  reviewModel: string;
+  reasoningEffort: 'low' | 'medium' | 'high' | 'xhigh';
+  baseUrl: string;
+  wireApi: 'responses';
+  requiresOpenaiAuth: boolean;
+  disableResponseStorage: boolean;
+  networkAccess: 'enabled' | 'disabled';
+  goals: boolean;
+}
+
+export interface RelayHostedSandboxMemberDto {
+  userId: string;
+  username: string;
+  email: string;
+}
+
+export interface RelayHostedCodexFilesDto {
+  configToml: string;
+  authJson: string;
+}
+
+export interface RelayHostedSandboxDto {
+  id: string;
+  deviceId: string;
+  deviceName: string;
+  assignedUserId: string;
+  assignedUsername: string;
+  assignedUsers: RelayHostedSandboxMemberDto[];
+  workspaceIsolationEnabled: boolean;
+  createdByAdminUserId: string;
+  provider: 'incus';
+  providerInstanceId: string | null;
+  imageVersion: string;
+  resources: RelayHostedSandboxResourcesDto;
+  status: RelayHostedSandboxStatusDto;
+  lastErrorCode: string | null;
+  lastErrorMessage: string | null;
+  activeTurnCount: number;
+  lastUserActivityAt: string | null;
+  idleDeadlineAt: string | null;
+  runningSince: string | null;
+  createdAt: string;
+  updatedAt: string;
+}
+
+export interface RelayHostedSandboxOperationDto {
+  id: string;
+  sandboxId: string;
+  action: RelayHostedSandboxOperationActionDto;
+  status: RelayHostedSandboxOperationStatusDto;
+  errorCode: string | null;
+  errorMessage: string | null;
+  createdAt: string;
+  updatedAt: string;
+}
+
+export interface RelayHostedSandboxDetailDto extends RelayHostedSandboxDto {
+  operations: RelayHostedSandboxOperationDto[];
+}
+
+export interface RelayHostedSandboxReconciliationDto {
+  status: 'never_run' | 'healthy' | 'issues' | 'unavailable';
+  checkedAt: string | null;
+  errorCode: string | null;
+  missingInstanceSandboxIds: string[];
+  missingCredentialSandboxIds: string[];
+  orphanInstances: Array<{
+    id: string;
+    status: string;
+    snapshots: string[];
+  }>;
+  orphanCredentials: Array<{
+    credentialRef: string;
+    createdAt: string;
+  }>;
+  orphanSnapshotCount: number;
+}
+
 export type RelaySupervisorEnvelope =
   | {
       type: 'relay.connected';
@@ -348,6 +504,16 @@ export type RelaySupervisorEnvelope =
       timestamp: string;
       deviceId?: string;
     }
+  | {
+      type: 'relay.activity';
+      timestamp: string;
+      deviceId?: string;
+      payload: {
+        kind: 'turn_started' | 'turn_terminal';
+        threadId: string;
+        turnId: string;
+      };
+    }
   | {
       type: 'relay.request';
       timestamp: string;
@@ -408,6 +574,22 @@ export interface AgentRuntimeStatusDto {
   restartCount: number;
 }
 
+export interface AgentSubscriptionUsageWindowDto {
+  id: string;
+  durationMinutes: number | null;
+  label: string;
+  usedPercent: number;
+  resetsAt: string | null;
+}
+
+export interface AgentSubscriptionUsageDto {
+  provider: 'codex' | 'claude';
+  authKind: 'subscription' | 'apiKey' | 'unknown';
+  observedAt: string;
+  stale: boolean;
+  windows: AgentSubscriptionUsageWindowDto[];
+}
+
 export interface AgentProviderCapabilitiesDto {
   sessions: {
     list: boolean;
@@ -535,6 +717,7 @@ export interface VersionDto {
 export interface HealthDto {
   status: 'ok';
   timestamp: string;
+  activeTurnCount: number;
 }
 
 export type ProviderHostFileNameDto = string;
@@ -596,7 +779,9 @@ export interface CreateWorkspaceFromGitInput {
   label?: string;
 }
 
-export type CreateWorkspaceInput = CreateWorkspaceFromPathInput | CreateWorkspaceFromGitInput;
+export type CreateWorkspaceInput =
+  | CreateWorkspaceFromPathInput
+  | CreateWorkspaceFromGitInput;
 
 export interface WorkspaceSettingsDto {
   workspaceRoot: string;
@@ -702,9 +887,13 @@ export type ReasoningEffortDto =
   | 'medium'
   | 'high'
   | 'xhigh'
-  | 'max';
+  | 'max'
+  | 'ultra';
 export type CollaborationModeDto = 'default' | 'plan';
-export type SandboxModeDto = 'read-only' | 'workspace-write' | 'danger-full-access';
+export type SandboxModeDto =
+  | 'read-only'
+  | 'workspace-write'
+  | 'danger-full-access';
 
 export interface ReasoningEffortOptionDto {
   reasoningEffort: ReasoningEffortDto;
@@ -894,6 +1083,7 @@ export interface ThreadTurnTokenBreakdownDto {
   totalTokens: number;
   inputTokens: number;
   cachedInputTokens: number;
+  cacheWriteInputTokens?: number;
   outputTokens: number;
   reasoningOutputTokens: number;
 }
@@ -912,6 +1102,7 @@ export interface ThreadTurnPriceEstimateDto {
   currency: 'USD';
   inputUsd: number;
   cachedInputUsd: number;
+  cacheWriteInputUsd?: number;
   outputUsd: number;
   totalUsd: number;
 }
@@ -1050,7 +1241,11 @@ export type AgentHookSourceDto =
   | 'legacyManagedConfigFile'
   | 'legacyManagedConfigMdm'
   | 'unknown';
-export type AgentHookTrustStatusDto = 'managed' | 'untrusted' | 'trusted' | 'modified';
+export type AgentHookTrustStatusDto =
+  | 'managed'
+  | 'untrusted'
+  | 'trusted'
+  | 'modified';
 
 export interface AgentHookDto {
   key: string;
@@ -1153,6 +1348,7 @@ export interface ThreadPendingSteerDto {
   clientRequestId: string | null;
   turnId: string;
   prompt: string;
+  delivery: 'steer' | 'continuation';
   createdAt: string;
 }
 

package/scripts/run-web-service.mjs

@@ -13,9 +13,9 @@ const sourceCheckout =
 const defaultServicePort = sourceCheckout ? 4173 : 45673;
 const defaultApiPort = sourceCheckout ? 8787 : 45674;
 
-const serviceHost = process.env.SERVICE_HOST ?? '127.0.0.1';
+const serviceHost = process.env.SERVICE_HOST ?? '0.0.0.0';
 const servicePort = parsePort(process.env.SERVICE_PORT, defaultServicePort);
-const apiHost = process.env.SERVICE_API_HOST ?? '127.0.0.1';
+const apiHost = process.env.SERVICE_API_HOST ?? '0.0.0.0';
 const apiPort = parsePort(process.env.SERVICE_API_PORT, defaultApiPort);
 const distDir = path.resolve(
   process.env.SERVICE_WEB_DIST_DIR ?? path.join(repoRoot, 'apps/supervisor-web/dist')

package/scripts/service-manager.mjs

@@ -23,9 +23,9 @@ const webIndex = path.join(repoRoot, 'apps', 'supervisor-web', 'dist', 'index.ht
 const defaultServicePort = supportsSourceRestart ? 4173 : 45673;
 const defaultApiPort = supportsSourceRestart ? 8787 : 45674;
 
-const serviceHost = process.env.SERVICE_HOST ?? '127.0.0.1';
+const serviceHost = process.env.SERVICE_HOST ?? '0.0.0.0';
 const servicePort = parsePort(process.env.SERVICE_PORT, defaultServicePort);
-const apiHost = process.env.SERVICE_API_HOST ?? '127.0.0.1';
+const apiHost = process.env.SERVICE_API_HOST ?? '0.0.0.0';
 const apiPort = parsePort(process.env.SERVICE_API_PORT, defaultApiPort);
 
 const command = process.argv[2];