@wangyaoshen/remux 0.3.9-dev.390cb29 → 0.3.10-dev.574c4d2

package/packages/RemuxKit/Sources/RemuxKit/Storage/KeychainStore.swift

@@ -60,12 +60,12 @@ public struct KeychainStore: Sendable {
     }
 
     public func preferredCredential(forServer server: String) -> RemuxCredential? {
-        if let resumeToken = loadResumeToken(forServer: server) {
-            return .resumeToken(resumeToken)
-        }
         if let token = loadServerToken(forServer: server) {
             return .token(token)
         }
+        if let resumeToken = loadResumeToken(forServer: server) {
+            return .resumeToken(resumeToken)
+        }
         return nil
     }
 

package/packages/RemuxKit/Tests/RemuxKitTests/KeychainStoreTests.swift

@@ -95,13 +95,13 @@ struct KeychainStoreTests {
         #expect(servers.contains(resumeOnly))
     }
 
-    @Test("Preferred credential uses resume token before server token", .enabled(if: keychainAvailable))
-    func preferredCredentialPrefersResumeToken() throws {
+    @Test("Preferred credential uses server token before resume token", .enabled(if: keychainAvailable))
+    func preferredCredentialPrefersServerToken() throws {
         try store.saveServerToken("tok", forServer: testServer)
         try store.saveResumeToken("resume", forServer: testServer)
         defer { store.deleteAll(forServer: testServer) }
 
         let credential = store.preferredCredential(forServer: testServer)
-        #expect(credential == .resumeToken("resume"))
+        #expect(credential == .token("tok"))
     }
 }

package/pty-daemon.js

@@ -120,17 +120,23 @@ function main() {
     } catch {
     }
   }
-  const ptyProcess = pty.spawn(args.shell, [], {
-    name: "xterm-256color",
-    cols: args.cols,
-    rows: args.rows,
-    cwd: args.cwd,
-    env: {
-      ...process.env,
-      TERM: "xterm-256color",
-      COLORTERM: "truecolor"
-    }
-  });
+  let ptyProcess;
+  try {
+    ptyProcess = pty.spawn(args.shell, [], {
+      name: "xterm-256color",
+      cols: args.cols,
+      rows: args.rows,
+      cwd: args.cwd,
+      env: {
+        ...process.env,
+        TERM: "xterm-256color",
+        COLORTERM: "truecolor"
+      }
+    });
+  } catch (err) {
+    console.error(`[pty-daemon] failed to spawn PTY: ${err?.message || err}`);
+    process.exit(1);
+  }
   const scrollback = new RingBuffer();
   const clients = /* @__PURE__ */ new Set();
   let alive = true;