@deksden-com/dd-flow-cli 0.4.0 → 0.4.2

package/dist/storage/database.js

@@ -10,8 +10,8 @@ export function getDatabase(ddFlowHome) {
     const dbPath = path.join(ddFlowHome, "db.sqlite");
     const db = new DatabaseSync(dbPath);
     configureDatabase(db);
-    db.exec("PRAGMA foreign_keys = ON");
     migrate(db);
+    db.exec("PRAGMA foreign_keys = ON");
     return {
         path: dbPath,
         exec: (sql) => db.exec(sql),
@@ -41,7 +41,7 @@ function migrate(db) {
     );
 
     CREATE TABLE IF NOT EXISTS protocols (
-      id TEXT PRIMARY KEY,
+      id TEXT NOT NULL,
       handshake_id TEXT NOT NULL,
       project_id TEXT NOT NULL,
       project_root TEXT NOT NULL,
@@ -56,14 +56,17 @@ function migrate(db) {
       plan_path TEXT NOT NULL,
       created_at TEXT NOT NULL,
       updated_at TEXT NOT NULL,
+      PRIMARY KEY(project_id, id),
       FOREIGN KEY(project_id) REFERENCES projects(id)
     );
 
     CREATE TABLE IF NOT EXISTS plans (
-      protocol_id TEXT PRIMARY KEY,
+      project_id TEXT NOT NULL,
+      protocol_id TEXT NOT NULL,
       plan_json TEXT NOT NULL,
       updated_at TEXT NOT NULL,
-      FOREIGN KEY(protocol_id) REFERENCES protocols(id)
+      PRIMARY KEY(project_id, protocol_id),
+      FOREIGN KEY(project_id, protocol_id) REFERENCES protocols(project_id, id)
     );
 
     CREATE TABLE IF NOT EXISTS audit_events (
@@ -79,7 +82,7 @@ function migrate(db) {
 
     CREATE TABLE IF NOT EXISTS merge_queue (
       id INTEGER PRIMARY KEY AUTOINCREMENT,
-      protocol_id TEXT NOT NULL UNIQUE,
+      protocol_id TEXT NOT NULL,
       project_id TEXT NOT NULL,
       status TEXT NOT NULL,
       claimed_by_session_id TEXT,
@@ -88,7 +91,8 @@ function migrate(db) {
       last_reason TEXT,
       completed_at TEXT,
       created_at TEXT NOT NULL,
-      updated_at TEXT NOT NULL
+      updated_at TEXT NOT NULL,
+      UNIQUE(project_id, protocol_id)
     );
 
     CREATE TABLE IF NOT EXISTS merge_sessions (
@@ -244,6 +248,7 @@ function migrate(db) {
       transcript_path TEXT,
       cwd TEXT,
       metadata_json TEXT NOT NULL,
+      coverage_units_json TEXT NOT NULL DEFAULT '[]',
       created_at TEXT NOT NULL,
       updated_at TEXT NOT NULL,
       stopped_at TEXT,
@@ -252,7 +257,7 @@ function migrate(db) {
     );
 
     CREATE TABLE IF NOT EXISTS flow_runs (
-      id TEXT PRIMARY KEY,
+      id TEXT NOT NULL,
       short_id TEXT NOT NULL,
       slug TEXT NOT NULL,
       project_id TEXT NOT NULL,
@@ -274,6 +279,7 @@ function migrate(db) {
       created_at TEXT NOT NULL,
       updated_at TEXT NOT NULL,
       completed_at TEXT,
+      PRIMARY KEY(project_id, id),
       FOREIGN KEY(project_id) REFERENCES projects(id)
     );
 
@@ -283,6 +289,46 @@ function migrate(db) {
     CREATE INDEX IF NOT EXISTS idx_flow_runs_short_id
       ON flow_runs(short_id);
 
+    CREATE TABLE IF NOT EXISTS flow_run_flag_mutations (
+      project_id TEXT NOT NULL,
+      run_id TEXT NOT NULL,
+      idempotency_key TEXT NOT NULL,
+      expected_revision INTEGER NOT NULL,
+      resulting_revision INTEGER NOT NULL,
+      result_json TEXT NOT NULL,
+      created_at TEXT NOT NULL,
+      PRIMARY KEY(project_id, run_id, idempotency_key),
+      FOREIGN KEY(project_id) REFERENCES projects(id)
+    );
+
+    CREATE TABLE IF NOT EXISTS flow_run_usage_snapshots (
+      id TEXT PRIMARY KEY,
+      project_id TEXT NOT NULL,
+      run_id TEXT NOT NULL,
+      session_id TEXT NOT NULL,
+      checkpoint TEXT NOT NULL,
+      stage TEXT,
+      stage_attempt TEXT,
+      observed_at TEXT NOT NULL,
+      total_tokens INTEGER,
+      input_tokens INTEGER,
+      cached_input_tokens INTEGER,
+      output_tokens INTEGER,
+      reasoning_output_tokens INTEGER,
+      source_kind TEXT NOT NULL,
+      token_event_at TEXT,
+      turn_id TEXT,
+      turn_attribution TEXT NOT NULL,
+      parser_version INTEGER NOT NULL,
+      extraction_status TEXT NOT NULL,
+      diagnostic_code TEXT,
+      created_at TEXT NOT NULL,
+      FOREIGN KEY(project_id) REFERENCES projects(id)
+    );
+
+    CREATE INDEX IF NOT EXISTS idx_flow_run_usage_snapshots_run
+      ON flow_run_usage_snapshots(project_id, run_id, session_id, observed_at, id);
+
     CREATE TABLE IF NOT EXISTS pending_flow_session_bindings (
       session_id TEXT NOT NULL,
       project_id TEXT NOT NULL,
@@ -312,7 +358,7 @@ function migrate(db) {
     );
 
     CREATE TABLE IF NOT EXISTS worktree_records (
-      protocol_id TEXT PRIMARY KEY,
+      protocol_id TEXT NOT NULL,
       project_id TEXT NOT NULL,
       integration_branch TEXT,
       feature_branch TEXT NOT NULL,
@@ -325,10 +371,12 @@ function migrate(db) {
       created_at TEXT NOT NULL,
       updated_at TEXT NOT NULL,
       closed_at TEXT,
-      FOREIGN KEY(protocol_id) REFERENCES protocols(id),
+      PRIMARY KEY(project_id, protocol_id),
+      FOREIGN KEY(project_id, protocol_id) REFERENCES protocols(project_id, id),
       FOREIGN KEY(project_id) REFERENCES projects(id)
     );
   `);
+    migrateProjectScopedIdentity(db);
     ensureColumn(db, "projects", "short_id", "ALTER TABLE projects ADD COLUMN short_id TEXT");
     ensureColumn(db, "projects", "slug", "ALTER TABLE projects ADD COLUMN slug TEXT");
     ensureColumn(db, "projects", "status", "ALTER TABLE projects ADD COLUMN status TEXT NOT NULL DEFAULT 'active'");
@@ -345,10 +393,176 @@ function migrate(db) {
     ensureColumn(db, "flow_sessions", "next_action", "ALTER TABLE flow_sessions ADD COLUMN next_action TEXT");
     ensureColumn(db, "flow_sessions", "metadata_json", "ALTER TABLE flow_sessions ADD COLUMN metadata_json TEXT NOT NULL DEFAULT '{}'");
     ensureColumn(db, "flow_sessions", "run_id", "ALTER TABLE flow_sessions ADD COLUMN run_id TEXT");
+    ensureColumn(db, "flow_sessions", "parent_session_id", "ALTER TABLE flow_sessions ADD COLUMN parent_session_id TEXT");
+    ensureColumn(db, "flow_sessions", "role", "ALTER TABLE flow_sessions ADD COLUMN role TEXT");
+    ensureColumn(db, "flow_sessions", "aspect_id", "ALTER TABLE flow_sessions ADD COLUMN aspect_id TEXT");
+    ensureColumn(db, "flow_sessions", "plan_item_id", "ALTER TABLE flow_sessions ADD COLUMN plan_item_id TEXT");
+    ensureColumn(db, "flow_sessions", "session_kind", "ALTER TABLE flow_sessions ADD COLUMN session_kind TEXT");
+    ensureColumn(db, "flow_sessions", "coverage_units_json", "ALTER TABLE flow_sessions ADD COLUMN coverage_units_json TEXT NOT NULL DEFAULT '[]'");
     ensureColumn(db, "flow_runs", "run_home_path", "ALTER TABLE flow_runs ADD COLUMN run_home_path TEXT");
     ensureColumn(db, "flow_runs", "layout_version", "ALTER TABLE flow_runs ADD COLUMN layout_version TEXT");
     ensureColumn(db, "flow_runs", "artifact_root_kind", "ALTER TABLE flow_runs ADD COLUMN artifact_root_kind TEXT");
     ensureColumn(db, "lane_waiters", "expires_at", "ALTER TABLE lane_waiters ADD COLUMN expires_at TEXT");
+    db.exec(`
+    CREATE INDEX IF NOT EXISTS idx_flow_runs_project_updated
+      ON flow_runs(project_id, updated_at DESC);
+    CREATE INDEX IF NOT EXISTS idx_flow_runs_short_id
+      ON flow_runs(short_id);
+  `);
+}
+function migrateProjectScopedIdentity(db) {
+    const protocolColumns = db.prepare("PRAGMA table_info(protocols)").all();
+    const legacyGlobalPrimaryKey = protocolColumns.some((column) => column.name === "id" && column.pk === 1)
+        && protocolColumns.some((column) => column.name === "project_id" && column.pk === 0);
+    if (!legacyGlobalPrimaryKey)
+        return;
+    db.exec(`
+    PRAGMA foreign_keys = OFF;
+    BEGIN IMMEDIATE;
+
+    ALTER TABLE plans RENAME TO plans_legacy_global_identity;
+    ALTER TABLE merge_queue RENAME TO merge_queue_legacy_global_identity;
+    ALTER TABLE worktree_records RENAME TO worktree_records_legacy_global_identity;
+    ALTER TABLE flow_runs RENAME TO flow_runs_legacy_global_identity;
+    ALTER TABLE protocols RENAME TO protocols_legacy_global_identity;
+
+    CREATE TABLE protocols (
+      id TEXT NOT NULL,
+      handshake_id TEXT NOT NULL,
+      project_id TEXT NOT NULL,
+      project_root TEXT NOT NULL,
+      status TEXT NOT NULL,
+      stage TEXT NOT NULL,
+      next_action TEXT,
+      route_json TEXT NOT NULL,
+      workspace_json TEXT NOT NULL,
+      blockers_json TEXT NOT NULL,
+      active_def_json TEXT NOT NULL,
+      state_path TEXT NOT NULL,
+      plan_path TEXT NOT NULL,
+      created_at TEXT NOT NULL,
+      updated_at TEXT NOT NULL,
+      PRIMARY KEY(project_id, id),
+      FOREIGN KEY(project_id) REFERENCES projects(id)
+    );
+
+    INSERT INTO protocols
+      (id, handshake_id, project_id, project_root, status, stage, next_action,
+       route_json, workspace_json, blockers_json, active_def_json, state_path,
+       plan_path, created_at, updated_at)
+      SELECT id, handshake_id, project_id, project_root, status, stage,
+        next_action, route_json, workspace_json, blockers_json, active_def_json,
+        state_path, plan_path, created_at, updated_at
+      FROM protocols_legacy_global_identity;
+
+    CREATE TABLE plans (
+      project_id TEXT NOT NULL,
+      protocol_id TEXT NOT NULL,
+      plan_json TEXT NOT NULL,
+      updated_at TEXT NOT NULL,
+      PRIMARY KEY(project_id, protocol_id),
+      FOREIGN KEY(project_id, protocol_id) REFERENCES protocols(project_id, id)
+    );
+    INSERT INTO plans (project_id, protocol_id, plan_json, updated_at)
+      SELECT p.project_id, legacy.protocol_id, legacy.plan_json, legacy.updated_at
+      FROM plans_legacy_global_identity legacy
+      JOIN protocols p ON p.id = legacy.protocol_id;
+
+    CREATE TABLE merge_queue (
+      id INTEGER PRIMARY KEY AUTOINCREMENT,
+      protocol_id TEXT NOT NULL,
+      project_id TEXT NOT NULL,
+      status TEXT NOT NULL,
+      claimed_by_session_id TEXT,
+      claimed_at TEXT,
+      attempts_count INTEGER NOT NULL DEFAULT 0,
+      last_reason TEXT,
+      completed_at TEXT,
+      created_at TEXT NOT NULL,
+      updated_at TEXT NOT NULL,
+      UNIQUE(project_id, protocol_id)
+    );
+    INSERT INTO merge_queue
+      (id, protocol_id, project_id, status, claimed_by_session_id, claimed_at,
+       attempts_count, last_reason, completed_at, created_at, updated_at)
+      SELECT id, protocol_id, project_id, status, claimed_by_session_id,
+        claimed_at, COALESCE(attempts_count, 0), last_reason, completed_at,
+        created_at, updated_at
+      FROM merge_queue_legacy_global_identity;
+
+    CREATE TABLE worktree_records (
+      protocol_id TEXT NOT NULL,
+      project_id TEXT NOT NULL,
+      integration_branch TEXT,
+      feature_branch TEXT NOT NULL,
+      base_ref TEXT NOT NULL,
+      worktree_path TEXT NOT NULL,
+      worktrunk_metadata_json TEXT NOT NULL,
+      bootstrap_status TEXT NOT NULL,
+      status TEXT NOT NULL,
+      last_command_result_json TEXT NOT NULL,
+      created_at TEXT NOT NULL,
+      updated_at TEXT NOT NULL,
+      closed_at TEXT,
+      PRIMARY KEY(project_id, protocol_id),
+      FOREIGN KEY(project_id, protocol_id) REFERENCES protocols(project_id, id),
+      FOREIGN KEY(project_id) REFERENCES projects(id)
+    );
+    INSERT INTO worktree_records
+      (protocol_id, project_id, integration_branch, feature_branch, base_ref,
+       worktree_path, worktrunk_metadata_json, bootstrap_status, status,
+       last_command_result_json, created_at, updated_at, closed_at)
+      SELECT protocol_id, project_id, integration_branch, feature_branch,
+        base_ref, worktree_path, worktrunk_metadata_json, bootstrap_status,
+        status, last_command_result_json, created_at, updated_at, closed_at
+      FROM worktree_records_legacy_global_identity;
+
+    CREATE TABLE flow_runs (
+      id TEXT NOT NULL,
+      short_id TEXT NOT NULL,
+      slug TEXT NOT NULL,
+      project_id TEXT NOT NULL,
+      project_root TEXT NOT NULL,
+      workspace_root TEXT NOT NULL,
+      flow_kind TEXT NOT NULL,
+      subject_type TEXT NOT NULL,
+      subject_id TEXT NOT NULL,
+      status TEXT NOT NULL,
+      verdict TEXT NOT NULL,
+      next_action TEXT,
+      runtime_path TEXT NOT NULL,
+      run_dir TEXT NOT NULL,
+      run_index_path TEXT NOT NULL,
+      run_home_path TEXT,
+      layout_version TEXT,
+      artifact_root_kind TEXT,
+      index_json TEXT NOT NULL,
+      created_at TEXT NOT NULL,
+      updated_at TEXT NOT NULL,
+      completed_at TEXT,
+      PRIMARY KEY(project_id, id),
+      FOREIGN KEY(project_id) REFERENCES projects(id)
+    );
+    INSERT INTO flow_runs
+      (id, short_id, slug, project_id, project_root, workspace_root, flow_kind,
+       subject_type, subject_id, status, verdict, next_action, runtime_path,
+       run_dir, run_index_path, run_home_path, layout_version,
+       artifact_root_kind, index_json, created_at, updated_at, completed_at)
+      SELECT id, short_id, slug, project_id, project_root, workspace_root,
+        flow_kind, subject_type, subject_id, status, verdict, next_action,
+        runtime_path, run_dir, run_index_path, run_home_path, layout_version,
+        artifact_root_kind, index_json, created_at, updated_at, completed_at
+      FROM flow_runs_legacy_global_identity;
+
+    DROP TABLE plans_legacy_global_identity;
+    DROP TABLE merge_queue_legacy_global_identity;
+    DROP TABLE worktree_records_legacy_global_identity;
+    DROP TABLE flow_runs_legacy_global_identity;
+    DROP TABLE protocols_legacy_global_identity;
+
+    COMMIT;
+    PRAGMA foreign_keys = ON;
+  `);
 }
 function ensureColumn(db, table, column, sql) {
     const columns = db.prepare(`PRAGMA table_info(${table})`).all();

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@deksden-com/dd-flow-cli",
-  "version": "0.4.0",
+  "version": "0.4.2",
   "description": "Mechanical runtime CLI for dd-flow workflows.",
   "type": "module",
   "bin": {