@hasna/todos 0.11.21 → 0.11.22

package/dist/index.js

@@ -1081,6 +1081,12 @@ var init_schema = __esm(() => {
   ALTER TABLE tasks ADD COLUMN archived_at TEXT;
   CREATE INDEX IF NOT EXISTS idx_tasks_archived ON tasks(archived_at) WHERE archived_at IS NOT NULL;
   INSERT OR IGNORE INTO _migrations (id) VALUES (43);
+  `,
+    `
+  DROP INDEX IF EXISTS idx_tasks_short_id;
+  CREATE UNIQUE INDEX IF NOT EXISTS idx_tasks_short_id ON tasks(short_id, machine_id) WHERE short_id IS NOT NULL AND machine_id IS NOT NULL;
+  CREATE INDEX IF NOT EXISTS idx_tasks_short_id_lookup ON tasks(short_id) WHERE short_id IS NOT NULL;
+  INSERT OR IGNORE INTO _migrations (id) VALUES (44);
   `
   ];
 });
@@ -1779,6 +1785,128 @@ init_database();
 init_types();
 init_database();
 
+// src/lib/completion-guard.ts
+init_types();
+
+// src/lib/config.ts
+import { existsSync as existsSync3 } from "fs";
+import { join as join3 } from "path";
+
+// src/lib/sync-utils.ts
+import { existsSync as existsSync2, mkdirSync as mkdirSync2, readFileSync, readdirSync, statSync, writeFileSync } from "fs";
+import { join as join2 } from "path";
+var HOME = process.env["HOME"] || process.env["USERPROFILE"] || "~";
+function ensureDir2(dir) {
+  if (!existsSync2(dir))
+    mkdirSync2(dir, { recursive: true });
+}
+function listJsonFiles(dir) {
+  if (!existsSync2(dir))
+    return [];
+  return readdirSync(dir).filter((f) => f.endsWith(".json"));
+}
+function readJsonFile(path) {
+  try {
+    return JSON.parse(readFileSync(path, "utf-8"));
+  } catch {
+    return null;
+  }
+}
+function writeJsonFile(path, data) {
+  writeFileSync(path, JSON.stringify(data, null, 2) + `
+`);
+}
+function readHighWaterMark(dir) {
+  const path = join2(dir, ".highwatermark");
+  if (!existsSync2(path))
+    return 1;
+  const val = parseInt(readFileSync(path, "utf-8").trim(), 10);
+  return isNaN(val) ? 1 : val;
+}
+function writeHighWaterMark(dir, value) {
+  writeFileSync(join2(dir, ".highwatermark"), String(value));
+}
+function getFileMtimeMs(path) {
+  try {
+    return statSync(path).mtimeMs;
+  } catch {
+    return null;
+  }
+}
+function parseTimestamp(value) {
+  if (typeof value !== "string")
+    return null;
+  const parsed = Date.parse(value);
+  return Number.isNaN(parsed) ? null : parsed;
+}
+function appendSyncConflict(metadata, conflict, limit = 5) {
+  const current = Array.isArray(metadata["sync_conflicts"]) ? metadata["sync_conflicts"] : [];
+  const next = [conflict, ...current].slice(0, limit);
+  return { ...metadata, sync_conflicts: next };
+}
+
+// src/lib/config.ts
+function getTodosGlobalDir() {
+  const home = process.env["HOME"] || HOME;
+  const newDir = join3(home, ".hasna", "todos");
+  const legacyDir = join3(home, ".todos");
+  if (!existsSync3(newDir) && existsSync3(legacyDir))
+    return legacyDir;
+  return newDir;
+}
+function getConfigPath() {
+  return join3(getTodosGlobalDir(), "config.json");
+}
+var cached = null;
+function normalizeAgent(agent) {
+  return agent.trim().toLowerCase();
+}
+function loadConfig() {
+  if (cached)
+    return cached;
+  if (!existsSync3(getConfigPath())) {
+    cached = {};
+    return cached;
+  }
+  const config = readJsonFile(getConfigPath()) || {};
+  if (typeof config.sync_agents === "string") {
+    config.sync_agents = config.sync_agents.split(",").map((a) => a.trim()).filter(Boolean);
+  }
+  cached = config;
+  return cached;
+}
+function getSyncAgentsFromConfig() {
+  const config = loadConfig();
+  const agents = config.sync_agents;
+  if (Array.isArray(agents) && agents.length > 0)
+    return agents.map(normalizeAgent);
+  return null;
+}
+function getAgentTasksDir(agent) {
+  const config = loadConfig();
+  const key = normalizeAgent(agent);
+  return config.agents?.[key]?.tasks_dir || config.agent_tasks_dir || null;
+}
+function getTaskPrefixConfig() {
+  const config = loadConfig();
+  return config.task_prefix || null;
+}
+var GUARD_DEFAULTS = {
+  enabled: false,
+  min_work_seconds: 30,
+  max_completions_per_window: 5,
+  window_minutes: 10,
+  cooldown_seconds: 60
+};
+function getCompletionGuardConfig(projectPath) {
+  const config = loadConfig();
+  const global2 = { ...GUARD_DEFAULTS, ...config.completion_guard };
+  if (projectPath && config.project_overrides?.[projectPath]?.completion_guard) {
+    return { ...global2, ...config.project_overrides[projectPath].completion_guard };
+  }
+  return global2;
+}
+
 // src/db/projects.ts
 init_types();
 init_database();
@@ -1942,13 +2070,6 @@ function nextTaskShortId(projectId, db) {
   const project = getProject(projectId, d);
   if (!project || !project.task_prefix)
     return null;
-  const prefix = project.task_prefix;
-  const prefixLen = prefix.length + 2;
-  const maxRow = d.query(`SELECT MAX(CAST(SUBSTR(short_id, ?) AS INTEGER)) as max_counter FROM tasks WHERE short_id LIKE ?`).get(prefixLen, `${prefix}-%`);
-  const syncedMax = maxRow?.max_counter ?? 0;
-  if (syncedMax >= (project.task_counter ?? 0)) {
-    d.run("UPDATE projects SET task_counter = ?, updated_at = ? WHERE id = ?", [syncedMax, now(), projectId]);
-  }
   d.run("UPDATE projects SET task_counter = task_counter + 1, updated_at = ? WHERE id = ?", [now(), projectId]);
   const updated = getProject(projectId, d);
   const padded = String(updated.task_counter).padStart(5, "0");
@@ -2007,128 +2128,6 @@ function removeMachineLocalPath(projectId, machineId, db) {
   return result.changes > 0;
 }
 
-// src/lib/completion-guard.ts
-init_types();
-
-// src/lib/config.ts
-import { existsSync as existsSync3 } from "fs";
-import { join as join3 } from "path";
-
-// src/lib/sync-utils.ts
-import { existsSync as existsSync2, mkdirSync as mkdirSync2, readFileSync, readdirSync, statSync, writeFileSync } from "fs";
-import { join as join2 } from "path";
-var HOME = process.env["HOME"] || process.env["USERPROFILE"] || "~";
-function ensureDir2(dir) {
-  if (!existsSync2(dir))
-    mkdirSync2(dir, { recursive: true });
-}
-function listJsonFiles(dir) {
-  if (!existsSync2(dir))
-    return [];
-  return readdirSync(dir).filter((f) => f.endsWith(".json"));
-}
-function readJsonFile(path) {
-  try {
-    return JSON.parse(readFileSync(path, "utf-8"));
-  } catch {
-    return null;
-  }
-}
-function writeJsonFile(path, data) {
-  writeFileSync(path, JSON.stringify(data, null, 2) + `
-`);
-}
-function readHighWaterMark(dir) {
-  const path = join2(dir, ".highwatermark");
-  if (!existsSync2(path))
-    return 1;
-  const val = parseInt(readFileSync(path, "utf-8").trim(), 10);
-  return isNaN(val) ? 1 : val;
-}
-function writeHighWaterMark(dir, value) {
-  writeFileSync(join2(dir, ".highwatermark"), String(value));
-}
-function getFileMtimeMs(path) {
-  try {
-    return statSync(path).mtimeMs;
-  } catch {
-    return null;
-  }
-}
-function parseTimestamp(value) {
-  if (typeof value !== "string")
-    return null;
-  const parsed = Date.parse(value);
-  return Number.isNaN(parsed) ? null : parsed;
-}
-function appendSyncConflict(metadata, conflict, limit = 5) {
-  const current = Array.isArray(metadata["sync_conflicts"]) ? metadata["sync_conflicts"] : [];
-  const next = [conflict, ...current].slice(0, limit);
-  return { ...metadata, sync_conflicts: next };
-}
-
-// src/lib/config.ts
-function getTodosGlobalDir() {
-  const home = process.env["HOME"] || HOME;
-  const newDir = join3(home, ".hasna", "todos");
-  const legacyDir = join3(home, ".todos");
-  if (!existsSync3(newDir) && existsSync3(legacyDir))
-    return legacyDir;
-  return newDir;
-}
-function getConfigPath() {
-  return join3(getTodosGlobalDir(), "config.json");
-}
-var cached = null;
-function normalizeAgent(agent) {
-  return agent.trim().toLowerCase();
-}
-function loadConfig() {
-  if (cached)
-    return cached;
-  if (!existsSync3(getConfigPath())) {
-    cached = {};
-    return cached;
-  }
-  const config = readJsonFile(getConfigPath()) || {};
-  if (typeof config.sync_agents === "string") {
-    config.sync_agents = config.sync_agents.split(",").map((a) => a.trim()).filter(Boolean);
-  }
-  cached = config;
-  return cached;
-}
-function getSyncAgentsFromConfig() {
-  const config = loadConfig();
-  const agents = config.sync_agents;
-  if (Array.isArray(agents) && agents.length > 0)
-    return agents.map(normalizeAgent);
-  return null;
-}
-function getAgentTasksDir(agent) {
-  const config = loadConfig();
-  const key = normalizeAgent(agent);
-  return config.agents?.[key]?.tasks_dir || config.agent_tasks_dir || null;
-}
-function getTaskPrefixConfig() {
-  const config = loadConfig();
-  return config.task_prefix || null;
-}
-var GUARD_DEFAULTS = {
-  enabled: false,
-  min_work_seconds: 30,
-  max_completions_per_window: 5,
-  window_minutes: 10,
-  cooldown_seconds: 60
-};
-function getCompletionGuardConfig(projectPath) {
-  const config = loadConfig();
-  const global2 = { ...GUARD_DEFAULTS, ...config.completion_guard };
-  if (projectPath && config.project_overrides?.[projectPath]?.completion_guard) {
-    return { ...global2, ...config.project_overrides[projectPath].completion_guard };
-  }
-  return global2;
-}
-
 // src/lib/completion-guard.ts
 function checkCompletionGuard(task, agentId, db, configOverride) {
   let config;
@@ -2931,47 +2930,56 @@ function replaceTaskTags(taskId, tags, db) {
 }
 function createTask(input, db) {
   const d = db || getDatabase();
-  const id = uuid();
   const timestamp = now();
   const tags = input.tags || [];
-  const shortId = input.project_id ? nextTaskShortId(input.project_id, d) : null;
-  const title = shortId ? `${shortId}: ${input.title}` : input.title;
   const assignedBy = input.assigned_by || input.agent_id;
   const assignedFromProject = input.assigned_from_project || null;
-  d.run(`INSERT INTO tasks (id, short_id, project_id, parent_id, plan_id, task_list_id, title, description, status, priority, agent_id, assigned_to, session_id, working_dir, tags, metadata, version, created_at, updated_at, due_at, estimated_minutes, requires_approval, approved_by, approved_at, recurrence_rule, recurrence_parent_id, spawns_template_id, reason, spawned_from_session, assigned_by, assigned_from_project, task_type)
-     VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, 1, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)`, [
-    id,
-    shortId,
-    input.project_id || null,
-    input.parent_id || null,
-    input.plan_id || null,
-    input.task_list_id || null,
-    title,
-    input.description || null,
-    input.status || "pending",
-    input.priority || "medium",
-    input.agent_id || null,
-    input.assigned_to || null,
-    input.session_id || null,
-    input.working_dir || null,
-    JSON.stringify(tags),
-    JSON.stringify(input.metadata || {}),
-    timestamp,
-    timestamp,
-    input.due_at || null,
-    input.estimated_minutes || null,
-    input.requires_approval ? 1 : 0,
-    null,
-    null,
-    input.recurrence_rule || null,
-    input.recurrence_parent_id || null,
-    input.spawns_template_id || null,
-    input.reason || null,
-    input.spawned_from_session || null,
-    assignedBy || null,
-    assignedFromProject || null,
-    input.task_type || null
-  ]);
+  let id = uuid();
+  for (let attempt = 0;attempt < 3; attempt++) {
+    try {
+      d.run(`INSERT INTO tasks (id, short_id, project_id, parent_id, plan_id, task_list_id, title, description, status, priority, agent_id, assigned_to, session_id, working_dir, tags, metadata, version, created_at, updated_at, due_at, estimated_minutes, requires_approval, approved_by, approved_at, recurrence_rule, recurrence_parent_id, spawns_template_id, reason, spawned_from_session, assigned_by, assigned_from_project, task_type)
+         VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, 1, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)`, [
+        id,
+        null,
+        input.project_id || null,
+        input.parent_id || null,
+        input.plan_id || null,
+        input.task_list_id || null,
+        input.title,
+        input.description || null,
+        input.status || "pending",
+        input.priority || "medium",
+        input.agent_id || null,
+        input.assigned_to || null,
+        input.session_id || null,
+        input.working_dir || null,
+        JSON.stringify(tags),
+        JSON.stringify(input.metadata || {}),
+        timestamp,
+        timestamp,
+        input.due_at || null,
+        input.estimated_minutes || null,
+        input.requires_approval ? 1 : 0,
+        null,
+        null,
+        input.recurrence_rule || null,
+        input.recurrence_parent_id || null,
+        input.spawns_template_id || null,
+        input.reason || null,
+        input.spawned_from_session || null,
+        assignedBy || null,
+        assignedFromProject || null,
+        input.task_type || null
+      ]);
+      break;
+    } catch (e) {
+      if (attempt < 2 && e?.message?.includes("UNIQUE constraint failed: tasks.id")) {
+        id = uuid();
+        continue;
+      }
+      throw e;
+    }
+  }
   if (tags.length > 0) {
     insertTaskTags(id, tags, d);
   }
@@ -16311,6 +16319,12 @@ var PG_MIGRATIONS = [
   CREATE INDEX IF NOT EXISTS idx_template_versions_template ON template_versions(template_id);
 
   INSERT INTO _migrations (id) VALUES (39) ON CONFLICT DO NOTHING;
+  `,
+  `
+  DROP INDEX IF EXISTS idx_tasks_short_id;
+  CREATE UNIQUE INDEX IF NOT EXISTS idx_tasks_short_id ON tasks(short_id, machine_id) WHERE short_id IS NOT NULL AND machine_id IS NOT NULL;
+  CREATE INDEX IF NOT EXISTS idx_tasks_short_id_lookup ON tasks(short_id) WHERE short_id IS NOT NULL;
+  INSERT INTO _migrations (id) VALUES (40) ON CONFLICT DO NOTHING;
   `
 ];