@nac3/forge-cli 1.0.48 → 1.0.49

package/dist/chat/server.d.ts

@@ -74,6 +74,19 @@ interface Ctx {
     setBrainProvider?: (mode: 'plan' | 'console') => Promise<boolean>;
     bridge?: import('./bridge.js').BridgeHandle | null;
 }
+/** Pure ownership decision for a mobile chat command across N desktop
+ *  instances (Pablo 2026-06-23). Exactly one instance must run each command.
+ *  Run when: no slug (legacy mobile -> old broadcast); the slug is MY active
+ *  project; I am alone / no bridge; or it is an orphan project (no live peer
+ *  owns it) and I am the lowest-id instance. Skip when a live peer owns it. */
+export declare function ownsMobileCommand(opts: {
+    projectSlug?: string;
+    activeSlug: string | null;
+    peerSlugs: Set<string>;
+    liveIds: string[];
+    selfId: string;
+    hasBridge: boolean;
+}): boolean;
 export declare function buildSystemPrompt(ctx: Ctx, mode?: ForgeMode, pilotState?: {
     pilot_completed: boolean;
     target_pending: boolean;

package/dist/chat/server.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"server.d.ts","sourceRoot":"","sources":["../../src/chat/server.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"server.d.ts","sourceRoot":"","sources":["../../src/chat/server.ts"],"names":[],"mappings":"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"}

package/dist/chat/server.js

@@ -440,7 +440,15 @@ export async function startChatServer(opts) {
      * restart needed). When the relay is off it is a cheap no-op timer. */
     let commandConsumerHandle = null;
     try {
-        commandConsumerHandle = startDesktopCommandConsumer(opts.port);
+        commandConsumerHandle = startDesktopCommandConsumer(opts.port, {
+            /* live so a reanchor moves which commands this instance owns */
+            getActiveSlug: () => session.projectSlug,
+            /* bridgeHandle is assigned just below; the closure reads it lazily at
+             * refresh time (after boot), so multi-instance ownership works without
+             * reordering. Null bridge -> single-instance assumption (run all). */
+            getBridgeState: async () => (bridgeHandle ? bridgeHandle.state() : null),
+            getSelfId: () => bridgeHandle?.selfId ?? '',
+        });
     }
     catch {
         commandConsumerHandle = null;
@@ -575,8 +583,68 @@ function getRelayPublisher() {
  * paired phone's chat commands, runs each through THIS server's own
  * /api/chat (loopback, so the full BYOK brain + project context apply),
  * and publishes the reply back as chat_reply. Gated YF_RELAY=1. */
-function startDesktopCommandConsumer(port) {
+/** Pure ownership decision for a mobile chat command across N desktop
+ *  instances (Pablo 2026-06-23). Exactly one instance must run each command.
+ *  Run when: no slug (legacy mobile -> old broadcast); the slug is MY active
+ *  project; I am alone / no bridge; or it is an orphan project (no live peer
+ *  owns it) and I am the lowest-id instance. Skip when a live peer owns it. */
+export function ownsMobileCommand(opts) {
+    if (!opts.projectSlug)
+        return true;
+    if (opts.projectSlug === opts.activeSlug)
+        return true;
+    if (!opts.hasBridge || opts.liveIds.length <= 1)
+        return true;
+    if (opts.peerSlugs.has(opts.projectSlug))
+        return false;
+    const lowest = [...opts.liveIds].sort()[0];
+    return opts.selfId !== '' && opts.selfId === lowest;
+}
+function startDesktopCommandConsumer(port, coord = {}) {
     const deviceId = 'desktop-' + process.pid;
+    /* Multi-instance project integrity (Pablo 2026-06-23). The relay is keyed
+     * only by handle, so EVERY yf chat on the machine reads the SAME command
+     * stream -> a phone command would run on ALL of them (duplicate execution,
+     * N replies). With the per-turn project binding, the phone tags each chat
+     * command with its project_slug; this lets each instance decide if the
+     * command is "mine". Rule: run it when (a) no slug (legacy mobile, keep old
+     * broadcast), (b) the slug is MY active project, or (c) no OTHER live
+     * instance owns that project (single instance, or an orphan project where
+     * the lowest-id instance takes it). So exactly ONE instance runs each
+     * command. Decision is sync off a cached bridge snapshot refreshed below. */
+    let peerSnapshot = { slugs: new Set(), liveIds: [], hasBridge: false };
+    const PEER_FRESH_MS = 15_000;
+    const refreshPeers = async () => {
+        if (!coord.getBridgeState)
+            return;
+        try {
+            const st = await coord.getBridgeState();
+            if (!st || !Array.isArray(st.instances)) {
+                peerSnapshot = { slugs: new Set(), liveIds: [], hasBridge: false };
+                return;
+            }
+            const cut = Date.now() - PEER_FRESH_MS;
+            const live = st.instances.filter((i) => i && typeof i.last_seen === 'number' && i.last_seen >= cut);
+            const self = coord.getSelfId ? coord.getSelfId() : '';
+            peerSnapshot = {
+                slugs: new Set(live.filter((i) => i.id !== self).map((i) => String(i.project_slug || '')).filter(Boolean)),
+                liveIds: live.map((i) => i.id),
+                hasBridge: true,
+            };
+        }
+        catch { /* keep the last snapshot on a transient failure */ }
+    };
+    const peerTimer = setInterval(() => { void refreshPeers(); }, 2500);
+    if (typeof peerTimer.unref === 'function')
+        peerTimer.unref();
+    const ownsChatCommand = (projectSlug) => ownsMobileCommand({
+        ...(projectSlug ? { projectSlug } : {}),
+        activeSlug: coord.getActiveSlug ? (coord.getActiveSlug() ?? null) : null,
+        peerSlugs: peerSnapshot.slugs,
+        liveIds: peerSnapshot.liveIds,
+        selfId: coord.getSelfId ? coord.getSelfId() : '',
+        hasBridge: peerSnapshot.hasBridge,
+    });
     const pollCommands = async (since) => {
         const r = await relayPoll({ deviceId }, since, ['command']);
         return {
@@ -709,7 +777,9 @@ function startDesktopCommandConsumer(port) {
      * past the skipped events. */
     const chat = startCommandConsumer({
         enabled: relayEnabled, intervalMs: 3000,
-        accept: (c) => !c.control,
+        /* only MY project's chat commands (multi-instance integrity); the other
+         * instances' consumers advance their cursor past the skipped ones. */
+        accept: (c) => !c.control && ownsChatCommand(c.projectSlug),
         pollCommands, runTurn, reply,
         ackImmediate: true, /* confirm receipt before the turn runs */
         onError: () => { },
@@ -721,8 +791,8 @@ function startDesktopCommandConsumer(port) {
         onError: () => { },
     });
     return {
-        stop() { chat.stop(); control.stop(); },
-        tickOnce: async () => { await chat.tickOnce(); await control.tickOnce(); },
+        stop() { clearInterval(peerTimer); chat.stop(); control.stop(); },
+        tickOnce: async () => { await refreshPeers(); await chat.tickOnce(); await control.tickOnce(); },
     };
 }
 /* Project context for board snapshots, set per chat turn (handleChat). */