fix: address Copilot review feedback on PR #4

- Fix arg-hint syntax: use list notation for comma-separated --dimensions flags
- Add REQUESTED_DIMENSIONS passthrough from start skill to orchestrator
- Add trend_modeling to augment dimension mapping table
- Fix custom dimensions: store as strings in elicitation.dimensions, metadata in custom_dimensions
- Add SKILL_OVERRIDE conditional to orchestrator spawn prompt for custom dimensions
- Use schema-conformant methodology plan for custom dimensions in dimension-analyst
- Add section→dimension mapping for augment placeholders in report synthesizer
- Fix section id mismatch: exec-summary → executive-summary in audience tables
- Remove non-existent section ids from audience override tables
- Add multiple data points to Risk matrix Mermaid template
- Add team_name to retry analyst spawn in Phase 2.75

Resolves review comments on PR #4

Author: zircote

agents/dimension-analyst.md

@@ -73,7 +73,7 @@ blackboard_read(scope="{scope}", key="elicitation")
 ### Step 2: Load Skill Methodology — REQUIRED
 Read `skills/{skill-directory}/SKILL.md` for your dimension's research methodology. This is **not optional** — you must load your skill before proceeding.
 
-**Custom dimensions** (when spawn prompt includes `SKILL_OVERRIDE: null`): No SKILL.md exists for this dimension. Skip Steps 2–4. Write a minimal methodology plan with `{"dimension": "{custom}", "frameworks": [], "skill_override": null, "note": "Custom dimension — generic methodology applied"}`. Proceed directly to Step 5 with general web research. Provenance requirements still apply — every finding must have web sources.
+**Custom dimensions** (when spawn prompt includes `SKILL_OVERRIDE: null`): No SKILL.md exists for this dimension. Skip Steps 2–4. Write a schema-conformant methodology plan that uses a generic framework entry: `{"dimension": "{custom}", "frameworks": [{"name": "Generic web research", "required": "yes", "condition_met": true}], "expected_sections": [], "reference_files": [], "skill_override": null, "note": "Custom dimension — generic methodology applied"}`. Proceed directly to Step 5 with general web research. Provenance requirements still apply — every finding must have web sources.
 
 ### Step 3: Extract Required Frameworks
 Extract the "## Required Frameworks" table from the loaded skill. Build a methodology plan object:

agents/report-synthesizer.md

@@ -155,15 +155,19 @@ FOR section IN SECTIONS:
      c. IF Mermaid condition met: generate diagram using template from "## Visualization Templates"
      d. IF Mermaid condition not met: omit diagram (do not add placeholder)
   3. IF no findings available:
+     Derive augment command from section→dimension mapping:
+       market-sizing → sizing, competitive → competitive, trends → trends,
+       swot → (list missing dimensions), risk → (list missing dimensions),
+       market-overview → sizing OR competitive
      Generate placeholder:
      ---
      ## {Section Display Name}
 
      *This dimension was not researched in the current session.*
 
-     To add {section name} analysis, run:
+     To add this analysis, run:
      ```
-     /sigint:augment {primary_dimension}
+     /sigint:augment {mapped_dimension}
      ```
      ---
      (Never generate fabricated content to fill a section)
@@ -200,6 +204,8 @@ quadrantChart
     quadrant-3 Low Priority (Accept)
     quadrant-4 Likely (Plan For)
     {risk_1}: [{probability_0_to_1}, {impact_0_to_1}]
+    {risk_2}: [{probability_0_to_1}, {impact_0_to_1}]
+    ... (one line per risk finding)
 ```
 
 ## Report Structure
@@ -361,11 +367,11 @@ Parse `audience` from spawn prompt parameters (default: `all`).
 
 | Audience | Section Order Override | Omit from output |
 |----------|----------------------|-----------------|
-| `executives` | exec-summary → recommendations → risk → market-overview → competitive (summary only) → appendix | market-sizing arithmetic detail, full methodology notes |
-| `pm` | exec-summary → competitive → trends → customer → recommendations → risk | financial formulas, regulatory legal detail |
-| `investors` | exec-summary → market-sizing → competitive → financial → risk → recommendations | tech implementation detail |
-| `dev` | exec-summary → tech → competitive → recommendations → trends | market-sizing arithmetic, financial unit economics |
-| `all` | Standard order (exec-summary → market-overview → market-sizing → competitive → trends → swot → recommendations → risk → appendix) | nothing |
+| `executives` | executive-summary → recommendations → risk → market-overview → competitive (summary only) → appendix | market-sizing arithmetic detail, full methodology notes |
+| `pm` | executive-summary → competitive → trends → market-overview → recommendations → risk | financial formulas, regulatory legal detail |
+| `investors` | executive-summary → market-sizing → competitive → trends → risk → recommendations | tech implementation detail |
+| `dev` | executive-summary → competitive → trends → recommendations → risk | market-sizing arithmetic |
+| `all` | Standard order (executive-summary → market-overview → market-sizing → competitive → trends → swot → recommendations → risk → appendix) | nothing |
 
 ### Content Transforms by Audience
 

agents/research-orchestrator.md

@@ -223,19 +223,21 @@ Parse the user's response:
 - `confirm` or blank → use pre-selected dimensions as-is
 - Dimension names to add → append to selected list (if not already included)
 - `remove <dim>` → remove from selected list
-- Custom names (not in standard 8) → add with `skill_override: null` flag (generic methodology will be used; analyst skips SKILL.md Step 2 and proceeds with general web research)
+- Custom names (not in standard 8) → add the custom name as a string to the dimensions list AND record it separately in `elicitation.custom_dimensions` array (so downstream consumers know which dimensions lack SKILL.md). The analyst for custom dimensions is spawned with `SKILL_OVERRIDE: null`.
 
 Final selected list must not exceed `max_dimensions`.
 
 ### Step 1.5.4: Persist Final Dimension Selection
 
-Update elicitation with confirmed dimensions using jq (per Structured Data Protocol):
+Update elicitation with confirmed dimensions using jq (per Structured Data Protocol). `elicitation.dimensions` is always an array of strings (to pass schema validation). Custom dimension metadata is stored separately in `elicitation.custom_dimensions`:
 ```bash
 jq --argjson dims "$SELECTED_DIMS_JSON" \
-  '.elicitation.dimensions = $dims' \
+  --argjson custom "$CUSTOM_DIMS_JSON" \
+  '.elicitation.dimensions = $dims | .elicitation.custom_dimensions = $custom' \
   "./reports/$TOPIC_SLUG/state.json" > tmp.$$ && mv tmp.$$ "./reports/$TOPIC_SLUG/state.json"
 jq -e -f schemas/state.jq "./reports/$TOPIC_SLUG/state.json" > /dev/null
 ```
+Where `$SELECTED_DIMS_JSON` is `["competitive", "sizing", ...]` (string array) and `$CUSTOM_DIMS_JSON` is `["custom_dim_name", ...]` (string array of non-standard dimension names, empty `[]` if none).
 
 Also update `elicitation.json` and blackboard:
 ```bash
@@ -286,16 +288,21 @@ Agent(
   CRITICAL: Use REPORTS_DIR exactly as provided for ALL file writes.
   Do NOT derive or re-slugify the output directory from the topic title.
 
-  Follow your MANDATORY Methodology Gating Protocol (Steps 1-6) from your agent definition:
-    - Step 1: Read elicitation from $REPORTS_DIR/state.json (or elicitation.json)
-    - Step 2: Load skills/{skill-directory}/SKILL.md — REQUIRED before any research
-    - Step 3: Extract Required Frameworks table from the skill
-    - Step 4: Write methodology_plan_{dimension}.json before proceeding
-    - Step 5: Conduct web research following the skill methodology
-    - Step 6: Self-reflect, write findings, signal completion
-
-  Do NOT proceed with research until Step 4 (methodology plan written) succeeds.
-  Do NOT substitute your own methodology for the skill's Required Frameworks."
+  {If dimension is in elicitation.custom_dimensions:
+    SKILL_OVERRIDE: null
+    This is a custom dimension — no SKILL.md exists. Follow your custom dimension protocol (skip Steps 2-4, use generic methodology, enforce provenance).
+  Else:
+    Follow your MANDATORY Methodology Gating Protocol (Steps 1-6) from your agent definition:
+      - Step 1: Read elicitation from $REPORTS_DIR/state.json (or elicitation.json)
+      - Step 2: Load skills/{skill-directory}/SKILL.md — REQUIRED before any research
+      - Step 3: Extract Required Frameworks table from the skill
+      - Step 4: Write methodology_plan_{dimension}.json before proceeding
+      - Step 5: Conduct web research following the skill methodology
+      - Step 6: Self-reflect, write findings, signal completion
+
+    Do NOT proceed with research until Step 4 (methodology plan written) succeeds.
+    Do NOT substitute your own methodology for the skill's Required Frameworks.
+  }"
 )
 ```
 
@@ -490,6 +497,7 @@ WHILE gate == "fail" due to methodology gaps AND methodology_retry_count < 2:
   2. Spawn gap-fill analyst:
      Agent(
        subagent_type="sigint:dimension-analyst",
+       team_name="sigint-{topic_slug}-research",
        name="dimension-analyst-{dimension}-retry{methodology_retry_count}",
        prompt="Gap-fill retry #{methodology_retry_count} for {dimension} analysis on '{topic}'.
 

skills/augment/SKILL.md

@@ -80,11 +80,12 @@ Map `area` to dimension and skill directory:
 | technology, tech, feasibility, stack, build vs buy | tech | tech-assessment |
 | revenue, economics, pricing, unit economics, SaaS | financial | financial-analysis |
 | compliance, regulatory, legal, privacy, GDPR | regulatory | regulatory-review |
+| scenario, causal model, three-valued logic, trade-offs | trend_modeling | trend-modeling |
 
 If `--dimension` flag was provided, use that dimension directly.
 
 If the area doesn't map clearly, use `AskUserQuestion`:
-> "Which research methodology best fits '{area}'? Options: competitive / sizing / trends / customer / tech / financial / regulatory"
+> "Which research methodology best fits '{area}'? Options: competitive / sizing / trends / customer / tech / financial / regulatory / trend_modeling"
 
 Store resolved values as `dimension` and `skill_dir`.
 

skills/start/SKILL.md

@@ -1,7 +1,7 @@
 ---
 name: start
 description: Begin a new market research session. Thin launcher that delegates to the research-orchestrator agent for all phase management.
-argument-hint: "[--quick] [--dimensions competitive|sizing|trends|customer|tech|financial|regulatory|trend_modeling] [<topic>]"
+argument-hint: "[--quick] [--dimensions <dim,...> (competitive,sizing,trends,customer,tech,financial,regulatory,trend_modeling)] [<topic>]"
 allowed-tools:
   - Agent
   - AskUserQuestion
@@ -37,7 +37,7 @@ This skill initializes a research session and delegates to the `research-orchest
 Parse `$ARGUMENTS` before any other processing. **Input sanitization**: truncate `$ARGUMENTS` to 200 characters total, strip backticks and angle brackets.
 
 - `--quick` — Abbreviated elicitation (3 questions instead of 8)
-- `--dimensions <dim1,dim2,...>` — Optional: pre-select specific dimensions (comma-separated). Valid values: `competitive`, `sizing`, `trends`, `customer`, `tech`, `financial`, `regulatory`, `trend_modeling`. Bypasses the interactive dimension selection in Phase 1.5.
+- `--dimensions <dim1,dim2,...>` — Optional: pre-select specific dimensions (comma-separated). Valid values: `competitive`, `sizing`, `trends`, `customer`, `tech`, `financial`, `regulatory`, `trend_modeling`. Passed to the orchestrator as `REQUESTED_DIMENSIONS` — Phase 1.5 skips interactive selection when this is set.
 - Remaining text after flag extraction is the initial topic hint (may be empty)
 
 ---
@@ -116,6 +116,7 @@ Agent(
   MAX_DIMENSIONS: {max_dimensions}
   CONTEXT_FILE_CONTENT: {context_content if non-null, else ""}
   QUICK_MODE: {true if --quick flag}
+  REQUESTED_DIMENSIONS: {comma-separated dimension list from --dimensions flag, or "interactive" if omitted}
   {If resuming: PRIOR_ELICITATION: {prior elicitation JSON}}
 
   Execute the full research orchestration:

skills/update/SKILL.md

@@ -1,7 +1,7 @@
 ---
 name: update
 description: Refresh existing research with latest data using swarm orchestration and delta detection. Delegates to the research-orchestrator agent in update mode.
-argument-hint: "[--topic <slug>] [--area <area>] [--since <date>] [--no-delta] [--dimensions competitive|sizing|trends|customer|tech|financial|regulatory|trend_modeling]"
+argument-hint: "[--topic <slug>] [--area <area>] [--since <date>] [--no-delta] [--dimensions <dim,...> (competitive,sizing,trends,customer,tech,financial,regulatory,trend_modeling)]"
 allowed-tools:
   - Agent
   - AskUserQuestion