@dougbots/avenor-core 0.16.0 → 0.16.1

package/dist/index.d.ts

@@ -248,6 +248,18 @@ declare class RpcError extends Error {
   readonly data?: unknown;
   constructor(code: number, message: string, data?: unknown);
 }
+/**
+ * A transport failure that marks the control client closed: a send refused
+ * because the socket is already closed, a pending call rejected because the
+ * read side closed, or a socket write failure. A peer's structured rejection
+ * (RpcError) or a call timeout do not close the client and are not classified
+ * here.
+ */
+declare class ClosedSocketError extends Error {
+  constructor(message: string);
+}
+/** True when the error is a transport failure that closed the client. */
+declare function isClosedSocketError(error: unknown): boolean;
 type OwnerAuthFailureKind = 'unauthenticated' | 'unsupported' | 'timeout';
 /** A classified owner-authentication rejection, not generic transport failure. */
 declare class OwnerAuthError extends Error {
@@ -1130,6 +1142,7 @@ interface PendingAsk {
   from_run_id: string;
   message_id: string;
 }
+declare const SUPERVISOR_RUN_ID = "supervisor";
 /** The broker rejected a receive because the caller's generation is stale. */
 declare function isGenerationMismatchError(error: unknown): boolean;
 interface HostProviderOptions {
@@ -1305,4 +1318,4 @@ type WorkflowCancelResult = Record<string, unknown>;
 declare function createWorkflowCancelTool(getSupervisorClient: GetSupervisorClient): (args: WorkflowCancelArgs) => Promise<WorkflowCancelResult>;
 declare const workflowCancelTool: (args: WorkflowCancelArgs) => Promise<WorkflowCancelResult>;
 //#endregion
-export { type AskClaims, type BrokerReceiveArgs, type BrokerReceiveResult, type ChildBroker, type Client, DEFAULT_RUN_REDUCER_LIMITS, type Event, type ExecutionIdentity, ForeignPeerError, type HistoryOptions, type HistoryResult, type InboundAsk, type InspectResult, type KillResult, type KillToolArgs, MAX_FINAL_OUTPUT_RUNES, MAX_WAIT_MS, MESSAGE_OUTCOMES, type MessageCallerKind, type MessageClient, type MessageInput, type MessageOutcome, type MessageProvider, type MessageSurface, type NormalizedRunEvent, type ObserveRunOptions, type OwnerAttachOptions, OwnerAuthError, OwnerRecordMissingError, type PeerRecord, type PeersInput, type PeersProviderResult, type PeersResult, type PeersRouterResult, type PeersToolArgs, type PendingAsk, type ProviderResult, type Resolution, type ResultResult, type ResultToolArgs, RpcError, type RunChunkRole, type RunFacts, type RunIdentity, type RunInfo, type RunObserver, type RunObserverClient, type RunPermissionOption, type RunPermissionSummary, RunReducer, type RunReducerLimits, type RunSnapshot, type RunSnapshotSeed, type RunToolState, type RunToolSummary, type RunTranscriptEntry, type SpawnMetadata, type SpawnParams, type SpawnResult, type SpawnSelectionInput, type SpawnToolArgs, type SpawnToolResult, StaleOwnerRecordError, type StatusListResult, type StatusResult, type StatusToolArgs, type StatusView, type SubscribeOptions, Supervisor, type SupervisorClientOptions, type SupervisorOptions, THINKING_LEVELS, type ThinkingLevel, type ThinkingOutcome, ToolError, type WorkflowCancelArgs, type WorkflowCancelResult, type WorkflowCompleteParams, type WorkflowCompleteResult, type WorkflowCompleteToolArgs, type WorkflowControllerCreateParams, type WorkflowControllerStatusResult, type WorkflowControllerStatusToolArgs, type WorkflowEventsResult, type WorkflowEventsToolArgs, type WorkflowGateOperation, type WorkflowGateParams, type WorkflowGateResult, type WorkflowGateToolArgs, type WorkflowHeartbeatParams, type WorkflowInspectResult, type WorkflowInspectToolArgs, type WorkflowReadyResult, type WorkflowReadyToolArgs, type WorkflowStatusResult, type WorkflowStatusToolArgs, type WorkflowWaitResult, type WorkflowWaitToolArgs, answerPermissionTool, assertMessageInput, assertPeersInput, attachOwner, boundFinalOutput, brokerReceiveTool, createChildMessageProvider, createHostMessageProvider, createMessageTool, createPeersTool, createRunSnapshot, createWorkflowCancelTool, createWorkflowCompleteTool, createWorkflowControllerStatusTool, createWorkflowEventsTool, createWorkflowGateTool, createWorkflowInspectTool, createWorkflowReadyTool, createWorkflowStatusTool, createWorkflowWaitTool, dial, evaluateThinkingPolicy, eventsTool, executeMessage, executePeers, extractEventText, extractReplyMessage, extractTurnText, findAvenorBinary, getInstallDir, getSupervisorClient, getVersion, inspectTool, installAskClaims, installerBinaryPath, isGenerationMismatchError, isThinkingLevel, killTool, messageTool, newMsgID, normalizeAskTimeoutMs, normalizeRunEvent, normalizeTurnStopReason, observeRun, peersDetails, peersTool, quote, quoteList, reduceRunSnapshot, renderAskFailure, renderLast, renderOutcome, renderPeerList, repair, resultOutput, resultTool, sanitize, shutdownTool, socketsRoot, spawnTool, statusTool, validateSpawnSelection, validateThinking, validateThinkingForBackend, validateThinkingForBackendResume, workflowCancelTool, workflowCompleteTool, workflowControllerStatusTool, workflowEventsTool, workflowGateTool, workflowInspectTool, workflowReadyTool, workflowStatusTool, workflowWaitTool };
+export { type AskClaims, type BrokerReceiveArgs, type BrokerReceiveResult, type ChildBroker, type Client, ClosedSocketError, DEFAULT_RUN_REDUCER_LIMITS, type Event, type ExecutionIdentity, ForeignPeerError, type HistoryOptions, type HistoryResult, type InboundAsk, type InspectResult, type KillResult, type KillToolArgs, MAX_FINAL_OUTPUT_RUNES, MAX_WAIT_MS, MESSAGE_OUTCOMES, type MessageCallerKind, type MessageClient, type MessageInput, type MessageOutcome, type MessageProvider, type MessageSurface, type NormalizedRunEvent, type ObserveRunOptions, type OwnerAttachOptions, OwnerAuthError, OwnerRecordMissingError, type PeerRecord, type PeersInput, type PeersProviderResult, type PeersResult, type PeersRouterResult, type PeersToolArgs, type PendingAsk, type ProviderResult, type Resolution, type ResultResult, type ResultToolArgs, RpcError, type RunChunkRole, type RunFacts, type RunIdentity, type RunInfo, type RunObserver, type RunObserverClient, type RunPermissionOption, type RunPermissionSummary, RunReducer, type RunReducerLimits, type RunSnapshot, type RunSnapshotSeed, type RunToolState, type RunToolSummary, type RunTranscriptEntry, SUPERVISOR_RUN_ID, type SpawnMetadata, type SpawnParams, type SpawnResult, type SpawnSelectionInput, type SpawnToolArgs, type SpawnToolResult, StaleOwnerRecordError, type StatusListResult, type StatusResult, type StatusToolArgs, type StatusView, type SubscribeOptions, Supervisor, type SupervisorClientOptions, type SupervisorOptions, THINKING_LEVELS, type ThinkingLevel, type ThinkingOutcome, ToolError, type WorkflowCancelArgs, type WorkflowCancelResult, type WorkflowCompleteParams, type WorkflowCompleteResult, type WorkflowCompleteToolArgs, type WorkflowControllerCreateParams, type WorkflowControllerStatusResult, type WorkflowControllerStatusToolArgs, type WorkflowEventsResult, type WorkflowEventsToolArgs, type WorkflowGateOperation, type WorkflowGateParams, type WorkflowGateResult, type WorkflowGateToolArgs, type WorkflowHeartbeatParams, type WorkflowInspectResult, type WorkflowInspectToolArgs, type WorkflowReadyResult, type WorkflowReadyToolArgs, type WorkflowStatusResult, type WorkflowStatusToolArgs, type WorkflowWaitResult, type WorkflowWaitToolArgs, answerPermissionTool, assertMessageInput, assertPeersInput, attachOwner, boundFinalOutput, brokerReceiveTool, createChildMessageProvider, createHostMessageProvider, createMessageTool, createPeersTool, createRunSnapshot, createWorkflowCancelTool, createWorkflowCompleteTool, createWorkflowControllerStatusTool, createWorkflowEventsTool, createWorkflowGateTool, createWorkflowInspectTool, createWorkflowReadyTool, createWorkflowStatusTool, createWorkflowWaitTool, dial, evaluateThinkingPolicy, eventsTool, executeMessage, executePeers, extractEventText, extractReplyMessage, extractTurnText, findAvenorBinary, getInstallDir, getSupervisorClient, getVersion, inspectTool, installAskClaims, installerBinaryPath, isClosedSocketError, isGenerationMismatchError, isThinkingLevel, killTool, messageTool, newMsgID, normalizeAskTimeoutMs, normalizeRunEvent, normalizeTurnStopReason, observeRun, peersDetails, peersTool, quote, quoteList, reduceRunSnapshot, renderAskFailure, renderLast, renderOutcome, renderPeerList, repair, resultOutput, resultTool, sanitize, shutdownTool, socketsRoot, spawnTool, statusTool, validateSpawnSelection, validateThinking, validateThinkingForBackend, validateThinkingForBackendResume, workflowCancelTool, workflowCompleteTool, workflowControllerStatusTool, workflowEventsTool, workflowGateTool, workflowInspectTool, workflowReadyTool, workflowStatusTool, workflowWaitTool };

package/dist/index.js

@@ -49,6 +49,23 @@ var CallTimeoutError = class extends Error {
 		this.name = "CallTimeoutError";
 	}
 };
+/**
+* A transport failure that marks the control client closed: a send refused
+* because the socket is already closed, a pending call rejected because the
+* read side closed, or a socket write failure. A peer's structured rejection
+* (RpcError) or a call timeout do not close the client and are not classified
+* here.
+*/
+var ClosedSocketError = class extends Error {
+	constructor(message) {
+		super(message);
+		this.name = "ClosedSocketError";
+	}
+};
+/** True when the error is a transport failure that closed the client. */
+function isClosedSocketError(error) {
+	return error instanceof ClosedSocketError;
+}
 const OWNER_AUTH_VERSION = 1;
 const OWNER_UNAUTHENTICATED_CODE = -32011;
 const UNSUPPORTED_OWNER_AUTH_CODE = -32012;
@@ -169,7 +186,7 @@ var Client = class {
 			this.closed = true;
 			for (const [, pc] of this.pending) {
 				clearTimeout(pc.timer);
-				pc.reject(/* @__PURE__ */ new Error("read response: connection closed"));
+				pc.reject(new ClosedSocketError("read response: connection closed"));
 			}
 			this.pending.clear();
 			this.eventDone = true;
@@ -232,7 +249,7 @@ var Client = class {
 		if (!value || value.authenticated !== true || value.version !== OWNER_AUTH_VERSION || value.capability_id !== capability.id) throw new OwnerAuthError("unsupported", { reason: "unexpected-result" });
 	}
 	sendCall(method, params, timeout) {
-		if (this.isClosed()) return Promise.reject(/* @__PURE__ */ new Error("control socket is closed"));
+		if (this.isClosed()) return Promise.reject(new ClosedSocketError("control socket is closed"));
 		this.startReadLoop();
 		const id = ++this.nextID;
 		const req = {
@@ -257,7 +274,7 @@ var Client = class {
 					this.closed = true;
 					clearTimeout(timer);
 					this.pending.delete(id);
-					reject(/* @__PURE__ */ new Error(`write request: ${err.message}`));
+					reject(new ClosedSocketError(`write request: ${err.message}`));
 				}
 			});
 		});
@@ -1712,6 +1729,13 @@ function avenorHome() {
 function socketsRoot() {
 	return path.join(avenorHome(), "sockets");
 }
+function validateSupervisorSocketPath(supervisorId) {
+	const root = fs.realpathSync(socketsRoot());
+	const parent = fs.realpathSync(path.dirname(supervisorId));
+	const basename = path.basename(supervisorId);
+	if (parent !== root || !/^avenor-mcp-[^/\\]+\.sock$/.test(basename)) throw new Error(`invalid supervisorId: ${supervisorId}`);
+	return path.join(parent, basename);
+}
 function runsRoot() {
 	return path.join(avenorHome(), "runs");
 }
@@ -1932,7 +1956,7 @@ var Supervisor = class Supervisor {
 			recursive: true,
 			mode: 448
 		});
-		const socketPath = path.join(socketDir, `avenor-mcp-${process.pid}.sock`);
+		const socketPath = path.join(fs.realpathSync(socketDir), `avenor-mcp-${process.pid}.sock`);
 		let socketExists = false;
 		try {
 			await fs.promises.access(socketPath, fs.constants.R_OK | fs.constants.W_OK);
@@ -2136,7 +2160,13 @@ var Supervisor = class Supervisor {
 	* isCurrentInstance true while currentInstance is null.
 	*/
 	static getInstance(supervisorId) {
-		return Supervisor.instance !== null && Supervisor.instance.supervisorId === supervisorId ? Supervisor.instance : null;
+		if (Supervisor.instance === null) return null;
+		if (Supervisor.instance.supervisorId === supervisorId) return Supervisor.instance;
+		try {
+			return Supervisor.instance.supervisorId === validateSupervisorSocketPath(supervisorId) ? Supervisor.instance : null;
+		} catch {
+			return null;
+		}
 	}
 	static isCurrentInstance(supervisorId) {
 		return Supervisor.getInstance(supervisorId) !== null;
@@ -2276,13 +2306,6 @@ function validateTimeout(value) {
 	if (unit === "h") return amount * 3600;
 	return amount;
 }
-function validateSupervisorSocketPath(supervisorId) {
-	const root = fs.realpathSync(socketsRoot());
-	const parent = fs.realpathSync(path.dirname(supervisorId));
-	const basename = path.basename(supervisorId);
-	if (parent !== root || !/^avenor-mcp-[^/\\]+\.sock$/.test(basename)) throw new Error(`invalid supervisorId: ${supervisorId}`);
-	return path.join(parent, basename);
-}
 function validateObservedAt(observedAt) {
 	if (!/^\d{4}-\d{2}-\d{2}T\d{2}:\d{2}:\d{2}(?:\.\d+)?(?:Z|[+-]\d{2}:\d{2})$/.test(observedAt)) throw new Error("observed_at must be an RFC3339 timestamp");
 }
@@ -9498,7 +9521,7 @@ function createHostMessageProvider(options) {
 				runId: "",
 				match: "none"
 			};
-			if (ref === SUPERVISOR_RUN_ID) return {
+			if (ref === "supervisor") return {
 				runId: SUPERVISOR_RUN_ID,
 				label: SUPERVISOR_RUN_ID,
 				match: "unique"
@@ -9536,8 +9559,8 @@ function createHostMessageProvider(options) {
 			};
 		},
 		async state(runId) {
-			if (runId === SUPERVISOR_RUN_ID) {
-				const translation = translateRunFacts((await listedPeers()).find((entry) => entry.run_id === SUPERVISOR_RUN_ID)?.status ?? "", "");
+			if (runId === "supervisor") {
+				const translation = translateRunFacts((await listedPeers()).find((entry) => entry.run_id === "supervisor")?.status ?? "", "");
 				return {
 					live: translation.live,
 					resumable: false,
@@ -10107,4 +10130,4 @@ function createWorkflowCancelTool(getSupervisorClient) {
 }
 const workflowCancelTool = createWorkflowCancelTool(getSupervisorClient);
 //#endregion
-export { DEFAULT_RUN_REDUCER_LIMITS, ForeignPeerError, MAX_FINAL_OUTPUT_RUNES, MAX_WAIT_MS, MESSAGE_OUTCOMES, OwnerAuthError, OwnerRecordMissingError, RpcError, RunReducer, StaleOwnerRecordError, Supervisor, THINKING_LEVELS, ToolError, answerPermissionTool, assertMessageInput, assertPeersInput, attachOwner, boundFinalOutput, brokerReceiveTool, createChildMessageProvider, createHostMessageProvider, createMessageTool, createPeersTool, createRunSnapshot, createWorkflowCancelTool, createWorkflowCompleteTool, createWorkflowControllerStatusTool, createWorkflowEventsTool, createWorkflowGateTool, createWorkflowInspectTool, createWorkflowReadyTool, createWorkflowStatusTool, createWorkflowWaitTool, dial, evaluateThinkingPolicy, eventsTool, executeMessage, executePeers, extractEventText, extractReplyMessage, extractTurnText, findAvenorBinary, getInstallDir, getSupervisorClient, getVersion, inspectTool, installAskClaims, installerBinaryPath, isGenerationMismatchError, isThinkingLevel, killTool, messageTool, newMsgID, normalizeAskTimeoutMs, normalizeRunEvent, normalizeTurnStopReason, observeRun, peersDetails, peersTool, quote, quoteList, reduceRunSnapshot, renderAskFailure, renderLast, renderOutcome, renderPeerList, repair, resultOutput, resultTool, sanitize, shutdownTool, socketsRoot, spawnTool, statusTool, validateSpawnSelection, validateThinking, validateThinkingForBackend, validateThinkingForBackendResume, workflowCancelTool, workflowCompleteTool, workflowControllerStatusTool, workflowEventsTool, workflowGateTool, workflowInspectTool, workflowReadyTool, workflowStatusTool, workflowWaitTool };
+export { ClosedSocketError, DEFAULT_RUN_REDUCER_LIMITS, ForeignPeerError, MAX_FINAL_OUTPUT_RUNES, MAX_WAIT_MS, MESSAGE_OUTCOMES, OwnerAuthError, OwnerRecordMissingError, RpcError, RunReducer, SUPERVISOR_RUN_ID, StaleOwnerRecordError, Supervisor, THINKING_LEVELS, ToolError, answerPermissionTool, assertMessageInput, assertPeersInput, attachOwner, boundFinalOutput, brokerReceiveTool, createChildMessageProvider, createHostMessageProvider, createMessageTool, createPeersTool, createRunSnapshot, createWorkflowCancelTool, createWorkflowCompleteTool, createWorkflowControllerStatusTool, createWorkflowEventsTool, createWorkflowGateTool, createWorkflowInspectTool, createWorkflowReadyTool, createWorkflowStatusTool, createWorkflowWaitTool, dial, evaluateThinkingPolicy, eventsTool, executeMessage, executePeers, extractEventText, extractReplyMessage, extractTurnText, findAvenorBinary, getInstallDir, getSupervisorClient, getVersion, inspectTool, installAskClaims, installerBinaryPath, isClosedSocketError, isGenerationMismatchError, isThinkingLevel, killTool, messageTool, newMsgID, normalizeAskTimeoutMs, normalizeRunEvent, normalizeTurnStopReason, observeRun, peersDetails, peersTool, quote, quoteList, reduceRunSnapshot, renderAskFailure, renderLast, renderOutcome, renderPeerList, repair, resultOutput, resultTool, sanitize, shutdownTool, socketsRoot, spawnTool, statusTool, validateSpawnSelection, validateThinking, validateThinkingForBackend, validateThinkingForBackendResume, workflowCancelTool, workflowCompleteTool, workflowControllerStatusTool, workflowEventsTool, workflowGateTool, workflowInspectTool, workflowReadyTool, workflowStatusTool, workflowWaitTool };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dougbots/avenor-core",
-  "version": "0.16.0",
+  "version": "0.16.1",
   "type": "module",
   "repository": {
     "type": "git",