@dennisrongo/dsh-todo 0.2.0 → 0.3.0

package/lib/index.js

@@ -48,22 +48,181 @@ var __privateSet = (obj, member, value, setter) => (__accessCheck(obj, member, "
 var __privateMethod = (obj, member, method) => (__accessCheck(obj, member, "access private method"), method);
 
 // src/index.ts
-import { mkdirSync, readFileSync, renameSync, existsSync } from "node:fs";
-import { DatabaseSync } from "node:sqlite";
-import { isAbsolute, join, resolve } from "node:path";
+import { readFileSync, renameSync, existsSync } from "node:fs";
+import { isAbsolute, join as join2, resolve as resolve2 } from "node:path";
 import { Service } from "@deepseek-ai/cordis";
 import { Remote, TypertRemoteService } from "@deepseek-ai/dsh-typert-protocol";
 import { z } from "zod";
 
+// src/db.ts
+import { mkdirSync } from "node:fs";
+import { DatabaseSync } from "node:sqlite";
+import { join, resolve } from "node:path";
+
 // src/types.ts
+var STATUSES = ["backlog", "todo", "in-progress", "blocked", "done"];
+var DEFAULT_STATUS = "todo";
+var PRIORITIES = ["p0", "p1", "p2", "p3"];
+var DEFAULT_PRIORITY = "p2";
+function toStatus(value) {
+  return typeof value === "string" && STATUSES.includes(value) ? value : DEFAULT_STATUS;
+}
+__name(toStatus, "toStatus");
+function toPriority(value) {
+  return typeof value === "string" && PRIORITIES.includes(value) ? value : DEFAULT_PRIORITY;
+}
+__name(toPriority, "toPriority");
+function normalizeLabel(raw) {
+  if (typeof raw !== "string") return void 0;
+  const text = raw.replace(/\s+/g, " ").trim().slice(0, MAX_LABEL);
+  return text.length > 0 ? text : void 0;
+}
+__name(normalizeLabel, "normalizeLabel");
+var DATE_RE = /^\d{4}-\d{2}-\d{2}$/;
+function normalizeDueDate(raw) {
+  if (typeof raw !== "string") return void 0;
+  const text = raw.trim();
+  if (!DATE_RE.test(text)) return void 0;
+  const parsed = /* @__PURE__ */ new Date(`${text}T00:00:00Z`);
+  if (Number.isNaN(parsed.getTime())) return void 0;
+  return parsed.toISOString().slice(0, 10) === text ? text : void 0;
+}
+__name(normalizeDueDate, "normalizeDueDate");
 var MAX_TEXT = 500;
+var MAX_DESC = 5e3;
+var MAX_LABEL = 60;
 var MAX_ITEMS = 1e3;
 
+// src/db.ts
+var DOT_DSH = ".dsh";
+var DB_FILE = "todo.db";
+var BUSY_TIMEOUT_MS = 5e3;
+function openDb(dir) {
+  const resolved = resolve(dir);
+  mkdirSync(join(resolved, DOT_DSH), { recursive: true });
+  const db = new DatabaseSync(join(resolved, DOT_DSH, DB_FILE));
+  db.exec(`PRAGMA busy_timeout = ${BUSY_TIMEOUT_MS}`);
+  db.exec(`
+    CREATE TABLE IF NOT EXISTS todo (
+      id           TEXT PRIMARY KEY,
+      text         TEXT NOT NULL,
+      done         INTEGER NOT NULL DEFAULT 0,
+      created_at   INTEGER NOT NULL,
+      completed_at INTEGER,
+      archived_at  INTEGER,
+      position     INTEGER NOT NULL
+    );
+    CREATE TABLE IF NOT EXISTS meta (key TEXT PRIMARY KEY, value TEXT NOT NULL);
+  `);
+  migrateSchema(db);
+  return db;
+}
+__name(openDb, "openDb");
+function migrateSchema(db) {
+  const columns = new Set(
+    db.prepare("PRAGMA table_info(todo)").all().map((c) => String(c.name))
+  );
+  const add = /* @__PURE__ */ __name((name, ddl) => {
+    if (columns.has(name)) return false;
+    db.exec(`ALTER TABLE todo ADD COLUMN ${ddl}`);
+    columns.add(name);
+    return true;
+  }, "add");
+  const addedTitle = add("title", "title TEXT");
+  const addedStatus = add("status", "status TEXT");
+  add("description", "description TEXT");
+  add("priority", "priority TEXT");
+  add("release", "release TEXT");
+  add("sprint", "sprint TEXT");
+  add("due_date", "due_date TEXT");
+  if (addedTitle && columns.has("text")) {
+    db.exec("UPDATE todo SET title = text WHERE title IS NULL");
+  }
+  if (addedStatus && columns.has("done")) {
+    db.exec("UPDATE todo SET status = CASE WHEN done = 1 THEN 'done' ELSE 'todo' END WHERE status IS NULL");
+  }
+  db.exec("UPDATE todo SET status = 'todo' WHERE status IS NULL OR status = ''");
+  db.exec("UPDATE todo SET priority = 'p2' WHERE priority IS NULL OR priority = ''");
+  db.exec("UPDATE todo SET title = '' WHERE title IS NULL");
+}
+__name(migrateSchema, "migrateSchema");
+function readList(db) {
+  const revision = Number(db.prepare("SELECT value FROM meta WHERE key = 'revision'").get()?.value ?? 0);
+  const updatedAt = Number(db.prepare("SELECT value FROM meta WHERE key = 'updatedAt'").get()?.value ?? 0);
+  const rows = db.prepare(
+    `SELECT id, title, description, status, priority, release, sprint, due_date,
+              created_at, completed_at, archived_at
+       FROM todo ORDER BY position ASC`
+  ).all();
+  const text = /* @__PURE__ */ __name((v) => v === null || v === void 0 ? void 0 : String(v), "text");
+  const items = [];
+  for (const row of rows) {
+    items.push({
+      id: String(row.id),
+      title: String(row.title ?? ""),
+      status: toStatus(row.status),
+      priority: toPriority(row.priority),
+      ...text(row.description) !== void 0 ? { description: text(row.description) } : {},
+      ...normalizeLabel(row.release) !== void 0 ? { release: normalizeLabel(row.release) } : {},
+      ...normalizeLabel(row.sprint) !== void 0 ? { sprint: normalizeLabel(row.sprint) } : {},
+      ...normalizeDueDate(row.due_date) !== void 0 ? { dueDate: normalizeDueDate(row.due_date) } : {},
+      createdAt: Number(row.created_at),
+      ...row.completed_at !== null && row.completed_at !== void 0 ? { completedAt: Number(row.completed_at) } : {},
+      ...row.archived_at !== null && row.archived_at !== void 0 ? { archivedAt: Number(row.archived_at) } : {}
+    });
+  }
+  return { items, revision, updatedAt };
+}
+__name(readList, "readList");
+function writeList(db, items, revision, updatedAt = Date.now()) {
+  db.exec("BEGIN IMMEDIATE");
+  try {
+    db.prepare("DELETE FROM todo").run();
+    const insert = db.prepare(
+      `INSERT INTO todo (id, title, description, status, priority, release, sprint, due_date,
+                         text, done, created_at, completed_at, archived_at, position)
+       VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)`
+    );
+    items.forEach((item, index) => {
+      insert.run(
+        item.id,
+        item.title,
+        item.description ?? null,
+        item.status,
+        item.priority,
+        item.release ?? null,
+        item.sprint ?? null,
+        item.dueDate ?? null,
+        item.title,
+        item.status === "done" ? 1 : 0,
+        item.createdAt,
+        item.completedAt ?? null,
+        item.archivedAt ?? null,
+        index
+      );
+    });
+    db.prepare(`INSERT INTO meta (key, value) VALUES ('revision', ?)
+                ON CONFLICT(key) DO UPDATE SET value = excluded.value`).run(String(revision));
+    db.prepare(`INSERT INTO meta (key, value) VALUES ('updatedAt', ?)
+                ON CONFLICT(key) DO UPDATE SET value = excluded.value`).run(String(updatedAt));
+    db.exec("COMMIT");
+  } catch (err) {
+    db.exec("ROLLBACK");
+    throw err;
+  }
+}
+__name(writeList, "writeList");
+
 // src/index.ts
 var todoItemSchema = z.object({
   id: z.string().min(1),
-  text: z.string().max(MAX_TEXT),
-  done: z.boolean(),
+  title: z.string().max(MAX_TEXT),
+  description: z.string().max(MAX_DESC).optional(),
+  status: z.enum(["backlog", "todo", "in-progress", "blocked", "done"]),
+  priority: z.enum(["p0", "p1", "p2", "p3"]),
+  release: z.string().max(MAX_LABEL).optional(),
+  sprint: z.string().max(MAX_LABEL).optional(),
+  dueDate: z.string().optional(),
   createdAt: z.number(),
   completedAt: z.number().optional(),
   archivedAt: z.number().optional()
@@ -77,8 +236,6 @@ var todoDomainSpec = {
   name: "dsh_todo",
   version: 2
 };
-var DOT_DSH = ".dsh";
-var DB_FILE = "todo.db";
 var _replace_dec, _list_dec, _a, _init, _b;
 var _TodoService = class _TodoService extends (_b = TypertRemoteService) {
   /**
@@ -110,8 +267,8 @@ var _TodoService = class _TodoService extends (_b = TypertRemoteService) {
     this.ctx.effect(() => () => this.close(), "dsh-todo: close workspace databases");
     const home = process.env.DSH_HOME;
     if (!home) return;
-    const legacyPath = join(home, "storages", "dsh_todo.json");
-    const registryPath = join(home, "storages", "workspace.json");
+    const legacyPath = join2(home, "storages", "dsh_todo.json");
+    const registryPath = join2(home, "storages", "workspace.json");
     try {
       if (!existsSync(legacyPath)) return;
       const legacy = JSON.parse(readFileSync(legacyPath, "utf8"));
@@ -160,7 +317,7 @@ var _TodoService = class _TodoService extends (_b = TypertRemoteService) {
     const registry = this.ctx.workspaceRegistry;
     const workspace = registry.list().find((w) => String(w.id) === workspaceId);
     if (workspace === void 0) throw new Error(`dsh-todo: unknown workspace ${workspaceId}`);
-    const dir = resolve(workspace.path);
+    const dir = resolve2(workspace.path);
     this.dirs.set(workspaceId, dir);
     return dir;
   }
@@ -171,23 +328,10 @@ var _TodoService = class _TodoService extends (_b = TypertRemoteService) {
    * cloned since.
    */
   openDb(dir) {
-    const resolved = resolve(dir);
+    const resolved = resolve2(dir);
     const cached = this.dbs.get(resolved);
     if (cached) return cached;
-    mkdirSync(join(resolved, DOT_DSH), { recursive: true });
-    const db = new DatabaseSync(join(resolved, DOT_DSH, DB_FILE));
-    db.exec(`
-      CREATE TABLE IF NOT EXISTS todo (
-        id           TEXT PRIMARY KEY,
-        text         TEXT NOT NULL,
-        done         INTEGER NOT NULL DEFAULT 0,
-        created_at   INTEGER NOT NULL,
-        completed_at INTEGER,
-        archived_at  INTEGER,
-        position     INTEGER NOT NULL
-      );
-      CREATE TABLE IF NOT EXISTS meta (key TEXT PRIMARY KEY, value TEXT NOT NULL);
-    `);
+    const db = openDb(resolved);
     this.dbs.set(resolved, db);
     return db;
   }
@@ -249,61 +393,22 @@ var _TodoService = class _TodoService extends (_b = TypertRemoteService) {
     }
     this.dbs.clear();
   }
-  /** Read the whole list from the database, ordered by `position`. */
+  /**
+   * Read the whole list, then re-validate it at this service's own boundary.
+   *
+   * `db.readList` already coerces rows, but the host keeps the zod check: it is
+   * the durable read boundary for the WIRE, and a shape the schema rejects must
+   * not reach the browser even if the storage layer was willing to build it.
+   */
   readList(db) {
-    const revision = Number(db.prepare(`SELECT value FROM meta WHERE key = 'revision'`).get()?.value ?? 0);
-    const updatedAt = Number(db.prepare(`SELECT value FROM meta WHERE key = 'updatedAt'`).get()?.value ?? 0);
-    const rows = db.prepare(
-      `SELECT id, text, done, created_at, completed_at, archived_at
-         FROM todo ORDER BY position ASC`
-    ).all();
-    const items = [];
-    for (const row of rows) {
-      const candidate = {
-        id: String(row.id),
-        text: String(row.text),
-        done: Number(row.done) === 1,
-        createdAt: Number(row.created_at),
-        ...row.completed_at !== null && row.completed_at !== void 0 ? { completedAt: Number(row.completed_at) } : {},
-        ...row.archived_at !== null && row.archived_at !== void 0 ? { archivedAt: Number(row.archived_at) } : {}
-      };
-      const parsed = todoItemSchema.safeParse(candidate);
-      if (parsed.success) items.push(parsed.data);
-    }
-    const list = { items, revision, updatedAt };
-    const check = todoListSchema.safeParse(list);
-    return check.success ? list : { items: [], revision, updatedAt };
+    const list = readList(db);
+    const items = list.items.filter((item) => todoItemSchema.safeParse(item).success);
+    const checked = { items, revision: list.revision, updatedAt: list.updatedAt };
+    return todoListSchema.safeParse(checked).success ? checked : { items: [], revision: list.revision, updatedAt: list.updatedAt };
   }
   /** Replace every row inside one transaction and stamp the meta tokens. */
   writeList(db, items, revision, updatedAt = Date.now()) {
-    const now = updatedAt;
-    db.exec("BEGIN");
-    try {
-      db.prepare("DELETE FROM todo").run();
-      const insert = db.prepare(
-        `INSERT INTO todo (id, text, done, created_at, completed_at, archived_at, position)
-         VALUES (?, ?, ?, ?, ?, ?, ?)`
-      );
-      items.forEach((item, index) => {
-        insert.run(
-          item.id,
-          item.text,
-          item.done ? 1 : 0,
-          item.createdAt,
-          item.completedAt ?? null,
-          item.archivedAt ?? null,
-          index
-        );
-      });
-      db.prepare(`INSERT INTO meta (key, value) VALUES ('revision', ?)
-                  ON CONFLICT(key) DO UPDATE SET value = excluded.value`).run(String(revision));
-      db.prepare(`INSERT INTO meta (key, value) VALUES ('updatedAt', ?)
-                  ON CONFLICT(key) DO UPDATE SET value = excluded.value`).run(String(now));
-      db.exec("COMMIT");
-    } catch (err) {
-      db.exec("ROLLBACK");
-      throw err;
-    }
+    writeList(db, items, revision, updatedAt);
   }
 };
 _init = __decoratorStart(_b);
@@ -324,18 +429,29 @@ function sanitizeItems(value) {
     if (!entry || typeof entry !== "object") continue;
     const e = entry;
     if (typeof e.id !== "string" || e.id.length === 0) continue;
-    if (typeof e.text !== "string") continue;
+    const rawTitle = typeof e.title === "string" ? e.title : e.text;
+    if (typeof rawTitle !== "string") continue;
     if (seen.has(e.id)) continue;
     seen.add(e.id);
-    const done = e.done === true;
+    const status = e.status === void 0 && e.done === true ? "done" : toStatus(e.status);
+    const done = status === "done";
+    const description = typeof e.description === "string" && e.description.length > 0 ? e.description.slice(0, MAX_DESC) : void 0;
+    const release = normalizeLabel(e.release);
+    const sprint = normalizeLabel(e.sprint);
+    const dueDate = normalizeDueDate(e.dueDate);
     const completedAt = typeof e.completedAt === "number" ? e.completedAt : void 0;
     const archivedAt = typeof e.archivedAt === "number" ? e.archivedAt : void 0;
     out.push({
       id: e.id,
-      text: e.text.slice(0, MAX_TEXT),
-      done,
+      title: rawTitle.slice(0, MAX_TEXT),
+      status,
+      priority: toPriority(e.priority),
+      ...description !== void 0 ? { description } : {},
+      ...release !== void 0 ? { release } : {},
+      ...sprint !== void 0 ? { sprint } : {},
+      ...dueDate !== void 0 ? { dueDate } : {},
       createdAt: typeof e.createdAt === "number" ? e.createdAt : 0,
-      // completedAt is meaningless on an open item; drop it rather than store a lie.
+      // completedAt is meaningless on an unfinished item; drop it rather than store a lie.
       ...done && completedAt !== void 0 ? { completedAt } : {},
       // archivedAt is the archived flag itself, so a non-numeric value must not
       // survive as a truthy marker.

package/lib/typert.host.js

@@ -5,12 +5,15 @@ var __name = (target, value) => __defProp(target, "name", { value, configurable:
 import { z } from "zod";
 var todoItemSchema = z.object({
   id: z.string(),
-  text: z.string(),
-  done: z.boolean(),
+  title: z.string(),
+  description: z.string().optional(),
+  status: z.enum(["backlog", "todo", "in-progress", "blocked", "done"]),
+  priority: z.enum(["p0", "p1", "p2", "p3"]),
+  release: z.string().optional(),
+  sprint: z.string().optional(),
+  dueDate: z.string().optional(),
   createdAt: z.number(),
   completedAt: z.number().optional(),
-  // Must be carried explicitly: these are strict codecs, so a field the schema
-  // does not name would be stripped off the wire and archiving would not persist.
   archivedAt: z.number().optional()
 });
 var todoListSchema = z.object({

package/package.json

@@ -1,11 +1,14 @@
 {
   "name": "@dennisrongo/dsh-todo",
-  "version": "0.2.0",
+  "version": "0.3.0",
   "description": "Todo list for DeepSeek Harness (dsh) — a per-workspace task list persisted on disk by the host",
   "type": "module",
   "license": "MIT",
   "author": "Dennis Rongo",
   "main": "lib/index.js",
+  "bin": {
+    "dsh-todo": "lib/bin.js"
+  },
   "exports": {
     ".": {
       "default": "./lib/index.js"
@@ -16,6 +19,9 @@
     "./typert": {
       "default": "./lib/typert.host.js"
     },
+    "./cli": {
+      "default": "./lib/cli.js"
+    },
     "./package.json": "./package.json"
   },
   "files": [
@@ -28,7 +34,10 @@
   "scripts": {
     "build": "node build/build.mjs",
     "typecheck": "tsc --noEmit",
-    "test": "node test/smoke.mjs"
+    "test": "node test/smoke.mjs && node test/cli.test.mjs",
+    "test:icons": "node test/icon-probe.mjs",
+    "test:modal": "node test/modal-probe.mjs",
+    "test:cli": "node test/cli.test.mjs"
   },
   "dsh": {
     "bundle": {
@@ -58,6 +67,7 @@
   "devDependencies": {
     "@types/node": "^22.20.1",
     "@types/react": "^18.3.0",
+    "@types/react-dom": "^18.3.0",
     "esbuild": "^0.24.0",
     "react": "^18.3.0",
     "react-dom": "^18.3.0",