@phenx-inc/ctlsurf 0.15.0 → 0.15.2

package/out/renderer/assets/{javascript-D0vPLEJg.js → javascript-CHhxL0s7.js}

@@ -1,5 +1,5 @@
-import { conf as conf$1, language as language$1 } from "./typescript-CDA0Hhef.js";
-import "./index-5azC4yNn.js";
+import { conf as conf$1, language as language$1 } from "./typescript-BRCOaBQ5.js";
+import "./index-DVdWgw7p.js";
 const conf = conf$1;
 const language = {
   // Set defaultToken to invalid to see what you do not tokenize yet

package/out/renderer/assets/{jsonMode-DBvR0zMu.js → jsonMode-Cy7-eWai.js}

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

package/out/renderer/assets/{liquid-CLoc6Tx7.js → liquid-vMkF9pfk.js}

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

package/out/renderer/assets/{lspLanguageFeatures-CiaMaQoY.js → lspLanguageFeatures-nAygNzuG.js}

@@ -1,4 +1,4 @@
-import { R as Range$1, l as languages, e as editor, U as Uri, M as MarkerSeverity } from "./index-5azC4yNn.js";
+import { R as Range$1, l as languages, e as editor, U as Uri, M as MarkerSeverity } from "./index-DVdWgw7p.js";
 var DocumentUri;
 (function(DocumentUri2) {
   function is(value) {

package/out/renderer/assets/{mdx-DTsq6tlv.js → mdx-C4UVz5dW.js}

@@ -1,4 +1,4 @@
-import { l as languages } from "./index-5azC4yNn.js";
+import { l as languages } from "./index-DVdWgw7p.js";
 const conf = {
   comments: {
     blockComment: ["{/*", "*/}"]

package/out/renderer/assets/{python-D04DpZDr.js → python-BHemzN9g.js}

@@ -1,4 +1,4 @@
-import { l as languages } from "./index-5azC4yNn.js";
+import { l as languages } from "./index-DVdWgw7p.js";
 const conf = {
   comments: {
     lineComment: "#",

package/out/renderer/assets/{razor-Di6CJ6s8.js → razor-DH6NPzbo.js}

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

package/out/renderer/assets/{tsMode-mfv6mHOv.js → tsMode-DxBdlGZB.js}

@@ -1,4 +1,4 @@
-import { c as createWebWorker, e as editor, U as Uri, a as MarkerTag, M as MarkerSeverity, l as languages, t as typescriptDefaults, R as Range } from "./index-5azC4yNn.js";
+import { c as createWebWorker, e as editor, U as Uri, a as MarkerTag, M as MarkerSeverity, l as languages, t as typescriptDefaults, R as Range } from "./index-DVdWgw7p.js";
 class WorkerManager {
   constructor(_modeId, _defaults) {
     this._modeId = _modeId;

package/out/renderer/assets/{typescript-CDA0Hhef.js → typescript-BRCOaBQ5.js}

@@ -1,4 +1,4 @@
-import { l as languages } from "./index-5azC4yNn.js";
+import { l as languages } from "./index-DVdWgw7p.js";
 const conf = {
   wordPattern: /(-?\d*\.\d\w*)|([^\`\~\!\@\#\%\^\&\*\(\)\-\=\+\[\{\]\}\\\|\;\:\'\"\,\.\<\>\/\?\s]+)/g,
   comments: {

package/out/renderer/assets/{xml-BU0voRuq.js → xml-DVv9gDP1.js}

@@ -1,4 +1,4 @@
-import { l as languages } from "./index-5azC4yNn.js";
+import { l as languages } from "./index-DVdWgw7p.js";
 const conf = {
   comments: {
     blockComment: ["<!--", "-->"]

package/out/renderer/assets/{yaml-qzFWnaZJ.js → yaml-jB-C3CdS.js}

@@ -1,4 +1,4 @@
-import { l as languages } from "./index-5azC4yNn.js";
+import { l as languages } from "./index-DVdWgw7p.js";
 const conf = {
   comments: {
     lineComment: "#"

package/out/renderer/index.html

@@ -106,7 +106,7 @@
     :root[data-theme='catppuccin-latte'] .boot-splash-title { color: #2f3145; }
     :root[data-theme='catppuccin-latte'] .boot-splash-label { color: #7c7f93; }
   </style>
-  <script type="module" crossorigin src="./assets/index-5azC4yNn.js"></script>
+  <script type="module" crossorigin src="./assets/index-DVdWgw7p.js"></script>
   <link rel="stylesheet" crossorigin href="./assets/index-3sFJEz7i.css">
 </head>
 <body>

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@phenx-inc/ctlsurf",
-  "version": "0.15.0",
+  "version": "0.15.2",
   "description": "Agent-agnostic terminal and desktop app for ctlsurf — run Claude Code, Codex, or any coding agent with live session logging and remote control",
   "main": "out/main/index.js",
   "bin": {

package/src/main/index.ts

@@ -710,8 +710,8 @@ ipcMain.handle('tickets:add', async (_event, input: {
 })
 ipcMain.handle('tickets:update', async (_event, rowId: string, input: {
   title: string; description?: string; status?: string; priority?: string
-}) => {
-  return orchestrator.updateTicketForActiveTab(rowId, input)
+}, blockId?: string) => {
+  return orchestrator.updateTicketForActiveTab(rowId, input, blockId)
 })
 ipcMain.handle('tickets:list', async () => {
   return orchestrator.listTicketsForActiveTab()

package/src/main/orchestrator.ts

@@ -780,13 +780,13 @@ export class Orchestrator {
     return this.ticketStore.addTicket(cwd, input)
   }
 
-  async updateTicketForActiveTab(rowId: string, input: TicketInput): Promise<{ ok: boolean; error?: string }> {
+  async updateTicketForActiveTab(rowId: string, input: TicketInput, blockId?: string): Promise<{ ok: boolean; error?: string }> {
     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(): Promise<{ ok: boolean; tickets: import('./ticketStore').Ticket[]; blockId?: string; pageId?: string; error?: string }> {

package/src/main/ticketStore.ts

@@ -45,23 +45,31 @@ export interface Ticket {
   status: string
   priority: string
   created: string | null
+  // Owning datastore, so edits and agent dispatches target the store this row
+  // actually lives in — a folder can accumulate more than one Tickets store.
+  blockId: string
+  pageId: string
 }
 
 function log(...args: unknown[]): void {
   baseLog('[ticket-store]', ...args)
 }
 
-function findPageByTitle(pages: any[], title: string): any | null {
+/** Collects every page with the given title, in tree order. A folder can end
+ * up with duplicate "Agent Datastore" pages (e.g. an agent creating its own
+ * under an unrelated page), with tickets split across them. */
+function findPagesByTitle(pages: any[], title: string): any[] {
+  const found: any[] = []
   for (const p of pages) {
-    if (p?.title === title) return p
-    if (p?.children?.length) {
-      const c = findPageByTitle(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
 }
 
+interface DsRef { blockId: string; pageId: string }
+interface ResolvedStores { primary: DsRef; all: DsRef[] }
+
 /**
  * Per-project `Tickets` datastore manager. Mirrors TimeTracker's datastore
  * resolution (find folder → Agent Datastore page → find/create block by
@@ -70,10 +78,10 @@ function findPageByTitle(pages: any[], title: string): any | null {
  */
 export class TicketStore {
   private api: CtlsurfApi
-  // 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.
-  private dsCache = new Map<string, { blockId: string; pageId: string }>()
+  // 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.
+  private dsCache = new Map<string, ResolvedStores>()
 
   constructor(api: CtlsurfApi) {
     this.api = api
@@ -84,11 +92,11 @@ export 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',
@@ -103,14 +111,15 @@ export class TicketStore {
     }
   }
 
-  /** Updates an existing ticket row in the project's Tickets datastore. */
-  async updateTicket(cwd: string, rowId: string, input: TicketInput): Promise<{ ok: boolean; error?: string }> {
+  /** 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: string, rowId: string, input: TicketInput, blockId?: string): Promise<{ ok: boolean; error?: string }> {
     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',
@@ -124,29 +133,42 @@ export class TicketStore {
     }
   }
 
-  /** 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: string): Promise<{ ok: boolean; tickets: Ticket[]; blockId?: string; pageId?: string; error?: string }> {
     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: Ticket[] = (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 as string) ?? 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: Ticket[] = []
+      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 as string) ?? r.created_at ?? null,
+            blockId: ds.blockId,
+            pageId: ds.pageId,
+          })
+        }
+      }
+      // Each store is queried newest-first; re-sort the merged list so rows
+      // from different stores interleave correctly (ISO strings compare fine).
+      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: any) {
       log(`listTickets failed for ${cwd}: ${err?.message || err}`)
       return { ok: false, tickets: [], error: err?.message || String(err) }
     }
   }
 
-  private async ensureDatastore(cwd: string, create: boolean): Promise<{ blockId: string; pageId: string } | null> {
+  private async resolveStores(cwd: string, create: boolean): Promise<ResolvedStores | null> {
     const cached = this.dsCache.get(cwd)
     if (cached) return cached
 
@@ -159,20 +181,34 @@ export class TicketStore {
     if (!folder?.id) return null
 
     const folderDetail = await this.api.getFolder(folder.id)
-    const agentPage = findPageByTitle(folderDetail?.pages || [], AGENT_DATASTORE_PAGE_TITLE)
-    if (!agentPage?.id) return null
-    const pageId: string = agentPage.id
+    const agentPages = findPagesByTitle(folderDetail?.pages || [], AGENT_DATASTORE_PAGE_TITLE)
+    if (agentPages.length === 0) return null
 
-    const blockId = await this.findOrAdoptBlock(pageId)
-    if (blockId) {
-      await this.ensureColumns(blockId)
-      const ds = { blockId, pageId }
-      this.dsCache.set(cwd, ds)
-      return ds
+    // The page bound to the codebase root is the canonical one; prefer it as
+    // the write target. Stable sort keeps tree order among the rest.
+    const rootPath = folder.root_path || cwd
+    agentPages.sort((a, b) => Number(b?.root_path === rootPath) - Number(a?.root_path === rootPath))
+    if (agentPages.length > 1) {
+      log(`Found ${agentPages.length} "Agent Datastore" pages for ${cwd}; aggregating tickets across all of them`)
+    }
+
+    const all: DsRef[] = []
+    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: string = agentPages[0].id
     const columns = COLUMNS.map((c, i) => ({
       id: `col_${i}`,
       name: c.name,
@@ -187,50 +223,48 @@ export class TicketStore {
     if (created?.id) {
       log(`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. */
-  private async findOrAdoptBlock(pageId: string): Promise<string | null> {
+  /** 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. */
+  private async findTicketBlocks(pageId: string): Promise<string[]> {
     const summaries = (await this.api.getPageBlockSummaries(pageId)) || []
     const datastoreSummaries = summaries.filter((b: any) => b?.type === 'datastore' && b?.id)
-    if (datastoreSummaries.length === 0) return null
+    if (datastoreSummaries.length === 0) return []
 
-    let titleFallbackId: string | null = null
-    let titleFallbackProps: Record<string, unknown> | null = null
+    const keyed: string[] = []
+    const legacy: Array<{ id: string; props: Record<string, unknown> }> = []
     for (const s of datastoreSummaries) {
       try {
         const block = await this.api.getBlock(s.id)
         const props = (block?.props || {}) as Record<string, unknown>
-        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: any) {
         log(`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(`Backfilled system_key on legacy Tickets block ${titleFallbackId}`)
+        log(`Backfilled system_key on legacy Tickets block ${adopt.id}`)
       } catch (err: any) {
-        log(`backfill system_key failed on ${titleFallbackId}: ${err?.message || err}`)
+        log(`backfill system_key failed on ${adopt.id}: ${err?.message || err}`)
       }
-      return titleFallbackId
     }
-    return null
+    return [...keyed, ...legacy.map(l => l.id)]
   }
 
   private async ensureColumns(blockId: string): Promise<void> {

package/src/preload/index.ts

@@ -138,9 +138,9 @@ const api = {
     ipcRenderer.invoke('tickets:project'),
   addTicket: (input: { title: string; description?: string; status?: string; priority?: string }): Promise<{ ok: boolean; error?: string }> =>
     ipcRenderer.invoke('tickets:add', input),
-  updateTicket: (rowId: string, input: { title: string; description?: string; status?: string; priority?: string }): Promise<{ ok: boolean; error?: string }> =>
-    ipcRenderer.invoke('tickets:update', rowId, input),
-  listTickets: (): Promise<{ ok: boolean; tickets: Array<{ id: string; title: string; description: string; status: string; priority: string; created: string | null }>; error?: string }> =>
+  updateTicket: (rowId: string, input: { title: string; description?: string; status?: string; priority?: string }, blockId?: string): Promise<{ ok: boolean; error?: string }> =>
+    ipcRenderer.invoke('tickets:update', rowId, input, blockId),
+  listTickets: (): Promise<{ ok: boolean; tickets: Array<{ id: string; title: string; description: string; status: string; priority: string; created: string | null; blockId?: string; pageId?: string }>; blockId?: string; pageId?: string; error?: string }> =>
     ipcRenderer.invoke('tickets:list'),
 
   // Chat logging (global)

package/src/renderer/App.tsx

@@ -62,8 +62,8 @@ declare global {
       deleteProfile: (profileId: string) => Promise<{ ok: boolean }>
       getTicketProject: () => Promise<{ cwd: string | null; name: string | null }>
       addTicket: (input: { title: string; description?: string; status?: string; priority?: string }) => Promise<{ ok: boolean; error?: string }>
-      updateTicket: (rowId: string, input: { title: string; description?: string; status?: string; priority?: string }) => Promise<{ ok: boolean; error?: string }>
-      listTickets: () => Promise<{ ok: boolean; tickets: Array<{ id: string; title: string; description: string; status: string; priority: string; created: string | null }>; blockId?: string; pageId?: string; error?: string }>
+      updateTicket: (rowId: string, input: { title: string; description?: string; status?: string; priority?: string }, blockId?: string) => Promise<{ ok: boolean; error?: string }>
+      listTickets: () => Promise<{ ok: boolean; tickets: Array<{ id: string; title: string; description: string; status: string; priority: string; created: string | null; blockId?: string; pageId?: string }>; blockId?: string; pageId?: string; error?: string }>
       getTracking: () => Promise<{ active: boolean }>
       setTracking: (enabled: boolean) => Promise<{ active: boolean }>
       getLogChat: () => Promise<{ enabled: boolean }>

package/src/renderer/components/FloatingMic.tsx

@@ -15,10 +15,11 @@ interface FloatingMicProps {
   onHide: () => void
 }
 
-// Keep the button clear of the 38px titlebar and 24px status bar.
+// Keep the toolbar clear of the 38px titlebar, 24px status bar, and the
+// terminal's bottom input line.
 const EDGE = 20
 const TOP_MIN = 46
-const BOTTOM_GAP = 36
+const BOTTOM_GAP = 72
 
 function loadPos(): Pos | null {
   try {
@@ -71,17 +72,20 @@ export function FloatingMic({ onTranscript, onHide }: FloatingMicProps) {
     }
   }, [])
 
-  // First mount with no saved position: default to bottom-right.
+  // Default to bottom-right, and clamp saved positions on first mount too so
+  // increased chrome/input clearance applies to existing installations.
   useEffect(() => {
-    if (pos) return
-    const el = elRef.current
-    const w = el?.offsetWidth ?? 64
-    const h = el?.offsetHeight ?? 90
-    setPos({
-      x: window.innerWidth - w - EDGE,
-      y: window.innerHeight - h - BOTTOM_GAP,
+    setPos((current) => {
+      if (current) return clamp(current.x, current.y)
+      const el = elRef.current
+      const w = el?.offsetWidth ?? 64
+      const h = el?.offsetHeight ?? 90
+      return clamp(
+        window.innerWidth - w - EDGE,
+        window.innerHeight - h - BOTTOM_GAP,
+      )
     })
-  }, [pos])
+  }, [clamp])
 
   // Keep it reachable if the window shrinks.
   useEffect(() => {

package/src/renderer/components/TerminalPanel.tsx

@@ -197,6 +197,11 @@ function getOrCreateTerminal(tabId: string, onExit: (tabId: string) => void): {
 
   const terminal = new Terminal({
     cursorBlink: true,
+    // Codex and other modern CLIs often render links as OSC 8 hyperlinks
+    // instead of plain URL text. OSC 8 links are handled by xterm core (not
+    // WebLinksAddon), whose default activation calls window.open(). Route them
+    // through the same embedded-panel handler as detected plain-text URLs.
+    linkHandler: { activate: handleTerminalLink },
     // Off by default on macOS; without this a right-click would reselect the
     // word under the cursor and clobber a multi-line table selection.
     rightClickSelectsWord: false,
@@ -469,8 +474,12 @@ export function TerminalPanel({ tabId, agent, onSpawn, onExit, isActive }: Termi
 
     // Wheel over the terminal is an explicit user scroll — stamp it so onScroll
     // treats the resulting move as intentional (not an involuntary redraw jump).
+    // Capture is important: xterm handles wheel events on a descendant and
+    // emits onScroll synchronously. A bubbling listener runs too late, causing
+    // streamed Codex output to mistake the wheel scroll for a redraw and snap
+    // the viewport straight back to the bottom.
     const onWheel = () => markGesture(tabId)
-    terminal.element?.addEventListener('wheel', onWheel, { passive: true })
+    terminal.element?.addEventListener('wheel', onWheel, { capture: true, passive: true })
 
     // Resize handling — skip when the container is hidden (display:none → 0x0),
     // otherwise fit() reports a tiny size and the PTY gets stuck at ~4 cols
@@ -499,7 +508,7 @@ export function TerminalPanel({ tabId, agent, onSpawn, onExit, isActive }: Termi
       clearTimeout(resizeTimeout)
       window.removeEventListener('resize', handleResize)
       observer.disconnect()
-      terminal.element?.removeEventListener('wheel', onWheel)
+      terminal.element?.removeEventListener('wheel', onWheel, true)
       // Do NOT dispose terminal or unsub PTY listeners — they persist across remounts
     }
   }, [tabId, onExit])

package/src/renderer/components/TicketPanel.tsx

@@ -31,6 +31,10 @@ interface Ticket {
   status: string
   priority: string
   created: string | null
+  // Owning datastore — tickets can live in more than one store per project,
+  // so edits and dispatch prompts must reference the row's own store.
+  blockId?: string
+  pageId?: string
 }
 
 type SaveState = { kind: 'idle' } | { kind: 'saving' } | { kind: 'error'; message: string }
@@ -82,10 +86,13 @@ function ticketPrompt(t: Ticket, refs: TicketRefs | null): string {
     'ctlsurf references (use the ctlsurf MCP tools to read details or update status):',
     `- Ticket row ID: ${t.id}`,
   )
-  if (refs) {
+  // Prefer the ticket's own store — it may not be the project's primary one.
+  const blockId = t.blockId ?? refs?.blockId
+  const pageId = t.pageId ?? refs?.pageId
+  if (blockId && pageId) {
     lines.push(
-      `- Tickets datastore block ID: ${refs.blockId}`,
-      `- Agent Datastore page ID: ${refs.pageId}`,
+      `- Tickets datastore block ID: ${blockId}`,
+      `- Agent Datastore page ID: ${pageId}`,
     )
   }
   return lines.join('\n')
@@ -177,6 +184,8 @@ export function TicketPane({ onSendToTerminal }: { onSendToTerminal: (text: stri
 
   // form state
   const [editingId, setEditingId] = useState<string | null>(null)
+  // Store the edited ticket came from, so the save lands in the right one.
+  const [editingBlockId, setEditingBlockId] = useState<string | null>(null)
   const [title, setTitle] = useState('')
   const [description, setDescription] = useState('')
   const [status, setStatus] = useState(STATUS_OPTIONS[0].value)
@@ -216,6 +225,7 @@ export function TicketPane({ onSendToTerminal }: { onSendToTerminal: (text: stri
 
   const openNewForm = useCallback(() => {
     setEditingId(null)
+    setEditingBlockId(null)
     setTitle('')
     setDescription('')
     setStatus(STATUS_OPTIONS[0].value)
@@ -226,6 +236,7 @@ export function TicketPane({ onSendToTerminal }: { onSendToTerminal: (text: stri
 
   const openEditForm = useCallback((t: Ticket) => {
     setEditingId(t.id)
+    setEditingBlockId(t.blockId ?? null)
     setTitle(t.title)
     setDescription(t.description)
     setStatus(STATUS_OPTIONS.some(o => o.value === t.status) ? t.status : STATUS_OPTIONS[0].value)
@@ -240,7 +251,7 @@ export function TicketPane({ onSendToTerminal }: { onSendToTerminal: (text: stri
     const payload = { title: title.trim(), description: description.trim(), status, priority }
     try {
       const r = editingId
-        ? await window.worker.updateTicket(editingId, payload)
+        ? await window.worker.updateTicket(editingId, payload, editingBlockId ?? undefined)
         : await window.worker.addTicket(payload)
       if (r?.ok) {
         setView('list')
@@ -251,7 +262,7 @@ export function TicketPane({ onSendToTerminal }: { onSendToTerminal: (text: stri
     } catch (err: any) {
       setSave({ kind: 'error', message: err?.message || 'Failed to save ticket' })
     }
-  }, [title, description, status, priority, editingId, save.kind, refreshList])
+  }, [title, description, status, priority, editingId, editingBlockId, save.kind, refreshList])
 
   // Only capture keys while editing a ticket, so list-view typing in the terminal
   // isn't hijacked. Esc returns to the list; Cmd/Ctrl+Enter saves.