Merge pull request #80 from nj-io/develop

Release: content vehicles, advisory flow, diagnostics

Author: nj-io

.claude/loops/docs-maintenance.yml

@@ -8,6 +8,7 @@ setup:
 checks:
   - "python scripts/generate_cli_docs.py && git diff --exit-code site-docs/cli/"
   - "ruff check src/ tests/"
+  - "ruff format --check src/ tests/"
   - "mypy src/social_hook/"
 
 autonomous:

docs/workbench-architecture.html

@@ -387,7 +387,7 @@ <h2>4. Captured Output Structure</h2>
 │   │   └── stage3: <span class="accent3">(grouped by draft group, not flat list)</span>
 │   │       └── draft_groups
 │   │           └── [strategy]: { targets[], drafter_output: <span class="existing">CreateDraftInput</span>
-│   │                              { content, reasoning, format_hint, beat_count,
+│   │                              { content, reasoning, vehicle, beat_count,
 │   │                                media_type, media_spec, variants[] },
 │   │                              resulting_drafts: [{ target, draft_id, status }] }
 │   │

mkdocs.yml

@@ -68,6 +68,7 @@ nav:
     - Overview: cli/index.md
     - Commands: cli/root-commands.md
     - account: cli/account.md
+    - advisory: cli/advisory.md
     - arc: cli/arc.md
     - bot: cli/bot.md
     - brief: cli/brief.md

scripts/e2e/harness.py

@@ -418,6 +418,7 @@ def seed_draft(self, project_id, status="draft", **kwargs):
             project_id=project_id,
             decision_id=decision.id,
             platform=kwargs.pop("platform", "x"),
+            vehicle=kwargs.pop("vehicle", "single"),
             content=kwargs.pop("content", "E2E test draft content for social media."),
             status=status,
             media_paths=kwargs.pop("media_paths", []),
@@ -467,7 +468,7 @@ def clean_scenario_state(self):
             "SELECT id FROM drafts WHERE project_id = ?", (self.project_id,)
         ).fetchall():
             self.conn.execute("DELETE FROM draft_changes WHERE draft_id = ?", (draft_row[0],))
-            self.conn.execute("DELETE FROM draft_tweets WHERE draft_id = ?", (draft_row[0],))
+            self.conn.execute("DELETE FROM draft_parts WHERE draft_id = ?", (draft_row[0],))
         self.conn.execute("DELETE FROM posts WHERE project_id = ?", (self.project_id,))
         self.conn.execute("DELETE FROM drafts WHERE project_id = ?", (self.project_id,))
         self.conn.execute("DELETE FROM decisions WHERE project_id = ?", (self.project_id,))

scripts/e2e/sections/__init__.py

@@ -22,6 +22,7 @@
     "S": "base-project",
     "T": "base-project",
     "U": "base-project",
+    "V": "base-project",
 }
 
 SECTION_REGISTRY = {
@@ -53,4 +54,9 @@
         "needs_adapter": False,
         "needs_live": True,
     },
+    "V": {
+        "name": "Content Vehicles & Advisory",
+        "module": "vehicles",
+        "needs_adapter": True,
+    },
 }

scripts/e2e/sections/crosspost.py

@@ -184,8 +184,8 @@ def s2():
                     draft = drafts[0]
                     if draft.reference_post_id:
                         detail += f", draft ref_id={draft.reference_post_id}"
-                    if draft.post_format:
-                        detail += f", post_format={draft.post_format}"
+                    if draft.reference_type:
+                        detail += f", reference_type={draft.reference_type}"
 
             evaluation = {
                 "angle": d.angle,
@@ -312,7 +312,7 @@ def s4():
             external_url="https://x.com/user/status/s4_external_123",
         )
 
-        # Create a Decision + Draft with post_format="quote" and reference_post_id
+        # Create a Decision + Draft with reference_type="quote" and reference_post_id
         decision = Decision(
             id=generate_id("decision"),
             project_id=harness.project_id,
@@ -331,7 +331,7 @@ def s4():
             platform="x",
             content="This post references a previous one. #test",
             status="scheduled",
-            post_format="quote",
+            reference_type="quote",
             reference_post_id=seeded_post.id,
         )
         insert_draft(harness.conn, draft)
@@ -423,7 +423,7 @@ def s5():
         )
         insert_post(harness.conn, first_post)
 
-        # Create second Decision + Draft for "current" commit in same arc (no post_format set)
+        # Create second Decision + Draft for "current" commit in same arc (no reference_type set)
         second_decision = Decision(
             id=generate_id("decision"),
             project_id=harness.project_id,
@@ -443,7 +443,7 @@ def s5():
             platform="x",
             content="Second post continuing the arc.",
             status="scheduled",
-            # Intentionally no post_format or reference_post_id
+            # Intentionally no reference_type or reference_post_id
         )
         insert_draft(harness.conn, second_draft)
         harness.conn.commit()
@@ -463,29 +463,30 @@ def s5():
         ):
             result = _post_draft(harness.conn, second_draft, config)
 
-        # _post_draft should have detected arc continuation and set post_format + reference_post_id
+        # _post_draft should have detected arc continuation and set reference_type + reference_post_id
         updated = ops.get_draft(harness.conn, second_draft.id)
-        assert updated.post_format == "quote", (
-            f"Expected post_format='quote', got '{updated.post_format}'"
+        assert updated.reference_type == "quote", (
+            f"Expected reference_type='quote', got '{updated.reference_type}'"
         )
         assert updated.reference_post_id == first_post.id, (
             f"Expected reference_post_id='{first_post.id}', got '{updated.reference_post_id}'"
         )
         assert result.success, f"Post failed: {result.error}"
 
         return (
-            f"Arc continuation: post_format={updated.post_format}, "
+            f"Arc continuation: reference_type={updated.reference_type}, "
             f"reference_post_id={updated.reference_post_id}"
         )
 
     runner.run_scenario("S5", "Arc continuation regression", s5)
 
     # S6: Deterministic drafting pipeline
     def s6():
-        from types import SimpleNamespace
 
+        from social_hook.config.platforms import resolve_platform
         from social_hook.config.project import load_project_config
-        from social_hook.drafting import draft_for_platforms
+        from social_hook.drafting import DraftingIntent, PlatformSpec
+        from social_hook.drafting import draft as run_draft
         from social_hook.filesystem import generate_id
         from social_hook.llm.dry_run import DryRunContext
         from social_hook.llm.prompts import assemble_evaluator_context
@@ -517,21 +518,6 @@ def s6():
         insert_decision(harness.conn, decision)
         harness.conn.commit()
 
-        # Build evaluation with reference_posts pointing to seeded post
-        evaluation = SimpleNamespace(
-            decision="draft",
-            reasoning="S6 test",
-            angle="Feature showcase",
-            episode_type="milestone",
-            post_category="arc",
-            arc_id=None,
-            new_arc_theme=None,
-            media_tool=None,
-            reference_posts=[seeded_post.id],
-            commit_summary="WS3 adapters implementation",
-            include_project_docs=False,
-        )
-
         config = harness.load_config()
         project_config = load_project_config(str(harness.repo_path))
         commit = parse_commit_info(COMMITS["major_feature"], str(harness.repo_path))
@@ -547,33 +533,50 @@ def s6():
 
         project = ops.get_project(harness.conn, harness.project_id)
 
-        draft_results = draft_for_platforms(
+        # Build DraftingIntent with reference_posts
+        platform_specs = []
+        for pname, pcfg in config.platforms.items():
+            if pcfg.enabled:
+                rpcfg = resolve_platform(pname, pcfg, config.scheduling)
+                platform_specs.append(PlatformSpec(platform=pname, resolved=rpcfg))
+
+        intent = DraftingIntent(
+            decision="draft",
+            reasoning="S6 test",
+            angle="Feature showcase",
+            post_category="arc",
+            reference_posts=[seeded_post.id],
+            commit_summary="WS3 adapters implementation",
+            decision_id=decision.id,
+            platforms=platform_specs,
+        )
+
+        draft_results = run_draft(
+            intent,
             config,
             harness.conn,
             db,
             project,
-            decision_id=decision.id,
-            evaluation=evaluation,
-            context=context,
-            commit=commit,
+            context,
+            commit,
             project_config=project_config,
             verbose=runner.verbose,
         )
 
-        assert len(draft_results) > 0, "No drafts created by draft_for_platforms"
+        assert len(draft_results) > 0, "No drafts created by draft()"
 
-        draft = draft_results[0].draft
-        assert draft.reference_post_id == seeded_post.id, (
-            f"Expected reference_post_id={seeded_post.id}, got {draft.reference_post_id}"
+        draft_obj = draft_results[0].draft
+        assert draft_obj.reference_post_id == seeded_post.id, (
+            f"Expected reference_post_id={seeded_post.id}, got {draft_obj.reference_post_id}"
         )
-        assert draft.post_format == "quote", (
-            f"Expected post_format='quote', got '{draft.post_format}'"
+        assert draft_obj.reference_type == "quote", (
+            f"Expected reference_type='quote', got '{draft_obj.reference_type}'"
         )
 
         detail = (
-            f"Draft ref_id={draft.reference_post_id}, "
-            f"post_format={draft.post_format}, "
-            f"content_len={len(draft.content)}"
+            f"Draft ref_id={draft_obj.reference_post_id}, "
+            f"reference_type={draft_obj.reference_type}, "
+            f"content_len={len(draft_obj.content)}"
         )
 
         runner.add_review_item(
@@ -582,15 +585,15 @@ def s6():
             decision="draft",
             episode_type="milestone",
             reasoning="S6 test — seeded evaluation with reference_posts",
-            draft_content=draft.content,
+            draft_content=draft_obj.content,
             evaluation={
                 "reference_posts": [seeded_post.id],
-                "post_format": draft.post_format,
-                "reference_post_id": draft.reference_post_id,
+                "reference_type": draft_obj.reference_type,
+                "reference_post_id": draft_obj.reference_post_id,
             },
             review_question=(
                 "Does the draft reference the seeded post? "
-                "Is reference_post_id and post_format='quote' set correctly?"
+                "Is reference_post_id and reference_type='quote' set correctly?"
             ),
         )
         return detail

scripts/e2e/sections/pipeline.py

@@ -225,7 +225,7 @@ def b7():
 
     # B6: Free tier + long content → thread (structural check)
     def b6():
-        from social_hook.db.operations import get_draft_tweets
+        from social_hook.db.operations import get_draft_parts
 
         exit_code = run_trigger(
             COMMITS["large_feature"], str(harness.repo_path), verbose=runner.verbose
@@ -234,7 +234,7 @@ def b6():
 
         drafts = get_pending_drafts(harness.conn, harness.project_id)
         for draft in drafts:
-            tweets = get_draft_tweets(harness.conn, draft.id)
+            tweets = get_draft_parts(harness.conn, draft.id)
             if tweets:
                 return f"Thread found: {len(tweets)} tweets"
 
@@ -766,11 +766,12 @@ def b17():
     # B18: Drafter + real nano_banana_pro (seeded decision, real LLM + real Gemini)
     def b18():
         from pathlib import Path as _Path
-        from types import SimpleNamespace
 
+        from social_hook.config.platforms import resolve_platform
         from social_hook.config.project import load_project_config
         from social_hook.db import operations as ops
-        from social_hook.drafting import draft_for_platforms
+        from social_hook.drafting import DraftingIntent, PlatformSpec
+        from social_hook.drafting import draft as run_draft
         from social_hook.filesystem import generate_id
         from social_hook.llm.dry_run import DryRunContext
         from social_hook.llm.prompts import assemble_evaluator_context
@@ -828,37 +829,39 @@ def b18():
             parent_timestamp=commit.parent_timestamp,
         )
 
-        # Build evaluation compat (what make_eval_compat would produce)
-        eval_compat = SimpleNamespace(
+        # Build DraftingIntent
+        project = ops.get_project(harness.conn, harness.project_id)
+        platform_specs = []
+        for pname, pcfg in config.platforms.items():
+            if pcfg.enabled:
+                rpcfg = resolve_platform(pname, pcfg, config.scheduling)
+                platform_specs.append(PlatformSpec(platform=pname, resolved=rpcfg))
+
+        intent = DraftingIntent(
             decision="draft",
             reasoning="E2E test — seeded decision for nano_banana_pro media",
             angle="Feature showcase",
-            episode_type="milestone",
             post_category="arc",
-            arc_id=None,
-            new_arc_theme=None,
             media_tool="nano_banana_pro",
-            reference_posts=[],
             commit_summary=commit.message,
-            include_project_docs=False,
+            decision_id=decision.id,
+            platforms=platform_specs,
         )
 
         # Run drafting pipeline
-        project = ops.get_project(harness.conn, harness.project_id)
-        draft_results = draft_for_platforms(
+        draft_results = run_draft(
+            intent,
             config,
             harness.conn,
             db,
             project,
-            decision_id=decision.id,
-            evaluation=eval_compat,
-            context=context,
-            commit=commit,
+            context,
+            commit,
             project_config=project_config,
             verbose=runner.verbose,
         )
 
-        assert len(draft_results) > 0, "No drafts created by draft_for_platforms"
+        assert len(draft_results) > 0, "No drafts created by draft()"
 
         draft = draft_results[0].draft
         assert draft.media_type == "nano_banana_pro", (

scripts/e2e/sections/platform_posting.py

@@ -375,17 +375,17 @@ def _run(plat=plat, adapter=adapter):
                 dry_run=not live,
             )
             assert thread_result.success, f"Thread failed: {thread_result.error}"
-            assert len(thread_result.tweet_results) >= 2, (
-                f"Expected >=2 results, got {len(thread_result.tweet_results)}"
+            assert len(thread_result.part_results) >= 2, (
+                f"Expected >=2 results, got {len(thread_result.part_results)}"
             )
-            for i, tr in enumerate(thread_result.tweet_results):
+            for i, tr in enumerate(thread_result.part_results):
                 assert tr.external_id, f"Tweet {i + 1} missing external_id"
 
             # Log and review
-            head = thread_result.tweet_results[0]
-            urls = [tr.external_url for tr in thread_result.tweet_results if tr.external_url]
+            head = thread_result.part_results[0]
+            urls = [tr.external_url for tr in thread_result.part_results if tr.external_url]
             with open(log_path, "a") as f:
-                for tr in thread_result.tweet_results:
+                for tr in thread_result.part_results:
                     f.write(f"{plat}\t{tr.external_id}\t{tr.external_url}\n")
 
             runner.add_review_item(
@@ -399,7 +399,7 @@ def _run(plat=plat, adapter=adapter):
                 _pause_before_delete(pause, head.external_url)
                 _safe_delete(adapter, head.external_id, label="thread head")
 
-            return f"Thread: {len(thread_result.tweet_results)} tweets"
+            return f"Thread: {len(thread_result.part_results)} tweets"
 
     runner.run_scenario(
         f"U-{plat}-thread",
@@ -717,7 +717,7 @@ def u_post_media(plat=platform, adapter=plat_adapter):
 
         # Consistency check for all capabilities
         for cap in plat_adapter.capabilities():
-            if cap.name == "single_post":
+            if cap.name == "single":
                 continue
 
             def u_capability(plat=platform, adapter=plat_adapter, capability=cap):