@agentproto/adapter-mastra-agent 0.6.0 → 0.7.0

package/dist/{chunk-BOEMDDBC.mjs → chunk-2FKFITFT.mjs}

@@ -336,6 +336,19 @@ function makeWorkspaceTools(opts) {
   const cwd = resolve(opts.cwd);
   const allowExec = opts.allowExec ?? true;
   const execTimeoutMs = opts.execTimeoutMs ?? 12e4;
+  const additionalReadPaths = new Set(
+    (opts.additionalReadPaths ?? []).filter(isAbsolute).map((p) => resolve(p))
+  );
+  const resolveForWrite = (p) => resolveInCwd(cwd, p);
+  const resolveForRead = (p) => {
+    try {
+      return resolveInCwd(cwd, p);
+    } catch (err) {
+      const target = isAbsolute(p) ? resolve(p) : resolve(cwd, p);
+      if (additionalReadPaths.has(target)) return target;
+      throw err;
+    }
+  };
   const execEnv = { ...process.env, GIT_CEILING_DIRECTORIES: resolve(cwd, "..") };
   const guard = (id, execute) => withTimeoutGuard(id, execTimeoutMs, execute);
   const doListDir = async (input) => {
@@ -346,11 +359,11 @@ function makeWorkspaceTools(opts) {
     };
   };
   const doReadFile = async (input) => {
-    const file = resolveInCwd(cwd, input.path);
+    const file = resolveForRead(input.path);
     return { content: await promises.readFile(file, "utf8") };
   };
   const doWriteFile = async (input) => {
-    const file = resolveInCwd(cwd, input.path);
+    const file = resolveForWrite(input.path);
     await promises.mkdir(resolve(file, ".."), { recursive: true });
     await promises.writeFile(file, input.content, "utf8");
     return { path: input.path, bytes: Buffer.byteLength(input.content, "utf8") };
@@ -421,7 +434,7 @@ function makeWorkspaceTools(opts) {
     }),
     outputSchema: z.object({ path: z.string(), replaced: z.boolean() }),
     execute: guard("edit_file", async (input) => {
-      const file = resolveInCwd(cwd, input.path);
+      const file = resolveForWrite(input.path);
       const current = await promises.readFile(file, "utf8");
       const count = current.split(input.old_string).length - 1;
       if (count === 0) throw new Error(`old_string not found in '${input.path}'.`);
@@ -447,7 +460,7 @@ function makeWorkspaceTools(opts) {
       created: z.string()
     }),
     execute: guard("file_info", async (input) => {
-      const abs = resolveInCwd(cwd, input.path);
+      const abs = resolveForRead(input.path);
       const info = await promises.stat(abs);
       return {
         name: abs.split(sep).pop() ?? input.path,
@@ -554,7 +567,7 @@ function makeWorkspaceTools(opts) {
       outputSchema: z.object({ diff: z.string() }),
       execute: guard("read_diff", async (input) => {
         const relPaths = (input.paths ?? []).map((p) => {
-          const abs = resolveInCwd(cwd, p);
+          const abs = resolveForRead(p);
           return relative(cwd, abs) || ".";
         });
         const args = [
@@ -585,7 +598,7 @@ function makeWorkspaceTools(opts) {
       outputSchema: z.object({ applied: z.boolean(), output: z.string() }),
       execute: guard("apply_patch", async (input) => {
         for (const p of extractPatchPaths(input.patch)) {
-          resolveInCwd(cwd, p);
+          resolveForWrite(p);
         }
         const patchFile = join(tmpdir(), `mastra-agent-patch-${randomUUID()}.diff`);
         await promises.writeFile(patchFile, input.patch, "utf8");
@@ -1409,6 +1422,18 @@ var DEFAULT_TOOL_IDS = [
 function envFlag(value) {
   return Boolean(value);
 }
+function parseAdditionalReadPathsEnv(env = process.env) {
+  const raw = env.AGENTPROTO_ADDITIONAL_READ_PATHS;
+  if (!raw) return void 0;
+  try {
+    const parsed = JSON.parse(raw);
+    if (!Array.isArray(parsed)) return void 0;
+    const paths = parsed.filter((p) => typeof p === "string" && p.length > 0);
+    return paths.length > 0 ? paths : void 0;
+  } catch {
+    return void 0;
+  }
+}
 function defaultAgentManifest(model) {
   return [
     "---",
@@ -1486,6 +1511,9 @@ function makeAgentFactory(opts = {}) {
     const workspaceTools = makeWorkspaceTools({
       cwd,
       allowExec: opts.allowExec,
+      // The daemon's exact-file AGENTS.md read grant (pointer-mode contract)
+      // — explicit option wins, else the driver-set env var.
+      additionalReadPaths: opts.additionalReadPaths ?? parseAdditionalReadPathsEnv(),
       extraTools: opts.extraTools
     });
     const modesEnabled = opts.modes !== false && !envFlag(process.env.AGENTPROTO_MASTRA_NO_MODES);
@@ -1720,6 +1748,7 @@ var SUSPENSION_OPTIONS = [
 var META_SUSPEND_PAYLOAD = "mastra-agent/suspendPayload";
 var META_RESUME_SCHEMA = "mastra-agent/resumeSchema";
 var META_RESUME_DATA = "mastra-agent/resumeData";
+var META_FEEDBACK = "agentproto/feedback";
 function emptySessionState() {
   return {
     session: null,
@@ -1873,6 +1902,19 @@ var MastraAcpAgent = class {
     state.turn = turn;
     const { text, files } = promptContent(params);
     try {
+      if (!interrupted && state.suspensions.size > 0) {
+        await this.#conn.sessionUpdate({
+          sessionId: params.sessionId,
+          update: {
+            sessionUpdate: "agent_message_chunk",
+            content: {
+              type: "text",
+              text: "\n[mastra-agent] run is suspended awaiting approval \u2014 resolve the pending permission request (or cancel the session) before sending another prompt.\n"
+            }
+          }
+        });
+        return { stopReason: "refusal" };
+      }
       const session = await this.#ensureSession(params.sessionId, state);
       const map = createEventMapper();
       let endReason;
@@ -1890,6 +1932,21 @@ var MastraAcpAgent = class {
         if (event.type === "agent_end") {
           endReason = event.reason ?? "complete";
           resolveAgentEnd?.();
+          if (event.reason === "suspended") {
+            relay = relay.then(
+              () => this.#conn.sessionUpdate({
+                sessionId: params.sessionId,
+                update: {
+                  sessionUpdate: "agent_message_chunk",
+                  content: {
+                    type: "text",
+                    text: "\n[mastra-agent] run suspended \u2014 waiting for approval before continuing.\n"
+                  }
+                }
+              })
+            ).catch(() => {
+            });
+          }
           return;
         }
         if (event.type === "tool_approval_required") {
@@ -2086,7 +2143,11 @@ var MastraAcpAgent = class {
       if (pending.cancelled) return;
       if (outcome.outcome !== "selected") return;
       const meta = outcome._meta;
-      const resumeData = meta && META_RESUME_DATA in meta ? meta[META_RESUME_DATA] : { approved: outcome.optionId === "approve" };
+      const feedback = meta && typeof meta[META_FEEDBACK] === "string" ? meta[META_FEEDBACK] : void 0;
+      const resumeData = meta && META_RESUME_DATA in meta ? meta[META_RESUME_DATA] : {
+        approved: outcome.optionId === "approve",
+        ...feedback ? { feedback } : {}
+      };
       await session.respondToToolSuspension({
         resumeData,
         toolCallId: event.toolCallId
@@ -2120,6 +2181,12 @@ var MastraAcpAgent = class {
       threadId: acpSessionId
     });
     session.subscribe((event) => {
+      if (event.type === "tool_suspension_cancelled") {
+        const pending = state.suspensions.get(event.toolCallId);
+        if (pending) pending.cancelled = true;
+        state.suspensions.delete(event.toolCallId);
+        return;
+      }
       if (event.type === "mode_changed") {
         void this.#conn.sessionUpdate({
           sessionId: acpSessionId,
@@ -2183,5 +2250,5 @@ function runAcpOverStdio(buildController) {
 }
 
 export { DEFAULT_MODEL, DEFAULT_MODEL_CATALOG, DEFAULT_TOOL_IDS, DISABLED_BUILTIN_TOOL_IDS, DaemonClient, DaemonHttpError, DaemonNotFoundError, MastraAcpAgent, buildSqliteMemory, buildSqliteStore, createEventMapper, defaultAgentManifest, discoverDaemonEndpoint, makeAgentFactory, makeDaemonTools, makeWorkspaceTools, messageText, modelRefToString, promptContent, promptText, providerOf, resolveInCwd, resolveMastraModel, resolveMemoryDbPath, runAcpOverStdio, toolCallTitle, toolKindFor };
-//# sourceMappingURL=chunk-BOEMDDBC.mjs.map
-//# sourceMappingURL=chunk-BOEMDDBC.mjs.map
+//# sourceMappingURL=chunk-2FKFITFT.mjs.map
+//# sourceMappingURL=chunk-2FKFITFT.mjs.map