orkestrator 2.34.5-beta → 2.35.0-beta

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "orkestrator",
-  "version": "2.34.5-beta",
+  "version": "2.35.0-beta",
   "description": "Run the Orkestrator backend service without the desktop application",
   "homepage": "https://orkestrator.dev",
   "repository": {
@@ -39,8 +39,8 @@
     "sharp": "0.35.5"
   },
   "devDependencies": {
-    "@orkestrator/protocol": "2.34.5-beta",
-    "@orkestrator/toolchain": "2.34.5-beta"
+    "@orkestrator/protocol": "2.35.0-beta",
+    "@orkestrator/toolchain": "2.35.0-beta"
   },
   "engines": {
     "bun": ">=1.4.4"

package/resources/acp-bridge/dist/index.js

@@ -9564,6 +9564,14 @@ var PROJECT_TRUST = {
     afterSubcommand: ["--no-leader"]
   }
 };
+var SESSION_RULES_META_FIELD = {
+  grok: "rules"
+};
+function sessionInstructionsMeta(config, instructions) {
+  if (!instructions || !Object.hasOwn(SESSION_RULES_META_FIELD, config.id))
+    return {};
+  return { _meta: { [SESSION_RULES_META_FIELD[config.id]]: instructions } };
+}
 var POLICY_ENV = {
   grok: { GROK_WORKTREE_INHERITS_MAIN_APPROVALS: "false" }
 };
@@ -15666,6 +15674,71 @@ function isStringTuple(value) {
   return Array.isArray(value) && value.length === 2 && typeof value[0] === "string";
 }
 
+// ../protocol/src/agent-system-instructions.ts
+var AGENT_IMAGE_PREVIEW_INSTRUCTION = "Orkestrator renders Markdown images inline in the transcript. When you show the user an image in your reply (a screenshot, rendered preview, or chart) using Markdown image syntax, reference it by its absolute path. In a managed worktree or container environment, save the file inside the working directory, preferably in a git-ignored folder so preview files stay out of the change set. Local image previews are limited to Orkestrator-managed workspace storage or the container's /workspace. Project-home checkouts are excluded from host preview reads, even when they are the working directory, so images saved there cannot be previewed from a local Markdown path. Paths outside previewable storage, such as /tmp, also show a placeholder.";
+var AGENT_DOCUMENT_INSTRUCTION = "When the user asks for a document (a report, design doc, plan, analysis, guide, or other writing to keep), prefer writing it as a Markdown file in a `docs/` folder at the root of the working directory, and tell the user the file's path. Project instructions (such as AGENTS.md or CLAUDE.md), local skills, and the user's own request take priority over this default when they say where or how to write documents.";
+var GENERAL_AGENT_INSTRUCTIONS = [
+  AGENT_IMAGE_PREVIEW_INSTRUCTION,
+  AGENT_DOCUMENT_INSTRUCTION
+];
+function agentSystemInstructions(providerSpecific = []) {
+  return [...GENERAL_AGENT_INSTRUCTIONS, ...providerSpecific].filter((line) => line.trim().length > 0).join(`
+
+`);
+}
+var REPOSITORY_INSTRUCTIONS_FILE = "AGENTS.md";
+function repositoryInstructionsBlock(path, content, truncated) {
+  return [
+    `# Repository instructions (${REPOSITORY_INSTRUCTIONS_FILE})`,
+    `This session does not load the repository's ${REPOSITORY_INSTRUCTIONS_FILE} on its own, so Orkestrator includes it here. Follow it as project instructions. Contents of ${path}:`,
+    content.trimEnd(),
+    ...truncated ? [
+      `[${REPOSITORY_INSTRUCTIONS_FILE} is longer than this session can hold, so it is cut here. Read the rest from ${path} before relying on anything it may say.]`
+    ] : []
+  ].join(`
+
+`);
+}
+
+// ../protocol/src/node/repository-instructions.ts
+import { open as open3, realpath as realpath2 } from "node:fs/promises";
+import { join as join5, relative as relative2, isAbsolute as isAbsolute2 } from "node:path";
+var MAX_REPOSITORY_INSTRUCTIONS_BYTES = 256 * 1024;
+async function readRepositoryInstructions(cwd, maxBytes = MAX_REPOSITORY_INSTRUCTIONS_BYTES) {
+  const path = join5(cwd, REPOSITORY_INSTRUCTIONS_FILE);
+  try {
+    const [root, target] = await Promise.all([realpath2(cwd), realpath2(path)]);
+    const inside = relative2(root, target);
+    if (!inside || inside.startsWith("..") || isAbsolute2(inside))
+      return;
+    const handle = await open3(target, "r");
+    try {
+      const buffer = Buffer.alloc(maxBytes + 1);
+      const { bytesRead } = await handle.read(buffer, 0, maxBytes + 1, 0);
+      const truncated = bytesRead > maxBytes;
+      const text = new TextDecoder().decode(buffer.subarray(0, Math.min(bytesRead, maxBytes))).replace(/�$/, "");
+      return text.trim() ? repositoryInstructionsBlock(path, text, truncated) : undefined;
+    } finally {
+      await handle.close();
+    }
+  } catch {
+    return;
+  }
+}
+
+// ../../bridges/acp-bridge/src/acp-session-instructions.ts
+async function sessionInstructions(policy, cwd) {
+  if (policy?.id === "coordinator-read-only")
+    return;
+  const parts = [
+    agentSystemInstructions(),
+    policy?.projectResources === true ? undefined : await readRepositoryInstructions(cwd)
+  ].filter((part) => Boolean(part));
+  return parts.length > 0 ? parts.join(`
+
+`) : undefined;
+}
+
 // ../protocol/src/mcp-elicitation-form.ts
 function record2(value) {
   return value !== null && typeof value === "object" && !Array.isArray(value);
@@ -15862,7 +15935,7 @@ import { randomUUID } from "node:crypto";
 import { rmSync as rmSync2 } from "node:fs";
 import { copyFile, lstat as lstat2, mkdtemp, rm as rm2 } from "node:fs/promises";
 import { tmpdir as tmpdir3 } from "node:os";
-import { delimiter, isAbsolute as isAbsolute2, join as join5, resolve as resolve4 } from "node:path";
+import { delimiter, isAbsolute as isAbsolute3, join as join6, resolve as resolve4 } from "node:path";
 var DEFAULT_MAX_UNTRACKED_FILE_BYTES = 2 * 1024 * 1024;
 var DEFAULT_MAX_UNTRACKED_FILES = 5000;
 var DEFAULT_SLOW_SNAPSHOT_MS = 500;
@@ -16144,8 +16217,8 @@ class WorkspaceChangeProbe {
           return;
         return {
           root,
-          indexPath: isAbsolute2(index) ? index : resolve4(cwd, index),
-          objectsPath: isAbsolute2(objects) ? objects : resolve4(cwd, objects)
+          indexPath: isAbsolute3(index) ? index : resolve4(cwd, index),
+          objectsPath: isAbsolute3(objects) ? objects : resolve4(cwd, objects)
         };
       }).catch(() => {
         return;
@@ -16188,8 +16261,8 @@ class WorkspaceChangeProbe {
       return;
     const { root, indexPath } = repo.location;
     const started = this.now();
-    const tempIndex = join5(this.tempDir, `orkestrator-probe-${randomUUID()}.index`);
-    const objectDirectory = await mkdtemp(join5(this.tempDir, "orkestrator-probe-objects-"));
+    const tempIndex = join6(this.tempDir, `orkestrator-probe-${randomUUID()}.index`);
+    const objectDirectory = await mkdtemp(join6(this.tempDir, "orkestrator-probe-objects-"));
     temporaryObjectDirectories.add(objectDirectory);
     let retained = false;
     try {
@@ -16206,7 +16279,7 @@ class WorkspaceChangeProbe {
       const included = [];
       const skipped = new Map;
       for (const path of untracked) {
-        const stats = await lstat2(join5(root, path)).catch(() => {
+        const stats = await lstat2(join6(root, path)).catch(() => {
           return;
         });
         if (!stats)
@@ -16858,7 +16931,7 @@ function workspaceObservationReportIssues(value) {
 import { createHash as createHash6, randomUUID as randomUUID2 } from "node:crypto";
 import { readdirSync, readFileSync as readFileSync2 } from "node:fs";
 import { appendFile as appendFile2, mkdir as mkdir2, rename as rename2, rm as rm3, writeFile as writeFile2 } from "node:fs/promises";
-import { join as join6 } from "node:path";
+import { join as join7 } from "node:path";
 var DEFAULT_EVIDENCE_SPOOL_LIMITS = {
   maxEntries: 2048,
   maxEntryBytes: 256 * 1024,
@@ -17121,7 +17194,7 @@ class ChangeEvidenceSpool {
     const lines = this.pendingLines.splice(0).join("");
     this.enqueueIo(async () => {
       await mkdir2(directory, { recursive: true, mode: 448 });
-      await appendFile2(join6(directory, ENTRIES_FILE), lines, { mode: 384 });
+      await appendFile2(join7(directory, ENTRIES_FILE), lines, { mode: 384 });
     });
   }
   persistBody(id, bytes) {
@@ -17129,9 +17202,9 @@ class ChangeEvidenceSpool {
     if (!directory || this.restoring)
       return;
     this.enqueueIo(async () => {
-      const bodies = join6(directory, BODY_DIRECTORY);
+      const bodies = join7(directory, BODY_DIRECTORY);
       await mkdir2(bodies, { recursive: true, mode: 448 });
-      await writeFile2(join6(bodies, bodyFileName(id)), bytes, { mode: 384, flag: "wx" }).catch((error) => {
+      await writeFile2(join7(bodies, bodyFileName(id)), bytes, { mode: 384, flag: "wx" }).catch((error) => {
         if (error.code !== "EEXIST")
           throw error;
       });
@@ -17141,7 +17214,7 @@ class ChangeEvidenceSpool {
     const directory = this.directory;
     if (!directory)
       return;
-    this.enqueueIo(() => rm3(join6(directory, BODY_DIRECTORY, bodyFileName(id)), { force: true }));
+    this.enqueueIo(() => rm3(join7(directory, BODY_DIRECTORY, bodyFileName(id)), { force: true }));
   }
   compactPersisted() {
     const directory = this.directory;
@@ -17152,7 +17225,7 @@ class ChangeEvidenceSpool {
 `);
     this.enqueueIo(async () => {
       await mkdir2(directory, { recursive: true, mode: 448 });
-      const file = join6(directory, ENTRIES_FILE);
+      const file = join7(directory, ENTRIES_FILE);
       const temp = `${file}.${process.pid}.tmp`;
       await writeFile2(temp, body ? `${body}
 ` : "", { mode: 384 });
@@ -17164,10 +17237,10 @@ class ChangeEvidenceSpool {
     await this.io;
   }
   restore(directory) {
-    const bodyDirectory = join6(directory, BODY_DIRECTORY);
+    const bodyDirectory = join7(directory, BODY_DIRECTORY);
     try {
       for (const name of readdirSync(bodyDirectory)) {
-        const bytes = new Uint8Array(readFileSync2(join6(bodyDirectory, name)));
+        const bytes = new Uint8Array(readFileSync2(join7(bodyDirectory, name)));
         const id = evidenceBodyId(bytes);
         if (bodyFileName(id) !== name)
           continue;
@@ -17179,7 +17252,7 @@ class ChangeEvidenceSpool {
     } catch {}
     let text = "";
     try {
-      text = readFileSync2(join6(directory, ENTRIES_FILE), "utf8");
+      text = readFileSync2(join7(directory, ENTRIES_FILE), "utf8");
     } catch {
       return;
     }
@@ -18353,7 +18426,11 @@ async function createSessionReserved(clientSessionKey, signal, spawnOptions = {}
     const created = await child.request("session/new", {
       cwd: workingDirectory,
       additionalDirectories: [],
-      mcpServers: configuredAcpMcpServers(spawnOptions.agentMcp)
+      mcpServers: configuredAcpMcpServers(spawnOptions.agentMcp),
+      ...sessionInstructionsMeta(providerConfig, await sessionInstructions(effectiveTurnExecutionPolicy({
+        policy: spawnOptions.policy,
+        readOnly: spawnOptions.readOnly
+      }), workingDirectory))
     }, RPC_TIMEOUT_MS, signal);
     if (!isObject3(created) || typeof created.sessionId !== "string") {
       throw new Error(`${provider} returned an invalid ACP session`);
@@ -18477,7 +18554,8 @@ async function startDeferredSession(state) {
     const created = await child.request("session/new", {
       cwd: workingDirectory,
       additionalDirectories: [],
-      mcpServers: configuredAcpMcpServers(state.agentMcp)
+      mcpServers: configuredAcpMcpServers(state.agentMcp),
+      ...sessionInstructionsMeta(providerConfig, await sessionInstructions(effectiveTurnExecutionPolicy(state), workingDirectory))
     }, RPC_TIMEOUT_MS);
     if (!isObject3(created) || typeof created.sessionId !== "string") {
       throw new Error(`${provider} returned an invalid ACP session`);
@@ -20327,8 +20405,8 @@ var STRUCTURED_OUTPUT_FAILURE_CODES = new Set([
 
 // ../../bridges/acp-bridge/src/prompt-attachments.ts
 import { constants as constants2 } from "node:fs";
-import { lstat as lstat3, open as open3, realpath as realpath2 } from "node:fs/promises";
-import { isAbsolute as isAbsolute3, join as join7, relative as relative2, resolve as resolve8, sep as sep2 } from "node:path";
+import { lstat as lstat3, open as open4, realpath as realpath3 } from "node:fs/promises";
+import { isAbsolute as isAbsolute4, join as join8, relative as relative3, resolve as resolve8, sep as sep2 } from "node:path";
 
 class PromptAttachmentError extends Error {
   code;
@@ -20427,10 +20505,10 @@ function attachmentErrorForFsFailure(error) {
 var BRIDGE_ATTACHMENT_ROOT_ENV = "ORKESTRATOR_BRIDGE_ATTACHMENT_ROOT";
 function configuredAttachmentRoot(env = process.env) {
   const value = env[BRIDGE_ATTACHMENT_ROOT_ENV]?.trim();
-  return value && isAbsolute3(value) ? resolve8(value) : undefined;
+  return value && isAbsolute4(value) ? resolve8(value) : undefined;
 }
 function attachmentContainmentRoot(filePath, workspaceRoot, extraRoot = configuredAttachmentRoot()) {
-  if (extraRoot && isAbsolute3(filePath) && isPathWithin(extraRoot, resolve8(filePath))) {
+  if (extraRoot && isAbsolute4(filePath) && isPathWithin(extraRoot, resolve8(filePath))) {
     return extraRoot;
   }
   return resolve8(workspaceRoot);
@@ -20438,13 +20516,13 @@ function attachmentContainmentRoot(filePath, workspaceRoot, extraRoot = configur
 function isPathWithin(root, candidate) {
   if (candidate === root)
     return true;
-  const childPath = relative2(root, candidate);
-  return Boolean(childPath) && childPath !== ".." && !childPath.startsWith(`..${sep2}`) && !isAbsolute3(childPath);
+  const childPath = relative3(root, candidate);
+  return Boolean(childPath) && childPath !== ".." && !childPath.startsWith(`..${sep2}`) && !isAbsolute4(childPath);
 }
 async function assertNoSymlinkComponents(root, targetPath) {
   let currentPath = root;
-  for (const segment of relative2(root, targetPath).split(sep2).filter(Boolean)) {
-    currentPath = join7(currentPath, segment);
+  for (const segment of relative3(root, targetPath).split(sep2).filter(Boolean)) {
+    currentPath = join8(currentPath, segment);
     const stats = await lstat3(currentPath).catch((error) => {
       throw attachmentErrorForFsFailure(error);
     });
@@ -20456,7 +20534,7 @@ async function assertNoSymlinkComponents(root, targetPath) {
 async function assertOpenedWorkspaceFile(targetPath, canonicalRoot, openedStats) {
   const [pathStats, canonicalTarget] = await Promise.all([
     lstat3(targetPath),
-    realpath2(targetPath)
+    realpath3(targetPath)
   ]).catch((error) => {
     throw attachmentErrorForFsFailure(error);
   });
@@ -20477,22 +20555,22 @@ function assertStableRead(initial, final, bytesRead) {
 }
 async function readWorkspaceImage(filePath, workspaceRoot) {
   const lexicalRoot = attachmentContainmentRoot(filePath, workspaceRoot);
-  const targetPath = isAbsolute3(filePath) ? resolve8(filePath) : resolve8(lexicalRoot, filePath);
+  const targetPath = isAbsolute4(filePath) ? resolve8(filePath) : resolve8(lexicalRoot, filePath);
   if (!isPathWithin(lexicalRoot, targetPath)) {
     throw new PromptAttachmentError("attachment_outside_workspace", "Image attachment must be contained in the current workspace");
   }
-  const canonicalRoot = await realpath2(lexicalRoot).catch((error) => {
+  const canonicalRoot = await realpath3(lexicalRoot).catch((error) => {
     throw attachmentErrorForFsFailure(error);
   });
   await assertNoSymlinkComponents(lexicalRoot, targetPath);
-  const canonicalTarget = await realpath2(targetPath).catch((error) => {
+  const canonicalTarget = await realpath3(targetPath).catch((error) => {
     throw attachmentErrorForFsFailure(error);
   });
   if (!isPathWithin(canonicalRoot, canonicalTarget)) {
     throw new PromptAttachmentError("attachment_outside_workspace", "Image attachment must be contained in the current workspace");
   }
   const noFollow = constants2.O_NOFOLLOW ?? 0;
-  const handle = await open3(targetPath, constants2.O_RDONLY | noFollow).catch((error) => {
+  const handle = await open4(targetPath, constants2.O_RDONLY | noFollow).catch((error) => {
     throw attachmentErrorForFsFailure(error);
   });
   try {