@h-rig/cli 0.0.6-alpha.17 → 0.0.6-alpha.19

package/dist/src/index.js

@@ -2882,6 +2882,14 @@ async function switchServerProjectRootViaServer(context, projectRoot, options =
   }
   throw new CliError2(`Rig server did not switch to ${projectRoot} before timeout (${lastError instanceof Error ? lastError.message : String(lastError ?? "no status")}).`, 1);
 }
+async function listRunsViaServer(context, options = {}) {
+  const url = new URL("http://rig.local/api/runs");
+  if (options.limit !== undefined)
+    url.searchParams.set("limit", String(options.limit));
+  const payload = await requestServerJson(context, `${url.pathname}${url.search}`);
+  const runs = Array.isArray(payload) ? payload : payload && typeof payload === "object" && !Array.isArray(payload) && Array.isArray(payload.runs) ? payload.runs : [];
+  return runs.filter((entry) => Boolean(entry && typeof entry === "object" && !Array.isArray(entry)));
+}
 async function getRunDetailsViaServer(context, runId) {
   const payload = await requestServerJson(context, `/api/runs/${encodeURIComponent(runId)}`);
   return payload && typeof payload === "object" && !Array.isArray(payload) ? payload : {};
@@ -4525,6 +4533,7 @@ function countDoctorFailures(checks) {
 
 // packages/cli/src/commands/init.ts
 var RIG_CONFIG_PACKAGE_DIST_TAG = "latest";
+var DEFAULT_REMOTE_RIG_URL = "https://where.rig-does.work";
 var RIG_CONFIG_DEV_DEPENDENCIES = {
   "@rig/core": `npm:@h-rig/core@${RIG_CONFIG_PACKAGE_DIST_TAG}`,
   "@rig/standard-plugin": `npm:@h-rig/standard-plugin@${RIG_CONFIG_PACKAGE_DIST_TAG}`
@@ -4629,6 +4638,19 @@ function readGhAuthToken() {
   }
   return result.stdout.trim();
 }
+function refreshGhProjectScopesAndReadToken() {
+  const result = spawnSync("gh", ["auth", "refresh", "--scopes", "read:project"], {
+    encoding: "utf8",
+    stdio: ["inherit", "pipe", "pipe"]
+  });
+  if (result.status !== 0)
+    return null;
+  try {
+    return readGhAuthToken();
+  } catch {
+    return null;
+  }
+}
 async function loadClackPrompts() {
   return await import("@clack/prompts");
 }
@@ -4724,12 +4746,27 @@ async function promptManualProjectStatusMapping(prompts) {
   }
   return statuses;
 }
-async function promptGitHubProjectConfig(context, prompts, repoSlug, githubToken) {
+function projectScopeError(value) {
+  const text2 = typeof value === "string" ? value : JSON.stringify(value ?? "");
+  return /INSUFFICIENT_SCOPES|read:project|required scopes/i.test(text2);
+}
+function optionName(option) {
+  return String(option.name ?? option.label ?? option.id ?? "").trim();
+}
+function autoProjectStatusValue(options, key, label) {
+  const candidates = [DEFAULT_PROJECT_STATUS_OPTIONS[key], label].filter((value) => Boolean(value)).map((value) => value.trim().toLowerCase());
+  const match = options.find((option) => candidates.includes(optionName(option).toLowerCase()));
+  if (!match)
+    return null;
+  return String(match.id ?? match.name);
+}
+async function promptGitHubProjectConfig(context, prompts, repoSlug, githubToken, refreshProjectToken) {
   const projectChoice = await promptSelect(prompts, {
     message: "GitHub Projects status sync",
+    initialValue: "select",
     options: [
-      { value: "off", label: "Off" },
       { value: "select", label: "Select accessible ProjectV2" },
+      { value: "off", label: "Off" },
       { value: "manual", label: "Enter ProjectV2 ids manually" }
     ]
   });
@@ -4745,16 +4782,22 @@ async function promptGitHubProjectConfig(context, prompts, repoSlug, githubToken
   const owner = repoOwnerFromSlug(repoSlug);
   if (!owner)
     throw new CliError2(`Cannot derive GitHub owner from repo slug ${repoSlug}.`, 1);
-  const projectsPayload = await listGitHubProjectsForInit(context, owner, githubToken).catch((error) => ({ ok: false, error: error instanceof Error ? error.message : String(error), projects: [] }));
-  const projects = recordArray(projectsPayload, "projects");
+  let activeToken = githubToken?.trim() || null;
+  let projectsPayload = await listGitHubProjectsForInit(context, owner, activeToken).catch((error) => ({ ok: false, error: error instanceof Error ? error.message : String(error), projects: [] }));
+  let projects = recordArray(projectsPayload, "projects");
+  if (projects.length === 0 && projectScopeError(projectsPayload.error) && refreshProjectToken) {
+    prompts.outro?.("GitHub token is missing read:project; refreshing gh auth scopes and retrying Projects.");
+    const refreshedToken = refreshProjectToken();
+    if (refreshedToken) {
+      activeToken = refreshedToken;
+      projectsPayload = await listGitHubProjectsForInit(context, owner, activeToken).catch((error) => ({ ok: false, error: error instanceof Error ? error.message : String(error), projects: [] }));
+      projects = recordArray(projectsPayload, "projects");
+    }
+  }
   if (projects.length === 0) {
-    const error = typeof projectsPayload.error === "string" ? ` (${projectsPayload.error})` : "";
-    prompts.outro?.(`No accessible GitHub Projects were returned${error}; falling back to manual ProjectV2 ids.`);
-    return {
-      githubProject: await promptRequiredText(prompts, { message: "GitHub ProjectV2 id", placeholder: "PVT_..." }),
-      githubProjectStatusField: await promptRequiredText(prompts, { message: "Project Status field id", placeholder: "field_status" }),
-      githubProjectStatuses: await promptManualProjectStatusMapping(prompts)
-    };
+    const error = typeof projectsPayload.error === "string" ? ` (${String(projectsPayload.error).replace(/\s+/g, " ").slice(0, 240)})` : "";
+    prompts.outro?.(`No accessible GitHub Projects were returned${error}; continuing with GitHub Projects status sync off.`);
+    return { githubProject: "off", ...activeToken ? { githubToken: activeToken } : {} };
   }
   const selectedProjectId = await promptSelect(prompts, {
     message: "GitHub ProjectV2 project",
@@ -4768,23 +4811,34 @@ async function promptGitHubProjectConfig(context, prompts, repoSlug, githubToken
     ]
   });
   const projectId = selectedProjectId === "manual" ? await promptRequiredText(prompts, { message: "GitHub ProjectV2 id", placeholder: "PVT_..." }) : selectedProjectId;
-  const fieldPayload = await getGitHubProjectStatusFieldForInit(context, projectId, githubToken).catch((error) => ({ ok: false, error: error instanceof Error ? error.message : String(error) }));
+  const fieldPayload = await getGitHubProjectStatusFieldForInit(context, projectId, activeToken).catch((error) => ({ ok: false, error: error instanceof Error ? error.message : String(error) }));
   const fieldPayloadRecord = fieldPayload && typeof fieldPayload === "object" && !Array.isArray(fieldPayload) ? fieldPayload : {};
   const rawField = fieldPayloadRecord.field;
   const field = rawField && typeof rawField === "object" && !Array.isArray(rawField) ? rawField : null;
   const fieldId = typeof field?.id === "string" && field.id.trim() ? field.id : await promptRequiredText(prompts, { message: "Project Status field id", placeholder: "field_status" });
   const options = Array.isArray(field?.options) ? field.options.filter((entry) => Boolean(entry && typeof entry === "object" && !Array.isArray(entry))) : [];
   if (options.length === 0) {
-    return { githubProject: projectId, githubProjectStatusField: fieldId, githubProjectStatuses: await promptManualProjectStatusMapping(prompts) };
+    return {
+      githubProject: projectId,
+      githubProjectStatusField: fieldId,
+      githubProjectStatuses: await promptManualProjectStatusMapping(prompts),
+      ...activeToken ? { githubToken: activeToken } : {}
+    };
   }
   const statuses = {};
   for (const [key, label] of Object.entries(PROJECT_STATUS_PROMPTS)) {
-    statuses[key] = await promptSelect(prompts, {
+    const auto = autoProjectStatusValue(options, key, label);
+    statuses[key] = auto ?? await promptSelect(prompts, {
       message: `Project status option for ${label}`,
-      options: options.map((option) => ({ value: String(option.id ?? option.name), label: String(option.name ?? option.id) }))
+      options: options.map((option) => ({ value: String(option.id ?? option.name), label: optionName(option) }))
     });
   }
-  return { githubProject: projectId, githubProjectStatusField: fieldId, githubProjectStatuses: Object.keys(statuses).length > 0 ? statuses : undefined };
+  return {
+    githubProject: projectId,
+    githubProjectStatusField: fieldId,
+    githubProjectStatuses: Object.keys(statuses).length > 0 ? statuses : undefined,
+    ...activeToken ? { githubToken: activeToken } : {}
+  };
 }
 function sleep2(ms) {
   return new Promise((resolve18) => setTimeout(resolve18, ms));
@@ -5115,12 +5169,13 @@ async function runInteractiveControlPlaneInit(context, prompts) {
   });
   const serverChoice = await promptSelect(prompts, {
     message: "Rig server",
+    initialValue: "remote",
     options: [
-      { value: "local", label: "Local server", hint: "run on this machine" },
-      { value: "remote", label: "Remote server", hint: "connect to an HTTPS Rig server" }
+      { value: "remote", label: "Remote server", hint: "connect to an HTTPS Rig server" },
+      { value: "local", label: "Local server", hint: "run on this machine" }
     ]
   });
-  const remoteUrl = serverChoice === "remote" ? await promptRequiredText(prompts, { message: "Remote Rig server URL", placeholder: "https://rig.example.com" }) : undefined;
+  const remoteUrl = serverChoice === "remote" ? await promptRequiredText(prompts, { message: "Remote Rig server URL", placeholder: DEFAULT_REMOTE_RIG_URL, initialValue: DEFAULT_REMOTE_RIG_URL }) : undefined;
   let remoteCheckout;
   if (serverChoice === "remote") {
     const checkout = await promptSelect(prompts, {
@@ -5152,31 +5207,35 @@ async function runInteractiveControlPlaneInit(context, prompts) {
       { value: "skip", label: "Skip for now" }
     ]
   });
+  let remoteGhTokenConfirmed = false;
   if (serverChoice === "remote" && authMethod === "gh") {
     if (!prompts.confirm)
       throw new CliError2("Remote gh-token import requires explicit confirmation.", 1);
     const confirmed = await prompts.confirm({
       message: `This sends a GitHub token from this machine to ${remoteUrl}. Continue?`,
-      initialValue: false
+      initialValue: true
     });
     if (prompts.isCancel(confirmed) || confirmed !== true) {
       throw new CliError2("Remote gh-token import cancelled.", 1);
     }
+    remoteGhTokenConfirmed = true;
   }
   const githubToken = authMethod === "token" ? await promptRequiredText(prompts, { message: "GitHub token", placeholder: "ghp_..." }) : authMethod === "gh" ? readGhAuthToken() : undefined;
-  const projectConfig = await promptGitHubProjectConfig(context, prompts, repoSlug, githubToken);
+  const projectConfig = await promptGitHubProjectConfig(context, prompts, repoSlug, githubToken, authMethod === "gh" ? refreshGhProjectScopesAndReadToken : undefined);
+  const effectiveGithubToken = projectConfig.githubToken ?? githubToken;
   const result = await runControlPlaneInit(context, {
     server: serverChoice,
     remoteUrl,
     repoSlug,
-    githubToken,
+    githubToken: effectiveGithubToken,
     githubAuthMethod: authMethod,
     githubProject: projectConfig.githubProject,
     githubProjectStatusField: projectConfig.githubProjectStatusField,
     githubProjectStatuses: projectConfig.githubProjectStatuses,
     remoteCheckout,
     repair,
-    privateStateOnly
+    privateStateOnly,
+    yes: remoteGhTokenConfirmed || undefined
   });
   const details = result.details && typeof result.details === "object" && !Array.isArray(result.details) ? result.details : {};
   const deviceAuth = details.deviceAuth && typeof details.deviceAuth === "object" && !Array.isArray(details.deviceAuth) ? details.deviceAuth : null;
@@ -6351,6 +6410,42 @@ var CANONICAL_STAGES = [
 function logDetail(log3) {
   return typeof log3.detail === "string" ? log3.detail.trim() : "";
 }
+function parseProviderProtocolLog(title, detail) {
+  if (title.trim().toLowerCase() !== "agent output")
+    return null;
+  if (!detail.startsWith("{") || !detail.endsWith("}"))
+    return null;
+  try {
+    const record = JSON.parse(detail);
+    if (!record || typeof record !== "object" || Array.isArray(record))
+      return null;
+    const type = record.type;
+    return typeof type === "string" && [
+      "assistant",
+      "message_start",
+      "message_update",
+      "message_end",
+      "stream_event",
+      "tool_result",
+      "tool_execution_start",
+      "tool_execution_update",
+      "tool_execution_end",
+      "turn_start",
+      "turn_end"
+    ].includes(type) ? record : null;
+  } catch {
+    return null;
+  }
+}
+function renderProviderProtocolLog(record) {
+  const type = typeof record.type === "string" ? record.type : "";
+  if (type === "tool_execution_start" || type === "tool_execution_update" || type === "tool_execution_end") {
+    const toolName = String(record.toolName ?? record.name ?? "tool");
+    const status = type === "tool_execution_start" ? "started" : type === "tool_execution_end" ? record.isError === true || record.result && typeof record.result === "object" && !Array.isArray(record.result) && record.result.isError === true ? "failed" : "completed" : "running";
+    return `[Pi tool] ${toolName} ${status}`;
+  }
+  return null;
+}
 function entryId(entry, fallback) {
   return typeof entry.id === "string" && entry.id.trim() ? entry.id : fallback;
 }
@@ -6395,12 +6490,16 @@ function createPiRunStreamRenderer(output = process.stdout) {
         if (entry.type === "assistant_message" && typeof entry.text === "string") {
           const text2 = entry.text;
           const previousText = assistantTextById.get(id) ?? "";
+          if (!previousText && text2.trim()) {
+            writeLine("[Pi assistant]");
+          }
           if (text2.startsWith(previousText)) {
             const delta = text2.slice(previousText.length);
             if (delta)
               output.write(delta);
           } else if (text2.trim() && text2 !== previousText) {
-            writeLine(`
+            if (previousText)
+              writeLine(`
 [Pi assistant]`);
             output.write(text2);
           }
@@ -6431,6 +6530,13 @@ function createPiRunStreamRenderer(output = process.stdout) {
         const detail = logDetail(entry);
         if (!detail)
           continue;
+        const protocolRecord = parseProviderProtocolLog(title, detail);
+        if (protocolRecord) {
+          const protocolLine = renderProviderProtocolLog(protocolRecord);
+          if (protocolLine)
+            writeLine(protocolLine);
+          continue;
+        }
         writeLine(`[${title || "Rig log"}] ${detail}`);
       }
     }
@@ -6578,6 +6684,28 @@ function normalizeRemoteRunDetails(payload) {
     ...Array.isArray(payload.userInputs) ? { userInputs: payload.userInputs } : {}
   };
 }
+var REMOTE_TERMINAL_RUN_STATUSES = new Set(["completed", "failed", "stopped", "cancelled", "canceled", "closed", "merged"]);
+function isRemoteConnectionSelected(projectRoot) {
+  return resolveSelectedConnection(projectRoot)?.connection.kind === "remote";
+}
+async function listRunsForSelectedConnection(context, options = {}) {
+  if (isRemoteConnectionSelected(context.projectRoot)) {
+    return { runs: await listRunsViaServer(context, options), source: "server" };
+  }
+  return { runs: listAuthorityRuns3(context.projectRoot), source: "local" };
+}
+function runStringField(run, key, fallback = "") {
+  const value = run[key];
+  return typeof value === "string" && value.trim() ? value : fallback;
+}
+function runDisplayTitle(run) {
+  return runStringField(run, "title", runStringField(run, "taskId", "(untitled)"));
+}
+function buildServerRunStatus(runs) {
+  const activeRuns = runs.filter((run) => !REMOTE_TERMINAL_RUN_STATUSES.has(runStringField(run, "status").toLowerCase()));
+  const recentRuns = runs.filter((run) => REMOTE_TERMINAL_RUN_STATUSES.has(runStringField(run, "status").toLowerCase()));
+  return { activeRuns, recentRuns, runs };
+}
 function shouldPromptForEpicSelection(context, command, promptEpic, noEpicPrompt) {
   if (noEpicPrompt) {
     return false;
@@ -6643,17 +6771,17 @@ async function executeRun(context, args) {
   switch (command) {
     case "list": {
       requireNoExtraArgs(rest, "bun run rig run list");
-      const runs = listAuthorityRuns3(context.projectRoot);
+      const { runs, source } = await listRunsForSelectedConnection(context, { limit: 100 });
       if (context.outputMode === "text") {
         if (runs.length === 0) {
-          console.log("No runs recorded in .rig/runs.");
+          console.log(source === "server" ? "No runs recorded on the selected Rig server." : "No runs recorded in .rig/runs.");
         } else {
           for (const run of runs) {
-            console.log(`- ${run.runId} \xB7 ${run.status} \xB7 ${run.title}`);
+            console.log(`- ${runStringField(run, "runId", "(unknown-run)")} \xB7 ${runStringField(run, "status", "unknown")} \xB7 ${runDisplayTitle(run)}`);
           }
         }
       }
-      return { ok: true, group: "run", command, details: { runs } };
+      return { ok: true, group: "run", command, details: { runs, source } };
     }
     case "delete": {
       let pending = rest;
@@ -6790,17 +6918,19 @@ async function executeRun(context, args) {
         }
         return { ok: true, group: "run", command };
       }
-      const summary = runStatus(context.projectRoot, runtimeContext);
+      const summary = isRemoteConnectionSelected(context.projectRoot) ? buildServerRunStatus(await listRunsViaServer(context, { limit: 100 })) : runStatus(context.projectRoot, runtimeContext);
+      const activeRuns = Array.isArray(summary.activeRuns) ? summary.activeRuns.filter((run) => Boolean(run && typeof run === "object" && !Array.isArray(run))) : [];
+      const recentRuns = Array.isArray(summary.recentRuns) ? summary.recentRuns.filter((run) => Boolean(run && typeof run === "object" && !Array.isArray(run))) : [];
       if (context.outputMode === "text") {
-        console.log(`Active runs: ${summary.activeRuns.length}`);
-        for (const run of summary.activeRuns) {
-          console.log(`- ${run.runId} \xB7 ${run.status} \xB7 ${run.taskId ?? run.title}`);
+        console.log(`Active runs: ${activeRuns.length}`);
+        for (const run of activeRuns) {
+          console.log(`- ${runStringField(run, "runId", "(unknown-run)")} \xB7 ${runStringField(run, "status", "unknown")} \xB7 ${runStringField(run, "taskId", runDisplayTitle(run))}`);
         }
-        if (summary.recentRuns.length > 0) {
+        if (recentRuns.length > 0) {
           console.log("");
           console.log("Recent runs:");
-          for (const run of summary.recentRuns) {
-            console.log(`- ${run.runId} \xB7 ${run.status} \xB7 ${run.taskId ?? run.title}`);
+          for (const run of recentRuns) {
+            console.log(`- ${runStringField(run, "runId", "(unknown-run)")} \xB7 ${runStringField(run, "status", "unknown")} \xB7 ${runStringField(run, "taskId", runDisplayTitle(run))}`);
           }
         }
       }
@@ -8236,6 +8366,26 @@ function appendAssistantTimelineFromRecord(input) {
   }
   return nextAssistantText;
 }
+function appendPiToolTimelineFromRecord(input) {
+  const type = typeof input.record.type === "string" ? input.record.type : "";
+  if (type !== "tool_execution_start" && type !== "tool_execution_update" && type !== "tool_execution_end")
+    return false;
+  const toolCallId = typeof input.record.toolCallId === "string" && input.record.toolCallId.trim() ? input.record.toolCallId.trim() : `${Date.now()}`;
+  const toolName = typeof input.record.toolName === "string" && input.record.toolName.trim() ? input.record.toolName.trim() : "tool";
+  const result = input.record.result && typeof input.record.result === "object" && !Array.isArray(input.record.result) ? input.record.result : null;
+  appendRunTimeline(input.projectRoot, input.runId, {
+    id: `tool:${toolCallId}:${type}`,
+    type,
+    toolName,
+    status: type === "tool_execution_end" ? input.record.isError === true || result?.isError === true ? "failed" : "completed" : "running",
+    createdAt: new Date().toISOString()
+  });
+  return true;
+}
+function isNonRenderablePiProtocolRecord(record) {
+  const type = typeof record.type === "string" ? record.type : "";
+  return type === "message_start" || type === "message_end" || type === "turn_start" || type === "turn_end" || type === "tool_result" || type === "message_update" && (!record.assistantMessageEvent || typeof record.assistantMessageEvent !== "object" || Array.isArray(record.assistantMessageEvent) || record.assistantMessageEvent.type !== "text_delta");
+}
 function appendToolTimelineFromLog(input) {
   const title = typeof input.log.title === "string" ? input.log.title : "";
   if (title !== "Tool activity")
@@ -8761,6 +8911,10 @@ ${planningClassification.planningRequired ? `Before implementing, write a concis
     try {
       const record = JSON.parse(trimmed);
       const liveLogStatus = reviewStarted ? "reviewing" : verificationStarted ? "validating" : "running";
+      if (input.runtimeAdapter === "pi" && appendPiToolTimelineFromRecord({ projectRoot: context.projectRoot, runId: input.runId, record })) {
+        emitServerRunEvent({ type: "timeline", runId: input.runId });
+        return;
+      }
       const providerLogs = input.runtimeAdapter === "codex" ? buildCodexLogsFromRecord({
         runId: input.runId,
         record,
@@ -8832,6 +8986,9 @@ ${planningClassification.planningRequired ? `Before implementing, write a concis
           return;
         }
       }
+      if (input.runtimeAdapter === "pi" && isNonRenderablePiProtocolRecord(record)) {
+        return;
+      }
       if (record.type === "assistant") {
         const message2 = record.message && typeof record.message === "object" ? record.message : record;
         const content = Array.isArray(message2.content) ? message2.content : [];

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@h-rig/cli",
-  "version": "0.0.6-alpha.17",
+  "version": "0.0.6-alpha.19",
   "type": "module",
   "description": "Rig package",
   "license": "UNLICENSED",
@@ -23,10 +23,10 @@
   },
   "dependencies": {
     "@clack/prompts": "^1.2.0",
-    "@rig/core": "npm:@h-rig/core@0.0.6-alpha.17",
-    "@rig/runtime": "npm:@h-rig/runtime@0.0.6-alpha.17",
-    "@rig/client": "npm:@h-rig/client@0.0.6-alpha.17",
-    "@rig/server": "npm:@h-rig/server@0.0.6-alpha.17",
+    "@rig/core": "npm:@h-rig/core@0.0.6-alpha.19",
+    "@rig/runtime": "npm:@h-rig/runtime@0.0.6-alpha.19",
+    "@rig/client": "npm:@h-rig/client@0.0.6-alpha.19",
+    "@rig/server": "npm:@h-rig/server@0.0.6-alpha.19",
     "picocolors": "^1.1.1"
   }
 }