@pmate/cli 0.21.0 → 0.21.1

package/dist/index.js

@@ -12659,16 +12659,23 @@ function readSessionToken() {
     preferredApp: DEFAULT_APP_ID
   }).token;
 }
-function unwrapAgentResult(value) {
+function unwrapAgentResult(agentId, value) {
   if (!value || typeof value !== "object") {
+    if (value == null) {
+      throw new Error(`Agent ${agentId} returned no result`);
+    }
     return value;
   }
   if ("content" in value && "type" in value) {
-    return value.content ?? null;
+    const content = value.content;
+    if (content == null) {
+      throw new Error(`Agent ${agentId} returned empty envelope content`);
+    }
+    return content;
   }
   return value;
 }
-var import_agent_sdk, DEFAULT_AGENT_API_BASE_URL, DEFAULT_AGENT_HUB_BASE_URL, DEFAULT_NAMESPACE, DEFAULT_FROM, AgentLlmClient;
+var import_agent_sdk, DEFAULT_AGENT_API_BASE_URL, DEFAULT_AGENT_HUB_BASE_URL, DEFAULT_NAMESPACE, DEFAULT_FROM, DEFAULT_AGENT_PROMPT_TIMEOUT_MS, AgentLlmClient;
 var init_AgentLlmClient = __esm({
   "src/llm/AgentLlmClient.ts"() {
     "use strict";
@@ -12678,6 +12685,7 @@ var init_AgentLlmClient = __esm({
     DEFAULT_AGENT_HUB_BASE_URL = "https://hub.pmate.chat";
     DEFAULT_NAMESPACE = "pmate-cli";
     DEFAULT_FROM = "pmate-cli";
+    DEFAULT_AGENT_PROMPT_TIMEOUT_MS = 12e4;
     AgentLlmClient = class {
       constructor(options) {
         this.token = options?.token ?? readSessionToken();
@@ -12696,7 +12704,8 @@ var init_AgentLlmClient = __esm({
       async call(agentId, payload, options) {
         const client = new import_agent_sdk.AgentClient({
           baseUrl: options?.hubBaseUrl ?? this.hubBaseUrl,
-          agentService: this.agentService
+          agentService: this.agentService,
+          timeoutMs: DEFAULT_AGENT_PROMPT_TIMEOUT_MS
         });
         try {
           await client.login(options?.from ?? this.from, {
@@ -12706,7 +12715,7 @@ var init_AgentLlmClient = __esm({
             agentId,
             payload
           });
-          return unwrapAgentResult(result);
+          return unwrapAgentResult(agentId, result);
         } finally {
           client.close();
         }
@@ -12721,8 +12730,8 @@ __export(index_exports, {
   parseCommandArgs: () => parseCommandArgs
 });
 module.exports = __toCommonJS(index_exports);
-var import_node_fs16 = require("fs");
-var import_node_path21 = __toESM(require("path"));
+var import_node_fs17 = require("fs");
+var import_node_path22 = __toESM(require("path"));
 var import_chalk4 = __toESM(require("chalk"));
 
 // src/cli.ts
@@ -17621,9 +17630,9 @@ ${indent}\`\`\``;
   static richTextToPlain(richText) {
     return richText.map((item) => item.plain_text ?? item.text?.content ?? "").join("").trim();
   }
-  static async requestJson(path22, init) {
+  static async requestJson(path23, init) {
     const token = this.getToken();
-    const response = await fetch(`${this.baseUrl}${path22}`, {
+    const response = await fetch(`${this.baseUrl}${path23}`, {
       method: init.method,
       headers: {
         Authorization: `Bearer ${token}`,
@@ -18660,15 +18669,72 @@ var QuizCommandHandler = class {
 
 // src/commands/CollectCommandHandler.ts
 var import_playwright = require("playwright");
+var import_node_crypto4 = require("crypto");
+var import_node_fs11 = require("fs");
+var import_node_os6 = __toESM(require("os"));
+var import_node_path16 = __toESM(require("path"));
+
+// src/collectStore.ts
 var import_node_crypto3 = require("crypto");
 var import_node_fs10 = require("fs");
 var import_node_os5 = __toESM(require("os"));
 var import_node_path15 = __toESM(require("path"));
+function resolveCollectTarget(input) {
+  const endpoint = input.endpoint ?? (input.source === "cc" ? "http://localhost:9223" : "http://localhost:9222");
+  const sourceKey = input.source ?? `endpoint-${(0, import_node_crypto3.createHash)("sha1").update(endpoint).digest("hex").slice(0, 8)}`;
+  const rootDir = import_node_path15.default.join(import_node_os5.default.homedir(), ".pmate", "collect", sourceKey);
+  return { sourceKey, endpoint, rootDir };
+}
+function toThreadKey(name) {
+  const normalized = name.trim().toLowerCase().replace(/[^a-z0-9\u4e00-\u9fff]+/g, "-").replace(/^-+|-+$/g, "");
+  const base = normalized || "thread";
+  const suffix = (0, import_node_crypto3.createHash)("sha1").update(name).digest("hex").slice(0, 8);
+  return `${base}-${suffix}`;
+}
+async function readStoredThread(rootDir, threadKey) {
+  const filePath = getThreadFilePath(rootDir, threadKey);
+  try {
+    const raw = await import_node_fs10.promises.readFile(filePath, "utf8");
+    return JSON.parse(raw);
+  } catch {
+    return null;
+  }
+}
+async function writeStoredThread(rootDir, thread) {
+  const filePath = getThreadFilePath(rootDir, thread.threadKey);
+  await import_node_fs10.promises.mkdir(import_node_path15.default.dirname(filePath), { recursive: true });
+  await import_node_fs10.promises.writeFile(filePath, JSON.stringify(thread, null, 2) + "\n", "utf8");
+}
+async function writeStoredIndex(rootDir, index) {
+  await import_node_fs10.promises.mkdir(rootDir, { recursive: true });
+  const filePath = import_node_path15.default.join(rootDir, "index.json");
+  await import_node_fs10.promises.writeFile(filePath, JSON.stringify(index, null, 2) + "\n", "utf8");
+}
+function mergeMessages(existing, incoming) {
+  const seen = new Set(existing.map((message) => message.hash));
+  const merged = [...existing];
+  let added = 0;
+  for (const message of incoming) {
+    if (seen.has(message.hash)) {
+      continue;
+    }
+    seen.add(message.hash);
+    merged.push(message);
+    added += 1;
+  }
+  return { messages: merged, added };
+}
+function getThreadFilePath(rootDir, threadKey) {
+  return import_node_path15.default.join(rootDir, "threads", `${threadKey}.json`);
+}
+
+// src/commands/CollectCommandHandler.ts
 var CollectCommandHandler = class {
   async handle(args) {
     let browser = null;
     try {
-      browser = await import_playwright.chromium.connectOverCDP(args.endpoint);
+      const target = resolveCollectTarget(args);
+      browser = await import_playwright.chromium.connectOverCDP(target.endpoint);
       const targetPage = await this.pickTargetPage(
         browser.contexts().flatMap((context) => context.pages())
       );
@@ -18677,36 +18743,20 @@ var CollectCommandHandler = class {
       }
       const { rows } = await this.locateThreadRows(targetPage);
       const threads = await this.extractThreads(rows);
-      if (args.mode === "list") {
-        if (args.json) {
-          ui.plain(JSON.stringify({ total: threads.length, threads }, null, 2));
-          return;
-        }
-        this.printThreadList(threads);
-        return;
-      }
-      const matched = this.findThread(threads, args.threadName || "");
-      if (!matched) {
-        throw new Error(`Thread not found: ${args.threadName}`);
-      }
-      await this.clickThreadRow(rows, matched);
-      await targetPage.waitForTimeout(1200);
-      const messages = await this.extractMessages(targetPage, matched.name);
-      if (args.json) {
-        ui.plain(
-          JSON.stringify(
-            {
-              thread: matched,
-              totalMessages: messages.length,
-              messages
-            },
-            null,
-            2
-          )
-        );
-        return;
-      }
-      this.printThreadMessages(matched, messages);
+      if (threads.length === 0) {
+        throw new Error("No threads found in target page.");
+      }
+      const syncedAt = (/* @__PURE__ */ new Date()).toISOString();
+      const results = [];
+      for (const thread of threads) {
+        await this.clickThreadRow(rows, thread);
+        await targetPage.waitForTimeout(1200);
+        const messages = await this.extractMessages(targetPage, thread.name);
+        const result = await this.persistThread(target.rootDir, target, thread, messages, syncedAt);
+        results.push(result);
+      }
+      await this.writeIndex(target.rootDir, target, results, syncedAt);
+      this.printSyncSummary(target.sourceKey, target.rootDir, threads.length, results);
     } catch (error) {
       const message = error instanceof Error ? error.message : String(error);
       throw new Error(`collect failed: ${message}`);
@@ -18714,6 +18764,67 @@ var CollectCommandHandler = class {
       await browser?.close().catch(() => void 0);
     }
   }
+  async persistThread(rootDir, target, thread, messages, syncedAt) {
+    const threadKey = toThreadKey(thread.name);
+    const existing = await readStoredThread(rootDir, threadKey);
+    const incoming = messages.map((message) => ({
+      hash: message.hash,
+      time: message.time,
+      sender: message.sender,
+      content: message.content,
+      links: [...message.links],
+      images: [...message.images],
+      collectedAt: syncedAt
+    }));
+    const merged = mergeMessages(existing?.messages ?? [], incoming);
+    const stored = {
+      source: target.sourceKey,
+      endpoint: target.endpoint,
+      threadKey,
+      threadName: thread.name,
+      preview: thread.preview,
+      unread: thread.unread,
+      lastMessageAt: thread.time,
+      lastSyncedAt: syncedAt,
+      messageCount: merged.messages.length,
+      messages: merged.messages
+    };
+    await writeStoredThread(rootDir, stored);
+    return {
+      thread: stored,
+      addedMessages: merged.added,
+      updated: merged.added > 0 || !existing || existing.preview !== stored.preview || existing.unread !== stored.unread || existing.lastMessageAt !== stored.lastMessageAt
+    };
+  }
+  async writeIndex(rootDir, target, results, syncedAt) {
+    const threads = results.map(({ thread }) => ({
+      threadKey: thread.threadKey,
+      name: thread.threadName,
+      unread: thread.unread,
+      preview: thread.preview,
+      lastMessageAt: thread.lastMessageAt,
+      messageCount: thread.messageCount,
+      lastSyncedAt: thread.lastSyncedAt
+    })).sort((left, right) => left.name.localeCompare(right.name));
+    const messageCount = threads.reduce((sum, thread) => sum + thread.messageCount, 0);
+    await writeStoredIndex(rootDir, {
+      source: target.sourceKey,
+      endpoint: target.endpoint,
+      lastSyncedAt: syncedAt,
+      threadCount: threads.length,
+      messageCount,
+      threads
+    });
+  }
+  printSyncSummary(sourceKey, rootDir, scannedThreads, results) {
+    const updatedThreads = results.filter((result) => result.updated).length;
+    const newMessages = results.reduce((sum, result) => sum + result.addedMessages, 0);
+    ui.plain(`Synced source: ${sourceKey}`);
+    ui.plain(`Threads scanned: ${scannedThreads}`);
+    ui.plain(`Threads updated: ${updatedThreads}`);
+    ui.plain(`New messages: ${newMessages}`);
+    ui.plain(`Saved under: ${rootDir}`);
+  }
   async pickTargetPage(pages) {
     let best = null;
     for (const page of pages) {
@@ -18730,7 +18841,7 @@ var CollectCommandHandler = class {
   async locateThreadRows(page) {
     const preferred = page.locator(".ReactVirtualized__Grid__innerScrollContainer").first();
     const preferredCount = await preferred.locator(":scope > *").count().catch(() => 0);
-    if (preferredCount >= 5) {
+    if (preferredCount >= 1) {
       return { rows: preferred.locator(":scope > *") };
     }
     const seeds = [
@@ -18750,7 +18861,7 @@ var CollectCommandHandler = class {
       for (let i = 0; i < max; i += 1) {
         const rows = containers.nth(i).locator(":scope > *");
         const rowCount = await rows.count().catch(() => 0);
-        if (rowCount < 5 || rowCount > 500) {
+        if (rowCount < 1 || rowCount > 500) {
           continue;
         }
         const textCount = await containers.nth(i).locator("text=/./").count().catch(() => 0);
@@ -18784,21 +18895,7 @@ var CollectCommandHandler = class {
       ) ?? "";
       result.push({ index: i, name, unread, preview, time });
     }
-    return result;
-  }
-  findThread(threads, name) {
-    const target = normalizeText(name).toLowerCase();
-    if (!target) {
-      return null;
-    }
-    const exact = threads.find((thread) => thread.name.toLowerCase() === target);
-    if (exact) {
-      return exact;
-    }
-    const contains = threads.find(
-      (thread) => thread.name.toLowerCase().includes(target) || target.includes(thread.name.toLowerCase())
-    );
-    return contains ?? null;
+    return dedupeThreads(result);
   }
   async extractMessages(page, threadName) {
     const container = await this.locateMessageContainer(page);
@@ -18841,17 +18938,14 @@ var CollectCommandHandler = class {
     return messages;
   }
   async clickThreadRow(rows, matched) {
-    const exactInRows = rows.filter({ hasText: matched.name }).first();
-    const exactCount = await exactInRows.count().catch(() => 0);
-    if (exactCount > 0) {
-      const clicked2 = await this.tryClick(exactInRows);
-      if (clicked2) {
+    const row = rows.nth(matched.index);
+    const clicked = await this.tryClick(row);
+    if (!clicked) {
+      const exactInRows = rows.filter({ hasText: matched.name }).first();
+      const exactCount = await exactInRows.count().catch(() => 0);
+      if (exactCount > 0 && await this.tryClick(exactInRows)) {
         return;
       }
-    }
-    const fallback = rows.nth(matched.index);
-    const clicked = await this.tryClick(fallback);
-    if (!clicked) {
       throw new Error(`Failed to select thread row: ${matched.name}`);
     }
   }
@@ -18990,31 +19084,20 @@ var CollectCommandHandler = class {
     }
     return candidates[0] ?? "";
   }
-  printThreadList(threads) {
-    for (const thread of threads) {
-      const unread = thread.unread > 0 ? ` (${thread.unread})` : "";
-      const preview = thread.preview ? ` - ${thread.preview}` : "";
-      ui.plain(`- ${thread.name}${unread}${preview}`);
-    }
-  }
-  printThreadMessages(thread, messages) {
-    const unread = thread.unread > 0 ? thread.unread : messages.length;
-    ui.plain(`## ${thread.name} (${unread})`);
-    for (const message of messages) {
-      ui.plain("-");
-      ui.plain(`  time: ${message.time ?? ""}`);
-      ui.plain(`  sender: ${message.sender ?? ""}`);
-      ui.plain(`  content: ${message.content}`);
-      ui.plain(`  hash: ${message.hash}`);
-      ui.plain(
-        `  links: ${message.links.length > 0 ? message.links.join(", ") : ""}`
-      );
-      ui.plain(
-        `  images: ${message.images.length > 0 ? message.images.join(", ") : ""}`
-      );
+};
+function dedupeThreads(threads) {
+  const seen = /* @__PURE__ */ new Set();
+  const result = [];
+  for (const thread of threads) {
+    const key = `${thread.name}::${thread.preview}::${thread.time ?? ""}`;
+    if (seen.has(key)) {
+      continue;
     }
+    seen.add(key);
+    result.push(thread);
   }
-};
+  return result;
+}
 function normalizeText(value) {
   return value.replace(/\s+/g, " ").replace(/\u200B/g, "").trim();
 }
@@ -19027,22 +19110,46 @@ function computeMessageHash(threadName, message) {
     message.links.map(normalizeText).join("|"),
     message.images.map(normalizeText).join("|")
   ].join("||");
-  return (0, import_node_crypto3.createHash)("sha1").update(base).digest("hex").slice(0, 16);
+  return (0, import_node_crypto4.createHash)("sha1").update(base).digest("hex").slice(0, 16);
+}
+function parseMessageText(rawText) {
+  const text = normalizeText(rawText);
+  if (!text) {
+    return { time: null, sender: null, content: "" };
+  }
+  const timeMatch = text.match(/^(\d{1,2}:\d{2}\s?(?:AM|PM)?)\s+(.*)$/i) ?? text.match(/^(\d{1,2}\/\d{1,2}|\d{4}\/\d{1,2}\/\d{1,2})\s+(.*)$/);
+  if (!timeMatch) {
+    return { time: null, sender: null, content: text };
+  }
+  const time = timeMatch[1];
+  const rest = normalizeText(timeMatch[2] ?? "");
+  if (!rest) {
+    return { time, sender: null, content: "" };
+  }
+  const senderMatch = rest.match(/^([^:]{1,80}):\s*(.*)$/);
+  if (!senderMatch) {
+    return { time, sender: null, content: rest };
+  }
+  return {
+    time,
+    sender: normalizeText(senderMatch[1] ?? "") || null,
+    content: normalizeText(senderMatch[2] ?? "")
+  };
 }
 async function toDisplayableImagePath(src) {
-  if (!import_node_path15.default.isAbsolute(src)) {
+  if (!import_node_path16.default.isAbsolute(src)) {
     return src;
   }
-  const ext = import_node_path15.default.extname(src);
+  const ext = import_node_path16.default.extname(src);
   if (ext) {
     return src;
   }
   try {
-    const stat = await import_node_fs10.promises.stat(src);
+    const stat = await import_node_fs11.promises.stat(src);
     if (!stat.isFile()) {
       return src;
     }
-    const fh = await import_node_fs10.promises.open(src, "r");
+    const fh = await import_node_fs11.promises.open(src, "r");
     try {
       const buf = Buffer.alloc(32);
       const { bytesRead } = await fh.read(buf, 0, 32, 0);
@@ -19051,17 +19158,17 @@ async function toDisplayableImagePath(src) {
       if (!guessedExt) {
         return src;
       }
-      const cacheDir = import_node_path15.default.join(
-        import_node_os5.default.homedir(),
+      const cacheDir = import_node_path16.default.join(
+        import_node_os6.default.homedir(),
         ".pmate",
         "messages",
         "images"
       );
-      await import_node_fs10.promises.mkdir(cacheDir, { recursive: true });
-      const base = (0, import_node_crypto3.createHash)("sha1").update(src).digest("hex");
-      const displayPath = import_node_path15.default.join(cacheDir, `${base}.${guessedExt}`);
-      await import_node_fs10.promises.rm(displayPath, { force: true }).catch(() => void 0);
-      await import_node_fs10.promises.copyFile(src, displayPath);
+      await import_node_fs11.promises.mkdir(cacheDir, { recursive: true });
+      const base = (0, import_node_crypto4.createHash)("sha1").update(src).digest("hex");
+      const displayPath = import_node_path16.default.join(cacheDir, `${base}.${guessedExt}`);
+      await import_node_fs11.promises.rm(displayPath, { force: true }).catch(() => void 0);
+      await import_node_fs11.promises.copyFile(src, displayPath);
       return displayPath;
     } finally {
       await fh.close();
@@ -19085,40 +19192,10 @@ function guessImageExtension(header) {
   }
   return null;
 }
-function parseMessageText(raw) {
-  if (!raw) {
-    return { time: null, sender: null, content: "" };
-  }
-  const timeMatches = raw.match(/\b\d{1,2}:\d{2}\s?(?:AM|PM)\b/gi) || [];
-  const time = timeMatches.length > 0 ? timeMatches[timeMatches.length - 1] : null;
-  let sender = null;
-  const chefSender = raw.match(/^(Chef\s+[A-Za-z0-9_-]+)/);
-  if (chefSender) {
-    sender = chefSender[1];
-  } else {
-    const simpleSender = raw.match(/^([A-Za-z][A-Za-z0-9._-]{1,30})/);
-    sender = simpleSender ? simpleSender[1] : null;
-  }
-  let content = raw;
-  if (sender && content.startsWith(sender)) {
-    content = content.slice(sender.length).trim();
-  }
-  if (time) {
-    const timeIdx = content.lastIndexOf(time);
-    if (timeIdx >= 0) {
-      content = content.slice(0, timeIdx).trim();
-    }
-  }
-  content = content.replace(
-    /QuoteReply|Forward|Save to Note|Select|Pin|Add To-Do|Info|Translate>English中文/g,
-    " "
-  ).replace(/Group Chat History|Chat History/g, " ").replace(/\s+/g, " ").trim();
-  return { time, sender, content };
-}
 
 // src/commands/AgentCommandHandler.ts
-var import_node_fs11 = require("fs");
-var import_node_path16 = __toESM(require("path"));
+var import_node_fs12 = require("fs");
+var import_node_path17 = __toESM(require("path"));
 init_AgentLlmClient();
 init_sessionStore();
 
@@ -19126,7 +19203,7 @@ init_sessionStore();
 var STORE_LOG_VERSION = 1;
 var LOG_KIND_TABLE = 1e4;
 var LOG_KIND_MAPPING = 6003;
-function createHash3() {
+function createHash4() {
   return `${Date.now().toString(36)}-${Math.random().toString(36).slice(2, 10)}`;
 }
 function createDescriptor(input) {
@@ -19151,8 +19228,8 @@ function descriptorPathSegments(descriptor) {
   return ["chains", normalized.chain, "namespaces", normalized.ns, normalized.kind, normalized.name];
 }
 function buildPathUrl(baseUrl, pathSegments, query) {
-  const path22 = `/${pathSegments.map((segment) => encodeURIComponent(segment)).join("/")}`;
-  const url = new URL(path22, baseUrl);
+  const path23 = `/${pathSegments.map((segment) => encodeURIComponent(segment)).join("/")}`;
+  const url = new URL(path23, baseUrl);
   if (query) {
     for (const [key, value] of Object.entries(query)) {
       url.searchParams.set(key, String(value));
@@ -19265,7 +19342,7 @@ var Namespace = class {
       },
       appendRow: async (data) => {
         const log = {
-          hash: createHash3(),
+          hash: createHash4(),
           t: Date.now(),
           kind: LOG_KIND_TABLE,
           topic: descriptorToTopic(descriptor),
@@ -19277,7 +19354,7 @@ var Namespace = class {
       updateRow: async (data) => {
         const { id, ...value } = data;
         const log = {
-          hash: createHash3(),
+          hash: createHash4(),
           t: Date.now(),
           kind: LOG_KIND_TABLE,
           topic: descriptorToTopic(descriptor),
@@ -19288,7 +19365,7 @@ var Namespace = class {
       },
       deleteRow: async (id) => {
         const log = {
-          hash: createHash3(),
+          hash: createHash4(),
           t: Date.now(),
           kind: LOG_KIND_TABLE,
           topic: descriptorToTopic(descriptor),
@@ -19331,7 +19408,7 @@ var Namespace = class {
       },
       set: async (key, value) => {
         const log = {
-          hash: createHash3(),
+          hash: createHash4(),
           t: Date.now(),
           kind: LOG_KIND_MAPPING,
           topic: descriptorToTopic(descriptor),
@@ -19342,7 +19419,7 @@ var Namespace = class {
       },
       delete: async (key) => {
         const log = {
-          hash: createHash3(),
+          hash: createHash4(),
           t: Date.now(),
           kind: LOG_KIND_MAPPING,
           topic: descriptorToTopic(descriptor),
@@ -19535,6 +19612,24 @@ var AgentCommandHandler = class {
         this.renderJson(record, args.json);
         return;
       }
+      case "move": {
+        const record = await this.request(
+          baseUrl,
+          token,
+          "POST",
+          `/agents/${encodeURIComponent(args.namespace)}/move`,
+          {
+            from: args.fromName,
+            toNamespace: args.targetNamespace,
+            ...args.toName ? { to: args.toName } : {}
+          }
+        );
+        ui.success(
+          `Moved agent ${formatNamespacedDisplayId(args.namespace, args.fromName)} -> ${record.id}`
+        );
+        this.renderJson(record, args.json);
+        return;
+      }
     }
   }
   resolveBaseUrl(baseUrl) {
@@ -19566,11 +19661,11 @@ var AgentCommandHandler = class {
     }).token;
   }
   readJsonFile(filePath) {
-    const absolutePath = import_node_path16.default.resolve(process.cwd(), filePath);
-    if (!(0, import_node_fs11.existsSync)(absolutePath)) {
+    const absolutePath = import_node_path17.default.resolve(process.cwd(), filePath);
+    if (!(0, import_node_fs12.existsSync)(absolutePath)) {
       throw new Error(`JSON file not found: ${absolutePath}`);
     }
-    const raw = (0, import_node_fs11.readFileSync)(absolutePath, "utf8");
+    const raw = (0, import_node_fs12.readFileSync)(absolutePath, "utf8");
     try {
       return JSON.parse(raw);
     } catch (error) {
@@ -19581,7 +19676,7 @@ var AgentCommandHandler = class {
   readJsonObjectFile(filePath) {
     const parsed = this.readJsonFile(filePath);
     if (!parsed || typeof parsed !== "object" || Array.isArray(parsed)) {
-      const absolutePath = import_node_path16.default.resolve(process.cwd(), filePath);
+      const absolutePath = import_node_path17.default.resolve(process.cwd(), filePath);
       throw new Error(`Invalid JSON in ${absolutePath}: expected an object`);
     }
     return parsed;
@@ -19730,8 +19825,8 @@ var NsCommandHandler = class {
 };
 
 // src/commands/StoreCommandHandler.ts
-var import_node_fs12 = require("fs");
-var import_node_path17 = __toESM(require("path"));
+var import_node_fs13 = require("fs");
+var import_node_path18 = __toESM(require("path"));
 var StoreCommandHandler = class {
   async handle(args) {
     if (args.scope === "namespace") {
@@ -19873,11 +19968,11 @@ var StoreCommandHandler = class {
     return payload.data ?? [];
   }
   readJsonFile(filePath) {
-    const absolutePath = import_node_path17.default.resolve(process.cwd(), filePath);
-    if (!(0, import_node_fs12.existsSync)(absolutePath)) {
+    const absolutePath = import_node_path18.default.resolve(process.cwd(), filePath);
+    if (!(0, import_node_fs13.existsSync)(absolutePath)) {
       throw new Error(`JSON file not found: ${absolutePath}`);
     }
-    const raw = (0, import_node_fs12.readFileSync)(absolutePath, "utf8");
+    const raw = (0, import_node_fs13.readFileSync)(absolutePath, "utf8");
     try {
       return JSON.parse(raw);
     } catch (error) {
@@ -19929,8 +20024,8 @@ var StoreCommandHandler = class {
 };
 
 // src/commands/AppCommandHandler.ts
-var import_node_fs13 = require("fs");
-var import_node_path18 = __toESM(require("path"));
+var import_node_fs14 = require("fs");
+var import_node_path19 = __toESM(require("path"));
 init_sessionStore();
 init_namespacedRef();
 var AppCommandHandler = class {
@@ -20018,6 +20113,24 @@ var AppCommandHandler = class {
         this.renderJson(record, args.json);
         return;
       }
+      case "move": {
+        const record = await this.request(
+          baseUrl,
+          token,
+          "POST",
+          `/apps/${encodeURIComponent(args.namespace)}/move`,
+          {
+            fromId: args.fromId,
+            toNamespace: args.targetNamespace,
+            ...args.toId ? { toId: args.toId } : {}
+          }
+        );
+        ui.success(
+          `Moved app ${formatNamespacedDisplayId(args.namespace, args.fromId)} -> ${formatNamespacedDisplayId(record.namespace, record.id)}`
+        );
+        this.renderJson(record, args.json);
+        return;
+      }
     }
   }
   resolveBaseUrl(baseUrl) {
@@ -20029,11 +20142,11 @@ var AppCommandHandler = class {
     }).token;
   }
   readJsonFile(filePath) {
-    const absolutePath = import_node_path18.default.resolve(process.cwd(), filePath);
-    if (!(0, import_node_fs13.existsSync)(absolutePath)) {
+    const absolutePath = import_node_path19.default.resolve(process.cwd(), filePath);
+    if (!(0, import_node_fs14.existsSync)(absolutePath)) {
       throw new Error(`JSON file not found: ${absolutePath}`);
     }
-    const raw = (0, import_node_fs13.readFileSync)(absolutePath, "utf8");
+    const raw = (0, import_node_fs14.readFileSync)(absolutePath, "utf8");
     try {
       return JSON.parse(raw);
     } catch (error) {
@@ -20113,13 +20226,13 @@ function readNamespaceFromPayload(payload) {
 }
 
 // src/commands/ServiceCommandHandler.ts
-var import_node_fs15 = require("fs");
-var import_node_path20 = __toESM(require("path"));
+var import_node_fs16 = require("fs");
+var import_node_path21 = __toESM(require("path"));
 
 // src/services/ServiceRuntimeRunner.ts
-var import_node_fs14 = require("fs");
-var import_node_os6 = __toESM(require("os"));
-var import_node_path19 = __toESM(require("path"));
+var import_node_fs15 = require("fs");
+var import_node_os7 = __toESM(require("os"));
+var import_node_path20 = __toESM(require("path"));
 var import_node_child_process9 = require("child_process");
 var import_node_readline = require("readline");
 var import_chalk3 = __toESM(require("chalk"));
@@ -20232,14 +20345,14 @@ var ServiceRuntimeRunner = class {
   }
   resolveRepoRoot(service, cwd) {
     if (cwd) {
-      return import_node_path19.default.resolve(process.cwd(), cwd);
+      return import_node_path20.default.resolve(process.cwd(), cwd);
     }
     const repository = this.getDeploy(service).repository?.trim();
     if (repository) {
       const repoName = repository.replace(/\/+$/, "").split("/").pop()?.replace(/\.git$/i, "");
       if (repoName) {
-        const candidate = import_node_path19.default.join(import_node_os6.default.homedir(), "dev", "pmate", repoName);
-        if ((0, import_node_fs14.existsSync)(candidate)) {
+        const candidate = import_node_path20.default.join(import_node_os7.default.homedir(), "dev", "pmate", repoName);
+        if ((0, import_node_fs15.existsSync)(candidate)) {
           return candidate;
         }
       }
@@ -20252,12 +20365,12 @@ var ServiceRuntimeRunner = class {
     if (!dir) {
       throw new Error(`Missing deploy.dir for ${service.id}`);
     }
-    return import_node_path19.default.resolve(repoRoot, dir);
+    return import_node_path20.default.resolve(repoRoot, dir);
   }
   async deployVite(service, options) {
     const appDir = this.resolveLocalDir(service, options.cwd);
-    const packageJsonPath = import_node_path19.default.join(appDir, "package.json");
-    if (!(0, import_node_fs14.existsSync)(packageJsonPath)) {
+    const packageJsonPath = import_node_path20.default.join(appDir, "package.json");
+    if (!(0, import_node_fs15.existsSync)(packageJsonPath)) {
       throw new Error(`No package.json found at ${packageJsonPath}`);
     }
     const pkg2 = this.loadPackageJson(packageJsonPath);
@@ -20266,8 +20379,8 @@ var ServiceRuntimeRunner = class {
       throw new Error(`Missing package name in ${packageJsonPath}`);
     }
     await this.runCommand("pnpm", ["--filter", pkgName, "build"], this.resolveRepoRoot(service, options.cwd));
-    const distDir = import_node_path19.default.join(appDir, "dist");
-    if (!(0, import_node_fs14.existsSync)(distDir)) {
+    const distDir = import_node_path20.default.join(appDir, "dist");
+    if (!(0, import_node_fs15.existsSync)(distDir)) {
       throw new Error(`No dist directory found at ${distDir}`);
     }
     const bucketName = this.getDeploy(service).bucket?.trim();
@@ -20278,8 +20391,8 @@ var ServiceRuntimeRunner = class {
   }
   async deployStatic(service, options) {
     const appDir = this.resolveLocalDir(service, options.cwd);
-    const srcDir = import_node_path19.default.join(appDir, "src");
-    if (!(0, import_node_fs14.existsSync)(srcDir)) {
+    const srcDir = import_node_path20.default.join(appDir, "src");
+    if (!(0, import_node_fs15.existsSync)(srcDir)) {
       throw new Error(`No src directory found at ${srcDir}`);
     }
     const bucketName = this.getDeploy(service).bucket?.trim();
@@ -20397,7 +20510,7 @@ var ServiceRuntimeRunner = class {
       const serverAddress = await resolveServerAddress(server);
       const templateName = serviceType === "ws" ? "nginx.ws.template" : "nginx.rest.template";
       const templatePath = this.resolveTemplatePath(templateName);
-      const template = (0, import_node_fs14.readFileSync)(templatePath, "utf8");
+      const template = (0, import_node_fs15.readFileSync)(templatePath, "utf8");
       const host = `${subdomain}.${deploy.domain?.trim() || "pmate.chat"}`;
       const rendered = template.replace(/\$\{\{PORT\}\}/g, String(port)).replace(/\$\{\{HOSTS\}\}/g, host).replace(/\$\{\{HOST\}\}/g, host);
       const remotePath = `/etc/nginx/sites-enabled/${subdomain}.conf`;
@@ -20429,11 +20542,11 @@ var ServiceRuntimeRunner = class {
     }
     if (config.ensurePackageJson) {
       const appDir = this.resolveLocalDir(service, options.cwd);
-      const packageJsonPath = import_node_path19.default.join(appDir, "package.json");
-      if (!(0, import_node_fs14.existsSync)(packageJsonPath)) {
+      const packageJsonPath = import_node_path20.default.join(appDir, "package.json");
+      if (!(0, import_node_fs15.existsSync)(packageJsonPath)) {
         throw new Error(`Missing package.json at ${packageJsonPath}`);
       }
-      const pkgStat = (0, import_node_fs14.statSync)(packageJsonPath);
+      const pkgStat = (0, import_node_fs15.statSync)(packageJsonPath);
       if (!pkgStat.isFile()) {
         throw new Error(`package.json is not a file at ${packageJsonPath}`);
       }
@@ -20856,9 +20969,9 @@ var ServiceRuntimeRunner = class {
     return tokens;
   }
   readPathValue(source, pathExpr) {
-    const path22 = pathExpr.split(".").map((segment) => segment.trim()).filter(Boolean);
+    const path23 = pathExpr.split(".").map((segment) => segment.trim()).filter(Boolean);
     let cursor = source;
-    for (const segment of path22) {
+    for (const segment of path23) {
       if (!cursor || typeof cursor !== "object" || Array.isArray(cursor)) {
         return void 0;
       }
@@ -20901,12 +21014,12 @@ var ServiceRuntimeRunner = class {
   }
   resolveTemplatePath(templateName) {
     const candidates = [
-      import_node_path19.default.join(__dirname, "..", "templates", templateName),
-      import_node_path19.default.join(__dirname, "..", "src", "templates", templateName),
-      import_node_path19.default.join(__dirname, "templates", templateName)
+      import_node_path20.default.join(__dirname, "..", "templates", templateName),
+      import_node_path20.default.join(__dirname, "..", "src", "templates", templateName),
+      import_node_path20.default.join(__dirname, "templates", templateName)
     ];
     for (const candidate of candidates) {
-      if ((0, import_node_fs14.existsSync)(candidate)) {
+      if ((0, import_node_fs15.existsSync)(candidate)) {
         return candidate;
       }
     }
@@ -20938,7 +21051,7 @@ var ServiceRuntimeRunner = class {
     });
   }
   loadPackageJson(packageJsonPath) {
-    const raw = (0, import_node_fs14.readFileSync)(packageJsonPath, "utf8");
+    const raw = (0, import_node_fs15.readFileSync)(packageJsonPath, "utf8");
     const parsed = JSON.parse(raw);
     if (!parsed || typeof parsed !== "object") {
       throw new Error(`Invalid package.json at ${packageJsonPath}`);
@@ -20947,7 +21060,7 @@ var ServiceRuntimeRunner = class {
   }
   writePackageJson(packageJsonPath, data) {
     const serialized = JSON.stringify(data, null, 2);
-    (0, import_node_fs14.writeFileSync)(packageJsonPath, `${serialized}
+    (0, import_node_fs15.writeFileSync)(packageJsonPath, `${serialized}
 `, "utf8");
   }
   runCommand(command, args, cwd) {
@@ -21172,6 +21285,23 @@ var ServiceCommandHandler = class {
         this.renderJson(record, args.json);
         return;
       }
+      case "move": {
+        const record = await this.request(
+          baseUrl,
+          "POST",
+          `/services/${encodeURIComponent(args.namespace)}/move`,
+          {
+            from: args.fromName,
+            toNamespace: args.targetNamespace,
+            ...args.toName ? { to: args.toName } : {}
+          }
+        );
+        ui.success(
+          `Moved service ${formatNamespacedDisplayId(args.namespace, args.fromName)} -> ${record.id}`
+        );
+        this.renderJson(record, args.json);
+        return;
+      }
       case "deploy": {
         const record = await registry.getService(args.namespace, args.name);
         await runtime.deploy(record, { cwd: args.cwd });
@@ -21198,11 +21328,11 @@ var ServiceCommandHandler = class {
     return (baseUrl || process.env.PMATE_APPS_API_BASE_URL || "https://apps-api.pmate.chat").replace(/\/+$/, "");
   }
   readJsonFile(filePath) {
-    const absolutePath = import_node_path20.default.resolve(process.cwd(), filePath);
-    if (!(0, import_node_fs15.existsSync)(absolutePath)) {
+    const absolutePath = import_node_path21.default.resolve(process.cwd(), filePath);
+    if (!(0, import_node_fs16.existsSync)(absolutePath)) {
       throw new Error(`JSON file not found: ${absolutePath}`);
     }
-    const raw = (0, import_node_fs15.readFileSync)(absolutePath, "utf8");
+    const raw = (0, import_node_fs16.readFileSync)(absolutePath, "utf8");
     try {
       return JSON.parse(raw);
     } catch (error) {
@@ -21913,6 +22043,54 @@ function parseAgentArgs(tokens) {
       json
     };
   }
+  if (action === "move") {
+    let namespace;
+    let from;
+    let targetNamespace;
+    let to;
+    while (rest.length > 0) {
+      const token = rest.shift();
+      switch (token) {
+        case "--ns":
+        case "--namespace":
+          namespace = requireValue(rest, token);
+          break;
+        case "--from":
+          from = parseBareRenameId(requireValue(rest, token), "agent");
+          break;
+        case "--to-ns":
+        case "--target-namespace":
+          targetNamespace = requireValue(rest, token);
+          break;
+        case "--to":
+          to = parseBareRenameId(requireValue(rest, token), "agent");
+          break;
+        case "--base-url":
+          baseUrl = requireValue(rest, token);
+          break;
+        case "--json":
+          json = true;
+          break;
+        default:
+          throw new Error(`Unknown agent move option: ${token}`);
+      }
+    }
+    if (!namespace || !from || !targetNamespace) {
+      throw new Error(
+        "Usage: agent move --from <id> --ns <namespace> --to-ns <namespace> [--to <id>] [--base-url <url>] [--json]"
+      );
+    }
+    return {
+      type: "agent" /* Agent */,
+      action,
+      namespace,
+      fromName: from,
+      targetNamespace,
+      toName: to,
+      baseUrl,
+      json
+    };
+  }
   throw new Error(`Unknown agent action: ${action}`);
 }
 function requireValue(tokens, optionName) {
@@ -22228,7 +22406,7 @@ function parseAppArgs(tokens) {
   const rawAction = rest.shift();
   const action = rawAction === "view" ? "view" : rawAction;
   if (!action) {
-    throw new Error("Missing app action. Use: app list|get|view|create|update|rename|delete");
+    throw new Error("Missing app action. Use: app list|get|view|create|update|rename|move|delete");
   }
   let baseUrl;
   let json = false;
@@ -22394,6 +22572,45 @@ function parseAppArgs(tokens) {
     }
     return { type: "app" /* App */, action, namespace, fromId, toId, baseUrl, json };
   }
+  if (action === "move") {
+    let namespace;
+    let fromId;
+    let targetNamespace;
+    let toId;
+    while (rest.length > 0) {
+      const token = rest.shift();
+      switch (token) {
+        case "--ns":
+        case "--namespace":
+          namespace = requireValue4(rest, token);
+          break;
+        case "--from":
+          fromId = parseBareRenameId2(requireValue4(rest, token), "app");
+          break;
+        case "--to-ns":
+        case "--target-namespace":
+          targetNamespace = requireValue4(rest, token);
+          break;
+        case "--to":
+          toId = parseBareRenameId2(requireValue4(rest, token), "app");
+          break;
+        case "--base-url":
+          baseUrl = requireValue4(rest, token);
+          break;
+        case "--json":
+          json = true;
+          break;
+        default:
+          throw new Error(`Unknown app move option: ${token}`);
+      }
+    }
+    if (!namespace || !fromId || !targetNamespace) {
+      throw new Error(
+        "Usage: app move --from <id> --ns <namespace> --to-ns <namespace> [--to <id>] [--base-url <url>] [--json]"
+      );
+    }
+    return { type: "app" /* App */, action, namespace, fromId, targetNamespace, toId, baseUrl, json };
+  }
   throw new Error(`Unknown app action: ${action}`);
 }
 function requireValue4(tokens, optionName) {
@@ -22622,6 +22839,54 @@ function parseServiceArgs(tokens) {
       json
     };
   }
+  if (action === "move") {
+    let namespace;
+    let from;
+    let targetNamespace;
+    let to;
+    while (rest.length > 0) {
+      const token = rest.shift();
+      switch (token) {
+        case "--ns":
+        case "--namespace":
+          namespace = requireValue5(rest, token);
+          break;
+        case "--from":
+          from = parseBareRenameId3(requireValue5(rest, token), "service");
+          break;
+        case "--to-ns":
+        case "--target-namespace":
+          targetNamespace = requireValue5(rest, token);
+          break;
+        case "--to":
+          to = parseBareRenameId3(requireValue5(rest, token), "service");
+          break;
+        case "--base-url":
+          baseUrl = requireValue5(rest, token);
+          break;
+        case "--json":
+          json = true;
+          break;
+        default:
+          throw new Error(`Unknown service move option: ${token}`);
+      }
+    }
+    if (!namespace || !from || !targetNamespace) {
+      throw new Error(
+        "Usage: service move --from <id> --ns <namespace> --to-ns <namespace> [--to <id>] [--base-url <url>] [--json]"
+      );
+    }
+    return {
+      type: "service" /* Service */,
+      action,
+      namespace,
+      fromName: from,
+      targetNamespace,
+      toName: to,
+      baseUrl,
+      json
+    };
+  }
   throw new Error(`Unknown service action: ${action}`);
 }
 function requireValue5(tokens, optionName) {
@@ -22866,9 +23131,59 @@ function requireValue7(tokens, optionName) {
   return value;
 }
 
+// src/collectCommandParser.ts
+function parseCollectArgs(tokens) {
+  const rest = [...tokens];
+  const options = {
+    action: "sync",
+    source: void 0,
+    endpoint: void 0
+  };
+  const action = rest.shift();
+  if (action !== "sync") {
+    throw new Error(
+      "Usage: collect sync (--source <cc|yelling> | --endpoint <url>)"
+    );
+  }
+  while (rest.length > 0) {
+    const token = rest.shift();
+    switch (token) {
+      case "--source": {
+        const value = requireValue8(rest, token);
+        if (value !== "cc" && value !== "yelling") {
+          throw new Error(`Unsupported collect source: ${value}`);
+        }
+        options.source = value;
+        break;
+      }
+      case "--endpoint":
+        options.endpoint = requireValue8(rest, token);
+        break;
+      default:
+        throw new Error(`Unknown collect option: ${token}`);
+    }
+  }
+  if (options.source && options.endpoint) {
+    throw new Error("Use either --source or --endpoint, not both.");
+  }
+  if (!options.source && !options.endpoint) {
+    throw new Error(
+      "Usage: collect sync (--source <cc|yelling> | --endpoint <url>)"
+    );
+  }
+  return { type: "collect" /* Collect */, ...options };
+}
+function requireValue8(tokens, optionName) {
+  const value = tokens.shift();
+  if (!value) {
+    throw new Error(`Missing value for ${optionName}`);
+  }
+  return value;
+}
+
 // src/index.ts
 var pkg = JSON.parse(
-  (0, import_node_fs16.readFileSync)(import_node_path21.default.resolve(__dirname, "..", "package.json"), "utf8")
+  (0, import_node_fs17.readFileSync)(import_node_path22.default.resolve(__dirname, "..", "package.json"), "utf8")
 );
 var HELP_TEXT = [
   import_chalk4.default.bold(`pmate v${pkg.version}`),
@@ -22947,8 +23262,7 @@ var HELP_TEXT = [
   `  ${import_chalk4.default.gray("                  [--count <n>]")}`,
   `  ${import_chalk4.default.gray("                  --easy [--words <n>] [--digits <n>] [--separator <s>] [--count <n>]")}`,
   `  ${import_chalk4.default.cyan("collect")}          Collect threads/messages from Electron chat app via CDP`,
-  `  ${import_chalk4.default.gray("                  --list [--endpoint <url>] [--json]")}`,
-  `  ${import_chalk4.default.gray("                  --thread <name> [--endpoint <url>] [--json]")}`,
+  `  ${import_chalk4.default.gray("                  sync (--source <cc|yelling> | --endpoint <url>)")}`,
   `  ${import_chalk4.default.cyan("agent")}            Manage agent registry entries and call agents for debugging`,
   `  ${import_chalk4.default.gray("                  namespaces [--base-url <url>] [--json]")}`,
   `  ${import_chalk4.default.gray("                  list [--namespace <ns>] [--base-url <url>] [--json]")}`,
@@ -22957,6 +23271,7 @@ var HELP_TEXT = [
   `  ${import_chalk4.default.gray("                  create [<namespace>] --file <path> [--base-url <url>] [--json]")}`,
   `  ${import_chalk4.default.gray("                  update <ns:objectId> --file <path> [--base-url <url>] [--json]")}`,
   `  ${import_chalk4.default.gray("                  rename --from <id> --to <id> --ns <namespace> [--base-url <url>] [--json]")}`,
+  `  ${import_chalk4.default.gray("                  move --from <id> --ns <namespace> --to-ns <namespace> [--to <id>] [--base-url <url>] [--json]")}`,
   `  ${import_chalk4.default.gray("                  call <ns:objectId> [--payload <json>] [--file <path>] [--base-url <url>] [--hub-base-url <url>] [--from <id>] [--json]")}`,
   `  ${import_chalk4.default.gray("                  delete <ns:objectId> [--base-url <url>] [--json]")}`,
   `  ${import_chalk4.default.gray("                  list defaults to all namespaces; create defaults to namespace: pmate; default base URL: https://agent-api.pmate.chat; call uses pmate:cli session and default hub: https://hub.pmate.chat")}`,
@@ -22986,6 +23301,7 @@ var HELP_TEXT = [
   `  ${import_chalk4.default.gray("                  create --file <path> [--base-url <url>] [--json]")}`,
   `  ${import_chalk4.default.gray("                  update <ns:objectId> --file <path> [--base-url <url>] [--json]")}`,
   `  ${import_chalk4.default.gray("                  rename --from <id> --to <id> --ns <namespace> [--base-url <url>] [--json]")}`,
+  `  ${import_chalk4.default.gray("                  move --from <id> --ns <namespace> --to-ns <namespace> [--to <id>] [--base-url <url>] [--json]")}`,
   `  ${import_chalk4.default.gray("                  delete <ns:objectId> [--base-url <url>] [--json]")}`,
   `  ${import_chalk4.default.gray("                  default base URL: https://apps-api.pmate.chat")}`,
   `  ${import_chalk4.default.cyan("service")}          Manage service registry entries via apps-api`,
@@ -22995,6 +23311,7 @@ var HELP_TEXT = [
   `  ${import_chalk4.default.gray("                  create --file <path> [--base-url <url>] [--json]")}`,
   `  ${import_chalk4.default.gray("                  update <ns:objectId> --file <path> [--base-url <url>] [--json]")}`,
   `  ${import_chalk4.default.gray("                  rename --from <id> --to <id> --ns <namespace> [--base-url <url>] [--json]")}`,
+  `  ${import_chalk4.default.gray("                  move --from <id> --ns <namespace> --to-ns <namespace> [--to <id>] [--base-url <url>] [--json]")}`,
   `  ${import_chalk4.default.gray("                  delete <ns:objectId> [--base-url <url>] [--json]")}`,
   `  ${import_chalk4.default.gray("                  deploy <ns:objectId> [--cwd <dir>] [--base-url <url>]")}`,
   `  ${import_chalk4.default.gray("                  init <ns:objectId> [--cwd <dir>] [--base-url <url>]")}`,
@@ -23060,7 +23377,7 @@ function parseCommandArgs(args) {
       const token = rest.shift();
       switch (token) {
         case "--app":
-          app = requireValue8(rest, token);
+          app = requireValue9(rest, token);
           break;
         default:
           throw new Error(`Unknown login option: ${token}`);
@@ -23157,7 +23474,7 @@ function parseVercelArgs(tokens) {
       const token = rest.shift();
       switch (token) {
         case "--scope":
-          scope = requireValue8(rest, token);
+          scope = requireValue9(rest, token);
           break;
         default:
           throw new Error(`Unknown vercel option: ${token}`);
@@ -23177,10 +23494,10 @@ function parseVercelArgs(tokens) {
       const token = rest.shift();
       switch (token) {
         case "--scope":
-          scope = requireValue8(rest, token);
+          scope = requireValue9(rest, token);
           break;
         case "--project":
-          project = requireValue8(rest, token);
+          project = requireValue9(rest, token);
           break;
         case "--last-week":
           lastWeek = true;
@@ -23211,16 +23528,16 @@ function parseAddDnsArgs(tokens) {
     const token = rest.shift();
     switch (token) {
       case "--type":
-        options.dnsType = requireValue8(rest, token);
+        options.dnsType = requireValue9(rest, token);
         break;
       case "--value":
-        options.dnsValue = requireValue8(rest, token);
+        options.dnsValue = requireValue9(rest, token);
         break;
       case "--rr":
-        options.dnsRr = requireValue8(rest, token);
+        options.dnsRr = requireValue9(rest, token);
         break;
       case "--ttl": {
-        const ttlValue = requireValue8(rest, token);
+        const ttlValue = requireValue9(rest, token);
         const ttl = Number.parseInt(ttlValue, 10);
         if (!Number.isFinite(ttl) || ttl <= 0) {
           throw new Error(`Invalid --ttl value: ${ttlValue}`);
@@ -23229,7 +23546,7 @@ function parseAddDnsArgs(tokens) {
         break;
       }
       case "--domain":
-        options.dnsDomain = requireValue8(rest, token);
+        options.dnsDomain = requireValue9(rest, token);
         break;
       default:
         throw new Error(`Unknown add-dns option: ${token}`);
@@ -23262,13 +23579,13 @@ function parseBucketArgs(tokens) {
         options.bucketCreate = true;
         break;
       case "--name":
-        options.bucketName = requireValue8(rest, token);
+        options.bucketName = requireValue9(rest, token);
         break;
       case "--subdomain":
-        options.bucketSubdomain = requireValue8(rest, token);
+        options.bucketSubdomain = requireValue9(rest, token);
         break;
       case "--domain":
-        options.bucketDomain = requireValue8(rest, token);
+        options.bucketDomain = requireValue9(rest, token);
         break;
       default:
         throw new Error(`Unknown bucket option: ${token}`);
@@ -23300,7 +23617,7 @@ function parseDevArgs(tokens) {
     const token = rest.shift();
     switch (token) {
       case "--cwd":
-        options.devCwd = requireValue8(rest, token);
+        options.devCwd = requireValue9(rest, token);
         break;
       default:
         throw new Error(`Unknown dev option: ${token}`);
@@ -23320,7 +23637,7 @@ function parseDeleteArgs(tokens) {
     const token = rest.shift();
     switch (token) {
       case "--cwd":
-        deleteCwd = requireValue8(rest, token);
+        deleteCwd = requireValue9(rest, token);
         break;
       default:
         throw new Error(`Unknown delete option: ${token}`);
@@ -23354,13 +23671,13 @@ function parseOssArgs(tokens) {
     const token = rest.shift();
     switch (token) {
       case "--bucket":
-        bucket = requireValue8(rest, token);
+        bucket = requireValue9(rest, token);
         break;
       case "--file":
-        filePath = requireValue8(rest, token);
+        filePath = requireValue9(rest, token);
         break;
       case "--key":
-        objectKey = requireValue8(rest, token);
+        objectKey = requireValue9(rest, token);
         break;
       default:
         throw new Error(`Unknown oss option: ${token}`);
@@ -23393,7 +23710,7 @@ function parseEnvArgs(tokens) {
           throw new Error("Only one env action is allowed.");
         }
         action = "set";
-        key = requireValue8(rest, token);
+        key = requireValue9(rest, token);
         break;
       case "--list":
         if (action) {
@@ -23406,17 +23723,17 @@ function parseEnvArgs(tokens) {
           throw new Error("Only one env action is allowed.");
         }
         action = "delete";
-        key = requireValue8(rest, token);
+        key = requireValue9(rest, token);
         break;
       case "--value":
-        value = requireValue8(rest, token);
+        value = requireValue9(rest, token);
         break;
       case "--verbose":
       case "-v":
         verbose = true;
         break;
       case "--cwd":
-        cwd = requireValue8(rest, token);
+        cwd = requireValue9(rest, token);
         break;
       default:
         throw new Error(`Unknown env option: ${token}`);
@@ -23474,7 +23791,7 @@ function parseCommitArgs(tokens) {
         push = true;
         break;
       case "--cwd":
-        cwd = requireValue8(rest, token);
+        cwd = requireValue9(rest, token);
         break;
       default:
         throw new Error(`Unknown commit option: ${token}`);
@@ -23490,10 +23807,10 @@ function parseSummaryArgs(tokens) {
     const token = rest.shift();
     switch (token) {
       case "--pr":
-        prRef = requireValue8(rest, token);
+        prRef = requireValue9(rest, token);
         break;
       case "--cwd":
-        cwd = requireValue8(rest, token);
+        cwd = requireValue9(rest, token);
         break;
       default:
         throw new Error(`Unknown summary option: ${token}`);
@@ -23518,13 +23835,13 @@ function parseQuizArgs(tokens) {
       const token = rest.shift();
       switch (token) {
         case "--paper-id":
-          paperId = requireValue8(rest, token);
+          paperId = requireValue9(rest, token);
           break;
         case "--base-url":
-          apiBaseUrl = requireValue8(rest, token);
+          apiBaseUrl = requireValue9(rest, token);
           break;
         case "--link-base":
-          linkBaseUrl = requireValue8(rest, token);
+          linkBaseUrl = requireValue9(rest, token);
           break;
         default:
           throw new Error(`Unknown quiz create-draft option: ${token}`);
@@ -23550,16 +23867,16 @@ function parseQuizArgs(tokens) {
       const token = rest.shift();
       switch (token) {
         case "--paper-id":
-          paperId = requireValue8(rest, token);
+          paperId = requireValue9(rest, token);
           break;
         case "--file":
-          filePath = requireValue8(rest, token);
+          filePath = requireValue9(rest, token);
           break;
         case "--base-url":
-          apiBaseUrl = requireValue8(rest, token);
+          apiBaseUrl = requireValue9(rest, token);
           break;
         case "--link-base":
-          linkBaseUrl = requireValue8(rest, token);
+          linkBaseUrl = requireValue9(rest, token);
           break;
         default:
           throw new Error(`Unknown quiz update-meta option: ${token}`);
@@ -23589,16 +23906,16 @@ function parseQuizArgs(tokens) {
       const token = rest.shift();
       switch (token) {
         case "--paper-id":
-          paperId = requireValue8(rest, token);
+          paperId = requireValue9(rest, token);
           break;
         case "--file":
-          filePath = requireValue8(rest, token);
+          filePath = requireValue9(rest, token);
           break;
         case "--base-url":
-          apiBaseUrl = requireValue8(rest, token);
+          apiBaseUrl = requireValue9(rest, token);
           break;
         case "--link-base":
-          linkBaseUrl = requireValue8(rest, token);
+          linkBaseUrl = requireValue9(rest, token);
           break;
         default:
           throw new Error(`Unknown quiz append-step option: ${token}`);
@@ -23629,19 +23946,19 @@ function parseQuizArgs(tokens) {
       const token = rest.shift();
       switch (token) {
         case "--paper-id":
-          paperId = requireValue8(rest, token);
+          paperId = requireValue9(rest, token);
           break;
         case "--step-id":
-          stepId = requireValue8(rest, token);
+          stepId = requireValue9(rest, token);
           break;
         case "--file":
-          filePath = requireValue8(rest, token);
+          filePath = requireValue9(rest, token);
           break;
         case "--base-url":
-          apiBaseUrl = requireValue8(rest, token);
+          apiBaseUrl = requireValue9(rest, token);
           break;
         case "--link-base":
-          linkBaseUrl = requireValue8(rest, token);
+          linkBaseUrl = requireValue9(rest, token);
           break;
         default:
           throw new Error(`Unknown quiz update-step option: ${token}`);
@@ -23675,16 +23992,16 @@ function parseQuizArgs(tokens) {
       const token = rest.shift();
       switch (token) {
         case "--paper-id":
-          paperId = requireValue8(rest, token);
+          paperId = requireValue9(rest, token);
           break;
         case "--step-ids":
-          stepIdsRaw = requireValue8(rest, token);
+          stepIdsRaw = requireValue9(rest, token);
           break;
         case "--base-url":
-          apiBaseUrl = requireValue8(rest, token);
+          apiBaseUrl = requireValue9(rest, token);
           break;
         case "--link-base":
-          linkBaseUrl = requireValue8(rest, token);
+          linkBaseUrl = requireValue9(rest, token);
           break;
         default:
           throw new Error(`Unknown quiz reorder option: ${token}`);
@@ -23717,13 +24034,13 @@ function parseQuizArgs(tokens) {
       const token = rest.shift();
       switch (token) {
         case "--paper-id":
-          paperId = requireValue8(rest, token);
+          paperId = requireValue9(rest, token);
           break;
         case "--base-url":
-          apiBaseUrl = requireValue8(rest, token);
+          apiBaseUrl = requireValue9(rest, token);
           break;
         case "--link-base":
-          linkBaseUrl = requireValue8(rest, token);
+          linkBaseUrl = requireValue9(rest, token);
           break;
         default:
           throw new Error(`Unknown quiz activate option: ${token}`);
@@ -23748,13 +24065,13 @@ function parseQuizArgs(tokens) {
       const token = rest.shift();
       switch (token) {
         case "--paper-id":
-          paperId = requireValue8(rest, token);
+          paperId = requireValue9(rest, token);
           break;
         case "--base-url":
-          apiBaseUrl = requireValue8(rest, token);
+          apiBaseUrl = requireValue9(rest, token);
           break;
         case "--link-base":
-          linkBaseUrl = requireValue8(rest, token);
+          linkBaseUrl = requireValue9(rest, token);
           break;
         default:
           throw new Error(`Unknown quiz view option: ${token}`);
@@ -23783,22 +24100,22 @@ function parseQuizArgs(tokens) {
       const token = rest.shift();
       switch (token) {
         case "--paper-id":
-          paperId = requireValue8(rest, token);
+          paperId = requireValue9(rest, token);
           break;
         case "--step-id":
-          stepId = requireValue8(rest, token);
+          stepId = requireValue9(rest, token);
           break;
         case "--file":
-          filePath = requireValue8(rest, token);
+          filePath = requireValue9(rest, token);
           break;
         case "--new-paper-id":
-          newPaperId = requireValue8(rest, token);
+          newPaperId = requireValue9(rest, token);
           break;
         case "--base-url":
-          apiBaseUrl = requireValue8(rest, token);
+          apiBaseUrl = requireValue9(rest, token);
           break;
         case "--link-base":
-          linkBaseUrl = requireValue8(rest, token);
+          linkBaseUrl = requireValue9(rest, token);
           break;
         case "--activate":
           activate = true;
@@ -23888,10 +24205,10 @@ function parseLinearPrArgs(tokens) {
     const token = rest.shift();
     switch (token) {
       case "--account":
-        account = requireValue8(rest, token);
+        account = requireValue9(rest, token);
         break;
       case "--cwd":
-        cwd = requireValue8(rest, token);
+        cwd = requireValue9(rest, token);
         break;
       default:
         throw new Error(`Unknown linear option: ${token}`);
@@ -23920,35 +24237,35 @@ function parseLinearCreateArgs(tokens) {
     const token = rest.shift();
     switch (token) {
       case "--account":
-        account = requireValue8(rest, token);
+        account = requireValue9(rest, token);
         break;
       case "--repl":
         useRepl = true;
         break;
       case "--title":
-        title = requireValue8(rest, token);
+        title = requireValue9(rest, token);
         break;
       case "--desc":
       case "--description":
-        description = decodeEscapedNewlines(requireValue8(rest, token));
+        description = decodeEscapedNewlines(requireValue9(rest, token));
         break;
       case "--team-id":
-        teamId = requireValue8(rest, token);
+        teamId = requireValue9(rest, token);
         break;
       case "--team-key":
-        teamKey = requireValue8(rest, token);
+        teamKey = requireValue9(rest, token);
         break;
       case "--priority":
-        priority = parseLinearPriority(requireValue8(rest, token));
+        priority = parseLinearPriority(requireValue9(rest, token));
         break;
       case "--parent-id":
-        parentId = requireValue8(rest, token);
+        parentId = requireValue9(rest, token);
         break;
       case "--state-id":
-        stateId = requireValue8(rest, token);
+        stateId = requireValue9(rest, token);
         break;
       case "--cwd":
-        cwd = requireValue8(rest, token);
+        cwd = requireValue9(rest, token);
         break;
       default:
         throw new Error(`Unknown linear option: ${token}`);
@@ -23983,10 +24300,10 @@ function parseLinearWhoamiArgs(tokens) {
     const token = rest.shift();
     switch (token) {
       case "--account":
-        account = requireValue8(rest, token);
+        account = requireValue9(rest, token);
         break;
       case "--cwd":
-        cwd = requireValue8(rest, token);
+        cwd = requireValue9(rest, token);
         break;
       default:
         throw new Error(`Unknown linear option: ${token}`);
@@ -24011,10 +24328,10 @@ function parseLinearViewArgs(tokens) {
     const token = rest.shift();
     switch (token) {
       case "--account":
-        account = requireValue8(rest, token);
+        account = requireValue9(rest, token);
         break;
       case "--cwd":
-        cwd = requireValue8(rest, token);
+        cwd = requireValue9(rest, token);
         break;
       default:
         throw new Error(`Unknown linear option: ${token}`);
@@ -24049,32 +24366,32 @@ function parseLinearUpdateArgs(tokens) {
     const token = rest.shift();
     switch (token) {
       case "--account":
-        account = requireValue8(rest, token);
+        account = requireValue9(rest, token);
         break;
       case "--title":
-        title = requireValue8(rest, token);
+        title = requireValue9(rest, token);
         break;
       case "--desc":
       case "--description":
-        description = decodeEscapedNewlines(requireValue8(rest, token));
+        description = decodeEscapedNewlines(requireValue9(rest, token));
         break;
       case "--team-id":
-        teamId = requireValue8(rest, token);
+        teamId = requireValue9(rest, token);
         break;
       case "--team-key":
-        teamKey = requireValue8(rest, token);
+        teamKey = requireValue9(rest, token);
         break;
       case "--priority":
-        priority = parseLinearPriority(requireValue8(rest, token));
+        priority = parseLinearPriority(requireValue9(rest, token));
         break;
       case "--parent-id":
-        parentId = requireValue8(rest, token);
+        parentId = requireValue9(rest, token);
         break;
       case "--state-id":
-        stateId = requireValue8(rest, token);
+        stateId = requireValue9(rest, token);
         break;
       case "--cwd":
-        cwd = requireValue8(rest, token);
+        cwd = requireValue9(rest, token);
         break;
       default:
         throw new Error(`Unknown linear option: ${token}`);
@@ -24112,10 +24429,10 @@ function parseLinearSubIssuesArgs(tokens) {
     const token = rest.shift();
     switch (token) {
       case "--account":
-        account = requireValue8(rest, token);
+        account = requireValue9(rest, token);
         break;
       case "--cwd":
-        cwd = requireValue8(rest, token);
+        cwd = requireValue9(rest, token);
         break;
       default:
         throw new Error(`Unknown linear option: ${token}`);
@@ -24142,15 +24459,15 @@ function parseLinearCommentArgs(tokens) {
     const token = rest.shift();
     switch (token) {
       case "--account":
-        account = requireValue8(rest, token);
+        account = requireValue9(rest, token);
         break;
       case "--body":
       case "--desc":
       case "--description":
-        body = decodeEscapedNewlines(requireValue8(rest, token));
+        body = decodeEscapedNewlines(requireValue9(rest, token));
         break;
       case "--cwd":
-        cwd = requireValue8(rest, token);
+        cwd = requireValue9(rest, token);
         break;
       default:
         throw new Error(`Unknown linear option: ${token}`);
@@ -24180,10 +24497,10 @@ function parseLinearCommentsArgs(tokens) {
     const token = rest.shift();
     switch (token) {
       case "--account":
-        account = requireValue8(rest, token);
+        account = requireValue9(rest, token);
         break;
       case "--cwd":
-        cwd = requireValue8(rest, token);
+        cwd = requireValue9(rest, token);
         break;
       default:
         throw new Error(`Unknown linear option: ${token}`);
@@ -24207,16 +24524,16 @@ function parseLinearCycleArgs(tokens) {
     const token = rest.shift();
     switch (token) {
       case "--account":
-        account = requireValue8(rest, token);
+        account = requireValue9(rest, token);
         break;
       case "--team-id":
-        teamId = requireValue8(rest, token);
+        teamId = requireValue9(rest, token);
         break;
       case "--team-key":
-        teamKey = requireValue8(rest, token);
+        teamKey = requireValue9(rest, token);
         break;
       case "--cwd":
-        cwd = requireValue8(rest, token);
+        cwd = requireValue9(rest, token);
         break;
       default:
         throw new Error(`Unknown linear option: ${token}`);
@@ -24239,10 +24556,10 @@ function parseLinearTeamsArgs(tokens) {
     const token = rest.shift();
     switch (token) {
       case "--account":
-        account = requireValue8(rest, token);
+        account = requireValue9(rest, token);
         break;
       case "--cwd":
-        cwd = requireValue8(rest, token);
+        cwd = requireValue9(rest, token);
         break;
       default:
         throw new Error(`Unknown linear option: ${token}`);
@@ -24269,16 +24586,16 @@ function parseLinearUserIssuesArgs(tokens) {
     const token = rest.shift();
     switch (token) {
       case "--account":
-        account = requireValue8(rest, token);
+        account = requireValue9(rest, token);
         break;
       case "--cycle":
-        cycle = parseLinearCycle(requireValue8(rest, token));
+        cycle = parseLinearCycle(requireValue9(rest, token));
         break;
       case "--status":
-        status = parseLinearStatus(requireValue8(rest, token));
+        status = parseLinearStatus(requireValue9(rest, token));
         break;
       case "--cwd":
-        cwd = requireValue8(rest, token);
+        cwd = requireValue9(rest, token);
         break;
       default:
         throw new Error(`Unknown linear option: ${token}`);
@@ -24312,28 +24629,28 @@ function parseLinearIssuesArgs(tokens) {
     const token = rest.shift();
     switch (token) {
       case "--account":
-        account = requireValue8(rest, token);
+        account = requireValue9(rest, token);
         break;
       case "--team-id":
-        teamId = requireValue8(rest, token);
+        teamId = requireValue9(rest, token);
         break;
       case "--team-key":
-        teamKey = requireValue8(rest, token);
+        teamKey = requireValue9(rest, token);
         break;
       case "--user":
-        user = requireValue8(rest, token);
+        user = requireValue9(rest, token);
         break;
       case "--cycle":
-        cycle = parseLinearCycle(requireValue8(rest, token));
+        cycle = parseLinearCycle(requireValue9(rest, token));
         break;
       case "--status":
-        status = parseLinearStatus(requireValue8(rest, token));
+        status = parseLinearStatus(requireValue9(rest, token));
         break;
       case "--query":
-        query = requireValue8(rest, token).trim();
+        query = requireValue9(rest, token).trim();
         break;
       case "--limit": {
-        const value = Number.parseInt(requireValue8(rest, token), 10);
+        const value = Number.parseInt(requireValue9(rest, token), 10);
         if (!Number.isInteger(value) || value < 1 || value > 250) {
           throw new Error("Invalid --limit. Expected an integer between 1 and 250.");
         }
@@ -24341,7 +24658,7 @@ function parseLinearIssuesArgs(tokens) {
         break;
       }
       case "--cwd":
-        cwd = requireValue8(rest, token);
+        cwd = requireValue9(rest, token);
         break;
       default:
         throw new Error(`Unknown linear option: ${token}`);
@@ -24382,10 +24699,10 @@ function parseLinearLegacyArgs(tokens) {
         useScreenshot = true;
         break;
       case "--account":
-        account = requireValue8(rest, token);
+        account = requireValue9(rest, token);
         break;
       case "--cwd":
-        cwd = requireValue8(rest, token);
+        cwd = requireValue9(rest, token);
         break;
       default:
         throw new Error(`Unknown linear option: ${token}`);
@@ -24479,19 +24796,19 @@ function parseNotionArgs(tokens) {
       const token = rest.shift();
       switch (token) {
         case "--parent":
-          parentPageId = requireValue8(rest, token);
+          parentPageId = requireValue9(rest, token);
           break;
         case "--title":
-          title = requireValue8(rest, token);
+          title = requireValue9(rest, token);
           break;
         case "--private":
           isPrivate = true;
           break;
         case "--content":
-          content2 = requireValue8(rest, token);
+          content2 = requireValue9(rest, token);
           break;
         case "--file":
-          filePath2 = requireValue8(rest, token);
+          filePath2 = requireValue9(rest, token);
           break;
         default:
           throw new Error(`Unknown notion option: ${token}`);
@@ -24535,10 +24852,10 @@ function parseNotionArgs(tokens) {
     const token = rest.shift();
     switch (token) {
       case "--content":
-        content = requireValue8(rest, token);
+        content = requireValue9(rest, token);
         break;
       case "--file":
-        filePath = requireValue8(rest, token);
+        filePath = requireValue9(rest, token);
         break;
       case "--append":
         append = true;
@@ -24583,11 +24900,11 @@ function parseRandomArgs(tokens) {
         mode = "easy";
         break;
       case "--length":
-        length = parsePositiveInt(requireValue8(rest, token), token);
+        length = parsePositiveInt(requireValue9(rest, token), token);
         seenLength = true;
         break;
       case "--charset": {
-        const value = requireValue8(rest, token);
+        const value = requireValue9(rest, token);
         if (!["base64url", "hex", "alnum", "ascii"].includes(value)) {
           throw new Error(
             `Invalid --charset value: ${value}. Use base64url|hex|alnum|ascii.`
@@ -24598,18 +24915,18 @@ function parseRandomArgs(tokens) {
         break;
       }
       case "--count":
-        count = parsePositiveInt(requireValue8(rest, token), token);
+        count = parsePositiveInt(requireValue9(rest, token), token);
         break;
       case "--words":
-        words = parsePositiveInt(requireValue8(rest, token), token);
+        words = parsePositiveInt(requireValue9(rest, token), token);
         seenWords = true;
         break;
       case "--digits":
-        digits = parseNonNegativeInt(requireValue8(rest, token), token);
+        digits = parseNonNegativeInt(requireValue9(rest, token), token);
         seenDigits = true;
         break;
       case "--separator":
-        separator = requireValue8(rest, token);
+        separator = requireValue9(rest, token);
         seenSeparator = true;
         break;
       default:
@@ -24640,40 +24957,7 @@ function parseRandomArgs(tokens) {
     count
   };
 }
-function parseCollectArgs(tokens) {
-  const rest = [...tokens];
-  const options = {
-    endpoint: "http://localhost:9222",
-    json: false,
-    mode: "list",
-    threadName: void 0
-  };
-  while (rest.length > 0) {
-    const token = rest.shift();
-    switch (token) {
-      case "--endpoint":
-        options.endpoint = requireValue8(rest, token);
-        break;
-      case "--json":
-        options.json = true;
-        break;
-      case "--list":
-        options.mode = "list";
-        break;
-      case "--thread":
-        options.mode = "thread";
-        options.threadName = requireValue8(rest, token);
-        break;
-      default:
-        throw new Error(`Unknown collect option: ${token}`);
-    }
-  }
-  if (options.mode === "thread" && !options.threadName) {
-    throw new Error("Missing thread name. Usage: collect --thread <name>.");
-  }
-  return { type: "collect" /* Collect */, ...options };
-}
-function requireValue8(tokens, optionName) {
+function requireValue9(tokens, optionName) {
   const value = tokens.shift();
   if (!value) {
     throw new Error(`Missing value for ${optionName}`);