@meistrari/remy-cli 1.2.0 → 1.4.0

package/README.md

@@ -50,6 +50,7 @@ Drag to select visible text in any Remy view; Remy copies it to the local clipbo
 | --- | --- |
 | `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. |

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,
@@ -36061,6 +36068,7 @@ import { CliRenderEvents as CliRenderEvents4, BoxRenderable as BoxRenderable4, b
 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" },
@@ -36073,6 +36081,7 @@ async function createSessionTui({
   submitMessage,
   requestInterrupt,
   requestComplete,
+  requestCancel,
   repositoryLabel,
   readClipboardImage,
   savePastedImage,
@@ -36153,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"
@@ -36165,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 });
@@ -36183,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";
@@ -36215,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) {
@@ -36244,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)
@@ -36286,7 +36295,7 @@ 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();
@@ -36524,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;
       }
@@ -36585,7 +36594,13 @@ 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") {
@@ -36669,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();
@@ -36713,9 +36728,10 @@ 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();
     });
@@ -36792,6 +36808,7 @@ 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" },
@@ -36817,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}`;
@@ -36854,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"))]);
+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) {
@@ -37022,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([
@@ -37033,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)
@@ -37174,7 +37197,7 @@ var compactMarkRows = 9;
 var compactMinWidth = 48;
 var compactMinHeight = 20;
 var markBrightnessGain = 4.2;
-var remyCliVersion = "1.2.0";
+var remyCliVersion = "1.4.0";
 async function showRemySplash({
   createRenderer = createRemyRenderer,
   durationMs = splashDurationMs,
@@ -38516,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 })
@@ -38630,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,
@@ -38647,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.2.0",
+    "version": "1.4.0",
     "description": "Remy, the Coding Agent terminal client.",
     "type": "module",
     "bin": {