orkestrator 2.34.5-beta → 2.35.0-beta

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

@@ -63,6 +63,7 @@ var PROMPT_TIMEOUT_MS = parseBoundedInteger(process.env.CURSOR_BRIDGE_PROMPT_TIM
 var CANCEL_ACK_TIMEOUT_MS = parseBoundedInteger(process.env.CURSOR_BRIDGE_CANCEL_ACK_TIMEOUT_MS, 30 * 1000, 1000, 5 * 60 * 1000);
 var CLOSE_ACK_TIMEOUT_MS = 4000;
 var CATALOG_TIMEOUT_MS = 30000;
+var ACCOUNT_LOOKUP_TIMEOUT_MS = 3000;
 var LOGIN_TIMEOUT_MS = 10 * 60 * 1000;
 function authenticate(headers) {
   const bearer = firstHeader(headers.authorization);
@@ -132,6 +133,8 @@ import { Cursor, FileCredentialStore } from "@cursor/sdk";
 var CURSOR_AUTHENTICATION_REQUIRED_MESSAGE = "Cursor is not signed in. Sign in from Settings › Cursor, or set a Cursor API key.";
 var AUTH_CACHE_TTL_MS = 15000;
 var authCache;
+var accountLookup;
+var accountLookupTimeoutMs = ACCOUNT_LOOKUP_TIMEOUT_MS;
 
 class LazyFileCredentialStore {
   store;
@@ -152,16 +155,25 @@ var credentialStore = new LazyFileCredentialStore;
 var cursorAuth = Cursor.auth;
 var cursorMe = Cursor.me;
 function useCursorCredentialRuntimeForTests(runtime) {
-  const previous = { store: credentialStore, auth: cursorAuth, me: cursorMe };
+  const previous = {
+    store: credentialStore,
+    auth: cursorAuth,
+    me: cursorMe,
+    meTimeoutMs: accountLookupTimeoutMs
+  };
   credentialStore = runtime.store;
   cursorAuth = runtime.auth;
   cursorMe = runtime.me;
+  accountLookupTimeoutMs = runtime.meTimeoutMs ?? ACCOUNT_LOOKUP_TIMEOUT_MS;
   authCache = undefined;
+  accountLookup = undefined;
   return () => {
     credentialStore = previous.store;
     cursorAuth = previous.auth;
     cursorMe = previous.me;
+    accountLookupTimeoutMs = previous.meTimeoutMs;
     authCache = undefined;
+    accountLookup = undefined;
   };
 }
 async function resolveCredential() {
@@ -198,10 +210,8 @@ async function authStatus() {
   if (credential && authCache?.credential === credential && authCache.expiresAt > Date.now()) {
     return authCache.value;
   }
-  const meFn = cursorMe;
-  const me = credential && meFn ? await meFn({ apiKey: credential }).catch(() => {
-    return;
-  }) : undefined;
+  const lookup = credential ? await lookUpAccount(credential) : { settled: true, account: undefined };
+  const me = lookup.account;
   const label = [me?.userFirstName, me?.userLastName].filter(Boolean).join(" ") || me?.apiKeyName || ("email" in sdkStatus ? sdkStatus.email : undefined) || stored?.email || "Cursor account";
   const value = {
     state: "signed-in",
@@ -212,11 +222,52 @@ async function authStatus() {
     signIn: fromEnvironment ? { kind: "none", hint: "Remove CURSOR_API_KEY to sign out." } : { kind: "browser-url" },
     signOut: !fromEnvironment
   };
-  if (credential) {
+  if (credential && lookup.settled) {
     authCache = { credential, expiresAt: Date.now() + AUTH_CACHE_TTL_MS, value };
   }
   return value;
 }
+async function lookUpAccount(credential) {
+  const meFn = cursorMe;
+  if (!meFn)
+    return { settled: true, account: undefined };
+  let entry = accountLookup;
+  if (!entry || entry.credential !== credential || entry.expiresAt <= Date.now()) {
+    const started = {
+      credential,
+      expiresAt: Date.now() + AUTH_CACHE_TTL_MS,
+      timedOut: false,
+      result: meFn({ apiKey: credential }).catch(() => {
+        return;
+      })
+    };
+    started.result.finally(() => {
+      if (accountLookup === started)
+        accountLookup = undefined;
+    });
+    entry = accountLookup = started;
+  }
+  if (entry.timedOut)
+    return { settled: false, account: undefined };
+  const active = entry;
+  const { result } = entry;
+  let timer;
+  try {
+    return await Promise.race([
+      result.then((account) => ({ settled: true, account })),
+      new Promise((resolve) => {
+        timer = setTimeout(() => {
+          active.timedOut = true;
+          resolve({ settled: false, account: undefined });
+        }, accountLookupTimeoutMs);
+        timer.unref();
+      })
+    ]);
+  } finally {
+    if (timer)
+      clearTimeout(timer);
+  }
+}
 function beginLogin(options = {}) {
   const controller = new AbortController;
   let publishUrl = () => {
@@ -252,6 +303,7 @@ function beginLogin(options = {}) {
 }
 async function logout() {
   authCache = undefined;
+  accountLookup = undefined;
   await cursorAuth.logout({ store: credentialStore });
 }
 function isExpired(expiresAtMs) {
@@ -23886,6 +23938,63 @@ var PROTECTED_SEGMENTS = new Set([
 ]);
 
 // ../protocol/src/review-evidence-frames.ts
+var SYSTEM_INSTRUCTIONS_FRAME_OPEN = "<orkestrator-system-instructions>";
+var SYSTEM_INSTRUCTIONS_FRAME_CLOSE = "</orkestrator-system-instructions>";
+function neutralizeSystemInstructionMarkers(content) {
+  if (!content.includes(SYSTEM_INSTRUCTIONS_FRAME_OPEN) && !content.includes(SYSTEM_INSTRUCTIONS_FRAME_CLOSE)) {
+    return content;
+  }
+  return content.replaceAll(SYSTEM_INSTRUCTIONS_FRAME_CLOSE, "\\u003c/orkestrator-system-instructions\\u003e").replaceAll(SYSTEM_INSTRUCTIONS_FRAME_OPEN, "\\u003corkestrator-system-instructions\\u003e");
+}
+function wrapSystemInstructions(...parts) {
+  const content = neutralizeSystemInstructionMarkers(parts.filter((part) => part.trim().length > 0).join(`
+
+`));
+  return `${SYSTEM_INSTRUCTIONS_FRAME_OPEN}
+${content}
+${SYSTEM_INSTRUCTIONS_FRAME_CLOSE}`;
+}
+function stripSystemInstructions(source) {
+  if (!source.includes(SYSTEM_INSTRUCTIONS_FRAME_OPEN))
+    return source;
+  const openLength = SYSTEM_INSTRUCTIONS_FRAME_OPEN.length;
+  const closeLength = SYSTEM_INSTRUCTIONS_FRAME_CLOSE.length;
+  const removed = [];
+  const openStack = [];
+  let index = 0;
+  while (index < source.length) {
+    if (source.startsWith(SYSTEM_INSTRUCTIONS_FRAME_OPEN, index)) {
+      openStack.push(index);
+      index += openLength;
+      continue;
+    }
+    if (source.startsWith(SYSTEM_INSTRUCTIONS_FRAME_CLOSE, index)) {
+      const open = openStack.pop();
+      if (open !== undefined)
+        removed.push([open, index + closeLength]);
+      index += closeLength;
+      continue;
+    }
+    index += 1;
+  }
+  if (removed.length === 0)
+    return source;
+  removed.sort((left, right) => left[0] - right[0]);
+  let result = "";
+  let cursor = 0;
+  for (const [start, end] of removed) {
+    if (start < cursor) {
+      cursor = Math.max(cursor, end);
+      continue;
+    }
+    result += source.slice(cursor, start);
+    cursor = end;
+  }
+  result += source.slice(cursor);
+  return result.replace(/\n{3,}/g, `
+
+`).trim();
+}
 var COORDINATOR_WORKER_NO_PR_INSTRUCTION = "Do not open a pull request, even if the prompt below asks you to: commit your work and report back. Orkestrator raises the pull request from a PR tab once the work has been reviewed.";
 var COORDINATOR_JOB_DELEGATION_INSTRUCTION = `This is a server-attested same-project worker delegation. Work only inside this disposable environment under its normal sandbox and approval policy, then report meaningful completion, failure, or blocking details through Orkestrator mail. ${COORDINATOR_WORKER_NO_PR_INSTRUCTION}`;
 var COORDINATOR_ENVIRONMENT_DELEGATION_INSTRUCTION = `This is a server-attested same-project worker delegation. Perform it inside this disposable worker under its normal sandbox and approval policy, then report meaningful completion, failure, or blocking details through Orkestrator mail. ${COORDINATOR_WORKER_NO_PR_INSTRUCTION}`;
@@ -31538,6 +31647,10 @@ var configHomeForTests;
 function setCursorMcpConfigHomeForTests(home) {
   configHomeForTests = home;
 }
+var skillsProjectForTests;
+function setCursorSkillsProjectForTests(directory) {
+  skillsProjectForTests = directory;
+}
 var attachedConfigKeys = new WeakMap;
 var attachedConfigRevisions = new WeakMap;
 var fingerprintForTests;
@@ -31629,7 +31742,7 @@ async function attach(state) {
     await closeHosted?.();
     throw new SessionClosedError;
   }
-  const skills = readOnly ? hostSkillCustomTools(process.env, workingDirectory) : undefined;
+  const skills = readOnly ? hostSkillCustomTools(process.env, skillsProjectForTests ?? workingDirectory) : undefined;
   const customTools = hosted || research || skills ? { ...skills?.customTools, ...research?.customTools, ...hosted?.customTools } : undefined;
   const httpMcpServerNames = hosted ? [] : allowHttpMcp ? Object.keys(mcpServers) : [];
   state.hostedMcpClose = closeHosted;
@@ -31641,16 +31754,18 @@ async function attach(state) {
     ...skills ? [COORDINATOR_SKILLS_SERVER] : []
   ];
   state.attachedMcpKey = mcpConnectionKey(state.agentMcp);
+  const settingSources = cursorSettingSources(policy, {
+    readOnly,
+    selectsServers: selectServers !== undefined
+  });
+  state.loadsProjectRules = settingSources.includes("project");
   const options = {
     apiKey,
     model: modelSelection(state.composer),
     mode: state.composer.selectedModeId === "plan" ? "plan" : "agent",
     local: {
       cwd: workingDirectory,
-      settingSources: cursorSettingSources(policy, {
-        readOnly,
-        selectsServers: selectServers !== undefined
-      }),
+      settingSources,
       sandboxOptions: { enabled: policy.sandbox === "provider" },
       autoReview: policy.sandbox === "provider" && policy.approvals === "auto-approve",
       ...customTools ? { customTools } : {}
@@ -32202,11 +32317,8 @@ function pushHistoricRow(state, row, planned) {
 }
 function historicUserTexts(body) {
   const extract = (value) => {
-    if (typeof value === "string")
-      return value;
-    if (isObject(value) && nonBlank(value.text))
-      return value.text;
-    return;
+    const raw = typeof value === "string" ? value : isObject(value) && nonBlank(value.text) ? value.text : undefined;
+    return raw === undefined ? undefined : stripSystemInstructions(raw);
   };
   const texts = [];
   const remaining = new Map;
@@ -32296,6 +32408,58 @@ function pushMessage(state, role, content, parts, messageId = randomBytes5(12).t
   state.messages.push(message);
   chargeTranscript(state, Buffer.byteLength(JSON.stringify(message)));
 }
+// ../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 } from "node:fs/promises";
+import { join as join7, relative as relative3, isAbsolute as isAbsolute3 } from "node:path";
+var MAX_REPOSITORY_INSTRUCTIONS_BYTES = 256 * 1024;
+async function readRepositoryInstructions(cwd, maxBytes = MAX_REPOSITORY_INSTRUCTIONS_BYTES) {
+  const path = join7(cwd, REPOSITORY_INSTRUCTIONS_FILE);
+  try {
+    const [root, target] = await Promise.all([realpath(cwd), realpath(path)]);
+    const inside = relative3(root, target);
+    if (!inside || inside.startsWith("..") || isAbsolute3(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;
+  }
+}
+
 // ../protocol/src/structured-output-text.ts
 var STRUCTURED_OUTPUT_RECOVERY_CHARS = 1024 * 1024;
 var STRUCTURED_OUTPUT_RECOVERY_CANDIDATES = 256;
@@ -32508,7 +32672,7 @@ import { randomUUID as randomUUID2 } from "node:crypto";
 import { rmSync } from "node:fs";
 import { copyFile, lstat, mkdtemp, rm as rm2 } from "node:fs/promises";
 import { tmpdir } from "node:os";
-import { delimiter, isAbsolute as isAbsolute3, join as join7, resolve as resolve4 } from "node:path";
+import { delimiter, isAbsolute as isAbsolute4, join as join8, 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;
@@ -32790,8 +32954,8 @@ class WorkspaceChangeProbe {
           return;
         return {
           root,
-          indexPath: isAbsolute3(index) ? index : resolve4(cwd, index),
-          objectsPath: isAbsolute3(objects) ? objects : resolve4(cwd, objects)
+          indexPath: isAbsolute4(index) ? index : resolve4(cwd, index),
+          objectsPath: isAbsolute4(objects) ? objects : resolve4(cwd, objects)
         };
       }).catch(() => {
         return;
@@ -32834,8 +32998,8 @@ class WorkspaceChangeProbe {
       return;
     const { root, indexPath } = repo.location;
     const started = this.now();
-    const tempIndex = join7(this.tempDir, `orkestrator-probe-${randomUUID2()}.index`);
-    const objectDirectory = await mkdtemp(join7(this.tempDir, "orkestrator-probe-objects-"));
+    const tempIndex = join8(this.tempDir, `orkestrator-probe-${randomUUID2()}.index`);
+    const objectDirectory = await mkdtemp(join8(this.tempDir, "orkestrator-probe-objects-"));
     temporaryObjectDirectories.add(objectDirectory);
     let retained = false;
     try {
@@ -32852,7 +33016,7 @@ class WorkspaceChangeProbe {
       const included = [];
       const skipped = new Map;
       for (const path of untracked) {
-        const stats = await lstat(join7(root, path)).catch(() => {
+        const stats = await lstat(join8(root, path)).catch(() => {
           return;
         });
         if (!stats)
@@ -33105,10 +33269,28 @@ Before that final message you may send ordinary prose progress updates. Keep the
 
 ${JSON.stringify(schema)}`;
 }
-async function dispatchPrompt(state, agent, input) {
-  const text = input.schema ? `${input.prompt}
+function cursorPromptText(state, input, repositoryInstructions) {
+  const parts = [
+    cursorAppliedPolicy(state).id === "coordinator-read-only" ? "" : agentSystemInstructions(),
+    cursorAppliedPolicy(state).id === "coordinator-read-only" ? "" : repositoryInstructions ?? ""
+  ].filter((part) => part.length > 0);
+  return [
+    input.prompt,
+    parts.length > 0 ? wrapSystemInstructions(...parts) : "",
+    input.schema ? structuredPromptInstruction(input.schema) : ""
+  ].filter((part) => part.length > 0).join(`
 
-${structuredPromptInstruction(input.schema)}` : input.prompt;
+`);
+}
+async function repositoryInstructionsFor(state, cwd = workingDirectory) {
+  if (cursorAppliedPolicy(state).id === "coordinator-read-only" || state.loadsProjectRules || state.repositoryInstructionsAgentId === state.agentId) {
+    return;
+  }
+  return readRepositoryInstructions(cwd);
+}
+async function dispatchPrompt(state, agent, input) {
+  const repositoryInstructions = await repositoryInstructionsFor(state);
+  const text = cursorPromptText(state, input, repositoryInstructions);
   const images = input.images.map((image) => ({
     data: image.data,
     mimeType: image.mimeType
@@ -33154,6 +33336,8 @@ ${structuredPromptInstruction(input.schema)}` : input.prompt;
     throw error;
   });
   diagnostics?.sent(run.id);
+  if (!state.loadsProjectRules)
+    state.repositoryInstructionsAgentId = state.agentId;
   if (input.userMessageId) {
     const userMessage = state.messages.find((message) => message.id === input.userMessageId);
     if (userMessage?.role === "user") {
@@ -33169,6 +33353,7 @@ ${structuredPromptInstruction(input.schema)}` : input.prompt;
 async function dispatchCompaction(state, agent) {
   const promptSequence = state.promptSequence;
   const diagnostics = createRunDiagnostics(state);
+  state.repositoryInstructionsAgentId = undefined;
   const start = () => agent.summarize();
   const run = await (diagnostics ? diagnostics.follow(start) : start()).catch((error) => {
     diagnostics?.close("send-failed");
@@ -33701,8 +33886,8 @@ async function withTimeout3(work, timeoutMs) {
 }
 // ../../bridges/cursor-bridge/src/prompt-attachments.ts
 import { constants } from "node:fs";
-import { lstat as lstat2, open as open3, realpath } from "node:fs/promises";
-import { isAbsolute as isAbsolute4, join as join8, relative as relative3, resolve as resolve6, sep as sep3 } from "node:path";
+import { lstat as lstat2, open as open4, realpath as realpath2 } from "node:fs/promises";
+import { isAbsolute as isAbsolute5, join as join9, relative as relative4, resolve as resolve6, sep as sep3 } from "node:path";
 
 class PromptAttachmentError extends Error {
   code;
@@ -33787,10 +33972,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 && isAbsolute4(value) ? resolve6(value) : undefined;
+  return value && isAbsolute5(value) ? resolve6(value) : undefined;
 }
 function attachmentContainmentRoot(filePath, workspaceRoot, extraRoot = configuredAttachmentRoot()) {
-  if (extraRoot && isAbsolute4(filePath) && isPathWithin(extraRoot, resolve6(filePath))) {
+  if (extraRoot && isAbsolute5(filePath) && isPathWithin(extraRoot, resolve6(filePath))) {
     return extraRoot;
   }
   return resolve6(workspaceRoot);
@@ -33798,13 +33983,13 @@ function attachmentContainmentRoot(filePath, workspaceRoot, extraRoot = configur
 function isPathWithin(root, candidate) {
   if (candidate === root)
     return true;
-  const childPath = relative3(root, candidate);
-  return Boolean(childPath) && childPath !== ".." && !childPath.startsWith(`..${sep3}`) && !isAbsolute4(childPath);
+  const childPath = relative4(root, candidate);
+  return Boolean(childPath) && childPath !== ".." && !childPath.startsWith(`..${sep3}`) && !isAbsolute5(childPath);
 }
 async function assertNoSymlinkComponents(root, targetPath) {
   let currentPath = root;
-  for (const segment of relative3(root, targetPath).split(sep3).filter(Boolean)) {
-    currentPath = join8(currentPath, segment);
+  for (const segment of relative4(root, targetPath).split(sep3).filter(Boolean)) {
+    currentPath = join9(currentPath, segment);
     const stats = await lstat2(currentPath).catch((error) => {
       throw attachmentErrorForFsFailure(error);
     });
@@ -33816,7 +34001,7 @@ async function assertNoSymlinkComponents(root, targetPath) {
 async function assertOpenedWorkspaceFile(targetPath, canonicalRoot, openedStats) {
   const [pathStats, canonicalTarget] = await Promise.all([
     lstat2(targetPath),
-    realpath(targetPath)
+    realpath2(targetPath)
   ]).catch((error) => {
     throw attachmentErrorForFsFailure(error);
   });
@@ -33837,22 +34022,22 @@ function assertStableRead(initial, final, bytesRead) {
 }
 async function readWorkspaceImage(filePath, workspaceRoot) {
   const lexicalRoot = attachmentContainmentRoot(filePath, workspaceRoot);
-  const targetPath = isAbsolute4(filePath) ? resolve6(filePath) : resolve6(lexicalRoot, filePath);
+  const targetPath = isAbsolute5(filePath) ? resolve6(filePath) : resolve6(lexicalRoot, filePath);
   if (!isPathWithin(lexicalRoot, targetPath)) {
     throw new PromptAttachmentError("attachment_outside_workspace", "Image attachment must be contained in the current workspace");
   }
-  const canonicalRoot = await realpath(lexicalRoot).catch((error) => {
+  const canonicalRoot = await realpath2(lexicalRoot).catch((error) => {
     throw attachmentErrorForFsFailure(error);
   });
   await assertNoSymlinkComponents(lexicalRoot, targetPath);
-  const canonicalTarget = await realpath(targetPath).catch((error) => {
+  const canonicalTarget = await realpath2(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 = constants.O_NOFOLLOW ?? 0;
-  const handle = await open3(targetPath, constants.O_RDONLY | noFollow).catch((error) => {
+  const handle = await open4(targetPath, constants.O_RDONLY | noFollow).catch((error) => {
     throw attachmentErrorForFsFailure(error);
   });
   try {
@@ -36497,6 +36682,7 @@ if (process.argv.includes("--login")) {
 export {
   ABANDONED_COMPACTION_NOTE,
   ABANDONED_TOOL_NOTE,
+  ACCOUNT_LOOKUP_TIMEOUT_MS,
   BRIDGE_ATTACHMENT_ROOT_ENV,
   CANCEL_ACK_TIMEOUT_MS,
   CATALOG_TIMEOUT_MS,
@@ -36594,6 +36780,7 @@ export {
   cursorDeniedTools,
   cursorMcpConfigFingerprint,
   cursorMcpConfigRevision,
+  cursorPromptText,
   cursorSdkStateDirectoryPath,
   detachAgent,
   dispatchCompaction,
@@ -36649,6 +36836,7 @@ export {
   rememberedOwnerRow,
   renderToolCall,
   reopenPersistenceForTests,
+  repositoryInstructionsFor,
   resolveCredential,
   resolveCursorExecutionPolicy,
   resumeSession,
@@ -36669,6 +36857,7 @@ export {
   sessions,
   setCursorMcpConfigHomeForTests,
   setCursorMcpFingerprintForTests,
+  setCursorSkillsProjectForTests,
   setMaxIndexedCallsForTests,
   setPromptJournal,
   setResumableAgentArchived,

package/resources/cursor-bridge/runtime/install.json

@@ -1,4 +1,4 @@
 {
   "bridge": "cursor-bridge",
-  "digest": "ef917a23d141dd05"
+  "digest": "5b12929b1567667b"
 }

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

@@ -3824,6 +3824,7 @@ var COORDINATOR_CONTROL_TOOL_NAMES = Object.freeze([
   "stop_node_environment",
   "stop_worker_turn",
   "switch_provider_account",
+  "set_account_auto_switch",
   "transfer_files",
   "update_schedule",
   "update_ticket"
@@ -27935,6 +27936,7 @@ var TOOL_CALL_TIMEOUT_MS = 120000;
 var MAX_MCP_TOOLS = 128;
 var MAX_MCP_RESULT_BYTES = 50000;
 var MAX_MCP_DESCRIPTION_BYTES = 4000;
+var MAX_MCP_INSTRUCTIONS_BYTES = 8000;
 var MAX_MCP_SCHEMA_BYTES = 20000;
 var COORDINATOR_MAIL_TOOLS = new Set([
   ...COORDINATOR_CONTROL_TOOL_NAMES,
@@ -28028,6 +28030,7 @@ async function preparePiMcp(state, options = {}) {
     grantedToolNames: new Set,
     granted: nativeAgentUserMcpGrant(state.policy) !== undefined,
     tools: [],
+    instructions: [],
     connections: [],
     connectionKey: mcpConnectionKey(state),
     configKey: "",
@@ -28077,6 +28080,19 @@ function piMcpExtension(state) {
     }
   };
 }
+function piMcpInstructions(state) {
+  const entries = runtimes.get(state)?.instructions ?? [];
+  if (entries.length === 0)
+    return;
+  return [
+    "# MCP Server Instructions",
+    "The following MCP servers have provided instructions for how to use their tools and resources:",
+    ...entries.map((entry) => `## ${entry.serverId}
+${entry.text}`)
+  ].join(`
+
+`);
+}
 async function closePiMcp(state) {
   const runtime = runtimes.get(state);
   if (runtime)
@@ -28136,6 +28152,13 @@ async function connectAndRegister(state, runtime, server) {
     return detachedServer(server);
   }
   runtime.connections.push(connection);
+  const instructions = connection.instructions?.trim();
+  if (instructions) {
+    runtime.instructions.push({
+      serverId: server.id,
+      text: instructions.length > MAX_MCP_INSTRUCTIONS_BYTES ? instructions.slice(0, MAX_MCP_INSTRUCTIONS_BYTES) : instructions
+    });
+  }
   const tools = connection.tools.slice(0, MAX_MCP_TOOLS);
   const names = [];
   for (const listed of tools) {
@@ -28274,7 +28297,9 @@ var defaultTransport = {
     try {
       await client.connect(transport);
       const listed = await client.listTools();
+      const instructions = client.getInstructions();
       return {
+        ...instructions ? { instructions } : {},
         tools: (listed.tools ?? []).map((tool) => ({
           name: tool.name,
           ...tool.description ? { description: tool.description } : {},
@@ -28932,6 +28957,21 @@ function readString2(value) {
 // ../../bridges/pi-bridge/src/agent-session.ts
 import { randomBytes as randomBytes6 } from "node:crypto";
 import { existsSync as existsSync2 } from "node:fs";
+
+// ../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(`
+
+`);
+}
+
+// ../../bridges/pi-bridge/src/agent-session.ts
 import { realpath, stat as stat2 } from "node:fs/promises";
 import { join as join6, resolve as resolve3, sep } from "node:path";
 
@@ -31194,12 +31234,20 @@ async function reconcileAgentMcp(state, options = {}) {
     await detachSession(state);
   }
 }
+function piAppendedInstructions(state) {
+  const mcp = piMcpInstructions(state);
+  return [
+    ...state.policy?.id === "coordinator-read-only" ? [] : [agentSystemInstructions()],
+    ...mcp ? [mcp] : []
+  ];
+}
 async function createPiSessionServices(state, options) {
   const loaderPolicy = piResourceLoaderPolicy(state, options.cwd);
   const services = await createAgentSessionServices({
     ...options,
     resourceLoaderOptions: {
       ...loaderPolicy.discovery,
+      appendSystemPromptOverride: (base) => [...base, ...piAppendedInstructions(state)],
       extensionFactories: [
         { name: "orkestrator", factory: approvalExtension(state) },
         { name: "orkestrator-mcp", factory: piMcpExtension(state) },
@@ -35947,6 +35995,7 @@ export {
   parsePromptAttachments,
   parseTranscriptTailLimit as parseTailLimit,
   persistBarrier,
+  piAppendedInstructions,
   piReadiness,
   piReportedPolicy,
   piResourceLoaderPolicy,

package/resources/pi-bridge/runtime/install.json

@@ -1,4 +1,4 @@
 {
   "bridge": "pi-bridge",
-  "digest": "a190eada26714cdb"
+  "digest": "d23d7f865d5cabd0"
 }