instar 1.3.370 → 1.3.372

package/dist/server/routes.js

@@ -4997,12 +4997,40 @@ export function createRoutes(ctx) {
     // Read-only cross-topic index: every topic with intent state + its current focus +
     // high-specificity tags + whether a session is live on it. Signal-only; never gates.
     // 503 when the index is unavailable (no stateDir / init failed).
-    router.get('/parallel-work/activities', (_req, res) => {
+    router.get('/parallel-work/activities', async (req, res) => {
         if (!ctx.parallelActivityIndex) {
             res.status(503).json({ error: 'parallel-activity index unavailable (no stateDir or init failed)' });
             return;
         }
         const activities = ctx.parallelActivityIndex.activities();
+        // P4 (POOL-WIDE-PARALLEL-WORK-SPEC §3): ?scope=pool composes the local
+        // rows with replica-derived remote rows (LOCAL replica files — no peer
+        // fan-out; an offline peer's last-replicated streams still answer).
+        // Default scope stays byte-identical; a dark replica layer degrades the
+        // pool scope to local rows only (200, never a new 503).
+        if (req.query.scope === 'pool') {
+            try {
+                const poolMod = await import('../core/PoolActivityView.js');
+                const readerMod = await import('../core/CoherenceJournalReader.js');
+                const view = poolMod.buildPoolActivityView({
+                    ownMachineId: ctx.meshSelfId ?? 'local',
+                    local: activities,
+                    reader: new readerMod.CoherenceJournalReader({ stateDir: ctx.config.stateDir }),
+                });
+                res.json({
+                    scope: 'pool',
+                    count: view.rows.length,
+                    runningCount: view.rows.filter((a) => a.running).length,
+                    activities: view.rows,
+                    pool: view.pool,
+                });
+                return;
+            }
+            catch (err) {
+                res.status(500).json({ error: err instanceof Error ? err.message : String(err) });
+                return;
+            }
+        }
         res.json({
             count: activities.length,
             runningCount: activities.filter((a) => a.running).length,
@@ -13965,6 +13993,19 @@ export function createRoutes(ctx) {
             res.status(404).json({ error: 'CommitmentTracker not configured' });
             return;
         }
+        // P1.5b §3.4 owner-routing (replica-targeted beacon-field PATCH forwards).
+        {
+            const pOrigin = typeof req.query.origin === 'string' ? req.query.origin : undefined;
+            const pRoute = await resolveCommitmentRoute(req.params.id, pOrigin);
+            if (pRoute === 'ambiguous') {
+                res.status(409).json({ error: `Commitment id ${req.params.id} is ambiguous across machines — retry with ?origin=<machineId>` });
+                return;
+            }
+            if (typeof pRoute === 'object') {
+                await forwardMutation(res, pRoute.forward.owner, mutatePayload(req, pRoute.forward.owner, 'patch-beacon', req.body ?? {}));
+                return;
+            }
+        }
         const existing = ctx.commitmentTracker.get(req.params.id);
         if (!existing) {
             res.status(404).json({ error: `Commitment ${req.params.id} not found` });
@@ -14071,11 +14112,79 @@ export function createRoutes(ctx) {
      * came back with the promised update," separate from `verified` which means
      * "config state is as promised."
      */
-    router.post('/commitments/:id/deliver', (req, res) => {
+    /**
+     * P1.5b §3.4 — owner-routing decision for a mutation route. Returns:
+     *  'local'      → the record is OWN (or the layer is dark): mutate locally.
+     *  {forward}    → the record lives ONLY in a replica: forward to its owner.
+     *  'ambiguous'  → a bare id matches own AND replica rows (409, §3.1).
+     *  'absent'     → nowhere in the merged view (404 falls through to local).
+     */
+    async function resolveCommitmentRoute(id, origin) {
+        if (!ctx.commitmentReplicaStore || !ctx.commitmentTracker)
+            return 'local';
+        const syncMod = await import('../core/CommitmentsSync.js');
+        const rows = syncMod.mergeCommitmentViews({
+            ownMachineId: ctx.meshSelfId ?? 'local',
+            own: ctx.commitmentTracker.getAll(),
+            replicas: ctx.commitmentReplicaStore.allReplicas(),
+        });
+        const resolved = syncMod.resolveBareId(rows, id, origin);
+        if (resolved === 'ambiguous')
+            return 'ambiguous';
+        if (resolved === null)
+            return 'absent';
+        if (resolved.viewSource === 'own')
+            return 'local';
+        return { forward: { owner: resolved.originMachineId } };
+    }
+    /** Shared forward path: verdict → mapped response; queued → honest 202. */
+    async function forwardMutation(res, owner, payload) {
+        if (!ctx.forwardCommitmentMutate) {
+            res.status(409).json({
+                error: `Commitment ${payload.id} lives on ${owner} and cross-machine mutation is not enabled here`,
+            });
+            return;
+        }
+        const r = await ctx.forwardCommitmentMutate(owner, payload);
+        if (r.kind === 'queued') {
+            res.status(202).json({ queued: true, owner, reason: r.reason, opKey: payload.opKey });
+            return;
+        }
+        const v = r.outcome;
+        if (v.verdict === 'applied' || v.verdict === 'idempotent-noop') {
+            res.json({ delivered: payload.op === 'deliver' ? true : undefined, op: payload.op, id: payload.id, owner, verdict: v.verdict, status: v.status, ...(v.staleObservation ? { staleObservation: true } : {}) });
+            return;
+        }
+        res.status(v.verdict === 'not-found' ? 404 : 409).json({ error: `owner verdict: ${v.verdict}`, owner, status: v.status });
+    }
+    function mutatePayload(req, origin, op, args) {
+        return {
+            origin,
+            id: req.params.id,
+            op,
+            ...(args ? { args } : {}),
+            opKey: randomUUID(),
+            requestedAt: new Date().toISOString(),
+            callerMachineId: ctx.meshSelfId ?? 'local',
+            ...(typeof req.query.observedStatus === 'string' ? { observedStatus: req.query.observedStatus } : {}),
+        };
+    }
+    router.post('/commitments/:id/deliver', async (req, res) => {
         if (!ctx.commitmentTracker) {
             res.status(404).json({ error: 'CommitmentTracker not configured' });
             return;
         }
+        const origin = typeof req.query.origin === 'string' ? req.query.origin : undefined;
+        const route = await resolveCommitmentRoute(req.params.id, origin);
+        if (route === 'ambiguous') {
+            res.status(409).json({ error: `Commitment id ${req.params.id} is ambiguous across machines — retry with ?origin=<machineId>` });
+            return;
+        }
+        if (typeof route === 'object') {
+            const { deliveryMessageId } = req.body ?? {};
+            await forwardMutation(res, route.forward.owner, mutatePayload(req, route.forward.owner, 'deliver', deliveryMessageId ? { deliveryMessageId } : undefined));
+            return;
+        }
         const { deliveryMessageId } = req.body ?? {};
         const updated = ctx.commitmentTracker.deliver(req.params.id, deliveryMessageId);
         if (!updated) {
@@ -14084,7 +14193,7 @@ export function createRoutes(ctx) {
         }
         res.json({ delivered: true, id: updated.id, commitment: updated });
     });
-    router.post('/commitments/:id/withdraw', (req, res) => {
+    router.post('/commitments/:id/withdraw', async (req, res) => {
         if (!ctx.commitmentTracker) {
             res.status(404).json({ error: 'CommitmentTracker not configured' });
             return;
@@ -14094,6 +14203,17 @@ export function createRoutes(ctx) {
             res.status(400).json({ error: 'reason is required' });
             return;
         }
+        // P1.5b §3.4 owner-routing (replica-targeted withdraw forwards).
+        const wOrigin = typeof req.query.origin === 'string' ? req.query.origin : undefined;
+        const wRoute = await resolveCommitmentRoute(req.params.id, wOrigin);
+        if (wRoute === 'ambiguous') {
+            res.status(409).json({ error: `Commitment id ${req.params.id} is ambiguous across machines — retry with ?origin=<machineId>` });
+            return;
+        }
+        if (typeof wRoute === 'object') {
+            await forwardMutation(res, wRoute.forward.owner, mutatePayload(req, wRoute.forward.owner, 'withdraw', { reason }));
+            return;
+        }
         const success = ctx.commitmentTracker.withdraw(req.params.id, reason);
         if (!success) {
             res.status(404).json({ error: `Commitment ${req.params.id} not found or already resolved` });
@@ -14109,11 +14229,22 @@ export function createRoutes(ctx) {
      * event. No-op (404) for commitments that aren't paused or are in a terminal
      * status.
      */
-    router.post('/commitments/:id/resume', (req, res) => {
+    router.post('/commitments/:id/resume', async (req, res) => {
         if (!ctx.commitmentTracker) {
             res.status(404).json({ error: 'CommitmentTracker not configured' });
             return;
         }
+        // P1.5b §3.4 owner-routing (replica-targeted resume forwards).
+        const rOrigin = typeof req.query.origin === 'string' ? req.query.origin : undefined;
+        const rRoute = await resolveCommitmentRoute(req.params.id, rOrigin);
+        if (rRoute === 'ambiguous') {
+            res.status(409).json({ error: `Commitment id ${req.params.id} is ambiguous across machines — retry with ?origin=<machineId>` });
+            return;
+        }
+        if (typeof rRoute === 'object') {
+            await forwardMutation(res, rRoute.forward.owner, mutatePayload(req, rRoute.forward.owner, 'resume'));
+            return;
+        }
         const updated = ctx.commitmentTracker.resume(req.params.id);
         if (!updated) {
             res.status(404).json({ error: `Commitment ${req.params.id} not found, not paused, or in terminal status` });