ultra-builder-pro-cli 0.13.0 → 0.15.0

package/mcp-server/server.cjs

@@ -2,7 +2,7 @@
 
 // MCP server (stdio JSON-RPC) exposing task.* + session.* tools backed by
 // .ultra/state.db. Uses the low-level Server API from
-// @modelcontextprotocol/sdk so we can pass raw JSON Schema (Draft 2020-12)
+// @modelcontextprotocol/server so we can pass raw JSON Schema (Draft 2020-12)
 // straight from spec/mcp-tools.yaml without translating to zod.
 
 const fs = require('node:fs');
@@ -12,18 +12,18 @@ const yaml = require('js-yaml');
 const Ajv = require('ajv/dist/2020');
 const addFormats = require('ajv-formats');
 
-const { Server } = require('@modelcontextprotocol/sdk/server/index.js');
-const { StdioServerTransport } = require('@modelcontextprotocol/sdk/server/stdio.js');
-const { ListToolsRequestSchema, CallToolRequestSchema } = require('@modelcontextprotocol/sdk/types.js');
+const { Server } = require('@modelcontextprotocol/server');
+const { StdioServerTransport } = require('@modelcontextprotocol/server/stdio');
 const { version: PACKAGE_VERSION } = require('../package.json');
 
-const { initStateDb, closeStateDb } = require('./lib/state-db.cjs');
+const {
+  initStateDb, closeStateDb, openStateDb, ensureSchemaVersion,
+} = require('./lib/state-db.cjs');
 const { assertStateAuthority } = require('./lib/state-authority.cjs');
 const ops = require('./lib/state-ops.cjs');
 const projector = require('./lib/projector.cjs');
 const telemetry = require('./lib/telemetry.cjs');
 const topo = require('./lib/topo.cjs');
-const llm = require('./lib/llm-client.cjs');
 const parser = require('./lib/prd-parser.cjs');
 const expander = require('./lib/task-expander.cjs');
 const planStore = require('./lib/plan-store.cjs');
@@ -31,7 +31,12 @@ const { initProject } = require('./lib/init-project.cjs');
 const baselines = require('./lib/baseline-workflow.cjs');
 const changes = require('./lib/change-workflow.cjs');
 const runtimeState = require('./lib/runtime-state.cjs');
+const workflows = require('./lib/workflow-state.cjs');
 const doctor = require('./lib/doctor.cjs');
+const {
+  readProjectBreadcrumb,
+  renderProjectBreadcrumb,
+} = require('./lib/project-breadcrumb.cjs');
 
 const REPO_ROOT = process.env.UBP_RUNTIME_ROOT
   ? path.resolve(process.env.UBP_RUNTIME_ROOT)
@@ -88,12 +93,21 @@ const CHANGE_TOOLS = Object.freeze([
   'change.archive',
 ]);
 
+const WORKFLOW_TOOLS = Object.freeze([
+  'workflow.start',
+  'workflow.get',
+  'workflow.list',
+  'workflow.step',
+  'workflow.complete',
+]);
+
 const SYSTEM_TOOLS = Object.freeze([
   'system.doctor',
 ]);
 
 const REGISTERED_TOOLS = Object.freeze([
   ...TASK_TOOLS, ...SESSION_TOOLS, ...PLAN_TOOLS, ...BASELINE_TOOLS, ...CHANGE_TOOLS,
+  ...WORKFLOW_TOOLS,
   ...SYSTEM_TOOLS,
 ]);
 
@@ -109,6 +123,7 @@ const MUTATING_TOOLS = new Set([
   'baseline.start', 'baseline.record', 'baseline.converge',
   'change.create', 'change.update', 'change.context', 'change.converge', 'change.archive',
   'change.learning_propose', 'change.learning_resolve',
+  'workflow.start', 'workflow.step', 'workflow.complete',
 ]);
 
 function loadRegisteredTools() {
@@ -127,22 +142,6 @@ function mintSessionId() {
   return `sess-${randomUUID().slice(0, 8)}`;
 }
 
-function resolvePrdText(input, ctx) {
-  if (input.prd_text && String(input.prd_text).trim()) return String(input.prd_text);
-  if (input.prd_path) {
-    const abs = path.isAbsolute(input.prd_path)
-      ? input.prd_path
-      : path.join(ctx.rootDir || process.cwd(), input.prd_path);
-    return fs.readFileSync(abs, 'utf8');
-  }
-  return null;
-}
-
-function buildLlmClient(ctx) {
-  if (ctx && ctx.llmClient) return ctx.llmClient;
-  return llm.createLlmClient({});
-}
-
 async function dispatchTool(name, input, db, ctx = {}) {
   switch (name) {
     case 'task.create': {
@@ -265,10 +264,33 @@ async function dispatchTool(name, input, db, ctx = {}) {
       return ops.switchTaskTag(db, input.id, input.tag);
     }
     case 'task.dependency_topo': {
-      const requested = Array.isArray(input && input.task_ids) ? input.task_ids : null;
-      const rows = requested
-        ? requested.map((id) => ops.readTask(db, id)).filter(Boolean)
-        : ops.listTasks(db, {});
+      const hasTaskIds = Array.isArray(input && input.task_ids);
+      const hasChangeId = typeof input?.change_id === 'string' && input.change_id.trim() !== '';
+      if (hasTaskIds === hasChangeId) {
+        const err = new Error('provide exactly one of task_ids or change_id');
+        err.code = 'VALIDATION_ERROR';
+        throw err;
+      }
+      let rows;
+      if (hasTaskIds) {
+        rows = input.task_ids.map((id) => {
+          const task = ops.readTask(db, id);
+          if (!task) {
+            const err = new Error(`task ${id} not found`);
+            err.code = 'TASK_NOT_FOUND';
+            throw err;
+          }
+          return task;
+        });
+      } else {
+        const change = changes.readChange(db, input.change_id);
+        if (!change) {
+          const err = new Error(`change ${input.change_id} not found`);
+          err.code = 'CHANGE_NOT_FOUND';
+          throw err;
+        }
+        rows = ops.listTasks(db, { change_id: change.id });
+      }
       const graph = rows.map((t) => ({
         id: t.id,
         deps: Array.isArray(t.deps) ? t.deps : [],
@@ -283,23 +305,32 @@ async function dispatchTool(name, input, db, ctx = {}) {
       return { waves: result.waves };
     }
     case 'task.parse_prd': {
-      const prdText = resolvePrdText(input, ctx);
-      if (!prdText || !prdText.trim()) {
-        const err = new Error('one of prd_path or prd_text required');
-        err.code = 'NO_INPUT';
-        throw err;
-      }
       const dryRun = input.dry_run === true;
       const rootDir = ctx.rootDir || process.cwd();
+      if (!dryRun && !String(input.change_id || '').trim()) {
+        const err = new Error('persisting a parsed task graph requires change_id');
+        err.code = 'CHANGE_REQUIRED';
+        throw err;
+      }
       const creationAuthority = { change_id: input.change_id };
       if (!dryRun) changes.assertTaskCreationAllowed(db, creationAuthority, { rootDir });
-      const client = buildLlmClient(ctx);
-      const parsed = await parser.parsePrd(prdText, { llmClient: client, tag: input.tag });
+      const parsed = parser.parsePrd(input.tasks, {
+        tag: input.tag,
+        changeId: input.change_id,
+      });
       const shaped = parsed.tasks.map((t) => ({
         id: t.id, title: t.title, type: t.type, priority: t.priority,
         complexity: t.complexity, deps: t.deps, files_modified: t.files_modified,
-        tag: t.tag, change_id: input.change_id,
+        tag: t.tag, change_id: t.change_id,
       }));
+      const graph = shaped.map((t) => ({ id: t.id, deps: t.deps || [] }));
+      const topoResult = topo.computeWaves(graph);
+      if (topoResult.cycles.length > 0) {
+        const err = new Error(`parsed task graph has ${topoResult.cycles.length} cycle(s)`);
+        err.code = 'CYCLE_DETECTED';
+        err.details = { cycles: topoResult.cycles };
+        throw err;
+      }
       if (!dryRun) {
         try {
           ops.tx(db, () => {
@@ -314,13 +345,9 @@ async function dispatchTool(name, input, db, ctx = {}) {
           throw wrap;
         }
       }
-      const graph = shaped.map((t) => ({ id: t.id, deps: t.deps || [] }));
-      const topoResult = topo.computeWaves(graph);
       return { tasks: shaped, topo: topoResult.waves };
     }
     case 'task.expand': {
-      // Cheap guards before paying for LLM client construction (which would
-      // throw NO_LLM_CREDENTIALS when env keys are missing).
       const parent = ops.readTask(db, input.id);
       if (!parent) {
         const err = new Error(`no task ${input.id}`);
@@ -334,32 +361,43 @@ async function dispatchTool(name, input, db, ctx = {}) {
       }
       const rootDir = ctx.rootDir || process.cwd();
       changes.assertTaskCreationAllowed(db, { change_id: parent.change_id }, { rootDir });
-      const client = buildLlmClient(ctx);
-      const result = await expander.expandTask(db, {
+      const result = expander.expandTask(db, {
         id: input.id,
-        sub_count: input.sub_count,
-        strategy: input.strategy,
-        llmClient: client,
+        children: input.children,
         rootDir,
       });
       return { parent_id: result.parent_id, children: result.children };
     }
     case 'plan.export': {
       const rootDir = ctx.rootDir || process.cwd();
+      const change = changes.readChange(db, input.change_id);
+      if (!change) {
+        const err = new Error(`change ${input.change_id} not found`);
+        err.code = 'CHANGE_NOT_FOUND';
+        throw err;
+      }
+      if (!['active', 'blocked'].includes(change.status)) {
+        const err = new Error(`change ${change.id} is ${change.status}`);
+        err.code = 'CHANGE_NOT_MUTABLE';
+        throw err;
+      }
       const abs = path.isAbsolute(input.out_path)
         ? input.out_path
         : path.join(rootDir, input.out_path);
-      const tasks = ops.listTasks(db, { tag: input.tag });
+      const tasks = ops.listTasks(db, { tag: input.tag, change_id: change.id });
       if (tasks.length === 0) {
         const err = new Error('no tasks to plan');
         err.code = 'NO_TASKS';
         throw err;
       }
-      const plan = planStore.buildPlan(tasks, {});
+      const plan = planStore.buildPlan(tasks, { changeId: change.id });
       const { plan_path } = planStore.savePlanArtifact(plan, abs, input.format || 'json');
       ops.appendEvent(db, {
-        type: 'plan_approved',
-        payload: { plan_path, wave_count: plan.waves.length, tag: input.tag || null },
+        type: 'plan_exported',
+        change_id: change.id,
+        payload: {
+          change_id: change.id, plan_path, wave_count: plan.waves.length, tag: input.tag || null,
+        },
       });
       return { plan_path, wave_count: plan.waves.length };
     }
@@ -371,6 +409,13 @@ async function dispatchTool(name, input, db, ctx = {}) {
         err.code = 'NO_PLAN';
         throw err;
       }
+      if (loaded.change_id !== input.change_id) {
+        const err = new Error(
+          `execution plan belongs to ${loaded.change_id || '(unbound)'}, not ${input.change_id}`,
+        );
+        err.code = 'PLAN_CHANGE_MISMATCH';
+        throw err;
+      }
       return { plan: planStore.selectSection(loaded, input.section) };
     }
     case 'baseline.start': {
@@ -472,6 +517,44 @@ async function dispatchTool(name, input, db, ctx = {}) {
     case 'change.archive': {
       return changes.archiveChange(db, input, { rootDir: ctx.rootDir || process.cwd() });
     }
+    case 'workflow.start': {
+      return {
+        workflow: workflows.startWorkflow(
+          db, input, { rootDir: ctx.rootDir || process.cwd() },
+        ),
+      };
+    }
+    case 'workflow.get': {
+      const workflow = workflows.readWorkflow(
+        db, input.id, { rootDir: ctx.rootDir || process.cwd() },
+      );
+      if (!workflow) {
+        const error = new Error(`workflow ${input.id} not found`);
+        error.code = 'WORKFLOW_NOT_FOUND';
+        throw error;
+      }
+      return { workflow };
+    }
+    case 'workflow.list': {
+      const rows = workflows.listWorkflows(
+        db, input || {}, { rootDir: ctx.rootDir || process.cwd() },
+      );
+      return { workflows: rows, count: rows.length };
+    }
+    case 'workflow.step': {
+      return {
+        workflow: workflows.recordWorkflowStep(
+          db, input, { rootDir: ctx.rootDir || process.cwd() },
+        ),
+      };
+    }
+    case 'workflow.complete': {
+      return {
+        workflow: workflows.completeWorkflow(
+          db, input, { rootDir: ctx.rootDir || process.cwd() },
+        ),
+      };
+    }
     case 'system.doctor': {
       return doctor.runDoctor(db, {
         rootDir: ctx.rootDir || process.cwd(),
@@ -517,7 +600,7 @@ function startServer({ dbPath, rootDir, projectOnWrite = true, project = project
     { capabilities: { tools: {} } },
   );
 
-  server.setRequestHandler(ListToolsRequestSchema, async () => ({
+  server.setRequestHandler('tools/list', async () => ({
     tools: tools.map((t) => ({
       name: t.name,
       description: t.description,
@@ -525,7 +608,7 @@ function startServer({ dbPath, rootDir, projectOnWrite = true, project = project
     })),
   }));
 
-  server.setRequestHandler(CallToolRequestSchema, async (request) => {
+  server.setRequestHandler('tools/call', async (request) => {
     const { name, arguments: args = {} } = request.params;
     const toolStart = Date.now();
     let toolError = null;
@@ -639,6 +722,51 @@ async function main() {
   process.on('SIGINT', cleanup);
 }
 
+function hookMetadata(value, fallback = 'unknown', maxLength = 256) {
+  const normalized = typeof value === 'string' ? value.trim() : '';
+  return (normalized || fallback).slice(0, maxLength);
+}
+
+function appendHookLifecycleEvent({ rootDir, action, hookInput = {} } = {}) {
+  if (!['start', 'stop'].includes(action)) {
+    const error = new Error('hook lifecycle action must be start or stop');
+    error.code = 'VALIDATION_ERROR';
+    throw error;
+  }
+  const root = path.resolve(rootDir || process.cwd());
+  const dbPath = path.join(root, '.ultra', 'state.db');
+  if (!fs.existsSync(dbPath)) return { recorded: false, reason: 'STATE_DB_MISSING' };
+
+  const db = openStateDb(dbPath);
+  try {
+    ensureSchemaVersion(db);
+    const change = db.prepare(
+      `SELECT id FROM changes WHERE status IN ('active', 'blocked', 'ready')
+       ORDER BY updated_at DESC, rowid DESC LIMIT 1`,
+    ).get();
+    if (!change) return { recorded: false, reason: 'NO_ACTIVE_CHANGE' };
+    const task = db.prepare(
+      `SELECT id FROM tasks WHERE change_id = ? AND status IN ('in_progress', 'pending', 'blocked')
+       ORDER BY CASE status WHEN 'in_progress' THEN 0 WHEN 'blocked' THEN 1 ELSE 2 END,
+                updated_at DESC, rowid DESC LIMIT 1`,
+    ).get(change.id);
+    const payload = {
+      agent_id: hookMetadata(hookInput.agent_id),
+      agent_type: hookMetadata(hookInput.agent_type),
+      host_session_id: hookMetadata(hookInput.session_id, '', 256),
+    };
+    ops.appendEvent(db, {
+      type: action === 'start' ? 'subagent_started' : 'subagent_stopped',
+      change_id: change.id,
+      task_id: task?.id || null,
+      payload,
+    });
+    return { recorded: true, change_id: change.id, task_id: task?.id || null };
+  } finally {
+    closeStateDb(db);
+  }
+}
+
 if (require.main === module) {
   main().catch((err) => {
     process.stderr.write(`mcp-server fatal: ${err.message}\n`);
@@ -655,8 +783,12 @@ module.exports = {
   PLAN_TOOLS,
   BASELINE_TOOLS,
   CHANGE_TOOLS,
+  WORKFLOW_TOOLS,
   SYSTEM_TOOLS,
   REGISTERED_TOOLS,
   STATELESS_TOOLS,
   MUTATING_TOOLS,
+  appendHookLifecycleEvent,
+  readProjectBreadcrumb,
+  renderProjectBreadcrumb,
 };

package/orchestrator/daemon.cjs

@@ -16,7 +16,7 @@ const runtimeState = require('../mcp-server/lib/runtime-state.cjs');
 const projector = require('../mcp-server/lib/projector.cjs');
 const runner = require('./session-runner.cjs');
 const recovery = require('./recovery.cjs');
-const { evaluate, DEFAULT_RULES, ROUTE_PREFERENCES } = require('./dispatch-rules.cjs');
+const { evaluate, DEFAULT_RULES } = require('./dispatch-rules.cjs');
 
 // Phase 8B.1 — routeTask is now a thin wrapper over evaluate() so Phase 5.4
 // callers see identical behavior while the parallel orchestrator (8B.2) can
@@ -146,6 +146,5 @@ function runDaemon({
 module.exports = {
   runDaemon,
   routeTask,
-  ROUTE_PREFERENCES,
   maintainState,
 };

package/orchestrator/dispatch-rules.cjs

@@ -8,28 +8,13 @@
 //   • defer       — leave task pending, revisit next tick (deps/wave wait)
 //   • block       — terminal: don't spawn (breaker, no runtimes, etc.)
 //
-// Phase 5.4 ROUTE_PREFERENCES lives here now. daemon.cjs's `routeTask` is a
-// thin wrapper around evaluate() so Phase 5.4 tests stay green while the
-// parallel orchestrator (8B.2) gets a richer decision surface: wave state,
-// deps readiness, and custom rule injection.
+// Runtime order is caller-owned. The orchestrator does not infer model quality,
+// price, or capability from a host name because every host can be configured
+// with different models. The parallel orchestrator supplies richer dimensions:
+// wave state, dependency readiness, and explicit custom rules.
 
 const { isSupportedRuntime } = require('../adapters/_shared/runtime-assets.cjs');
 
-const ROUTE_PREFERENCES = Object.freeze({
-  haiku:  ['opencode', 'claude', 'codex'],
-  sonnet: ['claude', 'codex', 'opencode'],
-  opus:   ['claude', 'codex'],
-});
-
-function resolveByPreference(ctx) {
-  const hint = ctx.task && ctx.task.complexity_hint;
-  const pref = hint ? ROUTE_PREFERENCES[hint] : null;
-  if (pref) {
-    for (const r of pref) if (ctx.available_runtimes.includes(r)) return r;
-  }
-  return ctx.available_runtimes[0];
-}
-
 const DEFAULT_RULES = Object.freeze([
   {
     id: 'breaker-blocked',
@@ -56,17 +41,7 @@ const DEFAULT_RULES = Object.freeze([
     action: 'defer',
   },
   {
-    id: 'by-preference',
-    priority: 10,
-    when: (ctx) => {
-      const hint = ctx.task && ctx.task.complexity_hint;
-      return !!(hint && ROUTE_PREFERENCES[hint]);
-    },
-    action: 'spawn_agent',
-    resolve: resolveByPreference,
-  },
-  {
-    id: 'fallback-first-available',
+    id: 'first-authorized-runtime',
     priority: 0,
     when: () => true,
     action: 'spawn_agent',
@@ -100,5 +75,4 @@ function evaluate(ctx, rules = DEFAULT_RULES) {
 module.exports = {
   evaluate,
   DEFAULT_RULES,
-  ROUTE_PREFERENCES,
 };

package/orchestrator/planner/plan-builder.cjs

@@ -15,18 +15,22 @@ const DEFAULT_COMPLEXITY = 3;
 const TOKENS_PER_COMPLEXITY = Object.freeze({ input: 5000, output: 2000 });
 const DURATION_MIN_PER_COMPLEXITY = 5;
 
-function buildPlan(tasks, { runtime = 'claude', model = null } = {}) {
+function buildPlan(tasks, { runtime = null, model = null, changeId = null } = {}) {
   if (!Array.isArray(tasks)) {
     throw new TypeError('buildPlan: tasks must be an array');
   }
 
-  const graph = tasks.map((t) => ({
+  // Plan artifacts are durable and compared by digest. Keep their ordering
+  // independent from SQLite insertion order or caller enumeration order.
+  const orderedTasks = [...tasks].sort((left, right) => String(left.id).localeCompare(String(right.id)));
+
+  const graph = orderedTasks.map((t) => ({
     id: t.id,
     deps: Array.isArray(t.deps) ? t.deps : [],
   }));
   const { waves, cycles } = computeWaves(graph);
 
-  const byId = new Map(tasks.map((t) => [t.id, t]));
+  const byId = new Map(orderedTasks.map((t) => [t.id, t]));
 
   const conflict_surface = [];
   const wavePayload = waves.map((waveTasks, idx) => {
@@ -52,18 +56,21 @@ function buildPlan(tasks, { runtime = 'claude', model = null } = {}) {
   });
 
   const ownership_forecast = {};
-  for (const t of tasks) {
+  for (const t of orderedTasks) {
     ownership_forecast[t.id] = Array.isArray(t.files_modified) ? t.files_modified : [];
   }
 
-  const estimated_cost_usd = round4(
-    tasks.reduce((sum, t) => {
-      const complexity = Number(t.complexity || DEFAULT_COMPLEXITY);
-      const ti = complexity * TOKENS_PER_COMPLEXITY.input;
-      const to = complexity * TOKENS_PER_COMPLEXITY.output;
-      return sum + (computeCost(runtime, model, ti, to) || 0);
-    }, 0),
-  );
+  const taskCosts = orderedTasks.map((t) => {
+    const complexity = Number(t.complexity || DEFAULT_COMPLEXITY);
+    const ti = complexity * TOKENS_PER_COMPLEXITY.input;
+    const to = complexity * TOKENS_PER_COMPLEXITY.output;
+    return computeCost(runtime, model, ti, to);
+  });
+  const estimated_cost_usd = orderedTasks.length === 0
+    ? 0
+    : (taskCosts.some((cost) => cost === null)
+      ? null
+      : round4(taskCosts.reduce((sum, cost) => sum + cost, 0)));
 
   const estimated_duration_min = wavePayload.reduce((acc, wv) => {
     const complexities = wv.tasks.map(
@@ -76,6 +83,8 @@ function buildPlan(tasks, { runtime = 'claude', model = null } = {}) {
   }, 0);
 
   return {
+    schema_version: '1.0',
+    change_id: changeId,
     waves: wavePayload,
     ownership_forecast,
     conflict_surface,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ultra-builder-pro-cli",
-  "version": "0.13.0",
+  "version": "0.15.0",
   "description": "Multi-runtime installer for the Ultra Builder Pro agent engineering system — deploys commands, agents, skills, hooks, and MCP server to Claude Code, OpenCode, Codex CLI, and Kimi Code.",
   "bin": {
     "ultra-builder-pro-cli": "bin/install.js",
@@ -49,13 +49,20 @@
     ".ultra-template",
     "docs/ROADMAP.md",
     "docs/ARCHITECTURE.md",
+    "docs/WORKFLOW-LIFECYCLE.md",
     "docs/AGENT-CONTEXT.md",
     "docs/SKILL-AUTHORING.md",
     "docs/COMMIT-HASH-BACKFILL.md",
     "docs/PLAN.zh-CN.md",
     "docs/STATE-DB-ACCESS-POLICY.md",
     "docs/USER-HANDBOOK-CONTRACT.md",
-    "docs/RUNTIME-COMPAT-MATRIX.md"
+    "docs/RUNTIME-COMPAT-MATRIX.md",
+    "!**/__pycache__/**",
+    "!**/*.pyc",
+    "!**/*.pyo",
+    "!**/*.test.cjs",
+    "!**/tests/**",
+    "!mcp-server/test-support/**"
   ],
   "keywords": [
     "claude-code",
@@ -98,13 +105,14 @@
     "install:all": "node bin/install.js --all --local"
   },
   "dependencies": {
-    "@anthropic-ai/sdk": "^0.111.0",
-    "@modelcontextprotocol/sdk": "^1.29.0",
+    "@modelcontextprotocol/server": "2.0.0-beta.5",
     "@vercel/ncc": "0.38.4",
     "ajv": "^8.17.1",
     "ajv-formats": "^3.0.1",
     "better-sqlite3": "^11.5.0",
-    "js-yaml": "^4.1.0",
-    "openai": "^6.34.0"
+    "js-yaml": "^4.1.0"
+  },
+  "devDependencies": {
+    "@modelcontextprotocol/client": "2.0.0-beta.5"
   }
 }

package/skills/cc-collab/SKILL.md

@@ -5,8 +5,8 @@ description: Ask Claude Code for an independent read-only analysis of a bounded
 
 # Consult Claude Code read-only
 
-Treat Claude Code as an untrusted advisor. The current host owns scope, evidence,
-decisions, edits, and final verification.
+Treat Claude Code as an untrusted advisor. Keep the current host responsible for
+scope, evidence, decisions, edits, and final verification.
 
 ## Preconditions
 

package/skills/codex-collab/SKILL.md

@@ -5,8 +5,8 @@ description: Ask Codex CLI for an independent read-only analysis of a bounded ar
 
 # Consult Codex read-only
 
-Treat Codex as an untrusted advisor. The current host owns scope, evidence, edits,
-verification, and the final answer.
+Treat Codex as an untrusted advisor. Keep the current host responsible for scope,
+evidence, edits, verification, and the final answer.
 
 ## Preconditions
 
@@ -23,7 +23,6 @@ Create a session directory under `.ultra/collab/`, then run in a read-only sandb
 SESSION_PATH=".ultra/collab/$(date +%Y%m%d-%H%M%S)-codex"
 mkdir -p "${SESSION_PATH}"
 codex exec -s read-only \
-  -a never \
   --ephemeral \
   --ignore-user-config \
   --ignore-rules \