clawdock 0.1.1 → 0.2.1

package/README.md

@@ -1,6 +1,6 @@
 # ClawDock CLI
 
-The command-line tool for [ClawDock](https://clawhub-one.vercel.app) — the agent registry. Push, pull, share, and deploy OpenClaw agent bundles.
+The command-line tool for [ClawDock](https://clawhub-one.vercel.app) — the agent registry. Push, pull, and run OpenClaw agent bundles.
 
 ## Install
 
@@ -11,24 +11,20 @@ npm install -g clawdock
 ## Quick Start
 
 ```bash
-# Log in with your access token (from dashboard)
-clawdock login
+# 1. Set up runtime credentials (one-time)
+clawdock credentials set --provider github-copilot --api-key ghu_xxx --model github-copilot/claude-sonnet-4
 
-# Initialize a bundle in your agent workspace
-clawdock init
-
-# Push your agent
-clawdock push
-
-# Pull an agent
-clawdock pull username/agent-name
+# 2. Pull and run any agent
+clawdock run hugo/caramelo
 ```
 
 ## Commands
 
+### Registry
+
 | Command | Description |
 |---------|-------------|
-| `clawdock login` | Authenticate with your access token |
+| `clawdock login` | Authenticate with your registry access token |
 | `clawdock whoami` | Show current user |
 | `clawdock init` | Create a `manifest.json` in the current directory |
 | `clawdock push [path]` | Bundle and publish an agent |
@@ -36,12 +32,61 @@ clawdock pull username/agent-name
 | `clawdock search <query>` | Search the registry |
 | `clawdock list` | List your published bundles |
 
+### Runtime
+
+| Command | Description |
+|---------|-------------|
+| `clawdock credentials set` | Configure provider/model/runtime for running agents |
+| `clawdock credentials show` | Show stored runtime credentials |
+| `clawdock credentials clear` | Remove stored credentials |
+| `clawdock run <owner/slug[@version]>` | Pull + launch an agent locally |
+
+### `clawdock run`
+
+Pulls an agent bundle and launches it with a local runtime (OpenClaw by default).
+
+```bash
+# Uses stored credentials
+clawdock run hugo/caramelo
+
+# Override model
+clawdock run hugo/caramelo --model github-copilot/claude-opus-4
+
+# Use a different runtime
+clawdock run hugo/caramelo --runtime nullclaw@latest
+
+# Skip pull (use cached workspace)
+clawdock run hugo/caramelo --no-pull
+```
+
+Agents are cached at `~/.clawdock/agents/<owner>/<slug>/workspace/`.
+
+### Supported Runtimes
+
+| Runtime | Default | Install |
+|---------|---------|---------|
+| `openclaw@latest` | ✅ | `npm install -g openclaw` (auto-installed if missing) |
+| `nullclaw@latest` | | [github.com/pigeonflow/brain-arch-v2](https://github.com/pigeonflow/brain-arch-v2) |
+
 ## Configuration
 
-Config is stored in `~/.clawdock/config.json`.
+All config lives in `~/.clawdock/config.json`:
+
+```json
+{
+  "apiKey": "cd_registry_token",
+  "registry": "https://clawhub-one.vercel.app",
+  "runtime": {
+    "provider": "github-copilot",
+    "apiKey": "ghu_xxx",
+    "model": "github-copilot/claude-sonnet-4",
+    "runtime": "openclaw@latest"
+  }
+}
+```
 
 Environment variables:
-- `CLAWDOCK_API_KEY` — override stored API key
+- `CLAWDOCK_API_KEY` — override runtime API key
 - `CLAWDOCK_REGISTRY` — override registry URL
 
 ## License

package/dist/index.js

@@ -235,7 +235,59 @@ program.command("init").description("Create a manifest.json for your agent").act
   console.log(`\u2705 Created manifest.json`);
   console.log(`   Edit it, then run: clawdock push`);
 });
-program.command("run <bundle>").description("Pull and run an agent with NullClaw").option("--dir <path>", "Directory for agent workspace", ".").option("--port <port>", "Gateway port", "21789").option("--model <model>", "Model override (e.g. github-copilot/claude-sonnet-4)").option("--provider <name>", "Provider name", "github-copilot").option("--api-key <key>", "Provider API key (or set NULLCLAW_API_KEY)").option("--channel <ch>", "Channel to enable: cli, telegram, http", "cli").option("--nullclaw <path>", "Path to nullclaw binary").option("--no-pull", "Skip pull, use existing workspace").action(async (bundle, opts) => {
+var credentials = program.command("credentials").description("Manage runtime credentials for clawdock run");
+credentials.command("set").description("Configure provider credentials for running agents").option("--provider <name>", "Provider name (e.g. github-copilot, openai, anthropic)").option("--api-key <key>", "Provider API key").option("--model <model>", "Default model (e.g. github-copilot/claude-sonnet-4)").option("--runtime <runtime>", "Runtime to use (e.g. openclaw@latest, nullclaw@latest)", "openclaw@latest").action(async (opts) => {
+  const config = loadConfig();
+  config.runtime = config.runtime || {};
+  if (opts.provider) config.runtime.provider = opts.provider;
+  if (opts.apiKey) config.runtime.apiKey = opts.apiKey;
+  if (opts.model) config.runtime.model = opts.model;
+  if (opts.runtime) config.runtime.runtime = opts.runtime;
+  if (!opts.provider && !opts.apiKey && !opts.model) {
+    const ask = (prompt) => new Promise((resolve2) => {
+      process.stdout.write(prompt);
+      let data = "";
+      process.stdin.setEncoding("utf-8");
+      process.stdin.on("data", (chunk) => {
+        data += chunk;
+        if (data.includes("\n")) {
+          process.stdin.pause();
+          resolve2(data.trim());
+        }
+      });
+      process.stdin.resume();
+    });
+    config.runtime.provider = await ask(`Provider [${config.runtime.provider || "github-copilot"}]: `) || config.runtime.provider || "github-copilot";
+    config.runtime.apiKey = await ask("API Key: ") || config.runtime.apiKey;
+    config.runtime.model = await ask(`Model [${config.runtime.model || config.runtime.provider + "/claude-sonnet-4"}]: `) || config.runtime.model;
+    config.runtime.runtime = await ask(`Runtime [${config.runtime.runtime || "openclaw@latest"}]: `) || config.runtime.runtime || "openclaw@latest";
+  }
+  saveConfig(config);
+  console.log(`\u2705 Credentials saved`);
+  console.log(`   Provider: ${config.runtime.provider}`);
+  console.log(`   Model:    ${config.runtime.model || config.runtime.provider + "/claude-sonnet-4"}`);
+  console.log(`   Runtime:  ${config.runtime.runtime || "openclaw@latest"}`);
+  console.log(`   Config:   ${CONFIG_FILE}`);
+});
+credentials.command("show").description("Show current runtime credentials").action(() => {
+  const config = loadConfig();
+  if (!config.runtime?.provider) {
+    console.log("No credentials configured. Run: clawdock credentials set");
+    return;
+  }
+  console.log(`Provider: ${config.runtime.provider}`);
+  console.log(`API Key:  ${config.runtime.apiKey ? config.runtime.apiKey.slice(0, 8) + "..." : "(not set)"}`);
+  console.log(`Model:    ${config.runtime.model || "(default)"}`);
+  console.log(`Runtime:  ${config.runtime.runtime || "openclaw@latest"}`);
+});
+credentials.command("clear").description("Remove stored runtime credentials").action(() => {
+  const config = loadConfig();
+  delete config.runtime;
+  saveConfig(config);
+  console.log("\u2705 Credentials cleared");
+});
+var AGENTS_DIR = path.join(CONFIG_DIR, "agents");
+program.command("run <bundle>").description("Pull and run an agent locally").option("--runtime <runtime>", "Runtime override (e.g. openclaw@latest)").option("--model <model>", "Model override").option("--provider <name>", "Provider override").option("--api-key <key>", "API key override").option("--no-pull", "Skip pull, use cached workspace").action(async (bundle, opts) => {
   const { execSync, spawn } = await import("child_process");
   const match = bundle.match(/^([^/]+)\/([^@]+)(?:@(.+))?$/);
   if (!match) {
@@ -243,10 +295,72 @@ program.command("run <bundle>").description("Pull and run an agent with NullClaw
     process.exit(1);
   }
   const [, owner, slug, version] = match;
-  const workspaceDir = path.resolve(opts.dir, slug);
+  const agentName = `${owner}-${slug}`;
+  const config = loadConfig();
+  const rt = config.runtime || {};
+  const provider = opts.provider || rt.provider;
+  const apiKey = opts.apiKey || rt.apiKey || process.env.CLAWDOCK_API_KEY;
+  const model = opts.model || rt.model;
+  const runtimeSpec = opts.runtime || rt.runtime || "openclaw@latest";
+  if (!provider || !apiKey) {
+    console.log("\u2139\uFE0F  No runtime credentials configured \u2014 launching without provider override.");
+    console.log("   To set defaults: clawdock credentials set");
+    console.log("   Or pass --provider and --api-key");
+    console.log();
+  }
+  const [runtimeName, runtimeVersion] = runtimeSpec.split("@");
+  console.log(`\u{1F50D} Checking runtime: ${runtimeName}...`);
+  let runtimeBin = null;
+  if (runtimeName === "openclaw") {
+    try {
+      const which = execSync("which openclaw 2>/dev/null", { encoding: "utf-8" }).trim();
+      if (which) {
+        runtimeBin = which;
+        const ver = execSync("openclaw --version 2>/dev/null", { encoding: "utf-8" }).trim();
+        console.log(`   Found openclaw ${ver}`);
+      }
+    } catch {
+    }
+    if (!runtimeBin) {
+      console.log("   OpenClaw not found. Installing via npm...");
+      try {
+        execSync("npm install -g openclaw", { stdio: "inherit" });
+        runtimeBin = execSync("which openclaw", { encoding: "utf-8" }).trim();
+        console.log("   \u2705 OpenClaw installed");
+      } catch {
+        console.error("\u274C Failed to install OpenClaw. Install manually:");
+        console.error("   npm install -g openclaw");
+        process.exit(1);
+      }
+    }
+  } else if (runtimeName === "nullclaw") {
+    const candidates = [
+      "nullclaw",
+      path.join(os.homedir(), ".nullclaw", "bin", "nullclaw"),
+      "/usr/local/bin/nullclaw"
+    ];
+    for (const c of candidates) {
+      try {
+        execSync(`which ${c} 2>/dev/null || test -x ${c}`, { stdio: "pipe" });
+        runtimeBin = c;
+        break;
+      } catch {
+      }
+    }
+    if (!runtimeBin) {
+      console.error(`\u274C ${runtimeName} not found in PATH.`);
+      console.error("   Install from: https://github.com/pigeonflow/brain-arch-v2");
+      process.exit(1);
+    }
+  } else {
+    console.error(`\u274C Unknown runtime: ${runtimeName}`);
+    console.error("   Supported: openclaw, nullclaw");
+    process.exit(1);
+  }
+  const workspaceDir = path.join(AGENTS_DIR, owner, slug, "workspace");
   if (opts.pull !== false) {
-    console.log(`\u{1F4E5} Pulling ${bundle}...`);
     const ver = version || "latest";
+    console.log(`\u{1F4E5} Pulling ${owner}/${slug}@${ver}...`);
     try {
       const { url, version: resolvedVersion } = await apiRequest(
         "GET",
@@ -269,79 +383,92 @@ program.command("run <bundle>").description("Pull and run an agent with NullClaw
   }
   if (!fs.existsSync(workspaceDir)) {
     console.error(`\u274C Workspace not found: ${workspaceDir}`);
-    console.error("   Run without --no-pull, or pull first with: clawdock pull");
+    console.error("   Run without --no-pull to download first.");
     process.exit(1);
   }
-  let nullclawBin = opts.nullclaw || process.env.NULLCLAW_BIN;
-  if (!nullclawBin) {
-    const candidates = [
-      "nullclaw",
-      path.join(os.homedir(), ".nullclaw", "bin", "nullclaw"),
-      "/usr/local/bin/nullclaw"
-    ];
-    for (const c of candidates) {
+  const resolvedModel = model || (provider ? `${provider}/claude-sonnet-4` : null);
+  console.log(`
+\u{1F980} Starting ${owner}/${slug}...`);
+  console.log(`   Runtime:   ${runtimeSpec}`);
+  console.log(`   Workspace: ${workspaceDir}`);
+  if (resolvedModel) console.log(`   Model:     ${resolvedModel}`);
+  console.log();
+  if (runtimeName === "openclaw") {
+    try {
+      const list = execSync("openclaw agents list --json 2>/dev/null", { encoding: "utf-8" });
+      const agents = JSON.parse(list);
+      if (!agents.find((a) => a.name === agentName)) {
+        throw new Error("not found");
+      }
+    } catch {
+      console.log(`   Registering agent "${agentName}"...`);
       try {
-        execSync(`which ${c} 2>/dev/null || test -x ${c}`, { stdio: "pipe" });
-        nullclawBin = c;
-        break;
-      } catch {
+        const modelFlag = resolvedModel ? ` --model ${resolvedModel}` : "";
+        execSync(
+          `openclaw agents add ${agentName} --workspace ${workspaceDir}${modelFlag} --non-interactive`,
+          { stdio: "inherit" }
+        );
+      } catch (err) {
+        console.error(`\u274C Failed to register agent: ${err.message}`);
+        process.exit(1);
       }
     }
-  }
-  if (!nullclawBin) {
-    console.error("\u274C NullClaw binary not found.");
-    console.error("   Install: https://github.com/pigeonflow/brain-arch-v2");
-    console.error("   Or pass --nullclaw /path/to/nullclaw");
-    process.exit(1);
-  }
-  const providerApiKey = opts.apiKey || process.env.NULLCLAW_API_KEY;
-  const model = opts.model || `${opts.provider}/claude-sonnet-4`;
-  const configPath = path.join(workspaceDir, ".nullclaw.json");
-  const manifestPath = path.join(workspaceDir, "manifest.json");
-  const manifest = fs.existsSync(manifestPath) ? JSON.parse(fs.readFileSync(manifestPath, "utf-8")) : { name: slug };
-  const config = {
-    default_temperature: 0.7,
-    models: {
-      providers: {
-        [opts.provider]: providerApiKey ? { api_key: providerApiKey } : {}
+    if (provider && apiKey) {
+      const agentDir = path.join(os.homedir(), ".openclaw", "agents", agentName, "agent");
+      fs.mkdirSync(agentDir, { recursive: true });
+      const authProfilesPath = path.join(agentDir, "auth-profiles.json");
+      const authProfiles = {};
+      authProfiles[provider] = { type: "api-key", apiKey };
+      fs.writeFileSync(authProfilesPath, JSON.stringify(authProfiles, null, 2));
+    }
+    const child = spawn(
+      runtimeBin,
+      ["agent", "--agent", agentName, "--prompt", "Hello! I just pulled you from ClawDock. Introduce yourself."],
+      {
+        stdio: "inherit",
+        env: { ...process.env }
       }
-    },
-    agents: {
-      defaults: {
-        model: { primary: model }
+    );
+    child.on("error", (err) => {
+      console.error(`\u274C Failed to start: ${err.message}`);
+      process.exit(1);
+    });
+    child.on("exit", (code) => process.exit(code || 0));
+    process.on("SIGINT", () => child.kill("SIGINT"));
+    process.on("SIGTERM", () => child.kill("SIGTERM"));
+  } else if (runtimeName === "nullclaw") {
+    const configPath = path.join(workspaceDir, ".nullclaw.json");
+    const nullclawConfig = {
+      default_temperature: 0.7,
+      models: {
+        providers: {
+          [provider]: { api_key: apiKey }
+        }
+      },
+      agents: {
+        defaults: {
+          model: { primary: resolvedModel }
+        }
+      },
+      channels: { cli: true },
+      memory: {
+        profile: "markdown_only",
+        backend: "markdown",
+        auto_save: true
       }
-    },
-    channels: {
-      cli: opts.channel === "cli" || opts.channel === "all",
-      ...opts.channel === "telegram" ? { telegram: true } : {},
-      ...opts.channel === "http" ? { http: { port: parseInt(opts.port) } } : {}
-    },
-    memory: {
-      profile: "markdown_only",
-      backend: "markdown",
-      auto_save: true
-    }
-  };
-  fs.writeFileSync(configPath, JSON.stringify(config, null, 2));
-  console.log(`
-\u{1F980} Starting ${manifest.name || slug} with NullClaw...`);
-  console.log(`   Workspace: ${workspaceDir}`);
-  console.log(`   Model: ${model}`);
-  console.log(`   Channel: ${opts.channel}`);
-  console.log();
-  const child = spawn(nullclawBin, ["--config", configPath, "--workspace", workspaceDir], {
-    stdio: "inherit",
-    cwd: workspaceDir,
-    env: { ...process.env }
-  });
-  child.on("error", (err) => {
-    console.error(`\u274C Failed to start NullClaw: ${err.message}`);
-    process.exit(1);
-  });
-  child.on("exit", (code) => {
-    process.exit(code || 0);
-  });
-  process.on("SIGINT", () => child.kill("SIGINT"));
-  process.on("SIGTERM", () => child.kill("SIGTERM"));
+    };
+    fs.writeFileSync(configPath, JSON.stringify(nullclawConfig, null, 2));
+    const child = spawn(runtimeBin, ["--config", configPath, "--workspace", workspaceDir], {
+      stdio: "inherit",
+      cwd: workspaceDir
+    });
+    child.on("error", (err) => {
+      console.error(`\u274C Failed to start NullClaw: ${err.message}`);
+      process.exit(1);
+    });
+    child.on("exit", (code) => process.exit(code || 0));
+    process.on("SIGINT", () => child.kill("SIGINT"));
+    process.on("SIGTERM", () => child.kill("SIGTERM"));
+  }
 });
 program.parse();

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "clawdock",
-  "version": "0.1.1",
+  "version": "0.2.1",
   "description": "CLI for ClawDock — the agent registry",
   "bin": {
     "clawdock": "./dist/index.js"