@deepseek-harness-tui/dsh-tui 0.14.1 → 0.16.0

package/lib/types/backends/codex/auth/external-tokens.js

@@ -1,4 +1,4 @@
-import { t } from '../../../i18n.js';
+import { codexText } from '../text.js';
 import { rec, str } from '../narrow.js';
 import { CLIENT, NOTIFY, SERVER_REQUEST } from '../protocol/index.js';
 import { REAL_CLOCK, RPC_ERROR } from '../rpc/client.js';
@@ -62,7 +62,7 @@ export function createCodexAuth(deps) {
         if (managedFailed)
             source = 'unknown';
         debug('codex auth: managed credential failed; injection stopped');
-        note('codex-auth', 'error', t(key));
+        note('codex-auth', 'error', codexText(key));
     };
     const fresh = async (rejected) => {
         if (deps.credential === undefined)
@@ -156,7 +156,7 @@ export function createCodexAuth(deps) {
                 if (access !== undefined) {
                     const tokens = externalTokensOf(access);
                     if (tokens === undefined) {
-                        note('codex-auth', 'warning', t('codex-auth-claims-missing'));
+                        note('codex-auth', 'warning', codexText('codex-auth-claims-missing'));
                     }
                     else {
                         epoch += 1;
@@ -175,7 +175,7 @@ export function createCodexAuth(deps) {
             }
         }
         if (source === 'missing')
-            note('codex-auth-required', 'warning', t('codex-auth-login-needed'));
+            note('codex-auth-required', 'warning', codexText('codex-auth-login-needed'));
     };
     const runtime = {
         get source() { return source; },
@@ -213,14 +213,14 @@ export function createCodexAuth(deps) {
             await runtime.start();
             const account = await runtime.account();
             const labels = {
-                channel: t('codex-auth-source-channel', { name: deps.channel?.name ?? '' }),
-                'dsh-auth': t('codex-auth-source-oauth'),
-                'codex-login': t('codex-auth-source-native'),
-                'api-key': t('codex-auth-source-api-key'),
-                missing: t('codex-auth-source-missing'),
-                unknown: t('codex-auth-source-unknown'),
+                channel: codexText('codex-auth-source-channel', { name: deps.channel?.name ?? '' }),
+                'dsh-auth': codexText('codex-auth-source-oauth'),
+                'codex-login': codexText('codex-auth-source-native'),
+                'api-key': codexText('codex-auth-source-api-key'),
+                missing: codexText('codex-auth-source-missing'),
+                unknown: codexText('codex-auth-source-unknown'),
             };
-            return { lines: [labels[source], ...(account.subscription === undefined ? [] : [t('codex-auth-plan', { plan: account.subscription })]), ...(route.host === undefined ? [] : [t('codex-auth-host', { host: route.host })]), ...(!route.firstParty || deps.externalAllowed === false ? [t('codex-auth-route-blocked')] : []), ...[...notices.values()].map(notice => notice.text)] };
+            return { lines: [labels[source], ...(account.subscription === undefined ? [] : [codexText('codex-auth-plan', { plan: account.subscription })]), ...(route.host === undefined ? [] : [codexText('codex-auth-host', { host: route.host })]), ...(!route.firstParty || deps.externalAllowed === false ? [codexText('codex-auth-route-blocked')] : []), ...[...notices.values()].map(notice => notice.text)] };
         },
         async account() {
             await readOwnAccount();
@@ -234,7 +234,7 @@ export function createCodexAuth(deps) {
         },
         async deviceLogin() {
             if (deps.channel !== undefined)
-                throw new Error(t('codex-auth-channel-active'));
+                throw new Error(codexText('codex-auth-channel-active'));
             let finish;
             const done = new Promise(resolve => { finish = resolve; });
             const early = [];
@@ -290,14 +290,14 @@ export function createCodexAuth(deps) {
             catch {
                 off();
                 finish(false);
-                throw new Error(t('codex-auth-login-failed'));
+                throw new Error(codexText('codex-auth-login-failed'));
             }
         },
         async apiKeyLogin(apiKey) {
             if (deps.channel !== undefined)
-                throw new Error(t('codex-auth-channel-active'));
+                throw new Error(codexText('codex-auth-channel-active'));
             if (apiKey.trim() === '')
-                throw new Error(t('codex-auth-api-key-required'));
+                throw new Error(codexText('codex-auth-api-key-required'));
             try {
                 await hub.call(CLIENT.accountLoginStart, { type: 'apiKey', apiKey });
                 disable();
@@ -307,7 +307,7 @@ export function createCodexAuth(deps) {
                 source = 'api-key';
             }
             catch {
-                throw new Error(t('codex-auth-login-failed'));
+                throw new Error(codexText('codex-auth-login-failed'));
             }
         },
     };

package/lib/types/backends/codex/auth/status.js

@@ -1,7 +1,7 @@
 /** /login's three methods over the shared question UI. API-key answers go
  * directly to auth; events contain only the secret question and settlement. */
 import { randomUUID } from 'node:crypto';
-import { t } from '../../../i18n.js';
+import { codexText } from '../text.js';
 import { CODEX_OAUTH_PROVIDER } from './external-tokens.js';
 export function createCodexAuthCapability(runtime, emit) {
     const pending = new Map();
@@ -32,15 +32,15 @@ export function createCodexAuthCapability(runtime, emit) {
         if (disposed)
             return;
         if (runtime.source === 'channel') {
-            notice('warning', t('codex-auth-channel-active'));
+            notice('warning', codexText('codex-auth-channel-active'));
             return;
         }
         const methods = [
-            ...(loginOAuth === undefined ? [] : [{ id: 'oauth', label: t('codex-login-oauth'), description: t('codex-login-oauth-desc') }]),
-            { id: 'device', label: t('codex-login-device'), description: t('codex-login-device-desc') },
-            { id: 'api-key', label: t('codex-login-api-key'), description: t('codex-login-api-key-storage') },
+            ...(loginOAuth === undefined ? [] : [{ id: 'oauth', label: codexText('codex-login-oauth'), description: codexText('codex-login-oauth-desc') }]),
+            { id: 'device', label: codexText('codex-login-device'), description: codexText('codex-login-device-desc') },
+            { id: 'api-key', label: codexText('codex-login-api-key'), description: codexText('codex-login-api-key-storage') },
         ];
-        const selection = await ask({ header: 'Codex', question: t('codex-login-choose'), options: methods.map(({ label, description }) => ({ label, description })), hideCustomInput: true }).answer;
+        const selection = await ask({ header: 'Codex', question: codexText('codex-login-choose'), options: methods.map(({ label, description }) => ({ label, description })), hideCustomInput: true }).answer;
         const label = selection?.answers[0]?.selected[0];
         const method = methods.find(row => row.label === label)?.id;
         if (disposed || method === undefined)
@@ -48,26 +48,26 @@ export function createCodexAuthCapability(runtime, emit) {
         try {
             if (method === 'oauth') {
                 if (!runtime.route.firstParty) {
-                    notice('warning', t('codex-auth-route-blocked'));
+                    notice('warning', codexText('codex-auth-route-blocked'));
                     return;
                 }
                 if (await loginOAuth?.() !== true || disposed)
                     return;
                 await runtime.reconnect();
-                notice(runtime.source === 'dsh-auth' ? 'info' : 'error', t(runtime.source === 'dsh-auth' ? 'codex-login-success' : 'codex-auth-login-failed'));
+                notice(runtime.source === 'dsh-auth' ? 'info' : 'error', codexText(runtime.source === 'dsh-auth' ? 'codex-login-success' : 'codex-auth-login-failed'));
                 return;
             }
             if (method === 'api-key') {
-                const answers = await ask({ header: 'Codex', question: t('codex-login-api-key-prompt'), detail: t('codex-login-api-key-storage'), options: [], secret: true }).answer;
+                const answers = await ask({ header: 'Codex', question: codexText('codex-login-api-key-prompt'), detail: codexText('codex-login-api-key-storage'), options: [], secret: true }).answer;
                 if (answers === undefined || disposed)
                     return;
                 const apiKey = answers.answers[0]?.custom;
                 if (apiKey === undefined || apiKey.trim() === '') {
-                    notice('warning', t('codex-auth-api-key-required'));
+                    notice('warning', codexText('codex-auth-api-key-required'));
                     return;
                 }
                 await runtime.apiKeyLogin(apiKey);
-                notice('info', t('codex-login-success'));
+                notice('info', codexText('codex-login-success'));
                 return;
             }
             const device = await runtime.deviceLogin();
@@ -75,7 +75,7 @@ export function createCodexAuthCapability(runtime, emit) {
                 await device.cancel();
                 return;
             }
-            const prompt = ask({ header: 'Codex', question: t('codex-login-device-code', { code: device.userCode }), detail: t('codex-login-device-wait'), link: device.verificationUrl, options: [{ label: t('codex-login-cancel') }], hideCustomInput: true });
+            const prompt = ask({ header: 'Codex', question: codexText('codex-login-device-code', { code: device.userCode }), detail: codexText('codex-login-device-wait'), link: device.verificationUrl, options: [{ label: codexText('codex-login-cancel') }], hideCustomInput: true });
             const outcome = await Promise.race([
                 device.done.then(success => ({ kind: 'done', success })),
                 prompt.answer.then(() => ({ kind: 'cancel' })),
@@ -84,11 +84,11 @@ export function createCodexAuthCapability(runtime, emit) {
                 await device.cancel();
             else {
                 prompt.withdraw();
-                notice(outcome.success ? 'info' : 'error', t(outcome.success ? 'codex-login-success' : 'codex-auth-login-failed'));
+                notice(outcome.success ? 'info' : 'error', codexText(outcome.success ? 'codex-login-success' : 'codex-auth-login-failed'));
             }
         }
         catch {
-            notice('error', t('codex-auth-login-failed'));
+            notice('error', codexText('codex-auth-login-failed'));
         }
     };
     return {

package/lib/types/backends/codex/backend.d.ts

@@ -1,29 +1,12 @@
-/**
- * The Codex backend (docs/codex-backend-design.md §5.5): detection, opening
- * a thread (create or resume) on the process-wide app-server hub, and the
- * launcher's per-backend session markers.
- *
- * The child runs the user's own `codex` with the user's own `CODEX_HOME`
- * (D6): their config, instructions, MCP servers, provider and login apply
- * as in the official client, and threads are shared with it. dsh-tui's
- * choices (start mode, model, effort) travel per thread as request
- * parameters; nothing is written into Codex's configuration.
- */
 import type { AgentBackend, BackendHost, OpenTarget } from '../../agent/backend.js';
 import type { AgentSession } from '../../agent/session.js';
 import { type CodexAuthRuntime } from './auth/external-tokens.js';
 import { type CodexChannels, type CodexChannelsRuntime } from './channels.js';
-import type { ChannelTokenStore } from '../shared/channel-tokens.js';
 import { type Rec } from './narrow.js';
 import { type CodexPrefs } from './prefs.js';
 import { type CodexExecutable } from './rpc/binary.js';
 import { type CodexHub, type CodexHubDeps } from './rpc/hub.js';
 import { type RpcClock } from './rpc/client.js';
-/** Structural until the neutral BackendHost addition is merged; the shared
- * ChannelTokenStore interface is the real host read/write/erase/declared seam. */
-export type CodexBackendHost = BackendHost & {
-    readonly tokenStore?: ChannelTokenStore;
-};
 export interface CodexRuntime {
     readonly hub: CodexHub;
     readonly release: () => void;
@@ -34,6 +17,8 @@ export interface CodexRuntime {
     readonly config?: Rec;
     readonly auth: CodexAuthRuntime;
     readonly channels: CodexChannelsRuntime;
+    /** Store identity captured from this child, not later process env changes. */
+    readonly catalogSource?: string;
     readonly startNotices?: readonly string[];
     /** Rejoin an idle native thread retained by the local daemon, if available. */
     readonly rejoinNativeDaemon?: () => Promise<CodexRuntime | undefined>;
@@ -49,9 +34,9 @@ export interface CodexRuntimeOptions {
 }
 /** Acquire the same platform runtime for open/resume/catalog. Tests replace
  * only the process, executable discovery and profile file, not the plumbing. */
-export declare function prepareCodexRuntime(target: OpenTarget, host: CodexBackendHost, options?: CodexRuntimeOptions): Promise<CodexRuntime>;
+export declare function prepareCodexRuntime(target: OpenTarget, host: BackendHost, options?: CodexRuntimeOptions): Promise<CodexRuntime>;
 /** Open a native thread, rejoining its idle daemon writer on conflict. */
-export declare function openCodexBackendSession(target: OpenTarget, host: CodexBackendHost, options?: CodexRuntimeOptions & {
+export declare function openCodexBackendSession(target: OpenTarget, host: BackendHost, options?: CodexRuntimeOptions & {
     readonly prefs?: CodexPrefs;
 }): Promise<AgentSession>;
 export declare const codexBackend: AgentBackend;

package/lib/types/backends/codex/backend.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"backend.d.ts","sourceRoot":"","sources":["../../../../src/backends/codex/backend.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;GAUG;AACH,OAAO,KAAK,EAAE,YAAY,EAAE,WAAW,EAAE,UAAU,EAAE,MAAM,wBAAwB,CAAA;AACnF,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,wBAAwB,CAAA;AAI1D,OAAO,EAA0C,KAAK,gBAAgB,EAAE,MAAM,2BAA2B,CAAA;AAEzG,OAAO,EAAiD,KAAK,aAAa,EAAE,KAAK,oBAAoB,EAAE,MAAM,eAAe,CAAA;AAC5H,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,6BAA6B,CAAA;AAGpE,OAAO,EAAuB,KAAK,GAAG,EAAE,MAAM,aAAa,CAAA;AAE3D,OAAO,EAAkB,KAAK,UAAU,EAAE,MAAM,YAAY,CAAA;AAC5D,OAAO,EAAyC,KAAK,eAAe,EAAE,MAAM,iBAAiB,CAAA;AAC7F,OAAO,EAAmB,KAAK,QAAQ,EAAE,KAAK,YAAY,EAAoB,MAAM,cAAc,CAAA;AAClG,OAAO,EAAsB,KAAK,QAAQ,EAAE,MAAM,iBAAiB,CAAA;AAMnE;kFACkF;AAClF,MAAM,MAAM,gBAAgB,GAAG,WAAW,GAAG;IAAE,QAAQ,CAAC,UAAU,CAAC,EAAE,iBAAiB,CAAA;CAAE,CAAA;AAExF,MAAM,WAAW,YAAY;IAC3B,QAAQ,CAAC,GAAG,EAAE,QAAQ,CAAA;IACtB,QAAQ,CAAC,OAAO,EAAE,MAAM,IAAI,CAAA;IAC5B,QAAQ,CAAC,GAAG,EAAE,MAAM,CAAA;IACpB,QAAQ,CAAC,UAAU,EAAE,eAAe,GAAG;QAAE,QAAQ,CAAC,OAAO,CAAC,EAAE,MAAM,CAAA;KAAE,CAAA;IACpE,QAAQ,CAAC,MAAM,CAAC,EAAE,GAAG,CAAA;IACrB,QAAQ,CAAC,IAAI,EAAE,gBAAgB,CAAA;IAC/B,QAAQ,CAAC,QAAQ,EAAE,oBAAoB,CAAA;IACvC,QAAQ,CAAC,YAAY,CAAC,EAAE,SAAS,MAAM,EAAE,CAAA;IACzC,+EAA+E;IAC/E,QAAQ,CAAC,kBAAkB,CAAC,EAAE,MAAM,OAAO,CAAC,YAAY,GAAG,SAAS,CAAC,CAAA;CACtE;AACD,MAAM,WAAW,mBAAmB;IAClC,QAAQ,CAAC,UAAU,CAAC,EAAE,eAAe,GAAG;QAAE,QAAQ,CAAC,OAAO,CAAC,EAAE,MAAM,CAAA;KAAE,CAAA;IACrE,QAAQ,CAAC,QAAQ,CAAC,EAAE,aAAa,CAAA;IACjC,QAAQ,CAAC,GAAG,CAAC,EAAE,MAAM,CAAC,UAAU,CAAA;IAChC,QAAQ,CAAC,OAAO,CAAC,EAAE,YAAY,CAAA;IAC/B,QAAQ,CAAC,SAAS,CAAC,EAAE,QAAQ,CAAA;CAC9B;AAED;gFACgF;AAChF,wBAAsB,mBAAmB,CAAC,MAAM,EAAE,UAAU,EAAE,IAAI,EAAE,gBAAgB,EAAE,OAAO,GAAE,mBAAwB,GAAG,OAAO,CAAC,YAAY,CAAC,CA8G9I;AAKD,0EAA0E;AAC1E,wBAAsB,uBAAuB,CAAC,MAAM,EAAE,UAAU,EAAE,IAAI,EAAE,gBAAgB,EAAE,OAAO,GAAE,mBAAmB,GAAG;IAAE,QAAQ,CAAC,KAAK,CAAC,EAAE,UAAU,CAAA;CAAO,GAAG,OAAO,CAAC,YAAY,CAAC,CAiBpL;AAED,eAAO,MAAM,YAAY,EAAE,YA6B1B,CAAA"}
+{"version":3,"file":"backend.d.ts","sourceRoot":"","sources":["../../../../src/backends/codex/backend.ts"],"names":[],"mappings":"AAYA,OAAO,KAAK,EAAE,YAAY,EAAE,WAAW,EAAE,UAAU,EAAE,MAAM,wBAAwB,CAAA;AACnF,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,wBAAwB,CAAA;AAG1D,OAAO,EAA0C,KAAK,gBAAgB,EAAE,MAAM,2BAA2B,CAAA;AAEzG,OAAO,EAAsE,KAAK,aAAa,EAAE,KAAK,oBAAoB,EAAE,MAAM,eAAe,CAAA;AAGjJ,OAAO,EAAuB,KAAK,GAAG,EAAE,MAAM,aAAa,CAAA;AAE3D,OAAO,EAAoC,KAAK,UAAU,EAAE,MAAM,YAAY,CAAA;AAC9E,OAAO,EAAyC,KAAK,eAAe,EAAE,MAAM,iBAAiB,CAAA;AAC7F,OAAO,EAAmB,KAAK,QAAQ,EAAE,KAAK,YAAY,EAAoB,MAAM,cAAc,CAAA;AAClG,OAAO,EAAsB,KAAK,QAAQ,EAAE,MAAM,iBAAiB,CAAA;AAMnE,MAAM,WAAW,YAAY;IAC3B,QAAQ,CAAC,GAAG,EAAE,QAAQ,CAAA;IACtB,QAAQ,CAAC,OAAO,EAAE,MAAM,IAAI,CAAA;IAC5B,QAAQ,CAAC,GAAG,EAAE,MAAM,CAAA;IACpB,QAAQ,CAAC,UAAU,EAAE,eAAe,GAAG;QAAE,QAAQ,CAAC,OAAO,CAAC,EAAE,MAAM,CAAA;KAAE,CAAA;IACpE,QAAQ,CAAC,MAAM,CAAC,EAAE,GAAG,CAAA;IACrB,QAAQ,CAAC,IAAI,EAAE,gBAAgB,CAAA;IAC/B,QAAQ,CAAC,QAAQ,EAAE,oBAAoB,CAAA;IACvC,8EAA8E;IAC9E,QAAQ,CAAC,aAAa,CAAC,EAAE,MAAM,CAAA;IAC/B,QAAQ,CAAC,YAAY,CAAC,EAAE,SAAS,MAAM,EAAE,CAAA;IACzC,+EAA+E;IAC/E,QAAQ,CAAC,kBAAkB,CAAC,EAAE,MAAM,OAAO,CAAC,YAAY,GAAG,SAAS,CAAC,CAAA;CACtE;AACD,MAAM,WAAW,mBAAmB;IAClC,QAAQ,CAAC,UAAU,CAAC,EAAE,eAAe,GAAG;QAAE,QAAQ,CAAC,OAAO,CAAC,EAAE,MAAM,CAAA;KAAE,CAAA;IACrE,QAAQ,CAAC,QAAQ,CAAC,EAAE,aAAa,CAAA;IACjC,QAAQ,CAAC,GAAG,CAAC,EAAE,MAAM,CAAC,UAAU,CAAA;IAChC,QAAQ,CAAC,OAAO,CAAC,EAAE,YAAY,CAAA;IAC/B,QAAQ,CAAC,SAAS,CAAC,EAAE,QAAQ,CAAA;CAC9B;AAED;gFACgF;AAChF,wBAAsB,mBAAmB,CAAC,MAAM,EAAE,UAAU,EAAE,IAAI,EAAE,WAAW,EAAE,OAAO,GAAE,mBAAwB,GAAG,OAAO,CAAC,YAAY,CAAC,CA6IzI;AAmCD,0EAA0E;AAC1E,wBAAsB,uBAAuB,CAAC,MAAM,EAAE,UAAU,EAAE,IAAI,EAAE,WAAW,EAAE,OAAO,GAAE,mBAAmB,GAAG;IAAE,QAAQ,CAAC,KAAK,CAAC,EAAE,UAAU,CAAA;CAAO,GAAG,OAAO,CAAC,YAAY,CAAC,CAoB/K;AAED,eAAO,MAAM,YAAY,EAAE,YAgD1B,CAAA"}

package/lib/types/backends/codex/backend.js

@@ -1,14 +1,25 @@
-import { t } from '../../i18n.js';
-import { installedTuiVersion } from '../../update.js';
+/**
+ * The Codex backend (docs/codex-backend-design.md §5.5): detection, opening
+ * a thread (create or resume) on the process-wide app-server hub, and the
+ * launcher's per-backend session markers.
+ *
+ * The child runs the user's own `codex` with the user's own `CODEX_HOME`
+ * (D6): their config, instructions, MCP servers, provider and login apply
+ * as in the official client, and threads are shared with it. dsh-tui's
+ * choices (start mode, model, effort) travel per thread as request
+ * parameters; nothing is written into Codex's configuration.
+ */
+import { isAbsolute, normalize } from 'node:path';
+import { codexLocale, codexText, installCodexLocale } from './text.js';
 import { CODEX_BACKEND_ID, CODEX_BACKEND_LABEL, codexResumeCommand, codexVersionSupported, MIN_CODEX_VERSION } from './contract.js';
 import { acquireCodexAuth, CODEX_OAUTH_PROVIDER } from './auth/external-tokens.js';
 import { codexAuthRoute } from './auth/route.js';
-import { createCodexChannelsRuntime, fileCodexChannels } from './channels.js';
+import { createCodexChannelsRuntime, fileCodexChannels, memoryCodexChannels } from './channels.js';
 import { createCodexCatalog } from './catalog.js';
-import { detectCodex } from './detect.js';
+import { codexHomeDir, detectCodex } from './detect.js';
 import { errorText, rec, str } from './narrow.js';
 import { CLIENT } from './protocol/index.js';
-import { fileCodexPrefs } from './prefs.js';
+import { fileCodexPrefs, memoryCodexPrefs } from './prefs.js';
 import { buildCodexEnv, resolveCodexExecutable } from './rpc/binary.js';
 import { acquireCodexHub } from './rpc/hub.js';
 import { rpcCode, RPC_ERROR } from './rpc/client.js';
@@ -21,10 +32,10 @@ export async function prepareCodexRuntime(target, host, options = {}) {
     const env = options.env ?? process.env;
     const executable = options.executable ?? await resolveCodexExecutable(env);
     if (executable === undefined)
-        throw new Error(t('codex-not-installed'));
+        throw new Error(codexText('codex-not-installed'));
     if (!codexVersionSupported(executable.version))
-        throw new Error(t('codex-too-old', { version: executable.version ?? '', min: MIN_CODEX_VERSION }));
-    const channels = createCodexChannelsRuntime({ store: options.channels ?? fileCodexChannels(undefined, host.debug), tokens: host.tokenStore, env });
+        throw new Error(codexText('codex-too-old', { version: executable.version ?? '', min: MIN_CODEX_VERSION }));
+    const channels = createCodexChannelsRuntime({ store: options.channels ?? (host.dataDir === undefined ? memoryCodexChannels() : fileCodexChannels(host.dataDir, host.debug)), tokens: host.tokenStore, env });
     const launch = channels.launch();
     const credential = launch.provider === undefined ? host.oauthCredential?.(CODEX_OAUTH_PROVIDER) : undefined;
     let cwd = target.cwd ?? host.cwd;
@@ -37,7 +48,7 @@ export async function prepareCodexRuntime(target, host, options = {}) {
         debug: host.debug,
         stderr: line => { if (!STDERR_NOISE.some(pattern => pattern.test(line)))
             host.stderr?.(line); },
-        clientVersion: installedTuiVersion() ?? 'dev',
+        clientVersion: host.appVersion ?? 'dev',
         ...options.hubDeps,
     };
     let hub = acquireCodexHub(settings, deps);
@@ -69,6 +80,34 @@ export async function prepareCodexRuntime(target, host, options = {}) {
                 host.debug('codex: config/read failed; managed injection disabled');
             }
         }
+        // A provider in the user's own config can take its credential from an
+        // environment key (`env_key`, e.g. DEEPSEEK_API_KEY). When the launching
+        // environment does not export it but the DSH credential store declares
+        // it, inject it into the child: a stored key then works without an
+        // exported variable. The key joins `injectedEnvKeys`, so the hub
+        // fingerprint separates keyless and keyed children and a keyless hub is
+        // never reused for a session whose provider needs the key. A key nothing
+        // can supply is not a startup failure — Codex itself rejects each turn —
+        // so it is remembered and reported once at start instead.
+        let missingProviderEnvKey;
+        if (launch.provider === undefined) {
+            const providerId = str(config?.model_provider) || 'openai';
+            const providerEnvKey = str(rec(rec(config?.model_providers)?.[providerId])?.env_key);
+            if (providerEnvKey !== undefined && providerEnvKey !== '' && (settings.env[providerEnvKey] ?? '') === '') {
+                const stored = host.tokenStore?.read(providerEnvKey);
+                if (stored !== undefined) {
+                    release();
+                    settings = { ...settings, env: { ...settings.env, [providerEnvKey]: stored }, injectedEnvKeys: [...(settings.injectedEnvKeys ?? []), providerEnvKey] };
+                    hub = acquireCodexHub(settings, deps);
+                    release = hub.retain();
+                    await hub.ready;
+                    host.debug(`codex: provider env ${providerEnvKey} resolved from the DSH credential store`);
+                }
+                else {
+                    missingProviderEnvKey = { provider: providerId, env: providerEnvKey };
+                }
+            }
+        }
         const route = codexAuthRoute(config, env, launch.provider !== undefined);
         const externalAllowed = settings.credentialMode === 'external' && route.firstParty;
         if (settings.credentialMode === 'external' && !externalAllowed) {
@@ -89,9 +128,13 @@ export async function prepareCodexRuntime(target, host, options = {}) {
             debug: host.debug,
         });
         await auth.start();
-        let startNotices;
+        // Codex rejects every turn of a provider whose env key is unset: name the
+        // reason once at start instead of leaving a bare turn failure behind.
+        let startNotices = missingProviderEnvKey === undefined || route.firstParty
+            ? undefined
+            : [codexText('codex-provider-env-key-missing', { provider: missingProviderEnvKey.provider, env: missingProviderEnvKey.env })];
         if (auth.managedFailed) {
-            startNotices = [t('codex-auth-login-failed')];
+            startNotices = [...(startNotices ?? []), codexText('codex-auth-login-failed')];
             // Only an already-observed startup failure takes this path. No logout:
             // a different process starts clean on the user's native credentials.
             release();
@@ -140,28 +183,59 @@ export async function prepareCodexRuntime(target, host, options = {}) {
                 }
             }
         };
-        return { hub, release, cwd, executable, config, auth, channels, ...(startNotices === undefined ? {} : { startNotices }), ...(rejoinNativeDaemon === undefined ? {} : { rejoinNativeDaemon }) };
+        return { hub, release, cwd, executable, config, auth, channels, catalogSource: catalogSource(settings.env, hub.info?.codexHome), ...(startNotices === undefined ? {} : { startNotices }), ...(rejoinNativeDaemon === undefined ? {} : { rejoinNativeDaemon }) };
     }
     catch (error) {
         release();
         host.debug(`codex: app-server start failed (${errorText(error)})`);
-        throw new Error(t('codex-start-failed', { err: errorText(error) }), { cause: error });
+        throw new Error(codexText('codex-start-failed', { err: errorText(error) }), { cause: error });
     }
 }
 let catalogHost;
-const catalogPrefs = fileCodexPrefs();
+let catalogRuntime;
+function catalogSource(env = process.env, actualHome) {
+    const home = actualHome ?? codexHomeDir(env);
+    const sqlite = env.CODEX_SQLITE_HOME;
+    if (!isAbsolute(home) || (sqlite !== undefined && sqlite !== '' && !isAbsolute(sqlite)))
+        return undefined;
+    return JSON.stringify(['codex', normalize(home), sqlite ? normalize(sqlite) : null]);
+}
+function rememberCatalogRuntime(runtime, host) {
+    const source = runtime.catalogSource;
+    if (source !== undefined)
+        catalogRuntime = { source, host, hub: runtime.hub };
+}
+/** The prefs store of the captured host, or undefined when no host has been
+ *  seen yet (see {@link catalogHost}). Built lazily: a module-level call would
+ *  resolve a directory before any host exists to name one (D2). */
+const catalogPrefs = () => {
+    const dir = catalogHost?.dataDir;
+    const host = catalogHost;
+    return dir === undefined || host === undefined ? undefined : fileCodexPrefs(dir, message => host.debug(message));
+};
+/** Remember the host of the most recent detect / open: the catalog's only way
+ *  to reach this backend's own directory without a host parameter, and where
+ *  this backend's copy takes its language from (read live, so a `/lang`
+ *  switch applies to the next string). */
+const rememberHost = (host) => {
+    catalogHost = host;
+    installCodexLocale(host.locale);
+};
 /** Open a native thread, rejoining its idle daemon writer on conflict. */
 export async function openCodexBackendSession(target, host, options = {}) {
-    catalogHost = host;
+    rememberHost(host);
     const runtime = await prepareCodexRuntime(target, host, options);
     const open = (active) => openCodexSession({
         ...active, target,
-        prefs: options.prefs ?? fileCodexPrefs(undefined, host.debug),
-        host: { debug: host.debug },
+        prefs: options.prefs ?? (host.dataDir === undefined ? memoryCodexPrefs() : fileCodexPrefs(host.dataDir, host.debug)),
+        host: { debug: host.debug, locale: host.locale },
         doctor: { get bubblewrapMissing() { return active.hub.bubblewrapMissing; } },
     });
     try {
-        return await open(runtime);
+        const session = await open(runtime);
+        if (options.env === undefined && options.executable === undefined)
+            rememberCatalogRuntime(runtime, host);
+        return session;
     }
     catch (error) {
         const cause = error instanceof Error ? error.cause : undefined;
@@ -176,18 +250,37 @@ export async function openCodexBackendSession(target, host, options = {}) {
 export const codexBackend = {
     id: CODEX_BACKEND_ID,
     descriptor: { label: CODEX_BACKEND_LABEL },
-    detect: (host) => { catalogHost = host; return detectCodex(host); },
+    detect: (host) => { rememberHost(host); return detectCodex(host); },
     catalog: createCodexCatalog({
-        acquire: cwd => {
-            const host = catalogHost ?? { cwd: process.cwd(), debug: () => undefined, warn: () => undefined };
-            return prepareCodexRuntime({ kind: 'create', cwd: cwd ?? host.cwd }, host);
+        acquire: async (cwd) => {
+            // Before detect/open supplies a host, keep stores in memory and use
+            // this backend's locale without guessing a host data directory.
+            const host = catalogHost ?? { cwd: process.cwd(), debug: () => undefined, warn: () => undefined, locale: codexLocale };
+            catalogHost = host;
+            const source = catalogSource();
+            const known = catalogRuntime;
+            // Metadata listing needs the native store, not another executable probe,
+            // config read or auth startup. Borrow the already-running session hub.
+            if (known !== undefined && known.source === source && known.host === host && known.hub.state !== 'closed' && known.hub.state !== 'failed') {
+                return { hub: known.hub, release: known.hub.retain() };
+            }
+            const runtime = await prepareCodexRuntime({ kind: 'create', cwd: cwd ?? host.cwd }, host);
+            rememberCatalogRuntime(runtime, host);
+            return runtime;
         },
         cwd: () => catalogHost?.cwd ?? process.cwd(),
-        lastUsed: () => catalogPrefs.read().lastUsed ?? {},
+        lastUsed: () => catalogPrefs()?.read().lastUsed ?? {},
+        snapshotKey: catalogSource,
     }),
     launch: {
-        sessionPrefs: debug => {
-            const prefs = fileCodexPrefs(undefined, debug);
+        // `host` replaces the old `debug` parameter (B-3 widened
+        // `AgentBackend.launch.sessionPrefs`). The launcher asks before a session
+        // exists, so this store is built from the host it is handed; a host that
+        // hands over no directory keeps nothing — there is simply no remembered
+        // session to resume (D-3's feature-detect, never a path this backend
+        // guessed — D2).
+        sessionPrefs: host => {
+            const prefs = host.dataDir === undefined ? memoryCodexPrefs() : fileCodexPrefs(host.dataDir, host.debug);
             return {
                 lastSession: () => prefs.read().lastSession,
                 setLastSession: threadId => { prefs.write({ lastSession: threadId }); },

package/lib/types/backends/codex/catalog.d.ts

@@ -1,5 +1,5 @@
 import type { SessionCatalog } from '../../agent/backend.js';
-import type { PreviewEntry, SessionSummary } from '../../adapter/ports/channel-session.js';
+import type { PreviewEntry, SessionSummary } from '../../agent/index.js';
 import type { CodexHub } from './rpc/hub.js';
 export interface CodexCatalogDeps {
     acquire(cwd?: string): Promise<{
@@ -8,6 +8,7 @@ export interface CodexCatalogDeps {
     }>;
     cwd(): string;
     lastUsed?(): Readonly<Record<string, number>>;
+    snapshotKey?(): string | undefined;
 }
 /** Metadata only. Absence of preview text is not proof of an empty thread. */
 export declare function codexSessionSummary(value: unknown, lastUsed?: Readonly<Record<string, number>>): SessionSummary | undefined;

package/lib/types/backends/codex/catalog.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"catalog.d.ts","sourceRoot":"","sources":["../../../../src/backends/codex/catalog.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,cAAc,EAAoB,MAAM,wBAAwB,CAAA;AAC9E,OAAO,KAAK,EAAE,YAAY,EAAE,cAAc,EAAE,MAAM,wCAAwC,CAAA;AAM1F,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,cAAc,CAAA;AAE5C,MAAM,WAAW,gBAAgB;IAC/B,OAAO,CAAC,GAAG,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC;QAAE,QAAQ,CAAC,GAAG,EAAE,IAAI,CAAC,QAAQ,EAAE,MAAM,CAAC,CAAC;QAAC,QAAQ,CAAC,OAAO,EAAE,MAAM,IAAI,CAAA;KAAE,CAAC,CAAA;IACtG,GAAG,IAAI,MAAM,CAAA;IACb,QAAQ,CAAC,IAAI,QAAQ,CAAC,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC,CAAA;CAC9C;AAKD,8EAA8E;AAC9E,wBAAgB,mBAAmB,CAAC,KAAK,EAAE,OAAO,EAAE,QAAQ,GAAE,QAAQ,CAAC,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAM,GAAG,cAAc,GAAG,SAAS,CAqB/H;AAED,6EAA6E;AAC7E,wBAAgB,mBAAmB,CAAC,KAAK,EAAE,SAAS,OAAO,EAAE,EAAE,KAAK,SAAgB,GAAG,YAAY,EAAE,CAkBpG;AAED,wBAAgB,kBAAkB,CAAC,IAAI,EAAE,gBAAgB,GAAG,cAAc,CAwDzE"}
+{"version":3,"file":"catalog.d.ts","sourceRoot":"","sources":["../../../../src/backends/codex/catalog.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,cAAc,EAAoB,MAAM,wBAAwB,CAAA;AAC9E,OAAO,KAAK,EAAE,YAAY,EAAE,cAAc,EAAE,MAAM,sBAAsB,CAAA;AAMxE,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,cAAc,CAAA;AAE5C,MAAM,WAAW,gBAAgB;IAC/B,OAAO,CAAC,GAAG,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC;QAAE,QAAQ,CAAC,GAAG,EAAE,IAAI,CAAC,QAAQ,EAAE,MAAM,CAAC,CAAC;QAAC,QAAQ,CAAC,OAAO,EAAE,MAAM,IAAI,CAAA;KAAE,CAAC,CAAA;IACtG,GAAG,IAAI,MAAM,CAAA;IACb,QAAQ,CAAC,IAAI,QAAQ,CAAC,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC,CAAA;IAC7C,WAAW,CAAC,IAAI,MAAM,GAAG,SAAS,CAAA;CACnC;AAMD,8EAA8E;AAC9E,wBAAgB,mBAAmB,CAAC,KAAK,EAAE,OAAO,EAAE,QAAQ,GAAE,QAAQ,CAAC,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAM,GAAG,cAAc,GAAG,SAAS,CAqB/H;AAED,6EAA6E;AAC7E,wBAAgB,mBAAmB,CAAC,KAAK,EAAE,SAAS,OAAO,EAAE,EAAE,KAAK,SAAgB,GAAG,YAAY,EAAE,CAkBpG;AAED,wBAAgB,kBAAkB,CAAC,IAAI,EAAE,gBAAgB,GAAG,cAAc,CAgGzE"}

package/lib/types/backends/codex/catalog.js

@@ -1,13 +1,14 @@
 /** The native app-server catalog: no rollout/sqlite parsing or second index.
  * Each bounded operation borrows the same hub and releases it in finally. */
 import { basename } from 'node:path';
-import { t } from '../../i18n.js';
+import { codexText } from './text.js';
 import { CODEX_BACKEND_ID } from './contract.js';
 import { arr, num, rec, str, text } from './narrow.js';
 import { CLIENT } from './protocol/index.js';
 import { rpcCode, RPC_ERROR } from './rpc/client.js';
 const LIST_LIMIT = 500;
 const LIST_PAGE = 200;
+const FIRST_PAGE = 32;
 const PREVIEW_LIMIT = 6;
 /** Metadata only. Absence of preview text is not proof of an empty thread. */
 export function codexSessionSummary(value, lastUsed = {}) {
@@ -44,7 +45,7 @@ export function codexPreviewEntries(turns, limit = PREVIEW_LIMIT) {
             if (item?.type === 'userMessage') {
                 const content = arr(item.content).map(rec);
                 const first = content.find(block => block?.type === 'text');
-                const body = text(first?.text) ?? (content.some(block => block?.type === 'image' || block?.type === 'localImage') ? t('codex-preview-image') : undefined);
+                const body = text(first?.text) ?? (content.some(block => block?.type === 'image' || block?.type === 'localImage') ? codexText('codex-preview-image') : undefined);
                 if (body !== undefined)
                     entries.push({ role: 'user', text: body, at: at === undefined ? undefined : at * 1000 });
             }
@@ -67,29 +68,73 @@ export function createCodexCatalog(deps) {
     };
     return {
         deleteAction: 'archive',
-        list(scope = {}) {
+        ...(deps.snapshotKey === undefined ? {} : { snapshotKey: deps.snapshotKey }),
+        list(scope = {}, onPartial) {
             const cwd = scope.allProjects === true ? undefined : scope.cwd ?? deps.cwd();
             return borrow(cwd, async (hub) => {
                 const rows = new Map();
+                const initial = new Map();
                 let cursor;
                 let scanned = 0;
                 const seen = new Set();
-                // The row budget also bounds the number of empty/malformed pages.
-                for (let page = 0; page < Math.ceil(LIST_LIMIT / LIST_PAGE) && scanned < LIST_LIMIT; page += 1) {
-                    const answer = rec(await hub.call(CLIENT.threadList, { limit: Math.min(LIST_PAGE, LIST_LIMIT - scanned), sortKey: 'recency_at', sortDirection: 'desc', archived: false, modelProviders: [], ...(cwd === undefined ? {} : { cwd }), ...(cursor === undefined ? {} : { cursor }) }));
-                    const data = arr(answer?.data);
-                    scanned += data.length;
-                    for (const raw of data.slice(0, LIST_LIMIT - rows.size)) {
-                        const row = codexSessionSummary(raw, deps.lastUsed?.());
-                        if (row !== undefined && row.kind.kind !== 'subagent')
-                            rows.set(row.id, row);
+                // Read file-backed preferences once, rather than synchronously reading
+                // and parsing them for every thread in every page.
+                const used = deps.lastUsed?.();
+                const params = { sortKey: 'recency_at', sortDirection: 'desc', archived: false, modelProviders: [], ...(cwd === undefined ? {} : { cwd }) };
+                const publish = () => {
+                    onPartial?.([...new Map([...initial, ...rows]).values()].sort((a, b) => b.updatedAt - a.updatedAt));
+                };
+                const initialAbort = new AbortController();
+                let finished = false;
+                let firstPage;
+                if (onPartial !== undefined) {
+                    // The DB shortcut must not delay discovery of new rollout files.
+                    // Repaired rows win even if the DB response arrives later.
+                    firstPage = hub.call(CLIENT.threadList, { ...params, limit: FIRST_PAGE, useStateDbOnly: true }, { timeoutMs: 1000, signal: initialAbort.signal }).then(answer => {
+                        if (finished)
+                            return;
+                        for (const raw of arr(rec(answer)?.data)) {
+                            const row = codexSessionSummary(raw, used);
+                            if (row !== undefined && row.kind.kind !== 'subagent')
+                                initial.set(row.id, row);
+                        }
+                        if (initial.size > 0)
+                            publish();
+                    }, () => { });
+                    // Attach a rejection handler now; publication errors are rethrown
+                    // by the final await after the other pending RPC has settled.
+                    void firstPage.catch(() => { });
+                }
+                try {
+                    // Servers may cap pages below our requested size. Bound empty pages
+                    // separately, rather than stopping after three capped pages.
+                    for (let page = 0; page < Math.ceil(LIST_LIMIT / FIRST_PAGE) && scanned < LIST_LIMIT; page += 1) {
+                        const limit = page === 0 && onPartial !== undefined ? FIRST_PAGE : LIST_PAGE;
+                        const answer = rec(await hub.call(CLIENT.threadList, { ...params, limit: Math.min(limit, LIST_LIMIT - scanned), ...(cursor === undefined ? {} : { cursor }) }));
+                        const data = arr(answer?.data);
+                        scanned += data.length;
+                        for (const raw of data.slice(0, LIST_LIMIT - rows.size)) {
+                            const row = codexSessionSummary(raw, used);
+                            if (row !== undefined && row.kind.kind !== 'subagent')
+                                rows.set(row.id, row);
+                        }
+                        // Progress is cumulative; repaired rows supersede the DB metadata,
+                        // and only the resolved result may drop unconfirmed initial IDs.
+                        publish();
+                        cursor = text(answer?.nextCursor);
+                        if (cursor === undefined || seen.has(cursor))
+                            break;
+                        seen.add(cursor);
                     }
-                    cursor = text(answer?.nextCursor);
-                    if (cursor === undefined || seen.has(cursor))
-                        break;
-                    seen.add(cursor);
+                    return [...rows.values()].sort((a, b) => b.updatedAt - a.updatedAt).slice(0, LIST_LIMIT);
+                }
+                finally {
+                    finished = true;
+                    initialAbort.abort();
+                    // Keep the runtime borrowed until the speculative DB request has
+                    // settled; it can never publish after completion or failure.
+                    await firstPage;
                 }
-                return [...rows.values()].sort((a, b) => b.updatedAt - a.updatedAt).slice(0, LIST_LIMIT);
             });
         },
         info(sessionId, cwd) {
@@ -120,7 +165,7 @@ export function createCodexCatalog(deps) {
             }
             catch (error) {
                 if (rpcCode(error) === RPC_ERROR.invalidRequest && /active.*worker/iu.test(error instanceof Error ? error.message : ''))
-                    throw new Error(t('codex-archive-busy'));
+                    throw new Error(codexText('codex-archive-busy'));
                 throw error;
             }
         }),

package/lib/types/backends/codex/channels.d.ts

@@ -1,5 +1,5 @@
 import type { SessionCapabilities } from '../../agent/capabilities.js';
-import { channelProfileSlug } from '../../channel/channel-slug.js';
+import { channelProfileSlug } from '../shared/channel-slug.js';
 import { type ChannelTokenStore } from '../shared/channel-tokens.js';
 import { type Rec } from './narrow.js';
 export interface CodexChannelProfile {
@@ -43,8 +43,11 @@ export declare function validateCodexBaseUrl(value: string): string;
 export declare function parseCodexChannels(value: unknown): CodexChannelsData;
 export declare const activeProfileOf: (data: CodexChannelsData) => CodexChannelProfile | undefined;
 export declare const hasChannelConnection: (profile: CodexChannelProfile | undefined) => boolean;
-/** Same atomic/upsert/damaged-file semantics as the mature Claude store. */
-export declare function fileCodexChannels(dir?: string, debug?: (message: string) => void): CodexChannels;
+/** The file-backed profiles under `<dir>` (the host's `dataDir` for this
+ *  backend). The directory is required: a backend never picks a location of
+ *  its own under the host's data directory (D2, B-3/B-5). Same
+ *  atomic/upsert/damaged-file semantics as the mature Claude store. */
+export declare function fileCodexChannels(dir: string, debug?: (message: string) => void): CodexChannels;
 export declare function memoryCodexChannels(initial?: CodexChannelsData): CodexChannels;
 /** The token only goes into the child environment, never an argv override. */
 export declare function codexChannelLaunch(profile: CodexChannelProfile | undefined, tokens?: ChannelTokenStore): CodexChannelLaunch;