主线 A(事件驱动落库): - 统一 EventStore 模块单例:RuntimeApp 不再 new EventStore,改用 eventStore 并 setRepositories(14 个 domain repo),消除事件流向空 DB 的割裂 - Scheduler.create_tasks 改为 async,真正发出 task.created 事件 - run.ts dispatchTask 加 await - 主线 A 独立复审发现并修复关键假绿:四个 repo(Task/Agent/ToolRun/ TaskAttempt)的 *Update 类型 Omit<'status'> 且 update() 主动丢弃 status, 导致 EventStore.project() 的状态写入全部静默失效,DB 行内容 tasks.status 永远冻结在 pending,UI 显示的 completed 来自内存 graph。已修,DB 现 真实反映 task.status=completed - 补 agent.started/agent.completed/agent.failed 事件发出(之前 agents 表 恒空),修复后 agents 表有正确行+status 主线 B1(结构化工具调用块类型,N1): - 新增 content-block.ts 定义 Anthropic canonical content blocks (TextBlock/ThinkingBlock/ToolUseBlock/ToolResultBlock/CanonicalMessage) - provider.ts ProviderCompletionInput 去掉 unknown 逃生舱: messages: CanonicalMessage[], tools?: ToolDefinitionBlock[], tool_choice?: ToolChoice, system?: string | TextBlock[] 主线 B2(read-before-edit 代码层强制,FR-009): - fs/index.ts 新增 readFileState 机制(移植 claude-code FileEditTool), fs.edit 执行前检查:未读先改报 "File has not been read yet",外部修改 报 "File has been unexpectedly modified" - 修复 fs.edit 参数名不匹配:兼容 old_str/new_str (ExecutorRole) 和 find/replace (UI) 两种命名 - fs_edit 唯一性检查(非 global 模式下 old_str 出现多次报错) 真实验收: - TSC=0 - air run 后 DB:events=5(原 3,+agent.started/completed), tasks.status=completed(原 frozen pending),agents 1 行 status=completed - read-before-edit 行为测试:未读先改 status=error,读后再改 status=ok Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
172 lines
5.3 KiB
TypeScript
Executable File
172 lines
5.3 KiB
TypeScript
Executable File
/**
|
|
* TaskAttemptRepository - CRUD + next_attempt_index, list_by_task for task_attempts table (§9)
|
|
*
|
|
* Implements Repository<TaskAttemptRecord, TaskAttemptInsert, TaskAttemptUpdate>
|
|
* per contracts §6.
|
|
*
|
|
* @module packages/runtime/src/storage/repositories/TaskAttemptRepository
|
|
*/
|
|
|
|
import type {
|
|
Repository,
|
|
TransactionHandle,
|
|
SessionID,
|
|
TaskID,
|
|
AgentID,
|
|
UUID,
|
|
ISOTimeString,
|
|
} from '@aircoding/contracts'
|
|
|
|
import { DatabaseHandle } from '../MigrationRunner.js'
|
|
|
|
// =============================================================================
|
|
// Types - per db-schema §9
|
|
// =============================================================================
|
|
|
|
export type TaskAttemptStatus = 'pending' | 'running' | 'completed' | 'failed' | 'cancelled'
|
|
|
|
export interface TaskAttemptRecord {
|
|
id: UUID
|
|
session_id: SessionID
|
|
task_id: TaskID
|
|
attempt_index: number
|
|
agent_id?: AgentID
|
|
status: TaskAttemptStatus
|
|
failure_signature?: string
|
|
failure_summary?: string
|
|
started_at: ISOTimeString
|
|
completed_at?: ISOTimeString
|
|
worker_result_json?: string
|
|
metadata_json?: string
|
|
}
|
|
|
|
export type TaskAttemptInsert = Omit<TaskAttemptRecord, 'id' | 'status'> & {
|
|
id?: UUID
|
|
}
|
|
|
|
export type TaskAttemptUpdate = Partial<Omit<TaskAttemptRecord, 'id' | 'session_id' | 'task_id' | 'attempt_index' | 'started_at'>>
|
|
|
|
// =============================================================================
|
|
// TaskAttemptRepository
|
|
// =============================================================================
|
|
|
|
export class TaskAttemptRepository implements Repository<TaskAttemptRecord, TaskAttemptInsert, TaskAttemptUpdate> {
|
|
private db: DatabaseHandle
|
|
|
|
constructor(db: DatabaseHandle) {
|
|
this.db = db
|
|
}
|
|
|
|
/**
|
|
* Get a task attempt by ID.
|
|
*/
|
|
async get(id: UUID, tx?: TransactionHandle): Promise<TaskAttemptRecord | undefined> {
|
|
const stmt = (tx?.db ?? this.db).prepare('SELECT * FROM task_attempts WHERE id = ?')
|
|
const row = stmt.get(id) as TaskAttemptRecord | undefined
|
|
return row
|
|
}
|
|
|
|
/**
|
|
* Insert a new task attempt. Status is set by EventStore projection (INV-1).
|
|
*/
|
|
async insert(record: TaskAttemptInsert, tx?: TransactionHandle): Promise<void> {
|
|
// Status is set by EventStore.project(), not by caller
|
|
const status: TaskAttemptStatus = 'pending'
|
|
|
|
const stmt = (tx?.db ?? this.db).prepare(`
|
|
INSERT INTO task_attempts (
|
|
id, session_id, task_id, attempt_index,
|
|
agent_id, status,
|
|
failure_signature, failure_summary,
|
|
started_at, completed_at,
|
|
worker_result_json, metadata_json
|
|
) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)
|
|
`)
|
|
|
|
stmt.run(
|
|
record.id,
|
|
record.session_id,
|
|
record.task_id,
|
|
record.attempt_index,
|
|
record.agent_id ?? null,
|
|
status,
|
|
record.failure_signature ?? null,
|
|
record.failure_summary ?? null,
|
|
record.started_at,
|
|
record.completed_at ?? null,
|
|
record.worker_result_json ?? null,
|
|
record.metadata_json ?? null,
|
|
)
|
|
}
|
|
|
|
/**
|
|
* Update an existing task attempt. Status changes only via EventStore projection (INV-1).
|
|
*/
|
|
async update(id: UUID, patch: TaskAttemptUpdate, tx?: TransactionHandle): Promise<void> {
|
|
const fields: string[] = []
|
|
const values: unknown[] = []
|
|
|
|
// status reaches here only via EventStore.project() (INV-1's authorized writer).
|
|
if (patch.status !== undefined) {
|
|
fields.push('status = ?')
|
|
values.push(patch.status)
|
|
}
|
|
if (patch.agent_id !== undefined) {
|
|
fields.push('agent_id = ?')
|
|
values.push(patch.agent_id)
|
|
}
|
|
if (patch.failure_signature !== undefined) {
|
|
fields.push('failure_signature = ?')
|
|
values.push(patch.failure_signature)
|
|
}
|
|
if (patch.failure_summary !== undefined) {
|
|
fields.push('failure_summary = ?')
|
|
values.push(patch.failure_summary)
|
|
}
|
|
if (patch.completed_at !== undefined) {
|
|
fields.push('completed_at = ?')
|
|
values.push(patch.completed_at)
|
|
}
|
|
if (patch.worker_result_json !== undefined) {
|
|
fields.push('worker_result_json = ?')
|
|
values.push(patch.worker_result_json)
|
|
}
|
|
if (patch.metadata_json !== undefined) {
|
|
fields.push('metadata_json = ?')
|
|
values.push(patch.metadata_json)
|
|
}
|
|
|
|
if (fields.length === 0) {
|
|
return // Nothing to update
|
|
}
|
|
|
|
values.push(id)
|
|
const stmt = (tx?.db ?? this.db).prepare(`UPDATE task_attempts SET ${fields.join(', ')} WHERE id = ?`)
|
|
stmt.run(...values)
|
|
}
|
|
|
|
// =============================================================================
|
|
// Extra methods
|
|
// =============================================================================
|
|
|
|
/**
|
|
* Get the next attempt index for a task (0-based).
|
|
*/
|
|
async next_attempt_index(task_id: TaskID): Promise<number> {
|
|
const stmt = this.db.prepare(
|
|
'SELECT MAX(attempt_index) as max_index FROM task_attempts WHERE task_id = ?',
|
|
)
|
|
const row = stmt.get(task_id) as { max_index: number | null } | undefined
|
|
return (row?.max_index ?? -1) + 1
|
|
}
|
|
|
|
/**
|
|
* List all attempts for a task, ordered by attempt_index.
|
|
*/
|
|
async list_by_task(task_id: TaskID): Promise<TaskAttemptRecord[]> {
|
|
const stmt = this.db.prepare(
|
|
'SELECT * FROM task_attempts WHERE task_id = ? ORDER BY attempt_index ASC',
|
|
)
|
|
return stmt.all(task_id) as TaskAttemptRecord[]
|
|
}
|
|
} |