@wowyuarm/dsh-agent-team 0.1.12 → 0.1.13

package/packages/agent-team/lib/mentions.js

@@ -17,40 +17,64 @@ function codeRanges(body) {
     return ranges;
 }
 const ALL_MARKER = /(?<![\p{L}\p{N}_@])@all(?=$|[^\p{L}\p{N}_])/iu;
+/** Whether one body carries the `@all` marker outside code. */
+export function hasAllMarker(body) {
+    const excluded = codeRanges(body);
+    const marker = ALL_MARKER.exec(body);
+    return marker !== null && !excluded.some(([start, end]) => marker.index >= start && marker.index < end);
+}
+/**
+ * Every `@Handle` occurrence in one body that names one of `handles`:
+ * case-insensitive, on Unicode word boundaries, longest handle first, outside
+ * code. Writing `@` is required: bare handles are ordinary words. This is the
+ * single definition of an authored mention — the Host delivery resolution and
+ * the Client's chip rendering and draft preview all read through it, so a name
+ * that renders as a chip is the same name that delivers a notification.
+ */
+export function scanBodyHandles(body, handles) {
+    const seen = new Set();
+    const usable = [];
+    for (const handle of handles) {
+        const key = handle.toLowerCase();
+        if (handle.trim() === '' || seen.has(key))
+            continue;
+        seen.add(key);
+        usable.push(handle);
+    }
+    if (usable.length === 0)
+        return Object.freeze([]);
+    const excluded = codeRanges(body);
+    // Longest first so `@Reeves` never resolves as `@Reeve` plus a stray letter.
+    const ordered = [...usable].sort((left, right) => right.length - left.length);
+    const pattern = new RegExp(`(?<![\\p{L}\\p{N}_@])@(?:${ordered.map(handle => escapeRegExp(handle)).join('|')})(?=$|[^\\p{L}\\p{N}_])`, 'giu');
+    const matches = [];
+    for (const match of body.matchAll(pattern)) {
+        const start = match.index ?? 0;
+        if (excluded.some(([rangeStart, rangeEnd]) => start >= rangeStart && start < rangeEnd))
+            continue;
+        const written = match[0].slice(1).toLowerCase();
+        const hit = ordered.find(handle => handle.toLowerCase() === written);
+        if (hit === undefined)
+            continue;
+        matches.push(Object.freeze({ handle: hit, start, end: start + match[0].length }));
+    }
+    return Object.freeze(matches);
+}
 /**
- * Resolve the `@Handle` mentions authored in one Message body. Matching is
- * deliberately the same shape the Client renders with — case-insensitive, on
- * Unicode word boundaries, longest handle first — so a name that renders as a
- * chip is the same name that delivers a notification.
+ * Resolve the `@Handle` mentions authored in one Message body.
  *
  * Callers pass the candidates reachable in the Message's Channel, so a name
  * that resolves here is already an addressable target; handles the Channel
- * cannot reach simply stay prose. Writing `@` is required: bare handles are
- * ordinary words, and treating them as mentions would notify on every
- * incidental name-drop.
+ * cannot reach simply stay prose.
  *
  * `sender` is excluded because a Message never mentions its own author, which
  * also keeps the result usable as a recipient set without further filtering.
  */
 export function resolveBodyMentions(body, candidates, sender) {
     const usable = candidates.filter(candidate => candidate.memberId !== sender && candidate.handle.trim() !== '');
-    const excluded = codeRanges(body);
-    const inCode = (index) => excluded.some(([start, end]) => index >= start && index < end);
-    const allMarker = ALL_MARKER.exec(body);
-    const all = allMarker !== null && !inCode(allMarker.index);
+    const all = hasAllMarker(body);
     if (usable.length === 0)
         return { memberIds: Object.freeze([]), all };
-    // Longest first so `@Reeves` never resolves as `@Reeve` plus a stray letter.
-    const ordered = [...usable].sort((left, right) => right.handle.length - left.handle.length);
-    const pattern = new RegExp(`(?<![\\p{L}\\p{N}_@])@(?:${ordered.map(candidate => escapeRegExp(candidate.handle)).join('|')})(?=$|[^\\p{L}\\p{N}_])`, 'giu');
-    const matched = new Set();
-    for (const match of body.matchAll(pattern)) {
-        if (inCode(match.index ?? 0))
-            continue;
-        const written = match[0].slice(1).toLowerCase();
-        const hit = ordered.find(candidate => candidate.handle.toLowerCase() === written);
-        if (hit !== undefined)
-            matched.add(hit.memberId);
-    }
-    return { memberIds: Object.freeze(usable.filter(candidate => matched.has(candidate.memberId)).map(candidate => candidate.memberId)), all };
+    const matched = new Set(scanBodyHandles(body, usable.map(candidate => candidate.handle)).map(match => match.handle.toLowerCase()));
+    return { memberIds: Object.freeze(usable.filter(candidate => matched.has(candidate.handle.toLowerCase())).map(candidate => candidate.memberId)), all };
 }

package/packages/agent-team/lib/spec.js

@@ -365,6 +365,25 @@ const storedAgentTeamOperationSchema = z.discriminatedUnion('kind', [
             ...releaseSnapshotFields,
         }).strict(),
     }).strict(),
+    z.object({
+        ...operationBase,
+        previousOperationId: operationIdSchema.nullable(),
+        kind: z.literal('team/member-workspace-joined'),
+        data: z.object({
+            workspaceId: workspaceIdSchema,
+            memberId: memberIdSchema,
+        }).strict(),
+    }).strict(),
+    z.object({
+        ...operationBase,
+        previousOperationId: operationIdSchema.nullable(),
+        kind: z.literal('team/member-workspace-left'),
+        data: z.object({
+            workspaceId: workspaceIdSchema,
+            memberId: memberIdSchema,
+            ...releaseSnapshotFields,
+        }).strict(),
+    }).strict(),
     z.object({
         ...operationBase,
         previousOperationId: operationIdSchema.nullable(),