fix(server): avoid color probe hangs in setup terminals

Julius Marminge committed 2 months ago

Commit e1da3351 parent 00d61094 files · +21 −8Browse files

Unified · Split

4 files

         terminalId: "setup-default-setup",
         cwd: "/repo/worktrees/a",
         worktreePath: "/repo/worktrees/a",
-        env: { T3CODE_PROJECT_ROOT: "/repo/project", T3CODE_WORKTREE_PATH: "/repo/worktrees/a" },
+        env: {
+          T3CODE_PROJECT_ROOT: "/repo/project",
+          T3CODE_WORKTREE_PATH: "/repo/worktrees/a",
+          COLORTERM: "",
+        },
       });
       expect(write).toHaveBeenCalledWith({
         threadId: "thread-1",
           env: {
             T3CODE_PROJECT_ROOT: "/repo/project",
             T3CODE_WORKTREE_PATH: "/repo/worktrees/a",
+            COLORTERM: "",
           },
         });
         expect(write).toHaveBeenCalledWith({

     const terminalId = input.preferredTerminalId ?? `setup-${script.id}`;
     const cwd = input.worktreePath;
-    const env = projectScriptRuntimeEnv({
+    const env = {
-      project: { cwd: project.workspaceRoot },
+      ...projectScriptRuntimeEnv({
-      worktreePath: input.worktreePath,
+        project: { cwd: project.workspaceRoot },
-    });
+        worktreePath: input.worktreePath,
+      }),
+      // Setup runs before a client necessarily attaches. Truecolor probing in
+      // tools such as vp can wait for terminal replies that nobody can send.
+      // Keep TERM's 256-color support without advertising truecolor here.
+      COLORTERM: "",
+    };
     yield* terminalManager
       .open({

           [undefined, undefined, "truecolor"],
           ["", undefined, "truecolor"],
           ["24bit", undefined, "24bit"],
-          ["24bit", "", "truecolor"],
+          ["24bit", "", ""],
+          [undefined, "", ""],
           ["24bit", "custom", "custom"],
         ] as const) {
           const env = Object.freeze({ COLORTERM: parentColor });

         key === "CODEX_HOME" || key === "CLAUDE_CONFIG_DIR" ? expandHomePath(value) : value;
     }
   }
-  // Both PTY backends feed truecolor-capable terminal clients.
+  // An explicit empty override opts out for terminals started without a client.
-  if (spawnEnv.COLORTERM === undefined || spawnEnv.COLORTERM === "") {
+  // Otherwise both PTY backends feed truecolor-capable terminal clients.
+  if (!spawnEnv.COLORTERM && runtimeEnv?.COLORTERM === undefined) {
     spawnEnv.COLORTERM = "truecolor";
   }
   return stripAppImageRuntimeEnv(spawnEnv);