pantheon-opencode 1.5.0-beta.2 → 1.5.0-beta.20

package/src/mcp/toon_codec.py

@@ -9,7 +9,7 @@ absent/fails.
 Only the standard library (``json`` + ``re``) — prohibited: external
 gateway, generative embedding.
 
-Encoding rules (mirrored byte-for-byte by ``src/pantheon/toon-codec.ts``):
+Encoding rules:
 
 - Scalars: ``None``/``True``/``False`` → ``null``/``true``/``false``;
   numbers → shortest form; strings bare when unambiguous, else
@@ -20,8 +20,7 @@ Encoding rules (mirrored byte-for-byte by ``src/pantheon/toon-codec.ts``):
 - Lists of scalars: ``- item`` lines; empty list → ``[]``.
 - Lists of dicts with uniform keys: ``@table k1|k2`` header + ``v1|v2``
   rows (savings are per payload class — ~11% on content-dominated board
-  records up to ~47% on large tabular checkpoints — see
-  ``docs/ws3-token-opt-measurements.md`` for the reproducible table).
+  records up to ~47% on large tabular checkpoints).
 - Dict values never need quoting for ``:`` (split is on the FIRST colon);
   list items / top-level scalars that look like ``key: ...`` are quoted.
 """
@@ -471,7 +470,6 @@ def toon_size_report(value: Any) -> dict[str, Any]:
     Reports BOTH chars and tokens: token ratios on tiny payloads suffer
     ceiling bias (``ceil`` rounds 161→41 vs 143→36), so the char columns are
     the honest basis and the token columns show what metering will debit.
-    Per-class numbers: see ``docs/ws3-token-opt-measurements.md``.
     """
     compact_json = json.dumps(value, ensure_ascii=False, separators=(",", ":"))
     toon = toon_encode(value)

package/src/pantheon/background-job-board.ts

@@ -2,7 +2,7 @@
  * Background Job Board — state machine for tracking background agent jobs.
  *
  * Tracks jobs through a state machine (running → completed/error/cancelled → reconciled),
- * supports alias generation per session, persistence via adapter, auto-wake signal files,
+ * supports alias generation per session, persistence via adapter, wake signal files,
  * and terminal state listeners (persist-before-notify write-ahead-log pattern).
  *
  * Pure TypeScript — zero external dependencies beyond Node.js builtins (fs/path).
@@ -123,7 +123,7 @@ export interface BoardOptions {
   /** Maximum completed jobs kept per agent for reuse (default: 3). */
   maxReusablePerAgent?: number
   /**
-   * Directory for auto-wake signal files.
+   * Directory for wake signal files.
    * When set, a `.signal.json` file is atomically written on every terminal transition.
    * When null or undefined, no signal files are written.
    */
@@ -175,7 +175,7 @@ function getAgentPrefix(agent: string): string {
  * - Strict state machine with validated transitions
  * - Per-session, per-agent alias generation (apo-1, her-2, …)
  * - Optional persistence via injected PersistenceAdapter
- * - Optional auto-wake signal files on terminal transitions
+ * - Optional wake signal files on terminal transitions
  * - Terminal state listeners with persist-before-notify guarantee
  * - expire/prune helpers for session lifecycle management
  */
@@ -222,15 +222,28 @@ export class BackgroundJobBoard {
   async recoverRunningJobs(): Promise<void> {
     if (!this.persistence) return
     const records = await this.persistence.loadAllJobs()
+    const recoveredIDs: string[] = []
     for (const record of records) {
       if (record.state === 'running') {
         record.state = 'error'
         record.lastStatusError = 'Process restarted — job marked as errored'
         record.updatedAt = Date.now()
+        record.completedAt = Date.now()
         record.totalErrors++
+        record.terminalUnreconciled = true
+        recoveredIDs.push(record.taskID)
       }
       this.jobs.set(record.taskID, record)
     }
+    // Persist + signal + notify for each recovered job (write-ahead-log pattern)
+    for (const taskID of recoveredIDs) {
+      const job = this.jobs.get(taskID)
+      if (job) {
+        await this.persistRecord(job)
+        await this.writeSignal(job)
+        this.notifyTerminal(job.taskID)
+      }
+    }
   }
 
   // ─── Core Operations ────────────────────────────────────────────────
@@ -240,6 +253,16 @@ export class BackgroundJobBoard {
    * The job starts in the `running` state with a generated alias.
    */
   async registerLaunch(input: LaunchInput): Promise<BackgroundJobRecord> {
+    // Atomic concurrency check: validate BEFORE any mutation or await.
+    // JavaScript's single-threaded event loop guarantees this check + set
+    // cannot be interleaved with another registerLaunch call.
+    if (!this.canDispatch(input.agent)) {
+      throw new Error(
+        `Concurrency limit reached for agent "${input.agent}" ` +
+          `(${this.getRunningCount(input.agent)} running, max ${this.options.maxConcurrentPerAgent})`,
+      )
+    }
+
     const prefix = getAgentPrefix(input.agent)
     let sessionCounters = this.aliasCounters.get(input.parentSessionID)
     if (!sessionCounters) {
@@ -272,6 +295,20 @@ export class BackgroundJobBoard {
     return record
   }
 
+  /**
+   * Register a launch only when taskID has not already been claimed.
+   *
+   * The map check and set happen before the first await, so JavaScript's
+   * single-threaded event loop makes this critical section atomic even when
+   * two event handlers call it concurrently. The existing record is returned
+   * for the losing caller.
+   */
+  async registerLaunchIfAbsent(input: LaunchInput): Promise<BackgroundJobRecord> {
+    const existing = this.jobs.get(input.taskID)
+    if (existing !== undefined) return existing
+    return this.registerLaunch(input)
+  }
+
   /**
    * Update a job's state to a terminal state.
    *
@@ -420,7 +457,12 @@ export class BackgroundJobBoard {
     job.terminalUnreconciled = false
 
     await this.persistRecord(job)
-    await this.writeSignal(job)
+    // P1-1: reconcile is an acknowledgment, NOT a new terminal transition
+    // (onTerminal does not re-fire). Re-writing a `.signal.json` here leaked
+    // orphan signals with `state:"reconciled"` after the finalize→reconcile
+    // cycle deleted them. Instead, remove any still-pending wake signal so
+    // reconcile leaves no `<alias>.signal.json` behind.
+    await this.deleteSignal(job.alias)
 
     return job
   }
@@ -610,7 +652,7 @@ export class BackgroundJobBoard {
   }
 
   /**
-   * Delete the auto-wake signal file for an alias (`<alias>.signal.json`).
+   * Delete the wake signal file for an alias (`<alias>.signal.json`).
    * No-op (false) when no signalDir is configured or the file is absent.
    * The delegate manager calls this on the spot right after auto-reconcile.
    */

package/src/pantheon/{delegation-compaction.ts → compaction-context.ts}

@@ -1,8 +1,8 @@
 /**
- * Compaction Context (Phase 4 + release-134 Phase 2) — build the context
- * blocks injected by the `experimental.session.compacting` hook so a
- * compacted session does not lose its working state: in-flight background
- * delegations, active goals and pending todos.
+ * Compaction Context (Phase 4 + release-134 Phase 2, slimmed in Fase 2 of the
+ * delegate removal) — build the context blocks injected by the
+ * `experimental.session.compacting` hook so a compacted session does not lose
+ * its working state: active goals and pending todos.
  *
  * Returns a Promise<string[]> (empty when there is nothing to preserve).
  * Section order is stable:
@@ -17,23 +17,10 @@
  *     `opts.todos`: "  [id] description — status". Omitted when the todo
  *     source is absent, disabled, unscoped (no sessionID), fails, or has
  *     no pending todos.
- *   - "Background Delegations (running):" — every running job launched by
- *     the session (active work is never capped): alias, agent, started ISO,
- *     truncated prompt.
- *   - "Background Delegations (finished, unread):" — terminal-unreconciled
- *     jobs, newest first, capped at `maxItems` (default 10, matching
- *     routing.yml background_delegation.max_compaction_items).
  *
- * Reconciled jobs are excluded — they have been read already.
- *
- * The block style mirrors board.formatForPrompt ("  [alias] description —
- * STATUS") so compaction context reads consistently with the system prompt,
- * but with the extra id/agent/started detail the compaction hook needs.
- *
- * @module delegation-compaction
+ * @module compaction-context
  */
 
-import type { BackgroundJobBoard, BackgroundJobRecord } from './background-job-board.ts'
 import type { Goal } from './goal-store.ts'
 import { createPantheonLogger } from './logger.ts'
 import type { TodoLike } from './todo-enforcer.ts'
@@ -72,56 +59,14 @@ export interface CompactionTodoSource {
 }
 
 export interface CompactionContextOptions {
-  /** Scope to jobs launched by this session; omit for all jobs. */
+  /** Scope to this session; omit to skip the per-session sections. */
   sessionID?: string
-  /** Cap on unread terminal jobs kept (default 10). */
-  maxItems?: number
   /** Goal source for <mission_context> (optional — omitted when absent). */
   goals?: CompactionGoalSource
   /** Todo source for <todo_context> (optional — omitted when absent). */
   todos?: CompactionTodoSource
 }
 
-/** Prompt truncation length for a context line. */
-const PROMPT_MAX_LEN = 100
-
-// ─── Formatting ────────────────────────────────────────────────────────
-
-/** Collapse whitespace and truncate a prompt to PROMPT_MAX_LEN chars. */
-function truncatePrompt(text: string): string {
-  const flat = text.trim().replace(/\s+/g, ' ')
-  if (flat.length <= PROMPT_MAX_LEN) return flat
-  return `${flat.slice(0, PROMPT_MAX_LEN)}…`
-}
-
-/** One-line terminal status label, mirroring formatForPrompt. */
-function terminalLabel(state: BackgroundJobRecord['state']): string {
-  switch (state) {
-    case 'completed':
-      return 'OK'
-    case 'error':
-      return 'ERR'
-    case 'cancelled':
-      return 'CAN'
-    default:
-      return state.toUpperCase()
-  }
-}
-
-function runningLine(job: BackgroundJobRecord): string {
-  return (
-    `  [${job.alias}] ${job.agent} — ${truncatePrompt(job.description)} — ` +
-    `RUNNING since ${new Date(job.launchedAt).toISOString()}`
-  )
-}
-
-function unreadTerminalLine(job: BackgroundJobRecord): string {
-  return (
-    `  [${job.alias}] ${job.agent} — ${truncatePrompt(job.description)} — ` +
-    `${terminalLabel(job.state)} ${new Date(job.updatedAt).toISOString()} [unread]`
-  )
-}
-
 // ─── Sections ──────────────────────────────────────────────────────────
 
 /**
@@ -180,58 +125,23 @@ async function todoContextBlock(opts: CompactionContextOptions): Promise<string
   return `<todo_context>\n${lines.join('\n')}`
 }
 
-/**
- * `<delegation_context>` — the existing delegation blocks, byte-for-byte
- * unchanged from Phase 4 (running, then unread terminal ≤ maxItems).
- */
-function delegationBlocks(board: BackgroundJobBoard, opts: CompactionContextOptions): string[] {
-  const maxItems = opts.maxItems ?? 10
-  const jobs = opts.sessionID !== undefined ? board.list(opts.sessionID) : board.list()
-
-  const running = jobs
-    .filter((j) => j.state === 'running')
-    .sort((a, b) => a.launchedAt - b.launchedAt)
-  const unreadTerminal = jobs
-    .filter((j) => j.terminalUnreconciled)
-    .sort((a, b) => b.updatedAt - a.updatedAt)
-    .slice(0, maxItems)
-
-  const blocks: string[] = []
-  if (running.length > 0) {
-    blocks.push(`Background Delegations (running):\n${running.map(runningLine).join('\n')}`)
-  }
-  if (unreadTerminal.length > 0) {
-    blocks.push(
-      `Background Delegations (finished, unread):\n${unreadTerminal
-        .map(unreadTerminalLine)
-        .join('\n')}`,
-    )
-  }
-  return blocks
-}
-
 // ─── Build ─────────────────────────────────────────────────────────────
 
 /**
  * Build the compaction context blocks for a session: preservation
- * directive, active goals, pending todos, and in-flight background
- * delegations. Returns an empty array when there is nothing to preserve
- * (caller skips the hook injection entirely).
+ * directive, active goals, and pending todos. Returns an empty array when
+ * there is nothing to preserve (caller skips the hook injection entirely).
  */
 export async function buildCompactionContext(
-  board: BackgroundJobBoard,
   opts: CompactionContextOptions = {},
 ): Promise<string[]> {
   const [mission, todo] = await Promise.all([missionContextBlock(opts), todoContextBlock(opts)])
-  const delegation = delegationBlocks(board, opts)
 
   // Totally-empty state → nothing to preserve; a lone directive is noise.
-  if (mission === undefined && todo === undefined && delegation.length === 0) return []
+  if (mission === undefined && todo === undefined) return []
 
-  const blocks: string[] = []
-  blocks.push(`<pantheon-context directive>\n${PANTHEON_COMPACTION_DIRECTIVE}`)
+  const blocks: string[] = [`<pantheon-context directive>\n${PANTHEON_COMPACTION_DIRECTIVE}`]
   if (mission !== undefined) blocks.push(mission)
   if (todo !== undefined) blocks.push(todo)
-  blocks.push(...delegation)
   return blocks
 }