@paradow/ledge 0.41.0 → 0.42.0

package/dist/cli/index.js

@@ -365,11 +365,15 @@ function pendingKey(p) {
   const s = JSON.stringify([p.kind, p.text, p.body ?? null, p.tool ?? null, p.options ?? null, p.optionDetails ?? null, p.helperId ?? null]);
   return cyrb53(s, 0) + cyrb53(s, 1);
 }
-var DecisionSchema, NOTE_MAX, NOTE_NOT_TYPED, DECISION_OFFERS;
+var DecisionSchema, DecidedBySchema, NOTE_MAX, NOTE_NOT_TYPED, DECISION_OFFERS;
 var init_decisions = __esm({
   "../protocol/src/decisions.ts"() {
     "use strict";
     DecisionSchema = z6.enum(["accept", "deny", "always"]);
+    DecidedBySchema = z6.discriminatedUnion("kind", [
+      z6.object({ kind: z6.literal("pc") }),
+      z6.object({ kind: z6.literal("device"), id: z6.string().min(1).max(100), name: z6.string().min(1).max(60) })
+    ]);
     NOTE_MAX = 4e3;
     NOTE_NOT_TYPED = "note_not_typed";
     DECISION_OFFERS = {
@@ -2056,6 +2060,7 @@ var init_thread = __esm({
     init_tasks();
     init_attachments();
     init_rigMessages();
+    init_decisions();
     ToolStatusSchema = z22.enum(["running", "success", "failed", "unknown"]);
     FileChangeSchema = z22.object({ path: z22.string().min(1), from: z22.string().min(1).optional(), change: z22.enum(["add", "edit", "delete", "write"]), diff: z22.string().optional() });
     base = { id: z22.string().min(1), at: z22.string().datetime(), turn: z22.number().int().nonnegative(), helperId: z22.string().optional() };
@@ -2081,8 +2086,8 @@ var init_thread = __esm({
         imagesDropped: z22.literal(true).optional()
       }),
       /** `unknown`: answered in the terminal, the daemon only saw the prompt go away; `always`: allowed and not asked again;
-       *  `byClose`: denied by Ledge closing the session. */
-      z22.object({ kind: z22.literal("permission"), ...base, tool: z22.string(), text: z22.string(), decision: z22.enum(["accept", "deny", "always", "unknown"]).optional(), byClose: z22.literal(true).optional() }),
+       *  `byClose`: denied by Ledge closing the session; `by`: who answered it from Ledge (the PC or a device, its name then). */
+      z22.object({ kind: z22.literal("permission"), ...base, tool: z22.string(), text: z22.string(), decision: z22.enum(["accept", "deny", "always", "unknown"]).optional(), byClose: z22.literal(true).optional(), by: DecidedBySchema.optional() }),
       z22.object({ kind: z22.literal("reply"), ...base, text: z22.string() }),
       z22.object({ kind: z22.literal("helper"), ...base, task: z22.string(), agentType: z22.string().optional(), state: z22.enum(["working", "exited"]) }),
       /** A message this session sent to another agent; `id` is the tool_use_id, `to` the address it used, `peer` the Ledge session id, `received` the paired item's id in the peer's thread, `via` set when Ledge's mailbox carries it. */
@@ -2141,7 +2146,10 @@ var init_thread = __esm({
 
 // ../protocol/src/mobile.ts
 import { z as z23 } from "zod";
-var DEFAULT_RELAY_URL, RelayUrlSchema, MobileConfigSchema, MobileLinkStateSchema, MobilePairingSchema, MobileStateSchema;
+function deviceKindOfLabel(label2) {
+  return /\b(iPad|tablet|tablette)\b/i.test(label2) ? "tablet" : "phone";
+}
+var DEFAULT_RELAY_URL, RelayUrlSchema, MobileConfigSchema, MobileLinkStateSchema, DeviceKindSchema, DEVICE_NAME_MAX, DeviceNameSchema, MobilePairingSchema, MobileStateSchema;
 var init_mobile = __esm({
   "../protocol/src/mobile.ts"() {
     "use strict";
@@ -2172,6 +2180,9 @@ var init_mobile = __esm({
       /** The mobile service did not start (a broken mobile.json, a missing key store): nothing is linked until the daemon restarts. */
       z23.object({ state: z23.literal("unavailable"), error: z23.string().max(200) })
     ]);
+    DeviceKindSchema = z23.enum(["phone", "tablet"]);
+    DEVICE_NAME_MAX = 40;
+    DeviceNameSchema = z23.string().trim().min(1).max(DEVICE_NAME_MAX).regex(/^[^\u0000-\u001f\u007f]+$/);
     MobilePairingSchema = z23.object({
       id: z23.string(),
       label: z23.string(),
@@ -2187,7 +2198,16 @@ var init_mobile = __esm({
       /** The last sign-in that did not end with a session; cleared by the next one. */
       signinError: z23.enum(["expired", "denied", "not_allowed", "failed"]).nullable(),
       link: MobileLinkStateSchema,
-      devices: z23.array(z23.object({ id: z23.string(), label: z23.string(), approvedAt: z23.string(), online: z23.boolean(), lastSeenAt: z23.string().optional() })),
+      devices: z23.array(z23.object({
+        id: z23.string(),
+        label: z23.string(),
+        approvedAt: z23.string(),
+        online: z23.boolean(),
+        lastSeenAt: z23.string().optional(),
+        /** Absent from an older daemon; `name` absent: the user gave none, the front derives one from the label. */
+        kind: DeviceKindSchema.optional(),
+        name: z23.string().optional()
+      })),
       pairings: z23.array(MobilePairingSchema),
       /** « Taper dans les terminaux depuis le téléphone »: absent from an older daemon, which has no phone terminal. */
       terminalInput: z23.boolean().optional()
@@ -2279,6 +2299,8 @@ var init_messages = __esm({
       decision: DecisionSchema.optional(),
       /** Decided: the request was refused by Ledge closing the session (its interrupt keys), not by the user's answer. */
       byClose: z24.literal(true).optional(),
+      /** Decided: who answered, when the daemon typed it (absent: answered in the terminal, or an older daemon). */
+      by: DecidedBySchema.optional(),
       /** The agent's own session id when the hook names it, so the daemon can resume that conversation. */
       agentSessionId: z24.string().optional()
     });
@@ -2555,7 +2577,9 @@ var init_messages = __esm({
         note: z24.string().trim().min(1).max(NOTE_MAX).optional(),
         /** The request the user saw when deciding: refused (the request changed) unless it is still the pending one. Left out by older fronts and the island.
          *  `key` (pendingKey) covers its whole content; older fronts send kind and text only. */
-        expect: PendingSchema.pick({ kind: true, text: true }).extend({ key: z24.string().max(64).optional() }).optional()
+        expect: PendingSchema.pick({ kind: true, text: true }).extend({ key: z24.string().max(64).optional() }).optional(),
+        /** Who decides: set by the phone gateway for a device (over anything the device sent); left out by a local front, which means the PC. */
+        by: DecidedBySchema.optional()
       }),
       z24.object({ type: z24.literal("session.focus"), id: z24.string() }),
       z24.object({ type: z24.literal("session.kill"), id: z24.string() }),
@@ -2609,10 +2633,13 @@ var init_messages = __esm({
       z24.object({ type: z24.literal("mobile.signout") }),
       /** While the link is offline: try again now. */
       z24.object({ type: z24.literal("mobile.retry") }),
-      z24.object({ type: z24.literal("mobile.pairing.approve"), id: z24.string().min(1).max(100) }),
+      /** `replaces`: an approved device this one takes the place of (the same app reinstalled), revoked once this one is stored. */
+      z24.object({ type: z24.literal("mobile.pairing.approve"), id: z24.string().min(1).max(100), replaces: z24.string().min(1).max(100).optional() }),
       z24.object({ type: z24.literal("mobile.pairing.deny"), id: z24.string().min(1).max(100) }),
       /** `id`: the device's fingerprint. */
       z24.object({ type: z24.literal("mobile.device.revoke"), id: z24.string().min(1).max(100) }),
+      /** Names a device (`id`: its fingerprint); the device sees its new name in its next snapshot. */
+      z24.object({ type: z24.literal("mobile.device.rename"), id: z24.string().min(1).max(100), name: DeviceNameSchema }),
       /** « Taper dans les terminaux depuis le téléphone »; turned off, every phone loses the hand. */
       z24.object({ type: z24.literal("mobile.terminal"), input: z24.boolean() }),
       /** « Reprendre la main »: the phone typing into the session's terminal goes back to reading it. */
@@ -2869,7 +2896,9 @@ var init_push = __esm({
     });
     PushPayloadSchema = z27.object({
       v: z27.literal(1),
-      kind: z27.enum(["request", "question", "finished", "chat", "decision"]),
+      /** `resolved`: a request or question answered (anywhere), replacing its notification under the same tag; only sent to a
+       *  device whose subscription says its service worker knows it (`push.subscribe` `resolved`). */
+      kind: z27.enum(["request", "question", "finished", "chat", "decision", "resolved"]),
       title: z27.string().max(80),
       body: z27.string().max(120),
       url: z27.string().regex(/^\/#\/[A-Za-z0-9/%._~-]*$/).max(300),
@@ -2902,6 +2931,7 @@ var init_phone = __esm({
     init_messages();
     init_broadcast();
     init_push();
+    init_mobile();
     init_models();
     init_commands();
     init_openrig();
@@ -3173,8 +3203,11 @@ var init_phone = __esm({
       z28.object({ type: z28.literal("openrig.row"), qitem: QitemIdSchema }),
       /** The phone drops its passkey from the daemon. */
       z28.object({ type: z28.literal("device.forget"), op: OperationIdSchema }),
-      /** The phone's push subscription, with the VAPID key it was made with (so a key change is seen). */
-      z28.object({ type: z28.literal("push.subscribe"), op: OperationIdSchema, subscription: PushSubscriptionSchema, key: B64U2.length(87) }),
+      /** The device names itself (on the PC and in its next snapshot); applied to the sender only. */
+      z28.object({ type: z28.literal("device.rename"), op: OperationIdSchema, name: DeviceNameSchema }),
+      /** The phone's push subscription, with the VAPID key it was made with (so a key change is seen). `resolved`: its service
+       *  worker shows a `resolved` push, which replaces a request's notification once it is answered elsewhere. */
+      z28.object({ type: z28.literal("push.subscribe"), op: OperationIdSchema, subscription: PushSubscriptionSchema, key: B64U2.length(87), resolved: z28.literal(true).optional() }),
       z28.object({ type: z28.literal("push.unsubscribe"), op: OperationIdSchema }),
       /** The phone's own chat with Ledge. */
       z28.object({ type: z28.literal("chat.ask"), qid: OperationIdSchema, text: z28.string().trim().max(MESSAGE_MAX), attachments: z28.array(AttachmentIdSchema).max(ATTACHMENTS_MAX).optional() }),
@@ -3266,7 +3299,16 @@ var init_phone = __esm({
         openrig: z28.literal(true).optional(),
         /** The daemon takes `session.broadcast` (« Écrire au groupe »). */
         broadcast: z28.literal(true).optional()
-      }), device: z28.object({ confirm: z28.boolean(), push: z28.enum(["on", "off", "stale", "unavailable"]).optional(), chat: z28.literal(true).optional(), contextNear: ContextPrefsSchema.shape.near.optional() }).optional() }),
+      }), device: z28.object({
+        confirm: z28.boolean(),
+        push: z28.enum(["on", "off", "stale", "unavailable"]).optional(),
+        chat: z28.literal(true).optional(),
+        contextNear: ContextPrefsSchema.shape.near.optional(),
+        /** This device's id (its fingerprint, as decisions name it in `by`), its kind, and the name the user gave it (absent: none given). */
+        id: z28.string().optional(),
+        kind: DeviceKindSchema.optional(),
+        name: z28.string().optional()
+      }).optional() }),
       /** « À toi » on this PC: the answer to `openrig.asks`, then each change, whole. */
       z28.object({ type: z28.literal("openrig.asks"), channel: HumanChannelSchema, asks: z28.array(HumanAskSchema), partial: z28.literal(true).optional(), truncated: z28.literal(true).optional() }),
       /** An answer's end, as on the desktop (`openrig.answered`), under the phone's `op`. `rejected`: the device check refused it (`reason`). */
@@ -6563,7 +6605,7 @@ var init_history = __esm({
               return q ? this.put(id, { ...q, status: "unknown", byClose: true }) : void 0;
             }
             const perm = [...this.items(id)].reverse().find((i) => i.kind === "permission" && i.decision === void 0);
-            return perm && perm.kind === "permission" ? this.put(id, { ...perm, decision: ev.decision, ...ev.byClose ? { byClose: true } : {} }) : void 0;
+            return perm && perm.kind === "permission" ? this.put(id, { ...perm, decision: ev.decision, ...ev.byClose ? { byClose: true } : {}, ...ev.by ? { by: ev.by } : {} }) : void 0;
           }
           case "AgentMessage": {
             if (!ev.messageId || !ev.text) return void 0;
@@ -9936,7 +9978,7 @@ var LEDGE_VERSION;
 var init_version = __esm({
   "src/version.ts"() {
     "use strict";
-    LEDGE_VERSION = true ? "0.41.0" : "0.0.0-dev";
+    LEDGE_VERSION = true ? "0.42.0" : "0.0.0-dev";
   }
 });
 
@@ -15604,7 +15646,7 @@ function toPhoneItem(item) {
       break;
     }
     case "permission":
-      out = { kind: "permission", ...base3, tool: item.tool, text: text7(item.text), ...pickSet(item, ["decision"]) };
+      out = { kind: "permission", ...base3, tool: item.tool, text: text7(item.text), ...pickSet(item, ["decision", "by"]) };
       break;
     case "helper":
       out = { kind: "helper", ...base3, task: text7(item.task), state: item.state, ...pickSet(item, ["agentType"]) };
@@ -15962,6 +16004,15 @@ function createPhoneGateway(deps) {
     if (!p) return "off";
     return key !== void 0 && p.key !== key ? "stale" : "on";
   };
+  const ownInfo = (deviceId) => {
+    const d = mobile.deviceInfo?.(deviceId);
+    return d ? { kind: d.kind, ...d.name ? { name: d.name } : {} } : {};
+  };
+  const decidedBy = (deviceId) => {
+    const d = mobile.deviceInfo?.(deviceId);
+    const name = (d?.name ?? d?.label ?? "").trim();
+    return { kind: "device", id: deviceId, name: name ? clip(name, 60).text : "Appareil" };
+  };
   const snapshot = (deviceId) => {
     const push3 = pushStatus(deviceId);
     const f = followers.get(deviceId);
@@ -15986,7 +16037,7 @@ function createPhoneGateway(deps) {
         ...deps.openrig ? { openrig: true } : {},
         broadcast: true
       },
-      device: { confirm: deps.credential(deviceId) !== null, push: push3, ...deps.chats ? { chat: true } : {}, ...deps.contextNear ? { contextNear: deps.contextNear() } : {} }
+      device: { confirm: deps.credential(deviceId) !== null, push: push3, ...deps.chats ? { chat: true } : {}, ...deps.contextNear ? { contextNear: deps.contextNear() } : {}, id: deviceId, ...ownInfo(deviceId) }
     };
     return deps.models ? { ...message, daemon: { ...message.daemon, models: true } } : message;
   };
@@ -16116,10 +16167,10 @@ function createPhoneGateway(deps) {
         return { status: "rejected", reason: s.state === "exited" ? "ended" : "not_launched" };
     }
   };
-  const local = (msg) => {
+  const local = (deviceId, msg) => {
     switch (msg.type) {
       case "session.decide":
-        return { type: "session.decide", id: msg.id, decision: msg.decision, ...msg.note !== void 0 ? { note: msg.note } : {}, expect: { kind: msg.expect.kind, text: msg.expect.text, key: msg.expect.key } };
+        return { type: "session.decide", id: msg.id, decision: msg.decision, ...msg.note !== void 0 ? { note: msg.note } : {}, expect: { kind: msg.expect.kind, text: msg.expect.text, key: msg.expect.key }, by: decidedBy(deviceId) };
       case "session.reply":
         return { type: "session.reply", id: msg.id, text: msg.text, ...msg.attachments?.length ? { attachments: msg.attachments } : {} };
       case "session.answer":
@@ -16495,9 +16546,14 @@ function createPhoneGateway(deps) {
     }
     if (msg.type === "credential.register") return register(deviceId, msg);
     if (msg.type === "device.forget") return { status: "applied" };
+    if (msg.type === "device.rename") {
+      if (!mobile.rename) return { status: "rejected", reason: "unavailable" };
+      mobile.rename(deviceId, msg.name);
+      return { status: "applied" };
+    }
     if (msg.type === "push.subscribe") {
       if (!pushEndpointAllowed(msg.subscription.endpoint)) return { status: "rejected", reason: "invalid" };
-      mobile.setPush(deviceId, { endpoint: msg.subscription.endpoint, p256dh: msg.subscription.keys.p256dh, auth: msg.subscription.keys.auth, key: msg.key });
+      mobile.setPush(deviceId, { endpoint: msg.subscription.endpoint, p256dh: msg.subscription.keys.p256dh, auth: msg.subscription.keys.auth, key: msg.key, ...msg.resolved ? { resolved: true } : {} });
       return { status: "applied" };
     }
     if (msg.type === "push.unsubscribe") {
@@ -16516,7 +16572,7 @@ function createPhoneGateway(deps) {
     if (msg.type === "openrig.answer") return rigAnswer(deviceId, msg);
     const refused = precheck(deviceId, msg);
     if (refused) return refused;
-    const out = local(msg);
+    const out = local(deviceId, msg);
     if (out.type === "session.model") return modelChange(out);
     let error;
     await deps.dispatch(out, (m) => {
@@ -16542,7 +16598,7 @@ function createPhoneGateway(deps) {
     }
     registry.finish(msg.op, outcome.status, outcome.reason, outcome.how, outcome.report, outcome.detail);
     result(deviceId, msg.op, outcome.status, outcome.reason, outcome.how, outcome.report);
-    if (msg.type === "credential.register" && outcome.status === "applied" && approved(deviceId)) push2(deviceId, snapshot(deviceId), "snapshot");
+    if ((msg.type === "credential.register" || msg.type === "device.rename") && outcome.status === "applied" && approved(deviceId)) push2(deviceId, snapshot(deviceId), "snapshot");
     if (msg.type === "device.forget" && outcome.status === "applied") {
       let timer2;
       await Promise.race([outbox.flush(deviceId), new Promise((r) => {
@@ -17038,6 +17094,12 @@ function pushFor(before2, after2, all2) {
   }
   return null;
 }
+function resolvedFor(before2, after2, all2, by) {
+  if (!before2?.pending || after2.pending) return null;
+  const badge = Math.min(999, all2.filter((s) => s.pending).length);
+  const body = !by ? "" : by.kind === "pc" ? "sur le PC" : cut(`sur ${by.name}`, BODY_MAX2);
+  return { v: 1, kind: "resolved", title: cut(`${after2.name} \xB7 trait\xE9e`, TITLE_MAX), body, url: `/#/thread/${encodeURIComponent(after2.id)}`, badge, tag: safeTag(after2.id) };
+}
 function chatEndPayload(code3, badge) {
   return {
     v: 1,
@@ -17094,6 +17156,15 @@ function createNotifier(deps) {
   const { mobile, log: log2 } = deps;
   const now2 = deps.now ?? Date.now;
   const lastFinished = /* @__PURE__ */ new Map();
+  const told = /* @__PURE__ */ new Map();
+  const tell = (id, tag) => {
+    let s = told.get(id);
+    if (!s) {
+      s = /* @__PURE__ */ new Set();
+      told.set(id, s);
+    }
+    s.add(tag);
+  };
   return {
     async notify(payload, sessionId2, only) {
       if (!mobile.state().enabled) return;
@@ -17118,6 +17189,7 @@ function createNotifier(deps) {
         if (only !== void 0 && d.id !== only) return [];
         const sub = mobile.pushOf(d.id);
         if (!sub || relayKey !== void 0 && sub.key !== relayKey || deps.presence(d.id)) return [];
+        if (p.kind === "resolved" && (!sub.resolved || !told.get(d.id)?.has(p.tag))) return [];
         return [{ id: d.id, online: d.online, sub }];
       });
       if (targets.length === 0) return;
@@ -17128,10 +17200,12 @@ function createNotifier(deps) {
             endpoint: sub.endpoint,
             body: Buffer.from(encryptPush(plain4, { p256dh: sub.p256dh, auth: sub.auth }, { padTo: PAD_TO })).toString("base64url"),
             ttl: TTL_S,
-            urgency: p.kind === "finished" || p.kind === "chat" ? "normal" : "high",
+            urgency: p.kind === "finished" || p.kind === "chat" || p.kind === "resolved" ? "normal" : "high",
             topic: p.tag
           };
           const r = await mobile.sendPush(msg);
+          if (p.kind === "resolved") told.get(id)?.delete(p.tag);
+          else if ((p.kind === "request" || p.kind === "question") && r.result === "sent") tell(id, p.tag);
           if (r.result === "gone") {
             log2(`push: subscription of device ${id} is gone, removed`);
             mobile.setPush(id, null);
@@ -17437,7 +17511,7 @@ async function startServer(opts) {
     }
   });
   const terminalHolders = /* @__PURE__ */ new Map();
-  const holdersMsg = () => ({ type: "terminal.holders", holds: [...terminalHolders].map(([id, deviceId]) => ({ id, device: mobile?.state().devices.find((d) => d.id === deviceId)?.label ?? deviceId })) });
+  const holdersMsg = () => ({ type: "terminal.holders", holds: [...terminalHolders].map(([id, deviceId]) => ({ id, device: ((d) => d?.name ?? d?.label)(mobile?.state().devices.find((d) => d.id === deviceId)) ?? deviceId })) });
   const typing = /* @__PURE__ */ new Set();
   const closing = /* @__PURE__ */ new Set();
   const cardThreads = opts.chat ? {
@@ -17586,9 +17660,9 @@ async function startServer(opts) {
     if (!a || a.settled || !answeredBy(a.pending, ev) || !cur || pendingKey(cur) !== pendingKey(a.pending)) return;
     a.settled = true;
     a.byHook = true;
-    store.apply(id, { name: "Decided", at: now2(), source: "daemon", ...a.decision ? { decision: a.decision } : {} });
+    store.apply(id, { name: "Decided", at: now2(), source: "daemon", ...a.decision ? { decision: a.decision } : {}, ...a.by ? { by: a.by } : {} });
   }
-  async function injectAndVerify(id, planFor, requirePrompt, decision) {
+  async function injectAndVerify(id, planFor, requirePrompt, decision, by) {
     const s = store.get(id);
     if (!s) throw new Refusal(`unknown session ${id}`, "unknown_session");
     if (inFlight.has(id)) throw new Refusal("a decision is already in progress", "busy");
@@ -17614,7 +17688,7 @@ async function startServer(opts) {
       const plan2 = typeof planFor === "function" ? planFor(before2 ?? "") : planFor;
       const stillShown = (p) => decided && adapter.promptGone ? !adapter.promptGone(p, decided) : adapter.promptStillVisible(bottomLines(p));
       const tool = s.tool === "claude" && decided?.source === "hook" ? pendingTool(decided) : void 0;
-      const answer = tool ? { pending: decided, ...decision ? { decision } : {}, settled: false, byHook: false } : void 0;
+      const answer = tool ? { pending: decided, ...decision ? { decision } : {}, ...by ? { by } : {}, settled: false, byHook: false } : void 0;
       const transcript = tool && !decided.helperId && s.transcriptPath ? s.transcriptPath : void 0;
       const call = transcript ? claudeOpenCall(transcript, tool) : void 0;
       const promptGone3 = async () => {
@@ -17635,7 +17709,7 @@ async function startServer(opts) {
         if (e instanceof NoteNotTyped) {
           if (await promptGone3()) {
             if (answer) answer.settled = true;
-            if (!answer?.byHook && stillTheSame()) store.apply(id, { name: "Decided", at: now2(), source: "daemon", ...decision ? { decision } : {} });
+            if (!answer?.byHook && stillTheSame()) store.apply(id, { name: "Decided", at: now2(), source: "daemon", ...decision ? { decision } : {}, ...by ? { by } : {} });
             throw e;
           }
           e = new Refusal(NOT_TAKEN, "not_taken");
@@ -17649,7 +17723,7 @@ async function startServer(opts) {
       if (answer?.byHook) return true;
       if (!stillTheSame()) return false;
       if (gone) {
-        store.apply(id, { name: "Decided", at: now2(), source: "daemon", ...decision ? { decision } : {} });
+        store.apply(id, { name: "Decided", at: now2(), source: "daemon", ...decision ? { decision } : {}, ...by ? { by } : {} });
         return true;
       }
       store.apply(id, { name: "InjectFailed", at: now2(), source: "daemon", text: NOT_TAKEN });
@@ -18344,7 +18418,7 @@ async function startServer(opts) {
         if (msg.decision === "always" && !offers(s.tool, pending.kind, "always")) return refuse(new Refusal(NOT_OFFERED, "not_offered"), msg.id);
         if (msg.note !== void 0 && (msg.decision !== "deny" || !offers(s.tool, pending.kind, "note"))) return refuse(new Refusal(NOT_OFFERED, "not_offered"), msg.id);
         const { decision, note } = msg;
-        await injectAndVerify(msg.id, (pane) => adapter.keysFor(decision, pending, pane, note), true, decision);
+        await injectAndVerify(msg.id, (pane) => adapter.keysFor(decision, pending, pane, note), true, decision, msg.by ?? { kind: "pc" });
         return;
       }
       case "session.reply": {
@@ -18680,10 +18754,22 @@ async function startServer(opts) {
       const badge = store.all().filter((s) => s.pending).length + tasks.all().filter(openDecision).length;
       void notifier.notify(decisionPayload(task, badge), void 0).catch((e) => log(`push failed (${e instanceof Error ? e.name : "error"})`));
     };
-    unsubscribePush = store.onApply((before2, after2) => {
+    const answeredBy2 = /* @__PURE__ */ new Map();
+    const unsubscribeDecided = store.onEvent((id, ev) => {
+      if (ev.name === "Decided") answeredBy2.set(id, ev.by ?? null);
+    });
+    const unsubscribeApply = store.onApply((before2, after2) => {
+      const failed = (e) => log(`push failed (${e instanceof Error ? e.name : "error"})`);
+      const r = resolvedFor(before2, after2, store.all(), answeredBy2.get(after2.id));
+      if (before2?.pending && !after2.pending) answeredBy2.delete(after2.id);
+      if (r) void notifier.notify(r, after2.id).catch(failed);
       const p = pushFor(before2, after2, store.all());
-      if (p) void notifier.notify(p, after2.id).catch((e) => log(`push failed (${e instanceof Error ? e.name : "error"})`));
+      if (p) void notifier.notify(p, after2.id).catch(failed);
     });
+    unsubscribePush = () => {
+      unsubscribeDecided();
+      unsubscribeApply();
+    };
   }
   wss.on("connection", (ws, req) => {
     ws.on("error", (e) => log(`socket error: ${e.message}`));
@@ -19810,7 +19896,7 @@ function readRevocations() {
 function writeRevocations(list3) {
   writePrivate(paths().revocations, JSON.stringify(z31.array(RevocationSchema).parse(list3), null, 2) + "\n");
 }
-var RelaySessionSchema, DeviceCredentialSchema, ApprovedDeviceSchema, DEFAULT_CONFIG, LEGACY_RELAY_URL, RevocationSchema;
+var RelaySessionSchema, DeviceCredentialSchema, MAX_DEVICE_PEERS, ApprovedDeviceSchema, DEFAULT_CONFIG, LEGACY_RELAY_URL, RevocationSchema;
 var init_files2 = __esm({
   "src/mobile/files.ts"() {
     "use strict";
@@ -19827,6 +19913,7 @@ var init_files2 = __esm({
       rpId: z31.string().min(1),
       transports: z31.array(z31.string()).optional()
     });
+    MAX_DEVICE_PEERS = 8;
     ApprovedDeviceSchema = z31.object({
       id: z31.string().min(1),
       publicKey: z31.string().min(1),
@@ -19835,8 +19922,14 @@ var init_files2 = __esm({
       lastPeer: z31.string().optional(),
       lastSeenAt: z31.string().optional(),
       credential: DeviceCredentialSchema.optional(),
-      /** The phone's push subscription and the relay's VAPID key it was made with. */
-      push: z31.object({ endpoint: z31.string().min(1), p256dh: z31.string().min(1), auth: z31.string().min(1), key: z31.string().min(1) }).optional()
+      /** The phone's push subscription and the relay's VAPID key it was made with; `resolved`: its service worker shows a `resolved` push. */
+      push: z31.object({ endpoint: z31.string().min(1), p256dh: z31.string().min(1), auth: z31.string().min(1), key: z31.string().min(1), resolved: z31.literal(true).optional() }).optional(),
+      /** Phone or tablet, from the pairing label; absent on a device approved before it was kept. */
+      kind: DeviceKindSchema.optional(),
+      /** The name the user gave it; absent means the default name the fronts derive. */
+      name: DeviceNameSchema.optional(),
+      /** Every relay peer that confirmed a channel for it, newest last (at most MAX_DEVICE_PEERS): all are revoked with it. */
+      peers: z31.array(z31.string().min(1)).max(MAX_DEVICE_PEERS).optional()
     });
     DEFAULT_CONFIG = () => ({ enabled: false, relayUrl: DEFAULT_RELAY_URL });
     LEGACY_RELAY_URL = "https://server.ledge.paradow.dev";
@@ -20480,6 +20573,10 @@ var init_channels = __esm({
 });
 
 // src/mobile/service.ts
+function peersOf(d) {
+  const list3 = d.peers ?? [];
+  return d.lastPeer && !list3.includes(d.lastPeer) ? [...list3, d.lastPeer] : list3;
+}
 async function createMobileService(opts = {}) {
   const now2 = opts.now ?? Date.now;
   const fetchImpl = opts.fetchImpl ?? fetch;
@@ -20510,6 +20607,13 @@ async function createMobileService(opts = {}) {
   const sendFrame = (peer, frame) => {
     link3?.send({ type: "send", to: peer, body: JSON.stringify(frame) });
   };
+  const withPeer = (d, peer) => [...peersOf(d).filter((p) => p !== peer), peer].slice(-MAX_DEVICE_PEERS);
+  const withoutPeer = (d, peer) => {
+    if (d.lastPeer !== peer && !d.peers?.includes(peer)) return d;
+    const { lastPeer, peers, ...rest } = d;
+    const left2 = (peers ?? []).filter((p) => p !== peer);
+    return { ...rest, ...lastPeer && lastPeer !== peer ? { lastPeer } : {}, ...left2.length > 0 ? { peers: left2 } : {} };
+  };
   const saveDevices = (next4) => {
     writeDevices(next4);
     devices = next4;
@@ -20519,7 +20623,8 @@ async function createMobileService(opts = {}) {
     send: sendFrame,
     approve(d) {
       const old = devices.find((x) => x.id === d.id);
-      saveDevices(old ? devices.map((x) => x.id === d.id ? { ...x, label: d.label } : x) : [...devices, d]);
+      const kind = deviceKindOfLabel(d.label);
+      saveDevices(old ? devices.map((x) => x.id === d.id ? { ...x, label: d.label, kind } : x) : [...devices, { ...d, kind }]);
     },
     onChange: changed,
     now: now2,
@@ -20533,7 +20638,7 @@ async function createMobileService(opts = {}) {
       if (devices.some((d) => d.id === deviceId)) {
         const at = new Date(now2()).toISOString();
         try {
-          saveDevices(devices.map((d) => d.id === deviceId ? { ...d, lastPeer: peer, lastSeenAt: at } : d));
+          saveDevices(devices.map((d) => d.id === deviceId ? { ...d, lastPeer: peer, lastSeenAt: at, peers: withPeer(d, peer) } : withoutPeer(d, peer)));
         } catch (e) {
           log(`mobile: devices.json not written (${e.message})`);
         }
@@ -20736,9 +20841,17 @@ async function createMobileService(opts = {}) {
     saveDevices(devices.filter((x) => x.id !== id));
     log(`mobile: revoked device ${id}`);
     channels.dropDevice(id);
-    if (d.lastPeer) sendFrame(d.lastPeer, { k: "denied" });
+    const others = new Set(devices.flatMap(peersOf));
+    const peers = peersOf(d).filter((p) => !others.has(p));
+    for (const p of peers) sendFrame(p, { k: "denied" });
+    changed();
+    await Promise.all(peers.map((p) => revokeOnRelay(p)));
+  };
+  const rename7 = (id, raw) => {
+    const name = DeviceNameSchema.parse(raw);
+    if (!devices.some((d) => d.id === id)) throw new Error("no such device");
+    saveDevices(devices.map((d) => d.id === id ? { ...d, name } : d));
     changed();
-    if (d.lastPeer) await revokeOnRelay(d.lastPeer);
   };
   const pairingIn = (id, states) => {
     const p = pairing.views().find((v2) => v2.id === id);
@@ -20760,13 +20873,20 @@ async function createMobileService(opts = {}) {
           label: d.label,
           approvedAt: d.approvedAt,
           online: online.has(d.id),
-          ...d.lastSeenAt ? { lastSeenAt: d.lastSeenAt } : {}
+          ...d.lastSeenAt ? { lastSeenAt: d.lastSeenAt } : {},
+          kind: d.kind ?? deviceKindOfLabel(d.label),
+          ...d.name ? { name: d.name } : {}
         })),
         pairings: pairing.views(),
         terminalInput: config.terminalInput === true
       };
     },
     revoke,
+    rename: rename7,
+    deviceInfo(deviceId) {
+      const d = devices.find((x) => x.id === deviceId);
+      return d ? { label: d.label, kind: d.kind ?? deviceKindOfLabel(d.label), ...d.name ? { name: d.name } : {} } : null;
+    },
     credential(deviceId) {
       const c = devices.find((d) => d.id === deviceId)?.credential;
       return c && c.rpId === rpOf(config.relayUrl)?.rpId ? c : null;
@@ -20867,17 +20987,24 @@ async function createMobileService(opts = {}) {
         case "mobile.retry":
           link3?.retryNow();
           return;
-        case "mobile.pairing.approve":
+        case "mobile.pairing.approve": {
           pairingIn(msg.id, ["confirm"]);
           if (linkState.state !== "online") throw new Error("the relay is offline");
+          const before2 = new Set(devices.map((d) => d.id));
           pairing.approve(msg.id);
+          const added = devices.some((d) => !before2.has(d.id));
+          if (msg.replaces !== void 0 && added && before2.has(msg.replaces)) await revoke(msg.replaces);
           return;
+        }
         case "mobile.pairing.deny":
           pairingIn(msg.id, ["confirm", "waiting"]);
           pairing.deny(msg.id);
           return;
         case "mobile.device.revoke":
           return revoke(msg.id);
+        case "mobile.device.rename":
+          rename7(msg.id, msg.name);
+          return;
       }
     },
     send: (deviceId, text7) => channels.send(deviceId, text7),

package/dist/cli/reduceWorker.js

@@ -243,6 +243,10 @@ var TaskBlockSchema = z5.object({
 // ../protocol/src/decisions.ts
 import { z as z6 } from "zod";
 var DecisionSchema = z6.enum(["accept", "deny", "always"]);
+var DecidedBySchema = z6.discriminatedUnion("kind", [
+  z6.object({ kind: z6.literal("pc") }),
+  z6.object({ kind: z6.literal("device"), id: z6.string().min(1).max(100), name: z6.string().min(1).max(60) })
+]);
 var NOTE_MAX = 4e3;
 
 // ../protocol/src/tasks.ts
@@ -1402,8 +1406,8 @@ var ThreadItemSchema = z22.discriminatedUnion("kind", [
     imagesDropped: z22.literal(true).optional()
   }),
   /** `unknown`: answered in the terminal, the daemon only saw the prompt go away; `always`: allowed and not asked again;
-   *  `byClose`: denied by Ledge closing the session. */
-  z22.object({ kind: z22.literal("permission"), ...base, tool: z22.string(), text: z22.string(), decision: z22.enum(["accept", "deny", "always", "unknown"]).optional(), byClose: z22.literal(true).optional() }),
+   *  `byClose`: denied by Ledge closing the session; `by`: who answered it from Ledge (the PC or a device, its name then). */
+  z22.object({ kind: z22.literal("permission"), ...base, tool: z22.string(), text: z22.string(), decision: z22.enum(["accept", "deny", "always", "unknown"]).optional(), byClose: z22.literal(true).optional(), by: DecidedBySchema.optional() }),
   z22.object({ kind: z22.literal("reply"), ...base, text: z22.string() }),
   z22.object({ kind: z22.literal("helper"), ...base, task: z22.string(), agentType: z22.string().optional(), state: z22.enum(["working", "exited"]) }),
   /** A message this session sent to another agent; `id` is the tool_use_id, `to` the address it used, `peer` the Ledge session id, `received` the paired item's id in the peer's thread, `via` set when Ledge's mailbox carries it. */
@@ -1486,6 +1490,9 @@ var MobileLinkStateSchema = z23.discriminatedUnion("state", [
   /** The mobile service did not start (a broken mobile.json, a missing key store): nothing is linked until the daemon restarts. */
   z23.object({ state: z23.literal("unavailable"), error: z23.string().max(200) })
 ]);
+var DeviceKindSchema = z23.enum(["phone", "tablet"]);
+var DEVICE_NAME_MAX = 40;
+var DeviceNameSchema = z23.string().trim().min(1).max(DEVICE_NAME_MAX).regex(/^[^\u0000-\u001f\u007f]+$/);
 var MobilePairingSchema = z23.object({
   id: z23.string(),
   label: z23.string(),
@@ -1501,7 +1508,16 @@ var MobileStateSchema = z23.object({
   /** The last sign-in that did not end with a session; cleared by the next one. */
   signinError: z23.enum(["expired", "denied", "not_allowed", "failed"]).nullable(),
   link: MobileLinkStateSchema,
-  devices: z23.array(z23.object({ id: z23.string(), label: z23.string(), approvedAt: z23.string(), online: z23.boolean(), lastSeenAt: z23.string().optional() })),
+  devices: z23.array(z23.object({
+    id: z23.string(),
+    label: z23.string(),
+    approvedAt: z23.string(),
+    online: z23.boolean(),
+    lastSeenAt: z23.string().optional(),
+    /** Absent from an older daemon; `name` absent: the user gave none, the front derives one from the label. */
+    kind: DeviceKindSchema.optional(),
+    name: z23.string().optional()
+  })),
   pairings: z23.array(MobilePairingSchema),
   /** « Taper dans les terminaux depuis le téléphone »: absent from an older daemon, which has no phone terminal. */
   terminalInput: z23.boolean().optional()
@@ -1556,6 +1572,8 @@ var SessionEventSchema = z24.object({
   decision: DecisionSchema.optional(),
   /** Decided: the request was refused by Ledge closing the session (its interrupt keys), not by the user's answer. */
   byClose: z24.literal(true).optional(),
+  /** Decided: who answered, when the daemon typed it (absent: answered in the terminal, or an older daemon). */
+  by: DecidedBySchema.optional(),
   /** The agent's own session id when the hook names it, so the daemon can resume that conversation. */
   agentSessionId: z24.string().optional()
 });
@@ -1832,7 +1850,9 @@ var ClientMessageSchema = z24.discriminatedUnion("type", [
     note: z24.string().trim().min(1).max(NOTE_MAX).optional(),
     /** The request the user saw when deciding: refused (the request changed) unless it is still the pending one. Left out by older fronts and the island.
      *  `key` (pendingKey) covers its whole content; older fronts send kind and text only. */
-    expect: PendingSchema.pick({ kind: true, text: true }).extend({ key: z24.string().max(64).optional() }).optional()
+    expect: PendingSchema.pick({ kind: true, text: true }).extend({ key: z24.string().max(64).optional() }).optional(),
+    /** Who decides: set by the phone gateway for a device (over anything the device sent); left out by a local front, which means the PC. */
+    by: DecidedBySchema.optional()
   }),
   z24.object({ type: z24.literal("session.focus"), id: z24.string() }),
   z24.object({ type: z24.literal("session.kill"), id: z24.string() }),
@@ -1886,10 +1906,13 @@ var ClientMessageSchema = z24.discriminatedUnion("type", [
   z24.object({ type: z24.literal("mobile.signout") }),
   /** While the link is offline: try again now. */
   z24.object({ type: z24.literal("mobile.retry") }),
-  z24.object({ type: z24.literal("mobile.pairing.approve"), id: z24.string().min(1).max(100) }),
+  /** `replaces`: an approved device this one takes the place of (the same app reinstalled), revoked once this one is stored. */
+  z24.object({ type: z24.literal("mobile.pairing.approve"), id: z24.string().min(1).max(100), replaces: z24.string().min(1).max(100).optional() }),
   z24.object({ type: z24.literal("mobile.pairing.deny"), id: z24.string().min(1).max(100) }),
   /** `id`: the device's fingerprint. */
   z24.object({ type: z24.literal("mobile.device.revoke"), id: z24.string().min(1).max(100) }),
+  /** Names a device (`id`: its fingerprint); the device sees its new name in its next snapshot. */
+  z24.object({ type: z24.literal("mobile.device.rename"), id: z24.string().min(1).max(100), name: DeviceNameSchema }),
   /** « Taper dans les terminaux depuis le téléphone »; turned off, every phone loses the hand. */
   z24.object({ type: z24.literal("mobile.terminal"), input: z24.boolean() }),
   /** « Reprendre la main »: the phone typing into the session's terminal goes back to reading it. */
@@ -2022,7 +2045,9 @@ var PushSubscriptionSchema = z27.object({
 });
 var PushPayloadSchema = z27.object({
   v: z27.literal(1),
-  kind: z27.enum(["request", "question", "finished", "chat", "decision"]),
+  /** `resolved`: a request or question answered (anywhere), replacing its notification under the same tag; only sent to a
+   *  device whose subscription says its service worker knows it (`push.subscribe` `resolved`). */
+  kind: z27.enum(["request", "question", "finished", "chat", "decision", "resolved"]),
   title: z27.string().max(80),
   body: z27.string().max(120),
   url: z27.string().regex(/^\/#\/[A-Za-z0-9/%._~-]*$/).max(300),
@@ -2289,8 +2314,11 @@ var PhoneClientMessageSchema = z28.discriminatedUnion("type", [
   z28.object({ type: z28.literal("openrig.row"), qitem: QitemIdSchema }),
   /** The phone drops its passkey from the daemon. */
   z28.object({ type: z28.literal("device.forget"), op: OperationIdSchema }),
-  /** The phone's push subscription, with the VAPID key it was made with (so a key change is seen). */
-  z28.object({ type: z28.literal("push.subscribe"), op: OperationIdSchema, subscription: PushSubscriptionSchema, key: B64U2.length(87) }),
+  /** The device names itself (on the PC and in its next snapshot); applied to the sender only. */
+  z28.object({ type: z28.literal("device.rename"), op: OperationIdSchema, name: DeviceNameSchema }),
+  /** The phone's push subscription, with the VAPID key it was made with (so a key change is seen). `resolved`: its service
+   *  worker shows a `resolved` push, which replaces a request's notification once it is answered elsewhere. */
+  z28.object({ type: z28.literal("push.subscribe"), op: OperationIdSchema, subscription: PushSubscriptionSchema, key: B64U2.length(87), resolved: z28.literal(true).optional() }),
   z28.object({ type: z28.literal("push.unsubscribe"), op: OperationIdSchema }),
   /** The phone's own chat with Ledge. */
   z28.object({ type: z28.literal("chat.ask"), qid: OperationIdSchema, text: z28.string().trim().max(MESSAGE_MAX), attachments: z28.array(AttachmentIdSchema).max(ATTACHMENTS_MAX).optional() }),
@@ -2382,7 +2410,16 @@ var PhoneServerMessageSchema = z28.discriminatedUnion("type", [
     openrig: z28.literal(true).optional(),
     /** The daemon takes `session.broadcast` (« Écrire au groupe »). */
     broadcast: z28.literal(true).optional()
-  }), device: z28.object({ confirm: z28.boolean(), push: z28.enum(["on", "off", "stale", "unavailable"]).optional(), chat: z28.literal(true).optional(), contextNear: ContextPrefsSchema.shape.near.optional() }).optional() }),
+  }), device: z28.object({
+    confirm: z28.boolean(),
+    push: z28.enum(["on", "off", "stale", "unavailable"]).optional(),
+    chat: z28.literal(true).optional(),
+    contextNear: ContextPrefsSchema.shape.near.optional(),
+    /** This device's id (its fingerprint, as decisions name it in `by`), its kind, and the name the user gave it (absent: none given). */
+    id: z28.string().optional(),
+    kind: DeviceKindSchema.optional(),
+    name: z28.string().optional()
+  }).optional() }),
   /** « À toi » on this PC: the answer to `openrig.asks`, then each change, whole. */
   z28.object({ type: z28.literal("openrig.asks"), channel: HumanChannelSchema, asks: z28.array(HumanAskSchema), partial: z28.literal(true).optional(), truncated: z28.literal(true).optional() }),
   /** An answer's end, as on the desktop (`openrig.answered`), under the phone's `op`. `rejected`: the device check refused it (`reason`). */

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@paradow/ledge",
-  "version": "0.41.0",
+  "version": "0.42.0",
   "description": "Follow and answer your WSL agent sessions (Claude Code, Codex, Cursor Agent) from the Ledge island on Windows.",
   "type": "module",
   "bin": { "ledge": "dist/cli/index.js" },