@supen-ai/cli 1.3.2 → 1.3.4

package/daemon/dist/http/routes/system.js

@@ -31,10 +31,6 @@ const MIRRORED_THREAD_LIMIT = 80;
 const MIRRORED_THREAD_HISTORY_LIMIT = 100;
 const MIRRORED_THREAD_HISTORY_MAX_BYTES = 64 * 1024 * 1024;
 const MIRRORED_THREAD_TEXT_LIMIT = 48_000;
-const MIRRORED_THREAD_TOOL_STRING_LIMIT = 24_000;
-const MIRRORED_THREAD_OBJECT_DEPTH_LIMIT = 4;
-const MIRRORED_THREAD_OBJECT_KEY_LIMIT = 80;
-const MIRRORED_THREAD_OBJECT_ARRAY_LIMIT = 80;
 const MIRRORED_THREAD_INLINE_DATA_URL_LIMIT = 120_000;
 const MIRRORED_THREAD_STREAM_REPLAY_LIMIT = 500;
 const MIRRORED_THREAD_STREAM_REPLAY_MAX_BYTES = 8 * 1024 * 1024;
@@ -44,7 +40,7 @@ const require = createRequire(import.meta.url);
 const HOST_DAEMON_INSTALL_DIR = path.join(SUPEN_HOME, 'daemon');
 const HOST_DAEMON_CLI_PACKAGE_ROOT = path.join(HOST_DAEMON_INSTALL_DIR, 'node_modules', '@supen-ai', 'cli');
 const HOST_DAEMON_BIN_PATH = path.join(HOST_DAEMON_CLI_PACKAGE_ROOT, 'daemon', 'scripts', 'supen-daemon.js');
-const HOST_DAEMON_PACKAGE_SPEC = '@supen-ai/cli';
+const HOST_DAEMON_PACKAGE_SPEC = '@supen-ai/cli@latest';
 function readSqliteRows(dbPath, query) {
     try {
         const { DatabaseSync } = require('node:sqlite');
@@ -953,34 +949,6 @@ function truncateMirroredHistoryString(value, limit, label) {
     const omitted = value.length - limit;
     return `${value.slice(0, limit)}\n\n[${label} truncated: ${omitted.toLocaleString()} more characters omitted]`;
 }
-function sanitizeMirroredHistoryPayload(value, depth = 0) {
-    if (typeof value === 'string') {
-        return truncateMirroredHistoryString(value, MIRRORED_THREAD_TOOL_STRING_LIMIT, 'Tool output');
-    }
-    if (value === null || typeof value !== 'object')
-        return value;
-    if (depth >= MIRRORED_THREAD_OBJECT_DEPTH_LIMIT) {
-        return Array.isArray(value) ? '[Nested array omitted]' : '[Nested object omitted]';
-    }
-    if (Array.isArray(value)) {
-        const visibleItems = value
-            .slice(0, MIRRORED_THREAD_OBJECT_ARRAY_LIMIT)
-            .map((item) => sanitizeMirroredHistoryPayload(item, depth + 1));
-        if (value.length > MIRRORED_THREAD_OBJECT_ARRAY_LIMIT) {
-            visibleItems.push(`[${value.length - MIRRORED_THREAD_OBJECT_ARRAY_LIMIT} more items omitted]`);
-        }
-        return visibleItems;
-    }
-    const result = {};
-    const entries = Object.entries(value);
-    for (const [key, entryValue] of entries.slice(0, MIRRORED_THREAD_OBJECT_KEY_LIMIT)) {
-        result[key] = sanitizeMirroredHistoryPayload(entryValue, depth + 1);
-    }
-    if (entries.length > MIRRORED_THREAD_OBJECT_KEY_LIMIT) {
-        result.__truncated_keys = `${entries.length - MIRRORED_THREAD_OBJECT_KEY_LIMIT} more keys omitted`;
-    }
-    return result;
-}
 function safeMirroredHistoryAttachmentUrl(url) {
     const trimmed = url.trim();
     if (trimmed.startsWith('data:') &&
@@ -1088,111 +1056,6 @@ function isMirroredGoalContextMessage(text) {
     const trimmed = text.trim();
     return trimmed.startsWith('<goal_context>') && trimmed.endsWith('</goal_context>');
 }
-function parseJsonObject(value) {
-    if (typeof value !== 'string')
-        return value;
-    try {
-        return JSON.parse(value);
-    }
-    catch {
-        return value;
-    }
-}
-function readableOutputFromMcpResult(result) {
-    if (!result || typeof result !== 'object')
-        return result;
-    const ok = result.Ok;
-    const error = result.Err;
-    const payload = ok && typeof ok === 'object' ? ok : error;
-    if (!payload || typeof payload !== 'object')
-        return result;
-    const content = payload.content;
-    if (!Array.isArray(content))
-        return payload;
-    const text = content
-        .map((entry) => {
-        if (typeof entry === 'string')
-            return entry;
-        if (entry && typeof entry === 'object' && typeof entry.text === 'string') {
-            return entry.text;
-        }
-        return '';
-    })
-        .filter(Boolean)
-        .join('\n');
-    return text || payload;
-}
-function fileNameFromPath(value) {
-    const trimmed = value.trim();
-    if (!trimmed)
-        return '';
-    return path.basename(trimmed);
-}
-function displayPatchPath(filePath, workspacePath) {
-    const trimmed = filePath.trim();
-    if (!trimmed || !workspacePath || !path.isAbsolute(trimmed))
-        return trimmed;
-    const relativePath = path.relative(workspacePath, trimmed);
-    if (!relativePath || relativePath.startsWith('..') || path.isAbsolute(relativePath))
-        return trimmed;
-    return relativePath;
-}
-function diffStatsFromText(value) {
-    let additions = 0;
-    let deletions = 0;
-    for (const line of value.split(/\r?\n/)) {
-        if (line.startsWith('+++') || line.startsWith('---'))
-            continue;
-        if (line.startsWith('+'))
-            additions += 1;
-        if (line.startsWith('-'))
-            deletions += 1;
-    }
-    return { additions, deletions };
-}
-function extractPatchFiles(input) {
-    if (typeof input !== 'string')
-        return [];
-    const files = [];
-    const seen = new Set();
-    for (const line of input.split(/\r?\n/)) {
-        const match = line.match(/^\*\*\* (?:Update|Add|Delete) File:\s+(.+?)\s*$/);
-        if (!match)
-            continue;
-        const filePath = match[1]?.trim();
-        if (!filePath || seen.has(filePath))
-            continue;
-        seen.add(filePath);
-        files.push({ path: filePath, name: fileNameFromPath(filePath) || filePath });
-    }
-    return files;
-}
-function extractPatchEndFiles(changes, workspacePath) {
-    if (!changes || typeof changes !== 'object')
-        return [];
-    return Object.entries(changes).map(([filePath, change]) => {
-        const diff = typeof change?.unified_diff === 'string' ? change.unified_diff : '';
-        const displayPath = displayPatchPath(filePath, workspacePath);
-        return {
-            path: displayPath,
-            name: fileNameFromPath(displayPath) || displayPath,
-            ...(diff ? { diff } : {}),
-            ...diffStatsFromText(diff),
-        };
-    });
-}
-function codexReplayEvent(eventId, timestamp, taskId, raw) {
-    return {
-        id: eventId,
-        timestamp,
-        task_id: taskId,
-        chunk: {
-            type: 'data-codex-event',
-            id: eventId,
-            data: { raw },
-        },
-    };
-}
 function mirroredThreadWorkspacePath(sessionPath, stateEntry) {
     const stateCwd = typeof stateEntry?.cwd === 'string' ? stateEntry.cwd : null;
     const sessionWorkspace = readThreadWorkspacePath(sessionPath);
@@ -1216,10 +1079,8 @@ export function readCodexThreadHistory(threadId, limit = MIRRORED_THREAD_HISTORY
     const messages = [];
     const events = [];
     let messageIndex = 0;
-    let eventIndex = 0;
     let latestTimestamp = indexEntry?.updated_at || '';
     let recentGoalContext = null;
-    const toolCalls = new Map();
     const mirroredUserMessageKey = (text) => sanitizeMirroredUserText(text)
         .replace(/\s+/g, ' ')
         .trim();
@@ -1309,39 +1170,6 @@ export function readCodexThreadHistory(threadId, limit = MIRRORED_THREAD_HISTORY
         const messageId = typeof payload.id === 'string' ? payload.id : `${threadId}-web-user-${event.sequence}`;
         pushUserMessage(text, timestamp, messageId, attachments);
     };
-    const pushEvent = (timestamp, chunk) => {
-        eventIndex += 1;
-        events.push({
-            id: `${threadId}-event-${eventIndex}`,
-            timestamp,
-            task_id: threadId,
-            chunk,
-        });
-    };
-    const pushToolInput = (timestamp, toolCallId, toolName, input) => {
-        const sanitizedInput = sanitizeMirroredHistoryPayload(input);
-        toolCalls.set(toolCallId, { toolName, input: sanitizedInput });
-        pushEvent(timestamp, {
-            type: 'tool-input-available',
-            toolCallId,
-            toolName,
-            input: sanitizedInput,
-        });
-    };
-    const pushToolOutput = (timestamp, toolCallId, output, fallbackToolName, fallbackInput, failed = false) => {
-        const toolCall = toolCalls.get(toolCallId);
-        const toolName = toolCall?.toolName || fallbackToolName;
-        const input = toolCall?.input ?? (fallbackInput === undefined ? undefined : sanitizeMirroredHistoryPayload(fallbackInput));
-        pushEvent(timestamp, {
-            type: failed ? 'tool-output-error' : 'tool-output-available',
-            toolCallId,
-            ...(toolName ? { toolName } : {}),
-            ...(input !== undefined ? { input } : {}),
-            ...(failed
-                ? { errorText: typeof output === 'string' ? output : 'Tool failed' }
-                : { output: sanitizeMirroredHistoryPayload(parseJsonObject(output)) }),
-        });
-    };
     for (const line of lines) {
         const parsed = parseJsonLine(line);
         if (typeof parsed?.timestamp === 'string')
@@ -1356,146 +1184,11 @@ export function readCodexThreadHistory(threadId, limit = MIRRORED_THREAD_HISTORY
             if (payload.type === 'user_message') {
                 const text = typeof payload.message === 'string' ? payload.message.trim() : '';
                 pushUserMessage(text, timestamp, undefined, imageAttachmentsFromUnknown(payload.images));
-                continue;
-            }
-            if (payload.type === 'turn_aborted') {
-                if (eventLogThreadId !== threadId) {
-                    events.push(codexReplayEvent(`${threadId}-turn-aborted-${eventIndex + 1}`, timestamp, threadId, {
-                        method: 'turn/completed',
-                        params: {
-                            turn: {
-                                id: payload.turn_id || payload.turnId || 'turn',
-                                status: 'interrupted',
-                            },
-                        },
-                    }));
-                    eventIndex += 1;
-                }
-                continue;
-            }
-            if (payload.type === 'context_compacted') {
-                events.push(codexReplayEvent(`${threadId}-context-compacted-${eventIndex + 1}`, timestamp, threadId, {
-                    method: 'contextCompaction/completed',
-                    params: {
-                        threadId,
-                        messageCount: payload.message_count || payload.messageCount,
-                        tokensSaved: payload.tokens_saved || payload.tokensSaved,
-                    },
-                }));
-                eventIndex += 1;
-                continue;
-            }
-            if (payload.type === 'web_search_end') {
-                const toolCallId = typeof payload.call_id === 'string' ? payload.call_id : `${threadId}-web-search-${eventIndex + 1}`;
-                const input = {
-                    query: payload.query,
-                    action: payload.action,
-                };
-                pushToolInput(timestamp, toolCallId, 'web_search', input);
-                pushToolOutput(timestamp, toolCallId, payload.action || payload.query || 'completed');
-                continue;
-            }
-            if (payload.type === 'mcp_tool_call_end') {
-                const toolCallId = typeof payload.call_id === 'string' ? payload.call_id : `${threadId}-mcp-tool-${eventIndex + 1}`;
-                const invocation = payload.invocation && typeof payload.invocation === 'object'
-                    ? payload.invocation
-                    : {};
-                const server = typeof invocation.server === 'string' ? invocation.server : '';
-                const tool = typeof invocation.tool === 'string' ? invocation.tool : '';
-                const toolName = [server, tool].filter(Boolean).join('.') || 'mcpToolCall';
-                const input = invocation.arguments;
-                const result = payload.result && typeof payload.result === 'object'
-                    ? payload.result
-                    : payload.result;
-                const failed = Boolean(result && typeof result === 'object' && 'Err' in result);
-                pushToolInput(timestamp, toolCallId, toolName, input);
-                pushToolOutput(timestamp, toolCallId, readableOutputFromMcpResult(result), toolName, input, failed);
-                continue;
-            }
-            if (payload.type === 'patch_apply_end') {
-                const files = extractPatchEndFiles(payload.changes, workspacePath);
-                const additions = files.reduce((sum, file) => sum + file.additions, 0);
-                const deletions = files.reduce((sum, file) => sum + file.deletions, 0);
-                events.push(codexReplayEvent(`${threadId}-patch-end-${eventIndex + 1}`, timestamp, threadId, {
-                    method: 'codex/patchApply/completed',
-                    params: {
-                        callId: payload.call_id,
-                        success: payload.success !== false,
-                        files,
-                        fileCount: files.length,
-                        additions,
-                        deletions,
-                        status: payload.status,
-                    },
-                }));
-                eventIndex += 1;
-                continue;
             }
-        }
-        if (parsed?.type === 'compacted') {
-            events.push(codexReplayEvent(`${threadId}-context-compacted-${eventIndex + 1}`, timestamp, threadId, {
-                method: 'contextCompaction/completed',
-                params: { threadId },
-            }));
-            eventIndex += 1;
             continue;
         }
         if (parsed?.type !== 'response_item')
             continue;
-        if (payload.type === 'function_call') {
-            const toolCallId = typeof payload.call_id === 'string' ? payload.call_id : `${threadId}-tool-${eventIndex + 1}`;
-            const toolName = typeof payload.name === 'string' ? payload.name : 'tool';
-            const input = sanitizeMirroredHistoryPayload(parseJsonObject(payload.arguments));
-            pushToolInput(timestamp, toolCallId, toolName, input);
-            continue;
-        }
-        if (payload.type === 'function_call_output') {
-            const toolCallId = typeof payload.call_id === 'string' ? payload.call_id : `${threadId}-tool-${eventIndex + 1}`;
-            pushToolOutput(timestamp, toolCallId, payload.output);
-            continue;
-        }
-        if (payload.type === 'tool_search_call') {
-            const toolCallId = typeof payload.call_id === 'string' ? payload.call_id : `${threadId}-tool-search-${eventIndex + 1}`;
-            pushToolInput(timestamp, toolCallId, 'tool_search', payload.arguments);
-            continue;
-        }
-        if (payload.type === 'tool_search_output') {
-            const toolCallId = typeof payload.call_id === 'string' ? payload.call_id : `${threadId}-tool-search-${eventIndex + 1}`;
-            pushToolOutput(timestamp, toolCallId, {
-                status: payload.status,
-                tools: payload.tools,
-            }, 'tool_search');
-            continue;
-        }
-        if (payload.type === 'custom_tool_call') {
-            const toolName = typeof payload.name === 'string' ? payload.name : 'custom_tool';
-            const toolCallId = typeof payload.call_id === 'string' ? payload.call_id : `${threadId}-tool-${eventIndex + 1}`;
-            if (toolName === 'apply_patch') {
-                const input = typeof payload.input === 'string' ? payload.input : '';
-                const files = extractPatchFiles(input);
-                events.push(codexReplayEvent(`${threadId}-patch-start-${eventIndex + 1}`, timestamp, threadId, {
-                    method: 'codex/patchApply/started',
-                    params: {
-                        callId: payload.call_id,
-                        files,
-                        fileCount: files.length,
-                        ...diffStatsFromText(input),
-                    },
-                }));
-                eventIndex += 1;
-            }
-            else {
-                pushToolInput(timestamp, toolCallId, toolName, parseJsonObject(payload.input));
-            }
-            continue;
-        }
-        if (payload.type === 'custom_tool_call_output') {
-            const toolCallId = typeof payload.call_id === 'string' ? payload.call_id : `${threadId}-tool-${eventIndex + 1}`;
-            if (toolCalls.has(toolCallId)) {
-                pushToolOutput(timestamp, toolCallId, payload.output);
-            }
-            continue;
-        }
         if (payload.type !== 'message')
             continue;
         messageIndex += 1;
@@ -1615,6 +1308,16 @@ function coerceSingleQueryParam(value) {
         return value[0] || null;
     return value || null;
 }
+function codexThreadsListRoute(pathname) {
+    return /^\/api\/computers\/\{computer_id\}\/agents\/[^/]+\/codex\/threads$/.test(pathname);
+}
+function codexThreadActionRoute(pathname, action) {
+    const suffix = action === 'messages' ? 'messages' : action;
+    return pathname.match(new RegExp(`^/api/computers/\\{computer_id\\}/agents/[^/]+/codex/threads/([^/]+)/${suffix}$`));
+}
+function codexProjectsOpenRoute(pathname) {
+    return /^\/api\/computers\/\{computer_id\}\/agents\/[^/]+\/codex\/projects\/open$/.test(pathname);
+}
 function collectSpaceLogEntries(filters = {}) {
     const spaceId = currentSpaceId();
     const limit = Math.max(1, Math.min(filters.limit || SPACE_LOG_EVENT_LIMIT, 500));
@@ -1698,7 +1401,7 @@ function threadStreamChunkForEvent(event) {
         !Array.isArray(event.raw_payload) &&
         typeof event.raw_payload.type === 'string' &&
         String(event.raw_payload.type).trim()) {
-        return normalizeStoredCodexThreadChunk(event.raw_payload);
+        return event.raw_payload;
     }
     return {
         type: 'data-codex-event',
@@ -1708,28 +1411,6 @@ function threadStreamChunkForEvent(event) {
         },
     };
 }
-function normalizeStoredCodexThreadChunk(chunk) {
-    if (chunk.type !== 'data-supen-event')
-        return chunk;
-    const data = chunk.data && typeof chunk.data === 'object' && !Array.isArray(chunk.data)
-        ? chunk.data
-        : {};
-    const raw = data.raw && typeof data.raw === 'object' && !Array.isArray(data.raw)
-        ? data.raw
-        : {};
-    return {
-        ...chunk,
-        type: 'data-codex-event',
-        data: {
-            ...data,
-            eventType: typeof data.eventType === 'string' && data.eventType.trim()
-                ? data.eventType
-                : typeof raw.method === 'string' && raw.method.trim()
-                    ? raw.method
-                    : 'codex-event',
-        },
-    };
-}
 function buildMcpSettingsResponse() {
     const overrides = getMcpEnvOverrides();
     const runtimeEnv = { ...process.env };
@@ -1764,6 +1445,15 @@ const MANAGED_CODING_CLI_INSTALL_COMMANDS = {
     codex: CODING_CLI_INSTALL_COMMANDS.codex,
     gemini: CODING_CLI_INSTALL_COMMANDS.gemini,
 };
+function resolveManagedCodingCliInstallCommand(cli, current) {
+    if (cli === 'codex' && current.install_source === 'homebrew') {
+        return {
+            command: 'sh',
+            args: ['-lc', 'brew upgrade codex || brew upgrade --cask codex || brew reinstall --cask codex'],
+        };
+    }
+    return MANAGED_CODING_CLI_INSTALL_COMMANDS[cli];
+}
 const CODING_CLI_NAMES = ['codex', 'gemini', 'claude'];
 const DETECTABLE_SPACE_APPS = [
     { id: 'libreoffice', command: 'libreoffice', managed: false },
@@ -1883,7 +1573,6 @@ function readPackageVersion(packageRoot) {
     }
 }
 function detectDaemonPackageStatus() {
-    const envVersion = process.env.SUPEN_DAEMON_VERSION || process.env.npm_package_version || null;
     let packageRoot = null;
     try {
         packageRoot = findPackageRootFrom(require.resolve('@supen-ai/daemon'), '@supen-ai/daemon');
@@ -1926,7 +1615,7 @@ function detectDaemonPackageStatus() {
                 ? 'local-package'
                 : null;
     return {
-        version: envVersion || bundledDaemonVersion || packageVersion,
+        version: bundledDaemonVersion || packageVersion,
         package_root: packageRoot || bundledDaemonRoot,
         install_source: installSource,
         update_supported: installSource === 'supen-cli-bundle' || installSource === 'npm-global',
@@ -1971,7 +1660,7 @@ function inferCliInstallSource(name, executablePath, resolvedPath) {
         return { install_source: 'pnpm', update_supported: false };
     }
     if (normalized.includes('/homebrew/') || normalized.includes('/opt/homebrew/') || normalized.includes('/cellar/')) {
-        return { install_source: 'homebrew', update_supported: false };
+        return { install_source: 'homebrew', update_supported: name === 'codex' };
     }
     if (name === 'codex') {
         const npmRoot = detectGlobalNpmRoot();
@@ -2322,6 +2011,47 @@ function readInstalledAppsPayload() {
         }),
     };
 }
+const CODEX_SUBSCRIPTION_STATUS_WAIT_MS = 1800;
+const CODEX_SUBSCRIPTION_CACHE_TTL_MS = 5 * 60 * 1000;
+let cachedCodexSubscription = null;
+let codexSubscriptionRefreshInFlight = null;
+function refreshCodexSubscriptionStatus() {
+    if (codexSubscriptionRefreshInFlight)
+        return codexSubscriptionRefreshInFlight;
+    codexSubscriptionRefreshInFlight = readCodexSubscription()
+        .then((payload) => {
+        cachedCodexSubscription = { payload, cachedAt: Date.now() };
+        return payload;
+    })
+        .finally(() => {
+        codexSubscriptionRefreshInFlight = null;
+    });
+    return codexSubscriptionRefreshInFlight;
+}
+async function readCodexSubscriptionForStatus() {
+    if (cachedCodexSubscription &&
+        Date.now() - cachedCodexSubscription.cachedAt < CODEX_SUBSCRIPTION_CACHE_TTL_MS) {
+        return { payload: cachedCodexSubscription.payload, error: null };
+    }
+    const refresh = refreshCodexSubscriptionStatus();
+    const timeout = new Promise((resolve) => {
+        setTimeout(() => resolve(null), CODEX_SUBSCRIPTION_STATUS_WAIT_MS).unref?.();
+    });
+    try {
+        const payload = await Promise.race([refresh, timeout]);
+        if (payload)
+            return { payload, error: null };
+    }
+    catch (err) {
+        if (cachedCodexSubscription)
+            return { payload: cachedCodexSubscription.payload, error: null };
+        return { payload: null, error: err?.message || 'Unable to read Codex subscription details.' };
+    }
+    if (cachedCodexSubscription)
+        return { payload: cachedCodexSubscription.payload, error: null };
+    refresh.catch(() => undefined);
+    return { payload: null, error: null };
+}
 function readCachedCodingCliStatusPayload(options) {
     startCodingCliStatusCache({
         build: () => ({
@@ -2396,14 +2126,22 @@ function codexSubscriptionSummary(subscription) {
         : {};
     return {
         plan_type: typeof rateLimits.planType === 'string' && rateLimits.planType.trim() ? rateLimits.planType.trim() : null,
-        credits_balance: typeof credits.balance === 'string' && credits.balance.trim() ? credits.balance.trim() : null,
+        credits_balance: typeof credits.balance === 'string' && credits.balance.trim()
+            ? credits.balance.trim()
+            : typeof credits.balance === 'number' && Number.isFinite(credits.balance)
+                ? String(credits.balance)
+                : null,
     };
 }
 async function readCodexAgentStatusPayload() {
-    const status = readCachedCodingCliStatusPayload();
+    const status = {
+        ...readCachedCodingCliStatusPayload(),
+        daemon: detectDaemonPackageStatus(),
+    };
     const quotaStatus = readLatestSpaceQuotaStatus();
-    try {
-        const subscription = await readCodexSubscription();
+    const subscriptionResult = await readCodexSubscriptionForStatus();
+    const subscription = subscriptionResult.payload;
+    if (subscription) {
         const subscriptionWindows = mergeQuotaWindows(normalizeCodexSubscriptionQuotaWindows(subscription), normalizeQuotaWindows(subscription.rate_limits), normalizeQuotaWindows(subscription.rate_limits_by_limit_id));
         return {
             ...status,
@@ -2418,23 +2156,21 @@ async function readCodexAgentStatusPayload() {
             quota_windows: mergeQuotaWindows(quotaStatus.windows, subscriptionWindows),
         };
     }
-    catch (err) {
-        return {
-            ...status,
-            subscription: {
-                ok: false,
-                fetched_at: null,
-                payload: null,
-                error: err?.message || 'Unable to read Codex subscription details.',
-            },
-            subscription_summary: {
-                plan_type: null,
-                credits_balance: null,
-            },
-            quota_status: quotaStatus,
-            quota_windows: quotaStatus.windows,
-        };
-    }
+    return {
+        ...status,
+        subscription: {
+            ok: false,
+            fetched_at: null,
+            payload: null,
+            error: subscriptionResult.error,
+        },
+        subscription_summary: {
+            plan_type: null,
+            credits_balance: null,
+        },
+        quota_status: quotaStatus,
+        quota_windows: quotaStatus.windows,
+    };
 }
 function readRuntimeModelStatusPayload() {
     const selected_cli = process.env.SUPEN_CODING_CLI || readConfigSummary().coding_cli || 'codex';
@@ -2763,31 +2499,6 @@ export async function handleSystemRoutes(req, res, url, pathname, method) {
         writeJson(res, 200, await readCodexAgentStatusPayload());
         return true;
     }
-    if (pathname === '/api/computers/{computer_id}/runtime-models' && method === 'GET') {
-        writeJson(res, 200, readRuntimeModelStatusPayload());
-        return true;
-    }
-    if (pathname === '/api/computers/{computer_id}/runtime-models/default' && method === 'PUT') {
-        try {
-            const parsed = await readJsonBody(req);
-            const model = typeof parsed === 'object' && parsed && typeof parsed.model === 'string'
-                ? String(parsed.model).trim()
-                : '';
-            if (!model) {
-                writeProtocolError(res, 400, 'validation_error', 'missing_model', 'Request body must include a non-empty "model" string.');
-                return true;
-            }
-            writeCodexDefaultModel(model);
-            writeJson(res, 200, {
-                ok: true,
-                status: readRuntimeModelStatusPayload(),
-            });
-        }
-        catch (err) {
-            writeProtocolError(res, 500, 'config_error', 'codex_model_default_failed', err?.message || 'Failed to set Codex default model');
-        }
-        return true;
-    }
     const codexTransportDefaultMatch = pathname.match(/^\/api\/computers\/\{computer_id\}\/agents\/codex\/transports\/([^/]+)\/default$/);
     if (codexTransportDefaultMatch && method === 'PUT') {
         try {
@@ -2822,7 +2533,7 @@ export async function handleSystemRoutes(req, res, url, pathname, method) {
         }
         return true;
     }
-    if (pathname === '/api/computers/{computer_id}/agents/codex/install' && method === 'POST') {
+    if (pathname === '/api/computers/{computer_id}/agents/codex/update' && method === 'POST') {
         try {
             const cli = 'codex';
             const current = detectCliInstalled(cli);
@@ -2830,7 +2541,7 @@ export async function handleSystemRoutes(req, res, url, pathname, method) {
                 writeProtocolError(res, 400, 'validation_error', 'coding_cli_update_not_supported', `${cli} is installed via ${current.install_source || current.resolved_path || current.path || 'an unknown source'}; update it with that installer on this computer.`);
                 return true;
             }
-            const installSpec = MANAGED_CODING_CLI_INSTALL_COMMANDS.codex;
+            const installSpec = resolveManagedCodingCliInstallCommand(cli, current);
             const result = spawnSync(installSpec.command, installSpec.args, {
                 encoding: 'utf8',
                 timeout: 120_000,
@@ -2946,15 +2657,15 @@ export async function handleSystemRoutes(req, res, url, pathname, method) {
         writeJson(res, 200, buildHubSnapshotForSpace(spaceId));
         return true;
     }
-    if (pathname === '/api/computers/{computer_id}/usage' && method === 'GET') {
+    if (pathname === '/api/computers/{computer_id}/agents/codex/usage' && method === 'GET') {
         writeJson(res, 200, getGlobalUsage());
         return true;
     }
-    if (pathname === '/api/computers/{computer_id}/usage/daily' && method === 'GET') {
+    if (pathname === '/api/computers/{computer_id}/agents/codex/usage/daily' && method === 'GET') {
         writeJson(res, 200, { daily: getDailyUsage() });
         return true;
     }
-    if (pathname === '/api/computers/{computer_id}/codex/threads' && method === 'GET') {
+    if (codexThreadsListRoute(pathname) && method === 'GET') {
         const limitRaw = coerceSingleQueryParam(url.searchParams.get('limit'));
         const limit = limitRaw ? Number.parseInt(limitRaw, 10) : MIRRORED_THREAD_LIMIT;
         writeJson(res, 200, readMirroredTaskProjects(Number.isFinite(limit) ? limit : MIRRORED_THREAD_LIMIT));
@@ -2974,7 +2685,7 @@ export async function handleSystemRoutes(req, res, url, pathname, method) {
         serveRemoteFile(req, res, filePath);
         return true;
     }
-    const mirroredThreadArchiveMatch = pathname.match(/^\/api\/computers\/\{computer_id\}\/codex\/threads\/([^/]+)\/archive$/);
+    const mirroredThreadArchiveMatch = codexThreadActionRoute(pathname, 'archive');
     if (mirroredThreadArchiveMatch && method === 'POST') {
         const threadId = decodeURIComponent(mirroredThreadArchiveMatch[1] || '').trim();
         if (!threadId) {
@@ -2988,7 +2699,7 @@ export async function handleSystemRoutes(req, res, url, pathname, method) {
         writeJson(res, 200, { ok: true, archived: true });
         return true;
     }
-    const mirroredThreadStreamMatch = pathname.match(/^\/api\/computers\/\{computer_id\}\/codex\/threads\/([^/]+)\/stream$/);
+    const mirroredThreadStreamMatch = codexThreadActionRoute(pathname, 'stream');
     if (mirroredThreadStreamMatch && method === 'GET') {
         const threadId = decodeURIComponent(mirroredThreadStreamMatch[1] || '').trim();
         if (!threadId) {
@@ -3031,7 +2742,7 @@ export async function handleSystemRoutes(req, res, url, pathname, method) {
         res.flush?.();
         return true;
     }
-    const mirroredThreadHistoryMatch = pathname.match(/^\/api\/computers\/\{computer_id\}\/codex\/threads\/([^/]+)\/messages$/);
+    const mirroredThreadHistoryMatch = codexThreadActionRoute(pathname, 'messages');
     if (mirroredThreadHistoryMatch && method === 'GET') {
         const threadId = decodeURIComponent(mirroredThreadHistoryMatch[1] || '').trim();
         const limitRaw = coerceSingleQueryParam(url.searchParams.get('limit'));
@@ -3046,7 +2757,7 @@ export async function handleSystemRoutes(req, res, url, pathname, method) {
         writeJson(res, 200, history);
         return true;
     }
-    const mirroredThreadAdoptMatch = pathname.match(/^\/api\/computers\/\{computer_id\}\/codex\/threads\/([^/]+)\/adopt$/);
+    const mirroredThreadAdoptMatch = codexThreadActionRoute(pathname, 'adopt');
     if (mirroredThreadAdoptMatch && method === 'POST') {
         const threadId = decodeURIComponent(mirroredThreadAdoptMatch[1] || '').trim();
         const parsed = await readJsonBody(req);
@@ -3063,7 +2774,7 @@ export async function handleSystemRoutes(req, res, url, pathname, method) {
         writeJson(res, 200, { thread: serializeAdoptedMirroredThread(session) });
         return true;
     }
-    if (pathname === '/api/computers/{computer_id}/codex/projects/open' && method === 'POST') {
+    if (codexProjectsOpenRoute(pathname) && method === 'POST') {
         try {
             const parsed = await readJsonBody(req);
             const projectPath = parsed && typeof parsed === 'object' && typeof parsed.path === 'string'