feat(mcp): support bundled text and attachment ingest

Allow one multipart request to stage body text and repeated files as a Bundle with bundle-level metadata. Preserve Bundle roles through preview, job launch, prompts, cleanup, and text-note ingestion.\n\nValidated with the full unittest suite (188 tests).
This commit is contained in:
Codex
2026-07-16 14:07:58 +00:00
parent 4c5454da90
commit a2b4bc393b
5 changed files with 443 additions and 18 deletions
+61
View File
@@ -264,6 +264,9 @@ class McpIngestTests(unittest.TestCase):
project="bjd",
doc_type_hint="drawing",
note="customer uploaded drawing",
bundle_id="drawing-package-1",
source_type="report_package",
label="Customer drawing package",
start_job=False,
)
@@ -272,12 +275,16 @@ class McpIngestTests(unittest.TestCase):
self.assertEqual(ticket["project"], "bjd")
self.assertEqual(ticket["doc_type_hint"], "drawing")
self.assertEqual(ticket["note"], "customer uploaded drawing")
self.assertEqual(ticket["bundle_id"], "drawing-package-1")
self.assertEqual(ticket["source_type"], "report_package")
self.assertEqual(ticket["label"], "Customer drawing package")
self.assertFalse(ticket["start_job"])
self.assertEqual(ticket["used_at"], None)
used = self.manager.consume_upload_ticket(ticket["upload_token"])
self.assertEqual(used["project"], "bjd")
self.assertEqual(used["bundle_id"], "drawing-package-1")
self.assertIsNotNone(used["used_at"])
with self.assertRaises(IngestError):
self.manager.consume_upload_ticket(ticket["upload_token"])
@@ -378,6 +385,11 @@ class McpIngestTests(unittest.TestCase):
def test_start_ingest_job_constructs_restricted_opencode_command(self):
payload = b"source data"
upload = self._complete_upload("source.pdf", payload)
self.manager.create_ingest_bundle(
[upload["upload_id"]],
source_type="report_package",
label="Quality report",
)
self.manager.opencode_model = "openai/gpt-5.5"
self.manager.opencode_variant = "high"
popen = FakePopen()
@@ -398,6 +410,9 @@ class McpIngestTests(unittest.TestCase):
self.assertIn(f"MCP ingest {job['job_id']}", args)
prompt = args[-1]
self.assertIn("/wiki-ingest", prompt)
self.assertIn('"source_type": "report_package"', prompt)
self.assertIn('"label": "Quality report"', prompt)
self.assertIn('"bundle_role": "attachment"', prompt)
self.assertIn(str(self._upload_payload_path(upload["upload_id"])), prompt)
self.assertIn("temporary runtime staging files", prompt)
self.assertIn("Do not ingest any file outside this list.", prompt)
@@ -503,6 +518,48 @@ class McpIngestTests(unittest.TestCase):
self.assertEqual(repeated["state"], "running")
popen_mock.assert_called_once()
def test_create_bundle_persists_body_and_attachment_relationship(self):
body = self._complete_upload("thread.md", b"# Thread\n\nBody")
attachment = self._complete_upload("report.pdf", b"report")
bundle = self.manager.create_ingest_bundle(
[body["upload_id"], attachment["upload_id"]],
body_upload_id=body["upload_id"],
bundle_id="mail-thread-123",
source_type="email_thread",
label="Customer quality thread",
)
self.assertEqual(bundle["bundle_id"], "mail-thread-123")
self.assertEqual(bundle["source_type"], "email_thread")
self.assertEqual(bundle["label"], "Customer quality thread")
self.assertEqual(bundle["body_upload_id"], body["upload_id"])
self.assertEqual(bundle["attachment_upload_ids"], [attachment["upload_id"]])
self.assertEqual(
self.manager._load_upload(body["upload_id"])["bundle_role"],
"primary",
)
self.assertEqual(
self.manager._load_upload(attachment["upload_id"])["bundle_role"],
"attachment",
)
preview = self.manager.preview_upload_metadata(
[body["upload_id"], attachment["upload_id"]]
)
self.assertEqual(preview["bundle"], bundle)
def test_start_ingest_job_rejects_partial_bundle(self):
body = self._complete_upload("thread.md", b"body")
attachment = self._complete_upload("report.pdf", b"report")
self.manager.create_ingest_bundle(
[body["upload_id"], attachment["upload_id"]],
body_upload_id=body["upload_id"],
)
with self.assertRaisesRegex(IngestError, "complete bundle"):
self.manager.start_ingest_job([body["upload_id"]])
def test_start_ingest_job_rejects_duplicate_upload_ids(self):
upload = self._complete_upload("source.pdf", b"source")
@@ -529,16 +586,20 @@ class McpIngestTests(unittest.TestCase):
upload_path = self._upload_payload_path(upload["upload_id"])
upload_dir = upload_path.parent
job_dir = self.manager.jobs_root / job["job_id"]
bundle_dir = self.manager.bundles_root / job["bundle"]["bundle_id"]
self._touch_tree(upload_dir, old_epoch)
self._touch_tree(job_dir, old_epoch)
self._touch_tree(bundle_dir, old_epoch)
os.utime(ticket_path, (old_epoch, old_epoch))
result = self.manager.cleanup_runtime(max_age_days=30)
self.assertGreaterEqual(result["expired_tickets_deleted"], 1)
self.assertEqual(result["old_uploads_deleted"], 1)
self.assertEqual(result["old_bundles_deleted"], 1)
self.assertEqual(result["old_jobs_deleted"], 1)
self.assertFalse(upload_dir.exists())
self.assertFalse(bundle_dir.exists())
self.assertFalse(job_dir.exists())
self.assertFalse(ticket_path.exists())