ultra-builder-pro-cli 0.16.0 → 0.17.0

package/ultra-tools/commands/session.cjs

@@ -9,6 +9,7 @@
 const path = require('node:path');
 const { initStateDb, closeStateDb } = require('../../mcp-server/lib/state-db.cjs');
 const ops = require('../../mcp-server/lib/state-ops.cjs');
+const sessionRunner = require('../../orchestrator/session-runner.cjs');
 
 const DEFAULT_DB_PATH = path.join('.ultra', 'state.db');
 
@@ -20,11 +21,12 @@ VERBS:
   reap        [--grace-seconds <n>]                      orphan sweeper (Phase 4.5.6)
   get         --sid <sid>
   heartbeat   --sid <sid>
-  close       --sid <sid> --status completed|crashed|orphan
+  close       --sid <sid> --status completed|crashed|orphan [--remove-worktree]
   subscribe   --since-id <n> [--sid <sid>] [--limit <n>]
 
 GLOBAL FLAGS:
   --db <path>  path to state.db (default: .ultra/state.db)
+  --repo-root <path> repository root for verified worktree cleanup (default: cwd)
   -h, --help   show this message
 `;
 
@@ -44,6 +46,8 @@ function parseFlags(args) {
       case '--limit':           flags.limit = Number(args[++i]); break;
       case '--since-id':        flags.since_id = Number(args[++i]); break;
       case '--grace-seconds':   flags.grace_seconds = Number(args[++i]); break;
+      case '--repo-root':       flags.repo_root = args[++i]; break;
+      case '--remove-worktree': flags.remove_worktree = true; break;
       case '-h': case '--help': flags.help = true; break;
       default:                  flags._.push(a);
     }
@@ -127,8 +131,11 @@ function cmdClose(flags) {
   if (!flags.sid || !flags.status) { emit({ ok: false, error: { code: 'VALIDATION_ERROR', message: 'missing --sid or --status' } }); return 1; }
   return withDb(flags, (db) => {
     try {
-      ops.updateSession(db, flags.sid, { status: flags.status });
-      emit({ ok: true, data: { sid: flags.sid, status: flags.status } });
+      const result = sessionRunner.closeSession(
+        { db, repoRoot: path.resolve(flags.repo_root || process.cwd()), sid: flags.sid },
+        { status: flags.status, remove_worktree: flags.remove_worktree === true },
+      );
+      emit({ ok: true, data: result });
       return 0;
     } catch (err) {
       emit({ ok: false, error: { code: err.code || 'STATE_DB_ERROR', message: err.message } });

package/ultra-tools/commands/status.cjs

@@ -17,7 +17,7 @@ const { readBreadcrumb } = require('../../mcp-server/lib/context-spine.cjs');
 
 const USAGE = `ultra-tools status [flags]
 
-Reads .ultra/state.db and prints baseline, workflow, task, session, route, and
+Reads .ultra/state.db and prints baseline, workflow, task, session, valid transitions, and
 cost-observability status.
 
 FLAGS:
@@ -174,20 +174,19 @@ function buildStatusPanel(db, { since = null, limit = 3, rootDir = process.cwd()
       status: 'unavailable', active: 0, awaiting_owner: 0, checkpoint_ready: 0,
       deferred_blocking: 0, stale_artifacts: [], current: null, current_thread_id: null,
     };
-  let next;
+  let transitions;
   let breadcrumb = null;
   try {
     if (!tables.has('baselines')) {
-      next = {
-        action: 'Resume project initialization to migrate and establish baseline authority.',
-        recommended_workflow: 'ultra-init', readiness: 'blocked',
+      transitions = {
+        allowed: ['ultra-init', 'ultra-status'], required: 'ultra-init', readiness: 'blocked',
         blockers: ['BASELINE_SCHEMA_MIGRATION_REQUIRED'], warnings: [],
       };
     } else {
     breadcrumb = readBreadcrumb(db, {}, { rootDir });
-    next = {
-      action: breadcrumb.next_action,
-      recommended_workflow: breadcrumb.recommended_workflow,
+    transitions = {
+      allowed: breadcrumb.allowed_transitions,
+      required: breadcrumb.required_transition,
       readiness: breadcrumb.readiness,
       blockers: breadcrumb.blockers,
       warnings: breadcrumb.warnings,
@@ -197,9 +196,8 @@ function buildStatusPanel(db, { since = null, limit = 3, rootDir = process.cwd()
     };
     }
   } catch (error) {
-    next = {
-      action: 'Run ultra-doctor to inspect authoritative state.',
-      recommended_workflow: 'ultra-doctor', readiness: 'blocked',
+    transitions = {
+      allowed: ['ultra-doctor', 'ultra-status'], required: 'ultra-doctor', readiness: 'blocked',
       blockers: [`STATUS_AUTHORITY_UNAVAILABLE:${error.code || 'unknown'}`], warnings: [],
     };
   }
@@ -256,7 +254,7 @@ function buildStatusPanel(db, { since = null, limit = 3, rootDir = process.cwd()
     changes,
     tasks: taskCounts,
     sessions,
-    next,
+    transitions,
     by_runtime,
     top_tasks,
     total_cost_usd,
@@ -315,7 +313,8 @@ function renderHuman(panel) {
   lines.push(
     `Sessions: running=${panel.sessions.running} crashed=${panel.sessions.crashed} orphan=${panel.sessions.orphan}`,
   );
-  lines.push(`Next: ${panel.next.action} (${panel.next.recommended_workflow})`);
+  lines.push(`Allowed transitions: ${panel.transitions.allowed.join(', ') || 'none'}`);
+  if (panel.transitions.required) lines.push(`Required transition: ${panel.transitions.required}`);
   lines.push(
     `Evidence: test=${panel.evidence.test.status} review=${panel.evidence.review.status} delivery=${panel.evidence.delivery.status}`,
   );
@@ -360,6 +359,11 @@ function resolveDbPath() {
   return path.resolve('.ultra', 'state.db');
 }
 
+function resolveRootDir(dbPath) {
+  if (process.env.UBP_ROOT_DIR) return path.resolve(process.env.UBP_ROOT_DIR);
+  return path.dirname(path.dirname(dbPath));
+}
+
 function dispatch(args) {
   let flags;
   try { flags = parseFlags(args); } catch (err) { return fail('USAGE_ERROR', err.message); }
@@ -377,7 +381,7 @@ function dispatch(args) {
   const Database = require('better-sqlite3');
   const db = new Database(dbPath, { readonly: true });
   try {
-    const rootDir = path.dirname(path.dirname(dbPath));
+    const rootDir = resolveRootDir(dbPath);
     const panel = buildStatusPanel(db, { since, limit: flags.limit, rootDir });
     if (flags.json) {
       emit({ ok: true, data: panel });
@@ -398,4 +402,5 @@ module.exports = {
   renderHuman,
   parseSince,
   parseFlags,
+  resolveRootDir,
 };

package/ultra-tools/commands/system.cjs

@@ -213,7 +213,7 @@ async function dispatchRestore(args) {
         quarantined_state_path: path.join(recoveryDir, 'state.db'),
         schema_version: initialized.schema_version,
         schema_migration_backup_path: initialized.backup_path || null,
-        next_action: 'Run ultra-tools system doctor, then ultra-init to inspect baseline readiness.',
+        recovery_guidance: 'Run ultra-tools system doctor, then ultra-init to inspect baseline readiness.',
       },
     });
     return 0;
@@ -284,7 +284,7 @@ async function dispatchRebaseline(args) {
           : null,
         baseline: initialized.baseline,
         copied_files: initialized.copied_files,
-        next_action: 'Inspect the preserved evidence, record the brownfield baseline, and obtain owner approval before convergence.',
+        recovery_guidance: 'Inspect the preserved evidence, run explicit adoption research, record the brownfield baseline, and obtain owner approval before convergence.',
       },
     });
     return 0;

package/ultra-tools/commands/task.cjs

@@ -17,6 +17,7 @@ FLAGS (init-project):
   --project-type <type>     web | api | cli | fullstack | other
   --stack <stack>           tech stack descriptor (comma-separated ok)
   --mode <mode>             auto | greenfield | brownfield (default: auto)
+  --git-mode <mode>         auto | initialize | skip (default: auto)
   --scope <path>            baseline scope; repeat for multiple paths (default: .)
   --resume                  preserve existing .ultra/ and install only missing assets
   --overwrite               replace existing .ultra/ (backup created)
@@ -38,6 +39,7 @@ function parseInitFlags(args) {
       case '--project-type':     flags.project_type     = args[++i]; break;
       case '--stack':            flags.stack            = args[++i]; break;
       case '--mode':             flags.mode             = args[++i]; break;
+      case '--git-mode':         flags.git_mode         = args[++i]; break;
       case '--scope':            flags.scope.push(args[++i]); break;
       case '--resume':           flags.resume            = true; break;
       case '--source-template':  flags.source_template  = args[++i]; break;
@@ -66,6 +68,7 @@ function dispatchInitProject(rawArgs) {
     project_type: flags.project_type,
     stack: flags.stack,
     mode: flags.mode || 'auto',
+    git_mode: flags.git_mode || 'auto',
     scope: flags.scope.length > 0 ? flags.scope : undefined,
     resume: !!flags.resume,
     overwrite: !!flags.overwrite,