@cruxy/cli 0.29.4 → 0.29.5

package/dist/tools/file/apply-patch.js

@@ -1,7 +1,7 @@
 import { promises as fs } from "node:fs";
 import path from "node:path";
 import { z } from "zod";
-import { resolveToolPath } from "./paths.js";
+import { resolveToolPath, toPosix } from "./paths.js";
 import { applyEol, detectEol, findMatch, tierLabel } from "./match.js";
 /** How many leading lines of a created file the approval preview shows. */
 const PREVIEW_LINES = 20;
@@ -116,7 +116,9 @@ export const applyPatchTool = {
 };
 /** Validate one operation against the filesystem and compute its final bytes. */
 async function planOp(i, op, abs, ctx) {
-    const rel = path.relative(ctx.cwd, abs);
+    // Forward-slash for model-facing output (the `applied` lines and error
+    // messages), consistent with every other path tool — see {@link toPosix}.
+    const rel = toPosix(path.relative(ctx.cwd, abs));
     if (op.type === "create") {
         if (await exists(abs)) {
             return { ok: false, error: opError(i, op, "file already exists") };

package/dist/tools/file/paths.d.ts

@@ -69,6 +69,16 @@ export declare function resolveInRoot(ctx: ToolContext, p: string): Promise<stri
  * shared by `glob` and `grep_files` so the two walk-rooted tools cannot diverge
  * (closing G1/G2). Path *arguments* go through {@link resolveToolPath}; glob
  * *patterns* are not resolvable paths, so this predicate guards the walk instead.
+ *
+ * NB — a known internal inconsistency, documented rather than fixed: this split on
+ * `/[/\\]/` (and the sibling `firstSegmentIsRoot` in grep_files) treats `\` as a
+ * separator on EVERY platform, but the resolution kernel {@link confineToRoot} →
+ * `path.resolve` does NOT on POSIX (there `\` is a legal filename character). The
+ * two only diverge for a `..\`-style argument on POSIX, which is unreachable from
+ * anything the tools EMIT (grep/apply_patch produce `\` only on Windows, where
+ * `path.resolve` does treat it as a separator). It is left as-is deliberately:
+ * "fixing" confineToRoot to fold `\`→`/` on POSIX would break access to files
+ * whose names legitimately contain a backslash.
  */
 export declare function isEscapingPattern(pattern: string): boolean;
 /**
@@ -76,6 +86,25 @@ export declare function isEscapingPattern(pattern: string): boolean;
  * constant so every no-path tool that fans across roots renders the same label.
  */
 export declare const ROOT_LABEL_SEP = " \u25B8 ";
+/**
+ * Rewrite the OS path separator to forward slashes for MODEL-FACING output — the
+ * one display convention every path tool shares. The rest of the toolset already
+ * emits POSIX paths on Windows (the indexer normalises the same way in
+ * `indexing/walker.ts`, and git's porcelain and tinyglobby both hand back `/`);
+ * this seam is what keeps the two `path.relative`-based stragglers, `grep_files`
+ * and `apply_patch`, from drifting to native `src\b.ts`.
+ *
+ * It splits on `path.sep`, NOT a literal `\`, so it only ever rewrites the real OS
+ * separator: on POSIX (`path.sep === "/"`) it is a no-op that PRESERVES a literal
+ * backslash in a filename — legal on POSIX — rather than mangling it; on Windows
+ * (`path.sep === "\\"`) it turns `path.relative`'s `src\b.ts` into `src/b.ts`.
+ *
+ * Purely cosmetic at the boundary — the model never needs native separators back:
+ * a path it echoes into read_file/edit_file resolves through {@link confineToRoot}
+ * → `path.resolve`, which accepts `/` on Windows, so the forward-slash form
+ * round-trips as-is.
+ */
+export declare function toPosix(p: string): string;
 /**
  * Prefix a root-relative path with its root name — but ONLY in a genuine
  * multi-root session. In single-root the label is dropped so output stays

package/dist/tools/file/paths.js

@@ -92,6 +92,16 @@ export async function resolveInRoot(ctx, p) {
  * shared by `glob` and `grep_files` so the two walk-rooted tools cannot diverge
  * (closing G1/G2). Path *arguments* go through {@link resolveToolPath}; glob
  * *patterns* are not resolvable paths, so this predicate guards the walk instead.
+ *
+ * NB — a known internal inconsistency, documented rather than fixed: this split on
+ * `/[/\\]/` (and the sibling `firstSegmentIsRoot` in grep_files) treats `\` as a
+ * separator on EVERY platform, but the resolution kernel {@link confineToRoot} →
+ * `path.resolve` does NOT on POSIX (there `\` is a legal filename character). The
+ * two only diverge for a `..\`-style argument on POSIX, which is unreachable from
+ * anything the tools EMIT (grep/apply_patch produce `\` only on Windows, where
+ * `path.resolve` does treat it as a separator). It is left as-is deliberately:
+ * "fixing" confineToRoot to fold `\`→`/` on POSIX would break access to files
+ * whose names legitimately contain a backslash.
  */
 export function isEscapingPattern(pattern) {
     return path.isAbsolute(pattern) || pattern.split(/[/\\]/).includes("..");
@@ -101,6 +111,27 @@ export function isEscapingPattern(pattern) {
  * constant so every no-path tool that fans across roots renders the same label.
  */
 export const ROOT_LABEL_SEP = " ▸ ";
+/**
+ * Rewrite the OS path separator to forward slashes for MODEL-FACING output — the
+ * one display convention every path tool shares. The rest of the toolset already
+ * emits POSIX paths on Windows (the indexer normalises the same way in
+ * `indexing/walker.ts`, and git's porcelain and tinyglobby both hand back `/`);
+ * this seam is what keeps the two `path.relative`-based stragglers, `grep_files`
+ * and `apply_patch`, from drifting to native `src\b.ts`.
+ *
+ * It splits on `path.sep`, NOT a literal `\`, so it only ever rewrites the real OS
+ * separator: on POSIX (`path.sep === "/"`) it is a no-op that PRESERVES a literal
+ * backslash in a filename — legal on POSIX — rather than mangling it; on Windows
+ * (`path.sep === "\\"`) it turns `path.relative`'s `src\b.ts` into `src/b.ts`.
+ *
+ * Purely cosmetic at the boundary — the model never needs native separators back:
+ * a path it echoes into read_file/edit_file resolves through {@link confineToRoot}
+ * → `path.resolve`, which accepts `/` on Windows, so the forward-slash form
+ * round-trips as-is.
+ */
+export function toPosix(p) {
+    return p.split(path.sep).join("/");
+}
 /**
  * Prefix a root-relative path with its root name — but ONLY in a genuine
  * multi-root session. In single-root the label is dropped so output stays
@@ -109,11 +140,13 @@ export const ROOT_LABEL_SEP = " ▸ ";
  * point at a different root than the one that was walked (the honesty pin).
  */
 export function labelPath(root, rel, isMultiRoot) {
-    return isMultiRoot ? labelName(root.name, rel) : rel;
+    // `rel` is normalised to forward slashes exactly once on each branch: via
+    // {@link labelName} when labelled, or directly when the label is dropped.
+    return isMultiRoot ? labelName(root.name, rel) : toPosix(rel);
 }
 /** As {@link labelPath} but from a bare root name (for hits that carry only a name). */
 export function labelName(rootName, rel) {
-    return `${rootName}${ROOT_LABEL_SEP}${rel}`;
+    return `${rootName}${ROOT_LABEL_SEP}${toPosix(rel)}`;
 }
 /**
  * The Funnel-B selector for **no-path** tools (`glob`, `grep_files`, `list_files`,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cruxy/cli",
-  "version": "0.29.4",
+  "version": "0.29.5",
   "description": "an agentic coding CLI",
   "type": "module",
   "bin": {