openhome-cli 0.1.0 → 0.1.2

package/dist/{store-DR7EKQ5T.js → store-USDMWKXY.js}

@@ -1,16 +1,20 @@
 import {
   getApiKey,
   getConfig,
+  getJwt,
   getTrackedAbilities,
   registerAbility,
   saveApiKey,
-  saveConfig
-} from "./chunk-Q4UKUXDB.js";
+  saveConfig,
+  saveJwt
+} from "./chunk-OAKGNZQM.js";
 export {
   getApiKey,
   getConfig,
+  getJwt,
   getTrackedAbilities,
   registerAbility,
   saveApiKey,
-  saveConfig
+  saveConfig,
+  saveJwt
 };

package/package.json

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

package/src/api/client.ts

@@ -10,6 +10,8 @@ import type {
   DeleteCapabilityResponse,
   ToggleCapabilityResponse,
   AssignCapabilitiesResponse,
+  InstalledCapability,
+  AbilitySummaryWithExtras,
 } from "./contracts.js";
 import { API_BASE, ENDPOINTS } from "./endpoints.js";
 
@@ -59,6 +61,7 @@ export class ApiClient implements IApiClient {
   constructor(
     private readonly apiKey: string,
     baseUrl?: string,
+    private readonly jwt?: string,
   ) {
     this.baseUrl = baseUrl ?? API_BASE;
     if (!this.baseUrl.startsWith("https://")) {
@@ -69,33 +72,42 @@ export class ApiClient implements IApiClient {
   private async request<T>(
     path: string,
     options: RequestInit = {},
+    useJwt = false,
   ): Promise<T> {
+    const token = useJwt ? this.jwt : this.apiKey;
     const url = `${this.baseUrl}${path}`;
     const response = await fetch(url, {
       ...options,
       headers: {
-        Authorization: `Bearer ${this.apiKey}`,
+        Authorization: `Bearer ${token}`,
         ...(options.headers ?? {}),
       },
     });
 
     if (!response.ok) {
-      let body: ApiErrorResponse | null = null;
+      if (response.status === 404) {
+        throw new NotImplementedError(path);
+      }
+
+      let body: Record<string, unknown> | null = null;
       try {
-        body = (await response.json()) as ApiErrorResponse;
+        body = (await response.json()) as Record<string, unknown>;
       } catch {
         // ignore parse errors
       }
 
-      if (body?.error?.code === "NOT_IMPLEMENTED" || response.status === 404) {
+      if (
+        (body as ApiErrorResponse | null)?.error?.code === "NOT_IMPLEMENTED"
+      ) {
         throw new NotImplementedError(path);
       }
 
-      throw new ApiError(
-        body?.error?.code ?? String(response.status),
-        body?.error?.message ?? response.statusText,
-        body?.error?.details,
-      );
+      const message =
+        (body?.detail as string) ??
+        (body as ApiErrorResponse | null)?.error?.message ??
+        response.statusText;
+
+      throw new ApiError(String(response.status), message);
     }
 
     return response.json() as Promise<T>;
@@ -154,15 +166,38 @@ export class ApiClient implements IApiClient {
   }
 
   async listAbilities(): Promise<ListAbilitiesResponse> {
-    return this.request<ListAbilitiesResponse>(ENDPOINTS.listCapabilities, {
-      method: "GET",
-    });
+    const data = await this.request<InstalledCapability[]>(
+      ENDPOINTS.listCapabilities,
+      { method: "GET" },
+      true, // uses JWT
+    );
+    // Normalise to AbilitySummary shape
+    return {
+      abilities: data.map((c) => ({
+        ability_id: String(c.id),
+        unique_name: c.name,
+        display_name: c.name,
+        version: 1,
+        status: c.enabled ? "active" : "disabled",
+        personality_ids: [],
+        created_at: c.last_updated ?? new Date().toISOString(),
+        updated_at: c.last_updated ?? new Date().toISOString(),
+        trigger_words: c.trigger_words,
+        category: c.category,
+      })),
+    };
   }
 
   async getAbility(id: string): Promise<GetAbilityResponse> {
-    return this.request<GetAbilityResponse>(ENDPOINTS.getCapability(id), {
-      method: "GET",
-    });
+    // No single-get endpoint — fetch all and filter
+    const { abilities } = await this.listAbilities();
+    const found = abilities.find(
+      (a) => a.ability_id === id || a.unique_name === id,
+    );
+    if (!found) {
+      throw new ApiError("404", `Ability "${id}" not found.`);
+    }
+    return { ...found, validation_errors: [], deploy_history: [] };
   }
 
   async verifyApiKey(apiKey: string): Promise<VerifyApiKeyResponse> {
@@ -205,13 +240,26 @@ export class ApiClient implements IApiClient {
     id: string,
     enabled: boolean,
   ): Promise<ToggleCapabilityResponse> {
+    // Fetch current state first so we can PUT back the full object
+    const { abilities } = await this.listAbilities();
+    const current = abilities.find((a) => a.ability_id === id);
+    if (!current) {
+      throw new ApiError("404", `Ability "${id}" not found.`);
+    }
     return this.request<ToggleCapabilityResponse>(
       ENDPOINTS.editInstalledCapability(id),
       {
-        method: "POST",
+        method: "PUT",
         headers: { "Content-Type": "application/json" },
-        body: JSON.stringify({ enabled }),
+        body: JSON.stringify({
+          enabled,
+          name: current.unique_name,
+          category: (current as AbilitySummaryWithExtras).category ?? "skill",
+          trigger_words:
+            (current as AbilitySummaryWithExtras).trigger_words ?? [],
+        }),
       },
+      true, // uses JWT
     );
   }
 
@@ -219,13 +267,16 @@ export class ApiClient implements IApiClient {
     personalityId: string,
     capabilityIds: number[],
   ): Promise<AssignCapabilitiesResponse> {
-    return this.request<AssignCapabilitiesResponse>(ENDPOINTS.editPersonality, {
-      method: "POST",
-      headers: { "Content-Type": "application/json" },
-      body: JSON.stringify({
-        personality_id: personalityId,
-        matching_capabilities: capabilityIds,
-      }),
-    });
+    // Uses multipart/form-data — JSON is rejected
+    const form = new FormData();
+    form.append("personality_id", personalityId);
+    for (const capId of capabilityIds) {
+      form.append("matching_capabilities", String(capId));
+    }
+    return this.request<AssignCapabilitiesResponse>(
+      ENDPOINTS.editPersonality,
+      { method: "PUT", body: form },
+      true, // uses JWT
+    );
   }
 }

package/src/api/contracts.ts

@@ -48,6 +48,27 @@ export interface AbilitySummary {
   updated_at: string;
 }
 
+// Extended with fields from the real API
+export interface AbilitySummaryWithExtras extends AbilitySummary {
+  trigger_words?: string[];
+  category?: string;
+}
+
+// Raw shape returned by get-installed-capabilities
+export interface InstalledCapability {
+  id: number;
+  name: string;
+  category: string;
+  enabled: boolean;
+  trigger_words: string[];
+  last_updated?: string;
+  image_file?: string;
+  default?: boolean;
+  system_capability?: boolean;
+  agent_capability?: boolean;
+  shortcut?: boolean;
+}
+
 export interface ListAbilitiesResponse {
   abilities: AbilitySummary[];
 }

package/src/api/endpoints.ts

@@ -6,8 +6,7 @@ export const ENDPOINTS = {
   getPersonalities: "/api/sdk/get_personalities",
   verifyApiKey: "/api/sdk/verify_apikey/",
   uploadCapability: "/api/capabilities/add-capability/",
-  listCapabilities: "/api/capabilities/get-all-capability/",
-  getCapability: (id: string) => `/api/capabilities/get-capability/${id}/`,
+  listCapabilities: "/api/capabilities/get-installed-capabilities/",
   deleteCapability: (id: string) =>
     `/api/capabilities/delete-capability/${id}/`,
   bulkDeleteCapabilities: "/api/capabilities/delete-capability/",

package/src/cli.ts

@@ -18,6 +18,7 @@ import { triggerCommand } from "./commands/trigger.js";
 import { whoamiCommand } from "./commands/whoami.js";
 import { configEditCommand } from "./commands/config-edit.js";
 import { logsCommand } from "./commands/logs.js";
+import { setJwtCommand } from "./commands/set-jwt.js";
 import { p, handleCancel } from "./ui/format.js";
 
 // Read version from package.json
@@ -58,12 +59,7 @@ async function interactiveMenu(): Promise<void> {
         {
           value: "init",
           label: "✨  Create Ability",
-          hint: "Scaffold a new ability from templates",
-        },
-        {
-          value: "deploy",
-          label: "🚀  Deploy",
-          hint: "Upload ability to OpenHome",
+          hint: "Scaffold and deploy a new ability",
         },
         {
           value: "chat",
@@ -134,9 +130,6 @@ async function interactiveMenu(): Promise<void> {
       case "init":
         await initCommand();
         break;
-      case "deploy":
-        await deployCommand();
-        break;
       case "chat":
         await chatCommand();
         break;
@@ -324,6 +317,15 @@ program
     await whoamiCommand();
   });
 
+program
+  .command("set-jwt [token]")
+  .description(
+    "Save a session token to enable management commands (list, delete, toggle, assign)",
+  )
+  .action(async (token?: string) => {
+    await setJwtCommand(token);
+  });
+
 // ── Entry point: menu if no args, subcommand otherwise ───────────
 
 if (process.argv.length <= 2) {

package/src/commands/assign.ts

@@ -1,6 +1,6 @@
 import { ApiClient, NotImplementedError } from "../api/client.js";
 import { MockApiClient } from "../api/mock-client.js";
-import { getApiKey, getConfig } from "../config/store.js";
+import { getApiKey, getConfig, getJwt } from "../config/store.js";
 import { error, success, info, p, handleCancel } from "../ui/format.js";
 import chalk from "chalk";
 
@@ -14,12 +14,19 @@ export async function assignCommand(
   if (opts.mock) {
     client = new MockApiClient();
   } else {
-    const apiKey = getApiKey();
-    if (!apiKey) {
+    const apiKey = getApiKey() ?? "";
+    const jwt = getJwt() ?? undefined;
+    if (!apiKey && !jwt) {
       error("Not authenticated. Run: openhome login");
       process.exit(1);
     }
-    client = new ApiClient(apiKey, getConfig().api_base_url);
+    if (!jwt) {
+      error(
+        "This command requires a session token.\nGet it from app.openhome.com → DevTools → Application → Local Storage → token\nThen run: openhome set-jwt <token>",
+      );
+      process.exit(1);
+    }
+    client = new ApiClient(apiKey, getConfig().api_base_url, jwt);
   }
 
   const s = p.spinner();

package/src/commands/delete.ts

@@ -1,6 +1,6 @@
 import { ApiClient, NotImplementedError } from "../api/client.js";
 import { MockApiClient } from "../api/mock-client.js";
-import { getApiKey, getConfig } from "../config/store.js";
+import { getApiKey, getConfig, getJwt } from "../config/store.js";
 import { error, success, p, handleCancel } from "../ui/format.js";
 import chalk from "chalk";
 
@@ -15,12 +15,19 @@ export async function deleteCommand(
   if (opts.mock) {
     client = new MockApiClient();
   } else {
-    const apiKey = getApiKey();
-    if (!apiKey) {
+    const apiKey = getApiKey() ?? "";
+    const jwt = getJwt() ?? undefined;
+    if (!apiKey && !jwt) {
       error("Not authenticated. Run: openhome login");
       process.exit(1);
     }
-    client = new ApiClient(apiKey, getConfig().api_base_url);
+    if (!jwt) {
+      error(
+        "This command requires a session token.\nGet it from app.openhome.com → DevTools → Application → Local Storage → token\nThen run: openhome set-jwt <token>",
+      );
+      process.exit(1);
+    }
+    client = new ApiClient(apiKey, getConfig().api_base_url, jwt);
   }
 
   // Fetch abilities to let user pick

package/src/commands/init.ts

@@ -10,6 +10,7 @@ import { homedir } from "node:os";
 import { validateAbility } from "../validation/validator.js";
 import { registerAbility } from "../config/store.js";
 import { success, error, warn, info, p, handleCancel } from "../ui/format.js";
+import { deployCommand } from "./deploy.js";
 
 type TemplateType =
   | "basic"
@@ -889,7 +890,18 @@ export async function initCommand(nameArg?: string): Promise<void> {
     warn(`${w.file ? `[${w.file}] ` : ""}${w.message}`);
   }
 
-  p.note(`cd abilities/${name}\nopenhome deploy`, "Next steps");
+  if (result.passed) {
+    const deployNow = await p.confirm({
+      message: "Deploy to OpenHome now?",
+      initialValue: true,
+    });
+    handleCancel(deployNow);
+
+    if (deployNow) {
+      await deployCommand(targetDir);
+      return;
+    }
+  }
 
-  p.outro(`Ability "${name}" is ready!`);
+  p.outro(`Ability "${name}" is ready! Run: openhome deploy`);
 }

package/src/commands/list.ts

@@ -1,6 +1,6 @@
 import { ApiClient, NotImplementedError } from "../api/client.js";
 import { MockApiClient } from "../api/mock-client.js";
-import { getApiKey, getConfig } from "../config/store.js";
+import { getApiKey, getConfig, getJwt } from "../config/store.js";
 import { error, warn, info, table, p } from "../ui/format.js";
 import type { TableRow } from "../ui/format.js";
 import chalk from "chalk";
@@ -30,12 +30,19 @@ export async function listCommand(
   if (opts.mock) {
     client = new MockApiClient();
   } else {
-    const apiKey = getApiKey();
-    if (!apiKey) {
+    const apiKey = getApiKey() ?? "";
+    const jwt = getJwt() ?? undefined;
+    if (!apiKey && !jwt) {
       error("Not authenticated. Run: openhome login");
       process.exit(1);
     }
-    client = new ApiClient(apiKey, getConfig().api_base_url);
+    if (!jwt) {
+      error(
+        "This command requires a session token.\nGet it from app.openhome.com → DevTools → Application → Local Storage → token\nThen run: openhome set-jwt <token>",
+      );
+      process.exit(1);
+    }
+    client = new ApiClient(apiKey, getConfig().api_base_url, jwt);
   }
 
   const s = p.spinner();

package/src/commands/login.ts

@@ -1,6 +1,6 @@
 import { ApiClient } from "../api/client.js";
 import type { Personality } from "../api/contracts.js";
-import { saveApiKey } from "../config/store.js";
+import { saveApiKey, saveJwt } from "../config/store.js";
 import { success, error, info, p, handleCancel } from "../ui/format.js";
 import chalk from "chalk";
 

package/src/commands/set-jwt.ts

@@ -0,0 +1,40 @@
+import { saveJwt } from "../config/store.js";
+import { success, error, p } from "../ui/format.js";
+
+export async function setJwtCommand(token?: string): Promise<void> {
+  p.intro("🔑 Set Session Token");
+
+  let jwt = token;
+
+  if (!jwt) {
+    const input = await p.text({
+      message: "Paste your OpenHome session token",
+      placeholder: "eyJ...",
+      validate: (val) => {
+        if (!val || !val.trim()) return "Token is required";
+        if (!val.trim().startsWith("eyJ"))
+          return "Doesn't look like a JWT — should start with eyJ";
+      },
+    });
+    if (typeof input === "symbol") {
+      p.cancel("Cancelled.");
+      return;
+    }
+    jwt = input;
+  }
+
+  try {
+    saveJwt(jwt.trim());
+    success("Session token saved.");
+    p.note(
+      "Management commands (list, delete, toggle, assign) are now unlocked.",
+      "Token saved",
+    );
+    p.outro("Done.");
+  } catch (err) {
+    error(
+      `Failed to save token: ${err instanceof Error ? err.message : String(err)}`,
+    );
+    process.exit(1);
+  }
+}

package/src/commands/status.ts

@@ -105,12 +105,13 @@ export async function statusCommand(
   if (opts.mock) {
     client = new MockApiClient();
   } else {
-    const apiKey = getApiKey();
-    if (!apiKey) {
+    const apiKey = getApiKey() ?? "";
+    const jwt = getJwt() ?? undefined;
+    if (!apiKey && !jwt) {
       error("Not authenticated. Run: openhome login");
       process.exit(1);
     }
-    client = new ApiClient(apiKey, getConfig().api_base_url);
+    client = new ApiClient(apiKey, getConfig().api_base_url, jwt);
   }
 
   const s = p.spinner();

package/src/commands/toggle.ts

@@ -1,6 +1,6 @@
 import { ApiClient, NotImplementedError } from "../api/client.js";
 import { MockApiClient } from "../api/mock-client.js";
-import { getApiKey, getConfig } from "../config/store.js";
+import { getApiKey, getConfig, getJwt } from "../config/store.js";
 import { error, success, p, handleCancel } from "../ui/format.js";
 import chalk from "chalk";
 
@@ -15,12 +15,19 @@ export async function toggleCommand(
   if (opts.mock) {
     client = new MockApiClient();
   } else {
-    const apiKey = getApiKey();
-    if (!apiKey) {
+    const apiKey = getApiKey() ?? "";
+    const jwt = getJwt() ?? undefined;
+    if (!apiKey && !jwt) {
       error("Not authenticated. Run: openhome login");
       process.exit(1);
     }
-    client = new ApiClient(apiKey, getConfig().api_base_url);
+    if (!jwt) {
+      error(
+        "This command requires a session token.\nGet it from app.openhome.com → DevTools → Application → Local Storage → token\nThen run: openhome set-jwt <token>",
+      );
+      process.exit(1);
+    }
+    client = new ApiClient(apiKey, getConfig().api_base_url, jwt);
   }
 
   // Fetch abilities

package/src/config/store.ts

@@ -19,6 +19,7 @@ export interface CliConfig {
   api_base_url?: string;
   default_personality_id?: string;
   api_key?: string;
+  jwt?: string;
   abilities?: TrackedAbility[];
 }
 
@@ -129,9 +130,18 @@ export function getTrackedAbilities(): TrackedAbility[] {
 export function saveApiKey(key: string): void {
   const saved = keychainSet(key);
   if (!saved) {
-    // Fallback: save in config file (less secure)
     const config = getConfig();
     config.api_key = key;
     saveConfig(config);
   }
 }
+
+export function getJwt(): string | null {
+  return getConfig().jwt ?? null;
+}
+
+export function saveJwt(jwt: string): void {
+  const config = getConfig();
+  config.jwt = jwt;
+  saveConfig(config);
+}