@slopus/rig 0.0.3 → 0.0.6

package/dist/agent/context/createNodeFileSystemContext.js

@@ -1,33 +1,41 @@
 import { existsSync } from "node:fs";
 import { mkdir, readFile, readdir, rm, stat, writeFile } from "node:fs/promises";
 import { homedir } from "node:os";
+import { isAbsolute, resolve } from "node:path";
+import { assertCanWritePath } from "./assertCanWritePath.js";
 export function createNodeFileSystemContext(cwd, options = {}) {
+    const permissionMode = options.permissionMode ?? (() => "full_access");
+    const resolvePath = (path) => (isAbsolute(path) ? path : resolve(cwd, path));
     return {
         cwd,
         home: options.home ?? homedir(),
         async exists(path) {
-            return existsSync(path);
+            return existsSync(resolvePath(path));
         },
         async mkdir(path, options) {
-            await mkdir(path, { recursive: options?.recursive ?? false });
+            const target = resolvePath(path);
+            await assertCanWritePath(cwd, target, permissionMode());
+            await mkdir(target, { recursive: options?.recursive ?? false });
         },
         async readFile(path) {
-            return readFile(path, "utf8");
+            return readFile(resolvePath(path), "utf8");
         },
         async readFileBuffer(path) {
-            return readFile(path);
+            return readFile(resolvePath(path));
         },
         async readdir(path) {
-            return readdir(path);
+            return readdir(resolvePath(path));
         },
         async rm(path, options) {
-            await rm(path, {
+            const target = resolvePath(path);
+            await assertCanWritePath(cwd, target, permissionMode());
+            await rm(target, {
                 recursive: options?.recursive ?? false,
                 force: options?.force ?? false,
             });
         },
         async stat(path) {
-            const stats = await stat(path);
+            const stats = await stat(resolvePath(path));
             return {
                 isFile: stats.isFile(),
                 isDirectory: stats.isDirectory(),
@@ -37,7 +45,9 @@ export function createNodeFileSystemContext(cwd, options = {}) {
             };
         },
         async writeFile(path, content) {
-            await writeFile(path, content);
+            const target = resolvePath(path);
+            await assertCanWritePath(cwd, target, permissionMode());
+            await writeFile(target, content);
         },
     };
 }

package/dist/agent/context/createSandboxedCommand.d.ts

@@ -0,0 +1,7 @@
+import type { PermissionMode } from "../../permissions/index.js";
+export declare function createSandboxedCommand(options: {
+    command: string;
+    cwd: string;
+    mode: PermissionMode;
+}): Promise<string>;
+//# sourceMappingURL=createSandboxedCommand.d.ts.map

package/dist/agent/context/createSandboxedCommand.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"createSandboxedCommand.d.ts","sourceRoot":"","sources":["../../../sources/agent/context/createSandboxedCommand.ts"],"names":[],"mappings":"AAOA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,4BAA4B,CAAC;AAKjE,wBAAsB,sBAAsB,CAAC,OAAO,EAAE;IAClD,OAAO,EAAE,MAAM,CAAC;IAChB,GAAG,EAAE,MAAM,CAAC;IACZ,IAAI,EAAE,cAAc,CAAC;CACxB,GAAG,OAAO,CAAC,MAAM,CAAC,CAoClB"}

package/dist/agent/context/createSandboxedCommand.js

@@ -0,0 +1,47 @@
+import { createHash } from "node:crypto";
+import { createRequire } from "node:module";
+import { mkdtemp, writeFile } from "node:fs/promises";
+import { tmpdir } from "node:os";
+import { dirname, join } from "node:path";
+import { findGitWritablePaths } from "./findGitWritablePaths.js";
+const require = createRequire(import.meta.url);
+let configDirectoryPromise;
+export async function createSandboxedCommand(options) {
+    if (options.mode === "full_access")
+        return options.command;
+    const writablePaths = [tmpdir()];
+    if (options.mode === "workspace_write" || options.mode === "auto") {
+        writablePaths.push(options.cwd);
+        writablePaths.push(...(await findGitWritablePaths(options.cwd)));
+    }
+    const config = {
+        network: { allowedDomains: [], deniedDomains: [] },
+        filesystem: {
+            denyRead: [],
+            allowRead: [],
+            allowWrite: writablePaths,
+            denyWrite: [],
+        },
+    };
+    configDirectoryPromise ??= mkdtemp(join(tmpdir(), "rig-sandbox-"));
+    const configDirectory = await configDirectoryPromise;
+    const key = createHash("sha256")
+        .update(`${options.cwd}\0${options.mode}`)
+        .digest("hex")
+        .slice(0, 20);
+    const configPath = join(configDirectory, `${key}.json`);
+    await writeFile(configPath, JSON.stringify(config), { mode: 0o600 });
+    const packageEntry = require.resolve("@anthropic-ai/sandbox-runtime");
+    const cliPath = join(dirname(packageEntry), "cli.js");
+    return [
+        shellQuote(process.execPath),
+        shellQuote(cliPath),
+        "--settings",
+        shellQuote(configPath),
+        "-c",
+        shellQuote(options.command),
+    ].join(" ");
+}
+function shellQuote(value) {
+    return `'${value.replaceAll("'", `'"'"'`)}'`;
+}

package/dist/agent/context/findGitWritablePaths.d.ts

@@ -0,0 +1,2 @@
+export declare function findGitWritablePaths(cwd: string): Promise<readonly string[]>;
+//# sourceMappingURL=findGitWritablePaths.d.ts.map

package/dist/agent/context/findGitWritablePaths.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"findGitWritablePaths.d.ts","sourceRoot":"","sources":["../../../sources/agent/context/findGitWritablePaths.ts"],"names":[],"mappings":"AAGA,wBAAsB,oBAAoB,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAAC,SAAS,MAAM,EAAE,CAAC,CAwBlF"}

package/dist/agent/context/findGitWritablePaths.js

@@ -0,0 +1,54 @@
+import { lstat, readFile, realpath } from "node:fs/promises";
+import { dirname, join, parse, resolve, sep } from "node:path";
+export async function findGitWritablePaths(cwd) {
+    const dotGit = await findDotGit(cwd);
+    if (dotGit === undefined)
+        return [];
+    const metadata = await lstat(dotGit);
+    if (metadata.isDirectory())
+        return [await realpath(dotGit)];
+    if (!metadata.isFile())
+        return [];
+    const contents = await readFile(dotGit, "utf8");
+    const match = /^gitdir:\s*(.+)\s*$/imu.exec(contents);
+    if (match?.[1] === undefined)
+        return [];
+    const gitDirectory = await realpath(resolve(dirname(dotGit), match[1]));
+    const parts = gitDirectory.split(sep);
+    const dotGitIndex = parts.lastIndexOf(".git");
+    const metadataKind = parts[dotGitIndex + 1];
+    if (dotGitIndex < 0 || (metadataKind !== "worktrees" && metadataKind !== "modules"))
+        return [];
+    if (metadataKind === "modules")
+        return [gitDirectory];
+    const commonDirectory = await findCommonGitDirectory(gitDirectory);
+    const expectedCommonDirectory = parts.slice(0, dotGitIndex + 1).join(sep) || sep;
+    return commonDirectory === expectedCommonDirectory
+        ? [gitDirectory, commonDirectory]
+        : [gitDirectory];
+}
+async function findDotGit(cwd) {
+    let directory = resolve(cwd);
+    for (;;) {
+        const candidate = join(directory, ".git");
+        try {
+            await lstat(candidate);
+            return candidate;
+        }
+        catch {
+            const parent = dirname(directory);
+            if (parent === directory || directory === parse(directory).root)
+                return undefined;
+            directory = parent;
+        }
+    }
+}
+async function findCommonGitDirectory(gitDirectory) {
+    try {
+        const commonDirectory = await realpath(resolve(gitDirectory, (await readFile(join(gitDirectory, "commondir"), "utf8")).trim()));
+        return commonDirectory;
+    }
+    catch {
+        return undefined;
+    }
+}

package/dist/agent/context/isPathInsideWorkspace.d.ts

@@ -0,0 +1,2 @@
+export declare function isPathInsideWorkspace(cwd: string, path: string): Promise<boolean>;
+//# sourceMappingURL=isPathInsideWorkspace.d.ts.map

package/dist/agent/context/isPathInsideWorkspace.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"isPathInsideWorkspace.d.ts","sourceRoot":"","sources":["../../../sources/agent/context/isPathInsideWorkspace.ts"],"names":[],"mappings":"AAKA,wBAAsB,qBAAqB,CAAC,GAAG,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC,CASvF"}

package/dist/agent/context/isPathInsideWorkspace.js

@@ -0,0 +1,14 @@
+import { realpath } from "node:fs/promises";
+import { isAbsolute, resolve, sep } from "node:path";
+import { resolvePotentialPath } from "./resolvePotentialPath.js";
+export async function isPathInsideWorkspace(cwd, path) {
+    try {
+        const root = await realpath(cwd);
+        const target = isAbsolute(path) ? path : resolve(cwd, path);
+        const canonicalTarget = await resolvePotentialPath(target);
+        return canonicalTarget === root || canonicalTarget.startsWith(`${root}${sep}`);
+    }
+    catch {
+        return false;
+    }
+}

package/dist/agent/context/resolvePotentialPath.d.ts

@@ -0,0 +1,2 @@
+export declare function resolvePotentialPath(target: string, symlinkDepth?: number): Promise<string>;
+//# sourceMappingURL=resolvePotentialPath.d.ts.map

package/dist/agent/context/resolvePotentialPath.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"resolvePotentialPath.d.ts","sourceRoot":"","sources":["../../../sources/agent/context/resolvePotentialPath.ts"],"names":[],"mappings":"AAGA,wBAAsB,oBAAoB,CAAC,MAAM,EAAE,MAAM,EAAE,YAAY,SAAI,GAAG,OAAO,CAAC,MAAM,CAAC,CAgC5F"}

package/dist/agent/context/resolvePotentialPath.js

@@ -0,0 +1,32 @@
+import { lstat, readlink } from "node:fs/promises";
+import { dirname, join, parse, resolve, sep } from "node:path";
+export async function resolvePotentialPath(target, symlinkDepth = 0) {
+    if (symlinkDepth > 40)
+        throw new Error(`Cannot resolve symbolic link chain for ${target}.`);
+    const pathRoot = parse(target).root;
+    const parts = target.slice(pathRoot.length).split(sep).filter(Boolean);
+    let current = pathRoot;
+    for (let index = 0; index < parts.length; index += 1) {
+        const part = parts[index];
+        if (part === undefined)
+            continue;
+        const candidate = join(current, part);
+        try {
+            const metadata = await lstat(candidate);
+            if (metadata.isSymbolicLink()) {
+                const destination = resolve(dirname(candidate), await readlink(candidate));
+                return resolvePotentialPath(join(destination, ...parts.slice(index + 1)), symlinkDepth + 1);
+            }
+            current = candidate;
+        }
+        catch (error) {
+            if (error instanceof Error &&
+                "code" in error &&
+                error.code === "ENOENT") {
+                return join(current, ...parts.slice(index));
+            }
+            throw error;
+        }
+    }
+    return current;
+}

package/dist/agent/createPermissionInstructions.d.ts

@@ -0,0 +1,3 @@
+import type { PermissionMode } from "../permissions/index.js";
+export declare function createPermissionInstructions(mode: PermissionMode): string;
+//# sourceMappingURL=createPermissionInstructions.d.ts.map

package/dist/agent/createPermissionInstructions.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"createPermissionInstructions.d.ts","sourceRoot":"","sources":["../../sources/agent/createPermissionInstructions.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,yBAAyB,CAAC;AAE9D,wBAAgB,4BAA4B,CAAC,IAAI,EAAE,cAAc,GAAG,MAAM,CAWzE"}

package/dist/agent/createPermissionInstructions.js

@@ -0,0 +1,12 @@
+export function createPermissionInstructions(mode) {
+    if (mode === "auto") {
+        return "You are in Auto mode. Routine reads and workspace edits run automatically. Permission-sensitive actions are reviewed automatically; low-risk actions proceed, while potentially unsafe actions require one-time user approval. Shell commands remain workspace-sandboxed unless you explicitly request escalation with the tool's sandbox option. Request escalation only when the sandbox blocks necessary work, and give a clear reason. Do not work around a denied permission or retry the same action unchanged.";
+    }
+    if (mode === "read_only") {
+        return "You are in Read only mode. You may inspect files and run non-mutating shell commands. File tools cannot make changes; shell commands may only write temporary files, and shell network access is blocked.";
+    }
+    if (mode === "workspace_write") {
+        return "You are in Workspace write mode. You may modify files inside the working directory. Shell writes outside it and shell network access are blocked.";
+    }
+    return "You are in Full access mode. Filesystem, shell, and network access are unrestricted.";
+}

package/dist/agent/createSubagentInstructions.js

@@ -6,7 +6,7 @@ export function createSubagentInstructions(parentInstructions, depth, maxDepth)
     return [
         baseInstructions,
         "You are a subagent working on one delegated step. Complete the task independently and return a concise result to the parent agent.",
-        "Your conversation is read-only after this step finishes, so do not expect follow-up messages or a resumed session.",
+        "The parent agent may send follow-up work after this step. Continue from your existing context when it does.",
         depth < maxDepth
             ? `You may delegate focused work to another subagent. The current depth is ${depth} of ${maxDepth}.`
             : "You are at the maximum subagent depth and must complete the task directly.",

package/dist/agent/createSystemPrompt.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"createSystemPrompt.d.ts","sourceRoot":"","sources":["../../sources/agent/createSystemPrompt.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,2BAA2B,CAAC;AAK9D,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,YAAY,CAAC;AAC1C,OAAO,KAAK,EAAE,KAAK,EAAE,QAAQ,EAAE,MAAM,uBAAuB,CAAC;AAE7D,MAAM,WAAW,yBAAyB;IACtC,QAAQ,EAAE,QAAQ,CAAC;IACnB,KAAK,EAAE,KAAK,CAAC;IACb,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,QAAQ,EAAE,SAAS,OAAO,EAAE,CAAC;IAC7B,OAAO,EAAE,YAAY,CAAC;CACzB;AAED,wBAAsB,kBAAkB,CACpC,OAAO,EAAE,yBAAyB,GACnC,OAAO,CAAC,MAAM,GAAG,SAAS,CAAC,CA4B7B"}
+{"version":3,"file":"createSystemPrompt.d.ts","sourceRoot":"","sources":["../../sources/agent/createSystemPrompt.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,2BAA2B,CAAC;AAM9D,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,YAAY,CAAC;AAC1C,OAAO,KAAK,EAAE,KAAK,EAAE,QAAQ,EAAE,MAAM,uBAAuB,CAAC;AAE7D,MAAM,WAAW,yBAAyB;IACtC,QAAQ,EAAE,QAAQ,CAAC;IACnB,KAAK,EAAE,KAAK,CAAC;IACb,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,QAAQ,EAAE,SAAS,OAAO,EAAE,CAAC;IAC7B,OAAO,EAAE,YAAY,CAAC;CACzB;AAED,wBAAsB,kBAAkB,CACpC,OAAO,EAAE,yBAAyB,GACnC,OAAO,CAAC,MAAM,GAAG,SAAS,CAAC,CAgC7B"}

package/dist/agent/createSystemPrompt.js

@@ -1,3 +1,4 @@
+import { createPermissionInstructions } from "./createPermissionInstructions.js";
 import { loadAgentsMdInstructions } from "./loadAgentsMdInstructions.js";
 import { selectSystemPromptForModel } from "./selectSystemPromptForModel.js";
 import { loadSkillInstructions } from "./skills/loadSkillInstructions.js";
@@ -24,5 +25,8 @@ export async function createSystemPrompt(options) {
     if (skillInstructions !== undefined) {
         parts.push(skillInstructions);
     }
+    if (options.context.permissions !== undefined) {
+        parts.push(createPermissionInstructions(options.context.permissions.mode));
+    }
     return parts.length > 0 ? parts.join("\n\n") : undefined;
 }

package/dist/agent/index.d.ts

@@ -1,5 +1,5 @@
 export { Agent } from "./Agent.js";
-export type { AgentOptions, AgentRunOptions, AgentRunResult, AgentSnapshot, AgentStatus, QueuedAgentMessage, } from "./Agent.js";
+export type { AgentOptions, AgentCompactionResult, AgentRunOptions, AgentRunResult, AgentSnapshot, AgentStatus, QueuedAgentMessage, } from "./Agent.js";
 export { runAgentLoop } from "./loop.js";
 export type { AgentLoopEvent, AgentLoopResult, RunAgentLoopOptions } from "./loop.js";
 export { createSystemPrompt } from "./createSystemPrompt.js";
@@ -20,9 +20,13 @@ export { selectToolsForModel } from "./selectToolsForModel.js";
 export type { SelectToolsForModelOptions } from "./selectToolsForModel.js";
 export type { AgentBlock, AgentMessage, AnyDefinedTool, ContentBlock, DefinedTool, ImageBlock, Message, SystemMessage, TextBlock, ThinkingBlock, ToolCallBlock, ToolResultBlock, UserMessage, } from "./types.js";
 export type { AgentContext } from "./context/AgentContext.js";
-export type { BashContext, BashRunOptions, BashRunResult } from "./context/BashContext.js";
+export type { PermissionMode } from "../permissions/index.js";
+export type { BashContext, BashRunOptions, BashRunResult, BashSessionReadOptions, BashSessionSnapshot, BashSessionStatus, } from "./context/BashContext.js";
 export type { FileSystemContext, FileSystemStat } from "./context/FileSystemContext.js";
-export type { SpawnSubagentRequest, SpawnSubagentResult, SubagentContext, SubagentRunStatus, } from "./context/SubagentContext.js";
+export type { GoalContext } from "./context/GoalContext.js";
+export type { UserInputContext } from "./context/UserInputContext.js";
+export type { TaskContext } from "./context/TaskContext.js";
+export type { ManagedSubagent, SpawnSubagentRequest, SpawnSubagentResult, SubagentContext, SubagentRunStatus, WaitForSubagentResult, } from "./context/SubagentContext.js";
 export { createJustBashAgentContext } from "./context/createJustBashAgentContext.js";
 export { createJustBashBashContext } from "./context/createJustBashBashContext.js";
 export { createJustBashFileSystemContext } from "./context/createJustBashFileSystemContext.js";

package/dist/agent/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../sources/agent/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,EAAE,MAAM,YAAY,CAAC;AACnC,YAAY,EACR,YAAY,EACZ,eAAe,EACf,cAAc,EACd,aAAa,EACb,WAAW,EACX,kBAAkB,GACrB,MAAM,YAAY,CAAC;AACpB,OAAO,EAAE,YAAY,EAAE,MAAM,WAAW,CAAC;AACzC,YAAY,EAAE,cAAc,EAAE,eAAe,EAAE,mBAAmB,EAAE,MAAM,WAAW,CAAC;AACtF,OAAO,EAAE,kBAAkB,EAAE,MAAM,yBAAyB,CAAC;AAC7D,YAAY,EAAE,yBAAyB,EAAE,MAAM,yBAAyB,CAAC;AACzE,OAAO,EAAE,wBAAwB,EAAE,MAAM,+BAA+B,CAAC;AACzE,OAAO,EAAE,qBAAqB,EAAE,MAAM,mCAAmC,CAAC;AAC1E,OAAO,EAAE,qBAAqB,EAAE,MAAM,mCAAmC,CAAC;AAC1E,OAAO,EAAE,UAAU,EAAE,MAAM,wBAAwB,CAAC;AACpD,YAAY,EAAE,KAAK,EAAE,MAAM,mBAAmB,CAAC;AAC/C,OAAO,EAAE,0BAA0B,EAAE,MAAM,iCAAiC,CAAC;AAC7E,OAAO,EAAE,0BAA0B,EAAE,MAAM,iCAAiC,CAAC;AAC7E,YAAY,EAAE,YAAY,EAAE,MAAM,iCAAiC,CAAC;AACpE,OAAO,EAAE,kBAAkB,EAAE,MAAM,yBAAyB,CAAC;AAC7D,OAAO,EAAE,0BAA0B,EAAE,MAAM,iCAAiC,CAAC;AAC7E,OAAO,EAAE,yBAAyB,EAAE,MAAM,gCAAgC,CAAC;AAC3E,OAAO,EAAE,kBAAkB,EAAE,MAAM,yBAAyB,CAAC;AAC7D,OAAO,EAAE,mBAAmB,EAAE,MAAM,0BAA0B,CAAC;AAC/D,YAAY,EAAE,0BAA0B,EAAE,MAAM,0BAA0B,CAAC;AAC3E,YAAY,EACR,UAAU,EACV,YAAY,EACZ,cAAc,EACd,YAAY,EACZ,WAAW,EACX,UAAU,EACV,OAAO,EACP,aAAa,EACb,SAAS,EACT,aAAa,EACb,aAAa,EACb,eAAe,EACf,WAAW,GACd,MAAM,YAAY,CAAC;AACpB,YAAY,EAAE,YAAY,EAAE,MAAM,2BAA2B,CAAC;AAC9D,YAAY,EAAE,WAAW,EAAE,cAAc,EAAE,aAAa,EAAE,MAAM,0BAA0B,CAAC;AAC3F,YAAY,EAAE,iBAAiB,EAAE,cAAc,EAAE,MAAM,gCAAgC,CAAC;AACxF,YAAY,EACR,oBAAoB,EACpB,mBAAmB,EACnB,eAAe,EACf,iBAAiB,GACpB,MAAM,8BAA8B,CAAC;AACtC,OAAO,EAAE,0BAA0B,EAAE,MAAM,yCAAyC,CAAC;AACrF,OAAO,EAAE,yBAAyB,EAAE,MAAM,wCAAwC,CAAC;AACnF,OAAO,EAAE,+BAA+B,EAAE,MAAM,8CAA8C,CAAC;AAC/F,OAAO,EAAE,sBAAsB,EAAE,MAAM,qCAAqC,CAAC;AAC7E,OAAO,EAAE,qBAAqB,EAAE,MAAM,oCAAoC,CAAC;AAC3E,OAAO,EAAE,2BAA2B,EAAE,MAAM,0CAA0C,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../sources/agent/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,EAAE,MAAM,YAAY,CAAC;AACnC,YAAY,EACR,YAAY,EACZ,qBAAqB,EACrB,eAAe,EACf,cAAc,EACd,aAAa,EACb,WAAW,EACX,kBAAkB,GACrB,MAAM,YAAY,CAAC;AACpB,OAAO,EAAE,YAAY,EAAE,MAAM,WAAW,CAAC;AACzC,YAAY,EAAE,cAAc,EAAE,eAAe,EAAE,mBAAmB,EAAE,MAAM,WAAW,CAAC;AACtF,OAAO,EAAE,kBAAkB,EAAE,MAAM,yBAAyB,CAAC;AAC7D,YAAY,EAAE,yBAAyB,EAAE,MAAM,yBAAyB,CAAC;AACzE,OAAO,EAAE,wBAAwB,EAAE,MAAM,+BAA+B,CAAC;AACzE,OAAO,EAAE,qBAAqB,EAAE,MAAM,mCAAmC,CAAC;AAC1E,OAAO,EAAE,qBAAqB,EAAE,MAAM,mCAAmC,CAAC;AAC1E,OAAO,EAAE,UAAU,EAAE,MAAM,wBAAwB,CAAC;AACpD,YAAY,EAAE,KAAK,EAAE,MAAM,mBAAmB,CAAC;AAC/C,OAAO,EAAE,0BAA0B,EAAE,MAAM,iCAAiC,CAAC;AAC7E,OAAO,EAAE,0BAA0B,EAAE,MAAM,iCAAiC,CAAC;AAC7E,YAAY,EAAE,YAAY,EAAE,MAAM,iCAAiC,CAAC;AACpE,OAAO,EAAE,kBAAkB,EAAE,MAAM,yBAAyB,CAAC;AAC7D,OAAO,EAAE,0BAA0B,EAAE,MAAM,iCAAiC,CAAC;AAC7E,OAAO,EAAE,yBAAyB,EAAE,MAAM,gCAAgC,CAAC;AAC3E,OAAO,EAAE,kBAAkB,EAAE,MAAM,yBAAyB,CAAC;AAC7D,OAAO,EAAE,mBAAmB,EAAE,MAAM,0BAA0B,CAAC;AAC/D,YAAY,EAAE,0BAA0B,EAAE,MAAM,0BAA0B,CAAC;AAC3E,YAAY,EACR,UAAU,EACV,YAAY,EACZ,cAAc,EACd,YAAY,EACZ,WAAW,EACX,UAAU,EACV,OAAO,EACP,aAAa,EACb,SAAS,EACT,aAAa,EACb,aAAa,EACb,eAAe,EACf,WAAW,GACd,MAAM,YAAY,CAAC;AACpB,YAAY,EAAE,YAAY,EAAE,MAAM,2BAA2B,CAAC;AAC9D,YAAY,EAAE,cAAc,EAAE,MAAM,yBAAyB,CAAC;AAC9D,YAAY,EACR,WAAW,EACX,cAAc,EACd,aAAa,EACb,sBAAsB,EACtB,mBAAmB,EACnB,iBAAiB,GACpB,MAAM,0BAA0B,CAAC;AAClC,YAAY,EAAE,iBAAiB,EAAE,cAAc,EAAE,MAAM,gCAAgC,CAAC;AACxF,YAAY,EAAE,WAAW,EAAE,MAAM,0BAA0B,CAAC;AAC5D,YAAY,EAAE,gBAAgB,EAAE,MAAM,+BAA+B,CAAC;AACtE,YAAY,EAAE,WAAW,EAAE,MAAM,0BAA0B,CAAC;AAC5D,YAAY,EACR,eAAe,EACf,oBAAoB,EACpB,mBAAmB,EACnB,eAAe,EACf,iBAAiB,EACjB,qBAAqB,GACxB,MAAM,8BAA8B,CAAC;AACtC,OAAO,EAAE,0BAA0B,EAAE,MAAM,yCAAyC,CAAC;AACrF,OAAO,EAAE,yBAAyB,EAAE,MAAM,wCAAwC,CAAC;AACnF,OAAO,EAAE,+BAA+B,EAAE,MAAM,8CAA8C,CAAC;AAC/F,OAAO,EAAE,sBAAsB,EAAE,MAAM,qCAAqC,CAAC;AAC7E,OAAO,EAAE,qBAAqB,EAAE,MAAM,oCAAoC,CAAC;AAC3E,OAAO,EAAE,2BAA2B,EAAE,MAAM,0CAA0C,CAAC"}

package/dist/agent/loop.d.ts

@@ -1,6 +1,6 @@
 import type { AgentContext } from "./context/AgentContext.js";
-import type { AnyDefinedTool, Message } from "./types.js";
-import type { AssistantMessageEvent, Provider, StopReason } from "../providers/types.js";
+import type { AnyDefinedTool, Message, ToolResultBlock, UserMessage } from "./types.js";
+import type { AssistantMessageEvent, Provider, StopReason, ToolCall as ProviderToolCall } from "../providers/types.js";
 export interface RunAgentLoopOptions {
     provider: Provider;
     modelId: string;
@@ -8,20 +8,34 @@ export interface RunAgentLoopOptions {
     tools: readonly AnyDefinedTool[];
     instructions?: string;
     messages: readonly Message[];
+    /** Model-facing history, when the visible transcript has been compacted. */
+    contextMessages?: readonly Message[];
     signal?: AbortSignal;
     sessionId?: string;
     idFactory?: () => string;
     now?: () => number;
     onEvent?: (event: AgentLoopEvent) => void | Promise<void>;
     onMessage?: (message: Message) => void | Promise<void>;
+    takeSteering?: () => readonly UserMessage[];
     context: AgentContext;
 }
 export type AgentLoopEvent = AssistantMessageEvent | {
     type: "inference_iteration_start";
     iteration: number;
+} | {
+    type: "tool_execution_start";
+    toolCall: ProviderToolCall;
+} | {
+    type: "tool_execution_end";
+    result: Pick<ToolResultBlock, "display" | "isError" | "toolCallId" | "toolName" | "type">;
+} | {
+    type: "tool_execution_progress";
+    display: string;
+    toolCallId: string;
 };
 export interface AgentLoopResult {
     messages: readonly Message[];
+    contextMessages: readonly Message[];
     stopReason: StopReason;
 }
 export declare function runAgentLoop(options: RunAgentLoopOptions): Promise<AgentLoopResult>;

package/dist/agent/loop.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"loop.d.ts","sourceRoot":"","sources":["../../sources/agent/loop.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,2BAA2B,CAAC;AAK9D,OAAO,KAAK,EAGR,cAAc,EAEd,OAAO,EAGV,MAAM,YAAY,CAAC;AACpB,OAAO,KAAK,EAGR,qBAAqB,EAIrB,QAAQ,EACR,UAAU,EAQb,MAAM,uBAAuB,CAAC;AAE/B,MAAM,WAAW,mBAAmB;IAChC,QAAQ,EAAE,QAAQ,CAAC;IACnB,OAAO,EAAE,MAAM,CAAC;IAChB,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,KAAK,EAAE,SAAS,cAAc,EAAE,CAAC;IACjC,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,QAAQ,EAAE,SAAS,OAAO,EAAE,CAAC;IAC7B,MAAM,CAAC,EAAE,WAAW,CAAC;IACrB,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,SAAS,CAAC,EAAE,MAAM,MAAM,CAAC;IACzB,GAAG,CAAC,EAAE,MAAM,MAAM,CAAC;IACnB,OAAO,CAAC,EAAE,CAAC,KAAK,EAAE,cAAc,KAAK,IAAI,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;IAC1D,SAAS,CAAC,EAAE,CAAC,OAAO,EAAE,OAAO,KAAK,IAAI,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;IACvD,OAAO,EAAE,YAAY,CAAC;CACzB;AAED,MAAM,MAAM,cAAc,GACpB,qBAAqB,GACrB;IACI,IAAI,EAAE,2BAA2B,CAAC;IAClC,SAAS,EAAE,MAAM,CAAC;CACrB,CAAC;AAER,MAAM,WAAW,eAAe;IAC5B,QAAQ,EAAE,SAAS,OAAO,EAAE,CAAC;IAC7B,UAAU,EAAE,UAAU,CAAC;CAC1B;AAED,wBAAsB,YAAY,CAAC,OAAO,EAAE,mBAAmB,GAAG,OAAO,CAAC,eAAe,CAAC,CAmLzF"}
+{"version":3,"file":"loop.d.ts","sourceRoot":"","sources":["../../sources/agent/loop.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,2BAA2B,CAAC;AAK9D,OAAO,KAAK,EAGR,cAAc,EAEd,OAAO,EACP,eAAe,EACf,WAAW,EACd,MAAM,YAAY,CAAC;AACpB,OAAO,KAAK,EAGR,qBAAqB,EAIrB,QAAQ,EACR,UAAU,EAGV,QAAQ,IAAI,gBAAgB,EAK/B,MAAM,uBAAuB,CAAC;AAS/B,MAAM,WAAW,mBAAmB;IAChC,QAAQ,EAAE,QAAQ,CAAC;IACnB,OAAO,EAAE,MAAM,CAAC;IAChB,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,KAAK,EAAE,SAAS,cAAc,EAAE,CAAC;IACjC,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,QAAQ,EAAE,SAAS,OAAO,EAAE,CAAC;IAC7B,4EAA4E;IAC5E,eAAe,CAAC,EAAE,SAAS,OAAO,EAAE,CAAC;IACrC,MAAM,CAAC,EAAE,WAAW,CAAC;IACrB,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,SAAS,CAAC,EAAE,MAAM,MAAM,CAAC;IACzB,GAAG,CAAC,EAAE,MAAM,MAAM,CAAC;IACnB,OAAO,CAAC,EAAE,CAAC,KAAK,EAAE,cAAc,KAAK,IAAI,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;IAC1D,SAAS,CAAC,EAAE,CAAC,OAAO,EAAE,OAAO,KAAK,IAAI,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;IACvD,YAAY,CAAC,EAAE,MAAM,SAAS,WAAW,EAAE,CAAC;IAC5C,OAAO,EAAE,YAAY,CAAC;CACzB;AAED,MAAM,MAAM,cAAc,GACpB,qBAAqB,GACrB;IACI,IAAI,EAAE,2BAA2B,CAAC;IAClC,SAAS,EAAE,MAAM,CAAC;CACrB,GACD;IACI,IAAI,EAAE,sBAAsB,CAAC;IAC7B,QAAQ,EAAE,gBAAgB,CAAC;CAC9B,GACD;IACI,IAAI,EAAE,oBAAoB,CAAC;IAC3B,MAAM,EAAE,IAAI,CAAC,eAAe,EAAE,SAAS,GAAG,SAAS,GAAG,YAAY,GAAG,UAAU,GAAG,MAAM,CAAC,CAAC;CAC7F,GACD;IACI,IAAI,EAAE,yBAAyB,CAAC;IAChC,OAAO,EAAE,MAAM,CAAC;IAChB,UAAU,EAAE,MAAM,CAAC;CACtB,CAAC;AAER,MAAM,WAAW,eAAe;IAC5B,QAAQ,EAAE,SAAS,OAAO,EAAE,CAAC;IAC7B,eAAe,EAAE,SAAS,OAAO,EAAE,CAAC;IACpC,UAAU,EAAE,UAAU,CAAC;CAC1B;AAED,wBAAsB,YAAY,CAAC,OAAO,EAAE,mBAAmB,GAAG,OAAO,CAAC,eAAe,CAAC,CAwOzF"}

package/dist/agent/loop.js

@@ -5,12 +5,14 @@ import { isInvalidImageRequestError } from "./isInvalidImageRequestError.js";
 import { prepareProviderMessageImages } from "./prepareProviderMessageImages.js";
 import { replaceLastTurnToolResultImages } from "./replaceLastTurnToolResultImages.js";
 import { createSystemPrompt } from "./createSystemPrompt.js";
+import { requestAutoPermissionApproval, reviewAutoPermission, shouldElevateToolInAutoMode, shouldReviewToolInAutoMode, summarizePermissionAction, } from "../permissions/index.js";
 export async function runAgentLoop(options) {
     const model = findModel(options.provider, options.modelId);
     const idFactory = options.idFactory ?? createId;
     const now = options.now ?? Date.now;
     const transcript = [...options.messages];
-    const providerMessages = toProviderMessages(options.messages, {
+    const contextTranscript = [...(options.contextMessages ?? options.messages)];
+    const providerMessages = toProviderMessages(contextTranscript, {
         model,
         now,
         providerId: options.provider.id,
@@ -19,7 +21,7 @@ export async function runAgentLoop(options) {
         provider: options.provider,
         model,
         ...(options.instructions !== undefined ? { instructions: options.instructions } : {}),
-        messages: options.messages,
+        messages: contextTranscript,
         context: options.context,
     });
     const providerTools = options.tools.map(toProviderTool);
@@ -28,7 +30,11 @@ export async function runAgentLoop(options) {
     let iteration = 0;
     for (;;) {
         if (options.signal?.aborted) {
-            return { messages: transcript, stopReason: "aborted" };
+            return {
+                messages: transcript,
+                contextMessages: contextTranscript,
+                stopReason: "aborted",
+            };
         }
         iteration += 1;
         await options.onEvent?.({
@@ -60,12 +66,17 @@ export async function runAgentLoop(options) {
         }
         catch (error) {
             if (options.signal?.aborted) {
-                return { messages: transcript, stopReason: "aborted" };
+                return {
+                    messages: transcript,
+                    contextMessages: contextTranscript,
+                    stopReason: "aborted",
+                };
             }
             if (isInvalidImageRequestError(error)) {
                 const replacements = replaceLastTurnToolResultImages(transcript, "Invalid image");
                 if (replacements.length > 0) {
-                    providerMessages.splice(0, providerMessages.length, ...toProviderMessages(transcript, {
+                    replaceLastTurnToolResultImages(contextTranscript, "Invalid image");
+                    providerMessages.splice(0, providerMessages.length, ...toProviderMessages(contextTranscript, {
                         model,
                         now,
                         providerId: options.provider.id,
@@ -81,7 +92,8 @@ export async function runAgentLoop(options) {
         if (isInvalidImageRequestError(assistantMessage)) {
             const replacements = replaceLastTurnToolResultImages(transcript, "Invalid image");
             if (replacements.length > 0) {
-                providerMessages.splice(0, providerMessages.length, ...toProviderMessages(transcript, {
+                replaceLastTurnToolResultImages(contextTranscript, "Invalid image");
+                providerMessages.splice(0, providerMessages.length, ...toProviderMessages(contextTranscript, {
                     model,
                     now,
                     providerId: options.provider.id,
@@ -101,34 +113,77 @@ export async function runAgentLoop(options) {
         providerMessages.push(assistantMessage);
         const agentMessage = assistantMessageToAgentMessage(assistantMessage, idFactory);
         transcript.push(agentMessage);
+        contextTranscript.push(agentMessage);
         await options.onMessage?.(agentMessage);
-        if (assistantMessage.stopReason === "aborted" ||
-            assistantMessage.stopReason === "error" ||
-            assistantMessage.stopReason !== "toolUse") {
+        if (assistantMessage.stopReason === "aborted" || assistantMessage.stopReason === "error") {
             return {
                 messages: transcript,
+                contextMessages: contextTranscript,
+                stopReason: assistantMessage.stopReason,
+            };
+        }
+        if (assistantMessage.stopReason !== "toolUse") {
+            if (appendSteering(options, transcript, contextTranscript, providerMessages, now) > 0) {
+                continue;
+            }
+            return {
+                messages: transcript,
+                contextMessages: contextTranscript,
                 stopReason: assistantMessage.stopReason,
             };
         }
         const toolCalls = assistantMessage.content.filter(isProviderToolCall);
         if (toolCalls.length === 0) {
-            return { messages: transcript, stopReason: assistantMessage.stopReason };
+            return {
+                messages: transcript,
+                contextMessages: contextTranscript,
+                stopReason: assistantMessage.stopReason,
+            };
         }
         if (options.signal?.aborted) {
             return appendInterruptedToolResults({
                 toolCalls,
                 transcript,
+                contextTranscript,
                 providerMessages,
                 idFactory,
                 now,
                 onMessage: options.onMessage,
             });
         }
-        const toolResultBlocks = await Promise.all(toolCalls.map((toolCall) => executeToolCall(toolCall, toolsByName, toolContext, options.signal)));
+        const toolResultBlocks = await Promise.all(toolCalls.map(async (toolCall) => {
+            await options.onEvent?.({ type: "tool_execution_start", toolCall });
+            const result = await executeToolCall(toolCall, toolsByName, toolContext, {
+                messages: contextTranscript,
+                model,
+                now,
+                onProgress: (display) => {
+                    void options.onEvent?.({
+                        type: "tool_execution_progress",
+                        display,
+                        toolCallId: toolCall.id,
+                    });
+                },
+                provider: options.provider,
+                ...(options.signal === undefined ? {} : { signal: options.signal }),
+            });
+            await options.onEvent?.({
+                type: "tool_execution_end",
+                result: {
+                    type: "tool_result",
+                    toolCallId: result.toolCallId,
+                    toolName: result.toolName,
+                    display: result.display,
+                    ...(result.isError === undefined ? {} : { isError: result.isError }),
+                },
+            });
+            return result;
+        }));
         if (options.signal?.aborted) {
             return appendInterruptedToolResults({
                 toolCalls,
                 transcript,
+                contextTranscript,
                 providerMessages,
                 idFactory,
                 now,
@@ -144,9 +199,20 @@ export async function runAgentLoop(options) {
             blocks: toolResultBlocks,
         };
         transcript.push(toolResultMessage);
+        contextTranscript.push(toolResultMessage);
         await options.onMessage?.(toolResultMessage);
+        appendSteering(options, transcript, contextTranscript, providerMessages, now);
     }
 }
+function appendSteering(options, transcript, contextTranscript, providerMessages, now) {
+    const steering = options.takeSteering?.() ?? [];
+    for (const message of steering) {
+        transcript.push(message);
+        contextTranscript.push(message);
+        providerMessages.push(toProviderUserMessage(message, now));
+    }
+    return steering.length;
+}
 async function appendInterruptedToolResults(options) {
     const toolResultBlocks = options.toolCalls.map(interruptedToolResultBlock);
     for (const resultBlock of toolResultBlocks) {
@@ -158,9 +224,11 @@ async function appendInterruptedToolResults(options) {
         blocks: toolResultBlocks,
     };
     options.transcript.push(toolResultMessage);
+    options.contextTranscript.push(toolResultMessage);
     await options.onMessage?.(toolResultMessage);
     return {
         messages: options.transcript,
+        contextMessages: options.contextTranscript,
         stopReason: "aborted",
     };
 }
@@ -294,7 +362,7 @@ function toProviderToolResultMessage(block, now) {
         timestamp: now(),
     };
 }
-async function executeToolCall(toolCall, toolsByName, context, signal) {
+async function executeToolCall(toolCall, toolsByName, context, options) {
     const tool = toolsByName.get(toolCall.name);
     if (!tool) {
         return errorToolResultBlock(toolCall, `Unknown tool '${toolCall.name}' requested by model`);
@@ -303,15 +371,47 @@ async function executeToolCall(toolCall, toolsByName, context, signal) {
         return errorToolResultBlock(toolCall, `Invalid arguments for tool '${tool.name}'`);
     }
     try {
+        let runWithFullAccess = false;
+        if (context.permissions?.mode === "auto" &&
+            (await shouldReviewToolInAutoMode(tool.name, toolCall.arguments, context.fs.cwd))) {
+            const review = await reviewAutoPermission({
+                args: toolCall.arguments,
+                messages: options.messages,
+                model: options.model,
+                now: options.now,
+                provider: options.provider,
+                ...(options.signal === undefined ? {} : { signal: options.signal }),
+                toolName: tool.name,
+            });
+            if (review.decision === "ask") {
+                const action = summarizePermissionAction(tool.name, toolCall.arguments);
+                const approved = await requestAutoPermissionApproval({
+                    action,
+                    reason: review.reason,
+                    ...(options.signal === undefined ? {} : { signal: options.signal }),
+                    toolCallId: toolCall.id,
+                    userInput: context.userInput,
+                });
+                if (!approved) {
+                    return errorToolResultBlock(toolCall, `Auto mode did not approve ${action}. Reason: ${review.reason}`);
+                }
+            }
+            runWithFullAccess = await shouldElevateToolInAutoMode(tool.name, toolCall.arguments, context.fs.cwd);
+        }
         const execute = tool.execute;
         const toLLM = tool.toLLM;
         const toUI = tool.toUI;
         const executionOptions = {
             toolCallId: toolCall.id,
         };
-        if (signal !== undefined)
-            executionOptions.signal = signal;
-        const result = await execute(toolCall.arguments, context, executionOptions);
+        if (options.onProgress !== undefined)
+            executionOptions.onProgress = options.onProgress;
+        if (options.signal !== undefined)
+            executionOptions.signal = options.signal;
+        const run = () => execute(toolCall.arguments, context, executionOptions);
+        const result = runWithFullAccess && context.permissions !== undefined
+            ? await context.permissions.runWithMode("full_access", run)
+            : await run();
         return {
             type: "tool_result",
             toolCallId: toolCall.id,

package/dist/agent/printAgentMessageToConsole.d.ts

@@ -1,5 +1,6 @@
 import type { Message } from "./types.js";
 export interface AgentConsole {
+    error?(...data: unknown[]): void;
     log(...data: unknown[]): void;
 }
 export declare function printAgentMessageToConsole(message: Message, output?: AgentConsole): void;