@botbotgo/agent-harness 0.0.267 → 0.0.269

package/dist/flow/build-flow-graph.js

@@ -46,14 +46,14 @@ function normalizeRuntimeEventType(eventType) {
 function normalizeRuntimeEvents(events) {
     return events.map((event) => {
         const typed = event;
-        const threadId = readString(typed.threadId) ?? readString(typed.sessionId) ?? "";
-        const runId = readString(typed.runId) ?? readString(typed.requestId) ?? "";
+        const sessionId = readString(typed.sessionId) ?? "";
+        const requestId = readString(typed.requestId) ?? "";
         return {
             eventId: String(event.eventId),
             eventType: normalizeRuntimeEventType(String(event.eventType)),
             timestamp: String(event.timestamp),
-            threadId,
-            runId,
+            sessionId,
+            requestId,
             sequence: Number(event.sequence),
             source: event.source,
             payload: event.payload ?? {},
@@ -103,10 +103,10 @@ function normalizeLabel(value) {
     return value.replace(/\s+/g, " ").trim();
 }
 function readSessionId(input) {
-    return input.sessionId ?? input.threadId;
+    return input.sessionId;
 }
 function readRequestId(input) {
-    return input.requestId ?? input.runId;
+    return input.requestId;
 }
 function readProjectionLabel(projection) {
     if (projection.type === "step") {
@@ -241,15 +241,13 @@ function buildRuntimeNodes(timeline) {
     for (const item of timeline) {
         const mapped = deriveRuntimeNode(item);
         const node = {
-            id: `rt:${item.runId}:${item.sequence}:${slugify(item.eventType)}`,
+            id: `rt:${item.requestId}:${item.sequence}:${slugify(item.eventType)}`,
             layer: "runtime",
             kind: mapped.kind,
             label: mapped.label,
             status: mapped.status,
-            sessionId: item.threadId,
-            requestId: item.runId,
-            threadId: item.threadId,
-            runId: item.runId,
+            sessionId: item.sessionId,
+            requestId: item.requestId,
             startedAt: item.timestamp,
             endedAt: item.timestamp,
             sequenceStart: item.sequence,
@@ -277,7 +275,7 @@ function buildRuntimeNodes(timeline) {
         if (item.eventType === "run.created" || item.eventType === "run.dequeued" || item.eventType === "run.resumed") {
             segmentOrdinal += 1;
             activeExecutionGroup = {
-                id: `group:${item.runId}:segment:${segmentOrdinal}`,
+                id: `group:${item.requestId}:segment:${segmentOrdinal}`,
                 kind: "segment",
                 label: item.eventType === "run.created"
                     ? `Execution segment ${segmentOrdinal}`
@@ -296,7 +294,7 @@ function buildRuntimeNodes(timeline) {
         if (item.eventType === "approval.requested") {
             approvalOrdinal += 1;
             activeApprovalGroup = {
-                id: `group:${item.runId}:approval:${approvalOrdinal}`,
+                id: `group:${item.requestId}:approval:${approvalOrdinal}`,
                 kind: "approval-window",
                 label: `Approval window ${approvalOrdinal}`,
                 nodeIds: [node.id],
@@ -311,7 +309,7 @@ function buildRuntimeNodes(timeline) {
             if (!activeApprovalGroup) {
                 approvalOrdinal += 1;
                 activeApprovalGroup = {
-                    id: `group:${item.runId}:approval:${approvalOrdinal}`,
+                    id: `group:${item.requestId}:approval:${approvalOrdinal}`,
                     kind: "approval-window",
                     label: `Approval window ${approvalOrdinal}`,
                     nodeIds: [],
@@ -444,8 +442,6 @@ function createDelegationNodeFromSurfaceItem(surfaceItem, fallbackAgentId, fallb
         status: surfaceItem.status === "failed" ? "failed" : surfaceItem.status === "started" ? "started" : "completed",
         sessionId: "",
         requestId: "",
-        threadId: "",
-        runId: "",
         agentId: toAgentId,
         agentName: toAgentName,
         sourceEventIds: [sourceEventId],
@@ -554,8 +550,6 @@ function convertUpstreamEventsWithAgents(upstreamEvents, initialAgentId) {
             status: "completed",
             sessionId: "",
             requestId: "",
-            threadId: "",
-            runId: "",
             agentId: delegatedAgentId,
             agentName: delegatedAgentName,
             sourceEventIds: [sourceEventId],
@@ -574,7 +568,7 @@ function convertUpstreamEventsWithAgents(upstreamEvents, initialAgentId) {
 function selectInitialGroup(groups) {
     return groups.find((group) => group.kind === "segment") ?? groups[0] ?? null;
 }
-function buildAttempts(projectionRecords, delegationNodes, runtimeGroups, threadId, runId) {
+function buildAttempts(projectionRecords, delegationNodes, runtimeGroups, sessionId, requestId) {
     const nodes = [];
     const edges = [];
     const groups = [];
@@ -601,7 +595,7 @@ function buildAttempts(projectionRecords, delegationNodes, runtimeGroups, thread
     function createAttempt(kind, label, projection, agentId, agentName) {
         ordinal += 1;
         const attempt = {
-            id: `attempt:${runId}:${slugify(kind)}:${slugify(label)}:${ordinal}`,
+            id: `attempt:${requestId}:${slugify(kind)}:${slugify(label)}:${ordinal}`,
             kind,
             label,
             status: deriveStatusFromProjection(projection),
@@ -647,10 +641,8 @@ function buildAttempts(projectionRecords, delegationNodes, runtimeGroups, thread
             delegationIndex += 1;
             pendingDelegationNode = {
                 ...sourceNode,
-                sessionId: threadId,
-                requestId: runId,
-                threadId,
-                runId,
+                sessionId,
+                requestId,
                 groupId: currentGroup?.id,
             };
             nodes.push(pendingDelegationNode);
@@ -685,10 +677,8 @@ function buildAttempts(projectionRecords, delegationNodes, runtimeGroups, thread
             delegationIndex += 1;
             pendingDelegationNode = {
                 ...sourceNode,
-                sessionId: threadId,
-                requestId: runId,
-                threadId,
-                runId,
+                sessionId,
+                requestId,
                 groupId: currentGroup?.id,
             };
             nodes.push(pendingDelegationNode);
@@ -705,15 +695,13 @@ function buildAttempts(projectionRecords, delegationNodes, runtimeGroups, thread
         if (projection.type === "thinking") {
             ordinal += 1;
             const detailNode = {
-                id: `detail:${runId}:thinking:${ordinal}`,
+                id: `detail:${requestId}:thinking:${ordinal}`,
                 layer: "detail",
                 kind: "thinking",
                 label: "Model reasoning",
                 status: "completed",
-                sessionId: threadId,
-                requestId: runId,
-                threadId,
-                runId,
+                sessionId,
+                requestId,
                 groupId: currentGroup?.id,
                 sourceEventIds: [],
                 detail: { text: projection.text },
@@ -785,7 +773,7 @@ function buildAttempts(projectionRecords, delegationNodes, runtimeGroups, thread
         }
         if (!attemptSetGroups.has(`${kind}:${currentGroup?.id ?? "ungrouped"}`)) {
             attemptSetGroups.set(`${kind}:${currentGroup?.id ?? "ungrouped"}`, {
-                id: `group:${runId}:attempt-set:${slugify(kind)}:${attemptSetGroups.size + 1}`,
+                id: `group:${requestId}:attempt-set:${slugify(kind)}:${attemptSetGroups.size + 1}`,
                 kind: "attempt-set",
                 label: `${titleCase(kind)} attempts`,
                 nodeIds: [],
@@ -838,10 +826,8 @@ function buildAttempts(projectionRecords, delegationNodes, runtimeGroups, thread
             kind: attempt.kind,
             label: attempt.label,
             status: attempt.status,
-            sessionId: threadId,
-            requestId: runId,
-            threadId,
-            runId,
+            sessionId,
+            requestId,
             agentId: attempt.agentId,
             agentName: attempt.agentName,
             groupId: attempt.groupId,
@@ -865,21 +851,21 @@ function resolveContext(input, runtimeTimeline, projections) {
     }
     if (timelineHead) {
         return {
-            sessionId: inputSessionId ?? timelineHead.threadId,
-            requestId: inputRequestId ?? timelineHead.runId,
+            sessionId: inputSessionId ?? timelineHead.sessionId,
+            requestId: inputRequestId ?? timelineHead.requestId,
         };
     }
     const firstProjection = projections[0];
     if (!inputSessionId || !inputRequestId) {
-        throw new Error(`buildFlowGraph requires sessionId and requestId when runtime timeline data is absent${firstProjection ? "" : " or empty"}; legacy threadId/runId inputs are still accepted.`);
+        throw new Error(`buildFlowGraph requires sessionId and requestId when runtime timeline data is absent${firstProjection ? "" : " or empty"}.`);
     }
     return { sessionId: inputSessionId, requestId: inputRequestId };
 }
 export function buildFlowGraph(input) {
     const runtimeData = input.runtimeTimeline
         ?? (input.runtimeEvents ? projectRuntimeTimeline(normalizeRuntimeEvents(input.runtimeEvents), {
-            ...(readSessionId(input) ? { threadId: readSessionId(input) } : {}),
-            ...(readRequestId(input) ? { runId: readRequestId(input) } : {}),
+            ...(readSessionId(input) ? { sessionId: readSessionId(input) } : {}),
+            ...(readRequestId(input) ? { requestId: readRequestId(input) } : {}),
         }) : []);
     const initialAgentId = deriveInitialAgentId(input, runtimeData);
     const upstreamContext = input.upstreamEvents
@@ -932,8 +918,6 @@ export function buildFlowGraph(input) {
         scope: input.scope ?? "run",
         sessionId,
         requestId,
-        threadId: sessionId,
-        runId: requestId,
         nodes: [...runtimeNodes, ...attemptNodes],
         edges: [...runtimeEdges, ...attemptEdges],
         groups: [...runtimeGroups, ...attemptGroups],

package/dist/flow/types.d.ts

@@ -23,8 +23,6 @@ export type FlowNode = {
     status: FlowNodeStatus;
     sessionId: string;
     requestId: string;
-    threadId: string;
-    runId: string;
     agentId?: string;
     agentName?: string;
     startedAt?: string;
@@ -59,8 +57,6 @@ export type FlowGraph = {
     scope: "run" | "thread";
     sessionId: string;
     requestId: string;
-    threadId: string;
-    runId: string;
     nodes: FlowNode[];
     edges: FlowEdge[];
     groups: FlowGroup[];
@@ -69,8 +65,6 @@ export type FlowGraph = {
 export type BuildFlowGraphInput = {
     sessionId?: string;
     requestId?: string;
-    threadId?: string;
-    runId?: string;
     scope?: FlowGraph["scope"];
     runtimeEvents?: readonly BuildFlowGraphRuntimeEvent[];
     runtimeTimeline?: readonly RuntimeTimelineItem[];

package/dist/package-version.d.ts

@@ -1 +1 @@
-export declare const AGENT_HARNESS_VERSION = "0.0.266";
+export declare const AGENT_HARNESS_VERSION = "0.0.268";

package/dist/package-version.js

@@ -1 +1 @@
-export const AGENT_HARNESS_VERSION = "0.0.266";
+export const AGENT_HARNESS_VERSION = "0.0.268";

package/dist/persistence/file-store.js

@@ -197,10 +197,10 @@ export class FilePersistence {
     }
     async appendEvent(event) {
         const sequenceId = String(event.sequence).padStart(6, "0");
-        const inspectionPath = path.join(this.runDir(event.threadId, event.runId), "inspection.json");
+        const inspectionPath = path.join(this.runDir(event.sessionId, event.requestId), "inspection.json");
         const inspection = await readJson(inspectionPath);
         await Promise.all([
-            writeJson(path.join(this.runDir(event.threadId, event.runId), "events", `${sequenceId}.json`), event),
+            writeJson(path.join(this.runDir(event.sessionId, event.requestId), "events", `${sequenceId}.json`), event),
             writeJson(inspectionPath, {
                 ...inspection,
                 lastActivityAt: event.timestamp,
@@ -221,8 +221,8 @@ export class FilePersistence {
             ]);
             return {
                 agentId: meta.entryAgentId,
-                threadId: index.threadId,
-                latestRunId: index.latestRunId,
+                sessionId: index.threadId,
+                latestRequestId: index.latestRunId,
                 createdAt: meta.createdAt,
                 updatedAt: index.updatedAt,
                 status: index.status,
@@ -237,9 +237,9 @@ export class FilePersistence {
         const sessions = await this.listSessions(filter);
         const summaries = await Promise.all(sessions.map(async (session) => {
             const [meta, messageBundle] = await Promise.all([
-                readJson(path.join(this.threadDir(session.threadId), "meta.json")),
-                readJson(path.join(this.threadDir(session.threadId), "messages.json"))
-                    .catch(() => ({ threadId: session.threadId, items: [] })),
+                readJson(path.join(this.threadDir(session.sessionId), "meta.json")),
+                readJson(path.join(this.threadDir(session.sessionId), "messages.json"))
+                    .catch(() => ({ threadId: session.sessionId, items: [] })),
             ]);
             const items = messageBundle.items;
             return {
@@ -268,8 +268,8 @@ export class FilePersistence {
             readJson(path.join(runDir, "inspection.json")),
         ]);
         return {
-            runId: meta.runId,
-            threadId: meta.threadId,
+            requestId: meta.runId,
+            sessionId: meta.threadId,
             agentId: meta.agentId,
             ...(meta.parentRunId ? { parentRunId: meta.parentRunId } : {}),
             executionMode: meta.executionMode,
@@ -295,7 +295,7 @@ export class FilePersistence {
             if (filter.agentId && run.agentId !== filter.agentId) {
                 return false;
             }
-            if (filter.threadId && run.threadId !== filter.threadId) {
+            if (filter.threadId && run.sessionId !== filter.threadId) {
                 return false;
             }
             if (filter.state && run.state !== filter.state) {
@@ -325,8 +325,8 @@ export class FilePersistence {
         const runInspection = await readJson(path.join(this.runDir(threadId, index.latestRunId), "inspection.json")).catch(() => null);
         return {
             agentId: meta.entryAgentId,
-            threadId,
-            latestRunId: index.latestRunId,
+            sessionId: threadId,
+            latestRequestId: index.latestRunId,
             createdAt: meta.createdAt,
             updatedAt: index.updatedAt,
             status: index.status,
@@ -370,10 +370,10 @@ export class FilePersistence {
             if (filter.status && approval.status !== filter.status) {
                 return false;
             }
-            if (filter.threadId && approval.threadId !== filter.threadId) {
+            if (filter.threadId && approval.sessionId !== filter.threadId) {
                 return false;
             }
-            if (filter.runId && approval.runId !== filter.runId) {
+            if (filter.runId && approval.requestId !== filter.runId) {
                 return false;
             }
             return true;
@@ -460,7 +460,7 @@ export class FilePersistence {
                 .filter((record) => record.threadId === threadId)
                 .map((record) => rm(this.runIndexPath(record.runId), { force: true })),
             ...approvals
-                .filter((record) => record.threadId === threadId)
+                .filter((record) => record.sessionId === threadId)
                 .map((record) => rm(this.approvalIndexPath(record.approvalId), { force: true })),
             ...runIndexes
                 .filter((record) => record.threadId === threadId)
@@ -487,9 +487,16 @@ export class FilePersistence {
         }
     }
     async createApproval(record) {
+        const sessionId = record.sessionId ?? record.threadId ?? "";
+        const requestId = record.requestId ?? record.runId ?? "";
+        const normalized = {
+            ...record,
+            sessionId,
+            requestId,
+        };
         await Promise.all([
-            writeJson(path.join(this.runDir(record.threadId, record.runId), "approvals", `${record.approvalId}.json`), record),
-            writeJson(path.join(this.runRoot, "indexes", "approvals", `${record.approvalId}.json`), record),
+            writeJson(path.join(this.runDir(sessionId, requestId), "approvals", `${record.approvalId}.json`), normalized),
+            writeJson(path.join(this.runRoot, "indexes", "approvals", `${record.approvalId}.json`), normalized),
         ]);
     }
     async resolveApproval(threadId, runId, approvalId, status) {

package/dist/persistence/sqlite-run-context-store.js

@@ -27,7 +27,7 @@ export class SqliteRunContextStore {
     async appendThreadMessage(threadId, message) {
         await this.db.execute(`INSERT INTO thread_messages
        (thread_id, role, content_json, run_id, created_at)
-       VALUES (?, ?, ?, ?, ?)`, [threadId, message.role, JSON.stringify(message.content), message.runId, message.createdAt]);
+       VALUES (?, ?, ?, ?, ?)`, [threadId, message.role, JSON.stringify(message.content), message.requestId ?? message.runId, message.createdAt]);
     }
     async listThreadMessages(threadId, limit = 12) {
         const rows = await this.db.selectAll(`SELECT role, content_json, run_id, created_at
@@ -42,7 +42,7 @@ export class SqliteRunContextStore {
         return rows.map((row) => ({
             role: asString(row.role),
             content: parseJson(row.content_json),
-            runId: asString(row.run_id),
+            requestId: asString(row.run_id),
             createdAt: asString(row.created_at),
         }));
     }

package/dist/persistence/sqlite-store.js

@@ -413,8 +413,8 @@ export class SqlitePersistence {
     mapThreadSummary(row) {
         return {
             agentId: asString(row.entry_agent_id),
-            threadId: asString(row.thread_id),
-            latestRunId: asString(row.latest_run_id),
+            sessionId: asString(row.thread_id),
+            latestRequestId: asString(row.latest_run_id),
             createdAt: asString(row.created_at),
             updatedAt: asString(row.updated_at),
             status: asString(row.status),
@@ -424,8 +424,8 @@ export class SqlitePersistence {
     mapRunSummary(row) {
         const runtimeSnapshot = row.runtime_snapshot_json ? parseJson(row.runtime_snapshot_json) : null;
         return {
-            runId: asString(row.run_id),
-            threadId: asString(row.thread_id),
+            requestId: asString(row.run_id),
+            sessionId: asString(row.thread_id),
             agentId: asString(row.agent_id),
             ...(asNullableString(row.parent_run_id) ? { parentRunId: asNullableString(row.parent_run_id) } : {}),
             executionMode: asString(row.execution_mode),
@@ -458,8 +458,8 @@ export class SqlitePersistence {
         return {
             approvalId: asString(row.approval_id),
             pendingActionId: asString(row.pending_action_id),
-            threadId: asString(row.thread_id),
-            runId: asString(row.run_id),
+            sessionId: asString(row.thread_id),
+            requestId: asString(row.run_id),
             toolCallId: asString(row.tool_call_id),
             toolName: asString(row.tool_name),
             status: asString(row.status),
@@ -612,7 +612,7 @@ export class SqlitePersistence {
                 input.threadId,
                 input.userMessage.role,
                 JSON.stringify(input.userMessage.content),
-                input.userMessage.runId,
+                input.userMessage.requestId ?? input.userMessage.runId,
                 input.userMessage.createdAt,
             ],
         }, {
@@ -681,10 +681,10 @@ export class SqlitePersistence {
     async appendEvent(event) {
         await this.execute(`INSERT OR REPLACE INTO events
        (thread_id, run_id, sequence, event_json, created_at)
-       VALUES (?, ?, ?, ?, ?)`, [event.threadId, event.runId, event.sequence, JSON.stringify(event), event.timestamp]);
+       VALUES (?, ?, ?, ?, ?)`, [event.sessionId, event.requestId, event.sequence, JSON.stringify(event), event.timestamp]);
         await this.execute(`UPDATE run_inspection
        SET last_activity_at = ?
-       WHERE run_id = ? AND thread_id = ?`, [event.timestamp, event.runId, event.threadId]);
+       WHERE run_id = ? AND thread_id = ?`, [event.timestamp, event.requestId, event.sessionId]);
     }
     async listSessions(filter = {}) {
         const { clause, args } = buildWhereClause([
@@ -750,7 +750,7 @@ export class SqlitePersistence {
                 ? {
                     role: asString(row.first_message_role),
                     content: parseJson(row.first_message_content_json),
-                    runId: asString(row.first_message_run_id),
+                    requestId: asString(row.first_message_run_id),
                     createdAt: asString(row.first_message_created_at),
                 }
                 : undefined,
@@ -758,7 +758,7 @@ export class SqlitePersistence {
                 ? {
                     role: asString(row.last_message_role),
                     content: parseJson(row.last_message_content_json),
-                    runId: asString(row.last_message_run_id),
+                    requestId: asString(row.last_message_run_id),
                     createdAt: asString(row.last_message_created_at),
                 }
                 : undefined,
@@ -972,13 +972,15 @@ export class SqlitePersistence {
         await this.runContextStore.clearRunRequest(threadId, runId);
     }
     async createApproval(record) {
+        const sessionId = record.sessionId ?? record.threadId ?? "";
+        const requestId = record.requestId ?? record.runId ?? "";
         await this.execute(`INSERT OR REPLACE INTO approvals
        (approval_id, pending_action_id, thread_id, run_id, tool_call_id, tool_name, status, requested_at, resolved_at, allowed_decisions_json, input_preview_json, checkpoint_ref, event_refs_json)
        VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)`, [
             record.approvalId,
             record.pendingActionId,
-            record.threadId,
-            record.runId,
+            sessionId,
+            requestId,
             record.toolCallId,
             record.toolName,
             record.status,
@@ -992,7 +994,7 @@ export class SqlitePersistence {
     }
     async resolveApproval(threadId, runId, approvalId, status) {
         const current = await this.getApproval(approvalId);
-        if (!current || current.threadId !== threadId || current.runId !== runId) {
+        if (!current || current.sessionId !== threadId || current.requestId !== runId) {
             throw new Error(`Missing approval ${approvalId} for run ${runId}`);
         }
         const updated = {
@@ -1018,8 +1020,8 @@ export class SqlitePersistence {
        WHERE thread_id = ? AND run_id = ?
        ORDER BY created_at ASC, artifact_id ASC`, [threadId, runId]);
         return {
-            threadId,
-            runId,
+            sessionId: threadId,
+            requestId: runId,
             items: rows.map((row) => ({
                 artifactId: asString(row.artifact_id),
                 kind: asString(row.kind),