@4pm/cli 1.5.40 → 1.5.42

package/dist/index.js

@@ -37844,10 +37844,19 @@ async function listDir(path, root) {
 
 // src/core/fs-read.ts
 import { readFile as readFile3 } from "fs/promises";
-import { resolve as resolve2 } from "path";
+import { resolve as resolve2, sep as sep3 } from "path";
 var MAX_BYTES = 256 * 1024;
-async function readWorkerFile(path) {
-  const target = resolve2(path);
+function resolveInRoot(root, relPath) {
+  if (!root) return null;
+  const base = resolve2(root);
+  const target = resolve2(base, relPath || ".");
+  return target === base || target.startsWith(base + sep3) ? target : null;
+}
+async function readWorkerFile(root, path) {
+  const target = resolveInRoot(root, path);
+  if (!target) {
+    return { path, content: "", truncated: false };
+  }
   try {
     const buf = await readFile3(target);
     const truncated = buf.byteLength > MAX_BYTES;
@@ -37860,16 +37869,16 @@ async function readWorkerFile(path) {
 
 // src/core/fs-write.ts
 import { mkdir as mkdir2, writeFile as writeFile2 } from "fs/promises";
-import { dirname as dirname3, resolve as resolve3, sep as sep3 } from "path";
+import { dirname as dirname3, resolve as resolve3, sep as sep4 } from "path";
 var MAX_BYTES2 = 2 * 1024 * 1024;
-function resolveInRoot(root, relPath) {
+function resolveInRoot2(root, relPath) {
   if (!root) return null;
   const base = resolve3(root);
   const target = resolve3(base, relPath || ".");
-  return target === base || target.startsWith(base + sep3) ? target : null;
+  return target === base || target.startsWith(base + sep4) ? target : null;
 }
 async function writeWorkerFile(root, relPath, content) {
-  const target = resolveInRoot(root, relPath);
+  const target = resolveInRoot2(root, relPath);
   if (!target) {
     return { ok: false, path: relPath, bytes: 0, error: "path escapes the project root" };
   }
@@ -37888,12 +37897,12 @@ async function writeWorkerFile(root, relPath, content) {
 
 // src/core/fs-mutate.ts
 import { mkdir as mkdir3, writeFile as writeFile3, rename, rm, stat } from "fs/promises";
-import { basename as basename3, dirname as dirname4, resolve as resolve4, sep as sep4 } from "path";
+import { basename as basename3, dirname as dirname4, resolve as resolve4, sep as sep5 } from "path";
 var MAX_BYTES3 = 2 * 1024 * 1024;
-function resolveInRoot2(root, rel) {
+function resolveInRoot3(root, rel) {
   const base = resolve4(root);
   const target = resolve4(base, rel || ".");
-  return target === base || target.startsWith(base + sep4) ? target : null;
+  return target === base || target.startsWith(base + sep5) ? target : null;
 }
 async function isDir(p) {
   try {
@@ -37916,13 +37925,13 @@ async function mutateFs(root, req) {
   try {
     switch (req.op) {
       case "mkdir": {
-        const target = resolveInRoot2(root, req.path ?? "");
+        const target = resolveInRoot3(root, req.path ?? "");
         if (!target || target === resolve4(root)) return escaped(req.path ?? "");
         await mkdir3(target, { recursive: true });
         return { ok: true, path: target };
       }
       case "create": {
-        const target = resolveInRoot2(root, req.path ?? "");
+        const target = resolveInRoot3(root, req.path ?? "");
         if (!target || target === resolve4(root)) return escaped(req.path ?? "");
         if (await exists(target)) return { ok: false, path: target, error: "already exists" };
         const content = req.content ?? "";
@@ -37934,19 +37943,19 @@ async function mutateFs(root, req) {
         return { ok: true, path: target };
       }
       case "move": {
-        const from = resolveInRoot2(root, req.from ?? "");
-        let to = resolveInRoot2(root, req.to ?? "");
+        const from = resolveInRoot3(root, req.from ?? "");
+        let to = resolveInRoot3(root, req.to ?? "");
         if (!from || !to) return escaped(req.from ?? req.to ?? "");
         if (from === resolve4(root)) return { ok: false, path: from, error: "cannot move the project root" };
         if (await isDir(to)) to = resolve4(to, basename3(from));
-        if (to !== resolve4(root) && !to.startsWith(resolve4(root) + sep4)) return escaped(req.to ?? "");
+        if (to !== resolve4(root) && !to.startsWith(resolve4(root) + sep5)) return escaped(req.to ?? "");
         if (await exists(to)) return { ok: false, path: to, error: "destination already exists" };
         await mkdir3(dirname4(to), { recursive: true });
         await rename(from, to);
         return { ok: true, path: to };
       }
       case "delete": {
-        const target = resolveInRoot2(root, req.path ?? "");
+        const target = resolveInRoot3(root, req.path ?? "");
         if (!target) return escaped(req.path ?? "");
         if (target === resolve4(root)) return { ok: false, path: target, error: "cannot delete the project root" };
         await rm(target, { recursive: true, force: true });
@@ -37962,12 +37971,12 @@ async function mutateFs(root, req) {
 
 // src/core/fs-transfer.ts
 import { mkdir as mkdir4, readFile as readFile4, stat as stat2, writeFile as writeFile4 } from "fs/promises";
-import { basename as basename4, dirname as dirname5, extname, resolve as resolve5, sep as sep5 } from "path";
-function resolveInRoot3(root, relPath) {
+import { basename as basename4, dirname as dirname5, extname, resolve as resolve5, sep as sep6 } from "path";
+function resolveInRoot4(root, relPath) {
   if (!root) return null;
   const base = resolve5(root);
   const target = resolve5(base, relPath || ".");
-  return target === base || target.startsWith(base + sep5) ? target : null;
+  return target === base || target.startsWith(base + sep6) ? target : null;
 }
 var MIME_BY_EXT = {
   ".png": "image/png",
@@ -37991,7 +38000,7 @@ function guessMime(path) {
   return MIME_BY_EXT[extname(path).toLowerCase()] ?? "application/octet-stream";
 }
 async function uploadBinaryFile(root, relPath, contentBase64) {
-  const target = resolveInRoot3(root, relPath);
+  const target = resolveInRoot4(root, relPath);
   if (!target) {
     return { ok: false, path: relPath, bytes: 0, error: "path escapes the project root" };
   }
@@ -38013,7 +38022,7 @@ async function uploadBinaryFile(root, relPath, contentBase64) {
   }
 }
 async function downloadBinaryFile(root, relPath) {
-  const target = resolveInRoot3(root, relPath);
+  const target = resolveInRoot4(root, relPath);
   if (!target) return { error: "path escapes the project root" };
   try {
     const info = await stat2(target);
@@ -38042,7 +38051,7 @@ function handleFsChannels(ctx, message, payload) {
       );
       return true;
     case WsChannels.FS_READ:
-      void readWorkerFile(payload.path).then(
+      void readWorkerFile(ctx.physicRoot, payload.path).then(
         (reply) => ctx.send(WsChannels.FS_READ, reply, message.id)
       );
       return true;
@@ -38082,11 +38091,20 @@ function handleFsChannels(ctx, message, payload) {
 // src/core/git-diff.ts
 import { readFile as readFile5 } from "fs/promises";
 import { execFile as execFile4 } from "child_process";
-import { basename as basename5, dirname as dirname6, resolve as resolve6 } from "path";
+import { basename as basename5, dirname as dirname6, resolve as resolve6, sep as sep7 } from "path";
 import { promisify as promisify4 } from "util";
 var run4 = promisify4(execFile4);
-async function gitDiff(path) {
-  const target = resolve6(path);
+function resolveInRoot5(root, relPath) {
+  if (!root) return null;
+  const base = resolve6(root);
+  const target = resolve6(base, relPath || ".");
+  return target === base || target.startsWith(base + sep7) ? target : null;
+}
+async function gitDiff(root, path) {
+  const target = resolveInRoot5(root, path);
+  if (!target) {
+    return { path, oldContent: "", newContent: "" };
+  }
   const dir2 = dirname6(target);
   const base = basename5(target);
   let newContent = "";
@@ -38209,7 +38227,7 @@ async function manageSshKey(op, profileDir2) {
 // src/core/git-history.ts
 import { readdir as readdir3 } from "fs/promises";
 import { execFile as execFile7 } from "child_process";
-import { resolve as resolve7, sep as sep6 } from "path";
+import { resolve as resolve7, sep as sep8 } from "path";
 import { promisify as promisify7 } from "util";
 var run7 = promisify7(execFile7);
 var FS = "";
@@ -38218,7 +38236,7 @@ function resolveRepo(root, repo) {
   if (!root) return null;
   const base = resolve7(root);
   const requested = resolve7(base, repo && repo.trim() ? repo : ".");
-  return requested === base || requested.startsWith(base + sep6) ? requested : base;
+  return requested === base || requested.startsWith(base + sep8) ? requested : base;
 }
 async function git(cwd2, args) {
   try {
@@ -38240,7 +38258,7 @@ async function gitRepos(root) {
   const add = async (dir2) => {
     const inside = await git(dir2, ["rev-parse", "--show-toplevel"]);
     const top = inside.trim();
-    if (!top || found.has(top) || !(top === base || top.startsWith(base + sep6))) return;
+    if (!top || found.has(top) || !(top === base || top.startsWith(base + sep8))) return;
     found.add(top);
     const subdir = top === base ? "" : top.slice(base.length + 1);
     const remote = (await git(top, ["remote", "get-url", "origin"])).trim();
@@ -38327,7 +38345,7 @@ async function gitCommitDiff(root, repo, hash, path) {
 function handleGitChannels(ctx, message, payload) {
   switch (message.channel) {
     case WsChannels.GIT_DIFF:
-      void gitDiff(payload.path).then(
+      void gitDiff(ctx.physicRoot, payload.path).then(
         (reply) => ctx.send(WsChannels.GIT_DIFF, reply, message.id)
       );
       return true;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@4pm/cli",
-  "version": "1.5.40",
+  "version": "1.5.42",
   "private": false,
   "description": "4PM CLI — drives Claude/Codex CLIs on AI worker machines (Node + TypeScript)",
   "license": "LicenseRef-4PM-Source-Available",