@agentdeck/bridge 1.0.5 → 1.0.6

package/dist/daemon-server.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"daemon-server.d.ts","sourceRoot":"","sources":["../src/daemon-server.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;GAWG;AAIH,OAAO,SAAS,MAAM,IAAI,CAAC;AAC3B,OAAO,EAAE,UAAU,EAA8B,MAAM,kBAAkB,CAAC;AAmF1E,OAAO,EAA8D,KAAK,YAAY,EAAE,MAAM,gBAAgB,CAAC;AA6P/G;;;;;;;;;;;GAWG;AACH,wBAAgB,wBAAwB,CACtC,IAAI,EAAE;IAAE,KAAK,CAAC,EAAE,MAAM,CAAC;IAAC,EAAE,CAAC,EAAE,MAAM,CAAA;CAAE,GAAG,IAAI,EAC5C,YAAY,EAAE,KAAK,CAAC;IAAE,KAAK,EAAE,MAAM,CAAC;IAAC,EAAE,CAAC,EAAE,MAAM,CAAA;CAAE,CAAC,GAClD,OAAO,CAST;AAkBD,iBAAS,iBAAiB,CAAC,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,EAAE,EAAE,EAAE,SAAS,GAAG,IAAI,CA+C1E;AAYD,iBAAS,yBAAyB,CAAC,EAAE,EAAE,SAAS,GAAG,IAAI,CAStD;AAED,iBAAS,mBAAmB,CAAC,GAAG,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,OAAO,CAsBlE;AA6ED,gBAAgB;AAChB,wBAAgB,uBAAuB,CAAC,CAAC,EAAE;IAAE,KAAK,CAAC,EAAE,MAAM,CAAC;IAAC,KAAK,CAAC,EAAE,MAAM,CAAC;IAAC,GAAG,CAAC,EAAE,MAAM,CAAC;IAAC,aAAa,CAAC,EAAE,MAAM,CAAA;CAAE,GAAG,IAAI,CAKzH;AACD,gBAAgB;AAChB,wBAAgB,wBAAwB,IAAI,IAAI,CAS/C;AACD,gBAAgB;AAChB,eAAO,MAAM,gBAAgB;;;;;CAK5B,CAAC;AAEF,iBAAe,mBAAmB,CAAC,IAAI,EAAE,UAAU,EAAE,MAAM,EAAE,MAAM,EAAE,YAAY,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC,CA8F3H;AAoHD,iEAAiE;AACjE,wBAAsB,iBAAiB,CAAC,QAAQ,EAAE,MAAM,GAAG,OAAO,CAAC,YAAY,GAAG,IAAI,CAAC,CAsBtF;AAED;;;;;;;;;GASG;AACH,wBAAgB,0BAA0B,CAAC,CAAC,SAAS;IAAE,SAAS,CAAC,EAAE,MAAM,CAAC;IAAC,WAAW,CAAC,EAAE,MAAM,CAAC;IAAC,SAAS,CAAC,EAAE,MAAM,CAAA;CAAE,EACnH,KAAK,EAAE,CAAC,GACP,CAAC,CAWH;AAED;;;;;;;;;;;;;;;;;;;;;;;;GAwBG;AACH,wBAAgB,yBAAyB,CACvC,SAAS,EAAE,MAAM,EACjB,MAAM,EAAE,MAAM,GACb;IAAE,QAAQ,EAAE,MAAM,CAAC;IAAC,SAAS,EAAE,aAAa,GAAG,WAAW,GAAG,UAAU,GAAG,aAAa,CAAA;CAAE,CAa3F;AAID,MAAM,WAAW,aAAa;IAC5B,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,KAAK,CAAC,EAAE,OAAO,CAAC;IAChB,QAAQ,CAAC,EAAE,OAAO,CAAC;CACpB;AAiHD,wBAAsB,WAAW,CAAC,IAAI,EAAE,aAAa,GAAG,OAAO,CAAC,IAAI,CAAC,CA6rHpE"}
+{"version":3,"file":"daemon-server.d.ts","sourceRoot":"","sources":["../src/daemon-server.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;GAWG;AAIH,OAAO,SAAS,MAAM,IAAI,CAAC;AAC3B,OAAO,EAAE,UAAU,EAA8B,MAAM,kBAAkB,CAAC;AAmF1E,OAAO,EAA8D,KAAK,YAAY,EAAE,MAAM,gBAAgB,CAAC;AA6P/G;;;;;;;;;;;GAWG;AACH,wBAAgB,wBAAwB,CACtC,IAAI,EAAE;IAAE,KAAK,CAAC,EAAE,MAAM,CAAC;IAAC,EAAE,CAAC,EAAE,MAAM,CAAA;CAAE,GAAG,IAAI,EAC5C,YAAY,EAAE,KAAK,CAAC;IAAE,KAAK,EAAE,MAAM,CAAC;IAAC,EAAE,CAAC,EAAE,MAAM,CAAA;CAAE,CAAC,GAClD,OAAO,CAST;AAkBD,iBAAS,iBAAiB,CAAC,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,EAAE,EAAE,EAAE,SAAS,GAAG,IAAI,CA+C1E;AAYD,iBAAS,yBAAyB,CAAC,EAAE,EAAE,SAAS,GAAG,IAAI,CAStD;AAED,iBAAS,mBAAmB,CAAC,GAAG,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,OAAO,CAsBlE;AA6ED,gBAAgB;AAChB,wBAAgB,uBAAuB,CAAC,CAAC,EAAE;IAAE,KAAK,CAAC,EAAE,MAAM,CAAC;IAAC,KAAK,CAAC,EAAE,MAAM,CAAC;IAAC,GAAG,CAAC,EAAE,MAAM,CAAC;IAAC,aAAa,CAAC,EAAE,MAAM,CAAA;CAAE,GAAG,IAAI,CAKzH;AACD,gBAAgB;AAChB,wBAAgB,wBAAwB,IAAI,IAAI,CAS/C;AACD,gBAAgB;AAChB,eAAO,MAAM,gBAAgB;;;;;CAK5B,CAAC;AAEF,iBAAe,mBAAmB,CAAC,IAAI,EAAE,UAAU,EAAE,MAAM,EAAE,MAAM,EAAE,YAAY,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC,CA8F3H;AAoHD,iEAAiE;AACjE,wBAAsB,iBAAiB,CAAC,QAAQ,EAAE,MAAM,GAAG,OAAO,CAAC,YAAY,GAAG,IAAI,CAAC,CAsBtF;AAED;;;;;;;;;GASG;AACH,wBAAgB,0BAA0B,CAAC,CAAC,SAAS;IAAE,SAAS,CAAC,EAAE,MAAM,CAAC;IAAC,WAAW,CAAC,EAAE,MAAM,CAAC;IAAC,SAAS,CAAC,EAAE,MAAM,CAAA;CAAE,EACnH,KAAK,EAAE,CAAC,GACP,CAAC,CAWH;AAED;;;;;;;;;;;;;;;;;;;;;;;;GAwBG;AACH,wBAAgB,yBAAyB,CACvC,SAAS,EAAE,MAAM,EACjB,MAAM,EAAE,MAAM,GACb;IAAE,QAAQ,EAAE,MAAM,CAAC;IAAC,SAAS,EAAE,aAAa,GAAG,WAAW,GAAG,UAAU,GAAG,aAAa,CAAA;CAAE,CAa3F;AAID,MAAM,WAAW,aAAa;IAC5B,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,KAAK,CAAC,EAAE,OAAO,CAAC;IAChB,QAAQ,CAAC,EAAE,OAAO,CAAC;CACpB;AAiHD,wBAAsB,WAAW,CAAC,IAAI,EAAE,aAAa,GAAG,OAAO,CAAC,IAAI,CAAC,CAuwHpE"}

package/dist/daemon-server.js

@@ -64,7 +64,7 @@ import { FallbackTaskTimeline } from './fallback-task-timeline.js';
 import { handleApmeRequest } from './apme/http.js';
 import { readModelFromTranscript } from './apme/claude-transcript-reader.js';
 import { transcriptTimelineForSession, lastAssistantTextFromTranscript, lastAssistantTextForSession, } from './session-transcript-timeline.js';
-import { DeviceVoiceReplyRouter, speakableReply, pcmFromWav, } from './device-voice-reply.js';
+import { DeviceVoiceReplyRouter, speakableReply, spokenDigest, pcmFromWav, } from './device-voice-reply.js';
 import { rawSessionId } from '@agentdeck/shared';
 import { lastAgentMessageFromCodexRollout } from './codex-rollout-response.js';
 import { callFoundationModelsHelper } from './foundation-models-helper.js';
@@ -75,7 +75,7 @@ import { getConnectedAdbDevices, hasAdb, getAdbDeviceCount } from './adb-reverse
 import { getPixooDeviceDetails, pixooDeviceCount } from './pixoo/pixoo-bridge.js';
 import { loadTimeboxDevices } from './timebox/timebox-settings.js';
 import { getLanIp, stripUnsafeText, cleanRawText, prepareMarkdownDetail, normalizeCommandPrompt, formatDurationSec } from '@agentdeck/shared';
-import { injectOpenClawSession } from './openclaw-session.js';
+import { injectOpenClawSession, OPENCLAW_SESSION_ID } from './openclaw-session.js';
 import { buildCardFeed, buildGlance, applyOutboxDecisions, FeedPullTracker, formatFeedPull, normalizeClientIp, parsePullTelemetry, } from './card-feed.js';
 import { threadModule } from './card-modules.js';
 import { AutonomousPocketEngine, createAutonomousPocketModules, parsePocketAutonomyConfig, } from './pocket-autonomy.js';
@@ -983,6 +983,22 @@ export async function startDaemon(opts) {
     // `gatewaySessionState` / `gatewayModelName` dedicated fields.
     let gatewaySessionState = 'idle';
     let gatewayModelName;
+    /**
+     * Snapshot for an `openclaw` state event: the global machine with the
+     * Gateway-local model pinned back on.
+     *
+     * The Gateway's `model_info` no longer writes `core.stateMachine` (see the
+     * parser branch): that machine is fed by every observed Claude/Codex/OpenCode
+     * hook, and the hub stamps its broadcasts with the user's focused session —
+     * so a model written there by a *different* agent is read as the focused
+     * session's own. That is how `GLM-5.2 (1M)` appeared as the model of a Claude
+     * session on both decks. Keeping the model out of the shared slot means the
+     * Gateway's own events have to carry it explicitly, which is what this does.
+     */
+    const gatewaySnapshot = (base) => ({
+        ...(base ?? core.stateMachine.getSnapshot()),
+        modelName: gatewayModelName ?? null,
+    });
     // Wi-Fi WebSocket e-ink panels (XTeink X3/X4 CrossPoint fork) self-register
     // their device roster via `client_register{clientType:"eink-device"}` — the
     // same volunteer model as the Stream Deck plugin. This handler lived ONLY in
@@ -2475,6 +2491,24 @@ export async function startDaemon(opts) {
     core.wireDisplayMonitor();
     let lastStateEvent = null;
     let userFocusedSessionId = null;
+    /**
+     * Stamp the focused session onto a hub `state_update`.
+     *
+     * This field carries two jobs, and both are load-bearing, which is why it
+     * cannot simply be narrowed:
+     *  - attribution: `buildStateEvent` sets no `sessionId` at all, so a
+     *    hook-observed session's AWAITING_PERMISSION options reach the decks
+     *    attributed only by this field (see session-deck-awaiting tests).
+     *  - focus ack: the Apple app toggles creature focus against it and needs it
+     *    even for a session that emits nothing of its own.
+     *
+     * The consequence is a standing invariant on the payload: whatever rides along
+     * here is read as the focused session's own. So nothing may write a *different*
+     * agent's per-session field into `core.stateMachine` — the Gateway's model went
+     * in and came out as a Claude session's model. Gateway-specific state lives in
+     * `gatewaySessionState` / `gatewayModelName` and is re-attached by
+     * `gatewaySnapshot()`.
+     */
     const attachFocusedSessionId = (event) => {
         if (event.type !== 'state_update')
             return event;
@@ -2483,6 +2517,28 @@ export async function startDaemon(opts) {
             focusedSessionId: userFocusedSessionId ?? '',
         };
     };
+    /**
+     * Stamp a *Gateway-specific* state event — one whose payload really is the
+     * Gateway's (its parser events, its connection transitions), as opposed to the
+     * hub broadcasts above that merely get labelled `openclaw` while the Gateway is
+     * alive.
+     *
+     * These name their own row (`sessionId`), which is the honest attribution and
+     * the reason a client never has to guess: an event carrying the Gateway's model
+     * now says so. The focus ack rides only when the Gateway IS the focused row —
+     * otherwise this event would claim to describe a Claude session, which is
+     * precisely how `GLM-5.2 (1M)` became that session's model on both decks. The
+     * ack still reaches the Apple app through every hub broadcast.
+     */
+    const attachGatewayEvent = (event) => {
+        if (event.type !== 'state_update')
+            return event;
+        return {
+            ...event,
+            sessionId: OPENCLAW_SESSION_ID,
+            focusedSessionId: userFocusedSessionId === OPENCLAW_SESSION_ID ? OPENCLAW_SESSION_ID : '',
+        };
+    };
     const broadcastFocusedState = () => {
         const gwAlive = gatewayAdapter?.isAlive() ?? false;
         const stateEvent = attachFocusedSessionId(core.buildStateEvent({
@@ -2932,7 +2988,14 @@ export async function startDaemon(opts) {
                         core.stateMachine.handleHookEvent('SessionEnd', {});
                     break;
                 case 'parser':
-                    core.stateMachine.handleParserEvent(evt.event, evt.data);
+                    // `model_info` is deliberately NOT forwarded: the global machine holds
+                    // one modelName for the whole hub, fed by every observed hook session,
+                    // and its broadcasts are stamped with the user's focused session — so a
+                    // model written here by the Gateway is read as that session's own
+                    // (GLM on a Claude row). It lives in `gatewayModelName` instead, and
+                    // `gatewaySnapshot()` puts it back on the Gateway's own events.
+                    if (evt.event !== 'model_info')
+                        core.stateMachine.handleParserEvent(evt.event, evt.data);
                     // Gateway-local activity state for the virtual session row (mirror of
                     // Swift `gatewaySessionState`). Kept separate from the global
                     // `core.stateMachine` above so the OpenClaw row reflects only the
@@ -2961,10 +3024,10 @@ export async function startDaemon(opts) {
                         if (models) {
                             core.cachedModelCatalog = models;
                             const snap = core.stateMachine.getSnapshot();
-                            const stateEvent = attachFocusedSessionId(core.buildStateEvent({
+                            const stateEvent = attachGatewayEvent(core.buildStateEvent({
                                 agentType: 'openclaw',
                                 agentCapabilities: OPENCLAW_CAPABILITIES,
-                                snapshot: snap,
+                                snapshot: gatewaySnapshot(snap),
                             }));
                             lastStateEvent = stateEvent;
                             core.broadcast(stateEvent);
@@ -3017,10 +3080,10 @@ export async function startDaemon(opts) {
                         }
                         // Force full state broadcast
                         const snap = core.stateMachine.getSnapshot();
-                        const gwStateEvent = attachFocusedSessionId(core.buildStateEvent({
+                        const gwStateEvent = attachGatewayEvent(core.buildStateEvent({
                             agentType: 'openclaw',
                             agentCapabilities: OPENCLAW_CAPABILITIES,
-                            snapshot: snap,
+                            snapshot: gatewaySnapshot(snap),
                         }));
                         lastStateEvent = gwStateEvent;
                         core.wsServer.broadcast(gwStateEvent);
@@ -3434,10 +3497,10 @@ export async function startDaemon(opts) {
             if (target === 'openclaw' && gatewayAdapter?.isAlive()) {
                 // Force broadcast OpenClaw state to all clients
                 const snap = core.stateMachine.getSnapshot();
-                const gwStateEvent = attachFocusedSessionId(core.buildStateEvent({
+                const gwStateEvent = attachGatewayEvent(core.buildStateEvent({
                     agentType: 'openclaw',
                     agentCapabilities: OPENCLAW_CAPABILITIES,
-                    snapshot: snap,
+                    snapshot: gatewaySnapshot(snap),
                 }));
                 lastStateEvent = gwStateEvent;
                 core.wsServer.broadcast(gwStateEvent);
@@ -3799,7 +3862,18 @@ export async function startDaemon(opts) {
         const voiceCfg = loadDaemonSettings().voice;
         if (voiceCfg?.speakReplies === false)
             return; // opt-out, default on
-        const spoken = speakableReply(text);
+        // Speech gets the lead, not the transcript: an explicit summary line if the
+        // answer has one, else its first sentence. The full answer is already on the
+        // screen the user is sitting at, where it can be skimmed — read aloud it is
+        // a minute of monologue nobody can skip. `voice.speakFullReply` opts back in.
+        const full = voiceCfg?.speakFullReply === true;
+        const spoken = spokenDigest(text, { full });
+        if (!full) {
+            const readable = speakableReply(text, Number.MAX_SAFE_INTEGER);
+            if (spoken && readable.length > spoken.length) {
+                log(`[agentdeck] voice: reply digested ${readable.length} -> ${spoken.length} chars`);
+            }
+        }
         if (!spoken) {
             // A code-only answer has nothing worth reading aloud; say that instead of
             // spelling out punctuation, so the user still knows the turn finished.