@volter/supercode-orchestrator 0.5.223 → 0.5.224

package/board/files.mjs

@@ -12,7 +12,7 @@ import { fillReadableIds } from './readable-id.mjs';
 import { existsSync, mkdirSync, readdirSync, readFileSync, renameSync, unlinkSync, writeFileSync } from 'node:fs';
 import { fenced } from './fence.mjs';
 import { markRemovedHeads } from './published.mjs';
-import { CARD_NUMBERS } from './store.mjs';
+import { CARD_NUMBERS, unnumberTasks } from './store.mjs';
 import { createHash } from 'node:crypto';
 import { join } from 'node:path';
 import { DatabaseSync } from 'node:sqlite';
@@ -133,6 +133,9 @@ class FilesBoard {
     cards.sort((a, b) => madeAt(a) - madeAt(b) || (String(a.id) < String(b.id) ? -1 : String(a.id) > String(b.id) ? 1 : 0));
     for (const card of cards) for (const [table, rows] of Object.entries(card.tables ?? {})) if (table !== CARD_NUMBERS) insert(table, rows);
     for (const [table, rows] of Object.entries(state?.tables ?? {})) insert(table, rows);
+    // A task whose file names no number keeps none: only cards are numbered.
+    unnumberTasks(mem, new Set(cards.filter((card) => card.tables?.[CARD_NUMBERS]?.length).map((card) => card.id)),
+      (state?.sequence ?? []).find((row) => row.name === CARD_NUMBERS)?.seq ?? 0);
     // Loading inserts every card, which marks every card changed (published.mjs). The first load of this projection keeps
     // those marks: its next write compares each card with its published head once (a named limit: each projection opened
     // compares every card once, as each load already reads every card's file). A reload keeps the marks not yet

package/board/store.mjs

@@ -370,6 +370,18 @@ function layOutNumbers(db) {
   } catch (error) { db.exec('ROLLBACK TO supercode_card_numbering; RELEASE supercode_card_numbering'); throw error; }
 }
 
+/** Only cards are numbered (VO-3578 row 22): a task's row (supercode_cards.subtask_of) is numbered by the insert trigger
+ *  like any row, so a load gives each task's number back unless its source named it (`named`, task ids). The sequence
+ *  returns to the highest number held, never below `floor` (what the source had already handed out). */
+export function unnumberTasks(db, named = new Set(), floor = 0) {
+  const taken = db.prepare(`SELECT n.task_id FROM ${CARD_NUMBERS} n JOIN supercode_cards c ON c.task_id = n.task_id WHERE c.subtask_of IS NOT NULL`).all()
+    .filter((row) => !named.has(row.task_id));
+  if (!taken.length) return;
+  const drop = db.prepare(`DELETE FROM ${CARD_NUMBERS} WHERE task_id = ?`);
+  for (const row of taken) drop.run(row.task_id);
+  db.prepare(`UPDATE sqlite_sequence SET seq = MAX(?, (SELECT COALESCE(MAX(number), 0) FROM ${CARD_NUMBERS})) WHERE name = ?`).run(Number(floor) || 0, CARD_NUMBERS);
+}
+
 /** Raise the numbers' high-water mark to the highest number held, and to `floor`: AUTOINCREMENT hands out only numbers
  *  above it. For a store whose numbers were given or copied explicitly. */
 export function raiseCardNumbers(db, floor = 0) {

package/board/ztrack.mjs

@@ -19,7 +19,7 @@ import { createHash, randomBytes } from 'node:crypto';
 import { existsSync, linkSync, mkdirSync, readdirSync, readFileSync, realpathSync, renameSync, statSync, unlinkSync, writeFileSync } from 'node:fs';
 import { basename, dirname, join, resolve } from 'node:path';
 import { DatabaseSync } from 'node:sqlite';
-import { actorOf, boardKey, CARD_NUMBERS, contention, raiseCardNumbers, event, json, now, principalOf, storageFault, STORAGE_TRIES, unreadable } from './store.mjs';
+import { actorOf, boardKey, CARD_NUMBERS, contention, raiseCardNumbers, unnumberTasks, event, json, now, principalOf, storageFault, STORAGE_TRIES, unreadable } from './store.mjs';
 import { GitDocument } from './git-document.mjs';
 import { unimported } from './legacy-store.mjs';
 import { noteStep, recordSlow } from '@volter/supercode-harness-sdk/slow-log';
@@ -462,13 +462,14 @@ class ZtrackBoard {
       put(`chunks:${role}`, entries);
     }
     put('published', published);
-    // The earlier store held no numbers: its cards take the numbers their documents' headings give them, and the rest
-    // are numbered in the order they were made, after every number the documents name (documentNumbers).
+    // The earlier store held no numbers: its cards take the numbers their documents' headings give them, and the other
+    // cards are numbered in the order they were made, after every number the documents name (documentNumbers); a task is not.
     db.exec(`DELETE FROM ${CARD_NUMBERS}; DELETE FROM sqlite_sequence WHERE name = '${CARD_NUMBERS}'`);
     const named = this.documentNumbers();
     this.numberFromHeadings([...named.headings].filter(([id]) => db.prepare('SELECT 1 FROM tasks WHERE id = ?').get(id)), db);
     raiseCardNumbers(db, named.highest);
-    db.exec(`INSERT INTO ${CARD_NUMBERS} (task_id) SELECT id FROM tasks WHERE id NOT IN (SELECT task_id FROM ${CARD_NUMBERS}) ORDER BY created_at, id`);
+    db.exec(`INSERT INTO ${CARD_NUMBERS} (task_id) SELECT id FROM tasks WHERE id NOT IN (SELECT task_id FROM ${CARD_NUMBERS})
+      AND id NOT IN (SELECT task_id FROM supercode_cards WHERE subtask_of IS NOT NULL) ORDER BY created_at, id`);
     db.exec('COMMIT');
   }
 
@@ -921,6 +922,10 @@ class ZtrackBoard {
       this.numberFromHeadings([...plan.numbers].filter(([id]) => plan.rows.has(id)));
       raiseCardNumbers(this.conn, this.documentNumbers().highest);
     }
+    // What is numbered before the cards load: a task the document or the store had numbered keeps it, and a task row the
+    // load inserts gives back the number the insert trigger hands it (only cards are numbered).
+    const numbered = overlay ? null : new Set(this.statement(`SELECT task_id FROM main.${CARD_NUMBERS}`).all().map((row) => row.task_id));
+    const handedOut = overlay ? 0 : this.one(`SELECT seq FROM main.sqlite_sequence WHERE name = '${CARD_NUMBERS}'`)?.seq ?? 0;
     for (const [id, rows] of plan.rows) {
       const before = fingerprintOf(id);
       const oldTask = this.one(`SELECT * FROM ${schema}.tasks WHERE id = ?`, id) ?? {};
@@ -939,6 +944,7 @@ class ZtrackBoard {
         events.push({ id, kind, payload: { by, source: 'document', status: after.status, assignee: after.assignee, author: by }, before, after });
       }
     }
+    if (!overlay) unnumberTasks(this.conn, numbered, handedOut);
     for (const id of plan.checked) this.errors.delete(id);
     for (const [id, reason] of plan.errors) this.errors.set(id, reason);
     // A read overlays new document cards before the owner commits them. Give that

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@volter/supercode-orchestrator",
-  "version": "0.5.223",
+  "version": "0.5.224",
   "type": "module",
   "description": "The orchestrator runtime over the Volter Harness ontology: one typed operational model whose folder is its serialization, read and written through the harness orchestration doors (docs/ORCHESTRATOR-IR.md)",
   "exports": {
@@ -36,7 +36,7 @@
     "check-types": "node scripts/generate-types.mjs --check"
   },
   "dependencies": {
-    "@volter/supercode-teams": "^0.3.380",
+    "@volter/supercode-teams": "^0.3.381",
     "@volter/supercode-terminal": "^0.3.12",
     "@volter/supercode-harness-sdk": "^0.3.106",
     "@volter/teams": "0.2.106",