@cloudcli-ai/cloudcli 1.37.2 → 1.37.4

package/server/modules/providers/list/codex/codex.provider.ts

@@ -1,5 +1,6 @@
 import { AbstractProvider } from '@/modules/providers/shared/base/abstract.provider.js';
 import { CodexProviderAuth } from '@/modules/providers/list/codex/codex-auth.provider.js';
+import { CodexForkProvider } from '@/modules/providers/list/codex/codex-fork.provider.js';
 import { CodexProviderModels } from '@/modules/providers/list/codex/codex-models.provider.js';
 import { codexRuntime } from '@/modules/providers/list/codex/codex-runtime.provider.js';
 import { CodexMcpProvider } from '@/modules/providers/list/codex/codex-mcp.provider.js';
@@ -8,6 +9,7 @@ import { CodexSessionsProvider } from '@/modules/providers/list/codex/codex-sess
 import { CodexSkillsProvider } from '@/modules/providers/list/codex/codex-skills.provider.js';
 import type {
   IProviderAuth,
+  IProviderFork,
   IProviderModels,
   IProviderRuntime,
   IProviderSessionSynchronizer,
@@ -22,6 +24,7 @@ export class CodexProvider extends AbstractProvider {
   readonly auth: IProviderAuth = new CodexProviderAuth();
   readonly skills: IProviderSkills = new CodexSkillsProvider();
   readonly sessions: IProviderSessions = new CodexSessionsProvider();
+  readonly fork: IProviderFork = new CodexForkProvider();
   readonly sessionSynchronizer: IProviderSessionSynchronizer = new CodexSessionSynchronizer();
 
   constructor() {

package/server/modules/providers/list/cursor/cursor-auth.provider.ts

@@ -10,6 +10,12 @@ type CursorLoginStatus = {
   error?: string;
 };
 
+// `cursor-agent status` decides "logged in" from the locally stored tokens, then fetches the
+// account details from Cursor's API. That request cannot change the verdict (on failure the CLI
+// still reports logged in), it only adds a network round trip to the CLI's startup (3-6 s on a
+// busy host even when logged out). A 5 s cap reported fresh logins as "Command timeout" (#551).
+const STATUS_TIMEOUT_MS = 20_000;
+
 export class CursorProviderAuth implements IProviderAuth {
   /**
    * Checks whether the cursor-agent CLI is available on this host.
@@ -71,7 +77,7 @@ export class CursorProviderAuth implements IProviderAuth {
             error: 'Command timeout',
           });
         }
-      }, 5000);
+      }, STATUS_TIMEOUT_MS);
 
       try {
         childProcess = spawn('cursor-agent', ['status']);
@@ -112,8 +118,10 @@ export class CursorProviderAuth implements IProviderAuth {
             return;
           }
 
+          // e.g. "Logged in (unable to fetch user details)" when the account request failed.
+          // There is no email to show, so the UI uses its own fallback label.
           if (stdout.includes('Logged in')) {
-            resolve({ authenticated: true, email: 'Logged in', method: 'cli' });
+            resolve({ authenticated: true, email: null, method: 'cli' });
             return;
           }
 

package/server/modules/providers/list/cursor/cursor-runtime.provider.js

@@ -6,7 +6,7 @@ import {
   normalizeAttachmentDescriptors
 } from '@/shared/image-attachments.js';
 import { notifyRunFailed, notifyRunStopped } from '@/modules/notifications/index.js';
-import { createCompleteMessage, createNormalizedMessage, flattenPromptForWindowsShell } from '@/shared/utils.js';
+import { createCompleteMessage, createNormalizedMessage, flattenPromptForWindowsShell, stripAnsiSequences } from '@/shared/utils.js';
 
 // cross-spawn resolves .cmd shims/PATHEXT on Windows and delegates to
 // child_process.spawn everywhere else.
@@ -30,22 +30,24 @@ function isWorkspaceTrustPrompt(text = '') {
 }
 
 async function spawnCursor(command, options = {}, ws, context) {
-  return new Promise(async (resolve, reject) => {
+  // Callers pass the stable app session id; the CLI resumes with the
+  // provider-native id recorded on the session row. Both lookups run before the
+  // promise is created: inside an async executor a rejected `resolveResumeModel`
+  // would be swallowed and leave the returned promise pending forever.
+  const providerSessionId = context.resolveProviderSessionId(options.sessionId);
+  const resolvedModel = await context.resolveResumeModel(options.sessionId, options.model);
+
+  return new Promise((resolve, reject) => {
     const {
       sessionId,
       projectPath,
       cwd,
       toolsSettings,
       skipPermissions,
-      model,
       sessionSummary,
       images,
       files
     } = options;
-    // Callers pass the stable app session id; the CLI resumes with the
-    // provider-native id recorded on the session row.
-    const providerSessionId = context.resolveProviderSessionId(sessionId);
-    const resolvedModel = await context.resolveResumeModel(sessionId, model);
     let capturedSessionId = providerSessionId; // Track the provider-native session id throughout the process
     let sessionCreatedSent = false; // Track if we've already sent session-created event
     let hasRetriedWithTrust = false;
@@ -275,7 +277,14 @@ async function spawnCursor(command, options = {}, ws, context) {
           return;
         }
 
-        ws.send(createNormalizedMessage({ kind: 'error', content: stderrText, sessionId: capturedSessionId || sessionId || null, provider: 'cursor' }));
+        // The CLI styles its stderr for a terminal; the chat renders plain
+        // text, so the escapes have to go before the text is surfaced.
+        const cleanedStderrText = stripAnsiSequences(stderrText);
+        if (!cleanedStderrText.trim()) {
+          return;
+        }
+
+        ws.send(createNormalizedMessage({ kind: 'error', content: cleanedStderrText, sessionId: capturedSessionId || sessionId || null, provider: 'cursor' }));
       });
 
       // Handle process completion

package/server/modules/providers/list/cursor/cursor-session-synchronizer.provider.ts

@@ -1,4 +1,3 @@
-import crypto from 'node:crypto';
 import fs from 'node:fs';
 import fsp from 'node:fs/promises';
 import os from 'node:os';

package/server/modules/providers/list/opencode/opencode-models.provider.ts

@@ -1,3 +1,7 @@
+import { readFile } from 'node:fs/promises';
+import os from 'node:os';
+import path from 'node:path';
+
 import Database from 'better-sqlite3';
 
 import { sessionsDb } from '@/modules/database/index.js';
@@ -17,9 +21,9 @@ import {
  * Curated OpenCode catalog shipped as immutable CloudCLI defaults.
  *
  * OpenCode routes by `<providerID>/<modelID>`, so this list mirrors the
- * providers `opencode models --verbose` reports: the OpenCode Zen gateway plus
- * the Anthropic and OpenAI providers OpenCode can address directly with the
- * user's own credentials.
+ * providers `opencode models --verbose` reports: the OpenCode Zen gateway, the
+ * OpenCode Go subscription gateway, and the Anthropic and OpenAI providers
+ * OpenCode can address directly with the user's own credentials.
  */
 export const OPENCODE_PREDEFINED_MODELS: ProviderModelsDefinition = {
   OPTIONS: [
@@ -77,6 +81,178 @@ export const OPENCODE_PREDEFINED_MODELS: ProviderModelsDefinition = {
     { value: 'opencode/north-mini-code-free', label: 'North Mini Code Free', description: 'OpenCode Zen · Free' },
     { value: 'opencode/nemotron-3-ultra-free', label: 'Nemotron 3 Ultra Free', description: 'OpenCode Zen · Free' },
     { value: 'opencode/deepseek-v4-flash-free', label: 'DeepSeek V4 Flash Free', description: 'OpenCode Zen · Free' },
+    {
+      value: 'opencode-go/grok-4.6',
+      label: 'Grok 4.6',
+      description: 'OpenCode Go',
+      effort: {
+        values: [{ value: 'low' }, { value: 'medium' }, { value: 'high' }, { value: 'xhigh' }],
+      },
+    },
+    {
+      value: 'opencode-go/glm-5.3-flash',
+      label: 'GLM 5.3 Flash',
+      description: 'OpenCode Go',
+      effort: {
+        values: [{ value: 'low' }, { value: 'high' }, { value: 'max' }],
+      },
+    },
+    {
+      value: 'opencode-go/glm-5.3',
+      label: 'GLM 5.3',
+      description: 'OpenCode Go',
+      effort: {
+        values: [{ value: 'low' }, { value: 'high' }, { value: 'max' }],
+      },
+    },
+    {
+      value: 'opencode-go/glm-5.2',
+      label: 'GLM 5.2',
+      description: 'OpenCode Go',
+      effort: {
+        values: [{ value: 'high' }, { value: 'max' }],
+      },
+    },
+    { value: 'opencode-go/glm-5.1', label: 'GLM 5.1', description: 'OpenCode Go' },
+    {
+      value: 'opencode-go/gpt-5.6-luna',
+      label: 'GPT 5.6 Luna',
+      description: 'OpenCode Go',
+      effort: {
+        values: [
+          { value: 'none' },
+          { value: 'low' },
+          { value: 'medium' },
+          { value: 'high' },
+          { value: 'xhigh' },
+          { value: 'max' },
+        ],
+      },
+    },
+    {
+      value: 'opencode-go/kimi-k3',
+      label: 'Kimi K3',
+      description: 'OpenCode Go',
+      effort: {
+        values: [{ value: 'max' }],
+      },
+    },
+    { value: 'opencode-go/kimi-k2.7-code', label: 'Kimi K2.7 Code', description: 'OpenCode Go' },
+    { value: 'opencode-go/kimi-k2.6', label: 'Kimi K2.6', description: 'OpenCode Go' },
+    {
+      value: 'opencode-go/longcat-2.0',
+      label: 'LongCat 2.0',
+      description: 'OpenCode Go',
+      effort: {
+        values: [{ value: 'low' }, { value: 'medium' }, { value: 'high' }],
+      },
+    },
+    { value: 'opencode-go/mimo-v2.5', label: 'MiMo V2.5', description: 'OpenCode Go' },
+    { value: 'opencode-go/mimo-v2.5-pro', label: 'MiMo V2.5 Pro', description: 'OpenCode Go' },
+    {
+      value: 'opencode-go/minimax-m3',
+      label: 'MiniMax M3',
+      description: 'OpenCode Go',
+      effort: {
+        values: [{ value: 'none' }, { value: 'thinking' }],
+      },
+    },
+    { value: 'opencode-go/minimax-m2.7', label: 'MiniMax M2.7', description: 'OpenCode Go' },
+    {
+      value: 'opencode-go/muse-spark-1.3-contributor',
+      label: 'Muse Spark 1.3 Contributor',
+      description: 'OpenCode Go',
+      effort: {
+        values: [
+          { value: 'minimal' },
+          { value: 'low' },
+          { value: 'medium' },
+          { value: 'high' },
+          { value: 'xhigh' },
+        ],
+      },
+    },
+    {
+      value: 'opencode-go/muse-spark-1.2-contributor',
+      label: 'Muse Spark 1.2 Contributor',
+      description: 'OpenCode Go',
+      effort: {
+        values: [
+          { value: 'minimal' },
+          { value: 'low' },
+          { value: 'medium' },
+          { value: 'high' },
+          { value: 'xhigh' },
+        ],
+      },
+    },
+    {
+      value: 'opencode-go/qwen3.8-max',
+      label: 'Qwen3.8 Max',
+      description: 'OpenCode Go',
+      effort: {
+        values: [{ value: 'low' }, { value: 'medium' }, { value: 'xhigh' }],
+      },
+    },
+    {
+      value: 'opencode-go/qwen3.8-flash',
+      label: 'Qwen3.8 Flash',
+      description: 'OpenCode Go',
+      effort: {
+        values: [{ value: 'low' }, { value: 'medium' }, { value: 'xhigh' }],
+      },
+    },
+    { value: 'opencode-go/qwen3.7-max', label: 'Qwen3.7 Max', description: 'OpenCode Go' },
+    { value: 'opencode-go/qwen3.7-plus', label: 'Qwen3.7 Plus', description: 'OpenCode Go' },
+    { value: 'opencode-go/qwen3.6-plus', label: 'Qwen3.6 Plus', description: 'OpenCode Go' },
+    {
+      value: 'opencode-go/deepseek-v4-pro',
+      label: 'DeepSeek V4 Pro',
+      description: 'OpenCode Go',
+      effort: {
+        values: [{ value: 'high' }, { value: 'max' }],
+      },
+    },
+    {
+      value: 'opencode-go/deepseek-v4-flash',
+      label: 'DeepSeek V4 Flash',
+      description: 'OpenCode Go',
+      effort: {
+        values: [{ value: 'low' }, { value: 'high' }, { value: 'max' }],
+      },
+    },
+    {
+      value: 'opencode-go/deepseek-v4-flash-vision-exp',
+      label: 'DeepSeek V4 Flash Vision Exp',
+      description: 'OpenCode Go',
+      effort: {
+        values: [{ value: 'low' }, { value: 'high' }, { value: 'max' }],
+      },
+    },
+    {
+      value: 'opencode-go/hy4-preview',
+      label: 'Hy4 Preview',
+      description: 'OpenCode Go',
+      effort: {
+        values: [{ value: 'none' }, { value: 'high' }],
+      },
+    },
+    {
+      value: 'opencode-go/hy3',
+      label: 'Hy3',
+      description: 'OpenCode Go',
+      effort: {
+        values: [{ value: 'none' }, { value: 'low' }, { value: 'high' }],
+      },
+    },
+    {
+      value: 'opencode-go/omen-alpha',
+      label: 'Omen Alpha',
+      description: 'OpenCode Go',
+      effort: {
+        values: [{ value: 'low' }, { value: 'high' }],
+      },
+    },
     { value: 'anthropic/claude-opus-5', label: 'Claude Opus 5', description: 'Anthropic' },
     { value: 'anthropic/claude-opus-5-fast', label: 'Claude Opus 5 Fast', description: 'Anthropic' },
     { value: 'anthropic/claude-fable-5', label: 'Claude Fable 5', description: 'Anthropic' },
@@ -117,6 +293,100 @@ export const OPENCODE_PREDEFINED_MODELS: ProviderModelsDefinition = {
   DEFAULT: 'opencode/gpt-5.6-terra',
 };
 
+/** Global OpenCode config files, in the order the CLI loads them. */
+const OPENCODE_CONFIG_FILES = ['config.json', 'opencode.json', 'opencode.jsonc'];
+
+/** Provider API keys OpenCode reads straight from the environment. */
+const OPENCODE_ENV_PROVIDER_IDS: Record<string, string> = {
+  OPENCODE_API_KEY: 'opencode',
+  ANTHROPIC_API_KEY: 'anthropic',
+  OPENAI_API_KEY: 'openai',
+};
+
+const readOpenCodeJsonFile = async (filePath: string): Promise<Record<string, unknown> | null> => {
+  try {
+    return readObjectRecord(JSON.parse(await readFile(filePath, 'utf8')));
+  } catch {
+    // Missing, unreadable, or comment-bearing (.jsonc) files simply contribute
+    // nothing; the auth store is the authoritative source below.
+    return null;
+  }
+};
+
+/**
+ * Lists the upstream providers this OpenCode install can actually route to.
+ *
+ * OpenCode resolves `<providerID>/<modelID>` against the providers the user has
+ * connected, and rejects anything else outright - `Model
+ * opencode/claude-sonnet-4-6 is not valid` is what a run gets for asking for an
+ * OpenCode Zen model on a machine that only has an Anthropic key. The curated
+ * catalog spans every provider OpenCode can address, so it has to be narrowed
+ * to this machine's providers before it reaches the model picker.
+ *
+ * Returns null when nothing can be read, so the caller keeps the full catalog
+ * rather than leaving the picker empty. Providers declared only in a
+ * project-level `opencode.json` are not visible here; the null fallback and the
+ * env-key sweep keep those installs on the full list.
+ */
+const readConnectedOpenCodeProviderIds = async (): Promise<Set<string> | null> => {
+  const providerIds = new Set<string>();
+  const configDir = path.join(os.homedir(), '.config', 'opencode');
+
+  const auth = await readOpenCodeJsonFile(
+    path.join(os.homedir(), '.local', 'share', 'opencode', 'auth.json'),
+  );
+  for (const [providerId, credential] of Object.entries(auth ?? {})) {
+    if (readObjectRecord(credential)) {
+      providerIds.add(providerId);
+    }
+  }
+
+  for (const configFile of OPENCODE_CONFIG_FILES) {
+    const config = await readOpenCodeJsonFile(path.join(configDir, configFile));
+    for (const providerId of Object.keys(readObjectRecord(config?.provider) ?? {})) {
+      providerIds.add(providerId);
+    }
+  }
+
+  for (const [envKey, providerId] of Object.entries(OPENCODE_ENV_PROVIDER_IDS)) {
+    if (readOptionalString(process.env[envKey])) {
+      providerIds.add(providerId);
+    }
+  }
+
+  return providerIds.size > 0 ? providerIds : null;
+};
+
+/**
+ * Narrows the curated catalog to the providers OpenCode can route to.
+ *
+ * The default has to move with the list: leaving it on an OpenCode Zen model
+ * would hand every new session a model the CLI refuses to run.
+ */
+const filterOpenCodeModelsByProvider = (
+  definition: ProviderModelsDefinition,
+  connectedProviderIds: Set<string> | null,
+): ProviderModelsDefinition => {
+  if (!connectedProviderIds) {
+    return definition;
+  }
+
+  const options = definition.OPTIONS.filter(
+    (option) => connectedProviderIds.has(option.value.split('/')[0]),
+  );
+  if (options.length === 0) {
+    return definition;
+  }
+
+  return {
+    ...definition,
+    OPTIONS: options,
+    DEFAULT: options.some((option) => option.value === definition.DEFAULT)
+      ? definition.DEFAULT
+      : options[0].value,
+  };
+};
+
 const parseOpenCodeSessionModelValue = (rawModel: unknown): string | null => {
   if (typeof rawModel === 'string') {
     const trimmed = rawModel.trim();
@@ -136,22 +406,40 @@ const parseOpenCodeSessionModelValue = (rawModel: unknown): string | null => {
     return null;
   }
 
-  return readOptionalString(record.id)
+  const modelId = readOptionalString(record.id)
     ?? readOptionalString(record.model)
     ?? readOptionalString(record.name)
-    ?? readOptionalString(record.value)
-    ?? null;
+    ?? readOptionalString(record.value);
+  if (!modelId) {
+    return null;
+  }
+
+  // OpenCode persists the provider and model id in separate fields (for
+  // example {"id":"z-ai/glm-5.3-flash","providerID":"openrouter"}), and its
+  // CLI's `--model` flag only accepts the composed `<providerID>/<modelID>`
+  // form. Compose it here so a resumed session resolves the same model
+  // instead of failing with an unknown-model error.
+  const providerId = readOptionalString(record.providerID)
+    ?? readOptionalString(record.providerId);
+  if (providerId && !modelId.startsWith(`${providerId}/`)) {
+    return `${providerId}/${modelId}`;
+  }
+
+  return modelId;
 };
 
 /** Provider registry model adapter for OpenCode predefined models and session metadata. */
 export class OpenCodeProviderModels implements IProviderModels {
   async getSupportedModels(): Promise<ProviderModelsDefinition> {
-    return OPENCODE_PREDEFINED_MODELS;
+    return filterOpenCodeModelsByProvider(
+      OPENCODE_PREDEFINED_MODELS,
+      await readConnectedOpenCodeProviderIds(),
+    );
   }
 
   async getCurrentActiveModel(sessionId?: string): Promise<ProviderCurrentActiveModel> {
     if (!sessionId?.trim()) {
-      return buildDefaultProviderCurrentActiveModel(OPENCODE_PREDEFINED_MODELS);
+      return buildDefaultProviderCurrentActiveModel(await this.getSupportedModels());
     }
 
     // OpenCode's `session` table is keyed by its own session id, so the stable
@@ -198,6 +486,6 @@ export class OpenCodeProviderModels implements IProviderModels {
       // Fall through to the curated default when OpenCode session lookup fails.
     }
 
-    return buildDefaultProviderCurrentActiveModel(OPENCODE_PREDEFINED_MODELS);
+    return buildDefaultProviderCurrentActiveModel(await this.getSupportedModels());
   }
 }

package/server/modules/providers/list/opencode/opencode-runtime.provider.js

@@ -9,7 +9,7 @@ import {
   normalizeAttachmentDescriptors
 } from '@/shared/image-attachments.js';
 import { notifyRunFailed, notifyRunStopped } from '@/modules/notifications/index.js';
-import { createCompleteMessage, createNormalizedMessage, flattenPromptForWindowsShell, getOpenCodeDatabasePath } from '@/shared/utils.js';
+import { createCompleteMessage, createNormalizedMessage, flattenPromptForWindowsShell, getOpenCodeDatabasePath, stripAnsiSequences } from '@/shared/utils.js';
 
 // cross-spawn resolves .cmd shims/PATHEXT on Windows and delegates to
 // child_process.spawn everywhere else.
@@ -308,7 +308,10 @@ async function spawnOpenCode(command, options = {}, ws, context) {
       });
 
       opencodeProcess.stderr.on('data', (data) => {
-        const stderrText = data.toString();
+        // opencode styles its stderr for a terminal; the chat renders plain
+        // text, so the escapes have to go before the text is surfaced. A chunk
+        // that was styling only cleans down to nothing and is not an error.
+        const stderrText = stripAnsiSequences(data.toString());
         if (!stderrText.trim()) {
           return;
         }

package/server/modules/providers/list/opencode/opencode-session-synchronizer.provider.ts

@@ -28,17 +28,23 @@ type SynchronizeRowsResult = {
   firstSessionId: string | null;
 };
 
+type OpenCodeChildSessionRow = {
+  id: string;
+};
+
 /**
  * Session indexer for OpenCode's SQLite-backed session store.
  */
 export class OpenCodeSessionSynchronizer implements IProviderSessionSynchronizer {
   private readonly provider = 'opencode' as const;
+  private childSessionsReconciled = false;
 
   /**
    * Scans OpenCode's shared opencode.db and upserts active sessions into DB.
    */
   async synchronize(since?: Date): Promise<number> {
-    const result = this.synchronizeRows(since);
+    // The first provider-wide scan also reconciles child rows indexed by older versions.
+    const result = this.synchronizeRows(since, undefined, !this.childSessionsReconciled);
     return result.processed;
   }
 
@@ -54,7 +60,11 @@ export class OpenCodeSessionSynchronizer implements IProviderSessionSynchronizer
     return result.firstSessionId;
   }
 
-  private synchronizeRows(since?: Date, limit?: number): SynchronizeRowsResult {
+  private synchronizeRows(
+    since?: Date,
+    limit?: number,
+    pruneChildSessions = false,
+  ): SynchronizeRowsResult {
     const dbPath = getOpenCodeDatabasePath();
     if (!fsSync.existsSync(dbPath)) {
       return { processed: 0, firstSessionId: null };
@@ -62,6 +72,11 @@ export class OpenCodeSessionSynchronizer implements IProviderSessionSynchronizer
 
     const db = new Database(dbPath, { readonly: true, fileMustExist: true });
     try {
+      if (pruneChildSessions) {
+        this.pruneChildSessions(db);
+        this.childSessionsReconciled = true;
+      }
+
       const sinceMillis = since?.getTime() ?? null;
       const limitClause = limit ? 'LIMIT ?' : '';
       const params = limit ? [sinceMillis, sinceMillis, limit] : [sinceMillis, sinceMillis];
@@ -76,6 +91,7 @@ export class OpenCodeSessionSynchronizer implements IProviderSessionSynchronizer
         FROM session s
         LEFT JOIN project p ON p.id = s.project_id
         WHERE s.time_archived IS NULL
+          AND s.parent_id IS NULL
           AND (? IS NULL OR COALESCE(s.time_updated, s.time_created, 0) >= ?)
         ORDER BY COALESCE(s.time_updated, s.time_created, 0) DESC, s.id DESC
         ${limitClause}
@@ -105,6 +121,18 @@ export class OpenCodeSessionSynchronizer implements IProviderSessionSynchronizer
     }
   }
 
+  private pruneChildSessions(db: Database.Database): void {
+    const childSessions = db.prepare(`
+      SELECT id
+      FROM session
+      WHERE parent_id IS NOT NULL
+    `).all() as OpenCodeChildSessionRow[];
+
+    for (const childSession of childSessions) {
+      sessionsDb.deleteSessionByProviderSessionId(childSession.id, this.provider);
+    }
+  }
+
   private upsertSession(db: Database.Database, row: OpenCodeSessionRow): string | null {
     const sessionId = readOptionalString(row.id);
     const projectPath = readOptionalString(row.directory) ?? readOptionalString(row.worktree);