mirror of
https://github.com/stablyai/orca.git
synced 2026-11-16 10:58:10 +00:00
Preserve settlement identities and indexed lifecycle facts in domain import
This commit is contained in:
@@ -109,9 +109,21 @@ CREATE TABLE journal_items (
|
||||
producer_attempt INTEGER,
|
||||
prompt INTEGER NOT NULL DEFAULT 0,
|
||||
signed_out INTEGER NOT NULL DEFAULT 0,
|
||||
lifecycle_state TEXT,
|
||||
live_work INTEGER NOT NULL DEFAULT 0,
|
||||
PRIMARY KEY(session_id, epoch, item_id)
|
||||
);
|
||||
CREATE INDEX journal_items_ordinal ON journal_items(session_id,epoch,ordinal);
|
||||
CREATE INDEX journal_items_unsettled ON journal_items(session_id,epoch,ordinal,item_id)
|
||||
WHERE lifecycle_state IN ('running','pending') OR live_work=1;
|
||||
CREATE TABLE journal_settlements (
|
||||
session_id TEXT NOT NULL,
|
||||
epoch TEXT NOT NULL,
|
||||
settlement_id TEXT NOT NULL,
|
||||
ordinal INTEGER NOT NULL,
|
||||
PRIMARY KEY(session_id, epoch, settlement_id)
|
||||
) WITHOUT ROWID;
|
||||
CREATE INDEX journal_settlements_ordinal ON journal_settlements(session_id,epoch,ordinal);
|
||||
CREATE TABLE journal_item_subagent_names (
|
||||
session_id TEXT NOT NULL,
|
||||
epoch TEXT NOT NULL,
|
||||
|
||||
@@ -23,6 +23,7 @@ export function discardJournalDomainImportPage(
|
||||
['journal_item_aliases', 'epoch,provider_item_id'],
|
||||
['journal_submission_attempts', 'epoch,message_id,attempt_sequence,attempt_index'],
|
||||
['journal_send_receipts', 'epoch,message_id'],
|
||||
['journal_settlements', 'epoch,settlement_id'],
|
||||
['journal_queue_cards', 'epoch,message_id'],
|
||||
['journal_queue_clear_members', 'epoch,message_id'],
|
||||
['journal_edit_leases', 'epoch,owner_id,caller_key,edit_id'],
|
||||
|
||||
@@ -1,5 +1,8 @@
|
||||
import { insertJournalDomainImportedSubmission } from './journal-domain-import-submissions'
|
||||
import { journalDomainItemReadColumns } from './journal-domain-item-read-columns'
|
||||
import {
|
||||
journalDomainItemLifecycleColumns,
|
||||
journalDomainItemReadColumns
|
||||
} from './journal-domain-item-read-columns'
|
||||
import { journalDomainItemPlacement } from './journal-domain-item-placement'
|
||||
import type Database from '../../sqlite/sync-database'
|
||||
import { journalDomainHistoryMetadata } from './journal-domain-history-metadata'
|
||||
@@ -53,8 +56,8 @@ export function insertJournalDomainImportPage(
|
||||
sequence,sequence_index,owner_fence,execution_owner,payload_json,hidden,root,subagent_row,
|
||||
subagent_group_key,turn_marker,wire_bytes,turn_item_id,original_stop_note_json,
|
||||
queue_command_turn,queue_failed_outcome,queue_failed_at,queue_failure_witnessed_through,queue_failure_report_turn_item_id,
|
||||
placement_json,kind,message_role,turn_id,opener_item_id,context_clear,goal_transition,producer_agent_id,producer_parent_ref,producer_attempt,prompt,signed_out)
|
||||
VALUES(?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?) ON CONFLICT DO NOTHING`)
|
||||
placement_json,kind,message_role,turn_id,opener_item_id,context_clear,goal_transition,producer_agent_id,producer_parent_ref,producer_attempt,prompt,signed_out,lifecycle_state,live_work)
|
||||
VALUES(?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?) ON CONFLICT DO NOTHING`)
|
||||
for (const {
|
||||
ordinal,
|
||||
ownerFence,
|
||||
@@ -95,7 +98,8 @@ export function insertJournalDomainImportPage(
|
||||
queueFailureWitnessedThrough,
|
||||
queueFailureReportTurnItemId,
|
||||
journalDomainItemPlacement(item),
|
||||
...journalDomainItemReadColumns(item)
|
||||
...journalDomainItemReadColumns(item),
|
||||
...journalDomainItemLifecycleColumns(item)
|
||||
)
|
||||
if (Number(result.changes) > 0) {
|
||||
writeJournalDomainItemNames(
|
||||
@@ -153,6 +157,15 @@ export function insertJournalDomainImportPage(
|
||||
}
|
||||
}
|
||||
break
|
||||
case 'settlements': {
|
||||
const insert =
|
||||
db.prepare(`INSERT INTO journal_settlements(session_id,epoch,settlement_id,ordinal)
|
||||
VALUES(?,?,?,?) ON CONFLICT DO NOTHING`)
|
||||
for (const { settlementId, ordinal } of page.rows) {
|
||||
insert.run(...prefix, settlementId, ordinal)
|
||||
}
|
||||
break
|
||||
}
|
||||
case 'activity': {
|
||||
const insert =
|
||||
db.prepare(`INSERT INTO journal_provider_activity(session_id,epoch,fence,last_activity_at)
|
||||
|
||||
@@ -106,6 +106,68 @@ function domainRows(db: Database.Database) {
|
||||
}
|
||||
}
|
||||
|
||||
it('imports settlement identity order and live lifecycle facts, discarding both on an unready restart', () => {
|
||||
const { db, reader, originalFilename } = savedChat(false)
|
||||
const { db: source } = openJournalDatabase(originalFilename)
|
||||
runJournalTransaction(source, () => {
|
||||
for (const [index, settlementId] of ['older', 'newer', 'older'].entries()) {
|
||||
insertJournalRow(source, 'session', {
|
||||
v: 4,
|
||||
epoch: 'epoch',
|
||||
seq: 25 + index,
|
||||
ts: 110 + index,
|
||||
fence: 1,
|
||||
kind: 'lifecycle-batch',
|
||||
settlementId,
|
||||
mutations:
|
||||
index === 1
|
||||
? [{ kind: 'tombstone', itemId: 'removed', revision: 1 }]
|
||||
: [
|
||||
{
|
||||
kind: 'item',
|
||||
itemId: 'tool',
|
||||
revision: index + 1,
|
||||
body: {
|
||||
kind: 'tool-call',
|
||||
callId: 'tool',
|
||||
name: 'read',
|
||||
input: {},
|
||||
state: index === 0 ? 'running' : 'completed'
|
||||
}
|
||||
}
|
||||
]
|
||||
})
|
||||
}
|
||||
})
|
||||
source.close()
|
||||
const imported = prepareJournalDomainImport(reader, 'session')!
|
||||
for (const page of imported.pages) {
|
||||
maintain(db, { kind: 'import-page', target: imported, page })
|
||||
}
|
||||
expect(
|
||||
db.prepare('SELECT settlement_id,ordinal FROM journal_settlements ORDER BY ordinal').all()
|
||||
).toEqual([
|
||||
{ settlement_id: 'older', ordinal: 1 },
|
||||
{ settlement_id: 'newer', ordinal: 2 }
|
||||
])
|
||||
expect(
|
||||
db
|
||||
.prepare("SELECT item_id,lifecycle_state,live_work FROM journal_items WHERE item_id='tool'")
|
||||
.get()
|
||||
).toEqual({ item_id: 'tool', lifecycle_state: 'running', live_work: 0 })
|
||||
maintain(db, { kind: 'import-discard', sessionId: 'session' })
|
||||
expect(db.prepare('SELECT settlement_id FROM journal_settlements').all()).toEqual([])
|
||||
expect(db.prepare('SELECT item_id FROM journal_items').all()).toEqual([])
|
||||
const resumed = prepareJournalDomainImport(reader, 'session')!
|
||||
for (const page of resumed.pages) {
|
||||
maintain(db, { kind: 'import-page', target: resumed, page })
|
||||
}
|
||||
maintain(db, { kind: 'import-finish', header: resumed })
|
||||
expect(
|
||||
db.prepare('SELECT settlement_id FROM journal_settlements ORDER BY ordinal').all()
|
||||
).toEqual([{ settlement_id: 'older' }, { settlement_id: 'newer' }])
|
||||
})
|
||||
|
||||
it('imports a frozen saved chat as typed domain rows, ready last, and resumes after interruption', () => {
|
||||
const { db, reader } = savedChat(false)
|
||||
reader.exec('BEGIN')
|
||||
|
||||
@@ -77,6 +77,7 @@ export type JournalDomainImportPage =
|
||||
| { kind: 'activity'; rows: { fence: number; lastActivityAt: number }[] }
|
||||
| { kind: 'queue-clear-members'; rows: { messageId: string }[] }
|
||||
| { kind: 'removed-turns'; rows: { turnId: string }[] }
|
||||
| { kind: 'settlements'; rows: { settlementId: string; ordinal: number }[] }
|
||||
|
||||
export type JournalDomainImportHeader = {
|
||||
sessionId: string
|
||||
@@ -235,6 +236,13 @@ function* importPages(
|
||||
[...memoryJournalSet(state.removedTurnIds)].map((turnId) => ({ turnId }))
|
||||
)
|
||||
yield* paged('receipts', [...memoryJournalMap(state.receipts).values()])
|
||||
yield* paged(
|
||||
'settlements',
|
||||
[...memoryJournalSet(state.appliedSettlementIds)].map((settlementId, index) => ({
|
||||
settlementId,
|
||||
ordinal: index + 1
|
||||
}))
|
||||
)
|
||||
yield* paged('cards', [...cards.values()])
|
||||
yield* paged(
|
||||
'queue-clear-members',
|
||||
|
||||
@@ -6,6 +6,14 @@ import { isAgentSessionContextClear } from '../../../shared/agent-session/agent-
|
||||
import { currentAgentSessionThreadGoalSourceBySequence } from '../../../shared/agent-session/agent-session-thread-goal'
|
||||
import { readAgentJournalTurn } from '../../../shared/agent-session/lifecycle/agent-session-turn-record'
|
||||
import { claudeAgentRowFacts } from '../../claude/claude-subagent-journaled-identities'
|
||||
import { journalItemLifecycleState } from './journal-item-status-metadata'
|
||||
import { lostLiveWorkJournalBody } from './item-lifecycle/journal-subagent-liveness'
|
||||
|
||||
export function journalDomainItemLifecycleColumns(
|
||||
item: AgentJournalRenderItem
|
||||
): readonly [lifecycleState: string | null, liveWork: number] {
|
||||
return [journalItemLifecycleState(item.body), Number(lostLiveWorkJournalBody(item.body) !== null)]
|
||||
}
|
||||
|
||||
/** Bound in item-read column order by the one item/import upsert. */
|
||||
export type JournalDomainItemReadColumns = readonly [
|
||||
|
||||
@@ -67,6 +67,7 @@ it('prunes proven retired epochs with atomic rollback while preserving incomplet
|
||||
db.prepare(`INSERT INTO journal_send_receipts VALUES(?,?,'send','accepted receipt')`).run(
|
||||
...prefix
|
||||
)
|
||||
db.prepare(`INSERT INTO journal_settlements VALUES(?,?,'settlement',1)`).run(...prefix)
|
||||
db.prepare(
|
||||
`INSERT INTO journal_queue_cards VALUES(?,?,'queued',1,'waiting',1,NULL,'domain body')`
|
||||
).run(...prefix)
|
||||
@@ -113,6 +114,15 @@ it('prunes proven retired epochs with atomic rollback while preserving incomplet
|
||||
expect(
|
||||
db.prepare("SELECT payload_json FROM journal_send_receipts WHERE session_id='chat'").all()
|
||||
).toEqual([{ payload_json: 'accepted receipt' }])
|
||||
expect(
|
||||
db
|
||||
.prepare('SELECT session_id,epoch,settlement_id FROM journal_settlements ORDER BY session_id')
|
||||
.all()
|
||||
).toEqual([
|
||||
{ session_id: 'chat', epoch: 'epoch', settlement_id: 'settlement' },
|
||||
{ session_id: 'failed', epoch: 'epoch', settlement_id: 'settlement' },
|
||||
{ session_id: 'incomplete', epoch: 'epoch', settlement_id: 'settlement' }
|
||||
])
|
||||
expect(
|
||||
db
|
||||
.prepare(
|
||||
|
||||
@@ -25,6 +25,7 @@ const RETIRED_TABLES: readonly { name: string; key: string; payload?: readonly s
|
||||
payload: ['payload_json']
|
||||
},
|
||||
{ name: 'journal_send_receipts', key: 'message_id', payload: ['payload_json'] },
|
||||
{ name: 'journal_settlements', key: 'settlement_id' },
|
||||
{ name: 'journal_queue_cards', key: 'message_id', payload: ['payload_json'] },
|
||||
{ name: 'journal_queue_clear_members', key: 'message_id' },
|
||||
{ name: 'journal_edit_leases', key: 'owner_id,caller_key,edit_id' },
|
||||
|
||||
@@ -1,4 +1,7 @@
|
||||
import { journalDomainItemReadColumns } from './journal-domain-item-read-columns'
|
||||
import {
|
||||
journalDomainItemLifecycleColumns,
|
||||
journalDomainItemReadColumns
|
||||
} from './journal-domain-item-read-columns'
|
||||
import { journalDomainItemPlacement } from './journal-domain-item-placement'
|
||||
import Database from '../../sqlite/sync-database'
|
||||
import type {
|
||||
@@ -61,7 +64,7 @@ export function messageFixture(db = new Database(':memory:')) {
|
||||
const metadata = journalDomainHistoryMetadata(item, payload)
|
||||
db.prepare(`INSERT INTO journal_items
|
||||
(session_id,epoch,item_id,ordinal,revision,sequence,sequence_index,owner_fence,payload_json,
|
||||
root,subagent_row,subagent_group_key,turn_marker,wire_bytes,placement_json,kind,message_role,turn_id,opener_item_id,context_clear,goal_transition,producer_agent_id,producer_parent_ref,producer_attempt,prompt,signed_out) VALUES(?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?)`).run(
|
||||
root,subagent_row,subagent_group_key,turn_marker,wire_bytes,placement_json,kind,message_role,turn_id,opener_item_id,context_clear,goal_transition,producer_agent_id,producer_parent_ref,producer_attempt,prompt,signed_out,lifecycle_state,live_work) VALUES(?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?)`).run(
|
||||
target.sessionId,
|
||||
target.epoch,
|
||||
item.itemId,
|
||||
@@ -77,7 +80,8 @@ export function messageFixture(db = new Database(':memory:')) {
|
||||
metadata.turnMarker,
|
||||
metadata.wireBytes,
|
||||
journalDomainItemPlacement(item),
|
||||
...journalDomainItemReadColumns(item)
|
||||
...journalDomainItemReadColumns(item),
|
||||
...journalDomainItemLifecycleColumns(item)
|
||||
)
|
||||
writeJournalDomainItemNames(
|
||||
db,
|
||||
|
||||
Reference in New Issue
Block a user