@hraness/ghostget 0.18.12 → 0.18.14

package/src/providers/beeper-local-runtime.ts

@@ -2544,11 +2544,11 @@ async function directMessagesV3(
     cursor: string;
   }> | null;
 }>> {
-  const selfUserId = requireBoundSelfAccount(
+  const selfUserIds = boundSelfUserIds(
+    requireBoundSelfAccount(realm.accounts, input.accountId, "messaging.read"),
     realm.accounts,
-    input.accountId,
     "messaging.read",
-  ).user.id;
+  );
   const collected: unknown[] = [];
   const seenIds = new Set<string>();
   const seenCursors = new Set<string>();
@@ -2582,8 +2582,8 @@ async function directMessagesV3(
       input,
     ));
     if (parsed.some((message) =>
-      message.isSender === true && message.senderId !== selfUserId
-      || message.isSender === false && message.senderId === selfUserId)) {
+      message.isSender === true && !selfUserIds.has(message.senderId)
+      || message.isSender === false && selfUserIds.has(message.senderId))) {
       throw new Error(
         "Beeper Desktop direct message direction contradicted the bound account self identity",
       );
@@ -3868,7 +3868,7 @@ export async function reconcileBeeperLocalOperation(
             const actualState = action === "messaging.edit"
               ? message.isSender === true && message.text === value.text
               : message.reactions.some((reaction) =>
-                  reaction.participantId === requireBoundAccount(accounts, accountId, action).user.id
+                  boundSelfUserIds(requireBoundAccount(accounts, accountId, action), accounts, action).has(reaction.participantId)
                   && reaction.reactionKey === value.reaction);
             return Object.freeze({
               actualState,
@@ -4032,13 +4032,21 @@ function conversationOutput(
   if (accountId !== null && !accountIds.has(accountId)) {
     throw new Error("messaging.list requested an account outside the bound Beeper realm");
   }
-  const conversations = strictArray(raw, "Beeper conversations", MAX_CHATS)
-    .map((item, index) => parseConversation(
-      item,
-      `Beeper conversations[${index}]`,
-      accountIds,
-      accountId,
-    ));
+  const rows = strictArray(raw, "Beeper conversations", MAX_CHATS);
+  // Desktop keeps chats for stale bridge accounts that /v1/accounts no longer
+  // enumerates. An unfiltered list excludes those rows instead of failing the
+  // whole projection; every emitted row still binds to the realm and scoped
+  // reads keep their exact-account check.
+  let excludedOutOfRealm = 0;
+  const conversations = rows.flatMap((item, index) => {
+    if (
+      accountId === null
+      && typeof item === "object" && item !== null
+      && typeof (item as Readonly<Record<string, unknown>>).accountID === "string"
+      && !accountIds.has((item as Readonly<Record<string, unknown>>).accountID as string)
+    ) { excludedOutOfRealm += 1; return []; }
+    return [parseConversation(item, `Beeper conversations[${index}]`, accountIds, accountId)];
+  });
   for (const conversation of conversations) {
     if (
       (input.archived !== null && (conversation.isArchived === true) !== input.archived)
@@ -4055,7 +4063,7 @@ function conversationOutput(
   }
   const ids = conversations.map((conversation) => `${conversation.accountId}\0${conversation.id}`);
   if (new Set(ids).size !== ids.length) throw new Error("Beeper conversations repeat an account-scoped ID");
-  const requestedLimitReached = conversations.length >= input.limit;
+  const requestedLimitReached = rows.length >= input.limit;
   return Object.freeze({
     provider: "beeper",
     operation: "messaging.list",
@@ -4070,9 +4078,11 @@ function conversationOutput(
       remoteConversationSetComplete: false,
       continuationAvailable: false,
       requestedLimitReached,
+      excludedOutOfRealmConversationCount: excludedOutOfRealm,
       warnings: Object.freeze([
         "beeper-cli-v0.6.2-chat-result-window-has-no-continuation",
         "newly-connected-accounts-may-have-incomplete-history",
+        ...(excludedOutOfRealm > 0 ? ["beeper-out-of-realm-conversations-excluded"] : []),
       ]),
     }),
   });
@@ -4302,11 +4312,8 @@ function directMessageOutputV3(
   raw: unknown,
   continuation: Readonly<{ direction: "before" | "after"; cursor: string }> | null,
 ) {
-  const selfUserId = requireBoundSelfAccount(
-    accounts,
-    input.accountId,
-    "messaging.read",
-  ).user.id;
+  const selfAccount = requireBoundSelfAccount(accounts, input.accountId, "messaging.read");
+  const selfUserIds = boundSelfUserIds(selfAccount, accounts, "messaging.read");
   const messages = strictArray(raw, "Beeper direct messages", input.limit)
     .map((item, index) => parseMessage(
       item,
@@ -4315,7 +4322,7 @@ function directMessageOutputV3(
     ));
   if (messages.some((message) =>
     message.isSender !== null
-    && message.isSender !== (message.senderId === selfUserId))) {
+    && message.isSender !== selfUserIds.has(message.senderId))) {
     throw new Error(
       "Beeper direct messages contradicted the bound account self identity",
     );
@@ -4367,7 +4374,8 @@ function directMessageOutputV3(
     projection: "bounded-local-desktop-direct-iterator",
     accountId: input.accountId,
     conversationId: input.conversationId,
-    selfUserId,
+    selfUserId: selfAccount.user.id,
+    canonicalSelfUserId: canonicalSelfUserId(accounts, "messaging.read"),
     requestCursor,
     requestDirection,
     requestedSender: input.sender,
@@ -4415,6 +4423,38 @@ function requireBoundSelfAccount(
   return account;
 }
 
+/** The realm's canonical Matrix self identity when exactly one is present;
+ * Desktop reports it as `senderID`/`participantId` for the owner on every
+ * bridge rather than each account's bridge-scoped user ID. */
+function canonicalSelfUserId(
+  accounts: readonly BeeperAccountProjection[],
+  operation: string,
+): string | null {
+  const canonical = accounts.filter((candidate) =>
+    candidate.user.isSelf === true
+    && (
+      candidate.bridge.type.toLowerCase() === "matrix"
+      || candidate.network?.toLowerCase() === "beeper"
+    ));
+  if (canonical.length > 1) {
+    throw new Error(`${operation} found ambiguous canonical self identities`);
+  }
+  return canonical.length === 1 ? canonical[0]!.user.id : null;
+}
+
+/** Self sender identities proven by the bound realm: the given bound account's
+ * bridge-scoped user ID plus the canonical Matrix self identity. */
+function boundSelfUserIds(
+  account: BeeperAccountProjection,
+  accounts: readonly BeeperAccountProjection[],
+  operation: string,
+): ReadonlySet<string> {
+  const self = new Set([account.user.id]);
+  const canonical = canonicalSelfUserId(accounts, operation);
+  if (canonical !== null) self.add(canonical);
+  return self;
+}
+
 function exactConversation(
   raw: unknown,
   accounts: readonly BeeperAccountProjection[],

package/src/providers/beeper-local.ts

@@ -284,7 +284,7 @@ const adapterOperations = beeperAdapterManifest.operations as Readonly<Record<
 >>;
 
 export const BEEPER_LOCAL_OPERATION_INPUT_TYPES = Object.freeze(Object.fromEntries(
-  Object.keys(adapterOperations).sort().map((operation) => [
+  [...BEEPER_LOCAL_OPERATION_NAMES].sort().map((operation) => [
     operation,
     Object.freeze(Object.fromEntries(
       Object.keys(adapterOperations[operation]!.input.properties).sort().map((field) => [
@@ -2579,9 +2579,9 @@ export const BEEPER_CLI_V062_SURFACE_CONTRACT = defineLocalCliSurfaceContractV1(
   sdk: BEEPER_DESKTOP_API_PIN,
   runtime: {
     providerPluginId: "beeper-linked-device",
-    providerPluginVersion: "2.4.0",
+    providerPluginVersion: "2.5.0",
     adapterId: "beeper-local",
-    adapterVersion: "2.4.0",
+    adapterVersion: "2.5.0",
     operationContractVersions: BEEPER_LOCAL_OPERATION_CONTRACT_VERSIONS,
     operationInputTypes: BEEPER_LOCAL_OPERATION_INPUT_TYPES,
     target: BEEPER_DESKTOP_TARGET,
@@ -2600,7 +2600,7 @@ export const BEEPER_CLI_V062_CLASSIFICATION_SHA256 =
 export const BEEPER_CLI_V062_SEMANTIC_PROFILES_SHA256 =
   "fb7ea5f70f004dd8090c3e6e0996bfa00b0bab8ea5639203e2d1027602450ffe" as const;
 export const BEEPER_CLI_V062_WHOLE_SURFACE_SHA256 =
-  "72201ac5eb3532f7c159583f19009f547d7d313e86388466b57c135bd2dc4944" as const;
+  "bedc3063a7a792686e351c78e7ba3ed2a5fc0cc6efd3d88a23d9b7ae777765e2" as const;
 
 export const BEEPER_CLI_V062_PUBLIC_MANUAL_SEMANTIC_PROFILE_SHA256 = Object.freeze({
   "setup": "cd432e2649e5724d70398e739a2d1c0c21557a23820aaa14562575a5fe689406",

package/src/providers/beeper-omni.ts

@@ -978,7 +978,7 @@ export function materializeBeeperMessagingRead(
     "tombstones",
     "continuation",
     "completeness",
-  ], [], "messaging.read output");
+  ], ["canonicalSelfUserId"], "messaging.read output");
   if (source.accountId !== parsed.accountId || source.conversationId !== parsed.conversationId) {
     drift("messaging.read output", "must bind input account and conversation");
   }
@@ -987,6 +987,13 @@ export function materializeBeeperMessagingRead(
     "messaging.read output.selfUserId",
     2_048,
   );
+  const canonicalSelfUserId = source.canonicalSelfUserId === undefined || source.canonicalSelfUserId === null
+    ? null
+    : beeperRawIdentifier(
+        source.canonicalSelfUserId,
+        "messaging.read output.canonicalSelfUserId",
+        2_048,
+      );
   const requestCursor = parsed.beforeCursor ?? parsed.afterCursor;
   if (source.requestCursor !== requestCursor) {
     drift("messaging.read output.requestCursor", "must bind the requested cursor");
@@ -1025,7 +1032,7 @@ export function materializeBeeperMessagingRead(
     );
     if (
       isSender !== null
-      && isSender !== (senderId === selfUserId)
+      && isSender !== (senderId === selfUserId || (canonicalSelfUserId !== null && senderId === canonicalSelfUserId))
     ) drift(
       "messaging.read output.messages",
       "must bind direction to the exact self user ID",

package/src/providers/imessage-direct-runtime.ts

@@ -448,18 +448,38 @@ export async function runImsgRpc(
   let timedOut = false;
   let cancelled = false;
   let forceKill: ReturnType<typeof setTimeout> | null = null;
+  let groupTerminated: Promise<boolean> | null = null;
   let terminationStarted = false;
   const signalGroup = (signal: "SIGTERM" | "SIGKILL"): void => {
     try {
       process.kill(-child.pid, signal);
     } catch {
-      // child.exited remains the reaping proof.
+      // The bounded group probe below establishes descendant cleanup.
     }
   };
   const terminate = (): void => {
     if (!terminationStarted) {
       terminationStarted = true;
       signalGroup("SIGTERM");
+      groupTerminated = (async (): Promise<boolean> => {
+        // A joined leader and closed pipes do not prove its descendants exited.
+        // Retain the one-second escalation, then bound final group reaping.
+        const deadline = performance.now() + 1_500;
+        for (;;) {
+          try {
+            process.kill(-child.pid, 0);
+          } catch (error) {
+            const code = typeof error === "object" && error !== null
+              && "code" in error ? error.code : undefined;
+            if (code === "ESRCH") return true;
+            // Allow a transient permission denial to settle within the same
+            // bound; it is never proof that the group exited.
+            if (code !== "EPERM") return false;
+          }
+          if (performance.now() >= deadline) return false;
+          await new Promise<void>((resolve) => setTimeout(resolve, 20));
+        }
+      })();
     }
     forceKill ??= setTimeout(() => signalGroup("SIGKILL"), 1_000);
   };
@@ -509,8 +529,14 @@ export async function runImsgRpc(
     });
   } finally {
     clearTimeout(timeout);
-    if (forceKill !== null) clearTimeout(forceKill);
     invocation.signal?.removeEventListener("abort", onAbort);
+    try {
+      if (groupTerminated !== null && !await groupTerminated) {
+        throw new ImsgCleanupUnverifiedError();
+      }
+    } finally {
+      if (forceKill !== null) clearTimeout(forceKill);
+    }
   }
 }
 

package/src/providers/messaging-native-install.ts

@@ -62,8 +62,9 @@ export async function ensureImsgNativeResources(installDirectory: string, enviro
 
 /** Owner setup only. Installing resources never pairs, opens Messages, changes
  * OS permissions, connects a provider, or grants messaging authority. */
-export async function installBundledMessagingRuntime(provider: "imessage" | "whatsapp", environment: Environment = process.env): Promise<{ version: string; sha256: string; alreadyPresent?: boolean }> {
+export async function installBundledMessagingRuntime(provider: "imessage" | "whatsapp" | "beeper", environment: Environment = process.env): Promise<{ version: string; sha256: string; alreadyPresent?: boolean }> {
   if (process.platform !== "darwin" || process.arch !== "arm64") throw new Error("Bundled messaging runtimes require Apple silicon macOS");
+  if (provider === "beeper") throw new Error("Beeper has no bundled messaging runtime; the pinned local CLI and running Beeper Desktop are installed separately");
   if (provider !== "imessage" && provider !== "whatsapp") throw new Error("Unknown messaging runtime");
   const bytes = await readBundledMessagingAsset(provider), directory = await mkdtemp(join(await realpath(tmpdir()), "wrench-messaging-install-")); await chmod(directory, 0o700);
   const path = join(directory, "runtime"), file = await open(path, constants.O_CREAT | constants.O_EXCL | constants.O_WRONLY | constants.O_NOFOLLOW, 0o500);

package/src/support-profile.ts

@@ -0,0 +1,7 @@
+/** Public product identity shared by the CLI, menu and static website. */
+export const ghostgetSupportProfile = Object.freeze({
+  id: "wrench",
+  name: "Ghostget",
+  valueProposition: "Support ongoing development of precise web tools for agents.",
+  updates: true,
+} as const);

package/src/support.ts

@@ -2,13 +2,7 @@ import {
   maybeShowSupportInvitation,
   runSupportCommand,
 } from "@hraness/support-foundation/node";
-
-const profile = {
-  id: "wrench",
-  name: "Ghostget",
-  valueProposition: "Support ongoing development of precise web tools for agents.",
-  updates: true,
-} as const;
+import { ghostgetSupportProfile as profile } from "./support-profile";
 
 type SupportOutput = {
   readonly stdout: (text: string) => unknown;

package/src/version.ts

@@ -1,2 +1,2 @@
 /** Canonical immutable Ghostget package release identity. */
-export const GHOSTGET_VERSION = "0.18.12" as const;
+export const GHOSTGET_VERSION = "0.18.14" as const;