veryfront 0.1.600 → 0.1.602

package/esm/src/discovery/import-rewriter.js

@@ -60,6 +60,51 @@ function rewriteDenoCompiledVeryfrontImports(code) {
     }
     return transformed;
 }
+/**
+ * True for bare npm imports that need an `npm:` prefix for Deno to resolve
+ * them when the discovery module is loaded from a temp directory. Excludes
+ * relative paths, absolute URLs, Node built-ins, and the veryfront package
+ * (handled by the dedicated rewrites above).
+ */
+function isUnprefixedNpmSpecifier(specifier) {
+    if (!specifier)
+        return false;
+    if (specifier.startsWith(".") || specifier.startsWith("/"))
+        return false;
+    if (specifier.startsWith("npm:") || specifier.startsWith("jsr:"))
+        return false;
+    if (specifier.startsWith("node:"))
+        return false;
+    if (specifier.startsWith("file:") ||
+        specifier.startsWith("http:") ||
+        specifier.startsWith("https:"))
+        return false;
+    if (specifier === "veryfront" || specifier.startsWith("veryfront/"))
+        return false;
+    return true;
+}
+// `import type` / `export type` lines reference types only; they get erased
+// by TypeScript and must not trigger filesystem resolution.
+const TYPE_ONLY_STATIC_RE = /(?:^|[\s;{}])(?:import|export)\s+type\b/;
+function rewriteBareNpmImportsForDeno(code) {
+    return code
+        // `import x from "spec"`, `export { x } from "spec"`, `export * from "spec"`.
+        // The leading-context capture lets us skip `import type` / `export type`.
+        .replace(/(^|[\s;{}])((?:import|export)\b[^"']*?\bfrom\s+)["']([^"']+)["']/g, (match, lead, head, specifier) => {
+        if (TYPE_ONLY_STATIC_RE.test(lead + head))
+            return match;
+        return isUnprefixedNpmSpecifier(specifier) ? `${lead}${head}"npm:${specifier}"` : match;
+    })
+        .replace(/import\s*\(\s*["']([^"']+)["']\s*\)/g, (match, specifier) => {
+        return isUnprefixedNpmSpecifier(specifier) ? `import("npm:${specifier}")` : match;
+    })
+        // Side-effect-only imports: `import "reflect-metadata";`, `import "dotenv/config";`.
+        .replace(/(^|[\n;{}])(\s*)import\s+["']([^"']+)["'](\s*;?)/g, (match, lead, indent, specifier, tail) => {
+        return isUnprefixedNpmSpecifier(specifier)
+            ? `${lead}${indent}import "npm:${specifier}"${tail}`
+            : match;
+    });
+}
 /**
  * Rewrite imports for Deno runtime
  * - Converts npm package imports to npm: specifier format
@@ -67,14 +112,7 @@ function rewriteDenoCompiledVeryfrontImports(code) {
  * - For compiled binaries, rewrites veryfront imports to use globals
  */
 export function rewriteForDeno(code, fileDir, options = {}) {
-    const npmReplacements = [
-        [/from\s+["']zod["']/g, 'from "npm:zod"'],
-        [/import\s*\(\s*["']zod["']\s*\)/g, 'import("npm:zod")'],
-    ];
     let transformed = code;
-    for (const [pattern, replacement] of npmReplacements) {
-        transformed = transformed.replace(pattern, replacement);
-    }
     // Handle relative imports
     transformed = transformed.replace(/from\s+["'](\.\.\/[^"']+)["']/g, (_match, relativePath) => `from "file://${pathHelper.resolve(fileDir, relativePath)}"`);
     // For compiled binaries, rewrite veryfront imports to use globals
@@ -85,8 +123,89 @@ export function rewriteForDeno(code, fileDir, options = {}) {
     else {
         transformed = rewriteDenoPublicVeryfrontImports(transformed, options.resolveSpecifier ?? ((specifier) => globalThis[Symbol.for("import-meta-ponyfill-esmodule")](import.meta).resolve(specifier)));
     }
+    // Prefix any remaining bare npm specifiers with `npm:` so Deno can resolve
+    // them from the temp directory the discovery module is loaded from. Covers
+    // `zod` plus arbitrary npm packages a tool/agent depends on, after the
+    // discovery bundler externalizes them via `packages: "external"`.
+    transformed = rewriteBareNpmImportsForDeno(transformed);
     return transformed;
 }
+// Memoizes resolved bare-specifier → file:// URL lookups across all
+// `rewriteDiscoveryImports` calls. Keyed by `${projectDir}::${specifier}`.
+// Most projects re-resolve the same handful of packages (react, zod,
+// pdf-parse, …) across every discovered tool/agent file — without this
+// cache, each discovery pass re-reads the same package.json files.
+const resolvedSpecifierCache = new Map();
+// Split `react/jsx-runtime` → { name: "react", subpath: "./jsx-runtime" } and
+// `@scope/pkg/sub/path` → { name: "@scope/pkg", subpath: "./sub/path" }.
+function splitPackageSubpath(specifier) {
+    const parts = specifier.split("/");
+    const segments = specifier.startsWith("@") ? parts.slice(0, 2) : parts.slice(0, 1);
+    const name = segments.join("/");
+    const rest = parts.slice(segments.length).join("/");
+    return { name, subpath: rest ? `./${rest}` : "." };
+}
+// Pick the relative file path from a `package.json#exports` entry, which can
+// be a string, a conditional object (`{ import, default, ... }`), or an
+// array of those.
+function pickExportEntry(entry) {
+    if (typeof entry === "string")
+        return entry;
+    if (Array.isArray(entry)) {
+        for (const e of entry) {
+            const v = pickExportEntry(e);
+            if (v)
+                return v;
+        }
+        return null;
+    }
+    if (entry && typeof entry === "object") {
+        const obj = entry;
+        const candidate = obj.import ?? obj.node ?? obj.default;
+        return candidate ? pickExportEntry(candidate) : null;
+    }
+    return null;
+}
+// Resolve a subpath (`.` or `./foo/bar`) against a `package.json#exports`
+// map. Honors literal keys first, then matches `./*`-style glob patterns
+// where the trailing `*` is substituted with the captured remainder.
+// Returns the resolved relative path (e.g. `./debounce.js`) or null when
+// no entry matches.
+function resolveExportPath(exports, subpath) {
+    if (!exports || typeof exports !== "object")
+        return null;
+    const map = exports;
+    // Literal key (covers "." and exact subpaths like "./jsx-runtime").
+    if (subpath in map)
+        return pickExportEntry(map[subpath]);
+    // Glob keys like "./*", "./feature/*", "./lib/*.js". Pick the longest
+    // matching prefix so more specific patterns win over `./*`.
+    let bestKey = null;
+    let bestPrefixLen = -1;
+    for (const key of Object.keys(map)) {
+        const star = key.indexOf("*");
+        if (star === -1)
+            continue;
+        const prefix = key.slice(0, star);
+        const suffix = key.slice(star + 1);
+        if (!subpath.startsWith(prefix) || !subpath.endsWith(suffix))
+            continue;
+        if (subpath.length < prefix.length + suffix.length)
+            continue;
+        if (prefix.length > bestPrefixLen) {
+            bestKey = key;
+            bestPrefixLen = prefix.length;
+        }
+    }
+    if (!bestKey)
+        return null;
+    const star = bestKey.indexOf("*");
+    const captured = subpath.slice(bestKey.slice(0, star).length, subpath.length - bestKey.slice(star + 1).length);
+    const template = pickExportEntry(map[bestKey]);
+    if (!template)
+        return null;
+    return template.replaceAll("*", captured);
+}
 /**
  * Rewrite imports for Node.js runtime
  * - Resolves relative imports to file:// URLs
@@ -99,20 +218,47 @@ export async function rewriteDiscoveryImports(code, projectDir, fs, fileDir) {
         const { pathToFileURL } = await import("node:url");
         // Handle relative imports
         transformed = transformed.replace(/from\s+["'](\.\.\/[^"']+)["']/g, (_match, relativePath) => `from "${pathToFileURL(pathHelper.resolve(fileDir, relativePath)).href}"`);
-        // Resolve npm package to file URL
-        const resolvePackageToFileUrl = async (packageName) => {
+        // Resolve a bare specifier (optionally with subpath) to a file:// URL,
+        // honoring the package's `exports` map for subpath imports such as
+        // `react/jsx-runtime` or `lodash-es/debounce`. Successful resolutions
+        // are memoized per (projectDir, specifier); failures are NOT cached
+        // so a subsequent `npm install` of the missing dep is picked up
+        // without a process restart.
+        const resolvePackageToFileUrl = async (specifier) => {
+            const cacheKey = `${projectDir}::${specifier}`;
+            const cached = resolvedSpecifierCache.get(cacheKey);
+            if (cached !== undefined)
+                return cached;
+            const { name: packageName, subpath } = splitPackageSubpath(specifier);
             let searchDir = projectDir;
             for (let i = 0; i < 10; i++) {
                 const packagePath = pathHelper.join(searchDir, "node_modules", packageName);
                 const packageJsonPath = pathHelper.join(packagePath, "package.json");
                 try {
                     const pkgJson = JSON.parse(await fs.readTextFile(packageJsonPath));
-                    const dotExport = pkgJson.exports?.["."];
-                    const entryPoint = (typeof dotExport === "string" ? dotExport : dotExport?.import ?? dotExport?.default) ??
-                        pkgJson.module ??
-                        pkgJson.main ??
-                        "index.js";
-                    return pathToFileURL(pathHelper.join(packagePath, entryPoint)).href;
+                    const exportPath = resolveExportPath(pkgJson.exports, subpath);
+                    const entryPoint = exportPath ??
+                        (subpath === "."
+                            ? (pkgJson.module ?? pkgJson.main ?? "index.js")
+                            // No exports entry matched: fall back to joining the subpath
+                            // onto the package dir (e.g. `dotenv/config.js`).
+                            : subpath.replace(/^\.\//, ""));
+                    // Defense in depth: refuse resolved paths that escape the package
+                    // directory. A malicious package shipping `exports: { ".": "../foo" }`
+                    // would otherwise yield a `file://` URL outside `node_modules/<pkg>`
+                    // that the discovery loader would still `import()`. `path.resolve`
+                    // (unlike `path.join`) normalizes `..` segments, so the prefix
+                    // check correctly catches escape attempts.
+                    const normalized = pathHelper.resolve(packagePath, entryPoint);
+                    const packagePathPrefix = packagePath.endsWith(pathHelper.SEPARATOR)
+                        ? packagePath
+                        : packagePath + pathHelper.SEPARATOR;
+                    if (normalized !== packagePath && !normalized.startsWith(packagePathPrefix)) {
+                        return null;
+                    }
+                    const resolved = pathToFileURL(normalized).href;
+                    resolvedSpecifierCache.set(cacheKey, resolved);
+                    return resolved;
                 }
                 catch (_) {
                     /* expected: package.json not found at this level, walk up */
@@ -122,26 +268,66 @@ export async function rewriteDiscoveryImports(code, projectDir, fs, fileDir) {
                     searchDir = parent;
                 }
             }
+            // Intentionally do NOT cache nulls — a missing-then-installed package
+            // should be resolvable on the next pass without a process restart.
             return null;
         };
-        // Rewrite package imports
-        const rewritePackageImports = async (input, pkg) => {
-            const escapedPkg = pkg.replace(/[.*+?^${}()|[\]\\]/g, "\\$&");
-            const staticImportRegex = new RegExp(`from\\s*["']${escapedPkg}["']`, "g");
+        const rewritePackageImports = (input, pkg, resolvedUrl) => {
+            const escapedPkg = escapeRegExp(pkg);
+            const staticImportRegex = new RegExp(`(^|[\\s;{}])((?:import|export)\\b[^"']*?\\bfrom\\s+)["']${escapedPkg}["']`, "g");
             const dynamicImportRegex = new RegExp(`import\\s*\\(\\s*["']${escapedPkg}["']\\s*\\)`, "g");
-            if (!staticImportRegex.test(input) && !dynamicImportRegex.test(input))
-                return input;
-            const resolvedUrl = await resolvePackageToFileUrl(pkg);
-            if (!resolvedUrl)
-                return input;
+            const sideEffectRegex = new RegExp(`(^|[\\n;{}])(\\s*)import\\s+["']${escapedPkg}["'](\\s*;?)`, "g");
             return input
-                .replace(staticImportRegex, `from "${resolvedUrl}"`)
-                .replace(dynamicImportRegex, `import("${resolvedUrl}")`);
+                .replace(staticImportRegex, (match, lead, head) => {
+                if (TYPE_ONLY_STATIC_RE.test(lead + head))
+                    return match;
+                return `${lead}${head}"${resolvedUrl}"`;
+            })
+                .replace(dynamicImportRegex, `import("${resolvedUrl}")`)
+                .replace(sideEffectRegex, (_m, lead, indent, tail) => `${lead}${indent}import "${resolvedUrl}"${tail}`);
+        };
+        // Collect every bare specifier the transformed source still imports,
+        // then resolve each to a file:// URL in the project's node_modules.
+        // With `packages: "external"` in the discovery bundler, npm packages a
+        // tool/agent depends on (e.g. `pdf-parse`, `mammoth`, `react/jsx-runtime`)
+        // survive as bare imports here and need explicit resolution before the
+        // temp module is loaded from outside the project's resolution root.
+        const collectBareSpecifiers = (input) => {
+            const specifiers = new Set();
+            // Matches `import x from "spec"`, `export { x } from "spec"`,
+            // `export * from "spec"`. The leading-context capture lets us skip
+            // `import type` / `export type` lines, which TypeScript erases at
+            // emit time and must not trigger filesystem resolution.
+            for (const match of input.matchAll(/(?:^|[\s;{}])((?:import|export)\b[^"']*?\bfrom\s+)["']([^"']+)["']/g)) {
+                const head = match[1] ?? "";
+                const s = match[2];
+                if (TYPE_ONLY_STATIC_RE.test(head))
+                    continue;
+                if (s && isUnprefixedNpmSpecifier(s))
+                    specifiers.add(s);
+            }
+            for (const match of input.matchAll(/import\s*\(\s*["']([^"']+)["']\s*\)/g)) {
+                const s = match[1];
+                if (s && isUnprefixedNpmSpecifier(s))
+                    specifiers.add(s);
+            }
+            // Side-effect imports: `import "reflect-metadata";`, `import "dotenv/config";`.
+            for (const match of input.matchAll(/(?:^|[\n;{}])\s*import\s+["']([^"']+)["']\s*;?/g)) {
+                const s = match[1];
+                if (s && isUnprefixedNpmSpecifier(s))
+                    specifiers.add(s);
+            }
+            return [...specifiers];
         };
-        // Rewrite external package imports
-        const externalPackages = ["zod"];
-        for (const pkg of externalPackages) {
-            transformed = await rewritePackageImports(transformed, pkg);
+        // Resolve every bare specifier in parallel — each lookup is independent
+        // node_modules I/O. Apply the resulting rewrites sequentially against
+        // the same source string.
+        const specifiers = collectBareSpecifiers(transformed);
+        const resolvedPairs = await Promise.all(specifiers.map(async (pkg) => [pkg, await resolvePackageToFileUrl(pkg)]));
+        for (const [pkg, resolvedUrl] of resolvedPairs) {
+            if (!resolvedUrl)
+                continue;
+            transformed = rewritePackageImports(transformed, pkg, resolvedUrl);
         }
         const resolveRuntimeSpecifierToFileUrl = (specifier) => {
             try {

package/esm/src/discovery/transpiler.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"transpiler.d.ts","sourceRoot":"","sources":["../../../src/src/discovery/transpiler.ts"],"names":[],"mappings":"AAeA,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,YAAY,CAAC;AAmIvD;;GAEG;AACH,wBAAsB,YAAY,CAChC,IAAI,EAAE,MAAM,EACZ,OAAO,EAAE,oBAAoB,GAC5B,OAAO,CAAC,OAAO,CAAC,CAwFlB;AAED;;GAEG;AACH,wBAAgB,mBAAmB,IAAI,IAAI,CAE1C"}
+{"version":3,"file":"transpiler.d.ts","sourceRoot":"","sources":["../../../src/src/discovery/transpiler.ts"],"names":[],"mappings":"AAeA,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,YAAY,CAAC;AAmIvD;;GAEG;AACH,wBAAsB,YAAY,CAChC,IAAI,EAAE,MAAM,EACZ,OAAO,EAAE,oBAAoB,GAC5B,OAAO,CAAC,OAAO,CAAC,CAgGlB;AAED;;GAEG;AACH,wBAAgB,mBAAmB,IAAI,IAAI,CAE1C"}

package/esm/src/discovery/transpiler.js

@@ -160,6 +160,14 @@ export async function importModule(file, context) {
         jsxImportSource: "react",
         resolveExtensions: [".ts", ".tsx", ".js", ".jsx", ".mjs"],
         plugins,
+        // Externalize all bare-specifier imports so npm packages a tool/agent file
+        // depends on (e.g. `pdf-parse`, `mammoth`) are not pulled into the
+        // discovery bundle. Discovery only needs the module's exports; the
+        // implementation runs server-side at request time and can resolve npm
+        // packages natively via the project's node_modules / import map.
+        // Without this, esbuild under platform: "neutral" tries to bundle CJS
+        // npm packages and fails on their Node built-in references (fs, http, ...).
+        packages: "external",
         external: [
             "zod",
             "node:*",

package/esm/src/internal-agents/run-stream.d.ts

@@ -1,8 +1,16 @@
 import { type Agent, type AgentMessage as Message, type AgentResponse } from "../agent/index.js";
+import type { AgentServiceSandboxToolsOptions, AgentServiceSandboxToolsResult } from "../sandbox/index.js";
 import { type AgentRunSessionManager } from "./session-manager.js";
 import type { RuntimeRunAgentInput } from "./schema.js";
 export interface RuntimeAgentStreamExecutionDeps {
     sessionManager: AgentRunSessionManager;
+    projectAgentSandbox?: {
+        apiUrl?: string;
+        authToken?: string;
+        projectId?: string | null;
+    };
+    createBashTool?: AgentServiceSandboxToolsOptions["createBashTool"];
+    createAgentServiceSandboxTools?: (input: AgentServiceSandboxToolsOptions) => Promise<AgentServiceSandboxToolsResult>;
     createRuntime?: (agent: Agent, mergedTools: Agent["config"]["tools"]) => {
         stream: (messages: Message[], context?: Record<string, unknown>, callbacks?: {
             onFinish?: (response: AgentResponse) => void;

package/esm/src/internal-agents/run-stream.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"run-stream.d.ts","sourceRoot":"","sources":["../../../src/src/internal-agents/run-stream.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,KAAK,KAAK,EACV,KAAK,YAAY,IAAI,OAAO,EAC5B,KAAK,aAAa,EAEnB,MAAM,mBAAmB,CAAC;AAa3B,OAAO,EAA0B,KAAK,sBAAsB,EAAE,MAAM,sBAAsB,CAAC;AAC3F,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,aAAa,CAAC;AAkBxD,MAAM,WAAW,+BAA+B;IAC9C,cAAc,EAAE,sBAAsB,CAAC;IACvC,aAAa,CAAC,EAAE,CACd,KAAK,EAAE,KAAK,EACZ,WAAW,EAAE,KAAK,CAAC,QAAQ,CAAC,CAAC,OAAO,CAAC,KAClC;QACH,MAAM,EAAE,CACN,QAAQ,EAAE,OAAO,EAAE,EACnB,OAAO,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,EACjC,SAAS,CAAC,EAAE;YACV,QAAQ,CAAC,EAAE,CAAC,QAAQ,EAAE,aAAa,KAAK,IAAI,CAAC;SAC9C,EACD,aAAa,CAAC,EAAE,MAAM,EACtB,uBAAuB,CAAC,EAAE,MAAM,EAChC,WAAW,CAAC,EAAE,WAAW,KACtB,OAAO,CAAC,cAAc,CAAC,UAAU,CAAC,CAAC,CAAC;KAC1C,CAAC;CACH;AAkJD,wBAAsB,gCAAgC,CACpD,KAAK,EAAE,oBAAoB,EAC3B,KAAK,EAAE,KAAK,EACZ,IAAI,EAAE,+BAA+B,GACpC,OAAO,CAAC,QAAQ,CAAC,CAwPnB"}
+{"version":3,"file":"run-stream.d.ts","sourceRoot":"","sources":["../../../src/src/internal-agents/run-stream.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,KAAK,KAAK,EACV,KAAK,YAAY,IAAI,OAAO,EAC5B,KAAK,aAAa,EAEnB,MAAM,mBAAmB,CAAC;AAE3B,OAAO,KAAK,EACV,+BAA+B,EAC/B,8BAA8B,EAC/B,MAAM,qBAAqB,CAAC;AAkB7B,OAAO,EAA0B,KAAK,sBAAsB,EAAE,MAAM,sBAAsB,CAAC;AAC3F,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,aAAa,CAAC;AAmBxD,MAAM,WAAW,+BAA+B;IAC9C,cAAc,EAAE,sBAAsB,CAAC;IACvC,mBAAmB,CAAC,EAAE;QACpB,MAAM,CAAC,EAAE,MAAM,CAAC;QAChB,SAAS,CAAC,EAAE,MAAM,CAAC;QACnB,SAAS,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;KAC3B,CAAC;IACF,cAAc,CAAC,EAAE,+BAA+B,CAAC,gBAAgB,CAAC,CAAC;IACnE,8BAA8B,CAAC,EAAE,CAC/B,KAAK,EAAE,+BAA+B,KACnC,OAAO,CAAC,8BAA8B,CAAC,CAAC;IAC7C,aAAa,CAAC,EAAE,CACd,KAAK,EAAE,KAAK,EACZ,WAAW,EAAE,KAAK,CAAC,QAAQ,CAAC,CAAC,OAAO,CAAC,KAClC;QACH,MAAM,EAAE,CACN,QAAQ,EAAE,OAAO,EAAE,EACnB,OAAO,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,EACjC,SAAS,CAAC,EAAE;YACV,QAAQ,CAAC,EAAE,CAAC,QAAQ,EAAE,aAAa,KAAK,IAAI,CAAC;SAC9C,EACD,aAAa,CAAC,EAAE,MAAM,EACtB,uBAAuB,CAAC,EAAE,MAAM,EAChC,WAAW,CAAC,EAAE,WAAW,KACtB,OAAO,CAAC,cAAc,CAAC,UAAU,CAAC,CAAC,CAAC;KAC1C,CAAC;CACH;AAmOD,wBAAsB,gCAAgC,CACpD,KAAK,EAAE,oBAAoB,EAC3B,KAAK,EAAE,KAAK,EACZ,IAAI,EAAE,+BAA+B,GACpC,OAAO,CAAC,QAAQ,CAAC,CAwQnB"}

package/esm/src/internal-agents/run-stream.js

@@ -1,5 +1,8 @@
 import { AgentRuntime, } from "../agent/index.js";
 import { normalizeAgUiRuntimeMessages } from "../agent/ag-ui/runtime-support.js";
+import { createAgentServiceSandboxTools } from "../sandbox/index.js";
+import { tryResolve } from "../extensions/contracts.js";
+import { SandboxShellToolsProviderName, } from "../extensions/sandbox/index.js";
 import { SKILL_TOOL_IDS } from "../skill/types.js";
 import { toolRegistry } from "../tool/index.js";
 import { defineSchema, lazySchema } from "../schemas/index.js";
@@ -9,6 +12,7 @@ import { serverLogger } from "../utils/index.js";
 const getAnyObjectSchema = defineSchema((v) => v.record(v.string(), v.unknown()));
 const anyObjectSchema = lazySchema(getAnyObjectSchema);
 const logger = serverLogger.component("internal-agent-run-stream");
+const PROJECT_AGENT_SANDBOX_BASH_TOOL_NAME = "bash";
 function getAgentAllowedRemoteToolNames(agent) {
     const raw = agent.config.allowedRemoteTools;
     return Array.isArray(raw) && raw.every((toolName) => typeof toolName === "string") ? raw : [];
@@ -37,7 +41,7 @@ function createInjectedStudioTool(runId, toolName, description, parameters, sess
         },
     };
 }
-function buildMergedTools(agent, input, sessionManager, availableForwardedToolNames) {
+function buildMergedTools(agent, input, sessionManager, availableForwardedToolNames, availableLocalTools) {
     const injectedTools = Object.fromEntries(input.tools.map((tool) => [
         tool.name,
         createInjectedStudioTool(input.runId, tool.name, tool.description, tool.inputSchema ?? tool.parameters, sessionManager),
@@ -63,9 +67,10 @@ function buildMergedTools(agent, input, sessionManager, availableForwardedToolNa
     for (const [toolName, entry] of Object.entries(agent.config.tools)) {
         if (entry === true) {
             if (toolRegistry.get(toolName) ||
+                availableLocalTools?.[toolName] ||
                 availableForwardedToolNames?.includes(toolName) ||
                 sourceAllowedRemoteToolNames.includes(toolName)) {
-                merged[toolName] = true;
+                merged[toolName] = availableLocalTools?.[toolName] ?? true;
             }
             continue;
         }
@@ -76,6 +81,69 @@ function buildMergedTools(agent, input, sessionManager, availableForwardedToolNa
     const filtered = { ...merged, ...injectedTools };
     return Object.keys(filtered).length > 0 ? filtered : undefined;
 }
+async function loadDefaultCreateBashTool() {
+    const provider = tryResolve(SandboxShellToolsProviderName);
+    if (provider)
+        return provider;
+    const { createBashSandboxShellToolsProvider } = await import("../../extensions/ext-sandbox-shell-tools/src/index.js");
+    return createBashSandboxShellToolsProvider;
+}
+function getStringProperty(value, keys) {
+    for (const key of keys) {
+        const candidate = value[key];
+        if (typeof candidate === "string" && candidate.trim()) {
+            return candidate.trim();
+        }
+    }
+    return undefined;
+}
+function getAgentSandboxConfig(agent) {
+    const config = agent.config;
+    if (!isRecord(config.sandbox)) {
+        return {};
+    }
+    return {
+        sandboxId: getStringProperty(config.sandbox, ["id", "sandboxId", "sessionId"]),
+        projectId: getStringProperty(config.sandbox, ["projectId"]),
+    };
+}
+function shouldExposeSandboxBash(agent) {
+    const tools = agent.config.tools;
+    return isRecord(tools) && tools[PROJECT_AGENT_SANDBOX_BASH_TOOL_NAME] === true;
+}
+async function buildProjectAgentSandboxTools(input) {
+    if (!shouldExposeSandboxBash(input.agent)) {
+        return {};
+    }
+    const sandboxConfig = getAgentSandboxConfig(input.agent);
+    const createBashTool = input.deps.createBashTool ?? await loadDefaultCreateBashTool();
+    const createSandboxTools = input.deps.createAgentServiceSandboxTools ??
+        createAgentServiceSandboxTools;
+    const sandboxResult = await createSandboxTools({
+        createBashTool,
+        ...(input.deps.projectAgentSandbox?.apiUrl
+            ? { apiUrl: input.deps.projectAgentSandbox.apiUrl }
+            : {}),
+        ...(input.deps.projectAgentSandbox?.authToken
+            ? { authToken: input.deps.projectAgentSandbox.authToken }
+            : {}),
+        ...(sandboxConfig.sandboxId
+            ? { sandboxId: sandboxConfig.sandboxId, deleteOnClose: false }
+            : {}),
+        getProjectId: () => sandboxConfig.projectId ?? input.deps.projectAgentSandbox?.projectId,
+    });
+    const bash = sandboxResult.tools[PROJECT_AGENT_SANDBOX_BASH_TOOL_NAME];
+    if (!bash) {
+        await sandboxResult.closeSandbox();
+        return {};
+    }
+    return {
+        tools: {
+            [PROJECT_AGENT_SANDBOX_BASH_TOOL_NAME]: bash,
+        },
+        closeSandbox: sandboxResult.closeSandbox,
+    };
+}
 function isRecord(value) {
     return typeof value === "object" && value !== null && !Array.isArray(value);
 }
@@ -126,7 +194,8 @@ export async function createRuntimeAgentStreamResponse(input, agent, deps) {
     const allowedRemoteToolNames = getAllowedRemoteToolNames(input.forwardedProps);
     const forwardedIntegrationToolDefs = getForwardedIntegrationToolDefinitions(input.forwardedProps);
     const availableForwardedToolNames = forwardedIntegrationToolDefs?.map((tool) => tool.name);
-    const mergedTools = buildMergedTools(agent, input, deps.sessionManager, availableForwardedToolNames);
+    const sandboxTools = await buildProjectAgentSandboxTools({ agent, deps });
+    const mergedTools = buildMergedTools(agent, input, deps.sessionManager, availableForwardedToolNames, sandboxTools.tools);
     const runtimeAgent = {
         ...agent,
         config: {
@@ -167,6 +236,13 @@ export async function createRuntimeAgentStreamResponse(input, agent, deps) {
     }
     catch (error) {
         deps.sessionManager.failRun(input.runId);
+        await sandboxTools.closeSandbox?.().catch((cleanupError) => {
+            logger.warn("Internal agent runtime sandbox cleanup failed after setup error", {
+                runId: input.runId,
+                agentId: agent.id,
+                error: cleanupError instanceof Error ? cleanupError.message : String(cleanupError),
+            });
+        });
         logger.error("Internal agent runtime stream setup failed", {
             runId: input.runId,
             threadId: input.threadId,
@@ -303,6 +379,13 @@ export async function createRuntimeAgentStreamResponse(input, agent, deps) {
                 if (clientAttached) {
                     controller.close();
                 }
+                await sandboxTools.closeSandbox?.().catch((cleanupError) => {
+                    logger.warn("Internal agent runtime sandbox cleanup failed", {
+                        runId: input.runId,
+                        agentId: agent.id,
+                        error: cleanupError instanceof Error ? cleanupError.message : String(cleanupError),
+                    });
+                });
                 logger.debug("Internal agent runtime stream response closed", {
                     runId: input.runId,
                     threadId: input.threadId,

package/esm/src/sandbox/lazy-sandbox.d.ts

@@ -1,6 +1,15 @@
 import { type BackgroundCommand, type BackgroundCommandOutput, type ExecOptions, type ExecResult, type ExecStreamEvent, type SandboxOptions } from "./types.js";
 /** Options accepted by lazy sandbox. */
 export interface LazySandboxOptions extends SandboxOptions {
+    /**
+     * Optional existing sandbox session to attach to instead of creating a new one.
+     * Attached sessions are detached, not deleted, on close unless deleteOnClose is true.
+     */
+    sandboxId?: string;
+    /** Optional known endpoint for sandboxId; avoids the initial control-plane lookup. */
+    sandboxEndpoint?: string;
+    /** Delete the sandbox when closing. Defaults to true for created sessions and false for sandboxId. */
+    deleteOnClose?: boolean;
     getProjectId?: () => string | null | undefined;
     startupTimeoutMs?: number;
     pollIntervalMs?: number;
@@ -23,6 +32,9 @@ export declare function resolveDefaultSandboxRuntimeEndpoint(input: {
 export declare class LazySandbox {
     private readonly apiUrl;
     private readonly authToken;
+    private readonly sandboxId;
+    private readonly sandboxEndpoint;
+    private readonly deleteOnClose;
     private readonly getProjectId;
     private readonly startupTimeoutMs;
     private readonly pollIntervalMs;
@@ -63,6 +75,8 @@ export declare class LazySandbox {
     get isActive(): boolean;
     private bootstrapSession;
     private resolveReadyEndpoint;
+    private attachExistingSession;
+    private getSession;
     private waitForReadySession;
     private touchSession;
     private startHeartbeatLoop;

package/esm/src/sandbox/lazy-sandbox.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"lazy-sandbox.d.ts","sourceRoot":"","sources":["../../../src/src/sandbox/lazy-sandbox.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"lazy-sandbox.d.ts","sourceRoot":"","sources":["../../../src/src/sandbox/lazy-sandbox.ts"],"names":[],"mappings":"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"}

package/esm/src/sandbox/lazy-sandbox.js

@@ -40,6 +40,9 @@ export function resolveDefaultSandboxRuntimeEndpoint(input) {
 export class LazySandbox {
     apiUrl;
     authToken;
+    sandboxId;
+    sandboxEndpoint;
+    deleteOnClose;
     getProjectId;
     startupTimeoutMs;
     pollIntervalMs;
@@ -62,6 +65,9 @@ export class LazySandbox {
     constructor(options = {}) {
         this.apiUrl = resolveSandboxApiUrl(options);
         this.authToken = resolveSandboxAuthToken(options);
+        this.sandboxId = options.sandboxId?.trim() || undefined;
+        this.sandboxEndpoint = options.sandboxEndpoint?.trim() || undefined;
+        this.deleteOnClose = options.deleteOnClose ?? !this.sandboxId;
         this.getProjectId = options.getProjectId ?? (() => options.projectId);
         this.startupTimeoutMs = options.startupTimeoutMs ?? DEFAULT_STARTUP_TIMEOUT_MS;
         this.pollIntervalMs = options.pollIntervalMs ?? DEFAULT_POLL_INTERVAL_MS;
@@ -313,7 +319,9 @@ export class LazySandbox {
                     this.resetSessionState();
                     return;
                 }
-                await this.deleteSession(currentSessionId);
+                if (this.deleteOnClose) {
+                    await this.deleteSession(currentSessionId);
+                }
                 this.resetSessionState(currentSessionId);
             })(),
         };
@@ -337,6 +345,10 @@ export class LazySandbox {
         return this.endpoint !== null;
     }
     async bootstrapSession() {
+        if (this.sandboxId) {
+            await this.attachExistingSession(this.sandboxId);
+            return;
+        }
         const projectId = this.resolveProjectId();
         const res = await this.fetchControl(`${this.apiUrl}/sandbox-sessions`, {
             method: "POST",
@@ -359,7 +371,7 @@ export class LazySandbox {
         }
         catch (error) {
             const currentSessionId = this.sessionId;
-            if (currentSessionId) {
+            if (currentSessionId && this.deleteOnClose) {
                 await this.deleteSession(currentSessionId);
             }
             this.resetSessionState(currentSessionId ?? undefined);
@@ -372,6 +384,34 @@ export class LazySandbox {
         }
         return (await this.waitForReadySession(session.id)).endpoint;
     }
+    async attachExistingSession(sessionId) {
+        const projectId = this.resolveProjectId();
+        this.sessionId = sessionId;
+        this.sessionProjectId = projectId;
+        try {
+            const session = this.sandboxEndpoint
+                ? { id: sessionId, endpoint: this.sandboxEndpoint, status: "running" }
+                : await this.getSession(sessionId);
+            this.endpoint = await this.resolveReadyEndpoint(session);
+            await this.heartbeat(true);
+            this.startHeartbeatLoop();
+        }
+        catch (error) {
+            this.resetSessionState(sessionId);
+            throw error;
+        }
+    }
+    async getSession(sessionId) {
+        const res = await this.fetchControl(`${this.apiUrl}/sandbox-sessions/${sessionId}`, {
+            headers: this.authHeaders(),
+        });
+        if (!res.ok) {
+            throw REQUEST_ERROR.create({
+                detail: `Failed to get sandbox: ${res.status} ${await res.text()}`,
+            });
+        }
+        return await res.json();
+    }
     async waitForReadySession(sessionId) {
         const start = Date.now();
         while (Date.now() - start < this.startupTimeoutMs) {
@@ -396,7 +436,7 @@ export class LazySandbox {
     }
     async touchSession() {
         const projectId = this.resolveProjectId();
-        if (this.endpoint && this.sessionProjectId !== projectId) {
+        if (!this.sandboxId && this.endpoint && this.sessionProjectId !== projectId) {
             const currentSessionId = this.sessionId;
             if (currentSessionId) {
                 await this.deleteSession(currentSessionId);
@@ -514,7 +554,9 @@ export class LazySandbox {
         const sessionId = this.sessionId;
         if (!sessionId)
             return;
-        await this.deleteSession(sessionId);
+        if (this.deleteOnClose) {
+            await this.deleteSession(sessionId);
+        }
         this.resetSessionState(sessionId);
     }
     resolveRuntimeEndpoint() {

package/esm/src/server/handlers/request/agent-stream.handler.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"agent-stream.handler.d.ts","sourceRoot":"","sources":["../../../../../src/src/server/handlers/request/agent-stream.handler.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,KAAK,yBAAyB,EAAE,MAAM,oCAAoC,CAAC;AACpF,OAAO,EAEL,KAAK,+BAA+B,EACrC,MAAM,wCAAwC,CAAC;AAChD,OAAO,EACL,4BAA4B,EAE7B,MAAM,2CAA2C,CAAC;AAwBnD,OAAO,EAAE,WAAW,EAAE,MAAM,qBAAqB,CAAC;AAClD,OAAO,KAAK,EAAE,cAAc,EAAE,eAAe,EAAmB,aAAa,EAAE,MAAM,aAAa,CAAC;AAUnG,MAAM,WAAW,sBACf,SAAQ,yBAAyB,EAAE,+BAA+B;IAClE,4BAA4B,CAAC,EAAE,OAAO,4BAA4B,CAAC;CACpE;AAyND,qBAAa,kBAAmB,SAAQ,WAAW;IASrC,OAAO,CAAC,QAAQ,CAAC,IAAI;IARjC,QAAQ,EAAE,eAAe,CAMvB;gBAE2B,IAAI,GAAE,sBAAoC;IAIvE,OAAO,CAAC,sBAAsB;IAwBxB,MAAM,CAAC,GAAG,EAAE,OAAO,EAAE,GAAG,EAAE,cAAc,GAAG,OAAO,CAAC,aAAa,CAAC;CAwJxE"}
+{"version":3,"file":"agent-stream.handler.d.ts","sourceRoot":"","sources":["../../../../../src/src/server/handlers/request/agent-stream.handler.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,KAAK,yBAAyB,EAAE,MAAM,oCAAoC,CAAC;AACpF,OAAO,EAEL,KAAK,+BAA+B,EACrC,MAAM,wCAAwC,CAAC;AAChD,OAAO,EACL,4BAA4B,EAE7B,MAAM,2CAA2C,CAAC;AAwBnD,OAAO,EAAE,WAAW,EAAE,MAAM,qBAAqB,CAAC;AAClD,OAAO,KAAK,EAAE,cAAc,EAAE,eAAe,EAAmB,aAAa,EAAE,MAAM,aAAa,CAAC;AAUnG,MAAM,WAAW,sBACf,SAAQ,yBAAyB,EAAE,+BAA+B;IAClE,4BAA4B,CAAC,EAAE,OAAO,4BAA4B,CAAC;CACpE;AAyND,qBAAa,kBAAmB,SAAQ,WAAW;IASrC,OAAO,CAAC,QAAQ,CAAC,IAAI;IARjC,QAAQ,EAAE,eAAe,CAMvB;gBAE2B,IAAI,GAAE,sBAAoC;IAIvE,OAAO,CAAC,sBAAsB;IAwBxB,MAAM,CAAC,GAAG,EAAE,OAAO,EAAE,GAAG,EAAE,cAAc,GAAG,OAAO,CAAC,aAAa,CAAC;CA+JxE"}