openhome-cli 0.1.12 → 0.1.14

package/dist/cli.js

@@ -855,7 +855,44 @@ async function resolveAbilityDir(pathArg) {
   return resolve(pathInput.trim());
 }
 async function deployCommand(pathArg, opts = {}) {
-  p.intro("\u{1F680} Deploy ability");
+  p.intro("\u{1F680} Upload Ability");
+  if (pathArg && pathArg.endsWith(".zip") && existsSync2(resolve(pathArg))) {
+    await deployZip(resolve(pathArg), opts);
+    return;
+  }
+  if (!pathArg) {
+    const mode = await p.select({
+      message: "What do you want to upload?",
+      options: [
+        {
+          value: "zip",
+          label: "\u{1F4E6}  Upload a zip file",
+          hint: "I already have a .zip ready"
+        },
+        {
+          value: "folder",
+          label: "\u{1F4C1}  Upload from a folder",
+          hint: "Point me to an ability directory"
+        }
+      ]
+    });
+    handleCancel(mode);
+    if (mode === "zip") {
+      const zipInput = await p.text({
+        message: "Path to your zip file",
+        placeholder: "./my-ability.zip",
+        validate: (val) => {
+          if (!val || !val.trim()) return "Path is required";
+          const resolved = resolve(val.trim());
+          if (!existsSync2(resolved)) return `File not found: ${val.trim()}`;
+          if (!resolved.endsWith(".zip")) return "Must be a .zip file";
+        }
+      });
+      handleCancel(zipInput);
+      await deployZip(resolve(zipInput.trim()), opts);
+      return;
+    }
+  }
   const targetDir = await resolveAbilityDir(pathArg);
   const s = p.spinner();
   s.start("Validating ability...");
@@ -1059,8 +1096,9 @@ async function deployCommand(pathArg, opts = {}) {
     p.outro("Mock deploy complete.");
     return;
   }
-  const apiKey = getApiKey();
-  if (!apiKey) {
+  const apiKey = getApiKey() ?? "";
+  const jwt = getJwt() ?? void 0;
+  if (!apiKey && !jwt) {
     error("Not authenticated. Run: openhome login");
     process.exit(1);
   }
@@ -1074,7 +1112,7 @@ async function deployCommand(pathArg, opts = {}) {
   }
   s.start("Uploading ability...");
   try {
-    const client = new ApiClient(apiKey, getConfig().api_base_url);
+    const client = new ApiClient(apiKey, getConfig().api_base_url, jwt);
     const result = await client.uploadAbility(
       zipBuffer,
       imageBuffer,
@@ -1125,6 +1163,119 @@ Or rename it in config.json and redeploy.`
     process.exit(1);
   }
 }
+async function deployZip(zipPath, opts = {}) {
+  const s = p.spinner();
+  const zipName = basename(zipPath, ".zip");
+  const nameInput = await p.text({
+    message: "Ability name (unique, lowercase, hyphens only)",
+    placeholder: zipName.toLowerCase().replace(/[^a-z0-9-]/g, "-"),
+    validate: (val) => {
+      if (!val || !val.trim()) return "Name is required";
+      if (!/^[a-z0-9-]+$/.test(val.trim()))
+        return "Lowercase letters, numbers, and hyphens only";
+    }
+  });
+  handleCancel(nameInput);
+  const descInput = await p.text({
+    message: "Description",
+    placeholder: "What does this ability do?",
+    validate: (val) => {
+      if (!val || !val.trim()) return "Description is required";
+    }
+  });
+  handleCancel(descInput);
+  const catChoice = await p.select({
+    message: "Category",
+    options: [
+      { value: "skill", label: "Skill", hint: "User-triggered" },
+      { value: "brain", label: "Brain Skill", hint: "Auto-triggered" },
+      {
+        value: "daemon",
+        label: "Background Daemon",
+        hint: "Runs continuously"
+      }
+    ]
+  });
+  handleCancel(catChoice);
+  const hotwordsInput = await p.text({
+    message: "Trigger words (comma-separated)",
+    placeholder: "hey openhome, start ability",
+    validate: (val) => {
+      if (!val || !val.trim()) return "At least one trigger word is required";
+    }
+  });
+  handleCancel(hotwordsInput);
+  const name = nameInput.trim();
+  const description = descInput.trim();
+  const category = catChoice;
+  const hotwords = hotwordsInput.split(",").map((w) => w.trim()).filter(Boolean);
+  const personalityId = opts.personality ?? getConfig().default_personality_id;
+  const metadata = {
+    name,
+    description,
+    category,
+    matching_hotwords: hotwords,
+    personality_id: personalityId
+  };
+  const zipBuffer = readFileSync2(zipPath);
+  if (opts.dryRun) {
+    p.note(
+      [
+        `Zip:         ${zipPath}`,
+        `Name:        ${name}`,
+        `Description: ${description}`,
+        `Category:    ${category}`,
+        `Hotwords:    ${hotwords.join(", ")}`,
+        `Agent:       ${personalityId ?? "(none set)"}`
+      ].join("\n"),
+      "Dry Run \u2014 would deploy"
+    );
+    p.outro("No changes made.");
+    return;
+  }
+  const confirmed = await p.confirm({
+    message: `Deploy "${name}" to OpenHome?`
+  });
+  handleCancel(confirmed);
+  if (!confirmed) {
+    p.cancel("Aborted.");
+    return;
+  }
+  if (opts.mock) {
+    s.start("Uploading (mock)...");
+    const mockClient = new MockApiClient();
+    await mockClient.uploadAbility(zipBuffer, null, null, metadata);
+    s.stop("Mock upload complete.");
+    p.outro("Mock deploy complete.");
+    return;
+  }
+  const apiKey = getApiKey() ?? "";
+  const jwt = getJwt() ?? void 0;
+  if (!apiKey && !jwt) {
+    error("Not authenticated. Run: openhome login");
+    process.exit(1);
+  }
+  s.start("Uploading ability...");
+  try {
+    const client = new ApiClient(apiKey, getConfig().api_base_url, jwt);
+    const result = await client.uploadAbility(zipBuffer, null, null, metadata);
+    s.stop("Upload complete.");
+    p.note(
+      [
+        `Ability ID: ${result.ability_id}`,
+        `Version:    ${result.version}`,
+        `Status:     ${result.status}`,
+        result.message ? `Message:    ${result.message}` : ""
+      ].filter(Boolean).join("\n"),
+      "Deploy Result"
+    );
+    p.outro("Deployed successfully! \u{1F389}");
+  } catch (err) {
+    s.stop("Upload failed.");
+    error(`Deploy failed: ${err instanceof Error ? err.message : String(err)}`);
+    process.exit(1);
+  }
+}
 
 // src/commands/init.ts
 var DAEMON_TEMPLATES = /* @__PURE__ */ new Set(["background", "alarm"]);
@@ -3300,10 +3451,15 @@ async function interactiveMenu() {
     const choice = await p.select({
       message: "What would you like to do?",
       options: [
+        {
+          value: "deploy",
+          label: "\u2B06\uFE0F   Upload Ability",
+          hint: "Upload a zip file to OpenHome"
+        },
         {
           value: "init",
-          label: "\u2728  Create Ability",
-          hint: "Scaffold and deploy a new ability"
+          label: "\u2728  Scaffold Ability",
+          hint: "Generate a new ability from a template"
         },
         {
           value: "list",
@@ -3350,6 +3506,9 @@ async function interactiveMenu() {
     });
     handleCancel(choice);
     switch (choice) {
+      case "deploy":
+        await deployCommand();
+        break;
       case "init":
         await initCommand();
         break;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "openhome-cli",
-  "version": "0.1.12",
+  "version": "0.1.14",
   "description": "CLI for managing OpenHome voice AI abilities",
   "type": "module",
   "bin": {

package/src/cli.ts

@@ -108,10 +108,15 @@ async function interactiveMenu(): Promise<void> {
     const choice = await p.select({
       message: "What would you like to do?",
       options: [
+        {
+          value: "deploy",
+          label: "⬆️   Upload Ability",
+          hint: "Upload a zip file to OpenHome",
+        },
         {
           value: "init",
-          label: "✨  Create Ability",
-          hint: "Scaffold and deploy a new ability",
+          label: "✨  Scaffold Ability",
+          hint: "Generate a new ability from a template",
         },
         {
           value: "list",
@@ -159,6 +164,9 @@ async function interactiveMenu(): Promise<void> {
     handleCancel(choice);
 
     switch (choice) {
+      case "deploy":
+        await deployCommand();
+        break;
       case "init":
         await initCommand();
         break;

package/src/commands/deploy.ts

@@ -11,7 +11,12 @@ import { validateAbility } from "../validation/validator.js";
 import { createAbilityZip } from "../util/zip.js";
 import { ApiClient, NotImplementedError } from "../api/client.js";
 import { MockApiClient } from "../api/mock-client.js";
-import { getApiKey, getConfig, getTrackedAbilities } from "../config/store.js";
+import {
+  getApiKey,
+  getConfig,
+  getJwt,
+  getTrackedAbilities,
+} from "../config/store.js";
 import type {
   AbilityCategory,
   UploadAbilityMetadata,
@@ -115,7 +120,50 @@ export async function deployCommand(
   pathArg?: string,
   opts: { dryRun?: boolean; mock?: boolean; personality?: string } = {},
 ): Promise<void> {
-  p.intro("🚀 Deploy ability");
+  p.intro("🚀 Upload Ability");
+
+  // Explicit zip file passed
+  if (pathArg && pathArg.endsWith(".zip") && existsSync(resolve(pathArg))) {
+    await deployZip(resolve(pathArg), opts);
+    return;
+  }
+
+  // No arg — ask whether they have a zip or a folder
+  if (!pathArg) {
+    const mode = await p.select({
+      message: "What do you want to upload?",
+      options: [
+        {
+          value: "zip",
+          label: "📦  Upload a zip file",
+          hint: "I already have a .zip ready",
+        },
+        {
+          value: "folder",
+          label: "📁  Upload from a folder",
+          hint: "Point me to an ability directory",
+        },
+      ],
+    });
+    handleCancel(mode);
+
+    if (mode === "zip") {
+      const zipInput = await p.text({
+        message: "Path to your zip file",
+        placeholder: "./my-ability.zip",
+        validate: (val) => {
+          if (!val || !val.trim()) return "Path is required";
+          const resolved = resolve(val.trim());
+          if (!existsSync(resolved)) return `File not found: ${val.trim()}`;
+          if (!resolved.endsWith(".zip")) return "Must be a .zip file";
+        },
+      });
+      handleCancel(zipInput);
+      await deployZip(resolve((zipInput as string).trim()), opts);
+      return;
+    }
+  }
+
   const targetDir = await resolveAbilityDir(pathArg);
 
   // Step 1: Validate
@@ -352,8 +400,9 @@ export async function deployCommand(
     return;
   }
 
-  const apiKey = getApiKey();
-  if (!apiKey) {
+  const apiKey = getApiKey() ?? "";
+  const jwt = getJwt() ?? undefined;
+  if (!apiKey && !jwt) {
     error("Not authenticated. Run: openhome login");
     process.exit(1);
   }
@@ -371,7 +420,7 @@ export async function deployCommand(
 
   s.start("Uploading ability...");
   try {
-    const client = new ApiClient(apiKey, getConfig().api_base_url);
+    const client = new ApiClient(apiKey, getConfig().api_base_url, jwt);
     const result = await client.uploadAbility(
       zipBuffer,
       imageBuffer,
@@ -428,3 +477,139 @@ export async function deployCommand(
     process.exit(1);
   }
 }
+
+async function deployZip(
+  zipPath: string,
+  opts: { dryRun?: boolean; mock?: boolean; personality?: string } = {},
+): Promise<void> {
+  const s = p.spinner();
+  const zipName = basename(zipPath, ".zip");
+
+  // Prompt for required metadata
+  const nameInput = await p.text({
+    message: "Ability name (unique, lowercase, hyphens only)",
+    placeholder: zipName.toLowerCase().replace(/[^a-z0-9-]/g, "-"),
+    validate: (val) => {
+      if (!val || !val.trim()) return "Name is required";
+      if (!/^[a-z0-9-]+$/.test(val.trim()))
+        return "Lowercase letters, numbers, and hyphens only";
+    },
+  });
+  handleCancel(nameInput);
+
+  const descInput = await p.text({
+    message: "Description",
+    placeholder: "What does this ability do?",
+    validate: (val) => {
+      if (!val || !val.trim()) return "Description is required";
+    },
+  });
+  handleCancel(descInput);
+
+  const catChoice = await p.select({
+    message: "Category",
+    options: [
+      { value: "skill", label: "Skill", hint: "User-triggered" },
+      { value: "brain", label: "Brain Skill", hint: "Auto-triggered" },
+      {
+        value: "daemon",
+        label: "Background Daemon",
+        hint: "Runs continuously",
+      },
+    ],
+  });
+  handleCancel(catChoice);
+
+  const hotwordsInput = await p.text({
+    message: "Trigger words (comma-separated)",
+    placeholder: "hey openhome, start ability",
+    validate: (val) => {
+      if (!val || !val.trim()) return "At least one trigger word is required";
+    },
+  });
+  handleCancel(hotwordsInput);
+
+  const name = (nameInput as string).trim();
+  const description = (descInput as string).trim();
+  const category = catChoice as AbilityCategory;
+  const hotwords = (hotwordsInput as string)
+    .split(",")
+    .map((w) => w.trim())
+    .filter(Boolean);
+
+  const personalityId = opts.personality ?? getConfig().default_personality_id;
+
+  const metadata: UploadAbilityMetadata = {
+    name,
+    description,
+    category,
+    matching_hotwords: hotwords,
+    personality_id: personalityId,
+  };
+
+  const zipBuffer = readFileSync(zipPath);
+
+  if (opts.dryRun) {
+    p.note(
+      [
+        `Zip:         ${zipPath}`,
+        `Name:        ${name}`,
+        `Description: ${description}`,
+        `Category:    ${category}`,
+        `Hotwords:    ${hotwords.join(", ")}`,
+        `Agent:       ${personalityId ?? "(none set)"}`,
+      ].join("\n"),
+      "Dry Run — would deploy",
+    );
+    p.outro("No changes made.");
+    return;
+  }
+
+  const confirmed = await p.confirm({
+    message: `Deploy "${name}" to OpenHome?`,
+  });
+  handleCancel(confirmed);
+  if (!confirmed) {
+    p.cancel("Aborted.");
+    return;
+  }
+
+  if (opts.mock) {
+    s.start("Uploading (mock)...");
+    const mockClient = new MockApiClient();
+    await mockClient.uploadAbility(zipBuffer, null, null, metadata);
+    s.stop("Mock upload complete.");
+    p.outro("Mock deploy complete.");
+    return;
+  }
+
+  const apiKey = getApiKey() ?? "";
+  const jwt = getJwt() ?? undefined;
+  if (!apiKey && !jwt) {
+    error("Not authenticated. Run: openhome login");
+    process.exit(1);
+  }
+
+  s.start("Uploading ability...");
+  try {
+    const client = new ApiClient(apiKey, getConfig().api_base_url, jwt);
+    const result = await client.uploadAbility(zipBuffer, null, null, metadata);
+    s.stop("Upload complete.");
+    p.note(
+      [
+        `Ability ID: ${result.ability_id}`,
+        `Version:    ${result.version}`,
+        `Status:     ${result.status}`,
+        result.message ? `Message:    ${result.message}` : "",
+      ]
+        .filter(Boolean)
+        .join("\n"),
+      "Deploy Result",
+    );
+    p.outro("Deployed successfully! 🎉");
+  } catch (err) {
+    s.stop("Upload failed.");
+    error(`Deploy failed: ${err instanceof Error ? err.message : String(err)}`);
+    process.exit(1);
+  }
+}