iteration-cli 0.19.0 → 0.19.1

package/README.md

@@ -1,11 +1,18 @@
 # Iteration CLI (private source)
 
-This package owns the `iteration-cli@0.19.0` product executable. Clerk sign-in,
+This package owns the `iteration-cli@0.19.1` product executable. Clerk sign-in,
 workspace enrollment and automatic expansion, the default Iteration endpoint,
 commands/status UI, history progress, friction summaries, Codex/Cursor billing
 clients and `iteration mcp`, which gives connected agents the workspace's tools,
 live here, not in the public Trace Vault repository.
 
+Running `iteration connect` again reuses the computer's saved workspace and agent
+credentials and reopens project choices. Several connected workspaces require a
+choice in the terminal, or an explicit `--workspace` in automation. Existing
+source connections are verified and reused; only missing sources are expanded.
+Server failures stop setup without starting sign-in, and a revoked source needs
+its own explicit sign-in. Reconnecting preserves history and sharing choices.
+
 The bundled collector requires Node.js 22.22.0 or later. Keep collector data on a
 local filesystem; the shared API owns its
 [single-writer lock and recovery contract](../trace-vault/packages/cli/README.md).
@@ -39,7 +46,7 @@ From the private repository root after workspace initialization:
 ```sh
 pnpm --filter "iteration-cli..." --recursive --workspace-concurrency=4 run build
 pnpm --filter iteration-cli pack --pack-destination /tmp/iteration-cli-pack
-node packages/cli/smoke.mjs /tmp/iteration-cli-pack/iteration-cli-0.19.0.tgz
+node packages/cli/smoke.mjs /tmp/iteration-cli-pack/iteration-cli-0.19.1.tgz
 ```
 
 The package smoke installs the tarball offline under a disposable home and checks

package/dist/cli.js

@@ -23025,6 +23025,16 @@ function sharingConnection(registry3, organizationId, source) {
 }
 
 // src/sharing.ts
+var SharingSnapshotError = class extends Error {
+  status;
+  constructor(status2) {
+    super(
+      `Could not check project sharing (HTTP ${status2}). Collection is waiting.`
+    );
+    this.name = "SharingSnapshotError";
+    this.status = status2;
+  }
+};
 async function fetchSharingSnapshot(config3, request2 = collectorFetch, signal) {
   const response = await request2(
     new URL("./collector-sharing", config3.endpoint),
@@ -23036,10 +23046,10 @@ async function fetchSharingSnapshot(config3, request2 = collectorFetch, signal)
       ])
     }
   );
-  if (!response.ok)
-    throw new Error(
-      `Could not check project sharing (HTTP ${response.status}). Collection is waiting.`
-    );
+  if (!response.ok) {
+    await response.body?.cancel();
+    throw new SharingSnapshotError(response.status);
+  }
   return collectorSharingSnapshotSchema.parse(await response.json());
 }
 function workspaceForSource(snapshot, location, source) {
@@ -26820,6 +26830,19 @@ async function startSource(config3) {
     );
   }
 }
+async function prepareConnectedSource(source, home, directory, connection, previous) {
+  const config3 = previous === null ? sourceConfig(source, home, directory, connection.endpoint, connection) : {
+    ...previous,
+    destination: "host",
+    ...previous.organizationId === connection.organizationId ? {
+      token: connection.token,
+      organizationName: connection.organizationName
+    } : {}
+  };
+  if (previous === null || previous.destination !== "host" || previous.token !== config3.token)
+    await prepareSource(config3, previous);
+  return config3;
+}
 async function localConnectionOptions(options, selectedSource) {
   const existing = await Promise.all(
     COLLECTOR_SOURCES2.map(
@@ -26861,6 +26884,61 @@ function assertSharingOwner(ownerId, nextOwnerId) {
       "This computer is connected to another Iteration account. Run iteration logout before switching accounts."
     );
 }
+async function connectedWorkspace(registry3, requested, endpoint) {
+  if (requested !== null) return requested;
+  const workspaces = [
+    ...new Map(
+      registry3.connections.filter((connection) => connection.endpoint === endpoint).map((connection) => [connection.organizationId, connection])
+    ).values()
+  ];
+  if (workspaces.length < 2) return workspaces[0]?.organizationId ?? null;
+  if (!process.stdin.isTTY || !process.stdout.isTTY)
+    throw new Error(
+      "This computer has several workspaces. Run iteration connect interactively to choose one, or pass --workspace ID."
+    );
+  process.stdout.write(
+    "\nChoose a connected workspace:\n" + workspaces.map(
+      (workspace, index) => `  ${index + 1}. ${safeWorkspaceName(workspace.organizationName)}`
+    ).join("\n") + "\n"
+  );
+  for (let attempt = 0; attempt < 3; attempt++) {
+    const answer = await ask(terminalFor(process.stdout), "Workspace number:");
+    if (answer === null) throw new Error("Connection canceled.");
+    const selected = /^\d+$/.test(answer.trim()) ? workspaces[Number(answer.trim()) - 1] : void 0;
+    if (selected) return selected.organizationId;
+  }
+  throw new Error("Choose one of the listed workspaces to connect.");
+}
+async function verifySavedConnection(connection, registry3) {
+  const snapshot = await fetchSharingSnapshot(connection);
+  if (snapshot.computerId !== registry3.computerId)
+    throw new Error(
+      "The saved connection belongs to a different computer. Sign in again before connecting it."
+    );
+  assertSharingOwner(registry3.ownerId, snapshot.ownerId);
+  return connection;
+}
+async function connectionForSource(registry3, anchor3, anchorConfig, source) {
+  if (source === anchor3.source) return anchor3;
+  const saved = sharingConnection(registry3, anchor3.organizationId, source);
+  if (saved !== null) {
+    try {
+      return await verifySavedConnection(saved, registry3);
+    } catch (error3) {
+      if (error3 instanceof SharingSnapshotError && [401, 403].includes(error3.status))
+        throw new Error(
+          `${collectorSourceLabel(source)} needs sign-in again. Run iteration connect ${source} --workspace ${anchor3.organizationId}.`,
+          { cause: error3 }
+        );
+      throw error3;
+    }
+  }
+  return enrolledSharingConnection(
+    await expandSource(anchorConfig, source, anchor3.organizationId),
+    source,
+    anchor3.endpoint
+  );
+}
 async function waitForSharing(anchor3, alreadyApproved, signal) {
   const deadline = Date.now() + 15 * 60 * 1e3;
   let approved = alreadyApproved;
@@ -26894,13 +26972,27 @@ async function connectWorkspace(options, selectedSource) {
   const prepared = await withSharingRegistry(async (initial, save) => {
     let registry3 = initial;
     const { existing, homes, sources, endpoint } = local;
+    if (registry3.connections.some(
+      (connection) => connection.endpoint !== endpoint
+    ))
+      throw new Error(
+        "This computer is connected to another Iteration server. Sign out before changing servers."
+      );
     const first = sources[0];
-    const requested = textOption(options, "workspace");
-    let anchor3 = requested === null ? null : sharingConnection(registry3, requested, first);
+    const requested = await connectedWorkspace(
+      registry3,
+      textOption(options, "workspace"),
+      endpoint
+    );
+    let anchor3 = requested === null ? null : sharingConnection(registry3, requested, first) ?? registry3.connections.find(
+      (connection) => connection.organizationId === requested && connection.endpoint === endpoint
+    ) ?? null;
     if (anchor3 !== null) {
       try {
-        await fetchSharingSnapshot(anchor3);
-      } catch {
+        await verifySavedConnection(anchor3, registry3);
+      } catch (error3) {
+        if (!(error3 instanceof SharingSnapshotError && [401, 403].includes(error3.status)))
+          throw error3;
         anchor3 = null;
       }
     }
@@ -26915,9 +27007,9 @@ async function connectWorkspace(options, selectedSource) {
       anchor3 = enrolledSharingConnection(enrollment, first, endpoint);
     }
     const anchorConfig = sourceConfig(
-      first,
-      homes[first],
-      defaultCollectorDirectory(first),
+      anchor3.source,
+      homes[anchor3.source],
+      defaultCollectorDirectory(anchor3.source),
       endpoint,
       anchor3
     );
@@ -26950,7 +27042,7 @@ async function connectWorkspace(options, selectedSource) {
       sourceHomes: homes,
       connections: [
         ...registry3.connections.filter(
-          (connection) => connection.organizationId !== anchor3.organizationId || connection.source !== first
+          (connection) => connection.organizationId !== anchor3.organizationId || connection.source !== anchor3.source
         ),
         anchor3
       ]
@@ -26963,11 +27055,11 @@ async function connectWorkspace(options, selectedSource) {
     }
     const configs = [];
     for (const source of sources) {
-      const enrollment = source === first ? anchor3 : await expandSource(anchorConfig, source, anchor3.organizationId);
-      const connection = enrolledSharingConnection(
-        enrollment,
-        source,
-        endpoint
+      const connection = await connectionForSource(
+        registry3,
+        anchor3,
+        anchorConfig,
+        source
       );
       registry3 = {
         ...registry3,
@@ -26983,9 +27075,13 @@ async function connectWorkspace(options, selectedSource) {
       const directory = selectedSource ? path30.resolve(
         textOption(options, "data-directory") ?? defaultCollectorDirectory(source)
       ) : defaultCollectorDirectory(source);
-      const config3 = previous === null ? sourceConfig(source, homes[source], directory, endpoint, enrollment) : { ...previous, destination: "host" };
-      if (previous === null || previous.destination !== "host")
-        await prepareSource(config3, previous);
+      const config3 = await prepareConnectedSource(
+        source,
+        homes[source],
+        directory,
+        connection,
+        previous
+      );
       registry3 = {
         ...registry3,
         directories: {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "iteration-cli",
-  "version": "0.19.0",
+  "version": "0.19.1",
   "type": "module",
   "repository": {
     "type": "git",