viber-channel 0.8.38 → 0.8.39

package/lib/agent_tools.ts

@@ -194,11 +194,20 @@ export async function messageAgent(
   }
   if (!outcome.ok) {
     let friendly: string;
-    if (outcome.detail === "target_offline") {
+    if (outcome.detail === "target_offline" && outcome.liveInstanceIds) {
+      // #692: the id is stale and its agent is online under several ids (a
+      // reconnect race) — the server refused to guess.
+      friendly =
+        `${trimmedPeerId} is a stale id: that agent reconnected and is online under ` +
+        `${outcome.liveInstanceIds.join(", ")}. Call message_agent again with one of them.`;
+    } else if (outcome.detail === "target_offline") {
       // #627: a just-launched agent comes online with its runner's first beat (≤ 30 s).
+      // #692: an agent that reconnected under a new id is followed by the server;
+      // reaching here means no live instance of it was found under any id.
       friendly =
         "That agent is offline right now — it must be running to receive a DM. " +
-        "If it was just launched, it comes online with its runner's next beat (within 30 s): retry then.";
+        "If it was just launched, it comes online with its runner's next beat (within 30 s): retry then. " +
+        "If you expected it online, check list_agents: it may have been relaunched under another name.";
     } else if (outcome.detail === "dm_unavailable_retry") {
       friendly = "Could not open the DM due to a transient conflict — try message_agent again.";
     } else {
@@ -233,6 +242,14 @@ export async function messageAgent(
   if (!result.ok) {
     return errorText(result.detail);
   }
+  if (outcome.redirect) {
+    // #692: say which agent was reached, and that the id used is stale.
+    return text(
+      `Message sent to agent ${outcome.redirect.to} (DM ${outcome.dm.conversation_id}). ` +
+        `Note: ${outcome.redirect.from} is a stale id — the same agent reconnected as ` +
+        `${outcome.redirect.to}; use that id from now on.`,
+    );
+  }
   return text(`Message sent to agent (DM ${outcome.dm.conversation_id}).`);
 }
 

package/lib/bridge_tool_host.ts

@@ -115,7 +115,8 @@ export const TOOL_DEFS = [
       "(from list_agents) and the text. Opens or reuses a private 1:1 DM and posts your message; " +
       "the agent's reply arrives back on this channel. Targets are normally same-project; an " +
       "ORCHESTRATOR instance (#307) can also message agents of the owner's other projects. " +
-      "Fails if the target agent is offline.",
+      "Fails if the target agent is offline. An id gone stale because the agent reconnected " +
+      "(same name, new id) still reaches it: the result then names the new id to use (#692).",
     inputSchema: {
       type: "object",
       properties: {

package/lib/claude_tool_defs.ts

@@ -104,7 +104,8 @@ export const CLAUDE_TOOL_DEFS = [
       "the agent's reply arrives back on this channel tagged source=agent-dm. " +
       "Targets are normally same-project; an ORCHESTRATOR instance (#307) can also message agents " +
       "of the owner's other projects (ids from its cross-project list_agents). " +
-      "Fails if the target agent is offline.",
+      "Fails if the target agent is offline. An id gone stale because the agent reconnected " +
+      "(same name, new id) still reaches it: the result then names the new id to use (#692).",
     inputSchema: {
       type: "object" as const,
       properties: {

package/lib/peers.ts

@@ -153,9 +153,22 @@ export interface OpenDmResult {
   invited: boolean;
 }
 
+/** #692: the server opened the DM with the live instance of the identity the
+ *  caller named by a stale id. */
+export interface OpenDmRedirect {
+  from: string;
+  to: string;
+}
+
 export type OpenDmOutcome =
-  | { ok: true; dm: OpenDmResult }
-  | { ok: false; detail: string; status: number };
+  | { ok: true; dm: OpenDmResult; redirect?: OpenDmRedirect }
+  | { ok: false; detail: string; status: number; liveInstanceIds?: string[] };
+
+/** Server-supplied ids end up in the model's prompt: only an instance id shape
+ *  (32 lowercase hex) is ever echoed back, never free text. */
+function instanceIdOrNull(v: unknown): string | null {
+  return typeof v === "string" && /^[0-9a-f]{32}$/.test(v) ? v : null;
+}
 
 /**
  * Open-or-create a 1:1 DM with `peerInstanceId` (POST /api/instances/dms).
@@ -180,13 +193,20 @@ export async function openDm(
 
   if (!resp.ok) {
     let detail = `HTTP ${resp.status}`;
+    let liveInstanceIds: string[] | undefined;
     try {
-      const json = (await resp.json()) as { detail?: string };
+      const json = (await resp.json()) as { detail?: string; live_instance_ids?: unknown };
       if (typeof json.detail === "string") detail = json.detail;
+      // #692: several live instances of a stale id's identity — the server
+      // refused to guess and named them.
+      if (Array.isArray(json.live_instance_ids)) {
+        const ids = json.live_instance_ids.map(instanceIdOrNull).filter((id): id is string => id !== null);
+        if (ids.length > 0) liveInstanceIds = ids;
+      }
     } catch {
       /* non-JSON body */
     }
-    return { ok: false, detail, status: resp.status };
+    return { ok: false, detail, status: resp.status, ...(liveInstanceIds ? { liveInstanceIds } : {}) };
   }
 
   const body = (await resp.json()) as {
@@ -194,6 +214,8 @@ export async function openDm(
     conversation_token?: string;
     expires_at?: number;
     invited?: boolean;
+    peer_instance_id?: unknown;
+    redirected_from?: unknown;
   };
   if (!body.conversation?.id || typeof body.conversation_token !== "string") {
     throw new Error("openDm: malformed response (missing conversation id or token)");
@@ -206,5 +228,14 @@ export async function openDm(
       expires_at: typeof body.expires_at === "number" ? body.expires_at : 0,
       invited: body.invited === true,
     },
+    ...redirectOf(body.redirected_from, body.peer_instance_id),
   };
 }
+
+/** #692: both ids well-formed and distinct, or no redirect at all. An older
+ *  server sends neither field. */
+function redirectOf(from: unknown, to: unknown): { redirect?: OpenDmRedirect } {
+  const f = instanceIdOrNull(from);
+  const t = instanceIdOrNull(to);
+  return f && t && f !== t ? { redirect: { from: f, to: t } } : {};
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "viber-channel",
-  "version": "0.8.38",
+  "version": "0.8.39",
   "description": "Voice + text MCP channel between a Claude Code session and the Viber UI (https://viber.dgypx.dev). Push transcripts to Claude; send_message tool delivers text back to the UI.",
   "type": "module",
   "bin": {