@meistrari/remy-cli 1.1.1 → 1.3.0

package/README.md

@@ -42,19 +42,23 @@ Use `Tab` while writing the request to complete a local file path. Remy attaches
 
 ### Resume or follow up
 
-Use the arrow keys to select a session in the dashboard and press `Enter` to open it. In a session, type a follow-up and press `Enter` to send it.
+Use Up/Down to select a session in the dashboard, Left/Right to load the adjacent page, and `Enter` to open it. After the dashboard list or repository-review list has focus, Vim keys work too: `j`/`k` move, `h`/`l` go to the previous/next dashboard page (or clear/mark a repository), `G` goes to the last row, and `gg` goes to the first row. Press `Shift+L` in the dashboard to start a logout confirmation. In a session, type a follow-up and press `Enter` to send it.
+
+Drag to select visible text in any Remy view; Remy copies it to the local clipboard and emits OSC 52 for terminal or remote-session clipboard support, then clears the selection highlight. When the conversation has focus, press `Tab` to return to the composer.
 
 | Control | Result |
 | --- | --- |
 | `Esc` | Interrupt the active turn; the session stays open. |
 | `/complete` | Complete an open session after its active turn stops. |
+| `/cancel` | Cancel the current session, including an active turn. |
 | `/sessions` | Return to the dashboard. |
 | `/new` | Start another new-session flow. |
+| `/logout` | Sign out of Remy after confirmation. |
 | `/help` | Show session controls. |
 | `/exit` | Leave Remy. |
 | `Ctrl+O` | Expand or collapse activity details. |
 
-After a session becomes terminal, press `Esc` to return to the dashboard or `n` to start new work. From the dashboard, press `l` to log out or `q` to quit. `Ctrl+C` exits Remy from the dashboard, wizard, or session view.
+After a session becomes terminal, press `Esc` to return to the dashboard or `n` to start new work. From the dashboard, press `q` to quit. `Shift+L` in the dashboard and `/logout` in a session ask for confirmation; press `y` to sign out or `Esc` to cancel. `Ctrl+C` exits Remy from the dashboard, wizard, or session view.
 
 ## Commands for direct or scripted use
 
@@ -112,7 +116,7 @@ remy login \
   --target-application-id <target-application-uuid>
 ```
 
-Remy stores endpoint configuration in `~/.config/remy/config.json` and tokens in `~/.local/state/remy/tokens.json`. Set `XDG_CONFIG_HOME` or `XDG_STATE_HOME` to use different base directories. `remy logout` removes tokens but retains endpoint configuration; pass `--api-url` to require that the supplied URL matches the active API host before logging out.
+Remy stores endpoint configuration in `~/.config/remy/config.json` and tokens in `~/.local/state/remy/tokens.json`. Set `XDG_CONFIG_HOME` or `XDG_STATE_HOME` to use different base directories. It refreshes an expired access token before each Coding Agent API request, so long-running sessions and reconnects remain authenticated. `remy logout` removes tokens but retains endpoint configuration; pass `--api-url` to require that the supplied URL matches the active API host before logging out.
 
 ## Complete command reference
 

package/dist/remy.js

@@ -32820,6 +32820,13 @@ async function completeSession({ client, sessionId }) {
     throw new CodingAgentProtocolError("Session completion response did not match the public API contract.", { cause: parsed.error });
   return parsed.data;
 }
+async function cancelSession({ client, sessionId }) {
+  const response = await client.request(`/v1/sessions/${encodeURIComponent(sessionId)}/cancel`, { method: "PUT" });
+  const parsed = sessionLifecycleResponseSchema.safeParse(await parseJson2(response, "Session cancellation response was not valid JSON."));
+  if (!parsed.success)
+    throw new CodingAgentProtocolError("Session cancellation response did not match the public API contract.", { cause: parsed.error });
+  return parsed.data;
+}
 async function listSessions({
   client,
   limit,
@@ -34355,7 +34362,7 @@ async function sleepMs(ms, signal) {
 }
 
 // src/tui/dashboard.ts
-import { bg, BoxRenderable, bold as bold2, CliRenderEvents, fg as fg3, InputRenderable, ScrollBoxRenderable, stringToStyledText as stringToStyledText2, TextRenderable } from "@opentui/core";
+import { bg, BoxRenderable, bold as bold2, CliRenderEvents as CliRenderEvents2, fg as fg3, ScrollBoxRenderable, stringToStyledText as stringToStyledText2, TextRenderable } from "@opentui/core";
 
 // src/tui/composer-divider.ts
 import { dim as dim2, fg as fg2, StyledText as StyledText2 } from "@opentui/core";
@@ -34551,18 +34558,20 @@ function renderComposerDivider({ width, tag, leadLabel }) {
 }
 
 // src/tui/renderer.ts
-import { createCliRenderer } from "@opentui/core";
+import { CliRenderEvents, createClipboard, createCliRenderer, createHostClipboard, createRendererClipboardAdapter } from "@opentui/core";
 var rendererDestroyed = new WeakMap;
 var enterAlternateScreen = "\x1B[?1049h";
 var clearScreen = "\x1B[2J\x1B[H";
 var exitAlternateScreen = "\x1B[?1049l";
 var transitionScreenWriter;
+var ignoreTerminalFocus = (sequence) => sequence === "\x1B[I" || sequence === "\x1B[O";
 async function createRemyRenderer({
   createRenderer = createCliRenderer
 } = {}) {
   let resolveDestroyed = () => {
     return;
   };
+  let selectionClipboard;
   const destroyed = new Promise((resolve) => {
     resolveDestroyed = resolve;
   });
@@ -34571,9 +34580,34 @@ async function createRemyRenderer({
     exitSignals: [],
     screenMode: "alternate-screen",
     useMouse: true,
-    onDestroy: resolveDestroyed
+    prependInputHandlers: [ignoreTerminalFocus],
+    onDestroy: () => {
+      selectionClipboard?.dispose().catch(() => {
+        return;
+      });
+      resolveDestroyed();
+    }
   });
   transitionScreenWriter = undefined;
+  try {
+    selectionClipboard = createClipboard({
+      host: createHostClipboard(),
+      terminal: createRendererClipboardAdapter(renderer)
+    });
+  } catch {}
+  renderer.on(CliRenderEvents.SELECTION, (selection) => {
+    const text = selection.getSelectedText();
+    if (text.length === 0)
+      return;
+    renderer.clearSelection();
+    if (selectionClipboard) {
+      selectionClipboard.writeText(text, { destination: "all-available" }).catch(() => {
+        return;
+      });
+      return;
+    }
+    renderer.copyToClipboardOSC52(text);
+  });
   rendererDestroyed.set(renderer, destroyed);
   return renderer;
 }
@@ -34611,6 +34645,7 @@ async function createDashboardTui({
 }) {
   const renderer = await createRenderer();
   let inputHandler;
+  let keyHandler;
   let resizeHandler;
   let rendererDestroyed2 = false;
   try {
@@ -34637,8 +34672,7 @@ async function createDashboardTui({
       previewBand.visible = showPreview;
       previewBand.content = showPreview ? formatSessionPreview({ session: selectedSession, width: contentWidth }) : stringToStyledText2("");
       separator.content = renderComposerDivider({ width: contentWidth });
-      footer.content = logoutConfirmationOpen ? "Log out of Remy? y confirms \xB7 Esc cancels" : dashboardFooter({ loadingPage, pageError, page, rowsBelow });
-      input.placeholder = logoutConfirmationOpen ? "Log out of Remy?" : "Type here to start a new session";
+      footer.content = dashboardFooter({ loadingPage, pageError, rowsBelow, logoutConfirmationOpen });
       renderer.requestRender();
     }, finish = function(value) {
       if (settled)
@@ -34650,6 +34684,11 @@ async function createDashboardTui({
         return;
       settled = true;
       rejectDraft(error93);
+    }, moveSelectionTo = function(index) {
+      if (page.sessions.length === 0)
+        return;
+      selectedIndex = Math.max(0, Math.min(index, page.sessions.length - 1));
+      render();
     }, handleSessionKey = function(key) {
       if (logoutConfirmationOpen) {
         key.preventDefault();
@@ -34661,16 +34700,57 @@ async function createDashboardTui({
         }
         return;
       }
+      const listFocused = renderer.currentFocusedRenderable === listRegion;
       if (key.name === "down") {
         key.preventDefault();
+        awaitingVimGoToTop = false;
         moveSelection("next");
         return;
       }
       if (key.name === "up") {
         key.preventDefault();
+        awaitingVimGoToTop = false;
         moveSelection("previous");
         return;
       }
+      if (key.name === "right") {
+        key.preventDefault();
+        awaitingVimGoToTop = false;
+        loadAdjacentPage("next");
+        return;
+      }
+      if (key.name === "left") {
+        key.preventDefault();
+        awaitingVimGoToTop = false;
+        loadAdjacentPage("previous");
+        return;
+      }
+      if (listFocused && (key.name === "G" || key.name === "g" && key.shift)) {
+        key.preventDefault();
+        awaitingVimGoToTop = false;
+        moveSelectionTo(page.sessions.length - 1);
+        return;
+      }
+      if (listFocused && key.name === "g") {
+        key.preventDefault();
+        if (awaitingVimGoToTop)
+          moveSelectionTo(0);
+        awaitingVimGoToTop = !awaitingVimGoToTop;
+        return;
+      }
+      if (listFocused && (key.name === "j" || key.name === "k")) {
+        key.preventDefault();
+        awaitingVimGoToTop = false;
+        moveSelection(key.name === "j" ? "next" : "previous");
+        return;
+      }
+      if (listFocused && !key.shift && (key.name === "h" || key.name === "l")) {
+        key.preventDefault();
+        awaitingVimGoToTop = false;
+        loadAdjacentPage(key.name === "l" ? "next" : "previous");
+        return;
+      }
+      awaitingVimGoToTop = false;
       if (key.name === "return" || key.name === "enter") {
         key.preventDefault();
         const session = page.sessions[selectedIndex];
@@ -34683,7 +34763,7 @@ async function createDashboardTui({
         finish({ kind: "new" });
         return;
       }
-      if (key.name === "l") {
+      if (key.name === "L" || key.shift && key.name === "l") {
         key.preventDefault();
         logoutConfirmationOpen = true;
         render();
@@ -34706,20 +34786,23 @@ async function createDashboardTui({
     const previewBand = new TextRenderable(renderer, { content: "", flexShrink: 0 });
     const separator = new TextRenderable(renderer, { content: "", flexShrink: 0 });
     const footer = new TextRenderable(renderer, { content: "", flexShrink: 0 });
-    const input = new InputRenderable(renderer, { placeholder: "Describe the work to do" });
+    root.onMouseDown = (event) => {
+      event.preventDefault();
+      listRegion.focus();
+    };
     listRegion.add(content);
     root.add(statusBand);
     root.add(listRegion);
     root.add(previewBand);
     root.add(separator);
     root.add(footer);
-    root.add(input);
     renderer.root.add(root);
     let page = initialPage;
     let pageIndex = 1;
     let selectedIndex = 0;
     let loadingPage = false;
     let pageError;
+    let awaitingVimGoToTop = false;
     let logoutConfirmationOpen = false;
     let destroyed = false;
     let rendererDestroyPromise;
@@ -34734,16 +34817,10 @@ async function createDashboardTui({
       resolveAction = resolve;
       rejectDraft = reject;
     });
-    async function moveSelection(direction) {
+    async function loadAdjacentPage(direction) {
       if (loadingPage)
         return;
-      const isBoundary = direction === "next" ? selectedIndex === page.sessions.length - 1 : selectedIndex === 0;
       const canLoad = direction === "next" ? page.hasMore : page.canGoPrevious;
-      if (!isBoundary) {
-        selectedIndex += direction === "next" ? 1 : -1;
-        render();
-        return;
-      }
       if (!canLoad)
         return;
       loadingPage = true;
@@ -34760,6 +34837,17 @@ async function createDashboardTui({
         render();
       }
     }
+    async function moveSelection(direction) {
+      if (loadingPage || page.sessions.length === 0)
+        return;
+      const isBoundary = direction === "next" ? selectedIndex === page.sessions.length - 1 : selectedIndex === 0;
+      if (!isBoundary) {
+        selectedIndex += direction === "next" ? 1 : -1;
+        render();
+        return;
+      }
+      await loadAdjacentPage(direction);
+    }
     inputHandler = (sequence) => {
       if (sequence === "\x03") {
         finish({ kind: "interrupt" });
@@ -34767,16 +34855,17 @@ async function createDashboardTui({
       }
       return false;
     };
-    input.onKeyDown = handleSessionKey;
+    keyHandler = handleSessionKey;
     renderer.addInputHandler(inputHandler);
-    renderer.on(CliRenderEvents.RENDER_ERROR, (event) => fail(event.error));
+    renderer.keyInput.on("keypress", keyHandler);
+    renderer.on(CliRenderEvents2.RENDER_ERROR, (event) => fail(event.error));
     resizeHandler = () => {
       if (!destroyed)
         render();
     };
-    renderer.on(CliRenderEvents.RESIZE, resizeHandler);
-    input.focus();
+    renderer.on(CliRenderEvents2.RESIZE, resizeHandler);
     render();
+    listRegion.focus();
     return {
       waitForAction: async () => await action,
       destroy() {
@@ -34785,8 +34874,10 @@ async function createDashboardTui({
         destroyed = true;
         if (inputHandler)
           renderer.removeInputHandler(inputHandler);
+        if (keyHandler)
+          renderer.keyInput.off("keypress", keyHandler);
         if (resizeHandler)
-          renderer.off(CliRenderEvents.RESIZE, resizeHandler);
+          renderer.off(CliRenderEvents2.RESIZE, resizeHandler);
         rendererDestroyed2 = true;
         renderer.destroy();
       },
@@ -34797,8 +34888,10 @@ async function createDashboardTui({
   } catch (error93) {
     if (inputHandler)
       renderer.removeInputHandler(inputHandler);
+    if (keyHandler)
+      renderer.keyInput.off("keypress", keyHandler);
     if (resizeHandler)
-      renderer.off(CliRenderEvents.RESIZE, resizeHandler);
+      renderer.off(CliRenderEvents2.RESIZE, resizeHandler);
     if (!rendererDestroyed2) {
       rendererDestroyed2 = true;
       renderer.destroy();
@@ -34811,22 +34904,24 @@ function formatSessionRow({ session, selected, width }) {
   const outcome = sessionOutcome(session);
   const updated = formatUpdatedAt(session.updatedAt ?? session.createdAt);
   const prefix = `#${session.sessionNumber} `;
-  const title = truncate(session.title ?? "Untitled session", Math.max(8, width - prefix.length - activity.label.length - outcome.length - updated.length - 8));
+  const title = truncate(session.title ?? "Untitled session", Math.max(8, Math.min(40, Math.floor(width * 0.24))));
+  const attribution = `${session.creator} (${session.source})`;
+  const metadataWidth = Math.max(0, width - prefix.length - title.length - activity.label.length - 6);
+  const metadata = truncate(`${attribution} \xB7 ${outcome} \xB7 ${updated}`, metadataWidth);
   const line = [
     fg3(PALETTE.dimText)(prefix),
     fg3(PALETTE.bodyText)(title),
     fg3(PALETTE.dimText)("  "),
     bold2(fg3(activity.color)(activity.label)),
     fg3(PALETTE.dimText)("  "),
-    fg3(PALETTE.bodyText)(outcome),
-    fg3(PALETTE.dimText)(`  ${updated}`)
+    fg3(PALETTE.dimText)(metadata)
   ];
   const lineLength = line.reduce((total, chunk) => total + chunk.text.length, 0);
   const padded = selected ? [...line, fg3(PALETTE.dimText)(" ".repeat(Math.max(0, width - lineLength)))] : line;
   return selected ? padded.map((chunk) => bg(PALETTE.selectionBg)(chunk)) : padded;
 }
 function visibleListWindow({ sessionCount, selectedIndex, height }) {
-  const rowCount = Math.max(1, height - 10);
+  const rowCount = Math.max(1, height - 9);
   const firstIndex = Math.min(Math.max(0, selectedIndex - Math.floor(rowCount / 2)), Math.max(0, sessionCount - rowCount));
   return { firstIndex, rowCount };
 }
@@ -34929,7 +35024,9 @@ function dashboardStatusBand({ page, pageIndex }) {
     paging.push("more \u2192");
   return `remy \xB7 sessions \xB7 ${openCount} open \xB7 ${paging.join(" \xB7 ")}`;
 }
-function dashboardFooter({ loadingPage, pageError, page, rowsBelow }) {
+function dashboardFooter({ loadingPage, pageError, rowsBelow, logoutConfirmationOpen }) {
+  if (logoutConfirmationOpen)
+    return "Log out of Remy? y confirms \xB7 Esc cancels";
   const parts = [];
   if (loadingPage)
     parts.push("Loading sessions\u2026");
@@ -34937,9 +35034,7 @@ function dashboardFooter({ loadingPage, pageError, page, rowsBelow }) {
     parts.push(`Could not load sessions: ${pageError}`);
   if (rowsBelow > 0)
     parts.push(`\u2193 ${rowsBelow} more below`);
-  if (page.hasMore || page.canGoPrevious)
-    parts.push("\u2191\u2193 pages at the ends of the list");
-  parts.push("\u2191\u2193 move \xB7 \u23CE open \xB7 n new session \xB7 q quit \xB7 ctrl+c discard & quit");
+  parts.push("\u2191\u2193 move \xB7 \u23CE open \xB7 n new session \xB7 \u21E7l log out \xB7 q quit");
   return parts.join(" \xB7 ");
 }
 function truncate(value, width) {
@@ -34952,7 +35047,7 @@ async function createDefaultRenderer() {
 }
 
 // src/tui/new-session-wizard.ts
-import { bg as bg3, BoxRenderable as BoxRenderable3, bold as bold3, CliRenderEvents as CliRenderEvents2, dim as dim3, fg as fg5, ScrollBoxRenderable as ScrollBoxRenderable2, StyledText as StyledText4, stringToStyledText as stringToStyledText4, TextRenderable as TextRenderable3 } from "@opentui/core";
+import { bg as bg3, BoxRenderable as BoxRenderable3, bold as bold3, CliRenderEvents as CliRenderEvents3, dim as dim3, fg as fg5, ScrollBoxRenderable as ScrollBoxRenderable2, StyledText as StyledText4, stringToStyledText as stringToStyledText4, TextRenderable as TextRenderable3 } from "@opentui/core";
 
 // src/tui/composer.ts
 import { BoxRenderable as BoxRenderable2, TextRenderable as TextRenderable2, TextareaRenderable } from "@opentui/core";
@@ -35297,7 +35392,7 @@ async function createNewSessionWizard({
       if (composerMounted)
         composer.render();
       if (repositoryListVisible) {
-        renderer.once(CliRenderEvents2.FRAME, () => {
+        renderer.once(CliRenderEvents3.FRAME, () => {
           if (destroyed || step !== "repositories" && step !== "repositorySearch")
             return;
           const nextRepositoryHeaderHeight = Math.min(content.virtualLineCount, Math.floor(renderer.height * 0.45));
@@ -35526,6 +35621,24 @@ async function createNewSessionWizard({
       if (step !== "repositories")
         return;
       const choices = visibleRepositories();
+      const repositoryListFocused = renderer.currentFocusedRenderable === repositoryScrollBox;
+      if (repositoryListFocused && (key.name === "G" || key.name === "g" && key.shift)) {
+        key.preventDefault();
+        awaitingVimGoToTop = false;
+        if (choices.length > 0)
+          repositoryIndex = choices.length - 1;
+        render();
+        return;
+      }
+      if (repositoryListFocused && key.name === "g") {
+        key.preventDefault();
+        if (awaitingVimGoToTop && choices.length > 0)
+          repositoryIndex = 0;
+        awaitingVimGoToTop = !awaitingVimGoToTop;
+        render();
+        return;
+      }
+      awaitingVimGoToTop = false;
       if (key.name === "up" || key.name === "down" || key.name === "j" || key.name === "k") {
         key.preventDefault();
         if (choices.length > 0)
@@ -35599,6 +35712,7 @@ async function createNewSessionWizard({
     let completionIndex = 0;
     let pathCompletionMenuOpen = false;
     let repositoryHeaderHeight;
+    let awaitingVimGoToTop = false;
     const manualSelections = new Map;
     let searchSelections;
     let suggestedIds = new Set;
@@ -35822,7 +35936,7 @@ async function createNewSessionWizard({
     };
     renderer.addInputHandler(inputHandler);
     renderer.keyInput.on("keypress", keyHandler);
-    renderer.on(CliRenderEvents2.RENDER_ERROR, (event) => fail(event.error));
+    renderer.on(CliRenderEvents3.RENDER_ERROR, (event) => fail(event.error));
     resizeHandler = () => {
       if (destroyed)
         return;
@@ -35831,7 +35945,7 @@ async function createNewSessionWizard({
         repositoryIndex = Math.min(repositoryIndex, choices.length - 1);
       render();
     };
-    renderer.on(CliRenderEvents2.RESIZE, resizeHandler);
+    renderer.on(CliRenderEvents3.RESIZE, resizeHandler);
     render();
     if (!Array.isArray(repositories))
       requestRepositoryLoad({ retry: false });
@@ -35846,7 +35960,7 @@ async function createNewSessionWizard({
         if (keyHandler)
           renderer.keyInput.off("keypress", keyHandler);
         if (resizeHandler)
-          renderer.off(CliRenderEvents2.RESIZE, resizeHandler);
+          renderer.off(CliRenderEvents3.RESIZE, resizeHandler);
         if (suggestionSpinnerTimer) {
           clearInterval(suggestionSpinnerTimer);
           suggestionSpinnerTimer = undefined;
@@ -35867,7 +35981,7 @@ async function createNewSessionWizard({
     if (keyHandler)
       renderer.keyInput.off("keypress", keyHandler);
     if (resizeHandler)
-      renderer.off(CliRenderEvents2.RESIZE, resizeHandler);
+      renderer.off(CliRenderEvents3.RESIZE, resizeHandler);
     if (!rendererDestroyed2) {
       rendererDestroyed2 = true;
       renderer.destroy();
@@ -35950,11 +36064,13 @@ async function createDefaultRenderer2() {
 }
 
 // src/tui/session-view.ts
-import { CliRenderEvents as CliRenderEvents3, BoxRenderable as BoxRenderable4, bg as bg4, bold as bold4, dim as dim4, fg as fg6, ScrollBoxRenderable as ScrollBoxRenderable3, StyledText as StyledText5, stringToStyledText as stringToStyledText5, TextRenderable as TextRenderable4 } from "@opentui/core";
+import { CliRenderEvents as CliRenderEvents4, BoxRenderable as BoxRenderable4, bg as bg4, bold as bold4, dim as dim4, fg as fg6, ScrollBoxRenderable as ScrollBoxRenderable3, StyledText as StyledText5, stringToStyledText as stringToStyledText5, TextRenderable as TextRenderable4 } from "@opentui/core";
 var composerSlashCommands = [
   { value: "/sessions", description: "Back to the session list" },
   { value: "/complete", description: "Finish this session" },
+  { value: "/cancel", description: "Cancel this session" },
   { value: "/new", description: "Start a new session" },
+  { value: "/logout", description: "Sign out of Remy" },
   { value: "/help", description: "Show what you can do here" },
   { value: "/exit", description: "Leave Remy" }
 ];
@@ -35965,6 +36081,7 @@ async function createSessionTui({
   submitMessage,
   requestInterrupt,
   requestComplete,
+  requestCancel,
   repositoryLabel,
   readClipboardImage,
   savePastedImage,
@@ -36045,8 +36162,8 @@ async function createSessionTui({
       const working = isRemyWorking(latestState);
       const startedAt = workingTurnStartedAt(latestState);
       const elapsedMs = startedAt === undefined ? 0 : Math.max(0, now3() - Date.parse(startedAt));
-      statusBand.content = renderStatusBand({ state: latestState, working, elapsedMs, stopState, completeState, repositoryLabel });
-      const liveIndicator = completeState.kind === "completing" ? renderWorkingIndicator({ frame: workingSpinnerFrames[spinnerFrameIndex], elapsedMs: 0, mode: "completing" }) : working ? renderWorkingIndicator({
+      statusBand.content = renderStatusBand({ state: latestState, working, elapsedMs, stopState, lifecycleRequestState, repositoryLabel });
+      const liveIndicator = lifecycleRequestState.kind === "pending" ? renderWorkingIndicator({ frame: workingSpinnerFrames[spinnerFrameIndex], elapsedMs: 0, mode: lifecycleRequestState.operation }) : working ? renderWorkingIndicator({
         frame: workingSpinnerFrames[spinnerFrameIndex],
         elapsedMs,
         mode: stopState.kind === "stopping" ? "stopping" : "working"
@@ -36057,8 +36174,8 @@ async function createSessionTui({
 `), joinStyled(liveContent, `
 
 `)], "");
-      if (completeState.kind === "completing")
-        composer.placeholder = "Completing the session \u2014 messages are paused.";
+      if (lifecycleRequestState.kind === "pending")
+        composer.placeholder = `${lifecycleOperationPresentParticiple(lifecycleRequestState.operation)} the session \u2014 messages are paused.`;
       if (latestState.aggregateStatus === "open")
         composerLayout.render();
       const submissionStatus = renderComposerStatus({ admittedSubmissions });
@@ -36075,7 +36192,7 @@ async function createSessionTui({
 
 `) : "";
       hints.visible = renderer.height >= 10;
-      hints.content = hints.visible ? renderActionBar({ state: latestState, working, stopState, completeState }) : "";
+      hints.content = hints.visible ? renderActionBar({ state: latestState, working, stopState, lifecycleRequestState }) : "";
       renderer.requestRender();
     }, syncTerminalSessionControls = function() {
       const terminal = latestState.aggregateStatus !== "open";
@@ -36107,7 +36224,7 @@ async function createSessionTui({
       renderedAdmittedSubmissions = admittedSubmissions;
       renderedWorking = working;
     }, spinnerActive = function() {
-      return isRemyWorking(latestState) || completeState.kind === "completing";
+      return isRemyWorking(latestState) || lifecycleRequestState.kind === "pending";
     }, syncWorkingIndicator = function() {
       if (!spinnerActive()) {
         if (workingSpinnerTimer) {
@@ -36136,7 +36253,7 @@ async function createSessionTui({
         slashCompletions = [];
         return;
       }
-      slashCompletions = composerSlashCommands.filter((command) => command.value.startsWith(value) && command.value !== value && (command.value !== "/complete" || latestState.aggregateStatus === "open"));
+      slashCompletions = composerSlashCommands.filter((command) => command.value.startsWith(value) && command.value !== value && (!["/complete", "/cancel"].includes(command.value) || latestState.aggregateStatus === "open"));
       slashCompletionIndex = 0;
     }, finish = function(result, error93) {
       if (settled)
@@ -36178,8 +36295,9 @@ async function createSessionTui({
     let pendingPastedImageWrites = 0;
     let admittedSubmissions = [];
     let stopState = { kind: "idle" };
-    let completeState = { kind: "idle" };
+    let lifecycleRequestState = { kind: "idle" };
     let helpVisible = false;
+    let logoutConfirmationOpen = false;
     let latestState = controller.getState();
     let spinnerFrameIndex = 0;
     let renderedTranscript;
@@ -36236,6 +36354,17 @@ async function createSessionTui({
       return true;
     };
     keyHandler = (key) => {
+      if (logoutConfirmationOpen) {
+        key.preventDefault();
+        if (key.name === "y") {
+          finish({ kind: "logout" });
+        } else if (key.name === "escape") {
+          logoutConfirmationOpen = false;
+          composerFeedback = undefined;
+          render();
+        }
+        return;
+      }
       if (key.ctrl && key.name === "c") {
         key.preventDefault();
         finish({ kind: "exit", signal: "SIGINT" });
@@ -36311,6 +36440,10 @@ async function createSessionTui({
       }
     }
     composer.onKeyDown = (key) => {
+      if (logoutConfirmationOpen) {
+        key.preventDefault();
+        return;
+      }
       if (slashCompletions.length > 0 && (key.name === "up" || key.name === "down")) {
         key.preventDefault();
         slashCompletionIndex = (slashCompletionIndex + (key.name === "up" ? -1 : 1) + slashCompletions.length) % slashCompletions.length;
@@ -36400,8 +36533,8 @@ async function createSessionTui({
         return;
       if (await handleComposerCommand(value))
         return;
-      if (completeState.kind === "completing") {
-        composerFeedback = "Completing the session \u2014 messages are paused.";
+      if (lifecycleRequestState.kind === "pending") {
+        composerFeedback = `${lifecycleOperationPresentParticiple(lifecycleRequestState.operation)} the session \u2014 messages are paused.`;
         render();
         return;
       }
@@ -36461,7 +36594,21 @@ async function createSessionTui({
       if (command === "/complete") {
         composer.setText("");
         composerDraft = { ...composerDraft, text: "" };
-        await handleCompleteRequest();
+        await handleLifecycleRequest("complete");
+        return true;
+      }
+      if (command === "/cancel") {
+        composer.setText("");
+        composerDraft = { ...composerDraft, text: "" };
+        await handleLifecycleRequest("cancel");
+        return true;
+      }
+      if (command === "/logout") {
+        composer.setText("");
+        composerDraft = { ...composerDraft, text: "" };
+        logoutConfirmationOpen = true;
+        composerFeedback = "Log out of Remy? Press y to confirm or Escape to cancel.";
+        render();
         return true;
       }
       if (command === "/help") {
@@ -36537,39 +36684,39 @@ async function createSessionTui({
       }
       render();
     }
-    async function handleCompleteRequest() {
-      if (completeState.kind === "completing")
+    async function handleLifecycleRequest(operation) {
+      if (lifecycleRequestState.kind === "pending")
         return;
       if (latestState.aggregateStatus !== "open") {
-        completeState = { kind: "idle" };
+        lifecycleRequestState = { kind: "idle" };
         composerFeedback = "This session is already terminal.";
         render();
         return;
       }
-      if (isRemyWorking(latestState)) {
+      if (operation === "complete" && isRemyWorking(latestState)) {
         composerFeedback = "Stop Remy\u2019s turn before completing the session.";
         render();
         return;
       }
-      completeState = { kind: "completing" };
-      composerFeedback = "Completing the session\u2026";
+      lifecycleRequestState = { kind: "pending", operation };
+      composerFeedback = `${lifecycleOperationPresentParticiple(operation)} the session\u2026`;
       render();
       try {
-        await requestComplete();
+        await (operation === "complete" ? requestComplete() : requestCancel());
         if (destroyed)
           return;
-        if (completeState.kind !== "completing")
+        if (lifecycleRequestState.kind !== "pending" || lifecycleRequestState.operation !== operation)
           return;
-        composerFeedback = "Session completed.";
+        composerFeedback = lifecycleOperationSuccessFeedback(operation);
         if (latestState.aggregateStatus !== "open")
-          completeState = { kind: "idle" };
+          lifecycleRequestState = { kind: "idle" };
       } catch (error93) {
         if (destroyed)
           return;
-        if (completeState.kind === "completing") {
+        if (lifecycleRequestState.kind === "pending" && lifecycleRequestState.operation === operation) {
           const message = error93 instanceof Error ? error93.message : String(error93);
-          completeState = { kind: "failed", message };
-          composerFeedback = `Could not complete the session: ${message}`;
+          lifecycleRequestState = { kind: "failed", operation, message };
+          composerFeedback = `Could not ${operation} the session: ${message}`;
         }
       }
       render();
@@ -36581,21 +36728,22 @@ async function createSessionTui({
         if (composerFeedback === "Stop requested.")
           composerFeedback = undefined;
       }
-      if (completeState.kind === "completing" && latestState.aggregateStatus !== "open") {
-        completeState = { kind: "idle" };
-        composerFeedback = "Session completed.";
+      if (lifecycleRequestState.kind === "pending" && latestState.aggregateStatus !== "open") {
+        const operation = lifecycleRequestState.operation;
+        lifecycleRequestState = { kind: "idle" };
+        composerFeedback = lifecycleOperationSuccessFeedback(operation);
       }
       render();
     });
     renderer.addInputHandler(inputHandler);
     renderer.keyInput.on("keypress", keyHandler);
     composer.setText(composerDraft.text);
-    renderer.on(CliRenderEvents3.RENDER_ERROR, (event) => finish(undefined, event.error));
+    renderer.on(CliRenderEvents4.RENDER_ERROR, (event) => finish(undefined, event.error));
     resizeHandler = () => {
       if (!destroyed)
         render();
     };
-    renderer.on(CliRenderEvents3.RESIZE, resizeHandler);
+    renderer.on(CliRenderEvents4.RESIZE, resizeHandler);
     render();
     if (latestState.aggregateStatus === "open")
       composer.focus();
@@ -36615,7 +36763,7 @@ async function createSessionTui({
         if (keyHandler)
           renderer.keyInput.off("keypress", keyHandler);
         if (resizeHandler)
-          renderer.off(CliRenderEvents3.RESIZE, resizeHandler);
+          renderer.off(CliRenderEvents4.RESIZE, resizeHandler);
         composerLayout.destroy();
         rendererDestroyed2 = true;
         renderer.destroy();
@@ -36632,7 +36780,7 @@ async function createSessionTui({
     if (keyHandler)
       renderer.keyInput.off("keypress", keyHandler);
     if (resizeHandler)
-      renderer.off(CliRenderEvents3.RESIZE, resizeHandler);
+      renderer.off(CliRenderEvents4.RESIZE, resizeHandler);
     if (!rendererDestroyed2) {
       rendererDestroyed2 = true;
       renderer.destroy();
@@ -36660,11 +36808,12 @@ var helpEntries = [
   { group: "command", token: "/new", description: "start a new session" },
   { group: "command", token: "/sessions", description: "back to the session list" },
   { group: "command", token: "/complete", description: "finish this session" },
+  { group: "command", token: "/cancel", description: "cancel this session" },
+  { group: "command", token: "/logout", description: "sign out of Remy" },
   { group: "command", token: "/exit", description: "leave Remy" },
   { group: "key", token: "esc", description: "stop Remy\u2019s current turn" },
   { group: "key", token: "ctrl+o", description: "expand the activity trail" },
-  { group: "key", token: "ctrl+r", description: "retry the oldest failed message" },
-  { group: "key", token: "ctrl+c", description: "quit" }
+  { group: "key", token: "ctrl+r", description: "retry the oldest failed message" }
 ];
 function renderHelpPanel() {
   const width = helpEntries.reduce((max, entry) => Math.max(max, entry.token.length), 0) + 2;
@@ -36685,10 +36834,10 @@ function renderHelpPanel() {
 function hasRunningTurn(state) {
   return state.aggregateStatus === "open" && Object.values(state.messageTurns).some((turn) => turn.outcome === undefined);
 }
-function renderStatusBand({ state, working, elapsedMs, stopState, completeState, repositoryLabel }) {
+function renderStatusBand({ state, working, elapsedMs, stopState, lifecycleRequestState, repositoryLabel }) {
   const stopping = stopState?.kind === "stopping";
-  const completing = completeState?.kind === "completing";
-  const presentation = completing ? { label: "Completing", color: PALETTE.approvalQuestion } : stopping ? { label: "Stopping", color: PALETTE.approvalQuestion } : sessionViewStatePresentation({ aggregateStatus: state.aggregateStatus, isWorking: working });
+  const pendingOperation = lifecycleRequestState?.kind === "pending" ? lifecycleRequestState.operation : undefined;
+  const presentation = pendingOperation ? { label: lifecycleOperationPresentParticiple(pendingOperation), color: PALETTE.approvalQuestion } : stopping ? { label: "Stopping", color: PALETTE.approvalQuestion } : sessionViewStatePresentation({ aggregateStatus: state.aggregateStatus, isWorking: working });
   const elapsed = (working || stopping) && elapsedMs !== undefined && elapsedMs > 0 ? ` ${formatElapsed(elapsedMs)}` : "";
   const connection = state.connectionStatus === "connected" ? dim4(fg6(PALETTE.dimText)("connected")) : fg6(PALETTE.approvalQuestion)("reconnecting\u2026");
   const sessionLabel = state.sessionNumber !== undefined ? `Session #${state.sessionNumber}` : `Session ${state.sessionId}`;
@@ -36722,14 +36871,14 @@ function renderTerminalSessionBand({ aggregateStatus }) {
   ], `
 `);
 }
-function renderActionBar({ state, working, stopState, completeState }) {
-  if (completeState.kind === "completing")
-    return new StyledText5([dim4(fg6(PALETTE.dimText)("completing the session\u2026  \xB7  ctrl+c exits"))]);
+function renderActionBar({ state, working, stopState, lifecycleRequestState }) {
+  if (lifecycleRequestState.kind === "pending")
+    return new StyledText5([dim4(fg6(PALETTE.dimText)(`${lifecycleOperationPresentParticiple(lifecycleRequestState.operation).toLowerCase()} the session\u2026`))]);
   if (state.aggregateStatus !== "open")
     return new StyledText5([]);
   const stopToken = working && stopState.kind === "failed" ? ["esc retry stop"] : [];
-  const idleGroup = completeState.kind === "failed" ? "/complete retries \xB7 /new \xB7 /sessions" : "/new \xB7 /sessions \xB7 /complete";
-  const tokens = working ? ["/ commands", "/help", ...stopToken, "ctrl+o activity"] : ["/ commands", "/help", idleGroup, "ctrl+o activity"];
+  const idleGroup = lifecycleRequestState.kind === "failed" ? `/${lifecycleRequestState.operation} retries \xB7 /new \xB7 /sessions` : "/new \xB7 /sessions \xB7 /complete \xB7 /cancel";
+  const tokens = working ? ["/ commands", ...stopToken, "ctrl+o activity"] : ["/ commands", idleGroup, "ctrl+o activity"];
   return new StyledText5([dim4(fg6(PALETTE.dimText)(tokens.join("  \xB7  ")))]);
 }
 function isRemyWorking(state) {
@@ -36890,10 +37039,10 @@ function renderWorkingIndicator({ frame, elapsedMs, mode }) {
       dim4(fg6(PALETTE.dimText)(` Stopping\u2026  ${formatElapsed(elapsedMs)}`))
     ]);
   }
-  if (mode === "completing") {
+  if (mode === "complete" || mode === "cancel") {
     return new StyledText5([
       fg6(PALETTE.approvalQuestion)(frame),
-      dim4(fg6(PALETTE.dimText)(" Completing the session\u2026"))
+      dim4(fg6(PALETTE.dimText)(` ${lifecycleOperationPresentParticiple(mode)} the session\u2026`))
     ]);
   }
   return new StyledText5([
@@ -36901,6 +37050,12 @@ function renderWorkingIndicator({ frame, elapsedMs, mode }) {
     dim4(fg6(PALETTE.dimText)(` Working  ${formatElapsed(elapsedMs)}`))
   ]);
 }
+function lifecycleOperationPresentParticiple(operation) {
+  return operation === "complete" ? "Completing" : "Cancelling";
+}
+function lifecycleOperationSuccessFeedback(operation) {
+  return operation === "complete" ? "Session completed." : "Session cancelled.";
+}
 function formatElapsed(elapsedMs) {
   const totalSeconds = Math.max(0, Math.floor(elapsedMs / 1000));
   if (totalSeconds < 60)
@@ -37042,7 +37197,7 @@ var compactMarkRows = 9;
 var compactMinWidth = 48;
 var compactMinHeight = 20;
 var markBrightnessGain = 4.2;
-var remyCliVersion = "1.1.1";
+var remyCliVersion = "1.3.0";
 async function showRemySplash({
   createRenderer = createRemyRenderer,
   durationMs = splashDurationMs,
@@ -37224,7 +37379,7 @@ Verification URL: `), bold5(fg7(PALETTE.humanAccent)(state.verificationUrl))] :
     fg7(PALETTE.bodyText)("Continue authentication in your browser."),
     ...url3,
     fg7(PALETTE.dimText)(`
-${spinner} Waiting for approval \xB7 q / esc / ctrl+c cancel`)
+${spinner} Waiting for approval \xB7 q / esc cancel`)
   ]);
 }
 async function waitForSplashAbort(signal) {
@@ -37517,7 +37672,7 @@ ${approvalUrl}
 `);
     });
     if (!splashPresented)
-      dependencies.output.writeStderr(`Waiting for approval\u2026 Press Ctrl+C to cancel.
+      dependencies.output.writeStderr(`Waiting for approval\u2026
 `);
   });
   let journalPrepared = false;
@@ -37681,7 +37836,6 @@ function parseOptionalStringFlag(value, name) {
 }
 async function createAuthenticatedClient(dependencies) {
   const paths = resolveCliPaths(dependencies.environment);
-  const candidateTokenPath = await createCandidateTokenPath(paths.tokenPath);
   const snapshot = await withCredentialState({
     stateDirectory: dirname6(paths.tokenPath),
     action: async () => {
@@ -37693,43 +37847,21 @@ async function createAuthenticatedClient(dependencies) {
       });
       const configuration = await readCliConfiguration(paths.configPath);
       const tokenGeneration = await readOptionalTokenFile(paths.tokenPath);
-      if (tokenGeneration !== undefined)
-        await writeFile4(candidateTokenPath, tokenGeneration, { mode: 384 });
       return { configuration, tokenGeneration };
     }
   });
-  const candidateAuthConfiguration = toAuthConfiguration({ configuration: snapshot.configuration, tokenPath: candidateTokenPath });
-  const identity = await loadStoredIdentity(candidateAuthConfiguration);
+  const authConfiguration = toAuthConfiguration({ configuration: snapshot.configuration, tokenPath: paths.tokenPath });
+  const identity = await loadStoredIdentity(authConfiguration);
+  const getAccessToken = createRefreshingAccessTokenProvider({ dependencies, paths, snapshot });
   try {
-    const accessToken = await requireAccessToken(candidateAuthConfiguration, dependencies.abortSignal);
-    await withCredentialState({
-      stateDirectory: dirname6(paths.tokenPath),
-      action: async () => {
-        await recoverCredentialPromotionWhileLocked({
-          stateDirectory: dirname6(paths.tokenPath),
-          configPath: paths.configPath,
-          tokenPath: paths.tokenPath,
-          ...dependencies.credentialStateFilesystem
-        });
-        await assertCredentialSnapshotCurrent({ paths, snapshot });
-        const candidateGeneration = await readFile5(candidateTokenPath, "utf8");
-        if (candidateGeneration !== snapshot.tokenGeneration) {
-          await replaceCredentialTokenWhileLocked({
-            sourcePath: candidateTokenPath,
-            tokenPath: paths.tokenPath,
-            renameFile: dependencies.credentialStateFilesystem?.renameFile,
-            syncDirectory: dependencies.credentialStateFilesystem?.syncDirectory
-          });
-        }
-      }
-    });
+    await getAccessToken(dependencies.abortSignal);
     const client = createCodingAgentClient({
       apiUrl: snapshot.configuration.apiUrl,
-      getAccessToken: async () => accessToken
+      getAccessToken
     });
     const remoteIdentity = await materializeRemoteCurrentUser({ client, signal: dependencies.abortSignal });
     return {
-      authConfiguration: toAuthConfiguration({ configuration: snapshot.configuration, tokenPath: paths.tokenPath }),
+      authConfiguration,
       client,
       identity,
       authenticatedEmail: remoteIdentity.email
@@ -37755,6 +37887,85 @@ async function createAuthenticatedClient(dependencies) {
       });
     }
     throw error93;
+  }
+}
+function createRefreshingAccessTokenProvider({
+  dependencies,
+  paths,
+  snapshot
+}) {
+  let tokenGeneration = snapshot.tokenGeneration;
+  let pendingAccessToken;
+  return async (signal) => {
+    if (!pendingAccessToken) {
+      const expectedTokenGeneration = tokenGeneration;
+      pendingAccessToken = refreshAccessToken({ dependencies, paths, configuration: snapshot.configuration, expectedTokenGeneration, signal }).then(({ accessToken: accessToken2, tokenGeneration: refreshedTokenGeneration }) => {
+        tokenGeneration = refreshedTokenGeneration;
+        return accessToken2;
+      });
+    }
+    const accessToken = pendingAccessToken;
+    try {
+      return await accessToken;
+    } finally {
+      if (pendingAccessToken === accessToken)
+        pendingAccessToken = undefined;
+    }
+  };
+}
+async function refreshAccessToken({
+  dependencies,
+  paths,
+  configuration,
+  expectedTokenGeneration,
+  signal
+}) {
+  const candidateTokenPath = await createCandidateTokenPath(paths.tokenPath);
+  try {
+    await withCredentialState({
+      stateDirectory: dirname6(paths.tokenPath),
+      action: async () => {
+        await recoverCredentialPromotionWhileLocked({
+          stateDirectory: dirname6(paths.tokenPath),
+          configPath: paths.configPath,
+          tokenPath: paths.tokenPath,
+          ...dependencies.credentialStateFilesystem
+        });
+        await assertCredentialSnapshotCurrent({
+          paths,
+          snapshot: { configuration, tokenGeneration: expectedTokenGeneration }
+        });
+        if (expectedTokenGeneration !== undefined)
+          await writeFile4(candidateTokenPath, expectedTokenGeneration, { mode: 384 });
+      }
+    });
+    const candidateAuthConfiguration = toAuthConfiguration({ configuration, tokenPath: candidateTokenPath });
+    const accessToken = await requireAccessToken(candidateAuthConfiguration, signal);
+    const candidateTokenGeneration = await readFile5(candidateTokenPath, "utf8");
+    await withCredentialState({
+      stateDirectory: dirname6(paths.tokenPath),
+      action: async () => {
+        await recoverCredentialPromotionWhileLocked({
+          stateDirectory: dirname6(paths.tokenPath),
+          configPath: paths.configPath,
+          tokenPath: paths.tokenPath,
+          ...dependencies.credentialStateFilesystem
+        });
+        await assertCredentialSnapshotCurrent({
+          paths,
+          snapshot: { configuration, tokenGeneration: expectedTokenGeneration }
+        });
+        if (candidateTokenGeneration !== expectedTokenGeneration) {
+          await replaceCredentialTokenWhileLocked({
+            sourcePath: candidateTokenPath,
+            tokenPath: paths.tokenPath,
+            renameFile: dependencies.credentialStateFilesystem?.renameFile,
+            syncDirectory: dependencies.credentialStateFilesystem?.syncDirectory
+          });
+        }
+      }
+    });
+    return { accessToken, tokenGeneration: candidateTokenGeneration };
   } finally {
     await removeCandidateToken({ path: candidateTokenPath, removeTokenFile: unlink3 });
   }
@@ -37847,6 +38058,8 @@ async function dashboard({
       return 0;
     if (action.kind === "interrupt")
       throw new CliInterruptedError("SIGINT");
+    if (action.kind === "logout")
+      return await logout({ dependencies, flags: {} });
     holdTransitionScreen();
     if (action.kind === "session")
       return await attachSession({ dependencies, sessionId: action.sessionId, noTui: false, json: false });
@@ -38326,6 +38539,10 @@ async function runAttachedSession({
               const detail = await operations.completeSession({ client: operations.client, sessionId });
               controller.updateDetail(detail);
             },
+            requestCancel: async () => {
+              const detail = await operations.cancelSession({ client: operations.client, sessionId });
+              controller.updateDetail(detail);
+            },
             readClipboardImage,
             savePastedImage: async (input) => await writePastedImage({ ...input, temporaryDirectory: tmpdir() }),
             attachPromptPaths: async (input) => await uploadPromptPaths({ operations, ...input })
@@ -38354,6 +38571,13 @@ async function runAttachedSession({
             bootstrap: await prepareDashboardBootstrap({ dependencies, operations })
           });
         }
+        if (action.kind === "logout") {
+          stop();
+          await startPromise;
+          if (dependencies.abortSignal?.aborted)
+            throw dependencies.abortSignal.reason ?? new Error("interrupted");
+          return await logout({ dependencies, flags: {} });
+        }
         holdTransitionScreen();
         const availableRepositories = await collectAllRepositories({ listRepositories: operations.listRepositories });
         let draft = await openTuiNewSessionWizard({ dependencies, operations, repositories: availableRepositories });
@@ -38433,6 +38657,7 @@ async function createSessionOperations(dependencies, { onAuthenticated } = {}) {
       reserveAndUploadFile: dependencies.reserveAndUploadFile ?? reserveAndUploadFile,
       createCodexSession: dependencies.createCodexSession ?? createCodexSession,
       appendSessionMessage: dependencies.appendSessionMessage ?? appendSessionMessage,
+      cancelSession: dependencies.cancelSession ?? cancelSession,
       completeSession: dependencies.completeSession ?? completeSession,
       interruptSession: dependencies.interruptSession ?? interruptSession,
       getSession: dependencies.getSession ?? getSession,
@@ -38450,6 +38675,7 @@ async function createSessionOperations(dependencies, { onAuthenticated } = {}) {
     reserveAndUploadFile: dependencies.reserveAndUploadFile ?? reserveAndUploadFile,
     createCodexSession: dependencies.createCodexSession ?? createCodexSession,
     appendSessionMessage: dependencies.appendSessionMessage ?? appendSessionMessage,
+    cancelSession: dependencies.cancelSession ?? cancelSession,
     completeSession: dependencies.completeSession ?? completeSession,
     interruptSession: dependencies.interruptSession ?? interruptSession,
     getSession: dependencies.getSession ?? getSession,

package/package.json

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