@openthink/team 0.0.3 → 0.0.5

package/dist/assign-ticket.md

@@ -61,6 +61,8 @@ Write the comment in this shape:
 - <bullet 2>
 ```
 
+If your appended system context flags the **AGT-107 haiku-downshift heuristic** as active (a `# Product agent: haiku-downshift heuristic active` block), use the header `### YYYY-MM-DD — Product agent (haiku-downshift)` instead of the standard form. The runner has already spawned you on Haiku 4.5; the suffix makes the heuristic visible in the ticket's audit trail.
+
 ## Phase 3 — Engineering agent (state: refined → spike phase)
 
 **Step 0 — Workspace is already prepared.** When `oteam assign` spawned you against a repo-bound ticket, it already cloned `/tmp/open-team-issues/<ticket-id-lowercased>/repo` (from the stamp server when `stamp.enforce: true` is set in `~/.open-team/config.json`; from GitHub otherwise, or when `--no-stamp` was passed) and set your cwd to it. Confirm with `pwd` and `git remote -v`; for stamp-governed repos you should see exactly one remote, `origin`, pointing at `ssh://git@<stamp-host>:<port>/srv/git/<basename>.git`.
@@ -157,10 +159,27 @@ If you skipped Phase 3 Step 0 (vault-only spike that turned out to need code cha
 
 Read `CLAUDE.md`, `AGENTS.md`, `README.md` at the repo root if present.
 
-**2. Verify the worktree shape.** Run `git remote -v` and confirm one of two shapes:
+**2. Verify the worktree shape and compute the merge mode.** Run `git remote -v` and check whether `.stamp/` exists in the worktree. Three shapes are valid:
+
+- **Stamp-governed (default).** Exactly one remote, `origin`, pointing at `ssh://git@<stamp-host>:<port>/srv/git/<basename>.git`. The runner clones with that shape on purpose; no rename / re-add is required, and adding a `github` remote here would defeat the AGT-050 invariant. `MODE` will resolve to `stamp` and routing goes through the stamp-protected branch (5a) at the end of Step 5.
+- **Local-stamp.** `origin` points at `git@github.com:<owner>/<repo>.git` AND the worktree contains a `.stamp/` directory. The repo carries stamp config but no stamp server is in use (typically a `--no-stamp` run against a stamp-aware repo). `MODE` will resolve to `local-stamp` and routing goes through 5c — `stamp review` + `stamp merge` produce a signed merge commit locally, which is then pushed to GitHub as the PR head for human review. `stamp push` is intentionally not invoked (no stamp server); `stamp verify <merge-sha>` still works against the PR head from any clone with the trusted public keys.
+- **Plain GitHub.** `origin` points at `git@github.com:<owner>/<repo>.git` and there is no `.stamp/` directory. `MODE` will resolve to `plain` and routing goes through 5b — `git push origin <feature>` + `gh pr create`.
+
+Compute `MODE` once, here, from the worktree's actual state — every subsequent step branches on this single variable:
+
+```sh
+ORIGIN_URL=$(git remote get-url origin)
+if [ -d .stamp ]; then
+    case "$ORIGIN_URL" in
+        *github.com*) MODE=local-stamp ;;
+        *)            MODE=stamp ;;
+    esac
+else
+    MODE=plain
+fi
+```
 
-- **Stamp-governed (default).** Exactly one remote, `origin`, pointing at `ssh://git@<stamp-host>:<port>/srv/git/<basename>.git`. The runner clones with that shape on purpose; no rename / re-add is required, and adding a `github` remote here would defeat the AGT-050 invariant. Continue to Step 3 and use the stamp-protected branch (5a) at the end of Step 5.
-- **`--no-stamp` run.** Exactly one remote, `origin`, pointing at `git@github.com:<owner>/<repo>.git`. Continue to Step 3 and route through the plain-GitHub branch (5b) at the end of Step 5 — `git push origin <feature>` + `gh pr create`. The stamp commands (`stamp review`, `stamp merge`, `stamp push`) must not be invoked in this branch even if `.stamp/` exists in the worktree, because there's nowhere to push the stamp-signed merge.
+If `MODE` doesn't match what you expected from `git remote -v` and the visible `.stamp/` state, stop and surface — the worktree was cloned from an unexpected remote or `.stamp/` was added/removed mid-flight.
 
 **3. Determine base branch + cut feature branch.**
 
@@ -175,6 +194,17 @@ git fetch origin "$BASE_BRANCH":"$BASE_BRANCH" 2>/dev/null || git fetch origin "
 git checkout "$BASE_BRANCH"
 FEATURE_BRANCH="agt/$(echo "$TICKET_ID" | tr '[:upper:]' '[:lower:]')"
 git checkout -b "$FEATURE_BRANCH"
+
+# Local-stamp only: cut a work branch off the feature branch so commits in
+# Step 4 land on $WORK_BRANCH and Step 5c can stamp-merge $WORK_BRANCH into
+# $FEATURE_BRANCH locally — the resulting signed merge commit becomes the
+# PR head. In other modes WORK_BRANCH == FEATURE_BRANCH (no extra checkout).
+if [ "$MODE" = "local-stamp" ]; then
+    WORK_BRANCH="${FEATURE_BRANCH}-work"
+    git checkout -b "$WORK_BRANCH"
+else
+    WORK_BRANCH="$FEATURE_BRANCH"
+fi
 ```
 
 Branch name: `agt/<ticket-id-lowercased>` (e.g. `agt/agt-003`). Vault ticket IDs are the canonical key — Linear identifiers are no longer minted in this flow (Linear-as-publish-target is a separate downstream sync, filed as its own follow-up ticket).
@@ -197,13 +227,13 @@ When tests pass:
 ```sh
 git add -A
 COMMIT_BODY="Refs <ticket-id>"
-# Plain-GitHub path only: append a `Fixes <gh-issue-url>` trailer so the
-# eventual GH merge auto-closes the issue. The stamp-governed path skips
-# this trailer — those worktrees have no github remote, the merge gets
-# pushed to the stamp server, and GH never sees a commit that would
-# trigger auto-close. QA Phase 5 closes the GH issue explicitly via
-# `gh issue close`, so behaviour is preserved either way.
-if [ "<source.type>" = "github" ] && [ ! -d .stamp ]; then
+# GitHub-bound paths (plain, local-stamp): append a `Fixes <gh-issue-url>`
+# trailer so the eventual PR merge auto-closes the GH issue. The
+# stamp-governed path skips this trailer — those worktrees have no github
+# remote, the merge gets pushed to the stamp server, and GH never sees a
+# commit that would trigger auto-close. QA Phase 5 closes the GH issue
+# explicitly via `gh issue close`, so behaviour is preserved either way.
+if [ "<source.type>" = "github" ] && [ "$MODE" != "stamp" ]; then
     COMMIT_BODY="$COMMIT_BODY"$'\n'"Fixes <linked-github URL>"
 fi
 git commit -m "<one-line summary>
@@ -214,11 +244,7 @@ $COMMIT_BODY
 
 Never use `--no-verify`. Fix hook failures at the root cause.
 
-**5. Detect repo type and route.**
-
-```sh
-test -d .stamp && REPO_KIND=stamp || REPO_KIND=plain
-```
+**5. Route by `$MODE`** (set in Step 2): `stamp` → 5a, `plain` → 5b, `local-stamp` → 5c.
 
 #### 5a — Stamp-protected repo
 
@@ -255,6 +281,31 @@ gh pr create --fill
 
 Capture the PR URL into `linked-pr:`. Human merges through GitHub PR review.
 
+#### 5c — Local-stamp repo (`.stamp/` present, GitHub origin)
+
+Run review on `$WORK_BRANCH` against `$FEATURE_BRANCH` (the eventual PR base):
+
+```sh
+stamp review --diff "$FEATURE_BRANCH..$WORK_BRANCH"
+stamp status --diff "$FEATURE_BRANCH..$WORK_BRANCH"
+```
+
+If the gate isn't open, iterate per the **5-round rule** (same shape as 5a — round 1 structure, round 2 consistency, round 3 polish; later rounds rare). Amend on `$WORK_BRANCH` between rounds. After 5 rounds still red → STOP with `🛑 BLOCKED — Local stamp review red after 5 rounds`.
+
+When the gate opens, merge locally and push the signed merge as the PR head:
+
+```sh
+git checkout "$FEATURE_BRANCH"
+stamp merge "$WORK_BRANCH" --into "$FEATURE_BRANCH"
+git push -u origin "$FEATURE_BRANCH"
+gh pr create --base "$DEFAULT_BRANCH" --head "$FEATURE_BRANCH" --fill
+git branch -D "$WORK_BRANCH"
+```
+
+`stamp push` is intentionally absent — there is no stamp server. The signed merge commit is the PR head; reviewers can `stamp verify <pr-head-sha>` from any clone whose `.stamp/trusted-keys/` contains the signing key. Capture the PR URL into `linked-pr:`. Human merges through GitHub PR review. Never merge a GitHub PR yourself.
+
+Local-stamp is single-tier only — the PR base is always `$DEFAULT_BRANCH`. Two-tier (stacked-base) flows require a stamp server to hold the intermediate base branch and aren't supported in this mode.
+
 ### Phase 4.5 — Release follow-up (single-tier stamp only)
 
 If the repo publishes artifacts (npm, crates.io, PyPI, GitHub Releases) gated on a version bump, the merge above adds the change but won't ship until the version bumps. Re-read `CLAUDE.md`/`AGENTS.md` for a "Releases" / "Publishing" section.

package/dist/index.js

@@ -250,6 +250,7 @@ import { query } from "@anthropic-ai/claude-agent-sdk";
 // src/lib/models.ts
 var ROLE_PIPELINE_MODEL = "claude-opus-4-7";
 var NORMALISER_MODEL = "claude-sonnet-4-6";
+var HAIKU_PRODUCT_MODEL = "claude-haiku-4-5";
 var PHASES = ["product", "spike", "implementation", "qa"];
 var DEFAULT_MODELS = {
   product: "claude-sonnet-4-6",
@@ -281,6 +282,55 @@ function resolveRoleModel(state, models) {
   if (pinned && pinned.length > 0) return pinned;
   return ROLE_PIPELINE_MODEL;
 }
+function acceptanceCriteriaIsPopulated(body) {
+  const lines = body.split("\n");
+  let inSection = false;
+  let inHtmlComment = false;
+  const numberedBullet = /^\s*\d+\.\s+\S/;
+  for (const line of lines) {
+    if (!inSection) {
+      if (/^##\s+Acceptance Criteria\s*$/.test(line)) {
+        inSection = true;
+      }
+      continue;
+    }
+    if (/^##\s+/.test(line)) return false;
+    let scan = line;
+    while (scan.length > 0) {
+      if (inHtmlComment) {
+        const close = scan.indexOf("-->");
+        if (close === -1) {
+          scan = "";
+          break;
+        }
+        scan = scan.slice(close + 3);
+        inHtmlComment = false;
+      } else {
+        const open = scan.indexOf("<!--");
+        if (open === -1) break;
+        const before = scan.slice(0, open);
+        if (numberedBullet.test(before)) return true;
+        const rest = scan.slice(open + 4);
+        const close = rest.indexOf("-->");
+        if (close === -1) {
+          inHtmlComment = true;
+          scan = "";
+          break;
+        }
+        scan = rest.slice(close + 3);
+      }
+    }
+    if (inHtmlComment) continue;
+    if (numberedBullet.test(scan)) return true;
+  }
+  return false;
+}
+function resolveModelForTicket(args) {
+  if (args.state === "triage" && args.sourceType === "manual" && args.productDownshift && acceptanceCriteriaIsPopulated(args.body)) {
+    return HAIKU_PRODUCT_MODEL;
+  }
+  return resolveRoleModel(args.state, args.models);
+}
 
 // src/lib/normalise.ts
 var SYSTEM_PROMPT = `You normalise unstructured work-item payloads (GitHub issues, Linear tickets, etc.) into well-formed product-vault tickets.
@@ -458,6 +508,7 @@ import {
 } from "fs";
 import { homedir } from "os";
 import { basename, isAbsolute, resolve, join as join2 } from "path";
+var DEFAULT_PRODUCT_DOWNSHIFT = true;
 function configDir() {
   return join2(homedir(), ".open-team");
 }
@@ -484,8 +535,12 @@ function writeConfig(config) {
     default: config.default,
     stamp: config.stamp
   };
-  if (Object.keys(config.models).length > 0) {
-    onDisk.models = config.models;
+  const onDiskModels = { ...config.models };
+  if (config.productDownshift !== DEFAULT_PRODUCT_DOWNSHIFT) {
+    onDiskModels.productDownshift = config.productDownshift;
+  }
+  if (Object.keys(onDiskModels).length > 0) {
+    onDisk.models = onDiskModels;
   }
   if (!config.telemetry.enabled) {
     onDisk.telemetry = config.telemetry;
@@ -499,6 +554,7 @@ function emptyConfig() {
     default: null,
     stamp: null,
     models: {},
+    productDownshift: DEFAULT_PRODUCT_DOWNSHIFT,
     telemetry: { enabled: true }
   };
 }
@@ -600,9 +656,15 @@ function normalise(parsed) {
     default: def,
     stamp: normaliseStamp(obj.stamp),
     models: normaliseModels(obj.models),
+    productDownshift: normaliseProductDownshift(obj.models),
     telemetry: normaliseTelemetry(obj.telemetry)
   };
 }
+function normaliseProductDownshift(value) {
+  if (!value || typeof value !== "object") return DEFAULT_PRODUCT_DOWNSHIFT;
+  const v = value;
+  return v.productDownshift !== false;
+}
 function normaliseTelemetry(value) {
   if (!value || typeof value !== "object") return { enabled: true };
   const v = value;
@@ -712,6 +774,15 @@ function seedDefaultModelsIfEmpty() {
   writeConfig(config);
   return { action: "seeded", models: config.models };
 }
+function getProductDownshift() {
+  return readConfig().productDownshift;
+}
+function setProductDownshift(enabled) {
+  const config = readConfig();
+  config.productDownshift = enabled;
+  writeConfig(config);
+  return config.productDownshift;
+}
 function getTelemetryEnabled() {
   return readConfig().telemetry.enabled;
 }
@@ -1299,6 +1370,28 @@ enforce: ${s.enforce ? "on" : "off"}
     const lines = PHASES.map((p) => `${p.padEnd(15)} ${m[p] ?? "(unset)"}`);
     process.stdout.write(lines.join("\n") + "\n");
   });
+  models.command("product-downshift <on|off|show>").description(
+    "Toggle the AGT-107 Haiku-downshift heuristic for well-formed manual tickets (default: on)"
+  ).action((flag) => {
+    const lower = flag.toLowerCase();
+    if (lower === "show") {
+      process.stdout.write(`${getProductDownshift() ? "on" : "off"}
+`);
+      return;
+    }
+    if (lower !== "on" && lower !== "off") {
+      process.stderr.write(
+        `oteam config models product-downshift: expected on|off|show, got "${flag}"
+`
+      );
+      process.exit(2);
+    }
+    const next = setProductDownshift(lower === "on");
+    process.stdout.write(
+      `\u2705 models.productDownshift = ${next ? "on" : "off"}
+`
+    );
+  });
   const telemetry = new Command("telemetry").description(
     "Manage per-phase telemetry recording (default: on)"
   );
@@ -2411,7 +2504,7 @@ function buildTicketCommand() {
 // src/role-pipeline/runner.ts
 import { spawnSync as spawnSync4 } from "child_process";
 import { randomUUID } from "crypto";
-import { writeFileSync as writeFileSync7 } from "fs";
+import { readFileSync as readFileSync9, writeFileSync as writeFileSync7 } from "fs";
 import { tmpdir } from "os";
 import { resolve as resolve4, basename as basename5, dirname as dirname2, join as join14 } from "path";
 
@@ -2757,7 +2850,16 @@ async function assignTicket(opts) {
     }
   }
   const projectContext = loadProjectContext(resolvedVault.path, ticket.project);
-  const model = resolveRoleModel(ticket.state, config.models);
+  const ticketBody = readTicketBody(ticketPath);
+  const model = resolveModelForTicket({
+    state: ticket.state,
+    sourceType: ticket.source.type,
+    body: ticketBody,
+    productDownshift: config.productDownshift,
+    models: config.models
+  });
+  const haikuDownshift = model === HAIKU_PRODUCT_MODEL && ticket.state === "triage";
+  const systemPrompt = composeSystemPrompt(ticket.id, projectContext, haikuDownshift);
   const phase = phaseForState(ticket.state);
   const telemetry = phase !== null && getTelemetryEnabled() ? {
     ticketId: ticket.id,
@@ -2771,7 +2873,7 @@ async function assignTicket(opts) {
       claudePath,
       ticketPath,
       resolvedVault.path,
-      projectContext,
+      systemPrompt,
       workspace,
       model,
       telemetry
@@ -2790,7 +2892,7 @@ async function assignTicket(opts) {
       claudePath,
       ticketPath,
       resolvedVault.path,
-      projectContext,
+      systemPrompt,
       workspace,
       model,
       telemetry
@@ -2808,7 +2910,7 @@ async function assignTicket(opts) {
   const escapedTicket = shellEscape(ticketPath);
   const slashPrompt = `/assign-ticket ${escapedTicket}`;
   const escapedPrompt = shellEscape(slashPrompt);
-  const projectFlag = projectContext ? ` --append-system-prompt "$(cat '${shellEscape(projectContext.tmpFile)}')"` : "";
+  const projectFlag = systemPrompt ? ` --append-system-prompt "$(cat '${shellEscape(systemPrompt.tmpFile)}')"` : "";
   const sessionFlag = telemetry ? ` --session-id '${shellEscape(telemetry.sessionId)}'` : "";
   const claudeCmd = `'${escapedClaude}' --dangerously-skip-permissions --model ${shellEscape(model)}${sessionFlag}${projectFlag} '${escapedPrompt}'`;
   const telemetryTail = telemetry ? buildTelemetryTail({
@@ -2845,7 +2947,7 @@ function buildTelemetryTail(input) {
   ].join(" ");
   return `; EC=$?; ${oteam} telemetry record ${args} >/dev/null 2>&1 || true; exit "$EC"`;
 }
-function runInline(claudePath, ticketPath, vaultPath, projectContext, workspace, model, telemetry) {
+function runInline(claudePath, ticketPath, vaultPath, systemPrompt, workspace, model, telemetry) {
   const args = [
     "--dangerously-skip-permissions",
     "--model",
@@ -2854,8 +2956,8 @@ function runInline(claudePath, ticketPath, vaultPath, projectContext, workspace,
   if (telemetry) {
     args.push("--session-id", telemetry.sessionId);
   }
-  if (projectContext) {
-    args.push("--append-system-prompt", projectContext.content);
+  if (systemPrompt) {
+    args.push("--append-system-prompt", systemPrompt.content);
   }
   args.push(`/assign-ticket ${ticketPath}`);
   const cwd = workspace?.path ?? process.cwd();
@@ -2901,12 +3003,39 @@ function loadProjectContext(vaultPath, projectId) {
     );
     return null;
   }
-  const content = formatProjectContextForPrompt(project);
-  const safeId = projectId.replace(/[^a-zA-Z0-9._-]/g, "_");
-  const tmpFile = join14(tmpdir(), `oteam-project-${safeId}.md`);
+  return formatProjectContextForPrompt(project);
+}
+function composeSystemPrompt(ticketId, projectContext, haikuDownshift) {
+  const parts = [];
+  if (projectContext) parts.push(projectContext);
+  if (haikuDownshift) parts.push(haikuDownshiftPromptHint());
+  if (parts.length === 0) return null;
+  const content = parts.join("\n\n");
+  const safeId = ticketId.replace(/[^a-zA-Z0-9._-]/g, "_");
+  const tmpFile = join14(tmpdir(), `oteam-prompt-${safeId}.md`);
   writeFileSync7(tmpFile, content, "utf8");
   return { tmpFile, content };
 }
+function haikuDownshiftPromptHint() {
+  return [
+    "# Product agent: haiku-downshift heuristic active",
+    "",
+    "AGT-107: this ticket is a well-formed manual ticket (source.type=manual + populated `## Acceptance Criteria`), so the runner spawned you on Haiku 4.5 instead of the configured Product model. The heuristic exists to handle structural-cleanup cases cheaply; full synthesis still belongs on the configured Product model.",
+    "",
+    "When you advance the ticket, write the comment header as:",
+    "",
+    "    ### YYYY-MM-DD \u2014 Product agent (haiku-downshift)",
+    "",
+    "instead of the standard `### YYYY-MM-DD \u2014 Product agent`. That makes the heuristic visible in the ticket's audit trail."
+  ].join("\n");
+}
+function readTicketBody(path) {
+  try {
+    return readFileSync9(path, "utf8");
+  } catch {
+    return "";
+  }
+}
 function findToolOnPath(name) {
   const r = spawnSync4("/usr/bin/env", ["which", name], { encoding: "utf8" });
   if (r.status !== 0) return null;