@astrosheep/keiyaku 0.1.4 → 0.1.6

package/README.md

@@ -56,7 +56,7 @@ Set `KEIYAKU_TERM_PRESET` in the MCP server env (recommended), or in your shell
 
 Each run/round can pick a profile via tool input `name`, or globally via `KEIYAKU_SUBAGENT_NAME_OVERRIDE`.
 
-- `default`: `servant-tier-b`, `servant-tier-a`, `servant-tier-s` (also accepts internal names `agent-a|agent-b|agent-c`)
+- `default`: `B-tier`, `A-tier`, `S-tier` (also accepts internal names `agent-a|agent-b|agent-c`)
 - `pokemon`: `caterpie`, `pikachu`, `mewtwo`
 - `mischief`: `imp`, `minion`, `mastermind`
 

package/build/common/errors.js

@@ -28,92 +28,85 @@ export function wrapFlowError(action, err) {
     }
     return new Error(`${action} failed: ${asMessage(err)}`);
 }
-export function pickHintFromError(err, message) {
-    if (isFlowError(err)) {
-        switch (err.code) {
-            case "NOT_GIT_REPO":
-                return "The provided `cwd` is not a git repository.";
-            case "ACTIVE_KEIYAKU_EXISTS":
-                return "An active keiyaku branch already exists in this repository.";
-            case "EXISTING_KEIYAKU_BRANCH_FOUND":
-                return "At least one local `keiyaku/*` branch already exists in this repository.";
-            case "EMPTY_PARAM":
-                return "One or more required parameters are empty.";
-            case "DIRTY_WORKTREE":
-                return "The working tree has uncommitted changes.";
-            case "NOT_ACTIVE_KEIYAKU_BRANCH":
-                return message;
-            case "MISSING_KEIYAKU_BASE":
-                return "Current keiyaku branch is missing `keiyakuBase` metadata.";
-            case "MISSING_PROTOCOL_FILES":
-                return "Required protocol files are missing (`KEIYAKU.md` or `KEIYAKU_TRACE.md`).";
-            case "DONE_MERGE_CONFLICT":
-                return "DONE encountered a git merge conflict.";
-            case "CLOSE_QUALITY_GATE_FAILED":
-                return "INVOKE was denied by Divine Judgment because one or more commandment thresholds or the minimum total score were not met.";
-            case "OATH_MISMATCH":
-                return err.message;
-            case "SUBAGENT_DID_NOT_ADVANCE_ROUND":
-                return "Subagent run did not append the expected new round in `KEIYAKU_TRACE.md`.";
-            case "ROUND_SUBAGENT_FAILED":
-                return "Subagent execution failed. Review KEIYAKU_TRACE.md for details, then continue with a narrower directive.";
-            case "INVALID_BRANCH_TITLE":
-                return "Title cannot be converted to a valid branch token for `keiyaku/<title>`.";
-            case "UNKNOWN_SUBAGENT":
-                return unknownSubagentHint();
-            default:
-                return "Review the error details, fix the issue, and retry.";
-        }
-    }
-    // Fallback for untyped runtime errors.
-    if (message.includes("is not a git repository")) {
-        return "The provided `cwd` is not a git repository.";
-    }
-    if (message.includes("active keiyaku already exists")) {
-        return "An active keiyaku branch already exists in this repository.";
-    }
-    if (message.includes("existing keiyaku branch found")) {
-        return "At least one local `keiyaku/*` branch already exists in this repository.";
-    }
-    if (message.includes("parameter") && message.includes("cannot be empty")) {
-        return "One or more required parameters are empty.";
-    }
-    if (message.includes("working tree has uncommitted changes")) {
-        return "The working tree has uncommitted changes.";
-    }
-    if (message.includes("current branch is not an active keiyaku branch")) {
-        return "No active keiyaku branch (`keiyaku/*`). If this task is not using keiyaku workflow, skip this tool call.";
-    }
-    if (message.includes("is missing base metadata")) {
-        return "Current keiyaku branch is missing `keiyakuBase` metadata.";
+function hintForFlowCode(code, message) {
+    switch (code) {
+        case "NOT_GIT_REPO":
+            return "The provided `cwd` is not a git repository.";
+        case "ACTIVE_KEIYAKU_EXISTS":
+            return "An active keiyaku branch already exists in this repository. Continue with `drive`, or use `close` + `ABANDON` to drop it.";
+        case "EXISTING_KEIYAKU_BRANCH_FOUND":
+            return "At least one local `keiyaku/*` branch already exists in this repository.";
+        case "EMPTY_PARAM":
+            return "One or more required parameters are empty.";
+        case "DIRTY_WORKTREE":
+            return "The working tree has uncommitted changes.";
+        case "NOT_ACTIVE_KEIYAKU_BRANCH":
+            return message;
+        case "MISSING_KEIYAKU_BASE":
+            return "Current keiyaku branch is missing `keiyakuBase` metadata.";
+        case "MISSING_PROTOCOL_FILES":
+            return "Required protocol files are missing (`KEIYAKU.md` or `KEIYAKU_TRACE.md`).";
+        case "DONE_MERGE_CONFLICT":
+            return "DONE encountered a git merge conflict.";
+        case "CLOSE_QUALITY_GATE_FAILED":
+            return "INVOKE was denied by Divine Judgment because one or more commandment thresholds or the minimum total score were not met.";
+        case "OATH_MISMATCH":
+            return message;
+        case "SUBAGENT_DID_NOT_ADVANCE_ROUND":
+            return "Subagent run did not append the expected new round in `KEIYAKU_TRACE.md`.";
+        case "ROUND_SUBAGENT_FAILED":
+            return "Subagent execution failed. Review KEIYAKU_TRACE.md for details, then continue with a narrower directive.";
+        case "INVALID_BRANCH_TITLE":
+            return "Title cannot be converted to a valid branch token for `keiyaku/<title>`.";
+        case "UNKNOWN_SUBAGENT":
+            return unknownSubagentHint();
     }
-    if (message.includes("missing protocol files")) {
-        return "Required protocol files are missing (`KEIYAKU.md` or `KEIYAKU_TRACE.md`).";
-    }
-    if (message.includes("DONE merge conflict")) {
-        return "DONE encountered a git merge conflict.";
-    }
-    if (message.includes("God's Wrath: INVOKE denied")) {
-        return "INVOKE was denied by Divine Judgment because one or more commandment thresholds or the minimum total score were not met.";
-    }
-    if (message.includes("requires the sacred oath to exactly equal") ||
-        message.includes("requires oath to exactly match configured value") ||
-        message.includes("requires oath to match configured value. If template contains") ||
-        message.includes("To declare DONE, you must solemnly swear the sacred oath.") ||
-        message.includes("To declare DONE, oath mismatch.")) {
-        return message;
-    }
-    if (message.includes("subagent did not advance round") || message.includes("did not append KEIYAKU_TRACE")) {
-        return "Subagent run did not append the expected new round in `KEIYAKU_TRACE.md`.";
-    }
-    if (message.includes("failed during subagent execution")) {
-        return "Subagent execution failed. Review KEIYAKU_TRACE.md for details, then continue with a narrower directive.";
+}
+const MESSAGE_HINT_PATTERNS = [
+    { code: "NOT_GIT_REPO", patterns: ["is not a git repository"] },
+    { code: "ACTIVE_KEIYAKU_EXISTS", patterns: ["active keiyaku already exists"] },
+    { code: "EXISTING_KEIYAKU_BRANCH_FOUND", patterns: ["existing keiyaku branch found"] },
+    { code: "EMPTY_PARAM", patterns: ["cannot be empty"] },
+    { code: "DIRTY_WORKTREE", patterns: ["working tree has uncommitted changes"] },
+    { code: "NOT_ACTIVE_KEIYAKU_BRANCH", patterns: ["current branch is not an active keiyaku branch"] },
+    { code: "MISSING_KEIYAKU_BASE", patterns: ["is missing base metadata"] },
+    { code: "MISSING_PROTOCOL_FILES", patterns: ["missing protocol files"] },
+    { code: "DONE_MERGE_CONFLICT", patterns: ["DONE merge conflict"] },
+    { code: "CLOSE_QUALITY_GATE_FAILED", patterns: ["God's Wrath: INVOKE denied"] },
+    {
+        code: "OATH_MISMATCH",
+        patterns: [
+            "requires the sacred oath to exactly equal",
+            "requires oath to exactly match configured value",
+            "requires oath to match configured value. If template contains",
+            "To declare DONE, you must solemnly swear the sacred oath.",
+            "To declare DONE, oath mismatch.",
+            "Oath mismatch.",
+        ],
+    },
+    {
+        code: "SUBAGENT_DID_NOT_ADVANCE_ROUND",
+        patterns: ["subagent did not advance round", "did not append KEIYAKU_TRACE"],
+    },
+    { code: "ROUND_SUBAGENT_FAILED", patterns: ["failed during subagent execution"] },
+    { code: "INVALID_BRANCH_TITLE", patterns: ["cannot be converted to a valid branch name"] },
+    { code: "UNKNOWN_SUBAGENT", patterns: ["Unknown subagent"] },
+];
+function inferFlowCodeFromMessage(message) {
+    for (const entry of MESSAGE_HINT_PATTERNS) {
+        if (entry.patterns.some((pattern) => message.includes(pattern))) {
+            return entry.code;
+        }
     }
-    if (message.includes("cannot be converted to a valid branch name")) {
-        return "Title cannot be converted to a valid branch token for `keiyaku/<title>`.";
+    return null;
+}
+export function pickHintFromError(err, message) {
+    if (isFlowError(err)) {
+        return hintForFlowCode(err.code, err.message);
     }
-    if (message.includes("Unknown subagent")) {
-        return unknownSubagentHint();
+    const inferredCode = inferFlowCodeFromMessage(message);
+    if (inferredCode) {
+        return hintForFlowCode(inferredCode, message);
     }
     return "Review the error details, fix the issue, and retry.";
 }