@jaggerxtrm/specialists 2.1.3 → 2.1.5

package/README.md

@@ -93,7 +93,7 @@ npm install -g @jaggerxtrm/specialists
 specialists install
 ```
 
-Installs: **pi** (`@mariozechner/pi-coding-agent`), **beads** (`@beads/bd`), **dolt** (interactive sudo on Linux / brew on macOS), registers the `specialists` MCP at user scope, scaffolds `~/.agents/specialists/`.
+Installs: **pi** (`@mariozechner/pi-coding-agent`), **beads** (`@beads/bd`), **dolt** (interactive sudo on Linux / brew on macOS), registers the `specialists` MCP at user scope, scaffolds `~/.agents/specialists/`, and installs the `main-guard` PreToolUse hook (`~/.claude/hooks/main-guard.mjs`) to protect `main`/`master` branches from direct edits.
 
 After running, **restart Claude Code** to load the MCP. Re-run `specialists install` at any time to update or repair the installation.
 

package/bin/install.js

@@ -12,7 +12,7 @@ const SPECIALISTS_DIR = join(HOME, '.agents', 'specialists');
 const CLAUDE_DIR      = join(HOME, '.claude');
 const HOOKS_DIR       = join(CLAUDE_DIR, 'hooks');
 const SETTINGS_FILE   = join(CLAUDE_DIR, 'settings.json');
-const HOOK_FILE       = join(HOOKS_DIR, 'specialists-main-guard.sh');
+const HOOK_FILE       = join(HOOKS_DIR, 'specialists-main-guard.mjs');
 const MCP_NAME        = 'specialists';
 const GITHUB_PKG      = '@jaggerxtrm/specialists';
 
@@ -78,43 +78,56 @@ function registerMCP() {
 
 // ── Hook installation ─────────────────────────────────────────────────────────
 
-const HOOK_SCRIPT = `#!/usr/bin/env bash
-# specialists — Claude Code PreToolUse hook
-# Blocks writes and git commit/push on main/master branch.
-# Exit 0: allow  |  Exit 2: block (message shown to user)
-#
-# Installed by: npx --package=@jaggerxtrm/specialists install
-
-BRANCH=$(git branch --show-current 2>/dev/null)
-
-# Not in a git repo or not on a protected branch — allow
-if [ -z "$BRANCH" ] || { [ "$BRANCH" != "main" ] && [ "$BRANCH" != "master" ]; }; then
-  exit 0
-fi
-
-INPUT=$(cat)
-TOOL=$(echo "$INPUT" | jq -r '.tool_name' 2>/dev/null)
-
-BLOCK_MSG="⛔ Direct edits on '$BRANCH' are not allowed.
-Create a feature branch first: git checkout -b feature/<name>"
-
-case "$TOOL" in
-  Edit|Write|MultiEdit|NotebookEdit)
-    echo "$BLOCK_MSG" >&2
-    exit 2
-    ;;
-  Bash)
-    CMD=$(echo "$INPUT" | jq -r '.tool_input.command' 2>/dev/null)
-    if echo "$CMD" | grep -qE '^git (commit|push)'; then
-      echo "$BLOCK_MSG" >&2
-      exit 2
-    fi
-    exit 0
-    ;;
-  *)
-    exit 0
-    ;;
-esac
+const HOOK_SCRIPT = `#!/usr/bin/env node
+// specialists — Claude Code PreToolUse hook
+// Blocks writes and git commit/push on main/master branch.
+// Exit 0: allow  |  Exit 2: block (message shown to user)
+//
+// Installed by: npx --package=@jaggerxtrm/specialists install
+
+import { execSync } from 'node:child_process';
+import { readFileSync } from 'node:fs';
+
+let branch = '';
+try {
+  branch = execSync('git branch --show-current', {
+    encoding: 'utf8',
+    stdio: ['pipe', 'pipe', 'pipe'],
+  }).trim();
+} catch {}
+
+if (!branch || (branch !== 'main' && branch !== 'master')) {
+  process.exit(0);
+}
+
+let input;
+try {
+  input = JSON.parse(readFileSync(0, 'utf8'));
+} catch {
+  process.exit(0);
+}
+
+const tool = input.tool_name ?? '';
+const blockMsg =
+  \`⛔ Direct edits on '\${branch}' are not allowed.\\n\` +
+  \`Create a feature branch first: git checkout -b feature/<name>\`;
+
+const WRITE_TOOLS = new Set(['Edit', 'Write', 'MultiEdit', 'NotebookEdit']);
+
+if (WRITE_TOOLS.has(tool)) {
+  process.stderr.write(blockMsg + '\\n');
+  process.exit(2);
+}
+
+if (tool === 'Bash') {
+  const cmd = input.tool_input?.command ?? '';
+  if (/^git (commit|push)/.test(cmd)) {
+    process.stderr.write(blockMsg + '\\n');
+    process.exit(2);
+  }
+}
+
+process.exit(0);
 `;
 
 const HOOK_ENTRY = {
@@ -202,7 +215,7 @@ installHook();
 hookExisted
   ? ok('main-guard hook updated')
   : ok('main-guard hook installed → ~/.claude/hooks/specialists-main-guard.sh');
-info('Blocks Edit/Write/git commit/push on main or master branch');
+info('Blocks Edit/Write/git commit/push on main or master branch (JS, no jq needed)');
 
 // 7. Health check
 section('Health check');

package/dist/index.js

@@ -24916,15 +24916,15 @@ class PiAgentSession {
   _doneReject;
   _agentEndReceived = false;
   _killed = false;
+  _lineBuffer = "";
   meta;
   constructor(options, meta) {
     this.options = options;
     this.meta = meta;
   }
   static async create(options) {
-    const provider = mapSpecialistBackend(options.model);
     const meta = {
-      backend: provider,
+      backend: options.model.includes("/") ? options.model.split("/")[0] : mapSpecialistBackend(options.model),
       model: options.model,
       sessionId: crypto.randomUUID(),
       startedAt: new Date
@@ -24940,7 +24940,6 @@ class PiAgentSession {
       "rpc",
       ...providerArgs,
       "--no-session",
-      "--print",
       ...extraArgs
     ];
     const toolsFlag = mapPermissionToTools(this.options.permissionLevel);
@@ -24958,9 +24957,19 @@ class PiAgentSession {
     });
     this._donePromise = donePromise;
     this.proc.stdout?.on("data", (chunk) => {
-      for (const line of chunk.toString().split(`
-`).filter(Boolean)) {
-        this._handleEvent(line);
+      this._lineBuffer += chunk.toString();
+      const lines = this._lineBuffer.split(`
+`);
+      this._lineBuffer = lines.pop() ?? "";
+      for (const line of lines) {
+        if (line.trim())
+          this._handleEvent(line);
+      }
+    });
+    this.proc.stdout?.on("end", () => {
+      if (this._lineBuffer.trim()) {
+        this._handleEvent(this._lineBuffer);
+        this._lineBuffer = "";
       }
     });
     this.proc.on("close", (code) => {
@@ -25049,6 +25058,7 @@ class PiAgentSession {
     const msg = JSON.stringify({ type: "prompt", message: task }) + `
 `;
     this.proc?.stdin?.write(msg);
+    this.proc?.stdin?.end();
   }
   async waitForDone() {
     return this._donePromise;
@@ -25056,26 +25066,6 @@ class PiAgentSession {
   async getLastOutput() {
     return this._lastOutput;
   }
-  async executeBash(command) {
-    return new Promise((resolve) => {
-      const id = crypto.randomUUID();
-      const handler = (chunk) => {
-        for (const line of chunk.toString().split(`
-`).filter(Boolean)) {
-          try {
-            const ev = JSON.parse(line);
-            if (ev.id === id) {
-              this.proc?.stdout?.off("data", handler);
-              resolve(ev.output ?? ev.data?.output ?? "");
-            }
-          } catch {}
-        }
-      };
-      this.proc?.stdout?.on("data", handler);
-      this.proc?.stdin?.write(JSON.stringify({ type: "bash", command, id }) + `
-`);
-    });
-  }
   kill() {
     this._killed = true;
     this.proc?.kill();
@@ -25145,6 +25135,32 @@ function shouldCreateBead(beadsIntegration, permissionRequired) {
 }
 
 // src/specialist/runner.ts
+import { execSync } from "node:child_process";
+import { basename } from "node:path";
+function runScript(scriptPath) {
+  try {
+    const output = execSync(scriptPath, { encoding: "utf8", timeout: 30000 });
+    return { name: basename(scriptPath), output, exitCode: 0 };
+  } catch (e) {
+    return { name: basename(scriptPath), output: e.stdout ?? e.message ?? "", exitCode: e.status ?? 1 };
+  }
+}
+function formatScriptOutput(results) {
+  const withOutput = results.filter((r) => r.output.trim());
+  if (withOutput.length === 0)
+    return "";
+  const blocks = withOutput.map((r) => {
+    const status = r.exitCode === 0 ? "" : ` exit_code="${r.exitCode}"`;
+    return `<script name="${r.name}"${status}>
+${r.output.trim()}
+</script>`;
+  }).join(`
+`);
+  return `<pre_flight_context>
+${blocks}
+</pre_flight_context>`;
+}
+
 class SpecialistRunner {
   deps;
   sessionFactory;
@@ -25168,7 +25184,10 @@ class SpecialistRunner {
       circuit_breaker_state: circuitBreaker.getState(model),
       scope: "project"
     });
-    const variables = { prompt: options.prompt, ...options.variables };
+    const preScripts = spec.specialist.skills?.scripts?.filter((s) => s.phase === "pre") ?? [];
+    const preResults = preScripts.map((s) => runScript(s.path)).filter((_, i) => preScripts[i].inject_output);
+    const preScriptOutput = formatScriptOutput(preResults);
+    const variables = { prompt: options.prompt, pre_script_output: preScriptOutput, ...options.variables };
     const renderedTask = renderTemplate(prompt.task_template, variables);
     const promptHash = createHash("sha256").update(renderedTask).digest("hex").slice(0, 16);
     await hooks.emit("post_render", invocationId, metadata.name, metadata.version, {
@@ -25233,22 +25252,12 @@ You have access via Bash:
       });
       await session.start();
       onKillRegistered?.(session.kill.bind(session));
-      const preScripts = spec.specialist.skills?.scripts?.filter((s) => s.phase === "pre") ?? [];
-      let preScriptOutput = "";
-      for (const script of preScripts) {
-        const out = await session.executeBash(script.path);
-        if (script.inject_output)
-          preScriptOutput += out + `
-`;
-      }
-      const finalTask = preScriptOutput ? renderTemplate(renderedTask, { pre_script_output: preScriptOutput.trim() }) : renderedTask;
-      await session.prompt(finalTask);
+      await session.prompt(renderedTask);
       await session.waitForDone();
       output = await session.getLastOutput();
       const postScripts = spec.specialist.skills?.scripts?.filter((s) => s.phase === "post") ?? [];
-      for (const script of postScripts) {
-        await session.executeBash(script.path);
-      }
+      for (const script of postScripts)
+        runScript(script.path);
       circuitBreaker.recordSuccess(model);
     } catch (err) {
       circuitBreaker.recordFailure(model);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@jaggerxtrm/specialists",
-  "version": "2.1.3",
+  "version": "2.1.5",
   "description": "OmniSpecialist — 7-tool MCP orchestration layer powered by the Specialist System. Discover and execute .specialist.yaml files across project/user/system scopes via pi.",
   "main": "dist/index.js",
   "type": "module",