psadk 1.4.8 → 1.5.1

package/build/{main/lib/agent-core → module/lib/agent-core/src}/harness/types.d.ts

@@ -1,7 +1,24 @@
 import type { ImageContent, Model, SimpleStreamOptions, TextContent, Transport } from '@earendil-works/pi-ai';
-import type { QueueMode } from '../agent.js';
-import type { AgentEvent, AgentMessage, AgentTool, ThinkingLevel } from '../index.js';
-import type { Session } from './session/session.js';
+import type { AgentEvent, AgentMessage, AgentTool, QueueMode, ThinkingLevel } from '../index.ts';
+import type { Session } from './session/session.ts';
+/** Result of a fallible operation. Expected failures are returned as `ok: false` instead of thrown. */
+export type Result<TValue, TError> = {
+    ok: true;
+    value: TValue;
+} | {
+    ok: false;
+    error: TError;
+};
+/** Create a successful {@link Result}. */
+export declare function ok<TValue, TError>(value: TValue): Result<TValue, TError>;
+/** Create a failed {@link Result}. */
+export declare function err<TValue, TError>(error: TError): Result<TValue, TError>;
+/** Return the success value or throw the failure error. Intended for tests and explicit adapter boundaries. */
+export declare function getOrThrow<TValue, TError>(result: Result<TValue, TError>): TValue;
+/** Return the success value or `undefined`. Only object values are allowed to avoid truthiness bugs with primitives. */
+export declare function getOrUndefined<TValue extends object, TError>(result: Result<TValue, TError>): TValue | undefined;
+/** Normalize unknown thrown values into Error instances before using them as typed error causes. */
+export declare function toError(error: unknown): Error;
 /**
  * Skill loaded from a `SKILL.md` file or provided by an application.
  *
@@ -60,100 +77,156 @@ export interface AgentHarnessStreamOptionsPatch extends Omit<Partial<AgentHarnes
     /** Metadata patch. `undefined` values delete keys; explicit `metadata: undefined` clears all metadata. */
     metadata?: Record<string, unknown | undefined>;
 }
-/** Kind of filesystem object as addressed by an {@link ExecutionEnv}. Symlinks are not followed automatically. */
+/** Kind of filesystem object as addressed by a {@link FileSystem}. Symlinks are not followed automatically. */
 export type FileKind = 'file' | 'directory' | 'symlink';
-/** Stable, backend-independent file error codes thrown by {@link ExecutionEnv} file operations. */
-export type FileErrorCode = 'not_found' | 'permission_denied' | 'not_directory' | 'is_directory' | 'invalid' | 'not_supported' | 'unknown';
-/** Error thrown by {@link ExecutionEnv} file operations. */
+/** Stable, backend-independent file error codes returned by {@link FileSystem} file operations. */
+export type FileErrorCode = 'aborted' | 'not_found' | 'permission_denied' | 'not_directory' | 'is_directory' | 'invalid' | 'not_supported' | 'unknown';
+/** Error returned by {@link FileSystem} file operations. */
 export declare class FileError extends Error {
     /** Backend-independent error code. */
     code: FileErrorCode;
     /** Absolute addressed path associated with the failure, when available. */
-    path?: string | undefined;
-    constructor(
+    path?: string;
+    constructor(code: FileErrorCode, message: string, path?: string, cause?: Error);
+}
+/** Stable, backend-independent execution error codes returned by {@link ExecutionEnv.exec}. */
+export type ExecutionErrorCode = 'aborted' | 'timeout' | 'shell_unavailable' | 'spawn_error' | 'callback_error' | 'unknown';
+/** Error returned by {@link ExecutionEnv.exec}. */
+export declare class ExecutionError extends Error {
     /** Backend-independent error code. */
-    code: FileErrorCode, message: string, 
-    /** Absolute addressed path associated with the failure, when available. */
-    path?: string | undefined, options?: ErrorOptions);
+    code: ExecutionErrorCode;
+    constructor(code: ExecutionErrorCode, message: string, cause?: Error);
+}
+/** Stable compaction error codes returned by compaction helpers. */
+export type CompactionErrorCode = 'aborted' | 'summarization_failed' | 'invalid_session' | 'unknown';
+/** Error returned by compaction helpers. */
+export declare class CompactionError extends Error {
+    /** Backend-independent error code. */
+    code: CompactionErrorCode;
+    constructor(code: CompactionErrorCode, message: string, cause?: Error);
 }
-/** Metadata for one filesystem object in an {@link ExecutionEnv}. */
+/** Stable branch-summary error codes returned by branch summarization helpers. */
+export type BranchSummaryErrorCode = 'aborted' | 'summarization_failed' | 'invalid_session';
+/** Error returned by branch summarization helpers. */
+export declare class BranchSummaryError extends Error {
+    /** Backend-independent error code. */
+    code: BranchSummaryErrorCode;
+    constructor(code: BranchSummaryErrorCode, message: string, cause?: Error);
+}
+export type SessionErrorCode = 'not_found' | 'invalid_session' | 'invalid_entry' | 'invalid_fork_target' | 'storage' | 'unknown';
+/** Error thrown by session storage, repositories, and session tree operations. */
+export declare class SessionError extends Error {
+    /** Session subsystem error code. */
+    code: SessionErrorCode;
+    constructor(code: SessionErrorCode, message: string, cause?: Error);
+}
+export type AgentHarnessErrorCode = 'busy' | 'invalid_state' | 'invalid_argument' | 'session' | 'hook' | 'auth' | 'compaction' | 'branch_summary' | 'unknown';
+/** Public AgentHarness failure with a stable top-level classification. */
+export declare class AgentHarnessError extends Error {
+    code: AgentHarnessErrorCode;
+    constructor(code: AgentHarnessErrorCode, message: string, cause?: Error);
+}
+/** Metadata for one filesystem object in a {@link FileSystem}. */
 export interface FileInfo {
     /** Basename of {@link path}. */
     name: string;
     /** Absolute, syntactically normalized addressed path in the execution environment. Symlinks are not followed. */
     path: string;
-    /** Object kind. Symlink targets are not followed; use {@link ExecutionEnv.resolvePath} explicitly. */
+    /** Object kind. Symlink targets are not followed; use {@link FileSystem.canonicalPath} explicitly. */
     kind: FileKind;
     /** Size in bytes for the addressed filesystem object. */
     size: number;
     /** Modification time as milliseconds since Unix epoch. */
     mtimeMs: number;
 }
-/** Options for {@link ExecutionEnv.exec}. */
+/** Options for {@link Shell.exec}. */
 export interface ExecutionEnvExecOptions {
-    /** Working directory for the command. Relative paths are resolved against {@link ExecutionEnv.cwd}. */
+    /** Working directory for the command. Relative paths are resolved against {@link ExecutionEnv.cwd}. Defaults to {@link ExecutionEnv.cwd}. */
     cwd?: string;
-    /** Additional environment variables for the command. Values override the environment defaults. */
+    /** Additional environment variables for the command. Values override the environment defaults. Defaults to no overrides. */
     env?: Record<string, string>;
-    /** Timeout in seconds. Implementations should reject when the command exceeds this duration. */
+    /** Timeout in seconds. Implementations should return a timeout error when the command exceeds this duration. Defaults to no timeout. */
     timeout?: number;
-    /** Abort signal used to terminate the command. */
-    signal?: AbortSignal;
+    /** Abort signal used to terminate the command. Defaults to no abort signal. */
+    abortSignal?: AbortSignal;
     /** Called with stdout chunks as they are produced. */
     onStdout?: (chunk: string) => void;
     /** Called with stderr chunks as they are produced. */
     onStderr?: (chunk: string) => void;
 }
 /**
- * Filesystem and process execution environment used by the harness.
+ * Filesystem capability used by the harness.
  *
- * Paths passed to methods may be absolute or relative to {@link cwd}. Paths returned by this interface are absolute
- * addressed paths in the environment, but are not canonicalized through symlinks unless returned by {@link resolvePath}.
+ * Paths passed to methods may be absolute or relative to {@link cwd}. Paths returned by file operations are addressed paths
+ * in the filesystem namespace, but are not canonicalized through symlinks unless returned by {@link canonicalPath}.
  *
- * File operations throw {@link FileError} for expected filesystem failures such as missing paths or permission errors.
+ * Operation methods must never throw or reject. All filesystem failures, including unexpected backend failures, must be
+ * encoded in the returned {@link Result}. Implementations must preserve this invariant.
  */
-export interface ExecutionEnv {
-    /** Current working directory for relative paths and command execution. */
+export interface FileSystem {
+    /** Current working directory for relative paths. */
     cwd: string;
-    /** Execute a shell command in {@link cwd} unless `options.cwd` is provided. */
-    exec(command: string, options?: ExecutionEnvExecOptions): Promise<{
-        stdout: string;
-        stderr: string;
-        exitCode: number;
-    }>;
-    /** Read a UTF-8 text file. Throws {@link FileError}. */
-    readTextFile(path: string): Promise<string>;
-    /** Read a binary file. Throws {@link FileError}. */
-    readBinaryFile(path: string): Promise<Uint8Array>;
-    /** Create or overwrite a file, creating parent directories when supported. Throws {@link FileError}. */
-    writeFile(path: string, content: string | Uint8Array): Promise<void>;
-    /** Return metadata for the addressed path without following symlinks. Throws {@link FileError}. */
-    fileInfo(path: string): Promise<FileInfo>;
-    /** List direct children of a directory without following symlinks. Throws {@link FileError}. */
-    listDir(path: string): Promise<FileInfo[]>;
-    /** Return the canonical path for a path, following symlinks. Throws {@link FileError}. */
-    realPath(path: string): Promise<string>;
-    /** Return false for missing paths. Other errors, such as permission failures, may throw {@link FileError}. */
-    exists(path: string): Promise<boolean>;
-    /** Create a directory. */
+    /** Return an absolute addressed path without requiring it to exist and without resolving symlinks. */
+    absolutePath(path: string, abortSignal?: AbortSignal): Promise<Result<string, FileError>>;
+    /** Join path segments in the filesystem namespace without requiring the result to exist. */
+    joinPath(parts: string[], abortSignal?: AbortSignal): Promise<Result<string, FileError>>;
+    /** Read a UTF-8 text file. */
+    readTextFile(path: string, abortSignal?: AbortSignal): Promise<Result<string, FileError>>;
+    /** Read UTF-8 text lines. Implementations should stop once `maxLines` lines have been read. */
+    readTextLines(path: string, options?: {
+        maxLines?: number;
+        abortSignal?: AbortSignal;
+    }): Promise<Result<string[], FileError>>;
+    /** Read a binary file. */
+    readBinaryFile(path: string, abortSignal?: AbortSignal): Promise<Result<Uint8Array, FileError>>;
+    /** Create or overwrite a file, creating parent directories when supported. */
+    writeFile(path: string, content: string | Uint8Array, abortSignal?: AbortSignal): Promise<Result<void, FileError>>;
+    /** Create or append to a file, creating parent directories when supported. */
+    appendFile(path: string, content: string | Uint8Array, abortSignal?: AbortSignal): Promise<Result<void, FileError>>;
+    /** Return metadata for the addressed path without following symlinks. */
+    fileInfo(path: string, abortSignal?: AbortSignal): Promise<Result<FileInfo, FileError>>;
+    /** List direct children of a directory without following symlinks. */
+    listDir(path: string, abortSignal?: AbortSignal): Promise<Result<FileInfo[], FileError>>;
+    /** Return the canonical path for an existing path, resolving symlinks where supported. */
+    canonicalPath(path: string, abortSignal?: AbortSignal): Promise<Result<string, FileError>>;
+    /** Return false for missing paths. Other errors, such as permission failures, return a {@link FileError}. */
+    exists(path: string, abortSignal?: AbortSignal): Promise<Result<boolean, FileError>>;
+    /** Create a directory. Defaults: `recursive: true`, no abort signal. */
     createDir(path: string, options?: {
         recursive?: boolean;
-    }): Promise<void>;
-    /** Remove a file or directory. */
+        abortSignal?: AbortSignal;
+    }): Promise<Result<void, FileError>>;
+    /** Remove a file or directory. Defaults: `recursive: false`, `force: false`, no abort signal. */
     remove(path: string, options?: {
         recursive?: boolean;
         force?: boolean;
-    }): Promise<void>;
-    /** Create a temporary directory and return its absolute path. */
-    createTempDir(prefix?: string): Promise<string>;
-    /** Create a temporary file and return its absolute path. */
+        abortSignal?: AbortSignal;
+    }): Promise<Result<void, FileError>>;
+    /** Create a temporary directory and return its absolute path. Defaults: `prefix: "tmp-"`, no abort signal. */
+    createTempDir(prefix?: string, abortSignal?: AbortSignal): Promise<Result<string, FileError>>;
+    /** Create a temporary file and return its absolute path. Defaults: `prefix: ""`, `suffix: ""`, no abort signal. */
     createTempFile(options?: {
         prefix?: string;
         suffix?: string;
-    }): Promise<string>;
-    /** Release resources owned by the environment. */
+        abortSignal?: AbortSignal;
+    }): Promise<Result<string, FileError>>;
+    /** Release filesystem resources. Must be best-effort and must not throw or reject. */
+    cleanup(): Promise<void>;
+}
+/** Shell execution capability used by the harness. */
+export interface Shell {
+    /** Execute a shell command in {@link FileSystem.cwd} unless `options.cwd` is provided. */
+    exec(command: string, options?: ExecutionEnvExecOptions): Promise<Result<{
+        stdout: string;
+        stderr: string;
+        exitCode: number;
+    }, ExecutionError>>;
+    /** Release shell resources. Must be best-effort and must not throw or reject. */
     cleanup(): Promise<void>;
 }
+/** Filesystem and process execution environment used by the harness. */
+export interface ExecutionEnv extends FileSystem, Shell {
+}
 export interface SessionTreeEntryBase {
     type: string;
     id: string;
@@ -173,6 +246,10 @@ export interface ModelChangeEntry extends SessionTreeEntryBase {
     provider: string;
     modelId: string;
 }
+export interface ActiveToolsChangeEntry extends SessionTreeEntryBase {
+    type: 'active_tools_change';
+    activeToolNames: string[];
+}
 export interface CompactionEntry<T = unknown> extends SessionTreeEntryBase {
     type: 'compaction';
     summary: string;
@@ -209,7 +286,11 @@ export interface SessionInfoEntry extends SessionTreeEntryBase {
     type: 'session_info';
     name?: string;
 }
-export type SessionTreeEntry = MessageEntry | ThinkingLevelChangeEntry | ModelChangeEntry | CompactionEntry | BranchSummaryEntry | CustomEntry | CustomMessageEntry | LabelEntry | SessionInfoEntry;
+export interface LeafEntry extends SessionTreeEntryBase {
+    type: 'leaf';
+    targetId: string | null;
+}
+export type SessionTreeEntry = MessageEntry | ThinkingLevelChangeEntry | ModelChangeEntry | ActiveToolsChangeEntry | CompactionEntry | BranchSummaryEntry | CustomEntry | CustomMessageEntry | LabelEntry | SessionInfoEntry | LeafEntry;
 export interface SessionContext {
     messages: AgentMessage[];
     thinkingLevel: string;
@@ -217,6 +298,7 @@ export interface SessionContext {
         provider: string;
         modelId: string;
     } | null;
+    activeToolNames: string[] | null;
 }
 export interface SessionMetadata {
     id: string;
@@ -230,6 +312,7 @@ export interface JsonlSessionMetadata extends SessionMetadata {
 export interface SessionStorage<TMetadata extends SessionMetadata = SessionMetadata> {
     getMetadata(): Promise<TMetadata>;
     getLeafId(): Promise<string | null>;
+    /** Persist a leaf entry that records the active session-tree leaf. */
     setLeafId(leafId: string | null): Promise<void>;
     createEntryId(): Promise<string>;
     appendEntry(entry: SessionTreeEntry): Promise<void>;
@@ -241,7 +324,7 @@ export interface SessionStorage<TMetadata extends SessionMetadata = SessionMetad
     getPathToRoot(leafId: string | null): Promise<SessionTreeEntry[]>;
     getEntries(): Promise<SessionTreeEntry[]>;
 }
-export type { Session } from './session/session.js';
+export type { Session } from './session/session.ts';
 export interface SessionCreateOptions {
     id?: string;
 }
@@ -353,23 +436,31 @@ export interface SessionTreeEvent {
     summaryEntry?: BranchSummaryEntry;
     fromHook?: boolean;
 }
-export interface ModelSelectEvent {
-    type: 'model_select';
+export interface ModelUpdateEvent {
+    type: 'model_update';
     model: Model<any>;
     previousModel: Model<any> | undefined;
     source: 'set' | 'restore';
 }
-export interface ThinkingLevelSelectEvent {
-    type: 'thinking_level_select';
+export interface ThinkingLevelUpdateEvent {
+    type: 'thinking_level_update';
     level: ThinkingLevel;
     previousLevel: ThinkingLevel;
 }
+export interface ToolsUpdateEvent {
+    type: 'tools_update';
+    toolNames: string[];
+    previousToolNames: string[];
+    activeToolNames: string[];
+    previousActiveToolNames: string[];
+    source: 'set' | 'restore';
+}
 export interface ResourcesUpdateEvent<TSkill extends Skill = Skill, TPromptTemplate extends PromptTemplate = PromptTemplate> {
     type: 'resources_update';
     resources: AgentHarnessResources<TSkill, TPromptTemplate>;
     previousResources: AgentHarnessResources<TSkill, TPromptTemplate>;
 }
-export type AgentHarnessOwnEvent<TSkill extends Skill = Skill, TPromptTemplate extends PromptTemplate = PromptTemplate> = QueueUpdateEvent | SavePointEvent | AbortEvent | SettledEvent | BeforeAgentStartEvent<TSkill, TPromptTemplate> | ContextEvent | BeforeProviderRequestEvent | BeforeProviderPayloadEvent | AfterProviderResponseEvent | ToolCallEvent | ToolResultEvent | SessionBeforeCompactEvent | SessionCompactEvent | SessionBeforeTreeEvent | SessionTreeEvent | ModelSelectEvent | ThinkingLevelSelectEvent | ResourcesUpdateEvent<TSkill, TPromptTemplate>;
+export type AgentHarnessOwnEvent<TSkill extends Skill = Skill, TPromptTemplate extends PromptTemplate = PromptTemplate> = QueueUpdateEvent | SavePointEvent | AbortEvent | SettledEvent | BeforeAgentStartEvent<TSkill, TPromptTemplate> | ContextEvent | BeforeProviderRequestEvent | BeforeProviderPayloadEvent | AfterProviderResponseEvent | ToolCallEvent | ToolResultEvent | SessionBeforeCompactEvent | SessionCompactEvent | SessionBeforeTreeEvent | SessionTreeEvent | ModelUpdateEvent | ThinkingLevelUpdateEvent | ResourcesUpdateEvent<TSkill, TPromptTemplate> | ToolsUpdateEvent;
 export type AgentHarnessEvent<TSkill extends Skill = Skill, TPromptTemplate extends PromptTemplate = PromptTemplate> = AgentEvent | AgentHarnessOwnEvent<TSkill, TPromptTemplate>;
 export interface BeforeAgentStartResult {
     messages?: AgentMessage[];
@@ -420,9 +511,10 @@ export type AgentHarnessEventResultMap = {
     session_compact: undefined;
     session_before_tree: SessionBeforeTreeResult | undefined;
     session_tree: undefined;
-    model_select: undefined;
-    thinking_level_select: undefined;
+    model_update: undefined;
+    thinking_level_update: undefined;
     resources_update: undefined;
+    tools_update: undefined;
     queue_update: undefined;
     save_point: undefined;
     abort: undefined;
@@ -486,11 +578,9 @@ export interface GenerateBranchSummaryOptions {
     reserveTokens?: number;
 }
 export interface BranchSummaryResult {
-    summary?: string;
-    readFiles?: string[];
-    modifiedFiles?: string[];
-    aborted?: boolean;
-    error?: string;
+    summary: string;
+    readFiles: string[];
+    modifiedFiles: string[];
 }
 export interface AgentHarnessOptions<TSkill extends Skill = Skill, TPromptTemplate extends PromptTemplate = PromptTemplate, TTool extends AgentTool = AgentTool> {
     env: ExecutionEnv;
@@ -521,4 +611,4 @@ export interface AgentHarnessOptions<TSkill extends Skill = Skill, TPromptTempla
     steeringMode?: QueueMode;
     followUpMode?: QueueMode;
 }
-export type { AgentHarness } from './agent-harness.js';
+export type { AgentHarness } from './agent-harness.ts';

package/build/module/lib/agent-core/src/harness/types.js

@@ -0,0 +1,94 @@
+/** Create a successful {@link Result}. */
+export function ok(value) {
+    return { ok: true, value };
+}
+/** Create a failed {@link Result}. */
+export function err(error) {
+    return { ok: false, error };
+}
+/** Return the success value or throw the failure error. Intended for tests and explicit adapter boundaries. */
+export function getOrThrow(result) {
+    if (!result.ok)
+        throw result.error;
+    return result.value;
+}
+/** Return the success value or `undefined`. Only object values are allowed to avoid truthiness bugs with primitives. */
+export function getOrUndefined(result) {
+    return result.ok ? result.value : undefined;
+}
+/** Normalize unknown thrown values into Error instances before using them as typed error causes. */
+export function toError(error) {
+    if (error instanceof Error)
+        return error;
+    if (typeof error === 'string')
+        return new Error(error);
+    try {
+        return new Error(JSON.stringify(error));
+    }
+    catch {
+        return new Error(String(error));
+    }
+}
+/** Error returned by {@link FileSystem} file operations. */
+export class FileError extends Error {
+    /** Backend-independent error code. */
+    code;
+    /** Absolute addressed path associated with the failure, when available. */
+    path;
+    constructor(code, message, path, cause) {
+        super(message, cause === undefined ? undefined : { cause });
+        this.name = 'FileError';
+        this.code = code;
+        this.path = path;
+    }
+}
+/** Error returned by {@link ExecutionEnv.exec}. */
+export class ExecutionError extends Error {
+    /** Backend-independent error code. */
+    code;
+    constructor(code, message, cause) {
+        super(message, cause === undefined ? undefined : { cause });
+        this.name = 'ExecutionError';
+        this.code = code;
+    }
+}
+/** Error returned by compaction helpers. */
+export class CompactionError extends Error {
+    /** Backend-independent error code. */
+    code;
+    constructor(code, message, cause) {
+        super(message, cause === undefined ? undefined : { cause });
+        this.name = 'CompactionError';
+        this.code = code;
+    }
+}
+/** Error returned by branch summarization helpers. */
+export class BranchSummaryError extends Error {
+    /** Backend-independent error code. */
+    code;
+    constructor(code, message, cause) {
+        super(message, cause === undefined ? undefined : { cause });
+        this.name = 'BranchSummaryError';
+        this.code = code;
+    }
+}
+/** Error thrown by session storage, repositories, and session tree operations. */
+export class SessionError extends Error {
+    /** Session subsystem error code. */
+    code;
+    constructor(code, message, cause) {
+        super(message, cause === undefined ? undefined : { cause });
+        this.name = 'SessionError';
+        this.code = code;
+    }
+}
+/** Public AgentHarness failure with a stable top-level classification. */
+export class AgentHarnessError extends Error {
+    code;
+    constructor(code, message, cause) {
+        super(message, cause === undefined ? undefined : { cause });
+        this.name = 'AgentHarnessError';
+        this.code = code;
+    }
+}
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoidHlwZXMuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi8uLi8uLi8uLi9zcmMvbGliL2FnZW50LWNvcmUvc3JjL2hhcm5lc3MvdHlwZXMudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBdUJBLDBDQUEwQztBQUMxQyxNQUFNLFVBQVUsRUFBRSxDQUFpQixLQUFhO0lBQzlDLE9BQU8sRUFBRSxFQUFFLEVBQUUsSUFBSSxFQUFFLEtBQUssRUFBRSxDQUFDO0FBQzdCLENBQUM7QUFFRCxzQ0FBc0M7QUFDdEMsTUFBTSxVQUFVLEdBQUcsQ0FBaUIsS0FBYTtJQUMvQyxPQUFPLEVBQUUsRUFBRSxFQUFFLEtBQUssRUFBRSxLQUFLLEVBQUUsQ0FBQztBQUM5QixDQUFDO0FBRUQsK0dBQStHO0FBQy9HLE1BQU0sVUFBVSxVQUFVLENBQ3hCLE1BQThCO0lBRTlCLElBQUksQ0FBQyxNQUFNLENBQUMsRUFBRTtRQUFFLE1BQU0sTUFBTSxDQUFDLEtBQUssQ0FBQztJQUNuQyxPQUFPLE1BQU0sQ0FBQyxLQUFLLENBQUM7QUFDdEIsQ0FBQztBQUVELHdIQUF3SDtBQUN4SCxNQUFNLFVBQVUsY0FBYyxDQUM1QixNQUE4QjtJQUU5QixPQUFPLE1BQU0sQ0FBQyxFQUFFLENBQUMsQ0FBQyxDQUFDLE1BQU0sQ0FBQyxLQUFLLENBQUMsQ0FBQyxDQUFDLFNBQVMsQ0FBQztBQUM5QyxDQUFDO0FBRUQsb0dBQW9HO0FBQ3BHLE1BQU0sVUFBVSxPQUFPLENBQUMsS0FBYztJQUNwQyxJQUFJLEtBQUssWUFBWSxLQUFLO1FBQUUsT0FBTyxLQUFLLENBQUM7SUFDekMsSUFBSSxPQUFPLEtBQUssS0FBSyxRQUFRO1FBQUUsT0FBTyxJQUFJLEtBQUssQ0FBQyxLQUFLLENBQUMsQ0FBQztJQUN2RCxJQUFJLENBQUM7UUFDSCxPQUFPLElBQUksS0FBSyxDQUFDLElBQUksQ0FBQyxTQUFTLENBQUMsS0FBSyxDQUFDLENBQUMsQ0FBQztJQUMxQyxDQUFDO0lBQUMsTUFB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

package/build/module/lib/agent-core/{harness → src/harness}/utils/shell-output.d.ts

@@ -1,4 +1,4 @@
-import type { ExecutionEnv, ExecutionEnvExecOptions } from '../types.js';
+import { type ExecutionEnv, type ExecutionEnvExecOptions, ExecutionError, type Result } from '../types.ts';
 export interface ShellCaptureOptions extends Omit<ExecutionEnvExecOptions, 'onStdout' | 'onStderr'> {
     onChunk?: (chunk: string) => void;
 }
@@ -10,4 +10,4 @@ export interface ShellCaptureResult {
     fullOutputPath?: string;
 }
 export declare function sanitizeBinaryOutput(str: string): string;
-export declare function executeShellWithCapture(env: ExecutionEnv, command: string, options?: ShellCaptureOptions): Promise<ShellCaptureResult>;
+export declare function executeShellWithCapture(env: ExecutionEnv, command: string, options?: ShellCaptureOptions): Promise<Result<ShellCaptureResult, ExecutionError>>;

package/build/module/lib/agent-core/src/harness/utils/shell-output.js

@@ -0,0 +1,134 @@
+import { err, ExecutionError, ok, toError, } from "../types.js";
+import { DEFAULT_MAX_BYTES, truncateTail } from "./truncate.js";
+function toExecutionError(error) {
+    if (error instanceof ExecutionError)
+        return error;
+    const cause = toError(error);
+    return new ExecutionError('unknown', cause.message, cause);
+}
+export function sanitizeBinaryOutput(str) {
+    return Array.from(str)
+        .filter((char) => {
+        const code = char.codePointAt(0);
+        if (code === undefined)
+            return false;
+        if (code === 0x09 || code === 0x0a || code === 0x0d)
+            return true;
+        if (code <= 0x1f)
+            return false;
+        if (code >= 0xfff9 && code <= 0xfffb)
+            return false;
+        return true;
+    })
+        .join('');
+}
+export async function executeShellWithCapture(env, command, options) {
+    const outputChunks = [];
+    let outputBytes = 0;
+    const maxOutputBytes = DEFAULT_MAX_BYTES * 2;
+    const encoder = new TextEncoder();
+    let totalBytes = 0;
+    let fullOutputPath;
+    let writeChain = Promise.resolve(ok(undefined));
+    let captureError;
+    const appendFullOutput = (text) => {
+        if (!fullOutputPath || captureError)
+            return;
+        const path = fullOutputPath;
+        writeChain = writeChain.then(async (previous) => {
+            if (!previous.ok)
+                return previous;
+            const appendResult = await env.appendFile(path, text, options?.abortSignal);
+            return appendResult.ok
+                ? ok(undefined)
+                : err(toExecutionError(appendResult.error));
+        });
+    };
+    const ensureFullOutputFile = (initialContent) => {
+        if (fullOutputPath || captureError)
+            return;
+        writeChain = writeChain.then(async (previous) => {
+            if (!previous.ok)
+                return previous;
+            const tempFile = await env.createTempFile({
+                prefix: 'bash-',
+                suffix: '.log',
+                abortSignal: options?.abortSignal,
+            });
+            if (!tempFile.ok)
+                return err(toExecutionError(tempFile.error));
+            fullOutputPath = tempFile.value;
+            const appendResult = await env.appendFile(tempFile.value, initialContent, options?.abortSignal);
+            return appendResult.ok
+                ? ok(undefined)
+                : err(toExecutionError(appendResult.error));
+        });
+    };
+    const onChunk = (chunk) => {
+        try {
+            totalBytes += encoder.encode(chunk).byteLength;
+            const text = sanitizeBinaryOutput(chunk).replace(/\r/g, '');
+            if (totalBytes > DEFAULT_MAX_BYTES && !fullOutputPath) {
+                ensureFullOutputFile(outputChunks.join('') + text);
+            }
+            else {
+                appendFullOutput(text);
+            }
+            outputChunks.push(text);
+            outputBytes += text.length;
+            while (outputBytes > maxOutputBytes && outputChunks.length > 1) {
+                const removed = outputChunks.shift();
+                outputBytes -= removed.length;
+            }
+            options?.onChunk?.(text);
+        }
+        catch (error) {
+            captureError = toExecutionError(error);
+        }
+    };
+    try {
+        const result = await env.exec(command, {
+            ...(options ?? {}),
+            onStdout: onChunk,
+            onStderr: onChunk,
+        });
+        const tailOutput = outputChunks.join('');
+        const truncationResult = truncateTail(tailOutput);
+        if (truncationResult.truncated && !fullOutputPath) {
+            ensureFullOutputFile(tailOutput);
+        }
+        const writeResult = await writeChain;
+        if (!writeResult.ok)
+            return err(writeResult.error);
+        if (captureError)
+            return err(captureError);
+        if (!result.ok) {
+            if (result.error.code === 'aborted' || options?.abortSignal?.aborted) {
+                return ok({
+                    output: truncationResult.truncated
+                        ? truncationResult.content
+                        : tailOutput,
+                    exitCode: undefined,
+                    cancelled: true,
+                    truncated: truncationResult.truncated,
+                    fullOutputPath,
+                });
+            }
+            return err(result.error);
+        }
+        const cancelled = options?.abortSignal?.aborted ?? false;
+        return ok({
+            output: truncationResult.truncated
+                ? truncationResult.content
+                : tailOutput,
+            exitCode: cancelled ? undefined : result.value.exitCode,
+            cancelled,
+            truncated: truncationResult.truncated,
+            fullOutputPath,
+        });
+    }
+    catch (error) {
+        return err(toExecutionError(error));
+    }
+}
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoic2hlbGwtb3V0cHV0LmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vLi4vLi4vLi4vLi4vLi4vc3JjL2xpYi9hZ2VudC1jb3JlL3NyYy9oYXJuZXNzL3V0aWxzL3NoZWxsLW91dHB1dC50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSxPQUFPLEVBQ0wsR0FBRyxFQUdILGNBQWMsRUFDZCxFQUFFLEVBRUYsT0FBTyxHQUNSLE1BQU0sYUFBYSxDQUFDO0FBRXJCLE9BQU8sRUFBRSxpQkFBaUIsRUFBRSxZQUFZLEVBQUUsTUFBTSxlQUFlLENBQUM7QUFpQmhFLFNBQVMsZ0JBQWdCLENBQUMsS0FBYztJQUN0QyxJQUFJLEtBQUssWUFBWSxjQUFjO1FBQUUsT0FBTyxLQUFLLENBQUM7SUFDbEQsTUFBTSxLQUFLLEdBQUcsT0FBTyxDQUFDLEtBQUssQ0FBQyxDQUFDO0lBQzdCLE9BQU8sSUFBSSxjQUFjLENBQUMsU0FBUyxFQUFFLEtBQUssQ0FBQyxPQUFPLEVBQUUsS0FBSyxDQUFDLENBQUM7QUFDN0QsQ0FBQztBQUVELE1BQU0sVUFBVSxvQkFBb0IsQ0FBQyxHQUFXO0lBQzlDLE9BQU8sS0FBSyxDQUFDLElBQUksQ0FBQyxHQUFHLENBQUM7U0FDbkIsTUFBTSxDQUFDLENBQUMsSUFBSSxFQUFFLEVBQUU7UUFDZixNQUFNLElBQUksR0FBRyxJQUFJLENBQUMsV0FBVyxDQUFDLENBQUMsQ0FBQyxDQUFDO1FBQ2pDLElBQUksSUFBSSxLQUFLLFNBQVM7WUFBRSxPQUFPLEtBQUssQ0FBQztRQUNyQyxJQUFJLElBQUksS0FBSyxJQUFJLElBQUksSUFBSSxLQUFLLElBQUksSUFBSSxJQUFJLEtBQUssSUFBSTtZQUFFLE9BQU8sSUFBSSxDQUFDO1FBQ2pFLElBQUksSUFBSSxJQUFJLElBQUk7WUFBRSxPQUFPLEtBQUssQ0FBQztRQUMvQixJQUFJLElBQUksSUFBSSxNQUFNLElBQUksSUFBSSxJQUFJLE1BQU07WUFBRSxPQUFPLEtBQUssQ0FBQztR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