@h-rig/cli 0.0.6-alpha.45 → 0.0.6-alpha.46

package/dist/src/index.js

@@ -2884,7 +2884,8 @@ function readRepoConnection(projectRoot) {
   return {
     selected,
     project: typeof record.project === "string" ? record.project : undefined,
-    linkedAt: typeof record.linkedAt === "string" ? record.linkedAt : undefined
+    linkedAt: typeof record.linkedAt === "string" ? record.linkedAt : undefined,
+    serverProjectRoot: typeof record.serverProjectRoot === "string" && record.serverProjectRoot.trim() ? record.serverProjectRoot.trim() : undefined
   };
 }
 function writeRepoConnection(projectRoot, state) {
@@ -2895,13 +2896,19 @@ function resolveSelectedConnection(projectRoot, options = {}) {
   if (!repo)
     return null;
   if (repo.selected === "local")
-    return { alias: "local", connection: { kind: "local", mode: "auto" } };
+    return { alias: "local", connection: { kind: "local", mode: "auto" }, serverProjectRoot: repo.serverProjectRoot };
   const global = readGlobalConnections(options);
   const connection = global.connections[repo.selected];
   if (!connection) {
     throw new CliError2(`Selected Rig server "${repo.selected}" was not found. Run \`rig server list\` or \`rig server use local\`.`, 1);
   }
-  return { alias: repo.selected, connection };
+  return { alias: repo.selected, connection, serverProjectRoot: repo.serverProjectRoot };
+}
+function writeRepoServerProjectRoot(projectRoot, serverProjectRoot) {
+  const repo = readRepoConnection(projectRoot);
+  if (!repo)
+    return;
+  writeRepoConnection(projectRoot, { ...repo, serverProjectRoot });
 }
 
 // packages/cli/src/commands/_server-client.ts
@@ -2942,17 +2949,21 @@ async function ensureServerForCli(projectRoot) {
   try {
     const selected = resolveSelectedConnection(projectRoot);
     if (selected?.connection.kind === "remote") {
+      const authToken = readGitHubBearerTokenForRemote(projectRoot);
+      const serverProjectRoot = selected.serverProjectRoot ?? await backfillRemoteServerProjectRoot(projectRoot, selected.connection.baseUrl, authToken);
       return {
         baseUrl: selected.connection.baseUrl,
-        authToken: readGitHubBearerTokenForRemote(projectRoot),
-        connectionKind: "remote"
+        authToken,
+        connectionKind: "remote",
+        serverProjectRoot
       };
     }
     const connection = await ensureLocalRigServerConnection(projectRoot);
     return {
       baseUrl: connection.baseUrl,
       authToken: connection.authToken,
-      connectionKind: "local"
+      connectionKind: "local",
+      serverProjectRoot: resolve11(projectRoot)
     };
   } catch (error) {
     if (error instanceof Error) {
@@ -2961,6 +2972,28 @@ async function ensureServerForCli(projectRoot) {
     throw error;
   }
 }
+async function backfillRemoteServerProjectRoot(projectRoot, baseUrl, authToken) {
+  const repo = readRepoConnection(projectRoot);
+  const slug = repo?.project?.trim();
+  if (!slug)
+    return null;
+  try {
+    const response = await fetch(`${baseUrl}/api/projects/${encodeURIComponent(slug)}`, {
+      headers: mergeHeaders(undefined, authToken)
+    });
+    if (!response.ok)
+      return null;
+    const payload = await response.json();
+    const project = payload.project && typeof payload.project === "object" && !Array.isArray(payload.project) ? payload.project : null;
+    const checkout = project?.checkout && typeof project.checkout === "object" && !Array.isArray(project.checkout) ? project.checkout : null;
+    const path = typeof checkout?.path === "string" && checkout.path.trim() ? checkout.path.trim() : typeof project?.path === "string" && project.path.trim() ? project.path.trim() : null;
+    if (path)
+      writeRepoServerProjectRoot(projectRoot, path);
+    return path;
+  } catch {
+    return null;
+  }
+}
 function appendTaskFilterParams(url, filters) {
   if (filters.assignee)
     url.searchParams.set("assignee", filters.assignee);
@@ -2995,9 +3028,12 @@ function diagnosticMessage(payload) {
 }
 async function requestServerJson(context, pathname, init = {}) {
   const server = await ensureServerForCli(context.projectRoot);
+  const headers = mergeHeaders(init.headers, server.authToken);
+  if (server.serverProjectRoot)
+    headers.set("x-rig-project-root", server.serverProjectRoot);
   const response = await fetch(`${server.baseUrl}${pathname}`, {
     ...init,
-    headers: mergeHeaders(init.headers, server.authToken)
+    headers
   });
   const text2 = await response.text();
   const payload = text2.trim().length > 0 ? (() => {
@@ -3104,22 +3140,12 @@ async function switchServerProjectRootViaServer(context, projectRoot, options =
   if (!switched) {
     throw new CliError2(`Rig server did not accept project-root switch to ${projectRoot} before timeout (${lastError instanceof Error ? lastError.message : String(lastError ?? "no response")}).`, 1);
   }
-  while (Date.now() < deadline) {
-    try {
-      const status = await requestServerJson(context, "/api/server/status");
-      if (status && typeof status === "object" && !Array.isArray(status)) {
-        const record = status;
-        if (record.projectRoot === projectRoot) {
-          return { ok: true, switched, status: record };
-        }
-        lastError = `server projectRoot=${String(record.projectRoot ?? "unknown")}`;
-      }
-    } catch (error) {
-      lastError = error;
-    }
-    await sleep(pollMs);
+  const record = switched && typeof switched === "object" && !Array.isArray(switched) ? switched : {};
+  if (record.ok === true) {
+    writeRepoServerProjectRoot(context.projectRoot, projectRoot);
+    return { ok: true, switched: record };
   }
-  throw new CliError2(`Rig server did not switch to ${projectRoot} before timeout (${lastError instanceof Error ? lastError.message : String(lastError ?? "no status")}).`, 1);
+  throw new CliError2(`Rig server rejected project-root scope ${projectRoot}: ${String(record.message ?? record.error ?? "unknown error")}`, 1);
 }
 async function listRunsViaServer(context, options = {}) {
   const url = new URL("http://rig.local/api/runs");
@@ -3251,6 +3277,8 @@ async function buildRunPiEventsWebSocketUrl(context, runId) {
   url.protocol = url.protocol === "https:" ? "wss:" : "ws:";
   if (server.authToken)
     url.searchParams.set("token", server.authToken);
+  if (server.serverProjectRoot)
+    url.searchParams.set("rigProjectRoot", server.serverProjectRoot);
   return url.toString();
 }
 async function submitTaskRunViaServer(context, input) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@h-rig/cli",
-  "version": "0.0.6-alpha.45",
+  "version": "0.0.6-alpha.46",
   "type": "module",
   "description": "Rig package",
   "license": "UNLICENSED",
@@ -23,11 +23,11 @@
   },
   "dependencies": {
     "@clack/prompts": "^1.2.0",
-    "@earendil-works/pi-coding-agent": "npm:@h-rig/pi-coding-agent@0.0.6-alpha.45",
-    "@rig/core": "npm:@h-rig/core@0.0.6-alpha.45",
-    "@rig/runtime": "npm:@h-rig/runtime@0.0.6-alpha.45",
-    "@rig/client": "npm:@h-rig/client@0.0.6-alpha.45",
-    "@rig/server": "npm:@h-rig/server@0.0.6-alpha.45",
+    "@earendil-works/pi-coding-agent": "npm:@h-rig/pi-coding-agent@0.0.6-alpha.46",
+    "@rig/core": "npm:@h-rig/core@0.0.6-alpha.46",
+    "@rig/runtime": "npm:@h-rig/runtime@0.0.6-alpha.46",
+    "@rig/client": "npm:@h-rig/client@0.0.6-alpha.46",
+    "@rig/server": "npm:@h-rig/server@0.0.6-alpha.46",
     "picocolors": "^1.1.1"
   }
 }