@stravica-ai/digital-operator-pa 0.1.0 → 0.1.1

package/dist/engineering-pa-cli/src/sync/git.mjs

@@ -23,8 +23,21 @@
 // under that subtree) — exactly the case a brand-new mount hits. `=all`
 // makes git enumerate every untracked file individually, so each path
 // is checked against the exclusion prefixes on its own merits.
+//
+// `-z` is equally load-bearing: without it, git C-quotes any path
+// containing a space or non-ASCII byte (`core.quotePath` defaults true),
+// emitting `?? "dir/Club photo.jpeg"` with the double-quotes and octal
+// escapes as LITERAL characters in the output. registry-scope.mjs then
+// slices that quoted string off the line and hands it to `git add --`
+// verbatim, so git looks for a file literally named `"dir/Club
+// photo.jpeg"` (quotes included) and fails with `fatal: pathspec … did
+// not match any files`, taking the whole sync tick down with exit 3.
+// `-z` switches the output to NUL-delimited records that are NEVER
+// quoted (git emits the raw bytes), eliminating the entire quoted-
+// pathspec bug class — spaces, quotes, backslashes, and unicode alike.
+// See parsePorcelainPaths in registry-scope.mjs for the NUL parser.
 export async function statusPorcelain(runner, { cwd }) {
-  return runner.spawn('git', ['status', '--porcelain', '--untracked-files=all'], { cwd });
+  return runner.spawn('git', ['status', '--porcelain', '-z', '--untracked-files=all'], { cwd });
 }
 
 export async function currentBranch(runner, { cwd }) {
@@ -93,22 +106,37 @@ export async function push(runner, { cwd }) {
 // git-status(1) `Short Format` — "Unmerged entries have the following
 // second column"): DD, AU, UD, UA, DU, AA, UU. Anything else is a normal
 // modification (M ), untracked (??), etc.
+//
+// Uses `-z` (NUL-delimited, never C-quoted) for the same reason
+// statusPorcelain does: a conflicted path with a space or non-ASCII byte
+// would otherwise be emitted C-quoted and flow — quotes and all — into
+// `git checkout --ours -- <path>` / `git add -- <path>` during
+// auto-resolve, failing the same way the staging path did. NUL records
+// carry the raw bytes, so the paths passed downstream match on disk.
 export async function listConflictedPaths(runner, { cwd }) {
-  const r = await runner.spawn('git', ['status', '--porcelain'], { cwd });
+  const r = await runner.spawn('git', ['status', '--porcelain', '-z'], { cwd });
   if (r.code !== 0) {
     return { code: r.code, stderr: r.stderr, paths: [] };
   }
   const paths = [];
-  for (const line of r.stdout.split('\n')) {
-    // Porcelain v1 line: `XY <path>` where XY is exactly two chars
-    // followed by a space. Renamed entries use `XY <old> -> <new>` — the
-    // conflict codes below never apply to renames, so we treat the tail
-    // as the path verbatim.
-    if (line.length < 4) continue;
-    const xy = line.slice(0, 2);
+  // `-z` records are NUL-terminated (trailing empty token after the final
+  // NUL). Each record is `XY <path>`; XY is exactly two chars followed by
+  // a space. Renamed/copied entries (`R`/`C` in the X column) carry a
+  // SECOND NUL-terminated field — the source path — which we must step
+  // over so it is not mis-scanned as its own record. Conflict codes never
+  // apply to renames, so a rename record never contributes a path here.
+  const records = r.stdout.split('\0');
+  for (let i = 0; i < records.length; i += 1) {
+    const rec = records[i];
+    if (rec.length < 4) continue;
+    const xy = rec.slice(0, 2);
+    if (xy[0] === 'R' || xy[0] === 'C') {
+      i += 1; // consume the trailing source-path field
+      continue;
+    }
     if (xy === 'DD' || xy === 'AU' || xy === 'UD' || xy === 'UA'
         || xy === 'DU' || xy === 'AA' || xy === 'UU') {
-      paths.push(line.slice(3));
+      paths.push(rec.slice(3));
     }
   }
   return { code: 0, stderr: '', paths };

package/dist/engineering-pa-cli/src/sync/registry-scope.mjs

@@ -171,30 +171,44 @@ export function computeCommitScope({ repoRoot, hostnameFn = osHostname }) {
 }
 
 /**
- * Parse `git status --porcelain` output into a flat list of paths. Rename
- * entries (`R  old -> new`) contribute BOTH paths — `git add -- <path>`
- * correctly stages a deletion when given an explicit path that no longer
- * exists on disk (git >= 2.0), so staging both sides of a rename is
- * sufficient without needing `-A` semantics.
+ * Parse `git status --porcelain -z` output into a flat list of paths.
+ * Rename entries contribute BOTH paths — `git add -- <path>` correctly
+ * stages a deletion when given an explicit path that no longer exists on
+ * disk (git >= 2.0), so staging both sides of a rename is sufficient
+ * without needing `-A` semantics.
  *
- * Shares the same C-style-quoting limitation as `listConflictedPaths` in
- * git.mjs (paths with unusual characters are not unquoted) — acceptable,
- * matches existing precedent in this module.
+ * Expects the `-z` (NUL-delimited) format produced by
+ * `git.mjs`'s statusPorcelain — NOT the default newline format. `-z`
+ * records are never C-quoted (git emits raw path bytes), which is the
+ * whole point: the default format wraps any path containing a space or
+ * non-ASCII byte in literal double-quotes with octal escapes, and those
+ * quoted strings then fail `git add -- <path>` with `fatal: pathspec …
+ * did not match any files`. Parsing `-z` eliminates that entire bug class
+ * (spaces, quotes, backslashes, unicode).
+ *
+ * `-z` record shape:
+ *   - normal entry:  `XY <path>` terminated by NUL
+ *   - rename/copy:   `XY <newPath>` NUL `<oldPath>` NUL — the source path
+ *     is a SEPARATE bare field (no XY prefix) that FOLLOWS the new path.
+ *     Note the order is reversed vs the newline format's `old -> new`.
+ * A trailing empty token follows the final NUL; the length guard skips it.
  *
  * @param {string} porcelainOutput
  * @returns {string[]}
  */
 export function parsePorcelainPaths(porcelainOutput) {
   const out = [];
-  for (const rawLine of porcelainOutput.split('\n')) {
-    if (rawLine.length < 4) continue;
-    const rest = rawLine.slice(3);
-    const arrowIdx = rest.indexOf(' -> ');
-    if (arrowIdx !== -1) {
-      out.push(rest.slice(0, arrowIdx));
-      out.push(rest.slice(arrowIdx + 4));
-    } else {
-      out.push(rest);
+  const records = porcelainOutput.split('\0');
+  for (let i = 0; i < records.length; i += 1) {
+    const rec = records[i];
+    if (rec.length < 4) continue;
+    const xy = rec.slice(0, 2);
+    out.push(rec.slice(3));
+    // Rename/copy: the next NUL field is the source path (bare, unquoted).
+    if (xy[0] === 'R' || xy[0] === 'C') {
+      const source = records[i + 1];
+      if (source !== undefined && source.length > 0) out.push(source);
+      i += 1;
     }
   }
   return out;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@stravica-ai/digital-operator-pa",
-  "version": "0.1.0",
+  "version": "0.1.1",
   "description": "Digital Operator PA — single-bundled public package surface (bins + library) for the platform.",
   "type": "module",
   "main": "./index.mjs",
@@ -35,7 +35,7 @@
   "license": "MIT",
   "repository": {
     "type": "git",
-    "url": "git+https://github.com/Stravica/engineering-pa-dev.git",
+    "url": "git+https://github.com/Stravica/digital-operator-pa.git",
     "directory": "packages/engineering-pa"
   },
   "publishConfig": {