lark-remote 0.1.6 → 0.1.8

package/dist/runner/codex/app-server/protocol-types.d.ts

@@ -7,51 +7,20 @@
  * (`item/agentMessage/delta`) and snake_case only where the server requires it
  * (e.g. permission profile fields).
  */
-export interface JsonRpcRequest {
-    jsonrpc: '2.0';
-    id: number | string;
-    method: string;
-    params?: unknown;
-}
-export interface JsonRpcNotification {
-    jsonrpc: '2.0';
-    method: string;
-    params?: unknown;
-}
-export interface JsonRpcSuccessResponse {
-    jsonrpc: '2.0';
-    id: number | string;
-    result: unknown;
-}
-export interface JsonRpcErrorResponse {
-    jsonrpc: '2.0';
-    id: number | string | null;
-    error: {
-        code: number;
-        message: string;
-        data?: unknown;
-    };
-}
-export type ServerMessage = JsonRpcRequest | JsonRpcNotification | JsonRpcSuccessResponse | JsonRpcErrorResponse;
-/** Standard JSON-RPC error codes. */
-export declare const RpcErrorCode: {
-    readonly PARSE_ERROR: -32700;
-    readonly INVALID_REQUEST: -32600;
-    readonly METHOD_NOT_FOUND: -32601;
-    readonly INVALID_PARAMS: -32602;
-    readonly INTERNAL_ERROR: -32603;
-    /** Timeout error (custom, not standard JSON-RPC). */
-    readonly TIMEOUT_ERROR: -32000;
-    /** Connection lost / transport error (custom). */
-    readonly CONNECTION_LOST: -32001;
-};
+export type { JsonRpcRequest, JsonRpcNotification, JsonRpcSuccessResponse, JsonRpcErrorResponse, } from '../../common/jsonrpc/types.js';
 export interface ClientInfo {
     name: string;
     version: string;
 }
+export interface InitializeCapabilities {
+    experimentalApi?: boolean;
+    requestAttestation?: boolean;
+    optOutNotificationMethods?: string[];
+    mcpServerOpenaiFormElicitation?: boolean;
+}
 export interface InitializeParams {
     clientInfo: ClientInfo;
-    capabilities?: Record<string, unknown>;
+    capabilities?: InitializeCapabilities;
 }
 export interface InitializeResult {
     serverInfo?: {
@@ -114,6 +83,8 @@ export interface ThreadResumeParams {
     modelProvider?: string | null;
     approvalPolicy?: AskForApproval;
     sandbox?: SandboxMode;
+    /** Configuration overrides for the resumed thread (codex v2 wire field). */
+    config?: Record<string, unknown> | null;
 }
 export interface ThreadResumeResponse {
     thread: Thread;
@@ -121,6 +92,28 @@ export interface ThreadResumeResponse {
     model: string;
     modelProvider: string;
 }
+/** `thread/settings/update` params (real v2 protocol). */
+export interface ThreadSettingsUpdateParams {
+    threadId: string;
+    /** Override the approval policy for subsequent turns. */
+    approvalPolicy?: AskForApproval;
+    /** Override the sandbox policy for subsequent turns. */
+    sandboxPolicy?: SandboxPolicy;
+    /** Override the model for subsequent turns. */
+    model?: string | null;
+    /** Override the model provider for subsequent turns. */
+    modelProvider?: string | null;
+}
+export interface ThreadSettingsUpdateResponse {
+}
+/** Server→client notification after a settings update is applied. */
+export interface ThreadSettingsUpdatedNotification {
+    method: 'thread/settings/updated';
+    params: {
+        threadId: string;
+        threadSettings: unknown;
+    };
+}
 export interface ThreadCompactStartParams {
     threadId: string;
 }
@@ -268,6 +261,7 @@ export declare const NotificationMethod: {
     readonly WARNING: "warning";
     readonly THREAD_STARTED: "thread/started";
     readonly THREAD_STATUS_CHANGED: "thread/status/changed";
+    readonly THREAD_SETTINGS_UPDATED: "thread/settings/updated";
     readonly THREAD_COMPACTED: "thread/compacted";
     readonly MODEL_REROUTED: "model/rerouted";
 };
@@ -440,6 +434,7 @@ export declare const ServerRequestMethod: {
     readonly COMMAND_EXECUTION_APPROVAL: "item/commandExecution/requestApproval";
     readonly FILE_CHANGE_APPROVAL: "item/fileChange/requestApproval";
     readonly PERMISSIONS_APPROVAL: "item/permissions/requestApproval";
+    readonly REQUEST_USER_INPUT: "item/tool/requestUserInput";
 };
 export interface NetworkApprovalContext {
     host: string;
@@ -523,5 +518,37 @@ export interface PermissionsRequestApprovalResponse {
     permissions: GrantedPermissionProfile;
     scope?: 'turn' | 'session';
 }
+/**
+ * Codex AskUserQuestion（request_user_input）协议形状。
+ * 来源：codex-rs/codex-rs/protocol/src/request_user_input.rs +
+ * app-server-protocol v2/item.rs ToolRequestUserInput*（EXPERIMENTAL）。
+ * isOther=true → 渲染层提供自定义答案输入；isSecret 仅影响展示（按普通输入
+ * 处理）；options 为 null/空 → 自由文本题。
+ */
+export interface ToolRequestUserInputOption {
+    label: string;
+    description: string;
+}
+export interface ToolRequestUserInputQuestion {
+    id: string;
+    header: string;
+    question: string;
+    isOther: boolean;
+    isSecret: boolean;
+    options: ToolRequestUserInputOption[] | null;
+}
+export interface ToolRequestUserInputParams {
+    threadId: string;
+    turnId: string;
+    itemId: string;
+    questions: ToolRequestUserInputQuestion[];
+    autoResolutionMs?: number | null;
+}
+export interface ToolRequestUserInputAnswer {
+    answers: string[];
+}
+export interface ToolRequestUserInputResponse {
+    answers: Record<string, ToolRequestUserInputAnswer>;
+}
 /** Unsupported / ignored server request methods. */
 export declare const UNSUPPORTED_SERVER_REQUEST_METHODS: Set<string>;

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

@@ -7,18 +7,6 @@
  * (`item/agentMessage/delta`) and snake_case only where the server requires it
  * (e.g. permission profile fields).
  */
-/** Standard JSON-RPC error codes. */
-export const RpcErrorCode = {
-    PARSE_ERROR: -32700,
-    INVALID_REQUEST: -32600,
-    METHOD_NOT_FOUND: -32601,
-    INVALID_PARAMS: -32602,
-    INTERNAL_ERROR: -32603,
-    /** Timeout error (custom, not standard JSON-RPC). */
-    TIMEOUT_ERROR: -32000,
-    /** Connection lost / transport error (custom). */
-    CONNECTION_LOST: -32001,
-};
 // =============================================================================
 // Notifications (server → client)
 // =============================================================================
@@ -42,6 +30,7 @@ export const NotificationMethod = {
     WARNING: 'warning',
     THREAD_STARTED: 'thread/started',
     THREAD_STATUS_CHANGED: 'thread/status/changed',
+    THREAD_SETTINGS_UPDATED: 'thread/settings/updated',
     THREAD_COMPACTED: 'thread/compacted',
     MODEL_REROUTED: 'model/rerouted',
 };
@@ -52,10 +41,10 @@ export const ServerRequestMethod = {
     COMMAND_EXECUTION_APPROVAL: 'item/commandExecution/requestApproval',
     FILE_CHANGE_APPROVAL: 'item/fileChange/requestApproval',
     PERMISSIONS_APPROVAL: 'item/permissions/requestApproval',
+    REQUEST_USER_INPUT: 'item/tool/requestUserInput',
 };
 /** Unsupported / ignored server request methods. */
 export const UNSUPPORTED_SERVER_REQUEST_METHODS = new Set([
-    'item/tool/requestUserInput',
     'mcpServer/elicitation/request',
     'item/tool/call',
     'account/chatgptAuthTokens/refresh',

package/dist/runner/codex/app-server/runner.d.ts

@@ -5,9 +5,16 @@
  * 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 type { AgentKind, AgentSessionReader, AgentEvent, AgentRunner, AgentStatusInfo, SpawnOptions } from '../../types.js';
-import { type AskForApproval, type SandboxMode } from './protocol-types.js';
+import type { AgentKind, AgentSessionReader, AgentEvent, AgentStatusInfo, SpawnOptions } from '../../types.js';
+import { JsonRpcClient } from '../../common/jsonrpc/client.js';
+import { type TranslatorEvent } from './translator.js';
+import { type AskForApproval, type SandboxMode, type SandboxPolicy, type InitializeResult } from './protocol-types.js';
+import { ConnectionBasedRunner } from '../../common/connection-based-runner.js';
 export interface CodexAppServerRunnerOptions {
     kind: AgentKind;
     sessionReader: AgentSessionReader;
@@ -31,90 +38,76 @@ export interface CodexAppServerRunnerOptions {
     /** Configured approval policy (Codex 官方 AskForApproval 标准值). */
     approvalPolicy?: AskForApproval;
 }
-export declare class CodexAppServerRunner implements AgentRunner {
-    readonly kind: AgentKind;
-    readonly sessionReader: AgentSessionReader;
-    readonly lifetime: "workspace";
+/**
+ * Map the client-side SandboxMode enum to the response-side SandboxPolicy
+ * object used by `thread/settings/update` (`sandboxPolicy`).
+ */
+export declare function sandboxModeToSandboxPolicy(mode: SandboxMode): SandboxPolicy;
+/**
+ * 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 declare const THREAD_CONFIG_DEFAULT_MODE_REQUEST_USER_INPUT: {
+    readonly 'features.default_mode_request_user_input': true;
+};
+export declare class CodexAppServerRunner extends ConnectionBasedRunner<JsonRpcClient<InitializeResult>, TranslatorEvent> {
     private connectionManager;
-    private currentClient;
     private currentTranslator;
-    private currentThreadId;
-    private currentTurnId;
-    private lastEventAt;
-    private _isRunning;
+    private activeThreadId;
     private model?;
     private modelProvider?;
     private reasoningEffort?;
     private sandboxConfig?;
     private approvalPolicyConfig?;
-    private readonly turnTimeoutMs;
     /** Pending approval requests: requestId (JSON-RPC id) → kind + view. */
     private pendingApprovals;
-    /** Notification queue consumed by the active run generator. */
-    private notificationQueue;
-    private waitResolve;
-    private forceFinish;
-    /** stop() 在 turn/start 响应前到达时置位，turn/start 完成后补发 interrupt。 */
-    private stopRequested;
     constructor(opts: CodexAppServerRunnerOptions);
-    get isRunning(): boolean;
-    /**
-     * Run a message in the current thread.
-     *
-     * 进程容错：若 app-server 子进程被外部误杀或自身异常退出（连接丢失），
-     * 自动重拉进程并重试一次 setup（thread/start 或按 sessionId thread/resume
-     * 继续处理），保证消费用户消息时进程挂了也能恢复。
-     */
-    run(message: string, opts: SpawnOptions): AsyncGenerator<AgentEvent>;
-    /**
-     * Acquire the connection and set up the turn: thread/start（新会话）或
-     * thread/resume（按 sessionId 恢复既有线程）→ turn/start。
-     */
-    private setupTurn;
+    protected get logTag(): string;
+    protected get turnTimeoutErrorMessage(): string;
+    protected get turnInterruptedErrorMessage(): string;
+    protected currentSessionId(): string | null;
+    protected shouldDeferStop(): boolean;
+    protected cancelCurrentTurn(): Promise<void>;
+    protected clearTurnState(): void;
+    protected releaseConnection(cwd: string): Promise<void>;
+    protected notifyIdle(cwd: string): void;
+    protected disposeConnections(): Promise<void>;
     /**
      * Run a compact operation on the current thread.
      */
     runCompact(_message: string, opts: SpawnOptions): AsyncGenerator<AgentEvent>;
-    /**
-     * Stop the current turn by interrupting it.
-     */
-    stop(_opts?: {
-        immediate?: boolean;
-    }): Promise<void>;
     /**
      * Respond to an approval server request. `response` is the bridge
      * ApprovalAction (`{ action: 'accept' | 'accept_for_session' | 'decline' | 'cancel' }`).
      */
     respondApproval(requestId: number | string, response: unknown): Promise<void>;
+    getStatusInfo(): AgentStatusInfo;
     /**
-     * Dispose the runner: release the connection.
+     * 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.
      */
-    dispose(): Promise<void>;
-    getUsageAuthority(): 'live';
-    killOrphan(): void;
-    registerExitHandlers(): void;
-    unregisterExitHandlers(): void;
-    getStatusInfo(): AgentStatusInfo;
+    updateApprovalMode(settings: {
+        approvalPolicy?: AskForApproval;
+        sandbox?: SandboxMode;
+    }): Promise<void>;
     private buildThreadParams;
     private buildTurnParams;
     /**
-     * Consume the notification queue until a result event arrives or the turn
-     * times out / is interrupted.
-     */
-    private consumeTurn;
-    /**
-     * 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。
      */
-    private nextTurnIdleDeadline;
-    private interruptCurrentTurn;
-    private waitForEvents;
+    protected setupTurn(message: string, opts: SpawnOptions): Promise<void>;
     private handleNotification;
     private handleServerRequest;
-    private pushEvents;
-    private wakeWaiters;
-    private failTurn;
-    private resetRunState;
     private buildGrantedPermissions;
     /** 拒绝权限审批：空 fileSystem + 关闭网络（真实 GrantedPermissionProfile）。 */
     private denyAllPermissions;