@xfey/tutti 0.1.60 → 0.1.62

package/README.md

@@ -7,7 +7,7 @@
 它负责：
 
 - `tutti launch` 后的项目绑定、恢复和接管入口
-- 裸 `tutti` 经 lifecycle lock 启动 / 复用的版本感知 loopback Local Console、独立 invocation context，以及既有项目 Host 编排
+- 裸 `tutti` 经 lifecycle lock 启动 / 复用的版本感知 loopback Local Console、独立 invocation context、既有项目 Host 编排，以及可信全局npm安装的idle-only worker / completion自更新交接
 - 首次 eligible 裸 `tutti`、显式 `tutti desktop` 与严格 `tutti://projects` bridge 共用的用户级 desktop integration manager
 - Fastify API、SSE、packaged static Web 产物服务和 server 生命周期
 - SQLite store、migrations、repository 与协作真相读写
@@ -28,7 +28,7 @@
 
 ## 当前状态
 
-- 已具备 Fastify host shell、后台 host manager CLI 套件、用户级 desktop integration / strict `tutti://projects` bridge、带 `service status / stop / restart`、卸载前 `shutdown`、并发启动锁、版本替换、strict terminal / desktop browser context、idle / package update cleanup 与私有日志的机器级 Local Console、Dev Runner、Host Project API、SSE、SQLite store、collaboration-state、workspace read-state、project timeline observability helper、Control Plane、Procedure / Run、workspace-ops、checks、Relay staged upload finalize、user skills 文件服务、artifacts 可视化产物查看层和 OpenAI / Codex provider 接入。
+- 已具备 Fastify host shell、后台 host manager CLI 套件、用户级 desktop integration / strict `tutti://projects` bridge、带 `service status / stop / restart`、卸载前 `shutdown`、并发启动锁、版本替换、strict terminal / desktop browser context、idle / package update cleanup、全机readiness、exact npm global install、跨版本worker / recovery与私有日志的机器级 Local Console、Dev Runner、Host Project API、SSE、SQLite store、collaboration-state、workspace read-state、project timeline observability helper、Control Plane、Procedure / Run、workspace-ops、checks、Relay staged upload finalize、user skills 文件服务、artifacts 可视化产物查看层和 OpenAI / Codex provider 接入。
 - 新 Host project 的空群聊会由 collaboration-state 幂等写入一条 Tutti 欢迎消息；它不经过 browser message command，不触发 `@tutti`、Chat read-state、Scratchpad 或 Timeline / execution 流程。
 - Host server 与 Local Console 支持在显式 `webStatic.root` 或 packaged `web/` 存在时服务 Web 静态产物；`/api/*`、SSE、health、host-local control 和 `/local-console/*` API 不被 SPA fallback 吞掉。
 - Root `pack:dry-run` 会先清理 build output、重新构建，再复制 `apps/web/dist` 到 package-local `web/`，生成临时 staging `@xfey/tutti` artifact，并校验 npm pack 文件列表包含 CLI、migrations、prompts、Web index、bundled `@tutti/shared` / `@tutti/relay-client` 以及它们的外部 runtime dependencies，同时排除源码、source map、日志、SQLite、`.env`、`.tutti-dev` 与测试产物。

package/dist/collaboration-state/clarification-records.d.ts

@@ -14,14 +14,5 @@ export declare function readClarificationRoundProjection(db: SqliteDatabase, rou
 export declare function readClarificationRoundsForThread(db: SqliteDatabase, threadId: ClarificationThreadRef, options?: {
     throughRoundIndex?: number;
 }): ClarificationRoundProjection[];
-export declare function readSubmittedTaskCompileClarificationRounds(db: SqliteDatabase, options?: {
-    afterSubmittedAt?: string;
-    limit?: number;
-}): ClarificationRoundProjection[];
-export declare function readSubmittedTaskCompileClarificationRoundsAfterCursor(db: SqliteDatabase, options: {
-    afterSubmittedAt: string;
-    afterRoundId: ClarificationRoundRef;
-    limit?: number;
-}): ClarificationRoundProjection[];
 export declare function readClarificationThreadResponse(db: SqliteDatabase, threadId: ClarificationThreadRef): GetClarificationThreadResponse | null;
 //# sourceMappingURL=clarification-records.d.ts.map

package/dist/collaboration-state/clarification-records.js

@@ -165,63 +165,6 @@ export function readClarificationRoundsForThread(db, threadId, options = {}) {
             .all(threadId, options.throughRoundIndex);
     return rows.map((row) => mapClarificationRoundRow(row));
 }
-export function readSubmittedTaskCompileClarificationRounds(db, options = {}) {
-    const limit = Math.max(1, Math.min(options.limit ?? 20, 100));
-    const rows = options.afterSubmittedAt === undefined
-        ? db
-            .prepare(`
-              SELECT clarification_rounds.*
-              FROM clarification_rounds
-              JOIN clarification_threads
-                ON clarification_threads.id = clarification_rounds.clarification_thread_id
-              WHERE clarification_threads.owner_kind = 'task_compile'
-                AND clarification_rounds.status = 'sealed'
-                AND clarification_rounds.submitted_at IS NOT NULL
-              ORDER BY clarification_rounds.submitted_at DESC, clarification_rounds.id DESC
-              LIMIT ?
-            `)
-            .all(limit)
-        : db
-            .prepare(`
-              SELECT clarification_rounds.*
-              FROM clarification_rounds
-              JOIN clarification_threads
-                ON clarification_threads.id = clarification_rounds.clarification_thread_id
-              WHERE clarification_threads.owner_kind = 'task_compile'
-                AND clarification_rounds.status = 'sealed'
-                AND clarification_rounds.submitted_at IS NOT NULL
-                AND clarification_rounds.submitted_at > ?
-              ORDER BY clarification_rounds.submitted_at ASC, clarification_rounds.id ASC
-              LIMIT ?
-            `)
-            .all(options.afterSubmittedAt, limit);
-    const sortedRows = options.afterSubmittedAt === undefined ? rows.toReversed() : rows;
-    return sortedRows.map((row) => mapClarificationRoundRow(row));
-}
-export function readSubmittedTaskCompileClarificationRoundsAfterCursor(db, options) {
-    const limit = Math.max(1, Math.min(options.limit ?? 20, 100));
-    const rows = db
-        .prepare(`
-        SELECT clarification_rounds.*
-        FROM clarification_rounds
-        JOIN clarification_threads
-          ON clarification_threads.id = clarification_rounds.clarification_thread_id
-        WHERE clarification_threads.owner_kind = 'task_compile'
-          AND clarification_rounds.status = 'sealed'
-          AND clarification_rounds.submitted_at IS NOT NULL
-          AND (
-            clarification_rounds.submitted_at > ?
-            OR (
-              clarification_rounds.submitted_at = ?
-              AND clarification_rounds.id > ?
-            )
-          )
-        ORDER BY clarification_rounds.submitted_at ASC, clarification_rounds.id ASC
-        LIMIT ?
-      `)
-        .all(options.afterSubmittedAt, options.afterSubmittedAt, options.afterRoundId, limit);
-    return rows.map((row) => mapClarificationRoundRow(row));
-}
 export function readClarificationThreadResponse(db, threadId) {
     const threadRow = readClarificationThreadRow(db, threadId);
     if (threadRow === null) {

package/dist/collaboration-state/index.d.ts

@@ -1,9 +1,10 @@
 export { CollaborationStateCursorError } from "./serialization.js";
 export { createIdleExecutionStatusProjection } from "./execution-status.js";
-export { createMainChatAgentMessage, createMainChatMessage, createMainChatSystemMessage, ensureInitialProjectWelcomeMessage, hasMainChatArtifactPreviewMessage, hasMainChatTaskResultMessage, hasMainChatWorklistCompileMessage, hasMainChatWorklistFeedbackMessage, readCompletedWorklistFeedbackTaskIds, readMessageProjectionById, readMainChatMessageWindow, readMainChatMessagesAfter, readMainChatMessagesAfterCursor, readMainChatMessagesBeforeCursor, } from "./messages.js";
-export { createEmptyScratchpadProjection, readScratchpadReceiptSourceRefs, readScratchpadProjection, submitScratchpadProjection, upsertScratchpadProjection, } from "./scratchpad.js";
-export { advanceScratchpadTaskCompileSourceCursor, markScratchpadRefreshFailed, markScratchpadRefreshStarted, markScratchpadRefreshSucceeded, markScratchpadSourceDirty, readScratchpadSourceState, } from "./scratchpad-source-state.js";
-export { deleteStaleClarificationSubmitReplayHints, readActiveClarificationProjection, readClarificationRoundProjection, readClarificationRoundsForThread, readClarificationThreadResponse, readSealedClarificationRoundsWithoutSuccessor, readSubmittedTaskCompileClarificationRounds, readSubmittedTaskCompileClarificationRoundsAfterCursor, } from "./clarification-records.js";
+export { createMainChatAgentMessage, createMainChatMessage, createMainChatSystemMessage, ensureInitialProjectWelcomeMessage, hasMainChatArtifactPreviewMessage, hasMainChatTaskResultMessage, hasMainChatWorklistCompileMessage, hasMainChatWorklistFeedbackMessage, readCompletedWorklistFeedbackTaskIds, readMessageProjectionById, readMainChatMessageWindow, readMainChatMessagesBeforeCursor, readMainChatMessagesForScratchpadCycle, } from "./messages.js";
+export { createEmptyScratchpadProjection, readScratchpadReceiptSourceRefs, readScratchpadProjection, upsertScratchpadProjection, } from "./scratchpad.js";
+export { markScratchpadRefreshFailed, markScratchpadRefreshStarted, markScratchpadRefreshSucceeded, markScratchpadSourceDirty, readScratchpadSourceState, } from "./scratchpad-source-state.js";
+export { captureTaskCompileContext, completeTaskCompileContext, readActiveTaskCompileContext, rollbackTaskCompileContext, taskCompileContextSnapshot, } from "./task-compile-context.js";
+export { deleteStaleClarificationSubmitReplayHints, readActiveClarificationProjection, readClarificationRoundProjection, readClarificationRoundsForThread, readClarificationThreadResponse, readSealedClarificationRoundsWithoutSuccessor, } from "./clarification-records.js";
 export { createClarificationRoundAgentMessage, createClarificationRoundMessage, readClarificationRoundMessagesWindow, } from "./clarification-messages.js";
 export { openNextTaskBoundClarificationRound, openNextTaskCompileClarificationRound, openTaskCompileClarificationRound, } from "./clarification-rounds.js";
 export { closeTaskBoundClarificationAsRetaskingRequired, materializeClarificationSuccessor, materializeTaskBoundRunSuccessor, submitClarificationRound, } from "./clarification-successors.js";
@@ -13,5 +14,5 @@ export { readStaleRunningTaskIdentities, recoverStaleRunningTasksAsFailed, } fro
 export { markReadStateScope, readReadStateSummary, recordReadNotificationEvent, } from "./read-state.js";
 export { readTaskDetailProjection } from "./task-details.js";
 export { applyTaskCompileProposal, markTaskRunStarted, readNextRunnableTask, readRecoverableScheduledRun, readCompiledTaskSummariesByWorkflowRef, readTaskProjection, readWorklistProjection, } from "./worklist.js";
-export type { ApplyTaskCompileProposalResult, CloseTaskBoundClarificationRetaskingRequiredInput, CloseTaskBoundClarificationRetaskingRequiredResult, CreateClarificationRoundAgentMessageInput, CreateClarificationRoundMessageInput, CreateMainChatAgentMessageInput, CreateMainChatMessageInput, CreateMainChatSystemMessageInput, CursorPageOptions, MarkReadStateScopeInput, MarkReadStateScopeResult, MarkTaskRunStartedInput, MarkTaskRunStartedResult, MaterializeClarificationSuccessorInput, MaterializeTaskBoundRunSuccessorInput, MaterializeTaskBoundRunSuccessorResult, MessageAuthorInput, NextRunnableTaskResult, OpenNextTaskBoundClarificationRoundInput, OpenNextTaskBoundClarificationRoundResult, OpenNextTaskCompileClarificationRoundInput, OpenNextTaskCompileClarificationRoundResult, OpenTaskCompileClarificationRoundInput, OpenTaskCompileClarificationRoundResult, ReadMainChatMessagesAfterOptions, ReadMessageWindowOptions, ReadReadStateSummaryInput, RecoverStaleRunningTasksResult, RecoverableScheduledRun, RecordReadNotificationEventInput, RecordRecoverySummaryInput, RecordRecoverySummaryResult, RecordRunNeedsHumanResultInput, RecordRunNeedsHumanResultResult, RecordRunResultInput, RecordRunResultResult, RunResultPromotionProjection, ScratchpadSnapshotInput, SubmitScratchpadInput, SubmitScratchpadResult, SealedClarificationRoundWithoutSuccessor, SubmitClarificationRoundInput, TaskCompileProposalInput, TaskCompileProposalModuleInput, TaskCompileProposalTaskInput, } from "./types.js";
+export type { ApplyTaskCompileProposalResult, CloseTaskBoundClarificationRetaskingRequiredInput, CloseTaskBoundClarificationRetaskingRequiredResult, CreateClarificationRoundAgentMessageInput, CreateClarificationRoundMessageInput, CreateMainChatAgentMessageInput, CreateMainChatMessageInput, CreateMainChatSystemMessageInput, CursorPageOptions, MarkReadStateScopeInput, MarkReadStateScopeResult, MarkTaskRunStartedInput, MarkTaskRunStartedResult, MaterializeClarificationSuccessorInput, MaterializeTaskBoundRunSuccessorInput, MaterializeTaskBoundRunSuccessorResult, MessageAuthorInput, NextRunnableTaskResult, OpenNextTaskBoundClarificationRoundInput, OpenNextTaskBoundClarificationRoundResult, OpenNextTaskCompileClarificationRoundInput, OpenNextTaskCompileClarificationRoundResult, OpenTaskCompileClarificationRoundInput, OpenTaskCompileClarificationRoundResult, ReadMessageWindowOptions, ReadReadStateSummaryInput, RecoverStaleRunningTasksResult, RecoverableScheduledRun, RecordReadNotificationEventInput, RecordRecoverySummaryInput, RecordRecoverySummaryResult, RecordRunNeedsHumanResultInput, RecordRunNeedsHumanResultResult, RecordRunResultInput, RecordRunResultResult, RunResultPromotionProjection, ScratchpadSnapshotInput, ScratchpadContentSnapshot, ScratchpadSourceRefInput, CaptureTaskCompileContextInput, CompleteTaskCompileContextInput, RollbackTaskCompileContextInput, TaskCompileContextRecord, SealedClarificationRoundWithoutSuccessor, SubmitClarificationRoundInput, TaskCompileProposalInput, TaskCompileProposalModuleInput, TaskCompileProposalTaskInput, } from "./types.js";
 //# sourceMappingURL=index.d.ts.map

package/dist/collaboration-state/index.js

@@ -1,9 +1,10 @@
 export { CollaborationStateCursorError } from "./serialization.js";
 export { createIdleExecutionStatusProjection } from "./execution-status.js";
-export { createMainChatAgentMessage, createMainChatMessage, createMainChatSystemMessage, ensureInitialProjectWelcomeMessage, hasMainChatArtifactPreviewMessage, hasMainChatTaskResultMessage, hasMainChatWorklistCompileMessage, hasMainChatWorklistFeedbackMessage, readCompletedWorklistFeedbackTaskIds, readMessageProjectionById, readMainChatMessageWindow, readMainChatMessagesAfter, readMainChatMessagesAfterCursor, readMainChatMessagesBeforeCursor, } from "./messages.js";
-export { createEmptyScratchpadProjection, readScratchpadReceiptSourceRefs, readScratchpadProjection, submitScratchpadProjection, upsertScratchpadProjection, } from "./scratchpad.js";
-export { advanceScratchpadTaskCompileSourceCursor, markScratchpadRefreshFailed, markScratchpadRefreshStarted, markScratchpadRefreshSucceeded, markScratchpadSourceDirty, readScratchpadSourceState, } from "./scratchpad-source-state.js";
-export { deleteStaleClarificationSubmitReplayHints, readActiveClarificationProjection, readClarificationRoundProjection, readClarificationRoundsForThread, readClarificationThreadResponse, readSealedClarificationRoundsWithoutSuccessor, readSubmittedTaskCompileClarificationRounds, readSubmittedTaskCompileClarificationRoundsAfterCursor, } from "./clarification-records.js";
+export { createMainChatAgentMessage, createMainChatMessage, createMainChatSystemMessage, ensureInitialProjectWelcomeMessage, hasMainChatArtifactPreviewMessage, hasMainChatTaskResultMessage, hasMainChatWorklistCompileMessage, hasMainChatWorklistFeedbackMessage, readCompletedWorklistFeedbackTaskIds, readMessageProjectionById, readMainChatMessageWindow, readMainChatMessagesBeforeCursor, readMainChatMessagesForScratchpadCycle, } from "./messages.js";
+export { createEmptyScratchpadProjection, readScratchpadReceiptSourceRefs, readScratchpadProjection, upsertScratchpadProjection, } from "./scratchpad.js";
+export { markScratchpadRefreshFailed, markScratchpadRefreshStarted, markScratchpadRefreshSucceeded, markScratchpadSourceDirty, readScratchpadSourceState, } from "./scratchpad-source-state.js";
+export { captureTaskCompileContext, completeTaskCompileContext, readActiveTaskCompileContext, rollbackTaskCompileContext, taskCompileContextSnapshot, } from "./task-compile-context.js";
+export { deleteStaleClarificationSubmitReplayHints, readActiveClarificationProjection, readClarificationRoundProjection, readClarificationRoundsForThread, readClarificationThreadResponse, readSealedClarificationRoundsWithoutSuccessor, } from "./clarification-records.js";
 export { createClarificationRoundAgentMessage, createClarificationRoundMessage, readClarificationRoundMessagesWindow, } from "./clarification-messages.js";
 export { openNextTaskBoundClarificationRound, openNextTaskCompileClarificationRound, openTaskCompileClarificationRound, } from "./clarification-rounds.js";
 export { closeTaskBoundClarificationAsRetaskingRequired, materializeClarificationSuccessor, materializeTaskBoundRunSuccessor, submitClarificationRound, } from "./clarification-successors.js";

package/dist/collaboration-state/messages.d.ts

@@ -1,7 +1,7 @@
 import { type MessageId, type RunResultId, type TaskId, type WorkflowInvocationRef } from "@tutti/shared/ids";
 import type { MessageProjection, MessageWindow } from "@tutti/shared/schemas/api";
 import { type SqliteDatabase } from "../store/index.js";
-import type { CreateMainChatAgentMessageInput, CreateMainChatMessageInput, CreateMainChatSystemMessageInput, ReadMainChatMessagesAfterOptions, ReadMessageWindowOptions } from "./types.js";
+import type { CreateMainChatAgentMessageInput, CreateMainChatMessageInput, CreateMainChatSystemMessageInput, ReadMessageWindowOptions } from "./types.js";
 import type { MessageRow } from "./storage-types.js";
 export declare function mapMessageRow(row: MessageRow, db?: SqliteDatabase): MessageProjection;
 export declare function createMainChatMessage(db: SqliteDatabase, input: CreateMainChatMessageInput): MessageProjection;
@@ -23,11 +23,9 @@ export declare function hasMainChatWorklistCompileMessage(db: SqliteDatabase, wo
 export declare function hasMainChatArtifactPreviewMessage(db: SqliteDatabase, runResultId: RunResultId): boolean;
 export declare function readCompletedWorklistFeedbackTaskIds(db: SqliteDatabase): Set<TaskId>;
 export declare function readMainChatMessageWindow(db: SqliteDatabase, options?: ReadMessageWindowOptions): MessageWindow;
-export declare function readMainChatMessagesAfter(db: SqliteDatabase, options: ReadMainChatMessagesAfterOptions): MessageProjection[];
-export declare function readMainChatMessagesAfterCursor(db: SqliteDatabase, options: {
-    after_created_at: string;
-    after_id: MessageId;
-    limit: number;
+export declare function readMainChatMessagesForScratchpadCycle(db: SqliteDatabase, after?: {
+    created_at: string;
+    message_id: MessageId;
 }): MessageProjection[];
 export declare function readMainChatMessagesBeforeCursor(db: SqliteDatabase, options: {
     before_created_at: string;

package/dist/collaboration-state/messages.js

@@ -440,35 +440,28 @@ export function readMainChatMessageWindow(db, options = {}) {
     }
     return { items, window };
 }
-export function readMainChatMessagesAfter(db, options) {
-    const limit = clampLimit(options.limit);
-    const rows = db
-        .prepare(`
-        SELECT *
-        FROM messages
-        WHERE scope_kind = 'main_chat'
-          AND created_at > ?
-        ORDER BY created_at ASC, id ASC
-        LIMIT ?
-      `)
-        .all(options.after_created_at, limit);
-    return rows.map((row) => mapMessageRow(row, db));
-}
-export function readMainChatMessagesAfterCursor(db, options) {
-    const limit = clampLimit(options.limit);
-    const rows = db
-        .prepare(`
-        SELECT *
-        FROM messages
-        WHERE scope_kind = 'main_chat'
-          AND (
-            created_at > ?
-            OR (created_at = ? AND id > ?)
-          )
-        ORDER BY created_at ASC, id ASC
-        LIMIT ?
-      `)
-        .all(options.after_created_at, options.after_created_at, options.after_id, limit);
+export function readMainChatMessagesForScratchpadCycle(db, after) {
+    const rows = after === undefined
+        ? db
+            .prepare(`
+              SELECT *
+              FROM messages
+              WHERE scope_kind = 'main_chat'
+              ORDER BY created_at ASC, id ASC
+            `)
+            .all()
+        : db
+            .prepare(`
+              SELECT *
+              FROM messages
+              WHERE scope_kind = 'main_chat'
+                AND (
+                  created_at > ?
+                  OR (created_at = ? AND id > ?)
+                )
+              ORDER BY created_at ASC, id ASC
+            `)
+            .all(after.created_at, after.created_at, after.message_id);
     return rows.map((row) => mapMessageRow(row, db));
 }
 export function readMainChatMessagesBeforeCursor(db, options) {

package/dist/collaboration-state/scratchpad-source-state.d.ts

@@ -1,16 +1,12 @@
-import type { ActivityRef, ClarificationRoundRef, MessageId } from "@tutti/shared/ids";
+import type { ActivityRef, MessageId } from "@tutti/shared/ids";
 import type { SqliteDatabase } from "../store/index.js";
 export type ScratchpadMainChatCursor = {
     created_at: string;
     message_id: MessageId;
 };
-export type ScratchpadTaskCompileCursor = {
-    submitted_at: string;
-    round_id: ClarificationRoundRef;
-};
 export type ScratchpadSourceState = {
-    main_chat_cursor?: ScratchpadMainChatCursor;
-    task_compile_cursor?: ScratchpadTaskCompileCursor;
+    cycle_start_cursor?: ScratchpadMainChatCursor;
+    refreshed_through_cursor?: ScratchpadMainChatCursor;
     dirty_since?: string;
     in_flight?: {
         activity_ref: ActivityRef;
@@ -22,16 +18,12 @@ export type ScratchpadSourceState = {
     updated_at?: string;
 };
 export type ScratchpadSourceCursorUpdate = {
-    main_chat_cursor?: ScratchpadMainChatCursor;
-    task_compile_cursor?: ScratchpadTaskCompileCursor;
+    refreshed_through_cursor?: ScratchpadMainChatCursor;
 };
 export declare function readScratchpadSourceState(db: SqliteDatabase): ScratchpadSourceState;
 export declare function markScratchpadSourceDirty(db: SqliteDatabase, input?: {
     now?: () => Date;
 }): ScratchpadSourceState;
-export declare function advanceScratchpadTaskCompileSourceCursor(db: SqliteDatabase, input: ScratchpadTaskCompileCursor & {
-    now?: () => Date;
-}): ScratchpadSourceState;
 export declare function markScratchpadRefreshStarted(db: SqliteDatabase, input: {
     activityRef: ActivityRef;
     now?: () => Date;

package/dist/collaboration-state/scratchpad-source-state.js

@@ -4,17 +4,18 @@ function mapScratchpadSourceStateRow(row) {
     if (row === undefined) {
         return state;
     }
-    if (row.main_chat_cursor_created_at !== null && row.main_chat_cursor_message_id !== null) {
-        state.main_chat_cursor = {
-            created_at: row.main_chat_cursor_created_at,
-            message_id: row.main_chat_cursor_message_id,
+    if (row.cycle_start_cursor_created_at !== null &&
+        row.cycle_start_cursor_message_id !== null) {
+        state.cycle_start_cursor = {
+            created_at: row.cycle_start_cursor_created_at,
+            message_id: row.cycle_start_cursor_message_id,
         };
     }
-    if (row.task_compile_cursor_submitted_at !== null &&
-        row.task_compile_cursor_round_id !== null) {
-        state.task_compile_cursor = {
-            submitted_at: row.task_compile_cursor_submitted_at,
-            round_id: row.task_compile_cursor_round_id,
+    if (row.refreshed_through_cursor_created_at !== null &&
+        row.refreshed_through_cursor_message_id !== null) {
+        state.refreshed_through_cursor = {
+            created_at: row.refreshed_through_cursor_created_at,
+            message_id: row.refreshed_through_cursor_message_id,
         };
     }
     if (row.dirty_since !== null) {
@@ -49,6 +50,9 @@ function nextDirtySinceForSourceChange(current, changedAt) {
         isIsoAfter(current.dirty_since, current.in_flight.started_at)) {
         return current.dirty_since;
     }
+    if (!isIsoAfter(changedAt, current.in_flight.started_at)) {
+        return new Date(new Date(current.in_flight.started_at).getTime() + 1).toISOString();
+    }
     return changedAt;
 }
 function dirtySinceAfterRefreshSuccess(current) {
@@ -59,21 +63,14 @@ function dirtySinceAfterRefreshSuccess(current) {
     }
     return null;
 }
-function isTaskCompileCursorAfter(left, right) {
-    const submittedOrder = left.submitted_at.localeCompare(right.submitted_at);
-    if (submittedOrder !== 0) {
-        return submittedOrder > 0;
-    }
-    return left.round_id > right.round_id;
-}
 export function readScratchpadSourceState(db) {
     const row = db
         .prepare(`
         SELECT
-          main_chat_cursor_created_at,
-          main_chat_cursor_message_id,
-          task_compile_cursor_submitted_at,
-          task_compile_cursor_round_id,
+          cycle_start_cursor_created_at,
+          cycle_start_cursor_message_id,
+          refreshed_through_cursor_created_at,
+          refreshed_through_cursor_message_id,
           dirty_since,
           in_flight_activity_ref,
           in_flight_started_at,
@@ -103,32 +100,6 @@ export function markScratchpadSourceDirty(db, input = {}) {
     `).run(dirtySince, updatedAt);
     return readScratchpadSourceState(db);
 }
-export function advanceScratchpadTaskCompileSourceCursor(db, input) {
-    const current = readScratchpadSourceState(db);
-    const nextCursor = {
-        submitted_at: input.submitted_at,
-        round_id: input.round_id,
-    };
-    if (current.task_compile_cursor !== undefined &&
-        !isTaskCompileCursorAfter(nextCursor, current.task_compile_cursor)) {
-        return current;
-    }
-    const updatedAt = nowIso(input.now);
-    db.prepare(`
-      INSERT INTO scratchpad_source_state (
-        id,
-        task_compile_cursor_submitted_at,
-        task_compile_cursor_round_id,
-        updated_at
-      )
-      VALUES ('current', ?, ?, ?)
-      ON CONFLICT(id) DO UPDATE SET
-        task_compile_cursor_submitted_at = excluded.task_compile_cursor_submitted_at,
-        task_compile_cursor_round_id = excluded.task_compile_cursor_round_id,
-        updated_at = excluded.updated_at
-    `).run(nextCursor.submitted_at, nextCursor.round_id, updatedAt);
-    return readScratchpadSourceState(db);
-}
 export function markScratchpadRefreshStarted(db, input) {
     const updatedAt = nowIso(input.now);
     db.prepare(`
@@ -149,16 +120,13 @@ export function markScratchpadRefreshStarted(db, input) {
 export function markScratchpadRefreshSucceeded(db, input) {
     const updatedAt = nowIso(input.now);
     const current = readScratchpadSourceState(db);
-    const mainChatCursor = input.main_chat_cursor ?? current.main_chat_cursor;
-    const taskCompileCursor = input.task_compile_cursor ?? current.task_compile_cursor;
+    const refreshedThroughCursor = input.refreshed_through_cursor ?? current.refreshed_through_cursor;
     const dirtySince = dirtySinceAfterRefreshSuccess(current);
     db.prepare(`
       INSERT INTO scratchpad_source_state (
         id,
-        main_chat_cursor_created_at,
-        main_chat_cursor_message_id,
-        task_compile_cursor_submitted_at,
-        task_compile_cursor_round_id,
+        refreshed_through_cursor_created_at,
+        refreshed_through_cursor_message_id,
         dirty_since,
         in_flight_activity_ref,
         in_flight_started_at,
@@ -166,19 +134,17 @@ export function markScratchpadRefreshSucceeded(db, input) {
         backoff_until,
         updated_at
       )
-      VALUES ('current', ?, ?, ?, ?, ?, NULL, NULL, ?, NULL, ?)
+      VALUES ('current', ?, ?, ?, NULL, NULL, ?, NULL, ?)
       ON CONFLICT(id) DO UPDATE SET
-        main_chat_cursor_created_at = excluded.main_chat_cursor_created_at,
-        main_chat_cursor_message_id = excluded.main_chat_cursor_message_id,
-        task_compile_cursor_submitted_at = excluded.task_compile_cursor_submitted_at,
-        task_compile_cursor_round_id = excluded.task_compile_cursor_round_id,
+        refreshed_through_cursor_created_at = excluded.refreshed_through_cursor_created_at,
+        refreshed_through_cursor_message_id = excluded.refreshed_through_cursor_message_id,
         dirty_since = excluded.dirty_since,
         in_flight_activity_ref = NULL,
         in_flight_started_at = NULL,
         last_completed_at = excluded.last_completed_at,
         backoff_until = NULL,
         updated_at = excluded.updated_at
-    `).run(mainChatCursor?.created_at ?? null, mainChatCursor?.message_id ?? null, taskCompileCursor?.submitted_at ?? null, taskCompileCursor?.round_id ?? null, dirtySince, updatedAt, updatedAt);
+    `).run(refreshedThroughCursor?.created_at ?? null, refreshedThroughCursor?.message_id ?? null, dirtySince, updatedAt, updatedAt);
     return readScratchpadSourceState(db);
 }
 export function markScratchpadRefreshFailed(db, input = {}) {

package/dist/collaboration-state/scratchpad.d.ts

@@ -1,10 +1,9 @@
 import type { ScratchpadProjection } from "@tutti/shared/schemas/api";
 import type { SqliteDatabase } from "../store/index.js";
 import type { ScratchpadSourceRefRow } from "./storage-types.js";
-import type { ScratchpadSnapshotInput, SubmitScratchpadInput } from "./types.js";
+import type { ScratchpadSnapshotInput } from "./types.js";
 export declare function createEmptyScratchpadProjection(): ScratchpadProjection;
 export declare function upsertScratchpadProjection(db: SqliteDatabase, input: ScratchpadSnapshotInput): ScratchpadProjection;
-export declare function submitScratchpadProjection(db: SqliteDatabase, input: SubmitScratchpadInput): ScratchpadProjection;
 export declare function readScratchpadProjection(db: SqliteDatabase): ScratchpadProjection;
 export declare function readScratchpadReceiptSourceRefs(db: SqliteDatabase, workflowRef: string): ScratchpadSourceRefRow[];
 //# sourceMappingURL=scratchpad.d.ts.map

package/dist/collaboration-state/scratchpad.js

@@ -33,25 +33,6 @@ function replaceCurrentScratchpadSourceRefs(db, sourceRefs) {
         insert.run(sourceRef.message_id, sourceRef.source_scope, sourceRef.created_at);
     }
 }
-function copyCurrentScratchpadSourcesToReceipt(db, workflowRef) {
-    db.prepare("DELETE FROM scratchpad_receipt_sources WHERE workflow_ref = ?").run(workflowRef);
-    db.prepare(`
-      INSERT INTO scratchpad_receipt_sources (
-        workflow_ref,
-        message_id,
-        source_scope,
-        created_at
-      )
-      SELECT
-        ?,
-        message_id,
-        source_scope,
-        created_at
-      FROM scratchpad_source_refs
-      WHERE scratchpad_id = 'current'
-      ORDER BY created_at ASC, message_id ASC
-    `).run(workflowRef);
-}
 export function createEmptyScratchpadProjection() {
     return {
         id: "current",
@@ -135,46 +116,6 @@ export function upsertScratchpadProjection(db, input) {
     replaceCurrentScratchpadSourceRefs(db, input.source_refs);
     return readScratchpadProjection(db);
 }
-export function submitScratchpadProjection(db, input) {
-    const submittedAt = nowIso(input.now);
-    const scratchpad = readScratchpadProjection(db);
-    if (scratchpad.state === "empty") {
-        return scratchpad;
-    }
-    db.prepare(`
-      INSERT INTO scratchpad_receipts (
-        workflow_ref,
-        activity_ref,
-        topic,
-        background_summary,
-        current_consensus_json,
-        open_questions_json,
-        task_changes_json,
-        submitted_at
-      )
-      VALUES (?, ?, ?, ?, ?, ?, ?, ?)
-      ON CONFLICT(workflow_ref) DO UPDATE SET
-        activity_ref = excluded.activity_ref,
-        topic = excluded.topic,
-        background_summary = excluded.background_summary,
-        current_consensus_json = excluded.current_consensus_json,
-        open_questions_json = excluded.open_questions_json,
-        task_changes_json = excluded.task_changes_json,
-        submitted_at = excluded.submitted_at
-    `).run(input.workflow_ref, input.activity_ref, scratchpad.topic, scratchpad.background_summary, stringifyJson(scratchpad.current_consensus), stringifyJson(scratchpad.open_questions), stringifyJson(scratchpad.task_changes), submittedAt);
-    copyCurrentScratchpadSourcesToReceipt(db, input.workflow_ref);
-    db.prepare(`
-      UPDATE scratchpad
-      SET
-        state = 'submitted',
-        submitted_by_activity_ref = ?,
-        submitted_by_workflow_ref = ?,
-        submitted_at = ?,
-        updated_at = ?
-      WHERE id = 'current'
-    `).run(input.activity_ref, input.workflow_ref, submittedAt, submittedAt);
-    return readScratchpadProjection(db);
-}
 export function readScratchpadProjection(db) {
     const receipts = readScratchpadReceipts(db);
     const row = db

package/dist/collaboration-state/storage-types.d.ts

@@ -37,14 +37,14 @@ export type ScratchpadReceiptRow = {
 };
 export type ScratchpadSourceRefRow = {
     message_id: MessageId;
-    source_scope: "main_chat" | "clarification_round";
+    source_scope: "main_chat";
     created_at: string;
 };
 export type ScratchpadSourceStateRow = {
-    main_chat_cursor_created_at: string | null;
-    main_chat_cursor_message_id: string | null;
-    task_compile_cursor_submitted_at: string | null;
-    task_compile_cursor_round_id: string | null;
+    cycle_start_cursor_created_at: string | null;
+    cycle_start_cursor_message_id: string | null;
+    refreshed_through_cursor_created_at: string | null;
+    refreshed_through_cursor_message_id: string | null;
     dirty_since: string | null;
     in_flight_activity_ref: string | null;
     in_flight_started_at: string | null;
@@ -53,6 +53,26 @@ export type ScratchpadSourceStateRow = {
     backoff_until: string | null;
     updated_at: string;
 };
+export type ActiveTaskCompileContextRow = {
+    workflow_ref: string;
+    captured_by_activity_ref: string;
+    submitted_at: string;
+    topic: string;
+    background_summary: string;
+    current_consensus_json: string;
+    open_questions_json: string;
+    task_changes_json: string;
+    scratchpad_updated_at: string;
+    source_window_after_created_at: string | null;
+    source_window_after_message_id: string | null;
+    source_window_through_created_at: string | null;
+    source_window_through_message_id: string | null;
+};
+export type ActiveTaskCompileContextSourceRow = {
+    workflow_ref: string;
+    message_id: MessageId;
+    created_at: string;
+};
 export type TaskModuleRow = {
     id: string;
     name: string;

package/dist/collaboration-state/task-compile-context.d.ts

@@ -0,0 +1,40 @@
+import type { WorkflowInvocationRef } from "@tutti/shared/ids";
+import { type SqliteDatabase } from "../store/index.js";
+import type { CaptureTaskCompileContextInput, CompleteTaskCompileContextInput, RollbackTaskCompileContextInput, ScratchpadContentSnapshot, TaskCompileContextRecord } from "./types.js";
+export declare function readActiveTaskCompileContext(db: SqliteDatabase, workflowRef?: WorkflowInvocationRef): TaskCompileContextRecord | null;
+export declare function captureTaskCompileContext(db: SqliteDatabase, input: CaptureTaskCompileContextInput): TaskCompileContextRecord;
+export declare function completeTaskCompileContext(db: SqliteDatabase, input: CompleteTaskCompileContextInput): {
+    updated_at?: string;
+    submitted_at?: string;
+    updated_by_activity_ref?: string;
+    submitted_by_activity_ref?: string;
+    submitted_by_workflow_ref?: string;
+    id: "current";
+    topic: string;
+    background_summary: string;
+    current_consensus: string[];
+    open_questions: string[];
+    task_changes: string[];
+    state: "ready" | "empty" | "submitted";
+    receipts: {
+        compiled_tasks?: {
+            status: "failed" | "done" | "todo" | "running" | "pending";
+            task_id: string;
+            title: string;
+            summary: string;
+            module_id: string;
+            module_name: string;
+        }[];
+        activity_ref: string;
+        workflow_ref: string;
+        topic: string;
+        background_summary: string;
+        current_consensus: string[];
+        open_questions: string[];
+        task_changes: string[];
+        submitted_at: string;
+    }[];
+};
+export declare function rollbackTaskCompileContext(db: SqliteDatabase, input: RollbackTaskCompileContextInput): boolean;
+export declare function taskCompileContextSnapshot(context: TaskCompileContextRecord): ScratchpadContentSnapshot;
+//# sourceMappingURL=task-compile-context.d.ts.map