acstack 0.50.1 → 0.50.3

package/.claude-plugin/plugin.json

@@ -1,7 +1,7 @@
 {
   "name": "acstack",
   "description": "Agentic coding stack where planning grows only as far as needed: a map of decisions, tasks, checks, and handoffs behind a pluggable tracker.",
-  "version": "0.50.1",
+  "version": "0.50.3",
   "author": {
     "name": "ac8318740"
   },

package/README.md

@@ -91,6 +91,9 @@ Then, in your project, run `/acstack:setup`.
         - Freshness uses `/acstack:handoff` when a fresh window or independent read helps more
         - With no thresholds set, the first nudge comes at 200k tokens or half the window, whichever is lower
         - The urgent nudge comes at 500k tokens or 80% of the window, whichever is lower
+- ACStack includes the question-status bridge automatically
+    - With `@juicesharp/rpiv-ask-user-question` and Herdr's Pi integration installed, Herdr shows blocked while Pi waits for an answer
+    - Existing setup-installed bridges can stay installed without counting the same wait twice
 - Both subagent packages find the four agents through the `pi.subagents` field in `package.json`
     - `@tintinweb/pi-subagents` exposes `Agent`; `pi-subagents` exposes `subagent`
     - The agents use your subagent package's default model

package/assets/terminal-workspace/lib/apply-herdr.sh

@@ -303,6 +303,9 @@ PY
 
   local integ; integ=$(cfg_get herdr.integration none)
   if [ "$integ" != "none" ] && [ -n "$integ" ]; then
-    herdr integration install "$integ" >/dev/null 2>&1 && say "herdr $integ state hook installed"
+    if herdr integration install "$integ" >/dev/null 2>&1; then
+      say "herdr $integ state hook installed"
+      patch_herdr_pi_status
+    fi
   fi
 }

package/assets/terminal-workspace/lib/commands.sh

@@ -189,6 +189,7 @@ PY
              say "delta unset as git pager"
              say "now set delta.enabled: false in $CFG so apply does not restore it" ;;
       herdr)
+        patch_herdr_pi_status --remove
         py "$HERDR_CFG" "$BEGIN" "$END" <<'PY'
 import re, sys, os
 p, b, e = sys.argv[1:4]

package/assets/terminal-workspace/lib/patch-herdr-pi.py

@@ -0,0 +1,86 @@
+"""Keep herdr's single Pi status writer aware of background subagents."""
+import os
+import sys
+import tempfile
+from pathlib import Path
+
+path = Path(sys.argv[1])
+remove = sys.argv[2:] == ["--remove"]
+if not path.exists():
+    sys.exit(0)
+if path.is_symlink() or not path.is_file():
+    sys.exit("  pi: herdr status patch skipped: reporter is not a regular file")
+
+begin = "// >>> acstack terminal-workspace: background status >>>"
+end = "// <<< acstack terminal-workspace: background status <<<"
+
+
+def marked(text):
+    return f"  {begin}\n{text}  {end}\n"
+
+
+replacements = [
+    ("  let agentActive = false;\n", "  let agentActive = false;\n" + marked('''  // shortcut: no workflow/reload replay; extend when Tintin exposes active-run snapshots.
+  const backgroundAgents = new Set<string>();
+  let busyCount = 0;
+''')),
+    ("    if (agentActive) {\n", marked('''    // blocked > active parent or children > idle
+    if (agentActive || backgroundAgents.size > 0 || busyCount > 0) {
+''')),
+    ('  pi.events.on("herdr:blocked", (data) => {\n', marked('''  // Tintin's in-process children share this bus, but never own the pane status.
+  pi.events.on("subagents:started", (data) => {
+    if (!rootSession || typeof data?.id !== "string" || !data.id) return;
+    backgroundAgents.add(data.id);
+    publishState();
+  });
+  for (const event of ["subagents:completed", "subagents:failed"]) {
+    pi.events.on(event, (data) => {
+      if (!rootSession || typeof data?.id !== "string") return;
+      backgroundAgents.delete(data.id);
+      publishState();
+    });
+  }
+  // nicobailon/pi-subagents uses balanced active intervals instead of IDs.
+  pi.events.on("herdr:busy", (data) => {
+    if (!rootSession || typeof data?.active !== "boolean") return;
+    busyCount = Math.max(0, busyCount + (data.active ? 1 : -1));
+    publishState();
+  });
+''') + '  pi.events.on("herdr:blocked", (data) => {\n'),
+]
+
+text = path.read_text()
+if not text.startswith("// installed by herdr\n") or "HERDR_INTEGRATION_ID=pi\n" not in text:
+    sys.exit("  pi: herdr status patch skipped: unrecognised reporter")
+# These lifecycle guards must still exist before adding shared-bus listeners.
+required = [
+    '  pi.on("agent_settled", (_event, ctx) => {',
+    '    if (ctx?.mode !== "tui") {',
+    '    if (!rootSession || ctx?.isIdle?.() !== true) {',
+]
+if any(text.count(anchor) != 1 for anchor in required):
+    sys.exit("  pi: herdr status patch skipped: upstream lifecycle changed")
+patched = begin in text
+if patched == (not remove):
+    # Validate every managed block before treating an existing patch as ours.
+    if patched and any(text.count(new) != 1 for _, new in replacements):
+        sys.exit("  pi: herdr status patch skipped: managed blocks were changed")
+    sys.exit(0)
+
+for old, new in replacements:
+    if text.count(new if remove else old) != 1:
+        sys.exit("  pi: herdr status patch skipped: upstream layout changed")
+for old, new in replacements:
+    text = text.replace(new, old, 1) if remove else text.replace(old, new, 1)
+
+# Validate all matches first, then replace atomically so a failed patch leaves no partial writer.
+fd, temporary = tempfile.mkstemp(dir=path.parent, prefix=".acstack-herdr-")
+try:
+    with os.fdopen(fd, "w") as stream:
+        stream.write(text)
+    os.chmod(temporary, path.stat().st_mode)
+    os.replace(temporary, path)
+finally:
+    if os.path.exists(temporary):
+        os.unlink(temporary)
+print(f"  pi: herdr background status patch {'removed' if remove else 'applied'}")

package/assets/terminal-workspace/lib/pi-packages.sh

@@ -301,6 +301,7 @@ apply_pi() {
   pi_state merge "$PI_SUBAGENT_CFG" subagent '{"toolActivation": "eager"}'
   pi_state md write
   patch_pi_win32_paste
+  patch_herdr_pi_status
 
   # Logging in is interactive and stores a credential, so it stays the user's.
   [ -f "$PI_DIR/auth.json" ] || say "pi: not logged in yet. Run pi, then /login"
@@ -311,6 +312,7 @@ apply_pi() {
 # and leaves the pi binary, its logins and its sessions alone.
 remove_pi() {
   find_pi
+  patch_herdr_pi_status --remove
   pi_question_bridge remove
   if pi_state parses "$PI_SETTINGS"; then
     pi_unpin "$PI_ACSTACK"

package/assets/terminal-workspace/lib/pi-state.sh

@@ -404,6 +404,12 @@ find_pi() {
 }
 
 
+# Keep herdr's own writer as the sole pane authority; reapply after it is replaced.
+patch_herdr_pi_status() {
+  python3 "$SCRIPT_DIR/lib/patch-herdr-pi.py" "$PI_DIR/extensions/herdr-agent-state.ts" "$@" \
+    || say "pi: herdr background status patch was not applied; reporter left unchanged"
+}
+
 # Pi's bundled TUI does not always receive Windows Terminal paste as plain
 # text. Through Herdr and ConPTY it can arrive as Win32 input records such as
 # ESC[13;28;13;1;0;1_. Patch the installed bundle after install or update.

package/assets/terminal-workspace/lib/versions.sh

@@ -204,8 +204,12 @@ upgrade_one() {  # upgrade_one <name>
     find_pi
   fi
   case "$1" in
-    herdr)     herdr update >/dev/null 2>&1 \
-                 && say "herdr updated" || say "herdr update failed" ;;
+    herdr)     if herdr update >/dev/null 2>&1; then
+                 say "herdr updated"
+                 patch_herdr_pi_status
+               else
+                 say "herdr update failed"
+               fi ;;
     gh-dash)   gh extension upgrade dlvhdr/gh-dash >/dev/null 2>&1 \
                  && say "gh-dash upgraded" || say "gh-dash upgrade failed" ;;
     harlequin) uv tool upgrade harlequin >/dev/null 2>&1 \

package/assets/terminal-workspace/pi/acstack-question-blocked.ts

@@ -1,31 +1,19 @@
 import type { ExtensionAPI } from "@earendil-works/pi-coding-agent";
 
-export default function (pi: ExtensionAPI) {
-  let pending: { active: boolean; native: boolean } | undefined;
-  let forwarding = false;
-
-  pi.events.on("herdr:blocked", (event: unknown) => {
-    if (!forwarding && pending && (event as { active?: unknown } | null)?.active === pending.active) {
-      pending.native = true;
-      pending = undefined;
-    }
-  });
+const TAKEOVER = "acstack:question-blocked:takeover";
 
-  pi.events.on("rpiv:ask-user:blocked", (event: unknown) => {
-    const active = (event as { active?: unknown } | null)?.active;
-    if (typeof active !== "boolean") return;
-    const transition = { active, native: false };
-    pending = transition;
-    // shortcut: dual producers emit public then herdr synchronously; async pairs need an upstream source ID
-    queueMicrotask(() => {
-      if (pending === transition) pending = undefined;
-      if (transition.native) return;
-      forwarding = true;
-      try {
-        pi.events.emit("herdr:blocked", { active });
-      } finally {
-        forwarding = false;
-      }
+export default function (pi: ExtensionAPI) {
+  pi.on("session_start", () => {
+    pi.events.emit(TAKEOVER, {});
+    // Register after legacy factories so our synchronous relay suppresses their queued copy.
+    // shortcut: legacy compatibility excludes recursively emitted public events; remove the legacy copy if needed
+    const stopRelay = pi.events.on("rpiv:ask-user:blocked", (event: unknown) => {
+      const active = (event as { active?: unknown } | null)?.active;
+      if (typeof active === "boolean") pi.events.emit("herdr:blocked", { active });
+    });
+    const stopTakeover = pi.events.on(TAKEOVER, () => {
+      stopRelay();
+      stopTakeover();
     });
   });
 }

package/cli/package.json

@@ -1,6 +1,6 @@
 {
   "name": "acstack-cli",
-  "version": "0.50.1",
+  "version": "0.50.3",
   "description": "CLI for the ACStack agentic coding stack",
   "type": "module",
   "license": "MIT",

package/docs/terminal-workspace.md

@@ -365,11 +365,14 @@ What `apply` does:
     - ACStack uses it because decisions can include markdown, code and artifact previews
     - It accepts freeform answers and notes, and needs no full-event telemetry environment variable
     - This setup still keeps pi's install telemetry disabled through `pi.settings.install_telemetry: false`
-    - Setup installs a managed question bridge under pi's agent directory, honoring `PI_CODING_AGENT_DIR`
+    - ACStack's Pi package loads the question bridge automatically, including installations made without terminal-workspace setup
+    - Setup also installs a fallback copy under pi's agent directory, honoring `PI_CODING_AGENT_DIR`
+    - The packaged bridge and fallback copy count each wait once when both load
     - The bridge translates `rpiv:ask-user:blocked` into `herdr:blocked`, so herdr shows the question's input wait
     - Answer, cancellation, and error completion release the question's blocker while other herdr blockers stay active
-    - A producer that also emits the matching herdr event synchronously contributes only one blocker
-    - Events carry no source ID, so the bridge treats a matching synchronous herdr event as the producer's own
+    - Anonymous native Herdr events remain independent from question events, including simultaneous waits
+    - A producer emitting both event types contributes two balanced blockers, which clear when both sources finish
+    - Older fallback copies work unless another extension recursively emits public question events; remove the older copy in that case
     - Reapply refreshes the owned bridge, but preserves a pre-existing file at the same path
     - `pi.question_tool: false`, `disable pi`, and `uninstall` remove only the owned bridge and leave user workarounds alone
     - Set `pi.question_tool: false` to leave the package out, or remove it later if this setup installed it
@@ -393,6 +396,14 @@ What `apply` does:
 - It writes the four keys under `pi.settings` into `~/.pi/agent/settings.json`
 - It patches pi's bundled TUI so Windows Terminal Win32 input records paste as text
     - `pi update` can replace the bundle, so `setup.sh upgrade pi` reapplies the patch
+- It patches an existing herdr Pi reporter to keep the parent working while background subagents run
+    - Questions still show blocked, even when children are active
+    - The patch handles `pi-subagents` busy events and `@tintinweb/pi-subagents` Agent lifecycle events
+    - Tintin workflows and children already running during an extension reload lack lifecycle replay and remain outside this tracking
+    - `apply`, herdr integration installation, and `setup.sh upgrade herdr` reapply the patch
+    - Direct `herdr integration install pi` overwrites the patch; run `apply` afterward, then restart Pi or use `/reload`
+    - Setup leaves unknown reporter layouts unchanged and reports the skipped patch
+    - `disable pi`, `disable herdr`, and `uninstall` remove unchanged managed patch blocks
 
 How it treats pi's files:
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "acstack",
-  "version": "0.50.1",
+  "version": "0.50.3",
   "private": false,
   "description": "Agentic coding stack with first-class Claude Code and pi support: skills, orchestrator instructions, and verification agents.",
   "license": "MIT",
@@ -38,7 +38,8 @@
   ],
   "pi": {
     "extensions": [
-      "./pi/extension.ts"
+      "./pi/extension.ts",
+      "./assets/terminal-workspace/pi/acstack-question-blocked.ts"
     ],
     "subagents": {
       "agents": [