@ccpocket/bridge 1.55.1 → 1.56.1

package/dist/websocket.js

@@ -32,7 +32,7 @@ const CLAUDE_MODELS = [
     "claude-sonnet-4-6",
     "claude-haiku-4-6",
 ];
-const CODEX_MODELS = [
+const FALLBACK_CODEX_MODELS = [
     "gpt-5.5",
     "gpt-5.4",
     "gpt-5.4-mini",
@@ -308,6 +308,8 @@ export class BridgeWebSocketServer {
     codexProfiles = [];
     defaultCodexProfile;
     codexProfilesRequest = null;
+    codexModels = FALLBACK_CODEX_MODELS;
+    codexModelsRequest = null;
     /** FCM token → push notification locale */
     tokenLocales = new Map();
     tokenPrivacyMode = new Map();
@@ -924,6 +926,7 @@ export class BridgeWebSocketServer {
     handleConnection(ws) {
         // Send session list and project history on connect
         void this.refreshCodexProfiles();
+        void this.refreshCodexModels();
         this.sendSessionList(ws);
         const projects = this.projectHistory?.getProjects() ?? [];
         this.send(ws, { type: "project_history", projects });
@@ -1119,6 +1122,9 @@ export class BridgeWebSocketServer {
                                 : {}),
                         }));
                         this.broadcastSessionList();
+                        if (provider === "codex") {
+                            void this.refreshCodexModels(projectPath);
+                        }
                         if (autoFallbackUsed) {
                             this.sendTip(ws, sessionId, "auto_mode_fallback_default", createdSession);
                         }
@@ -3982,7 +3988,7 @@ export class BridgeWebSocketServer {
             sessions,
             allowedDirs: this.allowedDirs,
             claudeModels: CLAUDE_MODELS,
-            codexModels: CODEX_MODELS,
+            codexModels: this.codexModels,
             codexProfiles: this.codexProfiles,
             defaultCodexProfile: this.defaultCodexProfile,
             bridgeVersion: getPackageVersion(),
@@ -4010,7 +4016,7 @@ export class BridgeWebSocketServer {
             sessions,
             allowedDirs: this.allowedDirs,
             claudeModels: CLAUDE_MODELS,
-            codexModels: CODEX_MODELS,
+            codexModels: this.codexModels,
             codexProfiles: this.codexProfiles,
             defaultCodexProfile: this.defaultCodexProfile,
             bridgeVersion: getPackageVersion(),
@@ -4081,6 +4087,38 @@ export class BridgeWebSocketServer {
             archivedSessionIds: this.archiveStore.archivedIds(),
         });
     }
+    async refreshCodexModels(projectPath) {
+        if (this.codexModelsRequest)
+            return this.codexModelsRequest;
+        this.codexModelsRequest = this.loadCodexModels(projectPath)
+            .then((models) => {
+            this.codexModels =
+                models.length > 0 ? models : FALLBACK_CODEX_MODELS;
+            this.broadcastSessionList();
+        })
+            .catch((err) => {
+            console.warn(`[ws] Failed to load Codex models: ${err}`);
+            this.codexModels = FALLBACK_CODEX_MODELS;
+            this.broadcastSessionList();
+        })
+            .finally(() => {
+            this.codexModelsRequest = null;
+        });
+        return this.codexModelsRequest;
+    }
+    async loadCodexModels(projectPath) {
+        const process = this.getActiveCodexProcess() ??
+            (await this.createStandaloneCodexProcess(projectPath));
+        const isStandalone = process !== this.getActiveCodexProcess();
+        try {
+            return await process.listAvailableModels();
+        }
+        finally {
+            if (isStandalone) {
+                process.stop();
+            }
+        }
+    }
     async refreshCodexProfiles(projectPath) {
         if (this.codexProfilesRequest)
             return this.codexProfilesRequest;
@@ -4444,6 +4482,10 @@ export class BridgeWebSocketServer {
             "core.quotePath=false",
             ...args,
         ];
+        const listUntrackedFiles = () => {
+            const out = execFileSync("git", gitArgs("ls-files", "-z", "--others", "--exclude-standard"), { cwd, encoding: "utf-8" });
+            return out.split("\0").filter(Boolean);
+        };
         // Staged only: git diff --cached
         if (options?.staged) {
             execFile("git", gitArgs("diff", "--cached", "--no-color"), execOpts, (err, stdout) => {
@@ -4460,10 +4502,7 @@ export class BridgeWebSocketServer {
             // Collect untracked files so they appear in the diff.
             let untrackedFiles = [];
             try {
-                const out = execFileSync("git", ["ls-files", "--others", "--exclude-standard"], { cwd })
-                    .toString()
-                    .trim();
-                untrackedFiles = out ? out.split("\n") : [];
+                untrackedFiles = listUntrackedFiles();
             }
             catch {
                 // Ignore errors: non-git directories are handled by git diff callback.
@@ -4471,7 +4510,7 @@ export class BridgeWebSocketServer {
             // Temporarily stage untracked files with --intent-to-add.
             if (untrackedFiles.length > 0) {
                 try {
-                    execFileSync("git", ["add", "--intent-to-add", ...untrackedFiles], {
+                    execFileSync("git", ["add", "--intent-to-add", "--", ...untrackedFiles], {
                         cwd,
                     });
                 }
@@ -4500,17 +4539,14 @@ export class BridgeWebSocketServer {
         // All mode (no options): git diff HEAD — shows both staged and unstaged vs HEAD
         let untrackedFilesAll = [];
         try {
-            const out = execFileSync("git", ["ls-files", "--others", "--exclude-standard"], { cwd })
-                .toString()
-                .trim();
-            untrackedFilesAll = out ? out.split("\n") : [];
+            untrackedFilesAll = listUntrackedFiles();
         }
         catch {
             // Ignore
         }
         if (untrackedFilesAll.length > 0) {
             try {
-                execFileSync("git", ["add", "--intent-to-add", ...untrackedFilesAll], {
+                execFileSync("git", ["add", "--intent-to-add", "--", ...untrackedFilesAll], {
                     cwd,
                 });
             }