ultra-builder-pro-cli 0.10.0 → 0.12.1

package/spec/cli-protocol.md

@@ -100,6 +100,10 @@ as a fallback unless `ultra-tools <family> --help` lists it.
 | `session.admission_check` | `session admission`         | 4.5   | any     |
 | `session.heartbeat`       | `session heartbeat`         | 4.5   | mcp     |
 | `session.subscribe_events`| `session subscribe`         | 4.5   | any     |
+| `baseline.start`          | `baseline start`            | 11    | mcp     |
+| `baseline.record`         | `baseline record`           | 11    | mcp     |
+| `baseline.get`            | `baseline get`              | 11    | any     |
+| `baseline.converge`       | `baseline converge`         | 11    | mcp     |
 | `change.create`           | `change create`             | 9     | mcp     |
 | `change.update`           | `change update`             | 9     | mcp     |
 | `change.get`              | `change get`                | 9     | any     |

package/spec/mcp-tools.yaml

@@ -23,6 +23,7 @@ families:
   - { name: task,    description: 'authoritative task lifecycle on state.db', phase: '2' }
   - { name: session, description: 'execution-unit lifecycle with single-active-lease admission (D33)', phase: '4.5' }
   - { name: plan,    description: 'execution-plan artifact export and query (D34)', phase: '8a' }
+  - { name: baseline, description: 'project adoption, baseline evidence, convergence, and drift authority', phase: '11' }
   - { name: change,  description: 'continuous post-delivery change lifecycle and convergence', phase: '9' }
   - { name: system,  description: 'read-only diagnostics and explicit backup-first repair', phase: '9' }
 
@@ -217,9 +218,9 @@ tools:
   - name: task.init_project
     family: task
     description: |
-      Bootstrap a fresh `.ultra/` skeleton in target_dir from the bundled
-      templates/.ultra/ source. Copies spec templates, tasks.json, context
-      template, and report stubs. Phase 3.1 entry point for /ultra-init.
+      Bootstrap `.ultra/` and start an authoritative greenfield or brownfield
+      baseline. Auto mode detects meaningful existing project content before
+      copying specification templates and creating state.db.
     phase: '3'
     writer_role: mcp
     input_schema:
@@ -240,6 +241,11 @@ tools:
         stack:
           type: string
           description: optional tech stack descriptor (comma-separated for fullstack)
+        mode:
+          type: string
+          enum: [auto, greenfield, brownfield]
+          default: auto
+          description: auto detects whether meaningful project content already exists
         overwrite:
           type: boolean
           default: false
@@ -249,7 +255,7 @@ tools:
           description: override path to the template root (defaults to bundled templates/.ultra/)
     output_schema:
       type: object
-      required: [created_path, state_db_path, status, copied_files]
+      required: [created_path, state_db_path, status, mode, baseline, copied_files]
       additionalProperties: false
       properties:
         created_path:
@@ -261,6 +267,13 @@ tools:
         status:
           type: string
           enum: [created, overwritten]
+        mode:
+          type: string
+          enum: [greenfield, brownfield]
+        baseline:
+          type: object
+          required: [id, mode, status]
+          additionalProperties: true
         copied_files:
           type: array
           items: { type: string }
@@ -629,6 +642,210 @@ tools:
     emits_events: []
     trace_to: '§7.3, D31'
 
+  # ───────────────────────── baseline family ─────────────────────────────
+  - name: baseline.start
+    family: baseline
+    description: Start a greenfield baseline or brownfield adoption without overwriting a ready baseline implicitly.
+    phase: '11'
+    writer_role: mcp
+    input_schema:
+      type: object
+      required: [project_name, mode]
+      additionalProperties: false
+      properties:
+        id: { type: string, pattern: '^[a-zA-Z0-9_\-]+$', default: project-baseline }
+        project_name: { type: string, minLength: 1 }
+        project_type: { type: string, enum: [web, api, cli, fullstack, other] }
+        stack: { type: string }
+        mode: { type: string, enum: [greenfield, brownfield] }
+        scope: { type: array, minItems: 1, items: { type: string, minLength: 1 }, default: ['.'] }
+        repository_revision: { type: string, minLength: 1 }
+        replace_ready: { type: boolean, default: false }
+        provider_refs:
+          type: object
+          additionalProperties: false
+          properties:
+            memory:
+              type: object
+              required: [provider]
+              additionalProperties: false
+              properties:
+                provider: { type: string }
+                project: { type: string }
+                reference: { type: string }
+                revision: { type: string }
+                indexed_head: { type: string }
+                status: { type: string, enum: [available, unavailable, fresh, stale, unknown] }
+            code_graph:
+              type: object
+              required: [provider]
+              additionalProperties: false
+              properties:
+                provider: { type: string }
+                project: { type: string }
+                reference: { type: string }
+                revision: { type: string }
+                indexed_head: { type: string }
+                status: { type: string, enum: [available, unavailable, fresh, stale, unknown] }
+    output_schema:
+      type: object
+      required: [baseline]
+      additionalProperties: false
+      properties:
+        baseline: { type: object }
+    errors:
+      - { code: BASELINE_EXISTS, description: 'a ready baseline requires explicit replacement' }
+      - { code: BASELINE_IN_PROGRESS, description: 'another adoption is already active' }
+      - { code: PROVIDER_CONTENT_FORBIDDEN, description: 'provider payload content must remain external' }
+    cli_subcommand: baseline start
+    emits_events: [baseline_started]
+
+  - name: baseline.record
+    family: baseline
+    description: Replace the current adoption snapshot with bounded specification digests, evidence references, verification, unknowns, and provider metadata.
+    phase: '11'
+    writer_role: mcp
+    input_schema:
+      type: object
+      required: [id]
+      additionalProperties: false
+      properties:
+        id: { type: string, pattern: '^[a-zA-Z0-9_\-]+$' }
+        repository_revision: { type: string, minLength: 1 }
+        scope: { type: array, minItems: 1, items: { type: string, minLength: 1 } }
+        spec_refs:
+          type: array
+          items:
+            type: object
+            required: [kind, path]
+            additionalProperties: false
+            properties:
+              kind: { type: string, enum: [discovery, product, architecture, quality, delivery, other] }
+              path: { type: string, minLength: 1 }
+        evidence:
+          type: array
+          items:
+            type: object
+            required: [kind, ref, summary]
+            additionalProperties: false
+            properties:
+              kind: { type: string, enum: [source, docs, runtime, test, deploy, external] }
+              ref: { type: string, minLength: 1 }
+              summary: { type: string, minLength: 1 }
+        verification:
+          type: array
+          items:
+            type: object
+            required: [name, command, status, evidence]
+            additionalProperties: false
+            properties:
+              name: { type: string, minLength: 1 }
+              command: { type: string, minLength: 1 }
+              status: { type: string, enum: [pass, known_red, not_run] }
+              evidence: { type: string, minLength: 1 }
+              rationale: { type: string, minLength: 1 }
+        unknowns:
+          type: array
+          items:
+            type: object
+            required: [summary, blocking]
+            additionalProperties: false
+            properties:
+              summary: { type: string, minLength: 1 }
+              blocking: { type: boolean }
+              owner: { type: string, minLength: 1 }
+        provider_refs:
+          type: object
+          additionalProperties: false
+          properties:
+            memory:
+              type: object
+              required: [provider]
+              additionalProperties: false
+              properties:
+                provider: { type: string }
+                project: { type: string }
+                reference: { type: string }
+                revision: { type: string }
+                indexed_head: { type: string }
+                status: { type: string, enum: [available, unavailable, fresh, stale, unknown] }
+            code_graph:
+              type: object
+              required: [provider]
+              additionalProperties: false
+              properties:
+                provider: { type: string }
+                project: { type: string }
+                reference: { type: string }
+                revision: { type: string }
+                indexed_head: { type: string }
+                status: { type: string, enum: [available, unavailable, fresh, stale, unknown] }
+    output_schema:
+      type: object
+      required: [baseline]
+      additionalProperties: false
+      properties:
+        baseline: { type: object }
+    errors:
+      - { code: BASELINE_NOT_FOUND, description: 'baseline id does not exist' }
+      - { code: BASELINE_NOT_MUTABLE, description: 'ready and superseded baselines are immutable' }
+      - { code: BASELINE_SPEC_MISSING, description: 'a declared specification file does not exist' }
+      - { code: PROVIDER_CONTENT_FORBIDDEN, description: 'provider payload content must remain external' }
+    cli_subcommand: baseline record
+    emits_events: [baseline_recorded]
+
+  - name: baseline.get
+    family: baseline
+    description: Read the current or named authoritative baseline with live digest and repository-revision health.
+    phase: '11'
+    readonly: true
+    input_schema:
+      type: object
+      additionalProperties: false
+      properties:
+        id: { type: string, pattern: '^[a-zA-Z0-9_\-]+$' }
+    output_schema:
+      type: object
+      required: [baseline, health]
+      additionalProperties: false
+      properties:
+        baseline: { type: object }
+        health: { type: object }
+    errors:
+      - { code: BASELINE_NOT_FOUND, description: 'no matching baseline exists' }
+    cli_subcommand: baseline get
+    emits_events: []
+
+  - name: baseline.converge
+    family: baseline
+    description: Approve a baseline only when its revision, specification digests, evidence, verification, and blocking unknowns satisfy deterministic gates.
+    phase: '11'
+    writer_role: mcp
+    input_schema:
+      type: object
+      required: [id, expected_revision, approved_by, approval_note]
+      additionalProperties: false
+      properties:
+        id: { type: string, pattern: '^[a-zA-Z0-9_\-]+$' }
+        expected_revision: { type: string, minLength: 1 }
+        approved_by: { type: string, minLength: 1 }
+        approval_note: { type: string, minLength: 3 }
+        accept_known_red: { type: boolean, default: false }
+    output_schema:
+      type: object
+      required: [ready, status, blockers, baseline]
+      additionalProperties: false
+      properties:
+        ready: { type: boolean }
+        status: { type: string, enum: [blocked, ready] }
+        blockers: { type: array, items: { type: string } }
+        baseline: { type: object }
+    errors:
+      - { code: BASELINE_NOT_FOUND, description: 'baseline id does not exist' }
+      - { code: BASELINE_NOT_CONVERGEABLE, description: 'baseline lifecycle does not allow convergence' }
+    cli_subcommand: baseline converge
+    emits_events: [baseline_blocked, baseline_converged]
+
   # ────────────────────────── change family ──────────────────────────────
   - name: change.create
     family: change
@@ -1048,6 +1265,8 @@ tools:
     errors:
       - { code: CHANGE_NOT_READY, description: 'change has not passed convergence' }
       - { code: BASELINE_RECONCILIATION_REQUIRED, description: 'baseline update or explicit no-change reason required' }
+      - { code: BASELINE_FILE_MISSING, description: 'a declared baseline update does not exist' }
+      - { code: BASELINE_RECONCILIATION_INCOMPLETE, description: 'repository revision or tracked specification digests remain stale after reconciliation' }
       - { code: ARCHIVE_EXISTS, description: 'archive target already exists' }
     cli_subcommand: change archive
     emits_events: [change_archived]

package/spec/schemas/command-manifest.schema.json

@@ -1,47 +1,29 @@
 {
   "$schema": "https://json-schema.org/draft/2020-12/schema",
   "$id": "https://ultra-builder-pro.dev/spec/command-manifest.schema.json",
-  "title": "Command manifest (frontmatter)",
-  "description": "YAML frontmatter contract for commands/ultra-*.md thin-shell files. Phase 3 薄壳化: 命令文件 ≤ 80 行正文，真实 workflow 放 skills/<name>/SKILL.md。additionalProperties=false (PLAN R19).",
+  "title": "Ultra command launcher frontmatter",
+  "description": "Portable source contract for a thin command launcher. Runtime metadata and workflow procedure belong outside the command file.",
   "type": "object",
-  "required": ["description"],
+  "required": ["description", "workflow-ref"],
   "additionalProperties": false,
   "properties": {
     "description": {
       "type": "string",
       "minLength": 10,
-      "description": "一句话触发描述; 给 runtime 的 skill router / 用户命令列表使用"
+      "maxLength": 240,
+      "description": "Concise user-visible action description."
     },
     "argument-hint": {
       "oneOf": [
         { "type": "string" },
         { "type": "array", "items": { "type": "string" }, "minItems": 1 }
       ],
-      "description": "Claude Code convention: hint shown after slash-command name. Both `argument-hint: [foo]` (YAML array form) and `argument-hint: \"[foo]\"` (string form) are accepted."
-    },
-    "allowed-tools": {
-      "type": "string",
-      "description": "Claude Code convention: comma-separated tool allowlist"
-    },
-    "model": {
-      "type": "string",
-      "enum": ["haiku", "sonnet", "opus"],
-      "description": "Claude Code convention: model routing hint"
+      "description": "Optional host launcher hint; it does not define argument semantics."
     },
     "workflow-ref": {
       "type": "string",
       "pattern": "^@skills/[a-z][a-z0-9\\-]*/SKILL\\.md$",
-      "description": "Phase 3 薄壳关键字段: 指向 skills/<name>/SKILL.md; 存在即表示该命令已迁为薄壳"
-    },
-    "mcp_tools_required": {
-      "type": "array",
-      "items": { "type": "string", "pattern": "^[a-z]+\\.[a-z_]+$" },
-      "uniqueItems": true,
-      "description": "Phase 3+: 命令运行时会调用的 MCP tool 名单; 无 MCP 时走 cli_fallback"
-    },
-    "cli_fallback": {
-      "type": "string",
-      "description": "Phase 3+: MCP 不可达时回退的 ultra-tools 子命令 (e.g. 'init' -> 'ultra-tools init')"
+      "description": "The single Skill that owns this workflow."
     }
   }
 }

package/spec/schemas/mcp-tools.schema.json

@@ -60,7 +60,7 @@
         },
         "family": {
           "type": "string",
-          "enum": ["task", "memory", "review", "impact", "skill", "session", "ask", "plan", "change", "system"]
+          "enum": ["task", "memory", "review", "impact", "skill", "session", "ask", "plan", "baseline", "change", "system"]
         },
         "description": { "type": "string", "minLength": 10 },
         "phase": {

package/spec/schemas/skill-manifest.schema.json

@@ -1,94 +1,24 @@
 {
   "$schema": "https://json-schema.org/draft/2020-12/schema",
   "$id": "https://ultra-builder-pro.dev/spec/skill-manifest.schema.json",
-  "title": "Skill manifest (frontmatter)",
-  "description": "YAML frontmatter contract for skills/*/SKILL.md. Strict additionalProperties=false: any new field must be added here AND propagated through validate-skills.cjs (PLAN R19 single-source rule).",
+  "title": "Portable Agent Skill frontmatter",
+  "description": "Canonical source contract for skills/*/SKILL.md. Host invocation policy, UI metadata, runtime dependencies, and command hints belong in adapters or host-native metadata, not model instructions.",
   "type": "object",
   "required": ["name", "description"],
   "additionalProperties": false,
   "properties": {
     "name": {
       "type": "string",
-      "pattern": "^[a-z][a-z0-9\\-]*$",
-      "description": "kebab-case slug; matches the directory name"
+      "minLength": 1,
+      "maxLength": 64,
+      "pattern": "^[a-z0-9]+(?:-[a-z0-9]+)*$",
+      "description": "Portable Agent Skills name; must match the parent directory."
     },
     "description": {
       "type": "string",
       "minLength": 10,
-      "description": "human-readable trigger sentence consumed by the runtime's skill router"
-    },
-    "runtime": {
-      "oneOf": [
-        { "type": "string", "enum": ["claude", "opencode", "codex", "kimi", "all"] },
-        {
-          "type": "array",
-          "items": { "type": "string", "enum": ["claude", "opencode", "codex", "kimi"] },
-          "minItems": 1,
-          "uniqueItems": true
-        }
-      ],
-      "description": "v4.5 — which runtime(s) this skill targets. Defaults to 'all' when absent (Phase 4 adapter installs everywhere)."
-    },
-    "mcp_tools_required": {
-      "type": "array",
-      "items": { "type": "string", "pattern": "^[a-z]+\\.[a-z_]+$" },
-      "uniqueItems": true,
-      "description": "v4.5 — MCP tool names this skill calls; Phase 3+ generators verify availability"
-    },
-    "cli_fallback": {
-      "type": "string",
-      "description": "v4.5 — ultra-tools subcommand to fall back to when MCP unreachable"
-    },
-    "complexity_hint": {
-      "type": "string",
-      "enum": ["haiku", "sonnet", "opus"],
-      "description": "v4.5 — model routing hint (Phase 7+)"
-    },
-    "argument-hint": {
-      "type": "string",
-      "description": "Claude Code convention: hint shown after slash-command name"
-    },
-    "allowed-tools": {
-      "type": "string",
-      "description": "Claude Code convention: comma-separated tool allowlist"
-    },
-    "user-invocable": {
-      "type": "boolean",
-      "description": "Claude Code convention: can the user call this via slash command"
-    },
-    "disable-model-invocation": {
-      "type": "boolean",
-      "description": "Claude Code convention: skill is not auto-invoked by the model"
-    },
-    "context": {
-      "type": "string",
-      "enum": ["fork", "main"],
-      "description": "Claude Code convention: 'fork' isolates skill output from main conversation"
-    },
-    "license": {
-      "type": "string",
-      "description": "third-party skill license (e.g. MIT)"
-    },
-    "metadata": {
-      "type": "object",
-      "additionalProperties": true,
-      "properties": {
-        "author":  { "type": "string" },
-        "version": { "type": "string" }
-      },
-      "description": "third-party metadata block (vercel skills, etc.)"
-    }
-  },
-  "allOf": [
-    {
-      "if": { "required": ["user-invocable"], "properties": { "user-invocable": { "const": true } } },
-      "then": {
-        "not": {
-          "required": ["disable-model-invocation"],
-          "properties": { "disable-model-invocation": { "const": true } }
-        },
-        "errorMessage": "user-invocable=true cannot coexist with disable-model-invocation=true"
-      }
+      "maxLength": 1024,
+      "description": "Concise discovery metadata that states both what the skill does and when to use it."
     }
-  ]
+  }
 }

package/spec/schemas/state-db.sql

@@ -1,9 +1,9 @@
 -- Ultra Builder Pro — authoritative state schema
 -- Phase 2 builds .ultra/state.db from this file. Source of truth for all
--- task / session / event / telemetry data. tasks.json and context md status
+-- baseline / change / task / session / event / telemetry data. tasks.json and context md status
 -- header are projections (PLAN §7.1, D18, D32).
 --
--- Trace: docs/PLAN.zh-CN.md §7.1; decisions D18/D30/D31/D32/D37.
+-- Trace: docs/PLAN.zh-CN.md §7.1; decisions D18/D30/D31/D32/D37/D52/D54.
 --
 -- PRAGMAs are applied by mcp-server/lib/state-db.ts on connection open;
 -- they cannot be persisted in CREATE statements but are documented here.
@@ -12,6 +12,35 @@
 --   PRAGMA busy_timeout=5000;       -- block up to 5s on lock (R25)
 --   PRAGMA foreign_keys=ON;         -- enforce FK constraints
 
+-- ──────────────────────────── project baseline ─────────────────────────────
+-- The baseline is the approved, repository-scoped snapshot that every change
+-- is measured against. It stores digests and evidence references, never source,
+-- prompt, transcript, memory, or code-graph payloads.
+CREATE TABLE IF NOT EXISTS baselines (
+  id                  TEXT PRIMARY KEY,
+  project_name        TEXT NOT NULL,
+  project_type        TEXT,
+  stack               TEXT,
+  mode                TEXT NOT NULL CHECK (mode IN ('greenfield', 'brownfield', 'migrated')),
+  status              TEXT NOT NULL DEFAULT 'draft'
+                        CHECK (status IN ('draft', 'adopting', 'blocked', 'ready', 'superseded')),
+  repository_root     TEXT NOT NULL DEFAULT '.',
+  scope_json          TEXT NOT NULL DEFAULT '["."]',
+  repository_revision TEXT,
+  spec_refs_json      TEXT NOT NULL DEFAULT '[]',
+  evidence_json       TEXT NOT NULL DEFAULT '[]',
+  verification_json   TEXT NOT NULL DEFAULT '[]',
+  unknowns_json       TEXT NOT NULL DEFAULT '[]',
+  provider_refs_json  TEXT NOT NULL DEFAULT '{}',
+  approved_by         TEXT,
+  approval_note       TEXT,
+  started_at          TEXT NOT NULL DEFAULT (strftime('%Y-%m-%dT%H:%M:%fZ', 'now')),
+  updated_at          TEXT NOT NULL DEFAULT (strftime('%Y-%m-%dT%H:%M:%fZ', 'now')),
+  converged_at        TEXT
+);
+
+CREATE INDEX IF NOT EXISTS baselines_status ON baselines(status, updated_at);
+
 -- ──────────────────────────── changes ─────────────────────────────────────
 -- A project baseline is continuous; each feature, fix, incident, or redesign
 -- is an independently converged change unit. Only changes become terminal.
@@ -305,3 +334,5 @@ INSERT OR IGNORE INTO schema_version (version, description)
 VALUES ('9.1', 'Kimi runtime support in durable events and sessions');
 INSERT OR IGNORE INTO schema_version (version, description)
 VALUES ('10.0', 'Role-scoped context snapshots, deterministic breadcrumbs, and approval-gated specification learning');
+INSERT OR IGNORE INTO schema_version (version, description)
+VALUES ('11.0', 'Greenfield and brownfield baseline adoption, convergence, and drift authority');

package/ultra-tools/commands/status.cjs

@@ -10,6 +10,7 @@ const fs = require('node:fs');
 const path = require('node:path');
 
 const ops = require('../../mcp-server/lib/state-ops.cjs');
+const baselines = require('../../mcp-server/lib/baseline-workflow.cjs');
 
 const USAGE = `ultra-tools status [flags]
 
@@ -64,12 +65,23 @@ function parseFlags(args) {
   return out;
 }
 
-function buildCostPanel(db, { since = null, limit = 3 } = {}) {
+function buildCostPanel(db, { since = null, limit = 3, rootDir = process.cwd() } = {}) {
   const by_runtime = ops.aggregateTelemetryByRuntime(db, { since });
   const top_tasks = ops.aggregateTelemetryByTask(db, { since, limit });
   const total_cost_usd = by_runtime.reduce((acc, r) => acc + (r.cost_usd || 0), 0);
+  const baselineHealth = baselines.inspectBaseline(db, { rootDir });
+  const current = baselineHealth.baseline;
   return {
     period: { since: since || 'all-time' },
+    baseline: {
+      id: current?.id || null,
+      mode: current?.mode || null,
+      status: current?.status || 'missing',
+      health: baselineHealth.status,
+      repository_revision: current?.repository_revision || null,
+      blockers: baselineHealth.blockers,
+      warnings: baselineHealth.warnings,
+    },
     by_runtime,
     top_tasks,
     total_cost_usd,
@@ -84,6 +96,11 @@ function formatCost(n) {
 
 function renderHuman(panel) {
   const lines = [];
+  const baseline = panel.baseline;
+  lines.push(
+    `Baseline: ${baseline.mode || 'none'}/${baseline.status} · ${baseline.health === 'pass' ? 'ready' : 'blocked'}`,
+  );
+  if (baseline.blockers.length > 0) lines.push(`Baseline blockers: ${baseline.blockers.join(', ')}`);
   lines.push(`Period: ${panel.period.since}`);
   lines.push(`Total cost: ${formatCost(panel.total_cost_usd)}`);
   lines.push('');
@@ -136,7 +153,8 @@ function dispatch(args) {
   const Database = require('better-sqlite3');
   const db = new Database(dbPath, { readonly: true });
   try {
-    const panel = buildCostPanel(db, { since, limit: flags.limit });
+    const rootDir = path.dirname(path.dirname(dbPath));
+    const panel = buildCostPanel(db, { since, limit: flags.limit, rootDir });
     if (flags.json) {
       emit({ ok: true, data: panel });
     } else {

package/ultra-tools/commands/task.cjs

@@ -9,13 +9,14 @@ const { initProject, InitProjectError } = require('../../mcp-server/lib/init-pro
 const USAGE = `ultra-tools task <verb> [flags]
 
 VERBS:
-  init-project  Bootstrap a fresh .ultra/ skeleton (Phase 3.1)
+  init-project  Initialize or adopt a project with authoritative Ultra state
 
 FLAGS (init-project):
   --target-dir <path>       target project root (default: cwd)
   --project-name <name>     project name (required)
   --project-type <type>     web | api | cli | fullstack | other
   --stack <stack>           tech stack descriptor (comma-separated ok)
+  --mode <mode>             auto | greenfield | brownfield (default: auto)
   --overwrite               replace existing .ultra/ (backup created)
   --source-template <path>  override bundled template source
   -h, --help                show this message
@@ -34,6 +35,7 @@ function parseInitFlags(args) {
       case '--project-name':     flags.project_name     = args[++i]; break;
       case '--project-type':     flags.project_type     = args[++i]; break;
       case '--stack':            flags.stack            = args[++i]; break;
+      case '--mode':             flags.mode             = args[++i]; break;
       case '--source-template':  flags.source_template  = args[++i]; break;
       case '--overwrite':        flags.overwrite        = true; break;
       case '--no-overwrite':     flags.overwrite        = false; break;
@@ -59,6 +61,7 @@ function dispatchInitProject(rawArgs) {
     project_name: flags.project_name,
     project_type: flags.project_type,
     stack: flags.stack,
+    mode: flags.mode || 'auto',
     overwrite: !!flags.overwrite,
     source_template: flags.source_template,
   };

package/ultra-tools/status-command.test.cjs

@@ -63,6 +63,26 @@ test('buildCostPanel: empty db → zero totals, empty arrays', () => {
     assert.equal(out.total_cost_usd, 0);
     assert.equal(out.by_runtime.length, 0);
     assert.equal(out.top_tasks.length, 0);
+    assert.deepEqual(out.baseline, {
+      id: null, mode: null, status: 'missing', health: 'fail',
+      repository_revision: null, blockers: ['BASELINE_MISSING'], warnings: [],
+    });
+  } finally { teardown(dir, db); }
+});
+
+test('status exposes an in-progress brownfield baseline from authoritative state', () => {
+  const { dir, db } = freshFixture();
+  try {
+    db.prepare(
+      `INSERT INTO baselines (id, project_name, mode, status)
+       VALUES ('adoption', 'legacy', 'brownfield', 'adopting')`,
+    ).run();
+    const out = statusCmd.buildCostPanel(db, { rootDir: dir });
+    assert.equal(out.baseline.id, 'adoption');
+    assert.equal(out.baseline.mode, 'brownfield');
+    assert.equal(out.baseline.status, 'adopting');
+    assert.deepEqual(out.baseline.blockers, ['BASELINE_NOT_READY:adopting']);
+    assert.match(statusCmd.renderHuman(out), /Baseline: brownfield\/adopting.*blocked/i);
   } finally { teardown(dir, db); }
 });
 

package/ultra-tools/system-command.test.cjs

@@ -14,6 +14,11 @@ const CLI = path.join(__dirname, 'cli.cjs');
 function fixture() {
   const rootDir = fs.mkdtempSync(path.join(os.tmpdir(), 'ubp-system-cli-'));
   const { db } = initStateDb(path.join(rootDir, '.ultra', 'state.db'));
+  db.prepare(
+    `INSERT INTO baselines
+     (id, project_name, mode, status, approved_by, approval_note, converged_at)
+     VALUES ('test-baseline', 'fixture', 'migrated', 'ready', 'test', 'legacy fixture', ?)`,
+  ).run(new Date().toISOString());
   closeStateDb(db);
   return rootDir;
 }