@webinson/peer 0.4.27 → 0.4.29

package/README.md

@@ -107,8 +107,17 @@ peer login --codex you@company.com
 If you already signed in to Peer, use `peer install --codex` in place of the login
 command. Review and trust the Peer Thread Mark hooks in Codex's `/hooks` menu.
 
-In standard Codex, send `peer: start`, `peer: stop`, `peer: list`, `peer: thread`, or
-`peer: all [words] [here] [--newest | --oldest] [page N]`. The hook answers these locally.
+In the desktop Codex composer, type `/` and select one of the skills installed with Peer Thread Mark.
+
+- `/peer` shares this chat. Append a task to share the chat and continue with that task.
+  Append `elephant` or `jellyfish` to select Peer's memory mode, or `stop` to stop sharing.
+- `/peer-list` shows the threads shared in your Peer workspace.
+- `/peer-thread` shows what the current chat saved to your personal OpenViking memory.
+- `/peer-all [words] [here] [--newest | --oldest] [page N]` browses or searches that memory.
+
+You can also send `peer: start [task | elephant | jellyfish]`, `peer: stop`, `peer: list`, `peer: thread`, or
+`peer: all [words] [here] [--newest | --oldest] [page N]` as plain text. The hook handles sharing and
+displays lists and memories locally.
 The plugin uses the [Codex hook API](https://learn.chatgpt.com/docs/hooks) and lives under
 [`mod/codex`](mod/codex) in its own marketplace.
 
@@ -146,16 +155,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/codex-thread-mark.mjs

@@ -9,6 +9,8 @@ const local = (reason) => ({ decision: "block", reason });
 const MARKETPLACE = "webinson-peer-codex";
 const PLUGIN = `peer-thread-mark@${MARKETPLACE}`;
 const setupFile = (peer) => path.join(peer.home, "codex-cli.json");
+const SKILL_MENTION = /^\$peer-thread-mark:(peer(?:-all|-list|-thread)?)(?=\s|$)/;
+const SKILL_LINK = /^\[(\$peer-thread-mark:[\w-]+)(?:\?[^\]\r\n]*)?\]\((?:\\.|[^\\)\r\n])+\)(?=\s|$)/;
 
 export function installCodex(peer, { client = false } = {}) {
   if (peer.cli.includes(`${path.sep}_npx${path.sep}`)) {
@@ -264,20 +266,24 @@ async function collideHook(input, session, peer) {
 
 async function promptHook(prompt, id, cwd, peer) {
   const session = `codex-${id}`;
+  // The desktop composer can send the namespaced skill as a Markdown link.
+  const link = SKILL_LINK.exec(prompt);
+  const skill = SKILL_MENTION.exec(link?.[1] ?? prompt);
+  const command = skill ? `/${skill[1]}${prompt.slice((link ?? skill)[0].length)}` : prompt;
   // The text form also works in clients that handle slash commands before submitting a turn.
-  const all = /^(?:\/peer-all|peer:\s+all)(?:\s+([\s\S]*))?$/.exec(prompt);
+  const all = /^(?:\/peer-all|peer:\s+all)(?:\s+([\s\S]*))?$/.exec(command);
   if (all) {
     const query = peer.memoryQuery((all[1] ?? "").split(/\s+/).filter(Boolean), cwd || process.cwd());
     return local(await peer.memoryText(query).catch((error) => `Peer: your memories did not load (${error.message})`));
   }
-  if (/^(?:\/peer-list|peer:\s+list)$/.test(prompt)) {
+  if (/^(?:\/peer-list|peer:\s+list)$/.test(command)) {
     try {
       return local(await peer.listText(peer.signedIn()));
     } catch (error) {
       return local(`Peer: ${error.message}`);
     }
   }
-  if (/^(?:\/peer-thread|peer:\s+thread)$/.test(prompt)) {
+  if (/^(?:\/peer-thread|peer:\s+thread)$/.test(command)) {
     try {
       return local(peer.threadMemoryText(await peer.threadMemories(id, true)));
     } catch (error) {
@@ -285,15 +291,18 @@ async function promptHook(prompt, id, cwd, peer) {
     }
   }
 
-  const share = /^(?:\/peer|peer:\s+start)(?:\s+([\s\S]*))?$/.exec(prompt);
+  const share = /^(?:\/peer|peer:\s+start)(?:\s+([\s\S]*))?$/.exec(command);
   const message = share?.[1]?.trim() ?? "";
-  const stop = (share && message === "stop") || /^peer:\s+stop$/.test(prompt);
+  const stop = (share && message === "stop") || /^peer:\s+stop$/.test(command);
   if (share || stop) {
     try {
       if (stop) return local(await setMode(peer, id, cwd, "inactive"));
       const mode = modeOf(peer, session);
-      const said = await setMode(peer, id, cwd, mode === "inactive" ? "elephant" : mode, { working: Boolean(message) });
-      if (!message) return local(said);
+      const selectedMode = /^(elephant|jellyfish)$/i.exec(message)?.[1].toLowerCase();
+      const hasWork = Boolean(message) && !selectedMode;
+      const said = await setMode(peer, id, cwd, selectedMode ?? (mode === "inactive" ? "elephant" : mode), { working: hasWork });
+      if (selectedMode) return local(`${said} Peer memory mode: ${selectedMode}.`);
+      if (!hasWork) return local(said);
       return {
         hookSpecificOutput: {
           hookEventName: "UserPromptSubmit",

package/bin/peer.mjs

@@ -1386,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) {
@@ -1415,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/codex/peer-thread-mark/.codex-plugin/plugin.json

@@ -1,8 +1,9 @@
 {
   "name": "peer-thread-mark",
-  "version": "0.2.0",
+  "version": "0.3.0",
   "description": "Share selected Codex threads in Peer and browse their memories.",
   "license": "MIT",
+  "skills": "./skills/",
   "hooks": "./hooks/hooks.json",
   "interface": {
     "displayName": "Peer Thread Mark",

package/mod/codex/peer-thread-mark/skills/peer/SKILL.md

@@ -0,0 +1,16 @@
+---
+name: peer
+description: Share the current Codex chat on Peer, optionally with a task or a memory mode, or stop sharing it.
+---
+
+# Peer
+
+The Peer Thread Mark hook handles sharing before this skill reaches the model. If the user invokes it and the hook has supplied a confirmation, continue with the task they appended.
+
+If the hook did not confirm the action, direct the user to send one of these messages in the chat they want to share or stop sharing.
+
+- `peer: start` shares the chat. Append a task to share it and continue with that task.
+- `peer: start elephant` or `peer: start jellyfish` shares the chat and selects Peer's memory mode.
+- `peer: stop` stops sharing.
+
+If the plain-text command also reaches the model, direct the user to `peer doctor` to check the hook.

package/mod/codex/peer-thread-mark/skills/peer-all/SKILL.md

@@ -0,0 +1,8 @@
+---
+name: peer-all
+description: Browse or search your personal OpenViking memories with Peer, optionally scoped to the current repository.
+---
+
+# Peer all
+
+The Peer Thread Mark hook searches and displays these memories locally. If the request reaches the model, ask the user to send `peer: all` with their search terms and filters as a separate message. The hook accepts `here`, `--newest`, `--oldest`, and `page N`. If the plain-text command also reaches the model, direct them to `peer doctor`.

package/mod/codex/peer-thread-mark/skills/peer-list/SKILL.md

@@ -0,0 +1,8 @@
+---
+name: peer-list
+description: List the people in your Peer workspace and the agent chats they share.
+---
+
+# Peer list
+
+The Peer Thread Mark hook shows this list directly in the chat. If the request reaches the model, ask the user to send `peer: list` by itself so the hook can answer. If that also reaches the model, direct them to `peer doctor`.

package/mod/codex/peer-thread-mark/skills/peer-thread/SKILL.md

@@ -0,0 +1,8 @@
+---
+name: peer-thread
+description: Show what the current Codex chat has saved to your personal OpenViking memory.
+---
+
+# Peer thread
+
+The Peer Thread Mark hook reads the current chat's memories and displays them locally. If the request reaches the model, ask the user to send `peer: thread` by itself. If that also reaches the model, direct them to `peer doctor`.

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

@@ -1,6 +1,6 @@
 {
   "name": "peer-thread-mark",
-  "version": "0.4.27",
+  "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.27",
+  "version": "0.4.29",
   "description": "Share chosen Claude Code and Codex threads with your team: who has agents running and on what.",
   "license": "MIT",
   "type": "module",