instar 1.3.839 → 1.3.840

package/dashboard/index.html

@@ -3644,7 +3644,7 @@
            the dashboard (PIN → sign-in link → paste the code). Hidden when there's nothing to show. -->
       <section class="ph-section">
         <h3 class="ph-h">Accounts on each machine</h3>
-        <p class="ph-h-sub">Which subscription is set up on which machine. Tap “Set up” on an empty cell to add one — you’ll enter your PIN, open the sign-in link, and paste the code right here.</p>
+        <p class="ph-h-sub">Which subscription is set up on which machine. Tap “Set up” on an empty cell, or “Sign in” on a cell that needs attention — you’ll enter your PIN, open the sign-in link, and paste the code right here.</p>
         <div id="subMatrix"></div>
       </section>
       <section class="ph-section">

package/dashboard/subscriptions.js

@@ -512,7 +512,13 @@ export function buildMatrixModel(poolScope, pendingScope, transient = {}) {
     const mid = a && a.machineId;
     if (!a || !a.id || !mid || offlineMachineIds.has(mid)) continue;
     const status = effectiveAccountStatus(a);
-    cellStatus.set(`${a.id}::${mid}`, status === 'needs-reauth' ? 'needs-reauth' : (status === 'active' ? 'active' : 'other'));
+    const key = `${a.id}::${mid}`;
+    const next = status === 'needs-reauth' ? 'needs-reauth' : (status === 'active' ? 'active' : 'other');
+    // Pool reads may contain more than one observation for the same account/machine.
+    // Safety state is monotonic within a render: a later stale Active row must never
+    // overwrite a live identity-drift verdict.
+    const prior = cellStatus.get(key);
+    cellStatus.set(key, prior === 'needs-reauth' || next === 'needs-reauth' ? 'needs-reauth' : next);
   }
   // (accountId, machineId) in-progress, correlated on (login.id === accountId, machineId) (FD6 r3 #2).
   // The MAP carries the pending-login RECORD so the in-progress cell can render the COMPLETE
@@ -546,20 +552,22 @@ export function buildMatrixModel(poolScope, pendingScope, transient = {}) {
       if (m.offline) state = 'offline';                              // whole column offline (FD6)
       else if (t && t.state === 'held') state = 'held';
       else if (t && t.state === 'cant-resolve') state = 'cant-resolve';
-      else if (cellStatus.get(key) === 'active') state = 'active';
-      // just-verified BRIDGES the gap between a client-observed successful enrollment and the
-      // next pool read that shows the account active — the cell must flip to an unmistakable
-      // verified presentation the moment the enrollment verifies (topic 29836 D4), never blink
-      // back to a "Set up" button while the server catches up.
-      else if (t && t.state === 'just-verified') state = 'just-verified';
+      // Durable pending state wins over enrollment bookkeeping after restart: the
+      // full flow rehydrates into its cell even if the pool row still says Active.
       // broken (D5): the server says this attempt's sign-in pane is DEAD (record ⟂ pane
       // reconciliation) — or the client just watched a code-submit refuse with pane-dead.
       // Presenting it as submittable would be a lie; it gets an explicit needs-restart
       // presentation with a working Retry (start-cell supersedes the zombie atomically).
-      else if ((pendingLogin && pendingLogin.paneAlive === false) || (t && t.state === 'broken')) state = 'broken';
-      else if (pendingLogin) state = 'in-progress';
+      else if (cellStatus.get(key) === 'needs-reauth' && pendingLogin && pendingLogin.paneAlive === false) state = 'broken';
+      else if (cellStatus.get(key) === 'needs-reauth' && pendingLogin) state = 'in-progress';
       else if (t && t.state === 'expired') state = 'expired';
       else if (cellStatus.get(key) === 'needs-reauth') state = 'needs-reauth';
+      else if (cellStatus.get(key) === 'active') state = 'active';
+      else if ((pendingLogin && pendingLogin.paneAlive === false) || (t && t.state === 'broken')) state = 'broken';
+      else if (pendingLogin) state = 'in-progress';
+      // just-verified bridges the short interval before the pool row becomes active.
+      // Once active, keep state=active and carry this transient as the highlight detail.
+      else if (t && t.state === 'just-verified') state = 'just-verified';
       else state = 'empty';                                          // → "Set up" button
       rowCells.push({
         accountId: acct.accountId, machineId: m.machineId, state,

package/dist/commands/server.js

@@ -12353,7 +12353,7 @@ export async function startServer(options) {
         // a 2nd account never clobbers the 1st.
         const { PendingLoginStore } = await import('../core/PendingLoginStore.js');
         const { EnrollmentWizard } = await import('../core/EnrollmentWizard.js');
-        const { FrameworkLoginDriver, enrollPaneSessionName } = await import('../core/FrameworkLoginDriver.js');
+        const { FrameworkLoginDriver, enrollPaneSessionName, enrollmentBrowserEnv } = await import('../core/FrameworkLoginDriver.js');
         const DEFAULT_ENROLL_LOGIN_COMMANDS = {
             'claude-code': 'claude auth login',
             'codex-cli': 'codex login',
@@ -12402,16 +12402,16 @@ export async function startServer(options) {
                     }
                     return sessionManager.captureOutput(session, 120) || '';
                 },
-                spawn: async ({ framework, configHome }) => {
+                spawn: async ({ framework, configHome, openBrowser }) => {
                     const tmuxPath = detectTmuxPath();
                     if (!tmuxPath)
                         throw new Error('tmux not available for enrollment login');
                     const baseCmd = enrollLoginCommands[framework] ?? `${framework} login`;
                     // env-prefix sets the per-account config home for the login process so
                     // the credential lands in its own slot (CLAUDE_CONFIG_DIR isolation).
-                    const cmd = configHome
-                        ? `env CLAUDE_CONFIG_DIR=${JSON.stringify(configHome)} ${baseCmd}`
-                        : baseCmd;
+                    const env = { ...(configHome ? { CLAUDE_CONFIG_DIR: configHome } : {}), ...enrollmentBrowserEnv(openBrowser) };
+                    const prefix = Object.entries(env).map(([k, v]) => `${k}=${JSON.stringify(v)}`).join(' ');
+                    const cmd = prefix ? `env ${prefix} ${baseCmd}` : baseCmd;
                     const session = enrollPaneSessionName(framework, configHome);
                     try {
                         execFileSync(tmuxPath, ['kill-session', '-t', `=${session}`], { stdio: 'ignore' });