@r1z4x/tezgah 1.6.0 → 1.8.2

package/hooks/tezgah_agents.py

@@ -37,7 +37,7 @@ import subprocess
 
 import tezgah_models as tm
 from tezgah_paths import (CONFIG_DIR, HOME, codegraph_bin, host_installed, off,
-                          root_for)
+                          root_for, say)
 from tezgah_paths import HOST_DIRS as HOST_HOMES
 
 MARKER = "# tezgah: managed by tezgah-agents; do not edit"
@@ -186,6 +186,7 @@ def detect_infra(root):
 # ------------------------------------------------------------------ roles ----
 
 def _reviewer_body(host):
+    decision = say()["decision"]
     return (
         "You are tezgah-reviewer, an adversarial code reviewer. Review a change,\n"
         "not the whole repo, with the code graph as below.\n\n"
@@ -221,10 +222,11 @@ def _reviewer_body(host):
         "provisional. Disclose the order you read the files in.\n\n"
         "Scope and budget. One review per plan, over its whole diff in the\n"
         "verification phase; at most two rounds - only a confirmed critical or\n"
-        "major finding opens round two, a minor or suggestion one is recorded\n"
-        "fix-later, and after round two what is left is fixed by the session\n"
-        "and closed with `--resolved`, or recorded fix-later, never a third\n"
-        "round. A round may be a fan-out of\n"
+        "major finding opens round two; a minor or suggestion one is fixed in the\n"
+        "session without a new round, or recorded fix-later only when it waits\n"
+        "on a user decision (%s); after round two what is left is fixed by\n"
+        "the session and closed with `--resolved`, or recorded fix-later only\n"
+        "with %s, never a third round. A round may be a fan-out of\n"
         "reviewers spawned at once, one per dimension (correctness and contract,\n"
         "security, tests and performance) or per file group: when your brief\n"
         "names a dimension or files, review only those - a sibling owns the rest.\n"
@@ -237,7 +239,7 @@ def _reviewer_body(host):
         "specific accusation needs it. The same defect family confirmed in both\n"
         "rounds is a sign the design needs a pivot, not another patch.\n\n"
         "%s" % (_graph_howto(host), _blast_radius(host), EMPTY_IS_NOT_PROOF,
-                _may_use(host)))
+                decision, decision, _may_use(host)))
 
 
 def _worker_body(tier):
@@ -250,17 +252,29 @@ def _worker_body(tier):
             scope = ("If the work needs a judgement above this tier - a design choice,\n"
                      "a stored-data or ordering invariant, security-sensitive code, or\n"
                      "a failure whose cause you cannot find - stop editing and answer\n"
-                     "`ESCALATE: <why>`; the router restarts it on tezgah-frontier.")
+                     "`ESCALATE: <why>`.")
         return ("You are tezgah-%s, a worker on the %s model tier. Do exactly the\n"
                 "brief: stay inside the files it names, run the checks it names, and\n"
                 "report what changed and what each check printed, verbatim. Report\n"
                 "progress, but never redefine the work. Never widen or narrow the brief's\n"
                 "scope, budget or question. If the brief cannot be met as written, say\n"
                 "so and stop rather than answering a different question.\n%s\n"
-                "Never spawn subagents." % (tier, tier, scope))
+                "Never spawn subagents.\n%s" % (tier, tier, scope, WORKER_OUTPUT))
     return body
 
 
+# The report a consumer reads: the orchestrator re-briefs a report missing one
+# of these fields (_orch_body), so only a role with a reader gets them. One
+# text on every host, since a worker body ignores its host.
+WORKER_OUTPUT = ("End the report, after any other shape asked for, with `Output to\n"
+                 "orchestrator`, every field, `none` when empty:\n"
+                 "- changed: the files you changed\n"
+                 "- commit: the sha\n"
+                 "- checks: each command, its exit code and the last lines of its\n"
+                 "  output file, verbatim\n"
+                 "- escalate: the `ESCALATE:` reason (always `none` on tezgah-frontier)")
+
+
 # The specialists beside the tier workers: name -> (what it does, the skills it
 # loads first, its tools, the role text). The tier is not here: it is
 # tezgah_models.AGENT_SLOT, the row every host's model line is rendered from, so
@@ -280,9 +294,11 @@ SPECIALISTS = {
         "import the changed modules. Keep each check last on its line with its\n"
         "output in a file, then read the file in a separate call: never pipe a\n"
         "check into tail or grep, never `|| true`, never `--no-verify`, never a\n"
-        "new skip. Set the shell timeout above 300 s for a long run. Report each\n"
-        "check as passed or failed with its counts and the exact failure text.\n"
-        "Never edit source or test files; a fix belongs to the caller."),
+        "new skip. Set the shell timeout above 300 s for a long run. Never edit\n"
+        "source or test files; a fix belongs to the caller.\n"
+        "End the report, after any other shape asked for, with `Output to\n"
+        "orchestrator`, per check: its command, the pass/fail/skip counts and\n"
+        "the first failure verbatim (`none` when it passed)."),
     "tezgah-docs": (
         "Writes and repairs docs pages and their `path:line` / `path::symbol` "
         "citations after a code change, under the repo's own docs checks.",
@@ -419,9 +435,26 @@ def _orch_body(names):
         "--name <slug> --parent-worktree active --json` when the session runs\n"
         "inside Orca, else `git worktree add -b <branch> <absolute path>` - and\n"
         "brief it with absolute paths under that checkout only, never the main\n"
-        "checkout. Serialize only a real\n"
-        "dependency, and never wait idle while independent work remains; you\n"
-        "integrate the branches and run the checks once on the merged tree.\n\n"
+        "checkout. Every writing brief names its `Owns:` globs (the files only\n"
+        "that slice writes; the gate holds its siblings to them) and declares\n"
+        "its checkout on a `Worktree: <abs path>` line, and siblings\n"
+        "message each other only on an interface or ownership change - status\n"
+        "goes to you. Serialize only a real\n"
+        "dependency. Your todo list is the step queue: each open item is ready\n"
+        "or blocked on something named (a slice id, %s).\n"
+        "After every spawn and every landed slice, dispatch every ready\n"
+        "item at once, before any `wait`, and mark each dispatched item blocked\n"
+        "on its slice id. Never `wait` while a ready step exists. Once every\n"
+        "open item is blocked on a running slice, `wait` or end the turn - the\n"
+        "host wakes you on the result. You integrate the branches in the order\n"
+        "`tezgah-task slice merge-plan` prints, and own CHANGELOG.md, MANIFEST\n"
+        "and the citation baseline. The per-turn\n"
+        "checks of what changed still run in the turn, in the background; only\n"
+        "the heavy tier (full suite, neuter, e2e) is joined at merge.\n"
+        "A slice commits `wip: <step>` after each step. A stopped slice is\n"
+        "resumed (`tezgah-task slice resume <id>`) or re-dispatched, never\n"
+        "silently absorbed inline; run `tezgah-task slice reconcile --prune`\n"
+        "before the turn that merged slices ends.\n\n"
         "Route reviews to tezgah-reviewer, with the changed files and symbols in\n"
         "the brief: where it has no shell it cannot run `git diff` itself. Checks\n"
         "go to tezgah-tester, docs and citations to tezgah-docs, a security review\n"
@@ -430,10 +463,13 @@ def _orch_body(names):
         "codegraph tools; a second opinion (`consult`) stays with the main\n"
         "thread. Other work goes to the tier worker\n"
         "`tezgah-route \"<brief>\"` names (tezgah-cheap, tezgah-standard,\n"
-        "tezgah-frontier); an ESCALATE answer is restarted on tezgah-frontier with\n"
-        "the same brief. Never delegate a task a specialist is not\n"
+        "tezgah-frontier). A report missing an `Output to orchestrator` field,\n"
+        "or an ESCALATE, gets one narrower re-brief of the same role naming the\n"
+        "missing field or the escalated judgement; only a second miss is\n"
+        "restarted on tezgah-frontier with the original brief, never continued.\n"
+        "Never delegate a task a specialist is not\n"
         "listed for, and never let a subagent spawn its own subagents. Verify each\n"
-        "returned claim against the code before acting." % listed)
+        "returned claim against the code before acting." % (listed, say()["blocker_tokens"]))
 
 
 # ---------------------------------------------------------------- renderers --

package/hooks/tezgah_clarity.py

@@ -4,7 +4,8 @@ Four rules are counted per file over docs/*.md and CHANGELOG.md: sentences over
 25 words, semicolons, a short list of words with a plainer replacement, and
 passive voice. Only English prose written for people is read: fenced code,
 code spans (including one broken across lines), link targets, HTML comments,
-tables, headings and any line holding a Turkish letter are blanked first, with
+tables, headings and any line holding another language's marker letter (a
+language pack's `markers.letters`, hooks/lang/) are blanked first, with
 their newlines kept so a hit still names its line.
 
 The counts are a ratchet, not a style gate: `docs/clarity-baseline.json` holds
@@ -19,6 +20,8 @@ import json
 import os
 import re
 
+from tezgah_paths import packs
+
 RULES = ("long_sentences", "semicolons", "replace_words", "passive")
 LONG = 25
 REPLACE = ("commence", "initiate", "utilize", "prior to", "in order to", "ensure",
@@ -33,7 +36,8 @@ FENCE = re.compile(r"^\s*(```|~~~)")
 SPAN = re.compile(r"(?<!`)(`+)(?!`)(.+?)(?<!`)\1(?!`)", re.S)
 COMMENT = re.compile(r"<!--.*?-->", re.S)
 LINK_TARGET = re.compile(r"\]\([^)]*\)|\]\[[^\]]*\]|<https?://[^>]*>|https?://\S+")
-TURKISH = re.compile(r"[ğĞışŞçÇöÖüÜİ]")
+OTHER_LANGUAGE = re.compile("[%s]" % "".join(
+    c for p in packs().values() for c in p["markers"]["letters"]))
 SKIP_LINE = re.compile(r"^\s*(?:#|\||\[[^\]]+\]:\s)")
 ITEM = re.compile(r"^\s*(?:[-*+]|\d+[.)])\s+")
 BASELINE = os.path.join("docs", "clarity-baseline.json")
@@ -58,7 +62,7 @@ def prose(text):
         out.append(SPAN.sub(lambda m: _blank(m, " CODE "), para))
     text = LINK_TARGET.sub(lambda m: "]" if m.group(0)[0] == "]" else "",
                            COMMENT.sub(_blank, "".join(out)))
-    return "\n".join("" if SKIP_LINE.match(line) or TURKISH.search(line) else line
+    return "\n".join("" if SKIP_LINE.match(line) or OTHER_LANGUAGE.search(line) else line
                      for line in text.split("\n"))