feat: add execute command for function execution with streaming options

* feat: add req subcommands for managing requirements.txt

* bump: version 2.1.9

* fix: address codex review comments (flag consistency, regex-based pkg parsing, error handling)

---------

Co-authored-by: Luna <clawy@reversed.dev>

OpenclawSkill.md

@@ -33,6 +33,8 @@ this will check the health, and if not setup, it will prompt you to set up the C
 - `shsf get namespace <id>`: Get details of a specific namespace by its ID
 - `shsf get trigger <functionId> <triggerId>`: Get details of a specific trigger from a function.
 
+- `shsf execute --id <id> [--payload <json>] [--no-stream]`: Execute a function and stream the output (debug/internal).
+
 - `shsf storage create --name <name> --purpose <purpose>`: Create a new storage.
 - `shsf storage delete --name <name>`: Delete a storage.
 - `shsf storage list`: List all storages.
@@ -45,14 +47,17 @@ this will check the health, and if not setup, it will prompt you to set up the C
 - `shsf update namespace <id>`: Update a specific namespace by its ID. (use `shsf update namespace -h` first)
 - `shsf update trigger <functionId> <triggerId>`: Update a specific trigger from a function. (use `shsf update trigger -h` first)
 
-- `shsf file create`: Create a file in a storage. (use `shsf file create -h` first)
-- `shsf file overwrite`: Overwrite an existing file in a storage. (use `shsf file overwrite -h` first)
-- `shsf file delete`: Delete a file from a storage. (use `shsf file delete -h` first)
-- `shsf file list`: List files in a storage. (use `shsf file list -h` first)
+- `shsf file create`: Create/update a file in a function. (use `shsf file create -h` first)
+- `shsf file list`: List files in a function. (use `shsf file list -h` first)
+- `shsf file rename`: Rename a file in a function. (use `shsf file rename -h` first)
+- `shsf file delete`: Delete a file from a function. (use `shsf file delete -h` first)
 
 - `shsf remote pull --id <id> --into <path> [--force]`: Pull files from a function into a local directory.
 - `shsf remote push --id <id> --from <path> [--force]`: Push files from a local directory to a function.
 
+- `shsf req add <package> --id <functionid>`: Add a package to the requirements.txt of a function.
+- `shsf req remove <package> --id <functionid>`: Remove a package from the requirements.txt of a function.
+
 ## Instructions
 Use these commands for when you need to interact with shsf from the command line. Its faster than using the ui for almost all ops.
 

package.json

@@ -1,6 +1,6 @@
 {
   "name": "shsf-cli",
-  "version": "2.1.8",
+  "version": "2.2.2",
   "description": "",
   "type": "module",
   "files": [

src/commands/file/create.ts

@@ -4,10 +4,10 @@ import { getApiClient } from "../../api.js";
 
 export const fileCreateDefinition = {
   name: "create",
-  description: "Create a file in a storage.",
+  description: "Create or update a file in a function.",
   options: [
-    { name: "--storage-id <id>", description: "Storage ID", required: true },
-    { name: "--path <path>", description: "Remote file path", required: true },
+    { name: "--function-id <id>", description: "Function ID", required: true },
+    { name: "--filename <name>", description: "Remote filename", required: true },
     { name: "--content <content>", description: "Inline file content" },
     { name: "--source <source>", description: "Local source file path" },
   ],
@@ -34,16 +34,16 @@ export const fileCreateDefinition = {
 
     const client = await getApiClient();
     const payload = {
-      path: options.path,
-      content,
+      filename: options.filename,
+      code: content,
     };
 
     try {
-      const response = await client.post(`/api/storage/${options.storageId}/files`, payload);
+      const response = await client.put(`/api/function/${options.functionId}/file`, payload);
 
       if (response.status === 200 || response.status === 201) {
         console.log(
-          `${chalk.green("✓")} File ${chalk.cyan(options.path)} created successfully in storage ${chalk.cyan(options.storageId)}.`,
+          `${chalk.green("✓")} File ${chalk.cyan(options.filename)} created/updated successfully in function ${chalk.cyan(options.functionId)}.`,
         );
       } else {
         console.log(`${chalk.yellow("!")} Unexpected response from server: ${response.status}`);
@@ -51,7 +51,7 @@ export const fileCreateDefinition = {
     } catch (error: any) {
       if (error.response) {
         console.error(
-          `${chalk.red("✗")} Failed to create file: ${chalk.yellow(error.response.data?.message || "Unknown error")}`,
+          `${chalk.red("✗")} Failed to create/update file: ${chalk.yellow(error.response.data?.message || "Unknown error")}`,
         );
       } else if (error.request) {
         console.error(`${chalk.red("✗")} No response received from server.`);

src/commands/file/delete.ts

@@ -3,22 +3,20 @@ import { getApiClient } from "../../api.js";
 
 export const fileDeleteDefinition = {
   name: "delete",
-  description: "Delete a file from a storage.",
+  description: "Delete a file from a function.",
   options: [
-    { name: "--storage-id <id>", description: "Storage ID", required: true },
-    { name: "--path <path>", description: "Remote file path", required: true },
+    { name: "--function-id <id>", description: "Function ID", required: true },
+    { name: "--file-id <id>", description: "File ID (from 'file list')", required: true },
   ],
   action: async (options: any) => {
     const client = await getApiClient();
 
     try {
-      const response = await client.delete(`/api/storage/${options.storageId}/files`, {
-        data: { path: options.path },
-      });
+      const response = await client.delete(`/api/function/${options.functionId}/file/${options.fileId}`);
 
       if (response.status === 200) {
         console.log(
-          `${chalk.green("✓")} File ${chalk.cyan(options.path)} deleted from storage ${chalk.cyan(options.storageId)}.`,
+          `${chalk.green("✓")} File ${chalk.cyan(options.fileId)} deleted from function ${chalk.cyan(options.functionId)}.`,
         );
       } else {
         console.log(`${chalk.yellow("!")} Unexpected response from server: ${response.status}`);
@@ -26,7 +24,7 @@ export const fileDeleteDefinition = {
     } catch (error: any) {
       if (error.response) {
         if (error.response.status === 404) {
-          console.error(`${chalk.red("✗")} File ${chalk.yellow(options.path)} not found.`);
+          console.error(`${chalk.red("✗")} File or Function not found.`);
         } else {
           console.error(
             `${chalk.red("✗")} Failed to delete file: ${chalk.yellow(error.response.data?.message || "Unknown error")}`,

src/commands/file/list.ts

@@ -3,18 +3,15 @@ import { getApiClient } from "../../api.js";
 
 export const fileListDefinition = {
   name: "list",
-  description: "List files in a storage.",
+  description: "List files in a function.",
   options: [
-    { name: "--storage-id <id>", description: "Storage ID", required: true },
-    { name: "--prefix <prefix>", description: "Optional path prefix filter" },
+    { name: "--function-id <id>", description: "Function ID", required: true },
   ],
   action: async (options: any) => {
     const client = await getApiClient();
 
     try {
-      const response = await client.get(`/api/storage/${options.storageId}/files`, {
-        params: options.prefix ? { prefix: options.prefix } : undefined,
-      });
+      const response = await client.get(`/api/function/${options.functionId}/files`);
 
       if (response.status === 200 && response.data.data) {
         const files = response.data.data;
@@ -25,9 +22,9 @@ export const fileListDefinition = {
         }
 
         console.log(chalk.blue("Files:"));
+        console.log(chalk.gray(`${"ID".padEnd(25)} ${"Filename"}`));
         files.forEach((file: any) => {
-          const path = file.path || file.name || "(unknown)";
-          console.log(`- ${chalk.cyan(path)}`);
+          console.log(`${chalk.cyan(file.id.padEnd(25))} ${chalk.white(file.filename)}`);
         });
         console.log(`\n${chalk.green("✓")} Found ${chalk.bgGreen.black(` ${files.length} `)} files.`);
       } else {

src/commands/file/overwrite.ts

@@ -1,67 +0,0 @@
-import chalk from "chalk";
-import fs from "fs/promises";
-import { getApiClient } from "../../api.js";
-
-export const fileOverwriteDefinition = {
-  name: "overwrite",
-  description: "Overwrite an existing file in a storage.",
-  options: [
-    { name: "--storage-id <id>", description: "Storage ID", required: true },
-    { name: "--path <path>", description: "Remote file path", required: true },
-    { name: "--content <content>", description: "Inline file content" },
-    { name: "--source <source>", description: "Local source file path" },
-  ],
-  action: async (options: any) => {
-    if (!options.content && !options.source) {
-      console.error(`${chalk.red("✗")} You must provide either --content or --source.`);
-      return;
-    }
-
-    if (options.content && options.source) {
-      console.error(`${chalk.red("✗")} Please provide only one of --content or --source.`);
-      return;
-    }
-
-    let content = options.content;
-    if (options.source) {
-      try {
-        content = await fs.readFile(options.source, "utf8");
-      } catch (error: any) {
-        console.error(`${chalk.red("✗")} Failed to read source file: ${chalk.yellow(error.message)}`);
-        return;
-      }
-    }
-
-    const client = await getApiClient();
-    const payload = {
-      path: options.path,
-      content,
-    };
-
-    try {
-      const response = await client.put(`/api/storage/${options.storageId}/files`, payload);
-
-      if (response.status === 200) {
-        console.log(
-          `${chalk.green("✓")} File ${chalk.cyan(options.path)} overwritten successfully in storage ${chalk.cyan(options.storageId)}.`,
-        );
-      } else {
-        console.log(`${chalk.yellow("!")} Unexpected response from server: ${response.status}`);
-      }
-    } catch (error: any) {
-      if (error.response) {
-        if (error.response.status === 404) {
-          console.error(`${chalk.red("✗")} File ${chalk.yellow(options.path)} not found.`);
-        } else {
-          console.error(
-            `${chalk.red("✗")} Failed to overwrite file: ${chalk.yellow(error.response.data?.message || "Unknown error")}`,
-          );
-        }
-      } else if (error.request) {
-        console.error(`${chalk.red("✗")} No response received from server.`);
-      } else {
-        console.error(`${chalk.red("✗")} Error: ${error.message}`);
-      }
-    }
-  },
-};

src/commands/file/rename.ts

@@ -0,0 +1,39 @@
+import chalk from "chalk";
+import { getApiClient } from "../../api.js";
+
+export const fileRenameDefinition = {
+  name: "rename",
+  description: "Rename a file in a function.",
+  options: [
+    { name: "--function-id <id>", description: "Function ID", required: true },
+    { name: "--file-id <id>", description: "File ID", required: true },
+    { name: "--new-filename <name>", description: "New filename", required: true },
+  ],
+  action: async (options: any) => {
+    const client = await getApiClient();
+
+    try {
+      const response = await client.patch(`/api/function/${options.functionId}/file/${options.fileId}/rename`, {
+        newFilename: options.newFilename,
+      });
+
+      if (response.status === 200) {
+        console.log(
+          `${chalk.green("✓")} File ${chalk.cyan(options.fileId)} renamed to ${chalk.cyan(options.newFilename)} successfully.`,
+        );
+      } else {
+        console.log(`${chalk.yellow("!")} Unexpected response from server: ${response.status}`);
+      }
+    } catch (error: any) {
+      if (error.response) {
+        console.error(
+          `${chalk.red("✗")} Failed to rename file: ${chalk.yellow(error.response.data?.message || "Unknown error")}`,
+        );
+      } else if (error.request) {
+        console.error(`${chalk.red("✗")} No response received from server.`);
+      } else {
+        console.error(`${chalk.red("✗")} Error: ${error.message}`);
+      }
+    }
+  },
+};

src/commands/function/execute.ts

@@ -0,0 +1,152 @@
+import chalk from "chalk";
+import { getApiClient } from "../../api.js";
+import { AxiosResponse } from "axios";
+
+export const functionExecuteDefinition = {
+  name: "execute",
+  description: "Execute a function and stream the output (debug/internal).",
+  options: [
+    { name: "--id <id>", description: "Function ID", required: true },
+    { name: "--payload <json>", description: "JSON payload for execution", required: false },
+    { name: "--no-stream", description: "Disable streaming and get final result only", required: false, default: false },
+  ],
+  action: async (options: any) => {
+    const client = await getApiClient();
+    
+    // Explicitly check for noStream from commander
+    // Commander uses camelsCase for options, so --no-stream becomes stream: false
+    // but we use --no-stream which commander natively handles as a boolean toggle
+    const useStream = options.stream !== false;
+
+    let payload = {};
+    if (options.payload) {
+      try {
+        payload = JSON.parse(options.payload);
+      } catch (error: any) {
+        console.error(`${chalk.red("✗")} Invalid JSON payload: ${chalk.yellow(error.message)}`);
+        return;
+      }
+    }
+
+    const handleJsonChunk = (chunk: string) => {
+      const trimmed = chunk.trim();
+      if (!trimmed) return;
+
+      try {
+        const obj = JSON.parse(trimmed);
+        if (obj.type === "output" && obj.content) {
+          process.stdout.write(obj.content);
+        } else if (obj.type === "end") {
+          if (obj.exitCode !== 0 && obj.exitCode !== undefined) {
+            console.error(`\n${chalk.red("✗")} Execution failed with exit code ${obj.exitCode}`);
+          } else {
+            console.log(`\n${chalk.green("✓")} Execution completed.`);
+          }
+          if (obj.result !== undefined) {
+            console.log(chalk.blue("Result:"), typeof obj.result === 'object' ? JSON.stringify(obj.result, null, 2) : obj.result);
+          }
+          if (obj.took) {
+            const total = obj.took.find((t: any) => t.description === "Total");
+            if (total) {
+              console.log(chalk.gray(`Total time: ${total.value}s`));
+            }
+          }
+        }
+      } catch (e) {
+        // If it's not JSON, it might be raw output from a non-stream response 
+        // that got into the stream handler mistakenly or just raw noise
+        if (trimmed.length > 0) {
+          process.stdout.write(chunk);
+        }
+      // Not a full JSON object yet or invalid JSON
+      }
+    };
+
+    console.log(`${chalk.blue("ℹ")} Executing function ${chalk.cyan(options.id)} (stream: ${useStream})...`);
+
+    try {
+      const response = await client.post(`/api/function/${options.id}/execute`, 
+        { run: payload },
+        { 
+          params: { stream: useStream ? "true" : "false" },
+          responseType: useStream ? "stream" : "json"
+        }
+      );
+
+      if (useStream) {
+        const stream = (response as AxiosResponse).data;
+        let buffer = "";
+        
+        return new Promise<void>((resolve, reject) => {
+          stream.on("data", (chunk: any) => {
+            const str = chunk.toString();
+            buffer += str;
+            
+            // Try to split by potential JSON boundaries
+            // Matches cases like ...}{...
+            const pattern = /\}\s*\{/g;
+            let lastIndex = 0;
+            let match;
+
+            while ((match = pattern.exec(buffer)) !== null) {
+              const part = buffer.slice(lastIndex, match.index + 1);
+              handleJsonChunk(part);
+              lastIndex = match.index + match[0].indexOf('{');
+            }
+
+            buffer = buffer.slice(lastIndex);
+
+            // Attempt to parse the remaining buffer if it looks like a complete object
+            try {
+              if (buffer.trim().startsWith('{') && buffer.trim().endsWith('}')) {
+                handleJsonChunk(buffer);
+                buffer = "";
+              }
+            } catch (e) {
+              // Wait for more data
+            }
+          });
+
+          stream.on("end", () => {
+            if (buffer.trim()) {
+              handleJsonChunk(buffer);
+            }
+            resolve();
+          });
+
+          stream.on("error", (err: Error) => {
+            console.error(`\n${chalk.red("✗")} Stream error: ${err.message}`);
+            reject(err);
+          });
+        });
+      } else {
+        // Non-stream returns just the output content or the body
+        const result = response.data;
+        if (typeof result === 'string') {
+          process.stdout.write(result);
+        } else if (result && result.data && typeof result.data === 'string') {
+          process.stdout.write(result.data);
+        } else if (result && typeof result.output === 'string') {
+          process.stdout.write(result.output);
+        } else if (result && typeof result.result === 'string') {
+          process.stdout.write(result.result);
+        } else if (result && result.data && result.data.output) {
+          process.stdout.write(result.data.output);
+        } else {
+          process.stdout.write(JSON.stringify(result, null, 2));
+        }
+        console.log(`\n${chalk.green("✓")} Execution completed.`);
+      }
+    } catch (error: any) {
+      if (error.response) {
+        console.error(
+          `${chalk.red("✗")} Execution failed: ${chalk.yellow(error.response.data?.message || error.response.statusText || "Unknown error")}`,
+        );
+      } else if (error.request) {
+        console.error(`${chalk.red("✗")} No response received from server.`);
+      } else {
+        console.error(`${chalk.red("✗")} Error: ${error.message}`);
+      }
+    }
+  },
+};

src/commands/req/add.ts

@@ -0,0 +1,91 @@
+import chalk from "chalk";
+import { getApiClient } from "../../api.js";
+
+interface ShsfFile {
+  name: string;
+  content: string;
+}
+
+export const reqAddDefinition = {
+  name: "add <package>",
+  description: "Add a package to the requirements.txt of a function.",
+  options: [
+    { name: "--to <id>", description: "The ID of the function (deprecated alias for --id)." },
+    { name: "--id <id>", description: "The ID of the function.", required: true },
+  ],
+  action: async (pkg: string, options: { to?: string; id?: string }) => {
+    const functionId = options.id ?? options.to;
+    if (!functionId) {
+      console.error(`${chalk.red("✗")} Error: Function ID is required. Use ${chalk.cyan("--id <id>")}.`);
+      return;
+    }
+    const client = await getApiClient();
+
+    try {
+      // 1. Get current files of the function
+      const response = await client.get(`/api/function/${functionId}/files`);
+      let files: ShsfFile[] = response.data.data;
+      if (!Array.isArray(files)) files = [];
+
+      let requirementsFile = files.find(f => f.name === "requirements.txt");
+      let content = requirementsFile ? requirementsFile.content : "";
+
+      // 2. Add the package
+      const lines = content.split("\n");
+      
+      // Robust package name extraction
+      const getPkgName = (line: string) => {
+        const withoutComment = line.trim().split("#", 1)[0];
+        const basePart = withoutComment.split(";", 1)[0].trim();
+        if (!basePart) return null;
+        return basePart.split(/[!=>~<]/)[0].trim().toLowerCase();
+      };
+
+      const pkgToAddName = getPkgName(pkg);
+      if (!pkgToAddName) {
+        console.error(`${chalk.red("✗")} Invalid package format.`);
+        return;
+      }
+
+      const exists = lines.some(line => {
+        const lineName = getPkgName(line);
+        return lineName === pkgToAddName;
+      });
+
+      if (exists) {
+        console.log(`${chalk.yellow("!")} Package ${chalk.cyan(pkgToAddName)} is already in requirements.txt.`);
+        return;
+      }
+
+      // Preserve existing content structure
+      if (content && !content.endsWith("\n")) {
+        content += "\n";
+      }
+      content += pkg + "\n";
+
+      // 3. Overwrite/Create requirements.txt using function-based API
+      await client.put(`/api/function/${functionId}/file`, {
+        filename: "requirements.txt",
+        code: content,
+      });
+
+      console.log(`${chalk.green("✓")} Added ${chalk.cyan(pkg)} to requirements.txt for function ${chalk.yellow(functionId)}.`);
+    } catch (error: any) {
+      handleError(error, "add package");
+    }
+  },
+};
+
+function handleError(error: any, task: string) {
+  if (error.response) {
+    console.error(`${chalk.red("✗")} Failed to ${task}: ${chalk.yellow(error.response.data?.message || (error.response.data ? JSON.stringify(error.response.data) : error.message))}`);
+  } else if (error.request) {
+    console.error(
+      `${chalk.red("✗")} Failed to ${task}: ${chalk.yellow(
+        "No response received from server. Please check your network connection and try again."
+      )}`
+    );
+  } else {
+    console.error(`${chalk.red("✗")} Error: ${error.message}`);
+  }
+}

src/commands/req/remove.ts

@@ -0,0 +1,97 @@
+import chalk from "chalk";
+import { getApiClient } from "../../api.js";
+
+interface ShsfFile {
+  name: string;
+  content: string;
+}
+
+export const reqRemoveDefinition = {
+  name: "remove <package>",
+  description: "Remove a package from the requirements.txt of a function.",
+  options: [
+    { name: "--from <id>", description: "The ID of the function (deprecated alias for --id)." },
+    { name: "--id <id>", description: "The ID of the function.", required: true },
+  ],
+  action: async (pkgToRemove: string, options: { from?: string; id?: string }) => {
+    const functionId = options.id ?? options.from;
+    if (!functionId) {
+      console.error(`${chalk.red("✗")} Error: Function ID is required. Use ${chalk.cyan("--id <id>")}.`);
+      return;
+    }
+    const client = await getApiClient();
+
+    try {
+      // 1. Get current files of the function
+      const response = await client.get(`/api/function/${functionId}/files`);
+      let files: ShsfFile[] = response.data.data;
+      if (!Array.isArray(files)) files = [];
+
+      const requirementsFile = files.find(f => f.name === "requirements.txt");
+      if (!requirementsFile) {
+        console.log(`${chalk.yellow("!")} No requirements.txt found for function ${chalk.yellow(functionId)}.`);
+        return;
+      }
+
+      const content = requirementsFile.content;
+      const lines = content.split("\n");
+      
+      const targetPkgName = pkgToRemove.trim().toLowerCase();
+      let removed = false;
+      
+      const newLines = lines.filter(line => {
+        const trimmedLine = line.trim();
+        // Preserve empty/whitespace-only lines
+        if (!trimmedLine) return true;
+        
+        // Strip inline comments and environment markers for matching purposes
+        const withoutComment = trimmedLine.split("#", 1)[0];
+        const basePart = withoutComment.split(";", 1)[0].trim();
+
+        // If there's no actual requirement (e.g., comment-only line), keep the line
+        if (!basePart) return true;
+
+        // Robust extraction (handles != <= >= ~= == and < >)
+        const currentPkgName = basePart.split(/[!=>~<]/)[0].trim().toLowerCase();
+        
+        if (currentPkgName === targetPkgName) {
+          removed = true;
+          return false;
+        }
+
+        return true;
+      });
+
+      if (!removed) {
+        console.log(`${chalk.yellow("!")} Package ${chalk.cyan(pkgToRemove)} was not found in requirements.txt.`);
+        return;
+      }
+
+      const newContent = newLines.join("\n");
+
+      // 2. Overwrite requirements.txt using function-based API
+      await client.put(`/api/function/${functionId}/file`, {
+        filename: "requirements.txt",
+        code: newContent,
+      });
+
+      console.log(`${chalk.green("✓")} Removed ${chalk.cyan(pkgToRemove)} from requirements.txt for function ${chalk.yellow(functionId)}.`);
+    } catch (error: any) {
+      handleError(error, "remove package");
+    }
+  },
+};
+
+function handleError(error: any, task: string) {
+  if (error.response) {
+    console.error(`${chalk.red("✗")} Failed to ${task}: ${chalk.yellow(error.response.data?.message || (error.response.data ? JSON.stringify(error.response.data) : error.message))}`);
+  } else if (error.request) {
+    console.error(
+      `${chalk.red("✗")} Failed to ${task}: ${chalk.yellow(
+        "No response received from server. Please check your network connection and try again."
+      )}`
+    );
+  } else {
+    console.error(`${chalk.red("✗")} Error: ${error.message}`);
+  }
+}