@windyroad/jtbd 0.13.3 → 0.14.0

package/.agents/plugins/marketplace.json

@@ -0,0 +1 @@
+{"name":"windyroad-jtbd-local","interface":{"displayName":"Windy Road JTBD"},"plugins":[{"name":"wr-jtbd","source":{"source":"local","path":"."},"policy":{"installation":"AVAILABLE","authentication":"ON_INSTALL"},"category":"Developer Tools"}]}

package/.claude-plugin/plugin.json

@@ -90,5 +90,5 @@
     }
   },
   "name": "wr-jtbd",
-  "version": "0.13.3"
+  "version": "0.14.0"
 }

package/.codex-plugin/plugin.json

@@ -0,0 +1,42 @@
+{
+  "name": "wr-jtbd",
+  "version": "0.14.0",
+  "description": "Jobs-to-be-done governance for product changes",
+  "author": {
+    "name": "Windy Road Technology",
+    "url": "https://windyroad.com.au"
+  },
+  "homepage": "https://github.com/windyroad/agent-plugins/tree/main/packages/jtbd",
+  "repository": "https://github.com/windyroad/agent-plugins",
+  "license": "MIT",
+  "keywords": [
+    "jtbd",
+    "product",
+    "personas",
+    "governance",
+    "codex",
+    "claude-code"
+  ],
+  "skills": "./skills/",
+  "interface": {
+    "displayName": "Windy Road JTBD",
+    "shortDescription": "Govern changes with jobs and personas",
+    "longDescription": "Review product changes against documented jobs and personas, update the JTBD guide, and confirm human oversight.",
+    "developerName": "Windy Road Technology",
+    "category": "Developer Tools",
+    "capabilities": [
+      "Interactive",
+      "Read",
+      "Write"
+    ],
+    "websiteURL": "https://windyroad.com.au",
+    "privacyPolicyURL": "https://windyroad.com.au/privacy",
+    "termsOfServiceURL": "https://windyroad.com.au/terms",
+    "defaultPrompt": [
+      "Review these changes against our jobs and personas",
+      "Update the JTBD guide"
+    ],
+    "brandColor": "#7C3AED",
+    "screenshots": []
+  }
+}

package/bin/install.mjs

@@ -8,6 +8,7 @@ const utils = await import(resolve(__dirname, "../lib/install-utils.mjs"));
 
 const PLUGIN = "wr-jtbd";
 const DEPS = [];
+const AGENTS = [{ source: "agents/agent.md", name: "wr-jtbd:agent", filename: "wr-jtbd-agent.toml" }];
 
 const flags = utils.parseStandardArgs(process.argv);
 
@@ -21,6 +22,7 @@ Options:
   --update     Update this plugin and its skills
   --uninstall  Remove this plugin
   --scope      Installation scope: project (default) or user
+  --runtime    Runtime to install for: claude (default), codex, or both
   --dry-run    Show what would be done without executing
   --help, -h   Show this help
 `);
@@ -32,12 +34,12 @@ if (flags.dryRun) {
   console.log("[dry-run mode — no commands will be executed]\n");
 }
 
-utils.checkPrerequisites();
+utils.checkPrerequisites({ runtime: flags.runtime });
 
 if (flags.uninstall) {
-  utils.uninstallPackage(PLUGIN);
+  utils.uninstallPackage(PLUGIN, { agents: AGENTS, scope: flags.scope, runtime: flags.runtime });
 } else if (flags.update) {
-  utils.updatePackage(PLUGIN, { scope: flags.scope });
+  utils.updatePackage(PLUGIN, { agents: AGENTS, scope: flags.scope, runtime: flags.runtime });
 } else {
-  utils.installPackage(PLUGIN, { deps: DEPS, scope: flags.scope });
+  utils.installPackage(PLUGIN, { agents: AGENTS, deps: DEPS, scope: flags.scope, runtime: flags.runtime });
 }

package/hooks/hooks.json

@@ -1,19 +1,73 @@
 {
   "hooks": {
     "SessionStart": [
-      { "matcher": "startup", "hooks": [{ "type": "command", "command": "${CLAUDE_PLUGIN_ROOT}/hooks/jtbd-oversight-nudge.sh" }] }
+      {
+        "matcher": "startup",
+        "hooks": [
+          {
+            "type": "command",
+            "command": "${CLAUDE_PLUGIN_ROOT}/hooks/jtbd-oversight-nudge.sh"
+          }
+        ]
+      }
     ],
     "UserPromptSubmit": [
-      { "hooks": [{ "type": "command", "command": "${CLAUDE_PLUGIN_ROOT}/hooks/jtbd-eval.sh" }] },
-      { "hooks": [{ "type": "command", "command": "${CLAUDE_PLUGIN_ROOT}/hooks/staleness-check.sh" }] }
+      {
+        "hooks": [
+          {
+            "type": "command",
+            "command": "${CLAUDE_PLUGIN_ROOT}/hooks/jtbd-eval.sh"
+          }
+        ]
+      },
+      {
+        "hooks": [
+          {
+            "type": "command",
+            "command": "${CLAUDE_PLUGIN_ROOT}/hooks/staleness-check.sh"
+          }
+        ]
+      }
     ],
     "PreToolUse": [
-      { "matcher": "Edit|Write", "hooks": [{ "type": "command", "command": "${CLAUDE_PLUGIN_ROOT}/hooks/jtbd-enforce-edit.sh" }] },
-      { "matcher": "Edit|Write", "hooks": [{ "type": "command", "command": "${CLAUDE_PLUGIN_ROOT}/hooks/jtbd-oversight-marker-discipline.sh" }] }
+      {
+        "matcher": "Edit|Write",
+        "hooks": [
+          {
+            "type": "command",
+            "command": "bash \"${PLUGIN_ROOT}/hooks-codex/codex-adapter.sh\" \"${PLUGIN_ROOT}/hooks/jtbd-enforce-edit.sh\""
+          }
+        ]
+      },
+      {
+        "matcher": "Edit|Write",
+        "hooks": [
+          {
+            "type": "command",
+            "command": "bash \"${PLUGIN_ROOT}/hooks-codex/codex-adapter.sh\" \"${PLUGIN_ROOT}/hooks/jtbd-oversight-marker-discipline.sh\""
+          }
+        ]
+      }
     ],
     "PostToolUse": [
-      { "matcher": "Agent", "hooks": [{ "type": "command", "command": "${CLAUDE_PLUGIN_ROOT}/hooks/jtbd-mark-reviewed.sh" }] },
-      { "matcher": "Agent|Bash|Skill", "hooks": [{ "type": "command", "command": "${CLAUDE_PLUGIN_ROOT}/hooks/jtbd-slide-marker.sh" }] }
+      {
+        "matcher": "Agent",
+        "hooks": [
+          {
+            "type": "command",
+            "command": "bash \"${PLUGIN_ROOT}/hooks-codex/codex-adapter.sh\" \"${PLUGIN_ROOT}/hooks/jtbd-mark-reviewed.sh\""
+          }
+        ]
+      },
+      {
+        "matcher": "Agent|Bash|Skill",
+        "hooks": [
+          {
+            "type": "command",
+            "command": "bash \"${PLUGIN_ROOT}/hooks-codex/codex-adapter.sh\" \"${PLUGIN_ROOT}/hooks/jtbd-slide-marker.sh\""
+          }
+        ]
+      }
     ]
   }
 }

package/hooks-codex/codex-adapter.sh

@@ -0,0 +1,27 @@
+#!/usr/bin/env bash
+set -uo pipefail
+
+target="$1"
+input="$(cat)"
+tool="$(printf '%s' "$input" | jq -r '.tool_name // empty')"
+
+run_hook() {
+  printf '%s' "$1" | "$target"
+}
+
+if [ "$tool" = "apply_patch" ]; then
+  paths="$(printf '%s' "$input" | jq -r '.tool_input.command // empty' | sed -nE 's/^\*\*\* (Add|Update|Delete) File: (.*)$/\2/p')"
+  if [ -n "$paths" ]; then
+    while IFS= read -r path; do
+      payload="$(printf '%s' "$input" | jq --arg path "$path" '.tool_name = "Edit" | .tool_input.file_path = $path')"
+      run_hook "$payload" || exit $?
+    done <<< "$paths"
+    exit 0
+  fi
+fi
+
+if [ "$tool" = "spawn_agent" ] || [ "$tool" = "Agent" ]; then
+  input="$(printf '%s' "$input" | jq '.tool_name = "Agent" | .tool_input.subagent_type = (.tool_input.agent_type // .tool_input.subagent_type // "") | .tool_input.prompt = (.tool_input.message // .tool_input.prompt // "")')"
+fi
+
+run_hook "$input"

package/hooks-codex/hooks.json

@@ -0,0 +1,73 @@
+{
+  "hooks": {
+    "SessionStart": [
+      {
+        "matcher": "startup",
+        "hooks": [
+          {
+            "type": "command",
+            "command": "${CLAUDE_PLUGIN_ROOT}/hooks/jtbd-oversight-nudge.sh"
+          }
+        ]
+      }
+    ],
+    "UserPromptSubmit": [
+      {
+        "hooks": [
+          {
+            "type": "command",
+            "command": "${CLAUDE_PLUGIN_ROOT}/hooks/jtbd-eval.sh"
+          }
+        ]
+      },
+      {
+        "hooks": [
+          {
+            "type": "command",
+            "command": "${CLAUDE_PLUGIN_ROOT}/hooks/staleness-check.sh"
+          }
+        ]
+      }
+    ],
+    "PreToolUse": [
+      {
+        "matcher": "Edit|Write",
+        "hooks": [
+          {
+            "type": "command",
+            "command": "bash \"${PLUGIN_ROOT}/hooks-codex/codex-adapter.sh\" \"${PLUGIN_ROOT}/hooks/jtbd-enforce-edit.sh\""
+          }
+        ]
+      },
+      {
+        "matcher": "Edit|Write",
+        "hooks": [
+          {
+            "type": "command",
+            "command": "bash \"${PLUGIN_ROOT}/hooks-codex/codex-adapter.sh\" \"${PLUGIN_ROOT}/hooks/jtbd-oversight-marker-discipline.sh\""
+          }
+        ]
+      }
+    ],
+    "PostToolUse": [
+      {
+        "matcher": "Agent",
+        "hooks": [
+          {
+            "type": "command",
+            "command": "bash \"${PLUGIN_ROOT}/hooks-codex/codex-adapter.sh\" \"${PLUGIN_ROOT}/hooks/jtbd-mark-reviewed.sh\""
+          }
+        ]
+      },
+      {
+        "matcher": "Agent|Bash|Skill",
+        "hooks": [
+          {
+            "type": "command",
+            "command": "bash \"${PLUGIN_ROOT}/hooks-codex/codex-adapter.sh\" \"${PLUGIN_ROOT}/hooks/jtbd-slide-marker.sh\""
+          }
+        ]
+      }
+    ]
+  }
+}

package/lib/install-utils.mjs

@@ -4,11 +4,17 @@
  */
 
 import { execSync } from "node:child_process";
+import { createHash } from "node:crypto";
+import { cpSync, existsSync, mkdirSync, readFileSync, rmSync, writeFileSync } from "node:fs";
+import { homedir } from "node:os";
+import { dirname, join, resolve } from "node:path";
+import { fileURLToPath } from "node:url";
 
 const MARKETPLACE_REPO = "windyroad/agent-plugins";
 const MARKETPLACE_NAME = "windyroad";
 const CODEX_MARKETPLACE_PATH = ".";
 const CODEX_MARKETPLACE_NAME = "windyroad-local";
+const PACKAGE_ROOT = resolve(dirname(fileURLToPath(import.meta.url)), "..");
 
 let _dryRun = false;
 
@@ -82,6 +88,132 @@ export function addCodexMarketplace() {
   );
 }
 
+function codexMarketplace(pluginName) {
+  return `windyroad-${pluginName.replace(/^wr-/, "")}-local`;
+}
+
+function codexMarketplaceRoot(pluginName) {
+  const version = JSON.parse(readFileSync(join(PACKAGE_ROOT, "package.json"), "utf8")).version;
+  return join(process.env.CODEX_HOME || join(homedir(), ".codex"), ".tmp", "marketplaces", `${pluginName}-${version}`);
+}
+
+function codexAgentDir(scope) {
+  return scope === "user"
+    ? join(process.env.CODEX_HOME || join(homedir(), ".codex"), "agents")
+    : join(process.cwd(), ".codex", "agents");
+}
+
+function codexTerms(text) {
+  return text
+    .replaceAll("AskUserQuestion", "request_user_input")
+    .replaceAll("Agent tool", "native Codex subagent tool")
+    .replaceAll("Skill tool", "installed skill invocation")
+    .replaceAll("Claude Code", "Codex")
+    .replace(/\bClaude\b/g, "Codex")
+    .replaceAll(".claude", ".codex");
+}
+
+function splitFrontmatter(markdown) {
+  const end = markdown.indexOf("\n---\n", 4);
+  return markdown.startsWith("---\n") && end !== -1
+    ? { frontmatter: markdown.slice(4, end), body: markdown.slice(end + 5) }
+    : { frontmatter: "", body: markdown };
+}
+
+function frontmatterDescription(frontmatter) {
+  const lines = frontmatter.split(/\r?\n/);
+  const start = lines.findIndex((line) => line.startsWith("description:"));
+  if (start === -1) return "Windy Road reviewer.";
+  const value = [lines[start].slice("description:".length).trim()];
+  for (let index = start + 1; index < lines.length && /^\s+/.test(lines[index]); index += 1) {
+    value.push(lines[index].trim());
+  }
+  return value.filter(Boolean).join(" ");
+}
+
+function renderCodexAgent(pluginName, agent) {
+  const source = join(PACKAGE_ROOT, agent.source);
+  const { frontmatter, body } = splitFrontmatter(readFileSync(source, "utf8"));
+  const codexInstructions = agent.name === "wr-voice-tone:external-comms"
+    ? `\n\n## Codex completion marker compatibility\n\nOn PASS, compute the lowercase SHA-256 marker key using the normalization specified above and append \`EXTERNAL_COMMS_VOICE_TONE_KEY: <64 lowercase hex characters>\`. Codex may hide the spawn prompt from PostToolUse hooks, so this emitted key is required. On FAIL, do not emit a key.`
+    : "";
+  const payload = [
+    `# Do not edit by hand; update ${agent.source} and reinstall.`,
+    `name = ${JSON.stringify(agent.name)}`,
+    `description = ${JSON.stringify(frontmatterDescription(frontmatter))}`,
+    'sandbox_mode = "read-only"',
+    'developer_instructions = """',
+    codexTerms(`${body.trimEnd()}${codexInstructions}`).replace(/\\/g, "\\\\").replace(/"""/g, '\\"\\"\\"').trimEnd(),
+    '"""',
+    "",
+  ].join("\n");
+  const owner = `# Generated by @windyroad/${pluginName.replace(/^wr-/, "")} from ${agent.source}.`;
+  const hash = createHash("sha256").update(payload).digest("hex");
+  return `${owner}\n# Generated content SHA-256: ${hash}\n${payload}`;
+}
+
+function isOwnedCodexAgent(content, pluginName, agent) {
+  const owner = `# Generated by @windyroad/${pluginName.replace(/^wr-/, "")} from ${agent.source}.`;
+  const lines = content.split("\n");
+  const hash = lines[1]?.match(/^# Generated content SHA-256: ([0-9a-f]{64})$/)?.[1];
+  return content.startsWith(`${owner}\n`) && Boolean(hash)
+    && createHash("sha256").update(lines.slice(2).join("\n")).digest("hex") === hash;
+}
+
+function installCodexAgents(pluginName, agents, scope) {
+  if (agents.length === 0 || _dryRun) return;
+  const targetDir = codexAgentDir(scope);
+  mkdirSync(targetDir, { recursive: true });
+  for (const agent of agents) {
+    const target = join(targetDir, agent.filename);
+    const expected = renderCodexAgent(pluginName, agent);
+    if (existsSync(target)) {
+      const current = readFileSync(target, "utf8");
+      if (current === expected) continue;
+      if (!isOwnedCodexAgent(current, pluginName, agent)) {
+        console.log(`Preserved user-managed Codex agent at ${target}.`);
+        continue;
+      }
+    }
+    writeFileSync(target, expected, "utf8");
+  }
+}
+
+function uninstallCodexAgents(pluginName, agents, scope) {
+  if (_dryRun) return;
+  for (const targetDir of new Set([codexAgentDir(scope), codexAgentDir("user")])) {
+    for (const agent of agents) {
+      const target = join(targetDir, agent.filename);
+      if (existsSync(target) && isOwnedCodexAgent(readFileSync(target, "utf8"), pluginName, agent)) rmSync(target);
+    }
+  }
+}
+
+function installPackedCodexPlugin(pluginName, { agents = [], scope = "project" } = {}) {
+  const marketplace = codexMarketplace(pluginName);
+  const root = codexMarketplaceRoot(pluginName);
+  if (!_dryRun) {
+    rmSync(root, { recursive: true, force: true });
+    mkdirSync(dirname(root), { recursive: true });
+    cpSync(PACKAGE_ROOT, root, { recursive: true });
+    const hooks = join(root, "hooks-codex", "hooks.json");
+    if (existsSync(hooks)) cpSync(hooks, join(root, "hooks", "hooks.json"));
+  }
+  if (!run(`codex plugin marketplace add ${JSON.stringify(root)}`, `Codex marketplace: ${marketplace}`)) return false;
+  if (!run(`codex plugin add ${pluginName}@${marketplace}`, pluginName)) return false;
+  installCodexAgents(pluginName, agents, scope);
+  return true;
+}
+
+function uninstallPackedCodexPlugin(pluginName, { agents = [], scope = "project" } = {}) {
+  const marketplace = codexMarketplace(pluginName);
+  const removed = run(`codex plugin remove ${pluginName}@${marketplace}`, `Removing ${pluginName}`);
+  run(`codex plugin marketplace remove ${marketplace}`, `Removing ${marketplace}`);
+  uninstallCodexAgents(pluginName, agents, scope);
+  if (!_dryRun) rmSync(codexMarketplaceRoot(pluginName), { recursive: true, force: true });
+  return removed;
+}
+
 export function installPlugin(pluginName, { scope = "project" } = {}) {
   return run(
     `claude plugin install ${pluginName}@${MARKETPLACE_NAME} --scope ${scope}`,
@@ -121,7 +253,7 @@ export function uninstallCodexPlugin(pluginName) {
 /**
  * Install a single package: marketplace add + plugin install.
  */
-export function installPackage(pluginName, { deps = [], scope = "project", runtime = "claude" } = {}) {
+export function installPackage(pluginName, { agents = [], deps = [], scope = "project", runtime = "claude" } = {}) {
   console.log(`\nInstalling @windyroad/${pluginName.replace("wr-", "")} (${scope} scope)...\n`);
 
   if (runtime === "claude" || runtime === "both") {
@@ -130,8 +262,7 @@ export function installPackage(pluginName, { deps = [], scope = "project", runti
   }
 
   if (runtime === "codex" || runtime === "both") {
-    addCodexMarketplace();
-    installCodexPlugin(pluginName);
+    if (!installPackedCodexPlugin(pluginName, { agents, scope })) process.exitCode = 1;
   }
 
   if (deps.length > 0) {
@@ -149,7 +280,7 @@ export function installPackage(pluginName, { deps = [], scope = "project", runti
 /**
  * Update a single package.
  */
-export function updatePackage(pluginName, { scope = "project", runtime = "claude" } = {}) {
+export function updatePackage(pluginName, { agents = [], scope = "project", runtime = "claude" } = {}) {
   console.log(`\nUpdating @windyroad/${pluginName.replace("wr-", "")}...\n`);
 
   if (runtime === "claude" || runtime === "both") {
@@ -161,8 +292,7 @@ export function updatePackage(pluginName, { scope = "project", runtime = "claude
   }
 
   if (runtime === "codex" || runtime === "both") {
-    updateCodexMarketplace();
-    installCodexPlugin(pluginName);
+    if (!installPackedCodexPlugin(pluginName, { agents, scope })) process.exitCode = 1;
   }
 
   console.log(`\nDone! Restart ${runtime === "codex" ? "Codex" : runtime === "both" ? "Claude Code and Codex" : "Claude Code"} to apply updates.\n`);
@@ -171,7 +301,7 @@ export function updatePackage(pluginName, { scope = "project", runtime = "claude
 /**
  * Uninstall a single package.
  */
-export function uninstallPackage(pluginName, { runtime = "claude" } = {}) {
+export function uninstallPackage(pluginName, { agents = [], scope = "project", runtime = "claude" } = {}) {
   console.log(`\nUninstalling @windyroad/${pluginName.replace("wr-", "")}...\n`);
 
   if (runtime === "claude" || runtime === "both") {
@@ -179,7 +309,7 @@ export function uninstallPackage(pluginName, { runtime = "claude" } = {}) {
   }
 
   if (runtime === "codex" || runtime === "both") {
-    uninstallCodexPlugin(pluginName);
+    if (!uninstallPackedCodexPlugin(pluginName, { agents, scope })) process.exitCode = 1;
   }
 
   console.log(`\nDone. Restart ${runtime === "codex" ? "Codex" : runtime === "both" ? "Claude Code and Codex" : "Claude Code"} to apply changes.\n`);

package/package.json

@@ -1,11 +1,15 @@
 {
   "name": "@windyroad/jtbd",
-  "version": "0.13.3",
+  "version": "0.14.0",
   "description": "Jobs-to-be-done enforcement for UI changes",
   "bin": {
     "windyroad-jtbd": "./bin/install.mjs"
   },
   "type": "module",
+  "scripts": {
+    "prepack": "node ../../scripts/sync-codex-plugin-surfaces.mjs jtbd --pack",
+    "postpack": "node ../../scripts/sync-codex-plugin-surfaces.mjs jtbd --restore-pack"
+  },
   "license": "MIT",
   "repository": {
     "type": "git",
@@ -15,6 +19,7 @@
   "keywords": [
     "claude-code",
     "claude-code-plugin",
+    "codex",
     "ai-agent",
     "ai-coding"
   ],
@@ -23,8 +28,11 @@
     "agents/",
     "hooks/",
     "skills/",
+    "hooks-codex/",
     "scripts/",
     ".claude-plugin/",
+    ".agents/",
+    ".codex-plugin/",
     "lib/",
     "!agents/eval/",
     "!agents/test/",

package/skills/confirm-jobs-and-personas/SKILL.md

@@ -1,12 +1,20 @@
 ---
 name: wr-jtbd:confirm-jobs-and-personas
-description: Drain the set of Jobs To Be Done and personas that lack human oversight. Surfaces each auto-derived job/persona via AskUserQuestion so a human confirms, amends, or rejects it, then writes the human-oversight marker. Use when the session-start nudge reports jobs/personas lack oversight, or any time you want to review the documented JTBD corpus. This is the read-write oversight drain — distinct from /wr-jtbd:review-jobs (the read-only alignment reviewer).
-allowed-tools: Read, Glob, Grep, Bash, Edit, AskUserQuestion
+description: Drain the set of Jobs To Be Done and personas that lack human oversight. Surfaces each auto-derived job/persona via request_user_input so a human confirms, amends, or rejects it, then writes the human-oversight marker. Use when the session-start nudge reports jobs/personas lack oversight, or any time you want to review the documented JTBD corpus. This is the read-write oversight drain — distinct from /wr-jtbd:review-jobs (the read-only alignment reviewer).
+allowed-tools: Read, Glob, Grep, Bash, Edit, request_user_input
 ---
 
+<!-- Generated from the runtime-neutral skill source. Do not edit. -->
+
+> Codex runtime note: invoke installed skills directly, use
+> `request_user_input` only when the contract requires a human decision, and
+> use native Codex subagents for agent delegation. Resolve bundled files from
+> this installed plugin instead of the adopter repository.
+
+
 # Confirm Jobs and Personas — human-oversight drain
 
-Lift auto-derived Jobs To Be Done and personas to human decisions. Documented jobs/personas are load-bearing: the JTBD edit gate reviews every project change against `docs/jtbd/`, so a job or persona that was agent-derived without a human confirming it reflects real need propagates wrong alignment verdicts. This skill drains the **unoversighted set** (jobs/personas lacking `human-oversight: confirmed`, per ADR-068): it surfaces each via `AskUserQuestion`, and writes the oversight marker only when a human confirms.
+Lift auto-derived Jobs To Be Done and personas to human decisions. Documented jobs/personas are load-bearing: the JTBD edit gate reviews every project change against `docs/jtbd/`, so a job or persona that was agent-derived without a human confirming it reflects real need propagates wrong alignment verdicts. This skill drains the **unoversighted set** (jobs/personas lacking `human-oversight: confirmed`, per ADR-068): it surfaces each via `request_user_input`, and writes the oversight marker only when a human confirms.
 
 This is the P288 / ADR-068 drain surface — the JTBD sibling of `/wr-architect:review-decisions`. It is **read-write** (writes the marker on confirm). It is NOT the same as `/wr-jtbd:review-jobs`, which is a read-only alignment review ("do my changes trace to documented jobs?"); this skill confirms the jobs/personas themselves.
 
@@ -33,9 +41,9 @@ The `wr-jtbd-detect-unoversighted` command is a `$PATH`-resolved shim (ADR-049)
 
 Read **only the frontmatter + title + Job Statement / persona "Who" section** of each unoversighted file (not full bodies — keep it cheap). Group by persona directory and order **load-bearing first**: personas before their jobs (a persona frames its jobs), and jobs that other artifacts (problems, RFCs, READMEs) cite most heavily before narrow ones.
 
-### Step 3: Present each via AskUserQuestion (batched)
+### Step 3: Present each via request_user_input (batched)
 
-For each job/persona in the ordered queue, surface it as an `AskUserQuestion` (cap **4 per call** per ADR-013 Rule 1; issue further calls sequentially):
+For each job/persona in the ordered queue, surface it as an `request_user_input` (cap **4 per call** per ADR-013 Rule 1; issue further calls sequentially):
 
 - **Question**: the job statement (for a JTBD) or the persona definition (who they are + key constraints), in one line.
 - **Context**: grounded in what the file actually says (per ADR-026) — the persona served, the desired outcomes, any cited problems/RFCs.
@@ -45,19 +53,19 @@ For each job/persona in the ordered queue, surface it as an `AskUserQuestion` (c
   - **Reject** — the auto-derived job/persona does not reflect real need; capture the supersede ticket (see Step 4) and write the **rejected-pending-supersede** marker so the drain stops re-asking.
   - **Defer** — skip this sitting; leave unoversighted for later.
 
-**Presentation rule — lead with the job statement / persona definition, never with the meta (P302).** The AskUserQuestion `question` field MUST open with the one-line job statement (for a JTBD) or persona definition (for a persona) — *what the job/persona asserts about real user/business need* — phrased as `"This job statement: <statement>"` / `"This persona: <who they are + key constraint>"`. Persona-cluster relationships, source-citations (which problem/RFC triggered the auto-derivation), and any internal-housekeeping recording-shape are **meta** about *how the artifact was authored*, not what it asserts — relegate them to a trailing clause or omit. Mirrors the `/wr-architect:review-decisions` presentation rule (P302) — ADR-074's *name the substance, not the grain* principle applied to the JTBD-confirm surface, and ADR-026 grounding extended from the file body to the AskUserQuestion `question` text. Burying the substance behind meta forces a clarifying re-ask: the user cannot tell what they are confirming reflects real need.
+**Presentation rule — lead with the job statement / persona definition, never with the meta (P302).** The request_user_input `question` field MUST open with the one-line job statement (for a JTBD) or persona definition (for a persona) — *what the job/persona asserts about real user/business need* — phrased as `"This job statement: <statement>"` / `"This persona: <who they are + key constraint>"`. Persona-cluster relationships, source-citations (which problem/RFC triggered the auto-derivation), and any internal-housekeeping recording-shape are **meta** about *how the artifact was authored*, not what it asserts — relegate them to a trailing clause or omit. Mirrors the `/wr-architect:review-decisions` presentation rule (P302) — ADR-074's *name the substance, not the grain* principle applied to the JTBD-confirm surface, and ADR-026 grounding extended from the file body to the request_user_input `question` text. Burying the substance behind meta forces a clarifying re-ask: the user cannot tell what they are confirming reflects real need.
 
 The trailing clause exists for cross-reference value — it is optional, NOT a re-entry point for meta-leading. When the meta does not add load-bearing context for the confirm decision, omit it entirely.
 
 **Brief-before-ID discipline (P350).** The `question` and `options` text MUST inline what each referenced artefact is and what is at stake before naming it by ID. `JTBD-NNN` / `P-NNN` / `ADR-NNN` / `RFC-NNN` references are audit-trail annotations, NEVER carriers of meaning — the user reads this prompt without project filesystem access (mobile clients, accessibility tooling, notification surfaces) and cannot follow links. Acceptable: *"This job statement: developers want governance enforced automatically so they get manual-review safety without the overhead (cited by the AFK-orchestration backlog ticket)."* Unacceptable: *"This job statement: enforce governance without slowing down (cited by P256, sibling to JTBD-006)."* Trailing parenthetical IDs are permitted ONLY after a self-contained explanation, never as the explanation itself. Mirrors the canonical `/wr-architect:create-adr` Step 5 § 5a Rule 3 ("No IDs as explainers"). See also session memory `feedback_brief_before_id.md`.
 
-This is a genuine human-decision surface (the point of P288/ADR-068) — `AskUserQuestion` is correct here, not over-asking. Do not auto-confirm; do not prose-ask.
+This is a genuine human-decision surface (the point of P288/ADR-068) — `request_user_input` is correct here, not over-asking. Do not auto-confirm; do not prose-ask.
 
 ### Step 4: Apply the outcome
 
 - **Confirm / Amend**: write `human-oversight: confirmed` + `oversight-date: <today, YYYY-MM-DD>` into the file's frontmatter (insert after the `status:`/`date-created:` line if absent; never duplicate). For Amend, apply the directed change first. Edits go through the standard JTBD / architect edit gate per ADR-014.
 - **Reject** (ADR-068 amendment per P316, mirroring ADR-066):
-  1. Capture the supersede ticket via a follow-up `AskUserQuestion`: "Which problem ticket tracks the rework?" — options: existing `P<NNN>` IDs surfaced from `docs/problems/`, **Capture a new ticket** (delegate to `/wr-itil:capture-problem`), or **Defer (leave un-tracked for now)**.
+  1. Capture the supersede ticket via a follow-up `request_user_input`: "Which problem ticket tracks the rework?" — options: existing `P<NNN>` IDs surfaced from `docs/problems/`, **Capture a new ticket** (delegate to `/wr-itil:capture-problem`), or **Defer (leave un-tracked for now)**.
   2. If a ticket ID is captured, write `human-oversight: rejected-pending-supersede` + `supersede-ticket: P<NNN>` into the file's frontmatter. The detector excludes artifacts carrying both, so the drain stops re-asking until either the rework lands (file renamed to `*.superseded.md`) or the rejection is revisited.
   3. If the user defers ticket capture, leave the marker absent — the artifact re-surfaces next drain (the un-tracked case is intentionally re-asked so it doesn't silently rot).
 - **Defer**: no write.

package/skills/confirm-jobs-and-personas/agents/openai.yaml

@@ -0,0 +1,3 @@
+interface:
+  display_name: "WR JTBD: Confirm Jobs and Personas"
+  short_description: "Ratify jobs and personas with human oversight"

package/skills/review-jobs/SKILL.md

@@ -1,9 +1,17 @@
 ---
 name: wr-jtbd:review-jobs
 description: On-demand JTBD alignment review. Checks staged changes and recent commits against documented persona jobs in docs/jtbd/. Use before a release or when adding new features.
-allowed-tools: Read, Glob, Grep, Bash, AskUserQuestion, Skill
+allowed-tools: Read, Glob, Grep, Bash, request_user_input, Skill
 ---
 
+<!-- Generated from the runtime-neutral skill source. Do not edit. -->
+
+> Codex runtime note: invoke installed skills directly, use
+> `request_user_input` only when the contract requires a human decision, and
+> use native Codex subagents for agent delegation. Resolve bundled files from
+> this installed plugin instead of the adopter repository.
+
+
 # JTBD Alignment Review Skill
 
 Run a Jobs To Be Done alignment review on demand — outside the pre-tool-use hook gate. Reviews staged changes and recent commits against the documented persona jobs in `docs/jtbd/`.
@@ -49,7 +57,7 @@ Summarise:
 
 ### 3. Resolve ambiguity
 
-If there are no staged changes and no recent unpushed commits, use `AskUserQuestion` to ask:
+If there are no staged changes and no recent unpushed commits, use `request_user_input` to ask:
 
 > "I don't see any staged or unpushed changes. What would you like me to review?
 > (a) A specific set of files or a planned feature — please describe it
@@ -68,10 +76,10 @@ Build a self-contained prompt for the JTBD subagent that includes:
 
 ### 5. Delegate to wr-jtbd:agent
 
-Invoke the JTBD subagent via the `Skill` tool:
+Invoke the JTBD subagent via the installed skill invocation:
 
 ```
-subagent_type: wr-jtbd:agent
+agent_type: wr-jtbd:agent
 prompt: <constructed review prompt from step 4>
 ```
 
@@ -85,7 +93,7 @@ Present the full alignment report to the user. The JTBD subagent will report:
 - BREAKS: changes that appear to remove or degrade a documented job outcome
 - NEW JOB NEEDED: capabilities being added that serve an undocumented need
 
-If gaps or breaks are identified, use `AskUserQuestion` to ask how the user wants to proceed:
+If gaps or breaks are identified, use `request_user_input` to ask how the user wants to proceed:
 - (a) Document the new job before continuing (recommended)
 - (b) Proceed with a documented exception
 - (c) Revise the approach to serve an existing job

package/skills/review-jobs/agents/openai.yaml

@@ -0,0 +1,3 @@
+interface:
+  display_name: "WR JTBD: Review Jobs"
+  short_description: "Review changes against jobs and personas"

package/skills/update-guide/SKILL.md

@@ -1,9 +1,17 @@
 ---
 name: wr-jtbd:update-guide
 description: Create or update the project's docs/jtbd/ directory with per-persona directories and individual job files. Migrates from docs/JOBS_TO_BE_DONE.md if present.
-allowed-tools: Read, Write, Edit, Bash, Glob, Grep, AskUserQuestion
+allowed-tools: Read, Write, Edit, Bash, Glob, Grep, request_user_input
 ---
 
+<!-- Generated from the runtime-neutral skill source. Do not edit. -->
+
+> Codex runtime note: invoke installed skills directly, use
+> `request_user_input` only when the contract requires a human decision, and
+> use native Codex subagents for agent delegation. Resolve bundled files from
+> this installed plugin instead of the adopter repository.
+
+
 # Jobs To Be Done Document Generator
 
 Create or update `docs/jtbd/` with per-persona directories and individual job files.
@@ -84,12 +92,12 @@ Use kebab-case for the directory name (e.g., `developer`, `tech-lead`).
 
 ### 4. Confirm personas with the user
 
-Use AskUserQuestion to present the drafted personas and ask:
+Use request_user_input to present the drafted personas and ask:
 - Are these the right personas?
 - Any missing user segments?
 - Any constraints or pain points to add?
 
-**Born-confirmed write (ADR-068 — structurally gated by ADR-110).** Once the user confirms a persona via this AskUserQuestion pass, IMMEDIATELY call the marker-evidence helper THEN insert the two lines into that persona's frontmatter — after the `description:` line:
+**Born-confirmed write (ADR-068 — structurally gated by ADR-110).** Once the user confirms a persona via this request_user_input pass, IMMEDIATELY call the marker-evidence helper THEN insert the two lines into that persona's frontmatter — after the `description:` line:
 
 ```bash
 wr-jtbd-mark-oversight-confirmed docs/jtbd/<persona-name>/persona.md
@@ -100,7 +108,7 @@ human-oversight: confirmed
 oversight-date: YYYY-MM-DD   # today
 ```
 
-The `wr-jtbd-mark-oversight-confirmed` call writes the session-scoped evidence marker (`/tmp/oversight-confirmed-<sha>-<sid>`) that the `jtbd-oversight-marker-discipline.sh` PreToolUse hook reads to authorise the subsequent Edit/Write — without the helper call, the hook will DENY the marker write. This is the load-bearing born-confirmed gate: a persona authored through update-guide enters the world human-oversighted ONLY because the helper above paired the user's substance-confirm answer to the marker write. Do NOT write the marker for a persona the user has not confirmed. AFK iter subprocesses spawned via `claude -p` have no `AskUserQuestion` access; they MUST write `human-oversight: unconfirmed` (the AFK fallback enum value codified in ADR-110), which the drain (`/wr-jtbd:confirm-jobs-and-personas`) later promotes interactively. The marker is orthogonal to status.
+The `wr-jtbd-mark-oversight-confirmed` call writes the session-scoped evidence marker (`/tmp/oversight-confirmed-<sha>-<sid>`) that the `jtbd-oversight-marker-discipline.sh` PreToolUse hook reads to authorise the subsequent Edit/Write — without the helper call, the hook will DENY the marker write. This is the load-bearing born-confirmed gate: a persona authored through update-guide enters the world human-oversighted ONLY because the helper above paired the user's substance-confirm answer to the marker write. Do NOT write the marker for a persona the user has not confirmed. AFK iter subprocesses spawned via `native Codex subagent` have no `request_user_input` access; they MUST write `human-oversight: unconfirmed` (the AFK fallback enum value codified in ADR-110), which the drain (`/wr-jtbd:confirm-jobs-and-personas`) later promotes interactively. The marker is orthogonal to status.
 
 ### 5. Draft jobs
 
@@ -143,12 +151,12 @@ by user research or production use. To validate: rename the file from
 
 ### 6. Confirm jobs with the user
 
-Use AskUserQuestion to present the drafted jobs and ask:
+Use request_user_input to present the drafted jobs and ask:
 - Do these jobs cover the core value proposition?
 - Do the job statements ring true?
 - Any missing jobs or user flows?
 
-**Born-confirmed write (ADR-068 — structurally gated by ADR-110).** Once the user confirms a job via this AskUserQuestion pass, IMMEDIATELY call the marker-evidence helper THEN insert the two lines into that job's frontmatter — after the `date-created:` line:
+**Born-confirmed write (ADR-068 — structurally gated by ADR-110).** Once the user confirms a job via this request_user_input pass, IMMEDIATELY call the marker-evidence helper THEN insert the two lines into that job's frontmatter — after the `date-created:` line:
 
 ```bash
 wr-jtbd-mark-oversight-confirmed docs/jtbd/<persona-name>/JTBD-NNN-<kebab-title>.proposed.md

package/skills/update-guide/agents/openai.yaml

@@ -0,0 +1,3 @@
+interface:
+  display_name: "WR JTBD: Update Guide"
+  short_description: "Update project jobs and personas"