@ccpocket/bridge 1.80.1 → 1.80.2

package/dist/codex-process.d.ts

@@ -112,6 +112,9 @@ export declare class CodexProcess extends EventEmitter<CodexProcessEvents> {
     private _agentRole;
     private stopped;
     private startModel;
+    private readiness;
+    private readinessError;
+    private readinessWaiters;
     private inputResolve;
     private pendingTurnId;
     private pendingTurnCompletion;
@@ -243,6 +246,7 @@ export declare class CodexProcess extends EventEmitter<CodexProcessEvents> {
     listAvailableModelMetadata(): Promise<CodexModelMetadata[]>;
     start(projectPath: string, options?: CodexStartOptions): void;
     initializeOnly(projectPath: string): Promise<void>;
+    waitUntilReady(): Promise<void>;
     stop(): void;
     private prepareLaunch;
     private launchAppServer;
@@ -355,6 +359,9 @@ export declare class CodexProcess extends EventEmitter<CodexProcessEvents> {
     private respondToServerRequestError;
     private writeEnvelope;
     private rejectAllPending;
+    private resetReadiness;
+    private resolveReadiness;
+    private rejectReadiness;
     private setStatus;
     private emitMessage;
     private extractToolUseId;

package/dist/codex-process.js

@@ -33,7 +33,7 @@ export function isCodexThreadWriterConflict(error) {
 }
 export function codexErrorMessage(error) {
     if (isCodexThreadWriterConflict(error)) {
-        return "This Codex thread is already open in another client. Close it there and try again.";
+        return "This Codex thread is already open in Codex Desktop or the Codex App. Close it there, then try again.";
     }
     return error instanceof Error ? error.message : String(error);
 }
@@ -64,6 +64,9 @@ export class CodexProcess extends EventEmitter {
     _agentRole = null;
     stopped = false;
     startModel;
+    readiness = "pending";
+    readinessError;
+    readinessWaiters = new Set();
     inputResolve = null;
     pendingTurnId = null;
     pendingTurnCompletion = null;
@@ -407,6 +410,7 @@ export class CodexProcess extends EventEmitter {
         if (this.transport) {
             this.stop();
         }
+        this.resetReadiness();
         this.prepareLaunch(projectPath, options);
         this.launchAppServer(projectPath, options);
         void this.bootstrap(projectPath, options);
@@ -415,13 +419,32 @@ export class CodexProcess extends EventEmitter {
         if (this.transport) {
             this.stop();
         }
-        this.prepareLaunch(projectPath);
-        this.launchAppServer(projectPath);
-        await this.initializeRpcConnection();
-        this.setStatus("idle");
+        this.resetReadiness();
+        try {
+            this.prepareLaunch(projectPath);
+            this.launchAppServer(projectPath);
+            await this.initializeRpcConnection();
+            this.setStatus("idle");
+            this.resolveReadiness();
+        }
+        catch (error) {
+            this.rejectReadiness(error);
+            throw error;
+        }
+    }
+    waitUntilReady() {
+        if (this.readiness === "ready")
+            return Promise.resolve();
+        if (this.readiness === "failed") {
+            return Promise.reject(this.readinessError);
+        }
+        return new Promise((resolve, reject) => {
+            this.readinessWaiters.add({ resolve, reject });
+        });
     }
     stop() {
         this.stopped = true;
+        this.rejectReadiness(new Error("codex app-server stopped"));
         if (this.inputResolve) {
             this.inputResolve({ text: "" });
             this.inputResolve = null;
@@ -1108,6 +1131,7 @@ export class CodexProcess extends EventEmitter {
                 ...(cliJoin ? { codexCliJoin: cliJoin } : {}),
             });
             this.setStatus("idle");
+            this.resolveReadiness();
             // Fetch completion entities in background (non-blocking).
             this._projectPath = projectPath;
             setTimeout(() => {
@@ -1118,6 +1142,7 @@ export class CodexProcess extends EventEmitter {
             await this.runInputLoop(options);
         }
         catch (err) {
+            this.rejectReadiness(err);
             if (!this.stopped) {
                 const message = codexErrorMessage(err);
                 console.error("[codex-process] bootstrap error:", err);
@@ -2544,6 +2569,26 @@ export class CodexProcess extends EventEmitter {
             this.pendingTurnCompletion = null;
         }
     }
+    resetReadiness() {
+        this.rejectReadiness(new Error("codex app-server restarted"));
+        this.readiness = "pending";
+        this.readinessError = undefined;
+    }
+    resolveReadiness() {
+        if (this.readiness !== "pending")
+            return;
+        this.readiness = "ready";
+        for (const waiter of this.readinessWaiters)
+            waiter.resolve();
+        this.readinessWaiters.clear();
+    }
+    rejectReadiness(error) {
+        this.readiness = "failed";
+        this.readinessError = error;
+        for (const waiter of this.readinessWaiters)
+            waiter.reject(error);
+        this.readinessWaiters.clear();
+    }
     setStatus(status) {
         if (this._status !== status) {
             this._status = status;