@toolforge-js/sdk 0.8.4 → 0.8.5

package/dist/cli/index.js

@@ -1,4 +1,4 @@
-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-DDDEH8M3.js";
+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 { r as toolForgeConfigSchema } from "../config-schema-D6ZIesbW.js";
 import { createReadStream, readFileSync } from "node:fs";
 import * as path from "node:path";
@@ -3692,7 +3692,6 @@ function getDeviceLabel() {
 //#endregion
 //#region ../core/dist/token/index.js
 const TOKEN_PREFIX = "tf_token--";
-const TOOL_FORGE_TOKEN_FILE = "TOOL_FORGE_TOKEN_FILE";
 
 //#endregion
 //#region src/internal/websocket-client.ts
@@ -3990,13 +3989,22 @@ var WebSocketClient = class extends EventEmitter {
 
 //#endregion
 //#region src/internal/forge-runner.ts
+/**
+* ForgeRunner should start with apiKey
+*/
 const toForgeRunnerMessages = z$1.discriminatedUnion("type", [
 	startToolMessageSchema,
 	stopToolMessageSchema,
 	startAgentMessageSchema,
 	stopAgentMessageSchema
 ]);
-const optionsSchema = z$1.object({ mode: z$1.enum(["development", "production"]) });
+const optionsSchema = z$1.object({
+	mode: z$1.enum(["development", "production"]),
+	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(),
+	toolsDir: z$1.string()
+});
 /**
 * ForgeRunner manages the lifecycle of tools or agents, including discovery, loading, and communication with the SDK server.
 *
@@ -4007,9 +4015,8 @@ var ForgeRunner = class extends EventEmitter {
 	#id = `tf-runner:${nanoid(32)}`;
 	#options;
 	#logger;
-	#config;
-	#sdkServerUrl;
 	#apiKey;
+	#sdkServerUrl;
 	#refreshApiKeyInterval;
 	#forgeItems = [];
 	#tools = {};
@@ -4019,32 +4026,22 @@ var ForgeRunner = class extends EventEmitter {
 	#fsWatcher;
 	#sessionTools = /* @__PURE__ */ new Map();
 	#sessionAgents = /* @__PURE__ */ new Map();
-	constructor(config, options, logger) {
+	constructor(options, logger) {
 		super({ captureRejections: true });
-		this.#config = config;
-		if (typeof config.apiKey === "string") this.#apiKey = config.apiKey;
-		else if (typeof process.env[TOOL_FORGE_TOKEN_FILE] === "string") {
-			const token = readFileSync(process.env[TOOL_FORGE_TOKEN_FILE], "utf-8").trim();
-			if (!token.startsWith(TOKEN_PREFIX)) throw new Error(`API key in ${process.env[TOOL_FORGE_TOKEN_FILE]} is invalid`);
-			this.#apiKey = token;
-		} else throw new Error("API key is required to initialize ForgeRunner");
-		const url = new URL(this.#config.sdkServerUrl);
+		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.#options = optionsSchema.parse(options);
-		this.#logger = logger.child({ id: this.#id });
 		this.#webSocketClient = new WebSocketClient({
 			serverUrl: this.#sdkServerUrl,
 			runnerId: this.#id
 		}, this, this.#logger);
 		this.#webSocketClient.on(WEB_SOCKET_CLIENT_EVENTS.COMMUNICATION_INITIALIZED, this.#handleWebSocketCommunicationInitialized.bind(this));
-		if (this.#apiKey.startsWith(TOKEN_PREFIX)) this.#refreshApiKeyInterval = setInterval(this.#refreshApiKey.bind(this), 840 * 1e3);
-		this.#logger.info({
-			mode: this.#options.mode,
-			id: this.#id
-		}, "created tool runner");
 		this.#start();
 	}
 	get activeSessionsCount() {
@@ -4053,7 +4050,7 @@ var ForgeRunner = class extends EventEmitter {
 	async #start() {
 		try {
 			this.#logger.debug("gathering tools...");
-			const { forgeItems, tools, agents } = await gatherForgeItems(path.resolve(process.cwd(), this.#config.toolsDir), this.#options.mode, this.#logger);
+			const { forgeItems, tools, agents } = await gatherForgeItems(path.resolve(process.cwd(), this.#options.toolsDir), this.#options.mode, this.#logger);
 			this.#forgeItems = forgeItems;
 			this.#tools = tools;
 			this.#agents = agents;
@@ -4089,7 +4086,6 @@ var ForgeRunner = class extends EventEmitter {
 	*/
 	async #handleStartToolMessage(message) {
 		this.#logger.debug({ message }, "received start tool message");
-		if (!this.#config) throw new Error("config should be initialized before starting tool");
 		const { sessionId, itemId } = message.data;
 		const toolDefinition = this.#tools[itemId];
 		if (!toolDefinition) {
@@ -4146,7 +4142,7 @@ var ForgeRunner = class extends EventEmitter {
 		this.#sessionTools.delete(sessionId);
 	}
 	#watchToolChanges() {
-		const resolvedToolsDir = path.resolve(process.cwd(), this.#config.toolsDir);
+		const resolvedToolsDir = path.resolve(process.cwd(), this.#options.toolsDir);
 		this.#fsWatcher = chokidar.watch(resolvedToolsDir, {
 			ignored: /(^|[/\\])\../,
 			persistent: true,
@@ -4162,7 +4158,7 @@ var ForgeRunner = class extends EventEmitter {
 			}).otherwise(() => picocolors.blue("tools changed"));
 			this.#logger.info(`${message}, reloading server...`);
 			try {
-				const { forgeItems, tools, agents } = await gatherForgeItems(path.resolve(process.cwd(), this.#config.toolsDir), this.#options.mode, this.#logger);
+				const { forgeItems, tools, agents } = await gatherForgeItems(path.resolve(process.cwd(), this.#options.toolsDir), this.#options.mode, this.#logger);
 				this.#forgeItems = forgeItems;
 				this.#tools = tools;
 				this.#agents = agents;
@@ -4185,7 +4181,6 @@ var ForgeRunner = class extends EventEmitter {
 	}
 	#handleStartAgentMessage(message) {
 		this.#logger.debug({ message }, "received start agent message");
-		if (!this.#config) throw new Error("config should be initialized before starting agent");
 		const { sessionId, itemId } = message.data;
 		const agentDefinition = this.#agents[itemId];
 		if (!agentDefinition) {
@@ -4227,16 +4222,25 @@ var ForgeRunner = class extends EventEmitter {
 			this.#sessionAgents.delete(sessionId);
 		});
 	}
-	#handleStopAgentMessage(message) {}
+	#handleStopAgentMessage(message) {
+		this.#logger.debug({ message }, "received stop agent message");
+		const { sessionId } = message.data;
+		const agent = this.#sessionAgents.get(sessionId);
+		if (!agent) {
+			this.#logger.warn("received stop agent message for unknown session id %s, ignoring", sessionId);
+			return;
+		}
+		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() {
-		const url = new URL(this.#sdkServerUrl);
-		url.pathname = "/token/refresh";
-		const res = await fetch(url.toString(), {
+		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 })
@@ -4274,16 +4278,36 @@ var ForgeRunner = class extends EventEmitter {
 //#endregion
 //#region src/cli/actions/start-tool-forge.ts
 async function startToolForge({ configRelPath, debug, mode }) {
-	const logger = pino({
-		level: debug ? "debug" : "info",
-		transport: { target: "pino-pretty" }
-	});
+	const logger = pino({ level: debug ? "debug" : "info" });
 	try {
 		const spinner = ora("loading configuration...").start();
 		const { config, configPath } = await getToolForgeConfig(configRelPath);
 		spinner.stop();
 		logger.debug({ config }, "loaded config from %s", configPath);
-		const runner = new ForgeRunner(config, { mode }, logger);
+		const sdkServerUrl = z$1.url().parse(process.env.SDK_SERVER_URL);
+		let apiKey;
+		if (config.apiKey) apiKey = config.apiKey;
+		else {
+			const parsed = z$1.url().safeParse(process.env.TOKEN_PROVIDER_ENDPOINT);
+			if (!parsed.success) throw new Error("either provide apiKey in config, or set the TOKEN_PROVIDER_ENDPOINT");
+			logger.debug("generating token");
+			apiKey = await fetch(new URL("/token/generate", parsed.data), { method: "POST" }).then((res) => res.json()).then((data) => {
+				const parsed$1 = z$1.object({ token: z$1.string() }).safeParse(data);
+				if (!parsed$1.success) throw new Error("invalid token");
+				return parsed$1.data.token;
+			}).catch((error) => {
+				logger.error(error, "error fetching token from TOKEN_PROVIDER_ENDPOINT");
+				throw error;
+			});
+			logger.debug("token generated");
+		}
+		invariant(!!apiKey, "apiKey should be present");
+		const runner = new ForgeRunner({
+			mode,
+			apiKey,
+			sdkServerUrl,
+			toolsDir: config.toolsDir
+		}, logger);
 		runner.on("error", async (error) => {
 			logger.error(error, "tool runner error - shutting down");
 			await runner.stop();

package/dist/components/index.d.ts

@@ -6083,24 +6083,18 @@ declare class Block {
   };
 }
 //#endregion
-//#region src/config/config-schema.d.ts
-declare const toolForgeConfigSchema: z$1.ZodIntersection<z$1.ZodIntersection<z$1.ZodObject<{
-  toolsDir: z$1.ZodDefault<z$1.ZodOptional<z$1.ZodString>>;
-  apiKey: z$1.ZodOptional<z$1.ZodString>;
-  maxRetries: z$1.ZodDefault<z$1.ZodOptional<z$1.ZodNumber>>;
-}, z$1.core.$strip>, z$1.ZodObject<{
-  sdkServerUrl: z$1.ZodDefault<z$1.ZodOptional<z$1.ZodURL>>;
-  appServerUrl: z$1.ZodDefault<z$1.ZodOptional<z$1.ZodURL>>;
-  appUrl: z$1.ZodDefault<z$1.ZodOptional<z$1.ZodURL>>;
-}, z$1.core.$strip>>, z$1.ZodObject<{
-  __tf__tag__name__: z$1.ZodSymbol;
-}, z$1.core.$strip>>;
-type ToolForgeConfig = z$1.infer<typeof toolForgeConfigSchema>;
-//#endregion
 //#region src/internal/forge-runner.d.ts
 type ForgeRunnerOptions = {
   /** Runtime mode for the tool runner. In the development mode, more verbose logging is enabled and tools are automatically reloaded on changes. */
   mode: 'development' | 'production';
+  /** API key  */
+  apiKey: string;
+  /** Endpoint to refresh the short term token. If the apiKey is the format of tf_token--****, then ForgeRunner needs to refresh the token before expiration. */
+  tokenProviderEndpoint?: string;
+  /** SDK Server endpoint */
+  sdkServerUrl: string;
+  /** Path to the directory containing tools  */
+  toolsDir: string;
 };
 /**
  * ForgeRunner manages the lifecycle of tools or agents, including discovery, loading, and communication with the SDK server.
@@ -6110,7 +6104,7 @@ type ForgeRunnerOptions = {
  */
 declare class ForgeRunner extends EventEmitter {
   #private;
-  constructor(config: ToolForgeConfig, options: ForgeRunnerOptions, logger: Logger);
+  constructor(options: ForgeRunnerOptions, logger: Logger);
   get activeSessionsCount(): number;
   stop(): void;
 }

package/dist/components/index.js

@@ -1,4 +1,4 @@
-import { a as AGENT_TAG_NAME, i as AGENT_STEP_TAG_NAME, n as TOOL_TAG_NAME, t as TOOL_HANDLER_TAG_NAME } from "../tool-DDDEH8M3.js";
+import { a as AGENT_TAG_NAME, i as AGENT_STEP_TAG_NAME, n as TOOL_TAG_NAME, t as TOOL_HANDLER_TAG_NAME } from "../tool-BHVNhWPh.js";
 
 //#region src/components/tool.ts
 /**

package/dist/{tool-DDDEH8M3.js → tool-BHVNhWPh.js}

@@ -2915,6 +2915,11 @@ var Agent = class {
 		}
 		return this.#context;
 	}
+	stop() {
+		this.#logger.info("stopping agent...");
+		this.#abortController.abort();
+		this.#logger.info("Agent stopped");
+	}
 	async #executeSteps(stepsToExecute) {
 		const stepDefinitions = stepsToExecute.filter((stepName) => stepName !== "START" && stepName !== "END").map((stepName) => {
 			const stepDef = this.#stepDefinitions[stepName];

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@toolforge-js/sdk",
-  "version": "0.8.4",
+  "version": "0.8.5",
   "type": "module",
   "files": [
     "dist",