agent-relay 11.10.4 → 12.0.0

package/dist/cli/lib/workspace-session.js

@@ -1,6 +1,6 @@
 import { getProjectPaths } from '@agent-relay/config';
 import { resolveWorkspaceKeyWithSource } from '@agent-relay/cloud/workspace-key';
-import { readProjectWorkspaceSession, writeProjectWorkspaceKey } from './project-workspace-key.js';
+import { readProjectWorkspaceSession, writeProjectWorkspaceKey, writeProjectWorkspaceKeyPreservingSession, } from './project-workspace-key.js';
 import { setWorkspaceKey, switchWorkspace, validateWorkspaceName } from './workspace-store.js';
 /** Validate and normalize a workspace session name before local or remote writes. */
 export function validateWorkspaceSessionName(name) {
@@ -62,10 +62,23 @@ export function persistWorkspaceSession(options) {
     // for an ordinary switch/join/create that happens to stay on the same key.
     const keepsWorkspace = existing?.workspaceKey === workspaceKey;
     const enrolledNodeId = keepsWorkspace ? existing?.enrolledNodeId : undefined;
-    writeProjectWorkspaceKey(projectDataDir, workspaceKey, {
-        ...(enrolledNodeId ? { enrolledNodeId } : {}),
-        ...(options.workspaceId ? { workspaceId: options.workspaceId } : {}),
-    });
+    if (keepsWorkspace) {
+        writeProjectWorkspaceKeyPreservingSession(projectDataDir, workspaceKey, {
+            ...(enrolledNodeId ? { enrolledNodeId } : {}),
+            ...(options.workspaceId ? { workspaceId: options.workspaceId } : {}),
+            ...(options.relaycastRoute ? { relaycastRoute: options.relaycastRoute } : {}),
+            ...(options.relaycastBaseUrl ? { relaycastBaseUrl: options.relaycastBaseUrl } : {}),
+            ...(options.relaycastApiKey ? { relaycastApiKey: options.relaycastApiKey } : {}),
+        });
+    }
+    else {
+        writeProjectWorkspaceKey(projectDataDir, workspaceKey, {
+            ...(options.workspaceId ? { workspaceId: options.workspaceId } : {}),
+            ...(options.relaycastRoute ? { relaycastRoute: options.relaycastRoute } : {}),
+            ...(options.relaycastBaseUrl ? { relaycastBaseUrl: options.relaycastBaseUrl } : {}),
+            ...(options.relaycastApiKey ? { relaycastApiKey: options.relaycastApiKey } : {}),
+        });
+    }
     if (name) {
         setWorkspaceKey(name, workspaceKey, options.env);
         switchWorkspace(name, options.env);

package/dist/cli/lib/workspace-session.js.map

@@ -1 +1 @@
-{"version":3,"file":"workspace-session.js","sourceRoot":"","sources":["../../../src/cli/lib/workspace-session.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"workspace-session.js","sourceRoot":"","sources":["../../../src/cli/lib/workspace-session.ts"],"names":[],"mappings":"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"}