opencastle 0.21.1 → 0.23.0

package/src/cli/convoy/store.ts

@@ -7,23 +7,25 @@ import type {
   WorkerRecord,
   WorkerStatus,
   EventRecord,
+  PipelineRecord,
+  PipelineStatus,
 } from './types.js'
 
-const SCHEMA_VERSION = 2
+const SCHEMA_VERSION = 4
 
 export interface ConvoyStore {
-  insertConvoy(record: Omit<ConvoyRecord, 'started_at' | 'finished_at'>): void
+  insertConvoy(record: Omit<ConvoyRecord, 'started_at' | 'finished_at' | 'total_tokens' | 'total_cost_usd' | 'pipeline_id'> & { pipeline_id?: string | null }): void
   getConvoy(id: string): ConvoyRecord | undefined
   getLatestConvoy(): ConvoyRecord | undefined
   updateConvoyStatus(
     id: string,
     status: ConvoyStatus,
-    extra?: { started_at?: string; finished_at?: string },
+    extra?: { started_at?: string; finished_at?: string; total_tokens?: number | null; total_cost_usd?: string | null },
   ): void
   insertTask(
     record: Omit<
       TaskRecord,
-      'worker_id' | 'worktree' | 'output' | 'exit_code' | 'started_at' | 'finished_at'
+      'worker_id' | 'worktree' | 'output' | 'exit_code' | 'started_at' | 'finished_at' | 'prompt_tokens' | 'completion_tokens' | 'total_tokens' | 'cost_usd'
     >,
   ): void
   getTask(id: string, convoyId: string): TaskRecord | undefined
@@ -33,7 +35,7 @@ export interface ConvoyStore {
     convoyId: string,
     status: ConvoyTaskStatus,
     extra?: Partial<
-      Pick<TaskRecord, 'worker_id' | 'worktree' | 'output' | 'exit_code' | 'started_at' | 'finished_at' | 'retries'>
+      Pick<TaskRecord, 'worker_id' | 'worktree' | 'output' | 'exit_code' | 'started_at' | 'finished_at' | 'retries' | 'prompt_tokens' | 'completion_tokens' | 'total_tokens' | 'cost_usd'>
     >,
   ): void
   getReadyTasks(convoyId: string): TaskRecord[]
@@ -46,6 +48,15 @@ export interface ConvoyStore {
   ): void
   insertEvent(record: Omit<EventRecord, 'id'>): void
   getEvents(convoyId: string): EventRecord[]
+  insertPipeline(record: Omit<PipelineRecord, 'started_at' | 'finished_at' | 'total_tokens' | 'total_cost_usd'>): void
+  getPipeline(id: string): PipelineRecord | undefined
+  getLatestPipeline(): PipelineRecord | undefined
+  updatePipelineStatus(
+    id: string,
+    status: PipelineStatus,
+    extra?: { started_at?: string; finished_at?: string; total_tokens?: number | null; total_cost_usd?: string | null },
+  ): void
+  getConvoysByPipeline(pipelineId: string): ConvoyRecord[]
   withTransaction<T>(fn: () => T): T
   close(): void
 }
@@ -61,8 +72,8 @@ class ConvoyStoreImpl implements ConvoyStore {
   }
 
   private initSchema(): void {
-    const row = this.db.prepare('PRAGMA user_version').get() as { user_version: number }
-    if (row.user_version === 0) {
+    let version = (this.db.prepare('PRAGMA user_version').get() as { user_version: number }).user_version
+    if (version === 0) {
       this.db.exec(`
         CREATE TABLE IF NOT EXISTS convoy (
           id          TEXT PRIMARY KEY,
@@ -72,8 +83,25 @@ class ConvoyStoreImpl implements ConvoyStore {
           branch      TEXT,
           created_at  TEXT NOT NULL,
           started_at  TEXT,
-          finished_at TEXT,
-          spec_yaml   TEXT NOT NULL
+          finished_at    TEXT,
+          spec_yaml      TEXT NOT NULL,
+          total_tokens   INTEGER,
+          total_cost_usd TEXT,
+          pipeline_id    TEXT
+        );
+
+        CREATE TABLE IF NOT EXISTS pipeline (
+          id              TEXT PRIMARY KEY,
+          name            TEXT NOT NULL,
+          status          TEXT NOT NULL DEFAULT 'pending',
+          branch          TEXT,
+          spec_yaml       TEXT NOT NULL,
+          convoy_specs    TEXT NOT NULL,
+          created_at      TEXT NOT NULL,
+          started_at      TEXT,
+          finished_at     TEXT,
+          total_tokens    INTEGER,
+          total_cost_usd  TEXT
         );
 
         CREATE TABLE IF NOT EXISTS task (
@@ -92,10 +120,14 @@ class ConvoyStoreImpl implements ConvoyStore {
           exit_code   INTEGER,
           started_at  TEXT,
           finished_at TEXT,
-          retries     INTEGER NOT NULL DEFAULT 0,
-          max_retries INTEGER NOT NULL DEFAULT 1,
-          files       TEXT,
-          depends_on  TEXT
+          retries           INTEGER NOT NULL DEFAULT 0,
+          max_retries       INTEGER NOT NULL DEFAULT 1,
+          files             TEXT,
+          depends_on        TEXT,
+          prompt_tokens     INTEGER,
+          completion_tokens INTEGER,
+          total_tokens      INTEGER,
+          cost_usd          TEXT
         );
 
         CREATE TABLE IF NOT EXISTS worker (
@@ -122,20 +154,52 @@ class ConvoyStoreImpl implements ConvoyStore {
         );
       `)
       this.db.exec(`PRAGMA user_version = ${SCHEMA_VERSION}`)
+      version = SCHEMA_VERSION
     }
-    if (row.user_version === 1) {
+    if (version === 1) {
       this.db.exec('ALTER TABLE task ADD COLUMN adapter TEXT')
       this.db.exec('PRAGMA user_version = 2')
+      version = 2
+    }
+    if (version === 2) {
+      this.db.exec('ALTER TABLE task ADD COLUMN prompt_tokens INTEGER')
+      this.db.exec('ALTER TABLE task ADD COLUMN completion_tokens INTEGER')
+      this.db.exec('ALTER TABLE task ADD COLUMN total_tokens INTEGER')
+      this.db.exec('ALTER TABLE task ADD COLUMN cost_usd TEXT')
+      this.db.exec('ALTER TABLE convoy ADD COLUMN total_tokens INTEGER')
+      this.db.exec('ALTER TABLE convoy ADD COLUMN total_cost_usd TEXT')
+      this.db.exec('PRAGMA user_version = 3')
+      version = 3
+    }
+    if (version === 3) {
+      this.db.exec(`
+        CREATE TABLE IF NOT EXISTS pipeline (
+          id              TEXT PRIMARY KEY,
+          name            TEXT NOT NULL,
+          status          TEXT NOT NULL DEFAULT 'pending',
+          branch          TEXT,
+          spec_yaml       TEXT NOT NULL,
+          convoy_specs    TEXT NOT NULL,
+          created_at      TEXT NOT NULL,
+          started_at      TEXT,
+          finished_at     TEXT,
+          total_tokens    INTEGER,
+          total_cost_usd  TEXT
+        )
+      `)
+      this.db.exec('ALTER TABLE convoy ADD COLUMN pipeline_id TEXT')
+      this.db.exec('PRAGMA user_version = 4')
+      version = 4
     }
   }
 
-  insertConvoy(record: Omit<ConvoyRecord, 'started_at' | 'finished_at'>): void {
+  insertConvoy(record: Omit<ConvoyRecord, 'started_at' | 'finished_at' | 'total_tokens' | 'total_cost_usd' | 'pipeline_id'> & { pipeline_id?: string | null }): void {
     this.db
       .prepare(
-        `INSERT INTO convoy (id, name, spec_hash, status, branch, created_at, started_at, finished_at, spec_yaml)
-         VALUES (:id, :name, :spec_hash, :status, :branch, :created_at, NULL, NULL, :spec_yaml)`,
+        `INSERT INTO convoy (id, name, spec_hash, status, branch, created_at, started_at, finished_at, spec_yaml, pipeline_id)
+         VALUES (:id, :name, :spec_hash, :status, :branch, :created_at, NULL, NULL, :spec_yaml, :pipeline_id)`,
       )
-      .run(record)
+      .run({ ...record, pipeline_id: record.pipeline_id ?? null })
   }
 
   getConvoy(id: string): ConvoyRecord | undefined {
@@ -153,10 +217,10 @@ class ConvoyStoreImpl implements ConvoyStore {
   updateConvoyStatus(
     id: string,
     status: ConvoyStatus,
-    extra?: { started_at?: string; finished_at?: string },
+    extra?: { started_at?: string; finished_at?: string; total_tokens?: number | null; total_cost_usd?: string | null },
   ): void {
     const sets = ['status = :status']
-    const params: Record<string, string | null> = { id, status }
+    const params: Record<string, string | number | null> = { id, status }
 
     if (extra?.started_at !== undefined) {
       sets.push('started_at = :started_at')
@@ -166,6 +230,14 @@ class ConvoyStoreImpl implements ConvoyStore {
       sets.push('finished_at = :finished_at')
       params.finished_at = extra.finished_at
     }
+    if (extra?.total_tokens !== undefined) {
+      sets.push('total_tokens = :total_tokens')
+      params.total_tokens = extra.total_tokens
+    }
+    if (extra?.total_cost_usd !== undefined) {
+      sets.push('total_cost_usd = :total_cost_usd')
+      params.total_cost_usd = extra.total_cost_usd
+    }
 
     this.db.prepare(`UPDATE convoy SET ${sets.join(', ')} WHERE id = :id`).run(params)
   }
@@ -173,7 +245,7 @@ class ConvoyStoreImpl implements ConvoyStore {
   insertTask(
     record: Omit<
       TaskRecord,
-      'worker_id' | 'worktree' | 'output' | 'exit_code' | 'started_at' | 'finished_at'
+      'worker_id' | 'worktree' | 'output' | 'exit_code' | 'started_at' | 'finished_at' | 'prompt_tokens' | 'completion_tokens' | 'total_tokens' | 'cost_usd'
     >,
   ): void {
     this.db
@@ -207,12 +279,12 @@ class ConvoyStoreImpl implements ConvoyStore {
     convoyId: string,
     status: ConvoyTaskStatus,
     extra?: Partial<
-      Pick<TaskRecord, 'worker_id' | 'worktree' | 'output' | 'exit_code' | 'started_at' | 'finished_at' | 'retries'>
+      Pick<TaskRecord, 'worker_id' | 'worktree' | 'output' | 'exit_code' | 'started_at' | 'finished_at' | 'retries' | 'prompt_tokens' | 'completion_tokens' | 'total_tokens' | 'cost_usd'>
     >,
   ): void {
     const sets = ['status = :status']
     const params: Record<string, string | number | null> = { id, convoy_id: convoyId, status }
-    const extraFields = ['worker_id', 'worktree', 'output', 'exit_code', 'started_at', 'finished_at', 'retries'] as const
+    const extraFields = ['worker_id', 'worktree', 'output', 'exit_code', 'started_at', 'finished_at', 'retries', 'prompt_tokens', 'completion_tokens', 'total_tokens', 'cost_usd'] as const
 
     if (extra) {
       for (const field of extraFields) {
@@ -298,6 +370,63 @@ class ConvoyStoreImpl implements ConvoyStore {
       .all({ convoy_id: convoyId }) as unknown as EventRecord[]
   }
 
+  insertPipeline(record: Omit<PipelineRecord, 'started_at' | 'finished_at' | 'total_tokens' | 'total_cost_usd'>): void {
+    this.db
+      .prepare(
+        `INSERT INTO pipeline (id, name, status, branch, spec_yaml, convoy_specs, created_at,
+           started_at, finished_at, total_tokens, total_cost_usd)
+         VALUES (:id, :name, :status, :branch, :spec_yaml, :convoy_specs, :created_at,
+           NULL, NULL, NULL, NULL)`,
+      )
+      .run(record)
+  }
+
+  getPipeline(id: string): PipelineRecord | undefined {
+    return this.db
+      .prepare('SELECT * FROM pipeline WHERE id = :id')
+      .get({ id }) as PipelineRecord | undefined
+  }
+
+  getLatestPipeline(): PipelineRecord | undefined {
+    return this.db
+      .prepare('SELECT * FROM pipeline ORDER BY created_at DESC LIMIT 1')
+      .get() as PipelineRecord | undefined
+  }
+
+  updatePipelineStatus(
+    id: string,
+    status: PipelineStatus,
+    extra?: { started_at?: string; finished_at?: string; total_tokens?: number | null; total_cost_usd?: string | null },
+  ): void {
+    const sets = ['status = :status']
+    const params: Record<string, string | number | null> = { id, status }
+
+    if (extra?.started_at !== undefined) {
+      sets.push('started_at = :started_at')
+      params.started_at = extra.started_at
+    }
+    if (extra?.finished_at !== undefined) {
+      sets.push('finished_at = :finished_at')
+      params.finished_at = extra.finished_at
+    }
+    if (extra?.total_tokens !== undefined) {
+      sets.push('total_tokens = :total_tokens')
+      params.total_tokens = extra.total_tokens
+    }
+    if (extra?.total_cost_usd !== undefined) {
+      sets.push('total_cost_usd = :total_cost_usd')
+      params.total_cost_usd = extra.total_cost_usd
+    }
+
+    this.db.prepare(`UPDATE pipeline SET ${sets.join(', ')} WHERE id = :id`).run(params)
+  }
+
+  getConvoysByPipeline(pipelineId: string): ConvoyRecord[] {
+    return this.db
+      .prepare('SELECT * FROM convoy WHERE pipeline_id = :pipeline_id ORDER BY created_at')
+      .all({ pipeline_id: pipelineId }) as unknown as ConvoyRecord[]
+  }
+
   withTransaction<T>(fn: () => T): T {
     this.db.exec('BEGIN')
     try {

package/src/cli/convoy/types.ts

@@ -11,6 +11,8 @@ export type ConvoyTaskStatus =
 
 export type WorkerStatus = 'spawned' | 'running' | 'done' | 'failed' | 'killed'
 
+export type PipelineStatus = 'pending' | 'running' | 'done' | 'failed'
+
 export interface ConvoyRecord {
   id: string
   name: string
@@ -21,6 +23,9 @@ export interface ConvoyRecord {
   started_at: string | null
   finished_at: string | null
   spec_yaml: string
+  total_tokens: number | null
+  total_cost_usd: string | null
+  pipeline_id: string | null
 }
 
 export interface TaskRecord {
@@ -43,6 +48,10 @@ export interface TaskRecord {
   max_retries: number
   files: string | null
   depends_on: string | null
+  prompt_tokens: number | null
+  completion_tokens: number | null
+  total_tokens: number | null
+  cost_usd: string | null
 }
 
 export interface WorkerRecord {
@@ -67,3 +76,17 @@ export interface EventRecord {
   data: string | null
   created_at: string
 }
+
+export interface PipelineRecord {
+  id: string
+  name: string
+  status: PipelineStatus
+  branch: string | null
+  spec_yaml: string
+  convoy_specs: string
+  created_at: string
+  started_at: string | null
+  finished_at: string | null
+  total_tokens: number | null
+  total_cost_usd: string | null
+}

package/src/cli/dashboard.ts

@@ -21,6 +21,7 @@ const MIME_TYPES: Record<string, string> = {
 const DATA_FILES = [
   'events.ndjson',
   'convoys.ndjson',
+  'pipelines.ndjson',
   // Legacy individual files — kept for backwards compatibility
   'sessions.ndjson',
   'delegations.ndjson',

package/src/cli/run/adapters/claude-code.ts

@@ -1,5 +1,5 @@
 import { spawn } from 'node:child_process'
-import type { Task, ExecuteOptions, ExecuteResult } from '../../types.js'
+import type { Task, ExecuteOptions, ExecuteResult, TokenUsage } from '../../types.js'
 
 /** Adapter name */
 export const name = 'claude-code'
@@ -60,10 +60,22 @@ export async function execute(task: Task, options: ExecuteOptions = {}): Promise
 
     proc.on('close', (code) => {
       const output = [stdout, stderr].filter(Boolean).join('\n')
+      let usage: TokenUsage | undefined
+      try {
+        const parsed = JSON.parse(stdout) as Record<string, unknown>
+        const u = parsed?.usage as Record<string, number> | undefined
+        if (u) {
+          const promptTokens = (u.input_tokens ?? u.prompt_tokens) as number | undefined
+          const completionTokens = (u.output_tokens ?? u.completion_tokens) as number | undefined
+          const total = ((promptTokens ?? 0) + (completionTokens ?? 0)) || undefined
+          usage = { prompt_tokens: promptTokens, completion_tokens: completionTokens, total_tokens: total }
+        }
+      } catch { /* not JSON or no usage — graceful degradation */ }
       resolve({
         success: code === 0,
         output: output.slice(0, 10000), // Cap output size
         exitCode: code ?? -1,
+        usage,
       })
     })
 

package/src/cli/run/adapters/copilot.ts

@@ -100,11 +100,19 @@ export async function execute(task: Task, options: ExecuteOptions = {}): Promise
     const timeoutMs = parseTimeout(task.timeout)
     const response = await session.sendAndWait({ prompt }, timeoutMs)
     const output = response?.data?.content ?? ''
+    const rawUsage = (response?.data as Record<string, unknown> | undefined)?.usage ?? (response as Record<string, unknown> | undefined)?.usage
+    const u = rawUsage as Record<string, number> | undefined
+    const usageResult = u ? {
+      prompt_tokens: u.prompt_tokens ?? u.promptTokens,
+      completion_tokens: u.completion_tokens ?? u.completionTokens,
+      total_tokens: u.total_tokens ?? u.totalTokens,
+    } : undefined
 
     return {
       success: true,
       output: output.slice(0, 10_000),
       exitCode: 0,
+      usage: usageResult,
     }
   } catch (err: unknown) {
     return {

package/src/cli/run/adapters/cursor.ts

@@ -1,5 +1,5 @@
 import { spawn } from 'node:child_process'
-import type { Task, ExecuteOptions, ExecuteResult } from '../../types.js'
+import type { Task, ExecuteOptions, ExecuteResult, TokenUsage } from '../../types.js'
 
 /** Adapter name */
 export const name = 'cursor'
@@ -59,10 +59,22 @@ export async function execute(task: Task, options: ExecuteOptions = {}): Promise
 
     proc.on('close', (code) => {
       const output = [stdout, stderr].filter(Boolean).join('\n')
+      let usage: TokenUsage | undefined
+      try {
+        const parsed = JSON.parse(stdout) as Record<string, unknown>
+        const u = parsed?.usage as Record<string, number> | undefined
+        if (u) {
+          const promptTokens = (u.input_tokens ?? u.prompt_tokens) as number | undefined
+          const completionTokens = (u.output_tokens ?? u.completion_tokens) as number | undefined
+          const total = ((promptTokens ?? 0) + (completionTokens ?? 0)) || undefined
+          usage = { prompt_tokens: promptTokens, completion_tokens: completionTokens, total_tokens: total }
+        }
+      } catch { /* not JSON or no usage — graceful degradation */ }
       resolve({
         success: code === 0,
         output: output.slice(0, 10000), // Cap output size
         exitCode: code ?? -1,
+        usage,
       })
     })
 

package/src/cli/run/adapters/opencode.ts

@@ -1,5 +1,5 @@
 import { spawn } from 'node:child_process'
-import type { Task, ExecuteOptions, ExecuteResult } from '../../types.js'
+import type { Task, ExecuteOptions, ExecuteResult, TokenUsage } from '../../types.js'
 
 /** Adapter name */
 export const name = 'opencode'
@@ -53,10 +53,22 @@ export async function execute(task: Task, options: ExecuteOptions = {}): Promise
 
     proc.on('close', (code) => {
       const output = [stdout, stderr].filter(Boolean).join('\n')
+      let usage: TokenUsage | undefined
+      try {
+        const parsed = JSON.parse(stdout) as Record<string, unknown>
+        const u = parsed?.usage as Record<string, number> | undefined
+        if (u) {
+          const promptTokens = (u.input_tokens ?? u.prompt_tokens) as number | undefined
+          const completionTokens = (u.output_tokens ?? u.completion_tokens) as number | undefined
+          const total = ((promptTokens ?? 0) + (completionTokens ?? 0)) || undefined
+          usage = { prompt_tokens: promptTokens, completion_tokens: completionTokens, total_tokens: total }
+        }
+      } catch { /* not JSON or no usage — graceful degradation */ }
       resolve({
         success: code === 0,
         output: output.slice(0, 10000), // Cap output size
         exitCode: code ?? -1,
+        usage,
       })
     })