@cleocode/cleo 2026.4.28 → 2026.4.29

package/dist/cli/index.js

@@ -1571,10 +1571,10 @@ var init_subquery = __esm({
     init_entity();
     Subquery = class {
       static [entityKind] = "Subquery";
-      constructor(sql12, fields, alias, isWith = false, usedTables = []) {
+      constructor(sql13, fields, alias, isWith = false, usedTables = []) {
         this._ = {
           brand: "Subquery",
-          sql: sql12,
+          sql: sql13,
           selectedFields: fields,
           alias,
           isWith,
@@ -1925,7 +1925,7 @@ var init_sql = __esm({
         return new SQL([new StringChunk(str)]);
       }
       _sql.raw = raw;
-      function join131(chunks, separator) {
+      function join132(chunks, separator) {
         const result = [];
         for (const [i, chunk] of chunks.entries()) {
           if (i > 0 && separator !== void 0) result.push(separator);
@@ -1933,7 +1933,7 @@ var init_sql = __esm({
         }
         return new SQL(result);
       }
-      _sql.join = join131;
+      _sql.join = join132;
       function identifier(value) {
         return new Name(value);
       }
@@ -1954,8 +1954,8 @@ var init_sql = __esm({
         isSelectionField = false;
         /** @internal */
         origin;
-        constructor(sql12, fieldAlias) {
-          this.sql = sql12;
+        constructor(sql13, fieldAlias) {
+          this.sql = sql13;
           this.fieldAlias = fieldAlias;
         }
         getSQL() {
@@ -2659,17 +2659,17 @@ var init_custom = __esm({
       mapFromJsonValue(value) {
         return typeof this.mapJson === "function" ? this.mapJson(value) : this.mapFromDriverValue(value);
       }
-      jsonSelectIdentifier(identifier, sql12) {
-        if (typeof this.forJsonSelect === "function") return this.forJsonSelect(identifier, sql12);
+      jsonSelectIdentifier(identifier, sql13) {
+        if (typeof this.forJsonSelect === "function") return this.forJsonSelect(identifier, sql13);
         const rawType = this.getSQLType().toLowerCase();
         const parenPos = rawType.indexOf("(");
         switch (parenPos + 1 ? rawType.slice(0, parenPos) : rawType) {
           case "numeric":
           case "decimal":
           case "bigint":
-            return sql12`cast(${identifier} as text)`;
+            return sql13`cast(${identifier} as text)`;
           case "blob":
-            return sql12`hex(${identifier})`;
+            return sql13`hex(${identifier})`;
           default:
             return identifier;
         }
@@ -3837,8 +3837,8 @@ var init_custom2 = __esm({
       mapFromJsonValue(value) {
         return typeof this.mapJson === "function" ? this.mapJson(value) : this.mapFromDriverValue(value);
       }
-      jsonSelectIdentifier(identifier, sql12, arrayDimensions) {
-        if (typeof this.forJsonSelect === "function") return this.forJsonSelect(identifier, sql12, arrayDimensions);
+      jsonSelectIdentifier(identifier, sql13, arrayDimensions) {
+        if (typeof this.forJsonSelect === "function") return this.forJsonSelect(identifier, sql13, arrayDimensions);
         const rawType = this.getSQLType().toLowerCase();
         const parenPos = rawType.indexOf("(");
         switch (parenPos + 1 ? rawType.slice(0, parenPos) : rawType) {
@@ -3848,7 +3848,7 @@ var init_custom2 = __esm({
           case "numeric":
           case "bigint": {
             const arrVal = "[]".repeat(arrayDimensions ?? 0);
-            return sql12`${identifier}::text${sql12.raw(arrVal).if(arrayDimensions)}`;
+            return sql13`${identifier}::text${sql13.raw(arrVal).if(arrayDimensions)}`;
           }
           default:
             return identifier;
@@ -6707,7 +6707,7 @@ var init_select2 = __esm({
           const baseTableName = this.tableName;
           const tableName = getTableLikeName(table);
           for (const item of extractUsedTable(table)) this.usedTables.add(item);
-          if (typeof tableName === "string" && this.config.joins?.some((join131) => join131.alias === tableName)) throw new Error(`Alias "${tableName}" is already used in this query`);
+          if (typeof tableName === "string" && this.config.joins?.some((join132) => join132.alias === tableName)) throw new Error(`Alias "${tableName}" is already used in this query`);
           if (!this.isPartialSelect) {
             if (Object.keys(this.joinsNotNullableMap).length === 1 && typeof baseTableName === "string") this.config.fields = { [baseTableName]: this.config.fields };
             if (typeof tableName === "string" && !is(table, SQL)) {
@@ -7729,8 +7729,8 @@ var init_dialect = __esm({
         const returningSql = returning ? sql` returning ${this.buildSelection(returning, { isSingleTable: true })}` : void 0;
         return sql`${withSql}insert into ${table} ${insertOrder} ${valuesSql}${onConflict?.length ? sql.join(onConflict) : void 0}${returningSql}`;
       }
-      sqlToQuery(sql12, invokeSource) {
-        return sql12.toQuery({
+      sqlToQuery(sql13, invokeSource) {
+        return sql13.toQuery({
           casing: this.casing,
           escapeName: this.escapeName,
           escapeParam: this.escapeParam,
@@ -7992,7 +7992,7 @@ var init_dialect = __esm({
           if (!joins2) return;
           const withEntries = Object.entries(joins2).filter(([_2, v2]) => v2);
           if (!withEntries.length) return;
-          return sql.join(withEntries.map(([k2, join131]) => {
+          return sql.join(withEntries.map(([k2, join132]) => {
             const relation = tableConfig.relations[k2];
             const isSingle2 = is(relation, One3);
             const targetTable = aliasedTable(relation.targetTable, `d${currentDepth + 1}`);
@@ -8003,7 +8003,7 @@ var init_dialect = __esm({
               table: targetTable,
               mode: isSingle2 ? "first" : "many",
               schema,
-              queryConfig: join131,
+              queryConfig: join132,
               tableConfig: schema[relation.targetTableName],
               relationWhere: filter,
               isNested: true,
@@ -8017,7 +8017,7 @@ var init_dialect = __esm({
               key: k2,
               selection: innerQuery.selection,
               isArray: !isSingle2,
-              isOptional: (relation.optional ?? false) || join131 !== true && !!join131.where
+              isOptional: (relation.optional ?? false) || join132 !== true && !!join132.where
             });
             const jsonColumns = sql.join(innerQuery.selection.map((s3) => {
               return sql`${sql.raw(this.escapeString(s3.key))}, ${s3.selection ? sql`${jsonb2}(${sql.identifier(s3.key)})` : sql.identifier(s3.key)}`;
@@ -8416,7 +8416,7 @@ var init_update = __esm({
       createJoin(joinType) {
         return ((table, on) => {
           const tableName = getTableLikeName(table);
-          if (typeof tableName === "string" && this.config.joins.some((join131) => join131.alias === tableName)) throw new Error(`Alias "${tableName}" is already used in this query`);
+          if (typeof tableName === "string" && this.config.joins.some((join132) => join132.alias === tableName)) throw new Error(`Alias "${tableName}" is already used in this query`);
           if (typeof on === "function") {
             const from = this.config.from ? is(table, SQLiteTable) ? table[Table.Symbol.Columns] : is(table, Subquery) ? table._.selectedFields : is(table, SQLiteViewBase) ? table[ViewBaseConfig].selectedFields : void 0 : void 0;
             on = on(new Proxy(this.config.table[Table.Symbol.Columns], new SelectionProxyHandler({
@@ -8827,8 +8827,8 @@ var init_db = __esm({
 });
 
 // node_modules/.pnpm/drizzle-orm@1.0.0-beta.19-d95b7a4_@sinclair+typebox@0.34.49_@types+mssql@9.1.9_@azure+c_7d603f9dc53f6bedf2f8e8db5954b691/node_modules/drizzle-orm/cache/core/cache.js
-async function hashQuery(sql12, params) {
-  const dataToHash = `${sql12}-${JSON.stringify(params, (_2, v2) => typeof v2 === "bigint" ? `${v2}n` : v2)}`;
+async function hashQuery(sql13, params) {
+  const dataToHash = `${sql13}-${JSON.stringify(params, (_2, v2) => typeof v2 === "bigint" ? `${v2}n` : v2)}`;
   const data = new TextEncoder().encode(dataToHash);
   const hashBuffer = await crypto.subtle.digest("SHA-256", data);
   return [...new Uint8Array(hashBuffer)].map((b2) => b2.toString(16).padStart(2, "0")).join("");
@@ -9007,8 +9007,8 @@ var init_session3 = __esm({
       values(query) {
         return this.prepareOneTimeQuery(this.dialect.sqlToQuery(query), void 0, "run", false).values();
       }
-      async count(sql12) {
-        return (await this.values(sql12))[0][0];
+      async count(sql13) {
+        return (await this.values(sql13))[0][0];
       }
       /** @internal */
       extractRawValuesValueFromBatchResult(_result) {
@@ -11102,8 +11102,8 @@ function reconcileJournal(nativeDb, migrationsFolder, existenceTable, logSubsyst
     const dbEntries = nativeDb.prepare('SELECT hash FROM "__drizzle_migrations"').all();
     const hasOrphanedEntries = dbEntries.some((e) => !localHashes.has(e.hash));
     if (hasOrphanedEntries) {
-      const log11 = getLogger(logSubsystem);
-      log11.warn(
+      const log12 = getLogger(logSubsystem);
+      log12.warn(
         { orphaned: dbEntries.filter((e) => !localHashes.has(e.hash)).length },
         `Detected stale migration journal entries from a previous CLEO version. Reconciling.`
       );
@@ -11135,8 +11135,8 @@ function reconcileJournal(nativeDb, migrationsFolder, existenceTable, logSubsyst
         return cols.some((c) => c.name === column);
       });
       if (allColumnsExist) {
-        const log11 = getLogger(logSubsystem);
-        log11.warn(
+        const log12 = getLogger(logSubsystem);
+        log12.warn(
           { migration: migration.name, columns: alterMatches },
           `Detected partially-applied migration ${migration.name} \u2014 columns exist but journal entry missing. Auto-reconciling.`
         );
@@ -11181,8 +11181,8 @@ function ensureColumns(nativeDb, tableName, requiredColumns, logSubsystem) {
   const existingCols = new Set(columns.map((c) => c.name));
   for (const req of requiredColumns) {
     if (!existingCols.has(req.name)) {
-      const log11 = getLogger(logSubsystem);
-      log11.warn(
+      const log12 = getLogger(logSubsystem);
+      log12.warn(
         { column: req.name },
         `Adding missing column ${tableName}.${req.name} via ALTER TABLE`
       );
@@ -11301,12 +11301,12 @@ function detachAgentFromProject(db, agentId) {
 }
 function listProjectAgentRefs(db, opts) {
   const enabledOnly = opts?.enabledOnly ?? true;
-  const sql12 = enabledOnly ? `SELECT agent_id, attached_at, role, capabilities_override, last_used_at, enabled
+  const sql13 = enabledOnly ? `SELECT agent_id, attached_at, role, capabilities_override, last_used_at, enabled
        FROM project_agent_refs WHERE enabled = 1
        ORDER BY attached_at DESC` : `SELECT agent_id, attached_at, role, capabilities_override, last_used_at, enabled
        FROM project_agent_refs
        ORDER BY attached_at DESC`;
-  const rows = db.prepare(sql12).all();
+  const rows = db.prepare(sql13).all();
   return rows.map((r) => ({
     agentId: r.agent_id,
     attachedAt: r.attached_at,
@@ -13395,7 +13395,7 @@ function getDbPath(cwd) {
   return join10(getCleoDirAbsolute(cwd), DB_FILENAME2);
 }
 async function autoRecoverFromBackup(nativeDb, dbPath, cwd) {
-  const log11 = getLogger("sqlite");
+  const log12 = getLogger("sqlite");
   try {
     const countResult = nativeDb.prepare("SELECT COUNT(*) as cnt FROM tasks").get();
     const taskCount = countResult?.cnt ?? 0;
@@ -13416,7 +13416,7 @@ async function autoRecoverFromBackup(nativeDb, dbPath, cwd) {
     if (backupTaskCount < MIN_BACKUP_TASK_COUNT) {
       return;
     }
-    log11.warn(
+    log12.warn(
       { dbPath, backupPath: newestBackup.path, backupTasks: backupTaskCount },
       `Empty database detected with ${backupTaskCount}-task backup available. Auto-recovering from backup. This likely happened because git-tracked WAL/SHM files were overwritten during a branch switch (T5188).`
     );
@@ -13434,7 +13434,7 @@ async function autoRecoverFromBackup(nativeDb, dbPath, cwd) {
     const tempPath = dbPath + ".recovery-tmp";
     copyFileSync4(newestBackup.path, tempPath);
     renameSync(tempPath, dbPath);
-    log11.info(
+    log12.info(
       { dbPath, backupPath: newestBackup.path, restoredTasks: backupTaskCount },
       "Database auto-recovered from backup successfully."
     );
@@ -13444,7 +13444,7 @@ async function autoRecoverFromBackup(nativeDb, dbPath, cwd) {
     runMigrations(restoredNativeDb, restoredDb);
     _db = restoredDb;
   } catch (err) {
-    log11.error({ err, dbPath }, "Auto-recovery from backup failed. Continuing with empty database.");
+    log12.error({ err, dbPath }, "Auto-recovery from backup failed. Continuing with empty database.");
   }
 }
 async function getDb(cwd) {
@@ -13478,7 +13478,7 @@ async function getDb(cwd) {
         const { execFileSync: execFileSync19 } = await import("node:child_process");
         const gitCwd = resolve3(dbPath, "..", "..");
         const filesToCheck = [dbPath, dbPath + "-wal", dbPath + "-shm"];
-        const log11 = getLogger("sqlite");
+        const log12 = getLogger("sqlite");
         for (const fileToCheck of filesToCheck) {
           try {
             execFileSync19("git", ["ls-files", "--error-unmatch", fileToCheck], {
@@ -13487,7 +13487,7 @@ async function getDb(cwd) {
             });
             const basename19 = fileToCheck.split(/[\\/]/).pop();
             const relPath = fileToCheck.replace(gitCwd + sep, "");
-            log11.warn(
+            log12.warn(
               { path: fileToCheck },
               `${basename19} is tracked by project git \u2014 this risks data loss on branch switch. Resolution (ADR-013 \xA79): \`git rm --cached ${relPath}\` and rely on \`.cleo/backups/sqlite/\` snapshots + \`cleo backup add\` for recovery.`
             );
@@ -15244,8 +15244,8 @@ async function cleanupMigrationArtifacts(backupPath) {
 }
 async function validateSqliteDatabase(dbPath) {
   try {
-    const { createRequire: createRequire13 } = await import("node:module");
-    const _req = createRequire13(import.meta.url);
+    const { createRequire: createRequire14 } = await import("node:module");
+    const _req = createRequire14(import.meta.url);
     const { DatabaseSync: DatabaseSync10 } = _req("node:sqlite");
     const db = new DatabaseSync10(dbPath, { readOnly: true });
     const integrityRow = db.prepare("PRAGMA integrity_check").get();
@@ -17270,7 +17270,7 @@ function collectAdrFiles(dir) {
 }
 async function syncAdrsToDb(projectRoot) {
   const adrsDir = join20(projectRoot, ".cleo", "adrs");
-  const result = { inserted: 0, updated: 0, skipped: 0, errors: [] };
+  const result = { inserted: 0, updated: 0, skipped: 0, errors: [], warnings: [] };
   if (!existsSync18(adrsDir)) {
     return result;
   }
@@ -17288,9 +17288,36 @@ async function syncAdrsToDb(projectRoot) {
       const fm = record2.frontmatter;
       const dbRelPath = `.cleo/adrs/${relPath}`;
       const content = readFileSync6(filePath, "utf-8");
-      const supersedesId = fm.Supersedes ? extractAdrIdFromRef(fm.Supersedes) : null;
-      const supersededById = fm["Superseded By"] ? extractAdrIdFromRef(fm["Superseded By"]) : null;
-      const amendsId = fm.Amends ? extractAdrIdFromRef(fm.Amends) : null;
+      let supersedesId = fm.Supersedes ? extractAdrIdFromRef(fm.Supersedes) : null;
+      let supersededById = fm["Superseded By"] ? extractAdrIdFromRef(fm["Superseded By"]) : null;
+      let amendsId = fm.Amends ? extractAdrIdFromRef(fm.Amends) : null;
+      if (supersedesId) {
+        const exists2 = await db.select({ id: architectureDecisions.id }).from(architectureDecisions).where(eq17(architectureDecisions.id, supersedesId)).all();
+        if (exists2.length === 0) {
+          result.warnings.push(
+            `${record2.id}: supersedes target ${supersedesId} not found in DB, setting to null`
+          );
+          supersedesId = null;
+        }
+      }
+      if (supersededById) {
+        const exists2 = await db.select({ id: architectureDecisions.id }).from(architectureDecisions).where(eq17(architectureDecisions.id, supersededById)).all();
+        if (exists2.length === 0) {
+          result.warnings.push(
+            `${record2.id}: supersededBy target ${supersededById} not found in DB, setting to null`
+          );
+          supersededById = null;
+        }
+      }
+      if (amendsId) {
+        const exists2 = await db.select({ id: architectureDecisions.id }).from(architectureDecisions).where(eq17(architectureDecisions.id, amendsId)).all();
+        if (exists2.length === 0) {
+          result.warnings.push(
+            `${record2.id}: amends target ${amendsId} not found in DB, setting to null`
+          );
+          amendsId = null;
+        }
+      }
       const rowBase = {
         id: record2.id,
         title: record2.title,
@@ -17320,6 +17347,13 @@ async function syncAdrsToDb(projectRoot) {
       await db.delete(adrTaskLinks).where(eq17(adrTaskLinks.adrId, record2.id));
       if (fm["Related Tasks"]) {
         for (const taskId of parseTaskIds2(fm["Related Tasks"])) {
+          const taskExists2 = await db.select({ id: tasks.id }).from(tasks).where(eq17(tasks.id, taskId)).all();
+          if (taskExists2.length === 0) {
+            result.warnings.push(
+              `${record2.id}: related task ${taskId} not found in DB, skipping link`
+            );
+            continue;
+          }
           await db.insert(adrTaskLinks).values({ adrId: record2.id, taskId, linkType: "related" });
         }
       }
@@ -20687,8 +20721,7 @@ function taskListItemNext(taskId) {
 }
 function sessionListItemNext(sessionId) {
   return {
-    show: `cleo session show ${sessionId}`,
-    serialize: `cleo session serialize ${sessionId}`
+    show: `cleo session show ${sessionId}`
   };
 }
 function sessionStartNext() {
@@ -20942,8 +20975,8 @@ function checkFts5Available(nativeDb) {
   }
   return _fts5Available;
 }
-function execDDL(nativeDb, sql12) {
-  nativeDb.prepare(sql12).run();
+function execDDL(nativeDb, sql13) {
+  nativeDb.prepare(sql13).run();
 }
 function ensureFts5Tables(nativeDb) {
   if (!checkFts5Available(nativeDb)) {
@@ -22058,8 +22091,8 @@ __export(memory_bridge_exports, {
 });
 import { existsSync as existsSync30, mkdirSync as mkdirSync8, readFileSync as readFileSync17, writeFileSync as writeFileSync3 } from "node:fs";
 import { join as join33 } from "node:path";
-function typedAll2(db, sql12, ...params) {
-  return db.prepare(sql12).all(...params);
+function typedAll2(db, sql13, ...params) {
+  return db.prepare(sql13).all(...params);
 }
 async function generateMemoryBridgeContent(projectRoot, config2) {
   const cfg = { ...DEFAULT_CONFIG, ...config2 };
@@ -38789,9 +38822,9 @@ async function readProjectMeta(projectPath) {
 }
 async function readProjectId(projectPath) {
   try {
-    const { readFileSync: readFileSync102, existsSync: existsSync131 } = await import("node:fs");
+    const { readFileSync: readFileSync102, existsSync: existsSync133 } = await import("node:fs");
     const infoPath = join64(projectPath, ".cleo", "project-info.json");
-    if (!existsSync131(infoPath)) return "";
+    if (!existsSync133(infoPath)) return "";
     const data = JSON.parse(readFileSync102(infoPath, "utf-8"));
     return typeof data.projectId === "string" ? data.projectId : "";
   } catch {
@@ -40033,7 +40066,7 @@ var init_sharing = __esm({
 
 // packages/core/src/reconciliation/link-store.ts
 import { randomUUID as randomUUID5 } from "node:crypto";
-import { and as and8, eq as eq11 } from "drizzle-orm";
+import { and as and8, eq as eq11, sql as sql11 } from "drizzle-orm";
 async function getLinksByProvider(providerId, cwd) {
   const db = await getDb(cwd);
   const rows = await db.select().from(externalTaskLinks).where(eq11(externalTaskLinks.providerId, providerId));
@@ -40054,7 +40087,46 @@ async function getLinksByTaskId(taskId, cwd) {
   const rows = await db.select().from(externalTaskLinks).where(eq11(externalTaskLinks.taskId, taskId));
   return rows.map(rowToLink);
 }
+async function ensureExternalTaskLinksTable(cwd) {
+  const db = await getDb(cwd);
+  try {
+    db.run(
+      sql11.raw(`
+        CREATE TABLE IF NOT EXISTS external_task_links (
+          id text PRIMARY KEY NOT NULL,
+          task_id text NOT NULL REFERENCES tasks(id) ON DELETE CASCADE,
+          provider_id text NOT NULL,
+          external_id text NOT NULL,
+          external_url text,
+          external_title text,
+          link_type text NOT NULL,
+          sync_direction text NOT NULL DEFAULT 'inbound',
+          metadata_json text DEFAULT '{}',
+          linked_at text NOT NULL DEFAULT (datetime('now')),
+          last_sync_at text
+        )
+      `)
+    );
+    db.run(
+      sql11.raw(
+        `CREATE UNIQUE INDEX IF NOT EXISTS uq_ext_links_task_provider_external ON external_task_links(task_id, provider_id, external_id)`
+      )
+    );
+    db.run(
+      sql11.raw(`CREATE INDEX IF NOT EXISTS idx_ext_links_task_id ON external_task_links(task_id)`)
+    );
+    db.run(
+      sql11.raw(
+        `CREATE INDEX IF NOT EXISTS idx_ext_links_provider_id ON external_task_links(provider_id)`
+      )
+    );
+  } catch (err) {
+    log6.warn({ err }, "Failed to ensure external_task_links table exists");
+    throw err;
+  }
+}
 async function createLink(params, cwd) {
+  await ensureExternalTaskLinksTable(cwd);
   const db = await getDb(cwd);
   const now2 = (/* @__PURE__ */ new Date()).toISOString();
   const id = randomUUID5();
@@ -40117,11 +40189,14 @@ function rowToLink(row) {
     lastSyncAt: row.lastSyncAt
   };
 }
+var log6;
 var init_link_store = __esm({
   "packages/core/src/reconciliation/link-store.ts"() {
     "use strict";
+    init_logger();
     init_sqlite2();
     init_tasks_schema();
+    log6 = getLogger("link-store");
   }
 });
 
@@ -40222,48 +40297,55 @@ async function executeTransferInternal(params) {
     return result;
   }
   let linksCreated = 0;
-  const targetAccessor = await getAccessor(targetProject.path);
-  const { tasks: targetTasks } = await targetAccessor.queryTasks({});
-  const targetTaskIds = new Set(targetTasks.map((t) => t.id));
-  for (const entry of entries) {
-    if (importResult.idRemap[entry.sourceId] && targetTaskIds.has(entry.targetId)) {
-      await createLink(
-        {
-          taskId: entry.targetId,
-          providerId: `nexus:${sourceProject.name}`,
-          externalId: entry.sourceId,
-          externalTitle: entry.title,
-          linkType: "transferred",
-          syncDirection: "inbound",
-          metadata: {
-            transferMode: mode,
-            transferScope: scope,
-            sourceProject: sourceProject.name,
-            transferredAt: (/* @__PURE__ */ new Date()).toISOString()
-          }
-        },
-        targetProject.path
-      );
-      linksCreated++;
-      await createLink(
-        {
-          taskId: entry.sourceId,
-          providerId: `nexus:${targetProject.name}`,
-          externalId: entry.targetId,
-          externalTitle: entry.title,
-          linkType: "transferred",
-          syncDirection: "outbound",
-          metadata: {
-            transferMode: mode,
-            transferScope: scope,
-            targetProject: targetProject.name,
-            transferredAt: (/* @__PURE__ */ new Date()).toISOString()
-          }
-        },
-        sourceProject.path
-      );
-      linksCreated++;
+  try {
+    const targetAccessor = await getAccessor(targetProject.path);
+    const { tasks: targetTasks } = await targetAccessor.queryTasks({});
+    const targetTaskIds = new Set(targetTasks.map((t) => t.id));
+    for (const entry of entries) {
+      if (importResult.idRemap[entry.sourceId] && targetTaskIds.has(entry.targetId)) {
+        await createLink(
+          {
+            taskId: entry.targetId,
+            providerId: `nexus:${sourceProject.name}`,
+            externalId: entry.sourceId,
+            externalTitle: entry.title,
+            linkType: "transferred",
+            syncDirection: "inbound",
+            metadata: {
+              transferMode: mode,
+              transferScope: scope,
+              sourceProject: sourceProject.name,
+              transferredAt: (/* @__PURE__ */ new Date()).toISOString()
+            }
+          },
+          targetProject.path
+        );
+        linksCreated++;
+        await createLink(
+          {
+            taskId: entry.sourceId,
+            providerId: `nexus:${targetProject.name}`,
+            externalId: entry.targetId,
+            externalTitle: entry.title,
+            linkType: "transferred",
+            syncDirection: "outbound",
+            metadata: {
+              transferMode: mode,
+              transferScope: scope,
+              targetProject: targetProject.name,
+              transferredAt: (/* @__PURE__ */ new Date()).toISOString()
+            }
+          },
+          sourceProject.path
+        );
+        linksCreated++;
+      }
     }
+  } catch (err) {
+    log7.warn(
+      { err, linksCreated },
+      "Failed to create external_task_links during transfer \u2014 tasks were transferred successfully but provenance links could not be written"
+    );
   }
   result.linksCreated = linksCreated;
   try {
@@ -40288,7 +40370,7 @@ async function executeTransferInternal(params) {
       })
     });
   } catch (err) {
-    log6.warn({ err }, "nexus transfer audit write failed");
+    log7.warn({ err }, "nexus transfer audit write failed");
   }
   if (mode === "move") {
     let archived = 0;
@@ -40301,7 +40383,7 @@ async function executeTransferInternal(params) {
           });
           archived++;
         } catch (err) {
-          log6.warn({ err, taskId: entry.sourceId }, "failed to archive source task after transfer");
+          log7.warn({ err, taskId: entry.sourceId }, "failed to archive source task after transfer");
         }
       }
     }
@@ -40339,14 +40421,14 @@ async function executeTransferInternal(params) {
         }
       }
     } catch (err) {
-      log6.warn({ err }, "brain observation transfer failed");
+      log7.warn({ err }, "brain observation transfer failed");
     }
     result.brainObservationsTransferred = brainTransferred;
     result.manifest.brainObservationsTransferred = brainTransferred;
   }
   return result;
 }
-var log6;
+var log7;
 var init_transfer = __esm({
   "packages/core/src/nexus/transfer.ts"() {
     "use strict";
@@ -40359,7 +40441,7 @@ var init_transfer = __esm({
     init_export2();
     init_permissions();
     init_registry3();
-    log6 = getLogger("nexus:transfer");
+    log7 = getLogger("nexus:transfer");
   }
 });
 
@@ -41259,8 +41341,8 @@ async function loadProjectACL(projectPath) {
 async function logAclFailure(projectPath) {
   try {
     const { getLogger: getLogger2 } = await Promise.resolve().then(() => (init_logger(), logger_exports));
-    const log11 = getLogger2("nexus.acl");
-    log11.warn({ projectPath }, "Failed to load ACL configuration, defaulting to deny-all");
+    const log12 = getLogger2("nexus.acl");
+    log12.warn({ projectPath }, "Failed to load ACL configuration, defaulting to deny-all");
   } catch {
   }
 }
@@ -41405,9 +41487,9 @@ async function executeOperation(operation, taskId, projectPath, accessor, direct
 async function logRouteAudit(directive, projectName, taskId, operation, success2, error48) {
   try {
     const { getLogger: getLogger2 } = await Promise.resolve().then(() => (init_logger(), logger_exports));
-    const log11 = getLogger2("nexus.route");
+    const log12 = getLogger2("nexus.route");
     const level = success2 ? "info" : "warn";
-    log11[level](
+    log12[level](
       {
         directive: directive.verb,
         agentId: directive.agentId,
@@ -47726,8 +47808,11 @@ function sanitizeParams(params, projectRoot, context) {
       continue;
     }
     if (typeof value === "string" && (key === "path" || key === "file") && projectRoot) {
-      sanitized[key] = sanitizePath(value, projectRoot);
-      continue;
+      const allowExternalPath = context?.domain === "nexus" && (context?.operation === "register" || context?.operation === "reconcile");
+      if (!allowExternalPath) {
+        sanitized[key] = sanitizePath(value, projectRoot);
+        continue;
+      }
     }
     if (typeof value === "string" && (key === "title" || key === "description" || key === "content")) {
       const maxLen = key === "title" ? 200 : DEFAULT_MAX_CONTENT_LENGTH;
@@ -50259,8 +50344,8 @@ async function initializeSpawnAdapters(manifests) {
     if (!manifest.capabilities?.supportsSpawn) continue;
     if (spawnRegistry.hasAdapterForProvider(manifest.provider)) continue;
     try {
-      const { join: join131 } = await import("node:path");
-      const modulePath = join131(manifest.packagePath, manifest.entryPoint);
+      const { join: join132 } = await import("node:path");
+      const modulePath = join132(manifest.packagePath, manifest.entryPoint);
       const adapterModule = await import(modulePath);
       let SpawnProviderClass;
       for (const [exportName, exportValue] of Object.entries(adapterModule)) {
@@ -50415,7 +50500,7 @@ async function queryTasks(cwd, since) {
     }).from(tasks2).where(conditions.length > 0 ? and13(...conditions) : void 0).all();
     return rows;
   } catch (err) {
-    log7.warn({ err }, "Failed to query tasks for workflow telemetry");
+    log8.warn({ err }, "Failed to query tasks for workflow telemetry");
     return [];
   }
 }
@@ -50449,7 +50534,7 @@ async function queryCompletionAuditRows(cwd, since) {
       return isComplete;
     });
   } catch (err) {
-    log7.warn({ err }, "Failed to query audit log for workflow telemetry");
+    log8.warn({ err }, "Failed to query audit log for workflow telemetry");
     return [];
   }
 }
@@ -50674,12 +50759,12 @@ async function getWorkflowComplianceReport(opts) {
     }
   };
 }
-var log7;
+var log8;
 var init_workflow_telemetry = __esm({
   "packages/core/src/stats/workflow-telemetry.ts"() {
     "use strict";
     init_logger();
-    log7 = getLogger("workflow-telemetry");
+    log8 = getLogger("workflow-telemetry");
   }
 });
 
@@ -51265,13 +51350,22 @@ function rowToStickyNote3(row) {
 }
 async function listStickies(params, projectRoot) {
   const accessor = await getBrainAccessor(projectRoot);
+  const hasTagFilter = params.tags && params.tags.length > 0;
   const rows = await accessor.findStickyNotes({
     status: params.status,
     color: params.color,
     priority: params.priority,
-    limit: params.limit
+    limit: hasTagFilter ? void 0 : params.limit
   });
-  return rows.map(rowToStickyNote3);
+  let notes = rows.map(rowToStickyNote3);
+  if (hasTagFilter) {
+    const requiredTags = params.tags;
+    notes = notes.filter((note) => requiredTags.every((t) => note.tags.includes(t)));
+    if (params.limit && notes.length > params.limit) {
+      notes = notes.slice(0, params.limit);
+    }
+  }
+  return notes;
 }
 var init_list2 = __esm({
   "packages/core/src/sticky/list.ts"() {
@@ -51984,7 +52078,7 @@ import { createGzip } from "node:zlib";
 async function pruneAuditLog(cleoDir, config2) {
   try {
     if (!config2.auditRetentionDays || config2.auditRetentionDays <= 0) {
-      log8.debug("auditRetentionDays is 0 or unset; skipping audit prune");
+      log9.debug("auditRetentionDays is 0 or unset; skipping audit prune");
       return { rowsArchived: 0, rowsDeleted: 0 };
     }
     const cutoff = new Date(Date.now() - config2.auditRetentionDays * 864e5).toISOString();
@@ -51995,7 +52089,7 @@ async function pruneAuditLog(cleoDir, config2) {
     const db = await getDb4(projectRoot);
     const oldRows = await db.select().from(auditLog2).where(lt4(auditLog2.timestamp, cutoff));
     if (oldRows.length === 0) {
-      log8.debug("No audit_log rows older than cutoff; nothing to prune");
+      log9.debug("No audit_log rows older than cutoff; nothing to prune");
       return { rowsArchived: 0, rowsDeleted: 0 };
     }
     let archivePath;
@@ -52013,17 +52107,17 @@ async function pruneAuditLog(cleoDir, config2) {
         const inStream = Readable.from([jsonlContent]);
         await pipeline(inStream, gzip, outStream);
         rowsArchived = oldRows.length;
-        log8.info(
+        log9.info(
           { archivePath, rowsArchived },
           `Archived ${rowsArchived} audit rows to ${archivePath}`
         );
       } catch (archiveErr) {
-        log8.warn({ err: archiveErr }, "Failed to archive audit rows; continuing with deletion");
+        log9.warn({ err: archiveErr }, "Failed to archive audit rows; continuing with deletion");
         archivePath = void 0;
       }
     }
     await db.delete(auditLog2).where(lt4(auditLog2.timestamp, cutoff)).run();
-    log8.info(
+    log9.info(
       { rowsDeleted: oldRows.length, cutoff },
       `Pruned ${oldRows.length} audit_log rows older than ${cutoff}`
     );
@@ -52033,16 +52127,16 @@ async function pruneAuditLog(cleoDir, config2) {
       archivePath
     };
   } catch (err) {
-    log8.warn({ err }, "audit log pruning failed");
+    log9.warn({ err }, "audit log pruning failed");
     return { rowsArchived: 0, rowsDeleted: 0 };
   }
 }
-var log8;
+var log9;
 var init_audit_prune = __esm({
   "packages/core/src/audit-prune.ts"() {
     "use strict";
     init_logger();
-    log8 = getLogger("prune");
+    log9 = getLogger("prune");
   }
 });
 
@@ -73615,8 +73709,8 @@ import { platform as platform4 } from "node:os";
 import { basename as basename17, dirname as dirname21, join as join105 } from "node:path";
 async function resolveSeedAgentsDir() {
   try {
-    const { createRequire: createRequire13 } = await import("node:module");
-    const req = createRequire13(import.meta.url);
+    const { createRequire: createRequire14 } = await import("node:module");
+    const req = createRequire14(import.meta.url);
     const agentsPkgMain = req.resolve("@cleocode/agents/package.json");
     const agentsPkgRoot = dirname21(agentsPkgMain);
     const candidate = join105(agentsPkgRoot, "seed-agents");
@@ -73643,8 +73737,8 @@ async function resolveSeedAgentsDir() {
 async function initAgentDefinition(created, warnings) {
   let agentSourceDir = null;
   try {
-    const { createRequire: createRequire13 } = await import("node:module");
-    const req = createRequire13(import.meta.url);
+    const { createRequire: createRequire14 } = await import("node:module");
+    const req = createRequire14(import.meta.url);
     const agentsPkgMain = req.resolve("@cleocode/agents/package.json");
     const agentsPkgRoot = dirname21(agentsPkgMain);
     const candidate = join105(agentsPkgRoot, "cleo-subagent");
@@ -73702,7 +73796,7 @@ async function initMcpServer(_projectRoot, _created, _warnings) {
 }
 async function initCoreSkills(created, warnings) {
   try {
-    const { getInstalledProviders: getInstalledProviders4, installSkill: installSkill3, registerSkillLibraryFromPath } = await import("@cleocode/caamp");
+    const { getInstalledProviders: getInstalledProviders4, installSkill: installSkill3, registerSkillLibraryFromPath: registerSkillLibraryFromPath2 } = await import("@cleocode/caamp");
     const providers = getInstalledProviders4();
     if (providers.length === 0) {
       return;
@@ -73710,8 +73804,8 @@ async function initCoreSkills(created, warnings) {
     const packageRoot = getPackageRoot();
     let ctSkillsRoot = null;
     try {
-      const { createRequire: createRequire13 } = await import("node:module");
-      const req = createRequire13(import.meta.url);
+      const { createRequire: createRequire14 } = await import("node:module");
+      const req = createRequire14(import.meta.url);
       const skillsPkgMain = req.resolve("@cleocode/skills/package.json");
       const skillsPkgRoot = dirname21(skillsPkgMain);
       if (existsSync106(join105(skillsPkgRoot, "skills.json"))) {
@@ -73738,13 +73832,13 @@ async function initCoreSkills(created, warnings) {
       return;
     }
     try {
-      registerSkillLibraryFromPath(ctSkillsRoot);
+      registerSkillLibraryFromPath2(ctSkillsRoot);
     } catch {
       warnings.push("Failed to register skill library with CAAMP");
     }
     const catalogPath = join105(ctSkillsRoot, "skills.json");
-    const catalog4 = JSON.parse(readFileSync74(catalogPath, "utf-8"));
-    const skills = catalog4.skills ?? [];
+    const catalog5 = JSON.parse(readFileSync74(catalogPath, "utf-8"));
+    const skills = catalog5.skills ?? [];
     const coreSkills = skills.filter((s3) => s3.tier <= 2);
     const installed = [];
     for (const skill of coreSkills) {
@@ -74090,8 +74184,8 @@ async function initProject(opts = {}) {
     if (!hasCantFiles) {
       let starterBundleSrc = null;
       try {
-        const { createRequire: createRequire13 } = await import("node:module");
-        const req = createRequire13(import.meta.url);
+        const { createRequire: createRequire14 } = await import("node:module");
+        const req = createRequire14(import.meta.url);
         const cleoOsPkgMain = req.resolve("@cleocode/cleo-os/package.json");
         const cleoOsPkgRoot = dirname21(cleoOsPkgMain);
         const candidate = join105(cleoOsPkgRoot, "starter-bundle");
@@ -74464,8 +74558,8 @@ async function bootstrapGlobalCleo(options) {
 }
 async function writeTemplateTo(content, destPath, isDryRun) {
   if (isDryRun) return false;
-  const { dirname: dirname29 } = await import("node:path");
-  await mkdir17(dirname29(destPath), { recursive: true });
+  const { dirname: dirname30 } = await import("node:path");
+  await mkdir17(dirname30(destPath), { recursive: true });
   await writeFile12(destPath, content);
   return true;
 }
@@ -75180,7 +75274,6 @@ var init_cleo = __esm({
 // packages/core/src/index.ts
 var init_src2 = __esm({
   "packages/core/src/index.ts"() {
-    "use strict";
     init_src();
     init_adapters();
     init_admin();
@@ -77763,8 +77856,8 @@ var init_brain_maintenance = __esm({
 // packages/core/src/memory/claude-mem-migration.ts
 import { existsSync as existsSync110 } from "node:fs";
 import { createRequire as createRequire8 } from "node:module";
-function typedAll3(db, sql12) {
-  return db.prepare(sql12).all();
+function typedAll3(db, sql13) {
+  return db.prepare(sql13).all();
 }
 function mapObservationType(type) {
   if (VALID_OBSERVATION_TYPES.has(type)) {
@@ -83906,7 +83999,7 @@ var init_backup_pack = __esm({
 import fs5 from "node:fs";
 import path4 from "node:path";
 function detectAndRemoveLegacyGlobalFiles(cleoHomeOverride) {
-  const log11 = getLogger("cleanup-legacy");
+  const log12 = getLogger("cleanup-legacy");
   const cleoHome = cleoHomeOverride ?? getCleoHome();
   const removed = [];
   const errors = [];
@@ -83916,30 +84009,30 @@ function detectAndRemoveLegacyGlobalFiles(cleoHomeOverride) {
       if (fs5.existsSync(fullPath)) {
         fs5.unlinkSync(fullPath);
         removed.push(fileName);
-        log11.info({ file: fullPath }, "Removed legacy global file");
+        log12.info({ file: fullPath }, "Removed legacy global file");
       }
     } catch (err) {
       const message = err instanceof Error ? err.message : String(err);
       errors.push({ file: fileName, error: message });
-      log11.warn({ file: fullPath, error: message }, "Failed to remove legacy global file");
+      log12.warn({ file: fullPath, error: message }, "Failed to remove legacy global file");
     }
   }
   return { removed, errors };
 }
 function detectAndRemoveStrayProjectNexus(projectRoot) {
-  const log11 = getLogger("cleanup-legacy");
+  const log12 = getLogger("cleanup-legacy");
   const strayPath = path4.join(projectRoot, ".cleo", "nexus.db");
   if (fs5.existsSync(strayPath)) {
     try {
       fs5.unlinkSync(strayPath);
-      log11.warn(
+      log12.warn(
         { path: strayPath },
         "Removed stray project-tier nexus.db (violates ADR-036 global-only contract)"
       );
       return { removed: true, path: strayPath };
     } catch (err) {
       const message = err instanceof Error ? err.message : String(err);
-      log11.warn(
+      log12.warn(
         { path: strayPath, error: message },
         "Failed to remove stray project-tier nexus.db \u2014 manual deletion may be required"
       );
@@ -84010,7 +84103,7 @@ function brokenTimestamp() {
   return `${now2.getFullYear()}${pad2(now2.getMonth() + 1)}${pad2(now2.getDate())}-${pad2(now2.getHours())}${pad2(now2.getMinutes())}${pad2(now2.getSeconds())}-${pad3(now2.getMilliseconds())}`;
 }
 function migrateSignaldockToConduit(projectRoot) {
-  const log11 = getLogger("migrate-signaldock-to-conduit");
+  const log12 = getLogger("migrate-signaldock-to-conduit");
   const legacyPath = join113(projectRoot, ".cleo", "signaldock.db");
   const conduitPath = join113(projectRoot, ".cleo", "conduit.db");
   const globalSignaldockPath = join113(getCleoHome(), "signaldock.db");
@@ -84027,13 +84120,13 @@ function migrateSignaldockToConduit(projectRoot) {
   if (!needsSignaldockToConduitMigration(projectRoot)) {
     return result;
   }
-  log11.info({ projectRoot, legacyPath }, "T310 migration: starting signaldock.db \u2192 conduit.db");
+  log12.info({ projectRoot, legacyPath }, "T310 migration: starting signaldock.db \u2192 conduit.db");
   let legacy = null;
   try {
     legacy = new DatabaseSync7(legacyPath, { readOnly: true });
   } catch (err) {
     const message = err instanceof Error ? err.message : String(err);
-    log11.error({ legacyPath, error: message }, "T310 migration: cannot open legacy signaldock.db");
+    log12.error({ legacyPath, error: message }, "T310 migration: cannot open legacy signaldock.db");
     result.errors.push({ step: "step-2-open-legacy", error: message });
     result.status = "failed";
     return result;
@@ -84041,7 +84134,7 @@ function migrateSignaldockToConduit(projectRoot) {
   try {
     if (!integrityCheckPasses(legacy)) {
       const msg = "Legacy signaldock.db failed PRAGMA integrity_check. Migration aborted \u2014 no changes written. Recovery: inspect the database with sqlite3 and attempt manual repair before re-running.";
-      log11.error({ legacyPath }, msg);
+      log12.error({ legacyPath }, msg);
       result.errors.push({ step: "step-3-legacy-integrity", error: msg });
       result.status = "failed";
       legacy.close();
@@ -84049,7 +84142,7 @@ function migrateSignaldockToConduit(projectRoot) {
     }
   } catch (err) {
     const message = err instanceof Error ? err.message : String(err);
-    log11.error({ legacyPath, error: message }, "T310 migration: integrity_check threw on legacy DB");
+    log12.error({ legacyPath, error: message }, "T310 migration: integrity_check threw on legacy DB");
     result.errors.push({ step: "step-3-legacy-integrity", error: message });
     result.status = "failed";
     legacy.close();
@@ -84067,7 +84160,7 @@ function migrateSignaldockToConduit(projectRoot) {
     getGlobalSalt();
   } catch (err) {
     const message = err instanceof Error ? err.message : String(err);
-    log11.error({ error: message }, "T310 migration: getGlobalSalt failed \u2014 migration aborted");
+    log12.error({ error: message }, "T310 migration: getGlobalSalt failed \u2014 migration aborted");
     result.errors.push({ step: "step-6-global-salt", error: message });
     result.status = "failed";
     legacy.close();
@@ -84081,7 +84174,7 @@ function migrateSignaldockToConduit(projectRoot) {
     conduit.exec("PRAGMA foreign_keys = OFF");
   } catch (err) {
     const message = err instanceof Error ? err.message : String(err);
-    log11.error({ conduitPath, error: message }, "T310 migration: failed to create conduit.db");
+    log12.error({ conduitPath, error: message }, "T310 migration: failed to create conduit.db");
     result.errors.push({ step: "step-7-create-conduit", error: message });
     result.status = "failed";
     legacy.close();
@@ -84127,7 +84220,7 @@ function migrateSignaldockToConduit(projectRoot) {
     result.agentsCopied = agentsCountForConduit;
   } catch (err) {
     const message = err instanceof Error ? err.message : String(err);
-    log11.error({ error: message }, "T310 migration: conduit.db write failed \u2014 rolling back");
+    log12.error({ error: message }, "T310 migration: conduit.db write failed \u2014 rolling back");
     result.errors.push({ step: "step-8-conduit-write", error: message });
     result.status = "failed";
     try {
@@ -84148,7 +84241,7 @@ function migrateSignaldockToConduit(projectRoot) {
   try {
     if (!integrityCheckPasses(conduit)) {
       const msg = "conduit.db failed PRAGMA integrity_check after write";
-      log11.error({ conduitPath }, msg);
+      log12.error({ conduitPath }, msg);
       result.errors.push({ step: "step-10-conduit-integrity", error: msg });
       result.status = "failed";
       conduit.close();
@@ -84163,7 +84256,7 @@ function migrateSignaldockToConduit(projectRoot) {
     }
   } catch (err) {
     const message = err instanceof Error ? err.message : String(err);
-    log11.error({ error: message }, "T310 migration: conduit.db integrity_check threw");
+    log12.error({ error: message }, "T310 migration: conduit.db integrity_check threw");
     result.errors.push({ step: "step-10-conduit-integrity", error: message });
     result.status = "failed";
     if (conduit) {
@@ -84185,7 +84278,7 @@ function migrateSignaldockToConduit(projectRoot) {
     globalDb.exec("PRAGMA foreign_keys = OFF");
   } catch (err) {
     const message = err instanceof Error ? err.message : String(err);
-    log11.error(
+    log12.error(
       { globalSignaldockPath, error: message },
       "T310 migration: cannot open global signaldock.db"
     );
@@ -84224,7 +84317,7 @@ function migrateSignaldockToConduit(projectRoot) {
     result.agentsCopied = agentsCopiedToGlobal;
   } catch (err) {
     const message = err instanceof Error ? err.message : String(err);
-    log11.error(
+    log12.error(
       { error: message },
       "T310 migration: global signaldock.db write failed \u2014 rolling back"
     );
@@ -84242,7 +84335,7 @@ function migrateSignaldockToConduit(projectRoot) {
   try {
     if (!integrityCheckPasses(globalDb)) {
       const msg = "Global signaldock.db failed PRAGMA integrity_check after write";
-      log11.error({ globalSignaldockPath }, msg);
+      log12.error({ globalSignaldockPath }, msg);
       result.errors.push({ step: "step-14-global-integrity", error: msg });
       result.status = "failed";
       globalDb.close();
@@ -84257,7 +84350,7 @@ function migrateSignaldockToConduit(projectRoot) {
     }
   } catch (err) {
     const message = err instanceof Error ? err.message : String(err);
-    log11.error({ error: message }, "T310 migration: global signaldock.db integrity_check threw");
+    log12.error({ error: message }, "T310 migration: global signaldock.db integrity_check threw");
     result.errors.push({ step: "step-14-global-integrity", error: message });
     result.status = "failed";
     if (globalDb) {
@@ -84276,21 +84369,21 @@ function migrateSignaldockToConduit(projectRoot) {
     result.bakPath = bakPath;
   } catch (err) {
     const message = err instanceof Error ? err.message : String(err);
-    log11.error(
+    log12.error(
       { legacyPath, bakPath, error: message },
       "T310 migration: rename to .pre-t310.bak failed \u2014 legacy file left in place (harmless)"
     );
     result.errors.push({ step: "step-16-rename-bak", error: message });
   }
-  log11.info(
+  log12.info(
     { projectRoot, agentsCopied: result.agentsCopied, conduitPath, bakPath: result.bakPath },
     `T310 migration complete: ${result.agentsCopied} agents migrated to global, conduit.db created`
   );
-  log11.warn(
+  log12.warn(
     {},
     "T310 migration: API keys have been re-keyed. External systems holding old API keys (CI env vars, remote agent configs) must be updated."
   );
-  log11.info(
+  log12.info(
     { legacyPath, bakPath: result.bakPath, conduitPath },
     "T310 migration recovery: if problems occur, rename .pre-t310.bak to signaldock.db and delete conduit.db to re-run migration."
   );
@@ -84524,7 +84617,7 @@ async function validateAndRepairSequence(cwd, config2 = {}) {
     }
     const repair = await repairSequence(cwd);
     if (repair.repaired) {
-      log9.warn(
+      log10.warn(
         { oldCounter: repair.oldCounter, newCounter: repair.newCounter },
         "Sequence repaired"
       );
@@ -84553,7 +84646,7 @@ async function triggerCheckpoint(context, cwd, config2 = {}) {
   try {
     await gitCheckpoint("auto", context, cwd);
   } catch (err) {
-    log9.warn({ err }, "Checkpoint failed (non-fatal)");
+    log10.warn({ err }, "Checkpoint failed (non-fatal)");
   }
   vacuumIntoBackup({ cwd }).catch(() => {
   });
@@ -84591,16 +84684,16 @@ async function safeDeleteTask(deleteFn, taskId, cwd, config2 = {}) {
   return result;
 }
 async function forceCheckpointBeforeOperation(operation, cwd) {
-  log9.info({ operation }, "Forcing checkpoint before operation");
+  log10.info({ operation }, "Forcing checkpoint before operation");
   try {
     await gitCheckpoint("manual", `pre-${operation}`, cwd);
   } catch (err) {
-    log9.error({ err }, "Failed to create pre-operation checkpoint");
+    log10.error({ err }, "Failed to create pre-operation checkpoint");
   }
   vacuumIntoBackup({ cwd, force: true }).catch(() => {
   });
 }
-var log9, DEFAULT_CONFIG2, SafetyError;
+var log10, DEFAULT_CONFIG2, SafetyError;
 var init_data_safety = __esm({
   "packages/core/src/store/data-safety.ts"() {
     "use strict";
@@ -84610,7 +84703,7 @@ var init_data_safety = __esm({
     init_sqlite2();
     init_sqlite_backup();
     init_tasks_schema();
-    log9 = getLogger("data-safety");
+    log10 = getLogger("data-safety");
     DEFAULT_CONFIG2 = {
       verifyWrites: true,
       detectCollisions: true,
@@ -84653,7 +84746,7 @@ __export(task_store_exports, {
   updateTask: () => updateTask2,
   updateTaskSafe: () => updateTaskSafe
 });
-import { and as and12, asc as asc4, count as count3, eq as eq16, inArray as inArray6, isNull as isNull5, ne as ne4, sql as sql11 } from "drizzle-orm";
+import { and as and12, asc as asc4, count as count3, eq as eq16, inArray as inArray6, isNull as isNull5, ne as ne4, sql as sql12 } from "drizzle-orm";
 async function insertTaskRow(task, cwd) {
   const db = await getDb(cwd);
   const row = taskToRow(task);
@@ -84756,7 +84849,7 @@ async function findTasks2(query, limit = 20, cwd) {
   const rows = await db.select().from(tasks).where(
     and12(
       ne4(tasks.status, "archived"),
-      sql11`(${tasks.id} LIKE ${pattern} OR ${tasks.title} LIKE ${pattern} OR ${tasks.description} LIKE ${pattern})`
+      sql12`(${tasks.id} LIKE ${pattern} OR ${tasks.title} LIKE ${pattern} OR ${tasks.description} LIKE ${pattern})`
     )
   ).limit(limit).all();
   return rows.map(rowToTask);
@@ -85771,11 +85864,11 @@ async function coreTaskHistory(projectRoot, taskId, limit) {
   try {
     const { getDb: getDb4 } = await Promise.resolve().then(() => (init_sqlite2(), sqlite_exports));
     const { auditLog: auditLog2 } = await Promise.resolve().then(() => (init_tasks_schema(), tasks_schema_exports));
-    const { sql: sql12 } = await import("drizzle-orm");
+    const { sql: sql13 } = await import("drizzle-orm");
     const db = await getDb4(projectRoot);
     const maxRows = limit && limit > 0 ? limit : 100;
     const rows = await db.all(
-      sql12`SELECT * FROM ${auditLog2}
+      sql13`SELECT * FROM ${auditLog2}
           WHERE ${auditLog2.taskId} = ${taskId}
           ORDER BY ${auditLog2.timestamp} DESC
           LIMIT ${maxRows}`
@@ -86698,10 +86791,10 @@ async function repairMissingSizes(cwd, dryRun) {
 async function repairMissingCompletedAt(cwd, dryRun) {
   const { getDb: getDb4 } = await Promise.resolve().then(() => (init_sqlite2(), sqlite_exports));
   const { tasks: tasks2 } = await Promise.resolve().then(() => (init_tasks_schema(), tasks_schema_exports));
-  const { sql: sql12 } = await import("drizzle-orm");
+  const { sql: sql13 } = await import("drizzle-orm");
   const db = await getDb4(cwd);
   const affected = await db.select({ id: tasks2.id }).from(tasks2).where(
-    sql12`(${tasks2.status} = 'done' OR ${tasks2.status} = 'cancelled') AND ${tasks2.completedAt} IS NULL`
+    sql13`(${tasks2.status} = 'done' OR ${tasks2.status} = 'cancelled') AND ${tasks2.completedAt} IS NULL`
   );
   if (affected.length === 0) {
     return {
@@ -86719,7 +86812,7 @@ async function repairMissingCompletedAt(cwd, dryRun) {
   }
   const now2 = (/* @__PURE__ */ new Date()).toISOString();
   await db.update(tasks2).set({ completedAt: now2 }).where(
-    sql12`(${tasks2.status} = 'done' OR ${tasks2.status} = 'cancelled') AND ${tasks2.completedAt} IS NULL`
+    sql13`(${tasks2.status} = 'done' OR ${tasks2.status} = 'cancelled') AND ${tasks2.completedAt} IS NULL`
   );
   return {
     action: "fix_completed_at",
@@ -86730,8 +86823,8 @@ async function repairMissingCompletedAt(cwd, dryRun) {
 async function repairMissingColumns(cwd, dryRun) {
   const { getDb: getDb4 } = await Promise.resolve().then(() => (init_sqlite2(), sqlite_exports));
   const db = await getDb4(cwd);
-  const { sql: sql12 } = await import("drizzle-orm");
-  const columns = db.all(sql12`PRAGMA table_info(tasks)`);
+  const { sql: sql13 } = await import("drizzle-orm");
+  const columns = db.all(sql13`PRAGMA table_info(tasks)`);
   const existingCols = new Set(columns.map((c) => c.name));
   const missingCols = ["pipeline_stage"].filter((c) => !existingCols.has(c));
   if (missingCols.length === 0) {
@@ -86749,7 +86842,7 @@ async function repairMissingColumns(cwd, dryRun) {
     };
   }
   for (const col of missingCols) {
-    db.run(sql12.raw(`ALTER TABLE tasks ADD COLUMN ${col} text`));
+    db.run(sql13.raw(`ALTER TABLE tasks ADD COLUMN ${col} text`));
   }
   return {
     action: "fix_missing_columns",
@@ -94290,11 +94383,11 @@ var require_core = __commonJS({
     Ajv4.ValidationError = validation_error_1.default;
     Ajv4.MissingRefError = ref_error_1.default;
     exports.default = Ajv4;
-    function checkOptions(checkOpts, options, msg, log11 = "error") {
+    function checkOptions(checkOpts, options, msg, log12 = "error") {
       for (const key in checkOpts) {
         const opt = key;
         if (opt in options)
-          this.logger[log11](`${msg}: option ${key}. ${checkOpts[opt]}`);
+          this.logger[log12](`${msg}: option ${key}. ${checkOpts[opt]}`);
       }
     }
     function getSchEnv(keyRef) {
@@ -104539,6 +104632,7 @@ var init_error = __esm({
       E_ID_COLLISION: 22,
       // Session Errors (30-39)
       E_SESSION_EXISTS: 30,
+      E_SESSION_CONFLICT: 30,
       E_SESSION_NOT_FOUND: 31,
       E_SCOPE_CONFLICT: 32,
       E_SCOPE_INVALID: 33,
@@ -105140,7 +105234,7 @@ async function taskWorkHistory2(projectRoot) {
 }
 async function sessionStart(projectRoot, params) {
   try {
-    let accessor = await getAccessor(projectRoot);
+    const accessor = await getAccessor(projectRoot);
     let scope;
     try {
       scope = parseScope2(params.scope);
@@ -105155,8 +105249,14 @@ async function sessionStart(projectRoot, params) {
     }
     const existingActive = await accessor.getActiveSession();
     if (existingActive) {
-      await sessionEnd(projectRoot);
-      accessor = await getAccessor(projectRoot);
+      return engineError(
+        "E_SESSION_CONFLICT",
+        `An active session already exists (${existingActive.id}). End it first with 'cleo session end'.`,
+        {
+          fix: "Run 'cleo session end' before starting a new session.",
+          details: { activeSessionId: existingActive.id }
+        }
+      );
     }
     const now2 = (/* @__PURE__ */ new Date()).toISOString();
     const sessionId = generateSessionId2();
@@ -105429,7 +105529,16 @@ async function sessionSuspend(projectRoot, sessionId, reason) {
 }
 async function sessionRecordDecision(projectRoot, params) {
   try {
-    const result = await recordDecision(projectRoot, params);
+    let resolvedSessionId = params.sessionId;
+    if (!resolvedSessionId) {
+      const accessor = await getAccessor(projectRoot);
+      const activeSession = await accessor.getActiveSession();
+      resolvedSessionId = activeSession?.id ?? "default";
+    }
+    const result = await recordDecision(projectRoot, {
+      ...params,
+      sessionId: resolvedSessionId
+    });
     return { success: true, data: result };
   } catch (err) {
     return cleoErrorToEngineError(err, "E_INVALID_INPUT", "Failed to record decision");
@@ -105931,8 +106040,7 @@ async function orchestrateParallelStart(epicId, wave, projectRoot) {
     const result = await startParallelExecution(epicId, wave, root, accessor);
     return { success: true, data: result };
   } catch (err) {
-    const code = err.code ?? "E_GENERAL";
-    return engineError(code, err.message);
+    return cleoErrorToEngineError(err, "E_GENERAL", "Failed to start parallel execution");
   }
 }
 async function orchestrateParallelEnd(epicId, wave, projectRoot) {
@@ -105955,8 +106063,7 @@ async function orchestrateParallelEnd(epicId, wave, projectRoot) {
     }
     return { success: true, data: result };
   } catch (err) {
-    const code = err.code ?? "E_GENERAL";
-    return engineError(code, err.message);
+    return cleoErrorToEngineError(err, "E_GENERAL", "Failed to end parallel execution");
   }
 }
 async function orchestrateHandoff(params, projectRoot) {
@@ -106879,6 +106986,18 @@ async function systemLabels(projectRoot) {
 async function systemArchiveStats(projectRoot, params) {
   try {
     const accessor = await getAccessor(projectRoot);
+    if (params?.report && params.report !== "summary") {
+      const result2 = await analyzeArchive(
+        {
+          report: params.report,
+          since: params.since,
+          until: params.until,
+          cwd: projectRoot
+        },
+        accessor
+      );
+      return { success: true, data: result2 };
+    }
     const result = await getArchiveStats({ period: params?.period, cwd: projectRoot }, accessor);
     return { success: true, data: result };
   } catch (err) {
@@ -106895,10 +107014,10 @@ async function systemLog(projectRoot, filters) {
 }
 async function queryAuditLogSqlite(projectRoot, filters) {
   try {
-    const { join: join131 } = await import("node:path");
-    const { existsSync: existsSync131 } = await import("node:fs");
-    const dbPath = join131(projectRoot, ".cleo", "tasks.db");
-    if (!existsSync131(dbPath)) {
+    const { join: join132 } = await import("node:path");
+    const { existsSync: existsSync133 } = await import("node:fs");
+    const dbPath = join132(projectRoot, ".cleo", "tasks.db");
+    if (!existsSync133(dbPath)) {
       const offset = filters?.offset ?? 0;
       const limit = filters?.limit ?? 20;
       return {
@@ -106908,27 +107027,27 @@ async function queryAuditLogSqlite(projectRoot, filters) {
     }
     const { getDb: getDb4 } = await Promise.resolve().then(() => (init_internal(), internal_exports));
     const { auditLog: auditLog2 } = await Promise.resolve().then(() => (init_internal(), internal_exports));
-    const { sql: sql12 } = await import("drizzle-orm");
+    const { sql: sql13 } = await import("drizzle-orm");
     const db = await getDb4(projectRoot);
     try {
       const conditions = [];
       if (filters?.operation) {
         conditions.push(
-          sql12`(${auditLog2.action} = ${filters.operation} OR ${auditLog2.operation} = ${filters.operation})`
+          sql13`(${auditLog2.action} = ${filters.operation} OR ${auditLog2.operation} = ${filters.operation})`
         );
       }
       if (filters?.taskId) {
-        conditions.push(sql12`${auditLog2.taskId} = ${filters.taskId}`);
+        conditions.push(sql13`${auditLog2.taskId} = ${filters.taskId}`);
       }
       if (filters?.since) {
-        conditions.push(sql12`${auditLog2.timestamp} >= ${filters.since}`);
+        conditions.push(sql13`${auditLog2.timestamp} >= ${filters.since}`);
       }
       if (filters?.until) {
-        conditions.push(sql12`${auditLog2.timestamp} <= ${filters.until}`);
+        conditions.push(sql13`${auditLog2.timestamp} <= ${filters.until}`);
       }
-      const whereClause = conditions.length > 0 ? sql12.join(conditions, sql12` AND `) : sql12`1=1`;
+      const whereClause = conditions.length > 0 ? sql13.join(conditions, sql13` AND `) : sql13`1=1`;
       const countResult = await db.all(
-        sql12`SELECT count(*) as cnt FROM ${auditLog2} WHERE ${whereClause}`
+        sql13`SELECT count(*) as cnt FROM ${auditLog2} WHERE ${whereClause}`
       );
       const total = countResult[0]?.cnt ?? 0;
       if (total === 0) {
@@ -106945,7 +107064,7 @@ async function queryAuditLogSqlite(projectRoot, filters) {
       const offset = filters?.offset ?? 0;
       const limit = filters?.limit ?? 20;
       const rows = await db.all(
-        sql12`SELECT * FROM ${auditLog2}
+        sql13`SELECT * FROM ${auditLog2}
             WHERE ${whereClause}
             ORDER BY ${auditLog2.timestamp} DESC
             LIMIT ${limit} OFFSET ${offset}`
@@ -108074,7 +108193,7 @@ async function taskTree(projectRoot, taskId) {
     const result = await coreTaskTree(projectRoot, taskId);
     return { success: true, data: result };
   } catch (err) {
-    return cleoErrorToEngineError(err, "E_NOT_INITIALIZED", "Task database not initialized");
+    return cleoErrorToEngineError(err, "E_NOT_FOUND", "Task not found");
   }
 }
 async function taskRelates(projectRoot, taskId) {
@@ -108154,7 +108273,7 @@ async function taskCancel(projectRoot, taskId, reason) {
     const result = await coreTaskCancel(projectRoot, taskId, { reason });
     return { success: true, data: result };
   } catch (err) {
-    return cleoErrorToEngineError(err, "E_INTERNAL", "Failed to cancel task");
+    return cleoErrorToEngineError(err, "E_NOT_FOUND", "Failed to cancel task");
   }
 }
 async function taskComplexityEstimate(projectRoot, params) {
@@ -108322,10 +108441,10 @@ var init_template_parser2 = __esm({
 });
 
 // packages/cleo/src/dispatch/engines/validate-engine.ts
-function validateSchemaOp(type, data, projectRoot) {
+async function validateSchemaOp(type, data, projectRoot) {
   try {
     const root = projectRoot || resolveProjectRoot();
-    const result = coreValidateSchema(type, data, root);
+    const result = await coreValidateSchema(type, data, root);
     return { success: true, data: result };
   } catch (err) {
     const message = err instanceof Error ? err.message : String(err);
@@ -109087,7 +109206,7 @@ var init_admin2 = __esm({
                         "admin",
                         operation,
                         "E_NOT_AVAILABLE",
-                        "Job manager not initialized",
+                        "Job manager not available. Background jobs require a running CLEO daemon or long-lived process. Start one with `cleo daemon start` or use `cleo admin health` to check system status.",
                         startTime
                       );
                     }
@@ -109130,7 +109249,7 @@ var init_admin2 = __esm({
                         "admin",
                         operation,
                         "E_NOT_AVAILABLE",
-                        "Job manager not initialized",
+                        "Job manager not available. Background jobs require a running CLEO daemon or long-lived process. Start one with `cleo daemon start` or use `cleo admin health` to check system status.",
                         startTime
                       );
                     }
@@ -109588,7 +109707,7 @@ var init_admin2 = __esm({
                   "admin",
                   operation,
                   "E_NOT_AVAILABLE",
-                  "Job manager not initialized",
+                  "Job manager not available. Background jobs require a running CLEO daemon or long-lived process. Start one with `cleo daemon start` or use `cleo admin health` to check system status.",
                   startTime
                 );
               }
@@ -109651,10 +109770,17 @@ var init_admin2 = __esm({
                 };
               }
               const result = await syncAdrsToDb(projectRoot);
+              const hasErrors2 = result.errors.length > 0;
               return {
                 meta: dispatchMeta("mutate", "admin", operation, startTime),
-                success: true,
-                data: result
+                success: !hasErrors2,
+                data: result,
+                ...hasErrors2 ? {
+                  error: {
+                    code: "E_ADR_SYNC",
+                    message: `${result.errors.length} ADR sync error(s) occurred`
+                  }
+                } : {}
               };
             }
             // Merged: import + snapshot.import + import.tasks → import via scope param (T5615)
@@ -109988,7 +110114,7 @@ var init_check = __esm({
                   startTime
                 );
               }
-              const result = validateSchemaOp(type, params?.data, projectRoot);
+              const result = await validateSchemaOp(type, params?.data, projectRoot);
               return wrapResult(result, "query", "check", operation, startTime);
             }
             case "task": {
@@ -110032,12 +110158,26 @@ var init_check = __esm({
             case "compliance.summary": {
               const detail = params?.detail;
               const limit = params?.limit;
+              const summaryType = params?.type ?? "summary";
               if (detail) {
                 const result2 = validateComplianceViolations(limit, projectRoot);
                 return wrapResult(result2, "query", "check", operation, startTime);
               }
               const result = validateComplianceSummary(projectRoot);
-              return wrapResult(result, "query", "check", operation, startTime);
+              if (!result.success || !result.data) {
+                return wrapResult(result, "query", "check", operation, startTime);
+              }
+              const enrichedResult = {
+                ...result,
+                data: {
+                  ...result.data,
+                  view: summaryType,
+                  ...params?.taskId ? { taskId: params.taskId } : {},
+                  ...params?.days ? { days: params.days } : {},
+                  ...params?.global ? { global: params.global } : {}
+                }
+              };
+              return wrapResult(enrichedResult, "query", "check", operation, startTime);
             }
             case "test": {
               const format = params?.format;
@@ -110222,7 +110362,10 @@ var init_check = __esm({
             }
             case "archive.stats": {
               const result = await systemArchiveStats(projectRoot, {
-                period: params?.period
+                period: params?.period,
+                report: params?.report,
+                since: params?.since,
+                until: params?.until
               });
               return wrapResult(result, "query", "check", operation, startTime);
             }
@@ -111267,7 +111410,7 @@ async function nexusUnregisterProject(name2) {
     await nexusUnregister(name2);
     return engineSuccess({ message: `Project unregistered: ${name2}` });
   } catch (error48) {
-    return engineError("E_INTERNAL", error48 instanceof Error ? error48.message : String(error48));
+    return cleoErrorToEngineError(error48, "E_INTERNAL", `Failed to unregister project: ${name2}`);
   }
 }
 async function nexusSyncProject(name2) {
@@ -111741,16 +111884,16 @@ var init_nexus2 = __esm({
 async function orchestrateClassify(request, context, projectRoot) {
   try {
     const { getCleoCantWorkflowsDir: getCleoCantWorkflowsDir2 } = await Promise.resolve().then(() => (init_internal(), internal_exports));
-    const { readFileSync: readFileSync102, readdirSync: readdirSync42, existsSync: existsSync131 } = await import("node:fs");
-    const { join: join131 } = await import("node:path");
+    const { readFileSync: readFileSync102, readdirSync: readdirSync42, existsSync: existsSync133 } = await import("node:fs");
+    const { join: join132 } = await import("node:path");
     const workflowsDir = getCleoCantWorkflowsDir2();
     const combined = `${request} ${context ?? ""}`.toLowerCase();
     const matches = [];
-    if (existsSync131(workflowsDir)) {
+    if (existsSync133(workflowsDir)) {
       const files = readdirSync42(workflowsDir).filter((f2) => f2.endsWith(".cant"));
       for (const file2 of files) {
         try {
-          const src = readFileSync102(join131(workflowsDir, file2), "utf-8");
+          const src = readFileSync102(join132(workflowsDir, file2), "utf-8");
           const teamMatch = /^team\s+(\S+):/m.exec(src);
           if (!teamMatch) continue;
           const teamName = teamMatch[1];
@@ -111765,12 +111908,12 @@ async function orchestrateClassify(request, context, projectRoot) {
         }
       }
     }
-    const localCantDir = join131(projectRoot, ".cleo", "workflows");
-    if (existsSync131(localCantDir)) {
+    const localCantDir = join132(projectRoot, ".cleo", "workflows");
+    if (existsSync133(localCantDir)) {
       const files = readdirSync42(localCantDir).filter((f2) => f2.endsWith(".cant"));
       for (const file2 of files) {
         try {
-          const src = readFileSync102(join131(localCantDir, file2), "utf-8");
+          const src = readFileSync102(join132(localCantDir, file2), "utf-8");
           const teamMatch = /^team\s+(\S+):/m.exec(src);
           if (!teamMatch) continue;
           const teamName = teamMatch[1];
@@ -113828,17 +113971,19 @@ var init_sticky2 = __esm({
         try {
           switch (operation) {
             case "list": {
+              const tags = params?.tags;
               const filters = {
                 status: params?.status,
                 color: params?.color,
-                priority: params?.priority
+                priority: params?.priority,
+                tags
               };
               const result = await stickyList(projectRoot, filters);
               if (!result.success) {
                 return wrapResult(result, "query", "sticky", operation, startTime);
               }
               const filteredStickies = result.data?.stickies ?? [];
-              const hasFilter = filters.status !== void 0 || filters.color !== void 0 || filters.priority !== void 0;
+              const hasFilter = filters.status !== void 0 || filters.color !== void 0 || filters.priority !== void 0 || tags !== void 0 && tags.length > 0;
               const totalResult = hasFilter ? await stickyList(projectRoot, {}) : result;
               if (!totalResult.success) {
                 return wrapResult(totalResult, "query", "sticky", operation, startTime);
@@ -114604,6 +114749,9 @@ async function toolsSkillFind(query) {
 }
 function toolsSkillDispatch(name2) {
   try {
+    if (!catalog3.isCatalogAvailable()) {
+      return engineError("E_CONFIG_ERROR", CATALOG_UNAVAILABLE_MSG, CATALOG_UNAVAILABLE_OPTS);
+    }
     const matrix = catalog3.getDispatchMatrix();
     const entry = {
       byTaskType: Object.entries(matrix.by_task_type).filter(([, skill]) => skill === name2).map(([k2]) => k2),
@@ -114617,6 +114765,9 @@ function toolsSkillDispatch(name2) {
 }
 async function toolsSkillVerify(name2) {
   try {
+    if (!catalog3.isCatalogAvailable()) {
+      return engineError("E_CONFIG_ERROR", CATALOG_UNAVAILABLE_MSG, CATALOG_UNAVAILABLE_OPTS);
+    }
     const installed = await discoverSkill2(`${getCanonicalSkillsDir4()}/${name2}`);
     const catalogEntry = catalog3.getSkill(name2);
     return engineSuccess({
@@ -114631,6 +114782,9 @@ async function toolsSkillVerify(name2) {
 }
 function toolsSkillDependencies(name2) {
   try {
+    if (!catalog3.isCatalogAvailable()) {
+      return engineError("E_CONFIG_ERROR", CATALOG_UNAVAILABLE_MSG, CATALOG_UNAVAILABLE_OPTS);
+    }
     const direct = catalog3.getSkillDependencies(name2);
     const tree = catalog3.resolveDependencyTree([name2]);
     return engineSuccess({ skill: name2, direct, tree });
@@ -115003,6 +115157,9 @@ async function toolsAdapterActivate(projectRoot, id) {
     if (!manager.getManifest(id)) {
       manager.discover();
     }
+    if (!manager.getManifest(id)) {
+      return engineError("E_NOT_FOUND", `Adapter not found: ${id}`);
+    }
     const adapter = await manager.activate(id);
     return engineSuccess({
       id,
@@ -115027,11 +115184,20 @@ async function toolsAdapterDispose(projectRoot, id) {
     return engineError("E_INTERNAL", error48 instanceof Error ? error48.message : String(error48));
   }
 }
+var CATALOG_UNAVAILABLE_MSG, CATALOG_UNAVAILABLE_OPTS;
 var init_tools_engine = __esm({
   "packages/cleo/src/dispatch/engines/tools-engine.ts"() {
     "use strict";
     init_internal();
     init_error();
+    CATALOG_UNAVAILABLE_MSG = "Skill catalog not available. The CAAMP skill library could not be loaded. Run `cleo init` to set up the skill library, or set CAAMP_SKILL_LIBRARY env var.";
+    CATALOG_UNAVAILABLE_OPTS = {
+      fix: "cleo init",
+      alternatives: [
+        { action: "Set env var", command: "export CAAMP_SKILL_LIBRARY=/path/to/skills" },
+        { action: "Use filesystem-based commands", command: "cleo skills list" }
+      ]
+    };
   }
 });
 
@@ -115887,7 +116053,7 @@ async function writeToSqlite(entry, requestId) {
     };
     const parsed = AuditLogInsertSchema2.safeParse(payload);
     if (!parsed.success) {
-      log10.warn(
+      log11.warn(
         { issues: parsed.error.issues },
         "Audit payload failed Zod validation; skipping insert"
       );
@@ -115896,7 +116062,7 @@ async function writeToSqlite(entry, requestId) {
     const db = await getDb4(process.cwd());
     await db.insert(auditLog2).values(parsed.data).run();
   } catch (err) {
-    log10.warn({ err }, "Failed to write audit entry to SQLite");
+    log11.warn({ err }, "Failed to write audit entry to SQLite");
   }
 }
 function createAudit() {
@@ -115927,7 +116093,7 @@ function createAudit() {
       },
       error: response.error?.message
     };
-    log10.info(
+    log11.info(
       {
         domain: entry.domain,
         operation: entry.operation,
@@ -115944,20 +116110,20 @@ function createAudit() {
       await writeToSqlite(entry, req.requestId);
     } else {
       writeToSqlite(entry, req.requestId).catch((err) => {
-        log10.error({ err }, "Failed to persist audit entry to SQLite");
+        log11.error({ err }, "Failed to persist audit entry to SQLite");
       });
     }
     return response;
   };
 }
-var log10, cachedProjectHash;
+var log11, cachedProjectHash;
 var init_audit3 = __esm({
   "packages/cleo/src/dispatch/middleware/audit.ts"() {
     "use strict";
     init_internal();
     init_config3();
     init_internal();
-    log10 = getLogger("audit");
+    log11 = getLogger("audit");
   }
 });
 
@@ -116108,6 +116274,38 @@ __export(cli_exports, {
   resetCliDispatcher: () => resetCliDispatcher
 });
 import { randomUUID as randomUUID13 } from "node:crypto";
+import { existsSync as existsSync128 } from "node:fs";
+import { createRequire as createRequire13 } from "node:module";
+import { dirname as dirname25, join as join124 } from "node:path";
+import { fileURLToPath as fileURLToPath5 } from "node:url";
+import { catalog as catalog4, registerSkillLibraryFromPath } from "@cleocode/caamp";
+function ensureCaampLibrary() {
+  if (catalog4.isCatalogAvailable()) return;
+  try {
+    let skillsRoot = null;
+    try {
+      const req = createRequire13(import.meta.url);
+      const skillsPkgJson = req.resolve("@cleocode/skills/package.json");
+      const candidate = dirname25(skillsPkgJson);
+      if (existsSync128(join124(candidate, "skills.json"))) {
+        skillsRoot = candidate;
+      }
+    } catch {
+    }
+    if (!skillsRoot) {
+      const thisFile = fileURLToPath5(import.meta.url);
+      const packageRoot = join124(dirname25(thisFile), "..", "..", "..", "..", "..");
+      const candidate = join124(packageRoot, "packages", "skills");
+      if (existsSync128(join124(candidate, "skills.json"))) {
+        skillsRoot = candidate;
+      }
+    }
+    if (skillsRoot) {
+      registerSkillLibraryFromPath(skillsRoot);
+    }
+  } catch {
+  }
+}
 function getCliDispatcher() {
   if (!_dispatcher) {
     _dispatcher = createCliDispatcher();
@@ -116124,6 +116322,7 @@ async function lookupCliSession() {
   }
 }
 function createCliDispatcher() {
+  ensureCaampLibrary();
   const handlers = createDomainHandlers();
   return new Dispatcher({
     handlers,
@@ -116316,8 +116515,8 @@ var init_cli = __esm({
 // packages/cleo/src/cli/index.ts
 init_internal();
 import { readFileSync as readFileSync101 } from "node:fs";
-import { dirname as dirname28, join as join130 } from "node:path";
-import { fileURLToPath as fileURLToPath5 } from "node:url";
+import { dirname as dirname29, join as join131 } from "node:path";
+import { fileURLToPath as fileURLToPath6 } from "node:url";
 
 // node_modules/.pnpm/citty@0.2.1/node_modules/citty/dist/_chunks/libs/scule.mjs
 var NUMBER_CHAR_RE = /\d/;
@@ -116912,7 +117111,7 @@ var COMMAND_GROUPS = [
   },
   {
     name: "Memory & Notes",
-    commands: ["memory", "brain", "observe", "refresh-memory", "sticky", "reason"]
+    commands: ["memory", "brain", "refresh-memory", "sticky", "reason"]
   },
   {
     name: "Analysis & Stats",
@@ -117473,7 +117672,7 @@ function registerAddCommand(program) {
 // packages/cleo/src/cli/commands/add-batch.ts
 init_cli();
 init_renderers();
-import { readFileSync as readFileSync95 } from "node:fs";
+import { existsSync as existsSync129, readFileSync as readFileSync95 } from "node:fs";
 function registerAddBatchCommand(program) {
   program.command("add-batch").description("Create multiple tasks atomically from a JSON file").option("--file <path>", "Path to JSON file (array of task objects). Use - for stdin.").option("--parent <parentId>", "Default parent for all tasks (overridden by per-task parent)").option("--dry-run", "Preview what would be created without making changes").action(async (opts) => {
     const filePath = opts["file"];
@@ -117486,7 +117685,33 @@ function registerAddBatchCommand(program) {
         chunks.push(chunk);
       }
       raw = Buffer.concat(chunks).toString("utf-8");
+      if (!raw.trim()) {
+        cliError(
+          "No input provided. Pass --file <path> or pipe JSON to stdin.",
+          "E_VALIDATION",
+          {
+            name: "E_VALIDATION",
+            fix: "cleo add-batch --file tasks.json"
+          },
+          { operation: "tasks.add-batch" }
+        );
+        process.exit(2);
+        return;
+      }
     } else {
+      if (!existsSync129(filePath)) {
+        cliError(
+          `File not found: ${filePath}`,
+          "E_NOT_FOUND",
+          {
+            name: "E_NOT_FOUND",
+            fix: `Verify the file path exists: ${filePath}`
+          },
+          { operation: "tasks.add-batch" }
+        );
+        process.exit(2);
+        return;
+      }
       raw = readFileSync95(filePath, "utf-8");
     }
     let tasks2;
@@ -117494,12 +117719,28 @@ function registerAddBatchCommand(program) {
       const parsed = JSON.parse(raw);
       tasks2 = Array.isArray(parsed) ? parsed : [parsed];
     } catch {
-      process.stderr.write("Error: Invalid JSON input. Expected an array of task objects.\n");
+      cliError(
+        "Invalid JSON input. Expected an array of task objects.",
+        "E_VALIDATION",
+        {
+          name: "E_VALIDATION",
+          fix: "Ensure the input is a valid JSON array of task objects"
+        },
+        { operation: "tasks.add-batch" }
+      );
       process.exit(2);
       return;
     }
     if (tasks2.length === 0) {
-      process.stderr.write("Error: No tasks in input.\n");
+      cliError(
+        "No tasks in input.",
+        "E_VALIDATION",
+        {
+          name: "E_VALIDATION",
+          fix: "Provide at least one task object in the JSON array"
+        },
+        { operation: "tasks.add-batch" }
+      );
       process.exit(2);
       return;
     }
@@ -117776,12 +118017,12 @@ function registerAgentCommand(program) {
         transportConfig: {},
         isActive: true
       });
-      const { existsSync: existsSync131, mkdirSync: mkdirSync31, writeFileSync: writeFileSync24 } = await import("node:fs");
-      const { join: join131 } = await import("node:path");
-      const cantDir = join131(".cleo", "agents");
-      const cantPath = join131(cantDir, `${agentId}.cant`);
+      const { existsSync: existsSync133, mkdirSync: mkdirSync31, writeFileSync: writeFileSync24 } = await import("node:fs");
+      const { join: join132 } = await import("node:path");
+      const cantDir = join132(".cleo", "agents");
+      const cantPath = join132(cantDir, `${agentId}.cant`);
       let cantScaffolded = false;
-      if (!existsSync131(cantPath)) {
+      if (!existsSync133(cantPath)) {
         mkdirSync31(cantDir, { recursive: true });
         const role = classification ?? "specialist";
         const cantContent = `---
@@ -117841,7 +118082,7 @@ agent ${agentId}:
           data: {
             agentId: credential.agentId,
             displayName: credential.displayName,
-            cantFile: cantScaffolded ? cantPath : existsSync131(cantPath) ? cantPath : null,
+            cantFile: cantScaffolded ? cantPath : existsSync133(cantPath) ? cantPath : null,
             cantScaffolded
           }
         },
@@ -117921,8 +118162,8 @@ agent ${agentId}:
     try {
       const { AgentRegistryAccessor: AgentRegistryAccessor2, getDb: getDb4 } = await Promise.resolve().then(() => (init_internal(), internal_exports));
       const { createRuntime } = await import("@cleocode/runtime");
-      const { existsSync: existsSync131, readFileSync: readFileSync102 } = await import("node:fs");
-      const { join: join131 } = await import("node:path");
+      const { existsSync: existsSync133, readFileSync: readFileSync102 } = await import("node:fs");
+      const { join: join132 } = await import("node:path");
       await getDb4();
       const registry2 = new AgentRegistryAccessor2(process.cwd());
       const credential = await registry2.get(agentId);
@@ -117942,8 +118183,8 @@ agent ${agentId}:
       }
       let profile = null;
       let cantValidation = null;
-      const cantPath = opts["cant"] ?? join131(".cleo", "agents", `${agentId}.cant`);
-      if (existsSync131(cantPath)) {
+      const cantPath = opts["cant"] ?? join132(".cleo", "agents", `${agentId}.cant`);
+      if (existsSync133(cantPath)) {
         profile = readFileSync102(cantPath, "utf-8");
         try {
           const cantModule = await import("@cleocode/cant");
@@ -118339,8 +118580,8 @@ Task ${taskId} reassigned to you by ${active.agentId}. Run: cleo show ${taskId}
     try {
       const { AgentRegistryAccessor: AgentRegistryAccessor2, getDb: getDb4 } = await Promise.resolve().then(() => (init_internal(), internal_exports));
       const { createRuntime } = await import("@cleocode/runtime");
-      const { existsSync: existsSync131 } = await import("node:fs");
-      const { join: join131 } = await import("node:path");
+      const { existsSync: existsSync133 } = await import("node:fs");
+      const { join: join132 } = await import("node:path");
       const { execFile: execFile9 } = await import("node:child_process");
       const { promisify: promisify9 } = await import("node:util");
       const execFileAsync6 = promisify9(execFile9);
@@ -118360,8 +118601,8 @@ Task ${taskId} reassigned to you by ${active.agentId}. Run: cleo show ${taskId}
       }
       await registry2.update(agentId, { isActive: true });
       await registry2.markUsed(agentId);
-      const cantPath = join131(".cleo", "agents", `${agentId}.cant`);
-      const hasProfile = existsSync131(cantPath);
+      const cantPath = join132(".cleo", "agents", `${agentId}.cant`);
+      const hasProfile = existsSync133(cantPath);
       const runtime = await createRuntime(registry2, {
         agentId,
         pollIntervalMs: 5e3,
@@ -118984,12 +119225,12 @@ Task ${taskId} reassigned to you by ${active.agentId}. Run: cleo show ${taskId}
   });
   agent.command("install <path>").description("Install an agent from a .cantz archive or agent directory").option("--global", "Install to global tier (~/.local/share/cleo/cant/agents/)").action(async (sourcePath, opts) => {
     try {
-      const { existsSync: existsSync131, mkdirSync: mkdirSync31, cpSync, readFileSync: readFileSync102, rmSync: rmSync3, statSync: statSync22 } = await import("node:fs");
-      const { join: join131, basename: basename19, resolve: resolve16 } = await import("node:path");
+      const { existsSync: existsSync133, mkdirSync: mkdirSync31, cpSync, readFileSync: readFileSync102, rmSync: rmSync3, statSync: statSync22 } = await import("node:fs");
+      const { join: join132, basename: basename19, resolve: resolve16 } = await import("node:path");
       const { homedir: homedir7 } = await import("node:os");
       const { tmpdir: tmpdir3 } = await import("node:os");
       const resolvedPath = resolve16(sourcePath);
-      if (!existsSync131(resolvedPath)) {
+      if (!existsSync133(resolvedPath)) {
         cliOutput(
           {
             success: false,
@@ -119009,7 +119250,7 @@ Task ${taskId} reassigned to you by ${active.agentId}. Run: cleo show ${taskId}
       const isCantzArchive = resolvedPath.endsWith(".cantz") && statSync22(resolvedPath).isFile();
       if (isCantzArchive) {
         const { execFileSync: execFileSync19 } = await import("node:child_process");
-        tempDir = join131(tmpdir3(), `cleo-agent-install-${Date.now()}`);
+        tempDir = join132(tmpdir3(), `cleo-agent-install-${Date.now()}`);
         mkdirSync31(tempDir, { recursive: true });
         try {
           execFileSync19("unzip", ["-o", "-q", resolvedPath, "-d", tempDir], {
@@ -119033,7 +119274,7 @@ Task ${taskId} reassigned to you by ${active.agentId}. Run: cleo show ${taskId}
         }
         const { readdirSync: readdirSync42 } = await import("node:fs");
         const topLevel = readdirSync42(tempDir).filter((entry) => {
-          const entryPath = join131(tempDir, entry);
+          const entryPath = join132(tempDir, entry);
           return statSync22(entryPath).isDirectory();
         });
         if (topLevel.length !== 1) {
@@ -119052,7 +119293,7 @@ Task ${taskId} reassigned to you by ${active.agentId}. Run: cleo show ${taskId}
           return;
         }
         agentName = topLevel[0];
-        agentDir = join131(tempDir, agentName);
+        agentDir = join132(tempDir, agentName);
       } else if (statSync22(resolvedPath).isDirectory()) {
         agentDir = resolvedPath;
         agentName = basename19(resolvedPath);
@@ -119070,8 +119311,8 @@ Task ${taskId} reassigned to you by ${active.agentId}. Run: cleo show ${taskId}
         process.exitCode = 6;
         return;
       }
-      const personaPath = join131(agentDir, "persona.cant");
-      if (!existsSync131(personaPath)) {
+      const personaPath = join132(agentDir, "persona.cant");
+      if (!existsSync133(personaPath)) {
         if (tempDir) rmSync3(tempDir, { recursive: true, force: true });
         cliOutput(
           {
@@ -119090,12 +119331,12 @@ Task ${taskId} reassigned to you by ${active.agentId}. Run: cleo show ${taskId}
       let targetRoot;
       if (isGlobal) {
         const home = homedir7();
-        const xdgData = process.env["XDG_DATA_HOME"] ?? join131(home, ".local", "share");
-        targetRoot = join131(xdgData, "cleo", "cant", "agents");
+        const xdgData = process.env["XDG_DATA_HOME"] ?? join132(home, ".local", "share");
+        targetRoot = join132(xdgData, "cleo", "cant", "agents");
       } else {
-        targetRoot = join131(process.cwd(), ".cleo", "cant", "agents");
+        targetRoot = join132(process.cwd(), ".cleo", "cant", "agents");
       }
-      const targetDir = join131(targetRoot, agentName);
+      const targetDir = join132(targetRoot, agentName);
       mkdirSync31(targetRoot, { recursive: true });
       cpSync(agentDir, targetDir, { recursive: true, force: true });
       if (tempDir) {
@@ -119103,7 +119344,7 @@ Task ${taskId} reassigned to you by ${active.agentId}. Run: cleo show ${taskId}
       }
       let registered = false;
       try {
-        const persona = readFileSync102(join131(targetDir, "persona.cant"), "utf-8");
+        const persona = readFileSync102(join132(targetDir, "persona.cant"), "utf-8");
         const descMatch = persona.match(/description:\s*"([^"]+)"/);
         const displayName = descMatch?.[1] ?? agentName;
         const { AgentRegistryAccessor: AgentRegistryAccessor2, getDb: getDb4 } = await Promise.resolve().then(() => (init_internal(), internal_exports));
@@ -119150,11 +119391,11 @@ Task ${taskId} reassigned to you by ${active.agentId}. Run: cleo show ${taskId}
   });
   agent.command("pack <dir>").description("Package an agent directory as a .cantz archive").action(async (dir) => {
     try {
-      const { existsSync: existsSync131, statSync: statSync22 } = await import("node:fs");
-      const { resolve: resolve16, basename: basename19, dirname: dirname29 } = await import("node:path");
+      const { existsSync: existsSync133, statSync: statSync22 } = await import("node:fs");
+      const { resolve: resolve16, basename: basename19, dirname: dirname30 } = await import("node:path");
       const { execFileSync: execFileSync19 } = await import("node:child_process");
       const resolvedDir = resolve16(dir);
-      if (!existsSync131(resolvedDir) || !statSync22(resolvedDir).isDirectory()) {
+      if (!existsSync133(resolvedDir) || !statSync22(resolvedDir).isDirectory()) {
         cliOutput(
           {
             success: false,
@@ -119168,9 +119409,9 @@ Task ${taskId} reassigned to you by ${active.agentId}. Run: cleo show ${taskId}
         process.exitCode = 4;
         return;
       }
-      const { join: join131 } = await import("node:path");
-      const personaPath = join131(resolvedDir, "persona.cant");
-      if (!existsSync131(personaPath)) {
+      const { join: join132 } = await import("node:path");
+      const personaPath = join132(resolvedDir, "persona.cant");
+      if (!existsSync133(personaPath)) {
         cliOutput(
           {
             success: false,
@@ -119187,7 +119428,7 @@ Task ${taskId} reassigned to you by ${active.agentId}. Run: cleo show ${taskId}
       const agentName = basename19(resolvedDir);
       const archiveName = `${agentName}.cantz`;
       const archivePath = resolve16(archiveName);
-      const parentDir = dirname29(resolvedDir);
+      const parentDir = dirname30(resolvedDir);
       try {
         execFileSync19("zip", ["-r", archivePath, agentName], {
           cwd: parentDir,
@@ -119217,7 +119458,7 @@ Task ${taskId} reassigned to you by ${active.agentId}. Run: cleo show ${taskId}
           if (entry.isFile()) {
             fileCount++;
           } else if (entry.isDirectory()) {
-            countFiles2(join131(dirPath, entry.name));
+            countFiles2(join132(dirPath, entry.name));
           }
         }
       };
@@ -119244,8 +119485,8 @@ Task ${taskId} reassigned to you by ${active.agentId}. Run: cleo show ${taskId}
   });
   agent.command("create").description("Scaffold a new agent package with persona.cant and manifest.json").requiredOption("--name <name>", "Agent name (kebab-case)").requiredOption("--role <role>", "Agent role: orchestrator, lead, worker, or docs-worker").option("--tier <tier>", "Agent tier: low, mid, or high (defaults based on role)").option("--team <teamName>", "Team this agent belongs to").option("--domain <description>", "Domain description for file permissions and context").option("--global", "Create in global tier (~/.local/share/cleo/cant/agents/)").option("--seed-brain", "Create expertise/mental-model-seed.md and seed a BRAIN observation").option("--parent <parentAgent>", "Parent agent name in the hierarchy").action(async (opts) => {
     try {
-      const { existsSync: existsSync131, mkdirSync: mkdirSync31, writeFileSync: writeFileSync24 } = await import("node:fs");
-      const { join: join131 } = await import("node:path");
+      const { existsSync: existsSync133, mkdirSync: mkdirSync31, writeFileSync: writeFileSync24 } = await import("node:fs");
+      const { join: join132 } = await import("node:path");
       const { homedir: homedir7 } = await import("node:os");
       const name2 = opts["name"];
       const role = opts["role"];
@@ -119305,13 +119546,13 @@ Task ${taskId} reassigned to you by ${active.agentId}. Run: cleo show ${taskId}
       let targetRoot;
       if (isGlobal) {
         const home = homedir7();
-        const xdgData = process.env["XDG_DATA_HOME"] ?? join131(home, ".local", "share");
-        targetRoot = join131(xdgData, "cleo", "cant", "agents");
+        const xdgData = process.env["XDG_DATA_HOME"] ?? join132(home, ".local", "share");
+        targetRoot = join132(xdgData, "cleo", "cant", "agents");
       } else {
-        targetRoot = join131(process.cwd(), ".cleo", "cant", "agents");
+        targetRoot = join132(process.cwd(), ".cleo", "cant", "agents");
       }
-      const agentDir = join131(targetRoot, name2);
-      if (existsSync131(agentDir)) {
+      const agentDir = join132(targetRoot, name2);
+      if (existsSync133(agentDir)) {
         cliOutput(
           {
             success: false,
@@ -119335,29 +119576,29 @@ Task ${taskId} reassigned to you by ${active.agentId}. Run: cleo show ${taskId}
         domain: domain2,
         parent
       });
-      writeFileSync24(join131(agentDir, "persona.cant"), personaContent, "utf-8");
+      writeFileSync24(join132(agentDir, "persona.cant"), personaContent, "utf-8");
       const manifest = generateManifest2({ name: name2, role, tier, domain: domain2 });
       writeFileSync24(
-        join131(agentDir, "manifest.json"),
+        join132(agentDir, "manifest.json"),
         `${JSON.stringify(manifest, null, 2)}
 `,
         "utf-8"
       );
       const createdFiles = [
-        join131(agentDir, "persona.cant"),
-        join131(agentDir, "manifest.json")
+        join132(agentDir, "persona.cant"),
+        join132(agentDir, "manifest.json")
       ];
       if (team) {
         const teamConfigContent = generateTeamConfig(name2, role, team);
-        writeFileSync24(join131(agentDir, "team-config.cant"), teamConfigContent, "utf-8");
-        createdFiles.push(join131(agentDir, "team-config.cant"));
+        writeFileSync24(join132(agentDir, "team-config.cant"), teamConfigContent, "utf-8");
+        createdFiles.push(join132(agentDir, "team-config.cant"));
       }
       if (seedBrain) {
-        const expertiseDir = join131(agentDir, "expertise");
+        const expertiseDir = join132(agentDir, "expertise");
         mkdirSync31(expertiseDir, { recursive: true });
         const seedContent = generateMentalModelSeed(name2, role, domain2);
-        writeFileSync24(join131(expertiseDir, "mental-model-seed.md"), seedContent, "utf-8");
-        createdFiles.push(join131(expertiseDir, "mental-model-seed.md"));
+        writeFileSync24(join132(expertiseDir, "mental-model-seed.md"), seedContent, "utf-8");
+        createdFiles.push(join132(expertiseDir, "mental-model-seed.md"));
         try {
           const { execFile: execFile9 } = await import("node:child_process");
           const { promisify: promisify9 } = await import("node:util");
@@ -119813,6 +120054,7 @@ function registerArchiveStatsCommand(program) {
 
 // packages/cleo/src/cli/commands/backfill.ts
 init_internal();
+init_renderers();
 function registerBackfillCommand(program) {
   program.command("backfill").description(
     "Retroactively add acceptance criteria and verification metadata to existing tasks"
@@ -119847,17 +120089,35 @@ function registerBackfillCommand(program) {
             process.stdout.write("\n");
           }
           if (result.processed === 0 && result.skipped === 0 && result.errors === 0) {
-            console.log(
-              "No observations to embed (provider unavailable or nothing to backfill)."
+            cliOutput(
+              {
+                processed: 0,
+                skipped: 0,
+                errors: 0,
+                message: "No observations to embed (provider unavailable or nothing to backfill)."
+              },
+              { command: "backfill", operation: "admin.backfill", message: "Nothing to embed" }
             );
             return;
           }
-          console.log(
-            `Processed ${result.processed}, skipped ${result.skipped}, errors ${result.errors}`
+          cliOutput(
+            { processed: result.processed, skipped: result.skipped, errors: result.errors },
+            {
+              command: "backfill",
+              operation: "admin.backfill",
+              message: `Processed ${result.processed}, skipped ${result.skipped}, errors ${result.errors}`
+            }
           );
         } catch (err) {
           const message = err instanceof Error ? err.message : String(err);
-          console.error(`Embedding backfill failed: ${message}`);
+          cliError(
+            `Embedding backfill failed: ${message}`,
+            "E_INTERNAL",
+            {
+              name: "E_INTERNAL"
+            },
+            { operation: "admin.backfill" }
+          );
           process.exit(1);
         }
         return;
@@ -119866,55 +120126,40 @@ function registerBackfillCommand(program) {
       const rollback = !!opts.rollback;
       const taskIds = opts.tasks?.trim() ? opts.tasks.split(",").map((s3) => s3.trim()).filter(Boolean) : void 0;
       if (!dryRun && !rollback && !process.env["CLEO_NONINTERACTIVE"]) {
-        console.log(
-          "\u26A0 Backfill will modify tasks in-place. Run with --dry-run first to preview changes."
+        process.stderr.write(
+          "Warning: Backfill will modify tasks in-place. Run with --dry-run first to preview changes.\n  Set CLEO_NONINTERACTIVE=1 or pass --dry-run to suppress this warning.\n\n"
         );
-        console.log("  Set CLEO_NONINTERACTIVE=1 or pass --dry-run to suppress this warning.\n");
-      }
-      if (dryRun) {
-        console.log("[dry run] No changes will be made.\n");
-      }
-      if (rollback) {
-        console.log("[rollback] Reverting previously backfilled tasks.\n");
       }
       try {
         const result = await backfillTasks(root, { dryRun, rollback, taskIds });
-        console.log(`Scanned: ${result.tasksScanned} task(s)`);
-        console.log(`Changed: ${result.tasksChanged} task(s)`);
+        const output = {
+          dryRun,
+          rollback,
+          tasksScanned: result.tasksScanned,
+          tasksChanged: result.tasksChanged,
+          changes: result.changes
+        };
         if (!rollback) {
-          console.log(`  AC added:           ${result.acAdded}`);
-          console.log(`  Verification added: ${result.verificationAdded}`);
-        }
-        if (result.changes.length === 0) {
-          console.log("\nNothing to do \u2014 all tasks already have AC and verification metadata.");
-          return;
-        }
-        console.log("\nDetails:");
-        for (const change of result.changes) {
-          const parts = [];
-          if (change.addedAc) parts.push("AC");
-          if (change.addedVerification) parts.push("verification");
-          if (change.addedNote) parts.push("note");
-          if (change.rolledBack && change.rolledBack.length > 0) {
-            parts.push(`rolled back [${change.rolledBack.join(", ")}]`);
-          }
-          console.log(`  ${change.taskId}: ${change.title}`);
-          console.log(`    Actions: ${parts.join(", ")}`);
-          if (change.addedAc && change.generatedAc.length > 0) {
-            console.log("    Generated AC:");
-            for (const ac of change.generatedAc) {
-              console.log(`      - ${ac}`);
-            }
-          }
-        }
-        if (dryRun) {
-          console.log("\n[dry run] Run without --dry-run to apply these changes.");
-        } else {
-          console.log("\nBackfill complete.");
-        }
+          output["acAdded"] = result.acAdded;
+          output["verificationAdded"] = result.verificationAdded;
+        }
+        const messagePrefix = dryRun ? "[dry run] " : rollback ? "[rollback] " : "";
+        const messageSuffix = result.changes.length === 0 ? "Nothing to do \u2014 all tasks already have AC and verification metadata." : `Scanned ${result.tasksScanned}, changed ${result.tasksChanged} task(s).`;
+        cliOutput(output, {
+          command: "backfill",
+          operation: "admin.backfill",
+          message: `${messagePrefix}${messageSuffix}`
+        });
       } catch (err) {
         const message = err instanceof Error ? err.message : String(err);
-        console.error(`Backfill failed: ${message}`);
+        cliError(
+          `Backfill failed: ${message}`,
+          "E_INTERNAL",
+          {
+            name: "E_INTERNAL"
+          },
+          { operation: "admin.backfill" }
+        );
         process.exit(1);
       }
     }
@@ -120723,8 +120968,8 @@ function registerCancelCommand(program) {
 
 // packages/cleo/src/cli/commands/cant.ts
 init_renderers();
-import { existsSync as existsSync128, mkdirSync as mkdirSync29, readFileSync as readFileSync96, writeFileSync as writeFileSync22 } from "node:fs";
-import { dirname as dirname25, isAbsolute as isAbsolute3, join as join124, resolve as resolve15 } from "node:path";
+import { existsSync as existsSync130, mkdirSync as mkdirSync29, readFileSync as readFileSync96, writeFileSync as writeFileSync22 } from "node:fs";
+import { dirname as dirname26, isAbsolute as isAbsolute3, join as join125, resolve as resolve15 } from "node:path";
 function registerCantCommand(program) {
   const cant = program.command("cant").description("CANT DSL tooling");
   cant.command("parse <file>").description("Parse a .cant file and emit the AST").action(async (file2) => {
@@ -120784,21 +121029,12 @@ function registerCantCommand(program) {
       process.exitCode = 1;
     }
   });
-  cant.command("migrate <file>").description("Convert markdown instruction files to .cant format").option("--write", "Write .cant files to disk (default: dry-run preview)").option("--dry-run", "Preview conversion without writing files (default behavior)").option("--output-dir <dir>", "Output directory for .cant files (default: .cleo/agents/)").option("--verbose", "Show detailed conversion log").option("--json", "Output results as JSON").action(
+  cant.command("migrate <file>").description("Convert markdown instruction files to .cant format").option("--write", "Write .cant files to disk (default: dry-run preview)").option("--dry-run", "Preview conversion without writing files (default behavior)").option("--output-dir <dir>", "Output directory for .cant files (default: .cleo/agents/)").option("--verbose", "Show detailed conversion log").action(
     async (file2, opts) => {
-      const isJson = !!opts.json;
       const isWrite = !!opts.write && !opts.dryRun;
       const isVerbose = !!opts.verbose;
       const filePath = isAbsolute3(file2) ? file2 : resolve15(process.cwd(), file2);
-      if (!existsSync128(filePath)) {
-        const errMsg = `File not found: ${filePath}`;
-        if (isJson) {
-          console.log(JSON.stringify({ error: errMsg }));
-        } else {
-          console.error(errMsg);
-        }
-        process.exit(1);
-      }
+      if (!ensureExists(filePath, "cant.migrate")) return;
       try {
         const mod = await loadMigrateEngine();
         const content = readFileSync96(filePath, "utf-8");
@@ -120807,43 +121043,43 @@ function registerCantCommand(program) {
           verbose: isVerbose,
           outputDir: opts.outputDir
         });
-        if (isJson) {
-          console.log(JSON.stringify(result, null, 2));
-          return;
-        }
         if (isWrite) {
           const projectRoot = process.cwd();
           let written = 0;
           for (const outputFile of result.outputFiles) {
-            const outputPath = isAbsolute3(outputFile.path) ? outputFile.path : join124(projectRoot, outputFile.path);
-            mkdirSync29(dirname25(outputPath), { recursive: true });
+            const outputPath = isAbsolute3(outputFile.path) ? outputFile.path : join125(projectRoot, outputFile.path);
+            mkdirSync29(dirname26(outputPath), { recursive: true });
             writeFileSync22(outputPath, outputFile.content, "utf-8");
             written++;
-            if (isVerbose) {
-              console.log(`  Created: ${outputFile.path} (${outputFile.kind})`);
-            }
-          }
-          console.log(`Wrote ${written} .cant file(s).`);
-          console.log(result.summary);
-          if (result.unconverted.length > 0) {
-            console.log("");
-            console.log(`${result.unconverted.length} section(s) need manual conversion.`);
-            for (const section of result.unconverted) {
-              console.log(`  Lines ${section.lineStart}-${section.lineEnd}: ${section.reason}`);
-            }
           }
+          cliOutput(
+            {
+              inputFile: result.inputFile,
+              filesWritten: written,
+              outputFiles: result.outputFiles.map((f2) => ({ path: f2.path, kind: f2.kind })),
+              unconverted: result.unconverted,
+              summary: result.summary
+            },
+            { command: "cant-migrate", operation: "cant.migrate" }
+          );
         } else {
-          const diffOutput = mod.showDiff(result, process.stdout.isTTY ?? false);
-          console.log(diffOutput);
+          cliOutput(
+            {
+              inputFile: result.inputFile,
+              dryRun: true,
+              outputFiles: result.outputFiles.map((f2) => ({
+                path: f2.path,
+                kind: f2.kind
+              })),
+              unconverted: result.unconverted,
+              summary: result.summary
+            },
+            { command: "cant-migrate", operation: "cant.migrate" }
+          );
         }
       } catch (err) {
-        const message = err instanceof Error ? err.message : String(err);
-        if (isJson) {
-          console.log(JSON.stringify({ error: message }));
-        } else {
-          console.error(`Migration failed: ${message}`);
-        }
-        process.exit(1);
+        emitFailure("cant.migrate", "E_MIGRATION_FAILED", err);
+        process.exitCode = 1;
       }
     }
   );
@@ -120852,7 +121088,7 @@ function resolveFilePath(file2) {
   return isAbsolute3(file2) ? file2 : resolve15(process.cwd(), file2);
 }
 function ensureExists(filePath, operation) {
-  if (existsSync128(filePath)) return true;
+  if (existsSync130(filePath)) return true;
   cliError(`File not found: ${filePath}`, "E_FILE_READ");
   process.exitCode = 3;
   if (process.env["CLEO_DEBUG"]) {
@@ -121169,30 +121405,6 @@ function registerUnclaimCommand(program) {
   });
 }
 
-// packages/cleo/src/cli/commands/commands.ts
-init_cli();
-function registerCommandsCommand(program) {
-  program.command("commands [command]").description(
-    "DEPRECATED: Use `cleo ops` instead. List and query available CLEO commands (delegates to admin help)"
-  ).option("-c, --category <category>", "Filter by category").option("-r, --relevance <level>", "Filter by agent relevance").option("--tier <n>", "Help tier level (0=basic, 1=extended, 2=full)", parseInt).action(async (commandName, opts) => {
-    console.error(
-      "[DEPRECATED] cleo commands now delegates to admin.help.\nUse: cleo help (CLI)\n"
-    );
-    await dispatchFromCli(
-      "query",
-      "admin",
-      "help",
-      {
-        tier: opts["tier"] ?? 0,
-        domain: commandName,
-        category: opts["category"],
-        relevance: opts["relevance"]
-      },
-      { command: "commands", operation: "admin.help" }
-    );
-  });
-}
-
 // packages/cleo/src/cli/commands/complete.ts
 init_cli();
 init_renderers();
@@ -121325,14 +121537,14 @@ function registerComplianceCommand(program) {
       { command: "compliance" }
     );
   });
-  compliance.command("audit <epicId>").description("Check compliance for specific epic tasks").option("--since <date>", "Filter from date").action(async (epicId, opts) => {
+  compliance.command("audit <taskId>").description("Check compliance for a specific task and its subtasks").option("--since <date>", "Filter from date").action(async (taskId, opts) => {
     await dispatchFromCli(
       "query",
       "check",
       "compliance.summary",
       {
         type: "audit",
-        epicId,
+        taskId,
         since: opts["since"]
       },
       { command: "compliance" }
@@ -121379,7 +121591,7 @@ function registerComplianceCommand(program) {
     (val, prev) => [...prev, val],
     []
   ).action(async (taskId, result, opts) => {
-    const rawViolations = opts["violation"];
+    const rawViolations = opts["violation"] ?? [];
     const violations = rawViolations.map((v2) => {
       const [code, severity, ...rest] = v2.split(":");
       return {
@@ -121448,46 +121660,20 @@ function registerConfigCommand(program) {
   });
 }
 
-// packages/cleo/src/cli/commands/consensus.ts
-init_cli();
-function registerConsensusCommand(program) {
-  const consensus = program.command("consensus").description(
-    "Validate consensus protocol compliance (alias for `cleo check protocol consensus`)"
-  );
-  consensus.command("validate <taskId>").description("Validate consensus protocol compliance for task").option("--strict", "Exit with error code on violations").option("--voting-matrix <file>", "Path to voting matrix JSON file").action(async (taskId, opts) => {
-    await dispatchFromCli(
-      "query",
-      "check",
-      "protocol",
-      {
-        protocolType: "consensus",
-        mode: "task",
-        taskId,
-        strict: opts["strict"],
-        votingMatrixFile: opts["votingMatrix"]
-      },
-      { command: "consensus" }
-    );
-  });
-  consensus.command("check <manifestFile>").description("Validate manifest entry directly").option("--strict", "Exit with error code on violations").option("--voting-matrix <file>", "Path to voting matrix JSON file").action(async (manifestFile, opts) => {
-    await dispatchFromCli(
-      "query",
-      "check",
-      "protocol",
-      {
-        protocolType: "consensus",
-        mode: "manifest",
-        manifestFile,
-        strict: opts["strict"],
-        votingMatrixFile: opts["votingMatrix"]
-      },
-      { command: "consensus" }
-    );
-  });
-}
-
 // packages/cleo/src/cli/commands/context.ts
+init_src();
+init_internal();
 init_cli();
+init_system_engine();
+init_renderers();
+var STATUS_EXIT_CODE = {
+  ok: 0 /* SUCCESS */,
+  warning: 50 /* CONTEXT_WARNING */,
+  caution: 51 /* CONTEXT_CAUTION */,
+  critical: 52 /* CONTEXT_CRITICAL */,
+  emergency: 53 /* CONTEXT_EMERGENCY */,
+  stale: 54 /* CONTEXT_STALE */
+};
 function registerContextCommand(program) {
   const context = program.command("context").description("Monitor context window usage for agent safeguard system");
   context.command("status", { isDefault: true }).description("Show current context state (default)").option("--session <id>", "Check specific CLEO session").action(async (opts) => {
@@ -121502,64 +121688,29 @@ function registerContextCommand(program) {
       { command: "context" }
     );
   });
-  context.command("check").description("Show context window state (same as status)").option("--session <id>", "Check specific CLEO session").action(async (opts) => {
-    await dispatchFromCli(
-      "query",
-      "admin",
-      "context",
-      {
-        action: "check",
-        session: opts["session"]
-      },
-      { command: "context" }
-    );
-  });
-  context.command("list").description("Show context window state including all sessions").action(async () => {
-    await dispatchFromCli(
-      "query",
-      "admin",
-      "context",
-      {
-        action: "list"
-      },
-      { command: "context" }
-    );
-  });
-}
-
-// packages/cleo/src/cli/commands/contribution.ts
-init_cli();
-function registerContributionCommand(program) {
-  const contribution = program.command("contribution").description(
-    "Validate contribution protocol compliance (alias for `cleo check protocol contribution`)"
-  );
-  contribution.command("validate <taskId>").description("Validate contribution protocol compliance for task").option("--strict", "Exit with error code on violations").action(async (taskId, opts) => {
-    await dispatchFromCli(
-      "query",
-      "check",
-      "protocol",
-      {
-        protocolType: "contribution",
-        mode: "task",
-        taskId,
-        strict: opts["strict"]
-      },
-      { command: "contribution" }
-    );
-  });
-  contribution.command("check <manifestFile>").description("Validate manifest entry directly").option("--strict", "Exit with error code on violations").action(async (manifestFile, opts) => {
-    await dispatchFromCli(
-      "query",
-      "check",
-      "protocol",
-      {
-        protocolType: "contribution",
-        mode: "manifest",
-        manifestFile,
-        strict: opts["strict"]
-      },
-      { command: "contribution" }
-    );
+  context.command("check").description(
+    "Check context window state \u2014 exits non-zero when threshold exceeded (for scripting)"
+  ).option("--session <id>", "Check specific CLEO session").action(async (opts) => {
+    const cwd = resolveProjectRoot();
+    const result = systemContext(cwd, {
+      session: opts["session"]
+    });
+    if (!result.success) {
+      console.error(result.error?.message ?? "Context check failed");
+      process.exit(1 /* GENERAL_ERROR */);
+      return;
+    }
+    const data = result.data;
+    if (!data) {
+      console.error("Context check returned no data");
+      process.exit(1 /* GENERAL_ERROR */);
+      return;
+    }
+    cliOutput(data, { command: "context", operation: "admin.context" });
+    const exitCode = STATUS_EXIT_CODE[data.status] ?? 0 /* SUCCESS */;
+    if (exitCode !== 0 /* SUCCESS */) {
+      process.exit(exitCode);
+    }
   });
 }
 
@@ -121589,44 +121740,6 @@ function registerDashCommand(program) {
   });
 }
 
-// packages/cleo/src/cli/commands/decomposition.ts
-init_cli();
-function registerDecompositionCommand(program) {
-  const decomposition = program.command("decomposition").description(
-    "Validate decomposition protocol compliance (alias for `cleo check protocol decomposition`)"
-  );
-  decomposition.command("validate <taskId>").description("Validate decomposition protocol compliance for task").option("--strict", "Exit with error code on violations").option("--epic <id>", "Specify parent epic ID").action(async (taskId, opts) => {
-    await dispatchFromCli(
-      "query",
-      "check",
-      "protocol",
-      {
-        protocolType: "decomposition",
-        mode: "task",
-        taskId,
-        strict: opts["strict"],
-        epicId: opts["epic"]
-      },
-      { command: "decomposition" }
-    );
-  });
-  decomposition.command("check <manifestFile>").description("Validate manifest entry directly").option("--strict", "Exit with error code on violations").option("--epic <id>", "Specify parent epic ID").action(async (manifestFile, opts) => {
-    await dispatchFromCli(
-      "query",
-      "check",
-      "protocol",
-      {
-        protocolType: "decomposition",
-        mode: "manifest",
-        manifestFile,
-        strict: opts["strict"],
-        epicId: opts["epic"]
-      },
-      { command: "decomposition" }
-    );
-  });
-}
-
 // packages/cleo/src/cli/commands/delete.ts
 init_cli();
 init_renderers();
@@ -121680,7 +121793,7 @@ function registerDepsCommand(program) {
       { command: "deps", operation: "tasks.depends" }
     );
   });
-  deps.command("waves [epicId]").description("Group tasks into parallelizable execution waves").action(async (epicId) => {
+  deps.command("waves <epicId>").description("Group tasks into parallelizable execution waves").action(async (epicId) => {
     await dispatchFromCli(
       "query",
       "orchestrate",
@@ -121758,15 +121871,15 @@ function registerDetectCommand(program) {
 // packages/cleo/src/cli/commands/detect-drift.ts
 init_src();
 init_renderers();
-import { existsSync as existsSync129, readdirSync as readdirSync41, readFileSync as readFileSync98 } from "node:fs";
-import { dirname as dirname26, join as join125 } from "node:path";
+import { existsSync as existsSync131, readdirSync as readdirSync41, readFileSync as readFileSync98 } from "node:fs";
+import { dirname as dirname27, join as join126 } from "node:path";
 function findProjectRoot() {
   let currentDir = process.cwd();
   while (currentDir !== "/") {
-    if (existsSync129(join125(currentDir, "package.json"))) {
+    if (existsSync131(join126(currentDir, "package.json"))) {
       return currentDir;
     }
-    const parent = dirname26(currentDir);
+    const parent = dirname27(currentDir);
     if (parent === currentDir) break;
     currentDir = parent;
   }
@@ -121775,8 +121888,8 @@ function findProjectRoot() {
 function registerDetectDriftCommand(program) {
   program.command("detect-drift").description("Detect documentation drift against TypeScript source of truth").action(async () => {
     const projectRoot = findProjectRoot();
-    const isCleoRepo = existsSync129(join125(projectRoot, "packages", "cleo", "src"));
-    const cleoSrcRoot = isCleoRepo ? join125(projectRoot, "packages", "cleo", "src") : join125(projectRoot, "src");
+    const isCleoRepo = existsSync131(join126(projectRoot, "packages", "cleo", "src"));
+    const cleoSrcRoot = isCleoRepo ? join126(projectRoot, "packages", "cleo", "src") : join126(projectRoot, "src");
     const safeRead = (filePath) => {
       try {
         return readFileSync98(filePath, "utf-8");
@@ -121790,8 +121903,8 @@ function registerDetectDriftCommand(program) {
         checks: [],
         recommendations: []
       };
-      const injPath = join125(projectRoot, ".cleo", "templates", "CLEO-INJECTION.md");
-      if (existsSync129(injPath)) {
+      const injPath = join126(projectRoot, ".cleo", "templates", "CLEO-INJECTION.md");
+      if (existsSync131(injPath)) {
         const content = safeRead(injPath);
         userResult.checks.push({
           name: "Agent injection",
@@ -121842,10 +121955,10 @@ function registerDetectDriftCommand(program) {
       }
     };
     try {
-      const specPath = join125(projectRoot, "docs", "specs", "CLEO-OPERATION-CONSTITUTION.md");
-      const registryPath = join125(cleoSrcRoot, "dispatch", "registry.ts");
-      const dispatchDomainsDir = join125(cleoSrcRoot, "dispatch", "domains");
-      if (!existsSync129(specPath)) {
+      const specPath = join126(projectRoot, "docs", "specs", "CLEO-OPERATION-CONSTITUTION.md");
+      const registryPath = join126(cleoSrcRoot, "dispatch", "registry.ts");
+      const dispatchDomainsDir = join126(cleoSrcRoot, "dispatch", "domains");
+      if (!existsSync131(specPath)) {
         addCheck("Gateway-to-spec sync", "fail", "CLEO-OPERATION-CONSTITUTION.md missing", [
           {
             severity: "error",
@@ -121855,7 +121968,7 @@ function registerDetectDriftCommand(program) {
             recommendation: "Create docs/specs/CLEO-OPERATION-CONSTITUTION.md with canonical operation definitions"
           }
         ]);
-      } else if (!existsSync129(registryPath) || !existsSync129(dispatchDomainsDir)) {
+      } else if (!existsSync131(registryPath) || !existsSync131(dispatchDomainsDir)) {
         addCheck("Gateway-to-spec sync", "fail", "Dispatch registry or domains missing", [
           {
             severity: "error",
@@ -121919,9 +122032,9 @@ function registerDetectDriftCommand(program) {
       ]);
     }
     try {
-      const cliDir = join125(cleoSrcRoot, "cli", "commands");
-      const coreDir = isCleoRepo ? join125(projectRoot, "packages", "core", "src") : join125(projectRoot, "src", "core");
-      if (!existsSync129(cliDir)) {
+      const cliDir = join126(cleoSrcRoot, "cli", "commands");
+      const coreDir = isCleoRepo ? join126(projectRoot, "packages", "core", "src") : join126(projectRoot, "src", "core");
+      if (!existsSync131(cliDir)) {
         addCheck("CLI-to-core sync", "fail", "CLI commands directory missing", [
           {
             severity: "error",
@@ -121930,7 +122043,7 @@ function registerDetectDriftCommand(program) {
             recommendation: "Verify TypeScript source structure is intact"
           }
         ]);
-      } else if (!existsSync129(coreDir)) {
+      } else if (!existsSync131(coreDir)) {
         addCheck("CLI-to-core sync", "fail", "Core directory missing", [
           {
             severity: "error",
@@ -121949,8 +122062,8 @@ function registerDetectDriftCommand(program) {
       addCheck("CLI-to-core sync", "fail", `Error: ${getErrorMessage(e)}`);
     }
     try {
-      const domainsDir = join125(cleoSrcRoot, "dispatch", "domains");
-      if (!existsSync129(domainsDir)) {
+      const domainsDir = join126(cleoSrcRoot, "dispatch", "domains");
+      if (!existsSync131(domainsDir)) {
         addCheck("Domain handler coverage", "fail", "Dispatch domains directory missing", [
           {
             severity: "error",
@@ -121967,8 +122080,8 @@ function registerDetectDriftCommand(program) {
       addCheck("Domain handler coverage", "fail", `Error: ${getErrorMessage(e)}`);
     }
     try {
-      const matrixPath = join125(cleoSrcRoot, "dispatch", "lib", "capability-matrix.ts");
-      if (!existsSync129(matrixPath)) {
+      const matrixPath = join126(cleoSrcRoot, "dispatch", "lib", "capability-matrix.ts");
+      if (!existsSync131(matrixPath)) {
         addCheck("Capability matrix", "fail", "Capability matrix missing", [
           {
             severity: "error",
@@ -121984,8 +122097,8 @@ function registerDetectDriftCommand(program) {
       addCheck("Capability matrix", "fail", `Error: ${getErrorMessage(e)}`);
     }
     try {
-      const schemaPath = join125(projectRoot, "src", "store", "schema.ts");
-      if (!existsSync129(schemaPath)) {
+      const schemaPath = join126(projectRoot, "src", "store", "schema.ts");
+      if (!existsSync131(schemaPath)) {
         addCheck("Schema validation", "fail", "Schema definition missing", [
           {
             severity: "error",
@@ -122019,10 +122132,10 @@ function registerDetectDriftCommand(program) {
       addCheck("Schema validation", "fail", `Error: ${getErrorMessage(e)}`);
     }
     try {
-      const visionPath = join125(projectRoot, "docs", "concepts", "CLEO-VISION.md");
-      const specPath = join125(projectRoot, "docs", "specs", "PORTABLE-BRAIN-SPEC.md");
+      const visionPath = join126(projectRoot, "docs", "concepts", "CLEO-VISION.md");
+      const specPath = join126(projectRoot, "docs", "specs", "PORTABLE-BRAIN-SPEC.md");
       const issues = [];
-      if (!existsSync129(visionPath)) {
+      if (!existsSync131(visionPath)) {
         issues.push({
           severity: "error",
           category: "vision",
@@ -122031,7 +122144,7 @@ function registerDetectDriftCommand(program) {
           recommendation: "Create docs/concepts/CLEO-VISION.md with project vision"
         });
       }
-      if (!existsSync129(specPath)) {
+      if (!existsSync131(specPath)) {
         issues.push({
           severity: "error",
           category: "spec",
@@ -122075,8 +122188,8 @@ function registerDetectDriftCommand(program) {
       addCheck("Canonical identity", "fail", `Error: ${getErrorMessage(e)}`);
     }
     try {
-      const injectionPath = join125(projectRoot, ".cleo", "templates", "CLEO-INJECTION.md");
-      if (!existsSync129(injectionPath)) {
+      const injectionPath = join126(projectRoot, ".cleo", "templates", "CLEO-INJECTION.md");
+      if (!existsSync131(injectionPath)) {
         addCheck("Agent injection", "fail", "Agent injection template missing", [
           {
             severity: "error",
@@ -122105,8 +122218,8 @@ function registerDetectDriftCommand(program) {
       addCheck("Agent injection", "fail", `Error: ${getErrorMessage(e)}`);
     }
     try {
-      const exitCodesPath = join125(cleoSrcRoot, "dispatch", "lib", "exit-codes.ts");
-      if (!existsSync129(exitCodesPath)) {
+      const exitCodesPath = join126(cleoSrcRoot, "dispatch", "lib", "exit-codes.ts");
+      if (!existsSync131(exitCodesPath)) {
         addCheck("Exit codes", "fail", "Exit codes definition missing", [
           {
             severity: "error",
@@ -122141,9 +122254,9 @@ function registerDetectDriftCommand(program) {
 init_internal();
 init_renderers();
 import { readdir as readdir3, readFile as readFile21 } from "node:fs/promises";
-import { join as join126 } from "node:path";
+import { join as join127 } from "node:path";
 async function getScriptNames(projectRoot) {
-  const scriptsDir = join126(projectRoot, "scripts");
+  const scriptsDir = join127(projectRoot, "scripts");
   try {
     const files = await readdir3(scriptsDir);
     return files.filter((f2) => f2.endsWith(".sh")).map((f2) => f2.replace(".sh", "")).sort();
@@ -122152,7 +122265,7 @@ async function getScriptNames(projectRoot) {
   }
 }
 async function getIndexedCommands(projectRoot) {
-  const indexPath = join126(projectRoot, "docs", "commands", "COMMANDS-INDEX.json");
+  const indexPath = join127(projectRoot, "docs", "commands", "COMMANDS-INDEX.json");
   const index2 = await readJson(indexPath);
   if (!index2) return [];
   return index2.commands.map((c) => c.name).sort();
@@ -122185,7 +122298,7 @@ async function runGapCheck(_projectRoot, filterId) {
     const reviewFiles = files.filter((f2) => f2.endsWith(".md"));
     for (const file2 of reviewFiles) {
       if (filterId && !file2.includes(filterId)) continue;
-      const filePath = join126(reviewDir, file2);
+      const filePath = join127(reviewDir, file2);
       const content = await readFile21(filePath, "utf-8");
       const taskMatch = file2.match(/^(T\d+)/);
       const taskId = taskMatch ? taskMatch[1] : "UNKNOWN";
@@ -122737,8 +122850,8 @@ init_src();
 init_src2();
 init_renderers();
 import { execFileSync as execFileSync16 } from "node:child_process";
-import { existsSync as existsSync130, mkdirSync as mkdirSync30, readFileSync as readFileSync99, writeFileSync as writeFileSync23 } from "node:fs";
-import { dirname as dirname27, join as join127 } from "node:path";
+import { existsSync as existsSync132, mkdirSync as mkdirSync30, readFileSync as readFileSync99, writeFileSync as writeFileSync23 } from "node:fs";
+import { dirname as dirname28, join as join128 } from "node:path";
 function getChangelogSource(cwd) {
   const configPath = getConfigPath(cwd);
   try {
@@ -122876,8 +122989,8 @@ function registerGenerateChangelogCommand(program) {
       const targetPlatform = opts["platform"];
       const dryRun = !!opts["dryRun"];
       const sourceFile = getChangelogSource();
-      const sourcePath = join127(getProjectRoot(), sourceFile);
-      if (!existsSync130(sourcePath)) {
+      const sourcePath = join128(getProjectRoot(), sourceFile);
+      if (!existsSync132(sourcePath)) {
         throw new CleoError(4 /* NOT_FOUND */, `Changelog source not found: ${sourcePath}`);
       }
       const sourceContent = readFileSync99(sourcePath, "utf-8");
@@ -122889,8 +123002,8 @@ function registerGenerateChangelogCommand(program) {
         const outputPath = platformConfig?.path ?? getDefaultOutputPath(targetPlatform);
         const content = generateForPlatform(targetPlatform, sourceContent, repoSlug, limit);
         if (!dryRun) {
-          const fullPath = join127(getProjectRoot(), outputPath);
-          mkdirSync30(dirname27(fullPath), { recursive: true });
+          const fullPath = join128(getProjectRoot(), outputPath);
+          mkdirSync30(dirname28(fullPath), { recursive: true });
           writeFileSync23(fullPath, content, "utf-8");
         }
         results.push({ platform: targetPlatform, path: outputPath, written: !dryRun });
@@ -122910,8 +123023,8 @@ function registerGenerateChangelogCommand(program) {
             limit
           );
           if (!dryRun) {
-            const fullPath = join127(getProjectRoot(), platformConfig.path);
-            mkdirSync30(dirname27(fullPath), { recursive: true });
+            const fullPath = join128(getProjectRoot(), platformConfig.path);
+            mkdirSync30(dirname28(fullPath), { recursive: true });
             writeFileSync23(fullPath, content, "utf-8");
           }
           results.push({
@@ -122955,7 +123068,8 @@ function registerGradeCommand(program) {
 // packages/cleo/src/cli/commands/history.ts
 init_cli();
 function registerHistoryCommand(program) {
-  const history = program.command("history").description("Completion timeline and productivity analytics").option("--days <n>", "Show last N days", "30").option("--since <date>", "Show completions since date (YYYY-MM-DD)").option("--until <date>", "Show completions until date (YYYY-MM-DD)").option("--no-chart", "Disable bar charts").action(async (opts) => {
+  const history = program.command("history").description("Completion timeline and productivity analytics");
+  history.command("log").description("Show operation audit log").option("--days <n>", "Show last N days", "30").option("--since <date>", "Show completions since date (YYYY-MM-DD)").option("--until <date>", "Show completions until date (YYYY-MM-DD)").option("--no-chart", "Disable bar charts").action(async (opts) => {
     await dispatchFromCli(
       "query",
       "admin",
@@ -122973,42 +123087,6 @@ function registerHistoryCommand(program) {
   });
 }
 
-// packages/cleo/src/cli/commands/implementation.ts
-init_cli();
-function registerImplementationCommand(program) {
-  const implementation = program.command("implementation").description(
-    "Validate implementation protocol compliance (alias for `cleo check protocol implementation`)"
-  );
-  implementation.command("validate <taskId>").description("Validate implementation protocol compliance for task").option("--strict", "Exit with error code on violations").action(async (taskId, opts) => {
-    await dispatchFromCli(
-      "query",
-      "check",
-      "protocol",
-      {
-        protocolType: "implementation",
-        mode: "task",
-        taskId,
-        strict: opts["strict"]
-      },
-      { command: "implementation" }
-    );
-  });
-  implementation.command("check <manifestFile>").description("Validate manifest entry directly").option("--strict", "Exit with error code on violations").action(async (manifestFile, opts) => {
-    await dispatchFromCli(
-      "query",
-      "check",
-      "protocol",
-      {
-        protocolType: "implementation",
-        mode: "manifest",
-        manifestFile,
-        strict: opts["strict"]
-      },
-      { command: "implementation" }
-    );
-  });
-}
-
 // packages/cleo/src/cli/commands/import.ts
 init_cli();
 function registerImportCommand(program) {
@@ -123564,7 +123642,7 @@ function registerMemoryBrainCommand(program) {
       );
     }
   });
-  memory.command("stats").description("Show BRAIN memory statistics").option("--json", "Output as JSON").action(async () => {
+  memory.command("stats").description("Show BRAIN memory statistics").action(async () => {
     const pResponse = await dispatchRaw("query", "memory", "pattern.find", {
       query: "",
       limit: 0
@@ -123577,10 +123655,10 @@ function registerMemoryBrainCommand(program) {
     if (pResponse.success) result["patterns"] = pResponse.data;
     if (lResponse.success) result["learnings"] = lResponse.data;
     if (!pResponse.success && !lResponse.success) {
-      handleRawError(pResponse, { command: "memory", operation: "memory.stats" });
+      handleRawError(pResponse, { command: "memory-stats", operation: "memory.stats" });
       return;
     }
-    cliOutput(result, { command: "memory", operation: "memory.stats" });
+    cliOutput(result, { command: "memory-stats", operation: "memory.stats" });
   });
   memory.command("observe <text>").description(
     "Save an observation to brain.db \u2014 captures facts, decisions, and discoveries for cross-session memory"
@@ -123611,7 +123689,7 @@ function registerMemoryBrainCommand(program) {
       { command: "memory", operation: "memory.observe" }
     );
   });
-  memory.command("timeline <anchor>").description("Show chronological context around an anchor observation ID").option("--before <n>", "Number of entries before anchor", parseInt).option("--after <n>", "Number of entries after anchor", parseInt).option("--json", "Output as JSON").action(async (anchor, opts) => {
+  memory.command("timeline <anchor>").description("Show chronological context around an anchor observation ID").option("--before <n>", "Number of entries before anchor", parseInt).option("--after <n>", "Number of entries after anchor", parseInt).action(async (anchor, opts) => {
     await dispatchFromCli(
       "query",
       "memory",
@@ -123621,17 +123699,17 @@ function registerMemoryBrainCommand(program) {
         depthBefore: opts["before"],
         depthAfter: opts["after"]
       },
-      { command: "memory", operation: "memory.timeline" }
+      { command: "memory-timeline", operation: "memory.timeline" }
     );
   });
-  memory.command("fetch <ids>").description("Fetch full details for specific observation IDs").option("--json", "Output as JSON").action(async (idsRaw, _opts) => {
+  memory.command("fetch <ids>").description("Fetch full details for specific observation IDs").action(async (idsRaw) => {
     const ids = idsRaw.split(/[,\s]+/).map((s3) => s3.trim()).filter(Boolean);
     await dispatchFromCli(
       "query",
       "memory",
       "fetch",
       { ids },
-      { command: "memory", operation: "memory.fetch" }
+      { command: "memory-fetch", operation: "memory.fetch" }
     );
   });
   memory.command("decision-find [query]").description("Search decisions stored in brain.db").option("--limit <n>", "Maximum results", parseInt).option("--json", "Output as JSON").action(async (query, opts) => {
@@ -123691,16 +123769,17 @@ function registerMemoryBrainCommand(program) {
       { command: "memory", operation: "memory.graph.neighbors" }
     );
   });
-  memory.command("graph-add").description("Add a node or edge to the PageIndex graph").option("--node-id <id>", "Node ID to add").option("--label <text>", "Label for the node").option("--from <id>", "Source node ID for an edge").option("--to <id>", "Target node ID for an edge").option("--edge-type <type>", "Edge relationship type").option("--json", "Output as JSON").action(async (opts) => {
+  memory.command("graph-add").description("Add a node or edge to the PageIndex graph").option("--node-id <id>", "Node ID to add").option("--node-type <type>", "Node type (e.g. concept, task, file)").option("--label <text>", "Label for the node").option("--from <id>", "Source node ID for an edge").option("--to <id>", "Target node ID for an edge").option("--edge-type <type>", "Edge relationship type").option("--json", "Output as JSON").action(async (opts) => {
     await dispatchFromCli(
       "mutate",
       "memory",
       "graph.add",
       {
         ...opts["nodeId"] !== void 0 && { nodeId: opts["nodeId"] },
+        ...opts["nodeType"] !== void 0 && { nodeType: opts["nodeType"] },
         ...opts["label"] !== void 0 && { label: opts["label"] },
-        ...opts["from"] !== void 0 && { from: opts["from"] },
-        ...opts["to"] !== void 0 && { to: opts["to"] },
+        ...opts["from"] !== void 0 && { fromId: opts["from"] },
+        ...opts["to"] !== void 0 && { toId: opts["to"] },
         ...opts["edgeType"] !== void 0 && { edgeType: opts["edgeType"] }
       },
       { command: "memory", operation: "memory.graph.add" }
@@ -123713,8 +123792,8 @@ function registerMemoryBrainCommand(program) {
       "graph.remove",
       {
         ...opts["nodeId"] !== void 0 && { nodeId: opts["nodeId"] },
-        ...opts["from"] !== void 0 && { from: opts["from"] },
-        ...opts["to"] !== void 0 && { to: opts["to"] }
+        ...opts["from"] !== void 0 && { fromId: opts["from"] },
+        ...opts["to"] !== void 0 && { toId: opts["to"] }
       },
       { command: "memory", operation: "memory.graph.remove" }
     );
@@ -123760,6 +123839,7 @@ function registerMemoryBrainCommand(program) {
 // packages/cleo/src/cli/commands/migrate-claude-mem.ts
 init_internal();
 init_cli();
+init_renderers();
 function registerMigrateClaudeMemCommand(program) {
   let migrateCmd = program.commands.find((c) => c.name() === "migrate");
   if (!migrateCmd) {
@@ -123786,23 +123866,26 @@ function registerMigrateClaudeMemCommand(program) {
         dryRun: !!opts["dryRun"],
         batchSize: opts["batchSize"] || void 0
       });
-      if (result.dryRun) {
-        console.log("[dry run] No changes made.");
-      }
-      console.log(
-        `Imported ${result.observationsImported} observations, ${result.learningsImported} learnings, ${result.decisionsImported} decisions (${result.observationsSkipped} skipped)`
+      cliOutput(
+        {
+          dryRun: result.dryRun,
+          observationsImported: result.observationsImported,
+          learningsImported: result.learningsImported,
+          decisionsImported: result.decisionsImported,
+          observationsSkipped: result.observationsSkipped,
+          errors: result.errors
+        },
+        { command: "migrate-claude-mem", operation: "migrate.claude-mem" }
       );
       if (result.errors.length > 0) {
-        console.error(`
-${result.errors.length} error(s):`);
-        for (const err of result.errors) {
-          console.error(`  - ${err}`);
-        }
-        process.exit(1);
+        process.exitCode = 1;
       }
     } catch (err) {
-      console.error(`Error: ${err.message}`);
-      process.exit(1);
+      const message = err instanceof Error ? err.message : String(err);
+      cliError(message, "E_MIGRATION_FAILED", void 0, {
+        operation: "migrate.claude-mem"
+      });
+      process.exitCode = 1;
     }
   });
 }
@@ -124035,42 +124118,6 @@ function registerNexusCommand(program) {
   });
 }
 
-// packages/cleo/src/cli/commands/observe.ts
-init_cli();
-function registerObserveCommand(program) {
-  program.command("observe <text>").description(
-    "Save an observation to brain.db \u2014 captures facts, decisions, and discoveries for cross-session memory"
-  ).option(
-    "-t, --title <title>",
-    "Short title for the observation (defaults to first 120 chars of text)"
-  ).option(
-    "--type <type>",
-    "Category: discovery (found something new), decision (choice made), bugfix (bug found/fixed), refactor (code restructured), feature (feature added), change (general change), pattern (recurring pattern), session_summary (end-of-session recap)"
-  ).option(
-    "--agent <name>",
-    "Name of the agent producing this observation (enables per-agent memory retrieval)"
-  ).option(
-    "--source-type <sourceType>",
-    "How this observation was captured: manual (typed by human/agent), auto (lifecycle hook), transcript (extracted from session)"
-  ).action(
-    async (text3, opts) => {
-      await dispatchFromCli(
-        "mutate",
-        "memory",
-        "observe",
-        {
-          text: text3,
-          title: opts.title,
-          ...opts.type !== void 0 && { type: opts.type },
-          ...opts.agent !== void 0 && { agent: opts.agent },
-          sourceType: opts.sourceType ?? "manual"
-        },
-        { command: "observe", operation: "memory.observe" }
-      );
-    }
-  );
-}
-
 // packages/cleo/src/cli/commands/ops.ts
 init_cli();
 function registerOpsCommand(program) {
@@ -124184,11 +124231,18 @@ function registerOrchestrateCommand(program) {
       { command: "orchestrate" }
     );
   });
-  tessera.command("instantiate <templateId> <epicId>").description("Instantiate a tessera template for an epic").option("--var <pairs...>", "Key=value variable overrides").action(async (templateId, epicId, opts) => {
+  tessera.command("instantiate <templateId> <epicId>").description("Instantiate a tessera template for an epic").option("--var <pairs>", "Comma-separated key=value variable overrides (e.g. foo=bar,baz=qux)").action(async (templateId, epicId, opts) => {
     const variables = {};
-    const pairs = opts["var"];
-    if (Array.isArray(pairs)) {
-      for (const pair of pairs) {
+    const raw = opts["var"];
+    if (typeof raw === "string") {
+      for (const pair of raw.split(",")) {
+        const eqIdx = pair.indexOf("=");
+        if (eqIdx > 0) {
+          variables[pair.slice(0, eqIdx).trim()] = pair.slice(eqIdx + 1).trim();
+        }
+      }
+    } else if (Array.isArray(raw)) {
+      for (const pair of raw) {
         const eqIdx = pair.indexOf("=");
         if (eqIdx > 0) {
           variables[pair.slice(0, eqIdx)] = pair.slice(eqIdx + 1);
@@ -124230,12 +124284,12 @@ function registerOrchestrateCommand(program) {
       { command: "orchestrate" }
     );
   });
-  orch.command("fanout-status").description("Get fanout status for an epic").option("--epic <epicId>", "Epic ID to scope fanout status to").action(async (opts) => {
+  orch.command("fanout-status").description("Get fanout status by manifest entry ID").requiredOption("--manifest-entry-id <id>", "Manifest entry ID returned by orchestrate.fanout").action(async (opts) => {
     await dispatchFromCli(
       "query",
       "orchestrate",
       "fanout.status",
-      { epicId: opts["epic"] },
+      { manifestEntryId: opts["manifestEntryId"] },
       { command: "orchestrate" }
     );
   });
@@ -124259,11 +124313,12 @@ function registerOrchestrateCommand(program) {
   });
   orch.command("fanout <epicId>").description("Fan out tasks for an epic using parallel spawn").option("--tasks <ids>", "Comma-separated task IDs to fan out").action(async (epicId, opts) => {
     const taskIds = typeof opts["tasks"] === "string" ? opts["tasks"].split(",").map((s3) => s3.trim()) : void 0;
+    const items = taskIds ? taskIds.map((taskId) => ({ taskId, team: "default" })) : void 0;
     await dispatchFromCli(
       "mutate",
       "orchestrate",
       "fanout",
-      { epicId, taskIds },
+      { epicId, items },
       { command: "orchestrate" }
     );
   });
@@ -124290,7 +124345,7 @@ function registerOrchestrateCommand(program) {
       "mutate",
       "orchestrate",
       "conduit.start",
-      { pollInterval: opts["pollInterval"] },
+      { pollIntervalMs: opts["pollInterval"] },
       { command: "orchestrate" }
     );
   });
@@ -124310,7 +124365,7 @@ function registerOrchestrateCommand(program) {
       "conduit.send",
       {
         content,
-        agentId: opts["to"],
+        to: opts["to"],
         conversationId: opts["conversation"]
       },
       { command: "orchestrate" }
@@ -124486,32 +124541,6 @@ function registerPhaseCommand(program) {
   });
 }
 
-// packages/cleo/src/cli/commands/phases.ts
-init_cli();
-function registerPhasesCommand(program) {
-  const phases = program.command("phases").description(
-    "DEPRECATED: Use `cleo phase` instead. List phases with progress bars and statistics"
-  );
-  phases.command("list", { isDefault: true }).description("List all phases with progress (default)").action(async () => {
-    console.error("[DEPRECATED] cleo phases is deprecated. Use: cleo phase list");
-    await dispatchFromCli("query", "pipeline", "phase.list", {}, { command: "phases" });
-  });
-  phases.command("show <phase>").description("Show phase details and task counts").action(async (phase) => {
-    console.error("[DEPRECATED] cleo phases is deprecated. Use: cleo phase show");
-    await dispatchFromCli(
-      "query",
-      "pipeline",
-      "phase.show",
-      { phaseId: phase },
-      { command: "phases" }
-    );
-  });
-  phases.command("stats").description("Show detailed phase statistics").action(async () => {
-    console.error("[DEPRECATED] cleo phases is deprecated. Use: cleo phase list");
-    await dispatchFromCli("query", "pipeline", "phase.list", {}, { command: "phases" });
-  });
-}
-
 // packages/cleo/src/cli/commands/plan.ts
 init_cli();
 function registerPlanCommand(program) {
@@ -124624,28 +124653,7 @@ function registerProviderCommand(program) {
 // packages/cleo/src/cli/commands/reason.ts
 init_cli();
 function registerReasonCommand(program) {
-  const reason = program.command("reason").description("Reasoning and intelligence operations (why, similar, impact, timeline)");
-  reason.command("why <taskId>").description("Explain why a task exists via causal trace through dependency chains").option("--json", "Output raw JSON envelope").action(async (taskId) => {
-    await dispatchFromCli(
-      "query",
-      "memory",
-      "reason.why",
-      { taskId },
-      { command: "reason", operation: "memory.reason.why" }
-    );
-  });
-  reason.command("similar <taskId>").description("Find BRAIN entries semantically similar to a task or observation ID").option("--limit <n>", "Maximum number of results to return", parseInt).option("--json", "Output raw JSON envelope").action(async (taskId, opts) => {
-    await dispatchFromCli(
-      "query",
-      "memory",
-      "reason.similar",
-      {
-        entryId: taskId,
-        limit: opts["limit"]
-      },
-      { command: "reason", operation: "memory.reason.similar" }
-    );
-  });
+  const reason = program.command("reason").description("Reasoning and intelligence operations (impact, timeline)");
   reason.command("impact [taskId]").description(
     "Predict impact of a change. Use --change for free-text prediction, or pass a taskId for graph-based analysis."
   ).option("--change <description>", "Free-text description of the proposed change (T043)").option("--limit <n>", "Maximum seed tasks to match when using --change (default: 5)", "5").option("--depth <n>", "Maximum traversal depth when using taskId (default: 10)", "10").option("--json", "Output raw JSON envelope").action(async (taskId, opts) => {
@@ -124992,9 +125000,20 @@ function registerRemoteCommand(program) {
 
 // packages/cleo/src/cli/commands/reorder.ts
 init_cli();
+var BOTTOM_POSITION = 999999;
 function registerReorderCommand(program) {
-  program.command("reorder <task-id>").description("Change task position within sibling group").option("--position <n>", "Move to specific zero-based position among siblings", parseInt).action(async (taskId, opts) => {
-    const position = opts["position"];
+  program.command("reorder <task-id>").description("Change task position within sibling group").option("--position <n>", "Move to specific zero-based position among siblings", parseInt).option("--top", "Move to the top (position 0)").option("--bottom", "Move to the bottom").action(async (taskId, opts) => {
+    let position = opts["position"];
+    if (opts["top"]) {
+      position = 0;
+    } else if (opts["bottom"]) {
+      position = BOTTOM_POSITION;
+    }
+    if (position === void 0) {
+      console.error("Error: Must specify --position <n>, --top, or --bottom.");
+      process.exitCode = 2;
+      return;
+    }
     await dispatchFromCli(
       "mutate",
       "tasks",
@@ -125022,22 +125041,36 @@ function registerReparentCommand(program) {
 
 // packages/cleo/src/cli/commands/research.ts
 init_cli();
+function generateResearchId() {
+  return `res_${Date.now()}`;
+}
 function registerResearchCommand(program) {
   const research = program.command("research").description("Research commands and manifest operations");
-  research.command("add").description("Add a research entry").requiredOption("-t, --task <taskId>", "Task ID to attach research to").requiredOption("--topic <topic>", "Research topic").option("--findings <findings>", "Comma-separated findings").option("--sources <sources>", "Comma-separated sources").action(async (opts) => {
+  research.command("add").description("Add a research entry").requiredOption("-t, --task <taskId>", "Task ID to attach research to").requiredOption("--topic <topic>", "Research topic").option("--findings <findings>", "Comma-separated findings").option("--sources <sources>", "Comma-separated sources").option("--agent-type <agentType>", "Agent type that produced this entry", "researcher").action(async (opts) => {
+    const topic = opts["topic"];
+    const findings = opts["findings"] ? opts["findings"].split(",").map((s3) => s3.trim()) : [];
+    const taskId = opts["task"];
+    const agentType = opts["agentType"] ?? "researcher";
     await dispatchFromCli(
       "mutate",
       "pipeline",
       "manifest.append",
       {
         entry: {
-          taskId: opts["task"],
-          topic: opts["topic"],
-          findings: opts["findings"] ? opts["findings"].split(",").map((s3) => s3.trim()) : void 0,
-          sources: opts["sources"] ? opts["sources"].split(",").map((s3) => s3.trim()) : void 0
+          id: generateResearchId(),
+          file: "",
+          title: topic,
+          date: (/* @__PURE__ */ new Date()).toISOString().slice(0, 10),
+          status: "partial",
+          agent_type: agentType,
+          topics: [topic],
+          key_findings: findings,
+          actionable: findings.length > 0,
+          needs_followup: [],
+          linked_tasks: [taskId]
         }
       },
-      { command: "research" }
+      { command: "research", operation: "pipeline.manifest.append" }
     );
   });
   research.command("show <id>").description("Show a research entry").action(async (id) => {
@@ -125078,29 +125111,46 @@ function registerResearchCommand(program) {
       "manifest.append",
       {
         entry: {
-          type: "link",
-          entryId: researchId,
-          taskId
-        }
-      },
-      { command: "research" }
-    );
-  });
-  research.command("update <id>").description("Update research findings").option("--findings <findings>", "Comma-separated findings").option("--sources <sources>", "Comma-separated sources").option("-s, --status <status>", "Set status").action(async (id, opts) => {
+          id: researchId,
+          file: "",
+          title: `Link: ${researchId} -> ${taskId}`,
+          date: (/* @__PURE__ */ new Date()).toISOString().slice(0, 10),
+          status: "partial",
+          agent_type: "researcher",
+          topics: [],
+          key_findings: [],
+          actionable: false,
+          needs_followup: [],
+          linked_tasks: [taskId]
+        }
+      },
+      { command: "research", operation: "pipeline.manifest.append" }
+    );
+  });
+  research.command("update <id>").description("Update research findings").option("--findings <findings>", "Comma-separated findings").option("--sources <sources>", "Comma-separated sources").option("-s, --status <status>", "Set status (completed, partial, blocked)").option("--topic <topic>", "Research topic (used as title)").action(async (id, opts) => {
+    const findings = opts["findings"] ? opts["findings"].split(",").map((s3) => s3.trim()) : [];
+    const status = opts["status"] ?? "partial";
+    const topic = opts["topic"] ?? `Updated research: ${id}`;
     await dispatchFromCli(
       "mutate",
       "pipeline",
       "manifest.append",
       {
         entry: {
-          type: "update",
-          entryId: id,
-          findings: opts["findings"] ? opts["findings"].split(",").map((s3) => s3.trim()) : void 0,
-          sources: opts["sources"] ? opts["sources"].split(",").map((s3) => s3.trim()) : void 0,
-          status: opts["status"]
+          id,
+          file: "",
+          title: topic,
+          date: (/* @__PURE__ */ new Date()).toISOString().slice(0, 10),
+          status,
+          agent_type: "researcher",
+          topics: topic !== `Updated research: ${id}` ? [topic] : [],
+          key_findings: findings,
+          actionable: findings.length > 0,
+          needs_followup: [],
+          linked_tasks: []
         }
       },
-      { command: "research" }
+      { command: "research", operation: "pipeline.manifest.append" }
     );
   });
   research.command("stats").description("Show research statistics").action(async () => {
@@ -125341,7 +125391,7 @@ function registerRestoreCommand(program) {
       const fileName = opts["file"] || "tasks.db";
       const scope = opts["scope"] || "project";
       const response = await dispatchRaw("mutate", "admin", "backup", {
-        action: "restore",
+        action: "restore.file",
         file: fileName,
         dryRun: opts["dryRun"],
         scope
@@ -125703,7 +125753,7 @@ init_src();
 init_internal();
 import { execFile as execFile8 } from "node:child_process";
 import { readFile as readFile22 } from "node:fs/promises";
-import { join as join128 } from "node:path";
+import { join as join129 } from "node:path";
 import * as readline2 from "node:readline";
 import { promisify as promisify8 } from "node:util";
 init_renderers();
@@ -125712,7 +125762,7 @@ var GITHUB_REPO = BUILD_CONFIG.repository.fullName;
 async function getCurrentVersion() {
   const cleoHome = getCleoHome();
   try {
-    const content = await readFile22(join128(cleoHome, "VERSION"), "utf-8");
+    const content = await readFile22(join129(cleoHome, "VERSION"), "utf-8");
     return (content.split("\n")[0] ?? "unknown").trim();
   } catch {
     return "unknown";
@@ -125766,7 +125816,7 @@ async function writeRuntimeVersionMetadata(mode, source, version2) {
   ];
   await import("node:fs/promises").then(
     ({ writeFile: writeFile15, mkdir: mkdir20 }) => mkdir20(cleoHome, { recursive: true }).then(
-      () => writeFile15(join128(cleoHome, "VERSION"), `${lines.join("\n")}
+      () => writeFile15(join129(cleoHome, "VERSION"), `${lines.join("\n")}
 `, "utf-8")
     )
   );
@@ -126079,7 +126129,7 @@ function registerSessionCommand(program) {
       { command: "session", operation: "session.start" }
     );
   });
-  session.command("stop").alias("end").description("Stop the current session").option("--session <id>", "Specific session ID to stop").option("--note <note>", "Stop note").option("--next-action <action>", "Suggested next action").action(async (opts) => {
+  session.command("end").alias("stop").description("End the current session").option("--session <id>", "Specific session ID to stop").option("--note <note>", "Stop note").option("--next-action <action>", "Suggested next action").action(async (opts) => {
     await dispatchFromCli(
       "mutate",
       "session",
@@ -126100,7 +126150,7 @@ function registerSessionCommand(program) {
       handleRawError(response, { command: "session handoff", operation: "session.handoff.show" });
     }
     const data = response.data;
-    if (!data || !data.handoff) {
+    if (!data?.handoff) {
       cliOutput(
         { handoff: null },
         {
@@ -126244,7 +126294,7 @@ function registerSessionCommand(program) {
       { command: "session", operation: "session.record.assumption" }
     );
   });
-  session.command("record-decision").description("Record a decision made during the current session").requiredOption("--session-id <sessionId>", "Session ID").requiredOption("--task-id <taskId>", "Task ID the decision relates to").requiredOption("--decision <decision>", "Decision text").requiredOption("--rationale <rationale>", "Rationale for the decision").option("--alternatives <alternatives>", "Alternatives considered").action(async (opts) => {
+  session.command("record-decision").description("Record a decision made during the current session").option("--session-id <sessionId>", "Session ID (defaults to active session)").requiredOption("--task-id <taskId>", "Task ID the decision relates to").requiredOption("--decision <decision>", "Decision text").requiredOption("--rationale <rationale>", "Rationale for the decision").option("--alternatives <alternatives>", "Alternatives considered").action(async (opts) => {
     await dispatchFromCli(
       "mutate",
       "session",
@@ -126520,44 +126570,6 @@ function registerSnapshotCommand(program) {
   });
 }
 
-// packages/cleo/src/cli/commands/specification.ts
-init_cli();
-function registerSpecificationCommand(program) {
-  const specification = program.command("specification").description(
-    "Validate specification protocol compliance (alias for `cleo check protocol specification`)"
-  );
-  specification.command("validate <taskId>").description("Validate specification protocol compliance for task").option("--strict", "Exit with error code on violations").option("--spec-file <file>", "Path to specification file").action(async (taskId, opts) => {
-    await dispatchFromCli(
-      "query",
-      "check",
-      "protocol",
-      {
-        protocolType: "specification",
-        mode: "task",
-        taskId,
-        strict: opts["strict"],
-        specFile: opts["specFile"]
-      },
-      { command: "specification" }
-    );
-  });
-  specification.command("check <manifestFile>").description("Validate manifest entry directly").option("--strict", "Exit with error code on violations").option("--spec-file <file>", "Path to specification file").action(async (manifestFile, opts) => {
-    await dispatchFromCli(
-      "query",
-      "check",
-      "protocol",
-      {
-        protocolType: "specification",
-        mode: "manifest",
-        manifestFile,
-        strict: opts["strict"],
-        specFile: opts["specFile"]
-      },
-      { command: "specification" }
-    );
-  });
-}
-
 // packages/cleo/src/cli/commands/start.ts
 init_cli();
 function registerStartCommand(program) {
@@ -126601,15 +126613,17 @@ init_cli();
 init_renderers();
 function registerStickyCommand(program) {
   const sticky = program.command("sticky").description("Manage sticky notes - quick project-wide ephemeral captures");
-  sticky.command("add <content>").alias("jot").description("Create a new sticky note").option("--tag <tag>", "Add a tag (can be used multiple times)", collect, []).option("--color <color>", "Sticky color: yellow|blue|green|red|purple", "yellow").option("--priority <priority>", "Priority: low|medium|high", "medium").action(async (content, opts) => {
+  sticky.command("add <content>").alias("jot").description("Create a new sticky note").option("--tag <tags>", 'Comma-separated tags (e.g. "bug,urgent")').option("--color <color>", "Sticky color: yellow|blue|green|red|purple", "yellow").option("--priority <priority>", "Priority: low|medium|high", "medium").action(async (content, opts) => {
     try {
+      const rawTag = opts["tag"];
+      const tags = rawTag ? rawTag.split(",").map((t) => t.trim()).filter(Boolean) : [];
       await dispatchFromCli(
         "mutate",
         "sticky",
         "add",
         {
           content,
-          tags: opts["tag"],
+          tags,
           color: opts["color"],
           priority: opts["priority"]
         },
@@ -126623,10 +126637,12 @@ function registerStickyCommand(program) {
       throw err;
     }
   });
-  sticky.command("list").alias("ls").description("List active sticky notes").option("--tag <tag>", "Filter by tag").option("--color <color>", "Filter by color").option("--status <status>", "Filter by status: active|converted|archived", "active").option("--limit <n>", "Max results", parseInt, 50).action(async (opts) => {
+  sticky.command("list").alias("ls").description("List active sticky notes").option("--tag <tags>", 'Filter by tags (comma-separated, e.g. "bug,urgent")').option("--color <color>", "Filter by color").option("--status <status>", "Filter by status: active|converted|archived", "active").option("--limit <n>", "Max results", parseInt, 50).action(async (opts) => {
     try {
+      const rawTag = opts["tag"];
+      const tags = rawTag ? rawTag.split(",").map((t) => t.trim()).filter(Boolean) : void 0;
       const response = await dispatchRaw("query", "sticky", "list", {
-        tag: opts["tag"],
+        tags,
         color: opts["color"],
         status: opts["status"],
         limit: opts["limit"]
@@ -126765,9 +126781,6 @@ function registerStickyCommand(program) {
     }
   });
 }
-function collect(value, previous) {
-  return previous.concat([value]);
-}
 
 // packages/cleo/src/cli/commands/stop.ts
 init_cli();
@@ -126780,19 +126793,25 @@ function registerStopCommand(program) {
 }
 
 // packages/cleo/src/cli/commands/sync.ts
+init_src();
 init_cli();
 function registerSyncCommand(program) {
   const sync = program.command("sync").description("External task synchronisation management");
   const links = sync.command("links").description("List external task links");
   links.command("list").description("List external task links (filter by provider or task)").option("--provider <providerId>", "Filter links by provider (e.g. linear, jira, github)").option("--task <taskId>", "Filter links by CLEO task ID").action(async (opts) => {
+    const providerId = opts["provider"];
+    const taskId = opts["task"];
+    if (!providerId && !taskId) {
+      console.error(
+        "Error: at least one of --provider or --task is required for sync links list"
+      );
+      process.exit(2 /* INVALID_INPUT */);
+    }
     await dispatchFromCli(
       "query",
       "tasks",
       "sync.links",
-      {
-        providerId: opts["provider"],
-        taskId: opts["task"]
-      },
+      { providerId, taskId },
       { command: "sync", operation: "tasks.sync.links" }
     );
   });
@@ -127144,26 +127163,6 @@ function registerUpgradeCommand(program) {
   });
 }
 
-// packages/cleo/src/cli/commands/validate.ts
-init_cli();
-function registerValidateCommand(program) {
-  program.command("validate").description(
-    "DEPRECATED: Use `cleo check schema todo` instead. Validate task data against schema and business rules"
-  ).option("--strict", "Treat warnings as errors").action(async (opts) => {
-    console.error("[DEPRECATED] cleo validate is deprecated. Use: cleo check schema todo");
-    await dispatchFromCli(
-      "query",
-      "check",
-      "schema",
-      {
-        type: "todo",
-        strict: opts["strict"]
-      },
-      { command: "validate", operation: "check.schema" }
-    );
-  });
-}
-
 // packages/cleo/src/cli/commands/verify.ts
 init_cli();
 function registerVerifyCommand(program) {
@@ -127192,15 +127191,15 @@ init_src2();
 init_renderers();
 import { execFileSync as execFileSync18, spawn as spawn2 } from "node:child_process";
 import { mkdir as mkdir19, readFile as readFile23, rm as rm3, stat as stat3, writeFile as writeFile14 } from "node:fs/promises";
-import { join as join129 } from "node:path";
+import { join as join130 } from "node:path";
 var DEFAULT_PORT = 3456;
 var DEFAULT_HOST = "127.0.0.1";
 function getWebPaths() {
   const cleoHome = getCleoHome();
   return {
-    pidFile: join129(cleoHome, "web-server.pid"),
-    configFile: join129(cleoHome, "web-server.json"),
-    logFile: join129(cleoHome, "logs", "web-server.log")
+    pidFile: join130(cleoHome, "web-server.pid"),
+    configFile: join130(cleoHome, "web-server.json"),
+    logFile: join130(cleoHome, "logs", "web-server.log")
   };
 }
 function isProcessRunning(pid) {
@@ -127247,8 +127246,8 @@ function registerWebCommand(program) {
         );
       }
       const projectRoot = process.env["CLEO_ROOT"] ?? process.cwd();
-      const distServerDir = join129(projectRoot, "dist", "cli");
-      await mkdir19(join129(getCleoHome(), "logs"), { recursive: true });
+      const distServerDir = join130(projectRoot, "dist", "cli");
+      await mkdir19(join130(getCleoHome(), "logs"), { recursive: true });
       await writeFile14(
         configFile,
         JSON.stringify({
@@ -127257,7 +127256,7 @@ function registerWebCommand(program) {
           startedAt: (/* @__PURE__ */ new Date()).toISOString()
         })
       );
-      const webIndexPath = join129(distServerDir, "index.js");
+      const webIndexPath = join130(distServerDir, "index.js");
       try {
         await stat3(webIndexPath);
       } catch {
@@ -127423,9 +127422,9 @@ var codeCommand = defineCommand({
       async run({ args }) {
         await requireTreeSitter();
         const { smartOutline: smartOutline2 } = await Promise.resolve().then(() => (init_internal(), internal_exports));
-        const { join: join131 } = await import("node:path");
+        const { join: join132 } = await import("node:path");
         const root = process.cwd();
-        const absPath = args.file.startsWith("/") ? args.file : join131(root, args.file);
+        const absPath = args.file.startsWith("/") ? args.file : join132(root, args.file);
         const result = smartOutline2(absPath, root);
         if (result.errors.length > 0 && result.symbols.length === 0) {
           console.error(`Error: ${result.errors.join(", ")}`);
@@ -127491,9 +127490,9 @@ var codeCommand = defineCommand({
       async run({ args }) {
         await requireTreeSitter();
         const { smartUnfold: smartUnfold2 } = await Promise.resolve().then(() => (init_internal(), internal_exports));
-        const { join: join131 } = await import("node:path");
+        const { join: join132 } = await import("node:path");
         const root = process.cwd();
-        const absPath = args.file.startsWith("/") ? args.file : join131(root, args.file);
+        const absPath = args.file.startsWith("/") ? args.file : join132(root, args.file);
         const result = smartUnfold2(absPath, args.symbol, root);
         if (!result.found) {
           console.error(`Symbol "${args.symbol}" not found in ${args.file}`);
@@ -127512,7 +127511,7 @@ var codeCommand = defineCommand({
 
 // packages/cleo/src/cli/index.ts
 function getPackageVersion() {
-  const pkgPath = join130(dirname28(fileURLToPath5(import.meta.url)), "../../package.json");
+  const pkgPath = join131(dirname29(fileURLToPath6(import.meta.url)), "../../package.json");
   const pkg = JSON.parse(readFileSync101(pkgPath, "utf-8"));
   return pkg.version;
 }
@@ -127542,7 +127541,6 @@ registerChainCommand(rootShim);
 registerLifecycleCommand(rootShim);
 registerReleaseCommand(rootShim);
 registerCheckpointCommand(rootShim);
-registerCommandsCommand(rootShim);
 registerDocsCommand(rootShim);
 registerExportTasksCommand(rootShim);
 registerImportTasksCommand(rootShim);
@@ -127570,15 +127568,11 @@ registerBlockersCommand(rootShim);
 registerCheckCommand(rootShim);
 registerComplianceCommand(rootShim);
 registerConfigCommand(rootShim);
-registerConsensusCommand(rootShim);
 registerContextCommand(rootShim);
-registerContributionCommand(rootShim);
 registerDashCommand(rootShim);
-registerDecompositionCommand(rootShim);
 registerDoctorCommand(rootShim);
 registerExportCommand(rootShim);
 registerHistoryCommand(rootShim);
-registerImplementationCommand(rootShim);
 registerImportCommand(rootShim);
 registerInitCommand(rootShim);
 registerInjectCommand(rootShim);
@@ -127588,7 +127582,6 @@ registerNextCommand(rootShim);
 registerPlanCommand(rootShim);
 registerOtelCommand(rootShim);
 registerTokenCommand(rootShim);
-registerPhasesCommand(rootShim);
 registerPromoteCommand(rootShim);
 registerRelatesCommand(rootShim);
 registerReorderCommand(rootShim);
@@ -127597,10 +127590,8 @@ registerRestoreCommand(rootShim);
 registerRoadmapCommand(rootShim);
 registerSelfUpdateCommand(rootShim);
 registerSequenceCommand(rootShim);
-registerSpecificationCommand(rootShim);
 registerStatsCommand(rootShim);
 registerUpgradeCommand(rootShim);
-registerValidateCommand(rootShim);
 registerVerifyCommand(rootShim);
 registerDetectCommand(rootShim);
 registerDetectDriftCommand(rootShim);
@@ -127618,7 +127609,6 @@ registerMigrateClaudeMemCommand(rootShim);
 registerStickyCommand(rootShim);
 registerReasonCommand(rootShim);
 registerRefreshMemoryCommand(rootShim);
-registerObserveCommand(rootShim);
 registerSchemaCommand(rootShim);
 function shimToCitty(shim) {
   const cittyArgs = {};