@orion-agents/orion-code 0.3.17 → 0.3.18

package/CHANGELOG.md

@@ -22,6 +22,41 @@ which is **not** a pass.
 
 ## [Unreleased]
 
+## [0.3.18]
+
+> **Status: released.** Closes the assertion and evidence backlog of the Git
+> right-hand work panel shipped in 0.3.17, and fixes the CRLF part-staging
+> defect found right after that release.
+
+### Fixed
+
+- **CRLF part-staging was impossible:** the rebuilt context reused the
+  normalised display text, dropping the carriage return, so the patch never
+  matched the stored bytes. The raw line is reused so the context keeps its
+  line endings, and a selection that still cannot apply is refused explicitly
+  with `git_patch_not_applicable` instead of surfacing as a Git failure.
+
+### Added
+
+- **Assertion coverage for the G317 backlog:** deleting and renaming through
+  the panel (git records R with the content preserved), line-level staging on a
+  CRLF file, a signing failure (HEAD and the staged work untouched), bare and
+  non-repository workspaces, and a clean repository with readable history.
+- **Conflict-assertion split:** the plan requirement (a conflict is never shown
+  as an ordinary stageable diff) is asserted separately from whether the ideal
+  three-way view rendered — the earlier single assertion was flaky because the
+  three-way view loads asynchronously.
+- **Browser evidence:** conflict, comparison, blame, narrow-viewport and
+  open-in-Files screenshots under docs/plan/evidence/v0.3.17-git/screenshots/.
+
+### Known gaps
+
+- The bare-repository `status()` contract is measured but not yet pinned (its
+  current behaviour is neither a refusal nor an empty status).
+- Performance samples for the S5/S6 reads, dark-theme screenshot assertions,
+  and the agent-led file-change scenario are still open.
+
+---
 ## [0.3.17]
 
 > **Status: candidate.** Opening a local project is made fast and honest

package/dist/web/git-patch-builder.js

@@ -63,7 +63,11 @@ function buildHunkBody(hunk, selection) {
             }
             else {
                 // Kept in the index: becomes context.
-                body.push(` ${line.text}`);
+                //
+                // The original raw line is reused with its prefix swapped for a space, NOT
+                // `line.text`. `text` is the normalised display form, so rebuilding from it dropped
+                // the `\r` of a CRLF file and the patch then failed to apply against the real index.
+                body.push(` ${line.raw.slice(1)}`);
                 oldCount += 1;
                 newCount += 1;
             }

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

@@ -718,7 +718,17 @@ class GitReadModelServiceV1 {
         await (0, git_index_transaction_1.withIndexTransaction)(pathsInfo, context => this.readTreeEmpty(context), async (context) => {
             // `--recount` derives line counts from the body, so a partially rebuilt hunk still
             // applies exactly as written. `--check` first: nothing is written on a failed check.
-            await this.runGit(['apply', '--cached', '--check', '--recount', ...direction, '-'], pathsInfo.root, 'index', context.env, patch);
+            await this.runGit(['apply', '--cached', '--check', '--recount', ...direction, '-'], pathsInfo.root, 'index', context.env, patch).catch(error => {
+                const message = error instanceof Error ? error.message : '';
+                // A patch rebuilt from the reviewed document can still be inapplicable to the real
+                // index. CRLF line endings are the common cause: the diff text cannot represent them
+                // unambiguously, so the rebuilt context does not match the stored bytes. The plan
+                // requires such a selection to be refused explicitly rather than to fail as a Git
+                // error — nothing has been written at this point.
+                throw new errors_1.WebWorkbenchError(409, /patch failed|patch does not apply/iu.test(message)
+                    ? 'This selection cannot be applied to the index (CRLF line endings are a common cause).'
+                    : message, 'git_patch_not_applicable');
+            });
             await this.runGit(['apply', '--cached', '--recount', ...direction, '-'], pathsInfo.root, 'index', context.env, patch);
         });
         return this.mutationResult();

package/npm-shrinkwrap.json

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

package/package.json

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