@agentdeck/bridge 0.2.2 → 0.2.3

package/assets/fonts/LICENSES.md

@@ -0,0 +1,22 @@
+# Bundled fonts
+
+These TTFs are rasterized by resvg-js in the D200H image renderer
+(`bridge/src/d200h/image-renderer.ts`). They are loaded explicitly via
+`fontFiles` (not system-font scanning) so device tile rendering is fast and
+deterministic across macOS/Linux.
+
+All fonts are licensed under the **SIL Open Font License 1.1** (OFL-1.1),
+which permits bundling and redistribution.
+
+| File | Family | Source |
+|------|--------|--------|
+| `IBMPlexSans-Regular.ttf` | IBM Plex Sans | https://github.com/IBM/plex (OFL-1.1) |
+| `IBMPlexSans-Bold.ttf` | IBM Plex Sans (Bold) | https://github.com/IBM/plex (OFL-1.1) |
+| `JetBrainsMono-Regular.ttf` | JetBrains Mono | https://github.com/JetBrains/JetBrainsMono (OFL-1.1) |
+| `JetBrainsMono-Bold.ttf` | JetBrains Mono (Bold) | https://github.com/JetBrains/JetBrainsMono (OFL-1.1) |
+
+IBM Plex Sans + JetBrains Mono are the two canonical AgentDeck design-system
+faces (see `DESIGN.md` §3). `IBM Plex Sans` is the `defaultFontFamily` passed to
+resvg so any unresolved family in the shared SVG renderers (e.g. `Inter`,
+`Arial`, `monospace`) falls back to a design-system face instead of dropping
+text entirely.

package/dist/adapters/claude-code.d.ts

@@ -14,6 +14,12 @@ export declare class ClaudeCodeAdapter extends PtyAdapter {
     protected wireOutputParser(): void;
     protected feedParser(data: string): void;
     protected handleAgentCommand(cmd: PluginCommand): boolean;
+    /**
+     * Pre-seed the bridge-resolved (git-aware) project name so the parser's
+     * PROJECT_DIR scrape never fires. The scrape is kept only as a fallback for
+     * the rare case the resolver produced nothing meaningful.
+     */
+    seedProjectName(name: string): void;
     getProjectName(): string | null;
     prepareForNavigation(): void;
     /** Exposed for SSE broadcasting from bridge index (alias for getHookServer) */

package/dist/adapters/claude-code.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"claude-code.d.ts","sourceRoot":"","sources":["../../src/adapters/claude-code.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,iBAAiB,EAAE,aAAa,EAAE,MAAM,aAAa,CAAC;AAEpE,OAAO,EAAE,UAAU,EAAE,MAAM,kBAAkB,CAAC;AAE9C;;;GAGG;AACH,qBAAa,iBAAkB,SAAQ,UAAU;IAC/C,QAAQ,CAAC,YAAY,EAAE,iBAAiB,CAA4B;IAEpE,OAAO,CAAC,YAAY,CAAe;IACnC,2BAA2B;IAC3B,OAAO,CAAC,kBAAkB,CAAK;;IAO/B,SAAS,CAAC,iBAAiB,IAAI,MAAM;IAIrC,SAAS,CAAC,gBAAgB,IAAI,IAAI;IA4ClC,SAAS,CAAC,UAAU,CAAC,IAAI,EAAE,MAAM,GAAG,IAAI;IAIxC,SAAS,CAAC,kBAAkB,CAAC,GAAG,EAAE,aAAa,GAAG,OAAO;IAgBhD,cAAc,IAAI,MAAM,GAAG,IAAI;IAI/B,oBAAoB,IAAI,IAAI;IAIrC,+EAA+E;IAC/E,mBAAmB;CAGpB"}
+{"version":3,"file":"claude-code.d.ts","sourceRoot":"","sources":["../../src/adapters/claude-code.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,iBAAiB,EAAE,aAAa,EAAE,MAAM,aAAa,CAAC;AAEpE,OAAO,EAAE,UAAU,EAAE,MAAM,kBAAkB,CAAC;AAE9C;;;GAGG;AACH,qBAAa,iBAAkB,SAAQ,UAAU;IAC/C,QAAQ,CAAC,YAAY,EAAE,iBAAiB,CAA4B;IAEpE,OAAO,CAAC,YAAY,CAAe;IACnC,2BAA2B;IAC3B,OAAO,CAAC,kBAAkB,CAAK;;IAO/B,SAAS,CAAC,iBAAiB,IAAI,MAAM;IAIrC,SAAS,CAAC,gBAAgB,IAAI,IAAI;IA4ClC,SAAS,CAAC,UAAU,CAAC,IAAI,EAAE,MAAM,GAAG,IAAI;IAIxC,SAAS,CAAC,kBAAkB,CAAC,GAAG,EAAE,aAAa,GAAG,OAAO;IAgBzD;;;;OAIG;IACH,eAAe,CAAC,IAAI,EAAE,MAAM,GAAG,IAAI;IAI1B,cAAc,IAAI,MAAM,GAAG,IAAI;IAI/B,oBAAoB,IAAI,IAAI;IAIrC,+EAA+E;IAC/E,mBAAmB;CAGpB"}

package/dist/adapters/claude-code.js

@@ -76,6 +76,14 @@ export class ClaudeCodeAdapter extends PtyAdapter {
         }
         return false;
     }
+    /**
+     * Pre-seed the bridge-resolved (git-aware) project name so the parser's
+     * PROJECT_DIR scrape never fires. The scrape is kept only as a fallback for
+     * the rare case the resolver produced nothing meaningful.
+     */
+    seedProjectName(name) {
+        this.outputParser.seedProjectName(name);
+    }
     getProjectName() {
         return this.outputParser.getProjectName();
     }

package/dist/adapters/claude-code.js.map

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

package/dist/adapters/openclaw.d.ts

@@ -45,11 +45,34 @@ export declare class OpenClawAdapter extends EventEmitter implements AgentAdapte
     private chatIsAutomated;
     private deviceIdentity;
     private deviceAuthToken;
+    private sharedGatewayToken;
+    private disableDeviceAuthForNextConnect;
+    private apmeSessionId;
+    private apmeTraceId;
+    private apmeCwdHint;
+    /** Idle-gap timer — fires the `task_boundary` (idle_gap) span when the
+     *  user hasn't sent a new `chat.send` for OPENCLAW_IDLE_GAP_MS after the
+     *  last `chat.final`. Reset on every new send, cleared on session end. */
+    private apmeIdleTimer;
     /** Reconnect delay (doubles on each failure, max 30s) */
     private reconnectDelay;
     private static readonly MAX_RECONNECT_DELAY;
     private static readonly RPC_TIMEOUT;
     constructor(options?: string | OpenClawAdapterOptions);
+    /** Bind the adapter to an APME session id so Gateway events can be
+     *  ingested as TelemetrySpans. No-op when APME isn't initialized. */
+    setApmeSession(sessionId: string, cwd?: string): void;
+    /** True when this adapter pipes Gateway events into the APME collector
+     *  itself — the bridge must then NOT also convert its timeline entries to
+     *  spans, or every turn and tool would be counted twice. */
+    hasDirectApmeIngestion(): boolean;
+    private buildApmeCtx;
+    private ingestApmeSpans;
+    /** Reset (or start) the idle-gap timer. Fires
+     *  `openclawIdleGapTaskBoundary` after OPENCLAW_IDLE_GAP_MS of silence
+     *  (no new `chat.send`) following the last `chat.final`. */
+    private armIdleGapTimer;
+    private clearIdleGapTimer;
     start(options: AdapterStartOptions & {
         externalServer?: Server;
     }): Promise<void>;
@@ -64,6 +87,7 @@ export declare class OpenClawAdapter extends EventEmitter implements AgentAdapte
     onRawData(callback: (data: string) => void): void;
     shutdown(): Promise<void>;
     private loadDeviceIdentity;
+    private loadSharedGatewayToken;
     /** Extract raw 32-byte Ed25519 public key from PEM → base64url */
     private getPublicKeyBase64Url;
     /** Build signed device auth for connect request */

package/dist/adapters/openclaw.d.ts.map

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

package/dist/adapters/openclaw.js

@@ -5,11 +5,46 @@ import { join } from 'path';
 import { homedir } from 'os';
 import { createPublicKey, createPrivateKey, sign as cryptoSign, randomUUID } from 'crypto';
 import WebSocket from 'ws';
-import { debug } from '../logger.js';
-import { summarizeResponse, extractTopicHint } from '../timeline-summarizer.js';
-import { cleanDetailText, cleanRawText, cleanNopMarkers, ED25519_SPKI_PREFIX_LEN, GATEWAY_PROTOCOL_VERSION, } from '@agentdeck/shared';
+import { debug, logError } from '../logger.js';
+import { summarizeResponse } from '../timeline-summarizer.js';
+import { extractTopicHint, extractTopicHintWithKind, promptSnippetFallback, prepareMarkdownDetail } from '@agentdeck/shared';
+import { cleanRawText, cleanNopMarkers, isOpenClawCronPrompt, ED25519_SPKI_PREFIX_LEN, GATEWAY_PROTOCOL_VERSION, } from '@agentdeck/shared';
 import { OPENCLAW_CAPABILITIES, OPENCLAW_GATEWAY_PORT } from '../types.js';
 import { fetchModelCatalog, getDefaultModelName, invalidateModelCache } from '../model-catalog.js';
+import { getApme } from '../apme/index.js';
+import { openclawChatEventToSpans, openclawChatSendToSpan, openclawIdleGapTaskBoundary, openclawSessionToolToSpans, openclawSessionMessageToSpans, OPENCLAW_IDLE_GAP_MS, } from '../apme/adapters/openclaw-hook.js';
+function extractGatewayTokenFromJson(json) {
+    if (!json || typeof json !== 'object')
+        return null;
+    const readPath = (root, path) => {
+        let current = root;
+        for (const [index, key] of path.entries()) {
+            if (!current || typeof current !== 'object' || Array.isArray(current))
+                return null;
+            const next = current[key];
+            if (next == null)
+                return null;
+            if (index === path.length - 1) {
+                if (typeof next !== 'string')
+                    return null;
+                const trimmed = next.trim();
+                return trimmed || null;
+            }
+            current = next;
+        }
+        return null;
+    };
+    for (const path of [
+        ['gateway', 'auth', 'token'],
+        ['auth', 'token'],
+        ['gateway', 'token'],
+    ]) {
+        const token = readPath(json, path);
+        if (token)
+            return token;
+    }
+    return null;
+}
 export class OpenClawAdapter extends EventEmitter {
     capabilities = OPENCLAW_CAPABILITIES;
     gatewayUrl;
@@ -41,6 +76,20 @@ export class OpenClawAdapter extends EventEmitter {
     // Device identity (loaded once on start)
     deviceIdentity = null;
     deviceAuthToken = null;
+    sharedGatewayToken = null;
+    disableDeviceAuthForNextConnect = false;
+    // APME bridge — set by `setApmeSession`. OpenClaw has no hook layer; the
+    // Gateway WS stream is the only event source. Without this APME wiring,
+    // OpenClaw sessions land in the runs table but fall through to a single
+    // `session_end` task boundary per session, collapsing all conversations
+    // into one "task" and defeating per-task evaluation.
+    apmeSessionId = null;
+    apmeTraceId = randomUUID();
+    apmeCwdHint;
+    /** Idle-gap timer — fires the `task_boundary` (idle_gap) span when the
+     *  user hasn't sent a new `chat.send` for OPENCLAW_IDLE_GAP_MS after the
+     *  last `chat.final`. Reset on every new send, cleared on session end. */
+    apmeIdleTimer = null;
     /** Reconnect delay (doubles on each failure, max 30s) */
     reconnectDelay = 1000;
     static MAX_RECONNECT_DELAY = 30_000;
@@ -92,6 +141,73 @@ export class OpenClawAdapter extends EventEmitter {
             res.end(JSON.stringify({ error: 'Not found' }));
         });
     }
+    /** Bind the adapter to an APME session id so Gateway events can be
+     *  ingested as TelemetrySpans. No-op when APME isn't initialized. */
+    setApmeSession(sessionId, cwd) {
+        this.apmeSessionId = sessionId;
+        this.apmeCwdHint = cwd;
+    }
+    /** True when this adapter pipes Gateway events into the APME collector
+     *  itself — the bridge must then NOT also convert its timeline entries to
+     *  spans, or every turn and tool would be counted twice. */
+    hasDirectApmeIngestion() {
+        return this.apmeSessionId != null && getApme() != null;
+    }
+    buildApmeCtx() {
+        if (!this.apmeSessionId || !getApme())
+            return null;
+        return {
+            sessionId: this.apmeSessionId,
+            agentType: 'openclaw',
+            cwd: this.apmeCwdHint,
+            traceId: this.apmeTraceId,
+            activeTurnId: undefined,
+        };
+    }
+    ingestApmeSpans(spans) {
+        const apme = getApme();
+        if (!apme || !this.apmeSessionId || spans.length === 0)
+            return;
+        for (const span of spans) {
+            try {
+                apme.collector.ingestSpan(this.apmeSessionId, span);
+            }
+            catch (err) {
+                debug('apme:openclaw', `ingestSpan failed: ${String(err)}`);
+            }
+        }
+    }
+    /** Reset (or start) the idle-gap timer. Fires
+     *  `openclawIdleGapTaskBoundary` after OPENCLAW_IDLE_GAP_MS of silence
+     *  (no new `chat.send`) following the last `chat.final`. */
+    armIdleGapTimer() {
+        this.clearIdleGapTimer();
+        const ctx = this.buildApmeCtx();
+        if (!ctx)
+            return;
+        this.apmeIdleTimer = setTimeout(() => {
+            this.apmeIdleTimer = null;
+            const apme = getApme();
+            if (!apme || !this.apmeSessionId)
+                return;
+            const span = openclawIdleGapTaskBoundary(ctx);
+            try {
+                apme.collector.ingestSpan(this.apmeSessionId, span);
+            }
+            catch (err) {
+                debug('apme:openclaw', `idle_gap ingestSpan failed: ${String(err)}`);
+            }
+        }, OPENCLAW_IDLE_GAP_MS);
+        // Don't keep the event loop alive just for this timer; the adapter is
+        // already pinning the loop via WebSocket.
+        this.apmeIdleTimer.unref?.();
+    }
+    clearIdleGapTimer() {
+        if (this.apmeIdleTimer) {
+            clearTimeout(this.apmeIdleTimer);
+            this.apmeIdleTimer = null;
+        }
+    }
     async start(options) {
         if (options.gatewayUrl) {
             this.gatewayUrl = options.gatewayUrl;
@@ -178,6 +294,14 @@ export class OpenClawAdapter extends EventEmitter {
                     this.emitAdapterEvent({ source: 'parser', event: 'spinner_start' });
                 }
                 if (this.currentSessionKey) {
+                    // APME: open a turn. The matching `turn_response` lands on
+                    // `chat.final` below. Cancel any pending idle-gap timer — a new
+                    // send means the conversation is still active.
+                    const ctx = this.buildApmeCtx();
+                    if (ctx) {
+                        this.clearIdleGapTimer();
+                        this.ingestApmeSpans([openclawChatSendToSpan(ctx, cmd.text)]);
+                    }
                     this.rpcCall('chat.send', {
                         sessionKey: this.currentSessionKey,
                         message: cmd.text,
@@ -279,6 +403,8 @@ export class OpenClawAdapter extends EventEmitter {
             clearTimeout(this.reconnectTimer);
             this.reconnectTimer = null;
         }
+        // Cancel any pending idle-gap timer so it doesn't fire after shutdown.
+        this.clearIdleGapTimer();
         for (const [id, pending] of this.pendingRpc) {
             pending.reject(new Error('Adapter shutting down'));
             this.pendingRpc.delete(id);
@@ -313,10 +439,21 @@ export class OpenClawAdapter extends EventEmitter {
                     scopes: operatorToken.scopes,
                 };
             }
+            this.sharedGatewayToken = this.loadSharedGatewayToken();
             debug('adapter:openclaw', `Device identity loaded: ${this.deviceIdentity.deviceId.slice(0, 16)}...`);
         }
         catch (err) {
             debug('adapter:openclaw', `Device identity not available: ${err}`);
+            this.sharedGatewayToken = this.loadSharedGatewayToken();
+        }
+    }
+    loadSharedGatewayToken() {
+        try {
+            const json = JSON.parse(readFileSync(join(homedir(), '.openclaw', 'openclaw.json'), 'utf-8'));
+            return extractGatewayTokenFromJson(json);
+        }
+        catch {
+            return null;
         }
     }
     /** Extract raw 32-byte Ed25519 public key from PEM → base64url */
@@ -335,9 +472,9 @@ export class OpenClawAdapter extends EventEmitter {
         }
         const signedAt = Date.now();
         const scopes = requestScopes.join(',');
-        // v2|deviceId|clientId|clientMode|role|scopes|signedAtMs|token|nonce
+        // v3|deviceId|clientId|clientMode|role|scopes|signedAtMs|token|nonce|platform|deviceFamily
         const payload = [
-            'v2',
+            'v3',
             this.deviceIdentity.deviceId,
             'gateway-client',
             'backend',
@@ -346,6 +483,8 @@ export class OpenClawAdapter extends EventEmitter {
             String(signedAt),
             authToken,
             nonce,
+            'darwin',
+            'mac',
         ].join('|');
         const privateKey = createPrivateKey(this.deviceIdentity.privateKeyPem);
         const signature = cryptoSign(null, Buffer.from(payload, 'utf8'), privateKey);
@@ -524,7 +663,15 @@ export class OpenClawAdapter extends EventEmitter {
                         if (!this.chatStarted) {
                             // Non-optimistic path: gateway-initiated chat (cron, web, etc.)
                             this.chatStarted = true;
-                            this.chatIsAutomated = !this.lastPrompt;
+                            // Automated when there's no user prompt (pure gateway-initiated
+                            // cron/web run) OR when the prompt itself is a `[cron:…]` job
+                            // injection. The bare `!lastPrompt` heuristic mis-flagged cron
+                            // turns whose prompt reached the adapter as `[cron:…]` text (a
+                            // stale lastPrompt left `automated:false`), so recurring cron
+                            // status polls ("Still translating") escaped the 8h automated
+                            // repetitive-dedup and stacked as N separate rows instead of one
+                            // `×count` row.
+                            this.chatIsAutomated = !this.lastPrompt || isOpenClawCronPrompt(this.lastPrompt);
                             this.chatStartTime = Date.now();
                             this.chatToolCount = 0;
                             this.chatToolNames = [];
@@ -537,6 +684,7 @@ export class OpenClawAdapter extends EventEmitter {
                                 ts: Date.now(), type: 'chat_start', raw: promptRaw,
                                 ...(promptDetail ? { detail: promptDetail } : {}),
                                 ...(this.chatIsAutomated ? { automated: true } : {}),
+                                startedAt: this.chatStartTime,
                             });
                         }
                         else {
@@ -552,6 +700,7 @@ export class OpenClawAdapter extends EventEmitter {
                                     this.emitTimelineUpsert({
                                         ts: this.chatStartTime, type: 'chat_start',
                                         raw: cleanRawText(topicHint),
+                                        startedAt: this.chatStartTime,
                                     });
                                 }
                             }
@@ -578,37 +727,75 @@ export class OpenClawAdapter extends EventEmitter {
                         const finalText = this.extractMessageText(payload);
                         const responseContent = (finalText || undefined)
                             || (this.accumulatedResponse || undefined);
-                        // Emit chat_response for APME turn response capture
-                        if (responseContent) {
-                            const respRaw = responseContent.length > 500 ? responseContent.slice(0, 497) + '...' : responseContent;
-                            this.emitTimelineEntry({
-                                ts: Date.now(), type: 'chat_response',
-                                raw: cleanRawText(respRaw),
-                                detail: cleanDetailText(responseContent.slice(0, 3000)),
-                            });
-                        }
-                        const cleanedResponse = responseContent ? cleanNopMarkers(cleanDetailText(responseContent)) : undefined;
+                        const cleanedResponse = responseContent ? cleanNopMarkers(prepareMarkdownDetail(responseContent)) : undefined;
                         const responseDetail = cleanedResponse
                             ? (cleanedResponse.length > 1000 ? cleanedResponse.slice(0, 997) + '...' : cleanedResponse)
                             : undefined;
-                        // Emit chat_end with heuristic summary, then async LLM enrichment
-                        const heuristicLabel = (responseContent && extractTopicHint(responseContent)) || 'Completed';
+                        // Pick the turn-close summary label. Same kind-classification rule
+                        // as wireClaudeCodeTimeline: 'topic' hint \u2192 heuristic, fallback /
+                        // "Completed" \u2192 'none' so clients can suppress the
+                        // (likely-redundant) detail pane.
+                        const respHint = responseContent ? extractTopicHintWithKind(responseContent) : { hint: null, kind: null };
+                        const promptHint = this.lastPrompt ? extractTopicHintWithKind(this.lastPrompt) : { hint: null, kind: null };
+                        let heuristicLabel;
+                        let summaryKind;
+                        if (respHint.kind === 'topic' && respHint.hint) {
+                            heuristicLabel = respHint.hint;
+                            summaryKind = 'heuristic';
+                        }
+                        else if (promptHint.kind === 'topic' && promptHint.hint) {
+                            heuristicLabel = promptHint.hint;
+                            summaryKind = 'heuristic';
+                        }
+                        else if (respHint.hint || promptHint.hint) {
+                            heuristicLabel = (respHint.hint || promptHint.hint);
+                            summaryKind = 'none';
+                        }
+                        else {
+                            heuristicLabel = promptSnippetFallback(this.lastPrompt, 60) ?? 'Completed';
+                            summaryKind = 'none';
+                        }
                         const parts = [heuristicLabel];
                         if (duration > 0)
                             parts.push(`${duration}s`);
                         if (toolSummary)
                             parts.push(toolSummary);
                         const chatEndTs = Date.now();
-                        this.emitTimelineEntry({
-                            ts: chatEndTs, type: 'chat_end', raw: parts.join(' \u00b7 '),
-                            ...(responseDetail ? { detail: responseDetail } : {}),
-                            ...(this.chatIsAutomated ? { automated: true } : {}),
-                        });
-                        // Async LLM summarization — fire-and-forget, upsert chat_end when ready
-                        if (responseContent && responseContent.length > 30) {
+                        // Single turn-close row — mirrors wireClaudeCodeTimeline's
+                        // emitCompletion: `chat_response` when there is response text,
+                        // `chat_end` only for response-less turns. Emitting both used to
+                        // put the same response `detail` on two rows milliseconds apart,
+                        // so every OpenClaw turn rendered twice on the flat surfaces.
+                        if (responseContent) {
+                            const respRaw = responseContent.length > 500 ? responseContent.slice(0, 497) + '...' : responseContent;
+                            this.emitTimelineEntry({
+                                ts: chatEndTs, type: 'chat_response',
+                                raw: cleanRawText(respRaw),
+                                detail: prepareMarkdownDetail(responseContent.slice(0, 3000)),
+                                ...(this.chatIsAutomated ? { automated: true } : {}),
+                                startedAt: this.chatStartTime,
+                                endedAt: chatEndTs,
+                            });
+                        }
+                        else {
+                            this.emitTimelineEntry({
+                                ts: chatEndTs, type: 'chat_end', raw: parts.join(' \u00b7 '),
+                                ...(this.chatIsAutomated ? { automated: true } : {}),
+                                startedAt: this.chatStartTime,
+                                endedAt: chatEndTs,
+                                summaryKind,
+                            });
+                        }
+                        // Async LLM summarization — fire-and-forget, upserts the turn's
+                        // chat_response raw with "summary · Ns · tools" (detail keeps the
+                        // full response). Skipped for automated turns: their low-signal
+                        // polling responses are dropped at storage time, and an upsert
+                        // that finds no match falls through to addEntry — the enriched
+                        // label would resurrect the dropped noise row.
+                        if (responseContent && responseContent.length > 30 && !this.chatIsAutomated) {
                             const savedToolSummary = toolSummary;
                             const savedDuration = duration;
-                            const savedAutomated = this.chatIsAutomated;
+                            const savedStartedAt = this.chatStartTime;
                             summarizeResponse(responseContent).then((summary) => {
                                 if (summary) {
                                     const enrichedParts = [summary];
@@ -617,15 +804,38 @@ export class OpenClawAdapter extends EventEmitter {
                                     if (savedToolSummary)
                                         enrichedParts.push(savedToolSummary);
                                     debug('adapter:openclaw', `LLM summary: ${summary}`);
-                                    // Upsert chat_end with LLM summary replacing "Completed"
                                     this.emitTimelineUpsert({
-                                        ts: chatEndTs, type: 'chat_end',
+                                        ts: chatEndTs, type: 'chat_response',
                                         raw: enrichedParts.join(' \u00b7 '),
                                         ...(responseDetail ? { detail: responseDetail } : {}),
-                                        ...(savedAutomated ? { automated: true } : {}),
+                                        startedAt: savedStartedAt,
+                                        endedAt: chatEndTs,
+                                        summaryKind: 'llm',
                                     });
                                 }
-                            }).catch(() => { });
+                            }).catch((err) => {
+                                // `summarizeResponse` itself swallows MLX/Ollama errors;
+                                // this catches only post-summary upsert/closure throws.
+                                // Backend-offline messaging is surfaced inside summarizeResponse.
+                                logError(`[adapter:openclaw] post-summary upsert threw: ${String(err)}`);
+                            });
+                        }
+                        // APME: emit turn_response + tool_result spans, then arm the
+                        // idle-gap timer. If the user sends a new prompt within
+                        // OPENCLAW_IDLE_GAP_MS the timer is cancelled (above in
+                        // `send_prompt`); otherwise it fires `task_boundary` (idle_gap)
+                        // and closes the task.
+                        const apmeCtx = this.buildApmeCtx();
+                        if (apmeCtx) {
+                            const apmePayload = {
+                                state: 'final',
+                                ...(payload.runId ? { runId: payload.runId } : {}),
+                                ...(payload.sessionKey ? { sessionKey: payload.sessionKey } : {}),
+                                ...(responseContent ? { response: responseContent } : {}),
+                                ...(Array.isArray(payload.tools) ? { tools: payload.tools } : {}),
+                            };
+                            this.ingestApmeSpans(openclawChatEventToSpans(apmeCtx, apmePayload));
+                            this.armIdleGapTimer();
                         }
                         this.chatStarted = false;
                         this.lastPrompt = null;
@@ -648,6 +858,18 @@ export class OpenClawAdapter extends EventEmitter {
                             ...(abortDetail ? { detail: abortDetail } : {}),
                             ...(this.chatIsAutomated ? { automated: true } : {}),
                         });
+                        // APME: emit task_boundary so the abort itself closes the task
+                        // immediately \u2014 don't wait for the idle timer. The user
+                        // explicitly stopped this turn.
+                        const abortCtx = this.buildApmeCtx();
+                        if (abortCtx) {
+                            this.clearIdleGapTimer();
+                            this.ingestApmeSpans(openclawChatEventToSpans(abortCtx, {
+                                state: 'aborted',
+                                ...(payload.runId ? { runId: payload.runId } : {}),
+                                ...(payload.sessionKey ? { sessionKey: payload.sessionKey } : {}),
+                            }));
+                        }
                         this.chatStarted = false;
                         this.lastPrompt = null;
                         this.accumulatedResponse = '';
@@ -742,6 +964,24 @@ export class OpenClawAdapter extends EventEmitter {
                 debug('adapter:openclaw', 'Gateway shutdown event');
                 this.emitAdapterEvent({ source: 'hook', event: 'SessionEnd', data: {} });
                 break;
+            // ===== Granular session streams (previously dropped) =====
+            // `session.tool` carries per-tool input/output; `session.message` carries
+            // out-of-band (e.g. cron/automation) prompts & responses. Both were
+            // silently swallowed by the old default case, leaving the sample's tool
+            // trajectory empty of detail. Route them into the APME normalizer so the
+            // SessionSample captures the full tool-use trajectory (req #6).
+            case 'session.tool': {
+                const apmeCtx = this.buildApmeCtx();
+                if (apmeCtx)
+                    this.ingestApmeSpans(openclawSessionToolToSpans(apmeCtx, payload));
+                break;
+            }
+            case 'session.message': {
+                const apmeCtx = this.buildApmeCtx();
+                if (apmeCtx)
+                    this.ingestApmeSpans(openclawSessionMessageToSpans(apmeCtx, payload));
+                break;
+            }
             default:
                 debug('adapter:openclaw', `Unhandled event: ${event}`);
                 break;
@@ -758,7 +998,8 @@ export class OpenClawAdapter extends EventEmitter {
         // reconstructs the payload from request params for signature verification.
         const scopes = this.deviceAuthToken?.scopes
             ?? ['operator.admin', 'operator.approvals', 'operator.read'];
-        const authToken = this.deviceAuthToken?.token ?? '';
+        const sharedToken = this.sharedGatewayToken ?? '';
+        const deviceToken = this.deviceAuthToken?.token ?? '';
         const params = {
             minProtocol: GATEWAY_PROTOCOL_VERSION,
             maxProtocol: GATEWAY_PROTOCOL_VERSION,
@@ -767,22 +1008,37 @@ export class OpenClawAdapter extends EventEmitter {
                 displayName: 'AgentDeck',
                 version: '0.3.0',
                 platform: process.platform,
+                deviceFamily: 'mac',
                 mode: 'backend',
             },
             role: 'operator',
             scopes,
             caps: ['tool-events'],
         };
-        // Add device auth if identity is available
-        if (this.deviceIdentity && this.deviceAuthToken) {
+        // Add device auth if identity is available. Fallback mode suppresses all
+        // device-derived credentials so the retry is token-only.
+        if (this.deviceIdentity && this.deviceAuthToken && !this.disableDeviceAuthForNextConnect) {
             try {
-                params.device = this.buildDeviceAuth(nonce, scopes, authToken);
-                params.auth = { token: authToken };
+                params.device = this.buildDeviceAuth(nonce, scopes, sharedToken);
             }
             catch (err) {
                 debug('adapter:openclaw', `Device auth signing failed: ${err}`);
             }
         }
+        const auth = {};
+        if (sharedToken)
+            auth.token = sharedToken;
+        if (deviceToken && !this.disableDeviceAuthForNextConnect) {
+            auth.deviceToken = deviceToken;
+        }
+        if (Object.keys(auth).length > 0) {
+            params.auth = auth;
+        }
+        debug('adapter:openclaw', `connect.RPC: fallback=${this.disableDeviceAuthForNextConnect}` +
+            ` hasDevice=${params.device != null}` +
+            ` hasSharedToken=${!!auth.token}` +
+            ` hasDeviceToken=${!!auth.deviceToken}` +
+            ` scopes=${scopes.length}`);
         const id = 'init-1';
         const message = { type: 'req', id, method: 'connect', params };
         this.pendingRpc.set(id, {