@agentdeck/bridge 1.0.20 → 1.0.22

package/dist/adapters/openclaw.d.ts

@@ -1,6 +1,7 @@
 import { EventEmitter } from 'events';
 import { type Server } from 'http';
 import type { AgentAdapter, AgentCapabilities, AdapterStartOptions, PluginCommand } from '../types.js';
+import { type OpenClawApprovalPrompt } from '@agentdeck/shared';
 /**
  * OpenClaw adapter — connects to OpenClaw Gateway via WebSocket.
  *
@@ -34,7 +35,14 @@ export declare class OpenClawAdapter extends EventEmitter implements AgentAdapte
     private autoReconnect;
     private currentSessionKey;
     private currentRunId;
-    private pendingApprovalId;
+    /** The approval the Gateway is currently blocked on, normalized for display
+     *  AND for answering — the options carry their own decision so an index press
+     *  is never re-derived at the answer site. `null` ⇒ nothing to approve. */
+    private pendingApproval;
+    /** Fires at `expiresAtMs`. The Gateway drops an expired approval without
+     *  emitting `exec.approval.resolved`, so without this the deck would keep
+     *  offering buttons that resolve to "unknown or expired approval id". */
+    private approvalExpiryTimer;
     private chatStarted;
     private chatStartTime;
     private chatToolCount;
@@ -76,6 +84,52 @@ export declare class OpenClawAdapter extends EventEmitter implements AgentAdapte
     start(options: AdapterStartOptions & {
         externalServer?: Server;
     }): Promise<void>;
+    /**
+     * The approval the Gateway is blocked on, or `null`. Read by the daemon so
+     * the virtual `openclaw-gateway` session row can carry the real question and
+     * option list — without it every deck falls back to "PERMIT? / answer in
+     * terminal", which is not answerable anywhere.
+     */
+    getPendingApproval(): OpenClawApprovalPrompt | null;
+    /**
+     * Read the approvals the Gateway is already blocked on and surface the oldest
+     * one. Called once per handshake.
+     *
+     * Only one is adopted: the deck renders a single question at a time, and the
+     * Gateway blocks the agent on each in turn, so the oldest is the one actually
+     * holding work up. The rest arrive as `requested` events (or on the next
+     * catch-up) once it is answered.
+     */
+    private adoptPendingApprovals;
+    private setPendingApproval;
+    private clearPendingApproval;
+    /**
+     * The approval went away without a decision — it expired, its run was
+     * cancelled, or the Gateway link dropped. The Gateway emits no
+     * `exec.approval.resolved` for any of those, so nothing else would ever close
+     * the `tool_request` row or move the session off `awaiting_permission`: the
+     * deck kept showing PERMIT? for a request that no longer existed.
+     */
+    private abandonPendingApproval;
+    /** Called from the turn-end paths (`final` / `aborted` / `error`). */
+    private abandonPendingApprovalForTurnEnd;
+    /**
+     * Send the decision the Gateway actually accepts. The pending pointer is held
+     * until the RPC succeeds: clearing it optimistically (as this used to) meant a
+     * rejected call left the user with no prompt on screen AND an approval still
+     * blocking the agent, with the failure swallowed into a debug line that is off
+     * by default.
+     */
+    private resolveApproval;
+    /** Re-emit the pending prompt so devices re-sync after a dropped press. */
+    private rebroadcastPendingApproval;
+    /**
+     * Truncation-tolerant echo check. Devices cap the question they display
+     * (ESP32 buffers, 16-char key labels), so an exact compare would refuse every
+     * legitimate press from a small surface. Compare on UTF-16 units to match the
+     * TS producers; the Swift mirror compares `.utf16` for the same reason.
+     */
+    private approvalEchoMatches;
     handleCommand(cmd: PluginCommand): boolean;
     writeInput(data: string): void;
     isAlive(): boolean;

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

@@ -1 +1 @@
-{"version":3,"file":"openclaw.d.ts","sourceRoot":"","sources":["../../src/adapters/openclaw.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,QAAQ,CAAC;AACtC,OAAO,EAAgB,KAAK,MAAM,EAAE,MAAM,MAAM,CAAC;AAgBjD,OAAO,KAAK,EACV,YAAY,EACZ,iBAAiB,EACjB,mBAAmB,EAEnB,aAAa,EAQd,MAAM,aAAa,CAAC;AAqDrB;;;;;;;;;;GAUG;AACH,MAAM,WAAW,sBAAsB;IACrC,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,qFAAqF;IACrF,aAAa,CAAC,EAAE,OAAO,CAAC;CACzB;AAED,qBAAa,eAAgB,SAAQ,YAAa,YAAW,YAAY;IACvE,QAAQ,CAAC,YAAY,EAAE,iBAAiB,CAAyB;IAEjE,OAAO,CAAC,UAAU,CAAS;IAC3B,OAAO,CAAC,EAAE,CAA0B;IACpC,OAAO,CAAC,UAAU,CAAS;IAC3B,OAAO,CAAC,KAAK,CAAK;IAClB,OAAO,CAAC,UAAU,CAIb;IACL,OAAO,CAAC,cAAc,CAA8C;IACpE,OAAO,CAAC,WAAW,CAAuB;IAC1C,OAAO,CAAC,KAAK,CAAS;IACtB,OAAO,CAAC,iBAAiB,CAAS;IAClC,OAAO,CAAC,kBAAkB,CAAS;IACnC,OAAO,CAAC,WAAW,CAA6C;IAChE,OAAO,CAAC,eAAe,CAAyC;IAChE,OAAO,CAAC,aAAa,CAAU;IAG/B,OAAO,CAAC,iBAAiB,CAAuB;IAChD,OAAO,CAAC,YAAY,CAAuB;IAC3C,OAAO,CAAC,iBAAiB,CAAuB;IAGhD,OAAO,CAAC,WAAW,CAAS;IAC5B,OAAO,CAAC,aAAa,CAAK;IAC1B,OAAO,CAAC,aAAa,CAAK;IAC1B,OAAO,CAAC,aAAa,CAAgB;IACrC,OAAO,CAAC,UAAU,CAAuB;IACzC,OAAO,CAAC,mBAAmB,CAAM;IACjC,OAAO,CAAC,cAAc,CAAS;IAC/B,OAAO,CAAC,eAAe,CAAS;IAGhC,OAAO,CAAC,cAAc,CAA+B;IACrD,OAAO,CAAC,eAAe,CAAgC;IACvD,OAAO,CAAC,kBAAkB,CAAuB;IACjD,OAAO,CAAC,+BAA+B,CAAS;IAOhD,OAAO,CAAC,aAAa,CAAuB;IAC5C,OAAO,CAAC,WAAW,CAAgB;IACnC,OAAO,CAAC,WAAW,CAAqB;IACxC;;8EAE0E;IAC1E,OAAO,CAAC,aAAa,CAA8C;IAEnE,yDAAyD;IACzD,OAAO,CAAC,cAAc,CAAQ;IAC9B,OAAO,CAAC,MAAM,CAAC,QAAQ,CAAC,mBAAmB,CAAU;IACrD,OAAO,CAAC,MAAM,CAAC,QAAQ,CAAC,WAAW,CAAU;gBAEjC,OAAO,CAAC,EAAE,MAAM,GAAG,sBAAsB;IAiDrD;yEACqE;IACrE,cAAc,CAAC,SAAS,EAAE,MAAM,EAAE,GAAG,CAAC,EAAE,MAAM,GAAG,IAAI;IAKrD;;gEAE4D;IAC5D,sBAAsB,IAAI,OAAO;IAIjC,OAAO,CAAC,YAAY;IAWpB,OAAO,CAAC,eAAe;IASvB;;gEAE4D;IAC5D,OAAO,CAAC,eAAe;IAiBvB,OAAO,CAAC,iBAAiB;IAOnB,KAAK,CAAC,OAAO,EAAE,mBAAmB,GAAG;QAAE,cAAc,CAAC,EAAE,MAAM,CAAA;KAAE,GAAG,OAAO,CAAC,IAAI,CAAC;IAkCtF,aAAa,CAAC,GAAG,EAAE,aAAa,GAAG,OAAO;IAqI1C,UAAU,CAAC,IAAI,EAAE,MAAM,GAAG,IAAI;IAc9B,OAAO,IAAI,OAAO;IAIlB,cAAc,CAAC,MAAM,EAAE,MAAM,CAAC,cAAc,EAAE,OAAO,EAAE,MAAM,CAAC,cAAc,GAAG,IAAI;IAInF,UAAU,IAAI,MAAM,GAAG,SAAS;IAIhC,cAAc,IAAI,MAAM,GAAG,IAAI;IAI/B,aAAa,IAAI,MAAM;IAIvB,MAAM,CAAC,OAAO,EAAE,CAAC,IAAI,CAAC,EAAE,MAAM,KAAK,OAAO,GAAG,IAAI;IAIjD,SAAS,CAAC,QAAQ,EAAE,CAAC,IAAI,EAAE,MAAM,KAAK,IAAI,GAAG,IAAI;IAI3C,QAAQ,IAAI,OAAO,CAAC,IAAI,CAAC;IAgC/B,OAAO,CAAC,kBAAkB;IAgC1B,OAAO,CAAC,sBAAsB;IAW9B,kEAAkE;IAClE,OAAO,CAAC,qBAAqB;IAQ7B,mDAAmD;IACnD,OAAO,CAAC,eAAe;IA2CvB,OAAO,CAAC,cAAc;IAwDtB,OAAO,CAAC,iBAAiB;IAiBzB;;;;;OAKG;IACH,OAAO,CAAC,OAAO;IAsCf,OAAO,CAAC,oBAAoB;IA2B5B,OAAO,CAAC,kBAAkB;IAmY1B;;;OAGG;IACH,OAAO,CAAC,kBAAkB;IA2G1B,sEAAsE;YACxD,aAAa;IAmC3B,4EAA4E;YAC9D,gBAAgB;IAuC9B;;;OAGG;IACH,OAAO,CAAC,kBAAkB;IAW1B,uDAAuD;IACvD,OAAO,CAAC,gBAAgB;IAMxB,6DAA6D;IAC7D,OAAO,CAAC,iBAAiB;IAIzB,mFAAmF;IACnF,OAAO,CAAC,kBAAkB;IAI1B,OAAO,CAAC,gBAAgB;CAGzB"}
+{"version":3,"file":"openclaw.d.ts","sourceRoot":"","sources":["../../src/adapters/openclaw.ts"],"names":[],"mappings":"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"}

package/dist/adapters/openclaw.js

@@ -9,10 +9,11 @@ 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 { parseExecApprovalRequest, decisionForOptionIndex, decisionForRespondValue, execApprovalAllows, } 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';
+import { openclawChatEventToSpans, openclawChatErrorLabel, openclawChatErrorDetail, openclawChatSendToSpan, openclawIdleGapTaskBoundary, openclawSessionToolToSpans, openclawSessionMessageToSpans, OPENCLAW_IDLE_GAP_MS, } from '../apme/adapters/openclaw-hook.js';
 function extractGatewayTokenFromJson(json) {
     if (!json || typeof json !== 'object')
         return null;
@@ -63,7 +64,14 @@ export class OpenClawAdapter extends EventEmitter {
     // Session tracking
     currentSessionKey = null;
     currentRunId = null;
-    pendingApprovalId = null;
+    /** The approval the Gateway is currently blocked on, normalized for display
+     *  AND for answering — the options carry their own decision so an index press
+     *  is never re-derived at the answer site. `null` ⇒ nothing to approve. */
+    pendingApproval = null;
+    /** Fires at `expiresAtMs`. The Gateway drops an expired approval without
+     *  emitting `exec.approval.resolved`, so without this the deck would keep
+     *  offering buttons that resolve to "unknown or expired approval id". */
+    approvalExpiryTimer = null;
     // Chat tracking for timeline events
     chatStarted = false;
     chatStartTime = 0;
@@ -240,34 +248,182 @@ export class OpenClawAdapter extends EventEmitter {
         // Connect to OpenClaw Gateway
         this.connectGateway();
     }
+    // ===== Pending exec approval =====
+    /**
+     * The approval the Gateway is blocked on, or `null`. Read by the daemon so
+     * the virtual `openclaw-gateway` session row can carry the real question and
+     * option list — without it every deck falls back to "PERMIT? / answer in
+     * terminal", which is not answerable anywhere.
+     */
+    getPendingApproval() {
+        return this.pendingApproval;
+    }
+    /**
+     * Read the approvals the Gateway is already blocked on and surface the oldest
+     * one. Called once per handshake.
+     *
+     * Only one is adopted: the deck renders a single question at a time, and the
+     * Gateway blocks the agent on each in turn, so the oldest is the one actually
+     * holding work up. The rest arrive as `requested` events (or on the next
+     * catch-up) once it is answered.
+     */
+    async adoptPendingApprovals() {
+        const pending = await this.rpcCall('exec.approval.list', {});
+        if (!Array.isArray(pending) || pending.length === 0)
+            return;
+        const oldest = [...pending].sort((a, b) => (a?.createdAtMs ?? 0) - (b?.createdAtMs ?? 0))[0];
+        const prompt = parseExecApprovalRequest(oldest, Date.now());
+        if (!prompt)
+            return;
+        // Already tracking it (a reconnect that raced the event) — don't re-emit.
+        if (this.pendingApproval?.id === prompt.id)
+            return;
+        debug('adapter:openclaw', `adopted pending approval ${prompt.id} on connect`);
+        this.setPendingApproval(prompt);
+        this.emitTimelineEntry({
+            ts: Date.now(), type: 'tool_request',
+            raw: prompt.question.length > 500 ? prompt.question.slice(0, 497) + '...' : prompt.question,
+            ...(prompt.detail ? { detail: prompt.detail } : {}),
+            approvalId: prompt.id, status: 'pending',
+        });
+        this.rebroadcastPendingApproval();
+    }
+    setPendingApproval(prompt) {
+        this.clearPendingApproval();
+        this.pendingApproval = prompt;
+        if (typeof prompt.expiresAtMs === 'number') {
+            const delay = prompt.expiresAtMs - Date.now();
+            // An already-expired stamp still needs the sweep to run (on the next
+            // tick, not inline) so the row and the state settle the same way.
+            this.approvalExpiryTimer = setTimeout(() => this.abandonPendingApproval(prompt.id, 'Expired'), Math.max(0, delay));
+            this.approvalExpiryTimer.unref?.();
+        }
+    }
+    clearPendingApproval() {
+        if (this.approvalExpiryTimer) {
+            clearTimeout(this.approvalExpiryTimer);
+            this.approvalExpiryTimer = null;
+        }
+        this.pendingApproval = null;
+    }
+    /**
+     * The approval went away without a decision — it expired, its run was
+     * cancelled, or the Gateway link dropped. The Gateway emits no
+     * `exec.approval.resolved` for any of those, so nothing else would ever close
+     * the `tool_request` row or move the session off `awaiting_permission`: the
+     * deck kept showing PERMIT? for a request that no longer existed.
+     */
+    abandonPendingApproval(approvalId, reason) {
+        if (!this.pendingApproval || this.pendingApproval.id !== approvalId)
+            return;
+        this.clearPendingApproval();
+        this.emitTimelineEntry({
+            ts: Date.now(), type: 'tool_resolved', raw: `Not approved · ${reason}`,
+            approvalId, status: 'denied',
+        });
+        this.emitAdapterEvent({ source: 'parser', event: 'idle' });
+    }
+    /** Called from the turn-end paths (`final` / `aborted` / `error`). */
+    abandonPendingApprovalForTurnEnd(reason) {
+        const pending = this.pendingApproval;
+        if (pending)
+            this.abandonPendingApproval(pending.id, reason);
+    }
+    /**
+     * Send the decision the Gateway actually accepts. The pending pointer is held
+     * until the RPC succeeds: clearing it optimistically (as this used to) meant a
+     * rejected call left the user with no prompt on screen AND an approval still
+     * blocking the agent, with the failure swallowed into a debug line that is off
+     * by default.
+     */
+    resolveApproval(prompt, decision) {
+        debug('adapter:openclaw', `exec.approval.resolve ${prompt.id} → ${decision}`);
+        this.rpcCall('exec.approval.resolve', { id: prompt.id, decision })
+            .then(() => {
+            // The `exec.approval.resolved` event is the authoritative close (it also
+            // arrives when another operator answers). Clear here too so a dropped
+            // event cannot strand the prompt.
+            if (this.pendingApproval?.id === prompt.id)
+                this.clearPendingApproval();
+        })
+            .catch((err) => {
+            logError(`[adapter:openclaw] exec.approval.resolve failed (${decision}): ${String(err)}`);
+            this.emitTimelineEntry({
+                ts: Date.now(), type: 'error',
+                raw: `Approval failed: ${err instanceof Error ? err.message : String(err)}`,
+            });
+            // Put the prompt back on every surface so the user can retry rather
+            // than staring at a deck that silently did nothing.
+            this.rebroadcastPendingApproval();
+        });
+    }
+    /** Re-emit the pending prompt so devices re-sync after a dropped press. */
+    rebroadcastPendingApproval() {
+        const prompt = this.pendingApproval;
+        if (!prompt)
+            return;
+        this.emitAdapterEvent({
+            source: 'parser',
+            event: 'permission_prompt',
+            data: {
+                question: prompt.question,
+                options: prompt.options.map((o) => ({
+                    index: o.index, label: o.label, shortcut: o.shortcut,
+                })),
+                navigable: false,
+                cursorIndex: 0,
+            },
+        });
+    }
+    /**
+     * Truncation-tolerant echo check. Devices cap the question they display
+     * (ESP32 buffers, 16-char key labels), so an exact compare would refuse every
+     * legitimate press from a small surface. Compare on UTF-16 units to match the
+     * TS producers; the Swift mirror compares `.utf16` for the same reason.
+     */
+    approvalEchoMatches(prompt, echo) {
+        const a = prompt.question.trim();
+        const b = echo.trim();
+        if (!b)
+            return true;
+        return a.startsWith(b) || b.startsWith(a);
+    }
     handleCommand(cmd) {
         switch (cmd.type) {
             case 'respond': {
                 debug('adapter:openclaw', `respond: "${cmd.value}"`);
-                if (this.pendingApprovalId) {
-                    const decision = cmd.value === 'y' ? 'allow' : 'deny';
-                    this.rpcCall('exec.approval.resolve', {
-                        id: this.pendingApprovalId,
-                        decision,
-                    }).catch((err) => {
-                        debug('adapter:openclaw', `exec.approval.resolve failed: ${err}`);
-                    });
-                    this.pendingApprovalId = null;
+                const prompt = this.pendingApproval;
+                if (prompt) {
+                    const decision = decisionForRespondValue(prompt, cmd.value);
+                    if (!decision) {
+                        logError(`[adapter:openclaw] respond "${cmd.value}" does not name a decision this approval allows` +
+                            ` (${prompt.options.map((o) => o.decision).join('/')}) — ignored`);
+                        return true;
+                    }
+                    this.resolveApproval(prompt, decision);
                 }
                 return true;
             }
             case 'select_option': {
                 debug('adapter:openclaw', `select_option: idx=${cmd.index}`);
-                // Permission prompts: index 0 = Allow, index 1 = Deny
-                if (this.pendingApprovalId) {
-                    const decision = cmd.index === 0 ? 'allow' : 'deny';
-                    this.rpcCall('exec.approval.resolve', {
-                        id: this.pendingApprovalId,
-                        decision,
-                    }).catch((err) => {
-                        debug('adapter:openclaw', `exec.approval.resolve failed: ${err}`);
-                    });
-                    this.pendingApprovalId = null;
+                const prompt = this.pendingApproval;
+                if (prompt) {
+                    // The index names an option in the list the device was DISPLAYING.
+                    // `question` echoes that list's headline; a press aimed at an
+                    // approval the Gateway has already moved past must be dropped rather
+                    // than applied to the new one — approving the wrong command is the
+                    // single worst outcome this path can produce.
+                    if (cmd.question && !this.approvalEchoMatches(prompt, cmd.question)) {
+                        logError('[adapter:openclaw] select_option dropped: question echo does not match the pending approval');
+                        this.rebroadcastPendingApproval();
+                        return true;
+                    }
+                    const decision = decisionForOptionIndex(prompt, cmd.index);
+                    if (!decision) {
+                        logError(`[adapter:openclaw] select_option index ${cmd.index} out of range — ignored`);
+                        return true;
+                    }
+                    this.resolveApproval(prompt, decision);
                 }
                 return true;
             }
@@ -530,6 +686,10 @@ export class OpenClawAdapter extends EventEmitter {
             debug('adapter:openclaw', 'Gateway disconnected');
             const wasAlive = this.alive;
             this.alive = false;
+            // Pending approvals are Gateway-process state: a reconnect issues new
+            // ids, so holding the old one would offer buttons that resolve to
+            // "unknown or expired approval id".
+            this.abandonPendingApprovalForTurnEnd('gateway disconnected');
             if (wasAlive) {
                 this.emitAdapterEvent({ source: 'connection', status: 'disconnected' });
                 this.emitAdapterEvent({ source: 'hook', event: 'SessionEnd', data: {} });
@@ -841,6 +1001,7 @@ export class OpenClawAdapter extends EventEmitter {
                         this.lastPrompt = null;
                         this.accumulatedResponse = '';
                         this.currentRunId = null;
+                        this.abandonPendingApprovalForTurnEnd('turn ended');
                         this.emitAdapterEvent({ source: 'parser', event: 'idle' });
                         break;
                     }
@@ -874,19 +1035,64 @@ export class OpenClawAdapter extends EventEmitter {
                         this.lastPrompt = null;
                         this.accumulatedResponse = '';
                         this.currentRunId = null;
+                        // A run cancelled while an approval was outstanding is the shape
+                        // that stranded the deck on PERMIT?: the Gateway drops the approval
+                        // silently, so this is the only place that can close it.
+                        this.abandonPendingApprovalForTurnEnd('run cancelled');
                         this.emitAdapterEvent({ source: 'parser', event: 'idle' });
                         break;
                     }
                     case 'error': {
-                        const errMsg = payload.errorMessage || 'unknown';
+                        // The Gateway's error frame reports only the user-facing message
+                        // plus `errorKind`/`stopReason`/`runId` — never the provider or
+                        // model that failed (OpenClaw's failover means the failing model
+                        // isn't the one the turn ends on anyway). So the row is built from
+                        // the frame PLUS this adapter's own turn counters; anything not
+                        // reported stays absent rather than getting guessed. `runId` is
+                        // the join key into the gateway log, where the provider/model and
+                        // the HTTP status do live.
+                        //
+                        // The frame spells the sentence `errorMessage` while
+                        // `ChatEventPayload` declares `error` — accept either rather than
+                        // silently losing it to a name mismatch.
+                        const errText = [payload.errorMessage, payload.error]
+                            .find((v) => typeof v === 'string' && v.trim().length > 0)?.trim();
+                        const errInput = {
+                            state: 'error',
+                            ...(errText ? { error: errText } : {}),
+                            ...(typeof payload.errorKind === 'string' ? { errorKind: payload.errorKind } : {}),
+                            ...(typeof payload.stopReason === 'string' ? { stopReason: payload.stopReason } : {}),
+                            ...(runId ? { runId } : {}),
+                            ...(sessionKey ? { sessionKey } : {}),
+                            durationSec: this.chatStarted ? Math.round((Date.now() - this.chatStartTime) / 1000) : 0,
+                            toolNames: [...this.chatToolNames],
+                        };
+                        const errLabel = openclawChatErrorLabel(errInput);
+                        const errDetail = openclawChatErrorDetail(errInput);
+                        const errTs = Date.now();
                         this.emitTimelineEntry({
-                            ts: Date.now(), type: 'error', raw: errMsg,
+                            ts: errTs, type: 'error', raw: errLabel,
+                            ...(errDetail ? { detail: errDetail } : {}),
+                            // Parity with the `final`/`aborted` rows: without this an
+                            // errored cron turn is indistinguishable from a user's.
+                            ...(this.chatIsAutomated ? { automated: true } : {}),
+                            ...(this.chatStarted ? { startedAt: this.chatStartTime, endedAt: errTs } : {}),
                         });
+                        // APME: record the failure in the trajectory, then re-arm the
+                        // idle-gap timer. `chat.send` cleared that timer and only `final`
+                        // used to re-arm it, so a prompt that errored and was then
+                        // abandoned left its task open indefinitely.
+                        const errCtx = this.buildApmeCtx();
+                        if (errCtx) {
+                            this.ingestApmeSpans(openclawChatEventToSpans(errCtx, errInput));
+                            this.armIdleGapTimer();
+                        }
                         this.chatStarted = false;
                         this.lastPrompt = null;
                         this.accumulatedResponse = '';
                         this.currentRunId = null;
-                        debug('adapter:openclaw', `Chat error: ${errMsg}`);
+                        debug('adapter:openclaw', `Chat error: ${errLabel}`);
+                        this.abandonPendingApprovalForTurnEnd('turn failed');
                         this.emitAdapterEvent({ source: 'parser', event: 'idle' });
                         break;
                     }
@@ -895,33 +1101,41 @@ export class OpenClawAdapter extends EventEmitter {
             }
             // ===== Tool approval =====
             case 'exec.approval.requested': {
-                const approvalId = payload.id;
-                const command = payload.command;
-                const ask = payload.ask;
-                this.pendingApprovalId = approvalId;
+                // The Gateway nests everything under `request` and describes the
+                // permitted decisions per-request. Both facts are handled in the shared
+                // parser — reading this payload flat here is what left every approval
+                // rendered as a bare "Approve tool execution?" with no command on it.
+                const prompt = parseExecApprovalRequest(payload, Date.now());
+                if (!prompt) {
+                    logError('[adapter:openclaw] exec.approval.requested without a usable id — ignored');
+                    break;
+                }
+                this.setPendingApproval(prompt);
                 // Track tool for chat summary
-                const toolName = command?.split(' ')[0] || 'tool';
+                const toolName = prompt.command.split(/\s+/)[0] || 'tool';
                 this.chatToolCount++;
                 if (!this.chatToolNames.includes(toolName)) {
                     this.chatToolNames.push(toolName);
                 }
-                const toolRaw = ask ? `${command}: ${ask}` : (command || 'Approve tool execution?');
-                const toolRequestRaw = toolRaw.length > 500 ? toolRaw.slice(0, 497) + '...' : toolRaw;
-                const toolRequestDetail = ask && ask.length > 100 ? (ask.length > 1000 ? ask.slice(0, 997) + '...' : ask) : undefined;
+                const toolRequestRaw = prompt.question.length > 500
+                    ? prompt.question.slice(0, 497) + '...'
+                    : prompt.question;
+                const toolRequestDetail = prompt.detail && prompt.detail.length > 1000
+                    ? prompt.detail.slice(0, 997) + '...'
+                    : prompt.detail;
                 this.emitTimelineEntry({
                     ts: Date.now(), type: 'tool_request', raw: toolRequestRaw,
                     ...(toolRequestDetail ? { detail: toolRequestDetail } : {}),
-                    approvalId, status: 'pending',
+                    approvalId: prompt.id, status: 'pending',
                 });
                 this.emitAdapterEvent({
                     source: 'parser',
                     event: 'permission_prompt',
                     data: {
-                        question: ask || command || 'Approve tool execution?',
-                        options: [
-                            { index: 0, label: 'Allow', shortcut: 'y' },
-                            { index: 1, label: 'Deny', shortcut: 'n' },
-                        ],
+                        question: prompt.question,
+                        options: prompt.options.map((o) => ({
+                            index: o.index, label: o.label, shortcut: o.shortcut,
+                        })),
                         navigable: false,
                         cursorIndex: 0,
                     },
@@ -929,19 +1143,32 @@ export class OpenClawAdapter extends EventEmitter {
                 break;
             }
             case 'exec.approval.resolved': {
-                // Approval resolved (by us or another client) → processing continues
-                const resolvedId = this.pendingApprovalId;
-                const decision = payload.decision || 'allow';
-                this.pendingApprovalId = null;
+                // Resolved by us or by another operator client. Key off the payload's
+                // own id, not our pending pointer: a resolution can arrive for an
+                // approval we already dropped (expiry, abort), and treating it as
+                // "whatever we last saw" mislabels an unrelated row.
+                const resolvedId = typeof payload.id === 'string' && payload.id
+                    ? payload.id
+                    : this.pendingApproval?.id;
+                const decision = typeof payload.decision === 'string' ? payload.decision : '';
+                const allowed = execApprovalAllows(decision);
+                if (this.pendingApproval && resolvedId === this.pendingApproval.id) {
+                    this.clearPendingApproval();
+                }
                 if (resolvedId) {
                     this.emitTimelineEntry({
                         ts: Date.now(), type: 'tool_resolved',
-                        raw: decision === 'allow' ? 'Approved' : 'Denied',
+                        // `decision` is allow-once / allow-always / deny. Comparing it to
+                        // 'allow' (as this did) labeled every real approval "Denied".
+                        raw: decision === 'allow-always' ? 'Approved (always)'
+                            : allowed ? 'Approved' : 'Denied',
                         approvalId: resolvedId,
-                        status: decision === 'allow' ? 'approved' : 'denied',
+                        status: allowed ? 'approved' : 'denied',
                     });
                 }
-                this.emitAdapterEvent({ source: 'parser', event: 'spinner_start' });
+                // Denial does not resume the turn — the tool call fails and the agent
+                // either recovers or ends. Only an allow means work continues.
+                this.emitAdapterEvent({ source: 'parser', event: allowed ? 'spinner_start' : 'idle' });
                 break;
             }
             // ===== Gateway health =====
@@ -1062,6 +1289,12 @@ export class OpenClawAdapter extends EventEmitter {
                 this.fetchSessions().catch(err => debug('adapter:openclaw', `fetchSessions error: ${err}`));
                 // Fetch model catalog (async, non-blocking)
                 this.emitModelCatalog().catch(err => debug('adapter:openclaw', `emitModelCatalog error: ${err}`));
+                // Catch up on approvals that were already waiting. `exec.approval.requested`
+                // is a broadcast and is never replayed, so without this read a daemon
+                // restart (or any Gateway reconnect) leaves the agent blocked on an
+                // approval that exists on exactly one side: the user sees an idle deck
+                // and the agent never moves.
+                this.adoptPendingApprovals().catch(err => debug('adapter:openclaw', `adoptPendingApprovals error: ${err}`));
             },
             reject: (err) => {
                 debug('adapter:openclaw', `Handshake failed: ${err.message}`);