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

package/lib/types/backends/codex/session/async-questions.js

@@ -0,0 +1,89 @@
+/** Nonblocking Codex assistant questions → the shared questionnaire, ordinary input back.
+ * Historical replay never opens panels. Live turn completion withdraws unanswered asks,
+ * matching Codex's TUI; dismissal alone does not interrupt the running turn. */
+import { randomUUID } from 'node:crypto';
+import { arr, errorText, rec, str } from '../narrow.js';
+import { NOTIFY } from '../protocol/index.js';
+import { codexText } from '../text.js';
+import { parseQuestionReply, questionReplyText } from '../translate/question-reply.js';
+export function createAsyncQuestions(deps) {
+    const pending = new Map();
+    let revision = 0;
+    const offer = (entry) => {
+        const requestId = `codex-async:${entry.questionId}:${++revision}`;
+        pending.set(requestId, entry);
+        deps.emit([{ type: 'question.request', request: { requestId, callId: entry.itemId, questions: [entry.view] } }]);
+    };
+    const settle = (requestId) => {
+        if (!pending.delete(requestId))
+            return;
+        deps.emit([{ type: 'question.settled', requestId }]);
+    };
+    const withdraw = () => {
+        for (const id of [...pending.keys()])
+            settle(id);
+    };
+    return {
+        notification(method, params) {
+            const item = rec(params.item);
+            if (method === NOTIFY.itemStarted && item?.type === 'userMessage') {
+                const text = arr(item.content).map(rec).find(input => input?.type === 'text')?.text;
+                const replies = typeof text === 'string' ? parseQuestionReply(text) : undefined;
+                if (replies !== undefined) {
+                    for (const [id, entry] of [...pending]) {
+                        if (replies.some(reply => reply.questionItemId === entry.questionId || reply.questionItemId === entry.itemId))
+                            settle(id);
+                    }
+                }
+                else {
+                    withdraw();
+                }
+            }
+            if (method !== NOTIFY.itemCompleted || item?.type !== 'agentMessage' || item.delivery !== 'async')
+                return;
+            const itemId = str(item.id);
+            if (itemId === undefined)
+                return;
+            arr(item.questions).forEach((raw, index) => {
+                const question = rec(raw);
+                const title = str(question?.title);
+                if (title === undefined || title.trim() === '')
+                    return;
+                const options = arr(question?.options).filter((label) => typeof label === 'string' && label.trim() !== '').map(label => ({ label }));
+                offer({
+                    itemId,
+                    questionId: JSON.stringify(['request_user_input_async', itemId, index]),
+                    view: { question: title, options, ...(options[0] === undefined ? {} : { defaultSelected: [options[0].label] }) },
+                    sending: false,
+                });
+            });
+        },
+        owns(requestId) { return pending.has(requestId); },
+        respond(requestId, answers) {
+            const entry = pending.get(requestId);
+            if (entry === undefined || entry.sending)
+                return;
+            const answer = answers.answers[0];
+            const text = [...(answer?.selected ?? []), ...(answer?.custom?.trim() ? [answer.custom.trim()] : [])].join('\n');
+            if (text === '') {
+                settle(requestId);
+                return;
+            }
+            entry.sending = true;
+            void deps.input.submit({ text: questionReplyText(entry.questionId, entry.view.question, text), clientMessageId: randomUUID() }, 'steer').then(result => {
+                if (!result.accepted)
+                    throw new Error(result.reason ?? codexText('codex-turn-start-failed', { err: '' }));
+                settle(requestId);
+            }).catch((error) => {
+                if (pending.get(requestId) !== entry)
+                    return;
+                settle(requestId);
+                deps.emit([{ type: 'notice', level: 'error', text: errorText(error) }]);
+                entry.sending = false;
+                offer(entry);
+            });
+        },
+        cancel: settle,
+        withdraw,
+    };
+}

package/lib/types/backends/codex/session/commands.d.ts

@@ -1,4 +1,6 @@
-/** Codex-only slash commands. Local TUI names retain precedence. */
+/** Codex-only slash commands. The host's merge drops a name that collides with
+ *  a local command ("local names win"), so this module never has to know the
+ *  host's command table. */
 import type { AgentEvent, CommandInfo } from '../../../agent/events.js';
 import type { AgentInput, SubmitPlacement } from '../../../agent/session.js';
 import { type Rec } from '../narrow.js';
@@ -16,11 +18,15 @@ interface CommandDeps {
     lastDiff(): string | undefined;
     planSupported(): boolean;
     setPlan(): Promise<void>;
+    /** Leave Plan for the permission preset that was active before it (the
+     *  catalog's `off` token). */
+    exitPlan(): Promise<void>;
     submit(input: AgentInput, placement: SubmitPlacement, wireInput?: readonly UserInput[]): Promise<{
         readonly accepted: boolean;
         readonly reason?: string;
     }>;
-    noteTurnStarted(id: string): void;
+    beginReview(): () => void;
+    noteReviewStarted(id: string): void;
 }
 export declare function createCodexCommands(deps: CommandDeps): {
     capability: {

package/lib/types/backends/codex/session/commands.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"commands.d.ts","sourceRoot":"","sources":["../../../../../src/backends/codex/session/commands.ts"],"names":[],"mappings":"AAAA,oEAAoE;AACpE,OAAO,KAAK,EAAE,UAAU,EAAE,WAAW,EAAE,MAAM,0BAA0B,CAAA;AACvE,OAAO,KAAK,EAAE,UAAU,EAAE,eAAe,EAAE,MAAM,2BAA2B,CAAA;AAG5E,OAAO,EAAiC,KAAK,GAAG,EAAE,MAAM,cAAc,CAAA;AACtE,OAAO,EAAkB,KAAK,SAAS,EAAE,MAAM,sBAAsB,CAAA;AACrE,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,eAAe,CAAA;AAE7C,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,uBAAuB,CAAA;AAGxD,wBAAgB,YAAY,CAAC,IAAI,EAAE,MAAM,GAAG,GAAG,CAO9C;AAED,UAAU,WAAW;IACnB,QAAQ,CAAC,GAAG,EAAE,QAAQ,CAAA;IACtB,QAAQ,CAAC,GAAG,EAAE,WAAW,CAAA;IACzB,QAAQ,CAAC,GAAG,EAAE,MAAM,CAAA;IACpB,QAAQ,IAAI,MAAM,CAAA;IAClB,IAAI,IAAI,OAAO,CAAA;IACf,IAAI,CAAC,MAAM,EAAE,SAAS,UAAU,EAAE,GAAG,IAAI,CAAA;IACzC,QAAQ,IAAI,MAAM,GAAG,SAAS,CAAA;IAC9B,aAAa,IAAI,OAAO,CAAA;IACxB,OAAO,IAAI,OAAO,CAAC,IAAI,CAAC,CAAA;IACxB,MAAM,CAAC,KAAK,EAAE,UAAU,EAAE,SAAS,EAAE,eAAe,EAAE,SAAS,CAAC,EAAE,SAAS,SAAS,EAAE,GAAG,OAAO,CAAC;QAAE,QAAQ,CAAC,QAAQ,EAAE,OAAO,CAAC;QAAC,QAAQ,CAAC,MAAM,CAAC,EAAE,MAAM,CAAA;KAAE,CAAC,CAAA;IAC1J,eAAe,CAAC,EAAE,EAAE,MAAM,GAAG,IAAI,CAAA;CAClC;AAED,wBAAgB,mBAAmB,CAAC,IAAI,EAAE,WAAW;;oBA0B5B,OAAO,CAAC,SAAS,WAAW,EAAE,CAAC;;mBAQlC,IAAI;kBAUF,UAAU,aAAa,eAAe,GAAG,OAAO,CAAC;QAAE,QAAQ,CAAC,QAAQ,EAAE,OAAO,CAAC;QAAC,QAAQ,CAAC,MAAM,CAAC,EAAE,MAAM,CAAA;KAAE,GAAG,SAAS,CAAC;iBA8D7H,MAAM,GAAG,IAAI;EAE7B"}
+{"version":3,"file":"commands.d.ts","sourceRoot":"","sources":["../../../../../src/backends/codex/session/commands.ts"],"names":[],"mappings":"AAAA;;4BAE4B;AAC5B,OAAO,KAAK,EAAE,UAAU,EAAE,WAAW,EAAE,MAAM,0BAA0B,CAAA;AACvE,OAAO,KAAK,EAAE,UAAU,EAAE,eAAe,EAAE,MAAM,2BAA2B,CAAA;AAG5E,OAAO,EAAiC,KAAK,GAAG,EAAE,MAAM,cAAc,CAAA;AACtE,OAAO,EAAkB,KAAK,SAAS,EAAE,MAAM,sBAAsB,CAAA;AACrE,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,eAAe,CAAA;AAE7C,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,uBAAuB,CAAA;AAGxD,wBAAgB,YAAY,CAAC,IAAI,EAAE,MAAM,GAAG,GAAG,CAO9C;AAED,UAAU,WAAW;IACnB,QAAQ,CAAC,GAAG,EAAE,QAAQ,CAAA;IACtB,QAAQ,CAAC,GAAG,EAAE,WAAW,CAAA;IACzB,QAAQ,CAAC,GAAG,EAAE,MAAM,CAAA;IACpB,QAAQ,IAAI,MAAM,CAAA;IAClB,IAAI,IAAI,OAAO,CAAA;IACf,IAAI,CAAC,MAAM,EAAE,SAAS,UAAU,EAAE,GAAG,IAAI,CAAA;IACzC,QAAQ,IAAI,MAAM,GAAG,SAAS,CAAA;IAC9B,aAAa,IAAI,OAAO,CAAA;IACxB,OAAO,IAAI,OAAO,CAAC,IAAI,CAAC,CAAA;IACxB;kCAC8B;IAC9B,QAAQ,IAAI,OAAO,CAAC,IAAI,CAAC,CAAA;IACzB,MAAM,CAAC,KAAK,EAAE,UAAU,EAAE,SAAS,EAAE,eAAe,EAAE,SAAS,CAAC,EAAE,SAAS,SAAS,EAAE,GAAG,OAAO,CAAC;QAAE,QAAQ,CAAC,QAAQ,EAAE,OAAO,CAAC;QAAC,QAAQ,CAAC,MAAM,CAAC,EAAE,MAAM,CAAA;KAAE,CAAC,CAAA;IAC1J,WAAW,IAAI,MAAM,IAAI,CAAA;IACzB,iBAAiB,CAAC,EAAE,EAAE,MAAM,GAAG,IAAI,CAAA;CACpC;AAWD,wBAAgB,mBAAmB,CAAC,IAAI,EAAE,WAAW;;oBAuC5B,OAAO,CAAC,SAAS,WAAW,EAAE,CAAC;;mBAQlC,IAAI;kBAUF,UAAU,aAAa,eAAe,GAAG,OAAO,CAAC;QAAE,QAAQ,CAAC,QAAQ,EAAE,OAAO,CAAC;QAAC,QAAQ,CAAC,MAAM,CAAC,EAAE,MAAM,CAAA;KAAE,GAAG,SAAS,CAAC;iBAyF7H,MAAM,GAAG,IAAI;EAE7B"}

package/lib/types/backends/codex/session/commands.js

@@ -1,5 +1,5 @@
-import { BACKEND_CHANNEL_COMMAND, BACKEND_GOAL_COMMAND, BACKEND_PERMISSION_COMMAND, LOCAL_COMMANDS } from '../../../commands.js';
-import { t } from '../../../i18n.js';
+import { manifest } from '../manifest.js';
+import { codexText } from '../text.js';
 import { arr, errorText, num, rec, str } from '../narrow.js';
 import { CLIENT, NOTIFY } from '../protocol/index.js';
 import { rpcCode, RPC_ERROR } from '../rpc/client.js';
@@ -15,11 +15,27 @@ export function reviewTarget(args) {
         return { type: 'commit', sha: match[2].trim(), title: null };
     return { type: 'custom', instructions: value };
 }
+/** The name the host serves for one of this backend's declared capabilities
+ *  (`src/commands.ts`'s three capability-conditional rows, which are not part
+ *  of the public surface a backend may read). */
+const CAPABILITY_COMMANDS = [
+    ['goals', 'goal'],
+    ['channels', 'channel'],
+    ['permissions', 'permission'],
+];
 export function createCodexCommands(deps) {
     let skills;
     let revision = 0;
-    const local = new Set([...LOCAL_COMMANDS, BACKEND_PERMISSION_COMMAND, BACKEND_CHANNEL_COMMAND, BACKEND_GOAL_COMMAND].map(command => command.name.toLowerCase()));
-    const reserved = new Set([...local, 'review', 'diff', 'plan', 'usage']);
+    /** The names this backend answers itself, which a skill of the same name must
+     *  not shadow: its own four plus whatever its own manifest declares (B-5).
+     *  A skill that collides with a *local* command is no longer filtered here —
+     *  the host drops those when it merges the lists
+     *  (`dsh-adapter/channel/core/session-controls.ts`, "local names win"), which
+     *  is all claude relies on. */
+    const reserved = new Set([
+        'review', 'diff', 'plan', 'usage',
+        ...CAPABILITY_COMMANDS.filter(([capability]) => manifest.capabilities?.includes(capability) === true).map(([, command]) => command),
+    ]);
     const loadSkills = () => {
         if (skills !== undefined)
             return skills;
@@ -44,11 +60,16 @@ export function createCodexCommands(deps) {
         const seq = deps.ctx.nextSeq();
         deps.emit([{ type: 'user.message', id: `codex-local-${seq}`, anchor: `codex-local-${seq}`, seq, time: deps.ctx.now(), source: 'command-output', text, blocks: [{ type: 'text', text }] }]);
     };
+    /** Backend commands that do not enter the Codex input queue still need to
+     *  retire the channel's optimistic pending row. */
+    const claim = (input) => {
+        deps.emit([{ type: 'pending.changed', items: [], claimed: [input.clientMessageId] }]);
+    };
     const list = async () => [
-        { name: 'review', description: t('codex-command-review') },
-        { name: 'diff', description: t('codex-command-diff') },
-        ...(deps.planSupported() ? [{ name: 'plan', description: t('codex-command-plan') }] : []),
-        { name: 'usage', description: t('codex-command-usage') },
+        { name: 'review', description: codexText('codex-command-review') },
+        { name: 'diff', description: codexText('codex-command-diff') },
+        ...(deps.planSupported() ? [{ name: 'plan', description: codexText('codex-command-plan') }] : []),
+        { name: 'usage', description: codexText('codex-command-usage') },
         ...(await loadSkills()).map(skill => ({ name: str(skill.name), description: str(skill.shortDescription) ?? str(skill.description) })),
     ];
     const changed = () => {
@@ -57,7 +78,7 @@ export function createCodexCommands(deps) {
         void list().then(commands => { if (current === revision)
             deps.emit([{ type: 'commands.changed', commands }]); }, error => {
             if (current === revision)
-                deps.emit([{ type: 'notice', level: 'warning', key: 'codex-skills', text: t('capability-failed', { name: 'skills', err: errorText(error) }) }]);
+                deps.emit([{ type: 'notice', level: 'warning', key: 'codex-skills', text: codexText('capability-failed', { name: 'skills', err: errorText(error) }) }]);
         });
     };
     return {
@@ -72,16 +93,43 @@ export function createCodexCommands(deps) {
             switch (name) {
                 case 'review': {
                     if (deps.busy())
-                        return { accepted: false, reason: t('codex-command-idle') };
-                    const result = rec(await deps.hub.call(CLIENT.reviewStart, { threadId: deps.threadId(), target: reviewTarget(args), delivery: 'inline' }));
-                    const id = str(rec(result?.turn)?.id);
-                    if (id !== undefined)
-                        deps.noteTurnStarted(id);
+                        return { accepted: false, reason: codexText('codex-command-idle') };
+                    const failStart = deps.beginReview();
+                    try {
+                        const result = rec(await deps.hub.call(CLIENT.reviewStart, { threadId: deps.threadId(), target: reviewTarget(args), delivery: 'inline' }));
+                        const id = str(rec(result?.turn)?.id);
+                        if (id !== undefined)
+                            deps.noteReviewStarted(id);
+                    }
+                    catch (error) {
+                        failStart();
+                        throw error;
+                    }
+                    claim(input);
                     return { accepted: true };
                 }
-                case 'plan':
+                case 'plan': {
+                    // The TUI catalog names the two states `on`/`off` (the `/plan`
+                    // completion children — the on/off picker is registry-only and
+                    // dispatches the bare command and ` off` itself), while this grammar
+                    // is `/plan [prompt]`: every non-empty argument becomes the turn's
+                    // prompt. Map both catalog tokens back to their switches so neither
+                    // word leaks into the conversation as a prompt; every other argument
+                    // stays the prompt.
+                    const arg = args.trim();
+                    if (arg === 'off') {
+                        await deps.exitPlan();
+                        claim(input);
+                        return { accepted: true };
+                    }
                     await deps.setPlan();
-                    return args.trim() === '' ? { accepted: true } : deps.submit({ ...input, text: args, blocks: [{ type: 'text', text: args }, ...(input.blocks?.slice(1) ?? [])] }, placement);
+                    const prompt = arg === 'on' ? '' : args;
+                    if (prompt.trim() === '') {
+                        claim(input);
+                        return { accepted: true };
+                    }
+                    return deps.submit({ ...input, text: prompt, blocks: [{ type: 'text', text: prompt }, ...(input.blocks?.slice(1) ?? [])] }, placement);
+                }
                 case 'diff': {
                     let diff = deps.lastDiff();
                     if (diff === undefined || diff === '') {
@@ -94,7 +142,8 @@ export function createCodexCommands(deps) {
                                 throw error;
                         }
                     }
-                    output(diff === undefined || diff === '' ? t('codex-diff-empty') : diff);
+                    output(diff === undefined || diff === '' ? codexText('codex-diff-empty') : diff);
+                    claim(input);
                     return { accepted: true };
                 }
                 case 'usage': {
@@ -109,22 +158,21 @@ export function createCodexCommands(deps) {
                     const lines = buckets.flatMap(({ id, snapshot }) => {
                         const windows = rateLimitOf({ rateLimits: snapshot }).view?.windows ?? [];
                         const rows = windows.map(window => {
-                            const name = window.name === 'five_hour' ? t('status-rate-limit-five-hour') : window.name === 'seven_day' ? t('status-rate-limit-seven-day') : window.name;
-                            return t('codex-usage-window', { name, used: Math.round(window.utilization * 100), reset: window.resetsAt === undefined ? t('doctor-unknown') : new Date(window.resetsAt).toLocaleString() });
+                            const name = window.name === 'five_hour' ? codexText('status-rate-limit-five-hour') : window.name === 'seven_day' ? codexText('status-rate-limit-seven-day') : window.name;
+                            return codexText('codex-usage-window', { name, used: Math.round(window.utilization * 100), reset: window.resetsAt === undefined ? codexText('doctor-unknown') : new Date(window.resetsAt).toLocaleString() });
                         });
                         const credits = rec(snapshot.credits);
                         if (credits !== undefined)
-                            rows.push(t('codex-usage-credits', { balance: str(credits.balance) ?? num(credits.balance) ?? t('doctor-unknown'), unlimited: credits.unlimited === true ? t('codex-yes') : t('codex-no') }));
+                            rows.push(codexText('codex-usage-credits', { balance: str(credits.balance) ?? num(credits.balance) ?? codexText('doctor-unknown'), unlimited: credits.unlimited === true ? codexText('codex-yes') : codexText('codex-no') }));
                         return rows.length > 0 && id !== '' ? [str(snapshot.limitName) ?? id, ...rows] : rows;
                     });
-                    output(lines.length === 0 ? t('codex-usage-unavailable') : lines.join('\n'));
+                    output(lines.length === 0 ? codexText('codex-usage-unavailable') : lines.join('\n'));
                     if (view !== undefined)
                         deps.emit([{ type: 'rate-limit', info: view }]);
+                    claim(input);
                     return { accepted: true };
                 }
                 default: {
-                    if (local.has(name))
-                        return undefined;
                     const skill = (await loadSkills()).find(row => str(row.name)?.toLowerCase() === name);
                     const path = str(skill?.path);
                     if (skill === undefined || path === undefined)

package/lib/types/backends/codex/session/controls.d.ts

@@ -24,7 +24,7 @@ interface ControlsDeps {
 /** Policy objects used by turn/start and thread/settings/update. */
 export declare function sandboxPolicy(mode: string, cwd: string): Rec;
 export declare function createCodexControls(deps: ControlsDeps): {
-    capabilities: Pick<SessionCapabilities, "context" | "effort" | "compact" | "rename" | "init" | "mcp" | "models" | "modes" | "account">;
+    capabilities: Pick<SessionCapabilities, "context" | "effort" | "models" | "modes" | "compact" | "init" | "mcp" | "rename" | "account">;
     initialize(): Promise<void>;
     /** Knobs not yet applied by a turn (or an idle settings update). */
     turnOverrides(): Rec;

package/lib/types/backends/codex/session/controls.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"controls.d.ts","sourceRoot":"","sources":["../../../../../src/backends/codex/session/controls.ts"],"names":[],"mappings":"AAAA,sFAAsF;AACtF,OAAO,KAAK,EAAE,WAAW,EAA+B,WAAW,EAAc,mBAAmB,EAAE,MAAM,gCAAgC,CAAA;AAC5I,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,0BAA0B,CAAA;AAG1D,OAAO,EAAiC,KAAK,GAAG,EAAE,MAAM,cAAc,CAAA;AACtE,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,aAAa,CAAA;AAG7C,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,eAAe,CAAA;AAC7C,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,uBAAuB,CAAA;AACxD,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,sBAAsB,CAAA;AAG5D,UAAU,YAAY;IACpB,QAAQ,CAAC,GAAG,EAAE,QAAQ,CAAA;IACtB,QAAQ,CAAC,KAAK,EAAE,UAAU,CAAA;IAC1B,QAAQ,CAAC,GAAG,EAAE,WAAW,CAAA;IACzB,QAAQ,CAAC,QAAQ,EAAE,gBAAgB,CAAA;IACnC,QAAQ,CAAC,GAAG,EAAE,MAAM,CAAA;IACpB,QAAQ,IAAI,MAAM,CAAA;IAClB,IAAI,IAAI,OAAO,CAAA;IACf,IAAI,CAAC,MAAM,EAAE,SAAS,UAAU,EAAE,GAAG,IAAI,CAAA;IACzC,UAAU,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAAA;IACvC,OAAO,CAAC,IAAI,OAAO,CAAC,WAAW,CAAC,CAAA;IAChC,YAAY,CAAC,IAAI,SAAS,WAAW,EAAE,CAAA;IACvC,WAAW,CAAC,CAAC,EAAE,EAAE,MAAM,GAAG,MAAM,CAAA;IAChC,KAAK,CAAC,OAAO,EAAE,MAAM,GAAG,IAAI,CAAA;CAC7B;AAID,oEAAoE;AACpE,wBAAgB,aAAa,CAAC,IAAI,EAAE,MAAM,EAAE,GAAG,EAAE,MAAM,GAAG,GAAG,CAM5D;AAWD,wBAAgB,mBAAmB,CAAC,IAAI,EAAE,YAAY;;kBAoM9B,OAAO,CAAC,IAAI,CAAC;IASjC,oEAAoE;qBACnD,GAAG;IACpB,6EAA6E;sBAC3D,OAAO,aAAa,GAAG,GAAG,IAAI;iBAYnC,MAAM,UAAU,GAAG,GAAG,OAAO;;EAoB7C"}
+{"version":3,"file":"controls.d.ts","sourceRoot":"","sources":["../../../../../src/backends/codex/session/controls.ts"],"names":[],"mappings":"AAAA,sFAAsF;AACtF,OAAO,KAAK,EAAE,WAAW,EAA+B,WAAW,EAAc,mBAAmB,EAAE,MAAM,gCAAgC,CAAA;AAC5I,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,0BAA0B,CAAA;AAG1D,OAAO,EAAiC,KAAK,GAAG,EAAE,MAAM,cAAc,CAAA;AACtE,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,aAAa,CAAA;AAG7C,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,eAAe,CAAA;AAC7C,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,uBAAuB,CAAA;AACxD,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,sBAAsB,CAAA;AAG5D,UAAU,YAAY;IACpB,QAAQ,CAAC,GAAG,EAAE,QAAQ,CAAA;IACtB,QAAQ,CAAC,KAAK,EAAE,UAAU,CAAA;IAC1B,QAAQ,CAAC,GAAG,EAAE,WAAW,CAAA;IACzB,QAAQ,CAAC,QAAQ,EAAE,gBAAgB,CAAA;IACnC,QAAQ,CAAC,GAAG,EAAE,MAAM,CAAA;IACpB,QAAQ,IAAI,MAAM,CAAA;IAClB,IAAI,IAAI,OAAO,CAAA;IACf,IAAI,CAAC,MAAM,EAAE,SAAS,UAAU,EAAE,GAAG,IAAI,CAAA;IACzC,UAAU,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAAA;IACvC,OAAO,CAAC,IAAI,OAAO,CAAC,WAAW,CAAC,CAAA;IAChC,YAAY,CAAC,IAAI,SAAS,WAAW,EAAE,CAAA;IACvC,WAAW,CAAC,CAAC,EAAE,EAAE,MAAM,GAAG,MAAM,CAAA;IAChC,KAAK,CAAC,OAAO,EAAE,MAAM,GAAG,IAAI,CAAA;CAC7B;AAID,oEAAoE;AACpE,wBAAgB,aAAa,CAAC,IAAI,EAAE,MAAM,EAAE,GAAG,EAAE,MAAM,GAAG,GAAG,CAM5D;AAWD,wBAAgB,mBAAmB,CAAC,IAAI,EAAE,YAAY;;kBAyM9B,OAAO,CAAC,IAAI,CAAC;IASjC,oEAAoE;qBACnD,GAAG;IACpB,6EAA6E;sBAC3D,OAAO,aAAa,GAAG,GAAG,IAAI;iBAYnC,MAAM,UAAU,GAAG,GAAG,OAAO;;EAoB7C"}

package/lib/types/backends/codex/session/controls.js

@@ -1,4 +1,4 @@
-import { t } from '../../../i18n.js';
+import { codexText } from '../text.js';
 import { CODEX_MODE_PARAMS, isCodexModeId } from '../modes.js';
 import { arr, errorText, num, rec, str } from '../narrow.js';
 import { CLIENT, NOTIFY } from '../protocol/index.js';
@@ -15,12 +15,12 @@ export function sandboxPolicy(mode, cwd) {
 }
 function permissionOptions() {
     return [
-        { id: 'read-only', label: t('codex-mode-read-only'), description: t('codex-mode-read-only-desc') },
-        { id: 'auto', label: t('codex-mode-auto'), description: t('codex-mode-auto-desc') },
-        { id: 'full-access', label: t('codex-mode-full-access'), description: t('codex-mode-full-access-desc') },
+        { id: 'read-only', label: codexText('codex-mode-read-only'), description: codexText('codex-mode-read-only-desc') },
+        { id: 'auto', label: codexText('codex-mode-auto'), description: codexText('codex-mode-auto-desc') },
+        { id: 'full-access', label: codexText('codex-mode-full-access'), description: codexText('codex-mode-full-access-desc') },
     ];
 }
-const planOption = () => ({ id: 'plan', label: t('codex-mode-plan'), description: t('codex-mode-plan-desc') });
+const planOption = () => ({ id: 'plan', label: codexText('codex-mode-plan'), description: codexText('codex-mode-plan-desc') });
 export function createCodexControls(deps) {
     const { hub, settings, ctx, prefs } = deps;
     let rows = [];
@@ -99,19 +99,19 @@ export function createCodexControls(deps) {
                 if (code === RPC_ERROR.invalidParams && change.collaborationMode !== undefined) {
                     planSupported = false;
                     delete pending.collaborationMode;
-                    throw new Error(t('codex-capability-unavailable', { feature: t('codex-mode-plan') }));
+                    throw new Error(codexText('codex-capability-unavailable', { feature: codexText('codex-mode-plan') }));
                 }
                 throw error;
             }
             settingsSupported = false;
-            deps.emit([{ type: 'notice', level: 'warning', key: 'codex-settings-deferred', text: t('codex-settings-deferred') }]);
+            deps.emit([{ type: 'notice', level: 'warning', key: 'codex-settings-deferred', text: codexText('codex-settings-deferred') }]);
         }
     };
-    const effortLevels = () => arr(currentRow()?.supportedReasoningEfforts).flatMap(raw => {
+    const effortLevels = (row) => arr(row?.supportedReasoningEfforts).flatMap(raw => {
         const id = str(rec(raw)?.reasoningEffort);
         if (id === undefined)
             return [];
-        const labels = { none: t('codex-effort-none'), minimal: t('codex-effort-minimal'), low: t('codex-effort-low'), medium: t('codex-effort-medium'), high: t('codex-effort-high'), xhigh: t('codex-effort-xhigh'), ultra: t('codex-effort-ultra') };
+        const labels = { none: codexText('codex-effort-none'), minimal: codexText('codex-effort-minimal'), low: codexText('codex-effort-low'), medium: codexText('codex-effort-medium'), high: codexText('codex-effort-high'), xhigh: codexText('codex-effort-xhigh'), ultra: codexText('codex-effort-ultra') };
         return [{ id, label: labels[id] ?? id }];
     });
     const capabilities = {
@@ -136,13 +136,18 @@ export function createCodexControls(deps) {
             },
         },
         effort: {
-            levels: effortLevels,
+            levels: () => effortLevels(currentRow()),
+            forModel: ref => {
+                const model = deps.actualModel?.(ref.model) ?? ref.model;
+                const row = rows.find(row => row.model === model || row.id === model);
+                return { levels: effortLevels(row), defaultEffort: str(row?.defaultReasoningEffort) };
+            },
             current: () => settings.effort ?? undefined,
             async set(id) {
                 if (rows.length === 0)
                     await models();
-                if (id !== null && !effortLevels().some(option => option.id === id))
-                    throw new Error(t('effort-invalid', { id, ids: effortLevels().map(option => option.id).join(', ') }));
+                if (id !== null && !effortLevels(currentRow()).some(option => option.id === id))
+                    throw new Error(codexText('effort-invalid', { id, ids: effortLevels(currentRow()).map(option => option.id).join(', ') }));
                 const applied = id ?? str(currentRow()?.defaultReasoningEffort) ?? null;
                 await update({ effort: applied });
                 settings.effort = applied;
@@ -159,9 +164,9 @@ export function createCodexControls(deps) {
             current: () => settings.modeId,
             async set(id) {
                 if (id !== 'plan' && !isCodexModeId(id) && id !== settings.permissionMode)
-                    throw new Error(t('codex-mode-invalid', { mode: id }));
+                    throw new Error(codexText('codex-mode-invalid', { mode: id }));
                 if (id === 'plan' && !planSupported)
-                    throw new Error(t('codex-capability-unavailable', { feature: t('codex-mode-plan') }));
+                    throw new Error(codexText('codex-capability-unavailable', { feature: codexText('codex-mode-plan') }));
                 const plan = id === 'plan';
                 const switching = plan !== (settings.modeId === 'plan');
                 const change = planSupported && switching ? { collaborationMode: collaboration(plan ? 'plan' : 'default') } : {};
@@ -186,7 +191,7 @@ export function createCodexControls(deps) {
         compact: {
             async run() {
                 if (deps.busy())
-                    throw new Error(t('codex-command-idle'));
+                    throw new Error(codexText('codex-command-idle'));
                 ctx.compactRequested = true;
                 try {
                     await hub.call(CLIENT.threadCompactStart, { threadId: deps.threadId() });
@@ -270,7 +275,7 @@ export function createCodexControls(deps) {
             }
             prefs.write({ plan: modeId === 'plan' });
             if (warn)
-                deps.emit([{ type: 'notice', level: 'warning', key: 'codex-plan-unavailable', text: t('codex-capability-unavailable', { feature: t('codex-mode-plan') }) }]);
+                deps.emit([{ type: 'notice', level: 'warning', key: 'codex-plan-unavailable', text: codexText('codex-capability-unavailable', { feature: codexText('codex-mode-plan') }) }]);
         },
         note(method, params) {
             if (method === NOTIFY.modelVerification || method === NOTIFY.accountUpdated) {

package/lib/types/backends/codex/session/goals.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"goals.d.ts","sourceRoot":"","sources":["../../../../../src/backends/codex/session/goals.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,UAAU,EAAE,YAAY,EAAE,MAAM,0BAA0B,CAAA;AAExE,OAAO,EAAiB,KAAK,GAAG,EAAE,MAAM,cAAc,CAAA;AAEtD,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,eAAe,CAAA;AAG7C,iFAAiF;AACjF,wBAAgB,cAAc,CAAC,GAAG,EAAE,OAAO,EAAE,SAAS,SAAW,GAAG,YAAY,CAAC,aAAa,CAAC,GAAG,SAAS,CAmB1G;AAED,wBAAgB,gBAAgB,CAAC,IAAI,EAAE;IACrC,QAAQ,CAAC,GAAG,EAAE,IAAI,CAAC,QAAQ,EAAE,MAAM,CAAC,CAAA;IACpC,QAAQ,IAAI,MAAM,CAAA;IAClB,IAAI,CAAC,MAAM,EAAE,SAAS,UAAU,EAAE,GAAG,IAAI,CAAA;IACzC,KAAK,CAAC,CAAC,OAAO,EAAE,MAAM,GAAG,IAAI,CAAA;CAC9B;;;gCAwDwmW,CAAC;;;;;;kBAxBllW,OAAO,CAAC,IAAI,CAAC;yBAeZ,MAAM,UAAU,GAAG,GAAG,OAAO;aAKzC,IAAI;aACJ,IAAI;EAEhB"}
+{"version":3,"file":"goals.d.ts","sourceRoot":"","sources":["../../../../../src/backends/codex/session/goals.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,UAAU,EAAE,YAAY,EAAE,MAAM,0BAA0B,CAAA;AAExE,OAAO,EAAiB,KAAK,GAAG,EAAE,MAAM,cAAc,CAAA;AAEtD,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,eAAe,CAAA;AAG7C,iFAAiF;AACjF,wBAAgB,cAAc,CAAC,GAAG,EAAE,OAAO,EAAE,SAAS,SAAW,GAAG,YAAY,CAAC,aAAa,CAAC,GAAG,SAAS,CAmB1G;AAED,wBAAgB,gBAAgB,CAAC,IAAI,EAAE;IACrC,QAAQ,CAAC,GAAG,EAAE,IAAI,CAAC,QAAQ,EAAE,MAAM,CAAC,CAAA;IACpC,QAAQ,IAAI,MAAM,CAAA;IAClB,IAAI,CAAC,MAAM,EAAE,SAAS,UAAU,EAAE,GAAG,IAAI,CAAA;IACzC,KAAK,CAAC,CAAC,OAAO,EAAE,MAAM,GAAG,IAAI,CAAA;CAC9B;;;gCAwDs0W,CAAC;;;;;;kBAxBhzW,OAAO,CAAC,IAAI,CAAC;yBAeZ,MAAM,UAAU,GAAG,GAAG,OAAO;aAKzC,IAAI;aACJ,IAAI;EAEhB"}

package/lib/types/backends/codex/session/goals.js

@@ -1,4 +1,4 @@
-import { t } from '../../../i18n.js';
+import { codexText } from '../text.js';
 import { num, rec, str } from '../narrow.js';
 import { CLIENT, NOTIFY } from '../protocol/index.js';
 import { rpcCode, RPC_ERROR } from '../rpc/client.js';
@@ -21,7 +21,7 @@ export function codexGoalEvent(raw, operation = 'update') {
             id: 'codex-goal:' + threadId + ':' + String(goal.createdAt),
             revision: num(goal.updatedAt) ?? 0,
             objective, phase, maxGoalRounds: 0,
-            ...(phase !== 'blocked' ? {} : { blockedReason: { code: status, message: t(status === 'usageLimited' ? 'codex-goal-usage-limited' : status === 'budgetLimited' ? 'codex-goal-budget-limited' : 'codex-goal-blocked') } }),
+            ...(phase !== 'blocked' ? {} : { blockedReason: { code: status, message: codexText(status === 'usageLimited' ? 'codex-goal-usage-limited' : status === 'budgetLimited' ? 'codex-goal-budget-limited' : 'codex-goal-blocked') } }),
             budget: { tokensUsed: num(goal.tokensUsed) ?? 0, tokenBudget: num(goal.tokenBudget) ?? null, timeUsedSeconds: num(goal.timeUsedSeconds) ?? 0 },
         },
     };
@@ -77,7 +77,7 @@ export function createCodexGoals(deps) {
                     return;
                 if (rpcCode(error) === RPC_ERROR.methodNotFound || rpcCode(error) === RPC_ERROR.invalidParams) {
                     if (enabled)
-                        deps.emit([{ type: 'notice', level: 'warning', key: 'codex-goals-unsupported', text: t('codex-goals-unsupported') }]);
+                        deps.emit([{ type: 'notice', level: 'warning', key: 'codex-goals-unsupported', text: codexText('codex-goals-unsupported') }]);
                     enabled = false;
                 }
                 else

package/lib/types/backends/codex/session/history.js

@@ -1,4 +1,4 @@
-import { t } from '../../../i18n.js';
+import { codexText } from '../text.js';
 import { arr, rec, str } from '../narrow.js';
 import { CLIENT, NOTIFY } from '../protocol/index.js';
 import { createItemContext } from '../translate/items.js';
@@ -95,7 +95,7 @@ export function createCodexTranscriptHistory(deps) {
             failures += 1;
             deps.ctx.debug('codex: older history prefetch failed; cursor retained');
             if (failures >= 3)
-                deps.notice?.({ type: 'notice', level: 'warning', key: 'codex-older-history', text: t('codex-history-fetch-failed') });
+                deps.notice?.({ type: 'notice', level: 'warning', key: 'codex-older-history', text: codexText('codex-history-fetch-failed') });
         }).finally(() => { if (pending === task) {
             pending = undefined;
             abort = undefined;

package/lib/types/backends/codex/session/images.js

@@ -3,8 +3,8 @@
 import { closeSync, openSync, readSync, statSync } from 'node:fs';
 import { readFile } from 'node:fs/promises';
 import { basename, extname, resolve } from 'node:path';
-import { t } from '../../../i18n.js';
-import { probeImageSize } from '../../../utils/imageResize.js';
+import { codexText } from '../text.js';
+import { probeImageSize } from '../../shared/image-size.js';
 import { arr, rec, str } from '../narrow.js';
 export const CODEX_IMAGE_LIMITS = Object.freeze({
     mediaTypes: Object.freeze(['image/png', 'image/jpeg', 'image/gif', 'image/webp']),
@@ -20,31 +20,31 @@ const extensionType = { '.png': 'image/png', '.jpg': 'image/jpeg', '.jpeg': 'ima
 /** Read and recheck staged facades before any turn/steer request is sent. */
 export async function codexImageInputs(images, limits = CODEX_IMAGE_LIMITS) {
     if (images.length > limits.maxImagesPerMessage)
-        throw new Error(t('codex-images-too-many', { n: limits.maxImagesPerMessage }));
+        throw new Error(codexText('codex-images-too-many', { n: limits.maxImagesPerMessage }));
     const inputs = [];
     let total = 0;
     for (const image of images) {
         const name = image.name ?? image.id;
         const type = image.mediaType;
         if (type === undefined || !CODEX_IMAGE_LIMITS.mediaTypes.includes(type) || !limits.mediaTypes.includes(type))
-            throw new Error(t('codex-image-type-refused', { name, type: type ?? '?' }));
+            throw new Error(codexText('codex-image-type-refused', { name, type: type ?? '?' }));
         let data;
         try {
             data = await image.read();
         }
         catch {
-            throw new Error(t('codex-image-unreadable', { name }));
+            throw new Error(codexText('codex-image-unreadable', { name }));
         }
         if (data.byteLength > limits.maxImageBytes)
-            throw new Error(t('codex-image-too-large', { name, mb: Math.round(limits.maxImageBytes / (1024 * 1024)) }));
+            throw new Error(codexText('codex-image-too-large', { name, mb: Math.round(limits.maxImageBytes / (1024 * 1024)) }));
         total += data.byteLength;
         if (total > limits.maxMessageImageBytes)
-            throw new Error(t('codex-images-too-large', { mb: Math.round(limits.maxMessageImageBytes / (1024 * 1024)) }));
+            throw new Error(codexText('codex-images-too-large', { mb: Math.round(limits.maxMessageImageBytes / (1024 * 1024)) }));
         const size = probeImageSize(data);
         const width = size?.width ?? image.width;
         const height = size?.height ?? image.height;
         if (width > limits.maxImageDimension || height > limits.maxImageDimension || width * height > limits.maxImagePixels)
-            throw new Error(t('codex-image-dimensions-refused', { name, px: limits.maxImageDimension }));
+            throw new Error(codexText('codex-image-dimensions-refused', { name, px: limits.maxImageDimension }));
         inputs.push({ type: 'image', url: 'data:' + type + ';base64,' + Buffer.from(data.buffer, data.byteOffset, data.byteLength).toString('base64') });
     }
     return inputs;

package/lib/types/backends/codex/session/input.d.ts

@@ -35,7 +35,7 @@ export interface InputQueueDeps {
     startFailed?(error: unknown, overrides: Rec): void;
     closed(): boolean;
     /** The open turn could not be settled by the server: close it here. */
-    forceClose(): void;
+    forceClose(turnId: string, reviewTurnId?: string): void;
     readonly clock: RpcClock;
     readonly forceSettleMs: number;
 }
@@ -56,6 +56,10 @@ export declare function createInputQueue(deps: InputQueueDeps): {
     /** A user message carried this client id back: the input ran. */
     claim(clientId: string): AgentEvent | undefined;
     onTurnStarted(turnId: string): void;
+    /** Reserve the turn before review/start reaches the server. The returned
+     *  cleanup releases only this request's wait if its RPC fails. */
+    beginReview(): () => void;
+    onReviewStarted(turnId: string): void;
     onTurnCompleted: (turnId: string | undefined, interrupted: boolean) => void;
     /** Re-queue a rejection's reason as the next turn (D10). */
     enqueueFollowup(id: string, text: string): void;
@@ -69,7 +73,7 @@ export declare function createInputQueue(deps: InputQueueDeps): {
     /** Dispose: forget everything, stop the timer. */
     close(): void;
     /** Interrupt the running turn (best-effort, dispose path). */
-    interrupt: () => Promise<boolean>;
+    interrupt: (waitForReviewStart?: boolean) => Promise<boolean>;
 };
 export type InputQueue = ReturnType<typeof createInputQueue>;
 //# sourceMappingURL=input.d.ts.map

package/lib/types/backends/codex/session/input.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"input.d.ts","sourceRoot":"","sources":["../../../../../src/backends/codex/session/input.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;GAoBG;AACH,OAAO,KAAK,EAAE,UAAU,EAAe,MAAM,0BAA0B,CAAA;AACvE,OAAO,KAAK,EAAE,UAAU,EAAE,WAAW,EAAE,aAAa,EAAE,eAAe,EAAE,MAAM,2BAA2B,CAAA;AAExG,OAAO,EAAuB,KAAK,GAAG,EAAE,MAAM,cAAc,CAAA;AAG5D,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,sBAAsB,CAAA;AACrD,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,kBAAkB,CAAA;AAahD,MAAM,WAAW,cAAc;IAC7B,QAAQ,CAAC,QAAQ,EAAE,MAAM,CAAA;IACzB,IAAI,CAAC,CAAC,GAAG,OAAO,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,OAAO,GAAG,OAAO,CAAC,CAAC,CAAC,CAAA;IAC9D,IAAI,CAAC,MAAM,EAAE,SAAS,UAAU,EAAE,GAAG,IAAI,CAAA;IACzC,KAAK,CAAC,OAAO,EAAE,MAAM,GAAG,IAAI,CAAA;IAC5B,iEAAiE;IACjE,SAAS,IAAI,GAAG,CAAA;IAChB,4EAA4E;IAC5E,WAAW,CAAC,CAAC,KAAK,EAAE,OAAO,EAAE,SAAS,EAAE,GAAG,GAAG,IAAI,CAAA;IAClD,MAAM,IAAI,OAAO,CAAA;IACjB,uEAAuE;IACvE,UAAU,IAAI,IAAI,CAAA;IAClB,QAAQ,CAAC,KAAK,EAAE,QAAQ,CAAA;IACxB,QAAQ,CAAC,aAAa,EAAE,MAAM,CAAA;CAC/B;AAED;qEACqE;AACrE,wBAAgB,WAAW,CAAC,KAAK,EAAE,UAAU,GAAG,SAAS,EAAE,CAQ1D;AAED,wBAAgB,gBAAgB,CAAC,IAAI,EAAE,cAAc;;IA6JjD,+CAA+C;YACvC,OAAO;kBAEK,UAAU,aAAa,eAAe,cAAc,SAAS,SAAS,EAAE,GAAG,OAAO,CAAC;QAAE,QAAQ,CAAC,QAAQ,EAAE,OAAO,CAAC;QAAC,QAAQ,CAAC,MAAM,CAAC,EAAE,MAAM,CAAA;KAAE,CAAC;kBAyB5I,WAAW,GAAG,OAAO,CAAC,aAAa,CAAC;IAsBxD,kDAAkD;eACvC,MAAM,GAAG,OAAO;IAO3B,iEAAiE;oBACjD,MAAM,GAAG,UAAU,GAAG,SAAS;0BAKzB,MAAM,GAAG,IAAI;8BAnGJ,MAAM,GAAG,SAAS,eAAe,OAAO,KAAG,IAAI;IAwG9E,4DAA4D;wBACxC,MAAM,QAAQ,MAAM,GAAG,IAAI;IAK/C,yEAAyE;sBACvD,SAAS,UAAU,EAAE;0BASjB,IAAI;IAK1B;;kEAE8D;qBAC7C,SAAS,UAAU,EAAE;IAQtC,kDAAkD;aACzC,IAAI;IAMb,8DAA8D;qBArKpC,OAAO,CAAC,OAAO,CAAC;EAwK7C;AAED,MAAM,MAAM,UAAU,GAAG,UAAU,CAAC,OAAO,gBAAgB,CAAC,CAAA"}
+{"version":3,"file":"input.d.ts","sourceRoot":"","sources":["../../../../../src/backends/codex/session/input.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;GAoBG;AACH,OAAO,KAAK,EAAE,UAAU,EAAe,MAAM,0BAA0B,CAAA;AACvE,OAAO,KAAK,EAAE,UAAU,EAAE,WAAW,EAAE,aAAa,EAAE,eAAe,EAAE,MAAM,2BAA2B,CAAA;AAExG,OAAO,EAAuB,KAAK,GAAG,EAAE,MAAM,cAAc,CAAA;AAG5D,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,sBAAsB,CAAA;AACrD,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,kBAAkB,CAAA;AAahD,MAAM,WAAW,cAAc;IAC7B,QAAQ,CAAC,QAAQ,EAAE,MAAM,CAAA;IACzB,IAAI,CAAC,CAAC,GAAG,OAAO,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,OAAO,GAAG,OAAO,CAAC,CAAC,CAAC,CAAA;IAC9D,IAAI,CAAC,MAAM,EAAE,SAAS,UAAU,EAAE,GAAG,IAAI,CAAA;IACzC,KAAK,CAAC,OAAO,EAAE,MAAM,GAAG,IAAI,CAAA;IAC5B,iEAAiE;IACjE,SAAS,IAAI,GAAG,CAAA;IAChB,4EAA4E;IAC5E,WAAW,CAAC,CAAC,KAAK,EAAE,OAAO,EAAE,SAAS,EAAE,GAAG,GAAG,IAAI,CAAA;IAClD,MAAM,IAAI,OAAO,CAAA;IACjB,uEAAuE;IACvE,UAAU,CAAC,MAAM,EAAE,MAAM,EAAE,YAAY,CAAC,EAAE,MAAM,GAAG,IAAI,CAAA;IACvD,QAAQ,CAAC,KAAK,EAAE,QAAQ,CAAA;IACxB,QAAQ,CAAC,aAAa,EAAE,MAAM,CAAA;CAC/B;AAED;qEACqE;AACrE,wBAAgB,WAAW,CAAC,KAAK,EAAE,UAAU,GAAG,SAAS,EAAE,CAQ1D;AAED,wBAAgB,gBAAgB,CAAC,IAAI,EAAE,cAAc;;IA6KjD,+CAA+C;YACvC,OAAO;kBAEK,UAAU,aAAa,eAAe,cAAc,SAAS,SAAS,EAAE,GAAG,OAAO,CAAC;QAAE,QAAQ,CAAC,QAAQ,EAAE,OAAO,CAAC;QAAC,QAAQ,CAAC,MAAM,CAAC,EAAE,MAAM,CAAA;KAAE,CAAC;kBAyB5I,WAAW,GAAG,OAAO,CAAC,aAAa,CAAC;IAsBxD,kDAAkD;eACvC,MAAM,GAAG,OAAO;IAO3B,iEAAiE;oBACjD,MAAM,GAAG,UAAU,GAAG,SAAS;0BAKzB,MAAM,GAAG,IAAI;IAInC;sEACkE;mBACnD,MAAM,IAAI;4BAWD,MAAM,GAAG,IAAI;8BAtHN,MAAM,GAAG,SAAS,eAAe,OAAO,KAAG,IAAI;IA8H9E,4DAA4D;wBACxC,MAAM,QAAQ,MAAM,GAAG,IAAI;IAK/C,yEAAyE;sBACvD,SAAS,UAAU,EAAE;0BAWjB,IAAI;IAK1B;;kEAE8D;qBAC7C,SAAS,UAAU,EAAE;IAQtC,kDAAkD;aACzC,IAAI;IAQb,8DAA8D;iDAjMX,OAAO,CAAC,OAAO,CAAC;EAoMtE;AAED,MAAM,MAAM,UAAU,GAAG,UAAU,CAAC,OAAO,gBAAgB,CAAC,CAAA"}