@ricsam/r5d-worker 0.0.40 → 0.0.42

package/dist/cjs/main.cjs

@@ -29,6 +29,7 @@ var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__ge
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
 var main_exports = {};
 __export(main_exports, {
+  editWorkerTextFile: () => editWorkerTextFile,
   ensureVisibleGitCheckout: () => ensureVisibleGitCheckout,
   findWorkerFiles: () => findWorkerFiles,
   githubCliEnv: () => githubCliEnv,
@@ -40,10 +41,9 @@ __export(main_exports, {
   readWorkerImageFile: () => readWorkerImageFile,
   readWorkerTextFile: () => readWorkerTextFile,
   resolveHostShell: () => resolveHostShell,
-  resolveProjectFilePath: () => resolveProjectFilePath,
   resolveWorkerFilePath: () => resolveWorkerFilePath,
-  syncProjectPlans: () => syncProjectPlans,
-  syncSessionArtifacts: () => syncSessionArtifacts
+  syncSessionArtifacts: () => syncSessionArtifacts,
+  writeWorkerTextFile: () => writeWorkerTextFile
 });
 module.exports = __toCommonJS(main_exports);
 var import_node_fs = __toESM(require("node:fs"), 1);
@@ -335,15 +335,6 @@ function artifactManifestUrl(baseUrl, projectId, branchName, sessionId) {
 function artifactDownloadUrl(baseUrl, projectId, branchName, sessionId, filename) {
   return new URL(`${artifactApiBasePath(projectId, branchName, sessionId)}/${encodeURIComponent(filename)}`, baseUrl);
 }
-function planApiBasePath(projectId, branchName) {
-  return `/preview-api/${encodeURIComponent(projectId)}/${encodeURIComponent(branchName)}/plans`;
-}
-function planManifestUrl(baseUrl, projectId, branchName) {
-  return new URL(planApiBasePath(projectId, branchName), baseUrl);
-}
-function planDownloadUrl(baseUrl, projectId, branchName, filename) {
-  return new URL(`${planApiBasePath(projectId, branchName)}/${encodeURIComponent(filename)}`, baseUrl);
-}
 function sha256Path(filePath) {
   return (0, import_node_crypto.createHash)("sha256").update(import_node_fs.default.readFileSync(filePath)).digest("hex");
 }
@@ -456,30 +447,6 @@ async function syncSessionArtifacts(input) {
     })
   });
 }
-async function fetchProjectPlanManifest(input) {
-  return fetchRemoteFileManifest({
-    url: planManifestUrl(input.baseUrl, input.projectId, input.branchName),
-    token: input.token,
-    collectionKey: "plans",
-    label: "plan"
-  });
-}
-async function syncProjectPlans(input) {
-  const targetDir = projectPlanDir(input.planRoot, input.projectId, input.branchName);
-  const plans = await fetchProjectPlanManifest(input);
-  return syncRemoteFileSet({
-    targetDir,
-    files: plans,
-    label: "Plan path",
-    download: (plan) => downloadRemoteSyncedFile({
-      url: planDownloadUrl(input.baseUrl, input.projectId, input.branchName, plan.filename),
-      token: input.token,
-      targetDir,
-      file: plan,
-      label: "plan"
-    })
-  });
-}
 async function resolveArtifactEnvFilePath(input) {
   if (!isArtifactEnvPath(input.filePath)) {
     return null;
@@ -539,15 +506,7 @@ async function prepareArtifactEnvForShell(input) {
     R5D_ARTIFACTS_DIR: artifactsDir
   };
 }
-async function preparePlanEnvForShell(input) {
-  try {
-    await syncProjectPlans(input);
-  } catch (error) {
-    process.stderr.write(
-      `[r5d-worker] plan sync skipped for ${input.projectId}/${input.branchName}: ${error instanceof Error ? error.message : String(error)}
-`
-    );
-  }
+function preparePlanEnvForShell(input) {
   const plansDir = projectPlanDir(input.planRoot, input.projectId, input.branchName);
   import_node_fs.default.mkdirSync(plansDir, { recursive: true });
   return planEnv(input.planRoot, input.projectId, input.branchName, input.activePlanId);
@@ -668,9 +627,6 @@ function toProjectDisplayPath(branchPath, absolutePath) {
   return relative || ".";
 }
 function assertAllowedProjectPath(repoRelativePath, inputPath) {
-  if (repoRelativePath === ".git" || repoRelativePath.startsWith(".git/")) {
-    throw new Error("Refusing to access .git through worker file tools");
-  }
   if (repoRelativePath.split("/").includes("..")) {
     throw new Error(`Invalid project file path: ${inputPath}`);
   }
@@ -718,13 +674,6 @@ function resolveWorkerFilePath(branchPath, inputPath) {
     scope: "project"
   };
 }
-function resolveProjectFilePath(branchPath, inputPath) {
-  const resolved = resolveWorkerFilePath(branchPath, inputPath);
-  if (resolved.scope === "host") {
-    throw new Error(`Project file writes must use a checkout-relative path. Absolute host paths are read-only in file tools: ${inputPath}`);
-  }
-  return resolved;
-}
 function fallbackInternalRemoteUrl(baseUrl, projectId) {
   return new URL(`/git/${projectId}.git`, baseUrl).toString();
 }
@@ -1141,8 +1090,11 @@ async function withFileMutationQueue(key, operation) {
     }
   }
 }
-function mutationQueueKey(projectId, branchName, filePath) {
-  return `${projectId}:${branchName}:${import_node_path.default.posix.normalize(filePath)}`;
+function mutationQueueKey(projectId, branchName, resolved) {
+  if (resolved.scope === "host") {
+    return `host:${import_node_path.default.normalize(resolved.absolutePath)}`;
+  }
+  return `project:${projectId}:${branchName}:${import_node_path.default.posix.normalize(resolved.repoRelativePath)}`;
 }
 function readWorkerTextFile(branchPath, filePath, offset, limit) {
   const resolved = resolveWorkerFilePath(branchPath, filePath);
@@ -1159,6 +1111,63 @@ function readWorkerTextFile(branchPath, filePath, offset, limit) {
     ...formatted
   };
 }
+function writeWorkerTextFile(branchPath, filePath, content) {
+  const resolved = resolveWorkerFilePath(branchPath, filePath);
+  import_node_fs.default.mkdirSync(import_node_path.default.dirname(resolved.absolutePath), { recursive: true });
+  import_node_fs.default.writeFileSync(resolved.absolutePath, content, "utf8");
+  return {
+    type: "write",
+    file: resolved.displayPath,
+    gitBlobHash: getGitBlobHashForContent(content)
+  };
+}
+function editWorkerTextFile(branchPath, filePath, edits) {
+  const resolved = resolveWorkerFilePath(branchPath, filePath);
+  if (!Array.isArray(edits) || edits.length === 0) {
+    throw new Error("edit requires at least one replacement");
+  }
+  if (!import_node_fs.default.existsSync(resolved.absolutePath) || !import_node_fs.default.statSync(resolved.absolutePath).isFile()) {
+    throw new Error(`File not found: ${resolved.displayPath}`);
+  }
+  const originalContent = import_node_fs.default.readFileSync(resolved.absolutePath, "utf8");
+  const ranges = edits.map((edit, index) => {
+    if (edit.oldText === edit.newText) {
+      throw new Error(`edits[${index}].oldText and edits[${index}].newText must be different`);
+    }
+    if (edit.oldText.length === 0) {
+      throw new Error(`edits[${index}].oldText cannot be empty`);
+    }
+    const occurrences = originalContent.split(edit.oldText).length - 1;
+    if (occurrences === 0) {
+      throw new Error(`Could not find edits[${index}].oldText: "${edit.oldText.slice(0, 100)}${edit.oldText.length > 100 ? "..." : ""}"`);
+    }
+    if (occurrences > 1) {
+      throw new Error(
+        `edits[${index}].oldText is not unique in the file (found ${occurrences} occurrences). Include more surrounding context.`
+      );
+    }
+    const start = originalContent.indexOf(edit.oldText);
+    return { index, start, end: start + edit.oldText.length, edit };
+  });
+  const sortedRanges = [...ranges].sort((a, b) => a.start - b.start);
+  for (let index = 1; index < sortedRanges.length; index += 1) {
+    const previous = sortedRanges[index - 1];
+    const current = sortedRanges[index];
+    if (current.start < previous.end) {
+      throw new Error(`edits[${current.index}] overlaps edits[${previous.index}]. Merge nearby changes into one replacement.`);
+    }
+  }
+  let nextContent = originalContent;
+  for (const range of [...sortedRanges].reverse()) {
+    nextContent = nextContent.slice(0, range.start) + range.edit.newText + nextContent.slice(range.end);
+  }
+  import_node_fs.default.writeFileSync(resolved.absolutePath, nextContent, "utf8");
+  return {
+    type: "edit",
+    file: resolved.displayPath,
+    edits: edits.length
+  };
+}
 async function executeReadFileOperation(input) {
   const artifact = await resolveArtifactEnvFilePath({
     filePath: input.message.filePath,
@@ -1189,66 +1198,17 @@ async function executeReadFileOperation(input) {
 async function executeWriteFileOperation(input) {
   rejectArtifactWritePath(input.message.filePath);
   const workspace = ensureOperationBranch({ ...input, branchName: input.message.branchName });
-  const resolved = resolveProjectFilePath(workspace.branchPath, input.message.filePath);
-  return withFileMutationQueue(mutationQueueKey(input.projectId, input.message.branchName, resolved.repoRelativePath), async () => {
-    import_node_fs.default.mkdirSync(import_node_path.default.dirname(resolved.absolutePath), { recursive: true });
-    import_node_fs.default.writeFileSync(resolved.absolutePath, input.message.content, "utf8");
-    return {
-      type: "write",
-      file: resolved.displayPath,
-      gitBlobHash: getGitBlobHashForContent(input.message.content)
-    };
+  const resolved = resolveWorkerFilePath(workspace.branchPath, input.message.filePath);
+  return withFileMutationQueue(mutationQueueKey(input.projectId, input.message.branchName, resolved), async () => {
+    return writeWorkerTextFile(workspace.branchPath, input.message.filePath, input.message.content);
   });
 }
 async function executeEditFileOperation(input) {
   rejectArtifactWritePath(input.message.filePath);
   const workspace = ensureOperationBranch({ ...input, branchName: input.message.branchName });
-  const resolved = resolveProjectFilePath(workspace.branchPath, input.message.filePath);
-  return withFileMutationQueue(mutationQueueKey(input.projectId, input.message.branchName, resolved.repoRelativePath), async () => {
-    if (!Array.isArray(input.message.edits) || input.message.edits.length === 0) {
-      throw new Error("edit requires at least one replacement");
-    }
-    if (!import_node_fs.default.existsSync(resolved.absolutePath) || !import_node_fs.default.statSync(resolved.absolutePath).isFile()) {
-      throw new Error(`File not found: ${resolved.displayPath}`);
-    }
-    const originalContent = import_node_fs.default.readFileSync(resolved.absolutePath, "utf8");
-    const ranges = input.message.edits.map((edit, index) => {
-      if (edit.oldText === edit.newText) {
-        throw new Error(`edits[${index}].oldText and edits[${index}].newText must be different`);
-      }
-      if (edit.oldText.length === 0) {
-        throw new Error(`edits[${index}].oldText cannot be empty`);
-      }
-      const occurrences = originalContent.split(edit.oldText).length - 1;
-      if (occurrences === 0) {
-        throw new Error(`Could not find edits[${index}].oldText: "${edit.oldText.slice(0, 100)}${edit.oldText.length > 100 ? "..." : ""}"`);
-      }
-      if (occurrences > 1) {
-        throw new Error(
-          `edits[${index}].oldText is not unique in the file (found ${occurrences} occurrences). Include more surrounding context.`
-        );
-      }
-      const start = originalContent.indexOf(edit.oldText);
-      return { index, start, end: start + edit.oldText.length, edit };
-    });
-    const sortedRanges = [...ranges].sort((a, b) => a.start - b.start);
-    for (let index = 1; index < sortedRanges.length; index += 1) {
-      const previous = sortedRanges[index - 1];
-      const current = sortedRanges[index];
-      if (current.start < previous.end) {
-        throw new Error(`edits[${current.index}] overlaps edits[${previous.index}]. Merge nearby changes into one replacement.`);
-      }
-    }
-    let nextContent = originalContent;
-    for (const range of [...sortedRanges].reverse()) {
-      nextContent = nextContent.slice(0, range.start) + range.edit.newText + nextContent.slice(range.end);
-    }
-    import_node_fs.default.writeFileSync(resolved.absolutePath, nextContent, "utf8");
-    return {
-      type: "edit",
-      file: resolved.displayPath,
-      edits: input.message.edits.length
-    };
+  const resolved = resolveWorkerFilePath(workspace.branchPath, input.message.filePath);
+  return withFileMutationQueue(mutationQueueKey(input.projectId, input.message.branchName, resolved), async () => {
+    return editWorkerTextFile(workspace.branchPath, input.message.filePath, input.message.edits);
   });
 }
 const IGNORED_ENTRY_NAMES = /* @__PURE__ */ new Set([".git", "node_modules", "dist", "build", ".next", ".cache", "coverage", "target"]);
@@ -1525,9 +1485,7 @@ async function executeCommand(input) {
       sessionId: input.message.sessionId,
       artifactRoot: input.artifactRoot
     });
-    const planProcessEnv = await preparePlanEnvForShell({
-      baseUrl: input.baseUrl,
-      token: input.token,
+    const planProcessEnv = preparePlanEnvForShell({
       projectId: input.projectId,
       branchName: input.message.branchName,
       planRoot: input.planRoot,
@@ -1636,9 +1594,7 @@ async function executeStreamingCommand(input) {
       sessionId: input.message.sessionId,
       artifactRoot: input.artifactRoot
     });
-    const planProcessEnv = await preparePlanEnvForShell({
-      baseUrl: input.baseUrl,
-      token: input.token,
+    const planProcessEnv = preparePlanEnvForShell({
       projectId: input.projectId,
       branchName: input.message.branchName,
       planRoot: input.planRoot,
@@ -1982,9 +1938,7 @@ async function openPty(input) {
       branchName: input.message.branchName,
       manifest: input.manifest
     });
-    const planProcessEnv = await preparePlanEnvForShell({
-      baseUrl: input.baseUrl,
-      token: input.token,
+    const planProcessEnv = preparePlanEnvForShell({
       projectId: input.projectId,
       branchName: input.message.branchName,
       planRoot: input.planRoot,
@@ -2180,19 +2134,6 @@ async function startWorker(options) {
   const runRequestedWorkspaceSync = async (requestId, trigger, overrides = {}) => {
     workspaceSyncRequestsInFlight += 1;
     try {
-      if (trigger.type === "plan_write" || trigger.type === "task_status" || trigger.type === "connect" || trigger.type === "inbound_head" || trigger.type === "manual") {
-        for (const manifest of manifestByProjectId.values()) {
-          for (const branchName of manifest.branches) {
-            await syncProjectPlans({
-              baseUrl,
-              token,
-              projectId: manifest.projectId,
-              branchName,
-              planRoot
-            });
-          }
-        }
-      }
       const newVisibleCheckouts = trigger.type === "connect" ? ensureAllVisibleWorkspaceCheckouts() : [];
       const result = await workspaceSyncSingleFlight.run(
         workspaceSyncInput(trigger, {
@@ -2673,6 +2614,7 @@ if (isCliEntrypoint()) {
 }
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
+  editWorkerTextFile,
   ensureVisibleGitCheckout,
   findWorkerFiles,
   githubCliEnv,
@@ -2684,8 +2626,7 @@ if (isCliEntrypoint()) {
   readWorkerImageFile,
   readWorkerTextFile,
   resolveHostShell,
-  resolveProjectFilePath,
   resolveWorkerFilePath,
-  syncProjectPlans,
-  syncSessionArtifacts
+  syncSessionArtifacts,
+  writeWorkerTextFile
 });

package/dist/cjs/package.json

@@ -1,5 +1,5 @@
 {
   "name": "@ricsam/r5d-worker",
-  "version": "0.0.40",
+  "version": "0.0.42",
   "type": "commonjs"
 }

package/dist/mjs/main.mjs

@@ -299,15 +299,6 @@ function artifactManifestUrl(baseUrl, projectId, branchName, sessionId) {
 function artifactDownloadUrl(baseUrl, projectId, branchName, sessionId, filename) {
   return new URL(`${artifactApiBasePath(projectId, branchName, sessionId)}/${encodeURIComponent(filename)}`, baseUrl);
 }
-function planApiBasePath(projectId, branchName) {
-  return `/preview-api/${encodeURIComponent(projectId)}/${encodeURIComponent(branchName)}/plans`;
-}
-function planManifestUrl(baseUrl, projectId, branchName) {
-  return new URL(planApiBasePath(projectId, branchName), baseUrl);
-}
-function planDownloadUrl(baseUrl, projectId, branchName, filename) {
-  return new URL(`${planApiBasePath(projectId, branchName)}/${encodeURIComponent(filename)}`, baseUrl);
-}
 function sha256Path(filePath) {
   return createHash("sha256").update(fs.readFileSync(filePath)).digest("hex");
 }
@@ -420,30 +411,6 @@ async function syncSessionArtifacts(input) {
     })
   });
 }
-async function fetchProjectPlanManifest(input) {
-  return fetchRemoteFileManifest({
-    url: planManifestUrl(input.baseUrl, input.projectId, input.branchName),
-    token: input.token,
-    collectionKey: "plans",
-    label: "plan"
-  });
-}
-async function syncProjectPlans(input) {
-  const targetDir = projectPlanDir(input.planRoot, input.projectId, input.branchName);
-  const plans = await fetchProjectPlanManifest(input);
-  return syncRemoteFileSet({
-    targetDir,
-    files: plans,
-    label: "Plan path",
-    download: (plan) => downloadRemoteSyncedFile({
-      url: planDownloadUrl(input.baseUrl, input.projectId, input.branchName, plan.filename),
-      token: input.token,
-      targetDir,
-      file: plan,
-      label: "plan"
-    })
-  });
-}
 async function resolveArtifactEnvFilePath(input) {
   if (!isArtifactEnvPath(input.filePath)) {
     return null;
@@ -503,15 +470,7 @@ async function prepareArtifactEnvForShell(input) {
     R5D_ARTIFACTS_DIR: artifactsDir
   };
 }
-async function preparePlanEnvForShell(input) {
-  try {
-    await syncProjectPlans(input);
-  } catch (error) {
-    process.stderr.write(
-      `[r5d-worker] plan sync skipped for ${input.projectId}/${input.branchName}: ${error instanceof Error ? error.message : String(error)}
-`
-    );
-  }
+function preparePlanEnvForShell(input) {
   const plansDir = projectPlanDir(input.planRoot, input.projectId, input.branchName);
   fs.mkdirSync(plansDir, { recursive: true });
   return planEnv(input.planRoot, input.projectId, input.branchName, input.activePlanId);
@@ -632,9 +591,6 @@ function toProjectDisplayPath(branchPath, absolutePath) {
   return relative || ".";
 }
 function assertAllowedProjectPath(repoRelativePath, inputPath) {
-  if (repoRelativePath === ".git" || repoRelativePath.startsWith(".git/")) {
-    throw new Error("Refusing to access .git through worker file tools");
-  }
   if (repoRelativePath.split("/").includes("..")) {
     throw new Error(`Invalid project file path: ${inputPath}`);
   }
@@ -682,13 +638,6 @@ function resolveWorkerFilePath(branchPath, inputPath) {
     scope: "project"
   };
 }
-function resolveProjectFilePath(branchPath, inputPath) {
-  const resolved = resolveWorkerFilePath(branchPath, inputPath);
-  if (resolved.scope === "host") {
-    throw new Error(`Project file writes must use a checkout-relative path. Absolute host paths are read-only in file tools: ${inputPath}`);
-  }
-  return resolved;
-}
 function fallbackInternalRemoteUrl(baseUrl, projectId) {
   return new URL(`/git/${projectId}.git`, baseUrl).toString();
 }
@@ -1105,8 +1054,11 @@ async function withFileMutationQueue(key, operation) {
     }
   }
 }
-function mutationQueueKey(projectId, branchName, filePath) {
-  return `${projectId}:${branchName}:${path.posix.normalize(filePath)}`;
+function mutationQueueKey(projectId, branchName, resolved) {
+  if (resolved.scope === "host") {
+    return `host:${path.normalize(resolved.absolutePath)}`;
+  }
+  return `project:${projectId}:${branchName}:${path.posix.normalize(resolved.repoRelativePath)}`;
 }
 function readWorkerTextFile(branchPath, filePath, offset, limit) {
   const resolved = resolveWorkerFilePath(branchPath, filePath);
@@ -1123,6 +1075,63 @@ function readWorkerTextFile(branchPath, filePath, offset, limit) {
     ...formatted
   };
 }
+function writeWorkerTextFile(branchPath, filePath, content) {
+  const resolved = resolveWorkerFilePath(branchPath, filePath);
+  fs.mkdirSync(path.dirname(resolved.absolutePath), { recursive: true });
+  fs.writeFileSync(resolved.absolutePath, content, "utf8");
+  return {
+    type: "write",
+    file: resolved.displayPath,
+    gitBlobHash: getGitBlobHashForContent(content)
+  };
+}
+function editWorkerTextFile(branchPath, filePath, edits) {
+  const resolved = resolveWorkerFilePath(branchPath, filePath);
+  if (!Array.isArray(edits) || edits.length === 0) {
+    throw new Error("edit requires at least one replacement");
+  }
+  if (!fs.existsSync(resolved.absolutePath) || !fs.statSync(resolved.absolutePath).isFile()) {
+    throw new Error(`File not found: ${resolved.displayPath}`);
+  }
+  const originalContent = fs.readFileSync(resolved.absolutePath, "utf8");
+  const ranges = edits.map((edit, index) => {
+    if (edit.oldText === edit.newText) {
+      throw new Error(`edits[${index}].oldText and edits[${index}].newText must be different`);
+    }
+    if (edit.oldText.length === 0) {
+      throw new Error(`edits[${index}].oldText cannot be empty`);
+    }
+    const occurrences = originalContent.split(edit.oldText).length - 1;
+    if (occurrences === 0) {
+      throw new Error(`Could not find edits[${index}].oldText: "${edit.oldText.slice(0, 100)}${edit.oldText.length > 100 ? "..." : ""}"`);
+    }
+    if (occurrences > 1) {
+      throw new Error(
+        `edits[${index}].oldText is not unique in the file (found ${occurrences} occurrences). Include more surrounding context.`
+      );
+    }
+    const start = originalContent.indexOf(edit.oldText);
+    return { index, start, end: start + edit.oldText.length, edit };
+  });
+  const sortedRanges = [...ranges].sort((a, b) => a.start - b.start);
+  for (let index = 1; index < sortedRanges.length; index += 1) {
+    const previous = sortedRanges[index - 1];
+    const current = sortedRanges[index];
+    if (current.start < previous.end) {
+      throw new Error(`edits[${current.index}] overlaps edits[${previous.index}]. Merge nearby changes into one replacement.`);
+    }
+  }
+  let nextContent = originalContent;
+  for (const range of [...sortedRanges].reverse()) {
+    nextContent = nextContent.slice(0, range.start) + range.edit.newText + nextContent.slice(range.end);
+  }
+  fs.writeFileSync(resolved.absolutePath, nextContent, "utf8");
+  return {
+    type: "edit",
+    file: resolved.displayPath,
+    edits: edits.length
+  };
+}
 async function executeReadFileOperation(input) {
   const artifact = await resolveArtifactEnvFilePath({
     filePath: input.message.filePath,
@@ -1153,66 +1162,17 @@ async function executeReadFileOperation(input) {
 async function executeWriteFileOperation(input) {
   rejectArtifactWritePath(input.message.filePath);
   const workspace = ensureOperationBranch({ ...input, branchName: input.message.branchName });
-  const resolved = resolveProjectFilePath(workspace.branchPath, input.message.filePath);
-  return withFileMutationQueue(mutationQueueKey(input.projectId, input.message.branchName, resolved.repoRelativePath), async () => {
-    fs.mkdirSync(path.dirname(resolved.absolutePath), { recursive: true });
-    fs.writeFileSync(resolved.absolutePath, input.message.content, "utf8");
-    return {
-      type: "write",
-      file: resolved.displayPath,
-      gitBlobHash: getGitBlobHashForContent(input.message.content)
-    };
+  const resolved = resolveWorkerFilePath(workspace.branchPath, input.message.filePath);
+  return withFileMutationQueue(mutationQueueKey(input.projectId, input.message.branchName, resolved), async () => {
+    return writeWorkerTextFile(workspace.branchPath, input.message.filePath, input.message.content);
   });
 }
 async function executeEditFileOperation(input) {
   rejectArtifactWritePath(input.message.filePath);
   const workspace = ensureOperationBranch({ ...input, branchName: input.message.branchName });
-  const resolved = resolveProjectFilePath(workspace.branchPath, input.message.filePath);
-  return withFileMutationQueue(mutationQueueKey(input.projectId, input.message.branchName, resolved.repoRelativePath), async () => {
-    if (!Array.isArray(input.message.edits) || input.message.edits.length === 0) {
-      throw new Error("edit requires at least one replacement");
-    }
-    if (!fs.existsSync(resolved.absolutePath) || !fs.statSync(resolved.absolutePath).isFile()) {
-      throw new Error(`File not found: ${resolved.displayPath}`);
-    }
-    const originalContent = fs.readFileSync(resolved.absolutePath, "utf8");
-    const ranges = input.message.edits.map((edit, index) => {
-      if (edit.oldText === edit.newText) {
-        throw new Error(`edits[${index}].oldText and edits[${index}].newText must be different`);
-      }
-      if (edit.oldText.length === 0) {
-        throw new Error(`edits[${index}].oldText cannot be empty`);
-      }
-      const occurrences = originalContent.split(edit.oldText).length - 1;
-      if (occurrences === 0) {
-        throw new Error(`Could not find edits[${index}].oldText: "${edit.oldText.slice(0, 100)}${edit.oldText.length > 100 ? "..." : ""}"`);
-      }
-      if (occurrences > 1) {
-        throw new Error(
-          `edits[${index}].oldText is not unique in the file (found ${occurrences} occurrences). Include more surrounding context.`
-        );
-      }
-      const start = originalContent.indexOf(edit.oldText);
-      return { index, start, end: start + edit.oldText.length, edit };
-    });
-    const sortedRanges = [...ranges].sort((a, b) => a.start - b.start);
-    for (let index = 1; index < sortedRanges.length; index += 1) {
-      const previous = sortedRanges[index - 1];
-      const current = sortedRanges[index];
-      if (current.start < previous.end) {
-        throw new Error(`edits[${current.index}] overlaps edits[${previous.index}]. Merge nearby changes into one replacement.`);
-      }
-    }
-    let nextContent = originalContent;
-    for (const range of [...sortedRanges].reverse()) {
-      nextContent = nextContent.slice(0, range.start) + range.edit.newText + nextContent.slice(range.end);
-    }
-    fs.writeFileSync(resolved.absolutePath, nextContent, "utf8");
-    return {
-      type: "edit",
-      file: resolved.displayPath,
-      edits: input.message.edits.length
-    };
+  const resolved = resolveWorkerFilePath(workspace.branchPath, input.message.filePath);
+  return withFileMutationQueue(mutationQueueKey(input.projectId, input.message.branchName, resolved), async () => {
+    return editWorkerTextFile(workspace.branchPath, input.message.filePath, input.message.edits);
   });
 }
 const IGNORED_ENTRY_NAMES = /* @__PURE__ */ new Set([".git", "node_modules", "dist", "build", ".next", ".cache", "coverage", "target"]);
@@ -1489,9 +1449,7 @@ async function executeCommand(input) {
       sessionId: input.message.sessionId,
       artifactRoot: input.artifactRoot
     });
-    const planProcessEnv = await preparePlanEnvForShell({
-      baseUrl: input.baseUrl,
-      token: input.token,
+    const planProcessEnv = preparePlanEnvForShell({
       projectId: input.projectId,
       branchName: input.message.branchName,
       planRoot: input.planRoot,
@@ -1600,9 +1558,7 @@ async function executeStreamingCommand(input) {
       sessionId: input.message.sessionId,
       artifactRoot: input.artifactRoot
     });
-    const planProcessEnv = await preparePlanEnvForShell({
-      baseUrl: input.baseUrl,
-      token: input.token,
+    const planProcessEnv = preparePlanEnvForShell({
       projectId: input.projectId,
       branchName: input.message.branchName,
       planRoot: input.planRoot,
@@ -1946,9 +1902,7 @@ async function openPty(input) {
       branchName: input.message.branchName,
       manifest: input.manifest
     });
-    const planProcessEnv = await preparePlanEnvForShell({
-      baseUrl: input.baseUrl,
-      token: input.token,
+    const planProcessEnv = preparePlanEnvForShell({
       projectId: input.projectId,
       branchName: input.message.branchName,
       planRoot: input.planRoot,
@@ -2144,19 +2098,6 @@ async function startWorker(options) {
   const runRequestedWorkspaceSync = async (requestId, trigger, overrides = {}) => {
     workspaceSyncRequestsInFlight += 1;
     try {
-      if (trigger.type === "plan_write" || trigger.type === "task_status" || trigger.type === "connect" || trigger.type === "inbound_head" || trigger.type === "manual") {
-        for (const manifest of manifestByProjectId.values()) {
-          for (const branchName of manifest.branches) {
-            await syncProjectPlans({
-              baseUrl,
-              token,
-              projectId: manifest.projectId,
-              branchName,
-              planRoot
-            });
-          }
-        }
-      }
       const newVisibleCheckouts = trigger.type === "connect" ? ensureAllVisibleWorkspaceCheckouts() : [];
       const result = await workspaceSyncSingleFlight.run(
         workspaceSyncInput(trigger, {
@@ -2636,6 +2577,7 @@ if (isCliEntrypoint()) {
   });
 }
 export {
+  editWorkerTextFile,
   ensureVisibleGitCheckout,
   findWorkerFiles,
   githubCliEnv,
@@ -2647,8 +2589,7 @@ export {
   readWorkerImageFile,
   readWorkerTextFile,
   resolveHostShell,
-  resolveProjectFilePath,
   resolveWorkerFilePath,
-  syncProjectPlans,
-  syncSessionArtifacts
+  syncSessionArtifacts,
+  writeWorkerTextFile
 };

package/dist/mjs/package.json

@@ -1,5 +1,5 @@
 {
   "name": "@ricsam/r5d-worker",
-  "version": "0.0.40",
+  "version": "0.0.42",
   "type": "module"
 }

package/dist/types/main.d.ts

@@ -11,6 +11,16 @@ type WorkerReadFileResult = {
     truncated: boolean;
     continuation?: string;
 };
+type WorkerWriteFileResult = {
+    type: "write";
+    file: string;
+    gitBlobHash?: string;
+};
+type WorkerEditFileResult = {
+    type: "edit";
+    file: string;
+    edits: number;
+};
 type WorkerGrepResult = {
     type: "grep";
     content: string;
@@ -48,13 +58,6 @@ export declare function syncSessionArtifacts(input: {
     sessionId: string;
     artifactRoot: string;
 }): Promise<string>;
-export declare function syncProjectPlans(input: {
-    baseUrl: string;
-    token: string;
-    projectId: string;
-    branchName: string;
-    planRoot: string;
-}): Promise<string>;
 export declare function prepareArtifactEnvForShell(input: {
     baseUrl: string;
     token: string;
@@ -64,13 +67,11 @@ export declare function prepareArtifactEnvForShell(input: {
     artifactRoot: string;
 }): Promise<Record<string, string>>;
 export declare function preparePlanEnvForShell(input: {
-    baseUrl: string;
-    token: string;
     projectId: string;
     branchName: string;
     planRoot: string;
     activePlanId?: string;
-}): Promise<Record<string, string>>;
+}): Record<string, string>;
 type GitAuth = {
     extraHeaderUrl: string;
     header: string;
@@ -87,9 +88,6 @@ type ResolvedWorkerFilePath = {
     scope: "host";
 };
 export declare function resolveWorkerFilePath(branchPath: string, inputPath: string): ResolvedWorkerFilePath;
-export declare function resolveProjectFilePath(branchPath: string, inputPath: string): Extract<ResolvedWorkerFilePath, {
-    scope: "project";
-}>;
 export declare function githubCliEnv(token: string | null | undefined): Record<string, string>;
 export declare function ensureVisibleGitCheckout(input: {
     projectRoot: string;
@@ -101,6 +99,11 @@ export declare function ensureVisibleGitCheckout(input: {
     reconcileExistingOrigin?: boolean;
 }): string;
 export declare function readWorkerTextFile(branchPath: string, filePath: string, offset?: number, limit?: number): WorkerReadFileResult;
+export declare function writeWorkerTextFile(branchPath: string, filePath: string, content: string): WorkerWriteFileResult;
+export declare function editWorkerTextFile(branchPath: string, filePath: string, edits: Array<{
+    oldText: string;
+    newText: string;
+}>): WorkerEditFileResult;
 export declare function grepWorkerFiles(branchPath: string, input: {
     pattern: string;
     path?: string;

package/dist/types/workspace-sync.d.ts

@@ -12,7 +12,7 @@ export type WorkspaceProjectManifestEntry = {
     branches: string[];
 };
 export type WorkspaceSyncTrigger = {
-    type: "connect" | "inbound_head" | "write" | "edit" | "plan_write" | "task_status" | "shell_inline" | "process_terminal" | "process_cancel" | "periodic" | "manual" | "remediation" | "remediation_confirm" | "remediation_reset";
+    type: "connect" | "inbound_head" | "write" | "edit" | "shell_inline" | "process_terminal" | "process_cancel" | "periodic" | "manual" | "remediation" | "remediation_confirm" | "remediation_reset";
     sessionId?: string;
     processRunId?: string;
     toolCallId?: string;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ricsam/r5d-worker",
-  "version": "0.0.40",
+  "version": "0.0.42",
   "type": "module",
   "main": "./dist/cjs/main.cjs",
   "module": "./dist/mjs/main.mjs",