@windyroad/voice-tone 0.7.3 → 0.8.0-preview.1121

package/.agents/plugins/marketplace.json

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

package/.claude-plugin/plugin.json

@@ -123,5 +123,5 @@
     }
   },
   "name": "wr-voice-tone",
-  "version": "0.7.3"
+  "version": "0.8.0"
 }

package/.codex-plugin/plugin.json

@@ -0,0 +1,42 @@
+{
+  "name": "wr-voice-tone",
+  "version": "0.8.0",
+  "description": "Voice, tone, and external-communications governance",
+  "author": {
+    "name": "Windy Road Technology",
+    "url": "https://windyroad.com.au"
+  },
+  "homepage": "https://github.com/windyroad/agent-plugins/tree/main/packages/voice-tone",
+  "repository": "https://github.com/windyroad/agent-plugins",
+  "license": "MIT",
+  "keywords": [
+    "voice",
+    "tone",
+    "copy",
+    "communications",
+    "codex",
+    "claude-code"
+  ],
+  "skills": "./skills/",
+  "interface": {
+    "displayName": "Windy Road Voice and Tone",
+    "shortDescription": "Govern user-facing and outbound copy",
+    "longDescription": "Review user-facing copy against a project voice-and-tone guide and assess outbound communications before sending.",
+    "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 this copy against our voice and tone",
+      "Assess this outbound communication"
+    ],
+    "brandColor": "#B45309",
+    "screenshots": []
+  }
+}

package/bin/install.mjs

@@ -8,6 +8,10 @@ const utils = await import(resolve(__dirname, "../lib/install-utils.mjs"));
 
 const PLUGIN = "wr-voice-tone";
 const DEPS = [];
+const AGENTS = [
+  { source: "agents/agent.md", name: "wr-voice-tone:agent", filename: "wr-voice-tone-agent.toml" },
+  { source: "agents/external-comms.md", name: "wr-voice-tone:external-comms", filename: "wr-voice-tone-external-comms.toml" },
+];
 
 const flags = utils.parseStandardArgs(process.argv);
 
@@ -21,6 +25,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 +37,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,17 +1,71 @@
 {
   "hooks": {
     "UserPromptSubmit": [
-      { "hooks": [{ "type": "command", "command": "${CLAUDE_PLUGIN_ROOT}/hooks/voice-tone-eval.sh" }] },
-      { "hooks": [{ "type": "command", "command": "${CLAUDE_PLUGIN_ROOT}/hooks/staleness-check.sh" }] }
+      {
+        "hooks": [
+          {
+            "type": "command",
+            "command": "${CLAUDE_PLUGIN_ROOT}/hooks/voice-tone-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/voice-tone-enforce-edit.sh" }] },
-      { "matcher": "Bash|Edit|Write", "hooks": [{ "type": "command", "command": "${CLAUDE_PLUGIN_ROOT}/hooks/external-comms-gate.sh" }] }
+      {
+        "matcher": "Edit|Write",
+        "hooks": [
+          {
+            "type": "command",
+            "command": "bash \"${PLUGIN_ROOT}/hooks-codex/codex-adapter.sh\" \"${PLUGIN_ROOT}/hooks/voice-tone-enforce-edit.sh\""
+          }
+        ]
+      },
+      {
+        "matcher": "Bash|Edit|Write",
+        "hooks": [
+          {
+            "type": "command",
+            "command": "bash \"${PLUGIN_ROOT}/hooks-codex/codex-adapter.sh\" \"${PLUGIN_ROOT}/hooks/external-comms-gate.sh\""
+          }
+        ]
+      }
     ],
     "PostToolUse": [
-      { "matcher": "Agent", "hooks": [{ "type": "command", "command": "${CLAUDE_PLUGIN_ROOT}/hooks/voice-tone-mark-reviewed.sh" }] },
-      { "matcher": "Agent", "hooks": [{ "type": "command", "command": "${CLAUDE_PLUGIN_ROOT}/hooks/external-comms-mark-reviewed.sh" }] },
-      { "matcher": "Agent|Bash|Skill", "hooks": [{ "type": "command", "command": "${CLAUDE_PLUGIN_ROOT}/hooks/voice-tone-slide-marker.sh" }] }
+      {
+        "matcher": "Agent",
+        "hooks": [
+          {
+            "type": "command",
+            "command": "bash \"${PLUGIN_ROOT}/hooks-codex/codex-adapter.sh\" \"${PLUGIN_ROOT}/hooks/voice-tone-mark-reviewed.sh\""
+          }
+        ]
+      },
+      {
+        "matcher": "Agent",
+        "hooks": [
+          {
+            "type": "command",
+            "command": "bash \"${PLUGIN_ROOT}/hooks-codex/codex-adapter.sh\" \"${PLUGIN_ROOT}/hooks/external-comms-mark-reviewed.sh\""
+          }
+        ]
+      },
+      {
+        "matcher": "Agent|Bash|Skill",
+        "hooks": [
+          {
+            "type": "command",
+            "command": "bash \"${PLUGIN_ROOT}/hooks-codex/codex-adapter.sh\" \"${PLUGIN_ROOT}/hooks/voice-tone-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,71 @@
+{
+  "hooks": {
+    "UserPromptSubmit": [
+      {
+        "hooks": [
+          {
+            "type": "command",
+            "command": "${CLAUDE_PLUGIN_ROOT}/hooks/voice-tone-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/voice-tone-enforce-edit.sh\""
+          }
+        ]
+      },
+      {
+        "matcher": "Bash|Edit|Write",
+        "hooks": [
+          {
+            "type": "command",
+            "command": "bash \"${PLUGIN_ROOT}/hooks-codex/codex-adapter.sh\" \"${PLUGIN_ROOT}/hooks/external-comms-gate.sh\""
+          }
+        ]
+      }
+    ],
+    "PostToolUse": [
+      {
+        "matcher": "Agent",
+        "hooks": [
+          {
+            "type": "command",
+            "command": "bash \"${PLUGIN_ROOT}/hooks-codex/codex-adapter.sh\" \"${PLUGIN_ROOT}/hooks/voice-tone-mark-reviewed.sh\""
+          }
+        ]
+      },
+      {
+        "matcher": "Agent",
+        "hooks": [
+          {
+            "type": "command",
+            "command": "bash \"${PLUGIN_ROOT}/hooks-codex/codex-adapter.sh\" \"${PLUGIN_ROOT}/hooks/external-comms-mark-reviewed.sh\""
+          }
+        ]
+      },
+      {
+        "matcher": "Agent|Bash|Skill",
+        "hooks": [
+          {
+            "type": "command",
+            "command": "bash \"${PLUGIN_ROOT}/hooks-codex/codex-adapter.sh\" \"${PLUGIN_ROOT}/hooks/voice-tone-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/voice-tone",
-  "version": "0.7.3",
+  "version": "0.8.0-preview.1121",
   "description": "Voice and tone enforcement for user-facing copy",
   "bin": {
     "windyroad-voice-tone": "./bin/install.mjs"
   },
   "type": "module",
+  "scripts": {
+    "prepack": "node ../../scripts/sync-codex-plugin-surfaces.mjs voice-tone --pack",
+    "postpack": "node ../../scripts/sync-codex-plugin-surfaces.mjs voice-tone --restore-pack"
+  },
   "license": "MIT",
   "repository": {
     "type": "git",
@@ -15,6 +19,7 @@
   "keywords": [
     "claude-code",
     "claude-code-plugin",
+    "codex",
     "ai-agent",
     "ai-coding"
   ],
@@ -23,7 +28,10 @@
     "agents/",
     "hooks/",
     "skills/",
+    "hooks-codex/",
+    ".agents/",
     ".claude-plugin/",
+    ".codex-plugin/",
     "lib/",
     "!hooks/test/"
   ]

package/skills/assess-external-comms/SKILL.md

@@ -1,9 +1,17 @@
 ---
 name: wr-voice-tone:assess-external-comms
 description: On-demand external-comms voice & tone review. Reviews a draft of an outbound prose tool call (gh issue/pr body, security advisory, npm publish content, or .changeset/*.md body) against docs/VOICE-AND-TONE.md. Delegates to wr-voice-tone:external-comms and pre-satisfies the external-comms-gate marker for the current session.
-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.
+
+
 # External-Comms Voice & Tone Assessment Skill
 
 Run a voice & tone review on demand against any drafted outbound prose — outside a hook gate trigger. Pre-satisfies the `external-comms-gate.sh` marker for the current session so the gated tool call (gh issue/pr/api/npm publish/changeset write) proceeds without re-prompting.
@@ -34,11 +42,11 @@ If both draft and surface are present, proceed to step 3. If either is missing,
 
 ### 2. Resolve missing context
 
-If the draft is missing, use `AskUserQuestion`:
+If the draft is missing, use `request_user_input`:
 
 > "What draft do you want me to review? Paste the body verbatim — I will pass it to the external-comms voice-tone reviewer."
 
-If the surface is missing AND cannot be inferred from context (e.g. user just said "before I post this comment"), use `AskUserQuestion`:
+If the surface is missing AND cannot be inferred from context (e.g. user just said "before I post this comment"), use `request_user_input`:
 
 - header: "Target surface"
 - options:
@@ -74,11 +82,11 @@ The orchestrator does NOT pre-compute the key — the hook derives it from the p
 
 ### 4. Delegate to wr-voice-tone:external-comms
 
-Invoke the subagent via the Agent tool. Dispatch it **synchronously** (`run_in_background: false`) — the `PostToolUse:Agent` mark hook (`external-comms-mark-reviewed.sh`) fires reliably only for a synchronous agent; a background-launched reviewer's mark hook does not fire in time, so no marker persists and the voice-tone gate re-blocks despite a PASS verdict (P402):
+Invoke the subagent via the native Codex subagent tool. Dispatch it **synchronously** (`wait_for_completion: true`) — the `PostToolUse:Agent` mark hook (`external-comms-mark-reviewed.sh`) fires reliably only for a synchronous agent; a background-launched reviewer's mark hook does not fire in time, so no marker persists and the voice-tone gate re-blocks despite a PASS verdict (P402):
 
 ```
-subagent_type: wr-voice-tone:external-comms
-run_in_background: false
+agent_type: wr-voice-tone:external-comms
+wait_for_completion: true
 prompt: <constructed review prompt from step 3>
 ```
 
@@ -99,7 +107,7 @@ When both evaluators are required (voice-tone + risk-scorer both installed), rem
 
 ### 6. Above-appetite handling (ADR-013 Rule 6)
 
-If the verdict is FAIL, do NOT auto-rewrite the draft. Use `AskUserQuestion`:
+If the verdict is FAIL, do NOT auto-rewrite the draft. Use `request_user_input`:
 
 - header: "Voice/tone violation — next step"
 - options:

package/skills/assess-external-comms/agents/openai.yaml

@@ -0,0 +1,3 @@
+interface:
+  display_name: "WR Voice Tone: Assess External Comms"
+  short_description: "Review outbound prose before sending"

package/skills/update-guide/SKILL.md

@@ -1,9 +1,17 @@
 ---
 name: wr-voice-tone:update-guide
 description: Create or update the project's docs/VOICE-AND-TONE.md by examining existing content and asking the user about brand voice, audience, and tone preferences.
-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.
+
+
 # Voice and Tone Guide Generator
 
 Create or update `docs/VOICE-AND-TONE.md` tailored to this project's brand, audience, and content. The voice-and-tone-lead agent reads this file to review user-facing copy.
@@ -74,7 +82,7 @@ At least 5 concrete pairs drawn from the actual project's content patterns. Show
 
 ### 4. Confirm with the user
 
-You MUST use the AskUserQuestion tool to collect user confirmation. Do not proceed to step 5 until you have answers.
+You MUST use the request_user_input tool to collect user confirmation. Do not proceed to step 5 until you have answers.
 
 Present:
 1. The drafted brand voice adjectives and ask if they match the intended personality

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

@@ -0,0 +1,3 @@
+interface:
+  display_name: "WR Voice Tone: Update Guide"
+  short_description: "Update the project voice-and-tone guide"