gcf-aif-ext 0.7.7 → 0.7.8

package/README.md

@@ -50,6 +50,14 @@ Updating preserves `gcf/`, `cnlp.config.json` and the pre-commit hook. Run `ai-f
 
 On Windows, run `extension add` and `extension update` from PowerShell or cmd, not Git Bash: the installer unpacks with `tar`, and Git Bash's GNU tar reads `C:\…` as a remote host (`Cannot connect to C: resolve failed`). The Windows `tar.exe` handles it.
 
+### 0.7.8
+
+- An open question's field written as a YAML block (`assumed: |` or `>`, and the lines under it) reads as its text: before, `gcf board --json` gave the block sign `|`. Every reader of `gcf/open-questions.md` (the board, `design check`, the audit, `context`, the index) reads the fields the same way:
+  - a field is a line at the record's field indent, so a block line such as `answer: x` is text: before, it made a D1 read as answered;
+  - a blank line inside a block no longer ends the record: before, the fields after it were lost;
+  - `gcf question answer` replaces an old answer written as a block whole: before, it replaced only the block's first line;
+  - an empty `answer:` is no answer: `design check` now holds the D1's units, as the board already showed it unanswered.
+
 ### 0.7.7
 
 - `ai-factory gcf config [--json]` lists the human's settings of `gcf/config.yml` with what each means; `gcf config set <key> --value=<v>` sets one, checked by the rules a read applies, the comments kept, one `gcf(config)` commit. An empty number goes back to its default. `gcf board --json` carries them as `settings`.

package/extension.json

@@ -1,7 +1,7 @@
 {
   "$schema": "https://raw.githubusercontent.com/lee-to/ai-factory/2.x/schemas/extension.schema.json",
   "name": "gcf-aif-ext",
-  "version": "0.7.7",
+  "version": "0.7.8",
   "description": "Game Context Framework for AI Factory",
   "skills": [
     "skills/gcf-init",

package/lib/audit-core.js

@@ -11,6 +11,7 @@ import { STORED } from './transitions.js';
 import { openDepends } from './work-ops.js';
 import { runHolder } from './main-lock.js';
 import { sessionActive } from './session-mark.js';
+import { fieldOf } from './question-fields.js';
 
 function git(args, cwd) {
   // A blame of a long file overflows the 1 MiB default, and an overflow reads as a git failure.
@@ -276,7 +277,7 @@ const questionsText = async (root) => {
   return existsSync(file) ? readFile(file, 'utf8') : '';
 };
 
-const D2_UNTIL_RE = /^\s+until:\s*(verdict\([a-z0-9-]+\)|retune\([a-z0-9-]+\)|manual\([^)]*\))/m;
+const D2_UNTIL_RE = /^(verdict\([a-z0-9-]+\)|retune\([a-z0-9-]+\)|manual\([^)]*\))/;
 
 /**
  * Until annotations across work items and systems docs, and the `until:` of each D2 record in
@@ -296,8 +297,8 @@ function untilRecords(items, systems, fired, questions) {
 
   for (const rec of questions.replace(/\r\n/g, '\n').split(/\n(?=- id:)/)) {
     const id = rec.match(/^- id:\s*(\S+)/)?.[1];
-    const trigger = rec.match(D2_UNTIL_RE)?.[1];
-    if (!id || !trigger || !/^\s+class:\s*D2\b/m.test(rec)) continue;
+    const trigger = fieldOf(rec, 'until')?.match(D2_UNTIL_RE)?.[1];
+    if (!id || !trigger || !/^D2\b/.test(fieldOf(rec, 'class') ?? '')) continue;
     until.push({
       file: 'gcf/open-questions.md',
       id,

package/lib/config-set.js

@@ -99,11 +99,13 @@ function valueOf(setting, text) {
 
     return t;
   }
+
   if (setting.kind === 'mode') {
     if (!RUN_MODES.includes(t)) throw new Error(`run_mode must be ${RUN_MODES.join(' | ')}`);
 
     return t;
   }
+
   if (!t) return null;
   // Plain decimals only: Number() would also take 0x10, 1e3 and 0b1.
   if (!/^\d+(\.\d+)?$/.test(t)) throw new Error(`${setting.key} must be a number, got ${t}`);
@@ -144,6 +146,7 @@ export async function setConfig(projectDir, key, text, { commit = true } = {}) {
           throw new Error(`gcf/config.yml: ${keys[0]} must map its keys`);
         if (!YAML.isMap(parent)) doc.set(keys[0], doc.createNode({}));
       }
+
       if (value === null) doc.deleteIn(keys);
       else doc.setIn(keys, value);
       raw = doc.toJS();
@@ -154,6 +157,7 @@ export async function setConfig(projectDir, key, text, { commit = true } = {}) {
         unchanged = true;
         throw NO_CHANGE;
       }
+
       await atomicWrite(file, out);
     },
     commit,

package/lib/context.js

@@ -2,6 +2,7 @@ import { readFile } from 'node:fs/promises';
 import { existsSync } from 'node:fs';
 import path from 'node:path';
 import { listItems, listSystems, readConfig, tokensEst } from './gcf-paths.js';
+import { fieldOf } from './question-fields.js';
 
 /**
  * Readset assembly — the whole command is deterministic (GCF-PRD §9.1, §10.1):
@@ -94,9 +95,9 @@ async function d2Assumptions(root, systems) {
   const records = (await readFile(oqFile, 'utf8')).split(/\n(?=- id:)/);
 
   return records
-    .filter((rec) => /^\s*-?\s*id:/m.test(rec) && /class:\s*D2/.test(rec))
+    .filter((rec) => /^\s*-?\s*id:/m.test(rec) && /^D2\b/.test(fieldOf(rec, 'class') ?? ''))
     .filter((rec) => {
-      const sys = rec.match(/sys:\s*(.+)/)?.[1] ?? '';
+      const sys = fieldOf(rec, 'sys') ?? '';
 
       return systems.some((s) => sys.includes(s));
     })

package/lib/design-check.js

@@ -19,6 +19,7 @@ import {
 import { buildLedger } from './ledger.js';
 import { sourceBodies } from './anchors.js';
 import { collapseLines } from './verdict-fs.js';
+import { fieldOf } from './question-fields.js';
 
 // Units a number may carry. A project adds its own in the `units:` block of glossary.md.
 // Bare `px` is absent on purpose: its size depends on the screen density.
@@ -122,7 +123,7 @@ export const recordsIn = (text, key) =>
   readRecords(itemsIn(text, key)).records.map((r) => r.values);
 
 /** A D1 record nobody answered yet: only such a question holds its units. */
-const blocksUnits = (rec) => /^\s+class:\s*D1\b/m.test(rec) && !/^\s+answer:/m.test(rec);
+const blocksUnits = (rec) => /^D1\b/.test(fieldOf(rec, 'class') ?? '') && !fieldOf(rec, 'answer');
 
 /**
  * open-questions.md: every record id, every `blocks:` reference, the D1 ones per blocked id. A
@@ -136,7 +137,7 @@ export function questionBlocks(text) {
   const qids = new Set([...src.matchAll(/^\s*- id:\s*(\S+)/gm)].map((m) => m[1]));
   for (const rec of src.split(/\n(?=- id:)/)) {
     const qid = rec.match(/^- id:\s*(\S+)/)?.[1];
-    const ids = listOf(rec.match(/^\s+blocks:\s*(.+)$/m)?.[1] ?? '');
+    const ids = listOf(fieldOf(rec, 'blocks') ?? '');
     if (!qid || ids === 'TBD' || !ids.length) continue;
     refs.push({ qid, ids });
     if (!blocksUnits(rec)) continue;

package/lib/gcf-paths.js

@@ -81,6 +81,7 @@ export function configOf(parsed) {
       );
     }
   }
+
   for (const key of PCT_KEYS)
     if (config[key] > 100)
       throw new Error(`gcf/config.yml: ${key} is a share of the window, 0-100, got ${config[key]}`);

package/lib/index-gen.js

@@ -4,6 +4,7 @@ import path from 'node:path';
 import { listItems, listSystems, firstBullet } from './gcf-paths.js';
 import { parseLive } from './live.js';
 import { atomicWrite } from './safe-path.js';
+import { fieldOf } from './question-fields.js';
 import { readDesign, slotValues, loadDocProfile, isTbd, UNIT_TYPES } from './design.js';
 
 /**
@@ -46,8 +47,9 @@ export async function generate(root) {
 
   const txt = await readIfExists(root, 'open-questions.md');
   if (txt !== null) {
-    const d1 = count(txt, /^\s*class:\s*D1/gm);
-    const d2 = count(txt, /^\s*class:\s*D2/gm);
+    const classes = txt.split(/\n(?=- id:)/).map((rec) => fieldOf(rec, 'class') ?? '');
+    const d1 = classes.filter((c) => /^D1\b/.test(c)).length;
+    const d2 = classes.filter((c) => /^D2\b/.test(c)).length;
     row(['questions', 'open-questions.md', '-', '-', `${d1} D1, ${d2} D2`]);
   }
 

package/lib/question-fields.js

@@ -0,0 +1,70 @@
+// The fields of one record of gcf/open-questions.md (`- id:` and the indented lines under it).
+// A field is a line at the record's field indent; a YAML block (`|`, `>`) is the deeper lines
+// under its key, so a block line that reads like `answer: x` is text, not a field.
+
+/** The indent of a record's fields: the indent of its first field line. */
+export const indentOf = (record) => record.match(/^([ \t]+)\w+:/m)?.[1] ?? '  ';
+
+/** The index after the lines under field line `i`: deeper ones, and blank ones between them. */
+export function blockEnd(lines, i, indent) {
+  let end = i + 1;
+  for (let j = i + 1; j < lines.length; j++) {
+    if (!lines[j].trim()) continue;
+    if (!lines[j].startsWith(indent) || !/^[ \t]/.test(lines[j].slice(indent.length))) break;
+    end = j + 1;
+  }
+
+  return end;
+}
+
+// `|`, `>-`, `|2`, `> # note`: a block's sign with its chomping, indentation and comment.
+const BLOCK = /^([|>])[-+]?\d?[-+]?(\s+#.*)?$/;
+
+/**
+ * A `>` block's lines folded: the lines of one paragraph join with a space, each blank line is a
+ * line break, and a more indented line keeps its breaks, the one before a blank line too.
+ */
+function folded(lines) {
+  let text = '';
+  let prev = null;
+  let blanks = 0;
+  for (const l of lines) {
+    if (!l) {
+      blanks += 1;
+      continue;
+    }
+
+    const kind = /^[ \t]/.test(l) ? 'more' : 'text';
+    if (prev !== null) {
+      const both = prev === 'text' && kind === 'text';
+      if (blanks) text += '\n'.repeat(both ? blanks : blanks + 1);
+      else text += both ? ' ' : '\n';
+    }
+
+    text += l;
+    prev = kind;
+    blanks = 0;
+  }
+
+  return text;
+}
+
+/**
+ * The value of field `k` in a record, or null. A block reads as its lines, the common indent
+ * taken off: `|` keeps the line breaks, `>` folds them (`folded`).
+ */
+export function fieldOf(record, k) {
+  const lines = record.split(/\r?\n/);
+  const indent = indentOf(record);
+  const i = lines.findIndex((l) => l.startsWith(`${indent}${k}:`));
+  if (i < 0) return null;
+  const value = lines[i].slice(indent.length + k.length + 1).trim();
+  const block = value.match(BLOCK)?.[1];
+  if (!block) return value || null;
+  const body = lines.slice(i + 1, blockEnd(lines, i, indent));
+  const cut = Math.min(...body.filter((l) => l.trim()).map((l) => l.match(/^[ \t]*/)[0].length));
+  const dedented = body.map((l) => l.slice(cut).trimEnd());
+  const text = block === '|' ? dedented.join('\n') : folded(dedented);
+
+  return text.trim() || null;
+}

package/lib/questions.js

@@ -7,6 +7,7 @@ import { existsSync } from 'node:fs';
 import path from 'node:path';
 import { atomicWrite } from './safe-path.js';
 import { commitMove } from './unit-ops.js';
+import { blockEnd, fieldOf, indentOf } from './question-fields.js';
 
 // A D2 carries its assumption and the trigger that brings it back; `lens`, `sections` and `sys`
 // say where a record came from: an import names its lens and the GDD sections.
@@ -27,19 +28,26 @@ const fileOf = (root) => path.join(root, 'open-questions.md');
 
 /**
  * The records of a file's text, each `{id, text, start}`: a `- id:` line and the indented lines
- * under it. A blank or unindented line ends the record: a heading after the last record is not
- * part of it.
+ * under it. An unindented line ends the record, and so does a blank one unless an indented line
+ * follows it (a blank line inside a block): a heading after the last record is not part of it.
  */
 function recordsOf(text) {
   const records = [];
   let at = 0;
   /** @type {{id: string, text: string, start: number} | null} */
   let rec = null;
+  // Blank lines after a record's last line: its own when an indented line follows.
+  let blank = '';
   for (const line of text.split(/(?<=\n)/)) {
     const id = line.match(/^- id:\s*(\S+)/)?.[1];
     if (id) records.push((rec = { id, text: line, start: at }));
-    else if (rec && /^[ \t]+\S/.test(line)) rec.text += line;
-    else rec = null;
+    else if (rec && /^[ \t]+\S/.test(line)) rec.text += blank + line;
+    else if (rec && !line.trim()) {
+      blank += line;
+      at += line.length;
+      continue;
+    } else rec = null;
+    blank = '';
     at += line.length;
   }
 
@@ -56,23 +64,27 @@ export async function listQuestions(root) {
 
   return recordsOf(await readFile(file, 'utf8')).map(({ id, text }) => ({
     id,
-    ...Object.fromEntries(
-      FIELDS.map((k) => [
-        k,
-        text.match(new RegExp(`^[ \\t]+${k}:[ \\t]*(.*?)\\s*$`, 'm'))?.[1] || null,
-      ]),
-    ),
+    ...Object.fromEntries(FIELDS.map((k) => [k, fieldOf(text, k)])),
   }));
 }
 
 /** The record text with its `answer:` set: an old answer is replaced, a new one appended. */
 function withAnswer(record, answer) {
   const eol = record.includes('\r\n') ? '\r\n' : '\n';
-  const indent = record.match(/^([ \t]+)\w+:/m)?.[1] || '  ';
+  const indent = indentOf(record);
   const line = `${indent}answer: ${answer}`;
-  // A function, not a string: `$&` in the operator's answer is text, not a pattern.
-  if (/^[ \t]+answer:/m.test(record))
-    return record.replace(/^[ \t]+answer:.*?(?=\r?$)/m, () => line);
+  // Each line with its own line end, so the lines around the answer keep their bytes.
+  const parts = record.split(/(?<=\n)/);
+  const lines = parts.map((p) => p.replace(/\r?\n$/, ''));
+  const at = lines.findIndex((l) => l.startsWith(`${indent}answer:`));
+  // An old answer goes with the block under it, if it was one.
+  if (at >= 0) {
+    const end = blockEnd(lines, at, indent);
+    parts.splice(at, end - at, line + (parts[end - 1].match(/\r?\n$/)?.[0] ?? ''));
+
+    return parts.join('');
+  }
+
   const body = record.replace(/(\r?\n)+$/, '');
 
   return `${body}${eol}${line}${record.slice(body.length) || eol}`;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "gcf-aif-ext",
-  "version": "0.7.7",
+  "version": "0.7.8",
   "description": "Game Context Framework for AI Factory",
   "type": "module",
   "license": "MIT",