@beeos-ai/device-agent 0.9.9 → 0.9.11

package/dist/plugins/message-bus/ms-channel-notifier.d.ts

@@ -67,12 +67,28 @@ export interface MsChannelNotifierOptions {
      */
     sessionKey: string;
     logger: Logger;
+    /**
+     * Test seam — async delay used between publish retries. Defaults to a
+     * real `setTimeout`-backed sleep. Tests inject a no-op / fake clock so
+     * retry assertions don't wall-clock block.
+     */
+    sleep?: (ms: number) => Promise<void>;
 }
 export declare class MsChannelNotifier implements SessionUpdateNotifier {
     private readonly opts;
     /** Cumulative `agent_message_chunk` text — populates terminal `agent_reply.text`. */
     private accumulatedText;
+    /** Count of delta sends attempted this turn — diagnostics for the terminal log. */
+    private deltaCount;
     private finalized;
+    /**
+     * Set synchronously on entry to `publishFinal` to guard against a
+     * concurrent duplicate `stream_complete`. `finalized` (the public
+     * "terminal reply actually landed" flag) is only set AFTER a
+     * successful send, so a failed publish can be retried.
+     */
+    private finalizing;
+    private readonly sleep;
     constructor(opts: MsChannelNotifierOptions);
     /**
      * Called by SessionManager for every `session/update` envelope on
@@ -97,4 +113,12 @@ export declare class MsChannelNotifier implements SessionUpdateNotifier {
      * publish two terminal envelopes.
      */
     private publishFinal;
+    /**
+     * Publish via `messages.send` with bounded exponential-backoff retry.
+     * Retries transient failures (network / 5xx / 408 / 429); treats a
+     * duplicate-id 409 as success (idempotent re-delivery); gives up
+     * immediately on fatal client errors (e.g. conversation closed, not a
+     * member) since retrying those can never succeed.
+     */
+    private sendWithRetry;
 }

package/dist/plugins/message-bus/ms-channel-notifier.js

@@ -47,13 +47,41 @@
  * subsequent handlers (e.g. status:idle). All publish failures are
  * logged and swallowed.
  */
+/**
+ * Publish retry budgets. The terminal `agent_reply` is the only message
+ * the caller's `/wait` blocks on, so it gets a far larger budget than
+ * best-effort progress deltas. Backoff is exponential, capped at
+ * `RETRY_CAP_MS`.
+ *
+ *   - delta:    3 attempts  (≈ 0.5s + 1s of backoff) — best effort.
+ *   - terminal: 8 attempts  (≈ 0.5,1,2,4,8,16,30s ≈ 60s) — must arrive.
+ *
+ * Every send carries an `Idempotency-Key`, so a retry that races a
+ * server-side success is de-duped (409) rather than double-delivered.
+ */
+const DELTA_MAX_ATTEMPTS = 3;
+const TERMINAL_MAX_ATTEMPTS = 8;
+const RETRY_BASE_MS = 500;
+const RETRY_CAP_MS = 30_000;
+const realSleep = (ms) => new Promise((resolve) => setTimeout(resolve, ms));
 export class MsChannelNotifier {
     opts;
     /** Cumulative `agent_message_chunk` text — populates terminal `agent_reply.text`. */
     accumulatedText = "";
+    /** Count of delta sends attempted this turn — diagnostics for the terminal log. */
+    deltaCount = 0;
     finalized = false;
+    /**
+     * Set synchronously on entry to `publishFinal` to guard against a
+     * concurrent duplicate `stream_complete`. `finalized` (the public
+     * "terminal reply actually landed" flag) is only set AFTER a
+     * successful send, so a failed publish can be retried.
+     */
+    finalizing = false;
+    sleep;
     constructor(opts) {
         this.opts = opts;
+        this.sleep = opts.sleep ?? realSleep;
     }
     /**
      * Called by SessionManager for every `session/update` envelope on
@@ -106,18 +134,21 @@ export class MsChannelNotifier {
         }
         catch (err) {
             this.opts.logger.error({
-                err: err instanceof Error ? err.message : String(err),
+                ...describeError(err),
                 channelId: this.opts.channelId,
                 sessionUpdate,
             }, "ms-channel-notifier: publish failed");
         }
     }
     async publishDelta(sessionUpdate, text) {
+        this.deltaCount += 1;
         // Persistent delta send via v2 messages.send. Deltas MUST NOT
         // carry `replyTo` (it would short-circuit MS `/wait` on the
         // first delta — the wait endpoint matches purely on `reply_to`,
-        // not message type).
-        await this.opts.client.messages.send({
+        // not message type). Best-effort retry only — terminal reply
+        // carries the full accumulated text, so a dropped delta degrades
+        // live progress UX but never loses the final answer.
+        await this.sendWithRetry({
             conversationId: this.opts.channelId,
             type: "agent_reply_delta",
             content: {
@@ -127,7 +158,7 @@ export class MsChannelNotifier {
                     content: { type: "text", text },
                 },
             },
-        });
+        }, DELTA_MAX_ATTEMPTS);
     }
     /**
      * Emit the terminal `agent_reply`. Idempotent — guarded by
@@ -136,9 +167,13 @@ export class MsChannelNotifier {
      * publish two terminal envelopes.
      */
     async publishFinal(stopReason, errorText) {
-        if (this.finalized)
+        // `finalized` guards a true duplicate (terminal already landed);
+        // `finalizing` guards a concurrent re-entry while a send is still
+        // in flight. We only flip `finalized` AFTER a confirmed send so a
+        // transient publish failure leaves the door open for a resend.
+        if (this.finalized || this.finalizing)
             return;
-        this.finalized = true;
+        this.finalizing = true;
         let content;
         if (stopReason === "cancelled") {
             content = {
@@ -160,12 +195,78 @@ export class MsChannelNotifier {
                 text: this.accumulatedText,
             };
         }
-        await this.opts.client.messages.send({
-            conversationId: this.opts.channelId,
-            type: "agent_reply",
-            replyTo: this.opts.inboundMessageId,
-            content,
-        });
+        try {
+            await this.sendWithRetry({
+                conversationId: this.opts.channelId,
+                type: "agent_reply",
+                replyTo: this.opts.inboundMessageId,
+                // Stable idempotency key — retries that race a server-side
+                // success de-dupe (409) instead of double-delivering.
+                id: `${this.opts.inboundMessageId}:final`,
+                content,
+            }, TERMINAL_MAX_ATTEMPTS);
+            this.finalized = true;
+            // Confirms the device→platform handoff: a terminal reply WAS
+            // delivered. textLen=0 here means the device sent an empty answer
+            // (panel would render blank even though delivery succeeded) — a
+            // different failure mode from "reply never sent".
+            this.opts.logger.info({
+                channelId: this.opts.channelId,
+                inboundMessageId: this.opts.inboundMessageId,
+                replyTo: this.opts.inboundMessageId,
+                stopReason,
+                textLen: this.accumulatedText.length,
+                hasError: stopReason === "cancelled" || !!errorText,
+                deltaCount: this.deltaCount,
+            }, "ms-channel-notifier: terminal agent_reply delivered");
+        }
+        catch (err) {
+            // Terminal reply exhausted its retry budget. The caller's `/wait`
+            // will now time out with no answer — log loudly with the real
+            // cause so this is diagnosable, and leave `finalized=false` so an
+            // upstream fallback (inbound reject path) can still try.
+            this.opts.logger.error({
+                ...describeError(err),
+                channelId: this.opts.channelId,
+                inboundMessageId: this.opts.inboundMessageId,
+                stopReason,
+            }, "ms-channel-notifier: TERMINAL agent_reply publish FAILED after retries — caller will not receive a reply");
+        }
+        finally {
+            this.finalizing = false;
+        }
+    }
+    /**
+     * Publish via `messages.send` with bounded exponential-backoff retry.
+     * Retries transient failures (network / 5xx / 408 / 429); treats a
+     * duplicate-id 409 as success (idempotent re-delivery); gives up
+     * immediately on fatal client errors (e.g. conversation closed, not a
+     * member) since retrying those can never succeed.
+     */
+    async sendWithRetry(input, maxAttempts) {
+        for (let attempt = 1;; attempt++) {
+            try {
+                await this.opts.client.messages.send(input);
+                return;
+            }
+            catch (err) {
+                const verdict = classifyError(err);
+                if (verdict === "duplicate")
+                    return;
+                if (verdict === "fatal" || attempt >= maxAttempts)
+                    throw err;
+                const delay = Math.min(RETRY_CAP_MS, RETRY_BASE_MS * 2 ** (attempt - 1));
+                this.opts.logger.warn({
+                    ...describeError(err),
+                    channelId: this.opts.channelId,
+                    type: input.type,
+                    attempt,
+                    maxAttempts,
+                    retryInMs: delay,
+                }, "ms-channel-notifier: publish failed, retrying");
+                await this.sleep(delay);
+            }
+        }
     }
 }
 function pickSessionUpdate(update) {
@@ -183,4 +284,70 @@ function pickContentText(content) {
 function pickString(v) {
     return typeof v === "string" ? v : "";
 }
+/**
+ * Extract diagnosable structured fields from an unknown thrown value.
+ *
+ * Fixes the historical `[object Object]` / bare `fetch failed` blind
+ * spot: a Node `fetch` rejection is a `TypeError` whose `.message` is
+ * just "fetch failed" — the real reason (ECONNREFUSED, ENOTFOUND,
+ * UND_ERR_*, socket timeout) lives on `.cause`. `MessagingError`s from
+ * the SDK carry `.status` / `.code`. We surface all of it.
+ */
+function describeError(err) {
+    if (err instanceof Error) {
+        const out = { err: err.message, errName: err.name };
+        const anyErr = err;
+        if (typeof anyErr.status === "number")
+            out.status = anyErr.status;
+        if (typeof anyErr.code === "string")
+            out.code = anyErr.code;
+        if (anyErr.cause !== undefined)
+            out.cause = describeCause(anyErr.cause);
+        return out;
+    }
+    try {
+        return { err: JSON.stringify(err) };
+    }
+    catch {
+        return { err: String(err) };
+    }
+}
+function describeCause(cause) {
+    if (cause instanceof Error) {
+        const code = cause.code;
+        return typeof code === "string"
+            ? `${cause.name}: ${cause.message} (${code})`
+            : `${cause.name}: ${cause.message}`;
+    }
+    try {
+        return JSON.stringify(cause);
+    }
+    catch {
+        return String(cause);
+    }
+}
+/**
+ * Decide how to handle a `messages.send` failure:
+ *   - "duplicate" — server already has this id (409); treat as success.
+ *   - "fatal"     — permanent client error (4xx other than 408/429);
+ *                   retrying can never succeed.
+ *   - "retry"     — transient (network / 5xx / 408 / 429 / unknown);
+ *                   worth another attempt.
+ */
+function classifyError(err) {
+    const status = err?.status;
+    if (typeof status === "number") {
+        if (status === 409)
+            return "duplicate";
+        if (status === 408 || status === 429)
+            return "retry";
+        if (status >= 400 && status < 500)
+            return "fatal";
+        return "retry";
+    }
+    // No HTTP status → network/transport error (fetch failed, abort,
+    // DNS, connection refused). These are exactly the transient blips we
+    // want to ride through.
+    return "retry";
+}
 //# sourceMappingURL=ms-channel-notifier.js.map

package/dist/plugins/message-bus/ms-channel-notifier.js.map

@@ -1 +1 @@
-{"version":3,"file":"ms-channel-notifier.js","sourceRoot":"","sources":["../../../src/plugins/message-bus/ms-channel-notifier.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"ms-channel-notifier.js","sourceRoot":"","sources":["../../../src/plugins/message-bus/ms-channel-notifier.ts"],"names":[],"mappings":"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"}

package/dist/ports/agent-core.d.ts

@@ -8,15 +8,16 @@
  *
  *   - ACP / Bridge / HTTP transports
  *   - SessionManager / TaskRunner accounting
- *   - the pi-coding-agent vs single-layer details
+ *   - the two-layer orchestrator vs single-layer details
  *
  * Plugins (ACP, HTTP debug, agent-sync, ...) interact with the core
  * indirectly through `AgentHost`. The host owns the IAgentCore instance
  * and dispatches events; plugins never call `IAgentCore.run` directly.
  *
  * Implementations:
- *  - `adapters/agentcore-pi.ts` — pi-coding-agent two-layer orchestrator
- *    (default; outer = arouter/kimi-k2.6, inner = autoglm-9b via mobile_use)
+ *  - `adapters/agentcore-runner.ts` — AgentRunner Hybrid Plan-Act (default)
+ *  - `adapters/agentcore-orchestrator.ts` — two-layer OrchestratorAgent
+ *    (outer tool-calling LLM, inner autoglm VLM via mobile_use; `--orchestrator`)
  *  - `adapters/agentcore-inner-loop.ts` — single-layer fallback that wraps
  *    `vlm-inner-loop.ts` (selected by `--legacy-inner`)
  */
@@ -119,7 +120,7 @@ export interface AgentCoreRunCallbacks {
 export interface AgentCoreRunResult {
     /** Final user-facing reply. */
     finalMessage: string;
-    /** Number of inner steps observed (0 for the pi adapter — opaque tools). */
+    /** Number of inner steps observed (0 for the orchestrator adapter — opaque tools). */
     steps: number;
     /** True iff the run terminated due to abort / timeout. */
     cancelled: boolean;
@@ -128,7 +129,7 @@ export interface AgentCoreRunResult {
 export interface AgentCoreRunOptions extends AgentCoreRunCallbacks {
     /** Natural language task / prompt. */
     task: string;
-    /** Soft cap on inner steps (legacy adapter); pi adapter may ignore. */
+    /** Soft cap on inner steps (legacy adapter); orchestrator may ignore. */
     maxSteps?: number;
     abortSignal?: AbortSignal;
 }

package/dist/shortcuts/types.d.ts

@@ -31,8 +31,7 @@
  *         shortcut's `execute(...)` body but are never advertised as
  *         outer-LLM tools. The convention is enforced by inspection:
  *         if you need to add a new shortcut that calls these, do so
- *         from inside `services/shortcuts/*.ts` only — see the
- *         file-level comment in `pi-context.ts`.
+ *         from inside `services/shortcuts/*.ts` only.
  *
  * Error contract:
  *
@@ -94,8 +93,7 @@ export type ShortcutResult<T = unknown> = ShortcutSuccess<T> | ShortcutFailure;
  * JSON schema fragment for a shortcut's parameter object. Kept as
  * `unknown` here so callers can supply either a TypeBox / Zod schema
  * or a hand-rolled JSON Schema; the registry forwards the value
- * unchanged to the outer LLM tool descriptor (see
- * `.pi/extensions/android-tools.ts`). Validation happens inside each
+ * unchanged to the outer LLM tool descriptor. Validation happens inside each
  * shortcut's `execute` body — there is no central validator, both
  * because the runtimes (TypeBox vs Zod vs raw JSON Schema) differ in
  * how they expose `validate(input)` and because the plan intentionally
@@ -139,8 +137,7 @@ export type ShortcutPlatform = "android" | "desktop" | "any";
 /**
  * Concrete shortcut. The execute method is given a ready-built
  * `ShortcutContext` so individual shortcuts don't have to hand-roll
- * MCP / device wiring (and the boundary in `pi-context.ts` stays
- * honest — see D9).
+ * MCP / device wiring.
  */
 export interface Shortcut<TArgs = unknown, TOut = unknown> {
     readonly descriptor: ShortcutDescriptor;

package/dist/shortcuts/types.js

@@ -31,8 +31,7 @@
  *         shortcut's `execute(...)` body but are never advertised as
  *         outer-LLM tools. The convention is enforced by inspection:
  *         if you need to add a new shortcut that calls these, do so
- *         from inside `services/shortcuts/*.ts` only — see the
- *         file-level comment in `pi-context.ts`.
+ *         from inside `services/shortcuts/*.ts` only.
  *
  * Error contract:
  *

package/dist/shortcuts/types.js.map

@@ -1 +1 @@
-{"version":3,"file":"types.js","sourceRoot":"","sources":["../../src/shortcuts/types.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GA2CG"}
+{"version":3,"file":"types.js","sourceRoot":"","sources":["../../src/shortcuts/types.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GA0CG"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@beeos-ai/device-agent",
-  "version": "0.9.9",
+  "version": "0.9.11",
   "description": "BeeOS device-agent — Android/desktop AI control agent (TypeScript) speaking ACP over Bridge WebSocket. Connects to a sibling device-mcp-server process for device control.",
   "license": "Apache-2.0",
   "type": "module",
@@ -23,8 +23,7 @@
     "dist",
     "README.md",
     "LICENSE",
-    "CHANGELOG.md",
-    ".pi"
+    "CHANGELOG.md"
   ],
   "publishConfig": {
     "access": "public"
@@ -56,7 +55,6 @@
     "@beeos-ai/message-sdk": "^1.0.0",
     "@fastify/cors": "^11.2.0",
     "@fastify/multipart": "^10.0.0",
-    "@mariozechner/pi-coding-agent": "0.70.2",
     "@modelcontextprotocol/sdk": "^1.29.0",
     "dotenv": "^16.5.0",
     "fastify": "^5.8.5",
@@ -73,7 +71,7 @@
     "tsx": "^4.19.0",
     "typescript": "^5.8.0",
     "vitest": "^4.1.5",
-    "@beeos-ai/device-mcp-server": "0.4.2"
+    "@beeos-ai/device-mcp-server": "0.4.3"
   },
   "scripts": {
     "build": "tsc -p tsconfig.json && chmod +x dist/inbound/cli/main.js",
@@ -82,7 +80,6 @@
     "test": "vitest run",
     "test:watch": "vitest",
     "test:cov": "vitest run --coverage",
-    "chat": "tsx src/chat.ts",
     "run:wechat-fixture": "tsx scripts/synthesize-wechat-fixture.ts",
     "record:wechat-fixture": "tsx scripts/record-wechat-fixture.ts",
     "legacy:test:mobile": "tsx scripts/legacy/test-mobile-use.ts",