zooid 0.4.1 → 0.5.1

package/dist/index.js

@@ -240,134 +240,14 @@ async function runChannelDelete(channelId, client) {
     const serverUrl = resolveServer();
     if (serverUrl && file.servers?.[serverUrl]?.channels?.[channelId]) {
       delete file.servers[serverUrl].channels[channelId];
-      const fs6 = await import("fs");
-      fs6.writeFileSync(getStatePath(), JSON.stringify(file, null, 2) + "\n");
+      const fs7 = await import("fs");
+      fs7.writeFileSync(getStatePath(), JSON.stringify(file, null, 2) + "\n");
     }
   }
 }
 
-// src/commands/publish.ts
-import fs2 from "fs";
-async function runPublish(channelId, options, client) {
-  const c = client ?? createPublishClient(channelId);
-  let type;
-  let data;
-  if (options.file) {
-    const raw = fs2.readFileSync(options.file, "utf-8");
-    const parsed = JSON.parse(raw);
-    type = parsed.type;
-    data = parsed.data ?? parsed;
-  } else if (options.data) {
-    data = JSON.parse(options.data);
-    type = options.type;
-  } else {
-    throw new Error("Either --data or --file is required");
-  }
-  const publishOpts = { data };
-  if (type) publishOpts.type = type;
-  return c.publish(channelId, publishOpts);
-}
-
-// src/commands/subscribe.ts
-async function runSubscribePoll(channelId, options = {}, client) {
-  const c = client ?? createSubscribeClient(channelId);
-  const callback = options.callback ?? ((event) => {
-    console.log(JSON.stringify(event));
-  });
-  return c.subscribe(channelId, callback, {
-    interval: options.interval ?? 5e3,
-    mode: options.mode,
-    type: options.type
-  });
-}
-async function runSubscribeWebhook(channelId, url, client) {
-  const c = client ?? createSubscribeClient(channelId);
-  return c.registerWebhook(channelId, url);
-}
-
-// src/commands/tail.ts
-async function runTail(channelId, options = {}, client) {
-  const c = client ?? createSubscribeClient(channelId);
-  if (options.follow) {
-    return runTailFollow(c, channelId, options);
-  }
-  const pollOpts = {};
-  if (options.limit !== void 0) pollOpts.limit = options.limit;
-  if (options.type) pollOpts.type = options.type;
-  if (options.since) pollOpts.since = options.since;
-  if (options.cursor) pollOpts.cursor = options.cursor;
-  return c.tail(channelId, pollOpts);
-}
-async function runTailFollow(client, channelId, options) {
-  const tailOpts = {
-    follow: true,
-    mode: options.mode,
-    interval: options.interval,
-    type: options.type
-  };
-  const stream = client.tail(channelId, tailOpts);
-  for await (const event of stream) {
-    console.log(JSON.stringify(event));
-  }
-  return void 0;
-}
-
-// src/commands/status.ts
-async function runStatus(client) {
-  const c = client ?? createClient();
-  const [discovery, identity] = await Promise.all([
-    c.getMetadata(),
-    c.getServerMeta()
-  ]);
-  return { discovery, identity };
-}
-
-// src/commands/history.ts
-function runHistory() {
-  const file = loadConfigFile();
-  const entries = [];
-  if (!file.servers) return entries;
-  const seen = /* @__PURE__ */ new Map();
-  for (const [serverUrl, serverConfig] of Object.entries(file.servers)) {
-    if (!serverConfig.channels) continue;
-    const normalizedServer = normalizeServerUrl(serverUrl);
-    for (const [channelId, channelData] of Object.entries(
-      serverConfig.channels
-    )) {
-      if (!channelData.stats) continue;
-      const key = `${normalizedServer}\0${channelId}`;
-      const existingIdx = seen.get(key);
-      if (existingIdx !== void 0) {
-        const existing = entries[existingIdx];
-        existing.num_tails += channelData.stats.num_tails;
-        if (channelData.stats.last_tailed_at > existing.last_tailed_at) {
-          existing.last_tailed_at = channelData.stats.last_tailed_at;
-          existing.name = channelData.name ?? existing.name;
-        }
-        if (channelData.stats.first_tailed_at < existing.first_tailed_at) {
-          existing.first_tailed_at = channelData.stats.first_tailed_at;
-        }
-      } else {
-        seen.set(key, entries.length);
-        entries.push({
-          server: normalizedServer,
-          channel_id: channelId,
-          name: channelData.name,
-          num_tails: channelData.stats.num_tails,
-          last_tailed_at: channelData.stats.last_tailed_at,
-          first_tailed_at: channelData.stats.first_tailed_at
-        });
-      }
-    }
-  }
-  entries.sort(
-    (a, b) => new Date(b.last_tailed_at).getTime() - new Date(a.last_tailed_at).getTime()
-  );
-  return entries;
-}
-
-// src/commands/share.ts
-import readline from "readline/promises";
+// src/commands/push.ts
+import readline3 from "readline/promises";
 
 // src/lib/output.ts
 function printSuccess(message) {
@@ -393,99 +273,6 @@ function formatRelative(isoString) {
   return `${days}d ago`;
 }
 
-// src/lib/directory.ts
-var DIRECTORY_BASE_URL = "https://directory.zooid.dev";
-var TOKEN_PREFIX = "zd_";
-var POLL_INTERVAL_MS = 3e3;
-var POLL_TIMEOUT_MS = 2 * 60 * 1e3;
-function getDirectoryToken() {
-  const token = loadDirectoryToken();
-  if (token && token.startsWith(TOKEN_PREFIX)) {
-    return token;
-  }
-  return void 0;
-}
-async function ensureDirectoryToken() {
-  const existing = getDirectoryToken();
-  if (existing) return existing;
-  return deviceAuth();
-}
-async function deviceAuth() {
-  const res = await fetch(`${DIRECTORY_BASE_URL}/api/auth/device`, {
-    method: "POST",
-    headers: { "Content-Type": "application/json" }
-  });
-  if (!res.ok) {
-    throw new Error(`Directory auth failed: ${res.status} ${res.statusText}`);
-  }
-  const data = await res.json();
-  const { device_code, verification_url } = data;
-  console.log("");
-  printInfo("Authorize", verification_url);
-  console.log("  Opening browser to complete GitHub sign-in...\n");
-  try {
-    const { exec } = await import("child_process");
-    const platform = process.platform;
-    const cmd = platform === "darwin" ? "open" : platform === "win32" ? "start" : "xdg-open";
-    exec(`${cmd} "${verification_url}"`);
-  } catch {
-    console.log(
-      "  Could not open browser automatically. Please visit the URL above.\n"
-    );
-  }
-  const deadline = Date.now() + POLL_TIMEOUT_MS;
-  while (Date.now() < deadline) {
-    await sleep(POLL_INTERVAL_MS);
-    const statusRes = await fetch(
-      `${DIRECTORY_BASE_URL}/api/auth/status?code=${encodeURIComponent(device_code)}`
-    );
-    if (!statusRes.ok) continue;
-    const status = await statusRes.json();
-    if (status.status === "complete" && status.token) {
-      saveDirectoryToken(status.token);
-      console.log("  Authenticated with Zooid Directory.\n");
-      return status.token;
-    }
-    if (status.status === "expired") {
-      throw new Error("Device authorization expired. Please try again.");
-    }
-  }
-  throw new Error(
-    "Authorization timed out. You need your human to authorize you. Run `npx zooid share` again to retry."
-  );
-}
-async function directoryFetch(path5, options = {}) {
-  let token = await ensureDirectoryToken();
-  const doFetch = (t) => {
-    const headers = new Headers(options.headers);
-    headers.set("Authorization", `Bearer ${t}`);
-    headers.set("Content-Type", "application/json");
-    return fetch(`${DIRECTORY_BASE_URL}${path5}`, { ...options, headers });
-  };
-  let res = await doFetch(token);
-  if (res.status === 401) {
-    console.log("  Directory token expired. Re-authenticating...\n");
-    token = await deviceAuth();
-    res = await doFetch(token);
-  }
-  return res;
-}
-function sleep(ms) {
-  return new Promise((resolve) => setTimeout(resolve, ms));
-}
-async function formatDirectoryError(res) {
-  let msg = `Directory returned ${res.status}`;
-  try {
-    const body = await res.json();
-    const parts = [];
-    if (body.error) parts.push(String(body.error));
-    if (body.message) parts.push(String(body.message));
-    if (parts.length > 0) msg = parts.join(": ");
-  } catch {
-  }
-  return msg;
-}
-
 // src/lib/prompts.ts
 async function ask(rl, label, defaultValue) {
   const hint = defaultValue ? ` [${defaultValue}]` : "";
@@ -493,221 +280,15 @@ async function ask(rl, label, defaultValue) {
   return answer.trim() || defaultValue;
 }
 
-// src/commands/share.ts
-async function runShare(channelIds, options = {}) {
-  const client = createClient();
-  const config = loadConfig();
-  const serverUrl = config.server;
-  if (!serverUrl) {
-    throw new Error(
-      "No server configured. Run: npx zooid config set server <url>"
-    );
-  }
-  const allChannels = await client.listChannels();
-  const publicChannels = allChannels.filter((ch) => ch.is_public);
-  if (publicChannels.length === 0) {
-    throw new Error("No public channels found on this server.");
-  }
-  let selected;
-  if (channelIds.length > 0) {
-    const byId = new Map(allChannels.map((ch) => [ch.id, ch]));
-    const missing = [];
-    selected = [];
-    for (const id of channelIds) {
-      const ch = byId.get(id);
-      if (!ch) {
-        missing.push(id);
-      } else {
-        selected.push(ch);
-      }
-    }
-    if (missing.length > 0) {
-      throw new Error(`Channels not found: ${missing.join(", ")}`);
-    }
-    const privateChannels = selected.filter((ch) => !ch.is_public);
-    if (privateChannels.length > 0) {
-      throw new Error(
-        `Cannot share private channels: ${privateChannels.map((ch) => ch.id).join(", ")}. Only public channels can be listed in the directory.`
-      );
-    }
-  } else if (options.yes) {
-    selected = publicChannels;
-  } else {
-    selected = await pickChannels(publicChannels);
-    if (selected.length === 0) {
-      throw new Error("No channels selected.");
-    }
-  }
-  const channelDetails = await promptChannelDetails(selected, options.yes);
-  const ids = selected.map((ch) => ch.id);
-  const { claim, signature } = await client.getClaim(ids);
-  const channels = selected.map((ch) => {
-    const details = channelDetails.get(ch.id);
-    const entry = {
-      channel_id: ch.id,
-      name: ch.name
-    };
-    if (details.description) entry.description = details.description;
-    if (details.tags.length > 0) entry.tags = details.tags;
-    return entry;
-  });
-  const res = await directoryFetch("/api/servers", {
-    method: "POST",
-    body: JSON.stringify({ server_url: serverUrl, claim, signature, channels })
-  });
-  if (!res.ok) {
-    throw new Error(await formatDirectoryError(res));
-  }
-  await res.json();
-  console.log("");
-  for (const ch of selected) {
-    console.log(`  ${ch.id} \u2192 ${serverUrl}/${ch.id}`);
-  }
-  console.log("");
-  console.log(`  Any zooid can find your channel using:`);
-  console.log(`    npx zooid discover --query ${selected[0].id}`);
-  const tags = [
-    ...new Set(selected.flatMap((ch) => channelDetails.get(ch.id)?.tags ?? []))
-  ];
-  if (tags.length > 0) {
-    console.log(`    npx zooid discover --tag ${tags[0]}`);
-  }
-  console.log("");
-}
-async function pickChannels(channels) {
-  const { default: checkbox } = await import("@inquirer/checkbox");
-  const selected = await checkbox({
-    message: "Select channels to share",
-    choices: channels.map((ch) => ({
-      name: ch.description ? `${ch.id} \u2014 ${ch.description}` : ch.id,
-      value: ch.id,
-      checked: true
-    })),
-    theme: {
-      icon: { cursor: "> " },
-      style: { highlight: (text) => text }
-    }
-  });
-  const selectedSet = new Set(selected);
-  return channels.filter((ch) => selectedSet.has(ch.id));
-}
-async function promptChannelDetails(channels, skipPrompt) {
-  const result = /* @__PURE__ */ new Map();
-  if (skipPrompt) {
-    for (const ch of channels) {
-      result.set(ch.id, {
-        description: ch.description ?? "",
-        tags: ch.tags
-      });
-    }
-    return result;
-  }
-  const rl = readline.createInterface({
-    input: process.stdin,
-    output: process.stdout
-  });
-  try {
-    console.log("");
-    console.log("  Set description and tags for each channel.");
-    console.log("  Press Enter to accept defaults shown in [brackets].\n");
-    for (const ch of channels) {
-      console.log(`  ${ch.id}:`);
-      const desc = await ask(rl, "Description", ch.description ?? "");
-      const tagsRaw = await ask(
-        rl,
-        "Tags (comma-separated)",
-        ch.tags.join(", ")
-      );
-      const tags = tagsRaw.split(",").map((t) => t.trim()).filter(Boolean);
-      result.set(ch.id, { description: desc, tags });
-      console.log("");
-    }
-  } finally {
-    rl.close();
-  }
-  return result;
-}
-
-// src/commands/unshare.ts
-async function runUnshare(channelId) {
-  const client = createClient();
-  const config = loadConfig();
-  const serverUrl = config.server;
-  if (!serverUrl) {
-    throw new Error(
-      "No server configured. Run: npx zooid config set server <url>"
-    );
-  }
-  const { claim, signature } = await client.getClaim([channelId], "delete");
-  const res = await directoryFetch("/api/servers/channels", {
-    method: "DELETE",
-    body: JSON.stringify({
-      server_url: serverUrl,
-      channel_id: channelId,
-      claim,
-      signature
-    })
-  });
-  if (!res.ok) {
-    throw new Error(await formatDirectoryError(res));
-  }
-}
-
-// src/commands/discover.ts
-async function runDiscover(options) {
-  const params = new URLSearchParams();
-  if (options.query) params.set("q", options.query);
-  if (options.tag) params.set("tag", options.tag);
-  if (options.limit) params.set("limit", String(options.limit));
-  const qs = params.toString();
-  const url = `${DIRECTORY_BASE_URL}/api/discover${qs ? `?${qs}` : ""}`;
-  const res = await fetch(url);
-  if (!res.ok) {
-    throw new Error(`Directory returned ${res.status}`);
-  }
-  const data = await res.json();
-  if (data.channels.length === 0) {
-    console.log("No channels found.");
-    return;
-  }
-  console.log("");
-  for (const ch of data.channels) {
-    const host = new URL(ch.server_url).host;
-    const tags = ch.tags.length > 0 ? ` [${ch.tags.join(", ")}]` : "";
-    const desc = ch.description ? ` \u2014 ${ch.description}` : "";
-    console.log(`  ${host}/${ch.channel_id}${desc}${tags}`);
-  }
-  console.log(`
-  ${data.total} channel${data.total === 1 ? "" : "s"} found.`);
-  console.log("");
-}
-
-// src/commands/server.ts
-async function runServerGet(client) {
-  const c = client ?? createClient();
-  return c.getServerMeta();
-}
-async function runServerSet(fields, client) {
-  const c = client ?? createClient();
-  return c.updateServerMeta(fields);
-}
-
-// src/commands/token.ts
-async function runTokenMint(scopes, options) {
-  const client = createClient();
-  const body = { scopes };
-  if (options.sub) body.sub = options.sub;
-  if (options.name) body.name = options.name;
-  if (options.expiresIn) body.expires_in = options.expiresIn;
-  return client.mintToken(body);
-}
-
-// src/commands/dev.ts
-import { execSync, spawn as spawn2 } from "child_process";
+// src/commands/deploy.ts
+import { execSync, spawnSync } from "child_process";
 import crypto2 from "crypto";
 import fs3 from "fs";
-import path2 from "path";
-import { fileURLToPath } from "url";
+import os from "os";
+import path3 from "path";
+import readline2 from "readline/promises";
+import { createRequire } from "module";
+import { ZooidClient } from "@zooid/sdk";
 
 // src/lib/crypto.ts
 function base64url(buf) {
@@ -770,82 +351,23 @@ async function createEdDSAAdminToken(privateKeyJwk, kid) {
   return `${message}.${signature}`;
 }
 
-// src/commands/dev.ts
-function findServerDir() {
-  const cliDir = path2.dirname(fileURLToPath(import.meta.url));
-  return path2.resolve(cliDir, "../../server");
-}
-async function runDev(port = 8787) {
-  const serverDir = findServerDir();
-  if (!fs3.existsSync(path2.join(serverDir, "wrangler.toml"))) {
-    throw new Error(
-      `Server directory not found at ${serverDir}. Make sure you're running from the zooid monorepo.`
-    );
-  }
-  const jwtSecret = crypto2.randomUUID();
-  const devVarsPath = path2.join(serverDir, ".dev.vars");
-  fs3.writeFileSync(devVarsPath, `ZOOID_JWT_SECRET=${jwtSecret}
-`);
-  const adminToken = await createAdminToken(jwtSecret);
-  const serverUrl = `http://localhost:${port}`;
-  saveConfig({ admin_token: adminToken }, serverUrl);
-  const schemaPath = path2.join(serverDir, "src/db/schema.sql");
-  if (fs3.existsSync(schemaPath)) {
-    try {
-      execSync(
-        `npx wrangler d1 execute zooid-db --local --file=${schemaPath}`,
-        {
-          cwd: serverDir,
-          stdio: "pipe"
-        }
-      );
-      printSuccess("Database schema initialized");
-    } catch {
-      printSuccess("Database ready (schema already exists)");
-    }
-  }
-  printSuccess("Local server configured");
-  printInfo("Server", serverUrl);
-  printInfo("Admin token", adminToken.slice(0, 20) + "...");
-  printInfo("Config saved to", "~/.zooid/state.json");
-  console.log("");
-  console.log("Starting wrangler dev...");
-  console.log("");
-  const child = spawn2(
-    "npx",
-    ["wrangler", "dev", "--local", "--port", String(port)],
-    {
-      cwd: serverDir,
-      stdio: "inherit",
-      shell: true
-    }
-  );
-  child.on("error", (err) => {
-    console.error(`Failed to start local server: ${err.message}`);
-    process.exit(1);
-  });
-  child.on("exit", (code) => {
-    process.exit(code ?? 0);
-  });
-}
-
 // src/commands/init.ts
-import fs4 from "fs";
-import path3 from "path";
-import readline2 from "readline/promises";
+import fs2 from "fs";
+import path2 from "path";
+import readline from "readline/promises";
 var CONFIG_FILENAME = "zooid.json";
 function getConfigPath() {
-  return path3.join(process.cwd(), CONFIG_FILENAME);
+  return path2.join(process.cwd(), CONFIG_FILENAME);
 }
 function loadServerConfig() {
   const configPath = getConfigPath();
-  if (!fs4.existsSync(configPath)) return null;
-  const raw = fs4.readFileSync(configPath, "utf-8");
+  if (!fs2.existsSync(configPath)) return null;
+  const raw = fs2.readFileSync(configPath, "utf-8");
   return JSON.parse(raw);
 }
 function saveServerConfig(config) {
   const configPath = getConfigPath();
-  fs4.writeFileSync(configPath, JSON.stringify(config, null, 2) + "\n");
+  fs2.writeFileSync(configPath, JSON.stringify(config, null, 2) + "\n");
 }
 async function runInit() {
   const configPath = getConfigPath();
@@ -854,7 +376,7 @@ async function runInit() {
     printInfo("Found existing", configPath);
     console.log("");
   }
-  const rl = readline2.createInterface({
+  const rl = readline.createInterface({
     input: process.stdin,
     output: process.stdout
   });
@@ -891,7 +413,15 @@ async function runInit() {
       tags,
       url
     };
-    fs4.writeFileSync(configPath, JSON.stringify(config, null, 2) + "\n");
+    fs2.writeFileSync(configPath, JSON.stringify(config, null, 2) + "\n");
+    const channelsDir = path2.join(process.cwd(), "channels");
+    const rolesDir = path2.join(process.cwd(), "roles");
+    for (const dir of [channelsDir, rolesDir]) {
+      if (!fs2.existsSync(dir)) {
+        fs2.mkdirSync(dir, { recursive: true });
+        fs2.writeFileSync(path2.join(dir, ".gitkeep"), "");
+      }
+    }
     console.log("");
     printSuccess(`Saved ${CONFIG_FILENAME}`);
     console.log("");
@@ -905,6 +435,8 @@ async function runInit() {
       config.tags.length > 0 ? config.tags.join(", ") : "(none)"
     );
     printInfo("URL", config.url || "(not set)");
+    printInfo("Channels", "channels/");
+    printInfo("Roles", "roles/");
     console.log("");
   } finally {
     rl.close();
@@ -912,23 +444,15 @@ async function runInit() {
 }
 
 // src/commands/deploy.ts
-import { execSync as execSync2, spawnSync } from "child_process";
-import crypto3 from "crypto";
-import fs5 from "fs";
-import os from "os";
-import path4 from "path";
-import readline3 from "readline/promises";
-import { createRequire } from "module";
-import { ZooidClient } from "@zooid/sdk";
 var require2 = createRequire(import.meta.url);
 function resolvePackageDir(packageName) {
   const pkgJson = require2.resolve(`${packageName}/package.json`);
-  return path4.dirname(pkgJson);
+  return path3.dirname(pkgJson);
 }
-var USER_WRANGLER_TOML = path4.join(process.cwd(), "wrangler.toml");
+var USER_WRANGLER_TOML = path3.join(process.cwd(), "wrangler.toml");
 function ejectWranglerToml(opts) {
   const serverDir = resolvePackageDir("@zooid/server");
-  let toml = fs5.readFileSync(path4.join(serverDir, "wrangler.toml"), "utf-8");
+  let toml = fs3.readFileSync(path3.join(serverDir, "wrangler.toml"), "utf-8");
   toml = toml.replace(/directory\s*=\s*"[^"]*"/, 'directory = "./web-dist/"');
   toml = toml.replace(/name = "[^"]*"/, `name = "${opts.workerName}"`);
   toml = toml.replace(
@@ -943,58 +467,58 @@ function ejectWranglerToml(opts) {
     /ZOOID_SERVER_ID = "[^"]*"/,
     `ZOOID_SERVER_ID = "${opts.serverSlug}"`
   );
-  fs5.writeFileSync(USER_WRANGLER_TOML, toml);
+  fs3.writeFileSync(USER_WRANGLER_TOML, toml);
 }
 function prepareStagingDir() {
   const serverDir = resolvePackageDir("@zooid/server");
-  const serverRequire = createRequire(path4.join(serverDir, "package.json"));
-  const webDir = path4.dirname(serverRequire.resolve("@zooid/web/package.json"));
-  const webDistDir = path4.join(webDir, "dist");
-  if (!fs5.existsSync(webDistDir)) {
+  const serverRequire = createRequire(path3.join(serverDir, "package.json"));
+  const webDir = path3.dirname(serverRequire.resolve("@zooid/web/package.json"));
+  const webDistDir = path3.join(webDir, "dist");
+  if (!fs3.existsSync(webDistDir)) {
     throw new Error(`Web dashboard not built. Missing: ${webDistDir}`);
   }
-  const tmpDir = fs5.mkdtempSync(path4.join(os.tmpdir(), "zooid-deploy-"));
-  copyDirSync(path4.join(serverDir, "src"), path4.join(tmpDir, "src"));
-  copyDirSync(webDistDir, path4.join(tmpDir, "web-dist"));
-  if (fs5.existsSync(USER_WRANGLER_TOML)) {
-    fs5.copyFileSync(USER_WRANGLER_TOML, path4.join(tmpDir, "wrangler.toml"));
+  const tmpDir = fs3.mkdtempSync(path3.join(os.tmpdir(), "zooid-deploy-"));
+  copyDirSync(path3.join(serverDir, "src"), path3.join(tmpDir, "src"));
+  copyDirSync(webDistDir, path3.join(tmpDir, "web-dist"));
+  if (fs3.existsSync(USER_WRANGLER_TOML)) {
+    fs3.copyFileSync(USER_WRANGLER_TOML, path3.join(tmpDir, "wrangler.toml"));
   } else {
-    if (!fs5.existsSync(path4.join(serverDir, "wrangler.toml"))) {
+    if (!fs3.existsSync(path3.join(serverDir, "wrangler.toml"))) {
       throw new Error(`Server package missing wrangler.toml at ${serverDir}`);
     }
-    let toml = fs5.readFileSync(path4.join(serverDir, "wrangler.toml"), "utf-8");
+    let toml = fs3.readFileSync(path3.join(serverDir, "wrangler.toml"), "utf-8");
     toml = toml.replace(/directory\s*=\s*"[^"]*"/, 'directory = "./web-dist/"');
-    fs5.writeFileSync(path4.join(tmpDir, "wrangler.toml"), toml);
+    fs3.writeFileSync(path3.join(tmpDir, "wrangler.toml"), toml);
   }
   const nodeModules = findServerNodeModules(serverDir);
   if (nodeModules) {
-    fs5.symlinkSync(nodeModules, path4.join(tmpDir, "node_modules"), "junction");
+    fs3.symlinkSync(nodeModules, path3.join(tmpDir, "node_modules"), "junction");
   }
   return tmpDir;
 }
 function findServerNodeModules(serverDir) {
-  const local = path4.join(serverDir, "node_modules");
-  if (fs5.existsSync(path4.join(local, "hono"))) return local;
-  const storeNodeModules = path4.resolve(serverDir, "..", "..");
-  if (fs5.existsSync(path4.join(storeNodeModules, "hono")))
+  const local = path3.join(serverDir, "node_modules");
+  if (fs3.existsSync(path3.join(local, "hono"))) return local;
+  const storeNodeModules = path3.resolve(serverDir, "..", "..");
+  if (fs3.existsSync(path3.join(storeNodeModules, "hono")))
     return storeNodeModules;
   let dir = serverDir;
-  while (dir !== path4.dirname(dir)) {
-    dir = path4.dirname(dir);
-    const nm = path4.join(dir, "node_modules");
-    if (fs5.existsSync(path4.join(nm, "hono"))) return nm;
+  while (dir !== path3.dirname(dir)) {
+    dir = path3.dirname(dir);
+    const nm = path3.join(dir, "node_modules");
+    if (fs3.existsSync(path3.join(nm, "hono"))) return nm;
   }
   return null;
 }
 function copyDirSync(src, dest) {
-  fs5.mkdirSync(dest, { recursive: true });
-  for (const entry of fs5.readdirSync(src, { withFileTypes: true })) {
-    const srcPath = path4.join(src, entry.name);
-    const destPath = path4.join(dest, entry.name);
+  fs3.mkdirSync(dest, { recursive: true });
+  for (const entry of fs3.readdirSync(src, { withFileTypes: true })) {
+    const srcPath = path3.join(src, entry.name);
+    const destPath = path3.join(dest, entry.name);
     if (entry.isDirectory()) {
       copyDirSync(srcPath, destPath);
     } else {
-      fs5.copyFileSync(srcPath, destPath);
+      fs3.copyFileSync(srcPath, destPath);
     }
   }
 }
@@ -1009,7 +533,7 @@ function wranglerEnv(creds) {
   return env;
 }
 function wrangler(cmd, cwd, creds, opts) {
-  return execSync2(`npx wrangler ${cmd}`, {
+  return execSync(`npx wrangler ${cmd}`, {
     cwd,
     stdio: "pipe",
     encoding: "utf-8",
@@ -1048,9 +572,9 @@ function parseDeployUrls(output) {
   };
 }
 function loadDotEnv() {
-  const envPath = path4.join(process.cwd(), ".env");
-  if (!fs5.existsSync(envPath)) return {};
-  const content = fs5.readFileSync(envPath, "utf-8");
+  const envPath = path3.join(process.cwd(), ".env");
+  if (!fs3.existsSync(envPath)) return {};
+  const content = fs3.readFileSync(envPath, "utf-8");
   const tokenMatch = content.match(/^CLOUDFLARE_API_TOKEN=(.+)$/m);
   const accountMatch = content.match(/^CLOUDFLARE_ACCOUNT_ID=(.+)$/m);
   return {
@@ -1069,7 +593,7 @@ async function getCfCredentials() {
     printInfo("Using credentials from", ".env");
     return { apiToken: dotEnv.apiToken, accountId: dotEnv.accountId };
   }
-  const rl = readline3.createInterface({
+  const rl = readline2.createInterface({
     input: process.stdin,
     output: process.stdout
   });
@@ -1094,6 +618,18 @@ async function getCfCredentials() {
     rl.close();
   }
 }
+function loadChannelDefs() {
+  const channelsDir = path3.join(process.cwd(), "channels");
+  if (!fs3.existsSync(channelsDir)) return /* @__PURE__ */ new Map();
+  const defs = /* @__PURE__ */ new Map();
+  for (const file of fs3.readdirSync(channelsDir)) {
+    if (!file.endsWith(".json")) continue;
+    const id = file.replace(/\.json$/, "");
+    const raw = fs3.readFileSync(path3.join(channelsDir, file), "utf-8");
+    defs.set(id, JSON.parse(raw));
+  }
+  return defs;
+}
 async function runDeploy() {
   let config = loadServerConfig();
   if (!config) {
@@ -1117,7 +653,7 @@ async function runDeploy() {
   const dbName = `zooid-db-${serverSlug}`;
   const workerName = `zooid-${serverSlug}`;
   try {
-    execSync2("npx wrangler --version", { cwd: stagingDir, stdio: "pipe" });
+    execSync("npx wrangler --version", { cwd: stagingDir, stdio: "pipe" });
   } catch {
     printError("wrangler not found. Install with: npm install -g wrangler");
     process.exit(1);
@@ -1156,12 +692,12 @@ async function runDeploy() {
     const databaseId = dbIdMatch[1];
     printSuccess(`D1 database created (${databaseId})`);
     ejectWranglerToml({ workerName, dbName, databaseId, serverSlug });
-    fs5.copyFileSync(USER_WRANGLER_TOML, path4.join(stagingDir, "wrangler.toml"));
+    fs3.copyFileSync(USER_WRANGLER_TOML, path3.join(stagingDir, "wrangler.toml"));
     printSuccess(
       "Created wrangler.toml (edit to add vars, observability, etc.)"
     );
-    const schemaPath = path4.join(stagingDir, "src/db/schema.sql");
-    if (fs5.existsSync(schemaPath)) {
+    const schemaPath = path3.join(stagingDir, "src/db/schema.sql");
+    if (fs3.existsSync(schemaPath)) {
       printStep("Running database schema migration...");
       wrangler(
         `d1 execute ${dbName} --remote --file=${schemaPath}`,
@@ -1171,23 +707,23 @@ async function runDeploy() {
       printSuccess("Database schema initialized");
     }
     printStep("Generating secrets...");
-    const keyPair = await crypto3.subtle.generateKey("Ed25519", true, [
+    const keyPair = await crypto2.subtle.generateKey("Ed25519", true, [
       "sign",
       "verify"
     ]);
-    const privateKeyRaw = await crypto3.subtle.exportKey(
+    const privateKeyRaw = await crypto2.subtle.exportKey(
       "pkcs8",
       keyPair.privateKey
     );
-    const publicKeyRaw = await crypto3.subtle.exportKey(
+    const publicKeyRaw = await crypto2.subtle.exportKey(
       "raw",
       keyPair.publicKey
     );
-    const privateKeyJwk = await crypto3.subtle.exportKey(
+    const privateKeyJwk = await crypto2.subtle.exportKey(
       "jwk",
       keyPair.privateKey
     );
-    const publicKeyJwk = await crypto3.subtle.exportKey(
+    const publicKeyJwk = await crypto2.subtle.exportKey(
       "jwk",
       keyPair.publicKey
     );
@@ -1216,7 +752,7 @@ async function runDeploy() {
     console.log("");
     printInfo("Deploy type", "Redeploying existing server");
     console.log("");
-    if (!fs5.existsSync(USER_WRANGLER_TOML)) {
+    if (!fs3.existsSync(USER_WRANGLER_TOML)) {
       printStep("Ejecting wrangler.toml...");
       let databaseId = "";
       try {
@@ -1231,9 +767,9 @@ async function runDeploy() {
         "Created wrangler.toml (edit to add vars, observability, etc.)"
       );
     }
-    fs5.copyFileSync(USER_WRANGLER_TOML, path4.join(stagingDir, "wrangler.toml"));
-    const schemaPath = path4.join(stagingDir, "src/db/schema.sql");
-    if (fs5.existsSync(schemaPath)) {
+    fs3.copyFileSync(USER_WRANGLER_TOML, path3.join(stagingDir, "wrangler.toml"));
+    const schemaPath = path3.join(stagingDir, "src/db/schema.sql");
+    if (fs3.existsSync(schemaPath)) {
       printStep("Running schema migration...");
       wrangler(
         `d1 execute ${dbName} --remote --file=${schemaPath}`,
@@ -1242,11 +778,11 @@ async function runDeploy() {
       );
       printSuccess("Schema up to date");
     }
-    const migrationsDir = path4.join(stagingDir, "src/db/migrations");
-    if (fs5.existsSync(migrationsDir)) {
-      const migrationFiles = fs5.readdirSync(migrationsDir).filter((f) => f.endsWith(".sql")).sort();
+    const migrationsDir = path3.join(stagingDir, "src/db/migrations");
+    if (fs3.existsSync(migrationsDir)) {
+      const migrationFiles = fs3.readdirSync(migrationsDir).filter((f) => f.endsWith(".sql")).sort();
       for (const file of migrationFiles) {
-        const migrationPath = path4.join(migrationsDir, file);
+        const migrationPath = path3.join(migrationsDir, file);
         try {
           wrangler(
             `d1 execute ${dbName} --remote --file=${migrationPath}`,
@@ -1267,23 +803,23 @@ async function runDeploy() {
       const hasLocalKey = keysResult?.[0]?.results?.length > 0;
       if (!hasLocalKey) {
         printStep("Upgrading to EdDSA auth...");
-        const keyPair = await crypto3.subtle.generateKey("Ed25519", true, [
+        const keyPair = await crypto2.subtle.generateKey("Ed25519", true, [
           "sign",
           "verify"
         ]);
-        const privateKeyRaw = await crypto3.subtle.exportKey(
+        const privateKeyRaw = await crypto2.subtle.exportKey(
           "pkcs8",
           keyPair.privateKey
         );
-        const publicKeyRaw = await crypto3.subtle.exportKey(
+        const publicKeyRaw = await crypto2.subtle.exportKey(
           "raw",
           keyPair.publicKey
         );
-        const privateKeyJwk = await crypto3.subtle.exportKey(
+        const privateKeyJwk = await crypto2.subtle.exportKey(
           "jwk",
           keyPair.privateKey
         );
-        const publicKeyJwk = await crypto3.subtle.exportKey(
+        const publicKeyJwk = await crypto2.subtle.exportKey(
           "jwk",
           keyPair.publicKey
         );
@@ -1326,83 +862,703 @@ async function runDeploy() {
       process.exit(1);
     }
   }
-  printStep("Deploying worker...");
-  const deployOutput = wranglerVerbose("deploy", stagingDir, creds);
-  const { workerUrl, customDomain } = parseDeployUrls(deployOutput);
-  printSuccess("Worker deployed");
-  if (workerUrl) {
-    printInfo("Worker URL", workerUrl);
+  printStep("Deploying worker...");
+  const deployOutput = wranglerVerbose("deploy", stagingDir, creds);
+  const { workerUrl, customDomain } = parseDeployUrls(deployOutput);
+  printSuccess("Worker deployed");
+  if (workerUrl) {
+    printInfo("Worker URL", workerUrl);
+  }
+  if (customDomain) {
+    printInfo("Custom domain", customDomain);
+  }
+  const canonicalUrl = config.url || customDomain || workerUrl;
+  await new Promise((r) => setTimeout(r, 2e3));
+  if (canonicalUrl && adminToken) {
+    try {
+      const client = new ZooidClient({
+        server: canonicalUrl,
+        token: adminToken
+      });
+      await client.updateServerMeta({
+        name: config.name || void 0,
+        description: config.description || void 0,
+        tags: config.tags.length > 0 ? config.tags : void 0,
+        owner: config.owner || void 0,
+        company: config.company || void 0,
+        email: config.email || void 0
+      });
+      printSuccess("Server identity updated");
+    } catch (err) {
+      printError(
+        `Failed to push server identity: ${err instanceof Error ? err.message : err}`
+      );
+    }
+  }
+  if (!config.url && (customDomain || workerUrl)) {
+    config.url = customDomain || workerUrl;
+    saveServerConfig(config);
+    printSuccess("Saved URL to zooid.json");
+  }
+  const configToSave = {
+    worker_url: workerUrl || void 0,
+    admin_token: adminToken
+  };
+  if (isFirstDeploy) {
+    configToSave.channels = {};
+  }
+  saveConfig(configToSave, canonicalUrl || void 0);
+  printSuccess("Saved connection config to ~/.zooid/state.json");
+  cleanup(stagingDir);
+  console.log("");
+  console.log("  \u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500");
+  console.log("  \u{1FAB8} Zooid server deployed!");
+  console.log("  \u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500");
+  printInfo("Server", canonicalUrl || "(unknown)");
+  if (workerUrl && workerUrl !== canonicalUrl) {
+    printInfo("Worker URL", workerUrl);
+  }
+  printInfo("Name", config.name || "(not set)");
+  if (isFirstDeploy) {
+    printInfo("Admin token", adminToken.slice(0, 20) + "...");
+  }
+  printInfo("Config", "~/.zooid/state.json");
+  console.log("");
+  const channelDefs = loadChannelDefs();
+  if (channelDefs.size > 0) {
+    console.log(
+      `  Found ${channelDefs.size} channel definition(s) in channels/`
+    );
+    console.log("  Run npx zooid push to sync them to the server.");
+    console.log("");
+  } else if (isFirstDeploy) {
+    console.log("  Next steps:");
+    console.log("    Edit wrangler.toml to add env vars, observability, etc.");
+    console.log("    npx zooid channel create my-channel");
+    console.log(
+      `    npx zooid publish my-channel --data='{"hello": "world"}'`
+    );
+    console.log("");
+  }
+  if (canonicalUrl) {
+    try {
+      const openCmd = process.platform === "darwin" ? "open" : process.platform === "win32" ? "start" : "xdg-open";
+      execSync(`${openCmd} ${canonicalUrl}`, { stdio: "ignore" });
+    } catch {
+    }
+  }
+}
+function cleanup(dir) {
+  try {
+    fs3.rmSync(dir, { recursive: true, force: true });
+  } catch {
+  }
+}
+
+// src/commands/push.ts
+async function defaultConfirmDelete(orphaned) {
+  console.log("");
+  printInfo(
+    "Warning",
+    `${orphaned.length} channel(s) on server not in channels/:`
+  );
+  for (const ch of orphaned) {
+    printInfo("  -", `${ch.id}${ch.name ? ` (${ch.name})` : ""}`);
+  }
+  const rl = readline3.createInterface({
+    input: process.stdin,
+    output: process.stdout
+  });
+  try {
+    const answer = await ask(
+      rl,
+      "Delete these channels from server? (y/N)",
+      "N"
+    );
+    return answer.toLowerCase() === "y";
+  } finally {
+    rl.close();
+  }
+}
+async function runPush(client, options = {}) {
+  const localDefs = loadChannelDefs();
+  if (localDefs.size === 0) {
+    printInfo("Nothing to push", "no channel definitions in channels/");
+    return;
+  }
+  const c = client ?? createClient();
+  printStep("Syncing channels...");
+  const remoteChannels = await c.listChannels();
+  const remoteIds = new Set(remoteChannels.map((ch) => ch.id));
+  const localIds = new Set(localDefs.keys());
+  let created = 0;
+  let updated = 0;
+  let deleted = 0;
+  for (const [id, def] of localDefs) {
+    if (!remoteIds.has(id)) {
+      await c.createChannel({
+        id,
+        name: def.name ?? id,
+        description: def.description,
+        is_public: def.visibility === "public",
+        config: def.config
+      });
+      printSuccess(`Channel created: ${id}`);
+      created++;
+    }
+  }
+  for (const [id, def] of localDefs) {
+    if (remoteIds.has(id)) {
+      await c.updateChannel(id, {
+        name: def.name,
+        description: def.description,
+        is_public: def.visibility === "public",
+        config: def.config
+      });
+      printSuccess(`Channel updated: ${id}`);
+      updated++;
+    }
+  }
+  const orphaned = remoteChannels.filter((ch) => !localIds.has(ch.id));
+  if (orphaned.length > 0) {
+    const confirmFn = options.confirmDelete ?? defaultConfirmDelete;
+    const confirmed = await confirmFn(orphaned);
+    if (confirmed) {
+      for (const ch of orphaned) {
+        await c.deleteChannel(ch.id);
+        printSuccess(`Channel deleted: ${ch.id}`);
+        deleted++;
+      }
+    } else {
+      printInfo("Skipped", "Remote-only channels left unchanged");
+    }
+  }
+  if (created || updated || deleted) {
+    printSuccess(
+      `Channels synced (${created} created, ${updated} updated, ${deleted} deleted)`
+    );
+  } else {
+    printSuccess("Channels up to date");
+  }
+}
+
+// src/commands/pull.ts
+import fs4 from "fs";
+import path4 from "path";
+async function runPull(client) {
+  const c = client ?? createClient();
+  const channels = await c.listChannels();
+  if (channels.length === 0) {
+    printInfo("Nothing to pull", "no channels on server");
+    return [];
+  }
+  const channelsDir = path4.join(process.cwd(), "channels");
+  fs4.mkdirSync(channelsDir, { recursive: true });
+  printStep("Pulling channels...");
+  const written = [];
+  for (const ch of channels) {
+    const filePath = path4.join(channelsDir, `${ch.id}.json`);
+    const def = {
+      visibility: ch.is_public ? "public" : "private"
+    };
+    if (ch.name && ch.name !== ch.id) def.name = ch.name;
+    if (ch.description) def.description = ch.description;
+    if (ch.config) def.config = ch.config;
+    fs4.writeFileSync(filePath, JSON.stringify(def, null, 2) + "\n");
+    printSuccess(`channels/${ch.id}.json`);
+    written.push(ch.id);
+  }
+  printSuccess(`Pulled ${written.length} channel(s) into channels/`);
+  return written;
+}
+
+// src/commands/publish.ts
+import fs5 from "fs";
+async function runPublish(channelId, options, client) {
+  const c = client ?? createPublishClient(channelId);
+  let type;
+  let data;
+  if (options.file) {
+    const raw = fs5.readFileSync(options.file, "utf-8");
+    const parsed = JSON.parse(raw);
+    type = parsed.type;
+    data = parsed.data ?? parsed;
+  } else if (options.data) {
+    data = JSON.parse(options.data);
+    type = options.type;
+  } else {
+    throw new Error("Either --data or --file is required");
+  }
+  const publishOpts = { data };
+  if (type) publishOpts.type = type;
+  return c.publish(channelId, publishOpts);
+}
+
+// src/commands/subscribe.ts
+async function runSubscribePoll(channelId, options = {}, client) {
+  const c = client ?? createSubscribeClient(channelId);
+  const callback = options.callback ?? ((event) => {
+    console.log(JSON.stringify(event));
+  });
+  return c.subscribe(channelId, callback, {
+    interval: options.interval ?? 5e3,
+    mode: options.mode,
+    type: options.type
+  });
+}
+async function runSubscribeWebhook(channelId, url, client) {
+  const c = client ?? createSubscribeClient(channelId);
+  return c.registerWebhook(channelId, url);
+}
+
+// src/commands/tail.ts
+async function runTail(channelId, options = {}, client) {
+  const c = client ?? createSubscribeClient(channelId);
+  if (options.follow) {
+    return runTailFollow(c, channelId, options);
+  }
+  const pollOpts = {};
+  if (options.limit !== void 0) pollOpts.limit = options.limit;
+  if (options.type) pollOpts.type = options.type;
+  if (options.since) pollOpts.since = options.since;
+  if (options.cursor) pollOpts.cursor = options.cursor;
+  return c.tail(channelId, pollOpts);
+}
+async function runTailFollow(client, channelId, options) {
+  const tailOpts = {
+    follow: true,
+    mode: options.mode,
+    interval: options.interval,
+    type: options.type
+  };
+  const stream = client.tail(channelId, tailOpts);
+  for await (const event of stream) {
+    console.log(JSON.stringify(event));
+  }
+  return void 0;
+}
+
+// src/commands/status.ts
+async function runStatus(client) {
+  const c = client ?? createClient();
+  const [discovery, identity] = await Promise.all([
+    c.getMetadata(),
+    c.getServerMeta()
+  ]);
+  return { discovery, identity };
+}
+
+// src/commands/history.ts
+function runHistory() {
+  const file = loadConfigFile();
+  const entries = [];
+  if (!file.servers) return entries;
+  const seen = /* @__PURE__ */ new Map();
+  for (const [serverUrl, serverConfig] of Object.entries(file.servers)) {
+    if (!serverConfig.channels) continue;
+    const normalizedServer = normalizeServerUrl(serverUrl);
+    for (const [channelId, channelData] of Object.entries(
+      serverConfig.channels
+    )) {
+      if (!channelData.stats) continue;
+      const key = `${normalizedServer}\0${channelId}`;
+      const existingIdx = seen.get(key);
+      if (existingIdx !== void 0) {
+        const existing = entries[existingIdx];
+        existing.num_tails += channelData.stats.num_tails;
+        if (channelData.stats.last_tailed_at > existing.last_tailed_at) {
+          existing.last_tailed_at = channelData.stats.last_tailed_at;
+          existing.name = channelData.name ?? existing.name;
+        }
+        if (channelData.stats.first_tailed_at < existing.first_tailed_at) {
+          existing.first_tailed_at = channelData.stats.first_tailed_at;
+        }
+      } else {
+        seen.set(key, entries.length);
+        entries.push({
+          server: normalizedServer,
+          channel_id: channelId,
+          name: channelData.name,
+          num_tails: channelData.stats.num_tails,
+          last_tailed_at: channelData.stats.last_tailed_at,
+          first_tailed_at: channelData.stats.first_tailed_at
+        });
+      }
+    }
+  }
+  entries.sort(
+    (a, b) => new Date(b.last_tailed_at).getTime() - new Date(a.last_tailed_at).getTime()
+  );
+  return entries;
+}
+
+// src/commands/share.ts
+import readline4 from "readline/promises";
+
+// src/lib/directory.ts
+var DIRECTORY_BASE_URL = "https://directory.zooid.dev";
+var TOKEN_PREFIX = "zd_";
+var POLL_INTERVAL_MS = 3e3;
+var POLL_TIMEOUT_MS = 2 * 60 * 1e3;
+function getDirectoryToken() {
+  const token = loadDirectoryToken();
+  if (token && token.startsWith(TOKEN_PREFIX)) {
+    return token;
+  }
+  return void 0;
+}
+async function ensureDirectoryToken() {
+  const existing = getDirectoryToken();
+  if (existing) return existing;
+  return deviceAuth();
+}
+async function deviceAuth() {
+  const res = await fetch(`${DIRECTORY_BASE_URL}/api/auth/device`, {
+    method: "POST",
+    headers: { "Content-Type": "application/json" }
+  });
+  if (!res.ok) {
+    throw new Error(`Directory auth failed: ${res.status} ${res.statusText}`);
+  }
+  const data = await res.json();
+  const { device_code, verification_url } = data;
+  console.log("");
+  printInfo("Authorize", verification_url);
+  console.log("  Opening browser to complete GitHub sign-in...\n");
+  try {
+    const { exec } = await import("child_process");
+    const platform = process.platform;
+    const cmd = platform === "darwin" ? "open" : platform === "win32" ? "start" : "xdg-open";
+    exec(`${cmd} "${verification_url}"`);
+  } catch {
+    console.log(
+      "  Could not open browser automatically. Please visit the URL above.\n"
+    );
+  }
+  const deadline = Date.now() + POLL_TIMEOUT_MS;
+  while (Date.now() < deadline) {
+    await sleep(POLL_INTERVAL_MS);
+    const statusRes = await fetch(
+      `${DIRECTORY_BASE_URL}/api/auth/status?code=${encodeURIComponent(device_code)}`
+    );
+    if (!statusRes.ok) continue;
+    const status = await statusRes.json();
+    if (status.status === "complete" && status.token) {
+      saveDirectoryToken(status.token);
+      console.log("  Authenticated with Zooid Directory.\n");
+      return status.token;
+    }
+    if (status.status === "expired") {
+      throw new Error("Device authorization expired. Please try again.");
+    }
+  }
+  throw new Error(
+    "Authorization timed out. You need your human to authorize you. Run `npx zooid share` again to retry."
+  );
+}
+async function directoryFetch(path6, options = {}) {
+  let token = await ensureDirectoryToken();
+  const doFetch = (t) => {
+    const headers = new Headers(options.headers);
+    headers.set("Authorization", `Bearer ${t}`);
+    headers.set("Content-Type", "application/json");
+    return fetch(`${DIRECTORY_BASE_URL}${path6}`, { ...options, headers });
+  };
+  let res = await doFetch(token);
+  if (res.status === 401) {
+    console.log("  Directory token expired. Re-authenticating...\n");
+    token = await deviceAuth();
+    res = await doFetch(token);
+  }
+  return res;
+}
+function sleep(ms) {
+  return new Promise((resolve) => setTimeout(resolve, ms));
+}
+async function formatDirectoryError(res) {
+  let msg = `Directory returned ${res.status}`;
+  try {
+    const body = await res.json();
+    const parts = [];
+    if (body.error) parts.push(String(body.error));
+    if (body.message) parts.push(String(body.message));
+    if (parts.length > 0) msg = parts.join(": ");
+  } catch {
+  }
+  return msg;
+}
+
+// src/commands/share.ts
+async function runShare(channelIds, options = {}) {
+  const client = createClient();
+  const config = loadConfig();
+  const serverUrl = config.server;
+  if (!serverUrl) {
+    throw new Error(
+      "No server configured. Run: npx zooid config set server <url>"
+    );
+  }
+  const allChannels = await client.listChannels();
+  const publicChannels = allChannels.filter((ch) => ch.is_public);
+  if (publicChannels.length === 0) {
+    throw new Error("No public channels found on this server.");
+  }
+  let selected;
+  if (channelIds.length > 0) {
+    const byId = new Map(allChannels.map((ch) => [ch.id, ch]));
+    const missing = [];
+    selected = [];
+    for (const id of channelIds) {
+      const ch = byId.get(id);
+      if (!ch) {
+        missing.push(id);
+      } else {
+        selected.push(ch);
+      }
+    }
+    if (missing.length > 0) {
+      throw new Error(`Channels not found: ${missing.join(", ")}`);
+    }
+    const privateChannels = selected.filter((ch) => !ch.is_public);
+    if (privateChannels.length > 0) {
+      throw new Error(
+        `Cannot share private channels: ${privateChannels.map((ch) => ch.id).join(", ")}. Only public channels can be listed in the directory.`
+      );
+    }
+  } else if (options.yes) {
+    selected = publicChannels;
+  } else {
+    selected = await pickChannels(publicChannels);
+    if (selected.length === 0) {
+      throw new Error("No channels selected.");
+    }
+  }
+  const channelDetails = await promptChannelDetails(selected, options.yes);
+  const ids = selected.map((ch) => ch.id);
+  const { claim, signature } = await client.getClaim(ids);
+  const channels = selected.map((ch) => {
+    const details = channelDetails.get(ch.id);
+    const entry = {
+      channel_id: ch.id,
+      name: ch.name
+    };
+    if (details.description) entry.description = details.description;
+    if (details.tags.length > 0) entry.tags = details.tags;
+    return entry;
+  });
+  const res = await directoryFetch("/api/servers", {
+    method: "POST",
+    body: JSON.stringify({ server_url: serverUrl, claim, signature, channels })
+  });
+  if (!res.ok) {
+    throw new Error(await formatDirectoryError(res));
+  }
+  await res.json();
+  console.log("");
+  for (const ch of selected) {
+    console.log(`  ${ch.id} \u2192 ${serverUrl}/${ch.id}`);
   }
-  if (customDomain) {
-    printInfo("Custom domain", customDomain);
+  console.log("");
+  console.log(`  Any zooid can find your channel using:`);
+  console.log(`    npx zooid discover --query ${selected[0].id}`);
+  const tags = [
+    ...new Set(selected.flatMap((ch) => channelDetails.get(ch.id)?.tags ?? []))
+  ];
+  if (tags.length > 0) {
+    console.log(`    npx zooid discover --tag ${tags[0]}`);
   }
-  const canonicalUrl = config.url || customDomain || workerUrl;
-  await new Promise((r) => setTimeout(r, 2e3));
-  if (canonicalUrl && adminToken) {
-    try {
-      const client = new ZooidClient({
-        server: canonicalUrl,
-        token: adminToken
-      });
-      await client.updateServerMeta({
-        name: config.name || void 0,
-        description: config.description || void 0,
-        tags: config.tags.length > 0 ? config.tags : void 0,
-        owner: config.owner || void 0,
-        company: config.company || void 0,
-        email: config.email || void 0
+  console.log("");
+}
+async function pickChannels(channels) {
+  const { default: checkbox } = await import("@inquirer/checkbox");
+  const selected = await checkbox({
+    message: "Select channels to share",
+    choices: channels.map((ch) => ({
+      name: ch.description ? `${ch.id} \u2014 ${ch.description}` : ch.id,
+      value: ch.id,
+      checked: true
+    })),
+    theme: {
+      icon: { cursor: "> " },
+      style: { highlight: (text) => text }
+    }
+  });
+  const selectedSet = new Set(selected);
+  return channels.filter((ch) => selectedSet.has(ch.id));
+}
+async function promptChannelDetails(channels, skipPrompt) {
+  const result = /* @__PURE__ */ new Map();
+  if (skipPrompt) {
+    for (const ch of channels) {
+      result.set(ch.id, {
+        description: ch.description ?? "",
+        tags: ch.tags
       });
-      printSuccess("Server identity updated");
-    } catch (err) {
-      printError(
-        `Failed to push server identity: ${err instanceof Error ? err.message : err}`
+    }
+    return result;
+  }
+  const rl = readline4.createInterface({
+    input: process.stdin,
+    output: process.stdout
+  });
+  try {
+    console.log("");
+    console.log("  Set description and tags for each channel.");
+    console.log("  Press Enter to accept defaults shown in [brackets].\n");
+    for (const ch of channels) {
+      console.log(`  ${ch.id}:`);
+      const desc = await ask(rl, "Description", ch.description ?? "");
+      const tagsRaw = await ask(
+        rl,
+        "Tags (comma-separated)",
+        ch.tags.join(", ")
       );
+      const tags = tagsRaw.split(",").map((t) => t.trim()).filter(Boolean);
+      result.set(ch.id, { description: desc, tags });
+      console.log("");
     }
+  } finally {
+    rl.close();
   }
-  if (!config.url && (customDomain || workerUrl)) {
-    config.url = customDomain || workerUrl;
-    saveServerConfig(config);
-    printSuccess("Saved URL to zooid.json");
+  return result;
+}
+
+// src/commands/unshare.ts
+async function runUnshare(channelId) {
+  const client = createClient();
+  const config = loadConfig();
+  const serverUrl = config.server;
+  if (!serverUrl) {
+    throw new Error(
+      "No server configured. Run: npx zooid config set server <url>"
+    );
   }
-  const configToSave = {
-    worker_url: workerUrl || void 0,
-    admin_token: adminToken
-  };
-  if (isFirstDeploy) {
-    configToSave.channels = {};
+  const { claim, signature } = await client.getClaim([channelId], "delete");
+  const res = await directoryFetch("/api/servers/channels", {
+    method: "DELETE",
+    body: JSON.stringify({
+      server_url: serverUrl,
+      channel_id: channelId,
+      claim,
+      signature
+    })
+  });
+  if (!res.ok) {
+    throw new Error(await formatDirectoryError(res));
   }
-  saveConfig(configToSave, canonicalUrl || void 0);
-  printSuccess("Saved connection config to ~/.zooid/state.json");
-  cleanup(stagingDir);
-  console.log("");
-  console.log("  \u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500");
-  console.log("  \u{1FAB8} Zooid server deployed!");
-  console.log("  \u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500");
-  printInfo("Server", canonicalUrl || "(unknown)");
-  if (workerUrl && workerUrl !== canonicalUrl) {
-    printInfo("Worker URL", workerUrl);
+}
+
+// src/commands/discover.ts
+async function runDiscover(options) {
+  const params = new URLSearchParams();
+  if (options.query) params.set("q", options.query);
+  if (options.tag) params.set("tag", options.tag);
+  if (options.limit) params.set("limit", String(options.limit));
+  const qs = params.toString();
+  const url = `${DIRECTORY_BASE_URL}/api/discover${qs ? `?${qs}` : ""}`;
+  const res = await fetch(url);
+  if (!res.ok) {
+    throw new Error(`Directory returned ${res.status}`);
   }
-  printInfo("Name", config.name || "(not set)");
-  if (isFirstDeploy) {
-    printInfo("Admin token", adminToken.slice(0, 20) + "...");
+  const data = await res.json();
+  if (data.channels.length === 0) {
+    console.log("No channels found.");
+    return;
   }
-  printInfo("Config", "~/.zooid/state.json");
   console.log("");
-  if (isFirstDeploy) {
-    console.log("  Next steps:");
-    console.log("    Edit wrangler.toml to add env vars, observability, etc.");
-    console.log("    npx zooid channel create my-channel");
-    console.log(
-      `    npx zooid publish my-channel --data='{"hello": "world"}'`
-    );
-    console.log("");
+  for (const ch of data.channels) {
+    const host = new URL(ch.server_url).host;
+    const tags = ch.tags.length > 0 ? ` [${ch.tags.join(", ")}]` : "";
+    const desc = ch.description ? ` \u2014 ${ch.description}` : "";
+    console.log(`  ${host}/${ch.channel_id}${desc}${tags}`);
   }
+  console.log(`
+  ${data.total} channel${data.total === 1 ? "" : "s"} found.`);
+  console.log("");
 }
-function cleanup(dir) {
-  try {
-    fs5.rmSync(dir, { recursive: true, force: true });
-  } catch {
+
+// src/commands/server.ts
+async function runServerGet(client) {
+  const c = client ?? createClient();
+  return c.getServerMeta();
+}
+async function runServerSet(fields, client) {
+  const c = client ?? createClient();
+  return c.updateServerMeta(fields);
+}
+
+// src/commands/token.ts
+async function runTokenMint(scopes, options) {
+  const client = createClient();
+  const body = { scopes };
+  if (options.sub) body.sub = options.sub;
+  if (options.name) body.name = options.name;
+  if (options.expiresIn) body.expires_in = options.expiresIn;
+  return client.mintToken(body);
+}
+
+// src/commands/dev.ts
+import { execSync as execSync2, spawn as spawn2 } from "child_process";
+import crypto3 from "crypto";
+import fs6 from "fs";
+import path5 from "path";
+import { fileURLToPath } from "url";
+function findServerDir() {
+  const cliDir = path5.dirname(fileURLToPath(import.meta.url));
+  return path5.resolve(cliDir, "../../server");
+}
+async function runDev(port = 8787) {
+  const serverDir = findServerDir();
+  if (!fs6.existsSync(path5.join(serverDir, "wrangler.toml"))) {
+    throw new Error(
+      `Server directory not found at ${serverDir}. Make sure you're running from the zooid monorepo.`
+    );
+  }
+  const jwtSecret = crypto3.randomUUID();
+  const devVarsPath = path5.join(serverDir, ".dev.vars");
+  fs6.writeFileSync(devVarsPath, `ZOOID_JWT_SECRET=${jwtSecret}
+`);
+  const adminToken = await createAdminToken(jwtSecret);
+  const serverUrl = `http://localhost:${port}`;
+  saveConfig({ admin_token: adminToken }, serverUrl);
+  const schemaPath = path5.join(serverDir, "src/db/schema.sql");
+  if (fs6.existsSync(schemaPath)) {
+    try {
+      execSync2(
+        `npx wrangler d1 execute zooid-db --local --file=${schemaPath}`,
+        {
+          cwd: serverDir,
+          stdio: "pipe"
+        }
+      );
+      printSuccess("Database schema initialized");
+    } catch {
+      printSuccess("Database ready (schema already exists)");
+    }
   }
+  printSuccess("Local server configured");
+  printInfo("Server", serverUrl);
+  printInfo("Admin token", adminToken.slice(0, 20) + "...");
+  printInfo("Config saved to", "~/.zooid/state.json");
+  console.log("");
+  console.log("Starting wrangler dev...");
+  console.log("");
+  const child = spawn2(
+    "npx",
+    ["wrangler", "dev", "--local", "--port", String(port)],
+    {
+      cwd: serverDir,
+      stdio: "inherit",
+      shell: true
+    }
+  );
+  child.on("error", (err) => {
+    console.error(`Failed to start local server: ${err.message}`);
+    process.exit(1);
+  });
+  child.on("exit", (code) => {
+    process.exit(code ?? 0);
+  });
 }
 
 // src/index.ts
@@ -1428,7 +1584,7 @@ async function resolveAndRecord(channel, opts) {
   return result;
 }
 var program = new Command();
-program.name("zooid").description("\u{1FAB8} Pub/sub for AI agents").version("0.4.0");
+program.name("zooid").description("\u{1FAB8} Pub/sub for AI agents").version("0.5.1");
 var telemetryCtx = { startTime: 0 };
 function setTelemetryChannel(channelId) {
   telemetryCtx.channelId = channelId;
@@ -1541,12 +1697,12 @@ channelCmd.command("create <id>").description("Create a new channel").option("--
   try {
     let config;
     if (opts.config) {
-      const fs6 = await import("fs");
-      const raw = fs6.readFileSync(opts.config, "utf-8");
+      const fs7 = await import("fs");
+      const raw = fs7.readFileSync(opts.config, "utf-8");
       config = JSON.parse(raw);
     } else if (opts.schema) {
-      const fs6 = await import("fs");
-      const raw = fs6.readFileSync(opts.schema, "utf-8");
+      const fs7 = await import("fs");
+      const raw = fs7.readFileSync(opts.schema, "utf-8");
       const parsed = JSON.parse(raw);
       const types = {};
       for (const [eventType, schemaDef] of Object.entries(parsed)) {
@@ -1583,12 +1739,12 @@ channelCmd.command("update <id>").description("Update a channel").option("--name
     if (opts.public) fields.is_public = true;
     if (opts.private) fields.is_public = false;
     if (opts.config) {
-      const fs6 = await import("fs");
-      const raw = fs6.readFileSync(opts.config, "utf-8");
+      const fs7 = await import("fs");
+      const raw = fs7.readFileSync(opts.config, "utf-8");
       fields.config = JSON.parse(raw);
     } else if (opts.schema) {
-      const fs6 = await import("fs");
-      const raw = fs6.readFileSync(opts.schema, "utf-8");
+      const fs7 = await import("fs");
+      const raw = fs7.readFileSync(opts.schema, "utf-8");
       const parsed = JSON.parse(raw);
       const types = {};
       for (const [eventType, schemaDef] of Object.entries(parsed)) {
@@ -1634,8 +1790,8 @@ channelCmd.command("list").description("List all channels").action(async () => {
 channelCmd.command("delete <id>").description("Delete a channel and all its data").option("-y, --yes", "Skip confirmation prompt").action(async (id, opts) => {
   try {
     if (!opts.yes) {
-      const readline4 = await import("readline");
-      const rl = readline4.createInterface({
+      const readline5 = await import("readline");
+      const rl = readline5.createInterface({
         input: process.stdin,
         output: process.stdout
       });
@@ -1657,6 +1813,20 @@ channelCmd.command("delete <id>").description("Delete a channel and all its data
     handleError("channel delete", err);
   }
 });
+program.command("push").description("Push local channel definitions (channels/) to server").action(async () => {
+  try {
+    await runPush();
+  } catch (err) {
+    handleError("push", err);
+  }
+});
+program.command("pull").description("Pull channel definitions from server into channels/").action(async () => {
+  try {
+    await runPull();
+  } catch (err) {
+    handleError("pull", err);
+  }
+});
 program.command("publish <channel>").description("Publish an event to a channel").option("--type <type>", "Event type").option("--data <json>", "Event data as JSON string").option("--file <path>", "Read event from JSON file").option("--token <token>", "Auth token (for remote/private channels)").action(async (channel, opts) => {
   try {
     const { client, channelId, tokenSaved } = resolveChannel(channel, {
@@ -1682,8 +1852,8 @@ program.command("delete-event <channel> <event-id>").description("Delete a singl
       tokenType: "publish"
     });
     if (!opts.yes) {
-      const readline4 = await import("readline");
-      const rl = readline4.createInterface({
+      const readline5 = await import("readline");
+      const rl = readline5.createInterface({
         input: process.stdin,
         output: process.stdout
       });