makaron-cli 0.5.3 → 0.6.0

package/README.md

@@ -1,5 +1,7 @@
 # Makaron CLI — Agent Integration Skill
 
+> **makaron.app** is for humans. **makaron-cli** is for AI agents.
+
 Makaron is a multimodal AI creative agent. You talk to it via `makaron chat`, and it produces images, videos, music, and animated designs — all saved to a persistent project.
 
 ## Setup
@@ -7,12 +9,51 @@ Makaron is a multimodal AI creative agent. You talk to it via `makaron chat`, an
 ```bash
 npm install -g makaron-cli
 # or use directly: npx makaron-cli
+```
+
+### Get your API key
+
+**Option A: Human login**
+1. Go to [makaron.app](https://makaron.app) and log in
+2. Open the menu (top-right)
+3. Click **Get API Key**
+4. Copy your `mk_live_...` key
+
+**Option B: Agent Self-Registration (no human required)**
+```bash
+# Step 1: Get challenge
+curl -X POST https://www.makaron.app/api/agent/register
+
+# Step 2: Solve the obfuscated math problem and verify
+curl -X POST https://www.makaron.app/api/agent/register/verify \
+  -H "Content-Type: application/json" \
+  -d '{"challenge_id": "...", "answer": "34.5"}'
+# → { "api_key": "mk_live_...", "credits": 500 }
+```
+
+Discovery endpoint (returns full registration flow + CLI usage as JSON):
+```bash
+curl https://www.makaron.app/api/agent/register
+```
 
+Docs: [makaron.app/agent](https://www.makaron.app/agent)
+
+```bash
 export MAKARON_API_KEY=mk_live_xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
 ```
 
 Verify: `npx makaron-cli list` should show projects.
 
+### Let a human claim your account
+
+After registering, you can generate a link for a human to link your API key to their account:
+```bash
+curl -X POST https://www.makaron.app/api/agent/claim \
+  -H "Authorization: Bearer mk_live_your_key"
+# → { "claim_url": "https://www.makaron.app/claim?token=clm_..." }
+```
+Share the `claim_url` with a human. They log in and the API key gets linked to their account.
+
 ## Core Workflow
 
 ```bash
@@ -181,7 +222,7 @@ type MakaronOutput =
 | Add/remove elements | "add a cat on the table" / "remove background person" |
 | Text-to-image | "generate a cyberpunk cityscape" |
 | Video from image | "create a 5 second video of her walking" |
-| Video with model | "用seedance模型做5秒视频" |
+| Video with model | "use seedance model, make a 5s video" |
 | Background music | "add calm piano music" |
 | Motion design | "create an Instagram story with animated text" |
 | Multi-step | "edit the photo then make a video from it" |
@@ -191,15 +232,15 @@ type MakaronOutput =
 When serving end-users in a chat environment (Feishu, Slack, Discord), use this proactive message pattern:
 
 ```bash
-# 1. Immediately reply to user: "收到，开始做"
-send_message "收到！正在为你制作..."
+# 1. Immediately acknowledge the user
+send_message "Got it! Working on it now..."
 
 # 2. Create project + submit (one command)
 RUN_ID=$(npx makaron-cli chat --project auto --image photo.jpg -b "make it cinematic and create a 5s video")
 
 # 3. Send project link proactively
 PROJECT_URL=$(npx makaron-cli responses get $RUN_ID --pick project_url)
-send_message "项目已创建：$PROJECT_URL"
+send_message "Project created: $PROJECT_URL"
 
 # 4. Watch and send each artifact as it appears
 npx makaron-cli responses watch $RUN_ID --jsonl | while read -r line; do
@@ -215,7 +256,7 @@ npx makaron-cli responses watch $RUN_ID --jsonl | while read -r line; do
     # Video ready — send as media
     send_video "$URL"
   elif [ "$EVENT" = "done" ]; then
-    send_message "全部完成 ✨"
+    send_message "All done!"
   fi
 done
 ```
@@ -223,7 +264,7 @@ done
 **Key principles for service agents:**
 - **Proactive, not reactive**: Don't wait for the full run to finish. Send progress messages and artifacts as they appear.
 - **Media over links**: When possible, send images/videos as native media in the chat (download URL and upload as attachment), not just paste the URL.
-- **Immediate acknowledgment**: Reply "收到" within 1 second of receiving user request. Don't make users wait for project creation.
+- **Immediate acknowledgment**: Reply within 1 second of receiving user request. Don't make users wait for project creation.
 - **Project link early**: Send the project URL right after creation so users can check anytime.
 - **Stream artifacts**: Use `watch --jsonl` to push each artifact the moment it's ready. An image at 15s should reach the user at 15s, not after the video finishes at 5 minutes.
 

package/SKILL.md

@@ -5,10 +5,39 @@ description: Use Makaron CLI to generate AI images, videos, music, and motion de
 
 # Makaron CLI — Agent Integration Skill
 
+> **makaron.app** is for humans. **makaron-cli** is for AI agents.
+
 Makaron is a multimodal AI creative agent. You talk to it via `makaron chat`, and it produces images, videos, music, and animated designs — all saved to a persistent project.
 
 ## Setup
 
+### Get your API key
+
+**Option A: Human login**
+1. Go to [makaron.app](https://makaron.app) and log in
+2. Open the menu (top-right) → **Get API Key**
+3. Copy your `mk_live_...` key
+
+**Option B: Self-Registration (no human required)**
+```bash
+# Step 1: Get challenge
+curl -X POST https://www.makaron.app/api/agent/register
+# → { "challenge_id": "uuid", "challenge": "obfuscated math problem" }
+
+# Step 2: Solve and verify
+curl -X POST https://www.makaron.app/api/agent/register/verify \
+  -H "Content-Type: application/json" \
+  -d '{"challenge_id": "...", "answer": "34.5"}'
+# → { "api_key": "mk_live_...", "credits": 500 }
+
+# Step 3: (Optional) Let a human claim this account
+curl -X POST https://www.makaron.app/api/agent/claim \
+  -H "Authorization: Bearer mk_live_your_key"
+# → { "claim_url": "..." } — share with human to link key to their account
+```
+
+Discovery endpoint: `GET https://www.makaron.app/api/agent/register` — returns full registration flow + CLI usage as JSON.
+
 ```bash
 export MAKARON_API_KEY=mk_live_xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
 ```
@@ -183,7 +212,7 @@ type MakaronOutput =
 | Add/remove elements | "add a cat on the table" / "remove background person" |
 | Text-to-image | "generate a cyberpunk cityscape" |
 | Video from image | "create a 5 second video of her walking" |
-| Video with model | "用seedance模型做5秒视频" |
+| Video with model | "use seedance model, make a 5s video" |
 | Background music | "add calm piano music" |
 | Motion design | "create an Instagram story with animated text" |
 | Multi-step | "edit the photo then make a video from it" |
@@ -193,15 +222,15 @@ type MakaronOutput =
 When serving end-users in a chat environment (Feishu, Slack, Discord), use this proactive message pattern:
 
 ```bash
-# 1. Immediately reply to user: "收到，开始做"
-send_message "收到！正在为你制作..."
+# 1. Immediately acknowledge the user
+send_message "Got it! Working on it now..."
 
 # 2. Create project + submit (one command)
 RUN_ID=$(npx makaron-cli chat --project auto --image photo.jpg -b "make it cinematic and create a 5s video")
 
 # 3. Send project link proactively
 PROJECT_URL=$(npx makaron-cli responses get $RUN_ID --pick project_url)
-send_message "项目已创建：$PROJECT_URL"
+send_message "Project created: $PROJECT_URL"
 
 # 4. Watch and send each artifact as it appears
 npx makaron-cli responses watch $RUN_ID --jsonl | while read -r line; do
@@ -217,7 +246,7 @@ npx makaron-cli responses watch $RUN_ID --jsonl | while read -r line; do
     # Video ready — send as media
     send_video "$URL"
   elif [ "$EVENT" = "done" ]; then
-    send_message "全部完成 ✨"
+    send_message "All done!"
   fi
 done
 ```
@@ -225,7 +254,7 @@ done
 **Key principles for service agents:**
 - **Proactive, not reactive**: Don't wait for the full run to finish. Send progress messages and artifacts as they appear.
 - **Media over links**: When possible, send images/videos as native media in the chat (download URL and upload as attachment), not just paste the URL.
-- **Immediate acknowledgment**: Reply "收到" within 1 second of receiving user request. Don't make users wait for project creation.
+- **Immediate acknowledgment**: Reply within 1 second of receiving user request. Don't make users wait for project creation.
 - **Project link early**: Send the project URL right after creation so users can check anytime.
 - **Stream artifacts**: Use `watch --jsonl` to push each artifact the moment it's ready. An image at 15s should reach the user at 15s, not after the video finishes at 5 minutes.
 

package/bin/makaron.mjs

@@ -98,9 +98,18 @@ function getAuth() {
   }
   const auth = loadAuth();
   if (!auth) {
-    console.error('Not logged in. Set MAKARON_API_KEY or run: npx makaron-cli login');
+    console.error('No API key found. Set MAKARON_API_KEY or run:');
+    console.error('  npx makaron-cli register --json   (agent self-registration)');
+    console.error('  npx makaron-cli login             (human interactive login)');
     process.exit(1);
   }
+  // Registered via `register --verify` (saved as _apiKey)
+  if (auth._apiKey) {
+    return {
+      headers: { 'Authorization': `Bearer ${auth._apiKey}` },
+      baseUrl: process.env.MAKARON_URL || auth._baseUrl || BASE_URL,
+    };
+  }
   return {
     headers: { 'Cookie': buildCookie(auth) },
     baseUrl: process.env.MAKARON_URL || auth._baseUrl || BASE_URL,
@@ -1026,11 +1035,98 @@ if (command === 'login') {
   admin set-admin <email>              Grant admin access to a user
 `);
   }
+} else if (command === 'register') {
+  const baseUrl = process.env.MAKARON_URL || DEFAULT_URL;
+  const isVerify = args.includes('--verify');
+
+  if (isVerify) {
+    let challengeId = null, answer = null;
+    for (let i = 1; i < args.length; i++) {
+      if (args[i] === '--challenge-id' && args[i + 1]) challengeId = args[++i];
+      else if (args[i] === '--answer' && args[i + 1]) answer = args[++i];
+    }
+    if (!challengeId || !answer) {
+      console.error('Usage: makaron register --verify --challenge-id <id> --answer <number>');
+      process.exit(1);
+    }
+    const res = await fetch(`${baseUrl}/api/agent/register/verify`, {
+      method: 'POST',
+      headers: { 'Content-Type': 'application/json' },
+      body: JSON.stringify({ challenge_id: challengeId, answer }),
+    });
+    const data = await res.json();
+    if (!res.ok) {
+      console.error(`Registration failed: ${data.error || data.message || res.status}`);
+      process.exit(1);
+    }
+    // Save key to auth file
+    saveAuth({ _apiKey: data.api_key, _baseUrl: baseUrl });
+    // Request claim URL
+    let claimUrl = null;
+    try {
+      const claimRes = await fetch(`${baseUrl}/api/agent/claim`, {
+        method: 'POST',
+        headers: { 'Authorization': `Bearer ${data.api_key}`, 'Content-Type': 'application/json' },
+      });
+      const claimData = await claimRes.json();
+      if (claimRes.ok) claimUrl = claimData.claim_url;
+    } catch { /* non-fatal */ }
+    const result = { api_key: data.api_key, credits: data.credits, claim_url: claimUrl };
+    console.log(JSON.stringify(result));
+    console.error(`✅ Registered! Key saved to ${AUTH_FILE}`);
+    if (claimUrl) console.error(`🔗 Claim URL (share with human): ${claimUrl}`);
+  } else {
+    // Check if already has a key
+    const existingKey = process.env.MAKARON_API_KEY;
+    const existingAuth = loadAuth();
+    if (existingKey) {
+      console.error(`Already have API key: ${existingKey.slice(0, 16)}...`);
+      process.exit(0);
+    }
+    if (existingAuth?._apiKey) {
+      console.error(`Already registered: ${existingAuth._apiKey.slice(0, 16)}...`);
+      process.exit(0);
+    }
+    // Request challenge
+    const res = await fetch(`${baseUrl}/api/agent/register`, {
+      method: 'POST',
+      headers: { 'Content-Type': 'application/json' },
+      body: '{}',
+    });
+    const data = await res.json();
+    if (!res.ok) {
+      console.error(`Registration failed: ${data.error || data.message || res.status}`);
+      process.exit(1);
+    }
+    if (args.includes('--json')) {
+      console.log(JSON.stringify(data));
+    } else {
+      console.log(JSON.stringify(data));
+      console.error(`\nChallenge received. Solve and run:`);
+      console.error(`  npx makaron-cli register --verify --challenge-id ${data.challenge_id} --answer <your_answer>`);
+    }
+  }
+} else if (command === 'claim') {
+  const auth = getAuth();
+  const res = await fetch(`${auth.baseUrl}/api/agent/claim`, {
+    method: 'POST',
+    headers: { 'Content-Type': 'application/json', ...auth.headers },
+  });
+  const data = await res.json();
+  if (!res.ok) {
+    console.error(`Claim failed: ${data.error || data.message || res.status}`);
+    process.exit(1);
+  }
+  console.log(JSON.stringify(data));
+  console.error(`🔗 Share this link with a human: ${data.claim_url}`);
 } else {
   console.log(`Makaron CLI — Talk to Makaron Agent from the terminal
 
 Commands:
-  login                              Log in to Makaron
+  register --json                    Get challenge for agent self-registration
+  register --verify --challenge-id <id> --answer <n>  Verify and save API key
+  claim                              Get claim URL for human to link account
+  login                              Log in to Makaron (human interactive)
   list (ls)                          List all projects
   create --image <file>              Create project from local image
   create --image-url <url>           Create project from URL

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "makaron-cli",
-  "version": "0.5.3",
+  "version": "0.6.0",
   "description": "Talk to Makaron Agent from the terminal — create projects, edit images, generate videos",
   "type": "module",
   "bin": {