diff --git a/plugins/ship-check/agents/bug-checker.md b/plugins/ship-check/agents/bug-checker.md
index a7712c5..25e89a1 100644
--- a/plugins/ship-check/agents/bug-checker.md
+++ b/plugins/ship-check/agents/bug-checker.md
@@ -136,8 +136,14 @@ skipping decision points.
 
 Every PR comment or review you post — inline comments, review bodies, PR-level
 comments — MUST include the footer: `\n\n---\n*🔍 ship-check · bug-check · <model-id>*`
-where `<model-id>` is your own model ID from your system prompt. No exceptions — a
-comment without a footer misattributes automated output to the repo owner.
+where `<model-id>` is your verified exact runtime model ID, including version and
+variant suffixes (for example, `gpt-5.6-sol`). Never abbreviate, translate, or guess
+it. In Codex, when visible system prose is generic, use a runtime-provided current
+thread or session ID to match `session_meta.payload.id` exactly, then read
+`session_meta.payload.base_instructions.provenance.model`. Never select a rollout by
+recency, cwd, or display name. If the current ID or exact model ID cannot be verified,
+stop before posting. No exceptions — a comment without a footer misattributes
+automated output to the repo owner.
 
 ### Comment mode
 
diff --git a/plugins/ship-check/agents/code-quality-reviewer.md b/plugins/ship-check/agents/code-quality-reviewer.md
index 7b1fdcd..192f6bb 100644
--- a/plugins/ship-check/agents/code-quality-reviewer.md
+++ b/plugins/ship-check/agents/code-quality-reviewer.md
@@ -116,8 +116,14 @@ You loaded `sequentialthinking` in orientation. Call it at these decision points
 
 Every PR comment or review you post — inline comments, review bodies, PR-level
 comments — MUST include the footer: `\n\n---\n*🔍 ship-check · code-quality · <model-id>*`
-where `<model-id>` is your own model ID from your system prompt. No exceptions — a
-comment without a footer misattributes automated output to the repo owner.
+where `<model-id>` is your verified exact runtime model ID, including version and
+variant suffixes (for example, `gpt-5.6-sol`). Never abbreviate, translate, or guess
+it. In Codex, when visible system prose is generic, use a runtime-provided current
+thread or session ID to match `session_meta.payload.id` exactly, then read
+`session_meta.payload.base_instructions.provenance.model`. Never select a rollout by
+recency, cwd, or display name. If the current ID or exact model ID cannot be verified,
+stop before posting. No exceptions — a comment without a footer misattributes
+automated output to the repo owner.
 
 ### Comment mode
 
diff --git a/plugins/ship-check/agents/pr-reviewer.md b/plugins/ship-check/agents/pr-reviewer.md
index 85b8d3d..34b42f7 100644
--- a/plugins/ship-check/agents/pr-reviewer.md
+++ b/plugins/ship-check/agents/pr-reviewer.md
@@ -126,8 +126,14 @@ you're shortcutting the review.
 
 Every PR comment or review you post — inline comments, review bodies, PR-level
 comments — MUST include the footer: `\n\n---\n*🔍 ship-check · pr-review · <model-id>*`
-where `<model-id>` is your own model ID from your system prompt. No exceptions — a
-comment without a footer misattributes automated output to the repo owner.
+where `<model-id>` is your verified exact runtime model ID, including version and
+variant suffixes (for example, `gpt-5.6-sol`). Never abbreviate, translate, or guess
+it. In Codex, when visible system prose is generic, use a runtime-provided current
+thread or session ID to match `session_meta.payload.id` exactly, then read
+`session_meta.payload.base_instructions.provenance.model`. Never select a rollout by
+recency, cwd, or display name. If the current ID or exact model ID cannot be verified,
+stop before posting. No exceptions — a comment without a footer misattributes
+automated output to the repo owner.
 
 ### Comment mode
 
diff --git a/plugins/ship-check/agents/test-auditor.md b/plugins/ship-check/agents/test-auditor.md
index 67d623d..67eff20 100644
--- a/plugins/ship-check/agents/test-auditor.md
+++ b/plugins/ship-check/agents/test-auditor.md
@@ -98,8 +98,14 @@ You loaded `sequentialthinking` in orientation. Call it at these decision points
 
 Every PR comment or review you post — inline comments, review bodies, PR-level
 comments — MUST include the footer: `\n\n---\n*🔍 ship-check · test-audit · <model-id>*`
-where `<model-id>` is your own model ID from your system prompt. No exceptions — a
-comment without a footer misattributes automated output to the repo owner.
+where `<model-id>` is your verified exact runtime model ID, including version and
+variant suffixes (for example, `gpt-5.6-sol`). Never abbreviate, translate, or guess
+it. In Codex, when visible system prose is generic, use a runtime-provided current
+thread or session ID to match `session_meta.payload.id` exactly, then read
+`session_meta.payload.base_instructions.provenance.model`. Never select a rollout by
+recency, cwd, or display name. If the current ID or exact model ID cannot be verified,
+stop before posting. No exceptions — a comment without a footer misattributes
+automated output to the repo owner.
 
 ### Comment mode
 
diff --git a/plugins/ship-check/skills/bug-check/SKILL.md b/plugins/ship-check/skills/bug-check/SKILL.md
index bdee736..b49fe7d 100644
--- a/plugins/ship-check/skills/bug-check/SKILL.md
+++ b/plugins/ship-check/skills/bug-check/SKILL.md
@@ -538,7 +538,13 @@ REVIEW
 ```
 
 Replace `OWNER_REPO` and `PR_NUMBER` with values from the dispatch prompt. Replace
-`MODEL_ID` with your own model ID (from your system prompt).
+`MODEL_ID` with your verified exact runtime model ID, including version and variant
+suffixes (for example, `gpt-5.6-sol`). Never abbreviate, translate, or guess it. In
+Codex, when visible system prose is generic, use a runtime-provided current thread or
+session ID to match `session_meta.payload.id` exactly, then read
+`session_meta.payload.base_instructions.provenance.model`. Never select a rollout by
+recency, cwd, or display name. If the current ID or exact model ID cannot be verified,
+stop before posting.
 
 5. **If 0 findings and no dismissals**, skip the API call — report "0 findings"
    to the orchestrator only. With 0 findings but cleared suspicions, post a
diff --git a/plugins/ship-check/skills/code-quality/SKILL.md b/plugins/ship-check/skills/code-quality/SKILL.md
index 3313d17..72f62ef 100644
--- a/plugins/ship-check/skills/code-quality/SKILL.md
+++ b/plugins/ship-check/skills/code-quality/SKILL.md
@@ -490,7 +490,13 @@ REVIEW
 ```
 
 Replace `OWNER_REPO` and `PR_NUMBER` with values from the dispatch prompt. Replace
-`MODEL_ID` with your own model ID (from your system prompt).
+`MODEL_ID` with your verified exact runtime model ID, including version and variant
+suffixes (for example, `gpt-5.6-sol`). Never abbreviate, translate, or guess it. In
+Codex, when visible system prose is generic, use a runtime-provided current thread or
+session ID to match `session_meta.payload.id` exactly, then read
+`session_meta.payload.base_instructions.provenance.model`. Never select a rollout by
+recency, cwd, or display name. If the current ID or exact model ID cannot be verified,
+stop before posting.
 
 4. **If 0 findings and no dismissals**, skip the API call — report "0 findings"
    to the orchestrator only. With 0 findings but cleared suspicions, post a
diff --git a/plugins/ship-check/skills/pr-monitor/SKILL.md b/plugins/ship-check/skills/pr-monitor/SKILL.md
index e49517f..9459ccc 100644
--- a/plugins/ship-check/skills/pr-monitor/SKILL.md
+++ b/plugins/ship-check/skills/pr-monitor/SKILL.md
@@ -235,8 +235,17 @@ For each unresolved bot thread, do ALL of these in order:
 4. **Reply to the comment** -- do this BEFORE resolving, for EVERY bot comment.
 
    Since `gh` posts as the user's account, every reply MUST include an attribution
-   footer. Read your model ID from your system context ("You are powered by the model
-   named..."). The footer format is: `\n\n---\n*🔍 ship-check · pr-monitor · <model-id>*`
+   footer. Use the exact runtime model ID, including its version and variant suffixes
+   (for example, `gpt-5.6-sol`). Never shorten it to a family label such as `gpt-5`,
+   translate it to a display name, or guess. Read it from runtime system context. In
+   Codex, when the visible system prose is generic, first obtain the current thread or
+   session ID from runtime-provided task metadata, then match it exactly to
+   `session_meta.payload.id` in the rollout metadata and read
+   `session_meta.payload.base_instructions.provenance.model`. Never select a rollout
+   by recency, cwd, or display name. If the runtime does not expose the current ID or
+   no exact model ID can be verified, stop before posting and report the attribution
+   blocker. The footer format is:
+   `\n\n---\n*🔍 ship-check · pr-monitor · <model-id>*`
 
    ```
    gh api graphql -f query='mutation {
diff --git a/plugins/ship-check/skills/pr-review/SKILL.md b/plugins/ship-check/skills/pr-review/SKILL.md
index 4ecc161..ddd9404 100644
--- a/plugins/ship-check/skills/pr-review/SKILL.md
+++ b/plugins/ship-check/skills/pr-review/SKILL.md
@@ -270,7 +270,13 @@ REVIEW
 ```
 
 Replace `OWNER_REPO` and `PR_NUMBER` with values from the dispatch prompt. Replace
-`MODEL_ID` with your own model ID (from your system prompt).
+`MODEL_ID` with your verified exact runtime model ID, including version and variant
+suffixes (for example, `gpt-5.6-sol`). Never abbreviate, translate, or guess it. In
+Codex, when visible system prose is generic, use a runtime-provided current thread or
+session ID to match `session_meta.payload.id` exactly, then read
+`session_meta.payload.base_instructions.provenance.model`. Never select a rollout by
+recency, cwd, or display name. If the current ID or exact model ID cannot be verified,
+stop before posting.
 
 5. **If 0 findings and no dismissals**, skip the API call — report "0 findings"
    to the orchestrator only. With 0 findings but cleared suspicions, post a
diff --git a/plugins/ship-check/skills/ship-check/SKILL.md b/plugins/ship-check/skills/ship-check/SKILL.md
index 6c5c525..4777707 100644
--- a/plugins/ship-check/skills/ship-check/SKILL.md
+++ b/plugins/ship-check/skills/ship-check/SKILL.md
@@ -45,12 +45,20 @@ orchestrator triage, pr-monitor replies).
 
 - `<component>` is the phase or role: `pr-review`, `code-quality`, `test-audit`,
   `bug-check`, `pr-monitor`, or `triage` (for orchestrator inter-phase triage posts).
-- `<model-id>` is the poster's own model ID, read from the system prompt ("You are
-  powered by the model named..."). Agents self-identify — the orchestrator does not
-  look up or pass model IDs for them.
+- `<model-id>` is the poster's exact runtime model ID, including version and variant
+  suffixes (for example, `gpt-5.6-sol`). Never shorten it to a family label such as
+  `gpt-5`, translate it to a display name, or guess. Read it from runtime system
+  context. In Codex, when visible system prose is generic, first obtain the current
+  thread or session ID from runtime-provided task metadata, match it exactly to
+  `session_meta.payload.id` in the rollout metadata, then read
+  `session_meta.payload.base_instructions.provenance.model`. Never select a rollout by
+  recency, cwd, or display name. If the runtime does not expose the current ID or no
+  exact model ID can be verified, stop before posting and report the attribution
+  blocker. Agents self-identify — the orchestrator does not look up or pass model IDs
+  for them.
 - **The orchestrator's own PR-level comments** (non-inline findings, deferred items
-  posted via `gh pr comment`) use the orchestrator's own model ID with component
-  `triage` or `ship-check`.
+  posted via `gh pr comment`) use the orchestrator's own verified exact runtime model
+  ID with component `triage` or `ship-check`.
 
 A comment posted without a footer is indistinguishable from the repo owner's manual
 comments and misattributes automated output to a human. Every `gh api` and
@@ -70,7 +78,8 @@ commit):
 When committing, add this trailer to every commit message (after the body, before
 any trailers the harness adds):
 Ship-Check: PHASE_NAME · YOUR_MODEL_ID
-Read YOUR_MODEL_ID from your system prompt ("You are powered by the model named...").
+Use your verified exact runtime model ID for YOUR_MODEL_ID. Preserve version and
+variant suffixes; never abbreviate, translate, or guess it.
 ```
 
 The harness appends its own `Co-Authored-By` trailer automatically; the `Ship-Check`
@@ -122,7 +131,8 @@ mode" section in your preloaded skill for the gh api template. Only post a revie
 you have findings — skip the API call for 0 findings.
 Repo: OWNER_REPO
 Append a footer to the review body AND every inline comment body using your own
-model ID (from your system prompt):
+exact runtime model ID, including version and variant suffixes. Never abbreviate,
+translate, or guess it:
 \n\n---\n*🔍 ship-check · PHASE_NAME · YOUR_MODEL_ID*
 ```
 
@@ -170,7 +180,7 @@ gh repo view --json nameWithOwner -q .nameWithOwner
 ```
 
 Pass it as `Repo: owner/repo` in the dispatch prompt. In comment mode, agents
-include their own model ID in the footer (they know it from their system prompt) —
+include their own verified exact runtime model ID in the footer —
 the orchestrator does not need to look it up or pass it.
 
 ## Local review mode (`--local`)
@@ -358,7 +368,8 @@ Append it to every phase that commits (phases 1, 3-5):
 ```
 When committing, add this trailer to every commit message:
 Ship-Check: PHASE_NAME · YOUR_MODEL_ID
-Read YOUR_MODEL_ID from your system prompt ("You are powered by the model named...").
+Use your verified exact runtime model ID for YOUR_MODEL_ID. Preserve version and
+variant suffixes; never abbreviate, translate, or guess it.
 ```
 
 ### Phase 1: PR Review
diff --git a/plugins/ship-check/skills/test-audit/SKILL.md b/plugins/ship-check/skills/test-audit/SKILL.md
index fd744f2..253f2be 100644
--- a/plugins/ship-check/skills/test-audit/SKILL.md
+++ b/plugins/ship-check/skills/test-audit/SKILL.md
@@ -386,7 +386,13 @@ REVIEW
 ```
 
 Replace `OWNER_REPO` and `PR_NUMBER` with values from the dispatch prompt. Replace
-`MODEL_ID` with your own model ID (from your system prompt).
+`MODEL_ID` with your verified exact runtime model ID, including version and variant
+suffixes (for example, `gpt-5.6-sol`). Never abbreviate, translate, or guess it. In
+Codex, when visible system prose is generic, use a runtime-provided current thread or
+session ID to match `session_meta.payload.id` exactly, then read
+`session_meta.payload.base_instructions.provenance.model`. Never select a rollout by
+recency, cwd, or display name. If the current ID or exact model ID cannot be verified,
+stop before posting.
 
 4. **If 0 findings and no dismissals**, skip the API call — report "0 findings"
    to the orchestrator only. With 0 findings but cleared suspicions, post a