@hasna/economy 0.3.5 → 0.3.7

package/dist/cli/index.js

@@ -544,6 +544,7 @@ __export(exports_database, {
   upsertProject: () => upsertProject,
   upsertModelPricing: () => upsertModelPricing,
   upsertGoal: () => upsertGoal,
+  upsertCostCenter: () => upsertCostCenter,
   upsertBudget: () => upsertBudget,
   upsertBillingDaily: () => upsertBillingDaily,
   setIngestState: () => setIngestState,
@@ -561,6 +562,7 @@ __export(exports_database, {
   queryModelBreakdown: () => queryModelBreakdown,
   queryHourlyBreakdown: () => queryHourlyBreakdown,
   queryDailyBreakdown: () => queryDailyBreakdown,
+  queryCostCenterBreakdown: () => queryCostCenterBreakdown,
   queryBillingSummary: () => queryBillingSummary,
   queryAgentBreakdownSince: () => queryAgentBreakdownSince,
   queryAgentBreakdown: () => queryAgentBreakdown,
@@ -583,6 +585,7 @@ __export(exports_database, {
   getGoalStatuses: () => getGoalStatuses,
   getDbPath: () => getDbPath,
   getDataDir: () => getDataDir,
+  getCostCenter: () => getCostCenter,
   getBudgetStatuses: () => getBudgetStatuses,
   deleteSubscription: () => deleteSubscription,
   deleteProject: () => deleteProject,
@@ -727,6 +730,16 @@ function addColumnIfMissing(db, table, column, definition) {
 }
 function initSchema(db) {
   db.exec(`
+    CREATE TABLE IF NOT EXISTS cost_centers (
+      id TEXT PRIMARY KEY,
+      kind TEXT NOT NULL,
+      name TEXT NOT NULL,
+      repo_path TEXT,
+      labels_json TEXT DEFAULT '{}',
+      created_at TEXT NOT NULL,
+      updated_at TEXT NOT NULL
+    );
+
     CREATE TABLE IF NOT EXISTS requests (
       id TEXT PRIMARY KEY,
       agent TEXT NOT NULL,
@@ -743,6 +756,7 @@ function initSchema(db) {
       timestamp TEXT NOT NULL,
       source_request_id TEXT,
       machine_id TEXT DEFAULT '',
+      cost_center_id TEXT,
       account_key TEXT DEFAULT '',
       account_tool TEXT DEFAULT '',
       account_name TEXT DEFAULT '',
@@ -761,6 +775,7 @@ function initSchema(db) {
       total_tokens INTEGER DEFAULT 0,
       request_count INTEGER DEFAULT 0,
       machine_id TEXT DEFAULT '',
+      cost_center_id TEXT,
       account_key TEXT DEFAULT '',
       account_tool TEXT DEFAULT '',
       account_name TEXT DEFAULT '',
@@ -781,6 +796,7 @@ function initSchema(db) {
       id TEXT PRIMARY KEY,
       project_path TEXT,
       agent TEXT,
+      cost_center_id TEXT,
       period TEXT NOT NULL,
       limit_usd REAL NOT NULL,
       alert_at_percent INTEGER DEFAULT 80,
@@ -811,6 +827,7 @@ function initSchema(db) {
     CREATE INDEX IF NOT EXISTS idx_sessions_agent ON sessions(agent);
     CREATE INDEX IF NOT EXISTS idx_sessions_project ON sessions(project_path);
     CREATE INDEX IF NOT EXISTS idx_sessions_started ON sessions(started_at);
+    CREATE INDEX IF NOT EXISTS idx_cost_centers_kind ON cost_centers(kind);
 
     CREATE TABLE IF NOT EXISTS model_pricing (
       model TEXT PRIMARY KEY,
@@ -897,6 +914,12 @@ function initSchema(db) {
   `);
   addColumnIfMissing(db, "requests", "machine_id", `TEXT DEFAULT ''`);
   addColumnIfMissing(db, "sessions", "machine_id", `TEXT DEFAULT ''`);
+  if (addColumnIfMissing(db, "cost_centers", "updated_at", `TEXT DEFAULT ''`)) {
+    db.exec(`UPDATE cost_centers SET updated_at = created_at WHERE updated_at = '' OR updated_at IS NULL`);
+  }
+  addColumnIfMissing(db, "requests", "cost_center_id", `TEXT`);
+  addColumnIfMissing(db, "sessions", "cost_center_id", `TEXT`);
+  addColumnIfMissing(db, "budgets", "cost_center_id", `TEXT`);
   if (addColumnIfMissing(db, "requests", "cache_create_5m_tokens", "INTEGER DEFAULT 0")) {
     db.exec(`UPDATE requests SET cache_create_5m_tokens = cache_create_tokens WHERE cache_create_5m_tokens = 0`);
   }
@@ -925,6 +948,10 @@ function initSchema(db) {
     CREATE INDEX IF NOT EXISTS idx_sessions_machine ON sessions(machine_id);
     CREATE INDEX IF NOT EXISTS idx_requests_account ON requests(account_key);
     CREATE INDEX IF NOT EXISTS idx_sessions_account ON sessions(account_key);
+    CREATE INDEX IF NOT EXISTS idx_requests_cost_center ON requests(cost_center_id);
+    CREATE INDEX IF NOT EXISTS idx_sessions_cost_center ON sessions(cost_center_id);
+    CREATE INDEX IF NOT EXISTS idx_budgets_cost_center ON budgets(cost_center_id);
+    CREATE INDEX IF NOT EXISTS idx_cost_centers_kind ON cost_centers(kind);
   `);
 }
 function periodWhere(period) {
@@ -975,6 +1002,17 @@ function requestPeriodWhere(period) {
       return "1=1";
   }
 }
+function upsertCostCenter(db, center) {
+  const updatedAt = center.updated_at ?? center.created_at;
+  db.prepare(`
+    INSERT OR REPLACE INTO cost_centers
+      (id, kind, name, repo_path, labels_json, created_at, updated_at)
+    VALUES (?, ?, ?, ?, ?, ?, ?)
+  `).run(center.id, center.kind, center.name, center.repo_path ?? null, center.labels_json ?? "{}", center.created_at, updatedAt);
+}
+function getCostCenter(db, id) {
+  return db.prepare(`SELECT * FROM cost_centers WHERE id = ?`).get(id);
+}
 function upsertRequest(db, req) {
   const now = req.updated_at ?? new Date().toISOString();
   db.prepare(`
@@ -982,10 +1020,10 @@ function upsertRequest(db, req) {
       (id, agent, session_id, model, input_tokens, output_tokens,
        cache_read_tokens, cache_create_tokens, cache_create_5m_tokens,
        cache_create_1h_tokens, cost_usd, cost_basis, duration_ms, timestamp,
-       source_request_id, machine_id, attribution_tag, account_key, account_tool,
+       source_request_id, machine_id, cost_center_id, attribution_tag, account_key, account_tool,
        account_name, account_email, account_source, updated_at, synced_at)
-    VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)
-  `).run(req.id, req.agent, req.session_id, req.model, req.input_tokens, req.output_tokens, req.cache_read_tokens, req.cache_create_tokens, req.cache_create_5m_tokens ?? req.cache_create_tokens, req.cache_create_1h_tokens ?? 0, req.cost_usd, req.cost_basis ?? "estimated", req.duration_ms, req.timestamp, req.source_request_id, req.machine_id ?? "", req.attribution_tag ?? process.env["ECONOMY_TAG"] ?? "", req.account_key ?? "", req.account_tool ?? "", req.account_name ?? "", req.account_email ?? "", req.account_source ?? "", now, req.synced_at ?? "");
+    VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)
+  `).run(req.id, req.agent, req.session_id, req.model, req.input_tokens, req.output_tokens, req.cache_read_tokens, req.cache_create_tokens, req.cache_create_5m_tokens ?? req.cache_create_tokens, req.cache_create_1h_tokens ?? 0, req.cost_usd, req.cost_basis ?? "estimated", req.duration_ms, req.timestamp, req.source_request_id, req.machine_id ?? "", req.cost_center_id ?? null, req.attribution_tag ?? process.env["ECONOMY_TAG"] ?? "", req.account_key ?? "", req.account_tool ?? "", req.account_name ?? "", req.account_email ?? "", req.account_source ?? "", now, req.synced_at ?? "");
 }
 function upsertSession(db, session) {
   const now = session.updated_at ?? new Date().toISOString();
@@ -993,9 +1031,9 @@ function upsertSession(db, session) {
     INSERT OR REPLACE INTO sessions
       (id, agent, project_path, project_name, started_at, ended_at,
        total_cost_usd, total_tokens, request_count, machine_id, attribution_tag,
-       account_key, account_tool, account_name, account_email, account_source, updated_at, synced_at)
-    VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)
-  `).run(session.id, session.agent, session.project_path, session.project_name, session.started_at, session.ended_at ?? null, session.total_cost_usd, session.total_tokens, session.request_count, session.machine_id ?? "", session.attribution_tag ?? process.env["ECONOMY_TAG"] ?? "", session.account_key ?? "", session.account_tool ?? "", session.account_name ?? "", session.account_email ?? "", session.account_source ?? "", now, session.synced_at ?? "");
+       cost_center_id, account_key, account_tool, account_name, account_email, account_source, updated_at, synced_at)
+    VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)
+  `).run(session.id, session.agent, session.project_path, session.project_name, session.started_at, session.ended_at ?? null, session.total_cost_usd, session.total_tokens, session.request_count, session.machine_id ?? "", session.attribution_tag ?? process.env["ECONOMY_TAG"] ?? "", session.cost_center_id ?? null, session.account_key ?? "", session.account_tool ?? "", session.account_name ?? "", session.account_email ?? "", session.account_source ?? "", now, session.synced_at ?? "");
 }
 function rollupSession(db, sessionId) {
   db.prepare(`
@@ -1021,9 +1059,12 @@ function rollupSession(db, sessionId) {
                             ELSE account_email END,
       account_source = CASE WHEN account_source = '' OR account_source IS NULL
                             THEN COALESCE((SELECT account_source FROM requests WHERE session_id = ? AND account_source != '' ORDER BY timestamp DESC LIMIT 1), '')
-                            ELSE account_source END
+                            ELSE account_source END,
+      cost_center_id = CASE WHEN cost_center_id = '' OR cost_center_id IS NULL
+                            THEN COALESCE((SELECT cost_center_id FROM requests WHERE session_id = ? AND cost_center_id IS NOT NULL AND cost_center_id != '' ORDER BY timestamp DESC LIMIT 1), NULL)
+                            ELSE cost_center_id END
     WHERE id = ?
-  `).run(sessionId, sessionId, sessionId, sessionId, sessionId, sessionId, sessionId, sessionId, sessionId, sessionId, sessionId);
+  `).run(sessionId, sessionId, sessionId, sessionId, sessionId, sessionId, sessionId, sessionId, sessionId, sessionId, sessionId, sessionId);
 }
 function querySessions(db, filter = {}) {
   const conditions = [];
@@ -1465,6 +1506,139 @@ function queryAccountBreakdown(db, period = "all", machine) {
   result.sort((a, b) => b.cost_usd - a.cost_usd);
   return result;
 }
+function kindFromCostCenterId(id) {
+  const prefix = id.split(":", 1)[0] ?? "";
+  return ["loop", "app", "repo", "service", "team"].includes(prefix) ? prefix : "";
+}
+function addCostCenterBreakdownRow(groups, row, sessionOnly) {
+  if (!row.cost_center_id)
+    return;
+  const derivedKind = row.kind || kindFromCostCenterId(row.cost_center_id) || "service";
+  const group = groups.get(row.cost_center_id) ?? {
+    cost_center_id: row.cost_center_id,
+    kind: derivedKind,
+    name: row.name || row.cost_center_id,
+    repo_path: row.repo_path ?? null,
+    labels_json: row.labels_json || "{}",
+    sessionIds: new Set,
+    requests: 0,
+    total_tokens: 0,
+    api_equivalent_usd: 0,
+    metered_api_usd: 0,
+    subscription_included_usd: 0,
+    estimated_usd: 0,
+    unknown_usd: 0,
+    last_active: ""
+  };
+  group.kind = derivedKind;
+  if (row.name)
+    group.name = row.name;
+  if (row.repo_path && !group.repo_path)
+    group.repo_path = row.repo_path;
+  if (row.labels_json && row.labels_json !== "{}")
+    group.labels_json = row.labels_json;
+  if (row.session_id)
+    group.sessionIds.add(row.session_id);
+  group.requests += row.requests;
+  group.total_tokens += row.total_tokens;
+  group.api_equivalent_usd += row.cost_usd;
+  if (sessionOnly) {
+    group.estimated_usd += row.cost_usd;
+  } else if (row.cost_basis === "metered_api") {
+    group.metered_api_usd += row.cost_usd;
+  } else if (row.cost_basis === "subscription_included") {
+    group.subscription_included_usd += row.cost_usd;
+  } else if (row.cost_basis === "unknown") {
+    group.unknown_usd += row.cost_usd;
+  } else {
+    group.estimated_usd += row.cost_usd;
+  }
+  if (!group.last_active || row.last_active > group.last_active)
+    group.last_active = row.last_active;
+  groups.set(row.cost_center_id, group);
+}
+function queryCostCenterBreakdown(db, period = "all", filter = {}) {
+  const requestWhere = filter.since ? "r.timestamp >= ?" : requestPeriodWhere(period);
+  const sessionWhere = filter.since ? "s.started_at >= ?" : sessionPeriodWhere(period);
+  const requestMachineClause = filter.machine ? " AND r.machine_id = ?" : "";
+  const sessionMachineClause = filter.machine ? " AND s.machine_id = ?" : "";
+  const requestParams = [];
+  const sessionParams = [];
+  if (filter.since) {
+    requestParams.push(filter.since);
+    sessionParams.push(filter.since);
+  }
+  if (filter.machine) {
+    requestParams.push(filter.machine);
+    sessionParams.push(filter.machine);
+  }
+  const groups = new Map;
+  const requestRows = db.prepare(`
+    SELECT
+      COALESCE(NULLIF(r.cost_center_id, ''), NULLIF(s.cost_center_id, '')) as cost_center_id,
+      COALESCE(cc.kind, '') as kind,
+      COALESCE(cc.name, COALESCE(NULLIF(r.cost_center_id, ''), NULLIF(s.cost_center_id, ''))) as name,
+      cc.repo_path as repo_path,
+      COALESCE(cc.labels_json, '{}') as labels_json,
+      r.session_id as session_id,
+      1 as requests,
+      COALESCE(r.input_tokens + r.output_tokens + r.cache_read_tokens + r.cache_create_tokens, 0) as total_tokens,
+      COALESCE(r.cost_usd, 0) as cost_usd,
+      COALESCE(NULLIF(r.cost_basis, ''), 'estimated') as cost_basis,
+      r.timestamp as last_active
+    FROM requests r
+    LEFT JOIN sessions s ON s.id = r.session_id
+    LEFT JOIN cost_centers cc ON cc.id = COALESCE(NULLIF(r.cost_center_id, ''), NULLIF(s.cost_center_id, ''))
+    WHERE ${requestWhere}${requestMachineClause}
+      AND COALESCE(NULLIF(r.cost_center_id, ''), NULLIF(s.cost_center_id, '')) IS NOT NULL
+      AND COALESCE(NULLIF(r.cost_center_id, ''), NULLIF(s.cost_center_id, '')) != ''
+  `).all(...requestParams);
+  for (const row of requestRows)
+    addCostCenterBreakdownRow(groups, row, false);
+  const sessionOnlyRows = db.prepare(`
+    SELECT
+      s.cost_center_id as cost_center_id,
+      COALESCE(cc.kind, '') as kind,
+      COALESCE(cc.name, s.cost_center_id) as name,
+      cc.repo_path as repo_path,
+      COALESCE(cc.labels_json, '{}') as labels_json,
+      s.id as session_id,
+      COALESCE(s.request_count, 0) as requests,
+      COALESCE(s.total_tokens, 0) as total_tokens,
+      COALESCE(s.total_cost_usd, 0) as cost_usd,
+      'estimated' as cost_basis,
+      s.started_at as last_active
+    FROM sessions s
+    LEFT JOIN cost_centers cc ON cc.id = s.cost_center_id
+    WHERE ${sessionWhere}${sessionMachineClause}
+      AND s.id NOT IN (SELECT DISTINCT session_id FROM requests)
+      AND s.cost_center_id IS NOT NULL
+      AND s.cost_center_id != ''
+  `).all(...sessionParams);
+  for (const row of sessionOnlyRows)
+    addCostCenterBreakdownRow(groups, row, true);
+  const result = [...groups.values()].map((group) => ({
+    cost_center_id: group.cost_center_id,
+    kind: group.kind,
+    name: group.name,
+    repo_path: group.repo_path,
+    labels_json: group.labels_json,
+    sessions: group.sessionIds.size,
+    requests: group.requests,
+    total_tokens: group.total_tokens,
+    api_equivalent_usd: group.api_equivalent_usd,
+    billable_usd: group.metered_api_usd,
+    metered_api_usd: group.metered_api_usd,
+    subscription_included_usd: group.subscription_included_usd,
+    estimated_usd: group.estimated_usd,
+    unknown_usd: group.unknown_usd,
+    cost_usd: group.api_equivalent_usd,
+    last_active: group.last_active
+  }));
+  const filtered = filter.kind ? result.filter((row) => row.kind === filter.kind) : result;
+  filtered.sort((a, b) => b.cost_usd - a.cost_usd);
+  return filtered;
+}
 function queryProjectBreakdownSince(db, since) {
   return db.prepare(`
     SELECT project_path, project_name,
@@ -1654,9 +1828,9 @@ function deleteProject(db, path) {
 function upsertBudget(db, budget) {
   db.prepare(`
     INSERT OR REPLACE INTO budgets
-      (id, project_path, agent, period, limit_usd, alert_at_percent, created_at, updated_at)
-    VALUES (?, ?, ?, ?, ?, ?, ?, ?)
-  `).run(budget.id, budget.project_path ?? null, budget.agent ?? null, budget.period, budget.limit_usd, budget.alert_at_percent, budget.created_at, budget.updated_at);
+      (id, project_path, agent, cost_center_id, period, limit_usd, alert_at_percent, created_at, updated_at)
+    VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?)
+  `).run(budget.id, budget.project_path ?? null, budget.agent ?? null, budget.cost_center_id ?? null, budget.period, budget.limit_usd, budget.alert_at_percent, budget.created_at, budget.updated_at);
 }
 function listBudgets(db) {
   return db.prepare(`SELECT * FROM budgets ORDER BY created_at DESC`).all();
@@ -1678,6 +1852,10 @@ function getBudgetStatuses(db) {
       spendQuery += ` AND agent = ?`;
       params.push(b.agent);
     }
+    if (b.cost_center_id) {
+      spendQuery += ` AND COALESCE(NULLIF(cost_center_id, ''), (SELECT NULLIF(s.cost_center_id, '') FROM sessions s WHERE s.id = requests.session_id)) = ?`;
+      params.push(b.cost_center_id);
+    }
     const row = db.prepare(spendQuery).get(...params);
     const spend = row.spend;
     const percent = b.limit_usd > 0 ? spend / b.limit_usd * 100 : 0;
@@ -3660,6 +3838,13 @@ class LocalStore {
   async accountBreakdown(query = {}) {
     return query.since ? queryAccountBreakdownSince(this.db(), query.since) : queryAccountBreakdown(this.db(), query.period ?? "all", query.machine);
   }
+  async costCenterBreakdown(query = {}) {
+    return queryCostCenterBreakdown(this.db(), query.period ?? "all", {
+      kind: query.kind,
+      machine: query.machine,
+      since: query.since
+    });
+  }
   async accounts(period) {
     return queryAccountBreakdown(this.db(), period);
   }
@@ -3849,6 +4034,14 @@ class ApiStore {
   async accountBreakdown(query = {}) {
     return cloudListItems(this.cloud, "breakdown", q({ by: "account", period: query.period, since: query.since }));
   }
+  async costCenterBreakdown(query = {}) {
+    const rows = await cloudListItems(this.cloud, "breakdown", q({
+      by: query.kind ?? "cost-center",
+      period: query.period,
+      since: query.since
+    }));
+    return rows.filter((row) => Boolean(row?.cost_center_id));
+  }
   async accounts(period) {
     return cloudListItems(this.cloud, "accounts", q({ period }));
   }
@@ -3922,6 +4115,7 @@ class ApiStore {
     const created = await this.cloud.client.create("budgets", {
       project_path: input.project_path,
       ...input.agent ? { agent: input.agent } : {},
+      ...input.cost_center_id ? { cost_center_id: input.cost_center_id } : {},
       period: input.period,
       limit_usd: input.limit_usd,
       alert_at_percent: input.alert_at_percent
@@ -5368,13 +5562,202 @@ var init_hermes = __esm(() => {
   HERMES_DB = join11(homedir8(), ".hermes", "state.db");
 });
 
+// src/ingest/loops.ts
+import { existsSync as existsSync10 } from "fs";
+import { homedir as homedir9 } from "os";
+import { join as join12 } from "path";
+import { Database as BunDatabase2 } from "bun:sqlite";
+function loopsDbPath() {
+  return process.env["HASNA_ECONOMY_LOOPS_DB_PATH"] ?? DEFAULT_LOOPS_DB_PATH;
+}
+function loopsModel() {
+  return process.env["HASNA_ECONOMY_LOOPS_MODEL"] ?? process.env["ECONOMY_LOOPS_MODEL"] ?? "gpt-5.3-codex";
+}
+function openLoopsDb(dbPath, verbose) {
+  let lastError;
+  for (const readonly of [true, false]) {
+    let loopsDb = null;
+    try {
+      loopsDb = readonly ? new BunDatabase2(dbPath, { readonly: true }) : new BunDatabase2(dbPath);
+      loopsDb.prepare("PRAGMA schema_version").get();
+      return loopsDb;
+    } catch (error) {
+      lastError = error;
+      loopsDb?.close();
+    }
+  }
+  if (verbose) {
+    const message = lastError instanceof Error ? lastError.message : String(lastError);
+    console.log("OpenLoops DB unreadable:", dbPath, message);
+  }
+  return null;
+}
+function slug(value) {
+  return value.trim().toLowerCase().replace(/[^a-z0-9._-]+/g, "-").replace(/^-+|-+$/g, "") || "unknown";
+}
+function parseTarget(raw) {
+  if (!raw)
+    return {};
+  try {
+    const parsed = JSON.parse(raw);
+    return parsed && typeof parsed === "object" ? parsed : {};
+  } catch {
+    return {};
+  }
+}
+function stringValue(value) {
+  return typeof value === "string" ? value.trim() : "";
+}
+function accountFields(row) {
+  const target = parseTarget(row.target_json);
+  const tool = stringValue(row.account_tool) || stringValue(target["account_tool"]) || stringValue(target["tool"]) || stringValue(target["agent"]);
+  const profile = stringValue(row.account_profile) || stringValue(target["account_profile"]) || stringValue(target["profile"]) || stringValue(target["account"]);
+  if (!tool || !profile) {
+    return { account_key: "", account_tool: tool, account_name: profile, account_source: "" };
+  }
+  return {
+    account_key: `${tool}:${profile}`,
+    account_tool: tool,
+    account_name: profile,
+    account_source: "loops"
+  };
+}
+function readLoopGoalRuns(loopsDb) {
+  return loopsDb.prepare(`
+    SELECT
+      gr.id as goal_run_id,
+      gr.goal_id as goal_id,
+      COALESCE(gr.loop_id, g.loop_id, lr.loop_id) as loop_id,
+      COALESCE(gr.loop_run_id, g.loop_run_id, lr.id) as loop_run_id,
+      COALESCE(l.name, lr.loop_name, 'unknown-loop') as loop_name,
+      l.labels_json as labels_json,
+      l.target_json as target_json,
+      g.objective as objective,
+      gr.phase as phase,
+      gr.status as status,
+      COALESCE(gr.tokens_used, 0) as tokens_used,
+      gr.created_at as created_at,
+      gr.updated_at as updated_at,
+      lr.started_at as loop_run_started_at,
+      wsr.account_profile as account_profile,
+      wsr.account_tool as account_tool
+    FROM goal_runs gr
+    LEFT JOIN goals g ON g.id = gr.goal_id
+    LEFT JOIN loop_runs lr ON lr.id = COALESCE(gr.loop_run_id, g.loop_run_id)
+    LEFT JOIN loops l ON l.id = COALESCE(gr.loop_id, g.loop_id, lr.loop_id)
+    LEFT JOIN (
+      SELECT goal_run_id, MIN(account_profile) as account_profile, MIN(account_tool) as account_tool
+      FROM workflow_step_runs
+      WHERE goal_run_id IS NOT NULL
+      GROUP BY goal_run_id
+    ) wsr ON wsr.goal_run_id = gr.id
+    WHERE COALESCE(gr.tokens_used, 0) > 0
+    ORDER BY gr.created_at ASC, gr.id ASC
+  `).all();
+}
+async function ingestLoops(db, verbose = false) {
+  const dbPath = loopsDbPath();
+  if (!existsSync10(dbPath)) {
+    if (verbose)
+      console.log("OpenLoops DB not found:", dbPath);
+    return { sessions: 0, requests: 0 };
+  }
+  const model = loopsModel();
+  const machineId = getMachineId();
+  let loopsDb = null;
+  let requests = 0;
+  const sessions = new Set;
+  try {
+    loopsDb = openLoopsDb(dbPath, verbose);
+    if (!loopsDb)
+      return { sessions: 0, requests: 0 };
+    for (const row of readLoopGoalRuns(loopsDb)) {
+      const loopName = row.loop_name || "unknown-loop";
+      const costCenterId = `loop:${slug(loopName)}`;
+      const sessionId = `loops-${row.loop_run_id ?? row.loop_id ?? row.goal_id}`;
+      const requestId = `loops-${row.goal_run_id}`;
+      const timestamp = row.updated_at ?? row.created_at ?? row.loop_run_started_at ?? new Date().toISOString();
+      const stateValue = `${LOOPS_INGEST_VERSION}:${row.updated_at ?? ""}:${row.tokens_used}:${model}:${costCenterId}`;
+      if (getIngestState(db, "loops", row.goal_run_id) === stateValue)
+        continue;
+      upsertCostCenter(db, {
+        id: costCenterId,
+        kind: "loop",
+        name: loopName,
+        repo_path: null,
+        labels_json: row.labels_json ?? "{}",
+        created_at: row.created_at ?? timestamp
+      });
+      const account = accountFields(row);
+      upsertSession(db, {
+        id: sessionId,
+        agent: "loop",
+        project_path: "",
+        project_name: loopName,
+        started_at: row.loop_run_started_at ?? row.created_at ?? timestamp,
+        ended_at: row.updated_at ?? null,
+        total_cost_usd: 0,
+        total_tokens: 0,
+        request_count: 0,
+        machine_id: machineId,
+        cost_center_id: costCenterId,
+        attribution_tag: "loops-orchestration",
+        ...account
+      });
+      const inputTokens = row.tokens_used;
+      const outputTokens = 0;
+      upsertRequest(db, {
+        id: requestId,
+        agent: "loop",
+        session_id: sessionId,
+        model,
+        input_tokens: inputTokens,
+        output_tokens: outputTokens,
+        cache_read_tokens: 0,
+        cache_create_tokens: 0,
+        cost_usd: computeCostFromDb(db, model, inputTokens, outputTokens),
+        cost_basis: "estimated",
+        duration_ms: 0,
+        timestamp,
+        source_request_id: requestId,
+        machine_id: machineId,
+        cost_center_id: costCenterId,
+        attribution_tag: "loops-orchestration",
+        ...account
+      });
+      sessions.add(sessionId);
+      requests++;
+      setIngestState(db, "loops", row.goal_run_id, stateValue);
+      if (verbose)
+        console.log(`OpenLoops ${loopName}: ${row.tokens_used} orchestration tokens`);
+    }
+  } catch (error) {
+    if (verbose) {
+      const message = error instanceof Error ? error.message : String(error);
+      console.log("OpenLoops ingest skipped:", message);
+    }
+    return { sessions: 0, requests: 0 };
+  } finally {
+    loopsDb?.close();
+  }
+  for (const sessionId of sessions)
+    rollupSession(db, sessionId);
+  return { sessions: sessions.size, requests };
+}
+var DEFAULT_LOOPS_DB_PATH, LOOPS_INGEST_VERSION = "goal-runs-orchestration-v1";
+var init_loops = __esm(() => {
+  init_database();
+  init_pricing();
+  DEFAULT_LOOPS_DB_PATH = join12(homedir9(), ".hasna", "loops", "loops.db");
+});
+
 // src/ingest/claude-quota.ts
-import { existsSync as existsSync10, readFileSync as readFileSync8 } from "fs";
+import { existsSync as existsSync11, readFileSync as readFileSync8 } from "fs";
 function readClaudeToken() {
   const fromEnv = process.env["CLAUDE_OAUTH_TOKEN"] ?? process.env["ANTHROPIC_OAUTH_TOKEN"];
   if (fromEnv)
     return { token: fromEnv };
-  if (!existsSync10(CREDENTIALS_PATH))
+  if (!existsSync11(CREDENTIALS_PATH))
     return null;
   try {
     const creds = JSON.parse(readFileSync8(CREDENTIALS_PATH, "utf-8"));
@@ -5518,13 +5901,13 @@ var init_claude_quota = __esm(() => {
 });
 
 // src/ingest/codex-quota.ts
-import { existsSync as existsSync11, readFileSync as readFileSync9 } from "fs";
+import { existsSync as existsSync12, readFileSync as readFileSync9 } from "fs";
 function readCodexAuth() {
   const fromEnv = process.env["CODEX_OAUTH_TOKEN"];
   if (fromEnv)
     return { token: fromEnv, authMode: "chatgpt" };
   const authPath = agentPaths().codexAuth;
-  if (!existsSync11(authPath))
+  if (!existsSync12(authPath))
     return null;
   try {
     const auth = JSON.parse(readFileSync9(authPath, "utf-8"));
@@ -5662,7 +6045,7 @@ var init_codex_quota = __esm(() => {
 
 // src/lib/sync-all.ts
 async function syncAll(db, opts = {}) {
-  const anySpecific = Boolean(opts.claude || opts.takumi || opts.codex || opts.gemini || opts.opencode || opts.cursor || opts.pi || opts.hermes);
+  const anySpecific = Boolean(opts.claude || opts.takumi || opts.codex || opts.gemini || opts.opencode || opts.cursor || opts.pi || opts.hermes || opts.loops);
   const all = !anySpecific;
   const result = { deduped: 0 };
   if (all || opts.claude) {
@@ -5685,6 +6068,8 @@ async function syncAll(db, opts = {}) {
     result.pi = await ingestPi(db, opts.verbose);
   if (all || opts.hermes)
     result.hermes = await ingestHermes(db, opts.verbose);
+  if (all || opts.loops)
+    result.loops = await ingestLoops(db, opts.verbose);
   if (opts.dedupe !== false)
     result.deduped = dedupeRequests(db);
   return result;
@@ -5697,6 +6082,7 @@ var init_sync_all = __esm(() => {
   init_cursor();
   init_pi();
   init_hermes();
+  init_loops();
   init_claude_quota();
   init_codex_quota();
   init_database();
@@ -6005,15 +6391,15 @@ __export(exports_config, {
   loadConfig: () => loadConfig2,
   getConfigValue: () => getConfigValue
 });
-import { existsSync as existsSync12, readFileSync as readFileSync11, writeFileSync as writeFileSync2, mkdirSync as mkdirSync3 } from "fs";
-import { dirname as dirname2, join as join12 } from "path";
+import { existsSync as existsSync13, readFileSync as readFileSync11, writeFileSync as writeFileSync2, mkdirSync as mkdirSync3 } from "fs";
+import { dirname as dirname2, join as join13 } from "path";
 function getConfigPath() {
-  return process.env["HASNA_ECONOMY_CONFIG_PATH"] ?? join12(getDataDir(), "config.json");
+  return process.env["HASNA_ECONOMY_CONFIG_PATH"] ?? join13(getDataDir(), "config.json");
 }
 function loadConfig2() {
   try {
     const configPath = getConfigPath();
-    if (existsSync12(configPath)) {
+    if (existsSync13(configPath)) {
       const raw = readFileSync11(configPath, "utf-8");
       return { ...DEFAULTS, ...JSON.parse(raw) };
     }
@@ -6023,7 +6409,7 @@ function loadConfig2() {
 function saveConfig2(config) {
   const configPath = getConfigPath();
   const dir = dirname2(configPath);
-  if (!existsSync12(dir))
+  if (!existsSync13(dir))
     mkdirSync3(dir, { recursive: true });
   writeFileSync2(configPath, JSON.stringify(config, null, 2) + `
 `);
@@ -6124,6 +6510,8 @@ async function checkAndFireWebhooks(db) {
       event: "budget_alert",
       budget_id: b.id,
       project: b.project_path ?? "global",
+      cost_center_id: b.cost_center_id ?? null,
+      scope: b.cost_center_id ?? b.project_path ?? "global",
       period: b.period,
       spend: b.current_spend_usd,
       limit: b.limit_usd,
@@ -6167,7 +6555,7 @@ var init_webhooks = __esm(() => {
 });
 
 // src/lib/watch-paths.ts
-import { existsSync as existsSync13 } from "fs";
+import { existsSync as existsSync14 } from "fs";
 function getWatchPaths() {
   const p = agentPaths();
   const candidates = [
@@ -6180,7 +6568,7 @@ function getWatchPaths() {
     p.piSessions,
     p.hermesDir
   ];
-  return candidates.filter((path) => existsSync13(path));
+  return candidates.filter((path) => existsSync14(path));
 }
 var init_watch_paths = __esm(() => {
   init_paths();
@@ -6358,8 +6746,8 @@ var init_watch = __esm(() => {
 // src/db/sync-pg.ts
 import { Worker, MessageChannel, receiveMessageOnPort } from "worker_threads";
 import { fileURLToPath } from "url";
-import { dirname as dirname3, join as join13 } from "path";
-import { existsSync as existsSync14 } from "fs";
+import { dirname as dirname3, join as join14 } from "path";
+import { existsSync as existsSync15 } from "fs";
 import { translateSql, translateParams } from "@hasna/cloud";
 function translateSqliteDates(sql) {
   let s = sql;
@@ -6385,12 +6773,12 @@ function translateSqliteDates(sql) {
 function resolveWorkerPath() {
   const here = dirname3(fileURLToPath(import.meta.url));
   const candidates = [
-    join13(here, "pg-sync-worker.ts"),
-    join13(here, "pg-sync-worker.js"),
-    join13(here, "..", "db", "pg-sync-worker.js")
+    join14(here, "pg-sync-worker.ts"),
+    join14(here, "pg-sync-worker.js"),
+    join14(here, "..", "db", "pg-sync-worker.js")
   ];
   for (const candidate of candidates)
-    if (existsSync14(candidate))
+    if (existsSync15(candidate))
       return candidate;
   return candidates[0];
 }
@@ -8144,7 +8532,7 @@ __export(exports_serve, {
   createHandler: () => createHandler
 });
 import { randomUUID as randomUUID2 } from "crypto";
-import { existsSync as existsSync15 } from "fs";
+import { existsSync as existsSync16 } from "fs";
 import { resolve, sep } from "path";
 import { verifyApiKey, ApiKeyStore } from "@hasna/contracts/auth";
 function openApiDocument() {
@@ -8227,13 +8615,13 @@ function createServerFetch(apiHandler, dashboardDir = DEFAULT_DASHBOARD_DIR) {
     if (url.pathname.startsWith("/api") || url.pathname.startsWith("/v1") || FOUNDATION_PATHS.has(url.pathname)) {
       return apiHandler(req);
     }
-    if (existsSync15(dashboardDir)) {
+    if (existsSync16(dashboardDir)) {
       const filePath = dashboardPath(dashboardDir, url.pathname);
-      if (filePath && existsSync15(filePath)) {
+      if (filePath && existsSync16(filePath)) {
         return new Response(Bun.file(filePath));
       }
       const indexPath = dashboardPath(dashboardDir, "/");
-      if (indexPath && existsSync15(indexPath)) {
+      if (indexPath && existsSync16(indexPath)) {
         return new Response(Bun.file(indexPath));
       }
     }
@@ -8402,6 +8790,10 @@ function createHandler(db, options = {}) {
         return ok(queryAgentBreakdown(db, period, machine));
       if (by === "account")
         return ok(queryAccountBreakdown(db, period, machine));
+      if (by === "cost-center")
+        return ok(queryCostCenterBreakdown(db, period, { machine }));
+      if (["loop", "app", "repo", "service", "team"].includes(by))
+        return ok(queryCostCenterBreakdown(db, period, { kind: by, machine }));
       return ok(queryModelBreakdown(db));
     }
     if (path === "/api/budgets" && method === "GET") {
@@ -8425,6 +8817,7 @@ function createHandler(db, options = {}) {
         id: randomUUID2(),
         project_path: body["project_path"] ?? null,
         agent,
+        cost_center_id: optionalString(body["cost_center_id"]) ?? null,
         period: normalizeBudgetPeriod(body["period"]),
         limit_usd: limitUsd,
         alert_at_percent: alertAtPercent,
@@ -8766,7 +9159,7 @@ var init_serve = __esm(() => {
   };
   ECONOMY_WRITE_SCOPE = `${APP}:write`;
   AGENT_ERROR = `agent must be one of: ${AGENTS.join(", ")}`;
-  SYNC_SOURCES = ["all", ...AGENTS];
+  SYNC_SOURCES = ["all", ...AGENTS, "loops"];
   DEFAULT_DASHBOARD_DIR = new URL("../../dashboard/dist", import.meta.url).pathname;
   FOUNDATION_PATHS = new Set(["/health", "/healthz", "/ready", "/readyz", "/version", "/openapi.json"]);
 });
@@ -8781,14 +9174,14 @@ __export(exports_menubar, {
 });
 import chalk6 from "chalk";
 import { execFileSync as execFileSync3 } from "child_process";
-import { cpSync, existsSync as existsSync16, mkdirSync as mkdirSync4, rmSync, writeFileSync as writeFileSync3 } from "fs";
+import { cpSync, existsSync as existsSync17, mkdirSync as mkdirSync4, rmSync, writeFileSync as writeFileSync3 } from "fs";
 import { tmpdir, arch } from "os";
-import { join as join14 } from "path";
+import { join as join15 } from "path";
 function getArch() {
   return arch() === "arm64" ? "arm64" : "x86_64";
 }
 function isInstalled() {
-  return existsSync16(APP_PATH);
+  return existsSync17(APP_PATH);
 }
 function isRunning() {
   try {
@@ -8825,8 +9218,8 @@ async function menubarInstall(opts) {
     console.error(chalk6.red(`\u2717 Failed to fetch release info: ${e instanceof Error ? e.message : String(e)}`));
     process.exit(1);
   }
-  const zipPath = join14(tmpdir(), `economy-bar-${cpuArch}.zip`);
-  const extractDir = join14(tmpdir(), "economy-bar-extracted");
+  const zipPath = join15(tmpdir(), `economy-bar-${cpuArch}.zip`);
+  const extractDir = join15(tmpdir(), "economy-bar-extracted");
   console.log(chalk6.cyan(`\u2192 Downloading ${assetUrl}...`));
   try {
     const res = await fetch(assetUrl, { signal: AbortSignal.timeout(60000) });
@@ -8846,7 +9239,7 @@ async function menubarInstall(opts) {
     execFileSync3("unzip", ["-q", zipPath, "-d", extractDir], { stdio: "ignore" });
     if (isInstalled())
       rmSync(APP_PATH, { recursive: true, force: true });
-    cpSync(join14(extractDir, "Economy Bar.app"), APP_PATH, { recursive: true });
+    cpSync(join15(extractDir, "Economy Bar.app"), APP_PATH, { recursive: true });
     try {
       execFileSync3("xattr", ["-rd", "com.apple.quarantine", APP_PATH], { stdio: "ignore" });
     } catch {}
@@ -9950,6 +10343,8 @@ var ROADMAP_PHASES = [
     ]
   }
 ];
+var DEFAULT_TODO_LIST_LIMIT = 20;
+var TODO_TITLE_WIDTH = 140;
 function statusLabel(status) {
   if (status === "done")
     return chalk2.green("done");
@@ -9963,6 +10358,30 @@ function countByStatus(tasks) {
     return acc;
   }, { pending: 0, in_progress: 0, done: 0 });
 }
+function truncateText(value, max) {
+  if (value.length <= max)
+    return value;
+  return `${value.slice(0, Math.max(0, max - 3)).trimEnd()}...`;
+}
+function parseListLimit(value) {
+  if (value == null)
+    return;
+  const parsed = Number(value);
+  if (!Number.isFinite(parsed) || parsed <= 0 || !Number.isInteger(parsed)) {
+    console.error(chalk2.red("--limit must be a positive integer"));
+    process.exit(1);
+  }
+  return parsed;
+}
+function matchingTasks(phases, status) {
+  const rows = [];
+  for (const phase of phases) {
+    const tasks = status ? phase.tasks.filter((task) => task.status === status) : phase.tasks;
+    for (const task of tasks)
+      rows.push({ phase, task });
+  }
+  return rows;
+}
 function printTodosHelp() {
   console.log();
   console.log(chalk2.bold.cyan("  Economy Roadmap \u2014 fleet, usage & savings"));
@@ -9972,7 +10391,9 @@ function printTodosHelp() {
   console.log();
   console.log(chalk2.bold("  Commands"));
   console.log("    economy todos              Overview of phases and progress");
-  console.log("    economy todos list         All granular tasks");
+  console.log("    economy todos list         Compact task list (first 20 by default)");
+  console.log("    economy todos list --verbose      Full task list with dependencies");
+  console.log("    economy todos list --json         Machine-readable roadmap payload");
   console.log("    economy todos list --phase <id>   Tasks for one phase (e.g. phase-9)");
   console.log("    economy todos show <task-id>      Task detail (e.g. 9.7)");
   console.log();
@@ -10014,7 +10435,8 @@ function printTodosOverview() {
     console.log(chalk2.dim(`    ${phase.summary}`));
   }
   console.log();
-  console.log(chalk2.dim("  Run: economy todos list"));
+  console.log(chalk2.dim("  Run: economy todos list --limit 20"));
+  console.log(chalk2.dim("  Run: economy todos list --verbose"));
   console.log(chalk2.dim("  Run: economy todos --help"));
   console.log();
 }
@@ -10025,21 +10447,55 @@ function printTodosList(opts) {
     console.log(chalk2.dim(`Valid phases: ${ROADMAP_PHASES.map((phase) => phase.id).join(", ")}`));
     return;
   }
+  const allMatches = matchingTasks(phases, opts.status);
+  const limit = opts.limit ?? (opts.verbose ? Number.POSITIVE_INFINITY : DEFAULT_TODO_LIST_LIMIT);
+  const visible = allMatches.slice(0, limit);
+  if (opts.json) {
+    const filteredPhases = phases.map((phase) => ({
+      ...phase,
+      tasks: opts.status ? phase.tasks.filter((task) => task.status === opts.status) : phase.tasks
+    })).filter((phase) => phase.tasks.length > 0);
+    console.log(JSON.stringify({
+      version: ROADMAP_VERSION,
+      goal: ROADMAP_GOAL,
+      total: allMatches.length,
+      phases: filteredPhases
+    }, null, 2));
+    return;
+  }
   console.log();
+  console.log(chalk2.bold.cyan("  Economy Roadmap Tasks"));
+  console.log(chalk2.dim(`  ${allMatches.length} matching tasks \xB7 showing ${visible.length}${visible.length < allMatches.length ? ` of ${allMatches.length}` : ""}`));
+  if (!opts.verbose && visible.length < allMatches.length) {
+    console.log(chalk2.dim("  Use --verbose for all tasks or economy todos show <task-id> for details."));
+  }
+  console.log();
+  const visibleByPhase = new Map;
+  for (const { phase, task } of visible) {
+    const tasks = visibleByPhase.get(phase.id) ?? [];
+    tasks.push(task);
+    visibleByPhase.set(phase.id, tasks);
+  }
   for (const phase of phases) {
-    const tasks = opts.status ? phase.tasks.filter((task) => task.status === opts.status) : phase.tasks;
+    const tasks = visibleByPhase.get(phase.id) ?? [];
     if (tasks.length === 0)
       continue;
     console.log(chalk2.bold.cyan(`  ${phase.id} \u2014 ${phase.title}`));
-    console.log(chalk2.dim(`  ${phase.summary}`));
+    if (opts.verbose)
+      console.log(chalk2.dim(`  ${phase.summary}`));
     console.log();
     for (const task of tasks) {
       const deps = task.deps?.length ? chalk2.dim(`  deps: ${task.deps.join(", ")}`) : "";
-      console.log(`    ${chalk2.dim(task.id.padEnd(5))} ${statusLabel(task.status).padEnd(14)} ${task.title}${deps ? `
+      const title = opts.verbose ? task.title : truncateText(task.title, TODO_TITLE_WIDTH);
+      console.log(`    ${chalk2.dim(task.id.padEnd(5))} ${statusLabel(task.status).padEnd(14)} ${title}${opts.verbose && deps ? `
 ${" ".repeat(22)}${deps}` : ""}`);
     }
     console.log();
   }
+  if (visible.length < allMatches.length) {
+    console.log(chalk2.dim(`  ... ${allMatches.length - visible.length} more tasks hidden. Use --limit <n>, --verbose, --phase <id>, or economy todos show <task-id>.`));
+    console.log();
+  }
 }
 function printTodoShow(taskId) {
   for (const phase of ROADMAP_PHASES) {
@@ -10069,13 +10525,19 @@ function registerTodosCommand(program) {
     }
     printTodosOverview();
   });
-  todosCmd.command("list").description("List granular roadmap tasks").option("--phase <id>", "Filter by phase id (e.g. phase-4)").option("--status <status>", "Filter by status: pending|in_progress|done").action((opts) => {
+  todosCmd.command("list").description("List granular roadmap tasks").option("--phase <id>", "Filter by phase id (e.g. phase-4)").option("--status <status>", "Filter by status: pending|in_progress|done").option("--limit <n>", "Maximum tasks to print (default: 20)").option("--verbose", "Print all matching tasks with phase summaries and dependencies").option("--json", "Output the full filtered roadmap as JSON").action((opts) => {
     const status = opts.status;
     if (status && !["pending", "in_progress", "done"].includes(status)) {
       console.error(chalk2.red("--status must be one of: pending, in_progress, done"));
       process.exit(1);
     }
-    printTodosList({ phase: opts.phase, status });
+    printTodosList({
+      phase: opts.phase,
+      status,
+      limit: parseListLimit(opts.limit),
+      verbose: Boolean(opts.verbose),
+      json: Boolean(opts.json)
+    });
   });
   todosCmd.command("show <task-id>").description("Show a single task (e.g. 4.2)").action((taskId) => {
     printTodoShow(taskId);
@@ -10259,8 +10721,18 @@ function parsePeriod(value, fallback = "month") {
   }
   return p;
 }
+function parseLimit(value, fallback, verbose) {
+  if (verbose && value == null)
+    return Number.POSITIVE_INFINITY;
+  const parsed = Number(value ?? String(fallback));
+  if (!Number.isFinite(parsed) || parsed <= 0 || !Number.isInteger(parsed)) {
+    console.error(chalk4.red("--limit must be a positive integer"));
+    process.exit(1);
+  }
+  return parsed;
+}
 function registerExtendedCommands(program) {
-  program.command("usage [period]").description("Show subscription usage quotas and consumption metrics").option("--agent <agent>", `Filter by agent (${AGENTS.join("|")})`).option("--json", "Output JSON").action(async (periodArg, opts) => {
+  program.command("usage [period]").description("Show subscription usage quotas and consumption metrics").option("--agent <agent>", `Filter by agent (${AGENTS.join("|")})`).option("--limit <n>", "Maximum snapshot rows to print (default: 20)").option("--verbose", "Show all snapshot rows").option("--json", "Output JSON").action(async (periodArg, opts) => {
     const period = parsePeriod(periodArg, "month");
     const agent = parseAgent(opts.agent, "--agent");
     const { snapshots: snaps, summary } = await getStore().usage(period, agent);
@@ -10274,9 +10746,19 @@ function registerExtendedCommands(program) {
     if (snaps.length === 0) {
       console.log(chalk4.yellow("  No usage snapshots yet. Run: economy sync --cursor"));
     } else {
-      for (const s of snaps) {
+      const limit = parseLimit(opts.limit, 20, opts.verbose);
+      const visibleSnaps = snaps.slice(0, limit);
+      if (visibleSnaps.length < snaps.length) {
+        console.log(chalk4.dim(`  ${snaps.length} snapshots \xB7 showing ${visibleSnaps.length}`));
+        console.log();
+      }
+      for (const s of visibleSnaps) {
         console.log(`  ${chalk4.white(s.agent.padEnd(10))} ${s.metric.padEnd(28)} ${s.value}${s.unit ? ` ${s.unit}` : ""}  ${chalk4.dim(s.date)}`);
       }
+      if (visibleSnaps.length < snaps.length) {
+        console.log(chalk4.dim(`
+  ... ${snaps.length - visibleSnaps.length} more snapshots hidden. Use --limit <n>, --verbose, or --json.`));
+      }
     }
     const spendLabel = agent ? `${agent} API-equivalent spend:` : "Fleet API-equivalent spend:";
     console.log(`
@@ -10316,7 +10798,7 @@ function registerExtendedCommands(program) {
     });
     console.log(chalk4.green(`\u2713 Subscription set: ${opts.provider} / ${opts.plan}`));
   });
-  subsCmd.command("list").description("List subscription plans").option("--json", "Output JSON").action(async (opts) => {
+  subsCmd.command("list").description("List subscription plans").option("--limit <n>", "Maximum subscription rows to print (default: 20)").option("--verbose", "Show all subscription rows").option("--json", "Output JSON").action(async (opts) => {
     const rows = await getStore().listSubscriptions();
     if (opts.json) {
       console.log(JSON.stringify(rows, null, 2));
@@ -10326,10 +10808,20 @@ function registerExtendedCommands(program) {
       console.log(chalk4.yellow("No subscriptions configured."));
       return;
     }
+    const limit = parseLimit(opts.limit, 20, opts.verbose);
+    const visibleRows = rows.slice(0, limit);
     console.log();
-    for (const r of rows) {
+    if (visibleRows.length < rows.length) {
+      console.log(chalk4.dim(`  ${rows.length} subscriptions \xB7 showing ${visibleRows.length}`));
+      console.log();
+    }
+    for (const r of visibleRows) {
       console.log(`  ${chalk4.white(r.provider)} / ${r.plan}  ${fmt2(r.monthly_fee_usd)}/mo  included ${fmt2(r.included_usage_usd)}  ${r.agent ?? "all agents"}`);
     }
+    if (visibleRows.length < rows.length) {
+      console.log(chalk4.dim(`
+  ... ${rows.length - visibleRows.length} more subscriptions hidden. Use --limit <n>, --verbose, or --json.`));
+    }
     console.log();
   });
   subsCmd.command("remove <id>").description("Remove subscription by id").action(async (id) => {
@@ -10453,20 +10945,29 @@ function registerExtendedCommands(program) {
   }
 }
 function registerFleetCommands(program) {
-  program.command("fleet").description("Fleet-wide summaries across all machines").option("--period <p>", "Period", "today").option("--json", "Output JSON").action(async (opts) => {
+  program.command("fleet").description("Fleet-wide summaries across all machines").option("--period <p>", "Period", "today").option("--limit <n>", "Maximum machine rows to print (default: 20)").option("--verbose", "Show all machine rows").option("--json", "Output JSON").action(async (opts) => {
     const period = parsePeriod(opts.period, "today");
     const { summary, machines, registry } = await getStore().fleet(period);
     if (opts.json) {
       console.log(JSON.stringify({ period, summary, machines, registry }, null, 2));
       return;
     }
+    const limit = parseLimit(opts.limit, 20, opts.verbose);
+    const visibleMachines = machines.slice(0, limit);
     console.log();
     console.log(chalk4.bold.cyan(`  Fleet \u2014 ${period}`));
     console.log(`  Total: ${fmt2(summary.total_usd)} \xB7 ${summary.sessions} sessions \xB7 ${summary.requests} requests`);
+    if (visibleMachines.length < machines.length) {
+      console.log(chalk4.dim(`  ${machines.length} machines \xB7 showing ${visibleMachines.length}`));
+    }
     console.log();
-    for (const m of machines) {
+    for (const m of visibleMachines) {
       console.log(`  ${chalk4.white(m.machine_id.padEnd(12))} ${fmt2(m.total_cost_usd).padEnd(10)} ${m.sessions} sessions`);
     }
+    if (visibleMachines.length < machines.length) {
+      console.log(chalk4.dim(`
+  ... ${machines.length - visibleMachines.length} more machines hidden. Use --limit <n>, --verbose, or --json.`));
+    }
     console.log();
   });
   program.command("completion <shell>").description("Print shell completion script (bash, zsh, or fish)").action((shell) => {
@@ -10721,6 +11222,16 @@ function parseOptionalCliAgent(value) {
     fail(e instanceof Error ? e.message : String(e));
   }
 }
+function resolveRowLimit(value, verbose, fallback) {
+  if (verbose && value == null)
+    return Number.POSITIVE_INFINITY;
+  return parsePositiveCliInteger(value ?? String(fallback), "--limit");
+}
+function printHiddenRowsHint(total, shown, detail) {
+  if (total <= shown)
+    return;
+  console.log(chalk7.dim(`  ... ${total - shown} more rows hidden. ${detail}`));
+}
 function requireCliChoice(value, option, allowed) {
   const selected = value ?? allowed[0];
   if (allowed.includes(selected))
@@ -10820,14 +11331,14 @@ program.action(async () => {
   }
   console.log();
 });
-program.command("sync").description("Ingest cost data from all coding agents").option("--claude", "Only ingest Claude Code telemetry").option("--takumi", "Only ingest Takumi sessions").option("--codex", "Only ingest Codex sessions").option("--gemini", "Only ingest Gemini CLI sessions").option("--opencode", "Only ingest OpenCode sessions").option("--cursor", "Only ingest Cursor usage").option("--pi", "Only ingest Pi sessions").option("--hermes", "Only ingest Hermes sessions").option("-v, --verbose", "Verbose output").option("--force", "Force re-process all files (ignore mtime cache)").option("--backfill-machine", "Tag existing records that have no machine_id with current hostname").option("--recalculate", "Recalculate costs for all requests with cost_usd = 0").action(async (opts) => {
+program.command("sync").description("Ingest cost data from all coding agents").option("--claude", "Only ingest Claude Code telemetry").option("--takumi", "Only ingest Takumi sessions").option("--codex", "Only ingest Codex sessions").option("--gemini", "Only ingest Gemini CLI sessions").option("--opencode", "Only ingest OpenCode sessions").option("--cursor", "Only ingest Cursor usage").option("--pi", "Only ingest Pi sessions").option("--hermes", "Only ingest Hermes sessions").option("--loops", "Only ingest OpenLoops orchestration/judge token usage").option("-v, --verbose", "Verbose output").option("--force", "Force re-process all files (ignore mtime cache)").option("--backfill-machine", "Tag existing records that have no machine_id with current hostname").option("--recalculate", "Recalculate costs for all requests with cost_usd = 0").action(async (opts) => {
   if (isCloudStore()) {
     console.log(chalk7.yellow("cloud mode: ingest is a local-only operation; nothing to sync (reads/writes route to the cloud API)"));
     return;
   }
   const db = openDatabase();
   ensurePricingSeeded(db);
-  const anySpecific = opts.claude || opts.takumi || opts.codex || opts.gemini || opts.opencode || opts.cursor || opts.pi || opts.hermes;
+  const anySpecific = opts.claude || opts.takumi || opts.codex || opts.gemini || opts.opencode || opts.cursor || opts.pi || opts.hermes || opts.loops;
   if (!anySpecific || opts.verbose) {
     try {
       const { syncOpenProjectsRegistry: syncOpenProjectsRegistry2 } = await Promise.resolve().then(() => (init_open_projects(), exports_open_projects));
@@ -10840,7 +11351,7 @@ program.command("sync").description("Ingest cost data from all coding agents").o
     }
   }
   if (opts.force) {
-    const ingestSources = [...AGENTS, "codex-codewith"];
+    const ingestSources = [...AGENTS, "codex-codewith", "loops"];
     db.exec(`DELETE FROM ingest_state WHERE source IN (${ingestSources.map((a) => `'${a}'`).join(", ")})`);
     if (opts.verbose)
       console.log(chalk7.dim("Cleared ingest cache"));
@@ -10855,6 +11366,7 @@ program.command("sync").description("Ingest cost data from all coding agents").o
     cursor: opts.cursor,
     pi: opts.pi,
     hermes: opts.hermes,
+    loops: opts.loops,
     verbose: opts.verbose
   });
   console.log(chalk7.green(`\u2713 deduped ${result.deduped}`));
@@ -10984,22 +11496,36 @@ program.command("top").description("Most expensive sessions").option("-n <n>", "
   ]));
   console.log();
 });
-program.command("breakdown").description("Cost breakdown by model, agent, project, or account").option("--by <dimension>", "Dimension: model|agent|project|account", "model").option("--since <date>", "Filter since date or relative (e.g. 2026-03-01, 7d, 30d)").action(async (opts) => {
+program.command("breakdown").description("Cost breakdown by model, agent, project, account, or cost center").option("--by <dimension>", "Dimension: model|agent|project|account|cost-center|loop|app|repo", "model").option("--since <date>", "Filter since date or relative (e.g. 2026-03-01, 7d, 30d)").option("--limit <n>", "Maximum breakdown rows to print (default: 20)").option("--verbose", "Show all breakdown rows").option("--json", "Output JSON").action(async (opts) => {
   const store = getStore();
+  const by = requireCliChoice(opts.by, "--by", ["model", "agent", "project", "account", "cost-center", "loop", "app", "repo"]);
   const since = opts.since ? parseSinceDate2(opts.since) : undefined;
+  const limit = resolveRowLimit(opts.limit, opts.verbose, 20);
+  const costCenterKinds = new Set(["loop", "app", "repo"]);
   console.log();
-  if (opts.by === "project") {
+  if (by === "project") {
     const rows = await store.projectBreakdown({ since });
-    printTable(["Project", "Sessions", "Requests", "Tokens", "Cost"], rows.map((r) => [
+    if (opts.json) {
+      console.log(JSON.stringify({ by, since: since ?? null, total: rows.length, rows }, null, 2));
+      return;
+    }
+    const visibleRows = rows.slice(0, limit);
+    printTable(["Project", "Sessions", "Requests", "Tokens", "Cost"], visibleRows.map((r) => [
       chalk7.white(r.project_name || chalk7.dim("unknown")),
       String(r.sessions),
       String(r.requests),
       chalk7.cyan(fmtTokens2(r.total_tokens)),
       fmt4(r.cost_usd)
     ]));
-  } else if (opts.by === "agent") {
+    printHiddenRowsHint(rows.length, visibleRows.length, "Use --limit <n>, --verbose, or --json.");
+  } else if (by === "agent") {
     const rows = await store.agentBreakdown({ since });
-    printTable(["Agent", "Sessions", "Requests", "Tokens", "API Eq", "Billable", "Included"], rows.map((r) => [
+    if (opts.json) {
+      console.log(JSON.stringify({ by, since: since ?? null, total: rows.length, rows }, null, 2));
+      return;
+    }
+    const visibleRows = rows.slice(0, limit);
+    printTable(["Agent", "Sessions", "Requests", "Tokens", "API Eq", "Billable", "Included"], visibleRows.map((r) => [
       fmtAgent(r.agent),
       String(r.sessions),
       String(r.requests),
@@ -11008,22 +11534,57 @@ program.command("breakdown").description("Cost breakdown by model, agent, projec
       fmt4(r.billable_usd),
       fmt4(r.subscription_included_usd)
     ]));
-  } else if (opts.by === "account") {
-    printAccountBreakdown(await store.accountBreakdown({ since }));
+    printHiddenRowsHint(rows.length, visibleRows.length, "Use --limit <n>, --verbose, or --json.");
+  } else if (by === "account") {
+    const rows = await store.accountBreakdown({ since });
+    if (opts.json) {
+      console.log(JSON.stringify({ by, since: since ?? null, total: rows.length, rows }, null, 2));
+      return;
+    }
+    const visibleRows = rows.slice(0, limit);
+    printAccountBreakdown(visibleRows);
+    printHiddenRowsHint(rows.length, visibleRows.length, "Use --limit <n>, --verbose, or --json.");
+  } else if (by === "cost-center" || costCenterKinds.has(by)) {
+    const kind = costCenterKinds.has(by) ? by : undefined;
+    const rows = await store.costCenterBreakdown({ since, kind });
+    if (opts.json) {
+      console.log(JSON.stringify({ by, since: since ?? null, total: rows.length, rows }, null, 2));
+      return;
+    }
+    if (rows.length === 0) {
+      console.log(chalk7.yellow("No cost-center usage yet. Run `economy sync --loops` or ingest app/service usage with /ingest."));
+    } else {
+      const visibleRows = rows.slice(0, limit);
+      printTable(["Kind", "Cost Center", "Sessions", "Requests", "Tokens", "Cost"], visibleRows.map((r) => [
+        chalk7.white(r.kind),
+        chalk7.white(r.name),
+        String(r.sessions),
+        String(r.requests),
+        chalk7.cyan(fmtTokens2(r.total_tokens)),
+        fmt4(r.cost_usd)
+      ]));
+      printHiddenRowsHint(rows.length, visibleRows.length, "Use --limit <n>, --verbose, or --json.");
+    }
   } else {
     const rows = await store.modelBreakdown({ since });
-    printTable(["Model", "Agent", "Requests", "Tokens", "Cost"], rows.map((r) => [
+    if (opts.json) {
+      console.log(JSON.stringify({ by, since: since ?? null, total: rows.length, rows }, null, 2));
+      return;
+    }
+    const visibleRows = rows.slice(0, limit);
+    printTable(["Model", "Agent", "Requests", "Tokens", "Cost"], visibleRows.map((r) => [
       chalk7.white(r.model),
       fmtAgent(r.agent),
       String(r.requests),
       chalk7.cyan(fmtTokens2(r.total_tokens)),
       fmt4(r.cost_usd)
     ]));
+    printHiddenRowsHint(rows.length, visibleRows.length, "Use --limit <n>, --verbose, or --json.");
   }
   console.log();
 });
 var ACCOUNT_PERIODS = ["today", "week", "month", "year", "all"];
-program.command("accounts [period]").description("List account usage by email address and coding agent").option("--json", "Output JSON").action(async (periodArg, opts) => {
+program.command("accounts [period]").description("List account usage by email address and coding agent").option("--limit <n>", "Maximum account rows to print (default: 20)").option("--verbose", "Show all account rows").option("--json", "Output JSON").action(async (periodArg, opts) => {
   const period = requireCliChoice(periodArg, "period", ACCOUNT_PERIODS);
   const rows = await getStore().accounts(period);
   if (opts.json) {
@@ -11036,8 +11597,14 @@ program.command("accounts [period]").description("List account usage by email ad
   }
   console.log();
   console.log(chalk7.bold.cyan(`  Accounts \u2014 ${period}`));
+  const limit = resolveRowLimit(opts.limit, opts.verbose, 20);
+  const visibleRows = rows.slice(0, limit);
+  if (visibleRows.length < rows.length) {
+    console.log(chalk7.dim(`  ${rows.length} rows \xB7 showing ${visibleRows.length}`));
+  }
   console.log();
-  printAccountBreakdown(rows);
+  printAccountBreakdown(visibleRows);
+  printHiddenRowsHint(rows.length, visibleRows.length, "Use --limit <n>, --verbose, or --json.");
   console.log();
 });
 program.command("watch").description("Live stream of incoming costs").option("--interval <seconds>", "Poll interval in seconds", "10").option("--daemon", "Watch agent data directories and sync on change").option("--agent <agent>", "Filter by agent").option("--notify <amount>", "Fire macOS notification when cumulative cost crosses this USD threshold").action(async (opts) => {
@@ -11050,7 +11617,7 @@ program.command("watch").description("Live stream of incoming costs").option("--
   });
 });
 var budgetCmd = program.command("budget").description("Manage spending budgets");
-budgetCmd.command("set").description("Set a budget").option("--project <path>", "Project path (omit for global)").option("--period <period>", "Period: daily|weekly|monthly", "monthly").option("--limit <usd>", "Budget limit in USD").option("--alert <percent>", "Alert threshold %", "80").option("--agent <agent>", "Limit to agent (claude|takumi|codex|gemini)").action(async (opts) => {
+budgetCmd.command("set").description("Set a budget").option("--project <path>", "Project path (omit for global)").option("--cost-center <id>", "Cost center id (for example loop:fleet-evaluator)").option("--period <period>", "Period: daily|weekly|monthly", "monthly").option("--limit <usd>", "Budget limit in USD").option("--alert <percent>", "Alert threshold %", "80").option("--agent <agent>", "Limit to agent (claude|takumi|codex|gemini)").action(async (opts) => {
   const limitUsd = parsePositiveCliNumber(opts.limit, "--limit");
   const alertAtPercent = parsePositiveCliNumber(opts.alert ?? "80", "--alert");
   if (alertAtPercent > 100)
@@ -11060,25 +11627,32 @@ budgetCmd.command("set").description("Set a budget").option("--project <path>",
   await getStore().setBudget({
     project_path: opts.project ?? null,
     agent,
+    cost_center_id: opts.costCenter ?? null,
     period,
     limit_usd: limitUsd,
     alert_at_percent: alertAtPercent
   });
-  console.log(chalk7.green(`\u2713 Budget set: ${opts.project ?? "global"} \u2014 ${period} $${limitUsd}`));
+  console.log(chalk7.green(`\u2713 Budget set: ${opts.costCenter ?? opts.project ?? "global"} \u2014 ${period} $${limitUsd}`));
 });
-budgetCmd.command("list").description("List all budgets").action(async () => {
+budgetCmd.command("list").description("List all budgets").option("--limit <n>", "Maximum budget rows to print (default: 20)").option("--verbose", "Show all budget rows").action(async (opts) => {
   const statuses = await getStore().listBudgets();
   if (statuses.length === 0) {
     console.log(chalk7.yellow("No budgets set."));
     return;
   }
+  const limit = resolveRowLimit(opts.limit, opts.verbose, 20);
+  const visibleStatuses = statuses.slice(0, limit);
   console.log();
-  printTable(["Scope", "Period", "Limit", "Spent", "Used%", "Status"], statuses.map((b) => {
+  if (visibleStatuses.length < statuses.length) {
+    console.log(chalk7.dim(`  ${statuses.length} budgets \xB7 showing ${visibleStatuses.length}`));
+    console.log();
+  }
+  printTable(["Scope", "Period", "Limit", "Spent", "Used%", "Status"], visibleStatuses.map((b) => {
     const pct = b.percent_used.toFixed(1);
     const status = b.is_over_limit ? chalk7.red("OVER") : b.is_over_alert ? chalk7.yellow("ALERT") : chalk7.green("OK");
     const pctColor = b.is_over_limit ? chalk7.red(pct + "%") : b.is_over_alert ? chalk7.yellow(pct + "%") : chalk7.green(pct + "%");
     return [
-      chalk7.white(b.project_path ?? "global"),
+      chalk7.white(b.cost_center_id ?? b.project_path ?? "global"),
       b.period,
       fmt4(b.limit_usd),
       fmt4(b.current_spend_usd),
@@ -11086,6 +11660,7 @@ budgetCmd.command("list").description("List all budgets").action(async () => {
       status
     ];
   }));
+  printHiddenRowsHint(statuses.length, visibleStatuses.length, "Use --limit <n> or --verbose.");
   console.log();
 });
 budgetCmd.command("remove <id>").description("Remove a budget by ID").action(async (id) => {
@@ -11099,20 +11674,27 @@ projectCmd.command("add <path>").description("Add a project").option("--name <na
   await getStore().addProject(path, name);
   console.log(chalk7.green(`\u2713 Project added: ${path}`));
 });
-projectCmd.command("list").description("List all projects with costs").action(async () => {
+projectCmd.command("list").description("List all projects with costs").option("--limit <n>", "Maximum project rows to print (default: 20)").option("--verbose", "Show all project rows").action(async (opts) => {
   const projects = await getStore().listProjects();
   if (projects.length === 0) {
     console.log(chalk7.yellow("No projects tracked yet."));
     return;
   }
+  const limit = resolveRowLimit(opts.limit, opts.verbose, 20);
+  const visibleProjects = projects.slice(0, limit);
   console.log();
-  printTable(["Project", "Path", "Sessions", "Cost", "Last Active"], projects.map((p) => [
+  if (visibleProjects.length < projects.length) {
+    console.log(chalk7.dim(`  ${projects.length} projects \xB7 showing ${visibleProjects.length}`));
+    console.log();
+  }
+  printTable(["Project", "Path", "Sessions", "Cost", "Last Active"], visibleProjects.map((p) => [
     chalk7.white(p.project_name || chalk7.dim("unknown")),
     chalk7.dim(p.project_path.substring(0, 40)),
     String(p.sessions),
     fmt4(p.cost_usd),
     chalk7.dim(p.last_active?.substring(0, 16) ?? "\u2014")
   ]));
+  printHiddenRowsHint(projects.length, visibleProjects.length, "Use --limit <n>, --verbose, or economy project show <path>.");
   console.log();
 });
 projectCmd.command("remove <path>").description("Remove a project (keeps historical data)").action(async (path) => {
@@ -11217,10 +11799,16 @@ configCmd.action(async () => {
   console.log();
 });
 var pricingCmd = program.command("pricing").description("Manage model pricing rates");
-pricingCmd.command("list").description("List all model prices").action(async () => {
+pricingCmd.command("list").description("List all model prices").option("--limit <n>", "Maximum pricing rows to print (default: 50)").option("--verbose", "Show all pricing rows").action(async (opts) => {
   const rows = await getStore().listPricing();
+  const limit = resolveRowLimit(opts.limit, opts.verbose, 50);
+  const visibleRows = rows.slice(0, limit);
   console.log();
-  printTable(["Model", "Input/1M", "Output/1M", "CacheR/1M", "CacheW/1M", "CacheStorage/1M-h", "Out/1k"], rows.map((r) => [
+  if (visibleRows.length < rows.length) {
+    console.log(chalk7.dim(`  ${rows.length} pricing rows \xB7 showing ${visibleRows.length}`));
+    console.log();
+  }
+  printTable(["Model", "Input/1M", "Output/1M", "CacheR/1M", "CacheW/1M", "CacheStorage/1M-h", "Out/1k"], visibleRows.map((r) => [
     chalk7.white(r.model),
     fmt4(r.input_per_1m),
     fmt4(r.output_per_1m),
@@ -11229,6 +11817,7 @@ pricingCmd.command("list").description("List all model prices").action(async ()
     fmt4(r.cache_storage_per_1m_hour ?? 0),
     chalk7.dim(fmt4(r.output_per_1m / 1000))
   ]));
+  printHiddenRowsHint(rows.length, visibleRows.length, "Use --limit <n> or --verbose.");
   console.log();
 });
 pricingCmd.command("set <model>").description("Set pricing for a model").option("--input <usd>", "Input price per 1M tokens").option("--output <usd>", "Output price per 1M tokens").option("--cache-read <usd>", "Cache read price per 1M tokens", "0").option("--cache-write <usd>", "5-minute cache write price per 1M tokens", "0").option("--cache-write-1h <usd>", "1-hour cache write price per 1M tokens", "0").option("--cache-storage <usd>", "Context cache storage price per 1M token-hours", "0").action(async (model, opts) => {
@@ -11323,7 +11912,8 @@ Gemini (~/.gemini/settings.json):`));
   }
   console.log();
 });
-program.command("session <id>").description("Show detailed breakdown of a single session").action(async (id) => {
+program.command("session <id>").description("Show detailed breakdown of a single session").option("--limit <n>", "Number of request rows to show (default: 20)").option("--verbose", "Show up to 50 request rows").action(async (id, opts) => {
+  const requestLimit = parsePositiveCliInteger(opts.limit ?? (opts.verbose ? "50" : "20"), "--limit");
   await autoSync();
   const detail = await getStore().sessionDetail(id);
   if (!detail) {
@@ -11344,10 +11934,11 @@ program.command("session <id>").description("Show detailed breakdown of a single
     ["Requests", fmtCount(session["request_count"])]
   ]);
   if (requests.length > 0) {
+    const visibleRequests = requests.slice(0, requestLimit);
     console.log(chalk7.dim(`
-  Requests (${requests.length}):
+  Requests (${visibleRequests.length}${visibleRequests.length < requests.length ? ` of ${requests.length}` : ""}):
 `));
-    printTable(["Time", "Model", "Input", "Output", "Cache R", "Cache W", "Cost"], requests.slice(0, 50).map((r) => [
+    printTable(["Time", "Model", "Input", "Output", "Cache R", "Cache W", "Cost"], visibleRequests.map((r) => [
       chalk7.dim(String(r["timestamp"]).substring(11, 19)),
       chalk7.white(String(r["model"]).substring(0, 22)),
       fmtTokens2(r["input_tokens"]),
@@ -11356,12 +11947,13 @@ program.command("session <id>").description("Show detailed breakdown of a single
       fmtTokens2(r["cache_create_tokens"]),
       fmt4(r["cost_usd"])
     ]));
-    if (requests.length > 50)
-      console.log(chalk7.dim(`  ... and ${requests.length - 50} more requests`));
+    if (requests.length > visibleRequests.length) {
+      console.log(chalk7.dim(`  ... ${requests.length - visibleRequests.length} more requests hidden. Use --limit <n> or --verbose.`));
+    }
   }
   console.log();
 });
-program.command("machines").description("List all machines that have synced data").action(async () => {
+program.command("machines").description("List all machines that have synced data").option("--limit <n>", "Maximum machine rows to print (default: 20)").option("--verbose", "Show all machine rows").action(async (opts) => {
   await autoSync();
   const machines = await getStore().machines();
   const current = getMachineId();
@@ -11369,16 +11961,22 @@ program.command("machines").description("List all machines that have synced data
     console.log(chalk7.yellow(`No machine data yet. Current machine: ${current}`));
     return;
   }
+  const limit = resolveRowLimit(opts.limit, opts.verbose, 20);
+  const visibleMachines = machines.slice(0, limit);
   console.log();
   console.log(chalk7.bold.cyan("  Machines"));
+  if (visibleMachines.length < machines.length) {
+    console.log(chalk7.dim(`  ${machines.length} machines \xB7 showing ${visibleMachines.length}`));
+  }
   console.log();
-  printTable(["Machine", "Sessions", "Requests", "Cost", "Last Active"], machines.map((m) => [
+  printTable(["Machine", "Sessions", "Requests", "Cost", "Last Active"], visibleMachines.map((m) => [
     m.machine_id === current ? chalk7.green(`${m.machine_id} (this)`) : chalk7.white(m.machine_id),
     fmtCount(m.sessions),
     fmtCount(m.requests),
     fmt4(m.total_cost_usd),
     chalk7.dim(m.last_active?.substring(0, 16) ?? "\u2014")
   ]));
+  printHiddenRowsHint(machines.length, visibleMachines.length, "Use --limit <n> or --verbose.");
   console.log(`
   ${chalk7.dim("Current machine:")} ${chalk7.bold(current)}`);
   console.log();
@@ -11540,14 +12138,20 @@ goalCmd.command("set").description("Set a spending goal").option("--period <peri
   });
   console.log(chalk7.green(`\u2713 Goal set: ${period} $${limitUsd}${opts.project ? ` (${opts.project})` : ""}`));
 });
-goalCmd.command("list").description("List all goals with progress").action(async () => {
+goalCmd.command("list").description("List all goals with progress").option("--limit <n>", "Maximum goal rows to print (default: 20)").option("--verbose", "Show all goal rows").action(async (opts) => {
   const statuses = await getStore().listGoals();
   if (statuses.length === 0) {
     console.log(chalk7.yellow("No goals set."));
     return;
   }
+  const limit = resolveRowLimit(opts.limit, opts.verbose, 20);
+  const visibleStatuses = statuses.slice(0, limit);
   console.log();
-  printTable(["Period", "Scope", "Limit", "Spent", "Used%", "Status"], statuses.map((g) => {
+  if (visibleStatuses.length < statuses.length) {
+    console.log(chalk7.dim(`  ${statuses.length} goals \xB7 showing ${visibleStatuses.length}`));
+    console.log();
+  }
+  printTable(["Period", "Scope", "Limit", "Spent", "Used%", "Status"], visibleStatuses.map((g) => {
     const pct = g.percent_used.toFixed(1);
     const scope = g.project_path ?? g.agent ?? "global";
     const status = g.is_over ? chalk7.red("OVER") : g.is_at_risk ? chalk7.yellow("AT RISK") : chalk7.green("ON TRACK");
@@ -11561,20 +12165,23 @@ goalCmd.command("list").description("List all goals with progress").action(async
       status
     ];
   }));
+  printHiddenRowsHint(statuses.length, visibleStatuses.length, "Use --limit <n> or --verbose.");
   console.log();
 });
 goalCmd.command("remove <id>").description("Remove a goal").action(async (id) => {
   await getStore().removeGoal(id);
   console.log(chalk7.green(`\u2713 Goal removed`));
 });
-goalCmd.command("status").description("Quick goal progress summary").action(async () => {
+goalCmd.command("status").description("Quick goal progress summary").option("--limit <n>", "Maximum goal rows to print (default: 20)").option("--verbose", "Show all goal rows").action(async (opts) => {
   const statuses = await getStore().listGoals();
   if (statuses.length === 0) {
     console.log(chalk7.yellow("No goals set."));
     return;
   }
+  const limit = resolveRowLimit(opts.limit, opts.verbose, 20);
+  const visibleStatuses = statuses.slice(0, limit);
   console.log();
-  for (const g of statuses) {
+  for (const g of visibleStatuses) {
     const scope = g.project_path ?? g.agent ?? "global";
     const pct = Math.min(g.percent_used, 100);
     const barFilled = Math.round(pct / 10);
@@ -11584,6 +12191,7 @@ goalCmd.command("status").description("Quick goal progress summary").action(asyn
     const label = `${g.period} (${scope})`.padEnd(20);
     console.log(`  ${label}  ${bar}  ${fmt4(g.current_spend_usd)} / ${fmt4(g.limit_usd)}  (${g.percent_used.toFixed(0)}%)  ${statusStr}`);
   }
+  printHiddenRowsHint(statuses.length, visibleStatuses.length, "Use --limit <n> or --verbose.");
   console.log();
 });
 program.command("remove <type> <id>").alias("rm").description("Remove a record. Type: budget | project | goal | pricing").action(async (type, id) => {