@orion-agents/orion-code 0.3.25 → 0.3.26

package/CHANGELOG.md

@@ -22,15 +22,40 @@ which is **not** a pass.
 
 ## [Unreleased]
 
-## [0.3.25] — UNRELEASED
-
-> **Status: candidate.** Open. Four open-issue fixes: the Git conflict view reads the
-> edited working file from the filesystem instead of an unstored object (#269), file
-> history walks the requested revision instead of always HEAD (#270), model switching
-> gates the compact preflight on effective input budgets instead of raw context windows
-> (#271), and the left project navigation keeps a stable registration order when
-> sessions are activated (#272). Plan: `docs/plan/v0.3.25-plan.md`. Not merged, tagged
-> or published.
+## [0.3.26] — UNRELEASED
+
+> **Status: candidate.** Open. Structured-diff integrity and Session lifecycle: body
+> rows that look like file headers stay body rows (#274), a hunk split across
+> pagination keeps its rows, line numbers and identity (#275), permanent Session
+> deletion removes the v2 Thread records (#276), and exiting a cutover Session no
+> longer rewrites its summary from the frozen legacy JSONL (#277). Plan:
+> `docs/plan/v0.3.26-plan.md`. Not merged, tagged or published.
+
+### Fixed
+
+- #274: a deletion row whose text starts with `-- ` (`--- old comment`) is no longer
+  mistaken for the old-file header; the hunk stays open and the remaining body is
+  no longer demoted to document metadata.
+- #275: the structured diff continuation contract carries the split hunk's state
+  (header, index, running line cursors) in the cursor, so every page of a large
+  hunk keeps its rows with correct line numbers and the stable hunk identity, and
+  the last page reports the true completeness.
+- #276: permanently deleting a cutover Session removes its v2 records — cutover
+  index entry, event log, head, projection, compact state and checkpoints,
+  session-index manifest, transcript pages and import receipt — under the same
+  file-lock and atomic-write discipline as the cutover itself.
+- #277: `/exit` (and the shutdown path) no longer rewrites a cutover Session's
+  `messageCount`/`historySizeBytes` from the frozen legacy JSONL; the summary comes
+  from the authoritative v2 Thread.
+
+## [0.3.25] — 2026-10-13
+
+> **Status: published.** Released as `@orion-agents/orion-code@0.3.25` from
+> `refs/tags/v0.3.25`, and merged to `main` as `c356323` (#273). Four open-issue fixes
+> for the Git conflict view (#269), file-history revisions (#270), the model-switch
+> compact preflight (#271) and the stable project navigation order (#272). Plan:
+> `docs/plan/v0.3.25-plan.md`. GitHub Release:
+> https://github.com/orion-agents/orion-code/releases/tag/v0.3.25
 
 ### Fixed
 

package/README.md

@@ -2,12 +2,12 @@
 
 Local-first, goal-driven coding agent for the terminal and browser.
 
-> v0.3.25 candidate — open. Four open-issue fixes: the Git conflict view reads the edited
-> working file from the filesystem (#269), file history walks the requested revision
-> (#270), model switching gates the compact preflight on effective input budgets (#271),
-> and the left project navigation keeps a stable registration order (#272). The previous
-> release 0.3.24 is on npm (registry `latest`), tagged `v0.3.24` (`85fadb4`, #268) and
-> released on GitHub.
+> v0.3.26 candidate — open. Structured-diff integrity and Session lifecycle: header-lookalike
+> body rows stay body rows (#274), hunks split across pagination keep their rows and line
+> numbers (#275), permanent Session deletion removes the v2 Thread records (#276), and
+> exiting a cutover Session no longer regresses its summary from the legacy JSONL (#277).
+> The previous release 0.3.25 is on npm (registry `latest`), tagged `v0.3.25` (`c356323`,
+> #273) and released on GitHub.
 
 [中文说明](README.zh-CN.md) ·
 [v0.3.24 plan](docs/plan/v0.3.24-plan.md) ·
@@ -170,10 +170,10 @@ user extension boundaries.
 Node.js 22.12+, 24, and 26 are supported. Use Node 24 LTS for production or Node 26 Current for
 current development environments. Node 20 is upstream EOL and is no longer a v0.3 runtime.
 
-To install the pinned v0.3.25 package when it is available on npm:
+To install the pinned v0.3.26 package when it is available on npm:
 
 ```bash
-npm install -g @orion-agents/orion-code@0.3.25
+npm install -g @orion-agents/orion-code@0.3.26
 orion --version
 orion doctor
 ```

package/README.zh-CN.md

@@ -2,10 +2,10 @@
 
 面向终端与浏览器、本地优先的目标驱动 Coding Agent。
 
-> v0.3.25 候选版本：进行中。四个开放 issue 修复：Git 冲突视图从文件系统读取已编辑的
-> 工作区文件（#269）、文件历史按请求的 revision 遍历（#270）、模型切换按有效输入预算
-> 触发压缩预检（#271）、左侧项目导航保持稳定注册序（#272）。上一版 0.3.24 已发布 npm
-> （registry `latest`）、打 tag `v0.3.24`（`85fadb4`，#268）并发布 GitHub Release。
+> v0.3.26 候选版本：进行中。结构化 diff 完整性与会话生命周期：形似文件头的 body 行保持为
+> body 行（#274）、跨页拆分的 hunk 保留行与行号（#275）、永久删除会话同时清除 v2 Thread
+> 记录（#276）、退出已切换会话不再从旧 JSONL 回退 summary（#277）。上一版 0.3.25 已发布
+> npm（registry `latest`）、打 tag `v0.3.25`（`c356323`，#273）并发布 GitHub Release。
 
 [English](README.md) ·
 [v0.3.24 方案](docs/plan/v0.3.24-plan.md) ·
@@ -100,10 +100,10 @@ MCP 仍是用户可见的扩展边界。
 支持 Node.js 22.12+、24 和 26。生产环境建议使用 Node 24 LTS，当前开发环境也支持 Node 26
 Current。Node 20 已结束上游维护，不再属于 v0.3 Runtime 合同。
 
-v0.3.25 在 npm 可用后，可安装固定版本：
+v0.3.26 在 npm 可用后，可安装固定版本：
 
 ```bash
-npm install -g @orion-agents/orion-code@0.3.25
+npm install -g @orion-agents/orion-code@0.3.26
 orion --version
 orion doctor
 ```

package/dist/runtime/legacy-thread-materializer.d.ts

@@ -102,4 +102,17 @@ export declare function openSessionCheckpointStorageV1(projectPathInput: string,
  */
 export declare function openSessionStorageV1(projectPathInput: string, sessionId: string): OpenedSessionStorageV1;
 export declare function loadThreadCutoverIndexV1(projectPath: string): ThreadCutoverIndexV1;
+/**
+ * v0.3.26 #276 — permanently removes one Session's durable v2 records: the
+ * cutover index entry plus every thread file the materializer and the event
+ * store publish (event log, projection, head, compact state and checkpoints,
+ * session-index manifest, transcript pages, import receipt). Returns the
+ * removed thread id, or null when the Session was never cut over.
+ *
+ * The index write takes the same file lock and atomic-write discipline as the
+ * cutover itself, with the generation bumped; an emptied index keeps its file
+ * with an empty session map so readers stay on the atomic authority instead of
+ * treating a missing file as "no v2 Sessions at all".
+ */
+export declare function deleteSessionThreadRecordsV1(projectPathInput: string, sessionId: string): string | null;
 //# sourceMappingURL=legacy-thread-materializer.d.ts.map

package/dist/runtime/legacy-thread-materializer.js

@@ -7,6 +7,7 @@ exports.resolveSessionStorageV1 = resolveSessionStorageV1;
 exports.openSessionCheckpointStorageV1 = openSessionCheckpointStorageV1;
 exports.openSessionStorageV1 = openSessionStorageV1;
 exports.loadThreadCutoverIndexV1 = loadThreadCutoverIndexV1;
+exports.deleteSessionThreadRecordsV1 = deleteSessionThreadRecordsV1;
 const fs_1 = require("fs");
 const path_1 = require("path");
 const atomic_write_1 = require("../services/atomic-write");
@@ -205,6 +206,77 @@ function openSessionStorageV1(projectPathInput, sessionId) {
 function loadThreadCutoverIndexV1(projectPath) {
     return readThreadCutoverIndex((0, paths_1.getProjectThreadsV2IndexPath)((0, path_1.resolve)(projectPath)));
 }
+/**
+ * v0.3.26 #276 — permanently removes one Session's durable v2 records: the
+ * cutover index entry plus every thread file the materializer and the event
+ * store publish (event log, projection, head, compact state and checkpoints,
+ * session-index manifest, transcript pages, import receipt). Returns the
+ * removed thread id, or null when the Session was never cut over.
+ *
+ * The index write takes the same file lock and atomic-write discipline as the
+ * cutover itself, with the generation bumped; an emptied index keeps its file
+ * with an empty session map so readers stay on the atomic authority instead of
+ * treating a missing file as "no v2 Sessions at all".
+ */
+function deleteSessionThreadRecordsV1(projectPathInput, sessionId) {
+    const projectPath = (0, path_1.resolve)(projectPathInput);
+    const indexPath = (0, paths_1.getProjectThreadsV2IndexPath)(projectPath);
+    // A project that never cut a Session over has no index and no threads-v2
+    // directory; taking the lock would create one on a pure legacy deletion.
+    if (!(0, fs_1.existsSync)(indexPath))
+        return null;
+    const threadsDir = (0, paths_1.getProjectThreadsV2Dir)(projectPath);
+    return (0, file_lock_1.withFileLockSync)(indexPath, () => {
+        const current = readThreadCutoverIndex(indexPath);
+        const entry = current.sessions[sessionId];
+        if (!entry)
+            return null;
+        const sessions = { ...current.sessions };
+        delete sessions[sessionId];
+        const content = { version: 1, generation: current.generation + 1, sessions };
+        const next = deepFreeze({ ...content, digest: (0, canonical_1.digestRuntimeValue)(content) });
+        (0, atomic_write_1.atomicWriteFileSync)(indexPath, `${(0, canonical_1.canonicalRuntimeJson)(next)}\n`, {
+            mode: 0o600,
+            fsync: true,
+        });
+        removeThreadFiles(threadsDir, projectPath, entry.threadId);
+        return entry.threadId;
+    });
+}
+/** v0.3.26 #276 — removes every durable file of one thread. Best effort per
+ *  file: a missing artifact is already deleted, and an unlink failure must not
+ *  resurrect the cutover entry that was just removed. */
+function removeThreadFiles(threadsDir, projectPath, threadId) {
+    const files = [
+        (0, path_1.join)(threadsDir, `${threadId}.events.v1.jsonl`),
+        (0, path_1.join)(threadsDir, `${threadId}.projection.v1.json`),
+        (0, path_1.join)(threadsDir, `${threadId}.head.v1.json`),
+        (0, path_1.join)(threadsDir, `${threadId}.compact-state.v1.json`),
+        (0, path_1.join)(threadsDir, `${threadId}.session-index.v1.json`),
+        (0, paths_1.getProjectThreadV2ImportReceiptPath)(projectPath, threadId),
+    ];
+    for (const file of files) {
+        try {
+            if ((0, fs_1.existsSync)(file))
+                (0, fs_1.unlinkSync)(file);
+        }
+        catch {
+            // Durable leftovers are reported by the integrity checks, never by
+            // throwing here: the cutover entry removal is already committed.
+        }
+    }
+    for (const dir of [
+        (0, path_1.join)(threadsDir, `${threadId}.compact-checkpoints.v1`),
+        (0, path_1.join)(threadsDir, `${threadId}.transcript-pages.v1`),
+    ]) {
+        try {
+            (0, fs_1.rmSync)(dir, { recursive: true, force: true });
+        }
+        catch {
+            // See above.
+        }
+    }
+}
 function buildMaterializedEvents(snapshot) {
     const receipt = snapshot.receipt;
     const pending = [

package/dist/services/session-storage.js

@@ -1858,6 +1858,21 @@ function updateSessionSummary(sessionId, _messages) {
     // Callers may hold a stale transcript snapshot. Re-read under the same lock
     // used by append/delete so reconciliation can never roll metadata backwards.
     withLockedSession(sessionId, session => {
+        // v0.3.26 #277 — a cutover Session's summary comes from the authoritative
+        // v2 Thread. Its legacy JSONL is frozen at cutover, so summarizing from it
+        // (as /exit and the shutdown path do) would move messageCount and
+        // historySizeBytes backwards while the Thread history is intact. Reopening
+        // the Session repairs the read model from v2; this makes the exit path
+        // agree instead of regressing it.
+        const threadView = (0, thread_session_view_1.loadThreadSessionViewV1)(session.projectPath, session.id);
+        if (threadView) {
+            session.messageCount = threadView.messageCount;
+            session.historySizeBytes = threadView.historySizeBytes;
+            session.updatedAt = threadView.updatedAt;
+            session.updatedAtIso = new Date(session.updatedAt).toISOString();
+            writeSessionMetaUnlocked(session);
+            return;
+        }
         const summary = summarizeSessionMessages(readSessionMessagesForSession(session));
         session.toolsUsed = summary.toolsUsed;
         session.filesModified = summary.filesModified;
@@ -2553,6 +2568,12 @@ function deleteSession(sessionId) {
         updateSessionCatalog(catalog => {
             delete catalog.sessions[sessionId];
         });
+        // v0.3.26 #276 — a cutover Session's v2 records are the authoritative
+        // history; permanent deletion must remove them with the legacy files.
+        // The Web deletion dialog promises exactly that.
+        if ((0, legacy_thread_materializer_1.deleteSessionThreadRecordsV1)(session.projectPath, sessionId)) {
+            deleted = true;
+        }
         return deleted;
     }) ?? false);
 }

package/dist/web/git-diff-document.d.ts

@@ -41,6 +41,18 @@ export interface GitHunkV2 {
     readonly complete: boolean;
 }
 export type GitDiffDocumentKindV2 = 'text' | 'binary' | 'symlink' | 'submodule' | 'metadata';
+/**
+ * v0.3.26 #275 — parser state for a hunk that a page boundary split. Carried in
+ * the continuation cursor so the next page re-opens the hunk with its stable
+ * identity (`index:oldStart:newStart`) and correct running line cursors instead
+ * of demoting the continuation rows to document meta.
+ */
+export interface GitDiffHunkResumeV1 {
+    readonly header: string;
+    readonly index: number;
+    readonly oldCursor: number;
+    readonly newCursor: number;
+}
 export interface GitDiffCapabilitiesV2 {
     readonly stageFile: boolean;
     readonly unstageFile: boolean;
@@ -63,6 +75,11 @@ export interface GitDiffDocumentV2 {
     readonly hunks: readonly GitHunkV2[];
     /** Metadata lines that are not part of any hunk (file headers, mode changes, …). */
     readonly meta: readonly string[];
+    /**
+     * v0.3.26 #275 — the hunk still open when this page ended, for the
+     * continuation cursor. Null when the page ends on a hunk boundary.
+     */
+    readonly pendingHunk: GitDiffHunkResumeV1 | null;
     readonly completeness: 'complete' | 'paged' | 'limited';
     readonly additions: number;
     readonly deletions: number;
@@ -79,5 +96,7 @@ export declare function parseGitDiffDocument(input: {
     readonly hasMore: boolean;
     /** Host-signed continuation cursor, or null. Never synthesised here. */
     readonly nextCursor: string | null;
+    /** v0.3.26 #275 — hunk state from the previous page's `pendingHunk`. */
+    readonly resume?: GitDiffHunkResumeV1 | null;
 }): GitDiffDocumentV2;
 //# sourceMappingURL=git-diff-document.d.ts.map

package/dist/web/git-diff-document.js

@@ -75,6 +75,31 @@ function parseGitDiffDocument(input) {
     let additions = 0;
     let deletions = 0;
     let current;
+    const openHunk = (header, index, oldCursor, newCursor) => {
+        const headerMatch = HUNK_HEADER.exec(header);
+        if (!headerMatch)
+            return;
+        const oldStart = Number(headerMatch[1]);
+        const newStart = Number(headerMatch[3]);
+        current = {
+            header,
+            oldStart,
+            oldLines: headerMatch[2] === undefined ? 1 : Number(headerMatch[2]),
+            newStart,
+            newLines: headerMatch[4] === undefined ? 1 : Number(headerMatch[4]),
+            contextLabel: (headerMatch[5] ?? '').trim(),
+            lines: [],
+            oldCursor,
+            newCursor,
+            index,
+        };
+    };
+    // v0.3.26 #275 — a continuation page starts mid-hunk: re-open it from the
+    // resume state before the first line is classified. A page that happens to
+    // start with its own `@@` header simply ignores the resume state.
+    if (input.resume && !HUNK_HEADER.test(input.lines[0] ?? '')) {
+        openHunk(input.resume.header, input.resume.index, input.resume.oldCursor, input.resume.newCursor);
+    }
     const closeHunk = () => {
         if (!current)
             return;
@@ -134,14 +159,22 @@ function parseGitDiffDocument(input) {
             }));
             continue;
         }
-        if (isMetaLine(raw)) {
+        // v0.3.26 #274 — the body marker decides first. A deletion of a line that
+        // itself starts with `-- ` produces the body row `--- old comment`, which a
+        // header-first check mistook for the old-file header, closing the hunk and
+        // demoting the remaining body to document meta. Genuine document-level lines
+        // carry no body marker by construction: context rows start with a space,
+        // additions with `+`, deletions with `-`, and file boundaries are announced
+        // by a markerless `diff --git` line.
+        const marker = raw[0];
+        const isBodyRow = marker === '+' || marker === '-' || marker === ' ' || raw === '';
+        if (!isBodyRow && isMetaLine(raw)) {
             // A file boundary inside one page (multi-command reads) closes the current hunk.
             closeHunk();
             if (raw)
                 meta.push(raw);
             continue;
         }
-        const marker = raw[0];
         const text = raw.length > 0 ? raw.slice(1) : '';
         let lineKind;
         let oldLineNumber = null;
@@ -185,6 +218,16 @@ function parseGitDiffDocument(input) {
             raw,
         }));
     }
+    // v0.3.26 #275 — a page that ends inside a hunk publishes the hunk state for
+    // the continuation cursor; a page ending on a boundary has nothing to resume.
+    const pendingHunk = input.hasMore && current
+        ? Object.freeze({
+            header: current.header,
+            index: current.index,
+            oldCursor: current.oldCursor,
+            newCursor: current.newCursor,
+        })
+        : null;
     closeHunk();
     const frozenHunks = Object.freeze(hunks);
     let completeness = 'complete';
@@ -203,6 +246,7 @@ function parseGitDiffDocument(input) {
         binary,
         hunks: frozenHunks,
         meta: Object.freeze(meta),
+        pendingHunk,
         completeness,
         additions,
         deletions,

package/dist/web/git-read-model-service.js

@@ -236,7 +236,13 @@ class GitReadModelServiceV1 {
      */
     async diffDocument(input) {
         const page = await this.diff(input);
-        return (0, git_diff_document_1.parseGitDiffDocument)({
+        // v0.3.26 #275 — the incoming cursor may carry the hunk state this page
+        // continues; diff() already validated the cursor, so decoding it here only
+        // reads the resume state.
+        const resumeHunk = input.cursor
+            ? this.decodeCursor(input.cursor, 'diff', page.repositoryRevision, page.fileId, diffScope(input.ignoreWhitespace === true, input.wordDiff === true)).resumeHunk
+            : undefined;
+        const document = (0, git_diff_document_1.parseGitDiffDocument)({
             fileToken: page.fileId,
             path: page.path,
             source: page.source,
@@ -244,7 +250,18 @@ class GitReadModelServiceV1 {
             lines: page.lines,
             hasMore: page.nextCursor !== null,
             nextCursor: page.nextCursor,
+            ...(resumeHunk ? { resume: resumeHunk } : {}),
         });
+        // A page that ends inside a hunk re-mints the cursor with the hunk state so
+        // the next page resumes it instead of demoting the rows to meta.
+        if (page.nextCursor && document.pendingHunk) {
+            const decoded = this.decodeCursor(page.nextCursor, 'diff', page.repositoryRevision, page.fileId, diffScope(input.ignoreWhitespace === true, input.wordDiff === true));
+            return Object.freeze({
+                ...document,
+                nextCursor: this.encodeCursor({ ...decoded, resumeHunk: document.pendingHunk }),
+            });
+        }
+        return document;
     }
     historyReader() {
         this.historyReaderInstance ?? (this.historyReaderInstance = (0, git_history_service_1.createGitHistoryReader)({
@@ -300,7 +317,8 @@ class GitReadModelServiceV1 {
             .update(`compare-diff:${input.baseOid}:${input.headOid}:${path}:${snapshot.revision}`)
             .digest('hex')
             .slice(0, 24);
-        const offset = input.cursor ? decodeCommitDiffCursor(input.cursor, margin) : 0;
+        const cursorState = input.cursor ? decodeCommitDiffCursor(input.cursor, margin) : null;
+        const offset = cursorState?.offset ?? 0;
         const page = await streamDiffPage({
             cwd: root,
             commands: Object.freeze([
@@ -339,9 +357,19 @@ class GitReadModelServiceV1 {
             nextCursor: page.hasMore
                 ? encodeCommitDiffCursor({ margin, offset: offset + page.returnedLines })
                 : null,
+            ...(cursorState?.resumeHunk ? { resume: cursorState.resumeHunk } : {}),
         });
+        // v0.3.26 #275 — re-mint the continuation cursor with the split hunk state.
+        const nextCursor = page.hasMore && document.pendingHunk
+            ? encodeCommitDiffCursor({
+                margin,
+                offset: offset + page.returnedLines,
+                resumeHunk: document.pendingHunk,
+            })
+            : document.nextCursor;
         return Object.freeze({
             ...document,
+            nextCursor,
             baseOid: input.baseOid,
             baseLabel: `比较 ${input.baseOid.slice(0, 10)} → ${input.headOid.slice(0, 10)}`,
         });
@@ -450,7 +478,8 @@ class GitReadModelServiceV1 {
             .update(`commit-diff:${detail.id}:${detail.baseOid}:${parentIndex}:${snapshot.revision}`)
             .digest('hex')
             .slice(0, 24);
-        const offset = input.cursor ? decodeCommitDiffCursor(input.cursor, margin) : 0;
+        const cursorState = input.cursor ? decodeCommitDiffCursor(input.cursor, margin) : null;
+        const offset = cursorState?.offset ?? 0;
         const page = await streamDiffPage({
             cwd: root,
             commands: Object.freeze([
@@ -489,8 +518,22 @@ class GitReadModelServiceV1 {
             nextCursor: page.hasMore
                 ? encodeCommitDiffCursor({ margin, offset: offset + page.returnedLines })
                 : null,
+            ...(cursorState?.resumeHunk ? { resume: cursorState.resumeHunk } : {}),
+        });
+        // v0.3.26 #275 — re-mint the continuation cursor with the split hunk state.
+        const nextCursor = page.hasMore && document.pendingHunk
+            ? encodeCommitDiffCursor({
+                margin,
+                offset: offset + page.returnedLines,
+                resumeHunk: document.pendingHunk,
+            })
+            : document.nextCursor;
+        return Object.freeze({
+            ...document,
+            nextCursor,
+            baseLabel: detail.baseLabel,
+            baseOid: detail.baseOid,
         });
-        return Object.freeze({ ...document, baseLabel: detail.baseLabel, baseOid: detail.baseOid });
     }
     async capture() {
         let root;
@@ -1211,6 +1254,9 @@ class GitReadModelServiceV1 {
                 parsed.offset < 0) {
                 return invalidCursor();
             }
+            if (parsed.resumeHunk !== undefined && !isDiffHunkResume(parsed.resumeHunk)) {
+                return invalidCursor();
+            }
             if (parsed.revision !== revision) {
                 throw new errors_1.WebWorkbenchError(409, 'Git cursor revision is stale.', 'git_revision_conflict');
             }
@@ -1224,6 +1270,22 @@ class GitReadModelServiceV1 {
     }
 }
 exports.GitReadModelServiceV1 = GitReadModelServiceV1;
+/** v0.3.26 #275 — the hunk header shape, mirrored for cursor validation. */
+const HUNK_HEADER_PATTERN = /^@@ -(\d+)(?:,(\d+))? \+(\d+)(?:,(\d+))? @@(.*)$/u;
+/** v0.3.26 #275 — validates a cursor-carried hunk resume state. */
+function isDiffHunkResume(value) {
+    if (!value || typeof value !== 'object')
+        return false;
+    const candidate = value;
+    return (typeof candidate.header === 'string' &&
+        HUNK_HEADER_PATTERN.test(candidate.header) &&
+        Number.isSafeInteger(candidate.index) &&
+        candidate.index >= 0 &&
+        Number.isSafeInteger(candidate.oldCursor) &&
+        candidate.oldCursor >= 1 &&
+        Number.isSafeInteger(candidate.newCursor) &&
+        candidate.newCursor >= 1);
+}
 function parsePorcelainV1(output) {
     const fields = output.split('\0');
     const records = [];
@@ -1692,7 +1754,16 @@ function decodeCommitDiffCursor(cursor, margin) {
         candidate.offset < 0) {
         throw new errors_1.WebWorkbenchError(409, 'Diff changed; reload before paginating.', 'git_cursor_invalid');
     }
-    return candidate.offset;
+    if (candidate.resumeHunk !== undefined && !isDiffHunkResume(candidate.resumeHunk)) {
+        throw new errors_1.WebWorkbenchError(400, 'Diff cursor is not valid.', 'git_cursor_invalid');
+    }
+    return {
+        margin,
+        offset: candidate.offset,
+        ...(candidate.resumeHunk !== undefined
+            ? { resumeHunk: candidate.resumeHunk }
+            : {}),
+    };
 }
 /**
  * Kills a detached child and everything it spawned.

package/npm-shrinkwrap.json

@@ -1,12 +1,12 @@
 {
   "name": "@orion-agents/orion-code",
-  "version": "0.3.25",
+  "version": "0.3.26",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "@orion-agents/orion-code",
-      "version": "0.3.25",
+      "version": "0.3.26",
       "license": "MIT",
       "dependencies": {
         "@clack/prompts": "^0.7.0",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@orion-agents/orion-code",
-  "version": "0.3.25",
+  "version": "0.3.26",
   "description": "Orion Code - local-first goal-driven coding agent for terminal and Web.",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",