@hasna/todos 0.13.2 → 0.13.4

package/dist/index.js

@@ -3427,7 +3427,7 @@ var init_machines = __esm(() => {
 function isBlockingDependencyStatus(status) {
   return status !== "completed" && status !== "cancelled";
 }
-var TASK_STATUSES, TASK_PRIORITIES, PLAN_STATUSES, VersionConflictError, TaskNotFoundError, ProjectNotFoundError, ResourceConflictError, PlanNotFoundError, LockError, AgentNotFoundError, IdentityAliasAmbiguousError, IdentityIdImmutableError, TaskListNotFoundError, DependencyCycleError, CompletionGuardError, DISPATCH_STATUSES, DispatchNotFoundError;
+var TASK_STATUSES, TASK_PRIORITIES, PLAN_STATUSES, VersionConflictError, TaskNotFoundError, TaskReferenceAmbiguousError, ProjectNotFoundError, ResourceConflictError, PlanNotFoundError, LockError, AgentNotFoundError, IdentityAliasAmbiguousError, IdentityIdImmutableError, TaskListNotFoundError, DependencyCycleError, CompletionGuardError, DISPATCH_STATUSES, DispatchNotFoundError;
 var init_types = __esm(() => {
   TASK_STATUSES = [
     "pending",
@@ -3467,6 +3467,22 @@ var init_types = __esm(() => {
       this.name = "TaskNotFoundError";
     }
   };
+  TaskReferenceAmbiguousError = class TaskReferenceAmbiguousError extends Error {
+    reference;
+    static code = "TASK_REFERENCE_AMBIGUOUS";
+    candidateTaskIds;
+    candidateProjectIds;
+    constructor(reference, candidates) {
+      const candidateTaskIds = [...new Set(candidates.map((candidate) => candidate.task_id))].sort();
+      const candidateProjectIds = [...new Set(candidates.map((candidate) => candidate.project_id).filter((projectId) => typeof projectId === "string" && projectId.length > 0))].sort();
+      const projectList = candidateProjectIds.length > 0 ? candidateProjectIds.join(", ") : "(unscoped)";
+      super(`Task reference is ambiguous: "${reference}". Candidate project IDs: ${projectList}. ` + "Use a full task UUID.");
+      this.reference = reference;
+      this.name = "TaskReferenceAmbiguousError";
+      this.candidateTaskIds = candidateTaskIds;
+      this.candidateProjectIds = candidateProjectIds;
+    }
+  };
   ProjectNotFoundError = class ProjectNotFoundError extends Error {
     projectId;
     static code = "PROJECT_NOT_FOUND";
@@ -3758,15 +3774,18 @@ var init_identity_mapping = __esm(() => {
 var exports_config = {};
 __export(exports_config, {
   parseStorageMode: () => parseStorageMode,
+  parseStorageBackend: () => parseStorageBackend,
   loadTodosStorageConfig: () => loadTodosStorageConfig,
   loadStorageConfig: () => loadStorageConfig,
   isTodosShadowEnabled: () => isTodosShadowEnabled,
   isTodosRemoteStorageEnabled: () => isTodosRemoteStorageEnabled,
+  isTodosPostgresBackend: () => isTodosPostgresBackend,
   getTodosStorageShadowEnvName: () => getTodosStorageShadowEnvName,
   getTodosStorageMode: () => getTodosStorageMode,
   getTodosStorageEnvName: () => getTodosStorageEnvName,
   getTodosStorageDatabaseUrl: () => getTodosStorageDatabaseUrl,
   getTodosStorageDatabaseEnv: () => getTodosStorageDatabaseEnv,
+  getTodosStorageBackend: () => getTodosStorageBackend,
   getStorageMode: () => getStorageMode,
   getStorageDatabaseUrl: () => getStorageDatabaseUrl,
   getStorageDatabaseEnv: () => getStorageDatabaseEnv,
@@ -3791,7 +3810,7 @@ function getCanonicalTodosRdsConfig(env = process.env) {
   };
 }
 function loadTodosStorageConfig(env = process.env) {
-  const mode = getTodosStorageMode(env);
+  const mode = getTodosStorageBackend(env);
   const databaseUrl = getTodosStorageDatabaseUrl(env);
   const bucket = readStorageEnv(env, "s3Bucket").value;
   const prefix = readStorageEnv(env, "s3Prefix").value ?? "todos/";
@@ -3828,29 +3847,41 @@ function loadTodosStorageConfig(env = process.env) {
 function loadStorageConfig(env = process.env) {
   return loadTodosStorageConfig(env);
 }
+function isTodosPostgresBackend(config) {
+  return config.mode === "postgres";
+}
 function isTodosRemoteStorageEnabled(config) {
-  return config.mode === "remote" || config.mode === "hybrid";
+  return isTodosPostgresBackend(config);
 }
 function assertTodosRemoteStorageConfig(config) {
-  if (!isTodosRemoteStorageEnabled(config))
+  if (!isTodosPostgresBackend(config))
     return;
   if (!config.database?.url) {
     throw new Error(`${TODOS_STORAGE_ENV.databaseUrl} is required when ${TODOS_STORAGE_ENV.mode}=${config.mode}`);
   }
 }
-function parseStorageMode(value) {
+function parseStorageBackend(value) {
   const normalized = clean(value)?.toLowerCase();
   if (!normalized)
-    return "local";
-  if (normalized === "local" || normalized === "remote" || normalized === "hybrid")
+    return "sqlite";
+  if (normalized === "sqlite" || normalized === "postgres")
     return normalized;
-  throw new Error(`${TODOS_STORAGE_ENV.mode} must be local, remote, or hybrid`);
+  const legacy = LEGACY_BACKEND_TOKENS[normalized];
+  if (legacy)
+    return legacy;
+  throw new Error(`${TODOS_STORAGE_ENV.mode} must be sqlite or postgres (legacy values local and remote are accepted)`);
+}
+function parseStorageMode(value) {
+  return parseStorageBackend(value);
+}
+function getTodosStorageBackend(env = process.env) {
+  return parseStorageBackend(readStorageEnv(env, "mode").value);
 }
 function getTodosStorageMode(env = process.env) {
-  return parseStorageMode(readStorageEnv(env, "mode").value);
+  return getTodosStorageBackend(env);
 }
 function getStorageMode(env = process.env) {
-  return getTodosStorageMode(env);
+  return getTodosStorageBackend(env);
 }
 function isTodosShadowEnabled(env = process.env) {
   return parseBoolean(readStorageEnv(env, "shadow").value, false);
@@ -3861,8 +3892,8 @@ function getTodosStorageShadowEnvName(env = process.env) {
 function assertTodosShadowConfig(config, env = process.env) {
   if (!isTodosShadowEnabled(env))
     return;
-  if (config.mode !== "local") {
-    throw new Error(`${readStorageEnv(env, "shadow").name} shadow mirror requires ${TODOS_STORAGE_ENV.mode}=local (got ${config.mode})`);
+  if (config.mode !== "sqlite") {
+    throw new Error(`${readStorageEnv(env, "shadow").name} shadow mirror requires the sqlite backend (got ${config.mode})`);
   }
   if (!config.database?.url) {
     throw new Error(`${TODOS_STORAGE_ENV.databaseUrl} is required when ${readStorageEnv(env, "shadow").name} is enabled`);
@@ -3918,7 +3949,7 @@ function parsePositiveInteger(value, fallback) {
   }
   return parsed;
 }
-var TODOS_STORAGE_TABLES, STORAGE_TABLES, TODOS_STORAGE_ENV, TODOS_STORAGE_FALLBACK_ENV, CANONICAL_TODOS_RDS_CLUSTER_ENV = "HASNA_TODOS_RDS_CLUSTER", CANONICAL_TODOS_RDS_RUNTIME_PATH_ENV = "HASNA_TODOS_RDS_RUNTIME_PATH", CANONICAL_TODOS_RDS_DATABASE = "todos";
+var TODOS_STORAGE_TABLES, STORAGE_TABLES, TODOS_STORAGE_ENV, TODOS_STORAGE_FALLBACK_ENV, CANONICAL_TODOS_RDS_CLUSTER_ENV = "HASNA_TODOS_RDS_CLUSTER", CANONICAL_TODOS_RDS_RUNTIME_PATH_ENV = "HASNA_TODOS_RDS_RUNTIME_PATH", CANONICAL_TODOS_RDS_DATABASE = "todos", LEGACY_BACKEND_TOKENS;
 var init_config = __esm(() => {
   TODOS_STORAGE_TABLES = [
     "todos_sync_records",
@@ -3959,6 +3990,14 @@ var init_config = __esm(() => {
     syncBatchSize: "TODOS_SYNC_BATCH_SIZE",
     syncDryRun: "TODOS_SYNC_DRY_RUN"
   };
+  LEGACY_BACKEND_TOKENS = {
+    local: "sqlite",
+    remote: "postgres",
+    postgresql: "postgres",
+    hybrid: "postgres",
+    self_hosted: "postgres",
+    cloud: "postgres"
+  };
 });
 
 // src/storage/shadow-outbox-schema.ts
@@ -4092,6 +4131,30 @@ function findGitRoot(startDir) {
   }
   return null;
 }
+function getGlobalDbPath() {
+  const home = process.env["HOME"] || process.env["USERPROFILE"] || "~";
+  return join(home, ".hasna", "todos", "todos.db");
+}
+function hasExplicitProjectArg(args = process.argv.slice(2)) {
+  return args.some((arg) => arg === "--project" || arg.startsWith("--project="));
+}
+function getCliCommand(args = process.argv.slice(2)) {
+  const globalOptionsWithValues = new Set(["--project", "--agent", "--session"]);
+  for (let index = 0;index < args.length; index += 1) {
+    const arg = args[index];
+    if (globalOptionsWithValues.has(arg)) {
+      index += 1;
+      continue;
+    }
+    if (arg.startsWith("-"))
+      continue;
+    return arg;
+  }
+  return null;
+}
+function canCreateScopedProjectDb(args = process.argv.slice(2)) {
+  return getCliCommand(args) === "project-bootstrap" && !args.some((arg) => arg === "--dry-run" || arg.startsWith("--dry-run="));
+}
 function getDbPath() {
   if (process.env["HASNA_TODOS_DB_PATH"]) {
     return process.env["HASNA_TODOS_DB_PATH"];
@@ -4099,18 +4162,19 @@ function getDbPath() {
   if (process.env["TODOS_DB_PATH"]) {
     return process.env["TODOS_DB_PATH"];
   }
+  if (hasExplicitProjectArg())
+    return getGlobalDbPath();
   const cwd = process.cwd();
   const nearest = findNearestProjectDb(cwd);
   if (nearest)
     return nearest;
   if (process.env["TODOS_DB_SCOPE"] === "project") {
     const gitRoot = findGitRoot(cwd);
-    if (gitRoot) {
+    if (gitRoot && canCreateScopedProjectDb()) {
       return join(gitRoot, ".hasna", "todos", "todos.db");
     }
   }
-  const home = process.env["HOME"] || process.env["USERPROFILE"] || "~";
-  return join(home, ".hasna", "todos", "todos.db");
+  return getGlobalDbPath();
 }
 function getDatabasePath() {
   return getDbPath();
@@ -4213,10 +4277,13 @@ function resolvePartialId(db, table, partialId) {
     return null;
   }
   if (table === "tasks") {
-    const shortIdRows = db.query("SELECT id FROM tasks WHERE short_id = ?").all(partialId);
+    const shortIdRows = db.query("SELECT id, project_id FROM tasks WHERE LOWER(short_id) = LOWER(?) ORDER BY project_id, id").all(partialId);
     if (shortIdRows.length === 1) {
       return shortIdRows[0].id;
     }
+    if (shortIdRows.length > 1) {
+      throw new TaskReferenceAmbiguousError(partialId, shortIdRows.map((row) => ({ task_id: row.id, project_id: row.project_id })));
+    }
   }
   if (table === "task_lists") {
     const slugRow = db.query("SELECT id FROM task_lists WHERE slug = ?").get(partialId);
@@ -11946,7 +12013,7 @@ var init_dispatches = __esm(() => {
 // package.json
 var package_default = {
   name: "@hasna/todos",
-  version: "0.13.2",
+  version: "0.13.4",
   description: "Universal task management for AI coding agents - CLI + MCP server + interactive TUI",
   type: "module",
   main: "dist/index.js",
@@ -11980,6 +12047,10 @@ var package_default = {
     "./storage": {
       types: "./dist/storage.d.ts",
       import: "./dist/storage.js"
+    },
+    "./testing": {
+      types: "./dist/testing.d.ts",
+      import: "./dist/testing.js"
     }
   },
   workspaces: [
@@ -11992,8 +12063,8 @@ var package_default = {
     "README.md"
   ],
   scripts: {
-    build: "rm -rf dist dashboard/dist && cd dashboard && bun install --frozen-lockfile && bun run build && cd .. && bun build src/cli/index.tsx --outdir dist/cli --target bun --external ink --external react --external chalk --external @modelcontextprotocol/sdk --external '@hasna/contracts' --external '@hasna/contracts/*' && bun build src/mcp/index.ts --outdir dist/mcp --target bun --external @modelcontextprotocol/sdk --external '@hasna/contracts' --external '@hasna/contracts/*' && bun build src/server/index.ts --outdir dist/server --target bun --external '@hasna/contracts' --external '@hasna/contracts/*' && bun build src/sdk/index.ts --outdir dist/sdk --target bun --external '@hasna/contracts' --external '@hasna/contracts/*' && bun build src/index.ts src/mcp.ts src/registry.ts src/contracts.ts src/storage.ts --outdir dist --target bun --external '@hasna/contracts' --external '@hasna/contracts/*' && tsc --emitDeclarationOnly --outDir dist",
-    "build:server": "rm -rf dist && bun build src/cli/index.tsx --outdir dist/cli --target bun --external ink --external react --external chalk --external @modelcontextprotocol/sdk --external '@hasna/contracts' --external '@hasna/contracts/*' && bun build src/mcp/index.ts --outdir dist/mcp --target bun --external @modelcontextprotocol/sdk --external '@hasna/contracts' --external '@hasna/contracts/*' && bun build src/server/index.ts --outdir dist/server --target bun --external '@hasna/contracts' --external '@hasna/contracts/*' && bun build src/sdk/index.ts --outdir dist/sdk --target bun --external '@hasna/contracts' --external '@hasna/contracts/*' && bun build src/index.ts src/mcp.ts src/registry.ts src/contracts.ts src/storage.ts --outdir dist --target bun --external '@hasna/contracts' --external '@hasna/contracts/*'",
+    build: "rm -rf dist dashboard/dist && cd dashboard && bun install --frozen-lockfile && bun run build && cd .. && bun build src/cli/index.tsx --outdir dist/cli --target bun --external ink --external react --external chalk --external @modelcontextprotocol/sdk --external '@hasna/contracts' --external '@hasna/contracts/*' && bun build src/mcp/index.ts --outdir dist/mcp --target bun --external @modelcontextprotocol/sdk --external '@hasna/contracts' --external '@hasna/contracts/*' && bun build src/server/index.ts --outdir dist/server --target bun --external '@hasna/contracts' --external '@hasna/contracts/*' && bun build src/sdk/index.ts --outdir dist/sdk --target bun --external '@hasna/contracts' --external '@hasna/contracts/*' && bun build src/index.ts src/mcp.ts src/registry.ts src/contracts.ts src/storage.ts src/testing.ts --outdir dist --target bun --external '@hasna/contracts' --external '@hasna/contracts/*' && tsc --emitDeclarationOnly --outDir dist",
+    "build:server": "rm -rf dist && bun build src/cli/index.tsx --outdir dist/cli --target bun --external ink --external react --external chalk --external @modelcontextprotocol/sdk --external '@hasna/contracts' --external '@hasna/contracts/*' && bun build src/mcp/index.ts --outdir dist/mcp --target bun --external @modelcontextprotocol/sdk --external '@hasna/contracts' --external '@hasna/contracts/*' && bun build src/server/index.ts --outdir dist/server --target bun --external '@hasna/contracts' --external '@hasna/contracts/*' && bun build src/sdk/index.ts --outdir dist/sdk --target bun --external '@hasna/contracts' --external '@hasna/contracts/*' && bun build src/index.ts src/mcp.ts src/registry.ts src/contracts.ts src/storage.ts src/testing.ts --outdir dist --target bun --external '@hasna/contracts' --external '@hasna/contracts/*'",
     migrate: "bun run src/server/index.ts migrate",
     "backfill:comment-redaction": "bun run src/server/index.ts redact-comments",
     "generate:sdk": "bun run scripts/generate-sdk.ts",
@@ -17740,11 +17811,12 @@ var DEFAULT_LIMITS = {
   verification_limit: 10,
   run_limit: 3,
   dependency_limit: 12,
-  plan_task_limit: 20,
+  plan_task_limit: 24,
   max_text_chars: 6000,
   summary_char_limit: 480,
   stale_after_hours: 72
 };
+var MAX_CONTEXT_TASKS = 24;
 var ALL_CONTEXT_SECTIONS = [
   "project",
   "plan",
@@ -17777,7 +17849,7 @@ function limits(input) {
     verification_limit: clamp(input.verification_limit, DEFAULT_LIMITS.verification_limit, 100),
     run_limit: clamp(input.run_limit, DEFAULT_LIMITS.run_limit, 20),
     dependency_limit: clamp(input.dependency_limit, DEFAULT_LIMITS.dependency_limit, 100),
-    plan_task_limit: clamp(input.plan_task_limit, DEFAULT_LIMITS.plan_task_limit, 100),
+    plan_task_limit: clamp(input.plan_task_limit, DEFAULT_LIMITS.plan_task_limit, MAX_CONTEXT_TASKS),
     max_text_chars: clamp(input.max_text_chars, DEFAULT_LIMITS.max_text_chars, 50000),
     summary_char_limit: clamp(input.summary_char_limit, DEFAULT_LIMITS.summary_char_limit, 4000),
     stale_after_hours: clamp(input.stale_after_hours, DEFAULT_LIMITS.stale_after_hours, 24 * 365)
@@ -17800,6 +17872,13 @@ function taskSummary(task2) {
     priority: task2.priority
   };
 }
+function latestPlanTasks(planId, limit, db) {
+  const rows = db.query(`SELECT * FROM tasks
+     WHERE plan_id = ? AND archived_at IS NULL
+     ORDER BY updated_at DESC, created_at DESC, id ASC
+     LIMIT ?`).all(planId, limit);
+  return rows.map(rowToTask);
+}
 function acceptanceCriteria(task2, maxText) {
   const metadata = task2.metadata || {};
   const raw = metadata["acceptance_criteria"] ?? metadata["acceptanceCriteria"] ?? metadata["criteria"];
@@ -17897,7 +17976,7 @@ function summarizeSection(pack, section, maxChars) {
       return "No plan was attached.";
     return summarizeStrings([
       `Plan ${pack.plan.name} is ${pack.plan.status}`,
-      `${pack.plan.tasks.length} listed plan tasks`,
+      `${pack.plan.tasks.length} of ${pack.plan.total_tasks} plan tasks listed; ${pack.plan.omitted_tasks} omitted`,
       ...pack.plan.tasks.slice(0, 4).map((task2) => `${task2.status} ${task2.short_id || task2.id.slice(0, 8)} ${task2.title}`)
     ], maxChars);
   }
@@ -18047,7 +18126,8 @@ function createAgentContextPack(input, db) {
   const limit = limits(input);
   const project = task2.project_id ? getProject(task2.project_id, d) : null;
   const plan = task2.plan_id ? getPlan(task2.plan_id, d) : null;
-  const planTasks = task2.plan_id ? listTasks({ plan_id: task2.plan_id, limit: limit.plan_task_limit + 1 }, d) : [];
+  const planTasks = task2.plan_id ? latestPlanTasks(task2.plan_id, limit.plan_task_limit, d) : [];
+  const totalPlanTasks = task2.plan_id ? countTasks({ plan_id: task2.plan_id }, d) : 0;
   const upstream = getTaskDependencies(task2.id, d).map((dep) => taskSummary(getTask(dep.depends_on, d))).filter((item) => Boolean(item));
   const downstream = getTaskDependents(task2.id, d).map((dep) => taskSummary(getTask(dep.task_id, d))).filter((item) => Boolean(item));
   const comments = listComments(task2.id, d);
@@ -18090,6 +18170,9 @@ function createAgentContextPack(input, db) {
     warnings.push(`${runs.length - selectedRuns.length} older runs omitted`);
   if (fileMap.size > relevantFiles.length)
     warnings.push(`${fileMap.size - relevantFiles.length} relevant files omitted`);
+  if (totalPlanTasks > planTasks.length && plan) {
+    warnings.push(`${totalPlanTasks - planTasks.length} plan tasks omitted (${totalPlanTasks} total); load more on demand with "todos plans --show ${plan.id}" and inspect task details with "todos show <task-id>" or "todos context-pack <task-id>"`);
+  }
   const contextTask = {
     id: task2.id,
     short_id: task2.short_id,
@@ -18121,8 +18204,9 @@ function createAgentContextPack(input, db) {
       description: truncate2(plan.description, limit.max_text_chars),
       status: plan.status,
       agent_id: plan.agent_id,
-      tasks: planTasks.slice(0, limit.plan_task_limit).map(taskSummary).filter((item) => Boolean(item)),
-      omitted_tasks: Math.max(0, planTasks.length - limit.plan_task_limit)
+      tasks: planTasks.map(taskSummary).filter((item) => Boolean(item)),
+      total_tasks: totalPlanTasks,
+      omitted_tasks: Math.max(0, totalPlanTasks - planTasks.length)
     } : null,
     acceptance_criteria: acceptanceCriteria(task2, limit.max_text_chars),
     dependencies: {
@@ -18232,6 +18316,8 @@ ${pack.task.description}` : null,
     "## Project And Plan",
     pack.project ? `- Project: ${pack.project.name} (${pack.project.path})` : "- Project: none",
     pack.plan ? `- Plan: ${pack.plan.name} (${pack.plan.status})` : "- Plan: none",
+    pack.plan ? `- Plan tasks: ${pack.plan.tasks.length} shown of ${pack.plan.total_tasks} total (${pack.plan.omitted_tasks} omitted)` : null,
+    pack.plan && pack.plan.omitted_tasks > 0 ? `- Load more on demand: \`todos plans --show ${pack.plan.id}\`; inspect one task with \`todos show <task-id>\` or \`todos context-pack <task-id>\`.` : null,
     pack.plan && pack.plan.tasks.length > 0 ? bullet(pack.plan.tasks.map((task2) => `${task2.status} ${task2.short_id || task2.id.slice(0, 8)} ${task2.title}`)) : null,
     "",
     "## Acceptance Criteria",
@@ -19900,7 +19986,7 @@ function createReleaseCompatibilityReport(options = {}) {
         "todos --help",
         "todos-mcp --help",
         "todos-serve --help",
-        "todos doctor"
+        "todos doctor --no-fail-on-findings"
       ],
       smoke_tests: [
         "command -v todos",
@@ -19908,7 +19994,7 @@ function createReleaseCompatibilityReport(options = {}) {
         "command -v todos-serve",
         "todos --version",
         "todos --help",
-        "todos doctor"
+        "todos doctor --no-fail-on-findings"
       ],
       rollback: [
         "npm view @hasna/todos versions --json",
@@ -20402,12 +20488,11 @@ ${task2.description || ""}`.split(/\r?\n/);
 function normalizeStackLocation(value) {
   return value.replace(/:\d+(?::\d+)?/g, "").replace(/^file:\/\//, "").toLowerCase().trim();
 }
-function fingerprint(task2) {
+function fingerprintContent(task2) {
   const body = task2.description || "";
   const text = `${task2.title}
 ${body}`;
   return {
-    task: task2,
     title: normalizeText(task2.title),
     body: normalizeText(body),
     text: normalizeText(text),
@@ -20416,6 +20501,9 @@ ${body}`;
     stackKeys: stackKeysFor(task2)
   };
 }
+function fingerprint(task2) {
+  return { task: task2, ...fingerprintContent(task2) };
+}
 function intersects(left, right) {
   for (const value of left)
     if (right.has(value))
@@ -23602,6 +23690,13 @@ var TODOS_PACKAGE_EXPORTS = [
     types: "./dist/storage.d.ts",
     description: "Storage and service adapter contracts for local SQLite implementations.",
     stability: "stable"
+  },
+  {
+    subpath: "./testing",
+    import: "./dist/testing.js",
+    types: "./dist/testing.d.ts",
+    description: "Test-store isolation helpers that keep a consumer's test suite off a shared todos store.",
+    stability: "stable"
   }
 ];
 function source8(version) {
@@ -23633,6 +23728,9 @@ var TODOS_REGISTRY = createTodosRegistry({
 // src/storage/index.ts
 init_config();
 
+// src/storage/local-sqlite.ts
+init_types();
+
 // src/lib/search.ts
 init_database();
 function rowToTask3(row) {
@@ -23798,6 +23896,11 @@ init_database();
 init_identity_mapping();
 init_storage_tombstones();
 
+// src/lib/agent-name-normalize.ts
+function normalizeAgentNameInput(name) {
+  return name.trim().toLowerCase();
+}
+
 // src/db/agent-names.ts
 class InvalidAgentNameError extends Error {
   suggestions;
@@ -23942,9 +24045,6 @@ var RESERVED_GENERIC_NAMES = new Set([
 ]);
 var NUMERIC_SUFFIX_RE = /[-_]\d+$/;
 var ONE_WORD_NAME_RE = /^[a-z]+$/;
-function normalizeAgentNameInput(name) {
-  return name.trim().toLowerCase();
-}
 function hasGeneratedNumericSuffix(name) {
   return NUMERIC_SUFFIX_RE.test(normalizeAgentNameInput(name));
 }
@@ -24449,6 +24549,267 @@ init_audit();
 init_comments();
 init_database();
 
+// src/db/integrity.ts
+init_database();
+
+// src/lib/integrity.ts
+init_types();
+var TODOS_INTEGRITY_SCHEMA_VERSION = "todos.integrity.v1";
+var TERMINAL_TASK_STATUSES = ["completed", "failed", "cancelled"];
+var OPEN_TASK_STATUSES = TASK_STATUSES.filter((status) => !TERMINAL_TASK_STATUSES.includes(status));
+var INTEGRITY_CONDITIONS = [
+  {
+    id: "tasks_without_project",
+    entity: "task",
+    field: "project_id",
+    target: "project",
+    kind: "missing",
+    base_severity: "warn",
+    escalate_when_open: true,
+    impact: "invisible to every project-scoped read (list, status, next, claim)"
+  },
+  {
+    id: "tasks_without_task_list",
+    entity: "task",
+    field: "task_list_id",
+    target: "task_list",
+    kind: "missing",
+    base_severity: "warn",
+    escalate_when_open: true,
+    impact: "invisible to every task-list read \u2014 the list reports zero open work"
+  },
+  {
+    id: "tasks_with_unregistered_project",
+    entity: "task",
+    field: "project_id",
+    target: "project",
+    kind: "dangling",
+    base_severity: "error",
+    escalate_when_open: false,
+    impact: "points at a project id that does not exist; the reference can never resolve"
+  },
+  {
+    id: "tasks_with_unregistered_task_list",
+    entity: "task",
+    field: "task_list_id",
+    target: "task_list",
+    kind: "dangling",
+    base_severity: "error",
+    escalate_when_open: false,
+    impact: "points at a task-list id that does not exist; the reference can never resolve"
+  },
+  {
+    id: "task_lists_without_project",
+    entity: "task_list",
+    field: "project_id",
+    target: "project",
+    kind: "missing",
+    base_severity: "warn",
+    escalate_when_open: false,
+    impact: "unbound list \u2014 unreachable from any project, so its tasks are unroutable"
+  },
+  {
+    id: "task_lists_with_unregistered_project",
+    entity: "task_list",
+    field: "project_id",
+    target: "project",
+    kind: "dangling",
+    base_severity: "error",
+    escalate_when_open: false,
+    impact: "points at a project id that does not exist; the list can never be reached"
+  }
+];
+function integrityCondition(id) {
+  const spec = INTEGRITY_CONDITIONS.find((condition) => condition.id === id);
+  if (!spec)
+    throw new Error(`unknown integrity condition: ${id}`);
+  return spec;
+}
+function resolveIntegritySeverity(spec, measurement) {
+  if (spec.kind === "dangling")
+    return "error";
+  if (spec.escalate_when_open && (measurement.open_count ?? 0) > 0)
+    return "error";
+  return spec.base_severity;
+}
+var ENTITY_LABEL = {
+  task: ["task", "tasks"],
+  task_list: ["task list", "task lists"]
+};
+function plural(entity, count2) {
+  const [one, many] = ENTITY_LABEL[entity];
+  return count2 === 1 ? one : many;
+}
+function formatIntegrityMessage(spec, measurement) {
+  const noun = plural(spec.entity, measurement.count);
+  const verb = measurement.count === 1 ? ["has", "references"] : ["have", "reference"];
+  const open = measurement.open_count === null || measurement.open_count === 0 ? "" : ` (${measurement.open_count} still open)`;
+  return spec.kind === "missing" ? `${measurement.count} ${noun} ${verb[0]} no ${spec.field}${open}` : `${measurement.count} ${noun} ${verb[1]} a ${spec.target.replace("_", " ")} that is not registered${open}`;
+}
+function measuredCondition(spec, measurement, source9) {
+  return {
+    id: spec.id,
+    entity: spec.entity,
+    field: spec.field,
+    kind: spec.kind,
+    count: measurement.count,
+    open_count: measurement.open_count,
+    severity: measurement.count > 0 ? resolveIntegritySeverity(spec, measurement) : null,
+    verified: true,
+    source: source9,
+    message: formatIntegrityMessage(spec, measurement),
+    impact: spec.impact
+  };
+}
+function unverifiedCondition(spec, reason) {
+  return {
+    id: spec.id,
+    entity: spec.entity,
+    field: spec.field,
+    kind: spec.kind,
+    count: null,
+    open_count: null,
+    severity: null,
+    verified: false,
+    source: "unverified",
+    unverified_reason: reason,
+    message: `${spec.id}: NOT CHECKED \u2014 ${reason}`,
+    impact: spec.impact
+  };
+}
+function summarizeIntegrity(conditions) {
+  const measured = conditions.filter((condition) => condition.verified && condition.count !== null);
+  const findings = measured.filter((condition) => (condition.count ?? 0) > 0);
+  const unverified = conditions.length - measured.length;
+  return {
+    ok: unverified === 0 && findings.length === 0,
+    findings: findings.length,
+    rows: findings.reduce((total, condition) => total + (condition.count ?? 0), 0),
+    errors: findings.filter((condition) => condition.severity === "error").length,
+    warnings: findings.filter((condition) => condition.severity === "warn").length,
+    unverified,
+    complete: unverified === 0
+  };
+}
+function buildIntegrityReport(conditions, generatedAt) {
+  const measuredSources = [...new Set(conditions.map((condition) => condition.source))].filter((source9) => source9 !== "unverified");
+  return {
+    schema_version: TODOS_INTEGRITY_SCHEMA_VERSION,
+    generated_at: generatedAt,
+    source: measuredSources.length === 0 ? "unverified" : measuredSources.length === 1 ? measuredSources[0] : "remote-derived",
+    conditions,
+    summary: summarizeIntegrity(conditions)
+  };
+}
+function adoptRemoteIntegrityReport(raw, fallbackGeneratedAt) {
+  const received = new Map;
+  if (Array.isArray(raw.conditions)) {
+    for (const entry of raw.conditions) {
+      if (entry && typeof entry["id"] === "string")
+        received.set(entry["id"], entry);
+    }
+  }
+  const conditions = INTEGRITY_CONDITIONS.map((spec) => {
+    const entry = received.get(spec.id);
+    const count2 = entry?.["count"];
+    const verified = entry?.["verified"];
+    if (!entry || verified === false || typeof count2 !== "number" || !Number.isFinite(count2)) {
+      return unverifiedCondition(spec, entry ? typeof entry["unverified_reason"] === "string" ? String(entry["unverified_reason"]) : "authority reported this condition without a usable count" : "authority did not report this condition");
+    }
+    const openRaw = entry["open_count"];
+    return measuredCondition(spec, {
+      count: count2,
+      open_count: spec.entity === "task" ? typeof openRaw === "number" && Number.isFinite(openRaw) ? openRaw : 0 : null
+    }, typeof raw.source === "string" && raw.source === "postgres" ? "postgres" : "remote-authority");
+  });
+  const report = buildIntegrityReport(conditions, typeof raw.generated_at === "string" ? raw.generated_at : fallbackGeneratedAt);
+  return typeof raw.source === "string" && (raw.source === "sqlite" || raw.source === "postgres") ? { ...report, source: raw.source } : report;
+}
+var SQLITE_TABLE = {
+  task: "tasks",
+  task_list: "task_lists",
+  project: "projects"
+};
+function sqliteOpenStatusList() {
+  return OPEN_TASK_STATUSES.map((status) => `'${status}'`).join(", ");
+}
+function buildSqliteIntegritySql(spec) {
+  const table = SQLITE_TABLE[spec.entity];
+  const target = SQLITE_TABLE[spec.target];
+  const column = `t."${spec.field}"`;
+  const predicate = spec.kind === "missing" ? `(${column} IS NULL OR ${column} = '')` : `${column} IS NOT NULL AND ${column} <> '' ` + `AND NOT EXISTS (SELECT 1 FROM "${target}" r WHERE r."id" = ${column})`;
+  const openExpr = spec.entity === "task" ? `SUM(CASE WHEN t."status" IN (${sqliteOpenStatusList()}) THEN 1 ELSE 0 END)` : "NULL";
+  return `SELECT COUNT(*) AS count, ${openExpr} AS open_count FROM "${table}" t WHERE ${predicate}`;
+}
+var RECORD_TYPE = {
+  task: "tasks",
+  task_list: "task_lists",
+  project: "projects"
+};
+function buildPostgresIntegritySql(spec, options) {
+  const params = [options.service, RECORD_TYPE[spec.entity]];
+  const p = (value) => {
+    params.push(value);
+    return `$${params.length}`;
+  };
+  const column = `t.payload->>'${spec.field}'`;
+  const predicate = spec.kind === "missing" ? `(${column} IS NULL OR ${column} = '')` : `${column} IS NOT NULL AND ${column} <> '' AND NOT EXISTS (` + `SELECT 1 FROM ${options.table} r WHERE r.service = $1 AND r.object_type = ${p(RECORD_TYPE[spec.target])} ` + `AND r.deleted_at IS NULL AND r.object_id = ${column})`;
+  const openExpr = spec.entity === "task" ? `COUNT(*) FILTER (WHERE t.payload->>'status' IN (${OPEN_TASK_STATUSES.map((status) => p(status)).join(", ")}))::int` : "NULL::int";
+  const sql = `/* todos:integrity-${spec.id} */ SELECT COUNT(*)::int AS count, ${openExpr} AS open_count ` + `FROM ${options.table} t WHERE t.service = $1 AND t.object_type = $2 AND t.deleted_at IS NULL AND ${predicate}`;
+  return { sql, params };
+}
+function referenceOf(row, field2) {
+  const raw = row[field2];
+  if (typeof raw !== "string")
+    return null;
+  const trimmed = raw.trim();
+  return trimmed === "" ? null : trimmed;
+}
+function measureIntegrityRows(spec, sets) {
+  const rows = spec.entity === "task" ? sets.tasks : sets.taskLists;
+  if (!rows)
+    return null;
+  const registered = spec.kind === "dangling" ? spec.target === "project" ? sets.projectIds : sets.taskListIds : undefined;
+  if (spec.kind === "dangling" && !registered)
+    return null;
+  let count2 = 0;
+  let open = 0;
+  for (const row of rows) {
+    const reference = referenceOf(row, spec.field);
+    const matches = spec.kind === "missing" ? reference === null : reference !== null && !registered.has(reference);
+    if (!matches)
+      continue;
+    count2++;
+    if (spec.entity === "task") {
+      const status = row.status;
+      if (typeof status === "string" && OPEN_TASK_STATUSES.includes(status))
+        open++;
+    }
+  }
+  return { count: count2, open_count: spec.entity === "task" ? open : null };
+}
+
+// src/db/integrity.ts
+var REQUIRED_TABLES2 = { tasks: true, task_lists: true, projects: true };
+function tableExists(db, table) {
+  return Boolean(db.query("SELECT name FROM sqlite_master WHERE type='table' AND name=?").get(table));
+}
+function scanSqliteIntegrity(db = getDatabase()) {
+  const missing = Object.keys(REQUIRED_TABLES2).filter((table) => !tableExists(db, table));
+  const conditions = INTEGRITY_CONDITIONS.map((spec) => {
+    if (missing.length > 0) {
+      return unverifiedCondition(spec, `local schema is missing table(s): ${missing.join(", ")}`);
+    }
+    try {
+      const row = db.query(buildSqliteIntegritySql(spec)).get();
+      return measuredCondition(spec, { count: Number(row?.count ?? 0), open_count: spec.entity === "task" ? Number(row?.open_count ?? 0) : null }, "sqlite");
+    } catch (error) {
+      return unverifiedCondition(spec, error instanceof Error ? error.message : String(error));
+    }
+  });
+  return buildIntegrityReport(conditions, now());
+}
+
 // src/storage/sqlite-snapshot.ts
 init_database();
 init_audit();
@@ -24840,15 +25201,15 @@ function resolveTaskRefLocal(db, ref) {
     return null;
   if (TASK_UUID_RE.test(raw))
     return getTask(raw, db);
-  const prefixRows = db.query("SELECT id FROM tasks WHERE LOWER(id) LIKE ? ESCAPE '\\' LIMIT 2").all(`${raw.replace(/[\\%_]/g, (c) => `\\${c}`)}%`);
+  const prefixRows = db.query("SELECT id, project_id FROM tasks WHERE LOWER(id) LIKE ? ESCAPE '\\' ORDER BY project_id, id LIMIT 2").all(`${raw.replace(/[\\%_]/g, (c) => `\\${c}`)}%`);
   if (prefixRows.length > 1) {
-    throw new Error(`Task reference is ambiguous: "${ref}"`);
+    throw new TaskReferenceAmbiguousError(ref, prefixRows.map((row) => ({ task_id: row.id, project_id: row.project_id })));
   }
   if (prefixRows.length === 1)
     return getTask(prefixRows[0].id, db);
-  const shortIdRows = db.query("SELECT id FROM tasks WHERE LOWER(short_id) = ? LIMIT 2").all(raw);
+  const shortIdRows = db.query("SELECT id, project_id FROM tasks WHERE LOWER(short_id) = ? ORDER BY project_id, id LIMIT 2").all(raw);
   if (shortIdRows.length > 1) {
-    throw new Error(`Task reference is ambiguous: "${ref}"`);
+    throw new TaskReferenceAmbiguousError(ref, shortIdRows.map((row) => ({ task_id: row.id, project_id: row.project_id })));
   }
   if (shortIdRows.length === 1)
     return getTask(shortIdRows[0].id, db);
@@ -24997,6 +25358,9 @@ function createLocalSqliteTodosStorageAdapter(options = {}) {
       exportSnapshot: () => exportSqliteTodosStorageSnapshot(database()),
       importSnapshot: (snapshot) => importSqliteTodosStorageSnapshot(snapshot, database())
     },
+    integrity: {
+      report: () => scanSqliteIntegrity(database())
+    },
     transaction: (fn) => {
       const tx = database().transaction(() => fn(adapter));
       return tx();
@@ -25005,6 +25369,10 @@ function createLocalSqliteTodosStorageAdapter(options = {}) {
   return adapter;
 }
 
+// src/storage/postgres-adapter.ts
+init_types();
+import { randomUUID as randomUUID3 } from "crypto";
+
 // src/storage/postgres-sync.ts
 var DEFAULT_TODOS_POSTGRES_SYNC_TABLE = "todos_sync_records";
 var DEFAULT_TODOS_POSTGRES_CURSOR_TABLE = "todos_sync_cursors";
@@ -25394,54 +25762,7 @@ function assertSafeIdentifier(value) {
     throw new Error(`Unsafe Postgres identifier: ${value}`);
 }
 
-// src/storage/hybrid.ts
-function createHybridTodosStorageAdapter(options) {
-  const local = options.localAdapter ?? createLocalSqliteTodosStorageAdapter(options.local);
-  const syncStore = options.syncStore ?? (options.postgresClient ? createPostgresTodosSyncStore(options.postgresClient, { sourceMachineId: options.sourceMachineId }) : null);
-  if (!syncStore)
-    throw new Error("hybrid storage requires a Postgres sync store or query client");
-  if (!local.sync.exportSnapshot || !local.sync.importSnapshot) {
-    throw new Error("hybrid storage requires local snapshot export/import support");
-  }
-  const exportSnapshot = async (context) => await local.sync.exportSnapshot(context);
-  const importSnapshot = async (snapshot, context) => await local.sync.importSnapshot(snapshot, context);
-  const remote = {
-    ensureSchema: () => syncStore.ensureSchema(),
-    async pushSnapshot(context) {
-      const snapshot = await exportSnapshot(context);
-      return syncStore.pushSnapshot(snapshot, context);
-    },
-    async pullSnapshot(options2, context) {
-      const snapshot = await syncStore.pullSnapshot(options2);
-      return importSnapshot(snapshot, context);
-    },
-    async syncOnce(options2, context) {
-      const pulled = await remote.pullSnapshot(options2, context);
-      const pushed = await remote.pushSnapshot(context);
-      return { pulled, pushed };
-    }
-  };
-  return {
-    ...local,
-    kind: "hybrid",
-    capabilities: {
-      ...local.capabilities,
-      localPersistence: true,
-      remotePersistence: true,
-      sync: true
-    },
-    sync: {
-      ...local.sync,
-      exportSnapshot,
-      importSnapshot
-    },
-    remote
-  };
-}
-
 // src/storage/postgres-adapter.ts
-init_types();
-import { randomUUID as randomUUID3 } from "crypto";
 init_redaction();
 function createPostgresTodosStorageAdapter(options) {
   const store = new PostgresJsonRecordStore(options);
@@ -25512,7 +25833,7 @@ function createPostgresTodosStorageAdapter(options) {
     agents: {
       register: (input, context) => registerAgent2(input, store, context),
       get: (id) => store.get("agents", id),
-      getByName: async (name) => (await store.list("agents")).find((agent) => agent.name === name) ?? null,
+      getByName: async (name) => matchAgentByName(await store.list("agents"), name),
       list: async (options2) => (await store.list("agents")).filter((agent) => options2?.include_archived || agent.status !== "archived").sort((a, b) => a.name.localeCompare(b.name)),
       update: (id, input) => updateAgent2(id, input, store),
       heartbeat: (idOrName, context) => heartbeatAgent(idOrName, store, context),
@@ -25569,6 +25890,9 @@ function createPostgresTodosStorageAdapter(options) {
       exportSnapshot: () => exportSnapshot(store),
       importSnapshot: (snapshot, context) => importSnapshot(snapshot, store, context)
     },
+    integrity: {
+      report: () => store.integrityReport()
+    },
     transaction: (fn) => fn(adapter)
   };
   return adapter;
@@ -25675,8 +25999,9 @@ class PostgresJsonRecordStore {
       conds.push(`payload->>'agent_id' = ${p(filter.agent_id)}`);
     if (filter.session_id !== undefined)
       conds.push(`payload->>'session_id' = ${p(filter.session_id)}`);
-    if (filter.tags?.length)
-      conds.push(`payload->'tags' @> ${p(filter.tags)}::jsonb`);
+    if (filter.tags?.length) {
+      conds.push(`EXISTS (SELECT 1 FROM jsonb_array_elements_text(COALESCE(payload->'tags', '[]'::jsonb)) AS task_tags(tag) ` + `WHERE ${inClause("task_tags.tag", filter.tags)})`);
+    }
     if (filter.has_recurrence !== undefined) {
       conds.push(`(COALESCE(payload->>'recurrence_rule', '') <> '') = ${p(filter.has_recurrence)}`);
     }
@@ -25737,7 +26062,8 @@ class PostgresJsonRecordStore {
             AND object_id COLLATE "C" >= $2 AND object_id COLLATE "C" < $3
           LIMIT 2`, [this.service, raw, upper]);
       if (prefixResult.rows.length > 1) {
-        throw new Error(`Task reference is ambiguous: "${ref}"`);
+        const candidates = prefixResult.rows.map((row) => payloadRecord2(row.payload));
+        throw new TaskReferenceAmbiguousError(ref, candidates.map((task2) => ({ task_id: task2.id, project_id: task2.project_id })));
       }
       if (prefixResult.rows.length === 1) {
         return payloadRecord2(prefixResult.rows[0].payload);
@@ -25748,7 +26074,8 @@ class PostgresJsonRecordStore {
           AND LOWER(payload->>'short_id') = $2
         LIMIT 2`, [this.service, raw]);
     if (shortIdResult.rows.length > 1) {
-      throw new Error(`Task reference is ambiguous: "${ref}"`);
+      const candidates = shortIdResult.rows.map((row) => payloadRecord2(row.payload));
+      throw new TaskReferenceAmbiguousError(ref, candidates.map((task2) => ({ task_id: task2.id, project_id: task2.project_id })));
     }
     if (shortIdResult.rows.length === 1) {
       return payloadRecord2(shortIdResult.rows[0].payload);
@@ -25762,6 +26089,24 @@ class PostgresJsonRecordStore {
     const result = await this.options.client.query(sql, params);
     return Number(result.rows[0]?.count ?? 0);
   }
+  async integrityReport() {
+    await this.ensureSchema();
+    const conditions = [];
+    for (const spec of INTEGRITY_CONDITIONS) {
+      const { sql, params } = buildPostgresIntegritySql(spec, { table: this.tableName, service: this.service });
+      try {
+        const result = await this.options.client.query(sql, params);
+        const row = result.rows[0];
+        conditions.push(measuredCondition(spec, {
+          count: Number(row?.count ?? 0),
+          open_count: spec.entity === "task" ? Number(row?.open_count ?? 0) : null
+        }, "postgres"));
+      } catch (error) {
+        conditions.push(unverifiedCondition(spec, error instanceof Error ? error.message : String(error)));
+      }
+    }
+    return buildIntegrityReport(conditions, new Date().toISOString());
+  }
   async listTombstones() {
     await this.ensureSchema();
     const result = await this.options.client.query(`SELECT object_type, object_id, payload, updated_at, deleted_at, source_machine_id, version
@@ -26237,7 +26582,7 @@ async function startTask2(id, agentId, store) {
   if (task2.status !== "pending" && task2.status !== "in_progress") {
     throw new Error(`Task is ${task2.status} and cannot be started by ${agentId}`);
   }
-  return patchTask(task2, {
+  const started = await patchTask(task2, {
     status: "in_progress",
     assigned_to: task2.assigned_to ?? agentId,
     agent_id: task2.agent_id ?? agentId,
@@ -26245,6 +26590,8 @@ async function startTask2(id, agentId, store) {
     locked_at: new Date().toISOString(),
     started_at: task2.started_at ?? new Date().toISOString()
   }, store);
+  await logTaskChange2(task2.id, "start", "status", task2.status, "in_progress", agentId, store);
+  return started;
 }
 async function completeTask2(id, agentId, options, store) {
   const task2 = await store.completeTask(id, agentId, options);
@@ -26550,15 +26897,27 @@ async function updatePlan2(id, input, store) {
   }
   return store.upsert("plans", { ...plan, ...patch, updated_at: new Date().toISOString() });
 }
+function matchAgentByName(agents, name, options) {
+  const target = normalizeAgentNameInput(name);
+  if (!target)
+    return null;
+  const matches = agents.filter((agent) => normalizeAgentNameInput(agent.name) === target && (options?.includeArchived !== false || agent.status !== "archived"));
+  if (matches.length === 0)
+    return null;
+  return matches.reduce((freshest, candidate) => new Date(candidate.last_seen_at).getTime() > new Date(freshest.last_seen_at).getTime() ? candidate : freshest);
+}
 async function registerAgent2(input, store, context) {
-  const existing = (await store.list("agents")).find((agent2) => agent2.name === input.name && agent2.status !== "archived");
+  const canonicalName = normalizeAgentNameInput(input.name);
+  const existing = matchAgentByName(await store.list("agents"), canonicalName, {
+    includeArchived: false
+  });
   if (existing && !input.force && existing.session_id && existing.session_id !== input.session_id) {
-    return { conflict: true, message: `Agent name '${input.name}' is already active` };
+    return { conflict: true, message: `Agent name '${canonicalName}' is already active` };
   }
   const timestamp3 = new Date().toISOString();
   const agent = {
     id: existing?.id ?? randomUUID3().slice(0, 8),
-    name: input.name,
+    name: canonicalName,
     description: input.description ?? existing?.description ?? null,
     role: input.role ?? existing?.role ?? null,
     title: input.title ?? existing?.title ?? null,
@@ -26596,7 +26955,7 @@ async function resolveAgent(idOrName, store) {
   const byId = await store.get("agents", idOrName);
   if (byId)
     return byId;
-  return (await store.list("agents")).find((agent) => agent.name === idOrName) ?? null;
+  return matchAgentByName(await store.list("agents"), idOrName);
 }
 async function heartbeatAgent(idOrName, store, context) {
   const agent = await resolveAgent(idOrName, store);
@@ -27353,17 +27712,17 @@ function createTodosCloudQueryClientFromEnv(env = process.env, options = {}) {
 init_config();
 function createTodosStorageAdapter(options = {}) {
   const config = options.config ?? loadTodosStorageConfig(options.env);
-  if (config.mode === "local") {
+  if (config.mode === "sqlite") {
     if (isTodosShadowEnabled(options.env))
       return createShadowAdapter(options, config);
     return createLocalSqliteTodosStorageAdapter(options.local);
   }
   assertTodosRemoteStorageConfig(config);
-  const adapter = config.mode === "hybrid" ? options.hybridAdapter ?? createImplicitHybridAdapter(options) ?? options.remoteAdapter : options.remoteAdapter ?? createImplicitPostgresAdapter(options);
+  const adapter = options.remoteAdapter ?? createImplicitPostgresAdapter(options);
   if (!adapter) {
-    throw new Error(`${config.mode} storage requires a repo-native remote adapter. ` + "Pass remoteAdapter/hybridAdapter after wiring Postgres RDS and S3 support.");
+    throw new Error("postgres storage requires a repo-native Postgres adapter. " + "Pass remoteAdapter or postgresClient after wiring Postgres RDS support.");
   }
-  assertRemoteAdapterCapabilities(adapter, config.mode);
+  assertPostgresAdapterCapabilities(adapter);
   return adapter;
 }
 function createShadowAdapter(options, config) {
@@ -27377,7 +27736,7 @@ function createShadowAdapter(options, config) {
     ...options.local ? { local: options.local } : {},
     ...options.postgresSyncStore ? { syncStore: options.postgresSyncStore } : {},
     ...postgresClient ? { postgresClient } : {},
-    ...options.hybrid?.sourceMachineId ? { sourceMachineId: options.hybrid.sourceMachineId } : {}
+    ...options.sourceMachineId ? { sourceMachineId: options.sourceMachineId } : {}
   });
 }
 function createImplicitPostgresAdapter(options) {
@@ -27385,25 +27744,12 @@ function createImplicitPostgresAdapter(options) {
     return null;
   return createPostgresTodosStorageAdapter({
     client: options.postgresClient,
-    ...options.hybrid?.sourceMachineId ? { sourceMachineId: options.hybrid.sourceMachineId } : {}
-  });
-}
-function createImplicitHybridAdapter(options) {
-  if (!options.postgresClient && !options.postgresSyncStore)
-    return null;
-  return createHybridTodosStorageAdapter({
-    ...options.hybrid ?? {},
-    local: options.local,
-    postgresClient: options.postgresClient,
-    syncStore: options.postgresSyncStore
+    ...options.sourceMachineId ? { sourceMachineId: options.sourceMachineId } : {}
   });
 }
-function assertRemoteAdapterCapabilities(adapter, mode) {
+function assertPostgresAdapterCapabilities(adapter) {
   if (!adapter.capabilities.remotePersistence) {
-    throw new Error(`${mode} storage adapter must set capabilities.remotePersistence=true`);
-  }
-  if (mode === "hybrid" && !adapter.capabilities.localPersistence) {
-    throw new Error("hybrid storage adapter must also set capabilities.localPersistence=true");
+    throw new Error("postgres storage adapter must set capabilities.remotePersistence=true");
   }
 }
 // src/storage/shadow-outbox.ts
@@ -27730,6 +28076,50 @@ async function closeRuntimeShadowCloud() {
     await cloud.close().catch(() => {});
   }
 }
+// src/storage/hybrid.ts
+function createHybridTodosStorageAdapter(options) {
+  const local = options.localAdapter ?? createLocalSqliteTodosStorageAdapter(options.local);
+  const syncStore = options.syncStore ?? (options.postgresClient ? createPostgresTodosSyncStore(options.postgresClient, { sourceMachineId: options.sourceMachineId }) : null);
+  if (!syncStore)
+    throw new Error("hybrid storage requires a Postgres sync store or query client");
+  if (!local.sync.exportSnapshot || !local.sync.importSnapshot) {
+    throw new Error("hybrid storage requires local snapshot export/import support");
+  }
+  const exportSnapshot2 = async (context) => await local.sync.exportSnapshot(context);
+  const importSnapshot2 = async (snapshot, context) => await local.sync.importSnapshot(snapshot, context);
+  const remote = {
+    ensureSchema: () => syncStore.ensureSchema(),
+    async pushSnapshot(context) {
+      const snapshot = await exportSnapshot2(context);
+      return syncStore.pushSnapshot(snapshot, context);
+    },
+    async pullSnapshot(options2, context) {
+      const snapshot = await syncStore.pullSnapshot(options2);
+      return importSnapshot2(snapshot, context);
+    },
+    async syncOnce(options2, context) {
+      const pulled = await remote.pullSnapshot(options2, context);
+      const pushed = await remote.pushSnapshot(context);
+      return { pulled, pushed };
+    }
+  };
+  return {
+    ...local,
+    kind: "hybrid",
+    capabilities: {
+      ...local.capabilities,
+      localPersistence: true,
+      remotePersistence: true,
+      sync: true
+    },
+    sync: {
+      ...local.sync,
+      exportSnapshot: exportSnapshot2,
+      importSnapshot: importSnapshot2
+    },
+    remote
+  };
+}
 // src/storage/comment-redaction-backfill.ts
 init_redaction();
 var COMMENT_REDACTION_BACKFILL_CONFIRMATION = "REDACT_STORED_TODOS_COMMENTS";
@@ -31308,10 +31698,10 @@ function getNativeStorageStatus(env = process.env) {
   } catch (error) {
     issues.push(error instanceof Error ? error.message : String(error));
   }
-  const remoteEnabled = isTodosRemoteStorageEnabled(config);
+  const remoteEnabled = isTodosPostgresBackend(config);
   const remoteFieldsConfigured = Boolean(config.database || config.objectStorage);
   if (!remoteEnabled && remoteFieldsConfigured) {
-    warnings.push(`${TODOS_STORAGE_ENV.mode}=local ignores configured remote storage fields`);
+    warnings.push(`the sqlite backend (${TODOS_STORAGE_ENV.mode}) ignores configured remote storage fields`);
   }
   if (remoteEnabled && !config.objectStorage) {
     warnings.push(`${TODOS_STORAGE_ENV.s3Bucket} is not configured, so artifact sync will stay local`);
@@ -31320,7 +31710,7 @@ function getNativeStorageStatus(env = process.env) {
     ok: issues.length === 0,
     service: "todos",
     mode: config.mode,
-    local_default: config.mode === "local",
+    local_default: config.mode === "sqlite",
     remote_enabled: remoteEnabled,
     database: {
       configured: Boolean(config.database),
@@ -31402,8 +31792,12 @@ function storageEnvStatus(env) {
   ]));
 }
 function fallbackConfig(env) {
-  const modeValue = clean2(env[TODOS_STORAGE_ENV.mode]);
-  const mode = modeValue === "remote" || modeValue === "hybrid" ? modeValue : "local";
+  let mode;
+  try {
+    mode = parseStorageBackend(clean2(env[TODOS_STORAGE_ENV.mode]));
+  } catch {
+    mode = "sqlite";
+  }
   return {
     service: "todos",
     mode,
@@ -50582,7 +50976,7 @@ function parseObject4(value) {
 function normalizeKey(value) {
   return value.trim().toLowerCase().replace(/[^a-z0-9._:/-]+/g, "-").replace(/^-+|-+$/g, "");
 }
-function normalizeFingerprint(value) {
+function normalizeTaskFindingFingerprint(value) {
   const normalized = normalizeKey(value);
   if (!normalized)
     throw new Error("finding fingerprint is required");
@@ -50691,7 +51085,7 @@ function assertTask(taskId, db) {
     throw new TaskNotFoundError(taskId);
 }
 function nextFinding(input, db) {
-  const fingerprint4 = normalizeFingerprint(input.fingerprint);
+  const fingerprint4 = normalizeTaskFindingFingerprint(input.fingerprint);
   const title = redactOptional(input.title, 300);
   if (!title)
     throw new Error("finding title is required");
@@ -50839,7 +51233,7 @@ function resolveMissingTaskFindings(input, db) {
   const timestamp3 = input.resolved_at || now();
   const status = normalizeResolutionStatus(input.status);
   const runId = resolveRunForTask(input.run_id, input.task_id, d);
-  const present = new Set(input.fingerprints.map(normalizeFingerprint));
+  const present = new Set(input.fingerprints.map(normalizeTaskFindingFingerprint));
   const warnings = [];
   const conditions = ["task_id = ?", "status = 'open'"];
   const params = [input.task_id];
@@ -51366,12 +51760,12 @@ init_artifact_store();
 
 // src/lib/doctor.ts
 init_database();
+import { chmodSync, copyFileSync as copyFileSync2, existsSync as existsSync30, mkdirSync as mkdirSync22, statSync as statSync12 } from "fs";
+import { basename as basename7, dirname as dirname18, join as join27 } from "path";
 init_migrations();
 init_schema();
 init_recurrence();
-import { chmodSync, copyFileSync as copyFileSync2, existsSync as existsSync30, mkdirSync as mkdirSync22, statSync as statSync12 } from "fs";
-import { basename as basename7, dirname as dirname18, join as join27 } from "path";
-var REQUIRED_TABLES2 = [
+var REQUIRED_TABLES3 = [
   "_migrations",
   "projects",
   "tasks",
@@ -51384,7 +51778,7 @@ var REQUIRED_TABLES2 = [
   "task_run_commands",
   "task_run_artifacts"
 ];
-function tableExists(db, table) {
+function tableExists2(db, table) {
   return Boolean(db.query("SELECT name FROM sqlite_master WHERE type='table' AND name=?").get(table));
 }
 function quoteIdent(identifier) {
@@ -51468,7 +51862,7 @@ function findDuplicateIndexes(db) {
   return duplicates;
 }
 function findMissingProjectRoots(db) {
-  if (!tableExists(db, "projects"))
+  if (!tableExists2(db, "projects"))
     return 0;
   let missing = 0;
   const rows = db.query("SELECT path FROM projects WHERE path IS NOT NULL AND path != ''").all();
@@ -51483,7 +51877,7 @@ function findMissingProjectRoots(db) {
   return missing;
 }
 function addTaskStateChecks(db, checks) {
-  if (!tableExists(db, "tasks"))
+  if (!tableExists2(db, "tasks"))
     return;
   const columns = getTableColumns(db, "tasks");
   const staleCutoff = new Date(Date.now() - 30 * 60 * 1000).toISOString();
@@ -51555,15 +51949,42 @@ function createBackup(dbPath) {
 function pushRepair(repairs, type, message, applied, count3) {
   repairs.push({ type, message, applied, count: count3 });
 }
-function summarize3(checks, repairs) {
+function summarize3(checks, repairs, integrity) {
   return {
     errors: checks.filter((check) => check.severity === "error").length,
     warnings: checks.filter((check) => check.severity === "warn").length,
     infos: checks.filter((check) => check.severity === "info").length,
     repairable: checks.filter((check) => check.repairable).length,
-    applied: repairs.filter((repair) => repair.applied).length
+    applied: repairs.filter((repair) => repair.applied).length,
+    integrity_findings: integrity.summary.findings,
+    integrity_rows: integrity.summary.rows,
+    integrity_unverified: integrity.summary.unverified
   };
 }
+function addIntegrityChecks(integrity, checks) {
+  for (const condition of integrity.conditions) {
+    if (!condition.verified) {
+      addCheck(checks, {
+        severity: "warn",
+        type: `${condition.id}_unverified`,
+        message: condition.message,
+        repairable: false,
+        integrity: true
+      });
+      continue;
+    }
+    if ((condition.count ?? 0) === 0)
+      continue;
+    addCheck(checks, {
+      severity: condition.severity ?? "warn",
+      type: condition.id,
+      message: `${condition.message} \u2014 ${condition.impact}`,
+      count: condition.count ?? undefined,
+      repairable: false,
+      integrity: true
+    });
+  }
+}
 function deleteOrphans(db, table, where) {
   const before = countQuery2(db, `SELECT COUNT(*) as count FROM ${table} WHERE ${where}`);
   if (before > 0)
@@ -51592,7 +52013,7 @@ function runTodosDoctor(options = {}) {
       message: `Schema at migration ${migrationCurrent}`
     });
   }
-  const missingTables = REQUIRED_TABLES2.filter((table) => !tableExists(db, table));
+  const missingTables = REQUIRED_TABLES3.filter((table) => !tableExists2(db, table));
   if (missingTables.length > 0) {
     addCheck(checks, {
       severity: "error",
@@ -51602,7 +52023,7 @@ function runTodosDoctor(options = {}) {
       repairable: true
     });
   }
-  const orphanedParents = tableExists(db, "tasks") ? countQuery2(db, "SELECT COUNT(*) as count FROM tasks t WHERE t.parent_id IS NOT NULL AND NOT EXISTS (SELECT 1 FROM tasks p WHERE p.id = t.parent_id)") : 0;
+  const orphanedParents = tableExists2(db, "tasks") ? countQuery2(db, "SELECT COUNT(*) as count FROM tasks t WHERE t.parent_id IS NOT NULL AND NOT EXISTS (SELECT 1 FROM tasks p WHERE p.id = t.parent_id)") : 0;
   if (orphanedParents > 0) {
     addCheck(checks, {
       severity: "error",
@@ -51612,7 +52033,7 @@ function runTodosDoctor(options = {}) {
       repairable: true
     });
   }
-  const orphanedDependencies = tableExists(db, "task_dependencies") && tableExists(db, "tasks") ? countQuery2(db, "SELECT COUNT(*) as count FROM task_dependencies d WHERE NOT EXISTS (SELECT 1 FROM tasks t WHERE t.id = d.task_id) OR NOT EXISTS (SELECT 1 FROM tasks t WHERE t.id = d.depends_on)") : 0;
+  const orphanedDependencies = tableExists2(db, "task_dependencies") && tableExists2(db, "tasks") ? countQuery2(db, "SELECT COUNT(*) as count FROM task_dependencies d WHERE NOT EXISTS (SELECT 1 FROM tasks t WHERE t.id = d.task_id) OR NOT EXISTS (SELECT 1 FROM tasks t WHERE t.id = d.depends_on)") : 0;
   if (orphanedDependencies > 0) {
     addCheck(checks, {
       severity: "error",
@@ -51631,7 +52052,7 @@ function runTodosDoctor(options = {}) {
   ];
   let orphanedRows2 = 0;
   for (const [table, where] of orphanTables) {
-    if (!tableExists(db, table))
+    if (!tableExists2(db, table))
       continue;
     orphanedRows2 += countQuery2(db, `SELECT COUNT(*) as count FROM ${table} WHERE ${where}`);
   }
@@ -51645,6 +52066,8 @@ function runTodosDoctor(options = {}) {
     });
   }
   addTaskStateChecks(db, checks);
+  const integrity = scanSqliteIntegrity(db);
+  addIntegrityChecks(integrity, checks);
   const corruptJson = findCorruptJsonMetadata(db);
   if (corruptJson.length > 0) {
     addCheck(checks, {
@@ -51703,12 +52126,12 @@ function runTodosDoctor(options = {}) {
       db.run("UPDATE tasks SET parent_id = NULL WHERE parent_id IS NOT NULL AND NOT EXISTS (SELECT 1 FROM tasks p WHERE p.id = tasks.parent_id)");
       pushRepair(repairs, "orphaned_task_parents", "Cleared missing parent references", true, orphanedParents);
     }
-    if (orphanedDependencies > 0 && tableExists(db, "task_dependencies")) {
+    if (orphanedDependencies > 0 && tableExists2(db, "task_dependencies")) {
       const count3 = deleteOrphans(db, "task_dependencies", "NOT EXISTS (SELECT 1 FROM tasks t WHERE t.id = task_dependencies.task_id) OR NOT EXISTS (SELECT 1 FROM tasks t WHERE t.id = task_dependencies.depends_on)");
       pushRepair(repairs, "orphaned_task_dependencies", "Deleted dependency rows referencing missing tasks", true, count3);
     }
     for (const [table, where] of orphanTables) {
-      if (!tableExists(db, table))
+      if (!tableExists2(db, table))
         continue;
       const count3 = deleteOrphans(db, table, where);
       if (count3 > 0)
@@ -51737,16 +52160,19 @@ function runTodosDoctor(options = {}) {
       }
     }
   }
-  const finalChecks = apply && hasRepairableIssue ? runTodosDoctor({ db, dbPath, apply: false }).checks : checks;
-  const summary = summarize3(finalChecks, repairs);
+  const reread = apply && hasRepairableIssue ? runTodosDoctor({ db, dbPath, apply: false }) : undefined;
+  const finalChecks = reread?.checks ?? checks;
+  const finalIntegrity = reread?.integrity ?? integrity;
+  const summary = summarize3(finalChecks, repairs, finalIntegrity);
   return {
-    ok: !finalChecks.some((check) => check.severity === "error"),
+    ok: !finalChecks.some((check) => check.severity === "error") && finalIntegrity.summary.ok,
     dry_run: !apply,
     database_path: dbPath,
     migration: { current: getMigrationLevel(db), expected: migrationExpected },
     backup,
     checks: finalChecks,
     repairs,
+    integrity: finalIntegrity,
     summary
   };
 }
@@ -52292,6 +52718,7 @@ export {
   updateArtifactRedaction,
   updateAgentActivity,
   updateAgent,
+  unverifiedCondition,
   unsubscribeResource,
   unlockTask,
   unlinkTaskCommit,
@@ -52312,6 +52739,7 @@ export {
   summarizeTaskRun,
   summarizeRoadmap,
   summarizeMilestone,
+  summarizeIntegrity,
   suggestAgentNames,
   subscribeResource,
   storeArtifactContent,
@@ -52352,6 +52780,7 @@ export {
   scorePlanHealth,
   scheduleTask,
   scanTextForSecrets,
+  scanSqliteIntegrity,
   scanSourceForForbiddenWebPatterns,
   scanReminders,
   scanPreWriteText,
@@ -52399,6 +52828,7 @@ export {
   resolvePartialId,
   resolveMissingTaskFindings,
   resolveMentions,
+  resolveIntegritySeverity,
   resolveGitRoot,
   resolveCommandQuery,
   resolveAccessProfile,
@@ -52513,6 +52943,7 @@ export {
   patrolTasks,
   parseTmuxTarget,
   parseStorageMode,
+  parseStorageBackend,
   parseRecurrenceRule,
   parseQuietHours,
   parsePlanArtifactMarkdown,
@@ -52541,6 +52972,8 @@ export {
   migrationDryRun,
   migrateWorkflowStates,
   mergeDuplicateTask,
+  measuredCondition,
+  measureIntegrityRows,
   materializePlanSteps,
   matchCapabilities,
   looksSensitiveKey,
@@ -52659,12 +53092,14 @@ export {
   isWorktreePath,
   isValidRecurrenceRule,
   isTodosRemoteStorageEnabled,
+  isTodosPostgresBackend,
   isSnapshotStale,
   isEncryptedValue,
   isEncryptedBridgeBundle,
   isArtifactExpired,
   isAllowedLocalApiUrl,
   isAgentConflict,
+  integrityCondition,
   installTemplateLibrary,
   installLocalExtension,
   inspectPlanArtifact,
@@ -52707,6 +53142,7 @@ export {
   getTodosStorageEnvName,
   getTodosStorageDatabaseUrl,
   getTodosStorageDatabaseEnv,
+  getTodosStorageBackend,
   getTimeReport,
   getTimeLogs,
   getTerminalNotificationRule,
@@ -52914,6 +53350,7 @@ export {
   formatLockConflict,
   formatKnowledgeSnapshotMarkdown,
   formatIssueImportPreviewText,
+  formatIntegrityMessage,
   formatIntakePreviewText,
   formatHandoffPacket,
   formatGoalHandoff,
@@ -53144,16 +53581,19 @@ export {
   bulkAddTaskFiles,
   buildTaskDependencyEdges,
   buildTaskBoardSnapshot,
+  buildSqliteIntegritySql,
   buildS3ObjectUrl,
   buildS3ObjectKey,
   buildRunReplayBundle,
   buildResourceSnapshot,
   buildReportExportData,
   buildProjectDependencyGraph,
+  buildPostgresIntegritySql,
   buildPlanArtifactSnapshot,
   buildMcpToolGroups,
   buildMachineTopologyReport,
   buildKnowledgeSnapshotPayload,
+  buildIntegrityReport,
   buildHandoffPacket,
   buildFeatureManifest,
   buildFailureTriageReport,
@@ -53188,6 +53628,7 @@ export {
   appendRunCommand,
   analyzeDependencyGraph,
   agentClaimNextSafe,
+  adoptRemoteIntegrityReport,
   addTemplateTasks,
   addTaskRunFile,
   addTaskRunEvent,
@@ -53234,6 +53675,7 @@ export {
   TODOS_LOCAL_BACKUP_KIND,
   TODOS_JSON_CONTRACTS_MANIFEST,
   TODOS_JSON_CONTRACTS,
+  TODOS_INTEGRITY_SCHEMA_VERSION,
   TODOS_ERROR_CODES,
   TODOS_ENCRYPTION_SCHEMA_VERSION,
   TODOS_ENCRYPTED_VALUE_KIND,
@@ -53290,6 +53732,7 @@ export {
   PLAN_EXECUTION_SCHEMA,
   PLAN_EXECUTION_MODES,
   PARITY_SCHEMA_VERSION,
+  OPEN_TASK_STATUSES,
   NOTIFICATION_REMINDERS_SCHEMA,
   NL_INTAKE_SCHEMA,
   NESTED_SUBCOMMANDS,
@@ -53318,6 +53761,7 @@ export {
   JSON_OUTPUT_CONTRACT,
   ISSUE_SOURCES,
   ISSUE_IMPORT_SCHEMA,
+  INTEGRITY_CONDITIONS,
   INTAKE_TRIAGE_STATUSES,
   INTAKE_SOURCE_TYPES,
   INBOX_INTAKE_SCHEMA,