mirror of
https://github.com/stablyai/orca.git
synced 2026-11-16 10:58:10 +00:00
Invalidate queue state at its owning transitions
This commit is contained in:
@@ -29,6 +29,7 @@ import { journalItemRevisionValue } from './projection/journal-item-fold'
|
||||
import { assertJournalFence } from './writing/journal-write-guards'
|
||||
import { queueClearRestatement, writeJournalDomainQueueClear } from './journal-domain-queue-clear'
|
||||
import { restoreRetainedFailures, retainedFailures } from './journal-domain-retained-failures'
|
||||
import { invalidateJournalDomainQueue } from './journal-domain-queue-revision'
|
||||
|
||||
type Target = { sessionId: string; epoch: string }
|
||||
|
||||
@@ -104,6 +105,7 @@ export function replaceJournalDomainContext(
|
||||
const restatement = head.cleared ? queueClearRestatement(db, target) : null
|
||||
const retained = retainedFailures(db, target, itemIds, head.failureBoundary)
|
||||
const removalSequence = head.lastSequence + 1
|
||||
invalidateJournalDomainQueue(db, target, removalSequence)
|
||||
const coordinate = (
|
||||
kind: JournalDomainContextCoordinate['kind'],
|
||||
at: number
|
||||
|
||||
@@ -32,6 +32,7 @@ import { writeJournalDomainQueueReopenMark } from './journal-domain-queue-pauses
|
||||
import { journalDomainQueueAwaitsReopen } from './journal-domain-queue-reads'
|
||||
import { appendJournalSqlEvent } from './journal-sql-event-tail'
|
||||
import { restoreJournalSqlFailure } from './journal-sql-failure'
|
||||
import { invalidateJournalDomainQueue } from './journal-domain-queue-revision'
|
||||
|
||||
type Target = { sessionId: string; epoch: string }
|
||||
|
||||
@@ -177,6 +178,7 @@ function writeMark(
|
||||
): AgentJournalCursor {
|
||||
const sequence = result.cursor.sequence + 1
|
||||
write(sequence)
|
||||
invalidateJournalDomainQueue(db, target, sequence)
|
||||
appendJournalSqlEvent(
|
||||
db,
|
||||
target,
|
||||
|
||||
@@ -12,7 +12,8 @@ import {
|
||||
journalDomainQueueFailure,
|
||||
refreshJournalDomainQueueFailureReports
|
||||
} from './journal-domain-queue-failures'
|
||||
import { reportedTurnItemId } from './queued-messages/journal-queue-failure-policy'
|
||||
import { isTurnOrClear, reportedTurnItemId } from './queued-messages/journal-queue-failure-policy'
|
||||
import { isStructuredAgentSessionCommandEntry } from '../../../shared/agent-session/structured-agent-session-command-entry'
|
||||
import type { JournalStopSettleFact } from './journal-writer-host-facts'
|
||||
import { normalizeJournalDomainItemBody } from './journal-domain-item-normalization'
|
||||
import { observeJournalDomainTurnScope } from './journal-domain-turn-scope'
|
||||
@@ -21,10 +22,7 @@ import {
|
||||
refreshJournalDomainAcceptedHandover,
|
||||
type JournalDomainInputItemObservation
|
||||
} from './journal-domain-input-ends'
|
||||
import {
|
||||
invalidateJournalDomainQueue,
|
||||
journalDomainQueueItemDependency
|
||||
} from './journal-domain-queue-revision'
|
||||
import { invalidateJournalDomainQueue } from './journal-domain-queue-revision'
|
||||
|
||||
export type JournalDomainCurrentItemWrite = {
|
||||
item: AgentJournalRenderItem
|
||||
@@ -63,7 +61,6 @@ export function writeJournalDomainCurrentItem(
|
||||
throw new Error('journal item persistence requires its writer transaction')
|
||||
}
|
||||
const prefix = [target.sessionId, target.epoch] as const
|
||||
const queueDependency = journalDomainQueueItemDependency(db, target, input.item.itemId)
|
||||
const ordinal =
|
||||
input.ordinal ?? input.previous?.ordinal ?? nextJournalDomainItemOrdinal(db, target)
|
||||
const body = normalizeJournalDomainItemBody(
|
||||
@@ -154,7 +151,16 @@ export function writeJournalDomainCurrentItem(
|
||||
sequence
|
||||
)
|
||||
}
|
||||
if (queueDependency !== journalDomainQueueItemDependency(db, target, next.itemId)) {
|
||||
if (
|
||||
isTurnOrClear(next) ||
|
||||
isTurnOrClear(input.previous?.item) ||
|
||||
(metadata.root && next.body.kind === 'message' && next.body.role === 'user') ||
|
||||
(input.previous?.item.body.kind === 'message' && input.previous.item.body.role === 'user') ||
|
||||
isStructuredAgentSessionCommandEntry(next.body) ||
|
||||
isStructuredAgentSessionCommandEntry(input.previous?.item.body) ||
|
||||
oldReport !== null ||
|
||||
failure.reportTurnItemId !== null
|
||||
) {
|
||||
invalidateJournalDomainQueue(db, target, sequence)
|
||||
}
|
||||
return [
|
||||
|
||||
@@ -1,4 +1,5 @@
|
||||
import type Database from '../../sqlite/sync-database'
|
||||
import { invalidateJournalDomainQueue } from './journal-domain-queue-revision'
|
||||
import type {
|
||||
AgentJournalRenderItem,
|
||||
AgentJournalSubmission,
|
||||
@@ -206,8 +207,12 @@ export function refreshJournalDomainAcceptedHandover(
|
||||
WHERE attempt.session_id=? AND attempt.epoch=? AND attempt.item_id=? AND attempt.current=1 AND attempt.dispatch_state='accepted'`)
|
||||
.get(target.sessionId, target.epoch, itemId)
|
||||
if (item) {
|
||||
db.prepare(`UPDATE journal_chat_state SET accepted_handover_sequence=MAX(accepted_handover_sequence,?)
|
||||
WHERE session_id=? AND epoch=?`).run(item.sequence, target.sessionId, target.epoch)
|
||||
const changed = db
|
||||
.prepare(`UPDATE journal_chat_state SET accepted_handover_sequence=?
|
||||
WHERE session_id=? AND epoch=? AND accepted_handover_sequence<?`)
|
||||
.run(item.sequence, target.sessionId, target.epoch, item.sequence)
|
||||
if (changed.changes > 0) {
|
||||
invalidateJournalDomainQueue(db, target)
|
||||
}
|
||||
}
|
||||
}
|
||||
import { invalidateJournalDomainQueue } from './journal-domain-queue-revision'
|
||||
|
||||
@@ -12,10 +12,7 @@ import { refreshJournalDomainQueueFailureReports } from './journal-domain-queue-
|
||||
import { observeJournalDomainTurnScope } from './journal-domain-turn-scope'
|
||||
import { appendJournalSqlEvent } from './journal-sql-event-tail'
|
||||
import { assertJournalFence } from './writing/journal-write-guards'
|
||||
import {
|
||||
invalidateJournalDomainQueue,
|
||||
journalDomainQueueItemDependency
|
||||
} from './journal-domain-queue-revision'
|
||||
import { invalidateJournalDomainQueue } from './journal-domain-queue-revision'
|
||||
|
||||
type Target = { sessionId: string; epoch: string }
|
||||
|
||||
@@ -47,7 +44,7 @@ export function removeJournalDomainItem(
|
||||
.get(...prefix, key)
|
||||
const itemId = alias ? String(alias.item_id) : key
|
||||
const row = db
|
||||
.prepare(`SELECT payload_json, revision, sequence, sequence_index, turn_marker,
|
||||
.prepare(`SELECT payload_json, revision, sequence, sequence_index, turn_marker,prompt,command_entry,
|
||||
queue_failure_report_turn_item_id FROM journal_items WHERE session_id=? AND epoch=? AND item_id=?`)
|
||||
.get(...prefix, itemId)
|
||||
const tombstone = db
|
||||
@@ -69,7 +66,12 @@ export function removeJournalDomainItem(
|
||||
return { itemId, revision, removed: null, items: [] }
|
||||
}
|
||||
const removed: AgentJournalRenderItem = JSON.parse(String(row.payload_json))
|
||||
if (journalDomainQueueItemDependency(db, target, itemId) !== 'null') {
|
||||
if (
|
||||
row.turn_marker ||
|
||||
row.prompt ||
|
||||
row.command_entry ||
|
||||
row.queue_failure_report_turn_item_id !== null
|
||||
) {
|
||||
invalidateJournalDomainQueue(db, target, sequence)
|
||||
}
|
||||
if (row.turn_marker) {
|
||||
|
||||
@@ -1,4 +1,5 @@
|
||||
import type Database from '../../sqlite/sync-database'
|
||||
import { invalidateJournalDomainQueue } from './journal-domain-queue-revision'
|
||||
import { readJournalDomainQueuePauseContext } from './journal-domain-queue-pauses'
|
||||
import { readJournalDomainQueueRow } from './journal-domain-queue-rows'
|
||||
import {
|
||||
@@ -73,5 +74,6 @@ export function writeJournalDomainQueueClear(
|
||||
for (const messageId of clear.messageIds) {
|
||||
insert.run(...prefix, messageId)
|
||||
}
|
||||
invalidateJournalDomainQueue(db, target, sequence)
|
||||
return { ...clear, messageIds: [...clear.messageIds], sequence }
|
||||
}
|
||||
|
||||
@@ -1,4 +1,5 @@
|
||||
import type Database from '../../sqlite/sync-database'
|
||||
import { invalidateJournalDomainQueue } from './journal-domain-queue-revision'
|
||||
import { isDeepStrictEqual } from 'node:util'
|
||||
import type { AgentJournalRenderItem } from '../../../shared/agent-session/journal/agent-session-journal-types'
|
||||
import {
|
||||
@@ -72,20 +73,18 @@ export function refreshJournalDomainQueueFailureReports(
|
||||
if (turnItemId === null) {
|
||||
continue
|
||||
}
|
||||
db.prepare(`UPDATE journal_items SET queue_failure_witnessed_through=CASE
|
||||
const changed = db
|
||||
.prepare(`UPDATE journal_items SET queue_failure_witnessed_through=CASE
|
||||
WHEN queue_failed_at=0 THEN 0 ELSE queue_failure_witnessed_through END,
|
||||
queue_failed_at=CASE WHEN EXISTS(
|
||||
SELECT 1 FROM journal_items report WHERE report.session_id=? AND report.epoch=?
|
||||
AND report.hidden=0 AND report.queue_failure_report_turn_item_id=journal_items.item_id)
|
||||
THEN COALESCE(NULLIF(queue_failed_at,0),?) ELSE 0 END
|
||||
WHERE session_id=? AND epoch=? AND item_id=? AND queue_command_turn=1 AND queue_failed_outcome=1`).run(
|
||||
target.sessionId,
|
||||
target.epoch,
|
||||
sequence,
|
||||
target.sessionId,
|
||||
target.epoch,
|
||||
turnItemId
|
||||
)
|
||||
WHERE session_id=? AND epoch=? AND item_id=? AND queue_command_turn=1 AND queue_failed_outcome=1`)
|
||||
.run(target.sessionId, target.epoch, sequence, target.sessionId, target.epoch, turnItemId)
|
||||
if (changed.changes > 0) {
|
||||
invalidateJournalDomainQueue(db, target, sequence)
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -7,6 +7,7 @@ import {
|
||||
} from './queued-messages/queued-message-pause'
|
||||
import { readJournalSqlAcceptedInputs } from './journal-sql-accepted-inputs'
|
||||
import { readJournalDomainQueueFailure } from './journal-domain-queue-failures'
|
||||
import { invalidateJournalDomainQueue } from './journal-domain-queue-revision'
|
||||
|
||||
type Target = { sessionId: string; epoch: string }
|
||||
|
||||
@@ -85,4 +86,5 @@ export function writeJournalDomainQueueReopenMark(
|
||||
if (Number(changed.changes) !== 1) {
|
||||
throw new Error('journal queue reopen targets a retired chat epoch')
|
||||
}
|
||||
invalidateJournalDomainQueue(db, target, sequence)
|
||||
}
|
||||
|
||||
@@ -1,28 +1,7 @@
|
||||
import type Database from '../../sqlite/sync-database'
|
||||
import type { JournalWriterCommit } from './journal-writer-changes'
|
||||
|
||||
type Target = { sessionId: string; epoch: string }
|
||||
|
||||
export async function trackJournalDomainQueueRevision(
|
||||
db: Database.Database,
|
||||
sessionId: string,
|
||||
execute: () => Promise<JournalWriterCommit>
|
||||
): Promise<JournalWriterCommit> {
|
||||
if (!db.isTransaction) {
|
||||
throw new Error('journal SQL command requires its transaction')
|
||||
}
|
||||
const before = readJournalDomainQueueRevision(db, sessionId)
|
||||
const commit = await execute()
|
||||
let after = readJournalDomainQueueRevision(db, sessionId)
|
||||
if (before.epoch === after.epoch && before.dependencies !== after.dependencies) {
|
||||
invalidateJournalDomainQueue(db, { sessionId, epoch: after.epoch }, after.sequence)
|
||||
after = readJournalDomainQueueRevision(db, sessionId)
|
||||
}
|
||||
commit.inputChanged ||= before.epoch !== after.epoch || before.revision !== after.revision
|
||||
commit.queueRevision = `${after.epoch}:${after.revision}`
|
||||
return commit
|
||||
}
|
||||
|
||||
/** Several dependency changes in one source unit share its next event position. */
|
||||
export function invalidateJournalDomainQueue(
|
||||
db: Database.Database,
|
||||
@@ -33,40 +12,16 @@ export function invalidateJournalDomainQueue(
|
||||
WHERE session_id=? AND epoch=?`).run(sequence ?? null, target.sessionId, target.epoch)
|
||||
}
|
||||
|
||||
/** Only scalar facts used by queue pauses/eligibility; ordinary text revisions have no signature. */
|
||||
export function journalDomainQueueItemDependency(
|
||||
db: Database.Database,
|
||||
target: Target,
|
||||
itemId: string
|
||||
): string {
|
||||
return JSON.stringify(
|
||||
db
|
||||
.prepare(`SELECT hidden,root,sequence,sequence_index,owner_fence,execution_owner,
|
||||
turn_marker,turn_id,opener_item_id,turn_item_id,turn_scope_kind,lifecycle_state,
|
||||
turn_completed_at,command_entry,queue_command_turn,queue_failed_outcome,queue_failed_at,
|
||||
queue_failure_witnessed_through,queue_failure_report_turn_item_id
|
||||
FROM journal_items WHERE session_id=? AND epoch=? AND item_id=?
|
||||
AND (turn_marker=1 OR prompt=1 OR command_entry=1
|
||||
OR queue_failure_report_turn_item_id IS NOT NULL)`)
|
||||
.get(target.sessionId, target.epoch, itemId) ?? null
|
||||
)
|
||||
}
|
||||
|
||||
export function readJournalDomainQueueRevision(db: Database.Database, sessionId: string) {
|
||||
const head = db
|
||||
.prepare(`SELECT epoch,last_sequence,queue_revision,context_boundary,accepted_handover_sequence,
|
||||
queue_latest_stop_json,queue_manual_stop_json,queue_resumed_sequence,queue_reopened_sequence,
|
||||
queue_clear_sequence,queue_clear_operation_id,queue_clear_lifted,queue_failure_boundary
|
||||
.prepare(`SELECT epoch,queue_revision
|
||||
FROM journal_chat_state WHERE session_id=? AND epoch IS NOT NULL`)
|
||||
.get(sessionId)
|
||||
if (!head) {
|
||||
throw new Error('queue revision targets a retired chat')
|
||||
}
|
||||
const { epoch, last_sequence: sequence, queue_revision: revision, ...dependencies } = head
|
||||
return {
|
||||
epoch: String(epoch),
|
||||
sequence: Number(sequence),
|
||||
revision: Number(revision),
|
||||
dependencies: JSON.stringify(dependencies)
|
||||
epoch: String(head.epoch),
|
||||
revision: Number(head.queue_revision)
|
||||
}
|
||||
}
|
||||
|
||||
@@ -5,6 +5,7 @@ import type Database from '../../sqlite/sync-database'
|
||||
import type { JournalWriterCommand } from './journal-writer-command'
|
||||
import type { JournalWriterCommit, JournalWriterPublication } from './journal-writer-changes'
|
||||
import { applyJournalWriterEffect, type JournalWriterCoordinate } from './journal-writer-effects'
|
||||
import { readJournalDomainQueueRevision } from './journal-domain-queue-revision'
|
||||
|
||||
export function finishJournalSqlCommand(
|
||||
db: Database.Database,
|
||||
@@ -54,9 +55,15 @@ export function finishJournalSqlCommand(
|
||||
invalidatedItemIds,
|
||||
referencedUploads: claims.referencedUploads
|
||||
}
|
||||
const queue = readJournalDomainQueueRevision(db, command.target.sessionId)
|
||||
return {
|
||||
cursor,
|
||||
inputChanged: result.inputChanged,
|
||||
inputChanged:
|
||||
result.inputChanged ||
|
||||
coordinates.some(
|
||||
(position) => position.epoch === queue.epoch && position.seq === queue.revision
|
||||
),
|
||||
queueRevision: `${queue.epoch}:${queue.revision}`,
|
||||
keys: [],
|
||||
inputKeys: [],
|
||||
items: [
|
||||
|
||||
@@ -17,7 +17,6 @@ import { applyJournalDomainLifecycleOperation } from './journal-domain-taken-sto
|
||||
import { applyJournalDomainPromptMutation } from './journal-domain-prompt-mutation'
|
||||
import { applyJournalSqlStepCommand } from './journal-sql-step-command'
|
||||
import { applyJournalSqlEditLeaseCommand } from './journal-sql-edit-lease-command'
|
||||
import { trackJournalDomainQueueRevision } from './journal-domain-queue-revision'
|
||||
import { applyJournalSqlAutomaticSubmissionCommand } from './journal-sql-automatic-submission-command'
|
||||
|
||||
/** Every command decides against current rows at its position on the sole writer. */
|
||||
@@ -28,12 +27,6 @@ export class JournalSqlCommand {
|
||||
) {}
|
||||
|
||||
async apply(command: JournalWriterCommand, now: number): Promise<JournalWriterCommit> {
|
||||
return trackJournalDomainQueueRevision(this.db, command.target.sessionId, () =>
|
||||
this.execute(command, now)
|
||||
)
|
||||
}
|
||||
|
||||
private async execute(command: JournalWriterCommand, now: number): Promise<JournalWriterCommit> {
|
||||
const savedAt = command.savedAt ?? now
|
||||
command = { ...command, savedAt }
|
||||
const { operation, target } = command
|
||||
|
||||
Reference in New Issue
Block a user