pier-setup 0.4.1 → 0.4.3

package/README.md

@@ -27,9 +27,9 @@ pier ships as **two halves**, installed separately:
 - **Todo anti-freeze**: an all-completed list unchanged for ≥6 turns flips the read hook from recitation to a rewrite warning; after ≥1h it archives — first offering one rewrite window with old entries as reference, then (if ignored) a final notice that clears the list (rm persisted to JSONL; the empty guard takes over — multi-step work must re-track); `/todos` still shows history, session JSONL untouched
 - **Interactive subagents**: every subagent = an isolated pi session in its own pane (separate context window); **a human can enter that pane and talk to it directly** (fix bugs, take over, answer ask_user_question)
 - **Delegation identity** (D111): spawn hands the worker a `PI_HERDR_DELEGATION` context (parent pane/session, taskId, task, role), replayed env > worker marker > branch fold; the worker's system prompt gains a `pier-delegation` section (identity + one stable delivery contract), its transcript opens with an "⟵ delegated by master …" card, and its pane title carries an `↳` prefix; `pi-parent`/`pi-task` herdr tokens ride their own report batch, the dashboard groups workers under their master, and blocked alerts name the edge (`worker ← master`)
-- **Task slugs + worker progress reports** (D112): spawn allocates a task slug (numbered on collision); tool outputs print `slug@paneId` and `agentId` accepts the bare slug, bare pane id, or the combined form (the slug part survives a revive that changed the pane); a worker-only `report_progress` tool pipes checkpoints into the master's context as a display-less custom message — no chat flood, no forced turn
+- **Task slugs** (D112): spawn allocates a task slug (numbered on collision); tool outputs print `slug@paneId` and `agentId` accepts the bare slug, bare pane id, or the combined form (the slug part survives a revive that changed the pane). A master bash call that sleeps ≥60 s while background workers run gets a note that the settlement notice arrives on its own (D125; the earlier `report_progress` tool was never called and is gone)
 - **Unified TUI status strip** (D113/D114): the resident widget is one line per agent — self as `▶ current item ✓done/total`, each running subagent as `↳ slug ▶ current item ✓d/n` (blocked shows the task + reason; settled rows never occupy the strip; a fully completed self list hides the widget instead of showing a bare `✓N/N`); workers push their full todo list over the pipe on every `todo_write` (event-driven, no polling), and `/pier-tree` opens the complete delegation tree (your todos + every worker's full list + settled nodes) in the shared Pier **popup** — the same singleton panel as `/dashboard`, opened on its `Tree` tab (inside the popup, `1`/`2`/`Tab` switch views; an explicit `/pier-tree overlay` keeps the independent full-window pane; non-Herdr falls back to the in-pane notify view); `/dashboard` opens the same panel on its `Dashboard` tab
-- **Subagent output preview**: `subagent(action: "output", agentId)` returns what a running background subagent has printed since the previous call — an in-memory per-pane cursor computes the delta (`agent.read`, falling back to `pane.read` on older herdr), and the result carries status, revision, truncation and a `restart` flag for scrolled/cleared buffers, so the master can notice a stuck worker instead of waiting for settlement
+- **Subagent output preview**: `subagent(action: "output", agentId)` returns what a running background subagent has printed since the previous call — an in-memory per-pane cursor computes the delta (`agent.read`, falling back to `pane.read` on older herdr), and the result carries status, revision, truncation and a `restart` flag for scrolled/cleared buffers, so the master can notice a stuck worker instead of waiting for settlement. TUI chrome (frames, footer) is stripped; once the worker has finished, the complete transcript report replaces the pane's lossy rendered copy, and a later settlement notice points at that delivery instead of repeating it (D124)
 - **Soft write-locks**: per-pane lock beacons on `write`/`edit` paths; cross-pane conflicts warn (default) or block (`PI_HERDR_WRITE_LOCK=1`). The warning lists every holder; `/locks` is the human view of the same table (`herdr agent list` exposes the raw tokens to agents)
 - **Role profiles**: built-in `master` / `worker-default`; custom roles as `.pi-herdr/roles/<name>.json`; toolset converges per role (deny rules are not bypassable)
 - **Human gate**: subagent `ask_user_question` → sidebar blocked marker + notification; manual takeover (ESC-interrupt then typing) is heuristically detected so the master pauses/returns management automatically
@@ -77,6 +77,10 @@ node install.mjs update --dev    # re-check env + versions; pull the repo yourse
 ```
 
 The script verifies the environment (node / pi / herdr versions) and registers both halves.
+pier must be registered in pi from exactly one source: `install`/`update` drops the legacy
+`git:github.com/July24/pier` registration automatically, and stops (exit 1, nothing changed)
+when pier is already registered from another source - e.g. a `--dev` checkout before a user-mode
+install - printing the `pi remove …` to run. `version` reports the source pi actually loads.
 
 `update` re-runs `pi update npm:pi-pier` (falls back to `pi install`) and
 `herdr plugin install … --yes`. Override sources with
@@ -165,7 +169,7 @@ Runtime policies and operational limits are centralized in `runtime-policy.ts` (
 |---|---|---|---|
 | `PIER_SUBAGENT_TIMEOUT_MS` | `600000` | ms | Subagent inactivity budget / overall timeout before forced termination |
 | `PIER_SETTLEMENT_WINDOW_MS` | `60000` | ms | Settlement notice window, machine injection grace period, and takeover idle threshold |
-| `PIER_OBSERVATION_WINDOW_MS` | `30000` | ms | Post-settle observation window before auto-consuming finished subagents |
+| `PIER_OBSERVATION_WINDOW_MS` | `30000` | ms | Post-settle observation window before auto-consuming finished subagents; skipped when the worker's transcript already holds a finalized answer and its pane is idle |
 | `PIER_FOREGROUND_PATIENCE_MS` | `300000` | ms | Foreground execution patience before auto-demoting a subagent to background |
 | `PIER_GC_TICK_MS` | `30000` | ms | Subagent garbage collection ticker interval |
 | `PIER_POLL_INTERVAL_MS` | `30000` | ms | State observation polling interval for subagent state transitions |

package/install.mjs

@@ -127,14 +127,17 @@ function cmpSemver(a, b) {
   return 0;
 }
 
-function readPkgVersion(dir) {
+function readPkgJson(dir) {
   try {
-    return JSON.parse(readFileSync(join(dir, 'package.json'), 'utf8')).version ?? null;
+    return JSON.parse(readFileSync(join(dir, 'package.json'), 'utf8'));
   } catch {
     return null;
   }
 }
 
+const readPkgVersion = (dir) => readPkgJson(dir)?.version ?? null;
+const readPkgName = (dir) => readPkgJson(dir)?.name ?? null;
+
 function npmLatest(name) {
   try {
     return run('npm', ['view', name, 'version'], { timeout: 15000 });
@@ -181,12 +184,56 @@ function registeredPiPackages() {
   } catch { return []; }
 }
 
-/** Clean up legacy git-mode registration before install/update; if --pi-spec explicitly specifies that git source, treat it as target and keep it. */
-function removeLegacyGitRegistration() {
-  if (piSource() === LEGACY_GIT_SPEC) return;
-  if (!registeredPiPackages().includes(LEGACY_GIT_SPEC)) return;
-  if (tryRun('pi', ['remove', LEGACY_GIT_SPEC])) log(`✓ removed legacy git-mode registration (${LEGACY_GIT_SPEC}); using ${piSource()}`);
-  else { console.error('✗ failed to remove legacy git-mode registration'); log(`  manual: pi remove ${LEGACY_GIT_SPEC}`); process.exitCode = 1; }
+/** A `packages` entry is a string spec or `{ source }`; local paths are relative to the agent dir. */
+function packageSource(entry) {
+  return typeof entry === 'string' ? entry : (typeof entry?.source === 'string' ? entry.source : null);
+}
+
+function localPackageDir(src) {
+  if (/^(npm|git|https?|ssh):/.test(src)) return null;
+  return resolve(piAgentDir(), src.startsWith('~/') ? join(homedir(), src.slice(2)) : src);
+}
+
+/** Registered sources that load pier's extension (npm, git, or a local checkout of pi-pier). */
+function registeredPierSources() {
+  return registeredPiPackages().map(packageSource).filter((src) => {
+    if (!src) return false;
+    if (npmNameFromSpec(src) === 'pi-pier' || /^git:.*july24\/pier/i.test(src)) return true;
+    const dir = localPackageDir(src);
+    return dir !== null && readPkgName(dir) === 'pi-pier';
+  });
+}
+
+function sameSource(registered, target) {
+  const dir = localPackageDir(registered);
+  if (dir !== null) return localPackageDir(target) === dir;
+  const name = npmNameFromSpec(registered);
+  return name !== null ? npmNameFromSpec(target) === name : registered === target;
+}
+
+/** Human/CLI form of a registered source: local entries become absolute (`pi remove` takes them). */
+function displaySource(src) {
+  const dir = localPackageDir(src);
+  return dir !== null ? dir : src;
+}
+
+/**
+ * Before install/update: drop the legacy git-mode registration (unless it is the explicit target),
+ * and refuse when pier is registered from any other source — two registrations load every pier
+ * tool twice and pi rejects the duplicate at launch.
+ */
+function reconcilePierRegistrations() {
+  for (const src of registeredPierSources()) {
+    if (sameSource(src, piSource())) continue;
+    if (src === LEGACY_GIT_SPEC) {
+      if (tryRun('pi', ['remove', LEGACY_GIT_SPEC])) log(`✓ removed legacy git-mode registration (${LEGACY_GIT_SPEC}); using ${piSource()}`);
+      else { console.error('✗ failed to remove legacy git-mode registration'); log(`  manual: pi remove ${LEGACY_GIT_SPEC}`); process.exitCode = 1; }
+      continue;
+    }
+    const switchHint = localPackageDir(src) !== null && !dev ? ', or keep it and rerun with --dev'
+      : dev && localPackageDir(src) === null ? ', or keep it and rerun without --dev' : '';
+    die(`pier is already registered in pi from ${displaySource(src)}; adding ${piSource()} would load every pier tool twice.\n  Remove it first: pi remove ${displaySource(src)}${switchHint}`);
+  }
 }
 
 function npmNameFromSpec(spec) {
@@ -305,13 +352,20 @@ function herdrPluginInfo() {
 
 function collectStatus() {
   const installer = readPkgVersion(ROOT);
-  const extPath = dev ? (existsSync(EXT_PATH) ? EXT_PATH : null) : resolveUserExtPath();
-  const extDir = extPath ? pkgDirFromExtPath(extPath) : null;
+  // Report what pi actually loads, not the spec this run would install.
+  const registered = registeredPierSources();
+  const registeredDir = registered.map(localPackageDir).find((d) => d !== null);
+  const extDir = dev
+    ? (existsSync(EXT_PATH) ? EXT_DIR : null)
+    : registeredDir ?? (() => { const p = resolveUserExtPath(); return p ? pkgDirFromExtPath(p) : null; })();
+  const spec = registered.length > 0
+    ? registered.map((src) => (localPackageDir(src) !== null ? `local:${localPackageDir(src)}` : src)).join(', ')
+    : piSource();
   return {
     product: (extDir ? readPkgVersion(extDir) : null) || installer,
     mode: dev ? 'dev' : 'user',
     installer: { name: 'pier-setup', version: installer },
-    piExt: { spec: piSource(), version: extDir ? readPkgVersion(extDir) : null, path: extDir },
+    piExt: { spec, version: extDir ? readPkgVersion(extDir) : null, path: extDir },
     herdr: herdrPluginInfo(),
     latest: { 'pier-setup': npmLatest('pier-setup'), 'pi-pier': npmLatest('pi-pier') },
   };
@@ -362,7 +416,7 @@ function version() {
 
 function update() {
   checkEnv();
-  removeLegacyGitRegistration();
+  reconcilePierRegistrations();
   const me = readPkgVersion(ROOT);
   const latestSetup = npmLatest('pier-setup');
   if (latestSetup && me && cmpSemver(me, latestSetup) < 0) {
@@ -389,7 +443,7 @@ function update() {
 
 function install() {
   checkEnv();
-  removeLegacyGitRegistration();
+  reconcilePierRegistrations();
 
   if (dev) {
     if (tryRun('pi', ['install', piSource()])) log('✓ pi extension installed (packages/pier-ext, local)');

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "pier-setup",
-  "version": "0.4.1",
+  "version": "0.4.3",
   "description": "One-shot installer for pier: install / update / version / uninstall for pi-pier + pier.workbench",
   "license": "MIT",
   "type": "module",