lark-remote 0.1.6 → 0.1.8

package/dist/runner/codex/app-server/runner.js

@@ -5,14 +5,17 @@
  * Flow per run: acquire persistent connection → thread/start or thread/resume
  * → turn/start → consume notifications (agent message deltas, approval server
  * requests, …) until turn/completed → synthesize ResultEvent.
+ *
+ * Shares the ConnectionBasedRunner base with kimi/opencode: same notification
+ * queue + waitResolve pump, forceFinish/stopRequested semantics, turn idle
+ * watchdog, and ConnectionLostError respawn-and-retry-once.
  */
-import { ConnectionManager } from './connection-manager.js';
-import { ConnectionLostError } from './client.js';
+import { ConnectionManager, } from '../../common/jsonrpc/connection-manager.js';
 import { CodexAppServerTranslator } from './translator.js';
+import { RpcErrorCode } from '../../common/acp/protocol-types.js';
+import { mapAnswersByIndex } from '../../question-common.js';
 import { getLogger } from '../../../logger/index.js';
-import { syntheticInitEvent } from '../../common/runner-utils.js';
-/** How long to wait for turn output notifications before failing. */
-const TURN_IDLE_TIMEOUT_MS = 10 * 60 * 1000;
+import { ConnectionBasedRunner } from '../../common/connection-based-runner.js';
 /**
  * Build the protocol response body for a command/file approval decision.
  * Structured decisions (acceptWithExecpolicyAmendment) carry the payload the
@@ -32,194 +35,154 @@ function buildApprovalResponse(action, view) {
     }
     return { decision: action };
 }
-export class CodexAppServerRunner {
-    kind;
-    sessionReader;
-    lifetime = 'workspace';
+/**
+ * 构造 request_user_input 响应。answer → 按问题 id 回编；decline/cancel →
+ * 空 answers。answers 值与问题 options 无强校验（Codex 接受任意字符串，
+ * 包括自由文本题的自定义答案）。
+ */
+function buildRequestUserInputResponse(action, questions, response) {
+    if (action !== 'answer') {
+        return { answers: {} };
+    }
+    const answers = response.answers;
+    if (!answers) {
+        return { answers: {} };
+    }
+    const notes = response.notes;
+    const byIndex = mapAnswersByIndex(questions ?? [], answers);
+    const result = {};
+    (questions ?? []).forEach((q, i) => {
+        const value = byIndex[i];
+        if (!q.id || value === undefined)
+            return;
+        const values = Array.isArray(value) ? value : [value];
+        const cleaned = values.filter((v) => typeof v === 'string' && v.length > 0);
+        // Codex user_note：补充说明编码为 "user_note: <text>" 条目（2026-08-18
+        // live 验证 deepseek-v4-flash 明确理解并遵守该格式）。
+        const note = notes?.[q.question]?.trim();
+        if (note)
+            cleaned.push(`user_note: ${note}`);
+        if (cleaned.length === 0)
+            return;
+        result[q.id] = { answers: cleaned };
+    });
+    return { answers: result };
+}
+/**
+ * Map the client-side SandboxMode enum to the response-side SandboxPolicy
+ * object used by `thread/settings/update` (`sandboxPolicy`).
+ */
+export function sandboxModeToSandboxPolicy(mode) {
+    switch (mode) {
+        case 'read-only':
+            return { type: 'readOnly', networkAccess: false };
+        case 'workspace-write':
+            return {
+                type: 'workspaceWrite',
+                writableRoots: [],
+                networkAccess: false,
+                excludeTmpdirEnvVar: false,
+                excludeSlashTmp: false,
+            };
+        case 'danger-full-access':
+            return { type: 'dangerFullAccess' };
+    }
+}
+/**
+ * Codex 官方 feature override（thread/start·resume 的 `config` 字段）：
+ * 让 `request_user_input` 在 Default 协作模式下也可用，无需改 codex
+ * config.toml。协议键与 openai/codex 的 feature registry 一致
+ * （key `default_mode_request_user_input`），app-server 官方测试
+ * （turn_start.rs）验证同一路径。
+ */
+export const THREAD_CONFIG_DEFAULT_MODE_REQUEST_USER_INPUT = {
+    'features.default_mode_request_user_input': true,
+};
+export class CodexAppServerRunner extends ConnectionBasedRunner {
     connectionManager;
-    currentClient = null;
     currentTranslator = null;
-    currentThreadId = null;
-    currentTurnId = null;
-    lastEventAt = 0;
-    _isRunning = false;
+    activeThreadId = null;
     model;
     modelProvider;
     reasoningEffort;
     sandboxConfig;
     approvalPolicyConfig;
-    turnTimeoutMs;
     /** Pending approval requests: requestId (JSON-RPC id) → kind + view. */
     pendingApprovals = new Map();
-    /** Notification queue consumed by the active run generator. */
-    notificationQueue = [];
-    waitResolve = null;
-    forceFinish = false;
-    /** stop() 在 turn/start 响应前到达时置位，turn/start 完成后补发 interrupt。 */
-    stopRequested = false;
     constructor(opts) {
-        this.kind = opts.kind;
-        this.sessionReader = opts.sessionReader;
+        super({ kind: opts.kind, sessionReader: opts.sessionReader }, opts.turnTimeoutMs);
         this.model = opts.model;
         this.modelProvider = opts.modelProvider;
         this.reasoningEffort = opts.reasoningEffort;
         this.sandboxConfig = opts.sandbox;
         this.approvalPolicyConfig = opts.approvalPolicy;
-        this.turnTimeoutMs = opts.turnTimeoutMs ?? TURN_IDLE_TIMEOUT_MS;
         const managerOpts = {
             binary: opts.binary ?? 'codex',
-            args: opts.appServerArgs,
+            args: opts.appServerArgs ?? ['app-server', '--stdio'],
             env: opts.env,
             requestTimeoutMs: opts.requestTimeoutMs,
             idleTtlMs: opts.idleTtlMs,
+            // `experimentalApi: true` is required for `thread/settings/update`, which
+            // lets config.save push approval/sandbox changes to a live thread instead
+            // of waiting for the workspace-lifetime runner to be recreated.
+            initializeParams: {
+                clientInfo: {
+                    name: 'lark-remote',
+                    version: '1.0.0',
+                },
+                capabilities: {
+                    experimentalApi: true,
+                },
+            },
         };
         this.connectionManager = new ConnectionManager(managerOpts);
     }
-    get isRunning() {
-        return this._isRunning;
+    get logTag() {
+        return 'codex-app-server-runner';
     }
-    /**
-     * Run a message in the current thread.
-     *
-     * 进程容错：若 app-server 子进程被外部误杀或自身异常退出（连接丢失），
-     * 自动重拉进程并重试一次 setup（thread/start 或按 sessionId thread/resume
-     * 继续处理），保证消费用户消息时进程挂了也能恢复。
-     */
-    async *run(message, opts) {
-        if (this._isRunning) {
-            throw new Error('CodexAppServerRunner is already running');
-        }
-        this._isRunning = true;
-        this.resetRunState();
+    get turnTimeoutErrorMessage() {
+        return 'Codex app-server turn timed out';
+    }
+    get turnInterruptedErrorMessage() {
+        return 'Codex app-server turn interrupted';
+    }
+    currentSessionId() {
+        return this.activeThreadId;
+    }
+    shouldDeferStop() {
+        return !this.currentTurnId;
+    }
+    async cancelCurrentTurn() {
+        if (!this.currentClient || !this.activeThreadId || !this.currentTurnId)
+            return;
         try {
-            try {
-                await this.setupTurn(message, opts);
-            }
-            catch (err) {
-                // 连接在 setup 期间丢失（进程被误杀/异常退出）：重拉进程并重试一次。
-                // thread/resume 会按持久化记录（rollout）恢复线程，继续原会话处理。
-                if (err instanceof ConnectionLostError && !this.stopRequested) {
-                    getLogger().warn(`[codex-app-server-runner] connection lost during turn setup (${err.message}), respawning app-server and retrying once`);
-                    // 旧连接可能仍挂在 slot 里（close 事件尚未处理完）：先强制释放，
-                    // 保证重试会拉起全新进程；并摘掉旧 client 的 hooks，避免其残留的
-                    // onClose 把错误结果塞进重试后的通知队列。
-                    await this.connectionManager.release(opts.cwd);
-                    const staleClient = this.currentClient;
-                    if (staleClient) {
-                        staleClient.setHooks({
-                            onNotification: () => { },
-                            onServerRequest: () => { },
-                            onClose: () => { },
-                        });
-                    }
-                    this.resetRunState();
-                    await this.setupTurn(message, opts);
-                }
-                else {
-                    throw err;
-                }
-            }
-            if (this.stopRequested) {
-                // 启动期 /stop：turn/start 已完成，补发 interrupt，避免 server 端 turn
-                // 无人接管继续执行。
-                getLogger().warn('[codex-app-server-runner] stop requested before turn/start resolved');
-                try {
-                    await this.currentClient?.request('turn/interrupt', {
-                        threadId: this.currentThreadId,
-                        turnId: this.currentTurnId,
-                    });
-                }
-                catch (err) {
-                    getLogger().warn(`[codex-app-server-runner] deferred interrupt failed: ${err.message}`);
-                }
-            }
-            // §9.22 守卫前提：桥的 pre-init result guard 和 run-state reducer 都以
-            // system.init 作为「本轮真实开始」的标记，而 app-server 协议没有 init 事件。
-            // 缺了它，成功的 result 会被当作 pre-init 丢弃，卡片终态停在 running，
-            // 最后兜底成「输出流已结束，但未收到 result 事件」（2026-08-13 事故）。
-            // 与 exec runner 的 syntheticInitEvent 模式一致：turn setup 成功即发 init，
-            // 保证 turn_started / turn_diff / result 全部落在 init 之后。
-            yield syntheticInitEvent(this.currentThreadId ?? opts.sessionId ?? '');
-            yield* this.consumeTurn();
+            await this.currentClient.request('turn/interrupt', {
+                threadId: this.activeThreadId,
+                turnId: this.currentTurnId,
+            });
         }
         catch (err) {
-            getLogger().error(`[codex-app-server-runner] run error: ${err.message}`);
-            // 与 spawn 失败路径（spawning-runner §9.22）同理：error result 前必须补
-            // init，否则守卫把错误结果丢弃，卡片只显示通用「输出流已结束」而非具体
-            // 错误信息。
-            yield syntheticInitEvent(this.currentThreadId ?? opts.sessionId ?? '');
-            yield {
-                type: 'result',
-                subtype: 'error',
-                // 优先上报本次 setup 创建/恢复的线程 id：thread/start 成功后 turn/start
-                // 失败时 opts.sessionId 仍是旧值，漏报会导致下条消息再开一个孤儿线程
-                // （review P3-10）。
-                session_id: this.currentThreadId ?? opts.sessionId ?? '',
-                errorMessage: err.message,
-            };
-        }
-        finally {
-            this._isRunning = false;
-            this.currentTranslator = null;
-            this.currentTurnId = null;
-            this.stopRequested = false;
-            this.currentThreadId = null;
-            // 无论成功失败都要重新武装 idle TTL（无 slot 时是 no-op）。
-            this.connectionManager.notifyIdle(opts.cwd);
+            getLogger().warn(`[${this.logTag}] interrupt failed: ${err.message}`);
         }
     }
-    /**
-     * Acquire the connection and set up the turn: thread/start（新会话）或
-     * thread/resume（按 sessionId 恢复既有线程）→ turn/start。
-     */
-    async setupTurn(message, opts) {
-        const client = await this.connectionManager.acquire(opts.cwd);
-        this.connectionManager.notifyActivity(opts.cwd);
-        this.currentClient = client;
-        client.setHooks({
-            onNotification: (method, params) => this.handleNotification(method, params),
-            onServerRequest: (id, method, params) => this.handleServerRequest(id, method, params),
-            onClose: () => {
-                getLogger().warn('[codex-app-server-runner] client connection closed');
-                this.failTurn('Codex app-server connection closed');
-            },
-        });
-        const threadParams = this.buildThreadParams(opts.cwd);
-        let threadId;
-        if (opts.sessionId) {
-            const resumeParams = {
-                threadId: opts.sessionId,
-                ...threadParams,
-            };
-            await client.request('thread/resume', resumeParams);
-            threadId = opts.sessionId;
-        }
-        else {
-            const threadResult = await client.request('thread/start', threadParams);
-            // 会话键假设（review P2-4）：主线程 thread.id === session_meta.session_id，
-            // 故 thread.id 可同时用作协议 threadId 与 store/session reader 的 session
-            // 键（bridge 用 turn_started 通知的 threadId 写回，/resume、Compact 按此
-            // 键定位 JSONL）。forked/subagent 线程二者会分叉（openai/codex#29327），
-            // 桥只把主线程作为顶层会话，不在此链路内。
-            threadId = threadResult.thread.id;
-        }
-        this.currentThreadId = threadId;
-        const translator = new CodexAppServerTranslator();
-        this.currentTranslator = translator;
-        const turnParams = this.buildTurnParams(message, opts);
-        const turnResult = await client.request('turn/start', turnParams);
-        this.currentTurnId = turnResult.turn.id;
+    clearTurnState() {
+        this.currentTranslator = null;
+        this.activeThreadId = null;
+    }
+    async releaseConnection(cwd) {
+        await this.connectionManager.release(cwd);
+    }
+    notifyIdle(cwd) {
+        this.connectionManager.notifyIdle(cwd);
+    }
+    async disposeConnections() {
+        await this.connectionManager.disposeAll();
     }
     /**
      * Run a compact operation on the current thread.
      */
     async *runCompact(_message, opts) {
-        if (this._isRunning) {
-            throw new Error('CodexAppServerRunner is already running');
-        }
-        this._isRunning = true;
-        this.resetRunState();
-        try {
+        yield* this.executeTurn(opts, async () => {
             const client = await this.connectionManager.acquire(opts.cwd);
             this.connectionManager.notifyActivity(opts.cwd);
             this.currentClient = client;
@@ -231,7 +194,7 @@ export class CodexAppServerRunner {
             if (!opts.sessionId) {
                 throw new Error('compact requires a sessionId');
             }
-            this.currentThreadId = opts.sessionId;
+            this.activeThreadId = opts.sessionId;
             const translator = new CodexAppServerTranslator();
             translator.setOperationKind('compact');
             this.currentTranslator = translator;
@@ -246,55 +209,7 @@ export class CodexAppServerRunner {
             };
             await client.request('thread/resume', resumeParams);
             await client.request('thread/compact/start', { threadId: opts.sessionId });
-            // 与 run() 同理：compact 也先发 init 再消费通知，避免 result 被守卫丢弃。
-            yield syntheticInitEvent(this.currentThreadId ?? opts.sessionId ?? '');
-            yield* this.consumeTurn();
-        }
-        catch (err) {
-            getLogger().error(`[codex-app-server-runner] runCompact error: ${err.message}`);
-            yield syntheticInitEvent(this.currentThreadId ?? opts.sessionId ?? '');
-            yield {
-                type: 'result',
-                subtype: 'error',
-                session_id: this.currentThreadId ?? opts.sessionId ?? '',
-                errorMessage: err.message,
-            };
-        }
-        finally {
-            this._isRunning = false;
-            this.currentTranslator = null;
-            this.currentTurnId = null;
-            this.stopRequested = false;
-            this.currentThreadId = null;
-            this.connectionManager.notifyIdle(opts.cwd);
-        }
-    }
-    /**
-     * Stop the current turn by interrupting it.
-     */
-    async stop(_opts) {
-        if (!this._isRunning || !this.currentClient || !this.currentThreadId)
-            return;
-        if (!this.currentTurnId) {
-            // turn/start 尚未响应：先标记，等 run() 在 turn/start 完成后补发 interrupt。
-            this.stopRequested = true;
-            this.forceFinish = true;
-            this.wakeWaiters();
-            return;
-        }
-        try {
-            await this.currentClient.request('turn/interrupt', {
-                threadId: this.currentThreadId,
-                turnId: this.currentTurnId ?? '',
-            });
-        }
-        catch (err) {
-            getLogger().warn(`[codex-app-server-runner] stop error: ${err.message}`);
-        }
-        // Unblock the turn loop regardless of whether the server sends a
-        // turn/completed notification afterwards.
-        this.forceFinish = true;
-        this.wakeWaiters();
+        });
     }
     /**
      * Respond to an approval server request. `response` is the bridge
@@ -306,7 +221,15 @@ export class CodexAppServerRunner {
         if (!client || !pending)
             return;
         const action = response?.action ?? 'decline';
-        if (pending.kind === 'permissions') {
+        if (pending.kind === 'question') {
+            // AskUserQuestion 回编：文本 key 答案按问题顺序展开后映射回问题 id
+            // （{answers:{id:{answers:[值]}}}）；跳过/拒绝/取消 → 空 answers
+            // （Codex 视为 unanswered，turn 继续，对齐 cc-connect deny 语义）。
+            const questions = pending.view.questions ?? [];
+            const answerPayload = buildRequestUserInputResponse(action, questions, response);
+            client.respond(requestId, answerPayload);
+        }
+        else if (pending.kind === 'permissions') {
             // 权限审批的响应没有 decision 字段（真实协议只回 granted profile +
             // scope）：decline/cancel 必须返回空授权（拒绝全部），否则会把用户已
             // 勾选的条目当作授予返回（2026-08-12 review 发现：勾选后点「拒绝」实
@@ -323,30 +246,7 @@ export class CodexAppServerRunner {
             client.respond(requestId, buildApprovalResponse(action, pending.view));
         }
         this.pendingApprovals.delete(requestId);
-        getLogger().info(`[codex-app-server-runner] approval responded requestId=${requestId} kind=${pending.kind} action=${action}`);
-    }
-    /**
-     * Dispose the runner: release the connection.
-     */
-    async dispose() {
-        try {
-            await this.connectionManager.disposeAll();
-        }
-        catch (err) {
-            getLogger().warn(`[codex-app-server-runner] dispose error: ${err.message}`);
-        }
-    }
-    getUsageAuthority() {
-        return 'live';
-    }
-    killOrphan() {
-        // No-op: the app-server connection is managed by ConnectionManager.
-    }
-    registerExitHandlers() {
-        // No-op: connection manager handles cleanup on exit.
-    }
-    unregisterExitHandlers() {
-        // No-op.
+        getLogger().info(`[${this.logTag}] approval responded requestId=${requestId} kind=${pending.kind} action=${action}`);
     }
     getStatusInfo() {
         return {
@@ -361,6 +261,45 @@ export class CodexAppServerRunner {
             },
         };
     }
+    /**
+     * Unified approval-mode hot-update entry (called by the bridge via duck
+     * typing on active runs). Codex's `thread/settings/update` applies the new
+     * approval/sandbox policy to subsequent turns, even while the current turn
+     * is still active. This lets `/config` take effect without waiting for this
+     * workspace-lifetime runner to be recreated/evicted. Local fields are always
+     * updated so `/status` reflects the new config immediately; if there is no
+     * live thread, the next `thread/start`/`thread/resume` uses the new values
+     * anyway.
+     */
+    async updateApprovalMode(settings) {
+        if (settings.approvalPolicy !== undefined) {
+            this.approvalPolicyConfig = settings.approvalPolicy;
+        }
+        if (settings.sandbox !== undefined) {
+            this.sandboxConfig = settings.sandbox;
+        }
+        if (!this.currentClient || !this.activeThreadId) {
+            return;
+        }
+        const params = {
+            threadId: this.activeThreadId,
+            ...(settings.approvalPolicy !== undefined ? { approvalPolicy: settings.approvalPolicy } : {}),
+            ...(settings.sandbox !== undefined
+                ? { sandboxPolicy: sandboxModeToSandboxPolicy(settings.sandbox) }
+                : {}),
+        };
+        try {
+            await this.currentClient.request('thread/settings/update', params);
+            getLogger().info(`[${this.logTag}] thread/settings/update applied for thread=${this.activeThreadId}`);
+        }
+        catch (err) {
+            // Config save must not fail because a live thread rejected an experimental
+            // update (e.g. older Codex without thread/settings/update). The local
+            // snapshot is already updated, so /status and the next thread start/resume
+            // still use the new values.
+            getLogger().warn(`[${this.logTag}] thread/settings/update failed: ${err.message}`);
+        }
+    }
     // =========================================================================
     // Internal
     // =========================================================================
@@ -371,12 +310,15 @@ export class CodexAppServerRunner {
             ...(this.modelProvider ? { modelProvider: this.modelProvider } : {}),
             ...(this.approvalPolicyConfig ? { approvalPolicy: this.approvalPolicyConfig } : {}),
             ...(this.sandboxConfig ? { sandbox: this.sandboxConfig } : {}),
+            // Default 协作模式下默认启用 request_user_input（Ask User Question），
+            // 协议级 override，不依赖 codex config.toml。
+            config: THREAD_CONFIG_DEFAULT_MODE_REQUEST_USER_INPUT,
         };
         return params;
     }
     buildTurnParams(message, opts) {
         const params = {
-            threadId: this.currentThreadId ?? '',
+            threadId: this.activeThreadId ?? '',
             input: [{ type: 'text', text: message }],
             ...((opts.model ?? this.model) ? { model: opts.model ?? this.model } : {}),
             ...((opts.reasoningEffort ?? this.reasoningEffort)
@@ -386,79 +328,46 @@ export class CodexAppServerRunner {
         return params;
     }
     /**
-     * Consume the notification queue until a result event arrives or the turn
-     * times out / is interrupted.
-     */
-    async *consumeTurn() {
-        while (true) {
-            const timedOut = await this.waitForEvents(this.nextTurnIdleDeadline());
-            if (timedOut) {
-                await this.interruptCurrentTurn();
-                getLogger().warn('[codex-app-server-runner] turn wait timed out');
-                yield {
-                    type: 'result',
-                    subtype: 'error',
-                    session_id: this.currentThreadId ?? '',
-                    errorMessage: 'Codex app-server turn timed out',
-                };
-                return;
-            }
-            if (this.forceFinish) {
-                yield {
-                    type: 'result',
-                    subtype: 'interrupted',
-                    session_id: this.currentThreadId ?? '',
-                    errorMessage: 'Codex app-server turn interrupted',
-                };
-                return;
-            }
-            while (this.notificationQueue.length > 0) {
-                const ev = this.notificationQueue.shift();
-                yield ev;
-                if (ev.type === 'result') {
-                    return;
-                }
-            }
-        }
-    }
-    /**
-     * Compute the current idle deadline. 0 disables the idle timeout; otherwise
-     * the deadline is based on the last received event, not the turn start time.
+     * Acquire the connection and set up the turn: thread/start（新会话）或
+     * thread/resume（按 sessionId 恢复既有线程）→ turn/start。
      */
-    nextTurnIdleDeadline() {
-        if (this.turnTimeoutMs <= 0)
-            return Number.POSITIVE_INFINITY;
-        return this.lastEventAt + this.turnTimeoutMs;
-    }
-    async interruptCurrentTurn() {
-        if (!this.currentClient || !this.currentThreadId || !this.currentTurnId)
-            return;
-        try {
-            await this.currentClient.request('turn/interrupt', {
-                threadId: this.currentThreadId,
-                turnId: this.currentTurnId,
-            });
-        }
-        catch (err) {
-            getLogger().warn(`[codex-app-server-runner] idle-timeout interrupt failed: ${err.message}`);
+    async setupTurn(message, opts) {
+        const client = await this.connectionManager.acquire(opts.cwd);
+        this.connectionManager.notifyActivity(opts.cwd);
+        this.currentClient = client;
+        client.setHooks({
+            onNotification: (method, params) => this.handleNotification(method, params),
+            onServerRequest: (id, method, params) => this.handleServerRequest(id, method, params),
+            onClose: () => {
+                getLogger().warn(`[${this.logTag}] client connection closed`);
+                this.failTurn('Codex app-server connection closed');
+            },
+        });
+        const threadParams = this.buildThreadParams(opts.cwd);
+        let threadId;
+        if (opts.sessionId) {
+            const resumeParams = {
+                threadId: opts.sessionId,
+                ...threadParams,
+            };
+            await client.request('thread/resume', resumeParams);
+            threadId = opts.sessionId;
         }
-    }
-    async waitForEvents(deadline) {
-        while (this.notificationQueue.length === 0 && !this.forceFinish) {
-            const remaining = deadline - Date.now();
-            if (remaining <= 0)
-                return true;
-            await new Promise((resolve) => {
-                this.waitResolve = resolve;
-                setTimeout(() => {
-                    if (this.waitResolve === resolve) {
-                        this.waitResolve = null;
-                        resolve();
-                    }
-                }, Math.min(remaining, 30_000));
-            });
+        else {
+            const threadResult = await client.request('thread/start', threadParams);
+            // 会话键假设（review P2-4）：主线程 thread.id === session_meta.session_id，
+            // 故 thread.id 可同时用作协议 threadId 与 store/session reader 的 session
+            // 键（bridge 用 turn_started 通知的 threadId 写回，/resume、Compact 按此
+            // 键定位 JSONL）。forked/subagent 线程二者会分叉（openai/codex#29327），
+            // 桥只把主线程作为顶层会话，不在此链路内。
+            threadId = threadResult.thread.id;
         }
-        return false;
+        this.activeThreadId = threadId;
+        const translator = new CodexAppServerTranslator();
+        this.currentTranslator = translator;
+        const turnParams = this.buildTurnParams(message, opts);
+        const turnResult = await client.request('turn/start', turnParams);
+        this.currentTurnId = turnResult.turn.id;
     }
     handleNotification(method, params) {
         const events = this.currentTranslator?.handleNotification(method, params) ?? [];
@@ -470,48 +379,17 @@ export class CodexAppServerRunner {
             // 未处理/不支持的服务端请求必须显式响应（error 即"拒绝"，turn 继续），
             // 否则服务端会一直等待响应（applyPatchApproval、item/tool/requestUserInput、
             // mcpServer/elicitation/request 等）。
-            this.currentClient?.respondError(id, -32601, `Unsupported server request: ${method}`);
+            this.currentClient?.respondError(id, RpcErrorCode.METHOD_NOT_FOUND, `Unsupported server request: ${method}`);
             return;
         }
         for (const ev of events) {
             if (ev.type === 'approval_requested') {
                 this.pendingApprovals.set(ev.requestId, { kind: ev.kind, view: ev.view });
-                getLogger().info(`[codex-app-server-runner] approval requested requestId=${ev.requestId} kind=${ev.kind}`);
+                getLogger().info(`[${this.logTag}] approval requested requestId=${ev.requestId} kind=${ev.kind}`);
             }
         }
         this.pushEvents(events);
     }
-    pushEvents(events) {
-        if (events.length === 0)
-            return;
-        this.lastEventAt = Date.now();
-        this.notificationQueue.push(...events);
-        this.wakeWaiters();
-    }
-    wakeWaiters() {
-        if (this.waitResolve) {
-            const resolve = this.waitResolve;
-            this.waitResolve = null;
-            resolve();
-        }
-    }
-    failTurn(message) {
-        this.pushEvents([
-            {
-                type: 'result',
-                subtype: 'error',
-                session_id: this.currentThreadId ?? '',
-                errorMessage: message,
-            },
-        ]);
-    }
-    resetRunState() {
-        this.notificationQueue = [];
-        this.waitResolve = null;
-        this.lastEventAt = Date.now();
-        this.forceFinish = false;
-        this.pendingApprovals.clear();
-    }
     buildGrantedPermissions(view) {
         const items = view.permissions?.items ?? [];
         const read = [];