@botbotgo/agent-harness 0.0.267 → 0.0.269

package/README.md

@@ -752,6 +752,7 @@ Important fields:
 - `concurrency.maxConcurrentRuns`
 - `routing.defaultAgentId`
 - `routing.rules`
+- `toolModuleDiscovery.scope`
 - `maintenance.checkpoints`
 - `maintenance.records`
 - `recovery.enabled`
@@ -765,6 +766,11 @@ Important fields:
 - `maintenance.checkpoints` trims backend checkpoint state used for resume/recovery
 - `maintenance.records` trims harness-owned terminal session/request records stored in `runtime.sqlite`
 
+`toolModuleDiscovery.scope` controls how local `resources/tools/`-style module discovery walks tool directories:
+
+- `recursive` is the default and keeps scanning nested folders
+- `top-level` limits module discovery to files directly under each tool root while leaving YAML catalogs recursive
+
 When libSQL reports an error against harness runtime persistence, the message is prefixed with the absolute path to `runtime.sqlite`. For constraint-class failures (or whenever you set `AGENT_HARNESS_RUNTIME_SQLITE_DEBUG=1`), the message also includes a truncated copy of the failing SQL so you can tell harness persistence apart from other SQLite databases in the same process.
 
 Example:
@@ -776,6 +782,8 @@ metadata:
   name: default
 spec:
   runRoot: ./.agent
+  toolModuleDiscovery:
+    scope: top-level
   concurrency:
     maxConcurrentRuns: 3
   routing:

package/README.zh.md

@@ -724,6 +724,11 @@ await stop(runtime);
 - `maintenance.checkpoints` 清理后端用于 resume/recovery 的 checkpoint 状态
 - `maintenance.records` 清理 harness 自己保存在 `runtime.sqlite` 中、已结束的 session/request 记录
 
+`toolModuleDiscovery.scope` 用来控制本地 `resources/tools/` 这类 tool module 目录的发现范围：
+
+- `recursive` 是默认值，会继续扫描嵌套目录
+- `top-level` 只发现每个工具根目录下一层文件，同时保留 YAML catalog 的递归发现
+
 当 libSQL 对 harness 运行时持久化报错时，错误信息会带上 `runtime.sqlite` 的绝对路径。对约束类错误（或设置环境变量 `AGENT_HARNESS_RUNTIME_SQLITE_DEBUG=1` 时），信息中还会包含被截断的失败 SQL，便于在同一进程里区分 harness 与其它 SQLite 数据库。
 
 示例：
@@ -735,6 +740,8 @@ metadata:
   name: default
 spec:
   runRoot: ./.agent
+  toolModuleDiscovery:
+    scope: top-level
   concurrency:
     maxConcurrentRuns: 3
   routing:

package/dist/acp.js

@@ -31,8 +31,8 @@ function toNotification(event) {
                 eventId: event.eventId,
                 eventType: event.eventType,
                 timestamp: event.timestamp,
-                sessionId: event.threadId,
-                requestId: event.runId,
+                sessionId: event.sessionId,
+                requestId: event.requestId,
                 sequence: event.sequence,
                 source: event.source,
                 payload: event.payload,

package/dist/api.d.ts

@@ -55,7 +55,7 @@ export type Approval = {
     allowedDecisions: Array<"approve" | "edit" | "reject">;
     inputPreview: Record<string, unknown>;
 };
-export type RequestArtifactListing = Omit<ArtifactListing, "threadId" | "runId"> & {
+export type RequestArtifactListing = Omit<ArtifactListing, "sessionId" | "requestId"> & {
     sessionId: string;
     requestId: string;
 };
@@ -97,17 +97,17 @@ type PublicApprovalFilter = {
     sessionId?: string;
     requestId?: string;
 };
-type PublicRequestStartOptions = Omit<RunStartOptions, "threadId" | "listeners"> & {
+type PublicRequestStartOptions = Omit<RunStartOptions, "sessionId" | "listeners"> & {
     sessionId?: string;
     listeners?: PublicRunListeners;
 };
-type PublicRequestDecisionOptions = Omit<RunDecisionOptions, "threadId" | "runId" | "listeners"> & {
+type PublicRequestDecisionOptions = Omit<RunDecisionOptions, "sessionId" | "requestId" | "listeners"> & {
     sessionId: string;
     requestId?: string;
     listeners?: PublicRunListeners;
 };
 type PublicRequestOptions = PublicRequestStartOptions | PublicRequestDecisionOptions;
-type PublicRequestResult = Omit<RunResult, "threadId" | "runId"> & {
+type PublicRequestResult = Omit<RunResult, "sessionId" | "requestId"> & {
     sessionId: string;
     requestId: string;
 };
@@ -188,13 +188,8 @@ export declare function describeInventory(runtime: AgentHarnessRuntime, options?
     workspaceRoot: string;
     agents: InventoryAgentRecord[];
 };
-export declare function resolveApproval(runtime: AgentHarnessRuntime, options: ResumeOptions & {
-    sessionId?: string;
-    requestId?: string;
-}): Promise<PublicRunResult>;
-export declare function cancelRun(runtime: AgentHarnessRuntime, options: CancelOptions & {
-    requestId?: string;
-}): Promise<PublicRunResult>;
+export declare function resolveApproval(runtime: AgentHarnessRuntime, options: ResumeOptions): Promise<PublicRunResult>;
+export declare function cancelRun(runtime: AgentHarnessRuntime, options: CancelOptions): Promise<PublicRunResult>;
 export declare function stop(runtime: AgentHarnessRuntime): Promise<void>;
 export declare function createToolMcpServer(runtime: AgentHarnessRuntime, options: ToolMcpServerOptions): Promise<import("@modelcontextprotocol/sdk/server/mcp").McpServer>;
 export declare function serveToolsOverStdio(runtime: AgentHarnessRuntime, options: ToolMcpServerOptions): Promise<import("@modelcontextprotocol/sdk/server/mcp").McpServer>;

package/dist/api.js

@@ -15,8 +15,8 @@ function toApprovalRecord(record) {
     return {
         approvalId: record.approvalId,
         pendingActionId: record.pendingActionId,
-        sessionId: record.threadId,
-        requestId: record.runId,
+        sessionId: record.sessionId,
+        requestId: record.requestId,
         toolName: record.toolName,
         ...(record.approvalReason ? { approvalReason: record.approvalReason } : {}),
         status: record.status,
@@ -47,8 +47,8 @@ function toPublicEvent(event) {
         eventId: event.eventId,
         eventType: toPublicEventType(event.eventType),
         timestamp: event.timestamp,
-        sessionId: event.threadId,
-        requestId: event.runId,
+        sessionId: event.sessionId,
+        requestId: event.requestId,
         sequence: event.sequence,
         source: event.source,
         payload: event.payload,
@@ -77,8 +77,8 @@ function toPublicRunListeners(listeners) {
         onUpstreamEvent: listeners.onUpstreamEvent,
         onTraceItem: listeners.onTraceItem
             ? async (item) => listeners.onTraceItem({
-                sessionId: item.threadId,
-                requestId: item.runId,
+                sessionId: item.sessionId,
+                requestId: item.requestId,
                 surfaceItem: item.surfaceItem,
                 event: item.event,
             })
@@ -87,8 +87,8 @@ function toPublicRunListeners(listeners) {
 }
 function toRequestArtifactListing(listing) {
     return {
-        sessionId: listing.threadId,
-        requestId: listing.runId,
+        sessionId: listing.sessionId,
+        requestId: listing.requestId,
         items: listing.items,
     };
 }
@@ -106,8 +106,8 @@ function toRequestPackage(pkg) {
 }
 function toPublicRunResult(result) {
     return {
-        sessionId: result.threadId,
-        requestId: result.runId,
+        sessionId: result.sessionId,
+        requestId: result.requestId,
         state: result.state,
         output: result.output,
         finalMessageText: result.finalMessageText,
@@ -130,8 +130,8 @@ function toInternalRunOptions(options) {
             decision: options.decision,
             editedInput: options.editedInput,
             listeners: toPublicRunListeners(options.listeners),
-            runId: options.requestId,
-            threadId: options.sessionId,
+            requestId: options.requestId,
+            sessionId: options.sessionId,
         };
     }
     return {
@@ -140,7 +140,7 @@ function toInternalRunOptions(options) {
         invocation: options.invocation,
         listeners: toPublicRunListeners(options.listeners),
         priority: options.priority,
-        threadId: options.sessionId,
+        sessionId: options.sessionId,
     };
 }
 function toInternalResumeOptions(options) {
@@ -148,14 +148,14 @@ function toInternalResumeOptions(options) {
         approvalId: options.approvalId,
         decision: options.decision,
         editedInput: options.editedInput,
-        runId: options.requestId ?? options.runId,
-        threadId: options.sessionId ?? options.threadId,
+        requestId: options.requestId,
+        sessionId: options.sessionId,
     };
 }
 function toPublicRequestSummary(run) {
     return {
-        requestId: run.runId,
-        sessionId: run.threadId,
+        requestId: run.requestId,
+        sessionId: run.sessionId,
         agentId: run.agentId,
         parentRunId: run.parentRunId,
         executionMode: run.executionMode,
@@ -270,9 +270,9 @@ export async function deleteSession(runtime, sessionId) {
 }
 export async function listApprovals(runtime, filter) {
     return (await runtime.listApprovals({
-        runId: filter?.requestId,
+        requestId: filter?.requestId,
         status: filter?.status,
-        threadId: filter?.sessionId,
+        sessionId: filter?.sessionId,
     })).map(toApprovalRecord);
 }
 export async function getApproval(runtime, approvalId) {
@@ -363,10 +363,7 @@ export async function resolveApproval(runtime, options) {
     return toPublicRunResult(await runtime.resume(toInternalResumeOptions(options)));
 }
 export async function cancelRun(runtime, options) {
-    return toPublicRunResult(await runtime.cancelRun({
-        ...options,
-        runId: options.requestId ?? options.runId,
-    }));
+    return toPublicRunResult(await runtime.cancelRun(options));
 }
 export async function stop(runtime) {
     return runtime.stop();

package/dist/contracts/runtime.d.ts

@@ -25,17 +25,8 @@ export type SessionListSummary = SessionSummary & {
     title?: string;
     snippet?: string;
 };
-/**
- * Backward-compatible alias for older thread/run terminology.
- */
-export type ThreadSummary = Omit<SessionSummary, "sessionId" | "latestRequestId"> & {
-    threadId: string;
-    latestRunId: string;
-};
-export type ThreadListSummary = Omit<SessionListSummary, "sessionId" | "latestRequestId"> & {
-    threadId: string;
-    latestRunId: string;
-};
+export type ThreadSummary = SessionSummary;
+export type ThreadListSummary = SessionListSummary;
 export type KnownHarnessEventType = "run.created" | "run.queued" | "run.dequeued" | "run.state.changed" | "run.resumed" | "approval.requested" | "approval.resolved" | "artifact.created" | "output.delta" | "runtime.health.changed" | "runtime.synthetic_fallback";
 export type HarnessEventType = KnownHarnessEventType | (string & {});
 /**
@@ -47,8 +38,8 @@ export type HarnessEvent = {
     eventId: string;
     eventType: HarnessEventType;
     timestamp: string;
-    threadId: string;
-    runId: string;
+    sessionId: string;
+    requestId: string;
     sequence: number;
     source: "runtime" | "policy" | "surface" | "worker";
     payload: Record<string, unknown>;
@@ -65,8 +56,8 @@ export type HarnessEventProjection = {
  */
 export type RuntimeTimelineItem = {
     eventId: string;
-    threadId: string;
-    runId: string;
+    sessionId: string;
+    requestId: string;
     eventType: HarnessEventType;
     timestamp: string;
     sequence: number;
@@ -75,8 +66,8 @@ export type RuntimeTimelineItem = {
     payload: Record<string, unknown>;
 };
 export type RuntimeTimelineProjectionOptions = {
-    threadId?: string;
-    runId?: string;
+    sessionId?: string;
+    requestId?: string;
 };
 /**
  * Ordered upstream/runtime execution trace projected from persisted upstream events.
@@ -281,8 +272,6 @@ export type MemorizeInput = {
     records: MemorizeInputRecord[];
     sessionId?: string;
     requestId?: string;
-    threadId?: string;
-    runId?: string;
     agentId?: string;
     userId?: string;
     projectId?: string;
@@ -299,7 +288,6 @@ export type RecallInput = {
     topK?: number;
     includeStale?: boolean;
     sessionId?: string;
-    threadId?: string;
     agentId?: string;
     workspaceId?: string;
     userId?: string;
@@ -313,7 +301,6 @@ export type ListMemoriesInput = {
     kinds?: MemoryKind[];
     status?: MemoryRecordStatus[];
     sessionId?: string;
-    threadId?: string;
     agentId?: string;
     workspaceId?: string;
     userId?: string;
@@ -411,8 +398,8 @@ export type RuntimeHealthSnapshot = {
     };
 };
 export type RunResult = {
-    threadId: string;
-    runId: string;
+    sessionId: string;
+    requestId: string;
     state: RunState;
     output: string;
     finalMessageText?: string;
@@ -429,8 +416,8 @@ export type RunResult = {
 };
 export type UpstreamRuntimeEvent = unknown;
 export type UpstreamRuntimeEventItem = {
-    threadId: string;
-    runId: string;
+    sessionId: string;
+    requestId: string;
     surfaceItem: RuntimeSurfaceItem;
     event: UpstreamRuntimeEvent;
 };
@@ -457,14 +444,14 @@ export type InvocationEnvelope = {
 export type RunStartOptions = {
     agentId?: string;
     input: MessageContent;
-    threadId?: string;
+    sessionId?: string;
     priority?: number;
     invocation?: InvocationEnvelope;
     listeners?: RunListeners;
 };
 export type RunDecisionOptions = {
-    threadId: string;
-    runId?: string;
+    sessionId: string;
+    requestId?: string;
     approvalId?: string;
     decision: "approve" | "edit" | "reject";
     editedInput?: Record<string, unknown>;
@@ -476,28 +463,28 @@ export type HarnessStreamItem = {
     event: HarnessEvent;
 } | {
     type: "content";
-    threadId: string;
-    runId: string;
+    sessionId: string;
+    requestId: string;
     agentId: string;
     content: string;
 } | {
     type: "content-blocks";
-    threadId: string;
-    runId: string;
+    sessionId: string;
+    requestId: string;
     agentId: string;
     contentBlocks: unknown[];
 } | {
     type: "tool-result";
-    threadId: string;
-    runId: string;
+    sessionId: string;
+    requestId: string;
     agentId: string;
     toolName: string;
     output: unknown;
     isError?: boolean;
 } | {
     type: "upstream-event";
-    threadId: string;
-    runId: string;
+    sessionId: string;
+    requestId: string;
     surfaceItem?: RuntimeSurfaceItem;
     event: UpstreamRuntimeEvent;
 } | {
@@ -507,12 +494,12 @@ export type HarnessStreamItem = {
 export type TranscriptMessage = {
     role: "user" | "assistant";
     content: MessageContent;
-    runId: string;
+    requestId: string;
     createdAt: string;
 };
 export type ThreadRunRecord = {
-    runId: string;
-    threadId: string;
+    requestId: string;
+    sessionId: string;
     agentId: string;
     parentRunId?: string;
     executionMode: string;
@@ -533,25 +520,13 @@ export type ThreadRunRecord = {
  * Persisted request summary projected from upstream execution state plus runtime lifecycle metadata.
  * This is the canonical runtime-facing execution record.
  */
-export type RequestSummary = Omit<ThreadRunRecord, "threadId" | "runId"> & {
-    sessionId: string;
-    requestId: string;
-};
+export type RequestSummary = ThreadRunRecord;
 export type RequestRecord = RequestSummary & {
     traceItems?: unknown[];
     runtimeTimeline?: RuntimeTimelineItem[];
 };
-/**
- * Backward-compatible alias for older thread/run terminology.
- */
-export type RunSummary = Omit<RequestSummary, "sessionId" | "requestId"> & {
-    threadId: string;
-    runId: string;
-};
-export type RunRecord = RunSummary & {
-    traceItems?: unknown[];
-    runtimeTimeline?: RuntimeTimelineItem[];
-};
+export type RunSummary = RequestSummary;
+export type RunRecord = RequestRecord;
 /**
  * Persisted session inspection record assembled from runtime records.
  * This is an inspectable projection, not a second session semantic model.
@@ -574,27 +549,20 @@ export type SessionRecord = {
         requestedAt: string;
     };
 };
-/**
- * Backward-compatible alias for older thread/run terminology.
- */
-export type ThreadRecord = Omit<SessionRecord, "sessionId" | "latestRequestId" | "requests"> & {
-    threadId: string;
-    latestRunId: string;
-    runs: RunRecord[];
-};
+export type ThreadRecord = SessionRecord;
 export type ResumeOptions = {
-    threadId?: string;
-    runId?: string;
+    sessionId?: string;
+    requestId?: string;
     approvalId?: string;
     decision?: "approve" | "edit" | "reject";
     editedInput?: Record<string, unknown>;
 };
 export type CancelOptions = {
-    runId: string;
+    requestId: string;
     reason?: string;
 };
 export type RestartConversationOptions = {
-    threadId: string;
+    sessionId: string;
     mode: "restart-in-thread" | "restart-new-thread";
     input: string;
 };
@@ -606,8 +574,8 @@ export type RestartConversationOptions = {
 export type ApprovalRecord = {
     approvalId: string;
     pendingActionId: string;
-    threadId: string;
-    runId: string;
+    sessionId: string;
+    requestId: string;
     toolName: string;
     approvalReason?: string;
     status: "pending" | "approved" | "edited" | "rejected" | "expired";
@@ -628,8 +596,8 @@ export type ArtifactRecord = {
     createdAt: string;
 };
 export type ArtifactListing = {
-    threadId: string;
-    runId: string;
+    sessionId: string;
+    requestId: string;
     items: ArtifactRecord[];
 };
 export type RuntimeToolResolver = (toolIds: string[], binding?: CompiledAgentBinding) => unknown[];