@toolforge-js/sdk 0.8.3 → 0.8.4

package/dist/cli/index.js

@@ -1,10 +1,10 @@
 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 { n as toolForgeConfigSchema, t as TF_CONFIG_TAG_NAME } from "../config-schema-V_1JIDL9.js";
-import * as z$1 from "zod";
-import z from "zod";
+import { r as toolForgeConfigSchema } from "../config-schema-D6ZIesbW.js";
 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";
@@ -3284,7 +3284,7 @@ async function getToolForgeConfig(configRelPath) {
 	try {
 		const configPath = path.resolve(process.cwd(), configRelPath);
 		return {
-			config: toolForgeConfigSchema.extend({ __tf__tag__name__: z$1.symbol(TF_CONFIG_TAG_NAME.description) }).parse(await import(configPath).then((mod) => mod.default)),
+			config: toolForgeConfigSchema.parse(await import(configPath).then((mod) => mod.default)),
 			configPath
 		};
 	} catch (error) {
@@ -4008,7 +4008,7 @@ var ForgeRunner = class extends EventEmitter {
 	#options;
 	#logger;
 	#config;
-	#serverUrl;
+	#sdkServerUrl;
 	#apiKey;
 	#refreshApiKeyInterval;
 	#forgeItems = [];
@@ -4028,15 +4028,15 @@ var ForgeRunner = class extends EventEmitter {
 			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.sdkServer);
+		const url = new URL(this.#config.sdkServerUrl);
 		url.searchParams.set("apiKey", this.#apiKey);
 		url.searchParams.set("runnerId", this.#id);
 		url.pathname = "/socket";
-		this.#serverUrl = url.toString();
+		this.#sdkServerUrl = url.toString();
 		this.#options = optionsSchema.parse(options);
 		this.#logger = logger.child({ id: this.#id });
 		this.#webSocketClient = new WebSocketClient({
-			serverUrl: this.#serverUrl,
+			serverUrl: this.#sdkServerUrl,
 			runnerId: this.#id
 		}, this, this.#logger);
 		this.#webSocketClient.on(WEB_SOCKET_CLIENT_EVENTS.COMMUNICATION_INITIALIZED, this.#handleWebSocketCommunicationInitialized.bind(this));
@@ -4234,7 +4234,7 @@ var ForgeRunner = class extends EventEmitter {
 	* using Tool Forge Cloud.
 	*/
 	async #refreshApiKey() {
-		const url = new URL(this.#serverUrl);
+		const url = new URL(this.#sdkServerUrl);
 		url.pathname = "/token/refresh";
 		const res = await fetch(url.toString(), {
 			method: "POST",

package/dist/components/index.d.ts

@@ -1,5 +1,5 @@
-import * as z$1 from "zod";
 import { EventEmitter } from "node:events";
+import * as z$1 from "zod";
 import { Logger } from "pino";
 import * as better_auth0 from "better-auth";
 
@@ -6084,14 +6084,17 @@ declare class Block {
 }
 //#endregion
 //#region src/config/config-schema.d.ts
-declare const toolForgeConfigSchema: z$1.ZodObject<{
+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>;
-  sdkServer: z$1.ZodDefault<z$1.ZodOptional<z$1.ZodURL>>;
+  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>>;
-  maxRetries: z$1.ZodDefault<z$1.ZodOptional<z$1.ZodNumber>>;
-}, z$1.core.$strip>;
+}, 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

package/dist/config/index.d.ts

@@ -8,12 +8,6 @@ type ToolForgeConfig = {
    * Get your API key from the Tool Forge environment dashboard.
    */
   apiKey?: string;
-  /** Optional URL for the SDK server (overrides default). */
-  sdkServer?: string;
-  /** Optional URL for the Tool Forge app server (overrides default). */
-  appServerUrl?: string;
-  /** Optional URL for the Tool Forge app (overrides default). */
-  appUrl?: string;
 };
 /**
  * Define and validate Tool Forge SDK configuration.
@@ -21,10 +15,10 @@ type ToolForgeConfig = {
  * @param config - The configuration object for Tool Forge SDK.
  */
 declare function defineConfig(input: ToolForgeConfig): {
-  toolsDir: string;
-  sdkServer: string;
+  sdkServerUrl: string;
   appServerUrl: string;
   appUrl: string;
+  toolsDir: string;
   maxRetries: number;
   apiKey?: string | undefined;
   __tf__tag__name__: symbol;

package/dist/config/index.js

@@ -1,4 +1,5 @@
-import { n as toolForgeConfigSchema, t as TF_CONFIG_TAG_NAME } from "../config-schema-V_1JIDL9.js";
+import { i as urlConfigSchema, n as baseConfigSchema, t as TF_CONFIG_TAG_NAME } from "../config-schema-D6ZIesbW.js";
+import * as z$1 from "zod";
 
 //#region src/config/index.ts
 /**
@@ -7,9 +8,24 @@ import { n as toolForgeConfigSchema, t as TF_CONFIG_TAG_NAME } from "../config-s
 * @param config - The configuration object for Tool Forge SDK.
 */
 function defineConfig(input) {
+	const parsedInput = baseConfigSchema.safeParse(input);
+	if (!parsedInput.success) {
+		const { errors } = z$1.treeifyError(parsedInput.error);
+		throw new Error(`invalid input. ${errors.join(", ")}`);
+	}
+	const parsedUrls = urlConfigSchema.safeParse({
+		sdkServerUrl: process.env.SDK_SERVER_URL,
+		appServerUrl: process.env.APP_SERVER_URL,
+		appUrl: process.env.APP_URL
+	});
+	if (!parsedUrls.success) {
+		const { errors } = z$1.treeifyError(parsedUrls.error);
+		throw new Error(`invalid urls. ${errors.join(", ")}`);
+	}
 	return {
 		__tf__tag__name__: TF_CONFIG_TAG_NAME,
-		...toolForgeConfigSchema.parse(input)
+		...parsedInput.data,
+		...parsedUrls.data
 	};
 }
 

package/dist/{config-schema-V_1JIDL9.js → config-schema-D6ZIesbW.js}

@@ -1,15 +1,18 @@
 import * as z$1 from "zod";
 
 //#region src/config/config-schema.ts
-const toolForgeConfigSchema = z$1.object({
+const urlConfigSchema = z$1.object({
+	sdkServerUrl: z$1.url().describe("URL of the Tool Forge SDK server").optional().default("https://sdk.tool-forge.ai"),
+	appServerUrl: z$1.url().optional().describe("URL of the Tool Forge application server").default("https://api.tool-forge.ai"),
+	appUrl: z$1.url().optional().describe("URL of the Tool Forge application").default("https://app.tool-forge.ai")
+});
+const baseConfigSchema = z$1.object({
 	toolsDir: z$1.string().describe("Directory where the tools are located").optional().default("tools"),
 	apiKey: z$1.string().describe("API key for authenticating with the Tool Forge platform").refine((val) => val.startsWith("sk_live") || val.startsWith("pk_test"), { message: "API key must start with sk_live, pk_test" }).describe("API key for authenticating with the Tool Forge platform.").optional(),
-	sdkServer: z$1.url().describe("URL of the Tool Forge SDK server").optional().default("https://sdk.tool-forge.ai"),
-	appServerUrl: z$1.url().optional().describe("URL of the Tool Forge application server").default("https://api.tool-forge.ai"),
-	appUrl: z$1.url().optional().describe("URL of the Tool Forge application").default("https://app.tool-forge.ai"),
 	maxRetries: z$1.number().optional().default(100)
 });
 const TF_CONFIG_TAG_NAME = Symbol("TOOL_FORGE_CONFIG");
+const toolForgeConfigSchema = baseConfigSchema.and(urlConfigSchema).and(z$1.object({ __tf__tag__name__: z$1.symbol(TF_CONFIG_TAG_NAME.description) }));
 
 //#endregion
-export { toolForgeConfigSchema as n, TF_CONFIG_TAG_NAME as t };
+export { urlConfigSchema as i, baseConfigSchema as n, toolForgeConfigSchema as r, TF_CONFIG_TAG_NAME as t };

package/package.json

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