@bongos/core 1.19.1058 → 1.19.1059

package/modules/copy-desk/tests/copy_no_cms.mjs

@@ -67,7 +67,7 @@ const MODULE_FILES = ['registry.js', 'flags.js', 'proposals.js', 'pages.js', 'pa
 
 console.log('copy-desk: NO LIVE CMS');
 
-await test('the write surface is exactly the three verbs the module defines', () => {
+await test('the write surface is exactly the verbs the module defines', () => {
   const src = stripComments(read('routes/copy-desk.js'));
   const found = [...src.matchAll(/router\.(post|put|patch|delete)\(\s*'([^']+)'/g)]
     .map((m) => `${m[1].toUpperCase()} ${m[2]}`)
@@ -75,12 +75,21 @@ await test('the write surface is exactly the three verbs the module defines', ()
   assert.deepEqual(found, [
     'POST /copy-desk/flags',
     'POST /copy-desk/flags/:id/close',
+    // TW06 (task 1004317, ADR 0341 D5, D6, D11): the page claim opens or takes a
+    // TASK and a web claim through the lifecycle port; the page ask writes one
+    // flag row whose target is a page id. Neither stores wording.
+    'POST /copy-desk/pages/:pageId/asks',
+    'POST /copy-desk/pages/:pageId/claim',
     'POST /copy-desk/proposals',
   ], 'a new write route on this module must be a deliberate, reviewed change to this list');
 });
 
+// Every migration this module ships, oldest first (the list is pinned below).
+const MIGRATION_FILES = ['copy_desk_001_flags.sql', 'copy_desk_002_page_asks.sql'];
+const allMigrationSql = () => MIGRATION_FILES.map((f) => stripComments(read(`migrations/${f}`))).join('\n');
+
 await test('no column on copy_desk_flags could hold replacement text', () => {
-  const sql = stripComments(read('migrations/copy_desk_001_flags.sql'));
+  const sql = allMigrationSql();
   // The names a "just store the suggested wording" column would plausibly take.
   const forbidden = /\b(new_text|proposed_text|suggested_text|replacement|replacement_text|new_copy|proposed_copy|override_text|value_text)\b/i;
   const hit = forbidden.exec(sql);
@@ -88,22 +97,26 @@ await test('no column on copy_desk_flags could hold replacement text', () => {
     `copy_desk_flags must carry a judgement and a pointer, never replacement copy (found "${hit && hit[0]}")`);
 });
 
-await test('R03 added no migration — a proposal is a task, not a row here', () => {
+await test('the module has exactly its two migrations — a proposal and a page round are tasks, not rows here', () => {
   // The load-bearing one. R03's obvious-but-wrong implementation is a
   // `copy_desk_proposals` table, which is the forbidden column with extra steps:
   // once the wording lives in this module's schema, one plausible read of it
   // turns the module into the copy source. The proposal lives on the TASK.
   const migrations = fs.readdirSync(path.join(MODULE_DIR, 'migrations')).sort();
-  assert.deepEqual(migrations, ['copy_desk_001_flags.sql'],
-    'a second migration in this module needs a hard look at whether it stores copy');
+  // TW06 (task 1004317) added the second, deliberately: copy_desk_002_page_asks
+  // widens the flag to a page scope and adds one POINTER column, page_id. It
+  // stores no wording; a page round, like a proposal, is a task.
+  assert.deepEqual(migrations, MIGRATION_FILES,
+    'another migration in this module needs a hard look at whether it stores copy');
 });
 
 await test('the only text column is the historical snapshot, and it is never the live source', () => {
-  const sql = stripComments(read('migrations/copy_desk_001_flags.sql'));
-  const textish = [...sql.matchAll(/^\s{2}(\w+)\s+text\b/gm)].map((m) => m[1]);
-  assert.deepEqual(textish.sort(), [
-    'file_at_flag', 'kind', 'reason', 'resolution_note', 'scope', 'status', 'string_id', 'surface', 'text_at_flag',
-  ], 'a new text column here needs a deliberate look at whether it is copy');
+  const sql = allMigrationSql();
+  const created = [...sql.matchAll(/^\s{2}(\w+)\s+text\b/gm)].map((m) => m[1]);
+  const added = [...sql.matchAll(/ADD\s+COLUMN\s+(?:IF\s+NOT\s+EXISTS\s+)?(\w+)\s+text\b/gi)].map((m) => m[1]);
+  assert.deepEqual([...created, ...added].sort(), [
+    'file_at_flag', 'kind', 'page_id', 'reason', 'resolution_note', 'scope', 'status', 'string_id', 'surface', 'text_at_flag',
+  ], 'a new text column here needs a deliberate look at whether it is copy (page_id, TW06, is a page pointer)');
 
   // And the live read path is the registry, not the row: annotateFlag fills
   // `current` from the registry index every time.
@@ -140,7 +153,11 @@ await test('the proposal domain holds no path to a renderer — it composes text
 
 await test('the proposal route creates a TASK and does not write a string anywhere', () => {
   const src = stripComments(read('routes/copy-desk.js'));
-  const route = src.slice(src.indexOf("router.post('/copy-desk/proposals'"));
+  // Bounded to THIS handler: the slice ends where the next route begins, so a
+  // later route (the page ask does call insertFlag) is not read as this one.
+  const start = src.indexOf("router.post('/copy-desk/proposals'");
+  const next = src.indexOf('router.', start + 1);
+  const route = src.slice(start, next === -1 ? undefined : next);
   assert.ok(/lifecycle\.createTask\(/.test(route),
     'the proposal path must land in the ledger via lifecycle.createTask');
   // No INSERT/UPDATE of this module's own tables on the proposal path — the
@@ -149,6 +166,25 @@ await test('the proposal route creates a TASK and does not write a string anywhe
     'the proposal path must not write a row in this module — the task IS the record');
 });
 
+await test('the page claim creates a TASK through the port and writes no row here; the ask writes a pointer', () => {
+  const src = stripComments(read('routes/copy-desk.js'));
+  const handler = (path) => {
+    const start = src.indexOf(`router.post('${path}'`);
+    assert.ok(start >= 0, `${path} is mounted`);
+    const next = src.indexOf('router.', start + 1);
+    return src.slice(start, next === -1 ? undefined : next);
+  };
+  const claim = handler('/copy-desk/pages/:pageId/claim');
+  assert.ok(/lifecycle\.webClaimPageTweak\(/.test(claim), 'the page claim must land in the ledger via the lifecycle port');
+  assert.equal(/insertFlag|closeFlag|INSERT INTO|UPDATE |description:\s*req\.body/i.test(claim), false,
+    'the page claim must write no row in this module and take no wording from the request');
+  const ask = handler('/copy-desk/pages/:pageId/asks');
+  assert.ok(/normalizePageAsk\(/.test(ask) && /insertFlag\(/.test(ask), 'the ask files through the validated flag write');
+  // The round's description is composed by pages.js from the INVENTORY page,
+  // never from anything a caller sent.
+  assert.ok(/roundTaskBody\(page, n\)/.test(claim), 'the round body comes from pages.roundTaskBody over the inventory page');
+});
+
 await test('the module manifest declares no seam another module could write copy through', () => {
   const manifest = JSON.parse(read('module.json'));
   assert.deepEqual(manifest.provides, [], 'a provided port here would be a copy write path for every other module');

package/modules/lifecycle/lifecycle.js

@@ -25,6 +25,7 @@ const taskRecommendations = require('./task-recommendations');
 const activity = require('./activity');
 const mingle = require('./mingle');
 const pageTweakReads = require('./page-tweak-reads');
+const pageTweakClaim = require('./page-tweak-claim');
 
 module.exports = {
   // --- retired doorway leaks (ADR 0093 §3) ---------------------------------
@@ -111,6 +112,12 @@ module.exports = {
   // drift and the tally from these; there is no status table.
   listPageTweakTasks: (...a) => pageTweakReads.listPageTweakTasks(...a),
   shippedTasksTouchingSince: (...a) => pageTweakReads.shippedTasksTouchingSince(...a),
+  // The page claim (task 1004317 / BV2.TW06, ADR 0341 D2, D5): find or create a
+  // page's open tweak round and web-claim it, in one transaction under an
+  // advisory lock on the page. ADR 0341 D11 names this port entry webClaimTask;
+  // it is page-shaped because the find-or-create has to share the claim's
+  // transaction. See modules/lifecycle/page-tweak-claim.js.
+  webClaimPageTweak: (...a) => pageTweakClaim.webClaimPageTweak(...a),
   listVersions: (...a) => db.listVersions(...a),
   versionProgress: (...a) => db.versionProgress(...a),
   recentShippedTasks: (...a) => db.recentShippedTasks(...a),

package/modules/lifecycle/page-tweak-claim.js

@@ -0,0 +1,184 @@
+// modules/lifecycle/page-tweak-claim.js — the page claim: find or create a page's
+// open tweak round and WEB-claim it, in one transaction (task 1004317 / BV2.TW06,
+// ADR 0341 D2 and D5).
+//
+// On the `lifecycle` port because tasks and claims are this module's tables and
+// copy-desk may only cross the wall through a port (ADR 0083, ADR 0093 §2). What
+// a round IS (its source ref, title, body, and which unheld rounds a writer may
+// take over) is copy-desk's, and is handed in; the transaction is lifecycle's.
+//
+// THE LOCK. Everything runs under pg_advisory_xact_lock(hashtext('page-tweak/' ||
+// page_id)), so two artists claiming the same page serialise: the second reads
+// the round the first created, and is refused `held` naming the first. The page's
+// existing rounds are also read FOR UPDATE, which is the lock every other claim
+// path takes (claimTask), so a CLI claim of the same task cannot interleave.
+//
+// A WEB CLAIM (ADR 0341 D5): worktree_name NULL and creator_session_id NULL, the
+// bind_session=false claim the hall's Claim button already takes. Migration
+// core_204's one-bound-claim-per-(session, worktree) index excludes NULL sessions,
+// so a web claim never collides with the artist's CLI work, and the reads
+// (page-tweak-reads.js) recognise it by exactly those two NULLs.
+//
+// WHAT THIS DOES NOT RUN, and why. claimTask's gates are for a builder taking
+// CODE work into a worktree: the rank floor, goal membership, the owed-rebase
+// gate, dependency and touches checks. A page round is not that. Its one gate is
+// the craft (ADR 0341 D5: `builders.preferred_disciplines` includes artist, read
+// here through help-requests' own reader, never from the request), plus the
+// inactive-builder refusal every claim carries. The round has no rank floor
+// (D2), no dependencies, and its applier later takes an ordinary CLI claim
+// through claimTask with every gate intact.
+//
+// Outcomes are returned, not thrown, so the route maps each to its named answer:
+//   created | claimed | resumed        the caller now holds the round (writing)
+//   held          another builder holds it (holder named)
+//   in_flight     the round is past writing (submitted, applying, waiting for
+//                 the artist, landing), so a writing claim would pull it back
+//   not_an_artist / builder_inactive / no_open_version
+
+'use strict';
+
+const api = require('../../src/module-api');
+const db = require('./db');
+const helpRequests = require('./help-requests');
+
+const SOURCE = 'page-tweak';
+const TERMINAL = Object.freeze(['shipped', 'abandoned']);
+
+function lockKey(pageId) { return `${SOURCE}/${pageId}`; }
+
+// The claim projection the route answers with.
+const CLAIM_COLS = 'id, task_id, builder_id, worktree_name, creator_session_id, claimed_at';
+
+async function insertWebClaim(client, taskId, builderId) {
+  const { rows } = await client.query(
+    `INSERT INTO claims (task_id, builder_id, worktree_name, requested_worktree_name, head_sha, creator_session_id)
+     VALUES ($1, $2, NULL, NULL, NULL, NULL)
+     RETURNING ${CLAIM_COLS}`,
+    [taskId, builderId]
+  );
+  await client.query(`UPDATE tasks SET status = 'active', updated_at = now() WHERE id = $1`, [taskId]);
+  return rows[0];
+}
+
+// 'page-tweak/landing:index/r2' -> 2 (0 when the ref carries no round).
+function roundNumber(sourceRef) {
+  const m = /\/r([1-9][0-9]*)$/.exec(String(sourceRef || ''));
+  return m ? Number(m[1]) : 0;
+}
+
+// webClaimPageTweak({ pageId, builderId, versionId, round }, deps)
+//
+//   round.title(n), round.description(n), round.sourceRef(n)   copy-desk's format
+//   round.touches, round.creditsReward
+//   round.canTakeOver(task)   may a writer take over this UNHELD open round?
+//   versionId                 where a NEW round lands (null: nothing is building)
+//
+// deps.pool is honoured only under NODE_ENV=test (the #538 test seam).
+async function webClaimPageTweak({ pageId, builderId, versionId = null, round }, deps = {}) {
+  const activePool = (deps.pool && process.env.NODE_ENV === 'test') ? deps.pool : api.pool;
+  const createTask = deps.createTask || db.createTask;
+  const prefix = `${SOURCE}/${pageId}/`;
+  const client = await activePool.connect();
+  try {
+    await client.query('BEGIN');
+    await client.query('SELECT pg_advisory_xact_lock(hashtext($1))', [lockKey(pageId)]);
+
+    const { rows: builderRows } = await client.query(
+      'SELECT id, status, github_login, display_name FROM builders WHERE id = $1', [builderId]
+    );
+    if (!builderRows[0] || builderRows[0].status === 'inactive') {
+      await client.query('ROLLBACK');
+      return { outcome: 'builder_inactive' };
+    }
+    const crafts = await helpRequests.craftsForBuilder(builderId, { pool: client });
+    if (!crafts.includes('artist')) {
+      await client.query('ROLLBACK');
+      return { outcome: 'not_an_artist' };
+    }
+
+    // Every round of this page, oldest first. `left(...) = prefix` rather than
+    // LIKE: a page id is [a-z0-9-:], and LIKE would read an `_` as a wildcard
+    // the day the id rule widens.
+    const { rows: rounds } = await client.query(
+      `SELECT id, status, title, description, source_ref, touches, credits_reward, goal_id, version_id
+         FROM tasks
+        WHERE source = $1 AND left(source_ref, length($2)) = $2
+        ORDER BY id ASC
+        FOR UPDATE`,
+      [SOURCE, prefix]
+    );
+    const open = [...rounds].reverse().find((t) => !TERMINAL.includes(t.status)) || null;
+
+    if (open) {
+      const { rows: held } = await client.query(
+        `SELECT c.${CLAIM_COLS.split(', ').join(', c.')}, b.github_login, b.display_name
+           FROM claims c JOIN builders b ON b.id = c.builder_id
+          WHERE c.task_id = $1 AND c.released_at IS NULL
+          LIMIT 1`,
+        [open.id]
+      );
+      const claim = held[0] || null;
+      const roundNo = roundNumber(open.source_ref);
+      if (claim) {
+        const web = claim.worktree_name == null && claim.creator_session_id == null;
+        if (String(claim.builder_id) !== String(builderId)) {
+          await client.query('ROLLBACK');
+          return {
+            outcome: 'held',
+            task: open,
+            round: roundNo,
+            holder: { id: String(claim.builder_id), login: claim.github_login || null, name: claim.display_name || null },
+            holder_is_writing: web,
+          };
+        }
+        await client.query('ROLLBACK');
+        // The caller's own web claim is Resume. Their own CLI claim means they
+        // are APPLYING this round (a self-applied tweak): not writing it.
+        return web
+          ? { outcome: 'resumed', task: open, round: roundNo, claim }
+          : { outcome: 'in_flight', task: open, round: roundNo, status: open.status };
+      }
+      if (!round.canTakeOver(open)) {
+        await client.query('ROLLBACK');
+        return { outcome: 'in_flight', task: open, round: roundNo, status: open.status };
+      }
+      const taken = await insertWebClaim(client, open.id, builderId);
+      await client.query('COMMIT');
+      return { outcome: 'claimed', task: { ...open, status: 'active' }, round: roundNo, claim: taken };
+    }
+
+    if (versionId == null) {
+      await client.query('ROLLBACK');
+      return { outcome: 'no_open_version' };
+    }
+    // n = one plus the earlier rounds, whatever their status (ADR 0341 D2); the
+    // max guards the never-repeat rule if a round row was ever removed.
+    const n = Math.max(rounds.length, ...rounds.map((t) => roundNumber(t.source_ref))) + 1;
+    const task = await createTask({
+      versionId,
+      // ADR 0341 D2: a round lands in the building version's catch-all goal,
+      // exactly as a copy proposal does. Declared out loud (BV1.R11).
+      allowCatchAll: true,
+      title: round.title(n),
+      description: round.description(n),
+      status: 'ready',
+      kind: 'feature',
+      discipline: 'artist',
+      creditsReward: round.creditsReward,
+      touches: round.touches,
+      source: SOURCE,
+      sourceRef: round.sourceRef(n),
+      createdBy: builderId,
+    }, { client });
+    const claim = await insertWebClaim(client, task.id, builderId);
+    await client.query('COMMIT');
+    return { outcome: 'created', task: { ...task, status: 'active' }, round: n, claim };
+  } catch (err) {
+    await client.query('ROLLBACK').catch(() => {});
+    throw err;
+  } finally {
+    client.release();
+  }
+}
+
+module.exports = { webClaimPageTweak, lockKey, roundNumber };

package/package-lock.json

@@ -1,12 +1,12 @@
 {
   "name": "@bongos/core",
-  "version": "1.19.1058",
+  "version": "1.19.1059",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "@bongos/core",
-      "version": "1.19.1058",
+      "version": "1.19.1059",
       "license": "AGPL-3.0-or-later",
       "dependencies": {
         "express": "^4.21.2",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@bongos/core",
-  "version": "1.19.1058",
+  "version": "1.19.1059",
   "description": "Cloud Bongos — the AI-first build platform core (GDS + platform surfaces + module system), installed as a versioned dependency (ADR 0108).",
   "license": "AGPL-3.0-or-later",
   "main": "src/platform-server.js",

package/release-notes.json

@@ -7649,5 +7649,11 @@
       "id": "1004316",
       "text": "Every page now has a status that is worked out from the project's own record, with nothing new to keep in sync. For each page you can see whether it is untweaked or text tweaked and how many times, a history of each round (who"
     }
+  ],
+  "1.19.1059": [
+    {
+      "id": "1004317",
+      "text": "An artist can now claim a whole page to rewrite in one step. If the page has no open round, one is created for them. If someone else is already on it, they are told who. Anyone, artist or not, can ask for a page to be worked o"
+    }
   ]
 }

package/src/module-api.js

@@ -71,7 +71,7 @@ const { responsibilityFor, ROLE_RESPONSIBILITIES } = require('./role-responsibil
 // there. scripts/gds/bump-version.js still rewrites the literal below; it appends
 // the entry to that file. Look for a version's history there, not here.
 // ---------------------------------------------------------------------------
-const CORE_VERSION = '1.19.1058'; // CI auto-patch carrier (ADR 0161); changelog: docs/module-api-changelog.md
+const CORE_VERSION = '1.19.1059'; // CI auto-patch carrier (ADR 0161); changelog: docs/module-api-changelog.md
 
 // A namespaced logger so a module's log lines are attributable + consistent.
 // Usage: const log = api.logger('dev-box'); log.info('mounted');

package/tests/copy_desk_flags_db.mjs

@@ -78,6 +78,10 @@ await pool.query('INSERT INTO tasks (id) VALUES ($1) ON CONFLICT (id) DO NOTHING
 // migrated DB has already run it.
 const MIGRATION = fs.readFileSync(path.join(ROOT, 'modules/copy-desk/migrations/copy_desk_001_flags.sql'), 'utf8');
 await pool.query(MIGRATION);
+// TW06 (task 1004317): the page-ask widening, applied on top, twice (idempotent).
+const MIGRATION_002 = fs.readFileSync(path.join(ROOT, 'modules/copy-desk/migrations/copy_desk_002_page_asks.sql'), 'utf8');
+await pool.query(MIGRATION_002);
+await pool.query(MIGRATION_002);
 
 // Every row this test writes carries a surface nothing else uses, so cleanup is
 // exact and it can never delete a real flag.
@@ -241,6 +245,46 @@ await test('closeFlag returns null on a second call — the route answers 409 fr
   assert.equal(second, null);
 });
 
+// --- page asks (task 1004317 / TW06, copy_desk_002) -----------------------
+// A page ask's surface IS its page id, so these use SURF as the page id and the
+// cleanup above still catches every row.
+console.log('copy_desk_flags — page asks (copy_desk_002)');
+
+const pageIns = (o = {}) => pool.query(
+  `INSERT INTO copy_desk_flags (scope, surface, string_id, page_id, reason, flagged_by)
+   VALUES ($1,$2,$3,$4,$5,$6) RETURNING *`,
+  [o.scope ?? 'page', o.surface ?? SURF, o.string_id ?? null, 'page_id' in o ? o.page_id : SURF, REASON, o.by ?? B]
+);
+
+await test('a page ask inserts through the real write, pointing at its page', async () => {
+  const norm = flagsLib.normalizePageAsk({ reason: REASON }, SURF);
+  const row = await flagsLib.insertFlag(norm.value, B);
+  assert.deepEqual([row.scope, row.page_id, row.surface, row.status], ['page', SURF, SURF, 'open']);
+  assert.equal((await flagsLib.findOpenPageAsk(SURF, B)).id, row.id);
+  assert.equal(await flagsLib.countPageAskers(SURF), 1);
+});
+
+await test('the same builder cannot hold two open asks on one page (the 001 index)', async () => {
+  await assert.rejects(() => pageIns(), (e) => e.code === '23505');
+});
+
+await test("scope 'page' needs a page_id, and only scope 'page' may carry one", async () => {
+  await assert.rejects(() => pageIns({ page_id: null, by: A }), (e) => e.code === '23514');
+  await assert.rejects(() => pageIns({ scope: 'string', string_id: 'pg1', by: A }), (e) => e.code === '23514');
+});
+
+await test("a page ask's surface must be its page id", async () => {
+  await assert.rejects(() => pageIns({ page_id: 'landing:index', by: A }), (e) => e.code === '23514');
+});
+
+await test('resolvePageAsks closes the open asks filed before the ship, stamped with the task', async () => {
+  const ids = await flagsLib.resolvePageAsks({ pageId: SURF, taskId: T, resolvedBy: A, shippedAt: new Date(Date.now() + 60000).toISOString() });
+  assert.equal(ids.length, 1);
+  const { rows } = await pool.query("SELECT status, resolved_task_id, resolved_by FROM copy_desk_flags WHERE scope = 'page' AND page_id = $1", [SURF]);
+  assert.deepEqual(rows.map((r) => [r.status, String(r.resolved_task_id), String(r.resolved_by)]), [['resolved', String(T), String(A)]]);
+  assert.equal(await flagsLib.countPageAskers(SURF), 0);
+});
+
 // --- cleanup --------------------------------------------------------------
 await clean();
 await pool.query('DELETE FROM builders WHERE id = ANY($1)', [[A, B]]).catch(() => {});