experimental-ash 0.6.1 → 0.7.0

package/dist/src/discover/filesystem.js

@@ -25,6 +25,15 @@ export const AGENT_ROOT_FILE_NAMES = [
     "agent.js",
     "agent.cjs",
     "agent.mjs",
+    "instructions.md",
+    "instructions.ts",
+    "instructions.cts",
+    "instructions.mts",
+    "instructions.js",
+    "instructions.cjs",
+    "instructions.mjs",
+    // The `system` files are deprecated and will be removed soon.
+    // TODO: Clean up in the near future.
     "system.md",
     "system.ts",
     "system.cts",
@@ -58,6 +67,15 @@ export const LOCAL_SUBAGENT_FILE_NAMES = [
     "agent.js",
     "agent.cjs",
     "agent.mjs",
+    "instructions.md",
+    "instructions.ts",
+    "instructions.cts",
+    "instructions.mts",
+    "instructions.js",
+    "instructions.cjs",
+    "instructions.mjs",
+    // The `system` files are deprecated and will be removed soon.
+    // TODO: Clean up in the near future.
     "system.md",
     "system.ts",
     "system.cts",
@@ -118,6 +136,12 @@ export function classifyAgentRootEntry(name, entryType) {
         if (matchesSupportedModuleBaseName(name, "agent")) {
             return "agent-config-module";
         }
+        if (name === "instructions.md") {
+            return "instructions-markdown";
+        }
+        if (matchesSupportedModuleBaseName(name, "instructions")) {
+            return "instructions-module";
+        }
         if (name === "system.md") {
             return "system-markdown";
         }
@@ -165,6 +189,12 @@ export function classifyLocalSubagentEntry(name, entryType) {
         if (matchesSupportedModuleBaseName(name, "agent")) {
             return "agent-config-module";
         }
+        if (name === "instructions.md") {
+            return "instructions-markdown";
+        }
+        if (matchesSupportedModuleBaseName(name, "instructions")) {
+            return "instructions-module";
+        }
         if (name === "system.md") {
             return "system-markdown";
         }

package/dist/src/discover/grammar.d.ts

@@ -1,6 +1,6 @@
 import type { Dirent } from "node:fs";
 import type { MarkdownSourceRef, ModuleSourceRef } from "#shared/source-ref.js";
-import type { SystemDefinition } from "#public/definitions/system.js";
+import type { InstructionsDefinition } from "#public/definitions/instructions.js";
 import { type DiscoverDiagnostic } from "#discover/diagnostics.js";
 import { type DirectoryEntryType } from "#discover/filesystem.js";
 import type { ProjectSource, ProjectSourceEntry } from "#discover/project-source.js";
@@ -9,9 +9,17 @@ import type { ProjectSource, ProjectSourceEntry } from "#discover/project-source
  */
 export declare const DISCOVER_MODULE_SLOT_COLLISION = "discover/module-slot-collision";
 /**
- * Shared diagnostic emitted when the required system prompt source is missing.
+ * Shared diagnostic emitted when the required instructions prompt source
+ * is missing.
  */
-export declare const DISCOVER_REQUIRED_SYSTEM_MISSING = "discover/required-system-missing";
+export declare const DISCOVER_REQUIRED_INSTRUCTIONS_MISSING = "discover/required-instructions-missing";
+/**
+ * Shared diagnostic emitted when discovery falls back to the deprecated
+ * `system.{md,ts,...}` slot because no `instructions.{md,ts,...}` source
+ * was found. The fallback resolves successfully; the warning prompts the
+ * author to rename the file.
+ */
+export declare const DISCOVER_DEPRECATED_SYSTEM_SLOT = "discover/deprecated-system-slot";
 /**
  * Shared diagnostic emitted when a slot has both markdown and module sources.
  */
@@ -100,7 +108,7 @@ export declare const DISCOVER_UNSUPPORTED_DIRECTORY = "discover/unsupported-dire
  * {@link createDiskProjectSource} returns them directly.
  */
 export type StringDirent = Dirent<string>;
-type SystemSourceRef = MarkdownSourceRef<SystemDefinition> | ModuleSourceRef;
+type InstructionsSourceRef = MarkdownSourceRef<InstructionsDefinition> | ModuleSourceRef;
 /**
  * Reads one directory through `source` and returns its entries sorted by name.
  */
@@ -110,15 +118,21 @@ export declare function readSortedDirectoryEntries(source: ProjectSource, direct
  */
 export declare function getPathType(source: ProjectSource, targetPath: string): Promise<"directory" | "file" | "missing" | "other">;
 /**
- * Discovers one required `system.md|ts|cts|mts|js|cjs|mjs` source from a root directory.
+ * Discovers one required `instructions.md|ts|cts|mts|js|cjs|mjs` source
+ * from a root directory.
+ *
+ * For backwards compatibility, falls back to the deprecated
+ * `system.{md,ts,...}` slot when no `instructions.*` source is present —
+ * with a {@link DISCOVER_DEPRECATED_SYSTEM_SLOT} warning prompting the
+ * author to rename the file.
  */
-export declare function discoverSystemSource(input: {
+export declare function discoverInstructionsSource(input: {
     rootEntries: readonly ProjectSourceEntry[];
     rootPath: string;
     source: ProjectSource;
 }): Promise<{
     diagnostics: DiscoverDiagnostic[];
-    system?: SystemSourceRef;
+    instructions?: InstructionsSourceRef;
 }>;
 /**
  * Discovers one flat module slot such as `agent.ts` or `subagent.cjs`.

package/dist/src/discover/grammar.js

@@ -1,5 +1,5 @@
 import { join } from "node:path";
-import { lowerSystemMarkdown } from "#public/helpers/markdown.js";
+import { lowerInstructionsMarkdown } from "#public/helpers/markdown.js";
 import { createDiscoverErrorDiagnostic, createDiscoverWarningDiagnostic, } from "#discover/diagnostics.js";
 import { getDirectoryEntryType } from "#discover/filesystem.js";
 import { createModuleSourceRef } from "#discover/manifest.js";
@@ -10,9 +10,17 @@ import { collectFlatSlotCandidates } from "#discover/slots.js";
  */
 export const DISCOVER_MODULE_SLOT_COLLISION = "discover/module-slot-collision";
 /**
- * Shared diagnostic emitted when the required system prompt source is missing.
+ * Shared diagnostic emitted when the required instructions prompt source
+ * is missing.
  */
-export const DISCOVER_REQUIRED_SYSTEM_MISSING = "discover/required-system-missing";
+export const DISCOVER_REQUIRED_INSTRUCTIONS_MISSING = "discover/required-instructions-missing";
+/**
+ * Shared diagnostic emitted when discovery falls back to the deprecated
+ * `system.{md,ts,...}` slot because no `instructions.{md,ts,...}` source
+ * was found. The fallback resolves successfully; the warning prompts the
+ * author to rename the file.
+ */
+export const DISCOVER_DEPRECATED_SYSTEM_SLOT = "discover/deprecated-system-slot";
 /**
  * Shared diagnostic emitted when a slot has both markdown and module sources.
  */
@@ -106,17 +114,75 @@ export async function getPathType(source, targetPath) {
     return await source.stat(targetPath);
 }
 /**
- * Discovers one required `system.md|ts|cts|mts|js|cjs|mjs` source from a root directory.
+ * Discovers one required `instructions.md|ts|cts|mts|js|cjs|mjs` source
+ * from a root directory.
+ *
+ * For backwards compatibility, falls back to the deprecated
+ * `system.{md,ts,...}` slot when no `instructions.*` source is present —
+ * with a {@link DISCOVER_DEPRECATED_SYSTEM_SLOT} warning prompting the
+ * author to rename the file.
  */
-export async function discoverSystemSource(input) {
-    const candidates = collectFlatSlotCandidates(input.rootEntries, {
+export async function discoverInstructionsSource(input) {
+    const result = await discoverSlotSource({
+        markdownFileName: "instructions.md",
+        moduleBaseName: "instructions",
+        rootEntries: input.rootEntries,
+        rootPath: input.rootPath,
+        slotLabel: "instructions",
+        source: input.source,
+    });
+    if (result.diagnostics.length > 0 || result.source !== undefined) {
+        return {
+            diagnostics: result.diagnostics,
+            instructions: result.source,
+        };
+    }
+    const legacyResult = await discoverSlotSource({
         markdownFileName: "system.md",
         moduleBaseName: "system",
+        rootEntries: input.rootEntries,
+        rootPath: input.rootPath,
+        slotLabel: "system",
+        source: input.source,
+    });
+    if (legacyResult.source !== undefined) {
+        const fileName = legacyResult.source.sourceKind === "markdown" ? "system.md" : legacyResult.source.logicalPath;
+        return {
+            diagnostics: [
+                createDiscoverWarningDiagnostic({
+                    code: DISCOVER_DEPRECATED_SYSTEM_SLOT,
+                    message: `The "${fileName}" slot is deprecated. Rename it to "${fileName.replace(/^system/, "instructions")}" — the runtime still loads the legacy slot for now, but support will be removed in a future release.`,
+                    sourcePath: join(input.rootPath, fileName),
+                }),
+                ...legacyResult.diagnostics,
+            ],
+            instructions: legacyResult.source,
+        };
+    }
+    if (legacyResult.diagnostics.length > 0) {
+        return {
+            diagnostics: legacyResult.diagnostics,
+        };
+    }
+    return {
+        diagnostics: [
+            createDiscoverErrorDiagnostic({
+                code: DISCOVER_REQUIRED_INSTRUCTIONS_MISSING,
+                message: 'Expected one authored instructions prompt source at "instructions.md", "instructions.ts", "instructions.cts", "instructions.mts", "instructions.js", "instructions.cjs", or "instructions.mjs".',
+                sourcePath: input.rootPath,
+            }),
+        ],
+    };
+}
+async function discoverSlotSource(input) {
+    const candidates = collectFlatSlotCandidates(input.rootEntries, {
+        markdownFileName: input.markdownFileName,
+        moduleBaseName: input.moduleBaseName,
     });
     if (candidates.markdownFileName !== undefined && candidates.moduleFileNames.length > 0) {
         return {
             diagnostics: [
-                createSlotCollisionDiagnostic(input.rootPath, "system", [
+                createSlotCollisionDiagnostic(input.rootPath, input.slotLabel, [
                     candidates.markdownFileName,
                     ...candidates.moduleFileNames,
                 ]),
@@ -126,16 +192,16 @@ export async function discoverSystemSource(input) {
     if (candidates.moduleFileNames.length > 1) {
         return {
             diagnostics: [
-                createModuleSlotCollisionDiagnostic(input.rootPath, "system", candidates.moduleFileNames),
+                createModuleSlotCollisionDiagnostic(input.rootPath, input.slotLabel, candidates.moduleFileNames),
             ],
         };
     }
     if (candidates.markdownFileName !== undefined) {
         return {
             diagnostics: [],
-            system: await discoverMarkdownSource({
-                logicalPath: "system.md",
-                lower: lowerSystemMarkdown,
+            source: await discoverMarkdownSource({
+                logicalPath: input.markdownFileName,
+                lower: lowerInstructionsMarkdown,
                 source: input.source,
                 sourcePath: join(input.rootPath, candidates.markdownFileName),
             }),
@@ -145,20 +211,12 @@ export async function discoverSystemSource(input) {
     if (logicalPath !== undefined) {
         return {
             diagnostics: [],
-            system: createModuleSourceRef({
+            source: createModuleSourceRef({
                 logicalPath,
             }),
         };
     }
-    return {
-        diagnostics: [
-            createDiscoverErrorDiagnostic({
-                code: DISCOVER_REQUIRED_SYSTEM_MISSING,
-                message: 'Expected one authored system prompt source at "system.md", "system.ts", "system.cts", "system.mts", "system.js", "system.cjs", or "system.mjs".',
-                sourcePath: input.rootPath,
-            }),
-        ],
-    };
+    return { diagnostics: [] };
 }
 /**
  * Discovers one flat module slot such as `agent.ts` or `subagent.cjs`.

package/dist/src/discover/manifest.d.ts

@@ -2,7 +2,7 @@ import type { MarkdownSourceRef, ModuleSourceRef, SkillPackageSourceRef } from "
 import type { InternalSkillDefinition } from "#shared/skill-definition.js";
 import type { ScheduleDefinition } from "#public/definitions/schedule.js";
 import type { SkillDefinition } from "#public/definitions/skill.js";
-import type { SystemDefinition } from "#public/definitions/system.js";
+import type { InstructionsDefinition } from "#public/definitions/instructions.js";
 import type { DiscoverDiagnostic, DiscoverDiagnosticsSummary } from "#discover/diagnostics.js";
 /**
  * Stable manifest kind emitted by discovery.
@@ -31,9 +31,10 @@ export interface ConnectionSourceRef extends ModuleSourceRef {
     readonly connectionName: string;
 }
 /**
- * System source reference preserved by discovery for compiler normalization.
+ * Instructions source reference preserved by discovery for compiler
+ * normalization.
  */
-export type SystemSourceRef = MarkdownSourceRef<SystemDefinition> | ModuleSourceRef;
+export type InstructionsSourceRef = MarkdownSourceRef<InstructionsDefinition> | ModuleSourceRef;
 /**
  * Skill source reference preserved by the discovery manifest.
  */
@@ -122,11 +123,13 @@ export interface AgentSourceManifest {
     lib: LibSourceRef[];
     kind: typeof AGENT_SOURCE_MANIFEST_KIND;
     /**
-     * Authored system prompt source discovered at the agent root
-     * (`system.md` or `system.{ts,cts,mts,js,cjs,mjs}`). Optional — agents
-     * without an authored system prompt fall back to the framework default.
+     * Authored instructions prompt source discovered at the agent root
+     * (`instructions.md` or `instructions.{ts,cts,mts,js,cjs,mjs}`).
+     * Optional — agents without an authored instructions prompt fall back
+     * to the framework default. The deprecated `system.{md,ts,...}` slot is
+     * still discovered as a fallback (with a deprecation warning).
      */
-    system?: SystemSourceRef;
+    instructions?: InstructionsSourceRef;
     /**
      * Authored sandbox module discovered for this agent, or `null` when
      * the agent does not declare one. Every agent owns at most one
@@ -165,7 +168,7 @@ export interface CreateAgentSourceManifestInput {
      * `/vercel/path0`) produce a meaningful agent id.
      */
     packageName?: string;
-    system?: SystemSourceRef;
+    instructions?: InstructionsSourceRef;
     sandbox?: SandboxSourceRef | null;
     sandboxWorkspaces?: readonly SandboxWorkspaceFolderSourceRef[];
     schedules?: readonly ScheduleSourceRef[];

package/dist/src/discover/manifest.js

@@ -36,8 +36,8 @@ export function createAgentSourceManifest(input) {
     if (input.configModule !== undefined) {
         manifest.configModule = input.configModule;
     }
-    if (input.system !== undefined) {
-        manifest.system = input.system;
+    if (input.instructions !== undefined) {
+        manifest.instructions = input.instructions;
     }
     return manifest;
 }

package/dist/src/evals/cli/eval.js

@@ -1 +1 @@
-import{n as e}from"../../chunks/paths-Dxh19LKr.js";import{loadDevelopmentEnvironmentFiles as t}from"../../cli/dev/environment.js";import{a as n,n as r,t as i}from"../../chunks/client-DBMG7iuf.js";import{n as a}from"../../chunks/host-CEiB9Ps8.js";import{discoverAndImportSuites as o,discoverSuiteFiles as s,importSuiteFile as c}from"../runner/discover.js";import{executeSuite as l}from"../runner/execute-suite.js";import{ConsoleReporter as u}from"../runner/reporters/console.js";var d=n();function f(e,t){e.command(`eval`).description(`Run eval suites against an Ash agent.`).option(`--suite <id...>`,`Suite IDs to run (repeatable)`).option(`--all`,`Run all discovered suites`).option(`--url <url>`,`Remote agent URL (skip local host startup)`).option(`--timeout <ms>`,`Per-case timeout in milliseconds`).option(`--max-concurrency <n>`,`Max concurrent case executions per suite`).option(`--json`,`Output results as JSON`).option(`--list-suites`,`List discovered suites and exit`).option(`--skip-report`,`Skip suite-defined reporters (e.g. Braintrust)`).action(async e=>{await p(e,t)})}async function p(n,r){let i=e();if(t(i),n.listSuites){await y(i,r);return}let s=n.suite,c=await o(i,s);if(c.length===0){s&&s.length>0?r.error(`No suites found matching: ${s.join(`, `)}`):r.error(`No eval suites found. Create suite files under evals/ with the *.eval.ts extension.`),process.exitCode=1;return}let u,d;n.url?d={kind:`remote`,url:n.url}:(u=await a(i,{host:`127.0.0.1`,port:0}),d={kind:`local`,url:u.url});let f=m(d);try{let e=[];for(let t of c){let r=_(t,n),a=v(r,{json:n.json===!0,skipReport:n.skipReport===!0}),o=await l({suite:r,target:d,reporters:a,appRoot:i,client:f});e.push(o)}n.json&&r.log(JSON.stringify(e,null,2)),e.some(e=>e.errored>0)&&(process.exitCode=1)}finally{u&&await u.close()}process.exit(process.exitCode??0)}function m(e){if(e.kind===`local`)return new i({host:e.url});let t={},n=process.env.VERCEL_AUTOMATION_BYPASS_SECRET?.trim();return n&&(t[r]=n),new i({auth:h(),headers:Object.keys(t).length>0?t:void 0,host:e.url})}function h(){let e=process.env.ASH_EVAL_AUTH_TOKEN?.trim();return e?{bearer:e}:{bearer:g}}async function g(){try{let e=(await(0,d.getVercelOidcToken)()).trim();if(e.length>0)return e}catch{}return process.env.VERCEL_OIDC_TOKEN?.trim()??``}function _(e,t){let n=t.maxConcurrency?Number.parseInt(t.maxConcurrency,10):void 0,r=t.timeout?Number.parseInt(t.timeout,10):void 0;if(n===void 0&&r===void 0)return e;let i={...e};return n!==void 0&&(i.maxConcurrency=n),r!==void 0&&(i.timeoutMs=r),i}function v(e,t){let n=t.json?[]:[new u];return!t.skipReport&&e.reporters&&n.push(...e.reporters),n}async function y(e,t){let n=await s(e);if(n.length===0){t.log(`No eval suites found.`);return}t.log(`Found ${n.length} eval suite file(s):\n`);for(let r of n){let n=await c(e,r);t.log(`  ${n.id}${n.description?`  - ${n.description}`:``}`)}}export{f as registerEvalCommand,p as runEvalCommand};
+import{n as e}from"../../chunks/paths-BiY7uVwD.js";import{loadDevelopmentEnvironmentFiles as t}from"../../cli/dev/environment.js";import{a as n,n as r,t as i}from"../../chunks/client-DBMG7iuf.js";import{n as a}from"../../chunks/host-Ca8xvEQ1.js";import{discoverAndImportSuites as o,discoverSuiteFiles as s,importSuiteFile as c}from"../runner/discover.js";import{executeSuite as l}from"../runner/execute-suite.js";import{ConsoleReporter as u}from"../runner/reporters/console.js";var d=n();function f(e,t){e.command(`eval`).description(`Run eval suites against an Ash agent.`).option(`--suite <id...>`,`Suite IDs to run (repeatable)`).option(`--all`,`Run all discovered suites`).option(`--url <url>`,`Remote agent URL (skip local host startup)`).option(`--timeout <ms>`,`Per-case timeout in milliseconds`).option(`--max-concurrency <n>`,`Max concurrent case executions per suite`).option(`--json`,`Output results as JSON`).option(`--list-suites`,`List discovered suites and exit`).option(`--skip-report`,`Skip suite-defined reporters (e.g. Braintrust)`).action(async e=>{await p(e,t)})}async function p(n,r){let i=e();if(t(i),n.listSuites){await y(i,r);return}let s=n.suite,c=await o(i,s);if(c.length===0){s&&s.length>0?r.error(`No suites found matching: ${s.join(`, `)}`):r.error(`No eval suites found. Create suite files under evals/ with the *.eval.ts extension.`),process.exitCode=1;return}let u,d;n.url?d={kind:`remote`,url:n.url}:(u=await a(i,{host:`127.0.0.1`,port:0}),d={kind:`local`,url:u.url});let f=m(d);try{let e=[];for(let t of c){let r=_(t,n),a=v(r,{json:n.json===!0,skipReport:n.skipReport===!0}),o=await l({suite:r,target:d,reporters:a,appRoot:i,client:f});e.push(o)}n.json&&r.log(JSON.stringify(e,null,2)),e.some(e=>e.errored>0)&&(process.exitCode=1)}finally{u&&await u.close()}process.exit(process.exitCode??0)}function m(e){if(e.kind===`local`)return new i({host:e.url});let t={},n=process.env.VERCEL_AUTOMATION_BYPASS_SECRET?.trim();return n&&(t[r]=n),new i({auth:h(),headers:Object.keys(t).length>0?t:void 0,host:e.url})}function h(){let e=process.env.ASH_EVAL_AUTH_TOKEN?.trim();return e?{bearer:e}:{bearer:g}}async function g(){try{let e=(await(0,d.getVercelOidcToken)()).trim();if(e.length>0)return e}catch{}return process.env.VERCEL_OIDC_TOKEN?.trim()??``}function _(e,t){let n=t.maxConcurrency?Number.parseInt(t.maxConcurrency,10):void 0,r=t.timeout?Number.parseInt(t.timeout,10):void 0;if(n===void 0&&r===void 0)return e;let i={...e};return n!==void 0&&(i.maxConcurrency=n),r!==void 0&&(i.timeoutMs=r),i}function v(e,t){let n=t.json?[]:[new u];return!t.skipReport&&e.reporters&&n.push(...e.reporters),n}async function y(e,t){let n=await s(e);if(n.length===0){t.log(`No eval suites found.`);return}t.log(`Found ${n.length} eval suite file(s):\n`);for(let r of n){let n=await c(e,r);t.log(`  ${n.id}${n.description?`  - ${n.description}`:``}`)}}export{f as registerEvalCommand,p as runEvalCommand};

package/dist/src/execution/sandbox/bindings/local.js

@@ -1,6 +1,7 @@
 import { access, mkdir, readFile, writeFile } from "node:fs/promises";
 import { dirname, join } from "node:path";
 import { resolveSandboxCacheDirectory } from "#internal/application/paths.js";
+import { shellQuote } from "#execution/sandbox/shell-quote.js";
 import { SandboxTemplateNotProvisionedError } from "#public/definitions/sandbox-backend.js";
 import { WORKSPACE_ROOT } from "#runtime/workspace/types.js";
 import { buildSandboxSession } from "#execution/sandbox/session.js";
@@ -89,8 +90,17 @@ async function createBashSandbox(input) {
             const disposableBash = bash;
             await disposableBash.dispose?.();
         },
-        async executeCommand(command) {
-            const result = await bash.exec(command);
+        async executeCommand(command, options) {
+            if (options?.abortSignal?.aborted) {
+                throw new DOMException("The operation was aborted.", "AbortError");
+            }
+            const wrapped = options?.workingDirectory !== undefined
+                ? `( cd ${shellQuote(options.workingDirectory)} && ${command} )`
+                : command;
+            const execPromise = bash.exec(wrapped);
+            const result = options?.abortSignal
+                ? await raceAbort(execPromise, options.abortSignal)
+                : await execPromise;
             return { exitCode: result.exitCode, stderr: result.stderr, stdout: result.stdout };
         },
         async readFileBytes(path) {
@@ -171,10 +181,29 @@ function createLocalSessionPrimitives(sandbox) {
         readFileBytes: (path) => sandbox.readFileBytes(path),
         readFileRaw: (path) => sandbox.readFileText(path),
         resolvePath: resolveLocalPath,
-        runCommand: (command) => sandbox.executeCommand(command),
+        runCommand: (command, options) => sandbox.executeCommand(command, options),
         writeFileRaw: (path, content) => sandbox.writeFiles([{ path, content }]),
     };
 }
+async function raceAbort(promise, signal) {
+    return await new Promise((resolve, reject) => {
+        const onAbort = () => {
+            reject(new DOMException("The operation was aborted.", "AbortError"));
+        };
+        if (signal.aborted) {
+            onAbort();
+            return;
+        }
+        signal.addEventListener("abort", onAbort, { once: true });
+        promise.then((value) => {
+            signal.removeEventListener("abort", onAbort);
+            resolve(value);
+        }, (error) => {
+            signal.removeEventListener("abort", onAbort);
+            reject(error);
+        });
+    });
+}
 function resolveLocalPath(path) {
     if (path.startsWith("/")) {
         return path;

package/dist/src/execution/sandbox/bindings/vercel.js

@@ -229,11 +229,12 @@ function createVercelSessionPrimitives(sandbox, id) {
             return new TextDecoder("utf-8", { fatal: true }).decode(buffer);
         },
         resolvePath: resolveVercelSandboxPath,
-        async runCommand(command) {
+        async runCommand(command, options) {
             const result = await sandbox.runCommand({
                 args: ["-lc", command],
                 cmd: "bash",
-                cwd: WORKSPACE_ROOT,
+                cwd: options?.workingDirectory ?? WORKSPACE_ROOT,
+                signal: options?.abortSignal,
             });
             const [stdout, stderr] = await Promise.all([result.stdout(), result.stderr()]);
             return { exitCode: result.exitCode, stderr, stdout };

package/dist/src/execution/sandbox/session.d.ts

@@ -1,4 +1,4 @@
-import type { SandboxCommandResult, SandboxSession } from "#public/definitions/sandbox.js";
+import type { SandboxCommandOptions, SandboxCommandResult, SandboxSession } from "#public/definitions/sandbox.js";
 /**
  * Raw backend primitives consumed by {@link buildSandboxSession} to
  * construct the public {@link SandboxSession}.
@@ -18,7 +18,7 @@ export interface SandboxSessionPrimitives {
     /** Translates a user-facing path to the backend's native path. */
     resolvePath(path: string): string;
     /** Runs one shell command inside the sandbox. */
-    runCommand(command: string): Promise<SandboxCommandResult>;
+    runCommand(command: string, options?: SandboxCommandOptions): Promise<SandboxCommandResult>;
     /**
      * Writes `content` to `resolvedPath`, creating parent dirs recursively.
      */

package/dist/src/execution/sandbox/session.js

@@ -23,8 +23,8 @@ export function buildSandboxSession(primitives) {
         resolvePath(path) {
             return primitives.resolvePath(path);
         },
-        async runCommand(command) {
-            return await primitives.runCommand(command);
+        async runCommand(command, options) {
+            return await primitives.runCommand(command, options);
         },
         async writeFile(path, content) {
             const resolvedPath = primitives.resolvePath(path);

package/dist/src/internal/application/package.js

@@ -6,7 +6,7 @@ import { ASH_PACKAGE_NAME } from "#package-name.js";
 let cachedPackageInfo;
 // The package build stamps the published version into `dist` so bundled
 // deployments can still report package metadata without resolving package.json.
-const BUNDLED_FALLBACK_PACKAGE_VERSION = "0.6.1";
+const BUNDLED_FALLBACK_PACKAGE_VERSION = "0.7.0";
 const BUNDLED_FALLBACK_PACKAGE_VERSION_PLACEHOLDER = "__ASH_PACKAGE_VERSION_PLACEHOLDER__";
 const WORKFLOW_MODULE_ALIASES = {
     "workflow/api": "src/compiled/@workflow/core/runtime.js",

package/dist/src/internal/authored-definition/core.d.ts

@@ -1,7 +1,7 @@
 import type { AgentDefinition, AgentBuildDefinition } from "#public/definitions/agent.js";
 import type { ScheduleDefinition } from "#public/definitions/schedule.js";
 import type { SkillDefinition } from "#public/definitions/skill.js";
-import type { SystemDefinition } from "#public/definitions/system.js";
+import type { InstructionsDefinition } from "#public/definitions/instructions.js";
 type NormalizedAgentDefinition = Omit<AgentDefinition, "build"> & {
     build?: {
         externalDependencies?: Readonly<AgentBuildDefinition["externalDependencies"]>;
@@ -15,13 +15,14 @@ type NormalizedAgentDefinition = Omit<AgentDefinition, "build"> & {
  */
 export declare function normalizeAgentDefinition(value: unknown, message: string): Readonly<NormalizedAgentDefinition>;
 /**
- * Normalizes one authored system definition into the canonical internal
- * shape.
+ * Normalizes one authored instructions definition into the canonical
+ * internal shape.
  *
- * Authored `name` fields are rejected — system prompt identity is derived
- * from the file path (`system.md` or `system.{ts,...}`).
+ * Authored `name` fields are rejected — instructions prompt identity is
+ * derived from the file path (`instructions.md` or
+ * `instructions.{ts,...}`).
  */
-export declare function normalizeSystemDefinition(value: unknown, message: string): SystemDefinition;
+export declare function normalizeInstructionsDefinition(value: unknown, message: string): InstructionsDefinition;
 /**
  * Normalizes one authored skill definition into the canonical internal
  * shape.

package/dist/src/internal/authored-definition/core.js

@@ -95,13 +95,14 @@ function normalizeAgentCompactionDefinition(value, message) {
     return normalizedDefinition;
 }
 /**
- * Normalizes one authored system definition into the canonical internal
- * shape.
+ * Normalizes one authored instructions definition into the canonical
+ * internal shape.
  *
- * Authored `name` fields are rejected — system prompt identity is derived
- * from the file path (`system.md` or `system.{ts,...}`).
+ * Authored `name` fields are rejected — instructions prompt identity is
+ * derived from the file path (`instructions.md` or
+ * `instructions.{ts,...}`).
  */
-export function normalizeSystemDefinition(value, message) {
+export function normalizeInstructionsDefinition(value, message) {
     const record = expectObjectRecord(value, message);
     expectOnlyKnownKeys(record, ["markdown"], message);
     return {

package/dist/src/internal/authored-definition/sandbox.d.ts

@@ -1,14 +1,7 @@
-import type { SandboxBackend } from "#public/definitions/sandbox-backend.js";
-/**
- * Canonical internal shape for an authored sandbox definition after
- * normalization.
- */
-export interface NormalizedSandboxDefinition {
-    readonly backend?: SandboxBackend;
+import type { SandboxDefinition } from "#public/definitions/sandbox.js";
+export type NormalizedSandboxDefinition = Readonly<SandboxDefinition> & {
     readonly description?: string;
-    readonly bootstrap?: (input: unknown) => Promise<void> | void;
-    readonly onSession?: (input: unknown) => Promise<void> | void;
-}
+};
 /**
  * Normalizes one authored sandbox definition into the canonical internal
  * shape.

package/dist/src/internal/nitro/routes/home-page/build-home-page-response.d.ts

@@ -52,12 +52,12 @@ export interface HomePageOverview {
     readonly discoveryWarnings: number;
     readonly modelId: string;
     readonly subagentCount: number;
-    readonly systemPromptSource: string;
+    readonly instructionsPromptSource: string;
 }
 /**
- * System prompt section returned by the home-page JSON route.
+ * Instructions prompt section returned by the home-page JSON route.
  */
-export interface HomePageSystemPrompt {
+export interface HomePageInstructionsPrompt {
     readonly logicalPath: string;
     readonly markdownPreview: string;
 }
@@ -77,8 +77,8 @@ export interface HomePageResponse {
     readonly skills: readonly HomePageSourceRow[];
     readonly subagents: readonly HomePageSubagentRow[];
     readonly summaryCounts: readonly HomePageSummaryCount[];
-    readonly system: HomePageSourceRow | null;
-    readonly systemPrompt: HomePageSystemPrompt;
+    readonly instructions: HomePageSourceRow | null;
+    readonly instructionsPrompt: HomePageInstructionsPrompt;
     readonly tools: readonly HomePageSourceRow[];
 }
 /**

package/dist/src/internal/nitro/routes/home-page/build-home-page-response.js

@@ -10,20 +10,20 @@ function truncateCopy(value, maxLength) {
 }
 function createHeroSummary(data) {
     const { agent, manifest, schedules } = data;
-    return `Compiled inspection surface for the current runtime. Runs on ${agent.config.model.id} with ${agent.system === undefined ? "no system prompt" : "a system prompt"}, ${pluralize(agent.skills.length, "skill")}, ${pluralize(agent.tools.length, "tool")}, ${pluralize(agent.sandbox === null ? 0 : 1, "sandbox")}, ${pluralize(schedules.length, "schedule")}, and ${pluralize(manifest.subagents.length, "subagent")}.`;
+    return `Compiled inspection surface for the current runtime. Runs on ${agent.config.model.id} with ${agent.instructions === undefined ? "no instructions prompt" : "an instructions prompt"}, ${pluralize(agent.skills.length, "skill")}, ${pluralize(agent.tools.length, "tool")}, ${pluralize(agent.sandbox === null ? 0 : 1, "sandbox")}, ${pluralize(schedules.length, "schedule")}, and ${pluralize(manifest.subagents.length, "subagent")}.`;
 }
 function createPageDescription(data) {
     return truncateCopy(createHeroSummary(data), 155);
 }
-function renderSystemRow(agent) {
-    if (agent.system === undefined) {
+function renderInstructionsRow(agent) {
+    if (agent.instructions === undefined) {
         return null;
     }
     return {
-        details: truncateCopy(agent.system.markdown.trim(), 420),
-        logicalPath: agent.system.logicalPath,
-        name: agent.system.name,
-        sourceKind: agent.system.sourceKind === "module" ? "Module" : agent.system.sourceKind,
+        details: truncateCopy(agent.instructions.markdown.trim(), 420),
+        logicalPath: agent.instructions.logicalPath,
+        name: agent.instructions.name,
+        sourceKind: agent.instructions.sourceKind === "module" ? "Module" : agent.instructions.sourceKind,
     };
 }
 function renderSkillRows(skills) {
@@ -118,7 +118,7 @@ function renderEndpointRows() {
  * Builds the JSON payload served to Ash's static Nitro home page.
  */
 export function buildHomePageResponse(data) {
-    const system = data.agent.system;
+    const instructions = data.agent.instructions;
     const requestExample = `POST ${ASH_CREATE_SESSION_ROUTE_PATH}
 content-type: application/json
 
@@ -137,7 +137,7 @@ content-type: application/json
             discoveryWarnings: data.agent.metadata.diagnosticsSummary.warnings,
             modelId: data.agent.config.model.id,
             subagentCount: data.manifest.subagents.length,
-            systemPromptSource: system?.logicalPath ?? "No system prompt discovered",
+            instructionsPromptSource: instructions?.logicalPath ?? "No instructions prompt discovered",
         },
         pageDescription: createPageDescription(data),
         pageTitle: `${data.agent.config.name} | Ash`,
@@ -147,8 +147,8 @@ content-type: application/json
         subagents: renderSubagentRows(data.manifest),
         summaryCounts: [
             {
-                label: "system prompt",
-                value: system === undefined ? 0 : 1,
+                label: "instructions prompt",
+                value: instructions === undefined ? 0 : 1,
             },
             {
                 label: "skill",
@@ -171,10 +171,11 @@ content-type: application/json
                 value: data.manifest.subagents.length,
             },
         ],
-        system: renderSystemRow(data.agent),
-        systemPrompt: {
-            logicalPath: system?.logicalPath ?? "No system prompt discovered",
-            markdownPreview: truncateCopy(system?.markdown.trim() ?? "This agent does not currently define a system prompt.", 420),
+        instructions: renderInstructionsRow(data.agent),
+        instructionsPrompt: {
+            logicalPath: instructions?.logicalPath ?? "No instructions prompt discovered",
+            markdownPreview: truncateCopy(instructions?.markdown.trim() ??
+                "This agent does not currently define an instructions prompt.", 420),
         },
         tools: renderToolRows(data.agent),
     };

package/dist/src/internal/nitro/routes/home-page/load-home-page-data.d.ts

@@ -1,6 +1,6 @@
 import type { CompiledAgentManifest, CompiledSubagentNode } from "#compiler/manifest.js";
 import { type RuntimeCompiledArtifactsSource } from "#runtime/compiled-artifacts-source.js";
-import type { ResolvedAgent, ResolvedSandboxDefinition, ResolvedSchedule, ResolvedSkillDefinition, ResolvedSystem } from "#runtime/types.js";
+import type { ResolvedAgent, ResolvedSandboxDefinition, ResolvedSchedule, ResolvedSkillDefinition, ResolvedInstructions } from "#runtime/types.js";
 /**
  * Runtime data needed to build the package-owned Nitro homepage.
  */
@@ -23,4 +23,4 @@ export declare function loadHomePageData(input: {
 export declare function resolveHomePageCompiledArtifactsSource(input?: {
     readonly appRoot?: string;
 }): RuntimeCompiledArtifactsSource;
-export type { CompiledAgentManifest, CompiledSubagentNode, ResolvedSandboxDefinition, ResolvedSchedule, ResolvedSkillDefinition, ResolvedSystem, };
+export type { CompiledAgentManifest, CompiledSubagentNode, ResolvedSandboxDefinition, ResolvedSchedule, ResolvedSkillDefinition, ResolvedInstructions, };