@estiva-app/interop 0.10.0 → 0.11.0

package/CHANGELOG.md

@@ -6,6 +6,57 @@ how a declaration is read, is a MAJOR — in `0.x`, a MINOR — even when no
 TypeScript signature moved. A consumer upgrading must be able to tell whether
 manifests already published still mean what they meant.
 
+## 0.11.0 — 2026-09-04
+
+**A second identity shape: an event id, for an object that has no `d`.** No
+existing manifest changes meaning; a pattern declaring `<id>` instead of `<d>`
+is new, and `MatchedObjectUrl` gains `by` so a consumer knows which query to
+make.
+
+RFC 0.5 §7.6 recorded a message as *addressed by `nevent`, outside this
+grammar*. PEE-17 needed a link to one, and following that literally would have
+put bech32 in a URL — which §7.3 argues against on two grounds that apply to
+`nevent` exactly as they do to `naddr`: a slice of it is checksum bytes rather
+than the identity, and relay hints are part of the encoding, so one object has
+more than one spelling.
+
+**A raw event id has neither problem**, and resolves with `{ids: ["<id>"]}` —
+one query, no index, the same property §7.2 chose the bare uuid for. So the rule
+generalises rather than gaining an exception: the identity goes in the path,
+unencoded, and everything before it is decoration.
+
+- **`eventIdFromRef`** reads a 64-character id off a ref's tail.
+- **`MatchedObjectUrl.by`** is `'d'` or `'id'` — the difference between
+  `{"#d": […]}` and `{ids: […]}`.
+- **The pattern decides which**, by carrying `<id>` or `<d>`. Not sniffed from
+  the value: a uuid and a 64-hex string are distinguishable today, and a
+  consumer relying on that would be inferring an app's addressing model from a
+  character class.
+
+Exactly 64 hex is required. A shorter run is a truncated id, which resolves to
+nothing or — worse — to something nobody intended.
+
+## 0.10.1 — 2026-09-03
+
+**`matchObjectUrl` matched no fragment route at all.** The parser's path capture
+stopped at the `#`, so `https://ship.estiva.app/#/issue/<uuid>` reduced to no
+segments and matched nothing — including patterns declaring exactly that shape.
+
+That is not a corner. Ship served fragment routes until SHI-16 and declares them
+still, so that links already sitting in other people's messages resolve rather
+than rendering as plain text for ever. A consumer on 0.10.0 would have silently
+failed every one of them.
+
+Found by a production probe before any consumer was built on it, which is the
+argument for probing the mechanism rather than the fixture.
+
+- Path and fragment segments are concatenated rather than swapped, because an
+  app may be served under a sub-path *and* use a fragment — Ship's own dev URL
+  is `localhost:5190/ship/#/…`, where both halves carry meaning.
+- A fragment route and a path route stay distinct shapes. Collapsing them would
+  let a pattern for `/issue/<slug>-<d>` claim `/#/issue/<d>`, and an app that
+  means different things by the two would resolve the wrong object.
+
 ## 0.10.0 — 2026-09-03
 
 **RFC 0.5 §7's URL grammar, which was accepted with amendments today.** No

package/dist/index.d.ts

@@ -33,5 +33,5 @@ export { resolveManifest, resolveForeignObject, resolveForeignEvent, resolveFold
  * question: those resolve an object you already hold, these turn a string
  * somebody pasted into one you can hold.
  */
-export { slugify, objectRef, identifierFromRef, urlPatternsOf, matchObjectUrl, type UrlPattern, type MatchedObjectUrl, } from './objectUrl.js';
+export { slugify, objectRef, identifierFromRef, eventIdFromRef, urlPatternsOf, matchObjectUrl, type UrlPattern, type MatchedObjectUrl, } from './objectUrl.js';
 //# sourceMappingURL=index.d.ts.map

package/dist/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;;;;;;GAyBG;AACH,OAAO,EACL,eAAe,EACf,oBAAoB,EACpB,mBAAmB,EACnB,oBAAoB,EACpB,cAAc,EACd,gBAAgB,EAChB,UAAU,EACV,kBAAkB,EAClB,cAAc,EACd,eAAe,EACf,SAAS,EACT,kBAAkB,EAClB,qBAAqB,EACrB,KAAK,aAAa,EAClB,cAAc,EACd,qBAAqB,EACrB,iBAAiB,EACjB,eAAe,EACf,kBAAkB,EAClB,mBAAmB,EACnB,KAAK,WAAW,EAChB,KAAK,kBAAkB,EACvB,KAAK,eAAe,EACpB,KAAK,gBAAgB,EACrB,KAAK,OAAO,EACZ,KAAK,QAAQ,EACb,KAAK,MAAM,EACX,KAAK,aAAa,EAClB,KAAK,aAAa,EAClB,KAAK,YAAY,EACjB,KAAK,cAAc,EACnB,KAAK,eAAe,EACpB,KAAK,cAAc,EACnB,KAAK,YAAY,EACjB,cAAc,EACd,KAAK,mBAAmB,GACzB,MAAM,iBAAiB,CAAA;AAExB;;;;;;;GAOG;AACH,OAAO,EACL,OAAO,EACP,SAAS,EACT,iBAAiB,EACjB,aAAa,EACb,cAAc,EACd,KAAK,UAAU,EACf,KAAK,gBAAgB,GACtB,MAAM,gBAAgB,CAAA"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;;;;;;GAyBG;AACH,OAAO,EACL,eAAe,EACf,oBAAoB,EACpB,mBAAmB,EACnB,oBAAoB,EACpB,cAAc,EACd,gBAAgB,EAChB,UAAU,EACV,kBAAkB,EAClB,cAAc,EACd,eAAe,EACf,SAAS,EACT,kBAAkB,EAClB,qBAAqB,EACrB,KAAK,aAAa,EAClB,cAAc,EACd,qBAAqB,EACrB,iBAAiB,EACjB,eAAe,EACf,kBAAkB,EAClB,mBAAmB,EACnB,KAAK,WAAW,EAChB,KAAK,kBAAkB,EACvB,KAAK,eAAe,EACpB,KAAK,gBAAgB,EACrB,KAAK,OAAO,EACZ,KAAK,QAAQ,EACb,KAAK,MAAM,EACX,KAAK,aAAa,EAClB,KAAK,aAAa,EAClB,KAAK,YAAY,EACjB,KAAK,cAAc,EACnB,KAAK,eAAe,EACpB,KAAK,cAAc,EACnB,KAAK,YAAY,EACjB,cAAc,EACd,KAAK,mBAAmB,GACzB,MAAM,iBAAiB,CAAA;AAExB;;;;;;;GAOG;AACH,OAAO,EACL,OAAO,EACP,SAAS,EACT,iBAAiB,EACjB,cAAc,EACd,aAAa,EACb,cAAc,EACd,KAAK,UAAU,EACf,KAAK,gBAAgB,GACtB,MAAM,gBAAgB,CAAA"}

package/dist/index.js

@@ -33,5 +33,5 @@ export { resolveManifest, resolveForeignObject, resolveForeignEvent, resolveFold
  * question: those resolve an object you already hold, these turn a string
  * somebody pasted into one you can hold.
  */
-export { slugify, objectRef, identifierFromRef, urlPatternsOf, matchObjectUrl, } from './objectUrl.js';
+export { slugify, objectRef, identifierFromRef, eventIdFromRef, urlPatternsOf, matchObjectUrl, } from './objectUrl.js';
 //# sourceMappingURL=index.js.map

package/dist/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;;;;;;GAyBG;AACH,OAAO,EACL,eAAe,EACf,oBAAoB,EACpB,mBAAmB,EACnB,oBAAoB,EACpB,cAAc,EACd,gBAAgB,EAChB,UAAU,EACV,kBAAkB,EAClB,cAAc,EACd,eAAe,EACf,SAAS,EACT,kBAAkB,EAClB,qBAAqB,EAErB,cAAc,EACd,qBAAqB,EACrB,iBAAiB,EACjB,eAAe,EACf,kBAAkB,EAClB,mBAAmB,EAenB,cAAc,GAEf,MAAM,iBAAiB,CAAA;AAExB;;;;;;;GAOG;AACH,OAAO,EACL,OAAO,EACP,SAAS,EACT,iBAAiB,EACjB,aAAa,EACb,cAAc,GAGf,MAAM,gBAAgB,CAAA"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;;;;;;GAyBG;AACH,OAAO,EACL,eAAe,EACf,oBAAoB,EACpB,mBAAmB,EACnB,oBAAoB,EACpB,cAAc,EACd,gBAAgB,EAChB,UAAU,EACV,kBAAkB,EAClB,cAAc,EACd,eAAe,EACf,SAAS,EACT,kBAAkB,EAClB,qBAAqB,EAErB,cAAc,EACd,qBAAqB,EACrB,iBAAiB,EACjB,eAAe,EACf,kBAAkB,EAClB,mBAAmB,EAenB,cAAc,GAEf,MAAM,iBAAiB,CAAA;AAExB;;;;;;;GAOG;AACH,OAAO,EACL,OAAO,EACP,SAAS,EACT,iBAAiB,EACjB,cAAc,EACd,aAAa,EACb,cAAc,GAGf,MAAM,gBAAgB,CAAA"}

package/dist/objectUrl.d.ts

@@ -48,6 +48,22 @@ export declare function objectRef(identifier: string, title?: string): string;
  * rather than silently miss.
  */
 export declare function identifierFromRef(ref: string): string | null;
+/**
+ * The event id out of a ref, or null.
+ *
+ * **Why an event id in a URL rather than an `nevent`.** §7.3 rejects bech32 in
+ * a URL on two grounds, and both apply to `nevent` exactly as they do to
+ * `naddr`: a slice of it is checksum bytes rather than the identity, and relay
+ * hints are part of the encoding, so one object has more than one spelling.
+ *
+ * A raw event id has neither problem. It is the whole identity of an event that
+ * has no `d`, it is stable because nothing optional is encoded into it, and it
+ * resolves with `{ids: ["<id>"]}` — one query, no index, exactly the property
+ * §7.2 chose the bare uuid for. So the rule generalises rather than gaining an
+ * exception: **the identity goes in the path, unencoded, and everything before
+ * it is decoration.**
+ */
+export declare function eventIdFromRef(ref: string): string | null;
 /**
  * A URL shape an app says it serves — RFC 0.5 §7.5's `urls`, read off the
  * manifest event the way `web` is.
@@ -78,7 +94,17 @@ export declare function urlPatternsOf(event: {
 }): UrlPattern[];
 /** What a pasted URL turned out to name. */
 export interface MatchedObjectUrl {
+    /** A `d` for an addressable object, or an event id for one without. */
     identifier: string;
+    /**
+     * How to resolve `identifier`: by `#d` for an addressable object, by `ids`
+     * for an event that has none.
+     *
+     * Declared by the pattern's placeholder — `<d>` or `<id>` — rather than
+     * guessed from the string, because a consumer that inspected the value would
+     * be deciding a kind's addressing model from the shape of a hex string.
+     */
+    by: 'd' | 'id';
     /** Present only when the matched pattern named one. */
     kind?: number;
 }

package/dist/objectUrl.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"objectUrl.d.ts","sourceRoot":"","sources":["../src/objectUrl.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAiCG;AAkBH;;;;GAIG;AACH,wBAAgB,OAAO,CAAC,KAAK,EAAE,MAAM,GAAG,MAAM,CAS7C;AAED,qFAAqF;AACrF,wBAAgB,SAAS,CAAC,UAAU,EAAE,MAAM,EAAE,KAAK,CAAC,EAAE,MAAM,GAAG,MAAM,CAGpE;AAED;;;;;;GAMG;AACH,wBAAgB,iBAAiB,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,GAAG,IAAI,CAG5D;AAED;;;;;;;;GAQG;AACH,MAAM,WAAW,UAAU;IACzB,sDAAsD;IACtD,OAAO,EAAE,MAAM,CAAA;IACf;;;;;;;;;OASG;IACH,IAAI,CAAC,EAAE,MAAM,CAAA;CACd;AAED,mDAAmD;AACnD,wBAAgB,aAAa,CAAC,KAAK,EAAE;IAAE,IAAI,EAAE,MAAM,EAAE,EAAE,CAAA;CAAE,GAAG,UAAU,EAAE,CAQvE;AAED,4CAA4C;AAC5C,MAAM,WAAW,gBAAgB;IAC/B,UAAU,EAAE,MAAM,CAAA;IAClB,uDAAuD;IACvD,IAAI,CAAC,EAAE,MAAM,CAAA;CACd;AAED;;;;;;;;;;GAUG;AACH,wBAAgB,cAAc,CAAC,GAAG,EAAE,MAAM,EAAE,QAAQ,EAAE,UAAU,EAAE,GAAG,gBAAgB,GAAG,IAAI,CAuB3F"}
+{"version":3,"file":"objectUrl.d.ts","sourceRoot":"","sources":["../src/objectUrl.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAiCG;AA2BH;;;;GAIG;AACH,wBAAgB,OAAO,CAAC,KAAK,EAAE,MAAM,GAAG,MAAM,CAS7C;AAED,qFAAqF;AACrF,wBAAgB,SAAS,CAAC,UAAU,EAAE,MAAM,EAAE,KAAK,CAAC,EAAE,MAAM,GAAG,MAAM,CAGpE;AAED;;;;;;GAMG;AACH,wBAAgB,iBAAiB,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,GAAG,IAAI,CAG5D;AAED;;;;;;;;;;;;;;GAcG;AACH,wBAAgB,cAAc,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,GAAG,IAAI,CAGzD;AAED;;;;;;;;GAQG;AACH,MAAM,WAAW,UAAU;IACzB,sDAAsD;IACtD,OAAO,EAAE,MAAM,CAAA;IACf;;;;;;;;;OASG;IACH,IAAI,CAAC,EAAE,MAAM,CAAA;CACd;AAED,mDAAmD;AACnD,wBAAgB,aAAa,CAAC,KAAK,EAAE;IAAE,IAAI,EAAE,MAAM,EAAE,EAAE,CAAA;CAAE,GAAG,UAAU,EAAE,CAQvE;AAED,4CAA4C;AAC5C,MAAM,WAAW,gBAAgB;IAC/B,uEAAuE;IACvE,UAAU,EAAE,MAAM,CAAA;IAClB;;;;;;;OAOG;IACH,EAAE,EAAE,GAAG,GAAG,IAAI,CAAA;IACd,uDAAuD;IACvD,IAAI,CAAC,EAAE,MAAM,CAAA;CACd;AAED;;;;;;;;;;GAUG;AACH,wBAAgB,cAAc,CAAC,GAAG,EAAE,MAAM,EAAE,QAAQ,EAAE,UAAU,EAAE,GAAG,gBAAgB,GAAG,IAAI,CAmC3F"}

package/dist/objectUrl.js

@@ -40,6 +40,14 @@
  * label that may itself contain hyphens, digits and hex.
  */
 const TRAILING_UUID_RE = /[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}$/i;
+/**
+ * A 64-character event id at the very end of a ref.
+ *
+ * The second identity shape, for an object that has no `d` — a `kind:9`
+ * message is the case in hand, and §7.6 recorded it as outside the grammar
+ * until this. Anchored at the end for the same positional reason as the uuid.
+ */
+const TRAILING_EVENT_ID_RE = /(?:^|[^0-9a-f])([0-9a-f]{64})$/i;
 /**
  * Slugs are cut here. Long enough to stay recognisable in a chat client's link
  * preview, short enough that the uuid is not pushed off the end of a rendered
@@ -77,6 +85,25 @@ export function identifierFromRef(ref) {
     const match = TRAILING_UUID_RE.exec(ref);
     return match ? match[0].toLowerCase() : null;
 }
+/**
+ * The event id out of a ref, or null.
+ *
+ * **Why an event id in a URL rather than an `nevent`.** §7.3 rejects bech32 in
+ * a URL on two grounds, and both apply to `nevent` exactly as they do to
+ * `naddr`: a slice of it is checksum bytes rather than the identity, and relay
+ * hints are part of the encoding, so one object has more than one spelling.
+ *
+ * A raw event id has neither problem. It is the whole identity of an event that
+ * has no `d`, it is stable because nothing optional is encoded into it, and it
+ * resolves with `{ids: ["<id>"]}` — one query, no index, exactly the property
+ * §7.2 chose the bare uuid for. So the rule generalises rather than gaining an
+ * exception: **the identity goes in the path, unencoded, and everything before
+ * it is decoration.**
+ */
+export function eventIdFromRef(ref) {
+    const match = TRAILING_EVENT_ID_RE.exec(ref);
+    return match ? match[1].toLowerCase() : null;
+}
 /** The `urls` shapes a manifest event declares. */
 export function urlPatternsOf(event) {
     const out = [];
@@ -109,6 +136,9 @@ export function matchObjectUrl(url, patterns) {
             continue;
         if (shape.scheme !== target.scheme || shape.host !== target.host)
             continue;
+        // A fragment route and a path route are different shapes, not one.
+        if (shape.fragmented !== target.fragmented)
+            continue;
         // The pattern's path up to its final segment: `/issue/` out of
         // `/issue/<slug>-<d>`. Compared literally and at equal depth, so `/issues`
         // never matches `/issue/…` and a nested route never matches a shallower one.
@@ -119,10 +149,20 @@ export function matchObjectUrl(url, patterns) {
             .every((segment, i) => segment === target.segments[i]);
         if (!prefixMatches)
             continue;
-        const identifier = identifierFromRef(target.segments[target.segments.length - 1] ?? '');
+        const tail = target.segments[target.segments.length - 1] ?? '';
+        /*
+          The pattern says which identity it carries. `<id>` is an event id, for a
+          kind with no `d`; anything else is the `<d>` uuid this grammar started
+          with. Read from the declaration rather than sniffed from the value: a
+          64-hex string and a uuid are distinguishable today, and a consumer that
+          relied on that would be inferring an app's addressing model from a
+          character class.
+        */
+        const wantsEventId = shape.segments[shape.segments.length - 1]?.includes('<id>') ?? false;
+        const identifier = wantsEventId ? eventIdFromRef(tail) : identifierFromRef(tail);
         if (!identifier)
             continue;
-        return { identifier, ...(kind === undefined ? {} : { kind }) };
+        return { identifier, by: wantsEventId ? 'id' : 'd', ...(kind === undefined ? {} : { kind }) };
     }
     return null;
 }
@@ -145,14 +185,34 @@ export function matchObjectUrl(url, patterns) {
  * declare.
  */
 function splitUrl(raw) {
-    const match = /^(https?):\/\/([^/?#]+)([^?#]*)/i.exec(raw.trim());
+    const match = /^(https?):\/\/([^/?#]+)([^?#]*)(?:\?[^#]*)?(?:#(.*))?$/i.exec(raw.trim());
     if (!match)
         return null;
-    const [, scheme, host, path] = match;
+    const [, scheme, host, path, fragment] = match;
+    /*
+      A fragment route counts as path.
+  
+      Ship served `#/issue/<d>` until SHI-16 and still declares those shapes, so
+      that links already sitting in other people's messages resolve rather than
+      rendering as plain text for ever. A parser that stopped at the `#` — this
+      one did — matched none of them, which a production probe caught before any
+      consumer was built on it.
+  
+      Segments from the path and the fragment are concatenated rather than
+      swapped, because an app may be served under a sub-path *and* use a
+      fragment: Ship's own dev URL is `localhost:5190/ship/#/…`, where both
+      halves carry meaning.
+  
+      `fragmented` is kept so the two do not collapse into each other. Without it
+      a pattern for `/issue/<slug>-<d>` would also claim `/#/issue/<d>`, and an
+      app that means different things by the two would resolve the wrong object.
+    */
+    const fragmentPath = fragment && fragment.startsWith('/') ? fragment : '';
     return {
         scheme: scheme.toLowerCase(),
         host: host.toLowerCase(),
-        segments: (path ?? '').split('/').filter(Boolean),
+        segments: [...(path ?? '').split('/'), ...fragmentPath.split('/')].filter(Boolean),
+        fragmented: fragmentPath !== '',
     };
 }
 //# sourceMappingURL=objectUrl.js.map

package/dist/objectUrl.js.map

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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@estiva-app/interop",
-  "version": "0.10.0",
+  "version": "0.11.0",
   "description": "Render and act on another app's objects from its published NIP-89 manifest. The owner defines the projection; the consumer decides how it looks.",
   "license": "MIT",
   "type": "module",

package/src/index.ts

@@ -75,6 +75,7 @@ export {
   slugify,
   objectRef,
   identifierFromRef,
+  eventIdFromRef,
   urlPatternsOf,
   matchObjectUrl,
   type UrlPattern,

package/src/objectUrl.ts

@@ -42,6 +42,15 @@
  */
 const TRAILING_UUID_RE = /[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}$/i
 
+/**
+ * A 64-character event id at the very end of a ref.
+ *
+ * The second identity shape, for an object that has no `d` — a `kind:9`
+ * message is the case in hand, and §7.6 recorded it as outside the grammar
+ * until this. Anchored at the end for the same positional reason as the uuid.
+ */
+const TRAILING_EVENT_ID_RE = /(?:^|[^0-9a-f])([0-9a-f]{64})$/i
+
 /**
  * Slugs are cut here. Long enough to stay recognisable in a chat client's link
  * preview, short enough that the uuid is not pushed off the end of a rendered
@@ -83,6 +92,26 @@ export function identifierFromRef(ref: string): string | null {
   return match ? match[0].toLowerCase() : null
 }
 
+/**
+ * The event id out of a ref, or null.
+ *
+ * **Why an event id in a URL rather than an `nevent`.** §7.3 rejects bech32 in
+ * a URL on two grounds, and both apply to `nevent` exactly as they do to
+ * `naddr`: a slice of it is checksum bytes rather than the identity, and relay
+ * hints are part of the encoding, so one object has more than one spelling.
+ *
+ * A raw event id has neither problem. It is the whole identity of an event that
+ * has no `d`, it is stable because nothing optional is encoded into it, and it
+ * resolves with `{ids: ["<id>"]}` — one query, no index, exactly the property
+ * §7.2 chose the bare uuid for. So the rule generalises rather than gaining an
+ * exception: **the identity goes in the path, unencoded, and everything before
+ * it is decoration.**
+ */
+export function eventIdFromRef(ref: string): string | null {
+  const match = TRAILING_EVENT_ID_RE.exec(ref)
+  return match ? match[1].toLowerCase() : null
+}
+
 /**
  * A URL shape an app says it serves — RFC 0.5 §7.5's `urls`, read off the
  * manifest event the way `web` is.
@@ -121,7 +150,17 @@ export function urlPatternsOf(event: { tags: string[][] }): UrlPattern[] {
 
 /** What a pasted URL turned out to name. */
 export interface MatchedObjectUrl {
+  /** A `d` for an addressable object, or an event id for one without. */
   identifier: string
+  /**
+   * How to resolve `identifier`: by `#d` for an addressable object, by `ids`
+   * for an event that has none.
+   *
+   * Declared by the pattern's placeholder — `<d>` or `<id>` — rather than
+   * guessed from the string, because a consumer that inspected the value would
+   * be deciding a kind's addressing model from the shape of a hex string.
+   */
+  by: 'd' | 'id'
   /** Present only when the matched pattern named one. */
   kind?: number
 }
@@ -145,6 +184,8 @@ export function matchObjectUrl(url: string, patterns: UrlPattern[]): MatchedObje
     const shape = splitUrl(pattern)
     if (!shape) continue
     if (shape.scheme !== target.scheme || shape.host !== target.host) continue
+    // A fragment route and a path route are different shapes, not one.
+    if (shape.fragmented !== target.fragmented) continue
 
     // The pattern's path up to its final segment: `/issue/` out of
     // `/issue/<slug>-<d>`. Compared literally and at equal depth, so `/issues`
@@ -155,9 +196,19 @@ export function matchObjectUrl(url: string, patterns: UrlPattern[]): MatchedObje
       .every((segment, i) => segment === target.segments[i])
     if (!prefixMatches) continue
 
-    const identifier = identifierFromRef(target.segments[target.segments.length - 1] ?? '')
+    const tail = target.segments[target.segments.length - 1] ?? ''
+    /*
+      The pattern says which identity it carries. `<id>` is an event id, for a
+      kind with no `d`; anything else is the `<d>` uuid this grammar started
+      with. Read from the declaration rather than sniffed from the value: a
+      64-hex string and a uuid are distinguishable today, and a consumer that
+      relied on that would be inferring an app's addressing model from a
+      character class.
+    */
+    const wantsEventId = shape.segments[shape.segments.length - 1]?.includes('<id>') ?? false
+    const identifier = wantsEventId ? eventIdFromRef(tail) : identifierFromRef(tail)
     if (!identifier) continue
-    return { identifier, ...(kind === undefined ? {} : { kind }) }
+    return { identifier, by: wantsEventId ? 'id' : 'd', ...(kind === undefined ? {} : { kind }) }
   }
   return null
 }
@@ -180,13 +231,34 @@ export function matchObjectUrl(url: string, patterns: UrlPattern[]): MatchedObje
  * refusal local to the parser rather than a consequence of what apps happen to
  * declare.
  */
-function splitUrl(raw: string): { scheme: string; host: string; segments: string[] } | null {
-  const match = /^(https?):\/\/([^/?#]+)([^?#]*)/i.exec(raw.trim())
+function splitUrl(raw: string): { scheme: string; host: string; segments: string[]; fragmented: boolean } | null {
+  const match = /^(https?):\/\/([^/?#]+)([^?#]*)(?:\?[^#]*)?(?:#(.*))?$/i.exec(raw.trim())
   if (!match) return null
-  const [, scheme, host, path] = match
+  const [, scheme, host, path, fragment] = match
+
+  /*
+    A fragment route counts as path.
+
+    Ship served `#/issue/<d>` until SHI-16 and still declares those shapes, so
+    that links already sitting in other people's messages resolve rather than
+    rendering as plain text for ever. A parser that stopped at the `#` — this
+    one did — matched none of them, which a production probe caught before any
+    consumer was built on it.
+
+    Segments from the path and the fragment are concatenated rather than
+    swapped, because an app may be served under a sub-path *and* use a
+    fragment: Ship's own dev URL is `localhost:5190/ship/#/…`, where both
+    halves carry meaning.
+
+    `fragmented` is kept so the two do not collapse into each other. Without it
+    a pattern for `/issue/<slug>-<d>` would also claim `/#/issue/<d>`, and an
+    app that means different things by the two would resolve the wrong object.
+  */
+  const fragmentPath = fragment && fragment.startsWith('/') ? fragment : ''
   return {
     scheme: scheme.toLowerCase(),
     host: host.toLowerCase(),
-    segments: (path ?? '').split('/').filter(Boolean),
+    segments: [...(path ?? '').split('/'), ...fragmentPath.split('/')].filter(Boolean),
+    fragmented: fragmentPath !== '',
   }
 }