@toolforge-js/sdk 0.8.6 → 0.8.8

package/dist/cli/index.js

@@ -1,10 +1,13 @@
-import { C as __toESM, S as __require, _ as stopToolMessageSchema, a as AGENT_TAG_NAME, b as invariant, c as runWithRetries, d as heartbeatAckMessageSchema, f as initCommunicationMessageSchema, g as stopAgentMessageSchema, h as startToolMessageSchema, i as AGENT_STEP_TAG_NAME, l as ackMessageSchema, m as startAgentMessageSchema, n as TOOL_TAG_NAME, o as Agent, p as runnerId, r as Tool, s as exponentialBackoff, t as TOOL_HANDLER_TAG_NAME, u as baseMessageSchema, v as convertToWords, x as __commonJS, y as getErrorMessage } from "../tool-BHVNhWPh.js";
+import { C as __require, S as __commonJS, _ as initCommunicationMessageSchema, a as TOOL_TAG_NAME, b as stopAgentMessageSchema, c as sessionIdStore, d as invariant, f as exponentialBackoff, g as heartbeatAckMessageSchema, h as baseMessageSchema, i as TOOL_HANDLER_TAG_NAME, l as convertToWords, m as ackMessageSchema, n as AGENT_TAG_NAME, o as Tool, p as runWithRetries, r as Agent, s as runnerIdStore, t as AGENT_STEP_TAG_NAME, u as getErrorMessage, v as startAgentMessageSchema, w as __toESM, x as stopToolMessageSchema, y as startToolMessageSchema } from "../agent-DzYymaXh.js";
 import { a as sdkServerUrlSchema, n as appServerUrlSchema, o as toolForgeConfigSchema, r as appUrlSchema } from "../config-schema-Bb9oY-Ku.js";
+import * as z$1 from "zod";
+import z from "zod";
+import { P, match } from "ts-pattern";
+import { setTimeout as setTimeout$1 } from "node:timers/promises";
+import { nanoid } from "nanoid";
 import { createReadStream, readFileSync } from "node:fs";
 import * as path from "node:path";
 import { EventEmitter } from "node:events";
-import * as z$1 from "zod";
-import z from "zod";
 import ora from "ora";
 import { pino } from "pino";
 import * as crypto from "node:crypto";
@@ -13,14 +16,12 @@ import { create } from "tar";
 import * as os from "node:os";
 import { camelCase, capitalize, kebabCase } from "es-toolkit/string";
 import esbuild from "esbuild";
-import { nanoid } from "nanoid";
-import { P, match } from "ts-pattern";
-import { setTimeout as setTimeout$1 } from "node:timers/promises";
 import * as prompts from "@clack/prompts";
 import picocolors from "picocolors";
 import { createAuthClient } from "better-auth/client";
 import { deviceAuthorizationClient } from "better-auth/client/plugins";
 import chokidar from "chokidar";
+import * as util from "node:util";
 
 //#region ../../node_modules/.bun/commander@14.0.2/node_modules/commander/lib/error.js
 var require_error = /* @__PURE__ */ __commonJS({ "../../node_modules/.bun/commander@14.0.2/node_modules/commander/lib/error.js": ((exports) => {
@@ -3227,7 +3228,8 @@ ${agentEntries.map(({ variableName, id }) => `  '${id}': agent_${variableName},`
 				"// @ts-nocheck",
 				"// noinspection JSUnusedGlobalSymbols",
 				"// This file is auto-generated by ToolForge. Do not edit manually."
-			].join("\n\n") }
+			].join("\n\n") },
+			external: ["@toolforge-js/sdk/components", "@toolforge-js/sdk/config"]
 		});
 		logger.debug("esbuild bundling completed");
 		return {
@@ -3279,7 +3281,7 @@ function getMemoryUsage() {
 }
 
 //#endregion
-//#region src/cli/actions/utils.ts
+//#region src/cli/lib/utils.ts
 async function getToolForgeConfig(configRelPath) {
 	try {
 		const configPath = path.resolve(process.cwd(), configRelPath);
@@ -3529,11 +3531,15 @@ async function deploy(configRelPath, debug) {
 		prompts.outro(getErrorMessage(error));
 		process.exit(1);
 	});
+	if (environments.length === 0) {
+		prompts.outro("No production environment found. Please create a production environment in your workspace. Learn more at https://docs.tool-forge.ai/concepts/environment#production-environment");
+		process.exit(0);
+	}
 	const environmentSelect = await prompts.select({
 		message: "Select the production environment to deploy to:",
-		options: environments.map((env) => ({
-			label: `${env.environmentName} (Workspace: ${env.workspaceName})`,
-			value: env.id
+		options: environments.map((env$1) => ({
+			label: `${env$1.environmentName} (Workspace: ${env$1.workspaceName})`,
+			value: env$1.id
 		}))
 	});
 	if (prompts.isCancel(environmentSelect)) {
@@ -3568,7 +3574,7 @@ async function deploy(configRelPath, debug) {
 		process.exit(1);
 	});
 	const deploySpinner = prompts.spinner();
-	const environmentName = environments.find((env) => env.id === environmentSelect)?.environmentName;
+	const environmentName = environments.find((env$1) => env$1.id === environmentSelect)?.environmentName;
 	deploySpinner.start(`Deploying tools to ${environmentName}...`);
 	const formData = new FormData();
 	formData.append("bundle", new File([await Bun.file(tarballPath).arrayBuffer()], path.basename(tarballPath), { type: "application/gzip" }));
@@ -3698,15 +3704,13 @@ const TOKEN_PREFIX = "tf_token--";
 //#endregion
 //#region src/internal/websocket-client.ts
 const optionsSchema$1 = z$1.object({
-	serverUrl: z$1.url(),
-	runnerId,
-	maxAcknowledgementWaitMs: z$1.number().min(0).optional().default(1e4),
-	maxRetries: z$1.number().min(0).optional().default(100),
-	retryDelayMs: z$1.number().min(100).default(1e3),
-	maxRetryDelayMs: z$1.number().min(1e3).optional().default(3e4),
-	retryJitterFactor: z$1.number().min(0).max(1).optional().default(.5),
-	retryBackoffMultiplier: z$1.number().min(1).optional().default(2)
-});
+	apiKey: z$1.string().refine((val) => val.startsWith("sk_live") || val.startsWith("pk_test") || val.startsWith(TOKEN_PREFIX)),
+	tokenProviderEndpoint: z$1.url().optional(),
+	sdkServerUrl: z$1.url()
+}).refine((val) => {
+	if (val.apiKey.startsWith(TOKEN_PREFIX) && !val.tokenProviderEndpoint) return false;
+	return true;
+}, "tokenProviderEndpoint must be present for short term apiKey");
 const WS_ERROR_CODES = {
 	NORMAL_CLOSURE: 1e3,
 	GOING_AWAY: 1001,
@@ -3725,8 +3729,18 @@ const WEB_SOCKET_CLIENT_EVENTS = {
 	COMMUNICATION_INITIALIZED: "COMMUNICATION_INITIALIZED",
 	STOPPED: "STOPPED"
 };
+const MAX_ACK_WAIT_MS = 1e4;
+const MAX_RETRIES = 100;
+const RETRY_DELAY_MS = 1e3;
+const MAX_RETRY_DELAY_MS = 3e4;
+const RETRY_JITTER_FACTOR = .5;
+const RETRY_BACKOFF_MULTIPLIER = 2;
 var WebSocketClient = class extends EventEmitter {
 	#options;
+	#runnerId;
+	#apiKey;
+	#refreshApiKeyInterval;
+	#serverUrl;
 	#forgeRunner;
 	#logger;
 	#connectionState = "disconnected";
@@ -3741,13 +3755,25 @@ var WebSocketClient = class extends EventEmitter {
 	#pendingMessagesBuffer = [];
 	#subscribeCallbacks = [];
 	constructor(options, forgeRunner, logger) {
-		super();
+		super({ captureRejections: true });
 		this.#options = optionsSchema$1.parse(options);
 		this.#forgeRunner = forgeRunner;
-		this.#logger = logger.child({ component: "WebSocketClient" });
-		this.#connectToServer();
+		const runnerId = runnerIdStore.getStore();
+		if (!runnerId) throw new Error("runnerId not found");
+		this.#runnerId = runnerId;
+		this.#logger = logger.child({
+			runnerId: this.#runnerId,
+			component: "WebSocketClient"
+		});
+		this.#apiKey = this.#options.apiKey;
+		const url = new URL("/socket", this.#options.sdkServerUrl);
+		url.searchParams.set("apiKey", this.#apiKey);
+		url.searchParams.set("runnerId", runnerId);
+		this.#serverUrl = url;
+		if (this.#apiKey.startsWith(TOKEN_PREFIX)) this.#refreshApiKeyInterval = setInterval(this.#refreshApiKey.bind(this), 840 * 1e3);
+		this.#connect();
 	}
-	#connectToServer() {
+	#connect() {
 		if (this.#connectionState === "closing") {
 			this.#logger.warn("start called while closing, ignoring");
 			return;
@@ -3757,8 +3783,8 @@ var WebSocketClient = class extends EventEmitter {
 			return;
 		}
 		this.#connectionState = "connecting";
-		this.#logger.info("connecting to SDK server at %s", this.#options.serverUrl);
-		this.#socket = new WebSocket(this.#options.serverUrl);
+		this.#logger.info("connecting to SDK server at %s", this.#options.sdkServerUrl.toString());
+		this.#socket = new WebSocket(this.#serverUrl);
 		this.#socket.addEventListener("open", this.#handleWebSocketOpen.bind(this));
 		this.#socket.addEventListener("close", this.#handleWebSocketClose.bind(this));
 		this.#socket.addEventListener("message", this.#handleWebSocketMessage.bind(this));
@@ -3773,34 +3799,57 @@ var WebSocketClient = class extends EventEmitter {
 		}
 	}
 	#handleWebSocketClose(event) {
-		this.#connectionState = "disconnected";
+		if (this.#connectionState === "closing") return;
 		this.#logger.debug({
 			code: event.code,
 			reason: event.reason
 		}, "disconnected from SDK server");
-		if (event.code === WS_ERROR_CODES.POLICY_VIOLATION) {
+		if (event.code === WS_ERROR_CODES.INVALID_FRAME_PAYLOAD_DATA && !this.#apiKey.startsWith(TOKEN_PREFIX)) {
 			this.#logger.error("authentication failed, exiting");
+			this.#connectionState = "closing";
+			this.#reset();
 			this.emit("error", /* @__PURE__ */ new Error("authentication failed"));
 			return;
 		}
-		this.#stop();
+		this.#connectionState = "disconnected";
+		this.#reset();
 		this.#retryConnect();
 	}
 	async #retryConnect() {
-		if (this.#retryCount >= this.#options.maxRetries) {
+		if (this.#retryCount >= MAX_RETRIES) {
 			this.#logger.error("max retries exceeded, exiting");
 			this.emit("error", /* @__PURE__ */ new Error("max retries exceeded"));
 			return;
 		}
 		this.#retryCount += 1;
-		const delay = exponentialBackoff(this.#retryCount - 1, this.#options.retryDelayMs, this.#options.maxRetryDelayMs, this.#options.retryJitterFactor, this.#options.retryBackoffMultiplier);
+		const delay = exponentialBackoff(this.#retryCount - 1, RETRY_DELAY_MS, MAX_RETRY_DELAY_MS, RETRY_JITTER_FACTOR, RETRY_BACKOFF_MULTIPLIER);
 		this.#logger.debug({
 			delay,
-			url: this.#options.serverUrl,
+			url: this.#options.sdkServerUrl,
 			attempt: this.#retryCount
 		}, "retrying connection to server");
 		await setTimeout$1(delay);
-		this.#connectToServer();
+		await this.#refreshApiKey();
+		this.#connect();
+	}
+	async #refreshApiKey() {
+		if (!this.#options.tokenProviderEndpoint) return;
+		this.#apiKey = await fetch(new URL("/token/refresh", this.#options.tokenProviderEndpoint), {
+			method: "POST",
+			headers: { "Content-Type": "application/json" },
+			body: JSON.stringify({ token: this.#apiKey })
+		}).then((res) => {
+			if (!res.ok) throw new Error(`failed to refresh token: ${res.status} ${res.statusText}`);
+			return res.json();
+		}).then((data) => {
+			const result = z$1.object({ token: z$1.string().startsWith(TOKEN_PREFIX) }).safeParse(data);
+			if (!result.success) throw new Error("invalid response from token refresh");
+			return result.data.token;
+		}).catch((error) => {
+			this.emit("error", error);
+			throw error;
+		});
+		this.#logger.info("successfully refreshed API token");
 	}
 	async #handleWebSocketMessage(event) {
 		const data = event.data;
@@ -3867,43 +3916,49 @@ var WebSocketClient = class extends EventEmitter {
 		if (this.#heartbeatTimeout) clearTimeout(this.#heartbeatTimeout);
 		const socket = this.#socket;
 		invariant(socket, "socket should be present");
-		this.#heartbeatInterval = setInterval(() => {
-			socket.send(JSON.stringify({
-				id: nanoid(),
-				type: "HEARTBEAT",
-				timestamp: Date.now(),
-				data: {
-					clientType: "RUNNER",
-					cpuUsage: getCPUUsage().usage,
-					memoryUsage: getMemoryUsage().usage,
-					runnerId: this.#options.runnerId,
-					activeSessionsCount: this.#forgeRunner.activeSessionsCount
-				}
-			}));
-		}, this.#heartbeatIntervalMs);
+		this.#heartbeatInterval = setInterval(this.#sendHeartbeat.bind(this), this.#heartbeatIntervalMs);
 		this.#heartbeatTimeout = setTimeout(this.#handleHeartbeatAckMiss.bind(this), this.#heartbeatAckTimeoutMs);
 		this.emit(WEB_SOCKET_CLIENT_EVENTS.COMMUNICATION_INITIALIZED);
 	}
+	#sendHeartbeat() {
+		if (this.#socket && this.#socket.readyState === WebSocket.OPEN) this.#socket.send(JSON.stringify({
+			id: nanoid(),
+			type: "HEARTBEAT",
+			timestamp: Date.now(),
+			data: {
+				clientType: "RUNNER",
+				cpuUsage: getCPUUsage().usage,
+				memoryUsage: getMemoryUsage().usage,
+				runnerId: this.#runnerId,
+				activeSessionsCount: this.#forgeRunner.activeSessionsCount
+			}
+		}));
+	}
 	#handleHeartbeatAck(message) {
 		if (message.data.clientType !== "RUNNER") {
 			this.#logger.warn("received heartbeat ack from non-runner client, ignoring");
 			return;
 		}
-		if (message.data.runnerId !== this.#options.runnerId || message.data.serverId !== this.#connectedServerId) {
+		if (message.data.runnerId !== this.#runnerId || message.data.serverId !== this.#connectedServerId) {
 			this.#logger.warn("received heartbeat ack for different runner or server, ignoring");
-			this.#stop();
-			this.#retryConnect();
+			if (this.#socket && this.#socket.readyState === this.#socket.OPEN) this.#socket.close(WS_ERROR_CODES.GOING_AWAY, "received heartbeat ack for different server or runner");
+			else {
+				this.#connectionState = "disconnected";
+				this.#reset();
+				this.#retryConnect();
+			}
 			return;
 		}
 		const latency = Date.now() - message.timestamp;
 		this.#logger.debug({ latency }, "heartbeat acknowledged");
 		if (this.#heartbeatTimeout) clearTimeout(this.#heartbeatTimeout);
-		invariant(this.#heartbeatAckTimeoutMs, "heartbeat interval should be set");
 		this.#heartbeatTimeout = setTimeout(this.#handleHeartbeatAckMiss.bind(this), this.#heartbeatAckTimeoutMs);
 	}
 	#handleHeartbeatAckMiss() {
 		this.#logger.error("heartbeat timeout, disconnecting");
-		this.#stop();
+		this.#connectionState = "closing";
+		if (this.#socket && this.#socket.readyState === this.#socket.OPEN) this.#socket.close(WS_ERROR_CODES.GOING_AWAY, "heartbeat timeout");
+		this.#reset();
 		this.emit("error", /* @__PURE__ */ new Error("heartbeat timeout"));
 	}
 	#handleServerAckMessage(message) {
@@ -3922,7 +3977,7 @@ var WebSocketClient = class extends EventEmitter {
 			const timeout = setTimeout(() => {
 				this.#pendingServerAcks.delete(message.id);
 				reject(/* @__PURE__ */ new Error("acknowledgement timeout"));
-			}, this.#options.maxAcknowledgementWaitMs);
+			}, MAX_ACK_WAIT_MS);
 			this.#pendingServerAcks.set(id, {
 				resolve: () => {
 					clearTimeout(timeout);
@@ -3965,27 +4020,32 @@ var WebSocketClient = class extends EventEmitter {
 			this.#subscribeCallbacks = this.#subscribeCallbacks.filter((cb) => cb !== callback);
 		};
 	}
-	#stop() {
-		if (this.#heartbeatInterval) clearInterval(this.#heartbeatInterval);
-		if (this.#heartbeatTimeout) clearTimeout(this.#heartbeatTimeout);
-		if (this.#socket && this.#socket.readyState !== WebSocket.CLOSED) {
-			this.#socket.close(WS_ERROR_CODES.GOING_AWAY, "runner shutting down");
+	#reset() {
+		if (this.#refreshApiKeyInterval) {
+			clearInterval(this.#refreshApiKeyInterval);
+			this.#refreshApiKeyInterval = void 0;
+			this.#logger.info("token refresh interval cleared");
+		}
+		if (this.#socket) {
 			this.#socket.removeEventListener("open", this.#handleWebSocketOpen.bind(this));
 			this.#socket.removeEventListener("close", this.#handleWebSocketClose.bind(this));
 			this.#socket.removeEventListener("message", this.#handleWebSocketMessage.bind(this));
 			this.#socket = void 0;
 		}
+		if (this.#heartbeatInterval) clearInterval(this.#heartbeatInterval);
+		if (this.#heartbeatTimeout) clearTimeout(this.#heartbeatTimeout);
 		this.#heartbeatAckTimeoutMs = void 0;
 		this.#heartbeatIntervalMs = void 0;
 		this.#connectedServerId = void 0;
 		this.emit(WEB_SOCKET_CLIENT_EVENTS.STOPPED);
 	}
 	stop() {
-		this.#logger.info("gracefully stopping WebSocketClient...");
+		this.#logger.info("gracefully stopping websocket client...");
 		this.#connectionState = "closing";
-		this.#stop();
 		this.#retryCount = 0;
-		this.#logger.info("WebSocketClient stopped");
+		if (this.#socket && this.#socket.readyState === WebSocket.OPEN) this.#socket.close(WS_ERROR_CODES.GOING_AWAY, "stopping forge runner");
+		this.#reset();
+		this.#logger.info("websocket client stopped");
 	}
 };
 
@@ -4014,12 +4074,9 @@ const optionsSchema = z$1.object({
 * spawns Tool instances, and handles file system changes to reload tools in development mode.
 */
 var ForgeRunner = class extends EventEmitter {
-	#id = `tf-runner:${nanoid(32)}`;
+	#runnerId;
 	#options;
 	#logger;
-	#apiKey;
-	#sdkServerUrl;
-	#refreshApiKeyInterval;
 	#forgeItems = [];
 	#tools = {};
 	#agents = {};
@@ -4030,24 +4087,24 @@ var ForgeRunner = class extends EventEmitter {
 	#sessionAgents = /* @__PURE__ */ new Map();
 	constructor(options, logger) {
 		super({ captureRejections: true });
+		const runnerId = runnerIdStore.getStore();
+		if (!runnerId) throw new Error("runnerId not available");
+		this.#runnerId = runnerId;
 		this.#options = optionsSchema.parse(options);
-		this.#logger = logger.child({ id: this.#id });
-		this.#apiKey = this.#options.apiKey;
-		if (this.#apiKey.startsWith(TOKEN_PREFIX)) this.#refreshApiKeyInterval = setInterval(this.#refreshApiKey.bind(this), 840 * 1e3);
-		const url = new URL(this.#options.sdkServerUrl);
-		url.searchParams.set("apiKey", this.#apiKey);
-		url.searchParams.set("runnerId", this.#id);
-		url.pathname = "/socket";
-		this.#sdkServerUrl = url.toString();
+		this.#logger = logger.child({
+			runnerId: this.#runnerId,
+			component: "ForgeRunner"
+		});
 		this.#webSocketClient = new WebSocketClient({
-			serverUrl: this.#sdkServerUrl,
-			runnerId: this.#id
+			apiKey: this.#options.apiKey,
+			sdkServerUrl: this.#options.sdkServerUrl
 		}, this, this.#logger);
 		this.#webSocketClient.on(WEB_SOCKET_CLIENT_EVENTS.COMMUNICATION_INITIALIZED, this.#handleWebSocketCommunicationInitialized.bind(this));
+		this.#webSocketClient.on("error", this.#handleWebSocketClientError.bind(this));
 		this.#start();
 	}
 	get activeSessionsCount() {
-		return this.#sessionTools.size;
+		return this.#sessionTools.size + this.#sessionAgents.size;
 	}
 	async #start() {
 		try {
@@ -4070,6 +4127,11 @@ var ForgeRunner = class extends EventEmitter {
 		this.#logger.info("websocket communication initialized, sending forge list...");
 		await this.#sendListForge();
 	}
+	#handleWebSocketClientError(error) {
+		this.#logger.error(error, "received error from websocket client");
+		this.#reset();
+		this.emit("error", error);
+	}
 	async #handleWebSocketMessage(message) {
 		const toolRunnerMessageParsed = toForgeRunnerMessages.safeParse(message);
 		if (toolRunnerMessageParsed.success) {
@@ -4094,42 +4156,42 @@ var ForgeRunner = class extends EventEmitter {
 			this.#logger.warn("received start tool message for unknown tool id %s, ignoring", itemId);
 			throw new Error(`tool with id ${itemId} not found`);
 		}
-		const tool = new Tool({
-			metadata: {
-				sessionId,
-				runnerId: this.#id,
-				toolName: toolDefinition.name,
-				toolDescription: toolDefinition.description,
-				toolId: itemId
-			},
-			handler: toolDefinition.handler,
-			webSocketClient: this.#webSocketClient
-		}, this.#logger);
-		this.#sessionTools.set(sessionId, tool);
-		tool.run().then((output) => runWithRetries(() => this.#webSocketClient.sendToServerWithAcknowledgement({
-			id: nanoid(),
-			timestamp: Date.now(),
-			type: "TOOL_COMPLETE",
-			data: {
-				output,
-				sessionId,
-				executionContext: { type: "TOOL" }
-			}
-		}))).catch((error) => runWithRetries(() => this.#webSocketClient.sendToServerWithAcknowledgement({
-			id: nanoid(),
-			timestamp: Date.now(),
-			type: "TOOL_ERROR",
-			data: {
-				error: {
-					message: getErrorMessage(error),
-					stack: error instanceof Error ? error.stack : void 0,
-					code: error instanceof Error && "code" in error ? String(error.code) : void 0
-				},
-				sessionId,
-				executionContext: { type: "TOOL" }
-			}
-		}))).finally(() => {
-			this.#sessionTools.delete(sessionId);
+		runnerIdStore.run(this.#runnerId, () => {
+			sessionIdStore.run(sessionId, () => {
+				const tool = new Tool({
+					toolName: toolDefinition.name,
+					toolDescription: toolDefinition.description,
+					toolId: itemId,
+					handler: toolDefinition.handler,
+					webSocketClient: this.#webSocketClient
+				}, this.#logger);
+				this.#sessionTools.set(sessionId, tool);
+				tool.run().then((output) => runWithRetries(() => this.#webSocketClient.sendToServerWithAcknowledgement({
+					id: nanoid(),
+					timestamp: Date.now(),
+					type: "TOOL_COMPLETE",
+					data: {
+						output,
+						sessionId,
+						executionContext: { type: "TOOL" }
+					}
+				}))).catch((error) => runWithRetries(() => this.#webSocketClient.sendToServerWithAcknowledgement({
+					id: nanoid(),
+					timestamp: Date.now(),
+					type: "TOOL_ERROR",
+					data: {
+						error: {
+							message: getErrorMessage(error),
+							stack: error instanceof Error ? error.stack : void 0,
+							code: error instanceof Error && "code" in error ? String(error.code) : void 0
+						},
+						sessionId,
+						executionContext: { type: "TOOL" }
+					}
+				}))).finally(() => {
+					this.#sessionTools.delete(sessionId);
+				});
+			});
 		});
 	}
 	#handleStopToolMessage(message) {
@@ -4176,7 +4238,7 @@ var ForgeRunner = class extends EventEmitter {
 			type: "LIST_FORGE",
 			timestamp: Date.now(),
 			data: {
-				runnerId: this.#id,
+				runnerId: this.#runnerId,
 				forgeItems: this.#forgeItems
 			}
 		}));
@@ -4189,39 +4251,39 @@ var ForgeRunner = class extends EventEmitter {
 			this.#logger.warn("received start agent message for unknown agent id %s, ignoring", itemId);
 			throw new Error(`agent with id ${itemId} not found`);
 		}
-		const agent = new Agent(agentDefinition, {
-			metadata: {
-				sessionId,
-				runnerId: this.#id,
-				agentId: itemId
-			},
-			webSocketClient: this.#webSocketClient
-		}, this.#logger);
-		this.#sessionAgents.set(sessionId, agent);
-		agent.run().then(() => runWithRetries(() => this.#webSocketClient.sendToServerWithAcknowledgement({
-			id: nanoid(),
-			timestamp: Date.now(),
-			type: "AGENT_COMPLETE",
-			data: {
-				output: {},
-				sessionId,
-				executionContext: { type: "AGENT" }
-			}
-		}))).catch((error) => runWithRetries(() => this.#webSocketClient.sendToServerWithAcknowledgement({
-			id: nanoid(),
-			timestamp: Date.now(),
-			type: "AGENT_ERROR",
-			data: {
-				error: {
-					message: getErrorMessage(error),
-					stack: error instanceof Error ? error.stack : void 0,
-					code: error instanceof Error && "code" in error ? String(error.code) : void 0
-				},
-				sessionId,
-				executionContext: { type: "AGENT" }
-			}
-		}))).finally(() => {
-			this.#sessionAgents.delete(sessionId);
+		runnerIdStore.run(this.#runnerId, () => {
+			sessionIdStore.run(sessionId, () => {
+				const agent = new Agent(agentDefinition, {
+					agentId: itemId,
+					webSocketClient: this.#webSocketClient
+				}, this.#logger);
+				this.#sessionAgents.set(sessionId, agent);
+				agent.run().then(() => runWithRetries(() => this.#webSocketClient.sendToServerWithAcknowledgement({
+					id: nanoid(),
+					timestamp: Date.now(),
+					type: "AGENT_COMPLETE",
+					data: {
+						output: {},
+						sessionId,
+						executionContext: { type: "AGENT" }
+					}
+				}))).catch((error) => runWithRetries(() => this.#webSocketClient.sendToServerWithAcknowledgement({
+					id: nanoid(),
+					timestamp: Date.now(),
+					type: "AGENT_ERROR",
+					data: {
+						error: {
+							message: getErrorMessage(error),
+							stack: error instanceof Error ? error.stack : void 0,
+							code: error instanceof Error && "code" in error ? String(error.code) : void 0
+						},
+						sessionId,
+						executionContext: { type: "AGENT" }
+					}
+				}))).finally(() => {
+					this.#sessionAgents.delete(sessionId);
+				});
+			});
 		});
 	}
 	#handleStopAgentMessage(message) {
@@ -4235,27 +4297,7 @@ var ForgeRunner = class extends EventEmitter {
 		agent.stop();
 		this.#sessionTools.delete(sessionId);
 	}
-	/**
-	* Refreshes the API key by requesting a new token from the SDK server,
-	* when the apiKey is a (short lived) token used when runner is deployed
-	* using Tool Forge Cloud.
-	*/
-	async #refreshApiKey() {
-		if (!this.#options.tokenProviderEndpoint) return;
-		const res = await fetch(new URL("/token/refresh", this.#options.tokenProviderEndpoint), {
-			method: "POST",
-			headers: { "Content-Type": "application/json" },
-			body: JSON.stringify({ token: this.#apiKey })
-		});
-		if (!res.ok) throw new Error(`failed to refresh token: ${res.status} ${res.statusText}`);
-		const data = await res.json();
-		const result = z$1.object({ token: z$1.string().startsWith(TOKEN_PREFIX) }).safeParse(data);
-		if (!result.success) throw new Error("invalid response from token refresh");
-		this.#apiKey = result.data.token;
-		this.#logger.info("successfully refreshed API token");
-	}
-	stop() {
-		this.#logger.info("gracefully stopping tool runner...");
+	#reset() {
 		if (this.#fsWatcher) {
 			this.#fsWatcher.close();
 			this.#fsWatcher = void 0;
@@ -4267,20 +4309,213 @@ var ForgeRunner = class extends EventEmitter {
 			this.#logger.info("websocket message handler unsubscribed");
 		}
 		this.#webSocketClient.off(WEB_SOCKET_CLIENT_EVENTS.COMMUNICATION_INITIALIZED, this.#handleWebSocketCommunicationInitialized.bind(this));
+		this.#webSocketClient.off("error", this.#handleWebSocketClientError.bind(this));
+	}
+	stop() {
+		this.#logger.info("gracefully stopping tool runner...");
+		this.#reset();
 		this.#webSocketClient.stop();
-		if (this.#refreshApiKeyInterval) {
-			clearInterval(this.#refreshApiKeyInterval);
-			this.#refreshApiKeyInterval = void 0;
-			this.#logger.info("token refresh interval cleared");
-		}
 		this.#logger.info("tool runner stopped");
 	}
 };
 
+//#endregion
+//#region src/cli/lib/logger.ts
+const env = z$1.object({
+	LOKI_HOST: z$1.url().optional(),
+	LOKI_USERNAME: z$1.string().optional(),
+	LOKI_PASSWORD: z$1.string().optional()
+}).parse(process.env);
+const transportTargets = [];
+if (env.LOKI_HOST) transportTargets.push({
+	target: "pino-loki",
+	level: "trace",
+	options: {
+		host: env.LOKI_HOST,
+		basicAuth: env.LOKI_USERNAME && env.LOKI_PASSWORD ? {
+			username: env.LOKI_USERNAME,
+			password: env.LOKI_PASSWORD
+		} : void 0,
+		propsToLabels: [
+			"app",
+			"component",
+			"runnerId",
+			"sessionId"
+		]
+	}
+});
+transportTargets.push({
+	target: "pino-pretty",
+	level: "trace"
+});
+const rootLogger = pino({
+	level: "trace",
+	transport: { targets: transportTargets },
+	base: { app: "forge-runner" }
+});
+console.log = (...args) => {
+	const runnerId = runnerIdStore.getStore();
+	const sessionId = sessionIdStore.getStore();
+	rootLogger.info({
+		runnerId,
+		sessionId
+	}, util.format(...args));
+};
+console.info = (...args) => {
+	const runnerId = runnerIdStore.getStore();
+	const sessionId = sessionIdStore.getStore();
+	rootLogger.info({
+		runnerId,
+		sessionId
+	}, util.format(...args));
+};
+console.warn = (...args) => {
+	const runnerId = runnerIdStore.getStore();
+	const sessionId = sessionIdStore.getStore();
+	rootLogger.warn({
+		runnerId,
+		sessionId
+	}, util.format(...args));
+};
+console.error = (...args) => {
+	const runnerId = runnerIdStore.getStore();
+	const sessionId = sessionIdStore.getStore();
+	rootLogger.error({
+		runnerId,
+		sessionId
+	}, util.format(...args));
+};
+console.debug = (...args) => {
+	const runnerId = runnerIdStore.getStore();
+	const sessionId = sessionIdStore.getStore();
+	rootLogger.debug({
+		runnerId,
+		sessionId
+	}, util.format(...args));
+};
+console.trace = (...args) => {
+	const runnerId = runnerIdStore.getStore();
+	const sessionId = sessionIdStore.getStore();
+	const stack = (/* @__PURE__ */ new Error()).stack;
+	rootLogger.trace({
+		runnerId,
+		sessionId,
+		stack
+	}, util.format(...args));
+};
+console.group = (...args) => {
+	const runnerId = runnerIdStore.getStore();
+	const sessionId = sessionIdStore.getStore();
+	rootLogger.info({
+		runnerId,
+		sessionId
+	}, util.format("group:", ...args));
+};
+console.groupCollapsed = (...args) => {
+	const runnerId = runnerIdStore.getStore();
+	const sessionId = sessionIdStore.getStore();
+	rootLogger.info({
+		runnerId,
+		sessionId
+	}, util.format("group:", ...args));
+};
+console.groupEnd = () => {
+	const runnerId = runnerIdStore.getStore();
+	const sessionId = sessionIdStore.getStore();
+	rootLogger.info({
+		runnerId,
+		sessionId
+	}, "group end");
+};
+const timers = /* @__PURE__ */ new Map();
+console.time = (label = "default") => {
+	timers.set(label, Date.now());
+};
+console.timeEnd = (label = "default") => {
+	const runnerId = runnerIdStore.getStore();
+	const sessionId = sessionIdStore.getStore();
+	const start = timers.get(label);
+	if (start) {
+		const duration = Date.now() - start;
+		rootLogger.info({
+			runnerId,
+			sessionId,
+			duration
+		}, `${label}: ${duration}ms`);
+		timers.delete(label);
+	}
+};
+console.timeLog = (label = "default", ...args) => {
+	const runnerId = runnerIdStore.getStore();
+	const sessionId = sessionIdStore.getStore();
+	const start = timers.get(label);
+	if (start) {
+		const duration = Date.now() - start;
+		rootLogger.info({
+			runnerId,
+			sessionId,
+			duration
+		}, util.format(`${label}: ${duration}ms`, ...args));
+	}
+};
+console.assert = (condition, ...args) => {
+	if (!condition) {
+		const runnerId = runnerIdStore.getStore();
+		const sessionId = sessionIdStore.getStore();
+		rootLogger.error({
+			runnerId,
+			sessionId
+		}, util.format("assertion failed:", ...args));
+	}
+};
+console.table = (data) => {
+	const runnerId = runnerIdStore.getStore();
+	const sessionId = sessionIdStore.getStore();
+	rootLogger.info({
+		runnerId,
+		sessionId,
+		data
+	}, "table data");
+};
+const counters = /* @__PURE__ */ new Map();
+console.count = (label = "default") => {
+	const runnerId = runnerIdStore.getStore();
+	const sessionId = sessionIdStore.getStore();
+	const count = (counters.get(label) || 0) + 1;
+	counters.set(label, count);
+	rootLogger.info({
+		runnerId,
+		sessionId
+	}, `${label}: ${count}`);
+};
+console.countReset = (label = "default") => {
+	counters.delete(label);
+};
+console.clear = () => {};
+console.dir = (obj, options) => {
+	const runnerId = runnerIdStore.getStore();
+	const sessionId = sessionIdStore.getStore();
+	rootLogger.info({
+		runnerId,
+		sessionId,
+		obj,
+		options
+	}, "Dir output");
+};
+console.dirxml = (...args) => {
+	const runnerId = runnerIdStore.getStore();
+	const sessionId = sessionIdStore.getStore();
+	rootLogger.info({
+		runnerId,
+		sessionId
+	}, util.format(...args));
+};
+
 //#endregion
 //#region src/cli/actions/start-tool-forge.ts
 async function startToolForge({ configRelPath, debug, mode }) {
-	const logger = pino({ level: debug ? "debug" : "info" });
+	const runnerId = runnerIdStore.getStore();
+	const logger = rootLogger.child({ runnerId }, { level: debug ? "debug" : "info" });
 	try {
 		const spinner = ora("loading configuration...").start();
 		const { config, configPath } = await getToolForgeConfig(configRelPath);
@@ -4312,19 +4547,15 @@ async function startToolForge({ configRelPath, debug, mode }) {
 		}, logger);
 		runner.on("error", async (error) => {
 			logger.error(error, "tool runner error - shutting down");
-			await runner.stop();
-			process.exit(1);
-		});
-		process.on("SIGTERM", async () => {
-			logger.info("gracefully shutting down tool runner...");
-			await runner.stop();
 			process.exit(1);
 		});
-		process.on("SIGINT", async () => {
+		async function gracefulShutdown() {
 			logger.info("gracefully shutting down tool runner...");
 			await runner.stop();
 			process.exit(1);
-		});
+		}
+		process.on("SIGTERM", gracefulShutdown);
+		process.on("SIGINT", gracefulShutdown);
 	} catch (error) {
 		logger.error(error, "failed to start tool runner");
 		process.exit(1);
@@ -4337,24 +4568,32 @@ const version = JSON.parse(readFileSync(path.resolve(__dirname, "../../package.j
 program.name("toolforge").description("Tool Forge SDK cli").version(version);
 program.command("dev").description("start the tool forge development server").option("-c, --config <path>", "path to the tool-forge config file", (val) => z$1.string().parse(val), "toolforge.config.ts").option("-d, --debug", "enable debug logging", false).action(async function startServer() {
 	const debug = z$1.boolean().optional().default(false).parse(this.opts().debug);
-	await startToolForge({
-		configRelPath: z$1.string().parse(this.opts().config),
-		debug,
-		mode: "development"
-	}).catch((error) => {
-		if (error instanceof Error) console.warn("Failed to start development server:", error.message);
-		process.exit(1);
+	const configRelPath = z$1.string().parse(this.opts().config);
+	const runnerId = `tf-runner:${nanoid(32)}`;
+	runnerIdStore.run(runnerId, () => {
+		startToolForge({
+			configRelPath,
+			debug,
+			mode: "development"
+		}).catch((error) => {
+			if (error instanceof Error) console.error(error, "failed to start toolforge runner");
+			process.exit(1);
+		});
 	});
 });
 program.command("start").description("start the tool forge server in production mode").option("-c, --config <path>", "path to the tool-forge config file", (val) => z$1.string().parse(val), "toolforge.config.ts").option("-d, --debug", "enable debug logging", false).action(async function startServer() {
 	const debug = z$1.boolean().optional().default(false).parse(this.opts().debug);
-	await startToolForge({
-		configRelPath: z$1.string().parse(this.opts().config),
-		debug,
-		mode: "production"
-	}).catch((error) => {
-		if (error instanceof Error) console.warn("Failed to start server:", error.message);
-		process.exit(1);
+	const configRelPath = z$1.string().parse(this.opts().config);
+	const runnerId = `tf-runner:${nanoid(32)}`;
+	runnerIdStore.run(runnerId, () => {
+		startToolForge({
+			configRelPath,
+			debug,
+			mode: "production"
+		}).catch((error) => {
+			if (error instanceof Error) console.error(error, "failed to start toolforge runner");
+			process.exit(1);
+		});
 	});
 });
 program.command("build").description("build the tools for production").option("-c, --config <path>", "path to the tool-forge config file", (val) => z$1.string().parse(val), "toolforge.config.ts").option("-d, --debug", "enable debug logging", false).action(async function() {