pi-diff-widget 0.1.3 → 0.2.0

package/CHANGELOG.md

@@ -4,6 +4,20 @@ All notable changes to this project are documented here. The format follows
 [Keep a Changelog](https://keepachangelog.com/en/1.1.0/), and this project
 adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## [0.2.0] - 2026-10-12
+
+### Changed
+
+- `accept` and `reject` moved to `/diff`, where the edits they act on are shown.
+  `/diff-widget` now only controls the panel: `on`, `off`, or a bare toggle.
+- `/diff` warns about an unrecognized argument instead of opening the viewer.
+- Both commands complete their arguments on `Tab`.
+
+### Removed
+
+- `/diff-widget accept` and `/diff-widget reject`. Use `/diff accept` and
+  `/diff reject`.
+
 ## [0.1.3] - 2026-10-12
 
 ### Added

package/README.md

@@ -40,8 +40,8 @@ Keys:
 - `g` / `G`: jump to top / bottom
 - `q` / `Esc`: close
 
-See [Live edits widget](#live-edits-widget) for the `/diff-widget` actions
-(`on`, `off`, `accept`, `reject`).
+See [Commands](#commands) for `/diff accept`, `/diff reject`, and the
+`/diff-widget` visibility toggle.
 
 ## Live edits widget
 
@@ -66,27 +66,32 @@ move or delete stops counting as a whole-file deletion.
 
 It hides itself when nothing differs.
 
-### `/diff-widget` actions
+### Commands
+
+Keeping or undoing the agent's edits acts on the tracked files, not on everything
+the uncommitted view lists: `/diff accept` and `/diff reject` work from the
+session baselines, so files the agent never touched are left alone. If you hand
+edit a tracked file after the agent first touched it, `/diff reject` discards
+that edit too.
 
 | Command | Effect |
 |---|---|
+| `/diff accept` | Keep the agent's edits: the current content becomes the baseline and the panel clears. Alias: `keep` |
+| `/diff reject` | Undo the agent's edits: restore every tracked file to its pre-agent content, delete the files the agent created, and recreate the ones it deleted |
 | `/diff-widget` | Toggle the panel. With no argument it shows a hidden panel and hides a visible one |
 | `/diff-widget on` | Show it |
 | `/diff-widget off` | Hide it |
-| `/diff-widget accept` | Keep the agent's edits: the current content becomes the baseline and the panel clears. Alias: `keep` |
-| `/diff-widget reject` | Undo the agent's edits: restore every tracked file to its pre-agent content, delete the files the agent created, and recreate the ones it deleted |
 
 `accept` is Zed's Keep All. `reject` asks for confirmation first, naming up to
 five affected paths, and cannot be undone. Whole files only: there is no
 hunk-level accept or reject. With nothing to reject it reports `Nothing to
-reject`, and any unrecognized argument warns instead of toggling the panel, so a
-typo never hides the widget by accident.
+reject`. Any unrecognized argument warns instead of acting, so a typo never hides
+the panel or reverts a file. Both commands complete their arguments on `Tab`.
 
 ```
-/diff-widget
-/diff-widget on
-/diff-widget accept
-/diff-widget reject
+/diff accept
+/diff reject
+/diff-widget off
 ```
 
 ## Status

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "pi-diff-widget",
-    "version": "0.1.3",
+    "version": "0.2.0",
     "description": "Interactive diff viewer for pi: uncommitted changes and per-turn diffs",
     "keywords": [
         "pi-package",

package/src/actions.ts

@@ -0,0 +1,74 @@
+import type { AutocompleteItem } from '@earendil-works/pi-tui';
+import type {
+    ExtensionAPI,
+    ExtensionCommandContext,
+} from '@earendil-works/pi-coding-agent';
+import type { BaselineTracker } from './baseline.ts';
+import { collectRevertTargets, revertTargets } from './summary.ts';
+
+export type DiffAction = 'view' | 'accept' | 'reject' | 'unknown';
+
+/** Maps `/diff` arguments onto the action they select. Bare means the viewer. */
+export function parseDiffAction(args: string): DiffAction {
+    const action = args.trim().toLowerCase();
+    if (action === '') return 'view';
+    if (action === 'accept' || action === 'keep') return 'accept';
+    if (action === 'reject') return 'reject';
+    return 'unknown';
+}
+
+/** Completes a first argument from `items`, and stops once a second word starts. */
+export function argumentCompletions(
+    items: string[],
+): (prefix: string) => AutocompleteItem[] | null {
+    return (prefix) => {
+        const [first = '', ...rest] = prefix.trimStart().split(/\s+/);
+        if (rest.length > 0) return null;
+        return items
+            .filter((item) => item.startsWith(first))
+            .map((item) => ({ value: `${item} `, label: item }));
+    };
+}
+
+/** Repaint the widget after a baseline change, so the panel is never stale. */
+export type Refresh = (ctx: ExtensionCommandContext) => Promise<void>;
+
+/** Keep the agent's edits: the current content becomes the new baseline. */
+export async function acceptEdits(
+    pi: ExtensionAPI,
+    baselines: BaselineTracker,
+    refresh: Refresh,
+    ctx: ExtensionCommandContext,
+): Promise<void> {
+    await baselines.rebaseline(pi);
+    await refresh(ctx);
+    ctx.ui.notify('Edits accepted', 'info');
+}
+
+/** Undo the agent's edits, after confirming. Restores pre-agent content. */
+export async function rejectEdits(
+    baselines: BaselineTracker,
+    refresh: Refresh,
+    ctx: ExtensionCommandContext,
+): Promise<void> {
+    await ctx.waitForIdle();
+    const targets = await collectRevertTargets(baselines, ctx.cwd);
+    if (targets.length === 0) {
+        ctx.ui.notify('Nothing to reject', 'info');
+        return;
+    }
+    const names = targets
+        .slice(0, 5)
+        .map((target) => target.relativePath)
+        .join(', ');
+    const rest = targets.length > 5 ? ` and ${targets.length - 5} more` : '';
+    const confirmed = await ctx.ui.confirm(
+        'Reject agent edits?',
+        `Restore ${targets.length} file(s) to their pre-agent content: ${names}${rest}. This cannot be undone.`,
+    );
+    if (!confirmed) return;
+
+    await revertTargets(targets);
+    await refresh(ctx);
+    ctx.ui.notify(`Rejected edits to ${targets.length} file(s)`, 'info');
+}

package/src/index.ts

@@ -1,6 +1,12 @@
 import type { ExtensionAPI } from '@earendil-works/pi-coding-agent';
 import { collectUncommitted, type DiffFile } from './git.ts';
 import type { ExecFn } from './exec.ts';
+import {
+    acceptEdits,
+    argumentCompletions,
+    parseDiffAction,
+    rejectEdits,
+} from './actions.ts';
 import { createBaselineTracker } from './baseline.ts';
 import { collectTurns, createWriteDiffTracker } from './turns.ts';
 import { DiffViewer } from './ui.ts';
@@ -13,12 +19,30 @@ export default function (pi: ExtensionAPI) {
     const exec: ExecFn = (command, args, options) =>
         pi.exec(command, args, options);
 
-    registerDiffWidget(pi, baselines, exec);
+    const refreshWidget = registerDiffWidget(pi, baselines, exec);
 
     pi.registerCommand('diff', {
         description:
-            'Show uncommitted changes and per-turn edits in a scrollable viewer',
-        handler: async (_args, ctx) => {
+            'Show uncommitted changes and per-turn edits, or accept and reject the edits the agent made',
+        getArgumentCompletions: argumentCompletions(['accept', 'reject']),
+        handler: async (args, ctx) => {
+            const action = parseDiffAction(args);
+            if (action === 'accept') {
+                await acceptEdits(pi, baselines, refreshWidget, ctx);
+                return;
+            }
+            if (action === 'reject') {
+                await rejectEdits(baselines, refreshWidget, ctx);
+                return;
+            }
+            if (action === 'unknown') {
+                ctx.ui.notify(
+                    `Unknown action "${args.trim()}". Use /diff, /diff accept (keep), or /diff reject.`,
+                    'warning',
+                );
+                return;
+            }
+
             if (ctx.mode !== 'tui') {
                 ctx.ui.notify('/diff needs the interactive TUI', 'warning');
                 return;

package/src/widget.ts

@@ -5,15 +5,12 @@ import type {
     ExtensionContext,
 } from '@earendil-works/pi-coding-agent';
 import type { Theme } from '@earendil-works/pi-coding-agent';
+import type { Refresh } from './actions.ts';
+import { argumentCompletions } from './actions.ts';
 import type { BaselineTracker } from './baseline.ts';
 import type { DocumentTheme } from './document.ts';
 import type { ExecFn } from './exec.ts';
-import {
-    collectRevertTargets,
-    computeNetSummary,
-    pruneCleanBaselines,
-    revertTargets,
-} from './summary.ts';
+import { computeNetSummary, pruneCleanBaselines } from './summary.ts';
 import type { EditSummary } from './view.ts';
 
 export const WIDGET_KEY = 'pi-diff';
@@ -76,7 +73,7 @@ export function registerDiffWidget(
     pi: ExtensionAPI,
     baselines: BaselineTracker,
     exec: ExecFn,
-): void {
+): Refresh {
     let visible = true;
 
     const update = async (ctx: ExtensionContext) => {
@@ -108,52 +105,17 @@ export function registerDiffWidget(
     });
 
     pi.registerCommand('diff-widget', {
-        description:
-            'Live edits widget: on, off, accept (keep), or reject (undo)',
+        description: 'Live edits widget: on, off, or toggle',
+        getArgumentCompletions: argumentCompletions(['on', 'off']),
         handler: async (args, ctx) => {
             const action = args.trim().toLowerCase();
 
-            if (action === 'reject') {
-                await ctx.waitForIdle();
-                const targets = await collectRevertTargets(baselines, ctx.cwd);
-                if (targets.length === 0) {
-                    ctx.ui.notify('Nothing to reject', 'info');
-                    return;
-                }
-                const names = targets
-                    .slice(0, 5)
-                    .map((target) => target.relativePath)
-                    .join(', ');
-                const rest =
-                    targets.length > 5 ? ` and ${targets.length - 5} more` : '';
-                const confirmed = await ctx.ui.confirm(
-                    'Reject agent edits?',
-                    `Restore ${targets.length} file(s) to their pre-agent content: ${names}${rest}. This cannot be undone.`,
-                );
-                if (!confirmed) return;
-
-                await revertTargets(targets);
-                await update(ctx);
-                ctx.ui.notify(
-                    `Rejected edits to ${targets.length} file(s)`,
-                    'info',
-                );
-                return;
-            }
-
-            if (action === 'accept' || action === 'keep') {
-                await baselines.rebaseline(pi);
-                await update(ctx);
-                ctx.ui.notify('Edits accepted', 'info');
-                return;
-            }
-
             if (action === 'on') visible = true;
             else if (action === 'off') visible = false;
             else if (action === '') visible = !visible;
             else {
                 ctx.ui.notify(
-                    `Unknown action "${action}". Use on, off, accept, or reject.`,
+                    `Unknown action "${action}". Use on or off. To keep or undo the edits, use /diff accept or /diff reject.`,
                     'warning',
                 );
                 return;
@@ -163,4 +125,6 @@ export function registerDiffWidget(
             ctx.ui.notify(`Edits widget ${visible ? 'on' : 'off'}`, 'info');
         },
     });
+
+    return update;
 }