@tablation/crew 0.79.7 → 0.79.9

package/dist/cli.js

@@ -9650,6 +9650,35 @@ function rememberSession(stateDir, host, workspaceSlug) {
   } catch {
   }
 }
+function forgetWorkspace(stateDir, host, workspaceSlug) {
+  try {
+    const all = readPointers(stateDir);
+    const left = (all[host] ?? []).filter((w) => w !== workspaceSlug);
+    const { [host]: _old, ...rest } = all;
+    const next = left.length ? { ...rest, [host]: left } : rest;
+    if (Object.keys(next).length) writePointers(stateDir, next);
+    else rmSync10(lastSessionFile(stateDir), { force: true });
+  } catch {
+  }
+}
+async function adoptSessionAddress(o) {
+  if (o.from === o.to) return false;
+  try {
+    const stored = await o.store.get(o.host, o.from);
+    if (!stored?.apiKey) return false;
+    if (!(await o.store.get(o.host, o.to))?.apiKey) await o.store.set(o.host, o.to, stored);
+    await o.store.clear(o.host, o.from);
+  } catch {
+    return false;
+  }
+  forgetWorkspace(o.stateDir, o.host, o.from);
+  rememberSession(o.stateDir, o.host, o.to);
+  return true;
+}
+function rememberedAddressFor(stateDir, host, workspace) {
+  if (workspace.includes(":")) return workspace;
+  return (readPointers(stateDir)[host] ?? []).find((w) => w.endsWith(`:${workspace}`)) ?? workspace;
+}
 async function resumableSessions(o) {
   const out = [];
   for (const workspace of readPointers(o.stateDir)[o.host] ?? []) {
@@ -19680,12 +19709,22 @@ ${reconstruction.prompt}
         store = void 0;
       }
       let keychainBacked = false;
+      let sessionAddress;
       if (!apiKey && workspace && store) {
         try {
-          const existing = await store.get(hostFromUrl4(baseUrl), workspace);
+          let existing = await store.get(hostFromUrl4(baseUrl), workspace);
+          let found = workspace;
+          if (!existing?.apiKey) {
+            const full = rememberedAddressFor(cfg.ship.stateDir, hostFromUrl4(baseUrl), workspace);
+            if (full !== workspace) {
+              existing = await store.get(hostFromUrl4(baseUrl), full);
+              found = full;
+            }
+          }
           if (existing?.apiKey) {
             apiKey = existing.apiKey;
             keychainBacked = true;
+            sessionAddress = found;
             process.stderr.write(`Reusing the existing keychain session for ${hostFromUrl4(baseUrl)}/${workspace}.
 `);
           }
@@ -19719,6 +19758,7 @@ ${reconstruction.prompt}
           apiKey = resumed.apiKey;
           workspace = resumed.workspace;
           keychainBacked = true;
+          sessionAddress = resumed.workspace;
           signInSource = "keychain";
           process.stderr.write(`Reusing the existing keychain session for ${hostFromUrl4(baseUrl)}/${workspace}.
 `);
@@ -19773,13 +19813,6 @@ Signed in as ${result.identity.email} \u2014 minted an API key in workspace "${r
         );
         apiKey = result.apiKey.key;
         mintedFromDevice = true;
-        signedInEmitted = true;
-        connectEvents.emit("signed_in", `signed in as ${result.identity.email}`, {
-          identity: { id: result.identity.id, email: result.identity.email },
-          workspaces: [{ slug: result.workspace.slug, name: result.workspace.name }],
-          session: "device",
-          host: hostFromUrl4(baseUrl)
-        });
         const deviceWorkspace = "path" in result.workspace && typeof result.workspace.path === "string" ? result.workspace.path : result.workspace.slug;
         if (!workspace) workspace = deviceWorkspace;
         if (store) {
@@ -19791,6 +19824,7 @@ Signed in as ${result.identity.email} \u2014 minted an API key in workspace "${r
               createdAt: result.apiKey.createdAt
             });
             keychainBacked = true;
+            sessionAddress = deviceWorkspace;
             rememberSession(cfg.ship.stateDir, hostFromUrl4(baseUrl), deviceWorkspace);
             process.stderr.write(
               `API key stored in the OS keychain for ${hostFromUrl4(baseUrl)}/${deviceWorkspace}.
@@ -19834,9 +19868,18 @@ Signed in as ${result.identity.email} \u2014 minted an API key in workspace "${r
       };
       const runConnect = async (ws, proj) => {
         let found = await discover({ ...authOpts, workspace: ws, project: proj, area: value("area"), ship, dryRun, interactive: canAsk || connectEvents.json });
+        if (store && keychainBacked && sessionAddress && sessionAddress !== found.workspaceSlug) {
+          if (await adoptSessionAddress({
+            store,
+            stateDir: cfg.ship.stateDir,
+            host: hostFromUrl4(baseUrl),
+            from: sessionAddress,
+            to: found.workspaceSlug
+          })) sessionAddress = found.workspaceSlug;
+        }
         if (!signedInEmitted && found.meId) {
           signedInEmitted = true;
-          connectEvents.emit("signed_in", `key belongs to ${found.meEmail ?? found.meId}`, {
+          connectEvents.emit("signed_in", mintedFromDevice ? `signed in as ${found.meEmail ?? found.meId}` : `key belongs to ${found.meEmail ?? found.meId}`, {
             identity: { id: found.meId, email: found.meEmail, name: found.meName },
             workspaces: [{ slug: found.workspaceSlug, name: found.workspaceName, role: found.role }],
             session: signInSource,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tablation/crew",
-  "version": "0.79.7",
+  "version": "0.79.9",
   "description": "A standing team of headless agents that picks work off a Tablation board, does it on a machine you control, and reports back.",
   "type": "module",
   "license": "MIT",