@toolforge-js/sdk 0.8.5 → 0.8.6

package/dist/cli/index.js

@@ -1,5 +1,5 @@
 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 { a as sdkServerUrlSchema, n as appServerUrlSchema, o as toolForgeConfigSchema, r as appUrlSchema } from "../config-schema-Bb9oY-Ku.js";
 import { createReadStream, readFileSync } from "node:fs";
 import * as path from "node:path";
 import { EventEmitter } from "node:events";
@@ -3514,7 +3514,8 @@ async function deploy(configRelPath, debug) {
 	});
 	const envSpinner = prompts.spinner();
 	envSpinner.start("Fetching production environments...");
-	const { environments } = await fetch(new URL("/api/cli/production-environments", config.appServerUrl), { headers: { "x-tf-token": key } }).then(async (res) => {
+	const appServerUrl = appServerUrlSchema.parse(process.env.APP_SERVER_URL);
+	const { environments } = await fetch(new URL("/api/cli/production-environments", appServerUrl), { headers: { "x-tf-token": key } }).then(async (res) => {
 		if (!res.ok) throw new Error(`Failed to fetch production environments: ${res.status} ${res.statusText}`);
 		const data = z$1.object({ environments: z$1.object({
 			id: z$1.string(),
@@ -3574,7 +3575,7 @@ async function deploy(configRelPath, debug) {
 	formData.append("environmentId", environmentSelect);
 	formData.append("sha256", sha256);
 	formData.append("name", name);
-	const { url } = await fetch(new URL("/api/cli/initialize-deployment", config.appServerUrl), {
+	const { url } = await fetch(new URL("/api/cli/initialize-deployment", appServerUrl), {
 		method: "POST",
 		headers: { "x-tf-token": key },
 		body: formData
@@ -3595,21 +3596,21 @@ async function deploy(configRelPath, debug) {
 		prompts.outro(getErrorMessage(error));
 		process.exit(1);
 	});
-	const deploymentUrl = new URL(url, config.appUrl).toString();
+	const appUrl = appUrlSchema.parse(process.env.APP_URL);
+	const deploymentUrl = new URL(url, appUrl).toString();
 	prompts.outro(`Deployment initiated successfully!\n\nYou can view the deployment status at:\n${picocolors.green(deploymentUrl)}`);
 }
 
 //#endregion
 //#region src/cli/actions/login.ts
-async function login(configRelPath) {
+async function login() {
 	prompts.intro("Logging in to Tool Forge");
 	const spinner = prompts.spinner();
 	spinner.start("Loading configuration...");
 	try {
-		const { config } = await getToolForgeConfig(configRelPath);
 		spinner.stop("Configuration loaded.");
 		const authClient = createAuthClient({
-			baseURL: config.appServerUrl,
+			baseURL: appServerUrlSchema.parse(process.env.APP_SERVER_URL),
 			plugins: [deviceAuthorizationClient()]
 		});
 		const deviceLabel = getDeviceLabel();
@@ -3622,7 +3623,8 @@ async function login(configRelPath) {
 			prompts.outro(`failed to initiate device authorization flow: ${error.error_description}`);
 			process.exit(1);
 		}
-		const verificationUrl = new URL("/cli/login", config.appUrl);
+		const appUrl = appUrlSchema.parse(process.env.APP_URL);
+		const verificationUrl = new URL("/cli/login", appUrl);
 		verificationUrl.searchParams.set("deviceLabel", deviceLabel);
 		verificationUrl.searchParams.set("userCode", deviceCodeData.user_code);
 		prompts.note(`To authenticate, please visit:\n${verificationUrl.toString()}\n\n🔐 And enter the code: ${deviceCodeData.user_code}`, "Login Instructions");
@@ -4284,7 +4286,7 @@ async function startToolForge({ configRelPath, debug, mode }) {
 		const { config, configPath } = await getToolForgeConfig(configRelPath);
 		spinner.stop();
 		logger.debug({ config }, "loaded config from %s", configPath);
-		const sdkServerUrl = z$1.url().parse(process.env.SDK_SERVER_URL);
+		const sdkServerUrl = sdkServerUrlSchema.parse(process.env.SDK_SERVER_URL);
 		let apiKey;
 		if (config.apiKey) apiKey = config.apiKey;
 		else {
@@ -4359,8 +4361,8 @@ program.command("build").description("build the tools for production").option("-
 	const debug = z$1.boolean().optional().default(false).parse(this.opts().debug);
 	await build(z$1.string().parse(this.opts().config), debug);
 });
-program.command("login").description("login to Tool Forge").option("-c, --config <path>", "path to the tool-forge config file", (val) => z$1.string().parse(val), "toolforge.config.ts").action(async function() {
-	await login(z$1.string().parse(this.opts().config));
+program.command("login").description("login to Tool Forge").action(async function() {
+	await login();
 });
 program.command("deploy").description("deploy the tools to Tool Forge").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() {
 	await deploy(z$1.string().parse(this.opts().config), z$1.boolean().optional().default(false).parse(this.opts().debug));

package/dist/config/index.d.ts

@@ -15,9 +15,6 @@ type ToolForgeConfig = {
  * @param config - The configuration object for Tool Forge SDK.
  */
 declare function defineConfig(input: ToolForgeConfig): {
-  sdkServerUrl: string;
-  appServerUrl: string;
-  appUrl: string;
   toolsDir: string;
   maxRetries: number;
   apiKey?: string | undefined;

package/dist/config/index.js

@@ -1,4 +1,4 @@
-import { i as urlConfigSchema, n as baseConfigSchema, t as TF_CONFIG_TAG_NAME } from "../config-schema-D6ZIesbW.js";
+import { i as baseConfigSchema, t as TF_CONFIG_TAG_NAME } from "../config-schema-Bb9oY-Ku.js";
 import * as z$1 from "zod";
 
 //#region src/config/index.ts
@@ -13,19 +13,9 @@ function defineConfig(input) {
 		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,
-		...parsedInput.data,
-		...parsedUrls.data
+		...parsedInput.data
 	};
 }
 

package/dist/config-schema-Bb9oY-Ku.js

@@ -0,0 +1,16 @@
+import * as z$1 from "zod";
+
+//#region src/config/config-schema.ts
+const sdkServerUrlSchema = z$1.url().describe("URL of the Tool Forge SDK server").optional().default("https://sdk.tool-forge.ai");
+const appServerUrlSchema = z$1.url().optional().describe("URL of the Tool Forge application server").default("https://api.tool-forge.ai");
+const appUrlSchema = 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(),
+	maxRetries: z$1.number().optional().default(100)
+});
+const TF_CONFIG_TAG_NAME = Symbol("TOOL_FORGE_CONFIG");
+const toolForgeConfigSchema = baseConfigSchema.and(z$1.object({ __tf__tag__name__: z$1.symbol(TF_CONFIG_TAG_NAME.description) }));
+
+//#endregion
+export { sdkServerUrlSchema as a, baseConfigSchema as i, appServerUrlSchema as n, toolForgeConfigSchema as o, appUrlSchema as r, TF_CONFIG_TAG_NAME as t };

package/package.json

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

package/dist/config-schema-D6ZIesbW.js

@@ -1,18 +0,0 @@
-import * as z$1 from "zod";
-
-//#region src/config/config-schema.ts
-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(),
-	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 { urlConfigSchema as i, baseConfigSchema as n, toolForgeConfigSchema as r, TF_CONFIG_TAG_NAME as t };