@cleocode/core 2026.5.133 → 2026.6.0

package/dist/playbooks/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/playbooks/index.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;GAWG;AAEH,OAAO,EACL,eAAe,EAEf,mBAAmB,EAEnB,qBAAqB,EAGrB,gBAAgB,GACjB,MAAM,uBAAuB,CAAC;AAI/B,OAAO,EACL,aAAa,EACb,qBAAqB,EAIrB,eAAe,GAChB,MAAM,wBAAwB,CAAC"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/playbooks/index.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;GAWG;AAEH,OAAO,EACL,eAAe,EAEf,mBAAmB,EAEnB,qBAAqB,EAGrB,gBAAgB,GACjB,MAAM,uBAAuB,CAAC;AAI/B,OAAO,EACL,aAAa,EACb,qBAAqB,EAIrB,eAAe,GAChB,MAAM,wBAAwB,CAAC;AAEhC,2EAA2E;AAC3E,6EAA6E;AAC7E,0BAA0B;AAC1B,OAAO,EACL,uBAAuB,EACvB,qBAAqB,EACrB,mBAAmB,GAIpB,MAAM,0BAA0B,CAAC"}

package/dist/playbooks/skill-node-executor.d.ts

@@ -0,0 +1,155 @@
+/**
+ * Skill-node executor factory — wires the in-process {@link SkillExecutorAdapter}
+ * into `CoreAgentDispatcherOptions.executor` while RETAINING the subprocess-spawn
+ * path for isolation nodes (T11477 · epic T11391 · saga T11387).
+ *
+ * ## The routing decision (AC2 + AC3)
+ *
+ * `CoreAgentDispatcher` resolves `agentId = node.agent ?? node.skill` and then
+ * calls its injected `executor` to perform the actual work. This factory builds
+ * that executor so it routes on the node's nature:
+ *
+ *  - **In-process skill node** — the `agentId` names a `ct-*` skill that
+ *    resolves via {@link findSkill}, AND the dispatch context does not request
+ *    isolation. These run through {@link SkillExecutorAdapter} **in-process**:
+ *    the skill→tool joint is a function call over the injected
+ *    {@link GuardedToolSurface}, NOT a process boundary (AC1, AC4). This is the
+ *    DEFAULT for in-process skill nodes, REPLACING `orchestrateSpawnExecute`
+ *    for them (AC2).
+ *
+ *  - **Isolation / agent node** — anything else (an `agent`-backed node, a node
+ *    whose context requests `isolation`, or a skill that does not resolve
+ *    in-process). These delegate to the INJECTED {@link SubprocessSpawnExecutor}
+ *    — typically the runtime's `orchestrateSpawnExecute`, which provisions a git
+ *    worktree and spawns a real subagent (AC3). The fallback is injected, not
+ *    imported, so `@cleocode/core` keeps its no-dependency-on-`@cleocode/runtime`
+ *    invariant (DIP again — the worktree mechanism is a detail core depends on
+ *    through an abstraction).
+ *
+ * ## Why the fallback is injected
+ *
+ * `orchestrateSpawnExecute` lives in `@cleocode/runtime/gateway`. `core` must not
+ * import it (directed layering `contracts → core → runtime`). The CLI/runtime
+ * layer that already imports the gateway supplies it via
+ * {@link SkillNodeExecutorOptions.subprocessSpawn}; when omitted, isolation nodes
+ * report a structured failure rather than silently degrading.
+ *
+ * @epic T11391
+ * @task T11477
+ * @saga T11387
+ */
+import type { ResolvedAgent } from '@cleocode/contracts';
+import type { GuardedToolSurface } from '@cleocode/contracts/tools/skill-executor';
+import { type SkillRunner } from '../skills/skill-executor-adapter.js';
+import type { DispatchContext, DispatchResult } from './agent-dispatcher.js';
+/**
+ * Context-binding key the playbook author / dispatcher uses to FORCE the
+ * subprocess-spawn (isolation) path even when the node names a resolvable
+ * `ct-*` skill. Truthy → isolation; absent/falsy → in-process skill execution.
+ */
+export declare const ISOLATION_CONTEXT_KEY = "isolation";
+/**
+ * Subprocess-spawn fallback for isolation / agent nodes. Mirrors the shape the
+ * runtime's `orchestrateSpawnExecute` is adapted to: given the resolved agent
+ * and dispatch context, perform a real (worktree-isolated) spawn and return a
+ * dispatch envelope.
+ *
+ * Injected (not imported) so `core` never depends on `@cleocode/runtime`.
+ *
+ * @param agent - The resolved agent/skill envelope from the dispatcher.
+ * @param context - The dispatch context (run id, node id, agent id, bindings).
+ * @returns The terminal {@link DispatchResult} for the subprocess spawn.
+ */
+export type SubprocessSpawnExecutor = (agent: ResolvedAgent, context: DispatchContext) => Promise<DispatchResult>;
+/**
+ * Options accepted by {@link createSkillNodeExecutor}.
+ *
+ * @task T11477
+ */
+export interface SkillNodeExecutorOptions {
+    /**
+     * The deny-first guarded tool surface handed to every in-process skill
+     * execution. Typically the result of `createToolGuard({ allowedRoots: [...] })`.
+     * Injected (DIP) — the executor never constructs its own guard.
+     */
+    readonly tools: GuardedToolSurface;
+    /**
+     * The subprocess-spawn fallback used for isolation / agent nodes (AC3). When
+     * omitted, isolation nodes return a structured failure instead of silently
+     * running in-process — refusing to weaken the isolation guarantee.
+     */
+    readonly subprocessSpawn?: SubprocessSpawnExecutor;
+    /**
+     * Working directory used to resolve `ct-*` skills. Defaults to the process
+     * cwd via {@link findSkill}.
+     */
+    readonly cwd?: string;
+    /**
+     * Optional in-process runner strategy forwarded to the
+     * {@link SkillExecutorAdapter} (the GenKit-phase model runner plugs in here).
+     */
+    readonly runner?: SkillRunner;
+}
+/**
+ * Build a `CoreAgentDispatcherOptions.executor` that runs in-process skill nodes
+ * through {@link SkillExecutorAdapter} and routes isolation / agent nodes to the
+ * injected subprocess-spawn fallback.
+ *
+ * Inject the result as `executor` when constructing a `CoreAgentDispatcher`:
+ *
+ * @example
+ * ```ts
+ * import { createToolGuard } from '@cleocode/core/tools/guard';
+ * import { orchestrateSpawnExecute } from '@cleocode/runtime/gateway';
+ *
+ * const tools = createToolGuard({ allowedRoots: [projectRoot] });
+ * const dispatcher = new CoreAgentDispatcher({
+ *   db,
+ *   projectRoot,
+ *   executor: createSkillNodeExecutor({
+ *     tools,
+ *     cwd: projectRoot,
+ *     subprocessSpawn: async (agent, ctx) => adaptOrchestrateSpawn(agent, ctx),
+ *   }),
+ * });
+ * ```
+ *
+ * @param opts - Injected tool surface + subprocess-spawn fallback + cwd/runner.
+ * @returns An executor suitable for `CoreAgentDispatcherOptions.executor`.
+ * @task T11477
+ */
+export declare function createSkillNodeExecutor(opts: SkillNodeExecutorOptions): (agent: ResolvedAgent, context: DispatchContext) => Promise<DispatchResult>;
+/**
+ * Minimal projection of the playbook runtime's `AgentDispatchInput` that the
+ * routing helper needs. Declared structurally so `core` does NOT import
+ * `@cleocode/playbooks` (preserves the directed layering `contracts → core →
+ * playbooks`) — the CLI passes its runtime input through unchanged.
+ */
+export interface SkillNodeDispatchInput {
+    /** Node identifier within the run graph. */
+    readonly nodeId: string;
+    /** Agent identity resolved from `node.agent ?? node.skill`. */
+    readonly agentId: string;
+    /** Accumulated bindings at dispatch time (may carry an `isolation` flag). */
+    readonly context: Record<string, unknown>;
+}
+/**
+ * Route a single agentic dispatch: run it in-process via
+ * {@link SkillExecutorAdapter} when it is a resolvable `ct-*` skill node, else
+ * delegate to the injected subprocess-spawn fallback (isolation/agent nodes).
+ *
+ * This is the runtime-input-shaped companion to {@link createSkillNodeExecutor},
+ * used by the CLI's default `cleo playbook run` dispatcher so the in-process
+ * skill path becomes the DEFAULT, REPLACING `orchestrateSpawnExecute` for skill
+ * nodes (AC2) while RETAINING it for isolation nodes (AC3). Keeping the routing
+ * decision here keeps the CLI dispatcher a thin adapter (CLI package boundary).
+ *
+ * @param input - The runtime dispatch input (node id, agent id, context).
+ * @param opts - Injected tool surface, cwd/runner, and subprocess-spawn fallback.
+ * @returns The terminal {@link DispatchResult} envelope.
+ * @task T11477
+ */
+export declare function runSkillNodeOrSpawn(input: SkillNodeDispatchInput, opts: SkillNodeExecutorOptions & {
+    subprocessSpawn: () => Promise<DispatchResult>;
+}): Promise<DispatchResult>;
+//# sourceMappingURL=skill-node-executor.d.ts.map

package/dist/playbooks/skill-node-executor.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"skill-node-executor.d.ts","sourceRoot":"","sources":["../../src/playbooks/skill-node-executor.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAuCG;AAEH,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,qBAAqB,CAAC;AACzD,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,0CAA0C,CAAC;AAEnF,OAAO,EAAwB,KAAK,WAAW,EAAE,MAAM,qCAAqC,CAAC;AAC7F,OAAO,KAAK,EAAE,eAAe,EAAE,cAAc,EAAE,MAAM,uBAAuB,CAAC;AAE7E;;;;GAIG;AACH,eAAO,MAAM,qBAAqB,cAAc,CAAC;AAEjD;;;;;;;;;;;GAWG;AACH,MAAM,MAAM,uBAAuB,GAAG,CACpC,KAAK,EAAE,aAAa,EACpB,OAAO,EAAE,eAAe,KACrB,OAAO,CAAC,cAAc,CAAC,CAAC;AAE7B;;;;GAIG;AACH,MAAM,WAAW,wBAAwB;IACvC;;;;OAIG;IACH,QAAQ,CAAC,KAAK,EAAE,kBAAkB,CAAC;IACnC;;;;OAIG;IACH,QAAQ,CAAC,eAAe,CAAC,EAAE,uBAAuB,CAAC;IACnD;;;OAGG;IACH,QAAQ,CAAC,GAAG,CAAC,EAAE,MAAM,CAAC;IACtB;;;OAGG;IACH,QAAQ,CAAC,MAAM,CAAC,EAAE,WAAW,CAAC;CAC/B;AAoBD;;;;;;;;;;;;;;;;;;;;;;;;;;;GA2BG;AACH,wBAAgB,uBAAuB,CACrC,IAAI,EAAE,wBAAwB,GAC7B,CAAC,KAAK,EAAE,aAAa,EAAE,OAAO,EAAE,eAAe,KAAK,OAAO,CAAC,cAAc,CAAC,CAgC7E;AAMD;;;;;GAKG;AACH,MAAM,WAAW,sBAAsB;IACrC,4CAA4C;IAC5C,QAAQ,CAAC,MAAM,EAAE,MAAM,CAAC;IACxB,+DAA+D;IAC/D,QAAQ,CAAC,OAAO,EAAE,MAAM,CAAC;IACzB,6EAA6E;IAC7E,QAAQ,CAAC,OAAO,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;CAC3C;AAED;;;;;;;;;;;;;;;GAeG;AACH,wBAAsB,mBAAmB,CACvC,KAAK,EAAE,sBAAsB,EAC7B,IAAI,EAAE,wBAAwB,GAAG;IAAE,eAAe,EAAE,MAAM,OAAO,CAAC,cAAc,CAAC,CAAA;CAAE,GAClF,OAAO,CAAC,cAAc,CAAC,CAkBzB"}

package/dist/playbooks/skill-node-executor.js

@@ -0,0 +1,156 @@
+/**
+ * Skill-node executor factory — wires the in-process {@link SkillExecutorAdapter}
+ * into `CoreAgentDispatcherOptions.executor` while RETAINING the subprocess-spawn
+ * path for isolation nodes (T11477 · epic T11391 · saga T11387).
+ *
+ * ## The routing decision (AC2 + AC3)
+ *
+ * `CoreAgentDispatcher` resolves `agentId = node.agent ?? node.skill` and then
+ * calls its injected `executor` to perform the actual work. This factory builds
+ * that executor so it routes on the node's nature:
+ *
+ *  - **In-process skill node** — the `agentId` names a `ct-*` skill that
+ *    resolves via {@link findSkill}, AND the dispatch context does not request
+ *    isolation. These run through {@link SkillExecutorAdapter} **in-process**:
+ *    the skill→tool joint is a function call over the injected
+ *    {@link GuardedToolSurface}, NOT a process boundary (AC1, AC4). This is the
+ *    DEFAULT for in-process skill nodes, REPLACING `orchestrateSpawnExecute`
+ *    for them (AC2).
+ *
+ *  - **Isolation / agent node** — anything else (an `agent`-backed node, a node
+ *    whose context requests `isolation`, or a skill that does not resolve
+ *    in-process). These delegate to the INJECTED {@link SubprocessSpawnExecutor}
+ *    — typically the runtime's `orchestrateSpawnExecute`, which provisions a git
+ *    worktree and spawns a real subagent (AC3). The fallback is injected, not
+ *    imported, so `@cleocode/core` keeps its no-dependency-on-`@cleocode/runtime`
+ *    invariant (DIP again — the worktree mechanism is a detail core depends on
+ *    through an abstraction).
+ *
+ * ## Why the fallback is injected
+ *
+ * `orchestrateSpawnExecute` lives in `@cleocode/runtime/gateway`. `core` must not
+ * import it (directed layering `contracts → core → runtime`). The CLI/runtime
+ * layer that already imports the gateway supplies it via
+ * {@link SkillNodeExecutorOptions.subprocessSpawn}; when omitted, isolation nodes
+ * report a structured failure rather than silently degrading.
+ *
+ * @epic T11391
+ * @task T11477
+ * @saga T11387
+ */
+import { findSkill } from '../skills/discovery.js';
+import { SkillExecutorAdapter } from '../skills/skill-executor-adapter.js';
+/**
+ * Context-binding key the playbook author / dispatcher uses to FORCE the
+ * subprocess-spawn (isolation) path even when the node names a resolvable
+ * `ct-*` skill. Truthy → isolation; absent/falsy → in-process skill execution.
+ */
+export const ISOLATION_CONTEXT_KEY = 'isolation';
+/**
+ * `true` when this dispatch should take the in-process skill path: the agentId
+ * names a `ct-*`-resolvable skill AND the context does not request isolation.
+ *
+ * @param agentId - The resolved agent/skill id (`node.agent ?? node.skill`).
+ * @param context - The dispatch context whose bindings may request isolation.
+ * @param cwd - Skill-resolution cwd.
+ * @returns Whether the in-process {@link SkillExecutorAdapter} should handle it.
+ */
+function isInProcessSkillNode(agentId, context, cwd) {
+    if (context.context[ISOLATION_CONTEXT_KEY])
+        return false;
+    return findSkill(agentId, cwd) !== null;
+}
+/**
+ * Build a `CoreAgentDispatcherOptions.executor` that runs in-process skill nodes
+ * through {@link SkillExecutorAdapter} and routes isolation / agent nodes to the
+ * injected subprocess-spawn fallback.
+ *
+ * Inject the result as `executor` when constructing a `CoreAgentDispatcher`:
+ *
+ * @example
+ * ```ts
+ * import { createToolGuard } from '@cleocode/core/tools/guard';
+ * import { orchestrateSpawnExecute } from '@cleocode/runtime/gateway';
+ *
+ * const tools = createToolGuard({ allowedRoots: [projectRoot] });
+ * const dispatcher = new CoreAgentDispatcher({
+ *   db,
+ *   projectRoot,
+ *   executor: createSkillNodeExecutor({
+ *     tools,
+ *     cwd: projectRoot,
+ *     subprocessSpawn: async (agent, ctx) => adaptOrchestrateSpawn(agent, ctx),
+ *   }),
+ * });
+ * ```
+ *
+ * @param opts - Injected tool surface + subprocess-spawn fallback + cwd/runner.
+ * @returns An executor suitable for `CoreAgentDispatcherOptions.executor`.
+ * @task T11477
+ */
+export function createSkillNodeExecutor(opts) {
+    const adapter = new SkillExecutorAdapter({
+        ...(opts.cwd !== undefined ? { cwd: opts.cwd } : {}),
+        ...(opts.runner !== undefined ? { runner: opts.runner } : {}),
+    });
+    return async (agent, context) => {
+        // In-process skill node (default; replaces orchestrateSpawnExecute) — AC1/AC2/AC4.
+        if (isInProcessSkillNode(context.agentId, context, opts.cwd)) {
+            const result = await adapter.execute({
+                skillId: context.agentId,
+                context: context.context,
+                tools: opts.tools,
+            });
+            // SkillExecuteResult and DispatchResult are structurally identical envelopes.
+            return result.error !== undefined
+                ? { status: result.status, output: { ...result.output }, error: result.error }
+                : { status: result.status, output: { ...result.output } };
+        }
+        // Isolation / agent node — RETAIN the subprocess-spawn path (AC3).
+        if (opts.subprocessSpawn !== undefined) {
+            return opts.subprocessSpawn(agent, context);
+        }
+        return {
+            status: 'failure',
+            output: {},
+            error: `node "${context.nodeId}" requires subprocess-spawn (isolation/agent "${context.agentId}") ` +
+                'but no subprocessSpawn executor was injected',
+        };
+    };
+}
+/**
+ * Route a single agentic dispatch: run it in-process via
+ * {@link SkillExecutorAdapter} when it is a resolvable `ct-*` skill node, else
+ * delegate to the injected subprocess-spawn fallback (isolation/agent nodes).
+ *
+ * This is the runtime-input-shaped companion to {@link createSkillNodeExecutor},
+ * used by the CLI's default `cleo playbook run` dispatcher so the in-process
+ * skill path becomes the DEFAULT, REPLACING `orchestrateSpawnExecute` for skill
+ * nodes (AC2) while RETAINING it for isolation nodes (AC3). Keeping the routing
+ * decision here keeps the CLI dispatcher a thin adapter (CLI package boundary).
+ *
+ * @param input - The runtime dispatch input (node id, agent id, context).
+ * @param opts - Injected tool surface, cwd/runner, and subprocess-spawn fallback.
+ * @returns The terminal {@link DispatchResult} envelope.
+ * @task T11477
+ */
+export async function runSkillNodeOrSpawn(input, opts) {
+    const isolationRequested = Boolean(input.context[ISOLATION_CONTEXT_KEY]);
+    if (!isolationRequested && findSkill(input.agentId, opts.cwd) !== null) {
+        const adapter = new SkillExecutorAdapter({
+            ...(opts.cwd !== undefined ? { cwd: opts.cwd } : {}),
+            ...(opts.runner !== undefined ? { runner: opts.runner } : {}),
+        });
+        const result = await adapter.execute({
+            skillId: input.agentId,
+            context: input.context,
+            tools: opts.tools,
+        });
+        return result.error !== undefined
+            ? { status: result.status, output: { ...result.output }, error: result.error }
+            : { status: result.status, output: { ...result.output } };
+    }
+    // Isolation / agent node — RETAIN the subprocess-spawn path (AC3).
+    return opts.subprocessSpawn();
+}
+//# sourceMappingURL=skill-node-executor.js.map

package/dist/playbooks/skill-node-executor.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"skill-node-executor.js","sourceRoot":"","sources":["../../src/playbooks/skill-node-executor.ts"],"names":[],"mappings":"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"}

package/dist/repair.d.ts

@@ -22,16 +22,12 @@ export declare function repairMissingSizes(cwd: string | undefined, dryRun: bool
  * Operates directly on the SQLite tasks table.
  */
 export declare function repairMissingCompletedAt(cwd: string | undefined, dryRun: boolean): Promise<RepairAction>;
-/**
- * Detect and add missing required columns on the tasks table.
- * Uses PRAGMA table_info to check actual schema vs required columns.
- *
- * @see https://github.com/anthropics/cleo/issues/63
- */
-export declare function repairMissingColumns(cwd: string | undefined, dryRun: boolean): Promise<RepairAction>;
 /**
  * Run all repair functions.
  * Returns all actions taken (or previewed in dry-run mode).
+ *
+ * Note: column-level schema repair was removed in T11527 — DDL is now owned
+ * exclusively by the forward Drizzle migrations, not post-hoc `ensureColumns`.
  */
 export declare function runAllRepairs(cwd: string | undefined, dryRun: boolean): Promise<RepairAction[]>;
 //# sourceMappingURL=repair.d.ts.map

package/dist/repair.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"repair.d.ts","sourceRoot":"","sources":["../src/repair.ts"],"names":[],"mappings":"AAAA;;;;;;;GAOG;AAEH,0CAA0C;AAC1C,MAAM,WAAW,YAAY;IAC3B,MAAM,EAAE,MAAM,CAAC;IACf,MAAM,EAAE,SAAS,GAAG,SAAS,GAAG,SAAS,CAAC;IAC1C,OAAO,EAAE,MAAM,CAAC;CACjB;AAED;;;GAGG;AACH,wBAAsB,kBAAkB,CACtC,GAAG,EAAE,MAAM,GAAG,SAAS,EACvB,MAAM,EAAE,OAAO,GACd,OAAO,CAAC,YAAY,CAAC,CA+BvB;AAED;;;GAGG;AACH,wBAAsB,wBAAwB,CAC5C,GAAG,EAAE,MAAM,GAAG,SAAS,EACvB,MAAM,EAAE,OAAO,GACd,OAAO,CAAC,YAAY,CAAC,CA0CvB;AAED;;;;;GAKG;AACH,wBAAsB,oBAAoB,CACxC,GAAG,EAAE,MAAM,GAAG,SAAS,EACvB,MAAM,EAAE,OAAO,GACd,OAAO,CAAC,YAAY,CAAC,CAuCvB;AAED;;;GAGG;AACH,wBAAsB,aAAa,CACjC,GAAG,EAAE,MAAM,GAAG,SAAS,EACvB,MAAM,EAAE,OAAO,GACd,OAAO,CAAC,YAAY,EAAE,CAAC,CAOzB"}
+{"version":3,"file":"repair.d.ts","sourceRoot":"","sources":["../src/repair.ts"],"names":[],"mappings":"AAAA;;;;;;;GAOG;AAEH,0CAA0C;AAC1C,MAAM,WAAW,YAAY;IAC3B,MAAM,EAAE,MAAM,CAAC;IACf,MAAM,EAAE,SAAS,GAAG,SAAS,GAAG,SAAS,CAAC;IAC1C,OAAO,EAAE,MAAM,CAAC;CACjB;AAED;;;GAGG;AACH,wBAAsB,kBAAkB,CACtC,GAAG,EAAE,MAAM,GAAG,SAAS,EACvB,MAAM,EAAE,OAAO,GACd,OAAO,CAAC,YAAY,CAAC,CA+BvB;AAED;;;GAGG;AACH,wBAAsB,wBAAwB,CAC5C,GAAG,EAAE,MAAM,GAAG,SAAS,EACvB,MAAM,EAAE,OAAO,GACd,OAAO,CAAC,YAAY,CAAC,CA0CvB;AAED;;;;;;GAMG;AACH,wBAAsB,aAAa,CACjC,GAAG,EAAE,MAAM,GAAG,SAAS,EACvB,MAAM,EAAE,OAAO,GACd,OAAO,CAAC,YAAY,EAAE,CAAC,CAMzB"}

package/dist/repair.js

@@ -75,56 +75,18 @@ export async function repairMissingCompletedAt(cwd, dryRun) {
         details: `Set completedAt for ${affected.length} done/cancelled task(s)`,
     };
 }
-/**
- * Detect and add missing required columns on the tasks table.
- * Uses PRAGMA table_info to check actual schema vs required columns.
- *
- * @see https://github.com/anthropics/cleo/issues/63
- */
-export async function repairMissingColumns(cwd, dryRun) {
-    const { getDb } = await import('./store/sqlite.js');
-    const db = await getDb(cwd);
-    // getDb() already calls ensureRequiredColumns(), so if we get here
-    // the column should exist. But we still report the action for visibility.
-    const { sql } = await import('drizzle-orm');
-    const columns = db.all(sql `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) {
-        return {
-            action: 'fix_missing_columns',
-            status: 'skipped',
-            details: 'All required columns present on tasks table',
-        };
-    }
-    if (dryRun) {
-        return {
-            action: 'fix_missing_columns',
-            status: 'preview',
-            details: `Would add missing column(s): ${missingCols.join(', ')}`,
-        };
-    }
-    // Columns should already be added by ensureRequiredColumns() in getDb(),
-    // but apply again defensively.
-    for (const col of missingCols) {
-        db.run(sql.raw(`ALTER TABLE tasks ADD COLUMN ${col} text`));
-    }
-    return {
-        action: 'fix_missing_columns',
-        status: 'applied',
-        details: `Added missing column(s): ${missingCols.join(', ')}`,
-    };
-}
 /**
  * Run all repair functions.
  * Returns all actions taken (or previewed in dry-run mode).
+ *
+ * Note: column-level schema repair was removed in T11527 — DDL is now owned
+ * exclusively by the forward Drizzle migrations, not post-hoc `ensureColumns`.
  */
 export async function runAllRepairs(cwd, dryRun) {
-    const [sizes, completedAt, columns] = await Promise.all([
+    const [sizes, completedAt] = await Promise.all([
         repairMissingSizes(cwd, dryRun),
         repairMissingCompletedAt(cwd, dryRun),
-        repairMissingColumns(cwd, dryRun),
     ]);
-    return [sizes, completedAt, columns];
+    return [sizes, completedAt];
 }
 //# sourceMappingURL=repair.js.map

package/dist/repair.js.map

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

package/dist/sagas/migrate-containment.js

@@ -70,7 +70,7 @@ export async function migrateSagaContainment(projectRoot, params = {}) {
     // 1. Find sagas to scan.
     const sagaFilter = sagaId ? `AND p.id = ?` : '';
     const sagaArgs = sagaId ? [sagaId] : [];
-    const sagas = db.all(`SELECT DISTINCT p.id, p.title FROM tasks p WHERE p.type = 'saga' ${sagaFilter} ORDER BY p.id`, ...sagaArgs);
+    const sagas = db.all(`SELECT DISTINCT p.id, p.title FROM tasks_tasks p WHERE p.type = 'saga' ${sagaFilter} ORDER BY p.id`, ...sagaArgs);
     if (sagas.length === 0) {
         return engineSuccess({
             sagasScanned: 0,
@@ -85,9 +85,9 @@ export async function migrateSagaContainment(projectRoot, params = {}) {
     const sagaIds = sagas.map((s) => s.id);
     const sagaPlaceholders = sagaIds.map(() => '?').join(',');
     const epics = db.all(`SELECT t.id, t.title, t.parent_id as parentId, p.id as sagaId
-     FROM task_relations r
-     JOIN tasks p ON r.task_id = p.id
-     JOIN tasks t ON r.related_to = t.id
+     FROM tasks_task_relations r
+     JOIN tasks_tasks p ON r.task_id = p.id
+     JOIN tasks_tasks t ON r.related_to = t.id
      WHERE r.relation_type = 'groups'
        AND p.type = 'saga'
        AND t.type = 'epic'
@@ -95,9 +95,9 @@ export async function migrateSagaContainment(projectRoot, params = {}) {
      ORDER BY t.id`, ...sagaIds);
     // 3. Find legacy groups relations whose target is not an Epic (conflicts).
     const tasks = db.all(`SELECT t.id, t.title, t.type, t.parent_id as parentId, p.id as sagaId
-     FROM task_relations r
-     JOIN tasks p ON r.task_id = p.id
-     JOIN tasks t ON r.related_to = t.id
+     FROM tasks_task_relations r
+     JOIN tasks_tasks p ON r.task_id = p.id
+     JOIN tasks_tasks t ON r.related_to = t.id
      WHERE r.relation_type = 'groups'
        AND p.type = 'saga'
        AND t.type != 'epic'

package/dist/sagas/migrate-containment.js.map

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

package/dist/scaffold/ensure-dirs.d.ts

@@ -43,8 +43,14 @@ export declare function ensureProjectGitInitialCommit(projectRoot: string): Prom
  */
 export declare function ensureSqliteDb(projectRoot: string): Promise<ScaffoldResult>;
 /**
- * Create brain.db if missing.
- * Idempotent: skips if brain.db already exists.
+ * Initialize the brain domain if missing.
+ *
+ * ## E6-L2 (T11522)
+ *
+ * The brain domain now lives inside the consolidated project `cleo.db`
+ * (`getBrainDb` → `openDualScopeDb('project')`), not a standalone `brain.db`.
+ * The idempotency probe therefore targets the consolidated `cleo.db` path so a
+ * second scaffold run correctly reports `skipped` rather than always `created`.
  *
  * @param projectRoot - Absolute path to the project root directory
  * @returns Scaffold result indicating the action taken

package/dist/scaffold/ensure-dirs.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"ensure-dirs.d.ts","sourceRoot":"","sources":["../../src/scaffold/ensure-dirs.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAOH,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,0CAA0C,CAAC;AAK/E,OAAO,EAAE,mBAAmB,EAAE,MAAM,kBAAkB,CAAC;AAIvD,4CAA4C;AAC5C,eAAO,MAAM,qBAAqB,8FAOxB,CAAC;AAEX;;;;;;GAMG;AACH,wBAAsB,mBAAmB,CAAC,WAAW,EAAE,MAAM,GAAG,OAAO,CAAC,cAAc,CAAC,CA0BtF;AAED;;;;;;GAMG;AACH,wBAAsB,iBAAiB,CAAC,WAAW,EAAE,MAAM,GAAG,OAAO,CAAC,cAAc,CAAC,CA0BpF;AAED;;;;;;;;;;GAUG;AACH,wBAAsB,6BAA6B,CAAC,WAAW,EAAE,MAAM,GAAG,OAAO,CAAC,cAAc,CAAC,CA+DhG;AAED;;;;;;GAMG;AACH,wBAAsB,cAAc,CAAC,WAAW,EAAE,MAAM,GAAG,OAAO,CAAC,cAAc,CAAC,CAmBjF;AAED;;;;;;GAMG;AACH,wBAAsB,aAAa,CAAC,WAAW,EAAE,MAAM,GAAG,OAAO,CAAC,cAAc,CAAC,CAwChF"}
+{"version":3,"file":"ensure-dirs.d.ts","sourceRoot":"","sources":["../../src/scaffold/ensure-dirs.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAOH,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,0CAA0C,CAAC;AAK/E,OAAO,EAAE,mBAAmB,EAAE,MAAM,kBAAkB,CAAC;AAIvD,4CAA4C;AAC5C,eAAO,MAAM,qBAAqB,8FAOxB,CAAC;AAEX;;;;;;GAMG;AACH,wBAAsB,mBAAmB,CAAC,WAAW,EAAE,MAAM,GAAG,OAAO,CAAC,cAAc,CAAC,CA0BtF;AAED;;;;;;GAMG;AACH,wBAAsB,iBAAiB,CAAC,WAAW,EAAE,MAAM,GAAG,OAAO,CAAC,cAAc,CAAC,CA0BpF;AAED;;;;;;;;;;GAUG;AACH,wBAAsB,6BAA6B,CAAC,WAAW,EAAE,MAAM,GAAG,OAAO,CAAC,cAAc,CAAC,CA+DhG;AAED;;;;;;GAMG;AACH,wBAAsB,cAAc,CAAC,WAAW,EAAE,MAAM,GAAG,OAAO,CAAC,cAAc,CAAC,CAuBjF;AAED;;;;;;;;;;;;GAYG;AACH,wBAAsB,aAAa,CAAC,WAAW,EAAE,MAAM,GAAG,OAAO,CAAC,cAAc,CAAC,CA6ChF"}

package/dist/scaffold/ensure-dirs.js

@@ -160,9 +160,13 @@ export async function ensureProjectGitInitialCommit(projectRoot) {
  */
 export async function ensureSqliteDb(projectRoot) {
     const cleoDir = resolveScaffoldCleoDir(projectRoot);
-    const dbPath = join(cleoDir, 'tasks.db');
+    // E6-L1 (T11521): getDb() now opens the consolidated project `cleo.db` via
+    // openDualScopeDb('project'), not the legacy `tasks.db`. The idempotency probe
+    // must check the file getDb actually creates, otherwise a second scaffold pass
+    // re-reports the DB as freshly `created`.
+    const dbPath = join(cleoDir, 'cleo.db');
     if (existsSync(dbPath)) {
-        return { action: 'skipped', path: dbPath, details: 'tasks.db already exists' };
+        return { action: 'skipped', path: dbPath, details: 'cleo.db already exists' };
     }
     try {
         const { getDb } = await import('../store/sqlite.js');
@@ -178,18 +182,24 @@ export async function ensureSqliteDb(projectRoot) {
     }
 }
 /**
- * Create brain.db if missing.
- * Idempotent: skips if brain.db already exists.
+ * Initialize the brain domain if missing.
+ *
+ * ## E6-L2 (T11522)
+ *
+ * The brain domain now lives inside the consolidated project `cleo.db`
+ * (`getBrainDb` → `openDualScopeDb('project')`), not a standalone `brain.db`.
+ * The idempotency probe therefore targets the consolidated `cleo.db` path so a
+ * second scaffold run correctly reports `skipped` rather than always `created`.
  *
  * @param projectRoot - Absolute path to the project root directory
  * @returns Scaffold result indicating the action taken
  */
 export async function ensureBrainDb(projectRoot) {
-    const cleoDir = resolveScaffoldCleoDir(projectRoot);
-    const dbPath = join(cleoDir, 'brain.db');
+    const { getBrainDbPath, getBrainDb, getBrainNativeDb } = await import('../store/memory-sqlite.js');
+    // E6-L2: getBrainDbPath resolves to the consolidated `cleo.db`.
+    const dbPath = getBrainDbPath(projectRoot);
     if (existsSync(dbPath)) {
         try {
-            const { getBrainNativeDb } = await import('../store/memory-sqlite.js');
             const nativeDb = getBrainNativeDb();
             if (nativeDb) {
                 const { ensureFts5Tables } = await import('../memory/brain-search.js');
@@ -199,10 +209,9 @@ export async function ensureBrainDb(projectRoot) {
         catch {
             // Non-fatal
         }
-        return { action: 'skipped', path: dbPath, details: 'brain.db already exists' };
+        return { action: 'skipped', path: dbPath, details: 'brain domain (cleo.db) already exists' };
     }
     try {
-        const { getBrainDb, getBrainNativeDb } = await import('../store/memory-sqlite.js');
         await getBrainDb(projectRoot);
         try {
             const nativeDb = getBrainNativeDb();
@@ -214,13 +223,17 @@ export async function ensureBrainDb(projectRoot) {
         catch {
             // FTS5 may not be available — non-fatal
         }
-        return { action: 'created', path: dbPath, details: 'Brain database initialized with FTS5' };
+        return {
+            action: 'created',
+            path: dbPath,
+            details: 'Brain domain initialized in cleo.db with FTS5',
+        };
     }
     catch (err) {
         return {
             action: 'skipped',
             path: dbPath,
-            details: `Failed to initialize brain.db: ${err instanceof Error ? err.message : String(err)}`,
+            details: `Failed to initialize brain domain: ${err instanceof Error ? err.message : String(err)}`,
         };
     }
 }

package/dist/scaffold/ensure-dirs.js.map

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