@ccpocket-base-auth/bridge 1.26.0 → 1.27.0

package/README.md

@@ -12,6 +12,10 @@ npx @ccpocket/bridge@latest
 
 A QR code will appear in your terminal. Scan it with the ccpocket mobile app to connect.
 
+> Warning
+> Versions older than `1.25.0` are deprecated and should not be used for new installs due to potential Anthropic policy concerns around OAuth-based usage.
+> Upgrade to `>=1.25.0` and use `ANTHROPIC_API_KEY` instead of OAuth.
+
 ## Installation
 
 ```bash

package/dist/codex-process.d.ts

@@ -69,6 +69,7 @@ export declare class CodexProcess extends EventEmitter<CodexProcessEvents> {
     private _pendingPlanInput;
     get status(): ProcessStatus;
     get isWaitingForInput(): boolean;
+    private getMessageModel;
     get sessionId(): string | null;
     get agentNickname(): string | null;
     get agentRole(): string | null;

package/dist/codex-process.js

@@ -42,6 +42,9 @@ export class CodexProcess extends EventEmitter {
     get isWaitingForInput() {
         return this.inputResolve !== null;
     }
+    getMessageModel() {
+        return sanitizeCodexModel(this.startModel) ?? "";
+    }
     get sessionId() {
         return this._threadId;
     }
@@ -98,14 +101,14 @@ export class CodexProcess extends EventEmitter {
         await this.request("thread/archive", { threadId });
     }
     async listThreads(params = {}) {
-        const result = await this.request("thread/list", {
+        const result = (await this.request("thread/list", {
             sortKey: "updated_at",
             archived: false,
             ...(params.limit != null ? { limit: params.limit } : {}),
             ...(params.cursor !== undefined ? { cursor: params.cursor } : {}),
             ...(params.cwd ? { cwd: params.cwd } : {}),
             ...(params.searchTerm ? { searchTerm: params.searchTerm } : {}),
-        });
+        }));
         const data = Array.isArray(result.data)
             ? result.data.map((entry) => toCodexThreadSummary(entry))
             : [];
@@ -157,7 +160,7 @@ export class CodexProcess extends EventEmitter {
         this.pendingApprovals.clear();
         this.pendingUserInputs.clear();
         this.lastTokenUsage = null;
-        this.startModel = options?.model;
+        this.startModel = sanitizeCodexModel(options?.model);
         this._approvalPolicy = options?.approvalPolicy ?? "never";
         this._collaborationMode = options?.collaborationMode ?? "default";
         this.lastPlanItemText = null;
@@ -188,7 +191,10 @@ export class CodexProcess extends EventEmitter {
             if (this.stopped)
                 return;
             console.error("[codex-process] app-server process error:", err);
-            this.emitMessage({ type: "error", message: `Failed to start codex app-server: ${err.message}` });
+            this.emitMessage({
+                type: "error",
+                message: `Failed to start codex app-server: ${err.message}`,
+            });
             this.setStatus("idle");
             this.emit("exit", 1);
         });
@@ -197,7 +203,10 @@ export class CodexProcess extends EventEmitter {
             this.child = null;
             this.rejectAllPending(new Error("codex app-server exited"));
             if (!this.stopped && exitCode !== 0) {
-                this.emitMessage({ type: "error", message: `codex app-server exited with code ${exitCode}` });
+                this.emitMessage({
+                    type: "error",
+                    message: `codex app-server exited with code ${exitCode}`,
+                });
             }
             this.setStatus("idle");
             this.emit("exit", code);
@@ -244,7 +253,8 @@ export class CodexProcess extends EventEmitter {
     }
     approve(toolUseId, _updatedInput) {
         // Check if this is a plan completion approval
-        if (this.pendingPlanCompletion && toolUseId === this.pendingPlanCompletion.toolUseId) {
+        if (this.pendingPlanCompletion &&
+            toolUseId === this.pendingPlanCompletion.toolUseId) {
             this.handlePlanApproved(_updatedInput);
             return;
         }
@@ -275,7 +285,8 @@ export class CodexProcess extends EventEmitter {
     }
     reject(toolUseId, _message) {
         // Check if this is a plan completion rejection
-        if (this.pendingPlanCompletion && toolUseId === this.pendingPlanCompletion.toolUseId) {
+        if (this.pendingPlanCompletion &&
+            toolUseId === this.pendingPlanCompletion.toolUseId) {
             this.handlePlanRejected(_message);
             return;
         }
@@ -359,7 +370,9 @@ export class CodexProcess extends EventEmitter {
      * Plan approved → switch to Default mode and auto-start execution.
      */
     handlePlanApproved(updatedInput) {
-        const planText = updatedInput?.plan ?? this.pendingPlanCompletion?.planText ?? "";
+        const planText = updatedInput?.plan ??
+            this.pendingPlanCompletion?.planText ??
+            "";
         const resolvedToolUseId = this.pendingPlanCompletion?.toolUseId;
         this.pendingPlanCompletion = null;
         this._collaborationMode = "default";
@@ -418,8 +431,9 @@ export class CodexProcess extends EventEmitter {
                 experimentalRawEvents: false,
                 persistExtendedHistory: true,
             };
-            if (options?.model)
-                threadParams.model = options.model;
+            const requestedModel = sanitizeCodexModel(options?.model);
+            if (requestedModel)
+                threadParams.model = requestedModel;
             if (options?.modelReasoningEffort) {
                 threadParams.effort = normalizeReasoningEffort(options.modelReasoningEffort);
             }
@@ -442,11 +456,9 @@ export class CodexProcess extends EventEmitter {
             if (options?.threadId) {
                 threadParams.persistExtendedHistory = true;
             }
-            const response = await this.request(method, threadParams);
+            const response = (await this.request(method, threadParams));
             const thread = response.thread;
-            const threadId = typeof thread?.id === "string"
-                ? thread.id
-                : options?.threadId;
+            const threadId = typeof thread?.id === "string" ? thread.id : options?.threadId;
             if (!threadId) {
                 throw new Error(`${method} returned no thread id`);
             }
@@ -454,12 +466,34 @@ export class CodexProcess extends EventEmitter {
             if (typeof thread?.model === "string" && thread.model) {
                 this.startModel = thread.model;
             }
+            const resolvedSettings = extractResolvedSettingsFromThreadResponse(response);
+            if (resolvedSettings.model) {
+                this.startModel = resolvedSettings.model;
+            }
             this._threadId = threadId;
             this.emitMessage({
                 type: "system",
                 subtype: "init",
                 sessionId: threadId,
-                model: this.startModel ?? "codex",
+                provider: "codex",
+                ...(sanitizeCodexModel(this.startModel)
+                    ? { model: sanitizeCodexModel(this.startModel) }
+                    : {}),
+                ...(resolvedSettings.approvalPolicy
+                    ? { approvalPolicy: resolvedSettings.approvalPolicy }
+                    : {}),
+                ...(resolvedSettings.sandboxMode
+                    ? { sandboxMode: resolvedSettings.sandboxMode }
+                    : {}),
+                ...(resolvedSettings.modelReasoningEffort
+                    ? { modelReasoningEffort: resolvedSettings.modelReasoningEffort }
+                    : {}),
+                ...(resolvedSettings.networkAccessEnabled !== undefined
+                    ? { networkAccessEnabled: resolvedSettings.networkAccessEnabled }
+                    : {}),
+                ...(resolvedSettings.webSearchMode
+                    ? { webSearchMode: resolvedSettings.webSearchMode }
+                    : {}),
             });
             this.setStatus("idle");
             // Fetch skills in background (non-blocking)
@@ -472,7 +506,12 @@ export class CodexProcess extends EventEmitter {
                 const message = err instanceof Error ? err.message : String(err);
                 console.error("[codex-process] bootstrap error:", err);
                 this.emitMessage({ type: "error", message: `Codex error: ${message}` });
-                this.emitMessage({ type: "result", subtype: "error", error: message, sessionId: this._threadId ?? undefined });
+                this.emitMessage({
+                    type: "result",
+                    subtype: "error",
+                    error: message,
+                    sessionId: this._threadId ?? undefined,
+                });
             }
             this.setStatus("idle");
             this.emit("exit", 1);
@@ -499,10 +538,10 @@ export class CodexProcess extends EventEmitter {
     async fetchSkills(projectPath) {
         const TIMEOUT_MS = 10_000;
         try {
-            const result = await Promise.race([
+            const result = (await Promise.race([
                 this.request("skills/list", { cwds: [projectPath] }),
                 new Promise((resolve) => setTimeout(() => resolve(null), TIMEOUT_MS)),
-            ]);
+            ]));
             if (this.stopped || !result?.data)
                 return;
             const skills = [];
@@ -517,7 +556,9 @@ export class CodexProcess extends EventEmitter {
                             name: skill.name,
                             path: skill.path,
                             description: skill.description,
-                            shortDescription: skill.shortDescription ?? skill.interface?.shortDescription ?? undefined,
+                            shortDescription: skill.shortDescription ??
+                                skill.interface?.shortDescription ??
+                                undefined,
                             enabled: skill.enabled,
                             scope: skill.scope,
                             displayName: skill.interface?.displayName ?? undefined,
@@ -558,7 +599,10 @@ export class CodexProcess extends EventEmitter {
             if (this.stopped || !pendingInput.text)
                 break;
             if (!this._threadId) {
-                this.emitMessage({ type: "error", message: "Codex thread is not initialized" });
+                this.emitMessage({
+                    type: "error",
+                    message: "Codex thread is not initialized",
+                });
                 continue;
             }
             const { input, tempPaths } = await this.toRpcInput(pendingInput);
@@ -574,15 +618,18 @@ export class CodexProcess extends EventEmitter {
                     input,
                     approvalPolicy: normalizeApprovalPolicy(this._approvalPolicy),
                 };
-                if (options?.model)
-                    params.model = options.model;
+                const requestedModel = sanitizeCodexModel(options?.model);
+                if (requestedModel)
+                    params.model = requestedModel;
                 if (options?.modelReasoningEffort) {
                     params.effort = normalizeReasoningEffort(options.modelReasoningEffort);
                 }
                 // Always send collaborationMode so the server switches modes correctly.
                 // Omitting it causes the server to persist the previous turn's mode.
                 const modeSettings = {
-                    model: options?.model || this.startModel || "gpt-5.4",
+                    model: requestedModel
+                        || sanitizeCodexModel(this.startModel)
+                        || "gpt-5.4",
                 };
                 if (this._collaborationMode === "plan") {
                     modeSettings.reasoning_effort = "medium";
@@ -646,11 +693,15 @@ export class CodexProcess extends EventEmitter {
         }
     }
     handleRpcEnvelope(envelope) {
-        if (envelope.id != null && envelope.method && envelope.result === undefined && envelope.error === undefined) {
+        if (envelope.id != null &&
+            envelope.method &&
+            envelope.result === undefined &&
+            envelope.error === undefined) {
             this.handleServerRequest(envelope.id, envelope.method, envelope.params ?? {});
             return;
         }
-        if (envelope.id != null && (envelope.result !== undefined || envelope.error)) {
+        if (envelope.id != null &&
+            (envelope.result !== undefined || envelope.error)) {
             this.handleRpcResponse(envelope);
             return;
         }
@@ -678,16 +729,38 @@ export class CodexProcess extends EventEmitter {
             case "item/commandExecution/requestApproval": {
                 const toolUseId = this.extractToolUseId(params, id);
                 const input = {
-                    ...(typeof params.command === "string" ? { command: params.command } : {}),
+                    ...(typeof params.command === "string"
+                        ? { command: params.command }
+                        : {}),
                     ...(typeof params.cwd === "string" ? { cwd: params.cwd } : {}),
-                    ...(params.commandActions ? { commandActions: params.commandActions } : {}),
-                    ...(params.networkApprovalContext ? { networkApprovalContext: params.networkApprovalContext } : {}),
-                    ...(params.additionalPermissions ? { additionalPermissions: params.additionalPermissions } : {}),
-                    ...(params.skillMetadata ? { skillMetadata: params.skillMetadata } : {}),
-                    ...(params.proposedExecpolicyAmendment ? { proposedExecpolicyAmendment: params.proposedExecpolicyAmendment } : {}),
-                    ...(params.proposedNetworkPolicyAmendments ? { proposedNetworkPolicyAmendments: params.proposedNetworkPolicyAmendments } : {}),
-                    ...(params.availableDecisions ? { availableDecisions: params.availableDecisions } : {}),
-                    ...(typeof params.reason === "string" ? { reason: params.reason } : {}),
+                    ...(params.commandActions
+                        ? { commandActions: params.commandActions }
+                        : {}),
+                    ...(params.networkApprovalContext
+                        ? { networkApprovalContext: params.networkApprovalContext }
+                        : {}),
+                    ...(params.additionalPermissions
+                        ? { additionalPermissions: params.additionalPermissions }
+                        : {}),
+                    ...(params.skillMetadata
+                        ? { skillMetadata: params.skillMetadata }
+                        : {}),
+                    ...(params.proposedExecpolicyAmendment
+                        ? {
+                            proposedExecpolicyAmendment: params.proposedExecpolicyAmendment,
+                        }
+                        : {}),
+                    ...(params.proposedNetworkPolicyAmendments
+                        ? {
+                            proposedNetworkPolicyAmendments: params.proposedNetworkPolicyAmendments,
+                        }
+                        : {}),
+                    ...(params.availableDecisions
+                        ? { availableDecisions: params.availableDecisions }
+                        : {}),
+                    ...(typeof params.reason === "string"
+                        ? { reason: params.reason }
+                        : {}),
                 };
                 this.pendingApprovals.set(toolUseId, {
                     requestId: id,
@@ -709,8 +782,12 @@ export class CodexProcess extends EventEmitter {
                 const toolUseId = this.extractToolUseId(params, id);
                 const input = {
                     ...(Array.isArray(params.changes) ? { changes: params.changes } : {}),
-                    ...(typeof params.grantRoot === "string" ? { grantRoot: params.grantRoot } : {}),
-                    ...(typeof params.reason === "string" ? { reason: params.reason } : {}),
+                    ...(typeof params.grantRoot === "string"
+                        ? { grantRoot: params.grantRoot }
+                        : {}),
+                    ...(typeof params.reason === "string"
+                        ? { reason: params.reason }
+                        : {}),
                 };
                 this.pendingApprovals.set(toolUseId, {
                     requestId: id,
@@ -767,7 +844,9 @@ export class CodexProcess extends EventEmitter {
                 const requestedPermissions = asRecord(params.permissions) ?? {};
                 const input = {
                     permissions: requestedPermissions,
-                    ...(typeof params.reason === "string" ? { reason: params.reason } : {}),
+                    ...(typeof params.reason === "string"
+                        ? { reason: params.reason }
+                        : {}),
                 };
                 this.pendingApprovals.set(toolUseId, {
                     requestId: id,
@@ -905,7 +984,7 @@ export class CodexProcess extends EventEmitter {
                         id: randomUUID(),
                         role: "assistant",
                         content: [{ type: "text", text }],
-                        model: "codex",
+                        model: this.getMessageModel(),
                     },
                 });
                 break;
@@ -947,7 +1026,9 @@ export class CodexProcess extends EventEmitter {
                 subtype: "success",
                 sessionId: this._threadId ?? undefined,
                 ...(usage?.input != null ? { inputTokens: usage.input } : {}),
-                ...(usage?.cachedInput != null ? { cachedInputTokens: usage.cachedInput } : {}),
+                ...(usage?.cachedInput != null
+                    ? { cachedInputTokens: usage.cachedInput }
+                    : {}),
                 ...(usage?.output != null ? { outputTokens: usage.output } : {}),
             });
         }
@@ -971,7 +1052,8 @@ export class CodexProcess extends EventEmitter {
         }
         else {
             this.lastPlanItemText = null;
-            if (this.pendingApprovals.size === 0 && this.pendingUserInputs.size === 0) {
+            if (this.pendingApprovals.size === 0 &&
+                this.pendingUserInputs.size === 0) {
                 this.setStatus("idle");
             }
         }
@@ -1005,7 +1087,7 @@ export class CodexProcess extends EventEmitter {
                                 input: { command: commandText },
                             },
                         ],
-                        model: "codex",
+                        model: this.getMessageModel(),
                     },
                 });
                 break;
@@ -1026,7 +1108,7 @@ export class CodexProcess extends EventEmitter {
                                 },
                             },
                         ],
-                        model: "codex",
+                        model: this.getMessageModel(),
                     },
                 });
                 break;
@@ -1046,7 +1128,7 @@ export class CodexProcess extends EventEmitter {
                                 input: toToolUseInput(item.arguments),
                             },
                         ],
-                        model: "codex",
+                        model: this.getMessageModel(),
                     },
                 });
                 break;
@@ -1057,10 +1139,16 @@ export class CodexProcess extends EventEmitter {
                 const input = {
                     tool,
                     ...(typeof item.prompt === "string" ? { prompt: item.prompt } : {}),
-                    ...(typeof item.senderThreadId === "string" ? { senderThreadId: item.senderThreadId } : {}),
-                    ...(Array.isArray(item.receiverThreadIds) ? { receiverThreadIds: item.receiverThreadIds } : {}),
+                    ...(typeof item.senderThreadId === "string"
+                        ? { senderThreadId: item.senderThreadId }
+                        : {}),
+                    ...(Array.isArray(item.receiverThreadIds)
+                        ? { receiverThreadIds: item.receiverThreadIds }
+                        : {}),
                     ...(typeof item.model === "string" ? { model: item.model } : {}),
-                    ...(typeof item.reasoningEffort === "string" ? { reasoningEffort: item.reasoningEffort } : {}),
+                    ...(typeof item.reasoningEffort === "string"
+                        ? { reasoningEffort: item.reasoningEffort }
+                        : {}),
                     ...(item.agentsStates ? { agentsStates: item.agentsStates } : {}),
                 };
                 this.emitMessage({
@@ -1076,7 +1164,7 @@ export class CodexProcess extends EventEmitter {
                                 input,
                             },
                         ],
-                        model: "codex",
+                        model: this.getMessageModel(),
                     },
                 });
                 break;
@@ -1101,7 +1189,7 @@ export class CodexProcess extends EventEmitter {
                         id: itemId,
                         role: "assistant",
                         content: [{ type: "text", text }],
-                        model: "codex",
+                        model: this.getMessageModel(),
                     },
                 });
                 break;
@@ -1157,7 +1245,7 @@ export class CodexProcess extends EventEmitter {
                                 input: item.arguments ?? {},
                             },
                         ],
-                        model: "codex",
+                        model: this.getMessageModel(),
                     },
                 });
                 this.emitMessage({
@@ -1197,7 +1285,7 @@ export class CodexProcess extends EventEmitter {
                                 input: { query },
                             },
                         ],
-                        model: "codex",
+                        model: this.getMessageModel(),
                     },
                 });
                 this.emitMessage({
@@ -1249,7 +1337,11 @@ export class CodexProcess extends EventEmitter {
         const tempPaths = [];
         // Prepend SkillUserInput if a skill reference is attached
         if (pendingInput.skill) {
-            input.push({ type: "skill", name: pendingInput.skill.name, path: pendingInput.skill.path });
+            input.push({
+                type: "skill",
+                name: pendingInput.skill.name,
+                path: pendingInput.skill.path,
+            });
         }
         input.push({ type: "text", text: pendingInput.text });
         if (!pendingInput.images || pendingInput.images.length === 0) {
@@ -1354,14 +1446,22 @@ export class CodexProcess extends EventEmitter {
         const approval = [...this.pendingApprovals.values()].find((entry) => entry.requestId === requestId);
         if (approval) {
             this.pendingApprovals.delete(approval.toolUseId);
-            this.emitMessage({ type: "permission_resolved", toolUseId: approval.toolUseId });
+            this.emitMessage({
+                type: "permission_resolved",
+                toolUseId: approval.toolUseId,
+            });
         }
         const inputRequest = [...this.pendingUserInputs.values()].find((entry) => entry.requestId === requestId);
         if (inputRequest) {
             this.pendingUserInputs.delete(inputRequest.toolUseId);
-            this.emitMessage({ type: "permission_resolved", toolUseId: inputRequest.toolUseId });
+            this.emitMessage({
+                type: "permission_resolved",
+                toolUseId: inputRequest.toolUseId,
+            });
         }
-        if (!this.pendingPlanCompletion && this.pendingApprovals.size === 0 && this.pendingUserInputs.size === 0) {
+        if (!this.pendingPlanCompletion &&
+            this.pendingApprovals.size === 0 &&
+            this.pendingUserInputs.size === 0) {
             this.setStatus(this.pendingTurnId ? "running" : "idle");
         }
     }
@@ -1417,13 +1517,56 @@ function normalizeReasoningEffort(value) {
             return value;
     }
 }
+function sanitizeCodexModel(value) {
+    if (typeof value !== "string")
+        return undefined;
+    const normalized = value.trim();
+    if (!normalized || normalized === "codex")
+        return undefined;
+    return normalized;
+}
+function extractResolvedSettingsFromThreadResponse(response) {
+    const thread = response.thread;
+    const sandbox = response.sandbox;
+    return {
+        model: sanitizeCodexModel(response.model)
+            ?? sanitizeCodexModel(thread?.model),
+        approvalPolicy: typeof response.approvalPolicy === "string"
+            ? response.approvalPolicy
+            : undefined,
+        sandboxMode: normalizeSandboxModeFromRpc(sandbox?.type),
+        modelReasoningEffort: typeof response.reasoningEffort === "string"
+            ? response.reasoningEffort
+            : undefined,
+        networkAccessEnabled: typeof sandbox?.networkAccess === "boolean"
+            ? sandbox.networkAccess
+            : undefined,
+        webSearchMode: typeof response.webSearchMode === "string"
+            ? response.webSearchMode
+            : undefined,
+    };
+}
+function normalizeSandboxModeFromRpc(value) {
+    switch (value) {
+        case "dangerFullAccess":
+            return "danger-full-access";
+        case "workspaceWrite":
+            return "workspace-write";
+        case "readOnly":
+            return "read-only";
+        default:
+            return typeof value === "string" && value.length > 0 ? value : undefined;
+    }
+}
 function normalizeItemType(raw) {
     if (typeof raw !== "string")
         return "";
     return raw.replace(/[_\s-]/g, "").toLowerCase();
 }
 function numberOrUndefined(value) {
-    return typeof value === "number" && Number.isFinite(value) ? value : undefined;
+    return typeof value === "number" && Number.isFinite(value)
+        ? value
+        : undefined;
 }
 function stringOrNull(value) {
     return typeof value === "string" && value.trim().length > 0 ? value : null;
@@ -1458,7 +1601,9 @@ function toToolUseInput(value) {
 function formatDynamicToolResult(item) {
     const status = typeof item.status === "string" ? item.status : "completed";
     const success = typeof item.success === "boolean" ? item.success : null;
-    const contentItems = Array.isArray(item.contentItems) ? item.contentItems : null;
+    const contentItems = Array.isArray(item.contentItems)
+        ? item.contentItems
+        : null;
     const parts = [
         `status: ${status}`,
         ...(success != null ? [`success: ${success}`] : []),
@@ -1536,7 +1681,9 @@ function normalizeMcpToolResult(result) {
     const imageCount = rawContentBlocks.filter((entry) => entry.type === "image").length;
     if (imageCount > 0) {
         return {
-            content: imageCount === 1 ? "Generated 1 image" : `Generated ${imageCount} images`,
+            content: imageCount === 1
+                ? "Generated 1 image"
+                : `Generated ${imageCount} images`,
             rawContentBlocks,
         };
     }
@@ -1639,7 +1786,9 @@ function normalizeUserInputQuestions(raw) {
         .map((entry, index) => {
         const id = typeof entry.id === "string" ? entry.id : `question_${index + 1}`;
         const question = typeof entry.question === "string" ? entry.question : "";
-        const header = typeof entry.header === "string" ? entry.header : `Question ${index + 1}`;
+        const header = typeof entry.header === "string"
+            ? entry.header
+            : `Question ${index + 1}`;
         const optionsRaw = Array.isArray(entry.options) ? entry.options : [];
         const options = optionsRaw
             .filter((option) => !!option && typeof option === "object")
@@ -1821,7 +1970,9 @@ function createElicitationInput(params) {
         const field = value;
         const title = typeof field.title === "string" ? field.title : key;
         const description = typeof field.description === "string" ? field.description : message;
-        const enumValues = Array.isArray(field.enum) ? field.enum.map((entry) => String(entry)) : [];
+        const enumValues = Array.isArray(field.enum)
+            ? field.enum.map((entry) => String(entry))
+            : [];
         const type = typeof field.type === "string" ? field.type : "";
         const options = enumValues.length > 0
             ? enumValues.map((entry, index) => ({