@gredescerber/agent-crew 0.5.0 → 0.6.1

package/src/core/registry.js

@@ -28,6 +28,11 @@ import kickoff from '../commands/kickoff.js';
 import guard from '../commands/guard.js';
 import up from '../commands/up.js';
 import shots from '../commands/shots.js';
+import board from '../commands/board.js';
+import upgrade from '../commands/upgrade.js';
+import askCmds from '../commands/ask.js';
+import mergeReady from '../commands/merge-ready.js';
+import digest from '../commands/digest.js';
 import { existsSync, realpathSync } from 'node:fs';
 import { isAbsolute, resolve } from 'node:path';
 import { loadConfig } from './config.js';
@@ -43,7 +48,7 @@ export const CWD_ARG = {
 /** Command arguments including the shared ones (cwd). */
 export const argsOf = (cmd) => [...(cmd.args ?? []), ...(cmd.usesCwd && !(cmd.args ?? []).some((a) => a.name === 'cwd') ? [CWD_ARG] : [])];
 
-export const commands = [...task, ...kickoff, check, ...pr, guard, status, commit, init, up, adapters, labels, ...compliance, doctor, worker, github, metrics, evalCmd, shots];
+export const commands = [...task, ...kickoff, check, ...pr, guard, status, commit, init, up, adapters, labels, ...compliance, doctor, worker, github, metrics, evalCmd, shots, board, upgrade, ...askCmds, mergeReady, digest];
 
 /** For MCP: only commands safe for agents (no init/labels/adapters; a human does those). */
 export const agentCommands = commands.filter((c) => c.agent !== false);

package/src/core/session.js

@@ -0,0 +1,61 @@
+// A unique agent name per session on one machine, without setting CREW_AGENT_ID by hand.
+// Each Claude Code / Codex session starts its own crew MCP server; the server takes the first free slot
+// (claude@pc, claude@pc-2, ...) with a lock file holding its PID, and frees it on exit.
+// crew task claim pins the name into the task worktree (.crew/agent-id), so CLI calls there use it too.
+import { existsSync, mkdirSync, readFileSync, unlinkSync, writeFileSync } from 'node:fs';
+import { tmpdir } from 'node:os';
+import { dirname, join, resolve } from 'node:path';
+
+export const SLOTS_DIR = join(tmpdir(), 'crew-agents');
+export const PIN_FILE = join('.crew', 'agent-id');
+
+const alive = (pid) => {
+  try { process.kill(pid, 0); return true; } catch (e) { return e.code === 'EPERM'; }
+};
+const slotName = (base, n) => (n === 1 ? base : `${base}-${n}`);
+
+/**
+ * Take the first free slot for base (e.g. claude@pc). A slot is free if it has no lock file or its PID is dead.
+ * → { id, release() } or null when every slot is busy. fs and isAlive are injectable for tests.
+ */
+export function claimSlot(base, { dir = SLOTS_DIR, pid = process.pid, isAlive = alive, max = 20 } = {}) {
+  mkdirSync(dir, { recursive: true });
+  for (let n = 1; n <= max; n++) {
+    const id = slotName(base, n);
+    const file = join(dir, `${id.replace(/[^A-Za-z0-9@._-]/g, '_')}.lock`);
+    if (existsSync(file)) {
+      const owner = Number(readFileSync(file, 'utf8').trim());
+      if (owner && owner !== pid && isAlive(owner)) continue;
+    }
+    try {
+      writeFileSync(file, String(pid), { flag: existsSync(file) ? 'w' : 'wx' });
+    } catch {
+      continue; // another session took it between the check and the write
+    }
+    return {
+      id,
+      release: () => {
+        try { if (Number(readFileSync(file, 'utf8').trim()) === pid) unlinkSync(file); } catch { /* already gone */ }
+      },
+    };
+  }
+  return null;
+}
+
+/** The name pinned in this worktree (nearest .crew/agent-id walking up from cwd), or null. */
+export function pinnedId(cwd = process.cwd()) {
+  let dir = resolve(cwd);
+  for (let i = 0; i < 30; i++) {
+    const f = join(dir, PIN_FILE);
+    if (existsSync(f)) return readFileSync(f, 'utf8').trim() || null;
+    const up = dirname(dir);
+    if (up === dir) return null;
+    dir = up;
+  }
+  return null;
+}
+
+export function pinId(worktree, id) {
+  mkdirSync(join(worktree, '.crew'), { recursive: true });
+  writeFileSync(join(worktree, PIN_FILE), `${id}\n`);
+}

package/src/mcp/server.js

@@ -1,6 +1,8 @@
 // Minimal MCP server (stdio, JSON-RPC 2.0, one message per line).
 // Exposes crew commands as tools: crew_task_next, crew_task_claim, crew_check, ...
 // Connects to any MCP client: Claude Code, Codex, Cursor, etc. No dependencies.
+import { claimSlot } from '../core/session.js';
+import { agentId } from '../core/config.js';
 import { createInterface } from 'node:readline';
 import { agentCommands, toolName, inputSchema, validate } from '../core/registry.js';
 import { CrewError, fail } from '../core/output.js';
@@ -51,6 +53,14 @@ export async function handle(msg) {
 }
 
 export function startServer() {
+  // One MCP server per agent session: take a free name slot (claude@pc, claude@pc-2, ...) unless CREW_AGENT_ID is set.
+  if (!process.env.CREW_AGENT_ID) {
+    const slot = claimSlot(agentId());
+    if (slot) {
+      process.env.CREW_AGENT_ID = slot.id;
+      for (const ev of ['exit', 'SIGINT', 'SIGTERM']) process.once(ev, () => { slot.release(); if (ev !== 'exit') process.exit(0); });
+    }
+  }
   const rl = createInterface({ input: process.stdin });
   const send = (o) => process.stdout.write(JSON.stringify(o) + '\n');
   rl.on('line', async (line) => {

package/templates/labels.json

@@ -1,18 +1,23 @@
 [
-  { "name": "status:needs-spec", "color": "fbca04", "description": "no verifiable acceptance criteria - agents do not take it" },
-  { "name": "status:ready", "color": "0e8a16", "description": "ready, can be taken (crew task next)" },
-  { "name": "status:claimed", "color": "1d76db", "description": "taken by an agent, work in progress (lease)" },
-  { "name": "status:review", "color": "5319e7", "description": "PR open, waiting for review" },
-  { "name": "status:blocked", "color": "b60205", "description": "blocked, a human is needed" },
-  { "name": "status:waiting", "color": "c5def5", "description": "waiting for dependencies (after); crew task promote moves it to ready" },
-  { "name": "status:done", "color": "c2e0c6", "description": "done" },
-  { "name": "tier:low", "color": "f9f9f9", "description": "simple task - a junior model will do" },
-  { "name": "tier:mid", "color": "e4e4e4", "description": "regular task" },
-  { "name": "tier:high", "color": "bfbfbf", "description": "complex - senior model only" },
-  { "name": "risk:low", "color": "c2e0c6", "description": "one agent review, auto-merge" },
-  { "name": "risk:med", "color": "fbca04", "description": "agent review + tests for the criteria, auto-merge" },
-  { "name": "risk:high", "color": "d93f0b", "description": "two agent reviews (one security), merged first, E2E required" },
-  { "name": "feedback", "color": "d4c5f9", "description": "human feedback after testing the running app; the product lead triages it regularly" },
-  { "name": "epic", "color": "3e4b9e", "description": "a large scenario made of several tasks" },
-  { "name": "crew:pause", "color": "000000", "description": "EMERGENCY STOP: all agents stop" }
+  {"name": "status:needs-spec", "color": "fbca04", "description": "no verifiable acceptance criteria - agents do not take it"},
+  {"name": "status:ready", "color": "0e8a16", "description": "ready, can be taken (crew task next)"},
+  {"name": "status:claimed", "color": "1d76db", "description": "taken by an agent, work in progress (lease)"},
+  {"name": "status:review", "color": "5319e7", "description": "PR open, waiting for review"},
+  {"name": "status:blocked", "color": "b60205", "description": "blocked, a human is needed"},
+  {"name": "status:waiting", "color": "c5def5", "description": "waiting for dependencies (after); crew task promote moves it to ready"},
+  {"name": "status:done", "color": "c2e0c6", "description": "done"},
+  {"name": "tier:low", "color": "f9f9f9", "description": "simple task - a junior model will do"},
+  {"name": "tier:mid", "color": "e4e4e4", "description": "regular task"},
+  {"name": "tier:high", "color": "bfbfbf", "description": "complex - senior model only"},
+  {"name": "risk:low", "color": "c2e0c6", "description": "one agent review, auto-merge"},
+  {"name": "risk:med", "color": "fbca04", "description": "agent review + tests for the criteria, auto-merge"},
+  {"name": "risk:high", "color": "d93f0b", "description": "agent review (security first), merged first by hand, E2E required"},
+  {"name": "priority:high", "color": "b60205", "description": "do first: crew task next hands it out before other tasks of the same owner"},
+  {"name": "priority:low", "color": "d4d4d4", "description": "do last"},
+  {"name": "feedback", "color": "d4c5f9", "description": "human feedback after testing the running app; the product lead triages it regularly"},
+  {"name": "epic", "color": "3e4b9e", "description": "a large scenario made of several tasks"},
+  {"name": "crew:pause", "color": "000000", "description": "EMERGENCY STOP: all agents stop"},
+  {"name": "crew:question", "color": "0052cc", "description": "a question from an agent to the owner of an area (crew ask); answered with crew answer"},
+  {"name": "needs-human", "color": "e99695", "description": "only a human can decide this (scope, contract, product choice)"},
+  {"name": "crew:digest", "color": "bfdadc", "description": "the pinned team status issue, rewritten by crew digest"}
 ]

package/templates/product/.github/workflows/crew-guard.yml

@@ -26,7 +26,7 @@ permissions:
 
 jobs:
   guard:
-    if: github.event_name != 'issue_comment' || (github.event.issue.pull_request && contains(github.event.comment.body, 'crew:review'))
+    if: github.event_name != 'issue_comment' || (github.event.issue.pull_request && (contains(github.event.comment.body, 'crew:review') || contains(github.event.comment.body, 'crew:waive')))
     runs-on: ubuntu-latest
     concurrency:
       group: crew-guard-${{ github.event.pull_request.number || github.event.issue.number || inputs.pr }}

package/templates/product/.github/workflows/crew.yml

@@ -1,6 +1,6 @@
 # Code checks: linter, types, tests from crew.config.json. They work the same for Claude, Codex, and humans.
 # PR rules (protected files, acceptance tests, agent review) live in crew-guard.yml, which runs from main.
-# Requires the variable CREW_HARNESS (Settings → Variables), e.g. @gredescerber/agent-crew@0.5.0
+# Requires the variable CREW_HARNESS (Settings → Variables), e.g. @gredescerber/agent-crew@0.6.0
 # (installed from the public npm registry at a pinned version; no token).
 # Main's protection, the variable, and the labels are set up by `crew github setup --apply`.
 name: crew
@@ -69,9 +69,9 @@ jobs:
     if: github.event_name == 'schedule'
     runs-on: ubuntu-latest
     permissions:
-      contents: read
+      contents: write # crew merge-ready merges ready PRs
       issues: write # change status labels and write release markers
-      pull-requests: read # recompute crew-guard for open PRs
+      pull-requests: write # recompute crew-guard and merge ready PRs
       statuses: write # the crew-guard commit status
     steps:
       - uses: actions/checkout@v4
@@ -90,6 +90,16 @@ jobs:
             crew guard --pr "$n" --report --json > /dev/null || true
           done
 
+      # Merge PRs that are ready but not auto-merged (risk:high, or auto-merge off): no agent session needed.
+      - name: Merge ready PRs
+        env: { GH_TOKEN: "${{ github.token }}" }
+        run: crew merge-ready --json
+
+      # Team status in one pinned issue (no LLM): who waits for a human, stale leases, PRs, idle members.
+      - name: Update crew digest
+        env: { GH_TOKEN: "${{ github.token }}" }
+        run: crew digest --post --json
+
   # An issue was closed → waiting tasks whose crew:after are all closed become ready.
   promote:
     if: github.event_name == 'issues'

package/templates/product/AGENTS.md

@@ -62,7 +62,7 @@ A task is taken by the **executor** — the agent that ran `crew task claim`. It
 ## When to stop
 - The same error 3 times → `crew task status <id> blocked --note "what I tried, what is in the way"`.
 - The task is unclear or the acceptance criteria are not verifiable → `crew task status <id> needs-spec --note "question"`. Do not guess.
-- Need to change someone else's area or `contracts/` → do not change, `blocked` with a description.
+- Need something from someone else's area or `contracts/` → do not change it: ask its owner with `crew ask <area> --text "..." --task <id>` (English, with facts). Only a human can decide (scope, product) → `crew ask <area> --human`. The answer comes back through `crew task next`.
 - The task is beyond you → `crew task release <id> --note "what I got done"`.
 - An issue with the label `crew:pause` is open → finish the current step and stop. The code checks this: `crew task next` and `crew task claim` return the error `paused` until a human closes the issue.