@webinson/peer 0.4.26 → 0.4.28

package/README.md

@@ -146,16 +146,16 @@ follow their own settings. `peer uninstall --codex` removes the plugin from Code
 ## Same file: who else was on an edited file
 
 After each edit in a shared thread, Peer sends the edited paths to the Hub and learns who else is on them: an agent
-that claimed the file in the last 3 minutes, or a checkout where the file has uncommitted changes (the Peer app reports
-those while they last). In Claude Code the thread mark runs `peer collide` after each `Edit`, `Write`, `MultiEdit` or
+that claimed the file in the last 3 minutes, or another person's session that changed the file in its work (the Peer
+app keeps reporting those files while the session lasts, committed or not). In Claude Code the thread mark runs `peer collide` after each `Edit`, `Write`, `MultiEdit` or
 `NotebookEdit`; in Codex the Peer Thread Mark plugin checks after each `apply_patch`.
 
 The first time a set of people meets on a file, Claude Code draws a line under the edit (and under a folded group of
 tool calls) with a **Same file** badge:
 
 - `bob@… was on it 2 min ago`: another person's agent claimed the file;
-- `bob@… has uncommitted changes`: the file has uncommitted changes in another person's checkout;
-- `Your other thread was on it just now`, dimmed: another session of yours. Your own uncommitted files are not shown.
+- `bob@… changed it`: a session of another person's changed the file in its work (it may be committed already);
+- `Your other thread was on it just now`, dimmed: another session of yours. Files you changed yourself are not shown.
 
 For another person, the agent also gets one sentence with the tool result, in Claude Code and in Codex, fenced as data
 and built by the CLI from the Hub's fields only:

package/bin/peer.mjs

@@ -901,6 +901,7 @@ function threadUses(session, prompts) {
   const name = (text) => path.basename(String(text).trim(), ".md").replace(/[_-]+/g, " ");
   const clean = (text) => plain(String(text).replace(/\*\*/g, "").replace(/`/g, "")).slice(0, 120);
   const uses = [];
+  const asking = new Map();
   let last;
   for (const line of fs.readFileSync(file, "utf8").split("\n")) {
     let row;
@@ -936,7 +937,17 @@ function threadUses(session, prompts) {
         if (block?.type !== "tool_use" || !/openviking/i.test(String(block.name))) continue;
         const input = block.input ?? {};
         const detail = input.query ?? input.pattern ?? input.uri ?? (Array.isArray(input.uris) ? input.uris.join(", ") : "") ?? "";
-        uses.push({ at, where: "tool", from: "yours", kind: String(block.name).split("__").pop(), items: detail ? [clean(String(detail).startsWith("viking://") ? name(detail) : detail)] : [], ...near("tool") });
+        const use = { at, where: "tool", from: "yours", kind: String(block.name).split("__").pop(), items: detail ? [clean(String(detail).startsWith("viking://") ? name(detail) : detail)] : [], ...near("tool") };
+        uses.push(use);
+        if (block.id) asking.set(block.id, use);
+      }
+    }
+    // A call that was refused (Jellyfish or Inactive holds PeerMemory back) or failed asked nothing of the memory.
+    if (row.type === "user" && Array.isArray(row.message?.content)) {
+      for (const block of row.message.content) {
+        if (block?.type !== "tool_result" || !block.is_error || !asking.has(block.tool_use_id)) continue;
+        const at = uses.indexOf(asking.get(block.tool_use_id));
+        if (at >= 0) uses.splice(at, 1);
       }
     }
   }
@@ -1375,8 +1386,8 @@ function minutesAgo(at, now = Date.now()) {
   return mins === 1 ? "1 minute ago" : `${mins} minutes ago`;
 }
 
-// The people on a path, one entry each: a claim wins over uncommitted changes, with the claim's own time. Your own
-// uncommitted files are no news to you and are left out.
+// The people on a path, one entry each: a claim wins over a file their session only reported changing in its work,
+// with the claim's own time. Your own changed files are no news to you and are left out.
 function peopleOn(holders, me) {
   const people = new Map();
   for (const holder of holders) {
@@ -1404,7 +1415,7 @@ function collisionSentence(results, now = Date.now()) {
     for (const person of result.people.filter((p) => !p.own).slice(0, 3)) {
       lines.push(
         person.kind === "changed"
-          ? `Another person, ${person.email}, has uncommitted changes to ${result.path}.`
+          ? `Another person, ${person.email}, changed ${result.path} in their work.`
           : `Another person, ${person.email}, had an agent on ${result.path} ${minutesAgo(person.at, now)}.`,
       );
     }

package/mod/peer-thread-mark/.claude-plugin/plugin.json

@@ -1,6 +1,6 @@
 {
   "name": "peer-thread-mark",
-  "version": "0.4.26",
+  "version": "0.4.28",
   "description": "Marks a Claude Code thread shared with Peer (/peer) with a band above the prompt, with /peer stop and /peer start; panes for /peer-list, /peer-thread and /peer-all (search your memories)",
   "license": "MIT",
   "types": "./types/index.d.ts"

package/mod/peer-thread-mark/hooks/register.tsx

@@ -538,8 +538,8 @@ function collisionLine(ui: { Box: (p: never) => RenderNode; Text: (p: never) =>
   const [newest] = others
   const who = `${plain(newest!.email.split('@')[0])}@…`
   const rest = others.length > 1 ? ` and ${others.length - 1} others` : ''
-  // Uncommitted changes carry no age: their report is renewed every few seconds.
-  const what = newest!.kind === 'changed' ? 'has uncommitted changes' : `was on it ${whenAgo(newest!.at, now)}`
+  // A file a session reported changing carries no age: the report is renewed every few seconds.
+  const what = newest!.kind === 'changed' ? 'changed it' : `was on it ${whenAgo(newest!.at, now)}`
   const badge =
     surface === 'terminal' ? (
       <Text backgroundColor={COLLISION_COLOR} color="#ffffff" bold size="caption">{' Same file '}</Text>

package/mod/peer-thread-mark/tests/collision-cases.mjs

@@ -25,7 +25,7 @@ export default {
       "line": "bob@… was on it 2 min ago"
     },
     {
-      "name": "another person's uncommitted changes",
+      "name": "another person changed the file in their work",
       "holders": [
         {
           "email": "carol@acme.test",
@@ -41,9 +41,9 @@ export default {
         }
       ],
       "sentence": [
-        "Another person, carol@acme.test, has uncommitted changes to src/cart.ts."
+        "Another person, carol@acme.test, changed src/cart.ts in their work."
       ],
-      "line": "carol@… has uncommitted changes"
+      "line": "carol@… changed it"
     },
     {
       "name": "one person in several sessions",
@@ -117,7 +117,7 @@ export default {
       "line": "Your other thread was on it just now"
     },
     {
-      "name": "your own uncommitted file",
+      "name": "a file you changed yourself",
       "holders": [
         {
           "email": "ana@acme.test",
@@ -156,10 +156,10 @@ export default {
         }
       ],
       "sentence": [
-        "Another person, carol@acme.test, has uncommitted changes to src/cart.ts.",
+        "Another person, carol@acme.test, changed src/cart.ts in their work.",
         "Another person, bob@acme.test, had an agent on src/cart.ts 2 minutes ago."
       ],
-      "line": "carol@… has uncommitted changes and 1 others"
+      "line": "carol@… changed it and 1 others"
     },
     {
       "name": "a Hub before kinds",

package/mod/peer-thread-mark/tests/collision.test.tsx

@@ -162,7 +162,7 @@ test('after a timeout the turn makes no more calls, and an old CLI draws nothing
 
 import CASES from './collision-cases.mjs'
 
-test('the line under an edit follows the shared cases: uncommitted changes carry no age, your own are not drawn', async ($, on) => {
+test('the line under an edit follows the shared cases: a changed file carries no age, your own are not drawn', async ($, on) => {
   const state = setUp(on)
   await $.classic.UserPromptSubmit({ prompt: 'go' } as never)
   let n = 0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@webinson/peer",
-  "version": "0.4.26",
+  "version": "0.4.28",
   "description": "Share chosen Claude Code and Codex threads with your team: who has agents running and on what.",
   "license": "MIT",
   "type": "module",