@meistrari/remy-cli 1.14.1 → 1.15.0

package/README.md

@@ -36,7 +36,7 @@ The dashboard is the starting point for all interactive work. It refreshes the v
 
 ### Start work
 
-Press `n` in the dashboard. The new-session flow asks what you want done, selects a GitHub installation when needed, suggests repositories based on your request, and lets you review those suggestions. If the request links an open pull request in a selected repository, Remy checks the current pull request state before accepting branch confirmation and adds a third branch step: continue from that pull request's current branch or create a new session branch. Before creating the session, choose the agent model and reasoning effort. The wizard starts with `gpt-6-astra` and `medium` reasoning by default. Remy then opens the session and streams its activity.
+Press `n` in the dashboard. The new-session flow asks what you want done, selects a GitHub installation when needed, suggests repositories based on your request, and lets you review those suggestions. Remy analyzes the request for existing work: a Remy session ID or number, a PR URL or number (`PR 267`, `#267`, or `owner/repo#267`), or an exact or approximate branch name. It verifies matches against the selected repositories and offers up to five branches per repository. In the branch step, use arrows to move, Space to select, and Enter to select the current option and review your choices. Each repository can continue one branch or start a new session branch. A lookup failure stays on a retry screen; press `r` to retry, `n` to explicitly choose new branches, or Esc to edit the request. Before creating the session, choose the agent model and reasoning effort. The wizard starts with `gpt-6-astra` and `medium` reasoning by default. Remy then opens the session and streams its activity.
 
 Use `Tab` while writing the request to complete a local file or directory path. Remy attaches selected paths when you confirm the request. Each file may be at most 20 MiB. A directory may contain at most 20 MiB across its regular files before compression; Remy uploads it as a temporary `<directory>.tar.gz` archive with the selected directory preserved as its root, so the remote agent can extract and use its files. Remy rejects oversized attachments with guidance to choose a smaller file or directory, and rejects directory attachments that contain symbolic links or other non-regular entries. On macOS, `Ctrl+V` adds a PNG from the system clipboard to the request; Remy attaches it on confirmation. Remy uploads attachments before creating the session and shows their filenames beneath your message.
 
@@ -91,6 +91,8 @@ remy new --repository owner/repository "Add a health check endpoint"
 
 Repeat `--repository` to select more repositories from the same GitHub installation. If you do not select a repository, supply `--installation <github-installation-id>`. Repeat `--attach <path>` to upload files or directories; the 20 MiB per-attachment limit is measured directly for a file and across all regular files before compressing a directory. Remy sends each accepted directory as a gzip-compressed tar archive. Direct creation uses `medium` reasoning unless `--reasoning-effort` overrides it; omit `--model` to use the server's `gpt-6-astra` default. `remy new` creates the session from the prompt and flags, then opens it when the terminal is interactive.
 
+The branch-suggestion flow belongs to the interactive new-session wizard (`remy`, then `n`). Direct `remy new` creation does not analyze continuation references.
+
 ### Open a known session
 
 ```bash

package/dist/remy.js

@@ -31690,6 +31690,12 @@ var branchSuggestionsResponseSchema = exports_external2.strictObject({
         url: exports_external2.url()
       })
     }),
+    exports_external2.strictObject({
+      repository_id: exports_external2.string().min(1),
+      suggestion_kind: exports_external2.literal("continue_existing_branch"),
+      branch_name: exports_external2.string().min(1),
+      pull_request: exports_external2.null()
+    }),
     exports_external2.strictObject({
       repository_id: exports_external2.string().min(1),
       suggestion_kind: exports_external2.literal("create_session_branch"),
@@ -31791,6 +31797,7 @@ async function suggestRemoteBranches({
     method: "POST",
     headers: { "content-type": "application/json" },
     body: JSON.stringify({
+      suggestion_mode: "prompt",
       github_installation_id: parsedInput.installationId,
       prompt: parsedInput.prompt,
       repository_ids: parsedInput.repositoryIds
@@ -31810,6 +31817,11 @@ async function suggestRemoteBranches({
     repositoryId: repository.repository_id,
     branchName: repository.branch_name,
     pullRequest: repository.pull_request
+  } : repository.suggestion_kind === "continue_existing_branch" ? {
+    suggestionKind: "continueExistingBranch",
+    repositoryId: repository.repository_id,
+    branchName: repository.branch_name,
+    pullRequest: null
   } : {
     suggestionKind: "createSessionBranch",
     repositoryId: repository.repository_id,
@@ -36935,6 +36947,19 @@ async function createNewSessionWizard({
         overrides.delete(repositoryId);
       else
         overrides.set(repositoryId, isSelected);
+    }, branchOverridesForSelection = function() {
+      return [...selectedBranches].map(([repositoryId, branchName]) => ({ repositoryId, branchName }));
+    }, branchOptions = function() {
+      return [...selectedRepositoryIds()].flatMap((repositoryId) => {
+        const existing = branchSuggestions.filter((suggestion) => suggestion.repositoryId === repositoryId && suggestion.suggestionKind !== "createSessionBranch");
+        return [...existing, { suggestionKind: "createSessionBranch", repositoryId, branchName: null, pullRequest: null }];
+      });
+    }, selectBranchOption = function() {
+      const option = branchOptions()[branchOptionIndex];
+      if (option.branchName === null)
+        selectedBranches.delete(option.repositoryId);
+      else
+        selectedBranches.set(option.repositoryId, option.branchName);
     }, renderRepositoryLoadingSkeleton = function() {
       return new StyledText5([
         dim4(fg6(PALETTE.dimText)(`\u283F \u2588\u2588\u2588\u2588\u2588\u2588\u2588\u2588\u2588\u2588\u2588\u2588
@@ -36947,7 +36972,7 @@ async function createNewSessionWizard({
       const orient = (body) => joinStyled([renderStepIndicator({
         step,
         hasInstallationChoice: installationIds.length > 1,
-        hasBranchChoice: step === "loadingBranches" || branchSuggestions.some((suggestion) => suggestion.suggestionKind !== "createSessionBranch")
+        hasBranchChoice: step === "loadingBranches" || step === "branchError" || branchSuggestions.some((suggestion) => suggestion.suggestionKind !== "createSessionBranch")
       }), body], `
 `);
       if (composerVisible && !composerMounted) {
@@ -37023,31 +37048,39 @@ async function createNewSessionWizard({
       } else if (step === "loadingBranches") {
         content.content = orient(joinStyled([
           new StyledText5([stepHeader("Choose branches")]),
-          new StyledText5([fg6(PALETTE.progress)(`${suggestionSpinnerFrames[suggestionSpinnerFrame]} Remy is checking for related open pull requests\u2026`)]),
+          new StyledText5([fg6(PALETTE.progress)(`${suggestionSpinnerFrames[suggestionSpinnerFrame]} Remy is analyzing session, PR, and branch references\u2026`)]),
           new StyledText5([dim4(fg6(PALETTE.dimText)("This can take a few seconds."))]),
           stringToStyledText4("esc back")
         ], `
 
+`));
+      } else if (step === "branchError") {
+        content.content = orient(joinStyled([
+          new StyledText5([stepHeader("Branch lookup failed")]),
+          stringToStyledText4(status),
+          stringToStyledText4("r retry \xB7 n explicitly choose new branches \xB7 esc back")
+        ], `
+
 `));
       } else if (step === "branches") {
-        const existing = branchSuggestions.filter((suggestion) => suggestion.suggestionKind !== "createSessionBranch");
-        const parts = [new StyledText5([stepHeader("Choose branches")])];
-        if (existing.length > 0) {
-          parts.push(stringToStyledText4("Remy found related open pull-request work:"));
-          for (const suggestion of existing) {
-            const repository = installationRepositories().find((candidate) => candidate.id === suggestion.repositoryId);
-            parts.push(stringToStyledText4(`${repository?.fullName ?? suggestion.repositoryId} \u2014 ${suggestion.branchName}${suggestion.pullRequest ? ` (PR #${suggestion.pullRequest.number}: ${suggestion.pullRequest.title})` : ""}`));
-          }
-          parts.push(new StyledText5(renderSelectableRow({ label: "Continue from the suggested branch", isCursor: branchChoice === "existing" })));
-          parts.push(new StyledText5(renderSelectableRow({ label: "Create a new session branch", isCursor: branchChoice === "new" })));
-          parts.push(stringToStyledText4("\u2191\u2193 choose \xB7 \u23CE continue \xB7 esc back"));
-        } else {
-          parts.push(stringToStyledText4("Remy recommends creating a new session branch."));
-          parts.push(new StyledText5([dim4(fg6(PALETTE.dimText)(status || "No related open pull request was identified from your request."))]));
-          parts.push(stringToStyledText4("\u23CE continue \xB7 esc back"));
+        const options = branchOptions();
+        const visibleCount = Math.max(2, renderer.height - 12);
+        const start = Math.max(0, Math.min(branchOptionIndex - Math.floor(visibleCount / 2), options.length - visibleCount));
+        const parts = [
+          new StyledText5([stepHeader("Choose branches")]),
+          stringToStyledText4("Continue from the suggested branch, or choose new work for each repository:")
+        ];
+        for (const [index, option] of options.slice(start, start + visibleCount).entries()) {
+          const repository = installationRepositories().find((repository2) => repository2.id === option.repositoryId);
+          const selected = (selectedBranches.get(option.repositoryId) ?? null) === option.branchName;
+          const label = option.branchName === null ? "Create a new session branch" : `${option.branchName}${option.pullRequest ? ` (PR #${option.pullRequest.number}: ${option.pullRequest.title})` : ""}`;
+          parts.push(new StyledText5(renderSelectableRow({
+            label: `${selected ? "\u25CF" : "\u25CB"} ${repository?.fullName ?? option.repositoryId} \u2014 ${label}`,
+            isCursor: start + index === branchOptionIndex
+          })));
         }
+        parts.push(stringToStyledText4(`\u2191\u2193 move \xB7 space select \xB7 \u23CE select & review \xB7 esc back (${branchOptionIndex + 1}/${options.length})`));
         content.content = orient(joinStyled(parts, `
-
 `));
       } else if (repositoryListVisible) {
         const selectionOverrides = searchSelections ?? manualSelections;
@@ -37092,13 +37125,13 @@ async function createNewSessionWizard({
         editor.placeholder = "e.g. worker, migration, dashboard";
       } else {
         const selected = installationRepositories().filter((repository) => selectedRepositoryIds().has(repository.id));
-        const branchOverrides = branchChoice === "existing" ? branchSuggestions.filter((suggestion) => suggestion.suggestionKind !== "createSessionBranch") : [];
+        const branchOverrides = branchOverridesForSelection();
         const meta5 = new StyledText5([
           fg6(PALETTE.bodyText)(`Installation: ${selectedInstallationId() ?? "(missing)"}
 `),
           fg6(PALETTE.bodyText)(`Repositories: ${selected.map((repository) => repository.fullName).join(", ") || "(none)"}
 `),
-          fg6(PALETTE.bodyText)(`Branches: ${branchOverrides.length > 0 ? branchOverrides.map((override) => override.branchName).join(", ") : "new session branches"}
+          fg6(PALETTE.bodyText)(`Branches: ${branchOverrides.length > 0 ? selected.map((repository) => `${repository.fullName}: ${selectedBranches.get(repository.id) ?? "new session branch"}`).join(", ") : "new session branches"}
 `),
           fg6(PALETTE.bodyText)(`Model: ${newSessionModelLabel(model)} \xB7 ${newSessionReasoningEffortLabel(reasoningEffort)} reasoning`),
           dim4(fg6(PALETTE.dimText)("   \u25B8 m model \xB7 \u2190\u2192 reasoning"))
@@ -37111,7 +37144,7 @@ async function createNewSessionWizard({
         ];
         if (attachmentText.chunks.length > 0)
           parts.push(attachmentText);
-        parts.push(new StyledText5([dim4(fg6(PALETTE.dimText)(branchOverrides.length > 0 ? "Remy will continue on the selected existing branch and update its pull request; you land in the session view." : "Remy will clone the selected repositories, work on new session branches, and open a pull request for each repository; you land in the session view."))]));
+        parts.push(new StyledText5([dim4(fg6(PALETTE.dimText)(branchOverrides.length > 0 ? "Remy will continue on the selected branches and create new branches for other repositories; you land in the session view." : "Remy will clone the selected repositories, work on new session branches, and open a pull request for each repository; you land in the session view."))]));
         parts.push(stringToStyledText4(branchSuggestions.some((suggestion) => suggestion.suggestionKind !== "createSessionBranch") ? "\u23CE create \xB7 e edit prompt \xB7 r repositories \xB7 b branches \xB7 esc back" : "\u23CE create \xB7 e edit prompt \xB7 r repositories \xB7 esc back"));
         if (status)
           parts.push(stringToStyledText4(status));
@@ -37244,7 +37277,7 @@ async function createNewSessionWizard({
         returnToPromptFromRepositoryLoading();
         return;
       }
-      if (step === "loadingBranches" || step === "branches") {
+      if (step === "loadingBranches" || step === "branches" || step === "branchError") {
         branchRequestGeneration += 1;
         step = "repositories";
         render();
@@ -37354,6 +37387,17 @@ async function createNewSessionWizard({
           return;
         }
       }
+      if (step === "branchError" && (key.name === "r" || key.name === "n")) {
+        key.preventDefault();
+        if (key.name === "r") {
+          startBranchReview();
+        } else {
+          status = "";
+          step = "confirmation";
+          render();
+        }
+        return;
+      }
       if (step === "repositorySearch")
         return;
       if (step === "loadingSuggestions" && key.name === "s") {
@@ -37373,15 +37417,23 @@ async function createNewSessionWizard({
           return;
         }
       }
+      if (step === "branches" && key.name === "space") {
+        key.preventDefault();
+        selectBranchOption();
+        render();
+        return;
+      }
       if (step === "branches" && branchSuggestions.some((suggestion) => suggestion.suggestionKind !== "createSessionBranch") && (key.name === "up" || key.name === "down" || key.name === "left" || key.name === "right")) {
         key.preventDefault();
-        branchChoice = branchChoice === "existing" ? "new" : "existing";
+        const options = branchOptions();
+        const direction = key.name === "up" || key.name === "left" ? -1 : 1;
+        branchOptionIndex = (branchOptionIndex + direction + options.length) % options.length;
         render();
         return;
       }
       if (!composerMounted && (key.name === "return" || key.name === "enter")) {
         key.preventDefault();
-        if (step === "loadingBranches")
+        if (step === "loadingBranches" || step === "branchError")
           return;
         submitEditor();
         return;
@@ -37500,7 +37552,8 @@ async function createNewSessionWizard({
       branchName: override.branchName,
       pullRequest: null
     })) ?? [];
-    let branchChoice = initialDraft?.repositoryBranchOverrides?.length ? "existing" : "new";
+    const selectedBranches = new Map(initialDraft?.repositoryBranchOverrides?.map((override) => [override.repositoryId, override.branchName]));
+    let branchOptionIndex = 0;
     let status = initialError ?? "";
     let attachmentFeedback;
     let pendingPastedImageWrites = 0;
@@ -37575,9 +37628,16 @@ async function createNewSessionWizard({
       if (!installationId)
         return;
       const repositoryIds = [...selectedRepositoryIds()];
+      if (repositoryIds.length === 0) {
+        branchSuggestions = [];
+        selectedBranches.clear();
+        step = "confirmation";
+        render();
+        return;
+      }
       const requestGeneration = ++branchRequestGeneration;
       branchSuggestions = [];
-      branchChoice = "new";
+      selectedBranches.clear();
       step = "loadingBranches";
       status = "";
       render();
@@ -37587,15 +37647,19 @@ async function createNewSessionWizard({
           return;
         branchSuggestions = suggestions;
         const hasExistingBranch = branchSuggestions.some((suggestion) => suggestion.suggestionKind !== "createSessionBranch");
-        branchChoice = hasExistingBranch ? "existing" : "new";
+        for (const suggestion of branchSuggestions) {
+          if (suggestion.suggestionKind !== "createSessionBranch" && !selectedBranches.has(suggestion.repositoryId))
+            selectedBranches.set(suggestion.repositoryId, suggestion.branchName);
+        }
+        branchOptionIndex = 0;
         step = hasExistingBranch ? "branches" : "confirmation";
       } catch (error93) {
         if (destroyed || requestGeneration !== branchRequestGeneration || step !== "loadingBranches")
           return;
         branchSuggestions = [];
-        branchChoice = "new";
+        selectedBranches.clear();
         status = error93 instanceof Error ? error93.message : String(error93);
-        step = "confirmation";
+        step = "branchError";
       }
       render();
     }
@@ -37668,7 +37732,7 @@ async function createNewSessionWizard({
         fail(new Error("Selected repositories must belong to the chosen GitHub installation."));
         return;
       }
-      const repositoryBranchOverrides = branchChoice === "existing" ? branchSuggestions.flatMap((suggestion) => suggestion.suggestionKind === "createSessionBranch" ? [] : [{ repositoryId: suggestion.repositoryId, branchName: suggestion.branchName }]) : [];
+      const repositoryBranchOverrides = branchOverridesForSelection();
       const confirmation = Symbol("confirmation");
       const confirmedAttachments = [...attachments];
       const confirmedPrompt = prompt;
@@ -37755,6 +37819,7 @@ async function createNewSessionWizard({
         return;
       }
       if (step === "branches") {
+        selectBranchOption();
         step = "confirmation";
         render();
         return;
@@ -37870,7 +37935,7 @@ function wizardStepKey(step) {
     return "describe";
   if (step === "installation")
     return "installation";
-  if (step === "loadingBranches" || step === "branches")
+  if (step === "loadingBranches" || step === "branches" || step === "branchError")
     return "branches";
   if (step === "confirmation")
     return "confirm";
@@ -39430,7 +39495,7 @@ var compactMarkRows = 9;
 var compactMinWidth = 48;
 var compactMinHeight = 20;
 var markBrightnessGain = 4.2;
-var remyCliVersion = "1.14.1";
+var remyCliVersion = "1.15.0";
 async function showRemySplash({
   createRenderer = createRemyRenderer,
   durationMs = splashDurationMs,

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@meistrari/remy-cli",
-    "version": "1.14.1",
+    "version": "1.15.0",
     "description": "Remy, the Coding Agent terminal client.",
     "type": "module",
     "bin": {