@meistrari/remy-cli 1.25.0-rc.3 → 1.25.0-rc.5

package/README.md

@@ -56,12 +56,14 @@ Press `n` in the dashboard. The new-session flow asks what you want done, select
 
 On the final review, press `c` to choose MCP servers. Arrows move, Space toggles optional servers, `s` searches, `r` refreshes, and Enter returns to review. Escape clears an active search before returning to review. Servers always included for CLI sessions are locked; unavailable optional connections cannot be added. Previously selected servers that disappear remain visible until you remove them. Catalog failures block creation: open the picker and press `r` to retry without losing your prompt.
 
-Use `Tab` while writing the request to complete a local file or directory path. Path suggestions use the same highlighted list as command autocomplete, with File/Directory labels and a menu sized to the terminal; arrows move, Enter accepts, Tab cycles, and Esc dismisses. Remy attaches selected paths when you confirm the request. You can also paste an absolute path directly; quote paths containing spaces (for example, `"/Users/me/Desktop/Screen Shot.png"`) or use shell-style backslash escapes. Autocomplete selection is not required. 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` saves a clipboard image as a temporary PNG and adds its path to the request; Remy attaches it on confirmation. Remy uploads attachments before creating the session and shows their filenames beneath your message.
+Use `Tab` while writing the request to complete a local file or directory path. Path suggestions use the same highlighted list as command autocomplete, with File/Directory labels and a menu sized to the terminal; arrows move, Enter accepts, Tab cycles, and Esc dismisses. Remy attaches selected paths when you confirm the request. You can also paste an absolute path directly; quote paths containing spaces (for example, `"/Users/me/Desktop/Screen Shot.png"`) or use shell-style backslash escapes. Autocomplete selection is not required. 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. Prompt-path attachments are best-effort: missing, unreadable, oversized or unsupported paths and failed uploads are skipped, and the original message is sent with whichever attachments succeeded. This includes paths selected with Tab or inserted from the clipboard. A non-blocking notice names files skipped during preparation or upload, including selected files that disappeared. When creating a session, the notice carries into the conversation; unrecognized, unselected prose remains quiet. Slashes in ordinary prose do not make attachment errors block your message. Directory archives never follow symbolic links or include other non-regular entries. On macOS, `Ctrl+V` saves a clipboard image as a temporary PNG and adds its path to the request; Remy attaches it on confirmation. Remy uploads attachments before creating the session and shows their filenames beneath your message.
 
 In a session, `Esc` dismisses open command/path suggestions or help before it can stop an active turn. Long suggestion labels may be shortened on screen; accepting one inserts the complete value. `/changes` opens read-only workspace Changes; `/workspace` opens its repository Files tree. `/files` or `Ctrl+F` remains the published-file and attachment picker. In the workspace browser, arrows or `j`/`k` navigate, Enter opens a loaded entry (deleted Changes rows open their old-side diff), `s` searches loaded entries, and `r` refreshes. In a file or diff, `g` goes to a line, Space anchors a range, `a` stages captured lines for the next message, `o`/`n` chooses the old/new side, `e` expands verified full context, `w` changes diff scope, `v` switches file/diff, and `d` downloads current regular-file bytes to `~/Downloads`; this is a fresh read and may differ from the displayed capture, not a snapshot export. Esc unwinds search, selection, and navigation before returning with the composer draft intact; returning from a viewer restores the originating list row when it remains available. Up to five contexts can be staged; each range is limited to 200 lines and 12,000 characters. Stale or unavailable captures cannot be staged. Valid human-message workspace trailers display compact repository/path/line references by default; `Ctrl+O` expands the original text. `/context` reviews or removes staged references before sending. The full captured text remains in the canonical message, and malformed trailers display as ordinary text.
 
 Opening the workspace browser while a message is being submitted does not discard that attempt. When you return, a failed submission remains available with `Ctrl+R`; retry preserves its original text, captured context, attachments, settings, and request identity. This recovery lasts for the current attached session, not across CLI restarts.
 
+The new-session request and conversation composers share path completion and attachment selection. `Tab` completes the path prefix immediately before the cursor, preserving the text after it; accepting a suggestion leaves the cursor at the inserted path, including with joined emoji, combining accents, and wide characters. Restored drafts, history, and search queries also place the cursor at the end of the actual text. Suggestions stay above the input on compact terminals. In the new-session wizard, long drafts scroll within the remaining input space so suggestions and both input dividers remain visible. Editing the draft dismisses the old suggestions, and `Esc` also cancels a lookup that is still loading. A lookup discarded after cursor movement does not consume the next `Esc`. Session commands and previous-message history are available in the conversation composer.
+
 ### Resume or follow up
 
 Every terminal follow-up is appended as an explicit **Steer**, so it targets the work currently in progress. Queuing a message for a later turn (**Next**) is Web-only for now. Remy can replay sessions containing queued-message dispatch, withdrawal, and failure events. Messages withdrawn or failed before reaching Remy show an activity notice; an active submission ends as cancelled or failed instead of waiting for a turn that never started.

package/dist/remy.js

@@ -34592,7 +34592,7 @@ function formatSessionJson({
 `;
 }
 // src/version.ts
-var remyCliVersion = "1.25.0-rc.3";
+var remyCliVersion = "1.25.0-rc.5";
 
 // src/self-update.ts
 import { spawn } from "child_process";
@@ -39610,8 +39610,8 @@ function completionMenuRows(terminalHeight) {
 }
 
 // src/tui/composer-height.ts
-function resizeComposer(composer) {
-  composer.height = Math.min(Math.max(composer.editorView.getTotalVirtualLineCount(), 1), TUI_LAYOUT.composerMaxRows);
+function resizeComposer(composer, availableRows = TUI_LAYOUT.composerMaxRows) {
+  composer.height = Math.min(Math.max(composer.editorView.getTotalVirtualLineCount(), 1), TUI_LAYOUT.composerMaxRows, Math.max(1, availableRows));
 }
 
 // src/tui/composer.ts
@@ -39688,6 +39688,10 @@ function createComposer({
     }
   };
 }
+function setComposerText(editor, text) {
+  editor.setText(text);
+  editor.gotoBufferEnd();
+}
 
 // src/tui/key-hints.ts
 import { dim as dim3, fg as fg4, StyledText as StyledText5 } from "@opentui/core";
@@ -40744,7 +40748,7 @@ async function createDashboardTui({
       render();
     }, openSessionSearch = function() {
       sessionSearchOpen = true;
-      sessionSearchComposer.textarea.setText(sessionSearchQuery);
+      setComposerText(sessionSearchComposer.textarea, sessionSearchQuery);
       render();
     }, applySessionSearch = function() {
       if (!sessionSearchOpen)
@@ -41463,6 +41467,9 @@ function renderFeedback(feedback) {
 function attachmentUploadMessage(filenames) {
   return filenames.length === 1 ? `Attaching ${filenames[0]}\u2026` : `Attaching ${filenames.length} files\u2026`;
 }
+function attachmentSkippedMessage(filenames) {
+  return `Continuing without attachments: ${filenames.map(terminalSafeText).join(", ")}.`;
+}
 function renderAttachmentFeedback(feedback) {
   return renderFeedback(feedback);
 }
@@ -41481,52 +41488,6 @@ function renderAttachmentSummary(attachments) {
 var SPINNER_FRAMES = ["\u280B", "\u2819", "\u2839", "\u2838", "\u283C", "\u2834", "\u2826", "\u2827", "\u2807", "\u280F"];
 var SPINNER_INTERVAL_MS = 80;
 
-// src/tui/completion-menu.ts
-import { dim as dim5, fg as fg10, StyledText as StyledText9 } from "@opentui/core";
-function renderCompletionMenu({ items, selectedIndex, hints, width, maxRows }) {
-  if (items.length === 0)
-    return;
-  const hint = renderKeyHints({ hints, width });
-  const hintRows = hint.chunks.map((chunk) => chunk.text).join("").split(`
-`).length;
-  const optionBudget = Math.max(1, maxRows - hintRows);
-  const showCount = items.length > Math.min(TUI_LAYOUT.completionMaxOptions, optionBudget) && optionBudget > 1;
-  const maximumVisibleCompletions = Math.min(TUI_LAYOUT.completionMaxOptions, optionBudget - (showCount ? 1 : 0));
-  const firstIndex = Math.min(Math.max(0, selectedIndex - Math.floor(maximumVisibleCompletions / 2)), Math.max(0, items.length - maximumVisibleCompletions));
-  const visibleItems = items.slice(firstIndex, firstIndex + maximumVisibleCompletions);
-  const naturalLabelWidth = Math.max(...items.map((item) => Bun.stringWidth(item.label))) + 2;
-  const descriptionBudget = Math.max(0, width - 2 - Math.min(naturalLabelWidth, Math.floor(width * 0.6)));
-  const descriptionWidth = width >= 30 ? Math.min(descriptionBudget, Math.max(...items.map((item) => Bun.stringWidth(item.description)))) : 0;
-  const labelWidth = Math.max(0, Math.min(naturalLabelWidth, width - 2 - descriptionWidth));
-  const rows = visibleItems.map((item, index) => {
-    const selected = firstIndex + index === selectedIndex;
-    const chunks = [
-      fg10(PALETTE.remyAccent)(`${selected ? "\u203A " : "  "}${padText(truncateText(item.label, labelWidth - 2), labelWidth)}`),
-      fg10(PALETTE.dimText)(truncateText(item.description, descriptionWidth))
-    ];
-    return new StyledText9(highlightSelection({ chunks, cursor: selected }));
-  });
-  if (showCount && items.length > visibleItems.length)
-    rows.push(new StyledText9([dim5(fg10(PALETTE.dimText)(`${firstIndex + 1}-${firstIndex + visibleItems.length} of ${items.length}`))]));
-  rows.push(hint);
-  return joinStyled(rows, `
-`);
-}
-
-// src/tui/path-completion-menu.ts
-function renderPathCompletionMenu({ completions, selectedIndex, width, maxRows }) {
-  return renderCompletionMenu({
-    items: completions.map((completion) => ({
-      label: completion.display,
-      description: completion.display.endsWith("/") ? "Directory" : "File"
-    })),
-    selectedIndex,
-    hints: [{ key: "\u2191\u2193", action: "select" }, { key: "Enter", action: "accepts" }, { key: "Tab", action: "next" }, { key: "Esc", action: "dismiss" }],
-    width,
-    maxRows
-  });
-}
-
 // src/tui/path-completion.ts
 import { readdir } from "fs/promises";
 import { homedir } from "os";
@@ -41615,6 +41576,163 @@ function activePathToken(text) {
   return match?.[1];
 }
 
+// src/tui/completion-menu.ts
+import { dim as dim5, fg as fg10, StyledText as StyledText9 } from "@opentui/core";
+function renderCompletionMenu({ items, selectedIndex, hints, width, maxRows }) {
+  if (items.length === 0)
+    return;
+  const hint = renderKeyHints({ hints, width });
+  const hintRows = hint.chunks.map((chunk) => chunk.text).join("").split(`
+`).length;
+  const optionBudget = Math.max(1, maxRows - hintRows);
+  const showCount = items.length > Math.min(TUI_LAYOUT.completionMaxOptions, optionBudget) && optionBudget > 1;
+  const maximumVisibleCompletions = Math.min(TUI_LAYOUT.completionMaxOptions, optionBudget - (showCount ? 1 : 0));
+  const firstIndex = Math.min(Math.max(0, selectedIndex - Math.floor(maximumVisibleCompletions / 2)), Math.max(0, items.length - maximumVisibleCompletions));
+  const visibleItems = items.slice(firstIndex, firstIndex + maximumVisibleCompletions);
+  const naturalLabelWidth = Math.max(...items.map((item) => Bun.stringWidth(item.label))) + 2;
+  const descriptionBudget = Math.max(0, width - 2 - Math.min(naturalLabelWidth, Math.floor(width * 0.6)));
+  const descriptionWidth = width >= 30 ? Math.min(descriptionBudget, Math.max(...items.map((item) => Bun.stringWidth(item.description)))) : 0;
+  const labelWidth = Math.max(0, Math.min(naturalLabelWidth, width - 2 - descriptionWidth));
+  const rows = visibleItems.map((item, index) => {
+    const selected = firstIndex + index === selectedIndex;
+    const chunks = [
+      fg10(PALETTE.remyAccent)(`${selected ? "\u203A " : "  "}${padText(truncateText(item.label, labelWidth - 2), labelWidth)}`),
+      fg10(PALETTE.dimText)(truncateText(item.description, descriptionWidth))
+    ];
+    return new StyledText9(highlightSelection({ chunks, cursor: selected }));
+  });
+  if (showCount && items.length > visibleItems.length)
+    rows.push(new StyledText9([dim5(fg10(PALETTE.dimText)(`${firstIndex + 1}-${firstIndex + visibleItems.length} of ${items.length}`))]));
+  rows.push(hint);
+  return joinStyled(rows, `
+`);
+}
+
+// src/tui/path-completion-menu.ts
+function renderPathCompletionMenu({ completions, selectedIndex, width, maxRows }) {
+  return renderCompletionMenu({
+    items: completions.map((completion) => ({
+      label: completion.display,
+      description: completion.display.endsWith("/") ? "Directory" : "File"
+    })),
+    selectedIndex,
+    hints: [{ key: "\u2191\u2193", action: "select" }, { key: "Enter", action: "accepts" }, { key: "Tab", action: "next" }, { key: "Esc", action: "dismiss" }],
+    width,
+    maxRows
+  });
+}
+
+// src/tui/composer-paths.ts
+function createComposerPaths({
+  editor,
+  cwd,
+  isActive,
+  onChange
+}) {
+  let previousText = editor.plainText;
+  let selections = [];
+  let completions = [];
+  let selectedIndex = 0;
+  let request;
+  function dismiss() {
+    const wasOpen = request !== undefined;
+    request = undefined;
+    completions = [];
+    return wasOpen;
+  }
+  function matchesEditor(snapshot) {
+    return isActive() && editor.plainText === snapshot.text && editor.cursorOffset === snapshot.cursor;
+  }
+  async function open5() {
+    const snapshot = { text: editor.plainText, cursor: editor.cursorOffset };
+    request = snapshot;
+    const candidates = await completePathToken({ text: editor.editBuffer.getTextRange(0, snapshot.cursor), cwd });
+    if (request !== snapshot)
+      return;
+    if (!matchesEditor(snapshot)) {
+      dismiss();
+      return;
+    }
+    completions = candidates;
+    selectedIndex = 0;
+    if (candidates.length === 0)
+      request = undefined;
+    onChange();
+  }
+  function trackPath({ path, token, end }) {
+    selections.push(createSelectedPathCompletion({ attachmentPath: path, token, end }));
+    previousText = editor.plainText;
+  }
+  return {
+    dismiss,
+    update() {
+      selections = reconcileSelectedPathCompletions({ previousText, text: editor.plainText, selections });
+      previousText = editor.plainText;
+      dismiss();
+    },
+    clearSelections() {
+      selections = [];
+    },
+    selectedPaths(text) {
+      return selectedAttachmentPaths({ text, selections });
+    },
+    insertPath(path) {
+      editor.insertText(path);
+      trackPath({ path, token: path, end: editor.editBuffer.getTextRange(0, editor.cursorOffset).length });
+    },
+    renderMenu({ width, maxRows }) {
+      if (!request || !matchesEditor(request) || completions.length === 0)
+        return;
+      return renderPathCompletionMenu({ completions, selectedIndex, width, maxRows });
+    },
+    handleKey(key) {
+      if (!isActive())
+        return false;
+      if (key.name === "escape" && dismiss()) {
+        key.preventDefault();
+        onChange();
+        return true;
+      }
+      if (request && !matchesEditor(request)) {
+        dismiss();
+        onChange();
+      }
+      if (completions.length > 0) {
+        if (key.name === "up" || key.name === "down" || key.name === "tab") {
+          key.preventDefault();
+          selectedIndex = (selectedIndex + (key.name === "up" ? -1 : 1) + completions.length) % completions.length;
+          onChange();
+          return true;
+        }
+        if (key.name === "return" || key.name === "enter") {
+          key.preventDefault();
+          const completion = completions[selectedIndex];
+          const cursor = editor.cursorOffset;
+          const cursorIndex = editor.editBuffer.getTextRange(0, cursor).length;
+          const prefix = replaceActivePathToken({ text: editor.plainText.slice(0, cursorIndex), replacement: completion.replacement });
+          const text = prefix + editor.plainText.slice(cursorIndex);
+          dismiss();
+          editor.gotoBufferEnd();
+          const suffixOffset = editor.cursorOffset - cursor;
+          setComposerText(editor, text);
+          editor.cursorOffset -= suffixOffset;
+          if (completion.attachmentPath)
+            trackPath({ path: completion.attachmentPath, token: completion.replacement, end: prefix.length });
+          onChange();
+          return true;
+        }
+        dismiss();
+        onChange();
+      }
+      if (key.name !== "tab")
+        return false;
+      key.preventDefault();
+      open5();
+      return true;
+    }
+  };
+}
+
 // src/tui/new-session-wizard.ts
 async function createNewSessionWizard({
   repositories,
@@ -41692,6 +41810,8 @@ async function createNewSessionWizard({
 \u283F \u2588\u2588\u2588\u2588\u2588\u2588\u2588\u2588\u2588\u2588\u2588\u2588`))
       ]);
     }, render = function() {
+      if (step !== "prompt")
+        composerPaths.dismiss();
       const repositoryListVisible = step === "repositories" || step === "repositorySearch";
       const mcpListVisible = step === "mcps" || step === "mcpSearch";
       const selectionListVisible = repositoryListVisible || step === "branches" || mcpListVisible;
@@ -41720,6 +41840,15 @@ async function createNewSessionWizard({
       repositoryRows.content = "";
       repositoryDivider.content = "";
       repositoryFooter.content = "";
+      repositoryDivider.height = selectionListVisible ? "auto" : 0;
+      repositoryFooter.height = selectionListVisible ? "auto" : 0;
+      const menu = composerPaths.renderMenu({ width: renderer.width - 2, maxRows: completionMenuRows(renderer.height) });
+      const menuRows = menu ? menu.chunks.map((chunk) => chunk.text).join("").split(`
+`).length : 0;
+      pathMenu.content = menu ?? "";
+      pathMenu.height = menuRows;
+      if (step === "prompt")
+        resizeComposer(editor, renderer.height - menuRows - 2);
       const attachmentText = renderAttachmentSummary(attachments);
       const attachmentStatus = attachmentFeedback ? renderAttachmentFeedback(attachmentFeedback) : undefined;
       if (step === "prompt") {
@@ -41729,9 +41858,6 @@ async function createNewSessionWizard({
         ];
         if (attachmentText.chunks.length > 0)
           parts.push(attachmentText);
-        const completionMenu = pathCompletionMenuOpen ? renderPathCompletionMenu({ completions: pathCompletions, selectedIndex: completionIndex, width: renderer.width - 2, maxRows: completionMenuRows(renderer.height) }) : undefined;
-        if (completionMenu)
-          parts.push(completionMenu);
         if (status)
           parts.push(stringToStyledText3(status));
         if (attachmentStatus)
@@ -41977,7 +42103,7 @@ async function createNewSessionWizard({
       rejectDraft(error93);
     }, returnToPromptFromRepositoryLoading = function() {
       step = "prompt";
-      editor.setText(prompt);
+      setComposerText(editor, prompt);
       render();
     }, requestRepositoryLoad = function({ retry }) {
       if (Array.isArray(repositories))
@@ -42013,6 +42139,10 @@ async function createNewSessionWizard({
           render();
       });
     }, goBack = function() {
+      if (composerPaths.dismiss()) {
+        render();
+        return;
+      }
       if (step === "mcpSearch") {
         step = "mcps";
         mcpQuery = "";
@@ -42027,11 +42157,6 @@ async function createNewSessionWizard({
         render();
         return;
       }
-      if (pathCompletionMenuOpen) {
-        pathCompletionMenuOpen = false;
-        render();
-        return;
-      }
       if (step === "repositorySearch") {
         searchSelections = undefined;
         repositoryQuery = "";
@@ -42072,47 +42197,8 @@ async function createNewSessionWizard({
       }
       finish(null);
     }, handleKey = function(key) {
-      if (step === "prompt" && pathCompletionMenuOpen) {
-        if (key.name === "up" || key.name === "down") {
-          key.preventDefault();
-          completionIndex = (completionIndex + (key.name === "up" ? -1 : 1) + pathCompletions.length) % pathCompletions.length;
-          render();
-          return;
-        }
-        if (key.name === "tab") {
-          key.preventDefault();
-          completionIndex = (completionIndex + 1) % pathCompletions.length;
-          render();
-          return;
-        }
-        if (key.name === "return" || key.name === "enter") {
-          key.preventDefault();
-          const completion = pathCompletions[completionIndex];
-          if (completion) {
-            const completedText = replaceActivePathToken({ text: editor.plainText, replacement: completion.replacement });
-            editor.setText(completedText);
-            editor.cursorOffset = completedText.length;
-            if (completion.attachmentPath) {
-              const selectedCompletion = createSelectedPathCompletion({
-                attachmentPath: completion.attachmentPath,
-                token: completion.replacement,
-                end: completedText.length
-              });
-              selectedPathCompletions = [...selectedPathCompletions, selectedCompletion];
-            }
-            previousPromptEditorText = completedText;
-          }
-          pathCompletions = [];
-          pathCompletionMenuOpen = false;
-          render();
-          return;
-        }
-      }
-      if (step === "prompt" && key.name === "tab") {
-        key.preventDefault();
-        openPathCompletionMenu();
+      if (composerPaths.handleKey(key))
         return;
-      }
       if (key.ctrl && key.name === "c") {
         key.preventDefault();
         finish({ kind: "interrupt" });
@@ -42193,7 +42279,7 @@ async function createNewSessionWizard({
           key.preventDefault();
           invalidatePendingConfirmation();
           step = "prompt";
-          editor.setText(prompt);
+          setComposerText(editor, prompt);
           render();
           return;
         }
@@ -42340,12 +42426,14 @@ async function createNewSessionWizard({
     repositoryScrollBox.visible = false;
     const repositoryDivider = new TextRenderable4(renderer, { content: "", flexShrink: 0 });
     const repositoryFooter = new TextRenderable4(renderer, { content: "", flexShrink: 0 });
+    const pathMenu = new TextRenderable4(renderer, { content: "", flexShrink: 0 });
     contentScrollBox.add(content2);
     root.add(contentScrollBox);
     repositoryScrollBox.add(repositoryRows);
     root.add(repositoryScrollBox);
     root.add(repositoryDivider);
     root.add(repositoryFooter);
+    root.add(pathMenu);
     renderer.root.add(root);
     let loadedRepositories = Array.isArray(repositories) ? repositories : [];
     let repositoryLoadState = Array.isArray(repositories) ? "ready" : "loading";
@@ -42363,11 +42451,6 @@ async function createNewSessionWizard({
     let recomputeInstruction = "";
     let suggestionSpinnerFrame = 0;
     let attachments = [...initialDraft?.attachments ?? []];
-    let previousPromptEditorText = "";
-    let pathCompletions = [];
-    let selectedPathCompletions = [];
-    let completionIndex = 0;
-    let pathCompletionMenuOpen = false;
     let repositoryHeaderHeight;
     let awaitingVimGoToTop = false;
     const manualSelections = new Map;
@@ -42405,6 +42488,7 @@ async function createNewSessionWizard({
       rejectDraft = reject;
     });
     let editor;
+    let composerPaths;
     const composer = createComposer({
       renderer,
       parent: root,
@@ -42413,28 +42497,28 @@ async function createNewSessionWizard({
         submitEditor();
       },
       onContentChange: () => {
-        if (step === "prompt") {
-          selectedPathCompletions = reconcileSelectedPathCompletions({
-            previousText: previousPromptEditorText,
-            text: editor.plainText,
-            selections: selectedPathCompletions
-          });
-          previousPromptEditorText = editor.plainText;
-        }
-        pathCompletionMenuOpen = false;
+        if (step === "prompt")
+          composerPaths.update();
+        else
+          composerPaths.dismiss();
         if (step === "mcpSearch") {
           mcpQuery = editor.plainText;
           mcpIndex = 0;
-          render();
         }
         if (step === "repositorySearch") {
           repositoryQuery = editor.plainText;
           repositoryIndex = 0;
-          render();
         }
+        render();
       }
     });
     editor = composer.textarea;
+    composerPaths = createComposerPaths({
+      editor,
+      cwd: process.cwd(),
+      isActive: () => !destroyed && !settled && step === "prompt",
+      onChange: render
+    });
     let composerMounted = false;
     for (const repository of initialDraft?.repositories ?? [])
       manualSelections.set(repository.id, true);
@@ -42521,18 +42605,6 @@ async function createNewSessionWizard({
       }
       render();
     }
-    async function openPathCompletionMenu() {
-      if (destroyed)
-        return;
-      const text = editor.plainText;
-      const completions = await completePathToken({ text, cwd: process.cwd() });
-      if (destroyed || editor.plainText !== text)
-        return;
-      pathCompletions = completions;
-      completionIndex = 0;
-      pathCompletionMenuOpen = completions.length > 0;
-      render();
-    }
     async function startRepositoryReview() {
       if (repositoryLoadState !== "ready") {
         step = "loadingRepositories";
@@ -42563,10 +42635,7 @@ async function createNewSessionWizard({
         const image = await readClipboardImage();
         const path = await savePastedImage(image);
         if (!destroyed) {
-          editor.insertText(path);
-          const selectedCompletion = createSelectedPathCompletion({ attachmentPath: path, token: path, end: editor.cursorOffset });
-          selectedPathCompletions = [...selectedPathCompletions, selectedCompletion];
-          previousPromptEditorText = editor.plainText;
+          composerPaths.insertPath(path);
           attachmentFeedback = { kind: "success", message: "Clipboard image ready to attach." };
         }
       } catch (error93) {
@@ -42602,11 +42671,12 @@ async function createNewSessionWizard({
       }
       const repositoryBranchOverrides = branchOverridesForSelection();
       const confirmation = Symbol("confirmation");
+      const skippedFilenames = [];
       const confirmedAttachments = [...attachments];
       const confirmedPrompt = prompt;
       const confirmedModel = model;
       const confirmedReasoningEffort = reasoningEffort;
-      const confirmedSelectedPaths = selectedAttachmentPaths({ text: confirmedPrompt, selections: selectedPathCompletions });
+      const confirmedSelectedPaths = composerPaths.selectedPaths(confirmedPrompt);
       pendingConfirmation = confirmation;
       const ownsConfirmation = () => !destroyed && !settled && step === "confirmation" && pendingConfirmation === confirmation;
       if (attachPromptPaths) {
@@ -42616,6 +42686,10 @@ async function createNewSessionWizard({
             text: confirmedPrompt,
             excludedPaths: confirmedAttachments.flatMap((attachment) => attachment.sourcePath ? [attachment.sourcePath] : []),
             selectedPaths: confirmedSelectedPaths,
+            onUploadSkipped: ({ filename }) => {
+              if (ownsConfirmation())
+                skippedFilenames.push(filename);
+            },
             onUploadStart: ({ filenames }) => {
               if (!ownsConfirmation())
                 return;
@@ -42627,7 +42701,7 @@ async function createNewSessionWizard({
             return;
           confirmedAttachments.push(...promptAttachments);
           attachments = confirmedAttachments;
-          selectedPathCompletions = [];
+          composerPaths.clearSelections();
           attachmentFeedback = undefined;
         } catch (error93) {
           if (!ownsConfirmation())
@@ -42646,6 +42720,7 @@ async function createNewSessionWizard({
         repositories: selected,
         ...repositoryBranchOverrides.length > 0 ? { repositoryBranchOverrides } : {},
         attachments: confirmedAttachments,
+        ...skippedFilenames.length > 0 ? { attachmentWarning: attachmentSkippedMessage(skippedFilenames) } : {},
         ...confirmedMcps.length > 0 ? { mcps: confirmedMcps } : {},
         model: confirmedModel,
         reasoningEffort: confirmedReasoningEffort
@@ -43101,6 +43176,7 @@ async function createSessionTui({
   attachPromptPaths,
   initialComposer,
   initialFeedback,
+  initialAttachmentWarning,
   now: now3 = Date.now,
   createRenderer = createDefaultRenderer3
 }) {
@@ -43169,7 +43245,7 @@ async function createSessionTui({
       composerFeedback = undefined;
       slashCompletions = [];
       helpVisible = false;
-      pathCompletionMenuOpen = false;
+      composerPaths.dismiss();
       render();
     }, moveAgentSettingsPicker = function(step) {
       if (!agentSettingsPicker)
@@ -43205,10 +43281,9 @@ async function createSessionTui({
       }
       promptHistoryIndex = direction === "up" ? Math.max(0, promptHistoryIndex - 1) : Math.min(promptHistory.length, promptHistoryIndex + 1);
       const text = promptHistoryIndex === promptHistory.length ? promptHistoryDraft : promptHistory[promptHistoryIndex];
-      selectedPathCompletions = [];
+      composerPaths.clearSelections();
       historyReplacement = text;
-      composer.setText(text);
-      composer.cursorOffset = text.length;
+      setComposerText(composer, text);
       const viewport = composer.editorView.getViewport();
       composer.editorView.setViewport(viewport.offsetX, 0, viewport.width, viewport.height);
       render();
@@ -43252,7 +43327,7 @@ async function createSessionTui({
       if (latestState.aggregateStatus === "open")
         composerLayout.render();
       const submissionStatus = renderComposerStatus({ admittedSubmissions, width: renderer.width - 2 });
-      const completionMenu = pathCompletionMenuOpen ? renderPathCompletionMenu({ completions: pathCompletions, selectedIndex: completionIndex, width: renderer.width - 2, maxRows: completionMenuRows(renderer.height) }) : undefined;
+      const completionMenu = composerPaths.renderMenu({ width: renderer.width - 2, maxRows: completionMenuRows(renderer.height) });
       const commandMenu = renderSlashCommandMenu({ commands: slashCompletions, selectedIndex: slashCompletionIndex, width: renderer.width - 2, maxRows: completionMenuRows(renderer.height) });
       const agentSettingsMenu = agentSettingsPicker && latestState.aggregateStatus === "open" ? renderAgentSettingsPicker({ picker: agentSettingsPicker, width: renderer.width - 2, maxRows: completionMenuRows(renderer.height) }) : undefined;
       const composerStatus = [
@@ -43314,7 +43389,7 @@ ${segment.excerpt}`).join(`
     }, openLocalMenu = function(mode) {
       resourceMode = mode;
       localMenuIndex = 0;
-      pathCompletionMenuOpen = false;
+      composerPaths.dismiss();
       slashCompletions = [];
       helpVisible = false;
       composer.blur();
@@ -43326,7 +43401,7 @@ ${segment.excerpt}`).join(`
       resourceMode = "mcps";
       mcpQuery = "";
       mcpSelectedId = mcps.getState().attachments[0]?.offering.id;
-      pathCompletionMenuOpen = false;
+      composerPaths.dismiss();
       slashCompletions = [];
       helpVisible = false;
       agentSettingsPicker = undefined;
@@ -43347,7 +43422,7 @@ ${segment.excerpt}`).join(`
       resourceMode = mode;
       resourceKey = resourceChoices()[0]?.key;
       resourceFeedback = undefined;
-      pathCompletionMenuOpen = false;
+      composerPaths.dismiss();
       slashCompletions = [];
       helpVisible = false;
       agentSettingsPicker = undefined;
@@ -43503,16 +43578,11 @@ ${segment.excerpt}`).join(`
     let settled = false;
     let activityExpanded = false;
     let composerDraft = initialComposer ?? { text: "", attachments: [] };
-    let previousComposerText = composerDraft.text;
-    let pathCompletions = [];
-    let selectedPathCompletions = [];
-    let completionIndex = 0;
-    let pathCompletionMenuOpen = false;
     let slashCompletions = [];
     let slashCompletionIndex = 0;
     let agentSettingsPicker;
     let composerFeedback = initialFeedback ? { kind: "info", message: initialFeedback } : undefined;
-    let attachmentFeedback;
+    let attachmentFeedback = initialAttachmentWarning ? { kind: "attention", message: initialAttachmentWarning } : undefined;
     let promptHistoryIndex;
     let promptHistoryDraft = "";
     let historyReplacement;
@@ -43583,6 +43653,7 @@ ${segment.excerpt}`).join(`
     });
     const composerTag = () => latestState.sessionNumber !== undefined ? `Session #${latestState.sessionNumber}` : latestState.sessionId;
     let composer;
+    let composerPaths;
     const composerLayout = createComposer({
       renderer,
       parent: root,
@@ -43592,23 +43663,23 @@ ${segment.excerpt}`).join(`
         submitComposer();
       },
       onContentChange: () => {
-        selectedPathCompletions = reconcileSelectedPathCompletions({
-          previousText: previousComposerText,
-          text: composer.plainText,
-          selections: selectedPathCompletions
-        });
-        previousComposerText = composer.plainText;
+        composerPaths.update();
         if (historyReplacement !== composer.plainText)
           promptHistoryIndex = undefined;
         historyReplacement = undefined;
         refreshSlashCompletions();
-        pathCompletionMenuOpen = false;
         if (composer.plainText.length > 0)
           helpVisible = false;
         render();
       }
     });
     composer = composerLayout.textarea;
+    composerPaths = createComposerPaths({
+      editor: composer,
+      cwd: process.cwd(),
+      isActive: () => !destroyed && !settled && latestState.aggregateStatus === "open" && resourceMode === undefined,
+      onChange: render
+    });
     const idleComposerPlaceholder = composer.placeholder;
     composerLayout.mount();
     const terminalSessionBand = new TextRenderable5(renderer, { content: "", flexShrink: 0, visible: false });
@@ -43700,7 +43771,7 @@ ${segment.excerpt}`).join(`
         } else if (key.name === "s") {
           mcpSearch = true;
           mcpSearchComposer.mount();
-          mcpSearchComposer.textarea.setText(mcpQuery);
+          setComposerText(mcpSearchComposer.textarea, mcpQuery);
           mcpSearchComposer.focus();
         } else if (key.name === "r") {
           mcps.refresh();
@@ -43773,9 +43844,8 @@ ${segment.excerpt}`).join(`
           finish({ kind: "sessions" });
           return;
         }
-        if (pathCompletionMenuOpen) {
+        if (composerPaths.dismiss()) {
           key.preventDefault();
-          pathCompletionMenuOpen = false;
           render();
           return;
         }
@@ -43822,10 +43892,7 @@ ${segment.excerpt}`).join(`
         const path = await savePastedImage(image);
         if (destroyed)
           return;
-        composer.insertText(path);
-        const selectedCompletion = createSelectedPathCompletion({ attachmentPath: path, token: path, end: composer.cursorOffset });
-        selectedPathCompletions = [...selectedPathCompletions, selectedCompletion];
-        previousComposerText = composer.plainText;
+        composerPaths.insertPath(path);
         attachmentFeedback = { kind: "success", message: "Clipboard image ready to attach." };
       } catch (error93) {
         if (!destroyed)
@@ -43858,10 +43925,8 @@ ${segment.excerpt}`).join(`
       if (slashCompletions.length > 0 && key.name === "tab") {
         key.preventDefault();
         const completion = slashCompletions[slashCompletionIndex];
-        if (completion) {
-          composer.setText(completion.value);
-          composer.cursorOffset = completion.value.length;
-        }
+        if (completion)
+          setComposerText(composer, completion.value);
         slashCompletions = [];
         render();
         return;
@@ -43869,55 +43934,14 @@ ${segment.excerpt}`).join(`
       if (slashCompletions.length > 0 && (key.name === "return" || key.name === "enter")) {
         key.preventDefault();
         const completion = slashCompletions[slashCompletionIndex];
-        if (completion) {
-          composer.setText(completion.value);
-          composer.cursorOffset = completion.value.length;
-        }
+        if (completion)
+          setComposerText(composer, completion.value);
         slashCompletions = [];
         render();
         return;
       }
-      if (pathCompletionMenuOpen) {
-        if (key.name === "up" || key.name === "down") {
-          key.preventDefault();
-          completionIndex = (completionIndex + (key.name === "up" ? -1 : 1) + pathCompletions.length) % pathCompletions.length;
-          render();
-          return;
-        }
-        if (key.name === "tab") {
-          key.preventDefault();
-          completionIndex = (completionIndex + 1) % pathCompletions.length;
-          render();
-          return;
-        }
-        if (key.name === "return" || key.name === "enter") {
-          key.preventDefault();
-          const completion = pathCompletions[completionIndex];
-          if (completion) {
-            const completedText = replaceActivePathToken({ text: composer.plainText, replacement: completion.replacement });
-            composer.setText(completedText);
-            composer.cursorOffset = completedText.length;
-            if (completion.attachmentPath) {
-              const selectedCompletion = createSelectedPathCompletion({
-                attachmentPath: completion.attachmentPath,
-                token: completion.replacement,
-                end: completedText.length
-              });
-              selectedPathCompletions = [...selectedPathCompletions, selectedCompletion];
-            }
-            previousComposerText = completedText;
-          }
-          pathCompletions = [];
-          pathCompletionMenuOpen = false;
-          render();
-          return;
-        }
-      }
-      if (key.name === "tab") {
-        key.preventDefault();
-        openPathCompletionMenu();
+      if (composerPaths.handleKey(key))
         return;
-      }
       if ((key.name === "up" || key.name === "down") && composerAtVisualEdge(key.name)) {
         key.preventDefault();
         navigatePromptHistory(key.name);
@@ -43996,18 +44020,6 @@ ${segment.excerpt}`).join(`
         });
       };
     }
-    async function openPathCompletionMenu() {
-      if (destroyed)
-        return;
-      const text = composer.plainText;
-      const completions = await completePathToken({ text, cwd: process.cwd() });
-      if (destroyed || composer.plainText !== text)
-        return;
-      pathCompletions = completions;
-      completionIndex = 0;
-      pathCompletionMenuOpen = completions.length > 0;
-      render();
-    }
     async function submitComposer() {
       if (attachmentPreparationOwner)
         return;
@@ -44042,12 +44054,17 @@ ${segment.excerpt}`).join(`
         return;
       }
       if (attachPromptPaths) {
+        const skippedFilenames = [];
         let handedOffToAdmission = false;
         try {
           const attachments = await attachPromptPaths({
             text: composerDraft.text,
             excludedPaths: composerDraft.attachments.flatMap((attachment) => attachment.sourcePath ? [attachment.sourcePath] : []),
-            selectedPaths: selectedAttachmentPaths({ text: composerDraft.text, selections: selectedPathCompletions }),
+            selectedPaths: composerPaths.selectedPaths(composerDraft.text),
+            onUploadSkipped: ({ filename }) => {
+              if (ownsAttachmentPreparation(preparationOwner))
+                skippedFilenames.push(filename);
+            },
             onUploadStart: ({ filenames }) => {
               if (!ownsAttachmentPreparation(preparationOwner))
                 return;
@@ -44058,8 +44075,8 @@ ${segment.excerpt}`).join(`
           if (!ownsAttachmentPreparation(preparationOwner))
             return;
           composerDraft = { ...composerDraft, attachments: [...composerDraft.attachments, ...attachments] };
-          selectedPathCompletions = [];
-          attachmentFeedback = undefined;
+          composerPaths.clearSelections();
+          attachmentFeedback = skippedFilenames.length > 0 ? { kind: "attention", message: attachmentSkippedMessage(skippedFilenames) } : undefined;
           handedOffToAdmission = true;
         } catch (error93) {
           if (!ownsAttachmentPreparation(preparationOwner))
@@ -44184,7 +44201,6 @@ ${segment.excerpt}`).join(`
         helpVisible = true;
         slashCompletions = composerSlashCommands;
         slashCompletionIndex = 0;
-        pathCompletionMenuOpen = false;
         render();
         return true;
       }
@@ -44337,7 +44353,7 @@ ${segment.excerpt}`).join(`
     });
     renderer.addInputHandler(inputHandler);
     renderer.keyInput.on("keypress", keyHandler);
-    composer.setText(composerDraft.text);
+    setComposerText(composer, composerDraft.text);
     renderer.on(CliRenderEvents5.RENDER_ERROR, (event) => finish(undefined, event.error));
     resizeHandler = () => {
       if (!destroyed)
@@ -44989,26 +45005,28 @@ async function attachPromptPaths({
   excludedPaths = [],
   selectedPaths = [],
   reserveAndUploadFile: reserveAndUploadFile2,
-  onUploadStart
+  onUploadStart,
+  onUploadSkipped
 }) {
+  const selected = new Set(selectedPaths.map((filePath) => resolve3(cwd, filePath)));
   const excluded = new Set(excludedPaths);
   const pathsToUpload = [];
-  for (const candidate of promptFilePaths({ text, cwd, selectedPaths })) {
-    const { filePath } = candidate;
+  for (const filePath of promptFilePaths({ text, cwd, selectedPaths })) {
     if (excluded.has(filePath))
       continue;
     let file3;
     try {
       file3 = await stat(filePath);
-    } catch (error93) {
-      if (error93 instanceof Error && "code" in error93 && error93.code === "ENOENT")
-        continue;
-      throw error93;
+    } catch {
+      if (selected.has(filePath))
+        onUploadSkipped?.({ filename: basename6(filePath) });
+      continue;
     }
-    if (!file3.isFile() && !file3.isDirectory() && candidate.explicit)
-      throw new Error(`Prompt attachment path is not a regular file or directory: ${filePath}`);
-    if (!file3.isFile() && !file3.isDirectory())
+    if (!file3.isFile() && !file3.isDirectory()) {
+      if (selected.has(filePath))
+        onUploadSkipped?.({ filename: basename6(filePath) });
       continue;
+    }
     pathsToUpload.push(filePath);
   }
   if (pathsToUpload.length === 0)
@@ -45016,11 +45034,16 @@ async function attachPromptPaths({
   onUploadStart?.({ filenames: pathsToUpload.map((filePath) => basename6(filePath)) });
   const attachments = [];
   for (const filePath of pathsToUpload) {
-    const uploaded = await uploadLocalAttachment({ filePath, reserveAndUploadFile: reserveAndUploadFile2 });
-    attachments.push({
-      id: randomUUID5(),
-      ...uploaded
-    });
+    try {
+      const uploaded = await uploadLocalAttachment({ filePath, reserveAndUploadFile: reserveAndUploadFile2 });
+      attachments.push({
+        id: randomUUID5(),
+        ...uploaded
+      });
+    } catch {
+      onUploadSkipped?.({ filename: basename6(filePath) });
+      continue;
+    }
   }
   return attachments;
 }
@@ -45155,9 +45178,9 @@ function truncateUtf8(value, maxBytes) {
   return result;
 }
 function promptFilePaths({ text, cwd, selectedPaths }) {
-  const paths = new Map;
+  const paths = new Set;
   for (const selectedPath of selectedPaths)
-    paths.set(isAbsolute3(selectedPath) ? selectedPath : resolve3(cwd, selectedPath), true);
+    paths.add(isAbsolute3(selectedPath) ? selectedPath : resolve3(cwd, selectedPath));
   const tokens = text.match(/[([{]*@?(?:"[^"]*"|'[^']*'|`[^`]*`)|(?:\\.|[^\s\\])+/g) ?? [];
   for (const quotedToken of tokens) {
     const wrappedToken = quotedToken.replace(/^[([{]+/, "").replace(/[),.;:!?\]}]+$/, "");
@@ -45172,9 +45195,9 @@ function promptFilePaths({ text, cwd, selectedPaths }) {
       continue;
     const expandedPath = pathText.startsWith("~/") ? join9(homedir2(), pathText.slice(2)) : pathText;
     const filePath = isAbsolute3(expandedPath) ? expandedPath : resolve3(cwd, expandedPath);
-    paths.set(filePath, paths.get(filePath) || explicit);
+    paths.add(filePath);
   }
-  return [...paths].map(([filePath, explicit]) => ({ filePath, explicit }));
+  return [...paths];
 }
 function extensionForMediaType(mediaType) {
   if (mediaType === "image/png")
@@ -46177,7 +46200,7 @@ async function dashboard({
       holdTransitionScreen();
       continue;
     }
-    return await attachCreatedSession({ dependencies, operations, created: result.created, repositories: result.repositories, noTui: false, json: false });
+    return await attachCreatedSession({ dependencies, operations, created: result.created, repositories: result.repositories, attachmentWarning: result.attachmentWarning, noTui: false, json: false });
   }
 }
 async function prepareDashboardBootstrap({
@@ -46421,7 +46444,8 @@ async function attachCreatedSession({
   created,
   repositories,
   noTui,
-  json: json3
+  json: json3,
+  attachmentWarning
 }) {
   const initialMessage = created.messages[0];
   if (!initialMessage)
@@ -46449,7 +46473,8 @@ async function attachCreatedSession({
     },
     noTui,
     json: json3,
-    emitCreated: true
+    emitCreated: true,
+    attachmentWarning
   });
 }
 async function createFromTuiDraft({
@@ -46494,7 +46519,7 @@ async function createReviewedSession({ dependencies, operations, repositories })
     showRemyTransitionScreen({ write: (chunk) => dependencies.output.writeStdout(chunk) });
     try {
       const created = await createFromTuiDraft({ dependencies, operations, draft });
-      return { created, repositories: draft.repositories };
+      return { created, repositories: draft.repositories, attachmentWarning: draft.attachmentWarning };
     } catch (error93) {
       throwIfAborted2(dependencies.abortSignal);
       initialDraft = draft;
@@ -46532,13 +46557,15 @@ async function uploadPromptPaths({
   text,
   excludedPaths,
   selectedPaths,
-  onUploadStart
+  onUploadStart,
+  onUploadSkipped
 }) {
   return await attachPromptPaths({
     text,
     excludedPaths,
     selectedPaths,
     onUploadStart,
+    onUploadSkipped,
     cwd: process.cwd(),
     reserveAndUploadFile: async ({ filePath, mediaType }) => await operations.reserveAndUploadFile({
       client: operations.client,
@@ -46634,7 +46661,8 @@ async function runAttachedSession({
   noTui,
   json: json3,
   emitCreated,
-  onCacheError
+  onCacheError,
+  attachmentWarning
 }) {
   if (dependencies.abortSignal?.aborted)
     throw dependencies.abortSignal.reason ?? new Error("interrupted");
@@ -46722,6 +46750,7 @@ async function runAttachedSession({
               fetchClient: globalThis.fetch
             }),
             initialComposer: composerSnapshot,
+            initialAttachmentWarning: attachmentWarning,
             admissions,
             repositoryLabel: repositories.map((repository) => repository.fullName).join(", ") || undefined,
             submitMessage: async (submission) => {
@@ -46871,6 +46900,7 @@ async function runAttachedSession({
           operations,
           created: result.created,
           repositories: result.repositories,
+          attachmentWarning: result.attachmentWarning,
           noTui: false,
           json: false
         });

package/package.json

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