dsh-diff-approval 0.23.2 → 0.24.0

package/lib/types/client/discussion.d.ts

@@ -25,6 +25,19 @@ export interface DiscussionMessage {
     /** The message text as it is rendered. */
     text: string;
 }
+/**
+ * The gutter pair of one quoted line: the numbers the file showed beside it.
+ *
+ * Kept per line with the quote so an outdated thread can put the code back on the file's own
+ * columns — the numbers are what the reader navigates by, and the two sides of a hunk do not
+ * simply count up from the range's first line, so they cannot be derived from the anchor.
+ */
+export interface DiscussionQuoteLine {
+    /** Old-file number, `undefined` on a row the old side does not have (an added line). */
+    old: number | undefined;
+    /** New-file number — the second gutter — `undefined` on a removed line. */
+    new: number | undefined;
+}
 /** One discussion bound to a row range. */
 export interface Discussion {
     /** Stable identity for keys and toggles. */
@@ -41,13 +54,39 @@ export interface Discussion {
     /** Folded to the one-row header. */
     collapsed: boolean;
     /**
-     * No line of the anchor exists in the file any more (the code was changed or
-     * removed under it). The block stays where it last matched, cannot be commented
-     * on again, and is the user's to delete.
+     * The anchored lines as they read when the thread was created.
+     *
+     * The line numbers are what a rebuild moves; this is what says whether they still hold the
+     * code the comment was written about. When they do not, the thread is re-anchored on the
+     * quote (see `remapDiscussion`), and when even that finds nothing the block is marked
+     * outdated and the quote is what the reader is shown to know what it had been about.
+     */
+    quote?: string;
+    /**
+     * The gutter numbers of `quote`'s lines, in the same order, so an outdated block can lay the
+     * quote out exactly as the file lays code out. See `DiscussionQuoteLine`.
+     */
+    quoteLines?: readonly DiscussionQuoteLine[];
+    /**
+     * The anchor no longer holds the code the thread was written about — the lines were edited
+     * under it, or they are gone from the file. The block stays where it last matched, says so,
+     * keeps its quote and its turns, and owns no rows: it is read-only (nothing current to write
+     * about), it washes no lines, and a new annotation may take the rows under it. Removal is the
+     * user's call. The mark is derived from the current model, so the lines coming back with their
+     * quote clears it.
      */
     lost?: boolean;
     /** The answer being streamed for the question in flight. */
     reply?: string;
+    /**
+     * Where the session's transcript stood when the last question was sent — its node count.
+     *
+     * Kept with the block rather than only in the panel's refs, so a question still waiting
+     * for its answer can be picked up again after the panel is closed and reopened: the search
+     * for our own prompt starts here, which is what keeps an older, identical-looking prompt
+     * from being mistaken for it.
+     */
+    baseline?: number;
     /** The turn for the last question is running. */
     asking?: boolean;
     /**
@@ -154,6 +193,12 @@ export declare function discussionOnRange(discussions: readonly Discussion[], an
  * annotation at most, so a selection that touches an existing block offers no
  * second one - otherwise two blocks would describe the same line.
  *
+ * An outdated thread owns no rows: the code under its numbers is no longer what the
+ * comment was written about, so it cannot hold the range against a new annotation of the
+ * code that is there now. Nothing marks those rows for it either (see the panel's band),
+ * which is the same rule seen from the other side: a thread that no longer matches is
+ * kept for its quote and its turns, not for its position.
+ *
  * @param discussions - the blocks currently attached to this file.
  * @param anchor - the candidate range.
  * @returns the overlapping discussion, or `undefined`.
@@ -163,17 +208,26 @@ export declare function discussionOverlapping(discussions: readonly Discussion[]
     end: number;
 }): Discussion | undefined;
 /**
- * Re-anchor one discussion against the current rows: the rows whose new-file line
- * falls inside the annotation's line range. When no line matches any more, the
- * block keeps the rows it last matched and is marked lost, so it stays where the
- * user last saw it and can only be deleted.
+ * Re-anchor one discussion against the current rows.
+ *
+ * The anchor's new-file line numbers are what a rebuild moves; the quote the thread carries
+ * is what says whether they still hold the code the comment was written about. When they do
+ * not — the lines were edited under it, or the hunk moved — the quote is looked for elsewhere
+ * in the model and the thread follows it, nearest occurrence first when the same code shows up
+ * more than once. When nothing matches, the block keeps the rows it last matched and is marked
+ * outdated: it says so and keeps its quote for the reader, rather than being silently moved
+ * onto whatever took those lines. Only when the whole range is gone from the model does the
+ * block move, and then by line number, back to where the range used to be (see `gone`). The mark
+ * is derived, not sticky — the lines coming back with their quote clears it (GitHub recomputes
+ * `isOutdated` the same way).
  *
  * @param discussion - the block to re-anchor.
  * @param lineOf - the new-file line number of a row, or `undefined` for a row that has none.
+ * @param textOf - the text of a row, for the quote comparison.
  * @param rowCount - how many rows the current model has.
  * @returns the re-anchored discussion (the same object when nothing moved).
  */
-export declare function remapDiscussion(discussion: Discussion, lineOf: (row: number) => number | undefined, rowCount: number): Discussion;
+export declare function remapDiscussion(discussion: Discussion, lineOf: (row: number) => number | undefined, textOf: (row: number) => string, rowCount: number): Discussion;
 /** What the selection frame shows for the current selection. */
 export interface SelectionFrameActions {
     /** Whether keep/revert apply (the selection fully covers change blocks). */

package/lib/types/client/locales.d.ts

@@ -89,17 +89,20 @@ export declare const zh: {
     'action.discussionExpand': string;
     'action.discussionCollapse': string;
     'discussion.placeholder': string;
+    'discussion.placeholderOutdated': string;
     'discussion.marker': string;
     'discussion.promptRule': string;
     'discussion.promptRuleSkill': string;
     'discussion.thinking': string;
     'discussion.queued': string;
-    'discussion.lost': string;
+    'discussion.outdated': string;
+    'discussion.quote': string;
     'discussion.hidden': string;
     'discussion.failed': string;
     'discussion.stopped': string;
     'action.revert': string;
     'action.delete': string;
+    'action.discussionEnd': string;
     'action.keepAll': string;
     'action.revertAll': string;
     'action.openFile': string;
@@ -301,17 +304,20 @@ export declare const en: {
     'action.discussionExpand': string;
     'action.discussionCollapse': string;
     'discussion.placeholder': string;
+    'discussion.placeholderOutdated': string;
     'discussion.marker': string;
     'discussion.promptRule': string;
     'discussion.promptRuleSkill': string;
     'discussion.thinking': string;
     'discussion.queued': string;
-    'discussion.lost': string;
+    'discussion.outdated': string;
+    'discussion.quote': string;
     'discussion.hidden': string;
     'discussion.failed': string;
     'discussion.stopped': string;
     'action.revert': string;
     'action.delete': string;
+    'action.discussionEnd': string;
     'action.keepAll': string;
     'action.revertAll': string;
     'action.openFile': string;

package/lib/types/client/panel-memory.d.ts

@@ -13,6 +13,20 @@
  *
  * @module dsh-diff-approval/client/panel-memory
  */
+import type { Discussion } from './discussion.ts';
+/**
+ * The comment threads a session's panel is holding.
+ * @param sessionId - the session, if any.
+ * @returns the threads by pending entry id; empty when there are none.
+ */
+export declare function rememberedDiscussions(sessionId: string | undefined): Readonly<Record<string, readonly Discussion[]>>;
+/**
+ * Remember the comment threads a session's panel holds. Called on every change, so a mount
+ * that appears later (another presentation, or the panel reopened) starts from them.
+ * @param sessionId - the session the panel is reviewing; nothing is recorded without one.
+ * @param byFile - the threads, by pending entry id.
+ */
+export declare function rememberDiscussions(sessionId: string | undefined, byFile: Readonly<Record<string, readonly Discussion[]>>): void;
 /**
  * Remember that a session's panel was left showing one file, and where in it.
  * @param sessionId - the session the panel was reviewing; nothing is recorded

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dsh-diff-approval",
-  "version": "0.23.2",
+  "version": "0.24.0",
   "description": "DeepSeek Harness plugin: pending-edit review with whole-file diff and Keep/Revert",
   "packageManager": "pnpm@11.21.0",
   "author": "Wu Zhiwei",