@phenx-inc/ctlsurf 0.15.0 → 0.15.1

package/out/headless/index.mjs

@@ -17314,7 +17314,7 @@ var require_package = __commonJS({
   "package.json"(exports, module) {
     module.exports = {
       name: "@phenx-inc/ctlsurf",
-      version: "0.15.0",
+      version: "0.15.1",
       description: "Agent-agnostic terminal and desktop app for ctlsurf \u2014 run Claude Code, Codex, or any coding agent with live session logging and remote control",
       main: "out/main/index.js",
       bin: {
@@ -19105,21 +19105,19 @@ var COLUMNS2 = [
 function log3(...args) {
   log("[ticket-store]", ...args);
 }
-function findPageByTitle2(pages, title) {
+function findPagesByTitle(pages, title) {
+  const found = [];
   for (const p of pages) {
-    if (p?.title === title) return p;
-    if (p?.children?.length) {
-      const c = findPageByTitle2(p.children, title);
-      if (c) return c;
-    }
+    if (p?.title === title) found.push(p);
+    if (p?.children?.length) found.push(...findPagesByTitle(p.children, title));
   }
-  return null;
+  return found;
 }
 var TicketStore = class {
   api;
-  // Per-cwd cache of the resolved Tickets datastore: the block (the datastore
-  // element) and the Agent Datastore page it lives on. Both ids are handed to
-  // the coding agent so it can read/update tickets via the ctlsurf MCP tools.
+  // Per-cwd cache of every resolved Tickets datastore. `primary` is where new
+  // tickets are written and what gets handed to the coding agent; `all` covers
+  // duplicate Agent Datastore pages so listing misses nothing.
   dsCache = /* @__PURE__ */ new Map();
   constructor(api) {
     this.api = api;
@@ -19129,11 +19127,11 @@ var TicketStore = class {
     const title = input.title?.trim();
     if (!title) return { ok: false, error: "Title is required" };
     try {
-      const ds = await this.ensureDatastore(cwd, true);
-      if (!ds) {
+      const stores = await this.resolveStores(cwd, true);
+      if (!stores) {
         return { ok: false, error: "No ctlsurf project found for this folder" };
       }
-      await this.api.addRow(ds.blockId, {
+      await this.api.addRow(stores.primary.blockId, {
         Title: title,
         Description: input.description?.trim() || "",
         Status: input.status || "Open",
@@ -19147,14 +19145,15 @@ var TicketStore = class {
       return { ok: false, error: err?.message || String(err) };
     }
   }
-  /** Updates an existing ticket row in the project's Tickets datastore. */
-  async updateTicket(cwd, rowId, input) {
+  /** Updates an existing ticket row. `blockId` names the store the row lives
+   * in (from listTickets); without it the primary store is assumed. */
+  async updateTicket(cwd, rowId, input, blockId) {
     const title = input.title?.trim();
     if (!title) return { ok: false, error: "Title is required" };
     try {
-      const ds = await this.ensureDatastore(cwd, false);
-      if (!ds) return { ok: false, error: "No Tickets datastore for this project" };
-      await this.api.updateRow(ds.blockId, rowId, {
+      const stores = await this.resolveStores(cwd, false);
+      if (!stores) return { ok: false, error: "No Tickets datastore for this project" };
+      await this.api.updateRow(blockId || stores.primary.blockId, rowId, {
         Title: title,
         Description: input.description?.trim() || "",
         Status: input.status || "Open",
@@ -19167,28 +19166,39 @@ var TicketStore = class {
       return { ok: false, error: err?.message || String(err) };
     }
   }
-  /** Lists existing tickets for the project, newest first. Does not create the
-   * datastore — an unconfigured project simply has no tickets yet. */
+  /** Lists existing tickets across every Tickets store in the project's
+   * folder, newest first. Does not create the datastore — an unconfigured
+   * project simply has no tickets yet. */
   async listTickets(cwd) {
     try {
-      const ds = await this.ensureDatastore(cwd, false);
-      if (!ds) return { ok: true, tickets: [] };
-      const res = await this.api.queryRows(ds.blockId, { orderBy: "Created", order: "desc", limit: 200 });
-      const tickets = (res?.rows || []).map((r) => ({
-        id: r.id,
-        title: String(r.data?.Title ?? ""),
-        description: String(r.data?.Description ?? ""),
-        status: String(r.data?.Status ?? "Open"),
-        priority: String(r.data?.Priority ?? "Med"),
-        created: r.data?.Created ?? r.created_at ?? null
-      }));
-      return { ok: true, tickets, blockId: ds.blockId, pageId: ds.pageId };
+      const stores = await this.resolveStores(cwd, false);
+      if (!stores) return { ok: true, tickets: [] };
+      const tickets = [];
+      for (const ds of stores.all) {
+        const res = await this.api.queryRows(ds.blockId, { orderBy: "Created", order: "desc", limit: 200 });
+        for (const r of res?.rows || []) {
+          tickets.push({
+            id: r.id,
+            title: String(r.data?.Title ?? ""),
+            description: String(r.data?.Description ?? ""),
+            status: String(r.data?.Status ?? "Open"),
+            priority: String(r.data?.Priority ?? "Med"),
+            created: r.data?.Created ?? r.created_at ?? null,
+            blockId: ds.blockId,
+            pageId: ds.pageId
+          });
+        }
+      }
+      if (stores.all.length > 1) {
+        tickets.sort((a, b) => (b.created || "").localeCompare(a.created || ""));
+      }
+      return { ok: true, tickets, blockId: stores.primary.blockId, pageId: stores.primary.pageId };
     } catch (err) {
       log3(`listTickets failed for ${cwd}: ${err?.message || err}`);
       return { ok: false, tickets: [], error: err?.message || String(err) };
     }
   }
-  async ensureDatastore(cwd, create) {
+  async resolveStores(cwd, create) {
     const cached = this.dsCache.get(cwd);
     if (cached) return cached;
     let folder = null;
@@ -19199,17 +19209,27 @@ var TicketStore = class {
     }
     if (!folder?.id) return null;
     const folderDetail = await this.api.getFolder(folder.id);
-    const agentPage = findPageByTitle2(folderDetail?.pages || [], AGENT_DATASTORE_PAGE_TITLE2);
-    if (!agentPage?.id) return null;
-    const pageId = agentPage.id;
-    const blockId = await this.findOrAdoptBlock(pageId);
-    if (blockId) {
-      await this.ensureColumns(blockId);
-      const ds = { blockId, pageId };
-      this.dsCache.set(cwd, ds);
-      return ds;
+    const agentPages = findPagesByTitle(folderDetail?.pages || [], AGENT_DATASTORE_PAGE_TITLE2);
+    if (agentPages.length === 0) return null;
+    const rootPath = folder.root_path || cwd;
+    agentPages.sort((a, b) => Number(b?.root_path === rootPath) - Number(a?.root_path === rootPath));
+    if (agentPages.length > 1) {
+      log3(`Found ${agentPages.length} "Agent Datastore" pages for ${cwd}; aggregating tickets across all of them`);
+    }
+    const all = [];
+    for (const page of agentPages) {
+      for (const blockId of await this.findTicketBlocks(page.id)) {
+        all.push({ blockId, pageId: page.id });
+      }
+    }
+    if (all.length > 0) {
+      for (const ds of all) await this.ensureColumns(ds.blockId);
+      const stores = { primary: all[0], all };
+      this.dsCache.set(cwd, stores);
+      return stores;
     }
     if (!create) return null;
+    const pageId = agentPages[0].id;
     const columns = COLUMNS2.map((c, i) => ({
       id: `col_${i}`,
       name: c.name,
@@ -19224,47 +19244,45 @@ var TicketStore = class {
     if (created?.id) {
       log3(`Created "${DATASTORE_TITLE2}" datastore on Agent Datastore page for ${cwd}`);
       const ds = { blockId: created.id, pageId };
-      this.dsCache.set(cwd, ds);
-      return ds;
+      const stores = { primary: ds, all: [ds] };
+      this.dsCache.set(cwd, stores);
+      return stores;
     }
     return null;
   }
-  /** Finds an existing Tickets block on the page. Prefers a system_key match
-   * (which survives title renames). Falls back to title match for legacy blocks
-   * and backfills system_key on the way out. */
-  async findOrAdoptBlock(pageId) {
+  /** Finds every Tickets block on the page: system_key matches first, then
+   * title matches for legacy blocks. When no system_key block exists, the
+   * first legacy block is adopted (system_key backfilled so it survives a
+   * later rename); extra title matches are still listed but left unstamped so
+   * the primary can't flip between sessions. */
+  async findTicketBlocks(pageId) {
     const summaries = await this.api.getPageBlockSummaries(pageId) || [];
     const datastoreSummaries = summaries.filter((b) => b?.type === "datastore" && b?.id);
-    if (datastoreSummaries.length === 0) return null;
-    let titleFallbackId = null;
-    let titleFallbackProps = null;
+    if (datastoreSummaries.length === 0) return [];
+    const keyed = [];
+    const legacy = [];
     for (const s of datastoreSummaries) {
       try {
         const block = await this.api.getBlock(s.id);
         const props = block?.props || {};
-        if (props.system_key === SYSTEM_KEY2) {
-          return s.id;
-        }
-        if (s.title === DATASTORE_TITLE2 && titleFallbackId === null) {
-          titleFallbackId = s.id;
-          titleFallbackProps = props;
-        }
+        if (props.system_key === SYSTEM_KEY2) keyed.push(s.id);
+        else if (s.title === DATASTORE_TITLE2) legacy.push({ id: s.id, props });
       } catch (err) {
         log3(`getBlock(${s.id}) failed during lookup: ${err?.message || err}`);
       }
     }
-    if (titleFallbackId) {
+    if (keyed.length === 0 && legacy.length > 0) {
+      const adopt = legacy[0];
       try {
-        await this.api.updateBlock(titleFallbackId, {
-          props: { ...titleFallbackProps || {}, system_key: SYSTEM_KEY2 }
+        await this.api.updateBlock(adopt.id, {
+          props: { ...adopt.props, system_key: SYSTEM_KEY2 }
         });
-        log3(`Backfilled system_key on legacy Tickets block ${titleFallbackId}`);
+        log3(`Backfilled system_key on legacy Tickets block ${adopt.id}`);
       } catch (err) {
-        log3(`backfill system_key failed on ${titleFallbackId}: ${err?.message || err}`);
+        log3(`backfill system_key failed on ${adopt.id}: ${err?.message || err}`);
       }
-      return titleFallbackId;
     }
-    return null;
+    return [...keyed, ...legacy.map((l) => l.id)];
   }
   async ensureColumns(blockId) {
     try {
@@ -20085,11 +20103,11 @@ var COLUMNS3 = [
 function log4(...args) {
   log("[observer-store]", ...args);
 }
-function findPageByTitle3(pages, title) {
+function findPageByTitle2(pages, title) {
   for (const p of pages) {
     if (p?.title === title) return p;
     if (p?.children?.length) {
-      const c = findPageByTitle3(p.children, title);
+      const c = findPageByTitle2(p.children, title);
       if (c) return c;
     }
   }
@@ -20158,7 +20176,7 @@ var ObserverStore = class {
     }
     if (!folder?.id) return null;
     const folderDetail = await this.api.getFolder(folder.id);
-    const agentPage = findPageByTitle3(folderDetail?.pages || [], AGENT_DATASTORE_PAGE_TITLE3);
+    const agentPage = findPageByTitle2(folderDetail?.pages || [], AGENT_DATASTORE_PAGE_TITLE3);
     if (!agentPage?.id) return null;
     const summaries = await this.api.getPageBlockSummaries(agentPage.id) || [];
     for (const s of summaries.filter((b) => b?.type === spec.type && b?.id)) {
@@ -21255,13 +21273,13 @@ var Orchestrator = class {
     }
     return this.ticketStore.addTicket(cwd, input);
   }
-  async updateTicketForActiveTab(rowId, input) {
+  async updateTicketForActiveTab(rowId, input, blockId) {
     const cwd = this.getActiveTabProjectPath();
     if (!cwd) return { ok: false, error: "No active terminal tab" };
     if (!this.ctlsurfApi.getApiKey()) {
       return { ok: false, error: "ctlsurf API key not configured" };
     }
-    return this.ticketStore.updateTicket(cwd, rowId, input);
+    return this.ticketStore.updateTicket(cwd, rowId, input, blockId);
   }
   async listTicketsForActiveTab() {
     const cwd = this.getActiveTabProjectPath();