@hasna/todos 0.13.2 → 0.13.4

package/dist/storage.js

@@ -43,15 +43,18 @@ var __require = import.meta.require;
 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,
@@ -76,7 +79,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/";
@@ -113,29 +116,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);
@@ -146,8 +161,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`);
@@ -203,7 +218,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",
@@ -244,6 +259,187 @@ 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/types/index.ts
+function isBlockingDependencyStatus(status) {
+  return status !== "completed" && status !== "cancelled";
+}
+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",
+    "in_progress",
+    "completed",
+    "failed",
+    "cancelled"
+  ];
+  TASK_PRIORITIES = [
+    "low",
+    "medium",
+    "high",
+    "critical"
+  ];
+  PLAN_STATUSES = ["active", "completed", "archived"];
+  VersionConflictError = class VersionConflictError extends Error {
+    taskId;
+    expectedVersion;
+    actualVersion;
+    static code = "VERSION_CONFLICT";
+    static suggestion = "Fetch the task with get_task to get the current version before updating.";
+    constructor(taskId, expectedVersion, actualVersion) {
+      super(`Version conflict for task ${taskId}: expected ${expectedVersion}, got ${actualVersion}`);
+      this.taskId = taskId;
+      this.expectedVersion = expectedVersion;
+      this.actualVersion = actualVersion;
+      this.name = "VersionConflictError";
+    }
+  };
+  TaskNotFoundError = class TaskNotFoundError extends Error {
+    taskId;
+    static code = "TASK_NOT_FOUND";
+    static suggestion = "Verify the task ID. Use list_tasks or search_tasks to find the correct ID.";
+    constructor(taskId) {
+      super(`Task not found: ${taskId}`);
+      this.taskId = taskId;
+      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";
+    static suggestion = "Use list_projects to see available projects.";
+    constructor(projectId) {
+      super(`Project not found: ${projectId}`);
+      this.projectId = projectId;
+      this.name = "ProjectNotFoundError";
+    }
+  };
+  ResourceConflictError = class ResourceConflictError extends Error {
+    code;
+    constructor(code, message) {
+      super(message);
+      this.code = code;
+      this.name = "ResourceConflictError";
+    }
+  };
+  PlanNotFoundError = class PlanNotFoundError extends Error {
+    planId;
+    static code = "PLAN_NOT_FOUND";
+    static suggestion = "Use list_plans to see available plans.";
+    constructor(planId) {
+      super(`Plan not found: ${planId}`);
+      this.planId = planId;
+      this.name = "PlanNotFoundError";
+    }
+  };
+  LockError = class LockError extends Error {
+    taskId;
+    lockedBy;
+    static code = "LOCK_ERROR";
+    static suggestion = "Wait for the lock to expire (30 min) or contact the lock holder.";
+    constructor(taskId, lockedBy) {
+      super(`Task ${taskId} is locked by ${lockedBy}`);
+      this.taskId = taskId;
+      this.lockedBy = lockedBy;
+      this.name = "LockError";
+    }
+  };
+  AgentNotFoundError = class AgentNotFoundError extends Error {
+    agentId;
+    static code = "AGENT_NOT_FOUND";
+    static suggestion = "Use register_agent to create the agent first, or list_agents to find existing ones.";
+    constructor(agentId) {
+      super(`Agent not found: ${agentId}`);
+      this.agentId = agentId;
+      this.name = "AgentNotFoundError";
+    }
+  };
+  IdentityAliasAmbiguousError = class IdentityAliasAmbiguousError extends Error {
+    code = "IDENTITY_ALIAS_AMBIGUOUS";
+    candidates;
+    constructor(subject, candidates = []) {
+      super(`Identity alias or source is ambiguous: ${subject}`);
+      this.name = "IdentityAliasAmbiguousError";
+      this.candidates = [...new Set(candidates)].sort();
+    }
+  };
+  IdentityIdImmutableError = class IdentityIdImmutableError extends Error {
+    code = "IDENTITY_ID_IMMUTABLE";
+    constructor(agentId) {
+      super(`IDENTITY_ID_IMMUTABLE: canonical identity for agent ${agentId} cannot be replaced`);
+      this.name = "IdentityIdImmutableError";
+    }
+  };
+  TaskListNotFoundError = class TaskListNotFoundError extends Error {
+    taskListId;
+    static code = "TASK_LIST_NOT_FOUND";
+    static suggestion = "Use list_task_lists to see available lists.";
+    constructor(taskListId) {
+      super(`Task list not found: ${taskListId}`);
+      this.taskListId = taskListId;
+      this.name = "TaskListNotFoundError";
+    }
+  };
+  DependencyCycleError = class DependencyCycleError extends Error {
+    taskId;
+    dependsOn;
+    static code = "DEPENDENCY_CYCLE";
+    static suggestion = "Check the dependency chain with get_task to avoid circular references.";
+    constructor(taskId, dependsOn) {
+      super(`Adding dependency ${taskId} -> ${dependsOn} would create a cycle`);
+      this.taskId = taskId;
+      this.dependsOn = dependsOn;
+      this.name = "DependencyCycleError";
+    }
+  };
+  CompletionGuardError = class CompletionGuardError extends Error {
+    reason;
+    retryAfterSeconds;
+    static code = "COMPLETION_BLOCKED";
+    static suggestion = "Wait for the cooldown period, then retry.";
+    constructor(reason, retryAfterSeconds) {
+      super(reason);
+      this.reason = reason;
+      this.retryAfterSeconds = retryAfterSeconds;
+      this.name = "CompletionGuardError";
+    }
+  };
+  DISPATCH_STATUSES = ["pending", "sent", "failed", "cancelled"];
+  DispatchNotFoundError = class DispatchNotFoundError extends Error {
+    dispatchId;
+    static code = "DISPATCH_NOT_FOUND";
+    static suggestion = "Check the dispatch ID with list_dispatches.";
+    constructor(dispatchId) {
+      super(`Dispatch not found: ${dispatchId}`);
+      this.dispatchId = dispatchId;
+      this.name = "DispatchNotFoundError";
+    }
+  };
 });
 
 // src/db/migrations.ts
@@ -3630,163 +3826,6 @@ var init_machines = __esm(() => {
   ];
 });
 
-// src/types/index.ts
-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 init_types = __esm(() => {
-  TASK_STATUSES = [
-    "pending",
-    "in_progress",
-    "completed",
-    "failed",
-    "cancelled"
-  ];
-  TASK_PRIORITIES = [
-    "low",
-    "medium",
-    "high",
-    "critical"
-  ];
-  PLAN_STATUSES = ["active", "completed", "archived"];
-  VersionConflictError = class VersionConflictError extends Error {
-    taskId;
-    expectedVersion;
-    actualVersion;
-    static code = "VERSION_CONFLICT";
-    static suggestion = "Fetch the task with get_task to get the current version before updating.";
-    constructor(taskId, expectedVersion, actualVersion) {
-      super(`Version conflict for task ${taskId}: expected ${expectedVersion}, got ${actualVersion}`);
-      this.taskId = taskId;
-      this.expectedVersion = expectedVersion;
-      this.actualVersion = actualVersion;
-      this.name = "VersionConflictError";
-    }
-  };
-  TaskNotFoundError = class TaskNotFoundError extends Error {
-    taskId;
-    static code = "TASK_NOT_FOUND";
-    static suggestion = "Verify the task ID. Use list_tasks or search_tasks to find the correct ID.";
-    constructor(taskId) {
-      super(`Task not found: ${taskId}`);
-      this.taskId = taskId;
-      this.name = "TaskNotFoundError";
-    }
-  };
-  ProjectNotFoundError = class ProjectNotFoundError extends Error {
-    projectId;
-    static code = "PROJECT_NOT_FOUND";
-    static suggestion = "Use list_projects to see available projects.";
-    constructor(projectId) {
-      super(`Project not found: ${projectId}`);
-      this.projectId = projectId;
-      this.name = "ProjectNotFoundError";
-    }
-  };
-  ResourceConflictError = class ResourceConflictError extends Error {
-    code;
-    constructor(code, message) {
-      super(message);
-      this.code = code;
-      this.name = "ResourceConflictError";
-    }
-  };
-  PlanNotFoundError = class PlanNotFoundError extends Error {
-    planId;
-    static code = "PLAN_NOT_FOUND";
-    static suggestion = "Use list_plans to see available plans.";
-    constructor(planId) {
-      super(`Plan not found: ${planId}`);
-      this.planId = planId;
-      this.name = "PlanNotFoundError";
-    }
-  };
-  LockError = class LockError extends Error {
-    taskId;
-    lockedBy;
-    static code = "LOCK_ERROR";
-    static suggestion = "Wait for the lock to expire (30 min) or contact the lock holder.";
-    constructor(taskId, lockedBy) {
-      super(`Task ${taskId} is locked by ${lockedBy}`);
-      this.taskId = taskId;
-      this.lockedBy = lockedBy;
-      this.name = "LockError";
-    }
-  };
-  AgentNotFoundError = class AgentNotFoundError extends Error {
-    agentId;
-    static code = "AGENT_NOT_FOUND";
-    static suggestion = "Use register_agent to create the agent first, or list_agents to find existing ones.";
-    constructor(agentId) {
-      super(`Agent not found: ${agentId}`);
-      this.agentId = agentId;
-      this.name = "AgentNotFoundError";
-    }
-  };
-  IdentityAliasAmbiguousError = class IdentityAliasAmbiguousError extends Error {
-    code = "IDENTITY_ALIAS_AMBIGUOUS";
-    candidates;
-    constructor(subject, candidates = []) {
-      super(`Identity alias or source is ambiguous: ${subject}`);
-      this.name = "IdentityAliasAmbiguousError";
-      this.candidates = [...new Set(candidates)].sort();
-    }
-  };
-  IdentityIdImmutableError = class IdentityIdImmutableError extends Error {
-    code = "IDENTITY_ID_IMMUTABLE";
-    constructor(agentId) {
-      super(`IDENTITY_ID_IMMUTABLE: canonical identity for agent ${agentId} cannot be replaced`);
-      this.name = "IdentityIdImmutableError";
-    }
-  };
-  TaskListNotFoundError = class TaskListNotFoundError extends Error {
-    taskListId;
-    static code = "TASK_LIST_NOT_FOUND";
-    static suggestion = "Use list_task_lists to see available lists.";
-    constructor(taskListId) {
-      super(`Task list not found: ${taskListId}`);
-      this.taskListId = taskListId;
-      this.name = "TaskListNotFoundError";
-    }
-  };
-  DependencyCycleError = class DependencyCycleError extends Error {
-    taskId;
-    dependsOn;
-    static code = "DEPENDENCY_CYCLE";
-    static suggestion = "Check the dependency chain with get_task to avoid circular references.";
-    constructor(taskId, dependsOn) {
-      super(`Adding dependency ${taskId} -> ${dependsOn} would create a cycle`);
-      this.taskId = taskId;
-      this.dependsOn = dependsOn;
-      this.name = "DependencyCycleError";
-    }
-  };
-  CompletionGuardError = class CompletionGuardError extends Error {
-    reason;
-    retryAfterSeconds;
-    static code = "COMPLETION_BLOCKED";
-    static suggestion = "Wait for the cooldown period, then retry.";
-    constructor(reason, retryAfterSeconds) {
-      super(reason);
-      this.reason = reason;
-      this.retryAfterSeconds = retryAfterSeconds;
-      this.name = "CompletionGuardError";
-    }
-  };
-  DISPATCH_STATUSES = ["pending", "sent", "failed", "cancelled"];
-  DispatchNotFoundError = class DispatchNotFoundError extends Error {
-    dispatchId;
-    static code = "DISPATCH_NOT_FOUND";
-    static suggestion = "Check the dispatch ID with list_dispatches.";
-    constructor(dispatchId) {
-      super(`Dispatch not found: ${dispatchId}`);
-      this.dispatchId = dispatchId;
-      this.name = "DispatchNotFoundError";
-    }
-  };
-});
-
 // src/db/identity-mapping.ts
 function timestamp() {
   return new Date().toISOString();
@@ -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);
@@ -11834,6 +11901,9 @@ var init_tasks = __esm(() => {
 // src/storage/index.ts
 init_config();
 
+// src/storage/local-sqlite.ts
+init_types();
+
 // src/lib/search.ts
 init_database();
 function rowToTask(row) {
@@ -11999,6 +12069,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;
@@ -12143,9 +12218,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));
 }
@@ -12650,6 +12722,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, count) {
+  const [one, many] = ENTITY_LABEL[entity];
+  return count === 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, source) {
+  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,
+    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((source) => source !== "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 count = entry?.["count"];
+    const verified = entry?.["verified"];
+    if (!entry || verified === false || typeof count !== "number" || !Number.isFinite(count)) {
+      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,
+      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, field) {
+  const raw = row[field];
+  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 count = 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;
+    count++;
+    if (spec.entity === "task") {
+      const status = row.status;
+      if (typeof status === "string" && OPEN_TASK_STATUSES.includes(status))
+        open++;
+    }
+  }
+  return { count, open_count: spec.entity === "task" ? open : null };
+}
+
+// src/db/integrity.ts
+var REQUIRED_TABLES = { 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_TABLES).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();
@@ -13041,15 +13374,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);
@@ -13198,6 +13531,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();
@@ -13206,6 +13542,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";
@@ -13595,54 +13935,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);
@@ -13713,7 +14006,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),
@@ -13770,6 +14063,9 @@ function createPostgresTodosStorageAdapter(options) {
       exportSnapshot: () => exportSnapshot(store),
       importSnapshot: (snapshot, context) => importSnapshot(snapshot, store, context)
     },
+    integrity: {
+      report: () => store.integrityReport()
+    },
     transaction: (fn) => fn(adapter)
   };
   return adapter;
@@ -13876,8 +14172,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)}`);
     }
@@ -13938,7 +14235,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((task) => ({ task_id: task.id, project_id: task.project_id })));
       }
       if (prefixResult.rows.length === 1) {
         return payloadRecord2(prefixResult.rows[0].payload);
@@ -13949,7 +14247,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((task) => ({ task_id: task.id, project_id: task.project_id })));
     }
     if (shortIdResult.rows.length === 1) {
       return payloadRecord2(shortIdResult.rows[0].payload);
@@ -13963,6 +14262,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
@@ -14438,7 +14755,7 @@ async function startTask2(id, agentId, store) {
   if (task.status !== "pending" && task.status !== "in_progress") {
     throw new Error(`Task is ${task.status} and cannot be started by ${agentId}`);
   }
-  return patchTask(task, {
+  const started = await patchTask(task, {
     status: "in_progress",
     assigned_to: task.assigned_to ?? agentId,
     agent_id: task.agent_id ?? agentId,
@@ -14446,6 +14763,8 @@ async function startTask2(id, agentId, store) {
     locked_at: new Date().toISOString(),
     started_at: task.started_at ?? new Date().toISOString()
   }, store);
+  await logTaskChange2(task.id, "start", "status", task.status, "in_progress", agentId, store);
+  return started;
 }
 async function completeTask2(id, agentId, options, store) {
   const task = await store.completeTask(id, agentId, options);
@@ -14751,15 +15070,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 timestamp2 = 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,
@@ -14797,7 +15128,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);
@@ -15554,17 +15885,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) {
@@ -15578,7 +15909,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) {
@@ -15586,25 +15917,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
@@ -15931,6 +16249,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";
@@ -16465,11 +16827,13 @@ export {
   postgresTodosCommentCursorIndexSql,
   planRunArtifactsS3Sync,
   parseStorageMode,
+  parseStorageBackend,
   maybeInstallShadowCapture2 as maybeInstallShadowCapture,
   loadTodosStorageConfig,
   loadStorageConfig,
   isTodosShadowEnabled,
   isTodosRemoteStorageEnabled,
+  isTodosPostgresBackend,
   isCommentRedactionBackfillComplete,
   installShadowOutboxSchema,
   importSqliteTodosStorageSnapshot,
@@ -16478,6 +16842,7 @@ export {
   getTodosStorageEnvName,
   getTodosStorageDatabaseUrl,
   getTodosStorageDatabaseEnv,
+  getTodosStorageBackend,
   getStorageMode,
   getStorageDatabaseUrl,
   getStorageDatabaseEnv,