@orion-agents/orion-code 0.3.25 → 0.3.27

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.27",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "@orion-agents/orion-code",
-      "version": "0.3.25",
+      "version": "0.3.27",
       "license": "MIT",
       "dependencies": {
         "@clack/prompts": "^0.7.0",
@@ -4293,9 +4293,9 @@
       "license": "ISC"
     },
     "node_modules/follow-redirects": {
-      "version": "1.16.0",
-      "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.16.0.tgz",
-      "integrity": "sha512-y5rN/uOsadFT/JfYwhxRS5R7Qce+g3zG97+JrtFZlC9klX/W5hD7iiLzScI4nZqUS7DNUdhPgw4xI8W2LuXlUw==",
+      "version": "1.16.1",
+      "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.16.1.tgz",
+      "integrity": "sha512-FNvFGzoMLWmE6Yj9spb/zjd7yiNCHiAW9/Tg9CXrQ8wuu32HtlJOwWO11OJafl5FfY3DxTdQ0vj42zU1kvv5jg==",
       "funding": [
         {
           "type": "individual",
@@ -4563,13 +4563,13 @@
       "license": "MIT"
     },
     "node_modules/handlebars": {
-      "version": "4.7.9",
-      "resolved": "https://registry.npmjs.org/handlebars/-/handlebars-4.7.9.tgz",
-      "integrity": "sha512-4E71E0rpOaQuJR2A3xDZ+GM1HyWYv1clR58tC8emQNeQe3RH7MAzSbat+V0wG78LQBo6m6bzSG/L4pBuCsgnUQ==",
+      "version": "4.7.10",
+      "resolved": "https://registry.npmjs.org/handlebars/-/handlebars-4.7.10.tgz",
+      "integrity": "sha512-P5VJMVM7qgBn6vjXMw8WG9uVI+ncf2pi72j4de4yz5ZULLj2RGqLYaKOYGsgyrViQ0tePOVlN1tDCCXXtFqXKg==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "minimist": "^1.2.5",
+        "minimist": "^1.2.8",
         "neo-async": "^2.6.2",
         "source-map": "^0.6.1",
         "wordwrap": "^1.0.0"
@@ -7147,9 +7147,9 @@
       }
     },
     "node_modules/source-map-js": {
-      "version": "1.2.1",
-      "resolved": "https://registry.npmjs.org/source-map-js/-/source-map-js-1.2.1.tgz",
-      "integrity": "sha512-UXWMKhLOwVKb728IUtQPXxfYU+usdybtUrK/8uGE8CQMvrhOpwvzDBwj0QhSL7MQc7vIsISBG8VQ8+IDQxpfQA==",
+      "version": "1.2.2",
+      "resolved": "https://registry.npmjs.org/source-map-js/-/source-map-js-1.2.2.tgz",
+      "integrity": "sha512-KGj/8Y43x35aZVDtt+J4mK1hoLGHULMYfSkODJNQjNDC3oW1PqPoxMwo0pLUsWM/UEGzON/NxeHywEfNXNP3Vw==",
       "dev": true,
       "license": "BSD-3-Clause",
       "engines": {

package/package.json

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