@unson/brainbase-mcp 0.22.2 → 0.22.4

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@unson/brainbase-mcp",
-  "version": "0.22.2",
+  "version": "0.22.4",
   "description": "Local-first Brainbase judgment OS that lets supported AI agents reuse a user's approved goals, priorities, decisions, and judgment criteria.",
   "type": "module",
   "license": "MIT",
@@ -407,5 +407,5 @@
   "engines": {
     "node": ">=20"
   },
-  "gitHead": "3a54233ed19d3ddae6b1f346955fecb878af962e"
+  "gitHead": "8c472153bac9ae0d439f8275a2c640f46ae03699"
 }

package/ui/graph-projects-view.js

@@ -298,6 +298,9 @@ export function createGraphProjectsView({
   let contextRequest = 0;
   let detailRequest = 0;
   let hostListRequest = 0;
+  // An explicitly selected project may be read in parallel with the host
+  // list, but the list remains authoritative for whether its detail is shown.
+  let initialSelectionGate = null;
   let viewDestroyed = false;
 
   const correction = createGraphCorrection({
@@ -415,7 +418,7 @@ export function createGraphProjectsView({
   }
 
   /** Reads supplementary sections independently of the Graph project detail. */
-  async function loadProjectContextFor(id, { keep = false } = {}) {
+  async function loadProjectContextFor(id, { keep = false, deferUntilHostList = null } = {}) {
     if (viewDestroyed) return state.context;
     if (typeof loadProjectContext !== 'function') {
       if (state.context?.projectId !== id) state.context = null;
@@ -425,9 +428,16 @@ export function createGraphProjectsView({
     const request = ++contextRequest;
     state.context = normalizeProjectContext(id, { state: 'loading' });
     controller.render();
-    const applyContext = (snapshot) => {
+    const applyContext = (snapshot, { flushDeferred = false } = {}) => {
       const normalized = normalizeProjectContext(id, snapshot);
       if (viewDestroyed || request !== contextRequest || state.selectedId !== id) return false;
+      if (deferUntilHostList && !deferUntilHostList.confirmed && !flushDeferred) {
+        if (!deferUntilHostList.cancelled && initialSelectionGate === deferUntilHostList) {
+          deferUntilHostList.pendingContext = normalized;
+          deferUntilHostList.flushContext = () => applyContext(normalized, { flushDeferred: true });
+        }
+        return false;
+      }
       state.context = normalized;
       // Context progress must not rebuild the workspace: rebuilding destroys
       // Sigma's viewport and resets the user's active tab/selection. Detail
@@ -796,6 +806,37 @@ export function createGraphProjectsView({
     return children;
   }
 
+  function cancelInitialSelectionGate(gate, { reset = true } = {}) {
+    if (!gate || gate.cancelled || gate.confirmed) return;
+    gate.cancelled = true;
+    gate.pendingContext = null;
+    gate.pendingDetail = null;
+    gate.flushContext = null;
+    gate.flushDetail = null;
+    if (initialSelectionGate === gate) initialSelectionGate = null;
+    // A caller may have selected another project while this gate was pending.
+    // Do not invalidate that newer project's reads in that case.
+    if (!reset || state.selectedId !== gate.id) return;
+    detailRequest += 1;
+    contextRequest += 1;
+    if (state.detail?.id === gate.id && state.detail.state === 'loading') state.detail = null;
+    if (state.context?.projectId === gate.id && state.context.state === 'loading') state.context = null;
+  }
+
+  function confirmInitialSelectionGate(gate) {
+    if (!gate || gate.cancelled) return;
+    gate.confirmed = true;
+    if (initialSelectionGate === gate) initialSelectionGate = null;
+    // Responses which finished before the list are safe to expose now.  A
+    // response still in flight will apply through its normal completion path.
+    gate.flushDetail?.();
+    gate.flushContext?.();
+    gate.pendingDetail = null;
+    gate.pendingContext = null;
+    gate.flushDetail = null;
+    gate.flushContext = null;
+  }
+
   /** Reads the host's project list (see `load`). */
   async function loadHostList({ keep = false } = {}) {
     const request = ++hostListRequest;
@@ -804,14 +845,45 @@ export function createGraphProjectsView({
       state.list = { state: 'loading' };
       controller.render();
     }
+    let selectionGate = null;
+    let selectionDetailReading = null;
+    const selectedBeforeList = state.selectedId;
+    if (selectedBeforeList) {
+      if (initialSelectionGate?.id === selectedBeforeList && !initialSelectionGate.cancelled && !initialSelectionGate.confirmed) {
+        selectionGate = initialSelectionGate;
+        selectionDetailReading = selectionGate.detailReading;
+      } else if (state.detail === null) {
+        selectionGate = {
+          id: selectedBeforeList,
+          confirmed: false,
+          cancelled: false,
+          pendingContext: null,
+          pendingDetail: null,
+          flushContext: null,
+          flushDetail: null,
+          detailReading: null,
+        };
+        initialSelectionGate = selectionGate;
+        selectionDetailReading = controller.loadDetail(selectedBeforeList, {
+          keep,
+          deferUntilHostList: selectionGate,
+        });
+        selectionGate.detailReading = selectionDetailReading;
+      }
+    }
     const result = await client.read('/projects');
     if (viewDestroyed || request !== hostListRequest) return state.list;
     state.list = normalizeProjectList(result);
     if (state.list.state !== 'ok') {
+      cancelInitialSelectionGate(selectionGate);
       controller.render();
       return state.list;
     }
     const { projects } = state.list.payload;
+    if (selectionGate && (selectionGate.cancelled || state.selectedId !== selectionGate.id)) {
+      cancelInitialSelectionGate(selectionGate, { reset: false });
+      selectionGate = null;
+    }
     if (!state.selectedId) {
       if (correction.form) correction.close();
       state.panelAt = null;
@@ -832,6 +904,7 @@ export function createGraphProjectsView({
       // never be replaced with the first row when the refreshed list no
       // longer contains it.  Keeping the id makes the missing target visible
       // and lets the host decide whether its identity or access changed.
+      cancelInitialSelectionGate(selectionGate);
       if (correction.form) correction.close();
       detailRequest += 1;
       state.panelAt = null;
@@ -842,6 +915,11 @@ export function createGraphProjectsView({
       };
       state.context = null;
       contextRequest += 1;
+    } else if (selectionGate && selectionGate.id === state.selectedId) {
+      confirmInitialSelectionGate(selectionGate);
+      if (selectionDetailReading) await selectionDetailReading;
+      if (viewDestroyed || request !== hostListRequest) return state.list;
+      return state.list;
     } else if (state.detail?.id !== state.selectedId || state.detail?.state === 'not_found') {
       // The project the host asked for is listed; read it for the rail.
       if (viewDestroyed || request !== hostListRequest) return state.list;
@@ -876,6 +954,7 @@ export function createGraphProjectsView({
       hostListRequest += 1;
       detailRequest += 1;
       contextRequest += 1;
+      initialSelectionGate = null;
       knowledgeWorkspace?.destroy();
       knowledgeWorkspace = null;
       correction.close();
@@ -925,7 +1004,7 @@ export function createGraphProjectsView({
       return state.own.detail;
     },
     /** `keep` shows the current detail until the new one has been read. */
-    async loadDetail(id, { keep = false } = {}) {
+    async loadDetail(id, { keep = false, deferUntilHostList = null } = {}) {
       if (viewDestroyed) return state.detail;
       const request = ++detailRequest;
       const previous = state.detail;
@@ -933,13 +1012,26 @@ export function createGraphProjectsView({
         state.detail = { id, state: 'loading' };
         controller.render();
       }
-      const contextReading = loadProjectContextFor(id, { keep });
+      const contextReading = loadProjectContextFor(id, { keep, deferUntilHostList });
       const result = await client.read(`/projects/${encodeURIComponent(id)}`);
       if (viewDestroyed || request !== detailRequest || state.selectedId !== id) return state.detail;
-      state.detail = result.state === 'error' && result.status === 404
+      const detail = result.state === 'error' && result.status === 404
         ? { id, state: 'not_found', reason: 'このプロジェクトは見つかりません。一覧を読み直してください。' }
         : { id, ...normalizeProjectDetail(result) };
-      controller.render();
+      const applyDetail = () => {
+        if (viewDestroyed || request !== detailRequest || state.selectedId !== id) return false;
+        state.detail = detail;
+        controller.render();
+        return true;
+      };
+      if (deferUntilHostList && !deferUntilHostList.confirmed) {
+        if (!deferUntilHostList.cancelled && initialSelectionGate === deferUntilHostList) {
+          deferUntilHostList.pendingDetail = detail;
+          deferUntilHostList.flushDetail = applyDetail;
+        }
+        return state.detail;
+      }
+      applyDetail();
       // The context is intentionally independent.  Its completion may trigger
       // one more render, but never changes the Graph detail result.
       void contextReading;
@@ -947,6 +1039,10 @@ export function createGraphProjectsView({
     },
     /** Selects a row: the rail shows that project, and an open correction is closed. */
     async selectProject(id) {
+      // A host selection supersedes a prefetched initial detail.  Cancel the
+      // gate before changing the id so A -> B -> A cannot make a later list
+      // response wait for the first A read.
+      cancelInitialSelectionGate(initialSelectionGate, { reset: false });
       if (correction.form) correction.close();
       state.panelAt = null;
       state.selectedId = id;

package/ui/world/world-district.js

@@ -14,7 +14,7 @@
  */
 
 import { THREE, MapControls } from './world-vendor.js';
-import { DISTRICT_STREETS, districtStage, districtStreetLots, skyAt } from './world-placement.js';
+import { DISTRICT_STREETS, districtGroundPlan, districtStage, districtStreetLots, skyAt } from './world-placement.js';
 import { canvasTexture, drawFacade, FACADE_SIZES, FACADE_UNITS, gableRoof, hashUnit, paintVertices, roundedPlate, valueNoise } from './world-scenery.js';
 import { makeWorkspaceElement as el } from '../../workspace-kit.js';
 
@@ -535,8 +535,8 @@ export function createDistrictView({ doc, stage, reducedMotion = false, onPick,
     // The stage of the district (AC-24): counted from permanent buildings, it sets how built-up it looks.
     const stage = districtStage(shown);
     const grown = stage.level;
-    const gateZ = L / 2 + 4;
-    const hallZ = -L / 2 - 7;
+    const plan = districtGroundPlan(L);
+    const { gateZ, hallZ, plazaZ, plazaRadius } = plan;
     // Land as in the world: gentle, non-repeating shades of grass (scenery).
     const grass = { low: new THREE.Color(0x9fbf8c), high: new THREE.Color(0xd3e4bd), warm: new THREE.Color(0xd9d6a6) };
     const land = mesh(paintVertices(new THREE.CircleGeometry(150, 96, 0, Math.PI * 2), (color, x, y) => {
@@ -554,7 +554,8 @@ export function createDistrictView({ doc, stage, reducedMotion = false, onPick,
     const lift = new THREE.Group();
     lift.position.y = 0.17;
     root.add(lift);
-    streetStrip(lift, { x: 0, z: (gateZ + 8 + hallZ + 3) / 2, width: DISTRICT_STREETS.main * 2, length: gateZ + 8 - (hallZ + 3), centreLine: grown >= 2, dirt: grown === 0 });
+    // The main street ends at the plaza's edge; it never runs under the plaza (that overlap flickered).
+    streetStrip(lift, { x: 0, z: (plan.street.from + plan.street.to) / 2, width: DISTRICT_STREETS.main * 2, length: plan.street.to - plan.street.from, centreLine: grown >= 2, dirt: grown === 0 });
     streetStrip(lift, { x: -DISTRICT_STREETS.backStreet, z: 0, width: 1.6, length: L + 2, dirt: grown < 2 });
     streetStrip(lift, { x: DISTRICT_STREETS.backStreet, z: 0, width: 1.6, length: L + 2, dirt: grown < 2 });
     // A cross street between the blocks, and at the hall end of each block a sign saying what its work is for.
@@ -616,20 +617,20 @@ export function createDistrictView({ doc, stage, reducedMotion = false, onPick,
     const hallChimney = new THREE.Vector3(2.8, 5.2, hallZ - 1.2);
     const purposeText = work?.status === 'ok' ? (work.purpose.text ?? '目的は未登録') : '目的を読めません';
     addLabel(`庁舎：${business.name}（${purposeText}）`, new THREE.Vector3(0, 5.6, hallZ), 'is-plaza', { priority: 1 });
-    const plaza = mesh(new THREE.CircleGeometry(3.6, 48), material(0xf1ece1, { roughness: 1 }), { y: 0.2, z: hallZ + 5.4, shadow: false });
+    const plaza = mesh(new THREE.CircleGeometry(plazaRadius - 0.25, 48), material(0xf1ece1, { roughness: 1 }), { y: 0.24, z: plazaZ, shadow: false });
     plaza.rotation.x = -Math.PI / 2;
     root.add(plaza);
-    const ring = mesh(new THREE.RingGeometry(3.6, 3.85, 48), material(0xcfc8b8, { roughness: 1 }), { y: 0.21, z: hallZ + 5.4, shadow: false });
+    const ring = mesh(new THREE.RingGeometry(plazaRadius - 0.25, plazaRadius, 48), material(0xcfc8b8, { roughness: 1 }), { y: 0.25, z: plazaZ, shadow: false });
     ring.rotation.x = -Math.PI / 2;
     root.add(ring);
     if (grown >= 3) {
       // A fountain in the plaza once the district is a 街.
       const basin = material(0xd9d3c6, { roughness: 0.8 });
-      root.add(mesh(new THREE.CylinderGeometry(1.0, 1.1, 0.35, 32), basin, { y: 0.37, z: hallZ + 5.4 }));
-      const water = mesh(new THREE.CylinderGeometry(0.88, 0.88, 0.04, 32), material(0x7fc4d6, { roughness: 0.15, metalness: 0.1, transparent: true, opacity: 0.85 }), { y: 0.52, z: hallZ + 5.4, shadow: false });
+      root.add(mesh(new THREE.CylinderGeometry(1.0, 1.1, 0.35, 32), basin, { y: 0.37, z: plazaZ }));
+      const water = mesh(new THREE.CylinderGeometry(0.88, 0.88, 0.04, 32), material(0x7fc4d6, { roughness: 0.15, metalness: 0.1, transparent: true, opacity: 0.85 }), { y: 0.52, z: plazaZ, shadow: false });
       root.add(water);
-      root.add(mesh(new THREE.CylinderGeometry(0.12, 0.16, 0.7, 12), basin, { y: 0.7, z: hallZ + 5.4 }));
-      const jet = mesh(new THREE.ConeGeometry(0.22, 0.6, 12, 1, true), material(0xcfeef5, { transparent: true, opacity: 0.6, emissive: new THREE.Color(0x6fb6c9), emissiveIntensity: 0.2 }), { y: 1.25, z: hallZ + 5.4, shadow: false });
+      root.add(mesh(new THREE.CylinderGeometry(0.12, 0.16, 0.7, 12), basin, { y: 0.7, z: plazaZ }));
+      const jet = mesh(new THREE.ConeGeometry(0.22, 0.6, 12, 1, true), material(0xcfeef5, { transparent: true, opacity: 0.6, emissive: new THREE.Color(0x6fb6c9), emissiveIntensity: 0.2 }), { y: 1.25, z: plazaZ, shadow: false });
       jet.rotation.x = Math.PI;
       root.add(jet);
       fountainJet = jet;
@@ -648,7 +649,7 @@ export function createDistrictView({ doc, stage, reducedMotion = false, onPick,
     policies.forEach((policy, index) => {
       const angle = Math.PI * (0.15 + (0.7 * index) / Math.max(policies.length - 1, 1));
       const x = Math.cos(angle) * 2.8;
-      const z = hallZ + 5.4 + Math.sin(angle) * 1.6;
+      const z = plazaZ + Math.sin(angle) * 1.6;
       if (policy.link === 'recorded') {
         root.add(box(0.5, 1.2, 0.22, 0xa8a49a, { x, y: 0.8, z }, { roughness: 0.9 }));
       } else {

package/ui/world/world-placement.js

@@ -194,6 +194,23 @@ export function districtStreetLots(sites, { minRows = 4 } = {}) {
   return { lots, streets, rows, length };
 }
 
+/**
+ * Where the gate, the plaza and the hall stand around the blocks of a district (`length` from
+ * `districtStreetLots`).  The main street runs from beyond the gate to the plaza's edge and never into
+ * it, and the plaza stays clear of the first row of lots.
+ */
+export function districtGroundPlan(length) {
+  const plazaRadius = 3.85;
+  const plazaZ = -length / 2 - 1.5 - plazaRadius;
+  return {
+    gateZ: length / 2 + 4,
+    plazaZ,
+    plazaRadius,
+    hallZ: plazaZ - 5.4,
+    street: { from: plazaZ + plazaRadius, to: length / 2 + 12 },
+  };
+}
+
 /*
  * The town grows (story-world-work-sites-and-gaps-v1, AC-22〜24).  It grows only from evidenced outcomes
  * and closed gaps, never from activity: counting completions or edits would let splitting work inflate it.