@forgehive/forge-cli 0.3.14 → 0.3.15

package/dist/tasks/task/invoke.d.ts

@@ -7,10 +7,10 @@ export declare const invoke: import("@forgehive/task").TaskInstanceType<(argv: {
     loadConf: (args: {}) => Promise<Promise<ForgeConf>>;
     loadCurrentProfile: (args: {}) => Promise<Promise<Profile>>;
     parseJSON: (jsonString: string) => Promise<unknown>;
-    invokeTask: (projectUuid: string, profile: Profile, taskName: string, payload: unknown) => Promise<InvokeResult | null>;
+    invokeTask: (projectUuid: string, taskUuid: string, profile: Profile, taskName: string, payload: unknown) => Promise<InvokeResult | null>;
 }>) => Promise<unknown>, {
     loadConf: (args: {}) => Promise<Promise<ForgeConf>>;
     loadCurrentProfile: (args: {}) => Promise<Promise<Profile>>;
     parseJSON: (jsonString: string) => Promise<unknown>;
-    invokeTask: (projectUuid: string, profile: Profile, taskName: string, payload: unknown) => Promise<InvokeResult | null>;
+    invokeTask: (projectUuid: string, taskUuid: string, profile: Profile, taskName: string, payload: unknown) => Promise<InvokeResult | null>;
 }>;

package/dist/tasks/task/invoke.js

@@ -26,17 +26,17 @@ const boundaries = {
             throw new Error(`Invalid JSON: ${error instanceof Error ? error.message : 'Unknown error'}`);
         }
     },
-    invokeTask: async (projectUuid, profile, taskName, payload) => {
+    invokeTask: async (projectUuid, taskUuid, profile, taskName, payload) => {
         const client = (0, hive_sdk_1.createHiveClient)({
             projectUuid,
             apiKey: profile.apiKey,
             apiSecret: profile.apiSecret,
             host: profile.url
         });
-        console.log(`Invoking task: ${taskName}`);
+        console.log(`Invoking task: ${taskName} (${taskUuid})`);
         console.log('Payload:', payload);
         console.log(`Using profile: ${profile.name} (${profile.url})`);
-        return await client.invoke(taskName, payload);
+        return await client.invoke(taskUuid, payload);
     }
 };
 exports.invoke = (0, task_1.createTask)({
@@ -51,10 +51,13 @@ exports.invoke = (0, task_1.createTask)({
         if (taskDescriptor === undefined) {
             throw new Error(`Task "${descriptorName}" is not defined in forge.json`);
         }
-        // Check for project UUID
+        // Check for required UUIDs
         if (!forge.project.uuid) {
             throw new Error('Project UUID is not defined in forge.json. Please ensure your project has a UUID.');
         }
+        if (!taskDescriptor.uuid) {
+            throw new Error(`Task "${descriptorName}" does not have a UUID in forge.json. Please ensure your task has a UUID.`);
+        }
         // Load profile (required for invoke)
         let profile;
         try {
@@ -66,7 +69,7 @@ exports.invoke = (0, task_1.createTask)({
         // Parse the JSON payload
         const payload = await parseJSON(json);
         // Invoke the task using the boundary
-        const result = await invokeTask(forge.project.uuid, profile, descriptorName, payload);
+        const result = await invokeTask(forge.project.uuid, taskDescriptor.uuid, profile, descriptorName, payload);
         if ((0, hive_sdk_1.isInvokeError)(result)) {
             throw new Error(`Task invocation failed: ${result.error}`);
         }

package/dist/tasks/task/publish.d.ts

@@ -47,7 +47,7 @@ export declare const publish: import("@forgehive/task").TaskInstanceType<(argv:
     }>>;
     readFileUtf8: (filePath: string) => Promise<string>;
     readFileBinary: (filePath: string) => Promise<Buffer>;
-    publishTask: (data: Record<string, unknown>, profile: Profile) => Promise<{
+    publishTask: (projectUuid: string, taskUuid: string, data: Record<string, unknown>, profile: Profile) => Promise<{
         bundleUploadUrl?: string;
     }>;
     uploadBundleWithPresignedUrl: (presignedUrl: string, bundleContent: Buffer) => Promise<boolean>;
@@ -101,7 +101,7 @@ export declare const publish: import("@forgehive/task").TaskInstanceType<(argv:
     }>>;
     readFileUtf8: (filePath: string) => Promise<string>;
     readFileBinary: (filePath: string) => Promise<Buffer>;
-    publishTask: (data: Record<string, unknown>, profile: Profile) => Promise<{
+    publishTask: (projectUuid: string, taskUuid: string, data: Record<string, unknown>, profile: Profile) => Promise<{
         bundleUploadUrl?: string;
     }>;
     uploadBundleWithPresignedUrl: (presignedUrl: string, bundleContent: Buffer) => Promise<boolean>;

package/dist/tasks/task/publish.js

@@ -38,8 +38,8 @@ const boundaries = {
     readFileBinary: async (filePath) => {
         return promises_1.default.readFile(filePath);
     },
-    publishTask: async (data, profile) => {
-        const publishUrl = `${profile.url}/api/tasks/publish`;
+    publishTask: async (projectUuid, taskUuid, data, profile) => {
+        const publishUrl = `${profile.url}/api/projects/${projectUuid}/tasks/${taskUuid}/publish`;
         const authToken = `${profile.apiKey}:${profile.apiSecret}`;
         try {
             const response = await axios_1.default.post(publishUrl, data, {
@@ -91,6 +91,13 @@ exports.publish = (0, task_1.createTask)({
         if (taskDescriptor === undefined) {
             throw new Error('Task is not defined on forge.json');
         }
+        // Check for required UUIDs
+        if (!forgeJson.project.uuid) {
+            throw new Error('Project UUID is not defined in forge.json. Please ensure your project has a UUID.');
+        }
+        if (!taskDescriptor.uuid) {
+            throw new Error(`Task "${descriptorName}" does not have a UUID in forge.json. Please ensure your task has a UUID.`);
+        }
         const entryPoint = path_1.default.join(cwd, taskDescriptor.path);
         const buildsPath = await ensureBuildsFolder();
         const outputFile = path_1.default.join(buildsPath, `${descriptorName}.js`);
@@ -158,7 +165,7 @@ exports.publish = (0, task_1.createTask)({
         };
         // Publish metadata to hive api server
         console.log(`Publishing metadata and source code to ${profile.url}...`);
-        const publishResponse = await publishTask(data, profile);
+        const publishResponse = await publishTask(forgeJson.project.uuid, taskDescriptor.uuid, data, profile);
         // Upload zipped bundle using the presigned URL
         if (publishResponse.bundleUploadUrl) {
             console.log('Uploading zipped bundle...');

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@forgehive/forge-cli",
-  "version": "0.3.14",
+  "version": "0.3.15",
   "description": "TypeScript CLI application",
   "license": "MIT",
   "main": "dist/index.js",
@@ -10,7 +10,7 @@
   "publishConfig": {
     "access": "public",
     "dependencies": {
-      "@forgehive/hive-sdk": "^0.1.4",
+      "@forgehive/hive-sdk": "^0.1.5",
       "@forgehive/record-tape": "^0.2.6",
       "@forgehive/runner": "^0.2.6",
       "@forgehive/schema": "^0.1.4",
@@ -30,11 +30,11 @@
     "minimist": "^1.2.8",
     "typescript": "^5.3.3",
     "uuid": "^11.1.0",
-    "@forgehive/record-tape": "0.2.6",
-    "@forgehive/hive-sdk": "0.1.4",
     "@forgehive/schema": "0.1.4",
-    "@forgehive/runner": "0.2.6",
-    "@forgehive/task": "0.2.6"
+    "@forgehive/task": "0.2.6",
+    "@forgehive/hive-sdk": "0.1.5",
+    "@forgehive/record-tape": "0.2.6",
+    "@forgehive/runner": "0.2.6"
   },
   "devDependencies": {
     "@types/archiver": "^6.0.3",

package/src/tasks/task/invoke.ts

@@ -30,6 +30,7 @@ const boundaries = {
   },
   invokeTask: async (
     projectUuid: string,
+    taskUuid: string,
     profile: Profile,
     taskName: string,
     payload: unknown
@@ -41,11 +42,11 @@ const boundaries = {
       host: profile.url
     })
 
-    console.log(`Invoking task: ${taskName}`)
+    console.log(`Invoking task: ${taskName} (${taskUuid})`)
     console.log('Payload:', payload)
     console.log(`Using profile: ${profile.name} (${profile.url})`)
 
-    return await client.invoke(taskName, payload)
+    return await client.invoke(taskUuid, payload)
   }
 }
 
@@ -63,11 +64,15 @@ export const invoke = createTask({
       throw new Error(`Task "${descriptorName}" is not defined in forge.json`)
     }
 
-    // Check for project UUID
+    // Check for required UUIDs
     if (!forge.project.uuid) {
       throw new Error('Project UUID is not defined in forge.json. Please ensure your project has a UUID.')
     }
 
+    if (!taskDescriptor.uuid) {
+      throw new Error(`Task "${descriptorName}" does not have a UUID in forge.json. Please ensure your task has a UUID.`)
+    }
+
     // Load profile (required for invoke)
     let profile: Profile
     try {
@@ -80,7 +85,7 @@ export const invoke = createTask({
     const payload = await parseJSON(json)
 
     // Invoke the task using the boundary
-    const result = await invokeTask(forge.project.uuid, profile, descriptorName, payload)
+    const result = await invokeTask(forge.project.uuid, taskDescriptor.uuid, profile, descriptorName, payload)
 
     if (isInvokeError(result)) {
       throw new Error(`Task invocation failed: ${result.error}`)

package/src/tasks/task/publish.ts

@@ -39,8 +39,13 @@ const boundaries = {
   readFileBinary: async (filePath: string): Promise<Buffer> => {
     return fs.readFile(filePath)
   },
-  publishTask: async (data: Record<string, unknown>, profile: Profile): Promise<{ bundleUploadUrl?: string }> => {
-    const publishUrl = `${profile.url}/api/tasks/publish`
+  publishTask: async (
+    projectUuid: string,
+    taskUuid: string,
+    data: Record<string, unknown>,
+    profile: Profile
+  ): Promise<{ bundleUploadUrl?: string }> => {
+    const publishUrl = `${profile.url}/api/projects/${projectUuid}/tasks/${taskUuid}/publish`
     const authToken = `${profile.apiKey}:${profile.apiSecret}`
 
     try {
@@ -112,6 +117,15 @@ export const publish = createTask({
       throw new Error('Task is not defined on forge.json')
     }
 
+    // Check for required UUIDs
+    if (!forgeJson.project.uuid) {
+      throw new Error('Project UUID is not defined in forge.json. Please ensure your project has a UUID.')
+    }
+
+    if (!taskDescriptor.uuid) {
+      throw new Error(`Task "${descriptorName}" does not have a UUID in forge.json. Please ensure your task has a UUID.`)
+    }
+
     const entryPoint = path.join(cwd, taskDescriptor.path)
     const buildsPath = await ensureBuildsFolder()
     const outputFile = path.join(buildsPath, `${descriptorName}.js`)
@@ -190,7 +204,7 @@ export const publish = createTask({
 
     // Publish metadata to hive api server
     console.log(`Publishing metadata and source code to ${profile.url}...`)
-    const publishResponse = await publishTask(data, profile)
+    const publishResponse = await publishTask(forgeJson.project.uuid, taskDescriptor.uuid, data, profile)
 
     // Upload zipped bundle using the presigned URL
     if (publishResponse.bundleUploadUrl) {