@cloudcli-ai/cloudcli 1.37.2 → 1.37.3

package/dist-server/server/modules/providers/list/claude/claude-skills.provider.js

@@ -120,10 +120,13 @@ export class ClaudeSkillsProvider extends SkillsProvider {
                     if (!pluginName) {
                         continue;
                     }
+                    // A plugin may ship commands, skills, or both, and the CLI offers
+                    // both halves. Reading only the first folder found hid every skill
+                    // that sits beside a commands folder -- and hid the whole plugin when
+                    // its commands are in a format this reader does not take.
                     const commandsPath = path.join(pluginFolder, 'commands');
                     if (await pathExistsAsDirectory(commandsPath)) {
                         skills.push(...(await this.listPluginCommandSkills(commandsPath, pluginId, pluginName)));
-                        continue;
                     }
                     const skillsPath = path.join(pluginFolder, 'skills');
                     if (!(await pathExistsAsDirectory(skillsPath))) {

package/dist-server/server/modules/providers/list/claude/claude-skills.provider.js.map

@@ -1 +1 @@
-{"version":3,"file":"claude-skills.provider.js","sourceRoot":"","sources":["../../../../../../server/modules/providers/list/claude/claude-skills.provider.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"claude-skills.provider.js","sourceRoot":"","sources":["../../../../../../server/modules/providers/list/claude/claude-skills.provider.ts"],"names":[],"mappings":"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"}

package/dist-server/server/modules/providers/list/claude/claude.provider.js

@@ -2,6 +2,7 @@ import { AbstractProvider } from '../../../../modules/providers/shared/base/abst
 import { ClaudeProviderAuth } from '../../../../modules/providers/list/claude/claude-auth.provider.js';
 import { ClaudeProviderModels } from '../../../../modules/providers/list/claude/claude-models.provider.js';
 import { claudeRuntime } from '../../../../modules/providers/list/claude/claude-runtime.provider.js';
+import { ClaudeForkProvider } from '../../../../modules/providers/list/claude/claude-fork.provider.js';
 import { ClaudeMcpProvider } from '../../../../modules/providers/list/claude/claude-mcp.provider.js';
 import { ClaudeSessionSynchronizer } from '../../../../modules/providers/list/claude/claude-session-synchronizer.provider.js';
 import { ClaudeSessionsProvider } from '../../../../modules/providers/list/claude/claude-sessions.provider.js';
@@ -14,6 +15,7 @@ export class ClaudeProvider extends AbstractProvider {
     skills = new ClaudeSkillsProvider();
     sessions = new ClaudeSessionsProvider();
     sessionSynchronizer = new ClaudeSessionSynchronizer();
+    fork = new ClaudeForkProvider();
     constructor() {
         super('claude');
     }

package/dist-server/server/modules/providers/list/claude/claude.provider.js.map

@@ -1 +1 @@
-{"version":3,"file":"claude.provider.js","sourceRoot":"","sources":["../../../../../../server/modules/providers/list/claude/claude.provider.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,gBAAgB,EAAE,MAAM,sDAAsD,CAAC;AACxF,OAAO,EAAE,kBAAkB,EAAE,MAAM,yDAAyD,CAAC;AAC7F,OAAO,EAAE,oBAAoB,EAAE,MAAM,2DAA2D,CAAC;AACjG,OAAO,EAAE,aAAa,EAAE,MAAM,4DAA4D,CAAC;AAC3F,OAAO,EAAE,iBAAiB,EAAE,MAAM,wDAAwD,CAAC;AAC3F,OAAO,EAAE,yBAAyB,EAAE,MAAM,yEAAyE,CAAC;AACpH,OAAO,EAAE,sBAAsB,EAAE,MAAM,6DAA6D,CAAC;AACrG,OAAO,EAAE,oBAAoB,EAAE,MAAM,2DAA2D,CAAC;AAUjG,MAAM,OAAO,cAAe,SAAQ,gBAAgB;IACzC,OAAO,GAAqB,aAAa,CAAC;IAC1C,MAAM,GAAoB,IAAI,oBAAoB,EAAE,CAAC;IACrD,GAAG,GAAG,IAAI,iBAAiB,EAAE,CAAC;IAC9B,IAAI,GAAkB,IAAI,kBAAkB,EAAE,CAAC;IAC/C,MAAM,GAAoB,IAAI,oBAAoB,EAAE,CAAC;IACrD,QAAQ,GAAsB,IAAI,sBAAsB,EAAE,CAAC;IAC3D,mBAAmB,GAAiC,IAAI,yBAAyB,EAAE,CAAC;IAE7F;QACE,KAAK,CAAC,QAAQ,CAAC,CAAC;IAClB,CAAC;CACF"}
+{"version":3,"file":"claude.provider.js","sourceRoot":"","sources":["../../../../../../server/modules/providers/list/claude/claude.provider.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,gBAAgB,EAAE,MAAM,sDAAsD,CAAC;AACxF,OAAO,EAAE,kBAAkB,EAAE,MAAM,yDAAyD,CAAC;AAC7F,OAAO,EAAE,oBAAoB,EAAE,MAAM,2DAA2D,CAAC;AACjG,OAAO,EAAE,aAAa,EAAE,MAAM,4DAA4D,CAAC;AAC3F,OAAO,EAAE,kBAAkB,EAAE,MAAM,yDAAyD,CAAC;AAC7F,OAAO,EAAE,iBAAiB,EAAE,MAAM,wDAAwD,CAAC;AAC3F,OAAO,EAAE,yBAAyB,EAAE,MAAM,yEAAyE,CAAC;AACpH,OAAO,EAAE,sBAAsB,EAAE,MAAM,6DAA6D,CAAC;AACrG,OAAO,EAAE,oBAAoB,EAAE,MAAM,2DAA2D,CAAC;AAWjG,MAAM,OAAO,cAAe,SAAQ,gBAAgB;IACzC,OAAO,GAAqB,aAAa,CAAC;IAC1C,MAAM,GAAoB,IAAI,oBAAoB,EAAE,CAAC;IACrD,GAAG,GAAG,IAAI,iBAAiB,EAAE,CAAC;IAC9B,IAAI,GAAkB,IAAI,kBAAkB,EAAE,CAAC;IAC/C,MAAM,GAAoB,IAAI,oBAAoB,EAAE,CAAC;IACrD,QAAQ,GAAsB,IAAI,sBAAsB,EAAE,CAAC;IAC3D,mBAAmB,GAAiC,IAAI,yBAAyB,EAAE,CAAC;IACpF,IAAI,GAAkB,IAAI,kBAAkB,EAAE,CAAC;IAExD;QACE,KAAK,CAAC,QAAQ,CAAC,CAAC;IAClB,CAAC;CACF"}

package/dist-server/server/modules/providers/list/codex/codex-app-server.client.js

@@ -0,0 +1,204 @@
+import { spawn } from 'node:child_process';
+import { stat } from 'node:fs/promises';
+import { createRequire } from 'node:module';
+import readline from 'node:readline';
+import { AppError } from '../../../../shared/utils.js';
+/**
+ * Minimal JSON-RPC client for `codex app-server`.
+ *
+ * Codex ships two entry points and they expose different things. The
+ * `@openai/codex-sdk` this app runs conversations through is a wrapper around
+ * `codex exec`, and its whole surface is `startThread` and `resumeThread` —
+ * there is no way to branch a thread or to resume one partway. The same
+ * binary's `app-server` subcommand speaks JSON-RPC and does have that
+ * primitive, `thread/fork`, which is what the Codex IDE clients build their
+ * own "fork" and "edit an earlier message" on top of.
+ *
+ * So this is a second transport to the same CLI, opened only for the
+ * operations the SDK cannot express. Everything else still goes through the
+ * SDK.
+ */
+/** How long a single request may take before the child is killed. */
+const REQUEST_TIMEOUT_MS = 30_000;
+/**
+ * Resolves the `codex` launcher shipped in node_modules.
+ *
+ * Deliberately not the `codex` on PATH: a machine can have a second, older
+ * install, and the protocol this speaks is only guaranteed against the
+ * version this package depends on.
+ */
+function resolveCodexLauncher() {
+    const require_ = createRequire(import.meta.url);
+    try {
+        return require_.resolve('@openai/codex/bin/codex.js');
+    }
+    catch {
+        throw new AppError('The Codex CLI package is not installed, so Codex conversations cannot be branched.', {
+            code: 'CODEX_APP_SERVER_UNAVAILABLE',
+            statusCode: 501,
+        });
+    }
+}
+/**
+ * Runs one exchange against a freshly spawned `codex app-server`.
+ *
+ * A process per operation rather than a pooled long-lived one: the handshake
+ * costs a fraction of a second, forking happens at most once per user action,
+ * and a shared child would need lifecycle handling — restarts, back-pressure,
+ * a crash taking every pending fork with it — for no measurable gain next to
+ * the model turn that follows.
+ */
+async function withAppServer(run) {
+    const launcher = resolveCodexLauncher();
+    const child = spawn(process.execPath, [launcher, 'app-server'], {
+        env: process.env,
+        stdio: ['pipe', 'pipe', 'pipe'],
+    });
+    // The server logs sandbox and skill warnings to stderr on every start. They
+    // are not failures and drowning the app log in them helps nobody, so stderr
+    // is only kept around to explain a spawn that dies.
+    let stderr = '';
+    child.stderr?.on('data', (chunk) => {
+        stderr = (stderr + String(chunk)).slice(-2000);
+    });
+    let nextRequestId = 1;
+    const pending = new Map();
+    let exitReason = null;
+    const reader = readline.createInterface({ input: child.stdout });
+    reader.on('line', (line) => {
+        if (!line.trim()) {
+            return;
+        }
+        let message;
+        try {
+            message = JSON.parse(line);
+        }
+        catch {
+            // Server-to-client notifications and any non-JSON banner are not
+            // replies to anything this client asked for.
+            return;
+        }
+        if (typeof message.id !== 'number') {
+            return;
+        }
+        pending.get(message.id)?.(message);
+        pending.delete(message.id);
+    });
+    const failPending = (reason) => {
+        exitReason = reason;
+        for (const resolve of pending.values()) {
+            resolve({ error: { message: reason } });
+        }
+        pending.clear();
+    };
+    child.on('error', (error) => failPending(error.message));
+    child.on('exit', (code, signal) => {
+        failPending(`codex app-server exited (code ${code ?? 'null'}, signal ${signal ?? 'null'})`);
+    });
+    // A child that dies mid-request leaves its pipes broken, and the next write
+    // raises EPIPE on the stream rather than at the call site. Without a
+    // listener that is an unhandled 'error' event, which takes the whole server
+    // down over one failed fork.
+    child.stdin?.on('error', (error) => failPending(error.message));
+    child.stdout?.on('error', (error) => failPending(error.message));
+    child.stderr?.on('error', () => { });
+    const call = (method, params) => new Promise((resolve, reject) => {
+        if (exitReason) {
+            reject(new AppError(`Codex app-server is not running: ${exitReason}`, {
+                code: 'CODEX_APP_SERVER_UNAVAILABLE',
+                statusCode: 502,
+            }));
+            return;
+        }
+        const id = nextRequestId++;
+        const timer = setTimeout(() => {
+            pending.delete(id);
+            reject(new AppError(`Codex app-server did not answer "${method}" within ${REQUEST_TIMEOUT_MS}ms.`, {
+                code: 'CODEX_APP_SERVER_TIMEOUT',
+                statusCode: 504,
+            }));
+        }, REQUEST_TIMEOUT_MS);
+        pending.set(id, (response) => {
+            clearTimeout(timer);
+            if (response.error) {
+                reject(new AppError(response.error.message || `Codex app-server rejected "${method}".`, {
+                    code: 'CODEX_APP_SERVER_ERROR',
+                    statusCode: 502,
+                    details: { method, rpcCode: response.error.code },
+                }));
+                return;
+            }
+            resolve(response.result);
+        });
+        child.stdin?.write(`${JSON.stringify({ jsonrpc: '2.0', id, method, params })}\n`);
+    });
+    try {
+        // `capabilities` is deliberately empty. `thread/fork` with `lastTurnId` is
+        // in the stable protocol; only `beforeTurnId` and the turn-listing methods
+        // are gated behind `experimentalApi`, and neither is needed here.
+        await call('initialize', {
+            clientInfo: { name: 'cloudcli', title: 'CloudCLI', version: '1' },
+            capabilities: {},
+        });
+        child.stdin?.write(`${JSON.stringify({ jsonrpc: '2.0', method: 'initialized', params: {} })}\n`);
+        return await run(call);
+    }
+    catch (error) {
+        if (error instanceof AppError && exitReason) {
+            throw new AppError(`${error.message}${stderr ? ` — ${stderr.trim().split('\n').slice(-1)[0]}` : ''}`, {
+                code: error.code,
+                statusCode: error.statusCode,
+            });
+        }
+        throw error;
+    }
+    finally {
+        reader.close();
+        child.kill();
+    }
+}
+export const codexAppServer = {
+    /**
+     * Copies a thread into a new one that ends at `lastTurnId`, or copies the
+     * whole thread when it is omitted.
+     *
+     * `lastTurnId` is inclusive of the turn it names, which is the same
+     * convention the app's edit anchor uses ("the last row to keep").
+     *
+     * `cwd` decides the working directory recorded in the copy's `session_meta`,
+     * and that field is what the session indexer keys a session's project off —
+     * omitting it would file every fork under whatever directory this server
+     * happens to be running from.
+     */
+    async forkThread(input) {
+        return withAppServer(async (call) => {
+            const result = await call('thread/fork', {
+                threadId: input.threadId,
+                ...(input.lastTurnId ? { lastTurnId: input.lastTurnId } : {}),
+                ...(input.cwd ? { cwd: input.cwd } : {}),
+            });
+            const threadId = typeof result?.thread?.id === 'string' ? result.thread.id : '';
+            const path = typeof result?.thread?.path === 'string' ? result.thread.path : '';
+            if (!threadId || !path) {
+                throw new AppError('Codex reported a fork without a thread id or transcript path.', {
+                    code: 'FORK_FAILED',
+                    statusCode: 502,
+                });
+            }
+            // Confirmed rather than trusted: both callers are about to point a
+            // database row at this file, and a row naming a transcript that is not
+            // there is a session that can never be opened.
+            try {
+                await stat(path);
+            }
+            catch {
+                throw new AppError('Codex reported a fork but wrote no transcript for it.', {
+                    code: 'FORK_FAILED',
+                    statusCode: 502,
+                });
+            }
+            return { threadId, path };
+        });
+    },
+};
+//# sourceMappingURL=codex-app-server.client.js.map

package/dist-server/server/modules/providers/list/codex/codex-app-server.client.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"codex-app-server.client.js","sourceRoot":"","sources":["../../../../../../server/modules/providers/list/codex/codex-app-server.client.ts"],"names":[],"mappings":"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"}

package/dist-server/server/modules/providers/list/codex/codex-fork.provider.js

@@ -0,0 +1,32 @@
+import { codexAppServer } from '../../../../modules/providers/list/codex/codex-app-server.client.js';
+/**
+ * Branches a Codex conversation into an independent thread.
+ *
+ * `thread/fork` writes a real rollout with its own thread id and a
+ * `forked_from_id` back-reference, which is what makes the copy resumable
+ * rather than an inert duplicate of the file.
+ *
+ * One difference from the Claude fork worth knowing about: Codex's unit is a
+ * turn, not a row. `upToAnchorId` names the turn a user message belongs to and
+ * the cut is inclusive of it, so forking from a message keeps that message
+ * *and the answer it got*. Claude's `upToMessageId` can stop at the prompt
+ * itself. There is no way to express the finer cut here — a turn is written as
+ * one thing — and the coarser one is the more useful of the two anyway.
+ */
+export class CodexForkProvider {
+    async forkSession(input) {
+        // `title` is deliberately not forwarded. The sidebar name lives in this
+        // app's own session row, and naming the thread inside Codex would mean a
+        // second call that could fail after the fork already succeeded.
+        const fork = await codexAppServer.forkThread({
+            threadId: input.providerSessionId,
+            lastTurnId: input.upToAnchorId,
+            cwd: input.projectPath,
+        });
+        // The path is the one the server reported and already confirmed on disk,
+        // not one derived from the source: a fork lands in today's date directory
+        // rather than beside the transcript it was copied from.
+        return { providerSessionId: fork.threadId, jsonlPath: fork.path };
+    }
+}
+//# sourceMappingURL=codex-fork.provider.js.map

package/dist-server/server/modules/providers/list/codex/codex-fork.provider.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"codex-fork.provider.js","sourceRoot":"","sources":["../../../../../../server/modules/providers/list/codex/codex-fork.provider.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,cAAc,EAAE,MAAM,2DAA2D,CAAC;AAG3F;;;;;;;;;;;;;GAaG;AACH,MAAM,OAAO,iBAAiB;IAC5B,KAAK,CAAC,WAAW,CAAC,KAMjB;QACC,wEAAwE;QACxE,yEAAyE;QACzE,gEAAgE;QAChE,MAAM,IAAI,GAAG,MAAM,cAAc,CAAC,UAAU,CAAC;YAC3C,QAAQ,EAAE,KAAK,CAAC,iBAAiB;YACjC,UAAU,EAAE,KAAK,CAAC,YAAY;YAC9B,GAAG,EAAE,KAAK,CAAC,WAAW;SACvB,CAAC,CAAC;QAEH,yEAAyE;QACzE,0EAA0E;QAC1E,wDAAwD;QACxD,OAAO,EAAE,iBAAiB,EAAE,IAAI,CAAC,QAAQ,EAAE,SAAS,EAAE,IAAI,CAAC,IAAI,EAAE,CAAC;IACpE,CAAC;CACF"}

package/dist-server/server/modules/providers/list/codex/codex-models.provider.js

@@ -6,6 +6,22 @@ import { buildDefaultProviderCurrentActiveModel, readObjectRecord, readOptionalS
 /** Curated Codex catalog shipped as immutable CloudCLI defaults. */
 export const CODEX_PREDEFINED_MODELS = {
     OPTIONS: [
+        {
+            value: 'gpt-6-astra',
+            label: 'GPT-6 Astra',
+            description: 'Our most capable model for complex, demanding work.',
+            effort: {
+                default: 'low',
+                values: [
+                    { value: 'low' },
+                    { value: 'medium' },
+                    { value: 'high' },
+                    { value: 'xhigh' },
+                    { value: 'max' },
+                    { value: 'ultra' },
+                ],
+            },
+        },
         {
             value: 'gpt-5.6-sol',
             label: 'GPT-5.6 Sol',

package/dist-server/server/modules/providers/list/codex/codex-models.provider.js.map

@@ -1 +1 @@
-{"version":3,"file":"codex-models.provider.js","sourceRoot":"","sources":["../../../../../../server/modules/providers/list/codex/codex-models.provider.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"codex-models.provider.js","sourceRoot":"","sources":["../../../../../../server/modules/providers/list/codex/codex-models.provider.ts"],"names":[],"mappings":"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"}

package/dist-server/server/modules/providers/list/codex/codex-runtime.provider.js

@@ -8,15 +8,17 @@
  * ## Usage
  *
  * - codexRuntime.run(command, options, writer, context) - Execute a streamed prompt
- * - abortCodexSession(sessionId) - Cancel an active session
- * - isCodexSessionActive(sessionId) - Check if a session is running
- * - getActiveCodexSessions() - List all active sessions
+ * - codexRuntime.abort(sessionId) - Cancel an active session
  */
 import { Codex } from '@openai/codex-sdk';
-import { appendFilesInputTag, buildCodexInputItems, normalizeImageDescriptors } from '../../../../shared/image-attachments.js';
+import { appendFilesInputTag, buildCodexInputItems, normalizeImageDescriptors, createCompleteMessage, createNormalizedMessage, } from '../../../../shared/index.js';
 import { notifyRunFailed, notifyRunStopped } from '../../../../modules/notifications/index.js';
-import { createCompleteMessage, createNormalizedMessage } from '../../../../shared/utils.js';
 const activeCodexSessions = new Map();
+/**
+ * Item types whose in-flight updates are worth showing. These are the ones a
+ * user waits on — a shell command's output, an MCP call, and the running plan.
+ */
+const PROGRESSIVE_CODEX_ITEM_TYPES = new Set(['command_execution', 'mcp_tool_call', 'todo_list']);
 function readUsageNumber(value) {
     const parsed = Number(value);
     return Number.isFinite(parsed) ? parsed : 0;
@@ -56,12 +58,16 @@ function transformCodexEvent(event) {
             if (!item) {
                 return { type: event.type, item: null };
             }
-            // Transform based on item type
+            // `itemId` is the SDK's stable per-item id. Carrying it through means an
+            // in-progress row and its later completion normalize to the same message
+            // id, so the client updates one transcript entry instead of appending a
+            // new one for every progress tick.
             switch (item.type) {
                 case 'agent_message':
                     return {
                         type: 'item',
                         itemType: 'agent_message',
+                        itemId: item.id,
                         message: {
                             role: 'assistant',
                             content: item.text
@@ -71,6 +77,7 @@ function transformCodexEvent(event) {
                     return {
                         type: 'item',
                         itemType: 'reasoning',
+                        itemId: item.id,
                         message: {
                             role: 'assistant',
                             content: item.text,
@@ -81,6 +88,7 @@ function transformCodexEvent(event) {
                     return {
                         type: 'item',
                         itemType: 'command_execution',
+                        itemId: item.id,
                         command: item.command,
                         output: item.aggregated_output,
                         exitCode: item.exit_code,
@@ -90,6 +98,7 @@ function transformCodexEvent(event) {
                     return {
                         type: 'item',
                         itemType: 'file_change',
+                        itemId: item.id,
                         changes: item.changes,
                         status: item.status
                     };
@@ -97,6 +106,7 @@ function transformCodexEvent(event) {
                     return {
                         type: 'item',
                         itemType: 'mcp_tool_call',
+                        itemId: item.id,
                         server: item.server,
                         tool: item.tool,
                         arguments: item.arguments,
@@ -108,18 +118,21 @@ function transformCodexEvent(event) {
                     return {
                         type: 'item',
                         itemType: 'web_search',
+                        itemId: item.id,
                         query: item.query
                     };
                 case 'todo_list':
                     return {
                         type: 'item',
                         itemType: 'todo_list',
+                        itemId: item.id,
                         items: item.items
                     };
                 case 'error':
                     return {
                         type: 'item',
                         itemType: 'error',
+                        itemId: item.id,
                         message: {
                             role: 'error',
                             content: item.message
@@ -129,6 +142,7 @@ function transformCodexEvent(event) {
                     return {
                         type: 'item',
                         itemType: item.type,
+                        itemId: item.id,
                         item: item
                     };
             }
@@ -184,7 +198,9 @@ function mapPermissionModeToCodexOptions(permissionMode) {
         default:
             return {
                 sandboxMode: 'workspace-write',
-                approvalPolicy: 'untrusted'
+                // Current Codex CLI versions reject the retired `untrusted` policy.
+                // Keep sandboxing enabled; exec cannot grant interactive approval requests.
+                approvalPolicy: 'on-request'
             };
     }
 }
@@ -194,7 +210,7 @@ function mapPermissionModeToCodexOptions(permissionMode) {
  * @param {object} options - Options including cwd, sessionId, model, permissionMode
  * @param {WebSocket|object} ws - WebSocket connection or response writer
  */
-export async function queryCodex(command, options = {}, ws, context) {
+async function queryCodex(command, options = {}, ws, context) {
     const { sessionId, sessionSummary, cwd, projectPath, model, effort, images, files, permissionMode = 'default' } = options;
     // Callers pass the stable app session id; the SDK resumes threads with the
     // provider-native id recorded on the session row.
@@ -215,6 +231,12 @@ export async function queryCodex(command, options = {}, ws, context) {
     let capturedSessionId = providerSessionId;
     let sessionCreatedSent = false;
     let terminalFailure = null;
+    // Codex surfaces API failures as streamed error items/turn.failed events, and
+    // then the SDK also throws "Codex Exec exited with code N: <stderr>" once the
+    // process dies. Showing both means the rendered error is followed by a raw
+    // stderr dump of unrelated CLI log lines, so the thrown wrapper is dropped
+    // when the stream already reported the failure.
+    let errorSurfaced = false;
     const abortController = new AbortController();
     // Session-map key: the app session id when the caller supplied one, else
     // the provider-native thread id once captured (legacy/direct API callers).
@@ -262,7 +284,7 @@ export async function queryCodex(command, options = {}, ws, context) {
         for await (const event of streamedTurn.events) {
             // Capture thread/session id lazily from the stream (Codex emits this asynchronously).
             if (event.type === 'thread.started') {
-                const discoveredSessionId = event.thread_id || event.id || null;
+                const discoveredSessionId = event.thread_id || null;
                 if (discoveredSessionId && !capturedSessionId) {
                     capturedSessionId = discoveredSessionId;
                     registerSession(sessionKey());
@@ -280,15 +302,25 @@ export async function queryCodex(command, options = {}, ws, context) {
                 break;
             }
             if (sessionKey()) {
-                const session = activeCodexSessions.get(sessionKey());
+                const session = activeCodexSessions.get(sessionKey() || '');
                 if (session?.status === 'aborted') {
                     break;
                 }
             }
-            if (event.type === 'item.started' || event.type === 'item.updated') {
+            // Progress events used to be dropped, so a long shell command or a
+            // growing plan showed nothing until it finished. They are forwarded now;
+            // every item carries a stable id, so the client replaces the row it
+            // already has rather than stacking a new one per tick. Text items are
+            // still skipped mid-flight because assistant prose arrives through the
+            // separate streaming path.
+            if ((event.type === 'item.started' || event.type === 'item.updated')
+                && !PROGRESSIVE_CODEX_ITEM_TYPES.has(event.item?.type)) {
                 continue;
             }
             const transformed = transformCodexEvent(event);
+            if (transformed.type === 'error' || transformed.itemType === 'error') {
+                errorSurfaced = true;
+            }
             // Normalize the transformed event into NormalizedMessage(s) via adapter
             const normalizedMsgs = context.normalizeMessage(transformed, capturedSessionId || sessionId || null);
             for (const msg of normalizedMsgs) {
@@ -296,6 +328,7 @@ export async function queryCodex(command, options = {}, ws, context) {
             }
             if (event.type === 'turn.failed' && !terminalFailure) {
                 terminalFailure = event.error || new Error('Turn failed');
+                errorSurfaced = true;
                 // Notifications are app-facing, so they carry the app session id.
                 notifyRunFailed({
                     userId: ws?.userId || null,
@@ -315,7 +348,7 @@ export async function queryCodex(command, options = {}, ws, context) {
         }
         // Send the terminal completion event — skipped for aborted runs, whose
         // terminal `complete` (aborted: true) was already sent by abort-session.
-        const runSession = sessionKey() ? activeCodexSessions.get(sessionKey()) : null;
+        const runSession = activeCodexSessions.get(sessionKey() || '');
         const runAborted = runSession?.status === 'aborted' || abortController.signal.aborted;
         if (!runAborted) {
             sendMessage(ws, createCompleteMessage({
@@ -336,18 +369,21 @@ export async function queryCodex(command, options = {}, ws, context) {
         }
     }
     catch (error) {
-        const session = sessionKey() ? activeCodexSessions.get(sessionKey()) : null;
+        const session = activeCodexSessions.get(sessionKey() || '');
+        const runError = error instanceof Error ? error : new Error(String(error));
         const wasAborted = session?.status === 'aborted' ||
-            error?.name === 'AbortError' ||
-            String(error?.message || '').toLowerCase().includes('aborted');
+            runError.name === 'AbortError' ||
+            runError.message.toLowerCase().includes('aborted');
         if (!wasAborted) {
             console.error('[Codex] Error:', error);
-            // Check if Codex SDK is available for a clearer error message
-            const installed = await context.isProviderInstalled();
-            const errorContent = !installed
-                ? 'Codex CLI is not configured. Please set up authentication first.'
-                : error.message;
-            sendMessage(ws, createNormalizedMessage({ kind: 'error', content: errorContent, sessionId: capturedSessionId || sessionId || null, provider: 'codex' }));
+            if (!errorSurfaced) {
+                // Check if Codex SDK is available for a clearer error message
+                const installed = await context.isProviderInstalled();
+                const errorContent = !installed
+                    ? 'Codex CLI is not configured. Please set up authentication first.'
+                    : runError.message;
+                sendMessage(ws, createNormalizedMessage({ kind: 'error', content: errorContent, sessionId: capturedSessionId || sessionId || null, provider: 'codex' }));
+            }
             sendMessage(ws, createCompleteMessage({
                 provider: 'codex',
                 sessionId: capturedSessionId || sessionId || null,
@@ -367,7 +403,7 @@ export async function queryCodex(command, options = {}, ws, context) {
     finally {
         // Update session status
         if (sessionKey()) {
-            const session = activeCodexSessions.get(sessionKey());
+            const session = activeCodexSessions.get(sessionKey() || '');
             if (session) {
                 session.status = session.status === 'aborted' ? 'aborted' : 'completed';
             }
@@ -379,7 +415,7 @@ export async function queryCodex(command, options = {}, ws, context) {
  * @param {string} sessionId - Session ID to abort
  * @returns {boolean} - Whether abort was successful
  */
-export function abortCodexSession(sessionId) {
+function abortCodexSession(sessionId) {
     const session = activeCodexSessions.get(sessionId);
     if (!session) {
         return false;
@@ -393,32 +429,7 @@ export function abortCodexSession(sessionId) {
     }
     return true;
 }
-/**
- * Check if a session is active
- * @param {string} sessionId - Session ID to check
- * @returns {boolean} - Whether session is active
- */
-export function isCodexSessionActive(sessionId) {
-    const session = activeCodexSessions.get(sessionId);
-    return session?.status === 'running';
-}
-/**
- * Get all active sessions
- * @returns {Array} - Array of active session info
- */
-export function getActiveCodexSessions() {
-    const sessions = [];
-    for (const [id, session] of activeCodexSessions.entries()) {
-        if (session.status === 'running') {
-            sessions.push({
-                id,
-                status: session.status,
-                startedAt: session.startedAt
-            });
-        }
-    }
-    return sessions;
-}
+/** Used by the providers module's CodexProvider to run and abort SDK turns. */
 export const codexRuntime = {
     run: queryCodex,
     abort: abortCodexSession,