@ssheleg/agent-sync 1.18.4 → 1.18.5

package/CHANGELOG.md

@@ -1,3 +1,45 @@
+## v1.18.5 — a pipe reaches the guard, and the installers stop deleting blind
+
+Two enforcement holes, each of the same shape: a mechanism whose own text claimed more
+than its code did.
+
+- **ASY-05 — a piped commit bypassed the lease guard entirely.** `guard.sh`'s tokenizer
+  said "each `&&`/`;`/`|` segment is its own command" and consumed only `&&`, `;` and
+  `||` — so `echo msg | git commit -F -`, the ordinary way to commit a generated
+  message, was one segment whose first token is `echo`, and the whole pipeline skipped
+  the guard. The single pipe and `|&` are now consumed (ordered after `||`, or each
+  would shatter into stray halves), three new `GUARD_SHAPES` cover the bypass and the
+  pipe that must NOT block (`git log | grep commit`), and the self-test plants the
+  shipped tokenizer back (`a piped commit slips past the guard`). Watched failing
+  against the pre-fix guard: both piped shapes reached a guarded file with exit 0.
+- **The installers consulted nothing before deleting the Claude Code channel.** This
+  member's installers never write `~/.claude/skills/agent-sync` themselves — the skills
+  CLI they drive recreates it — and both deleted that copy unconditionally afterwards.
+  The family canon this implements (make-skill v0.25.0, distribution.md §3) names the
+  fail-open class, and here it ran in mirror image: on a home where the plugin is NOT
+  installed — no claude CLI, or the plugin install failed — the prune destroyed the only
+  Claude Code channel the very same run had just installed, and exited 0. The fate of
+  the copy is now a decision read from the target home's
+  `~/.claude/plugins/installed_plugins.json` (the record of what is installed; plugin
+  and marketplace names differ, so the spec is taken from the JSON), with the
+  `marketplaces/<name>` dir kept only as the fallback signal: plugin present → the
+  shadow is pruned and the message names the real spec, the plugin-channel remedy and
+  the family launcher; no plugin → the copy is kept, because it IS the Claude Code
+  channel; `--force` → kept beside the plugin, as the recorded choice to run two
+  channels where the stale one wins. Absent or corrupt JSON reads as "no plugin" — fail
+  open, never crash. Only the Claude Code channel is gated; other agents' installs are
+  untouched.
+- **The install now says how the next version arrives** — `npx @ssheleg/agent-sync@latest
+  update`, or the family launcher — because an installer that never mentions updates has
+  still chosen an update model: never.
+- `test/installer_test.js`: 11 cases against throwaway HOMEs with the delegated CLIs
+  stubbed through PATH — plugin-present prune with the spec from the JSON, a
+  differently-named marketplace, `--force`, corrupt JSON, a prefix-collider
+  (`agent-sync-extra@x`), the marketplaces-dir fallback, the update path, and the
+  install.sh mirrors. Ten of eleven watched failing against the pre-fix installers.
+  Wired into `npm test` and CI; `hooks_session_test.py` — already in `npm test` —
+  joins CI in the same step block.
+
 ## v1.18.4 — the channel that sends the installs, on npm too
 
 - The `skills.sh` badge and the canonical `homepage` reached GitHub in the previous cycle and stopped

package/bin/agent-sync.js

@@ -6,8 +6,11 @@
  *
  * One channel per agent: Claude Code gets the plugin, every other agent gets the
  * skill through the vercel skills CLI, and the plain ~/.claude/skills/agent-sync
- * copy that the skills CLI recreates on its own is pruned afterwards — that
- * duplicate shadows the plugin and silently serves a stale skill.
+ * copy that the skills CLI recreates on its own is settled afterwards against
+ * the home's installed_plugins.json — pruned when the plugin owns Claude Code
+ * (the duplicate would shadow it and silently serve a stale skill), kept when no
+ * plugin does (then it IS the Claude Code channel), kept on --force as the
+ * recorded choice to run two channels. Canon: make-skill distribution.md §3.
  */
 
 const { spawnSync } = require('child_process');
@@ -19,6 +22,41 @@ const REPO = 'ssheleg/agent-sync';
 const NAME = 'agent-sync';
 const SHADOW = path.join(os.homedir(), '.claude', 'skills', NAME);
 
+/**
+ * The plugin spec (`<name>@<marketplace>`) installed for `name` in this home,
+ * or null.
+ *
+ * `installed_plugins.json` is the record of what is actually installed. The
+ * `plugins/marketplaces/<name>` directory — the only signal the family's
+ * installers read until the 2026-08-29 canon (make-skill v0.25.0,
+ * distribution.md §3) — under-reports: a marketplace added from a local
+ * `directory` source has no dir there at all, and plugin names differ from
+ * marketplace names, so a check keyed on it stays green while the shadow
+ * lands. Absence and corruption both read as "no plugin": the fresh HOME is
+ * the common case, and an installer that crashes on a parse error refuses the
+ * machines that need it most.
+ */
+function installedPluginSpec(home, name) {
+  try {
+    const raw = fs.readFileSync(
+      path.join(home, '.claude', 'plugins', 'installed_plugins.json'), 'utf8');
+    const parsed = JSON.parse(raw);
+    const plugins =
+      parsed && typeof parsed === 'object' &&
+      parsed.plugins && typeof parsed.plugins === 'object'
+        ? parsed.plugins
+        : parsed;
+    if (!plugins || typeof plugins !== 'object') return null;
+    for (const spec of Object.keys(plugins)) {
+      if (spec === name) return `${name}@${name}`;
+      if (spec.startsWith(name + '@')) return spec;
+    }
+  } catch {
+    // missing or corrupt = no plugin — fail open on absence, never crash
+  }
+  return null;
+}
+
 const C = {
   dim: (s) => `\x1b[2m${s}\x1b[0m`,
   bold: (s) => `\x1b[1m${s}\x1b[0m`,
@@ -46,7 +84,12 @@ ${C.bold('agent-sync')} — coordination for concurrent agents
   npx @ssheleg/${NAME} install              install for Claude Code and other agents
   npx @ssheleg/${NAME} install --claude-only  Claude Code plugin only
   npx @ssheleg/${NAME} install --agent a,b    pick agents for the skills CLI
-  npx @ssheleg/${NAME} update               update every channel, then prune the shadow
+  npx @ssheleg/${NAME} update               update every channel, then settle the
+                                            ~/.claude/skills copy: pruned when it
+                                            would shadow the installed plugin, kept
+                                            when no plugin owns Claude Code
+  npx @ssheleg/${NAME} install|update --force  keep the plain copy even beside the
+                                            plugin — two channels, the stale one wins
   npx @ssheleg/${NAME} --help
 
 After installing, initialise the project — this is the step that asks where
@@ -64,6 +107,7 @@ asks for a token and never stores one.
 function install(argv) {
   const claudeOnly = argv.includes('--claude-only');
   const noClaude = argv.includes('--no-claude');
+  const force = argv.includes('--force');
   const agentIdx = argv.indexOf('--agent');
   const agents = agentIdx !== -1 && argv[agentIdx + 1] ? argv[agentIdx + 1].split(',') : null;
 
@@ -88,7 +132,7 @@ function install(argv) {
     ok = run('npx', args) && ok;
   }
 
-  pruneShadow();
+  settleClaudeChannel(force);
 
   console.log(
     ok
@@ -98,8 +142,14 @@ function install(argv) {
   // Before the "Next:" block, so the last thing on screen stays the instruction
   // rather than the tail of a delegated command.
   offerRouters();
+  // How the next version arrives — an installer that never says has still
+  // chosen an update model: never.
   console.log(`
-${C.bold('Next:')} restart Claude Code, then run ${C.bold('/agent-sync init')} in your project.
+${C.bold('Updates:')} npx @ssheleg/${NAME}@latest update — every channel, and it settles
+the plain copy that would shadow the plugin. Whole family:
+npx --yes sshlg-skills@latest update.
+`);
+  console.log(`${C.bold('Next:')} restart Claude Code, then run ${C.bold('/agent-sync init')} in your project.
 It will ask where coordination state should live before writing anything.
 `);
   return ok ? 0 : 1;
@@ -137,13 +187,30 @@ function offerRouters() {
 }
 
 /**
+ * Decide the fate of ~/.claude/skills/<name> after a skills-CLI run.
+ *
  * The shadow regrows on its own: `npx skills add|update --global` auto-detects
  * Claude Code and recreates ~/.claude/skills/<name> — often as a symlink — even when
- * claude-code was never named as a target. That copy shadows the plugin and serves a
- * stale skill, so the prune belongs INSIDE every command that touches the skills CLI,
- * not in a human's memory. lstatSync, because a symlink shadows exactly as a dir does.
+ * claude-code was never named as a target. What that copy IS depends on the home it
+ * landed in, and until v1.18.5 this function consulted nothing and deleted it
+ * unconditionally — the family's fail-open class (make-skill distribution.md §3) in
+ * mirror image: on a home where the plugin is NOT installed (no claude CLI, or the
+ * plugin install failed), the unconditional prune destroyed the only Claude Code
+ * channel this very run had just installed, and exited 0.
+ *
+ * - Plugin installed in this home — read from installed_plugins.json, with the
+ *   marketplaces/<name> dir kept only as the fallback signal: the copy is a SHADOW.
+ *   It outranks the plugin and serves the version it was copied from forever.
+ *   Prune it, and name the plugin spec it would have shadowed plus the channel
+ *   that owns updates.
+ * - No plugin: the copy is Claude Code's only channel. Keep it, and say so.
+ * - --force: the deliberate choice to run two channels, where the stale one wins.
+ *   The copy stays even beside the plugin, and the output records the choice.
+ *
+ * The gate lives INSIDE every command that touches the skills CLI, not in a human's
+ * memory. lstatSync, because a symlink shadows exactly as a dir does.
  */
-function pruneShadow() {
+function settleClaudeChannel(force) {
   let present = false;
   try {
     fs.lstatSync(SHADOW);
@@ -152,11 +219,40 @@ function pruneShadow() {
     /* not there */
   }
   if (!present) return;
+
+  const home = os.homedir();
+  const spec = installedPluginSpec(home, NAME);
+  const marketplace = path.join(home, '.claude', 'plugins', 'marketplaces', NAME);
+  const viaMarketplaceDir = !spec && fs.existsSync(marketplace);
+
+  if (!spec && !viaMarketplaceDir) {
+    console.log(C.dim(
+      `  kept ${SHADOW} — no ${NAME} plugin is installed in this home,\n` +
+      `  so this plain copy is Claude Code's only channel for the skill`));
+    return;
+  }
+  if (force) {
+    console.log(C.yellow(
+      `  kept ${SHADOW} beside the installed plugin (--force) — two channels\n` +
+      `  on one agent, and the stale plain copy is the one Claude Code reads`));
+    return;
+  }
+  const found = spec
+    ? `the Claude Code plugin ${spec} is installed (installed_plugins.json)`
+    : `a Claude Code marketplace is registered at ${marketplace}`;
   fs.rmSync(SHADOW, { recursive: true, force: true });
-  console.log(C.dim(`  pruned duplicate ${SHADOW}`));
+  console.log(C.dim(
+    `  pruned ${SHADOW} — ${found};\n` +
+    `  a plain copy there would shadow the plugin and serve a frozen version\n` +
+    `  forever. The plugin channel owns updates:\n` +
+    `    claude plugin marketplace update ${NAME}\n` +
+    `    claude plugin update ${spec || `${NAME}@${NAME}`}\n` +
+    `  Pass --force to keep the plain copy anyway — a deliberate choice to run\n` +
+    `  two channels, where the stale one wins.`));
 }
 
-function update() {
+function update(argv) {
+  const force = argv.includes('--force');
   console.log(C.bold('\nUpdating every channel'));
   let ok = true;
   if (has('claude')) {
@@ -166,7 +262,7 @@ function update() {
     ok = run('claude', ['plugin', 'update', `${NAME}@${NAME}`]) && ok;
   }
   ok = run('npx', ['--yes', 'skills', 'update', NAME, '--global', '--yes']) && ok;
-  pruneShadow();
+  settleClaudeChannel(force);
   console.log(ok ? C.green('\n✓ updated') : C.red('\n✗ a channel failed — see above'));
   console.log('\nRestart Claude Code so it picks the new version up.');
   return ok ? 0 : 1;
@@ -178,6 +274,6 @@ if (argv.length === 0 || argv.includes('--help') || argv.includes('-h')) {
   process.exit(0);
 }
 if (argv[0] === 'install') process.exit(install(argv.slice(1)));
-if (argv[0] === 'update') process.exit(update());
+if (argv[0] === 'update') process.exit(update(argv.slice(1)));
 usage();
 process.exit(1);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ssheleg/agent-sync",
-  "version": "1.18.4",
+  "version": "1.18.5",
   "description": "Let concurrent coding agents share one project without colliding — leases with TTL, race-free id reservation, a run journal and a generated board, over a pluggable knowledge cloud.",
   "bin": {
     "agent-sync": "bin/agent-sync.js"
@@ -17,7 +17,7 @@
     "LICENSE"
   ],
   "scripts": {
-    "test": "python3 test/validate.py && python3 test/validate.py --self-test && python3 test/claim_cell_test.py && python3 test/hooks_session_test.py",
+    "test": "python3 test/validate.py && python3 test/validate.py --self-test && python3 test/claim_cell_test.py && python3 test/hooks_session_test.py && node test/installer_test.js",
     "prepublishOnly": "python3 test/validate.py"
   },
   "publishConfig": {

package/plugins/agent-sync/.claude-plugin/plugin.json

@@ -1,7 +1,7 @@
 {
   "name": "agent-sync",
   "displayName": "Agent Sync",
-  "version": "1.18.4",
+  "version": "1.18.5",
   "description": "Coordination layer for multi-agent repositories — leases with TTL, race-free ID reservation, a run journal, a cross-repo signal feed and a generated board, over a pluggable knowledge cloud.",
   "author": {
     "name": "ssheleg",

package/plugins/agent-sync/hooks/guard.sh

@@ -38,8 +38,12 @@ except Exception:
     print("0 ."); sys.exit(0)
 cmd = (d.get("tool_input") or {}).get("command", "")
 is_commit, repo = 0, "."
-# Each &&/;/| segment is its own command; a commit anywhere in the chain counts.
-for seg in cmd.replace("&&", "\n").replace(";", "\n").replace("||", "\n").split("\n"):
+# Each &&/;/||/|&/| segment is its own command; a commit anywhere in the chain counts.
+# The single pipe was CLAIMED by this comment and never consumed (ASY-05, fixed 2026-08-29):
+# only "||" was replaced, so `echo msg | git commit -F -` stayed one segment whose first
+# token is `echo`, and the whole pipeline skipped the guard. Order matters: "||" and "|&"
+# must be consumed before the bare "|", or each would be split into a stray half.
+for seg in cmd.replace("&&", "\n").replace("||", "\n").replace("|&", "\n").replace(";", "\n").replace("|", "\n").split("\n"):
     try:
         toks = shlex.split(seg)
     except ValueError:

package/plugins/agent-sync/skills/agent-sync/SKILL.md

@@ -4,7 +4,7 @@ description: "Use when several coding agents work one repository at the same tim
 compatibility: "Requires the task-pipeline skill for its stages (npx sshlg-skills install). Needs python3 3.9+ (stdlib only, HTTP included - nothing to pip install) and bash for the hooks. The knowledge backend is configured per project; with none configured it degrades to git-file leases. Enforcement hooks are Claude Code only - on other agents the same checks run as a self-check."
 license: MIT
 metadata:
-  version: "1.18.4"
+  version: "1.18.5"
   author: ssheleg
 ---
 

package/plugins/agent-sync/skills/agent-sync/scripts/agent_sync.py

@@ -33,7 +33,7 @@ from datetime import datetime, timezone
 from pathlib import Path
 from typing import Any
 
-VERSION = "1.18.4"
+VERSION = "1.18.5"
 
 CONFIG_PATH = Path(".claude/agent-sync.json")
 ENV_FILE = Path(".env.agent-sync")