wispy-cli 2.3.0 → 2.3.1

package/core/migrate.mjs

@@ -71,6 +71,7 @@ export class OpenClawMigrator {
       await this._migrateWorkspaceFiles(dryRun);
       await this._migrateCronJobs(dryRun);
       await this._migrateChannels(dryRun);
+      await this._migrateApiKeys(dryRun);
     }
 
     return {
@@ -274,9 +275,11 @@ export class OpenClawMigrator {
         } catch { /* empty */ }
 
         // Extract Telegram config
-        const telegramToken = config.telegram?.token
+        const telegramToken = config.channels?.telegram?.botToken
+          ?? config.telegram?.token
           ?? config.channels?.telegram?.token
-          ?? config.plugins?.telegram?.token;
+          ?? config.plugins?.telegram?.token
+          ?? config.plugins?.entries?.telegram?.config?.botToken;
 
         if (telegramToken && !wispyChannels.telegram) {
           wispyChannels.telegram = { token: telegramToken };
@@ -302,6 +305,83 @@ export class OpenClawMigrator {
     }
   }
 
+  // ── API keys migration ───────────────────────────────────────────────────────
+
+  async _migrateApiKeys(dryRun) {
+    // Read API keys from environment (same as OpenClaw uses)
+    const keyMap = {
+      google:    { env: ["GOOGLE_AI_KEY", "GOOGLE_GENERATIVE_AI_KEY", "GEMINI_API_KEY"], model: "gemini-2.5-flash" },
+      anthropic: { env: ["ANTHROPIC_API_KEY"], model: "claude-sonnet-4-20250514" },
+      openai:    { env: ["OPENAI_API_KEY"], model: "gpt-4o" },
+      groq:      { env: ["GROQ_API_KEY"], model: "llama-3.3-70b-versatile" },
+      deepseek:  { env: ["DEEPSEEK_API_KEY"], model: "deepseek-chat" },
+      openrouter:{ env: ["OPENROUTER_API_KEY"], model: "anthropic/claude-sonnet-4-20250514" },
+    };
+
+    // Also check macOS keychain
+    const { execSync } = await import("node:child_process");
+    function keychainGet(service, account) {
+      try {
+        return execSync(`security find-generic-password -s "${service}" -a "${account}" -w 2>/dev/null`, { encoding: "utf8" }).trim();
+      } catch { return null; }
+    }
+
+    const keychainMap = {
+      google:    { service: "google-ai-key", account: "poropo" },
+      anthropic: { service: "anthropic-api-key", account: "poropo" },
+      openai:    { service: "openai-api-key", account: "poropo" },
+    };
+
+    const configPath = join(this.wispyDir, "config.json");
+    let config = {};
+    try { config = JSON.parse(await readFile(configPath, "utf8")); } catch { /* empty */ }
+    if (!config.providers) config.providers = {};
+
+    let found = 0;
+    for (const [provider, info] of Object.entries(keyMap)) {
+      if (config.providers[provider]?.apiKey) continue; // already configured
+
+      // Check env vars
+      let key = null;
+      for (const envName of info.env) {
+        if (process.env[envName]) { key = process.env[envName]; break; }
+      }
+
+      // Check keychain (macOS)
+      if (!key && keychainMap[provider]) {
+        key = keychainGet(keychainMap[provider].service, keychainMap[provider].account);
+      }
+
+      // Check ~/.zshenv for exports
+      if (!key) {
+        try {
+          const zshenv = await readFile(join(homedir(), ".zshenv"), "utf8");
+          for (const envName of info.env) {
+            const match = zshenv.match(new RegExp(`export\\s+${envName}=["']?([^"'\\n]+)`));
+            if (match) { key = match[1]; break; }
+          }
+        } catch { /* no zshenv */ }
+      }
+
+      if (key) {
+        found++;
+        this.report.apiKeys = this.report.apiKeys || [];
+        this.report.apiKeys.push({ provider, masked: key.slice(0, 6) + "..." + key.slice(-4) });
+
+        if (!dryRun) {
+          config.providers[provider] = { apiKey: key, model: info.model };
+          if (!config.defaultProvider) config.defaultProvider = provider;
+        }
+      }
+    }
+
+    if (found > 0 && !dryRun) {
+      config.onboarded = true;
+      await mkdir(this.wispyDir, { recursive: true });
+      await writeFile(configPath, JSON.stringify(config, null, 2) + "\n", "utf8");
+    }
+  }
+
   // ── Report formatting ─────────────────────────────────────────────────────────
 
   formatReport() {
@@ -345,6 +425,13 @@ export class OpenClawMigrator {
       }
     }
 
+    if (r.apiKeys?.length > 0) {
+      lines.push(`🔑 API Keys (${r.apiKeys.length}):`);
+      for (const k of r.apiKeys) {
+        lines.push(`  import: ${k.provider} (${k.masked})`);
+      }
+    }
+
     if (r.errors.length > 0) {
       lines.push(`⚠️ Errors (${r.errors.length}):`);
       for (const e of r.errors) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "wispy-cli",
-  "version": "2.3.0",
+  "version": "2.3.1",
   "description": "🌿 Wispy — AI workspace assistant with trustworthy execution (harness, receipts, approvals, diffs)",
   "license": "MIT",
   "author": "Minseo & Poropo",