gcf-aif-ext 0.7.1 → 0.7.3

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.1",
+  "version": "0.7.3",
   "description": "Game Context Framework for AI Factory",
   "skills": [
     "skills/gcf-init",

package/lib/board.js

@@ -132,8 +132,28 @@ const SCALARS = [
   'effort',
 ];
 
-// Ranked items first, lower rank sooner; the unranked keep their file order after them.
-const byPriority = (a, b) => (a.priority ?? Infinity) - (b.priority ?? Infinity);
+/**
+ * Ranked items first, lower rank sooner. The unranked follow in dependency order: what can run
+ * now first, each item after every open item it depends on; file order breaks a tie.
+ */
+function inRunOrder(items) {
+  const byId = new Map(items.map((i) => [i.id, i]));
+  const depth = new Map();
+  const depthOf = (i) => {
+    if (depth.has(i.id)) return depth.get(i.id);
+    depth.set(i.id, 0); // a depends cycle stops here
+    const open = i.depends.map((d) => byId.get(d)).filter(Boolean);
+    depth.set(i.id, open.length ? 1 + Math.max(...open.map(depthOf)) : 0);
+
+    return depth.get(i.id);
+  };
+
+  // Two unranked items give NaN (Infinity - Infinity), which falls through to the depth.
+  return items.sort(
+    (a, b) => (a.priority ?? Infinity) - (b.priority ?? Infinity) || depthOf(a) - depthOf(b),
+  );
+}
+
 const LISTS = ['children', 'system', 'depends'];
 
 /** One item of the board. */
@@ -174,7 +194,7 @@ export async function board(projectDir) {
   const verified = verifiedOf(projectDir);
   const items = [];
   for (const c of ledger.items) items.push(await itemOf(projectDir, c, verified));
-  items.sort(byPriority);
+  inRunOrder(items);
 
   const config = await readConfig(root);
   const live = await readLive(root);

package/lib/integrate.js

@@ -302,6 +302,8 @@ export async function integrate(projectDir, ids = []) {
     throw new Error(`integrate runs in the main checkout on its branch, not on ${branch}`);
 
   return withMainLock(projectDir, async () => {
+    // Nothing to merge leaves main alone: a run's first integrate must not refuse a dirty tree.
+    if (!ids.length && !verifiedBranches(projectDir).length) return [];
     if (git(projectDir, ['status', '--porcelain', '--untracked-files=no', '--', '.', METRICS]).out)
       throw new Error('main has uncommitted changes: commit or stash them before integrating');
     commitMetrics(projectDir);

package/package.json

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