laohuang 0.4.2 → 0.5.0

package/dist/runtime/task-lifecycle.d.ts

@@ -0,0 +1,73 @@
+import { CancelToken } from "../cancellation.ts";
+import { type EventBus } from "../events.ts";
+export declare const TaskState: {
+    readonly RunningModel: "running_model";
+    readonly RunningTools: "running_tools";
+    readonly Cancelling: "cancelling";
+    readonly Cancelled: "cancelled";
+    readonly Completed: "completed";
+    readonly Failed: "failed";
+};
+export type TaskState = (typeof TaskState)[keyof typeof TaskState];
+export interface TaskRecord {
+    readonly taskId: string;
+    readonly state: TaskState;
+    readonly cancelToken: CancelToken;
+    readonly result: string | null;
+    readonly error: string | null;
+}
+export interface RegisterTaskOptions {
+    state?: TaskState;
+    cancelToken?: CancelToken;
+    activate?: boolean;
+}
+export interface TransitionOptions {
+    result?: string;
+    error?: string;
+}
+export declare function isTerminalTaskState(state: TaskState): boolean;
+/** Task records with at most one active task. */
+export declare class TaskRegistry {
+    private readonly tasks;
+    private activeTaskIdValue;
+    get activeTaskId(): string | null;
+    register(taskId: string, options?: RegisterTaskOptions): TaskRecord;
+    get(taskId: string): TaskRecord | null;
+    active(): TaskRecord | null;
+    transition(taskId: string, state: TaskState, options?: TransitionOptions): TaskRecord;
+    records(): TaskRecord[];
+}
+export interface TaskLifecycleOptions {
+    readonly eventBus: EventBus;
+    readonly sessionId: string;
+    readonly taskRegistry?: TaskRegistry;
+    readonly queueCounts?: () => {
+        readonly pending: number;
+        readonly held: number;
+    };
+    readonly onCancelling?: (taskId: string) => void;
+}
+export interface CreateTaskOptions {
+    readonly cancelToken?: CancelToken;
+    readonly correlationId?: string | null;
+}
+/** Owns task state changes and their canonical lifecycle events. */
+export declare class TaskLifecycle {
+    readonly taskRegistry: TaskRegistry;
+    private readonly eventBus;
+    private readonly sessionId;
+    private readonly queueCounts;
+    private readonly onCancelling;
+    constructor(options: TaskLifecycleOptions);
+    active(): TaskRecord | null;
+    createTask(taskId: string, options?: CreateTaskOptions): TaskRecord;
+    markModelRunning(taskId: string): boolean;
+    markToolsRunning(taskId: string): boolean;
+    requestCancel(taskId: string, reason?: string): boolean;
+    completeTask(taskId: string, result: string | null): boolean;
+    finishCancelled(taskId: string): boolean;
+    failTask(taskId: string, error: string): boolean;
+    publishCurrentState(taskId: string): boolean;
+    private markRunning;
+    private publishState;
+}

package/dist/runtime/task-lifecycle.js

@@ -0,0 +1,267 @@
+import { CancelToken } from "../cancellation.js";
+import { EventKind, EventSource } from "../events.js";
+export const TaskState = {
+    RunningModel: "running_model",
+    RunningTools: "running_tools",
+    Cancelling: "cancelling",
+    Cancelled: "cancelled",
+    Completed: "completed",
+    Failed: "failed",
+};
+const TERMINAL_TASK_STATES = new Set([
+    TaskState.Cancelled,
+    TaskState.Completed,
+    TaskState.Failed,
+]);
+const ALLOWED_TASK_TRANSITIONS = new Map([
+    [
+        TaskState.RunningModel,
+        new Set([
+            TaskState.RunningTools,
+            TaskState.Cancelling,
+            TaskState.Completed,
+            TaskState.Failed,
+        ]),
+    ],
+    [
+        TaskState.RunningTools,
+        new Set([
+            TaskState.RunningModel,
+            TaskState.Cancelling,
+            TaskState.Completed,
+            TaskState.Failed,
+        ]),
+    ],
+    [TaskState.Cancelling, new Set([TaskState.Cancelled])],
+    [TaskState.Cancelled, new Set()],
+    [TaskState.Completed, new Set()],
+    [TaskState.Failed, new Set()],
+]);
+export function isTerminalTaskState(state) {
+    return TERMINAL_TASK_STATES.has(state);
+}
+/** Task records with at most one active task. */
+export class TaskRegistry {
+    tasks = new Map();
+    activeTaskIdValue = null;
+    get activeTaskId() {
+        return this.activeTaskIdValue;
+    }
+    register(taskId, options = {}) {
+        const state = options.state ?? TaskState.RunningModel;
+        const activate = options.activate ?? true;
+        if (this.tasks.has(taskId)) {
+            throw new Error(`task already exists: ${taskId}`);
+        }
+        if (activate && this.activeTaskIdValue !== null) {
+            throw new Error("another task is already active");
+        }
+        const record = {
+            taskId,
+            state,
+            cancelToken: options.cancelToken ?? new CancelToken(),
+            result: null,
+            error: null,
+        };
+        this.tasks.set(taskId, record);
+        if (activate && !isTerminalTaskState(state)) {
+            this.activeTaskIdValue = taskId;
+        }
+        return { ...record };
+    }
+    get(taskId) {
+        const record = this.tasks.get(taskId);
+        return record === undefined ? null : { ...record };
+    }
+    active() {
+        if (this.activeTaskIdValue === null) {
+            return null;
+        }
+        const record = this.tasks.get(this.activeTaskIdValue);
+        return record === undefined ? null : { ...record };
+    }
+    transition(taskId, state, options = {}) {
+        const record = this.tasks.get(taskId);
+        if (record === undefined) {
+            throw new Error(`unknown task: ${taskId}`);
+        }
+        if (state !== record.state &&
+            !ALLOWED_TASK_TRANSITIONS.get(record.state)?.has(state)) {
+            throw new Error(`invalid task transition: ${record.state} -> ${state}`);
+        }
+        const next = {
+            ...record,
+            state,
+            result: options.result !== undefined ? options.result : record.result,
+            error: options.error !== undefined ? options.error : record.error,
+        };
+        if (isTerminalTaskState(state)) {
+            if (this.activeTaskIdValue === taskId) {
+                this.activeTaskIdValue = null;
+            }
+        }
+        else {
+            const active = this.activeTaskIdValue;
+            if (active !== null && active !== taskId) {
+                throw new Error("another task is already active");
+            }
+            this.activeTaskIdValue = taskId;
+        }
+        this.tasks.set(taskId, next);
+        return { ...next };
+    }
+    records() {
+        return [...this.tasks.values()].map((record) => ({ ...record }));
+    }
+}
+/** Owns task state changes and their canonical lifecycle events. */
+export class TaskLifecycle {
+    taskRegistry;
+    eventBus;
+    sessionId;
+    queueCounts;
+    onCancelling;
+    constructor(options) {
+        this.eventBus = options.eventBus;
+        this.sessionId = options.sessionId;
+        this.taskRegistry = options.taskRegistry ?? new TaskRegistry();
+        this.queueCounts = options.queueCounts ?? (() => ({ pending: 0, held: 0 }));
+        this.onCancelling = options.onCancelling ?? (() => { });
+    }
+    active() {
+        return this.taskRegistry.active();
+    }
+    createTask(taskId, options = {}) {
+        const record = this.taskRegistry.register(taskId, {
+            cancelToken: options.cancelToken,
+        });
+        const counts = this.queueCounts();
+        this.eventBus.publish(EventKind.TaskStarted, {
+            source: EventSource.Session,
+            session_id: this.sessionId,
+            task_id: taskId,
+            correlation_id: options.correlationId ?? null,
+            payload: {
+                pending_count: counts.pending,
+                held_count: counts.held,
+            },
+        });
+        return record;
+    }
+    markModelRunning(taskId) {
+        return this.markRunning(taskId, TaskState.RunningModel);
+    }
+    markToolsRunning(taskId) {
+        return this.markRunning(taskId, TaskState.RunningTools);
+    }
+    requestCancel(taskId, reason = "cancelled by user") {
+        const record = this.taskRegistry.get(taskId);
+        if (record === null || isTerminalTaskState(record.state)) {
+            return false;
+        }
+        if (record.state === TaskState.Cancelling) {
+            return true;
+        }
+        this.taskRegistry.transition(taskId, TaskState.Cancelling);
+        this.onCancelling(taskId);
+        this.publishState(taskId, TaskState.Cancelling);
+        return record.cancelToken.cancel(reason);
+    }
+    completeTask(taskId, result) {
+        const record = this.taskRegistry.get(taskId);
+        if (record === null ||
+            record.state === TaskState.Cancelling ||
+            isTerminalTaskState(record.state)) {
+            return false;
+        }
+        this.taskRegistry.transition(taskId, TaskState.Completed, result === null ? {} : { result });
+        const counts = this.queueCounts();
+        this.eventBus.publish(EventKind.TaskCompleted, {
+            source: EventSource.Session,
+            session_id: this.sessionId,
+            task_id: taskId,
+            payload: {
+                result: result ?? "",
+                pending_count: counts.pending,
+                held_count: counts.held,
+            },
+        });
+        return true;
+    }
+    finishCancelled(taskId) {
+        const record = this.taskRegistry.get(taskId);
+        if (record === null || record.state !== TaskState.Cancelling) {
+            return false;
+        }
+        this.taskRegistry.transition(taskId, TaskState.Cancelled);
+        const counts = this.queueCounts();
+        this.eventBus.publish(EventKind.TaskCancelled, {
+            source: EventSource.Session,
+            session_id: this.sessionId,
+            task_id: taskId,
+            payload: {
+                reason: record.cancelToken.reason ?? "cancelled",
+                pending_count: counts.pending,
+                held_count: counts.held,
+            },
+        });
+        return true;
+    }
+    failTask(taskId, error) {
+        const record = this.taskRegistry.get(taskId);
+        if (record === null ||
+            record.state === TaskState.Cancelling ||
+            isTerminalTaskState(record.state)) {
+            return false;
+        }
+        this.taskRegistry.transition(taskId, TaskState.Failed, { error });
+        const counts = this.queueCounts();
+        this.eventBus.publish(EventKind.TaskFailed, {
+            source: EventSource.Session,
+            session_id: this.sessionId,
+            task_id: taskId,
+            payload: {
+                error,
+                pending_count: counts.pending,
+                held_count: counts.held,
+            },
+        });
+        return true;
+    }
+    publishCurrentState(taskId) {
+        const record = this.taskRegistry.get(taskId);
+        if (record === null) {
+            return false;
+        }
+        this.publishState(taskId, record.state);
+        return true;
+    }
+    markRunning(taskId, state) {
+        const record = this.taskRegistry.get(taskId);
+        if (record === null ||
+            record.state === TaskState.Cancelling ||
+            isTerminalTaskState(record.state)) {
+            return false;
+        }
+        if (record.state !== state) {
+            this.taskRegistry.transition(taskId, state);
+            this.publishState(taskId, state);
+        }
+        return true;
+    }
+    publishState(taskId, state) {
+        const counts = this.queueCounts();
+        this.eventBus.publish(EventKind.TaskStateChanged, {
+            source: EventSource.Session,
+            session_id: this.sessionId,
+            task_id: taskId,
+            payload: {
+                state,
+                state_name: state.toUpperCase(),
+                pending_count: counts.pending,
+                held_count: counts.held,
+            },
+        });
+    }
+}
+//# sourceMappingURL=task-lifecycle.js.map

package/dist/runtime/task-lifecycle.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"task-lifecycle.js","sourceRoot":"","sources":["../../src/runtime/task-lifecycle.ts"],"names":[],"mappings":"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"}

package/dist/runtime/tool-runtime.d.ts

@@ -0,0 +1,33 @@
+import type { CancelToken } from "../cancellation.ts";
+import type { AssembledToolCall } from "../model-stream.ts";
+import type { ToolExecutionContextLike, ToolExecutionMode, ToolRegistryLike, ToolResult } from "../tools.ts";
+export interface ToolRuntimeRequest {
+    toolCalls: readonly AssembledToolCall[];
+    executionMode: ToolExecutionMode;
+    cancelToken: CancelToken | null;
+    onToolStart?: ((event: ToolRuntimeToolEvent) => void) | null;
+    onToolResult?: ((event: ToolRuntimeToolResultEvent) => void) | null;
+}
+export interface ToolRuntimeToolEvent {
+    readonly index: number;
+    readonly batchSize: number;
+    readonly toolCall: AssembledToolCall;
+    readonly args: Record<string, unknown>;
+}
+export interface ToolRuntimeToolResultEvent extends ToolRuntimeToolEvent {
+    readonly result: ToolResult;
+}
+/** Tool results are always in source order, even when execution is parallel. */
+export interface ToolBatchResult {
+    readonly results: readonly ToolResult[];
+}
+export type ToolExecutionContextFactory = (toolCallId: string, cancelToken: CancelToken | null) => ToolExecutionContextLike;
+/** Owns tool-call argument decoding, scheduling, and cooperative cancellation. */
+export declare class ToolRuntime {
+    private readonly tools;
+    private readonly createExecutionContext;
+    constructor(tools: ToolRegistryLike, options?: {
+        createExecutionContext?: ToolExecutionContextFactory;
+    });
+    execute(request: ToolRuntimeRequest): Promise<ToolBatchResult>;
+}

package/dist/runtime/tool-runtime.js

@@ -0,0 +1,89 @@
+import { ToolExecutionContext } from "../bash-runner.js";
+/** Owns tool-call argument decoding, scheduling, and cooperative cancellation. */
+export class ToolRuntime {
+    tools;
+    createExecutionContext;
+    constructor(tools, options = {}) {
+        this.tools = tools;
+        this.createExecutionContext = options.createExecutionContext ??
+            ((toolCallId, cancelToken) => new ToolExecutionContext({ toolCallId, cancelToken }));
+    }
+    async execute(request) {
+        const results = new Array(request.toolCalls.length).fill(undefined);
+        const prepared = [];
+        for (let offset = 0; offset < request.toolCalls.length; offset += 1) {
+            const toolCall = request.toolCalls[offset];
+            if (toolCall === undefined) {
+                continue;
+            }
+            let args;
+            let result;
+            try {
+                const decoded = JSON.parse(toolCall.function.arguments);
+                if (typeof decoded !== "object" || decoded === null || Array.isArray(decoded)) {
+                    throw new Error("Tool arguments must be a JSON object");
+                }
+                args = decoded;
+            }
+            catch (error) {
+                args = { _raw: toolCall.function.arguments };
+                result = { ok: false, error: errorMessage(error) };
+            }
+            const event = {
+                index: offset + 1,
+                batchSize: request.toolCalls.length,
+                toolCall,
+                args,
+            };
+            request.onToolStart?.(event);
+            if (result === undefined) {
+                prepared.push(event);
+            }
+            else {
+                results[offset] = result;
+                request.onToolResult?.({ ...event, result });
+            }
+        }
+        const sequentialBatch = request.executionMode === "sequential" ||
+            request.toolCalls.some((toolCall) => this.tools.executionMode(toolCall.function.name) === "sequential") ||
+            request.toolCalls.some((toolCall) => toolCall.function.name === "write" || toolCall.function.name === "edit");
+        const runOne = async (event) => {
+            let result;
+            if (isCancelled(request.cancelToken)) {
+                result = cancelledToolResult(request.cancelToken);
+            }
+            else {
+                try {
+                    result = await this.tools.execute(event.toolCall.function.name, event.args, this.createExecutionContext(event.toolCall.id, request.cancelToken));
+                }
+                catch (error) {
+                    result = { ok: false, error: errorMessage(error) };
+                }
+            }
+            const offset = event.index - 1;
+            results[offset] = result;
+            request.onToolResult?.({ ...event, result });
+        };
+        if (sequentialBatch || prepared.length === 1) {
+            for (const event of prepared) {
+                await runOne(event);
+            }
+        }
+        else if (prepared.length > 0) {
+            await Promise.all(prepared.map((event) => runOne(event)));
+        }
+        return {
+            results: results.map((result) => result ?? { ok: false, error: "Tool execution produced no result" }),
+        };
+    }
+}
+function isCancelled(token) {
+    return token !== null && token.isCancelled();
+}
+function cancelledToolResult(token) {
+    return { ok: false, status: "cancelled", error: token?.reason || "cancelled" };
+}
+function errorMessage(error) {
+    return error instanceof Error ? error.message : String(error);
+}
+//# sourceMappingURL=tool-runtime.js.map

package/dist/runtime/tool-runtime.js.map

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

package/dist/runtime/user-intent.d.ts

@@ -0,0 +1,48 @@
+/** User-level input before it is routed to a session action. */
+export type UserIntent = {
+    readonly type: "prompt";
+    readonly text: string;
+    readonly source: string;
+} | {
+    readonly type: "command";
+    readonly name: string;
+    readonly arguments: readonly string[];
+    readonly source: string;
+} | {
+    readonly type: "steer";
+    readonly text: string;
+    readonly source: string;
+} | {
+    readonly type: "follow_up";
+    readonly text: string;
+    readonly source: string;
+} | {
+    readonly type: "cancel";
+    readonly reason: string;
+    readonly source: string;
+} | {
+    readonly type: "approval";
+    readonly text: string;
+    readonly source: string;
+} | {
+    readonly type: "answer";
+    readonly text: string;
+    readonly source: string;
+} | {
+    readonly type: "exit";
+    readonly source: string;
+};
+export type HumanIntentDecision = {
+    readonly accepted: true;
+    readonly intent: UserIntent;
+    readonly reason?: string;
+} | {
+    readonly accepted: false;
+    readonly intent: null;
+    readonly reason: string;
+};
+export declare function makePromptIntent(text: string, source: string): UserIntent;
+export declare function makeFollowUpIntent(text: string, source: string): UserIntent;
+export declare function makeCancelIntent(reason: string, source: string): UserIntent;
+export declare function makeApprovalIntent(text: string, source: string): UserIntent;
+export declare function makeAnswerIntent(text: string, source: string): UserIntent;

package/dist/runtime/user-intent.js

@@ -0,0 +1,17 @@
+/** User-level input before it is routed to a session action. */
+export function makePromptIntent(text, source) {
+    return { type: "prompt", text, source };
+}
+export function makeFollowUpIntent(text, source) {
+    return { type: "follow_up", text, source };
+}
+export function makeCancelIntent(reason, source) {
+    return { type: "cancel", reason, source };
+}
+export function makeApprovalIntent(text, source) {
+    return { type: "approval", text, source };
+}
+export function makeAnswerIntent(text, source) {
+    return { type: "answer", text, source };
+}
+//# sourceMappingURL=user-intent.js.map

package/dist/runtime/user-intent.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"user-intent.js","sourceRoot":"","sources":["../../src/runtime/user-intent.ts"],"names":[],"mappings":"AAAA,gEAAgE;AAwDhE,MAAM,UAAU,gBAAgB,CAAC,IAAY,EAAE,MAAc;IAC3D,OAAO,EAAE,IAAI,EAAE,QAAQ,EAAE,IAAI,EAAE,MAAM,EAAE,CAAC;AAC1C,CAAC;AAED,MAAM,UAAU,kBAAkB,CAAC,IAAY,EAAE,MAAc;IAC7D,OAAO,EAAE,IAAI,EAAE,WAAW,EAAE,IAAI,EAAE,MAAM,EAAE,CAAC;AAC7C,CAAC;AAED,MAAM,UAAU,gBAAgB,CAAC,MAAc,EAAE,MAAc;IAC7D,OAAO,EAAE,IAAI,EAAE,QAAQ,EAAE,MAAM,EAAE,MAAM,EAAE,CAAC;AAC5C,CAAC;AAED,MAAM,UAAU,kBAAkB,CAAC,IAAY,EAAE,MAAc;IAC7D,OAAO,EAAE,IAAI,EAAE,UAAU,EAAE,IAAI,EAAE,MAAM,EAAE,CAAC;AAC5C,CAAC;AAED,MAAM,UAAU,gBAAgB,CAAC,IAAY,EAAE,MAAc;IAC3D,OAAO,EAAE,IAAI,EAAE,QAAQ,EAAE,IAAI,EAAE,MAAM,EAAE,CAAC;AAC1C,CAAC"}

package/dist/session.d.ts

@@ -1,8 +1,12 @@
 /** Single-active-task runtime coordination for laoHuangCode. */
-import { type CancelToken } from "./cancellation.ts";
-import type { QueueStatus } from "./commands.ts";
+import type { CancelToken } from "./cancellation.ts";
+import type { CommandResult, QueueStatus } from "./commands.ts";
 import { EventBus, EventKind, EventSource, type AnyEventEnvelope, type EventEnvelope } from "./events.ts";
-import { DeadLetterQueue, EventRouter, HeldQueue, PendingQueue, Scheduler, TaskRegistry, TaskState, type RoutedEvent, type SafetyPolicy, type SemanticClassifier, type TaskRecord } from "./routing.ts";
+import { DeadLetterQueue, EventRouter, HeldQueue, PendingQueue, type RoutedEvent, type SafetyPolicy, type SemanticClassifier } from "./routing.ts";
+import { QueueDispatcher } from "./runtime/queue-dispatcher.ts";
+import type { QueueInputBatch } from "./runtime/queue-bridge.ts";
+import type { SessionAction } from "./runtime/session-action.ts";
+import { TaskLifecycle, TaskRegistry, TaskState, type TaskRecord } from "./runtime/task-lifecycle.ts";
 export declare const SessionState: {
     readonly Idle: "idle";
     readonly Running: "running";
@@ -11,7 +15,7 @@ export declare const SessionState: {
 };
 export type SessionState = (typeof SessionState)[keyof typeof SessionState];
 /** One compatible batch of pending input claimed at a safe point. */
-export interface PendingInputBatch {
+export interface PendingInputBatch extends QueueInputBatch {
     readonly events: readonly RoutedEvent[];
     readonly content: string;
     readonly eventIds: readonly string[];
@@ -36,6 +40,7 @@ export interface AgentRunnerLike {
     run(userInput: string, context: TaskContext): TaskRunnerResult;
 }
 export type TaskRunner = ((content: string, context: TaskContext) => TaskRunnerResult) | AgentRunnerLike;
+export type CommandDispatcher = (command: string) => CommandResult | Promise<CommandResult>;
 /** Capabilities exposed to one model/tool worker invocation. */
 export declare class TaskContext {
     #private;
@@ -64,7 +69,7 @@ export declare class TaskContext {
     /** Atomically take one compatible pending batch for this task. */
     safePoint(): PendingInputBatch;
     /** @internal Used by the session worker around each runner invocation. */
-    setClaimedInput(batch: PendingInputBatch | null): void;
+    setClaimedInput(batch: QueueInputBatch | null): void;
     commitInput(callback: () => void, rollback?: () => void): boolean;
     commitPending(batch: PendingInputBatch, callback: () => void, rollback?: () => void): boolean;
     /** Atomically reject history commits once cancellation has won. */
@@ -76,6 +81,7 @@ export interface AgentSessionOptions {
     taskRegistry?: TaskRegistry;
     semanticClassifier?: SemanticClassifier | null;
     safetyPolicy?: SafetyPolicy | null;
+    commandDispatcher?: CommandDispatcher | null;
 }
 export interface CloseOptions {
     wait?: boolean;
@@ -94,11 +100,12 @@ export declare class AgentSession {
     #private;
     readonly sessionId: string;
     readonly eventBus: EventBus;
+    readonly taskLifecycle: TaskLifecycle;
     readonly taskRegistry: TaskRegistry;
     readonly pending: PendingQueue;
     readonly held: HeldQueue;
     readonly deadLetters: DeadLetterQueue;
-    readonly scheduler: Scheduler;
+    readonly queueDispatcher: QueueDispatcher;
     readonly router: EventRouter;
     readonly runner: TaskRunner;
     constructor(runner: TaskRunner, options?: AgentSessionOptions);
@@ -106,9 +113,14 @@ export declare class AgentSession {
     get activeTask(): TaskRecord | null;
     get pendingCount(): number;
     get heldCount(): number;
+    /**
+     * Compatibility API for existing callers while they migrate to submitAction.
+     */
     submitInput(content: string, options?: {
         strategy?: string;
     }): Promise<Submission>;
+    /** Compatibility bridge from neutral actions to the existing session API. */
+    submitAction(action: SessionAction): Promise<Submission | CommandResult | boolean>;
     /** Repair a decision if task state changed during semantic routing. */
     private refreshRouteForCurrentTask;
     requestCancel(reason?: string): boolean;
@@ -142,10 +154,8 @@ export declare class AgentSession {
     private settleWorker;
     /** @internal Test hook mirroring Python's ``_settle_worker``. */
     _settleWorker(workerKey: object): void;
-    private finishCancelled;
     /** Rollback and preserve every unacknowledged input for a task. */
     private holdTaskInputs;
-    private invokeRunner;
     /** @internal Used by {@link TaskContext}. */
     setRunningState(taskId: string, state: TaskState): boolean;
     /** @internal Used by {@link TaskContext}. */
@@ -154,9 +164,9 @@ export declare class AgentSession {
     commitClaimedInput(taskId: string, eventIds: readonly string[], callback: () => void, rollback: () => void): boolean;
     /** @internal Used by {@link TaskContext} and the worker loop. */
     ackClaimedInput(taskId: string, eventIds: readonly string[]): boolean;
-    private publishTaskState;
     /** @internal Used by {@link TaskContext.safePoint} and the worker loop. */
     drainPending(taskId: string): PendingInputBatch;
     private setSessionState;
+    private inputAction;
     private setIdle;
 }