@cueloop/client 0.1.0-alpha.82 → 0.1.0-alpha.84

package/src/components/__snapshots__/stories.test.tsx.snap

@@ -363,13 +363,13 @@ exports[`stories catalog Overlays/CompletionOverlay/FeedbackCounting renders, sn
 `;
 
 exports[`stories catalog Cards/ConfirmCard/ApproveDefault renders, snapshots, and carries its colors: Cards/ConfirmCard/ApproveDefault 1`] = `
-"┌────────────────────────────────┐      
-│       [Approve]  Changes       │      
-│                                │      
-│  summary for the agent (       │      
-│                                │      
-│  send    cancel                │      
-└────────────────────────────────┘      
+"┌────────────────────────────────────┐  
+│    [comment] [approve] [changes]   │  
+│                                    │  
+│  summary for the agent (optional)  │  
+│                                    │  
+│  send    cancel                    │  
+└────────────────────────────────────┘  
                                         
                                         
                                         
@@ -381,13 +381,13 @@ exports[`stories catalog Cards/ConfirmCard/ApproveDefault renders, snapshots, an
 `;
 
 exports[`stories catalog Cards/ConfirmCard/RequestChanges renders, snapshots, and carries its colors: Cards/ConfirmCard/RequestChanges 1`] = `
-"┌────────────────────────────────┐      
-│        Approve  [Changes]      │      
-│                                │      
-│  Tighten the steps.            │      
-│                                │      
-│  send    cancel                │      
-└────────────────────────────────┘      
+"┌────────────────────────────────────┐  
+│    [comment] [approve] [changes]   │  
+│                                    │  
+│  Tighten the steps.                │  
+│                                    │  
+│  send    cancel                    │  
+└────────────────────────────────────┘  
                                         
                                         
                                         
@@ -399,15 +399,15 @@ exports[`stories catalog Cards/ConfirmCard/RequestChanges renders, snapshots, an
 `;
 
 exports[`stories catalog Cards/ConfirmCard/WithViewedSummary renders, snapshots, and carries its colors: Cards/ConfirmCard/WithViewedSummary 1`] = `
-"┌────────────────────────────────┐      
-│ 2/3 files viewed               │      
-│                                │      
-│       [Approve]  Changes       │      
-│                                │      
-│  summary for the agent (       │      
-│                                │      
-│  send    cancel                │      
-└────────────────────────────────┘      
+"┌────────────────────────────────────┐  
+│ 2/3 files viewed                   │  
+│                                    │  
+│    [comment] [approve] [changes]   │  
+│                                    │  
+│  summary for the agent (optional)  │  
+│                                    │  
+│  send    cancel                    │  
+└────────────────────────────────────┘  
                                         
                                         
                                         

package/src/config.ts

@@ -9,7 +9,7 @@ import { existsSync, readFileSync } from "node:fs";
 import { homedir } from "node:os";
 import { join } from "node:path";
 import { OBSIDIAN_DEFAULTS, type ObsidianConfig } from "@cueloop/integration-obsidian";
-import type { MessageOutcome } from "@cueloop/schema";
+import { MESSAGE_OUTCOMES, type MessageOutcome } from "@cueloop/schema";
 import { writeFileSync, mkdirSync } from "node:fs";
 import { dirname } from "node:path";
 import * as v from "valibot";
@@ -213,7 +213,7 @@ const UiSchema = v.object({
   editor: v.fallback(v.optional(v.string()), undefined),
   theme: v.fallback(v.optional(v.string()), undefined),
   diff_view: v.fallback(v.optional(v.picklist(["split", "stacked", "unified"])), undefined),
-  default_message: v.fallback(v.optional(v.picklist(["approved", "changes_requested"])), undefined),
+  default_message: v.fallback(v.optional(v.picklist(MESSAGE_OUTCOMES)), undefined),
   pins: v.fallback(v.optional(v.array(v.string())), undefined),
   layout: v.fallback(
     v.optional(

package/src/intent-dispatch.test.ts

@@ -276,7 +276,7 @@ describe("cycleMessage", () => {
 describe("marker-actions popover", () => {
   const span = { displayIndex: 3, wordIndex: 0, wordEnd: 0, start: 2, end: 9 };
 
-  test("spanCut cuts the span's block and closes the popover", () => {
+  test("spanCut cuts only the marked character range and closes the popover", () => {
     // Arrange
     const deps = makeDeps({ mode: { type: "span", span } });
     const dispatch = createIntentDispatch(deps);
@@ -285,7 +285,7 @@ describe("marker-actions popover", () => {
     dispatch({ type: "spanCut" });
 
     // Assert
-    expect(deps.controller.cut).toHaveBeenCalledWith(3);
+    expect(deps.controller.cut).toHaveBeenCalledWith(3, 2, 9);
     expect(deps.setMode).toHaveBeenCalledWith({ type: "normal" });
   });
 

package/src/intent-dispatch.ts

@@ -8,14 +8,13 @@
  */
 
 import type { Dispatch, MutableRefObject, SetStateAction } from "react";
-import { isAddressed, type Thread, type MessageOutcome } from "@cueloop/schema";
+import { isAddressed, MESSAGE_OUTCOMES, type Thread, type MessageOutcome } from "@cueloop/schema";
 import { displayText, spanKey, startSpan, type DisplayBlock, type SpanState } from "./view-plan";
 import type { DiffRow } from "./view-diff";
 import type { ReviewController } from "./thread-controller";
 import type { Intent } from "./keymap";
 import type { TreeRow } from "./tree-view";
 import { quickActionBody, type QuickAction } from "./config";
-import { MESSAGE_OUTCOMES } from "./components/ConfirmCard";
 
 /** Which pane of the session tree / review the keyboard grammar is aimed at. */
 export type RailTab = "review" | "tree";
@@ -256,11 +255,10 @@ function handleSpanKey(intent: IntentOfType<"spanKey">, deps: IntentDispatchDeps
 }
 
 function handleSpanCut(_intent: IntentOfType<"spanCut">, deps: IntentDispatchDeps): void {
-  // the block the span sits in, cut whole (partial-span cut is not modeled)
   const { mode } = deps;
 
   if (mode.type === "span") {
-    deps.controller.cut(mode.span.displayIndex);
+    deps.controller.cut(mode.span.displayIndex, mode.span.start, mode.span.end);
     deps.setMode({ type: "normal" });
   }
 }

package/src/keymap.ts

@@ -315,8 +315,6 @@ function spanGrammar(state: KeyState, name: string): Intent[] {
     if (state.resolved) return status("review submitted - read-only");
     if (name === "c") return [{ type: "openCompose", kind: "comment", from: "span" }];
     if (name === "a") return [{ type: "openSpanActions" }];
-    // partial-span cut is not in the working-copy model, so cut removes the
-    // whole block the span sits in; owner-only, like plan cut
     if (state.canEditPlan === false) return [];
 
     return [{ type: "spanCut" }];

package/src/thread-controller.curate.test.ts

@@ -1,5 +1,6 @@
 import { describe, expect, mock, test } from "bun:test";
 import {
+  applyTextCuts,
   cutBlock,
   parseBlocks,
   restoreBlock,
@@ -7,6 +8,7 @@ import {
   type DiffFileContents,
   type HunkRejection,
   type Thread,
+  type TextCut,
 } from "@cueloop/schema";
 import { curateDiff } from "@cueloop/daemon/curate";
 import type { ThreadClient } from "@cueloop/daemon/client";
@@ -48,6 +50,7 @@ function diffSession(files?: DiffFileContents[]): Thread {
 
 interface WorkingCopySink {
   workingCopy?: string;
+  textCuts?: TextCut[];
 }
 
 const unimplemented = (member: string) => () =>
@@ -65,11 +68,15 @@ function fakeClient(initial: Thread, sink: WorkingCopySink): ThreadClient {
     sessionComment: unimplemented("sessionComment"),
     sessionAnnotate: unimplemented("sessionAnnotate"),
     sessionRemoveAnnotation: unimplemented("sessionRemoveAnnotation"),
-    sessionSetWorkingCopy: mock(async (_id: string, content: string | undefined) => {
-      sink.workingCopy = content;
-
-      return { ...session, workingCopy: content };
-    }),
+    sessionSetWorkingCopy: mock(
+      async (_id: string, content: string | undefined, textCuts?: TextCut[]) => {
+        sink.workingCopy = content;
+        sink.textCuts = textCuts;
+        session = { ...session, workingCopy: content, textCuts };
+
+        return session;
+      },
+    ),
     // the daemon's block primitives, stood in for with the same pure helpers it uses
     sessionCutBlock: mock(async (_id: string, blockIndex: number) => {
       const working = session.workingCopy ?? session.artifact.content;
@@ -154,7 +161,7 @@ describe("diff hunk curation", () => {
     await tick();
 
     // Assert
-    expect(controller.getSnapshot().status).toContain("change rejected");
+    expect(controller.getSnapshot().toast).toBeNull();
     expect(sink.workingCopy).toBe("");
   });
 
@@ -181,7 +188,7 @@ describe("diff hunk curation", () => {
     await tick();
 
     // Assert - no decisions left, so the working copy reverts to undefined
-    expect(controller.getSnapshot().status).toContain("change restored");
+    expect(controller.getSnapshot().toast).toBeNull();
     expect(sink.workingCopy).toBeUndefined();
     expect(controller.rejectedRows().size).toBe(0);
   });
@@ -195,7 +202,7 @@ describe("diff hunk curation", () => {
     await tick();
 
     // Assert - the single hunk is the whole diff, so nothing remains
-    expect(controller.getSnapshot().status).toContain("hunk rejected");
+    expect(controller.getSnapshot().toast).toBeNull();
     expect(sink.workingCopy).toBe("");
   });
 
@@ -249,7 +256,7 @@ describe("diff hunk curation", () => {
     await tick();
 
     // Assert - the list empties and the working copy reverts to the full diff
-    expect(controller.getSnapshot().status).toContain("removal restored");
+    expect(controller.getSnapshot().toast).toBeNull();
     expect(controller.curationItems().length).toBe(0);
     expect(sink.workingCopy).toBeUndefined();
     expect(controller.rejectedRows().size).toBe(0);
@@ -355,7 +362,7 @@ describe("plan cut removals", () => {
     await tick();
 
     // Assert - restoring the only cut round-trips to the submitted revision
-    expect(controller.getSnapshot().status).toContain("removal restored");
+    expect(controller.getSnapshot().toast).toBeNull();
     expect(sink.workingCopy).toBeUndefined();
   });
 
@@ -373,6 +380,25 @@ describe("plan cut removals", () => {
     expect(client.sessionCutBlock).toHaveBeenNthCalledWith(2, "ses_plan", 1);
     expect(sink.workingCopy).toBe("# Title\n");
   });
+
+  test("a whole-block Cut composes with an earlier exact Cut", async () => {
+    const start = PLAN_CONTENT.indexOf("paragraph.");
+    const end = PLAN_CONTENT.indexOf("Second") + "Sec".length;
+    const textCuts = [{ start, end, quote: PLAN_CONTENT.slice(start, end) }];
+    const session = {
+      ...planSession(applyTextCuts(PLAN_CONTENT, textCuts)),
+      textCuts,
+    };
+    const { controller, client, sink } = await connected(session);
+
+    controller.cut(1);
+    await tick();
+
+    expect(client.sessionSetWorkingCopy).toHaveBeenCalledTimes(1);
+    expect(client.sessionCutBlock).not.toHaveBeenCalled();
+    expect(sink.textCuts).toHaveLength(1);
+    expect(sink.workingCopy).toBe("# Title\nond paragraph.\n");
+  });
 });
 
 // a file whose hunk touches line 2 only, so lines 1/3/4 are unchanged tail/context

package/src/thread-controller.switch-cache.test.ts

@@ -141,7 +141,7 @@ describe("switching threads keeps the cached projection curatable", () => {
     controller.toggleRejectChange(4);
     await tick();
 
-    expect(controller.getSnapshot().status).toContain("change rejected");
+    expect(controller.getSnapshot().toast).toBeNull();
     expect(controller.getSnapshot().session?.workingCopy).toBe("");
   });