@cleocode/core 2026.9.24 → 2026.9.26

package/dist/validation/protocol-common.js

@@ -56,11 +56,20 @@ const VALID_TYPES = [
     'Testing',
     'Specification',
     'Consensus',
+    'ADR',
     'Decomposition',
     'Contribution',
     'Release',
 ];
-const VALID_STATUSES_MSG = MANIFEST_STATUSES.filter((s) => s !== 'archived');
+/**
+ * Statuses a return message may carry. `complete` is the spelling the spawn
+ * prompt renders; `completed` is the manifest status and stays accepted.
+ */
+const RETURN_STATUSES = ['complete', ...MANIFEST_STATUSES.filter((s) => s !== 'archived')];
+/** Tail of the legacy one-line return message (ADR-027). */
+const LEGACY_RETURN_TAIL = ' Manifest appended to pipeline_manifest.';
+/** Keys a compressed return message may carry after its first line (T12521). */
+const RETURN_DETAIL_KEYS = ['commits', 'gates', 'blocker'];
 /**
  * Map from protocol type identifiers to the expected message type prefix.
  * When a protocolType is provided, the return message must use the matching type.
@@ -72,38 +81,94 @@ const PROTOCOL_TYPE_MAP = {
     testing: 'Testing',
     specification: 'Specification',
     consensus: 'Consensus',
+    architecture_decision: 'ADR',
     decomposition: 'Decomposition',
     contribution: 'Contribution',
     release: 'Release',
 };
 /**
- * Check if return message follows protocol format.
- * Expected: "<Type> <status>. Manifest appended to pipeline_manifest."
+ * Parse a subagent return message in the compressed or the legacy form.
+ *
+ * One surrounding ``` fence is stripped first. In the compressed form:
+ * `blocker` must be `none` (or absent) when the status is
+ * `complete`/`completed`, and present and not `none` when it is
+ * `partial`/`blocked`; `manifest:none` is accepted only for `partial`/`blocked`;
+ * an entry id containing `<` or `>` (an unfilled `<entryId>` placeholder) is
+ * rejected. Unknown, duplicate or empty detail lines reject the message, and a
+ * legacy message must be exactly one line (its rules are unchanged).
+ *
+ * @param message - Raw return message (surrounding whitespace and one
+ *   surrounding code fence are ignored).
+ * @param types - Allowed type words; omitted, any non-empty type is allowed.
+ * @returns The parsed message, or `null` when it matches neither form.
+ * @task T12521
+ */
+export function parseReturnMessage(message, types) {
+    const lines = stripReturnFence(message.trim().split(/\r?\n/));
+    const typePattern = types ? types.map(escapeRegex).join('|') : '.+?';
+    const head = new RegExp(`^(${typePattern}) (${RETURN_STATUSES.join('|')})\\.(?:${escapeRegex(LEGACY_RETURN_TAIL)}| manifest:(\\S+))$`).exec(lines[0] ?? '');
+    const type = head?.[1];
+    const status = head?.[2];
+    if (!type || !status)
+        return null;
+    const entryId = head?.[3] ?? null;
+    const parsed = {
+        form: entryId ? 'compressed' : 'legacy',
+        type,
+        status,
+        entryId,
+        commits: null,
+        gates: null,
+        blocker: null,
+    };
+    if (parsed.form === 'legacy')
+        return lines.length === 1 ? parsed : null;
+    for (const line of lines.slice(1)) {
+        const detail = /^(\w+): (\S.*)$/.exec(line.trim());
+        const key = RETURN_DETAIL_KEYS.find((k) => k === detail?.[1]);
+        const value = detail?.[2]?.trim();
+        if (!key || !value || parsed[key] !== null)
+            return null;
+        parsed[key] = value;
+    }
+    if (/[<>]/.test(entryId ?? ''))
+        return null;
+    const done = status === 'complete' || status === 'completed';
+    const blocked = parsed.blocker !== null && parsed.blocker !== 'none';
+    if (done && (blocked || entryId === 'none'))
+        return null;
+    if (!done && !blocked)
+        return null;
+    return parsed;
+}
+/**
+ * Drop one surrounding ``` fence (with an optional info string) from the
+ * lines of a return message, so a block copied verbatim from the spawn
+ * prompt's template still parses (T12521).
+ */
+function stripReturnFence(lines) {
+    const first = lines[0]?.trim() ?? '';
+    const last = lines[lines.length - 1]?.trim() ?? '';
+    if (lines.length >= 3 && /^```[\w-]*$/.test(first) && last === '```') {
+        return lines.slice(1, -1).map((line) => line.trim());
+    }
+    return lines;
+}
+/**
+ * Check if return message follows protocol format — the compressed form
+ * (`<Type> <status>. manifest:<entryId>` plus optional detail lines) or the
+ * legacy one-liner (`<Type> <status>. Manifest appended to pipeline_manifest.`).
  *
  * When protocolType is provided, the message type must match the protocol
  * (e.g., a 'research' protocol must produce a "Research ..." message).
  *
  * @task T4527
+ * @task T12521
  */
 export function checkReturnMessageFormat(message, protocolType) {
-    const statusPattern = VALID_STATUSES_MSG.join('|');
-    // If protocolType is given, constrain the type to the matching prefix
-    let typePattern;
-    if (protocolType) {
-        const expectedType = PROTOCOL_TYPE_MAP[protocolType.toLowerCase()];
-        if (!expectedType) {
-            // Unknown protocol type — fall back to allowing any valid type
-            typePattern = VALID_TYPES.join('|');
-        }
-        else {
-            typePattern = expectedType;
-        }
-    }
-    else {
-        typePattern = VALID_TYPES.join('|');
-    }
-    const regex = new RegExp(`^(${typePattern}) (${statusPattern})\\. Manifest appended to pipeline_manifest\\.$`);
-    return regex.test(message);
+    // Unknown protocol type — fall back to allowing any valid type.
+    const expectedType = protocolType ? PROTOCOL_TYPE_MAP[protocolType.toLowerCase()] : undefined;
+    return parseReturnMessage(message, expectedType ? [expectedType] : VALID_TYPES) !== null;
 }
 // ============================================================================
 // Manifest Field Validation

package/dist/validation/protocol-common.js.map

@@ -1 +1 @@
-{"version":3,"file":"protocol-common.js","sourceRoot":"","sources":["../../src/validation/protocol-common.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"protocol-common.js","sourceRoot":"","sources":["../../src/validation/protocol-common.ts"],"names":[],"mappings":"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"}

package/dist/workgraph/scaffold-apply.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"scaffold-apply.d.ts","sourceRoot":"","sources":["../../src/workgraph/scaffold-apply.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;GAUG;AAEH,OAAO,KAAK,EACV,4BAA4B,EAC5B,4BAA4B,EAE7B,MAAM,qBAAqB,CAAC;AAU7B,0EAA0E;AAC1E,eAAO,MAAM,kCAAkC,uCAAuC,CAAC;AAEvF,qFAAqF;AACrF,eAAO,MAAM,yCAAyC,8CACT,CAAC;AAE9C,kFAAkF;AAClF,eAAO,MAAM,gCAAgC,qCAAqC,CAAC;AAsEnF;;;;;;;;;;;;;;;;;;;;;;GAsBG;AACH,wBAAsB,sBAAsB,CAC1C,MAAM,EAAE,4BAA4B,GACnC,OAAO,CAAC,4BAA4B,CAAC,CA0HvC"}
+{"version":3,"file":"scaffold-apply.d.ts","sourceRoot":"","sources":["../../src/workgraph/scaffold-apply.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;GAUG;AAEH,OAAO,KAAK,EACV,4BAA4B,EAC5B,4BAA4B,EAE7B,MAAM,qBAAqB,CAAC;AAW7B,0EAA0E;AAC1E,eAAO,MAAM,kCAAkC,uCAAuC,CAAC;AAEvF,qFAAqF;AACrF,eAAO,MAAM,yCAAyC,8CACT,CAAC;AAE9C,kFAAkF;AAClF,eAAO,MAAM,gCAAgC,qCAAqC,CAAC;AAsEnF;;;;;;;;;;;;;;;;;;;;;;GAsBG;AACH,wBAAsB,sBAAsB,CAC1C,MAAM,EAAE,4BAA4B,GACnC,OAAO,CAAC,4BAA4B,CAAC,CAiIvC"}

package/dist/workgraph/scaffold-apply.js

@@ -10,6 +10,7 @@
  * @epic T10547
  */
 import { captureProjectScope, getProjectRoot, worktreeScope } from '../project-scope.js';
+import { rethrowDependencyCycle } from '../store/dependency-cycles.js';
 import { getDb, getNativeDb } from '../store/sqlite.js';
 import * as schema from '../store/tasks-schema.js';
 import { validateWorkGraphScaffold } from './scaffold-validate.js';
@@ -147,11 +148,19 @@ export async function applyWorkGraphScaffold(params) {
                 for (const edge of params.edges) {
                     if (edge.source === 'dependency') {
                         // Dependency edge → task_dependencies
-                        const result = db
-                            .insert(schema.taskDependencies)
-                            .values({ taskId: edge.fromId, dependsOn: edge.toId })
-                            .onConflictDoNothing()
-                            .run();
+                        const dependency = { taskId: edge.fromId, dependsOn: edge.toId };
+                        let result;
+                        try {
+                            result = db
+                                .insert(schema.taskDependencies)
+                                .values(dependency)
+                                .onConflictDoNothing()
+                                .run();
+                        }
+                        catch (err) {
+                            // T12886: name the cycle the guard trigger refused.
+                            rethrowDependencyCycle(db, err, [dependency]);
+                        }
                         if (result.changes > 0) {
                             edgesChanged++;
                         }

package/dist/workgraph/scaffold-apply.js.map

@@ -1 +1 @@
-{"version":3,"file":"scaffold-apply.js","sourceRoot":"","sources":["../../src/workgraph/scaffold-apply.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"scaffold-apply.js","sourceRoot":"","sources":["../../src/workgraph/scaffold-apply.ts"],"names":[],"mappings":"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"}

package/migrations/README.md

@@ -236,6 +236,18 @@ Running `pnpm db:new -- --db signaldock` emits a warning and proceeds; the linte
 any convention violations. Bringing signaldock fully into the `migration-manager.ts` runtime
 is an epic-scale refactor out of scope for Wave 2A (ADR-054 R3 §6.1).
 
+### sync-journal: not a drizzle lineage
+
+`sync-journal/` holds the change journal's own tables (`_sync_meta`, `_sync_clock`,
+`_sync_replica`; T12342). It is NOT a drizzle lineage: `migration-manager.ts`, drizzle-kit,
+`pnpm db:new` and `scripts/lint-migrations.mjs` (which scans `drizzle-*` sets only) never touch
+it. `packages/core/src/store/sync/schema.ts` applies its folders lazily, only when a `sync.*`
+flag is first enabled on a store, so a store with every flag off gains no table and no journal
+row. Each applied folder is journaled in `_sync_meta` as `schema:<folder>` with the sha256 of
+its `migration.sql`, never in `__drizzle_migrations`; an applied folder whose SQL changed is
+refused with `E_SYNC_SCHEMA_HASH_DRIFT`. Never edit an applied folder: add a new one, with the
+same `YYYYMMDDHHMMSS_tNNNN-<slug>/migration.sql` naming.
+
 ---
 
 ## Linter Rules

package/migrations/drizzle-cleo-project/20260928120000_t12341-row-uids/migration.sql

@@ -0,0 +1,169 @@
+-- T12341 (epic T12323) — row uids: the merge key of every syncing row.
+--
+-- Adds a nullable `uid` column (and a unique index on it) to the task-graph
+-- tables whose live table is settled (no pending twin collapse), plus the
+-- stored AC-uid references `ac_uid` on evidence bindings and AC history, and
+-- the display-id alias table. Spec: `cleo docs fetch t12341-uid-scheme`.
+--
+-- The column is filled by TypeScript, not here: SQLite has no hash function,
+-- and existing rows need a DETERMINISTIC uid so two devices that share a
+-- history derive the same one (store/row-identity.ts, run at every open inside
+-- the cold-open lease, right after the migrations). Nothing in this file
+-- rebuilds a table, so the T12541 rebuild probe does not apply; if the journal
+-- probe ever stamps this migration after adding only its columns (Scenario 3,
+-- Case B), the open pass re-creates the indexes.
+--
+-- There is deliberately no persistent trigger: one that called the uid
+-- function would fail every insert an older build makes (it lacks the
+-- function), and one that minted a random uid would make those rows
+-- non-deterministic. Rows an older build inserts keep a NULL uid until the next
+-- open by this build fills them.
+--
+-- `birth_fp` (minted tables) is the birth fingerprint: a hash of creation
+-- facts no edit changes, captured when the uid is assigned. Same uid with a
+-- different birth_fp is a uid COLLISION the merge never merges (spec §6.4).
+-- `ac_text_hash` on bindings is the hash of the AC text the evidence was
+-- recorded against; a mismatch with the current text is stale evidence.
+--
+-- `tasks_display_id_aliases` follows the ADR-094 alias pattern (a live display
+-- id always wins; an alias resolves only when no live row holds the id;
+-- several aliases are an error). `tasks_uid_aliases` records uid re-keys after
+-- a collision. Both are runtime infrastructure written by
+-- store/display-id-alias.ts, not part of the exodus target shape.
+--
+-- `tasks_identity_quarantine` (local-only) holds incoming rows a merge cannot
+-- place yet: the loser of a uid or display-id collision until its authority's
+-- re-key / re-mint arrives, and rows whose references wait on one (spec §6.4).
+--
+-- `tasks_row_identity_meta` (local-only) holds the identity recipe version the
+-- store's values were derived with, and the sync layer's "uids have synced"
+-- marker (spec §12.1).
+--
+-- `tasks_ac_uid_graveyard` and its PURE-SQL delete trigger record the uid of a
+-- deleted acceptance criterion, so the next open by this build can re-link a
+-- criterion an older build deleted and recreated without carrying its uid
+-- (spec §6.5). The trigger calls no function, so older builds run it as is.
+--
+-- @task T12341
+-- @epic T12323
+
+ALTER TABLE `tasks_tasks` ADD COLUMN `uid` TEXT;
+--> statement-breakpoint
+ALTER TABLE `tasks_task_acceptance_criteria` ADD COLUMN `uid` TEXT;
+--> statement-breakpoint
+ALTER TABLE `tasks_task_acceptance_criteria_history` ADD COLUMN `uid` TEXT;
+--> statement-breakpoint
+ALTER TABLE `tasks_task_acceptance_criteria_history` ADD COLUMN `ac_uid` TEXT;
+--> statement-breakpoint
+ALTER TABLE `tasks_evidence_ac_bindings` ADD COLUMN `uid` TEXT;
+--> statement-breakpoint
+ALTER TABLE `tasks_evidence_ac_bindings` ADD COLUMN `ac_uid` TEXT;
+--> statement-breakpoint
+ALTER TABLE `tasks_sessions` ADD COLUMN `uid` TEXT;
+--> statement-breakpoint
+ALTER TABLE `tasks_task_dependencies` ADD COLUMN `uid` TEXT;
+--> statement-breakpoint
+ALTER TABLE `tasks_task_relations` ADD COLUMN `uid` TEXT;
+--> statement-breakpoint
+ALTER TABLE `tasks_task_labels` ADD COLUMN `uid` TEXT;
+--> statement-breakpoint
+ALTER TABLE `tasks_tasks` ADD COLUMN `birth_fp` TEXT;
+--> statement-breakpoint
+ALTER TABLE `tasks_task_acceptance_criteria` ADD COLUMN `birth_fp` TEXT;
+--> statement-breakpoint
+ALTER TABLE `tasks_task_acceptance_criteria_history` ADD COLUMN `birth_fp` TEXT;
+--> statement-breakpoint
+ALTER TABLE `tasks_evidence_ac_bindings` ADD COLUMN `birth_fp` TEXT;
+--> statement-breakpoint
+ALTER TABLE `tasks_evidence_ac_bindings` ADD COLUMN `ac_text_hash` TEXT;
+--> statement-breakpoint
+ALTER TABLE `tasks_sessions` ADD COLUMN `birth_fp` TEXT;
+--> statement-breakpoint
+CREATE UNIQUE INDEX IF NOT EXISTS `uq_tasks_tasks_uid` ON `tasks_tasks` (`uid`);
+--> statement-breakpoint
+CREATE UNIQUE INDEX IF NOT EXISTS `uq_tasks_task_acceptance_criteria_uid` ON `tasks_task_acceptance_criteria` (`uid`);
+--> statement-breakpoint
+CREATE UNIQUE INDEX IF NOT EXISTS `uq_tasks_task_acceptance_criteria_history_uid` ON `tasks_task_acceptance_criteria_history` (`uid`);
+--> statement-breakpoint
+CREATE INDEX IF NOT EXISTS `idx_tasks_task_acceptance_criteria_history_ac_uid` ON `tasks_task_acceptance_criteria_history` (`ac_uid`);
+--> statement-breakpoint
+CREATE UNIQUE INDEX IF NOT EXISTS `uq_tasks_evidence_ac_bindings_uid` ON `tasks_evidence_ac_bindings` (`uid`);
+--> statement-breakpoint
+CREATE INDEX IF NOT EXISTS `idx_tasks_evidence_ac_bindings_ac_uid` ON `tasks_evidence_ac_bindings` (`ac_uid`);
+--> statement-breakpoint
+CREATE INDEX IF NOT EXISTS `idx_tasks_evidence_ac_bindings_ac_text_hash` ON `tasks_evidence_ac_bindings` (`ac_text_hash`);
+--> statement-breakpoint
+CREATE UNIQUE INDEX IF NOT EXISTS `uq_tasks_sessions_uid` ON `tasks_sessions` (`uid`);
+--> statement-breakpoint
+CREATE UNIQUE INDEX IF NOT EXISTS `uq_tasks_task_dependencies_uid` ON `tasks_task_dependencies` (`uid`);
+--> statement-breakpoint
+CREATE UNIQUE INDEX IF NOT EXISTS `uq_tasks_task_relations_uid` ON `tasks_task_relations` (`uid`);
+--> statement-breakpoint
+CREATE UNIQUE INDEX IF NOT EXISTS `uq_tasks_task_labels_uid` ON `tasks_task_labels` (`uid`);
+--> statement-breakpoint
+CREATE TABLE IF NOT EXISTS `tasks_display_id_aliases` (
+  `uid` TEXT PRIMARY KEY NOT NULL,
+  `entity_table` TEXT NOT NULL,
+  `display_id` TEXT NOT NULL,
+  `entity_uid` TEXT NOT NULL,
+  `reason` TEXT NOT NULL,
+  `origin` TEXT,
+  `displaced_hlc` TEXT,
+  `created_at` TEXT NOT NULL,
+  `entity_birth_fp` TEXT
+);
+--> statement-breakpoint
+CREATE INDEX IF NOT EXISTS `idx_tasks_display_id_aliases_lookup` ON `tasks_display_id_aliases` (`entity_table`, `display_id`);
+--> statement-breakpoint
+CREATE INDEX IF NOT EXISTS `idx_tasks_display_id_aliases_entity` ON `tasks_display_id_aliases` (`entity_uid`);
+--> statement-breakpoint
+CREATE TABLE IF NOT EXISTS `tasks_uid_aliases` (
+  `uid` TEXT PRIMARY KEY NOT NULL,
+  `entity_table` TEXT NOT NULL,
+  `old_uid` TEXT NOT NULL,
+  `old_birth_fp` TEXT NOT NULL,
+  `new_uid` TEXT NOT NULL,
+  `origin` TEXT,
+  `displaced_hlc` TEXT,
+  `created_at` TEXT NOT NULL
+);
+--> statement-breakpoint
+CREATE INDEX IF NOT EXISTS `idx_tasks_uid_aliases_old` ON `tasks_uid_aliases` (`entity_table`, `old_uid`);
+--> statement-breakpoint
+CREATE TABLE IF NOT EXISTS `tasks_ac_uid_graveyard` (
+  `seq` INTEGER PRIMARY KEY AUTOINCREMENT,
+  `ac_id` TEXT NOT NULL,
+  `uid` TEXT NOT NULL,
+  `task_id` TEXT NOT NULL,
+  `ordinal` INTEGER NOT NULL,
+  `text` TEXT NOT NULL,
+  `birth_fp` TEXT,
+  `deleted_at` TEXT NOT NULL
+);
+--> statement-breakpoint
+CREATE INDEX IF NOT EXISTS `idx_tasks_ac_uid_graveyard_task` ON `tasks_ac_uid_graveyard` (`task_id`);
+--> statement-breakpoint
+CREATE TRIGGER IF NOT EXISTS `trg_tasks_ac_uid_graveyard`
+AFTER DELETE ON `tasks_task_acceptance_criteria`
+WHEN OLD.`uid` IS NOT NULL
+BEGIN
+  INSERT INTO `tasks_ac_uid_graveyard` (`ac_id`, `uid`, `task_id`, `ordinal`, `text`, `birth_fp`, `deleted_at`)
+  VALUES (OLD.`id`, OLD.`uid`, OLD.`task_id`, OLD.`ordinal`, OLD.`text`, OLD.`birth_fp`, strftime('%Y-%m-%dT%H:%M:%fZ', 'now'));
+END;
+--> statement-breakpoint
+CREATE TABLE IF NOT EXISTS `tasks_row_identity_meta` (
+  `key` TEXT PRIMARY KEY NOT NULL,
+  `value` TEXT NOT NULL
+);
+--> statement-breakpoint
+CREATE TABLE IF NOT EXISTS `tasks_identity_quarantine` (
+  `entity_table` TEXT NOT NULL,
+  `uid` TEXT NOT NULL,
+  `birth_fp` TEXT NOT NULL,
+  `reason` TEXT NOT NULL,
+  `contested_id` TEXT,
+  `row_json` TEXT NOT NULL,
+  `received_hlc` TEXT,
+  `created_at` TEXT NOT NULL,
+  PRIMARY KEY (`entity_table`, `uid`, `birth_fp`)
+);

package/migrations/drizzle-cleo-project/20260930160000_t12886-dependency-cycle-guard/migration.sql

@@ -0,0 +1,76 @@
+-- T12886 — refuse a `tasks_task_dependencies` edge that closes a cycle.
+--
+-- `tasks_tasks_parent_cycle_guard_*` (T10572, restored by T11884) guards the
+-- containment tree only. Nothing guarded the dependency graph: no trigger, and
+-- no write path in TypeScript (`wouldCreateCycle` / `detectCircularDeps` are
+-- read-only diagnostics). A cycle stalls every task on it forever: `cleo next`,
+-- ready waves and orchestration all wait for a blocker that waits for them.
+--
+-- An edge (task_id → depends_on) means "task_id depends on depends_on". It
+-- closes a cycle when task_id = depends_on (a self-dependency) or when
+-- task_id is already reachable from depends_on through existing edges.
+--
+-- Bounded recursion: `reachable` has ONE column and uses UNION, so every task
+-- id enters it at most once and the walk stops after at most one row per task.
+-- No depth column exists to make a revisit distinct (the T12307 exit-143
+-- failure mode), and no depth cap truncates a legitimately long chain. EXISTS
+-- stops at the first match.
+--
+-- Re-inserting an edge that is already stored (INSERT … ON CONFLICT DO
+-- NOTHING by the diff writers) is not checked, so a store that already holds a
+-- legacy cycle stays writable; `cleo doctor dep-cycles` reports those cycles
+-- with a repair plan. The UPDATE guard ignores the row's own OLD edge, which
+-- is replaced by the update.
+--
+-- The RAISE message is a literal (an expression needs SQLite ≥ 3.47, and every
+-- reader must be able to parse the schema). The TypeScript write chokepoint
+-- (`batchUpdateDependencies`) translates it into an error that names the cycle.
+--
+-- @task T12886
+-- @epic T12486
+
+DROP TRIGGER IF EXISTS `tasks_task_dependencies_cycle_guard_insert`;
+--> statement-breakpoint
+DROP TRIGGER IF EXISTS `tasks_task_dependencies_cycle_guard_update`;
+--> statement-breakpoint
+CREATE TRIGGER `tasks_task_dependencies_cycle_guard_insert`
+BEFORE INSERT ON `tasks_task_dependencies`
+WHEN NOT EXISTS (
+  SELECT 1
+  FROM `tasks_task_dependencies` existing
+  WHERE existing.`task_id` = NEW.`task_id`
+    AND existing.`depends_on` = NEW.`depends_on`
+)
+BEGIN
+  SELECT RAISE(ABORT, 'E_TASK_DEPENDENCY_CYCLE: tasks_task_dependencies edge would close a dependency cycle (a task cannot depend on itself or on a task that already depends on it)')
+  WHERE NEW.`task_id` = NEW.`depends_on`
+    OR EXISTS (
+      WITH RECURSIVE reachable(`id`) AS (
+        SELECT NEW.`depends_on`
+        UNION
+        SELECT dep.`depends_on`
+        FROM `tasks_task_dependencies` dep
+        JOIN reachable ON dep.`task_id` = reachable.`id`
+      )
+      SELECT 1 FROM reachable WHERE reachable.`id` = NEW.`task_id`
+    );
+END;
+--> statement-breakpoint
+CREATE TRIGGER `tasks_task_dependencies_cycle_guard_update`
+BEFORE UPDATE OF `task_id`, `depends_on` ON `tasks_task_dependencies`
+WHEN NEW.`task_id` IS NOT OLD.`task_id` OR NEW.`depends_on` IS NOT OLD.`depends_on`
+BEGIN
+  SELECT RAISE(ABORT, 'E_TASK_DEPENDENCY_CYCLE: tasks_task_dependencies edge would close a dependency cycle (a task cannot depend on itself or on a task that already depends on it)')
+  WHERE NEW.`task_id` = NEW.`depends_on`
+    OR EXISTS (
+      WITH RECURSIVE reachable(`id`) AS (
+        SELECT NEW.`depends_on`
+        UNION
+        SELECT dep.`depends_on`
+        FROM `tasks_task_dependencies` dep
+        JOIN reachable ON dep.`task_id` = reachable.`id`
+        WHERE NOT (dep.`task_id` = OLD.`task_id` AND dep.`depends_on` = OLD.`depends_on`)
+      )
+      SELECT 1 FROM reachable WHERE reachable.`id` = NEW.`task_id`
+    );
+END;

package/migrations/drizzle-cleo-project/20260930160000_t12886-dependency-cycle-guard/revert.sql

@@ -0,0 +1,7 @@
+-- Revert T12886 — drop the dependency-cycle guard triggers.
+--
+-- @task T12886
+
+DROP TRIGGER IF EXISTS `tasks_task_dependencies_cycle_guard_insert`;
+--> statement-breakpoint
+DROP TRIGGER IF EXISTS `tasks_task_dependencies_cycle_guard_update`;

package/migrations/sync-journal/20260929140000_t12342-sync-clock/migration.sql

@@ -0,0 +1,42 @@
+-- T12342 — change journal (S1): store-level sync flags, the HLC clock and the
+-- replica binding. Journal spec t12342-t12343-journal-design §1.4, §1.5, §5.1.
+--
+-- NOT a drizzle migration. The sync schema is applied lazily by
+-- packages/core/src/store/sync/schema.ts, and only when a sync.* flag is first
+-- enabled on a store. With every flag off (the default), opening a store
+-- writes nothing: no table, no journal row. Applied folders are journaled in
+-- _sync_meta under the key 'schema:<folder name>', never in
+-- __drizzle_migrations.
+--
+-- All three tables are local-only (never synced; tier-1 backed up like every
+-- table) and identical in the project and the global store. Statements are
+-- separated by the drizzle breakpoint marker line, like the drizzle lineages.
+--
+-- @task T12342
+
+CREATE TABLE IF NOT EXISTS _sync_meta (
+  key        TEXT PRIMARY KEY,
+  value      TEXT NOT NULL,
+  updated_at TEXT NOT NULL
+) WITHOUT ROWID;
+--> statement-breakpoint
+CREATE TABLE IF NOT EXISTS _sync_clock (
+  replica_id TEXT PRIMARY KEY,
+  phys       INTEGER NOT NULL CHECK (phys >= 0),
+  ctr        INTEGER NOT NULL CHECK (ctr BETWEEN 0 AND 999999)
+) WITHOUT ROWID;
+--> statement-breakpoint
+CREATE TABLE IF NOT EXISTS _sync_replica (
+  replica_id TEXT PRIMARY KEY,
+  scope      TEXT NOT NULL CHECK (scope IN ('project', 'global')),
+  nonce      TEXT NOT NULL,
+  device_id  TEXT NOT NULL,
+  file_ino   INTEGER NOT NULL,
+  file_birth INTEGER,
+  bound_at   TEXT NOT NULL,
+  bound_why  TEXT NOT NULL,
+  retired_at TEXT,
+  successor  TEXT
+) WITHOUT ROWID;
+--> statement-breakpoint
+CREATE UNIQUE INDEX IF NOT EXISTS _sync_replica_active ON _sync_replica (scope) WHERE retired_at IS NULL;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cleocode/core",
-  "version": "2026.9.24",
+  "version": "2026.9.26",
   "description": "CLEO core business logic kernel — tasks, sessions, memory, orchestration, lifecycle, with bundled SQLite store",
   "type": "module",
   "main": "./dist/index.js",
@@ -491,16 +491,16 @@
     "write-file-atomic": "^7.0.1",
     "yaml": "^2.8.3",
     "zod": "^4.3.6",
-    "@cleocode/adapters": "2026.9.24",
-    "@cleocode/agents": "2026.9.24",
-    "@cleocode/caamp": "2026.9.24",
-    "@cleocode/contracts": "2026.9.24",
-    "@cleocode/git-shim": "2026.9.24",
-    "@cleocode/lafs": "2026.9.24",
-    "@cleocode/nexus": "2026.9.24",
-    "@cleocode/paths": "2026.9.24",
-    "@cleocode/skills": "2026.9.24",
-    "@cleocode/worktree": "2026.9.24"
+    "@cleocode/adapters": "2026.9.26",
+    "@cleocode/agents": "2026.9.26",
+    "@cleocode/caamp": "2026.9.26",
+    "@cleocode/contracts": "2026.9.26",
+    "@cleocode/git-shim": "2026.9.26",
+    "@cleocode/lafs": "2026.9.26",
+    "@cleocode/nexus": "2026.9.26",
+    "@cleocode/paths": "2026.9.26",
+    "@cleocode/skills": "2026.9.26",
+    "@cleocode/worktree": "2026.9.26"
   },
   "engines": {
     "node": ">=24.16.0"
@@ -526,7 +526,7 @@
     "@types/proper-lockfile": "^4.1.4",
     "@types/tar": "^6.1.13",
     "@types/write-file-atomic": "^4.0.3",
-    "@cleocode/utils": "2026.9.24"
+    "@cleocode/utils": "2026.9.26"
   },
   "repository": {
     "type": "git",
@@ -535,7 +535,7 @@
   },
   "optionalDependencies": {
     "llmtxt": "^2026.5.15",
-    "@cleocode/studio": "^2026.9.24"
+    "@cleocode/studio": "^2026.9.26"
   },
   "scripts": {
     "build": "tsc && node scripts/copy-selfimprove-fixtures.mjs && node scripts/write-build-provenance.mjs",

package/templates/CLEO-INJECTION.md

@@ -1,6 +1,6 @@
 # CLEO Protocol
 
-Version: 2.24.1 | CLI-only dispatch | `cleo <command> [args]`
+Version: 2.24.3 | CLI-only dispatch | `cleo <command> [args]`
 
 <!-- CLEO-INJECTION:section=session-start -->
 ## Universal protocol
@@ -71,7 +71,7 @@ Discovery: `cleo focus <id>` to orient, `cleo find "query"` to search (default p
 | Start session | `cleo session start --scope global --name "<what you are doing>"` (both flags are REQUIRED) |
 | End session | `cleo session end --note "..."` |
 
-Sessions are terminal-bound. `E_SESSION_UNBOUND` → bind via `cleo session start`, `cleo session resume <id>` or `CLEO_SESSION_ID=<id>`, or pass `--session <id>`; CI and multi-step scripts must export `CLEO_SESSION_ID`. Claude Code adopts a session a human started in its tab; Agent-tool subagents inherit the parent's `CLAUDE_CODE_SESSION_ID`, so they act in the parent's session.
+Sessions are terminal-bound: to the agent harness, pane, tab, CI job (GitHub Actions, GitLab CI) or ssh login, and to a known single-agent harness process (Kimi, aider, …) across its `bash -c` calls; in a human's tab it gets its own identity and runs `cleo session start` itself. Other hosts (orchestrators, IDE extension hosts, `opencode serve`, daemons) identify nobody: multi-agent hosts and multi-step scripts set `CLEO_SESSION_ID` (or `CLEO_AGENT_ID` in a long-lived host only) per agent. `E_SESSION_UNBOUND` → bind via `cleo session start`, `cleo session resume <id>` or `CLEO_SESSION_ID=<id>`, or pass `--session <id>`; separate one-shot `ssh host 'cleo …'` calls must export `CLEO_SESSION_ID`. Claude Code adopts a session a human started in its tab; Agent-tool subagents inherit the parent's `CLAUDE_CODE_SESSION_ID`, so they act in the parent's session.
 <!-- /CLEO-INJECTION:section=session-commands -->
 
 <!-- CLEO-INJECTION:section=output-contract -->