@phenx-inc/ctlsurf 0.14.2 → 0.15.1

package/out/main/index.js

@@ -11002,11 +11002,11 @@ function isSameLocalDay(a, b2) {
 function log$4(...args) {
   log$5("[time-tracker]", ...args);
 }
-function findPageByTitle$2(pages, title) {
+function findPageByTitle$1(pages, title) {
   for (const p2 of pages) {
     if (p2?.title === title) return p2;
     if (p2?.children?.length) {
-      const c = findPageByTitle$2(p2.children, title);
+      const c = findPageByTitle$1(p2.children, title);
       if (c) return c;
     }
   }
@@ -11184,7 +11184,7 @@ class TimeTracker {
     }
     if (!folder?.id) return null;
     const folderDetail = await this.api.getFolder(folder.id);
-    const agentPage = findPageByTitle$2(folderDetail?.pages || [], AGENT_DATASTORE_PAGE_TITLE$2);
+    const agentPage = findPageByTitle$1(folderDetail?.pages || [], AGENT_DATASTORE_PAGE_TITLE$2);
     if (!agentPage?.id) return null;
     const blockId = await this.findOrAdoptBlock(agentPage.id);
     if (blockId) {
@@ -11289,21 +11289,19 @@ const COLUMNS$1 = [
 function log$3(...args) {
   log$5("[ticket-store]", ...args);
 }
-function findPageByTitle$1(pages, title) {
+function findPagesByTitle(pages, title) {
+  const found = [];
   for (const p2 of pages) {
-    if (p2?.title === title) return p2;
-    if (p2?.children?.length) {
-      const c = findPageByTitle$1(p2.children, title);
-      if (c) return c;
-    }
+    if (p2?.title === title) found.push(p2);
+    if (p2?.children?.length) found.push(...findPagesByTitle(p2.children, title));
   }
-  return null;
+  return found;
 }
 class TicketStore {
   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;
@@ -11313,11 +11311,11 @@ class TicketStore {
     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",
@@ -11331,14 +11329,15 @@ class TicketStore {
       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",
@@ -11351,28 +11350,39 @@ class TicketStore {
       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, b2) => (b2.created || "").localeCompare(a.created || ""));
+      }
+      return { ok: true, tickets, blockId: stores.primary.blockId, pageId: stores.primary.pageId };
     } catch (err) {
       log$3(`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;
@@ -11383,17 +11393,27 @@ class TicketStore {
     }
     if (!folder?.id) return null;
     const folderDetail = await this.api.getFolder(folder.id);
-    const agentPage = findPageByTitle$1(folderDetail?.pages || [], AGENT_DATASTORE_PAGE_TITLE$1);
-    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_TITLE$1);
+    if (agentPages.length === 0) return null;
+    const rootPath = folder.root_path || cwd;
+    agentPages.sort((a, b2) => Number(b2?.root_path === rootPath) - Number(a?.root_path === rootPath));
+    if (agentPages.length > 1) {
+      log$3(`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 = COLUMNS$1.map((c, i) => ({
       id: `col_${i}`,
       name: c.name,
@@ -11408,47 +11428,45 @@ class TicketStore {
     if (created?.id) {
       log$3(`Created "${DATASTORE_TITLE}" 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((b2) => b2?.type === "datastore" && b2?.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_KEY) {
-          return s.id;
-        }
-        if (s.title === DATASTORE_TITLE && titleFallbackId === null) {
-          titleFallbackId = s.id;
-          titleFallbackProps = props;
-        }
+        if (props.system_key === SYSTEM_KEY) keyed.push(s.id);
+        else if (s.title === DATASTORE_TITLE) legacy.push({ id: s.id, props });
       } catch (err) {
         log$3(`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_KEY }
+        await this.api.updateBlock(adopt.id, {
+          props: { ...adopt.props, system_key: SYSTEM_KEY }
         });
-        log$3(`Backfilled system_key on legacy Tickets block ${titleFallbackId}`);
+        log$3(`Backfilled system_key on legacy Tickets block ${adopt.id}`);
       } catch (err) {
-        log$3(`backfill system_key failed on ${titleFallbackId}: ${err?.message || err}`);
+        log$3(`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 {
@@ -23328,13 +23346,13 @@ class Orchestrator {
     }
     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();
@@ -23626,12 +23644,18 @@ const orchestrator = new Orchestrator(
   }
 );
 function createWindow() {
+  const saved = orchestrator.settingsData;
+  if (saved.themeSource === "light" || saved.themeSource === "dark" || saved.themeSource === "system") {
+    electron.nativeTheme.themeSource = saved.themeSource;
+  }
+  const savedBg = typeof saved.themeBackground === "string" && /^#[0-9a-fA-F]{6}$/.test(saved.themeBackground) ? saved.themeBackground : null;
   mainWindow = new electron.BrowserWindow({
     width: 1400,
     height: 900,
     minWidth: 600,
     minHeight: 400,
     title: "ctlsurf-worker",
+    backgroundColor: savedBg ?? (electron.nativeTheme.shouldUseDarkColors ? "#1a1b26" : "#e9eaef"),
     titleBarStyle: "hiddenInset",
     icon: path$1.join(__dirname, "../../resources/icon.png"),
     webPreferences: {
@@ -23729,6 +23753,27 @@ electron.ipcMain.handle(
 electron.ipcMain.handle("app:homePath", () => electron.app.getPath("home"));
 electron.ipcMain.handle("app:cwd", () => process.env.CTLSURF_WORKER_CWD || process.cwd());
 electron.ipcMain.handle("app:projectName", () => orchestrator.projectName);
+electron.ipcMain.handle("app:getAppearance", () => ({
+  pref: orchestrator.settingsData.appearance ?? null
+}));
+electron.ipcMain.handle("app:setAppearance", (_e, data) => {
+  const source = data?.source;
+  if (source !== "system" && source !== "light" && source !== "dark") return { ok: false };
+  electron.nativeTheme.themeSource = source;
+  const settings = orchestrator.settingsData;
+  if (data.pref && typeof data.pref === "object") {
+    settings.appearance = data.pref;
+  }
+  settings.themeSource = source;
+  if (typeof data.background === "string" && /^#[0-9a-fA-F]{6}$/.test(data.background)) {
+    settings.themeBackground = data.background;
+    if (mainWindow && !mainWindow.isDestroyed()) {
+      mainWindow.setBackgroundColor(data.background);
+    }
+  }
+  orchestrator.saveSettings();
+  return { ok: true };
+});
 electron.ipcMain.handle("app:browseCwd", async () => {
   if (!mainWindow) return null;
   const result = await electron.dialog.showOpenDialog(mainWindow, {
@@ -23933,8 +23978,8 @@ electron.ipcMain.handle("tickets:project", () => {
 electron.ipcMain.handle("tickets:add", async (_event, input) => {
   return orchestrator.addTicketForActiveTab(input);
 });
-electron.ipcMain.handle("tickets:update", async (_event, rowId, input) => {
-  return orchestrator.updateTicketForActiveTab(rowId, input);
+electron.ipcMain.handle("tickets:update", async (_event, rowId, input, blockId) => {
+  return orchestrator.updateTicketForActiveTab(rowId, input, blockId);
 });
 electron.ipcMain.handle("tickets:list", async () => {
   return orchestrator.listTicketsForActiveTab();

package/out/preload/index.js

@@ -40,6 +40,11 @@ const api = {
     return () => electron.ipcRenderer.removeListener("app:projectChanged", listener);
   },
   browseCwd: () => electron.ipcRenderer.invoke("app:browseCwd"),
+  // Mirror the renderer's appearance preference onto Chromium's nativeTheme and
+  // persist it. localStorage stays the source of truth (see renderer/lib/theme.ts);
+  // this copy backs the pre-load window background and localStorage recovery.
+  setAppearance: (data) => electron.ipcRenderer.invoke("app:setAppearance", data),
+  getAppearance: () => electron.ipcRenderer.invoke("app:getAppearance"),
   // Clipboard — write a rich-HTML table (+ plain-text fallback) for email paste.
   // `ok` reflects a read-back verification in the main process, not just that the
   // call was made; `error` is set when the write threw.
@@ -68,7 +73,7 @@ const api = {
   // Tickets (active tab)
   getTicketProject: () => electron.ipcRenderer.invoke("tickets:project"),
   addTicket: (input) => electron.ipcRenderer.invoke("tickets:add", input),
-  updateTicket: (rowId, input) => electron.ipcRenderer.invoke("tickets:update", rowId, input),
+  updateTicket: (rowId, input, blockId) => electron.ipcRenderer.invoke("tickets:update", rowId, input, blockId),
   listTickets: () => electron.ipcRenderer.invoke("tickets:list"),
   // Chat logging (global)
   getLogChat: () => electron.ipcRenderer.invoke("logchat:get"),

package/out/renderer/assets/{cssMode-bQYoCKra.js → cssMode-B77M9HlN.js}

@@ -1,6 +1,6 @@
-import { c as createWebWorker, l as languages } from "./index-BJNR4hRK.js";
-import { C as CompletionAdapter, H as HoverAdapter, D as DocumentHighlightAdapter, a as DefinitionAdapter, R as ReferenceAdapter, b as DocumentSymbolAdapter, c as RenameAdapter, d as DocumentColorAdapter, F as FoldingRangeAdapter, e as DiagnosticsAdapter, S as SelectionRangeAdapter, f as DocumentFormattingEditProvider, g as DocumentRangeFormattingEditProvider } from "./lspLanguageFeatures-BEgiDCIW.js";
-import { h, i, j, t, k } from "./lspLanguageFeatures-BEgiDCIW.js";
+import { c as createWebWorker, l as languages } from "./index-CN3UN7Tm.js";
+import { C as CompletionAdapter, H as HoverAdapter, D as DocumentHighlightAdapter, a as DefinitionAdapter, R as ReferenceAdapter, b as DocumentSymbolAdapter, c as RenameAdapter, d as DocumentColorAdapter, F as FoldingRangeAdapter, e as DiagnosticsAdapter, S as SelectionRangeAdapter, f as DocumentFormattingEditProvider, g as DocumentRangeFormattingEditProvider } from "./lspLanguageFeatures-BE0g7ubH.js";
+import { h, i, j, t, k } from "./lspLanguageFeatures-BE0g7ubH.js";
 const STOP_WHEN_IDLE_FOR = 2 * 60 * 1e3;
 class WorkerManager {
   constructor(defaults) {

package/out/renderer/assets/{freemarker2-BS1ERQl_.js → freemarker2-oUT2zvyQ.js}

@@ -1,4 +1,4 @@
-import { l as languages } from "./index-BJNR4hRK.js";
+import { l as languages } from "./index-CN3UN7Tm.js";
 const EMPTY_ELEMENTS = [
   "assign",
   "flush",

package/out/renderer/assets/{handlebars-B-ZEHRLr.js → handlebars-jCckoi5j.js}

@@ -1,4 +1,4 @@
-import { l as languages } from "./index-BJNR4hRK.js";
+import { l as languages } from "./index-CN3UN7Tm.js";
 const EMPTY_ELEMENTS = [
   "area",
   "base",

package/out/renderer/assets/{html-lk9e1Lkl.js → html-kAgrAaKW.js}

@@ -1,4 +1,4 @@
-import { l as languages } from "./index-BJNR4hRK.js";
+import { l as languages } from "./index-CN3UN7Tm.js";
 const EMPTY_ELEMENTS = [
   "area",
   "base",

package/out/renderer/assets/{htmlMode-Ds1eMYgM.js → htmlMode-DIWkIawy.js}

@@ -1,6 +1,6 @@
-import { c as createWebWorker, l as languages } from "./index-BJNR4hRK.js";
-import { H as HoverAdapter, D as DocumentHighlightAdapter, h as DocumentLinkAdapter, F as FoldingRangeAdapter, b as DocumentSymbolAdapter, S as SelectionRangeAdapter, c as RenameAdapter, f as DocumentFormattingEditProvider, g as DocumentRangeFormattingEditProvider, C as CompletionAdapter } from "./lspLanguageFeatures-BEgiDCIW.js";
-import { a, e, d, R, i, j, t, k } from "./lspLanguageFeatures-BEgiDCIW.js";
+import { c as createWebWorker, l as languages } from "./index-CN3UN7Tm.js";
+import { H as HoverAdapter, D as DocumentHighlightAdapter, h as DocumentLinkAdapter, F as FoldingRangeAdapter, b as DocumentSymbolAdapter, S as SelectionRangeAdapter, c as RenameAdapter, f as DocumentFormattingEditProvider, g as DocumentRangeFormattingEditProvider, C as CompletionAdapter } from "./lspLanguageFeatures-BE0g7ubH.js";
+import { a, e, d, R, i, j, t, k } from "./lspLanguageFeatures-BE0g7ubH.js";
 const STOP_WHEN_IDLE_FOR = 2 * 60 * 1e3;
 class WorkerManager {
   constructor(defaults) {