From 3d746b075391cc242f79fac8fb5690cfcd5ececa Mon Sep 17 00:00:00 2001 From: "sweetman.eth" Date: Thu, 25 Jun 2026 18:25:41 -0500 Subject: [PATCH 1/2] Test (#715) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * feat(measurement-jobs): free-tier card gate (setup mode) + instant backfill drain (#671) Two chat#1796 refinements on the historical (Songstats) path: 1. Free-tier card-on-file link. The gate was issuing the paid subscription checkout ($99/mo after a 30-day trial). New createCardOnFileSession uses Stripe Checkout `mode: "setup"` — collects a card for $0, no subscription, no Stripe product. The account then pays only for metered usage via credits. 2. Instant drain. After enqueuing a historical job, fire-and-forget start(songstatsBackfillWorkflow) so the backfill begins immediately instead of waiting up to 24h for the cron. Safe by reuse: the workflow's budget gate (limit − reserve − rolling-30d ledger) caps it to the Songstats quota and SKIP LOCKED prevents double-claiming with the daily cron, which stays as the backstop. Only kicks when something was actually enqueued. 26 new/updated unit tests; research+stripe+workflows suite 453 green; tsc/lint/format clean. * fix(songstats-backfill): backoff on 429 + defer instead of churn (chat#1797) (#673) Pacing/backoff + per-step logging for the Songstats backfill drain (chat#1797 bullets 1 & 3). Bounded exponential backoff (fetchSongstatsWithBackoff, 502/503/504/408/429), defer-to-pending past the bound with claimed-batch release, per-step + per-batch logging. * refactor(songstats): remove local quota ledger + budget gate (chat#1797) (#674) Bullet 2 of chat#1797 (code half). Songstats is the rate authority — removes getBackfillBudgetStep, the budget gate, and insertSongstatsQuotaLedger/selectSongstatsQuotaSpent. The drain now claims+processes regardless of the ledger (un-stalls the backfill); the songstats_quota_ledger table is dropped in recoupable/database#35 (apply AFTER this deploys). * feat: POST /api/catalogs (create + materialize from valuation snapshot) (#677) * feat: POST /api/catalogs create + materialize from valuation snapshot Creates a catalog owned by the authenticated account (account derived from credentials via validateAuthContext, never the body). With from.snapshot_id, materializes the catalog from a completed valuation snapshot: creates the catalogs row, links account_catalogs, adds the snapshot's measured ISRCs as catalog_songs, and records the catalog on the snapshot. Re-claiming the same snapshot is idempotent. TDD: validateCreateCatalogBody (6 tests) + createCatalogHandler (8 tests), red->green. New supabase wrappers: insertCatalog, selectCatalogById, insertAccountCatalog, updateSnapshotCatalog. Implements recoupable/chat#1801 Phase 2. Matches docs contract recoupable/docs#243. Co-Authored-By: Claude Opus 4.8 (1M context) * refactor: re-anchor POST /api/catalogs to merged contract + review fixes - Flatten request to the merged docs#243 contract: from:{snapshot_id} -> a root snapshot field (validator + handler + tests). Error copy follows. - DRY/SRP: drop the inline success() helper; use the shared successResponse(). - KISS rename: materializeSnapshotCatalog.ts -> createSnapshotCatalog.ts. - DRY: delete the redundant updateSnapshotCatalog helper; reuse the existing updatePlaycountSnapshot(id, fields). Validator change done red->green. lib/catalog: 24 tests pass; tsc + eslint clean. Addresses review on PR #677. * fix: materialize catalog songs from song_measurements, not snapshot.isrcs Testing the full materialize path surfaced a real bug: a valuation snapshot is album_ids-scoped, so its own isrcs column is null — createSnapshotCatalog read snapshot.isrcs and would link an EMPTY catalog. The measured ISRCs live in song_measurements (snapshot lineage), so source them there. New selectSnapshotIsrcs(snapshotId) helper (distinct song_measurements.song for the snapshot). createSnapshotCatalog now uses it. TDD: new createSnapshotCatalog.test.ts (3 tests) red->green; lib/catalog 27 pass. Addresses PR #677 verification. * refactor: reuse selectSongMeasurements (snapshot filter) instead of a new helper KISS/DRY per review: drop selectSnapshotIsrcs; add an optional snapshot filter to the existing selectSongMeasurements, and derive distinct ISRCs in createSnapshotCatalog. lib/catalog + song_measurements: 36 tests pass. Addresses review on PR #677. --------- Co-authored-by: Claude Opus 4.8 (1M context) * fix: LEFT-join artists in catalog-songs read (materialized tracks were hidden) (#681) * fix: LEFT-join artists in catalog-songs read so materialized tracks surface selectCatalogSongsWithArtists used song_artists!inner -> accounts!inner, so valuation-captured tracks (which have songs + song_measurements but no song_artists yet) were filtered out — a materialized catalog read back as 0 songs (verified live on api#677). Drop the two !inner so artist-less songs return with artists: []; songs!inner stays (catalog_songs.song FK guarantees it). Closes the read-path half of the song_artists follow-up in recoupable/chat#1801. Longer-term (option a): the capture pipeline should also write song_artists. * Update lib/supabase/catalog_songs/selectCatalogSongsWithArtists.ts * feat: add X (Twitter) + LinkedIn to the Composio connector whitelist (chat#1793) (#679) * feat: add X (Twitter) + LinkedIn to the Composio connector whitelist (chat#1793) Expand the existing whitelist pattern to two new platforms — no architecture changes: - SUPPORTED_TOOLKITS (getConnectors.ts) + ENABLED_TOOLKITS (getComposioTools.ts) - CONNECTOR_DISPLAY_NAMES: twitter → "X (Twitter)", linkedin → "LinkedIn" - buildAuthConfigs() reads COMPOSIO_TWITTER_AUTH_CONFIG_ID + COMPOSIO_LINKEDIN_AUTH_CONFIG_ID - document both env vars in .env.example TDD: new buildAuthConfigs unit + expanded getConnectors / handler / ENABLED_TOOLKITS assertions, RED before GREEN. Full lib/composio suite green (157 tests). Implements the contract from docs#244. Co-Authored-By: Claude Opus 4.8 (1M context) * chore: fix lint/format — relocate ENABLED_TOOLKITS test block, reformat toolkit array - Move the ENABLED_TOOLKITS describe block below the imports (import/first) - Prettier-format the expanded toolkits array in getConnectors.test.ts Co-Authored-By: Claude Opus 4.8 (1M context) --------- Co-authored-by: Claude Opus 4.8 (1M context) * chore: remove unused ALLOWED_ARTIST_CONNECTORS from api (chat#1793) (#680) * feat: allow artists to connect X (Twitter); keep LinkedIn label-only (chat#1793) Add `twitter` to ALLOWED_ARTIST_CONNECTORS — artist-facing social, same class as tiktok/instagram/youtube. `linkedin` is intentionally left out (label/owner-only). TDD: isAllowedArtistConnector.test.ts asserts twitter allowed + linkedin excluded, RED before GREEN. Full lib/composio suite green (157 tests). Co-Authored-By: Claude Opus 4.8 (1M context) * feat: allow artists to connect LinkedIn too (chat#1793) Reversal of the earlier "LinkedIn label/owner-only" call: per owner decision 2026-06-18, LinkedIn is now an artist-facing connector like the others. Add `linkedin` to ALLOWED_ARTIST_CONNECTORS. TDD: flipped the linkedin assertions (now allowed/included), RED before GREEN. Full lib/composio suite green (159 tests). Co-Authored-By: Claude Opus 4.8 (1M context) * chore: remove unused ALLOWED_ARTIST_CONNECTORS from api (chat#1793) The api copy of the artist connector allow-list had no runtime consumer — only its definition, test, and an (also-unused) barrel re-export. The connector routes are unopinionated (allow any connector for any account); the allow-list that actually drives the artist Connectors tab lives in `chat` (`lib/composio/allowedArtistConnectors.ts`). Removing the dead code. Supersedes the earlier plan to add twitter/linkedin to this api constant (decision: owner, 2026-06-18) — the artist allow-list is chat-only. Deletes isAllowedArtistConnector.ts + its test, and the barrel re-export. lib/composio suite green (149); no new tsc errors vs test (198 baseline). Co-Authored-By: Claude Opus 4.8 (1M context) --------- Co-authored-by: Claude Opus 4.8 (1M context) * fix: enrich valuation-captured songs (artists + notes) so they render in the catalog (#684) * fix: enrich captured songs with artists + notes (root cause) The valuation capture path created songs rows from the Spotify track lookup but discarded track.artists and never ran the manual flow's enrichment, so captured songs had no song_artists and no notes -> the chat catalog view's isCompleteSong filter (artist + notes required, on by default) hid every valuation track (count shown, list empty). mapUnmappedAlbumTracks now carries track.artists through and runs the same enrichment as processSongsInput: linkSongsToArtists (auto-creates the artist account) + queueRedisSongs (queues note generation). TDD: new test asserts artists are linked + queued; lib/research/playcounts + lib/songs 109 tests pass. Root-cause follow-up on recoupable/chat#1801. * style: prettier-format the capture-enrichment test Co-Authored-By: Claude Opus 4.8 (1M context) --------- Co-authored-by: Claude Opus 4.8 (1M context) * fix(tasks): let admins fetch any task by id alone (cross-account read) (#689) GET /api/tasks scopes every lookup to the caller's own account. A lookup by `id` alone therefore returns nothing when the caller's key doesn't own the task, which blocks the background worker (customer-prompt-task) from loading a customer's scheduled task config with a shared admin key. When an admin caller queries by `id` with no `account_id` param, drop the account scope so the single task is returned regardless of owner. Non-admin id lookups stay scoped to the authenticated account (no cross-account leak). ValidatedGetTasksQuery.account_id is now optional; selectScheduledActions already filters by account_id only when present. TDD: RED (admin id lookup not cross-account, non-admin not scoped) -> GREEN. Fixes part of recoupable/chat#1810. Co-authored-by: Claude Opus 4.8 (1M context) * feat(connectors): POST /api/connectors/files — stage images for LinkedIn/X posts (#691) * feat(connectors): add POST /api/connectors/files (stage image for posts) Connector actions with file_uploadable fields (e.g. LINKEDIN_CREATE_LINKED_IN_POST.images[], TWITTER_CREATION_OF_A_POST) need a Composio { name, mimetype, s3key } descriptor whose s3key already lives in Composio storage. The execute path forwards parameters verbatim and never stages the file, so any s3key 404s. Add POST /api/connectors/files: given { url, toolSlug }, stage the image via composio.files.upload() and return flat { success, name, mimetype, s3key }. The caller passes that descriptor into parameters.images[] on the existing POST /api/connectors/actions. No change to the execute path (Option A). - uploadConnectorFile: calls composio.files.upload({ file: url, toolSlug, toolkitSlug }) where toolkitSlug is derived from the action slug. - validate body (zod { url, toolSlug }) + request (validateAuthContext gate; no account_id — upload is scoped by tool/toolkit, not connection). - handler returns 200 on success, 400 invalid body, 401 unauth, 502 upstream. URL-only input by decision; generic across file_uploadable toolkits (linkedin, twitter). TDD RED→GREEN; connectors suite green (129 tests). Implements recoupable/chat#1809. Docs: recoupable/docs#246. Co-Authored-By: Claude Opus 4.8 (1M context) * style: prettier-format connectors file-upload tests Co-Authored-By: Claude Opus 4.8 (1M context) * refactor(connectors): use shared safeParseJson in file-upload validator Address review (DRY): replace the raw `await request.json()` with the shared `safeParseJson` helper (lib/networking/safeParseJson), matching the other validators. Malformed JSON now yields a clean 400 via body validation instead of throwing into the handler's 502 path. TDD: added a malformed-JSON test (RED on request.json() throw) → GREEN. Co-Authored-By: Claude Opus 4.8 (1M context) --------- Co-authored-by: Claude Opus 4.8 (1M context) * feat(artists): account_id override for DELETE /api/artists/{id} (#693) Parse an optional account_id from the request body and thread it into validateAuthContext(request, { accountId }), so a caller with access to multiple accounts (org members / Recoup admins) can delete an artist in another account's context. The resolved account is used for the checkAccountArtistAccess check; a non-admin passing an inaccessible account is still rejected by canAccessAccount (403). Mirrors the existing override pattern on POST /api/artists. chat#1811 Co-authored-by: Claude Opus 4.8 (1M context) * feat(chats): admins (RECOUP_ORG) can access any chat — read + write (#694) * feat(chats): account_id override for GET /api/chats/{id}/messages Parse an optional account_id (or camelCase accountId) query param in validateGetChatMessagesQuery, validate it as a UUID, and thread it into validateChatAccess via a new optional options arg. validateChatAccess forwards it to validateAuthContext(request, { accountId }) and resolves room access against the overridden account, so a caller with access to multiple accounts (org members / Recoup admins) can read another account's chat messages. A non-admin passing an inaccessible account is still rejected by canAccessAccount (403). The override is opt-in per call site: only validateGetChatMessagesQuery passes it, so the other validateChatAccess callers are unchanged. chat#1811 Co-Authored-By: Claude Opus 4.8 (1M context) * refactor(chats): admin bypass (not account_id param) for GET messages Aligns GET /api/chats/{id}/messages with the shipped docs contract — docs#247 rolled back the account_id query param. The chat is identified by the path id and the owner is resolved server-side, so no param is needed. Instead, validateChatAccess gains an opt-in `allowAdmin` flag that grants RECOUP_ORG admins access to any room (mirrors checkAccountArtistAccess). Only the messages read path opts in; chat mutations (update/delete/copy) stay ownership-gated, so admin write access is not silently broadened. - drop account_id/accountId query parsing from validateGetChatMessagesQuery - validateChatAccess: remove accountId override; add allowAdmin + checkIsAdmin bypass - tests: admin bypass grants access; non-admin still 403 even with allowAdmin; mutation paths never consult admin status - mock checkIsAdmin in getChatArtistHandler.test.ts (now a transitive dep) Refs recoupable/chat#1811 Co-Authored-By: Claude Opus 4.8 (1M context) * refactor(chats): drop allowAdmin flag — admins access any chat (read + write) YAGNI/KISS per internal review: RECOUP_ORG admins already have broad cross-account power (delete any artist, read any account), and chat ops are resource-scoped by chatId, so an unconditional admin bypass is the coherent model. Removes the opt-in flag entirely. The admin check now runs ONLY after the ownership check fails, so the common owner path never pays the extra checkIsAdmin lookup (better than both the flag and a top-of-function bypass). Applies across all validateChatAccess call sites (messages + getChatArtist reads; update/delete-trailing/copy mutations), so admins can read and write any account's chats; non-admins are unchanged (403). Refs recoupable/chat#1811 Co-Authored-By: Claude Opus 4.8 (1M context) * refactor(chats): revert validateGetChatMessagesQuery (no change needed) The admin bypass lives entirely in validateChatAccess, which the messages endpoint already delegates to — so validateGetChatMessagesQuery needs no change. Reverts the doc-only edit and the redundant delegation test to keep the PR scoped to validateChatAccess. Co-Authored-By: Claude Opus 4.8 (1M context) --------- Co-authored-by: Claude Opus 4.8 (1M context) * Enforce account_api_keys.expires_at in x-api-key auth (chat#1813) (#700) * feat(auth): ephemeral, account-scoped api keys (chat#1813) Foundation for the async chat-generation migration: the headless/scheduled path has no client Privy session to forward into the sandbox and must not put the long-lived service key into model-driven bash. It instead mints a short-lived, account-scoped recoup_sk_ key per run and deletes it on completion. - lib/keys/mintEphemeralAccountKey: generate+hash+insert a recoup_sk_ key with an expires_at (default 15m TTL); returns { rawKey, keyId } for injection + cleanup. - lib/keys/isApiKeyExpired: pure TTL check (NULL/unparseable = never expires). - getApiKeyAccountId: reject a key whose expires_at has passed (401). Backward compatible — existing long-lived keys have NULL expiry. - insertApiKey + database.types: carry the new account_api_keys.expires_at column. Depends on database#36 (adds the column). Security-sensitive (touches the api-key auth path) — please review the expiry-enforcement diff. Co-Authored-By: Claude Opus 4.8 (1M context) * refactor(auth): scope PR to expiry enforcement; defer key minting Remove mintEphemeralAccountKey + its test and revert the insertApiKey expires_at writer change. Both are orphaned in this PR — mint has no caller anywhere, and insertApiKey's expires_at param is only ever passed by mint. They belong with the re-point PR (handleChatGenerate) that actually mints + injects + deletes the key, so this PR stays a complete, testable slice: enforce expires_at on x-api-key auth (getApiKeyAccountId + isApiKeyExpired). The minting code + its wiring spec are preserved in the tracking issue (recoupable/chat#1813). Co-Authored-By: Claude Opus 4.8 (1M context) --------- Co-authored-by: Claude Opus 4.8 (1M context) * refactor(chat): extract shared buildRunAgentInput (chat#1813) (#701) Pulls the RunAgentWorkflowInput construction out of handleChatWorkflowStream into a pure, shared builder so the interactive (/api/chat/workflow) and the upcoming headless (/api/chat/generate) callers construct workflow input identically. Repo identifiers and the recoup org id are derived from clone_url inside the builder — one source of truth, no caller duplication. Behavior-preserving: the interactive handler now delegates to buildRunAgentInput; existing handleChatWorkflowStream tests stay green (20), plus 4 new builder tests. Co-authored-by: Claude Opus 4.8 (1M context) * Re-point POST /api/chat/generate onto runAgentWorkflow + ephemeral key (chat#1813) (#704) * feat(chat): re-point /api/chat/generate onto runAgentWorkflow (chat#1813) Async chat generation now runs on the SAME durable runAgentWorkflow as interactive /api/chat instead of the synchronous legacy ToolLoopAgent. POST /api/chat/generate provisions a headless session + active sandbox, mints a short-lived account-scoped recoup_sk_ key for in-sandbox recoup-api calls, builds the shared workflow input via buildRunAgentInput, and start()s the run — returning { runId } with 202 immediately. Generation, message persistence, the credit charge, and key revocation happen server-side inside the workflow. - lib/keys/mintEphemeralAccountKey + insertApiKey expires_at writer (re-added from the deferred half of #700; minting now has its only consumer). - lib/chat/generate/validateGenerateRequest — x-api-key auth + prompt/messages normalization to UIMessage[]. - lib/chat/generate/provisionGenerateSession — ensurePersonalRepo → insertSession → insertChat → connectSandbox → updateSession(active) → discoverSkills. - lib/chat/handleChatGenerate — orchestrates provision → mint → start; revokes the key if the run never starts. - Ephemeral key injected as recoupAccessToken + threaded as agentContext.ephemeralKeyId; runAgentWorkflow's finally deletes it on run end (deleteEphemeralKeyStep). The ~15m expires_at TTL (enforced by #700) is the backstop. - Matches docs#249 (202 { runId } contract). Co-Authored-By: Claude Opus 4.8 (1M context) * feat(chat): return { runId, chatId, sessionId } from /api/chat/generate The workflow runId alone can't be resolved back to the chat output. Return the persisted-output identifiers too so a caller can read the result later (GET /api/chat/{chatId}/stream, or the chat's persisted messages) — turning the endpoint from fire-and-forget-only into a proper async-job contract. The scheduled task still ignores the body. (chat#1813, review follow-up.) Co-Authored-By: Claude Opus 4.8 (1M context) * refactor(chat): rename POST /api/chat/generate → POST /api/chat/runs REST cleanup (chat#1813): the endpoint starts a *run*, so it's modeled as a run resource, not a `generate` verb. Removes /generate entirely (no alias). - Route app/api/chat/generate → app/api/chat/runs; handler handleChatGenerate → handleStartChatRun. Add a Location header at /api/chat/runs/{runId}. - Update path strings in comments/JSDoc to /api/chat/runs. Also addresses cubic review on this PR: - validateGenerateRequest: trim prompt before the presence check (reject blank). - handleStartChatRun: standardized 500 body "Internal server error". - validateGenerateRequest test: use a schema-valid field so the "exactly one of prompt/messages" case is exercised for the right reason; add a whitespace-prompt test. (Internal helper names — validateGenerateRequest/provisionGenerateSession — keep "generate" as it describes the operation; renaming is out of scope.) Co-Authored-By: Claude Opus 4.8 (1M context) * refactor(chat/runs): drop dead roomId from the request schema roomId was accepted-but-ignored on the re-pointed endpoint (it mints its own session+chat per run and returns chatId/sessionId). Nothing sends it anymore (tasks#152 stopped), and Zod strips unknown keys regardless — so remove it from the schema to keep docs↔api in sync. excludeTools was already gone. (chat#1813) Co-Authored-By: Claude Opus 4.8 (1M context) * refactor(chat/runs): remove topic param to match /api/chat /api/chat takes no session-title param, so /api/chat/runs shouldn't either. The endpoint provisions its own session with a default title; drop topic from the request schema and the GenerateRequest type. (chat#1813 review) Co-Authored-By: Claude Opus 4.8 (1M context) * feat(chat/runs): implement GET /api/chat/runs/{runId} status endpoint Brings the api to parity with the merged docs#249, which documented the run- status endpoint. Wraps the durable workflow's getRun(runId).status and returns { runId, status } (normalized to queued|running|completed|failed|cancelled). 404 when the run is unknown; x-api-key auth. Returns { runId, status } rather than the documented chatId/sessionId: getRun exposes only status, and there's no durable runId→chat mapping (the caller already holds chatId/sessionId from the 202 start response). Docs reconciled to match; full chatId/sessionId + per-run ownership would need a chats.last_run_id column (follow-up). (chat#1813) Co-Authored-By: Claude Opus 4.8 (1M context) * refactor(chat/runs): SRP + DRY — share session/sandbox provisioning libs Addresses review on api#704: SRP — extract normalizeRunStatus into its own file (one exported fn per file). DRY — the headless provisionGenerateSession duplicated the interactive flow. Extract the shared blocks and use them in both paths: - lib/sessions/createSessionWithInitialChat — ensurePersonalRepo → insertSession → insertChat with rollback. Used by createSessionHandler (POST /api/sessions) AND provisionGenerateSession. Also fixes the headless rollback gap (cubic P2). - lib/sandbox/markSessionSandboxActive — bind sandbox state to a session + mark active. Used by createSandboxHandler (POST /api/sandbox) AND provisionGenerateSession. The sandbox connectSandbox call itself is left in each caller: the interactive createSandboxHandler interleaves org-snapshot warm-boot + one-shot (no-session) provisioning + skill-install + lifecycle-kick that the lean headless path intentionally omits, so forcing a shared connect would couple unrelated concerns. Behavior-preserving: full lib/sessions + lib/sandbox suites green; new unit tests for the 3 extracted fns. (chat#1813) Co-Authored-By: Claude Opus 4.8 (1M context) * refactor(chat/runs): rename lib/chat/generate → lib/chat/runs (match the endpoint) The endpoint was renamed /api/chat/generate → /api/chat/runs, but the internal helpers kept "generate" — pointing at a removed concept, and split across two dirs (handleStartChatRun lived in lib/chat/, its helpers in lib/chat/generate/). Pure rename, no behavior change: - lib/chat/generate/ → lib/chat/runs/ (handleStartChatRun + its test moved in too) - validateGenerateRequest → validateChatRunRequest (file + symbol) - provisionGenerateSession → provisionRunSession (file + symbol) - ProvisionedGenerateSession → ProvisionedRunSession - generateBodySchema → chatRunBodySchema, GenerateRequest → ChatRunRequest - DEFAULT_GENERATE_MODEL_ID → DEFAULT_RUN_MODEL_ID - updated JSDoc refs in the shared createSandboxHandler / markSessionSandboxActive / createSessionWithInitialChat git mv preserves history. lib/chat/generateChatTitle (unrelated) left untouched. Feature suites green (126), tsc + lint clean. (chat#1813) Co-Authored-By: Claude Opus 4.8 (1M context) --------- Co-authored-by: Claude Opus 4.8 (1M context) * Retire OpenClaw prompt_sandbox → run-sandbox-command bridge (chat#1813) (#705) * refactor(sandbox): retire OpenClaw prompt_sandbox → run-sandbox-command bridge (chat#1813) Async agent work now runs on the durable runAgentWorkflow via POST /api/chat/generate, so the OpenClaw offload bridge is removed: - Delete lib/trigger/triggerPromptSandbox.ts (the only caller of tasks.trigger("run-sandbox-command")). - Delete the prompt_sandbox MCP tool (registerPromptSandboxTool) + its registration (lib/mcp/tools/sandbox/index.ts) and drop it from registerAllTools. - Simplify processCreateSandbox to bare sandbox creation (no prompt, no trigger); drop `prompt` from validateSandboxBody. POST /api/sandboxes now only provisions a sandbox. - Update JSDoc on the route + handler; prune prompt-mode tests. No api code calls run-sandbox-command anymore (grep clean). The shared OpenClaw helpers in the tasks repo stay until their other consumers are migrated (issue Phase 2). Stale prompt_sandbox references in the dead legacy generate stack (SYSTEM_PROMPT, getGeneralAgent, getMcpTools, setupToolsForRequest) are left for a follow-up cleanup PR. Co-Authored-By: Claude Opus 4.8 (1M context) * docs(sandbox): /api/chat/generate → /api/chat/runs in retire-bridge comments The endpoint was renamed in api#704 (now on test/prod); update the JSDoc refs added by this PR to match. (chat#1813) Co-Authored-By: Claude Opus 4.8 (1M context) * refactor(prompt): remove prompt_sandbox from SYSTEM_PROMPT + create_knowledge_base Retiring the prompt_sandbox MCP tool (this PR) affects LIVE agents, not dead code: the legacy getGeneralAgent stack is still used by Slack chat (handleSlackChatMessage → setupChatRequest) and the inbound email responder (respondToInboundEmail → generateEmailResponse). Both run on SYSTEM_PROMPT and the MCP toolset, so removing the tool while the prompt instructs models to use it would tell live agents to call a tool that no longer exists. - SYSTEM_PROMPT: drop the entire "Sandbox-First Approach" section (it centered on prompt_sandbox as the "primary tool" + release-management-via-sandbox). - create_knowledge_base tool: drop the "(use prompt_sandbox for those)" pointer. - Update both tests to guard that neither references the retired tool. Behavior note: the Slack + email agents lose the prompt_sandbox (OpenClaw) sandbox tool — acceptable since OpenClaw is the failing component this issue removes. Those agents still run on the legacy getGeneralAgent stack (not runAgentWorkflow); migrating them is out of scope (chat#1813). Co-Authored-By: Claude Opus 4.8 (1M context) --------- Co-authored-by: Claude Opus 4.8 (1M context) * feat: POST /api/emails + route ephemeral key to RECOUP_API_KEY (#1815) (#708) * feat(emails): POST /api/emails + route ephemeral key to RECOUP_API_KEY (#1815) Item 1 of recoupable/chat#1815 — let the sandbox agent (and scheduled report tasks) deliver email. POST /api/emails: send an email to explicit recipients, account-scoped via validateAuthContext, reusing the same processAndSendEmail domain fn as the send_email MCP tool (DRY). Mirrors POST /api/notifications but takes a required `to[]`. SRP: route → sendEmailHandler → validateSendEmailBody. Flat response { success, message, id }; 400/401/502 like the sibling. TDD red→green. buildRecoupExecEnv: route a recoup_sk_ token (the headless /api/chat/runs ephemeral key) to RECOUP_API_KEY (which the recoup-api skill sends as x-api-key) instead of RECOUP_ACCESS_TOKEN (Bearer). REST endpoints 401 a recoup_sk_ key over Bearer — this is why the sandbox agent's recoup-api calls were failing. Privy JWTs (interactive path) still route to RECOUP_ACCESS_TOKEN. Verified by diagnostic run: x-api-key → 200, Bearer → 401. Contract: recoupable/docs#251. Affected suites green (231); my files tsc + lint clean (other tsc errors pre-exist on test). Co-Authored-By: Claude Opus 4.8 (1M context) * feat: bring POST /api/emails to parity with docs#251 contract Documentation-driven follow-up to the merged docs#251 contract: 1. Rename the public request field room_id -> chat_id at the /api/emails boundary (schema, type, handler, route JSDoc). The internal processAndSendEmail/selectRoomWithArtist plumbing keeps room_id (same id value, rooms table) so the shared MCP send_email path is untouched. 2. Enforce the recipient restriction: without a payment method on file, to/cc are limited to the account's own email (403 otherwise); a card on file lifts it. New assertRecipientsAllowed + accountHasPaymentMethod helpers (read-only Stripe customer + default-payment-method lookup). Tests: assertRecipientsAllowed unit (card-on-file, own-email, blocked), handler chat_id mapping + 403 path, validate chat_id. 144 emails/notifications tests green; tsc adds 0 new errors; lint clean. Co-Authored-By: Claude Opus 4.8 (1M context) * refactor(emails): address review — server-side token parsing, DRY, SRP Addresses the four review comments on api#708: 1. KISS (buildRecoupExecEnv): drop client-side token routing. The server now accepts a `recoup_sk_` API key over `Authorization: Bearer` too (getAuthenticatedAccountId parses the format), so buildRecoupExecEnv always sets a single RECOUP_ACCESS_TOKEN. New shared getAccountIdByApiKey is used by both the x-api-key and Bearer paths. 2. DRY (payment method): extract accountHasPaymentMethod into lib/stripe and reuse it in ensureSongstatsPaymentMethod (was duplicating the findStripeCustomer -> findDefaultPaymentMethod two-step). 3. SRP: move the recipient restriction out of the handler into validateSendEmailBody (alongside auth/validation). 4. KISS: validateSendEmailBody returns { ...result.data, accountId }. Tests: getAuthenticatedAccountId recoup_sk_ branch, recipient 403 moved to the validator suite, handler test now mocks the validator. 427 tests green across emails/auth/stripe/agent/research; tsc 0 new errors; lint clean. Co-Authored-By: Claude Opus 4.8 (1M context) --------- Co-authored-by: Claude Opus 4.8 (1M context) * fix(skills): install the renamed global skills into sandboxes (chat#1815) (#712) The sandbox agent never gets the recoup-api playbook, so scheduled "send an email" tasks complete with zero tool calls ("I don't have a tool to send emails"). Root cause: defaultGlobalSkillRefs installed `recoup-api` and `artist-workspace`, but both were renamed/split in recoupable/skills. The install runs `npx skills add recoupable/skills --skill recoup-api`, which throws on the unknown name (caught best-effort) → no platform skills land in the sandbox. Breaks all platform-skill loading, not just email. - defaultGlobalSkillRefs.ts: use the current slugs — recoup-platform-api-access, recoup-platform-build-workspace, recoup-roster-{add,list,manage}-artist (restores the old recoup-api + artist-workspace coverage, now split). - recoupApiSkillPrompt.ts: update the skill names the nudge tells the agent to load, and add send-email / deliver-report to the triggers so the agent loads recoup-platform-api-access for email tasks instead of claiming no tool. 569 tests green; tsc 0 new errors; lint clean. Co-authored-by: Claude Opus 4.8 (1M context) * feat(emails): make `to` and `subject` optional on POST /api/emails (#710) * feat: make `to` optional on POST /api/emails (default to account's own email) When `to` is omitted, resolve the authenticated account's own email(s) via account_emails and use them as recipients, so a caller can "email me this" without restating their address (the common scheduled-report case). `to` stays minItems:1 when provided. The recipient restriction is unchanged and runs on the resolved recipients (own email always allowed). 400 when `to` is omitted and the account has no email on file. Implements the merged contract docs#252. Part of chat#1815. Co-Authored-By: Claude Opus 4.8 (1M context) * feat(emails): make subject optional, default from body (docs#252) Follows the merged docs#252 contract (subject dropped from required). Resend requires a non-empty subject, so resolve one server-side when the caller omits it: new resolveEmailSubject() returns the provided subject, else the body's first heading/line (text preferred, then HTML with tags stripped), else "Message from Recoup". validateSendEmailBody now returns a always-string subject; schema marks it optional. Tests: resolveEmailSubject unit (provided/derived/html/fallback/cap), validator subject-defaulting cases; removed the now-obsolete "rejects a missing subject" 400 test. 155 emails/notifications tests green; tsc 0 new errors; lint clean. Co-Authored-By: Claude Opus 4.8 (1M context) * refactor(emails): extract firstMeaningfulLine + stripHtml to own files (SRP) Per review: one exported function per file. Move the two pure string helpers out of resolveEmailSubject.ts into lib/emails/firstMeaningfulLine.ts and lib/emails/stripHtml.ts, each with its own unit test. resolveEmailSubject now imports them. Behavior unchanged; 14 tests green, tsc/lint clean. Co-Authored-By: Claude Opus 4.8 (1M context) --------- Co-authored-by: Claude Opus 4.8 (1M context) * chore: remove POST /api/notifications (superseded by /api/emails) (#711) /api/notifications emailed only the account's own address. With `to` now optional on POST /api/emails (defaulting to the account's own email, api#710), /api/emails fully subsumes it, so we standardize on /api/emails and delete the duplicate route. Deletes app/api/notifications/route.ts and lib/notifications/* (handler, validator, tests). Keeps processAndSendEmail (the shared domain fn for the send_email MCP tool) and updates its stale JSDoc to reference /api/emails. Implements docs#253. Part of chat#1815 cleanup. grep for api/notifications / createNotification / lib/notifications is clean; emails suite green. Co-authored-by: Claude Opus 4.8 (1M context) --------- Co-authored-by: Claude Opus 4.8 (1M context) --- app/api/notifications/route.ts | 42 ---- lib/emails/processAndSendEmail.ts | 2 +- .../createNotificationHandler.test.ts | 194 ---------------- .../validateCreateNotificationBody.test.ts | 212 ------------------ .../createNotificationHandler.ts | 76 ------- .../validateCreateNotificationBody.ts | 74 ------ 6 files changed, 1 insertion(+), 599 deletions(-) delete mode 100644 app/api/notifications/route.ts delete mode 100644 lib/notifications/__tests__/createNotificationHandler.test.ts delete mode 100644 lib/notifications/__tests__/validateCreateNotificationBody.test.ts delete mode 100644 lib/notifications/createNotificationHandler.ts delete mode 100644 lib/notifications/validateCreateNotificationBody.ts diff --git a/app/api/notifications/route.ts b/app/api/notifications/route.ts deleted file mode 100644 index 22597e8f0..000000000 --- a/app/api/notifications/route.ts +++ /dev/null @@ -1,42 +0,0 @@ -import { NextRequest, NextResponse } from "next/server"; -import { getCorsHeaders } from "@/lib/networking/getCorsHeaders"; -import { createNotificationHandler } from "@/lib/notifications/createNotificationHandler"; - -/** - * OPTIONS handler for CORS preflight requests. - * - * @returns A NextResponse with CORS headers. - */ -export async function OPTIONS() { - return new NextResponse(null, { - status: 204, - headers: getCorsHeaders(), - }); -} - -/** - * POST /api/notifications - * - * Sends a notification email to the authenticated account's email address via Resend. - * The recipient is automatically resolved from the API key or Bearer token. - * Requires authentication via x-api-key header or Authorization bearer token. - * - * Body parameters: - * - subject (required): email subject line - * - text (optional): plain text / Markdown body - * - html (optional): raw HTML body (takes precedence over text) - * - cc (optional): array of CC email addresses - * - headers (optional): custom email headers - * - room_id (optional): room ID for chat link in footer - * - account_id (optional): UUID of the account to send to (org keys only) - * - * @param request - The request object. - * @returns A NextResponse with send result. - */ -export async function POST(request: NextRequest): Promise { - return createNotificationHandler(request); -} - -export const dynamic = "force-dynamic"; -export const fetchCache = "force-no-store"; -export const revalidate = 0; diff --git a/lib/emails/processAndSendEmail.ts b/lib/emails/processAndSendEmail.ts index 934939ca6..16402cd5b 100644 --- a/lib/emails/processAndSendEmail.ts +++ b/lib/emails/processAndSendEmail.ts @@ -30,7 +30,7 @@ export type ProcessAndSendEmailResult = ProcessAndSendEmailSuccess | ProcessAndS /** * Shared email processing and sending logic used by both the - * POST /api/notifications handler and the send_email MCP tool. + * POST /api/emails handler and the send_email MCP tool. * * Handles room lookup, footer generation, markdown-to-HTML conversion, * and the Resend API call. diff --git a/lib/notifications/__tests__/createNotificationHandler.test.ts b/lib/notifications/__tests__/createNotificationHandler.test.ts deleted file mode 100644 index ca7fb677f..000000000 --- a/lib/notifications/__tests__/createNotificationHandler.test.ts +++ /dev/null @@ -1,194 +0,0 @@ -import { describe, it, expect, vi, beforeEach } from "vitest"; -import { NextRequest, NextResponse } from "next/server"; -import { createNotificationHandler } from "../createNotificationHandler"; - -const mockValidateAuthContext = vi.fn(); -const mockSelectAccountEmails = vi.fn(); -const mockProcessAndSendEmail = vi.fn(); - -vi.mock("@/lib/auth/validateAuthContext", () => ({ - validateAuthContext: (...args: unknown[]) => mockValidateAuthContext(...args), -})); - -vi.mock("@/lib/supabase/account_emails/selectAccountEmails", () => ({ - default: (...args: unknown[]) => mockSelectAccountEmails(...args), -})); - -vi.mock("@/lib/emails/processAndSendEmail", () => ({ - processAndSendEmail: (...args: unknown[]) => mockProcessAndSendEmail(...args), -})); - -vi.mock("@/lib/networking/getCorsHeaders", () => ({ - getCorsHeaders: vi.fn(() => ({ "Access-Control-Allow-Origin": "*" })), -})); - -vi.mock("@/lib/networking/safeParseJson", () => ({ - safeParseJson: vi.fn(async (req: Request) => req.json()), -})); - -function createRequest(body: unknown): NextRequest { - return new NextRequest("https://recoup-api.vercel.app/api/notifications", { - method: "POST", - headers: { - "Content-Type": "application/json", - "x-api-key": "test-key", - }, - body: JSON.stringify(body), - }); -} - -describe("createNotificationHandler", () => { - beforeEach(() => { - vi.clearAllMocks(); - mockValidateAuthContext.mockResolvedValue({ - accountId: "account-123", - orgId: null, - authToken: "test-key", - }); - mockSelectAccountEmails.mockResolvedValue([ - { id: "email-1", account_id: "account-123", email: "owner@example.com", updated_at: "" }, - ]); - }); - - it("returns 401 when authentication fails", async () => { - mockValidateAuthContext.mockResolvedValue( - NextResponse.json({ status: "error", error: "Unauthorized" }, { status: 401 }), - ); - - const request = createRequest({ subject: "Test" }); - const response = await createNotificationHandler(request); - - expect(response.status).toBe(401); - }); - - it("returns 400 when body validation fails", async () => { - const request = createRequest({}); - const response = await createNotificationHandler(request); - - expect(response.status).toBe(400); - const data = await response.json(); - expect(data.status).toBe("error"); - }); - - it("returns 400 when account has no email", async () => { - mockSelectAccountEmails.mockResolvedValue([]); - - const request = createRequest({ subject: "Test", text: "Hello" }); - const response = await createNotificationHandler(request); - - expect(response.status).toBe(400); - const data = await response.json(); - expect(data.error).toContain("No email address found"); - }); - - it("sends email to account owner with text body", async () => { - mockProcessAndSendEmail.mockResolvedValue({ - success: true, - message: - "Email sent successfully from Agent by Recoup to owner@example.com. CC: none.", - id: "email-123", - }); - - const request = createRequest({ - subject: "Test Subject", - text: "Hello world", - }); - const response = await createNotificationHandler(request); - - expect(response.status).toBe(200); - const data = await response.json(); - expect(data.success).toBe(true); - expect(data.id).toBe("email-123"); - expect(data.message).toContain("owner@example.com"); - expect(mockSelectAccountEmails).toHaveBeenCalledWith({ accountIds: "account-123" }); - expect(mockProcessAndSendEmail).toHaveBeenCalledWith({ - to: ["owner@example.com"], - cc: [], - subject: "Test Subject", - text: "Hello world", - html: "", - headers: {}, - room_id: undefined, - }); - }); - - it("passes CC and room_id through to processAndSendEmail", async () => { - mockProcessAndSendEmail.mockResolvedValue({ - success: true, - message: "Email sent successfully.", - id: "email-789", - }); - - const request = createRequest({ - cc: ["cc@example.com"], - subject: "Test", - text: "Hello", - room_id: "room-abc", - }); - const response = await createNotificationHandler(request); - - expect(response.status).toBe(200); - expect(mockProcessAndSendEmail).toHaveBeenCalledWith( - expect.objectContaining({ - cc: ["cc@example.com"], - room_id: "room-abc", - }), - ); - }); - - it("returns 502 when email delivery fails", async () => { - mockProcessAndSendEmail.mockResolvedValue({ - success: false, - error: "Rate limited", - }); - - const request = createRequest({ - subject: "Test", - text: "Hello", - }); - const response = await createNotificationHandler(request); - - expect(response.status).toBe(502); - const data = await response.json(); - expect(data.status).toBe("error"); - expect(data.error).toContain("Rate limited"); - }); - - it("resolves email from account_id override", async () => { - const overrideAccountId = "550e8400-e29b-41d4-a716-446655440000"; - - mockValidateAuthContext.mockResolvedValue({ - accountId: overrideAccountId, - orgId: "org-id", - authToken: "test-key", - }); - mockSelectAccountEmails.mockResolvedValue([ - { id: "email-2", account_id: overrideAccountId, email: "member@example.com", updated_at: "" }, - ]); - mockProcessAndSendEmail.mockResolvedValue({ - success: true, - message: "Email sent successfully to member@example.com.", - id: "email-override", - }); - - const request = createRequest({ - subject: "Override Test", - text: "Hello member", - account_id: overrideAccountId, - }); - const response = await createNotificationHandler(request); - - expect(response.status).toBe(200); - expect(mockValidateAuthContext).toHaveBeenCalledWith( - expect.anything(), - expect.objectContaining({ accountId: overrideAccountId }), - ); - expect(mockSelectAccountEmails).toHaveBeenCalledWith({ accountIds: overrideAccountId }); - expect(mockProcessAndSendEmail).toHaveBeenCalledWith( - expect.objectContaining({ - to: ["member@example.com"], - subject: "Override Test", - }), - ); - }); -}); diff --git a/lib/notifications/__tests__/validateCreateNotificationBody.test.ts b/lib/notifications/__tests__/validateCreateNotificationBody.test.ts deleted file mode 100644 index 10390b15d..000000000 --- a/lib/notifications/__tests__/validateCreateNotificationBody.test.ts +++ /dev/null @@ -1,212 +0,0 @@ -import { describe, it, expect, vi, beforeEach } from "vitest"; -import { NextRequest, NextResponse } from "next/server"; -import { validateCreateNotificationBody } from "../validateCreateNotificationBody"; - -const mockValidateAuthContext = vi.fn(); - -vi.mock("@/lib/auth/validateAuthContext", () => ({ - validateAuthContext: (...args: unknown[]) => mockValidateAuthContext(...args), -})); - -vi.mock("@/lib/networking/getCorsHeaders", () => ({ - getCorsHeaders: vi.fn(() => ({ "Access-Control-Allow-Origin": "*" })), -})); - -vi.mock("@/lib/networking/safeParseJson", () => ({ - safeParseJson: vi.fn(async (req: Request) => req.json()), -})); - -function createRequest(body: unknown, headers: Record = {}): NextRequest { - const defaultHeaders: Record = { "Content-Type": "application/json" }; - return new NextRequest("http://localhost/api/notifications", { - method: "POST", - headers: { ...defaultHeaders, ...headers }, - body: JSON.stringify(body), - }); -} - -describe("validateCreateNotificationBody", () => { - beforeEach(() => { - vi.clearAllMocks(); - mockValidateAuthContext.mockResolvedValue({ - accountId: "account-123", - orgId: null, - authToken: "test-api-key", - }); - }); - - describe("successful validation", () => { - it("returns validated data with subject and text", async () => { - const request = createRequest( - { subject: "Test Subject", text: "Hello world" }, - { "x-api-key": "test-api-key" }, - ); - const result = await validateCreateNotificationBody(request); - - expect(result).not.toBeInstanceOf(NextResponse); - if (!(result instanceof NextResponse)) { - expect(result.subject).toBe("Test Subject"); - expect(result.text).toBe("Hello world"); - expect(result.accountId).toBe("account-123"); - } - }); - - it("returns validated data with all optional fields", async () => { - const request = createRequest( - { - cc: ["cc@example.com"], - subject: "Test Subject", - text: "Hello", - html: "

Hello

", - headers: { "X-Custom": "value" }, - room_id: "room-123", - }, - { "x-api-key": "test-api-key" }, - ); - const result = await validateCreateNotificationBody(request); - - expect(result).not.toBeInstanceOf(NextResponse); - if (!(result instanceof NextResponse)) { - expect(result.cc).toEqual(["cc@example.com"]); - expect(result.subject).toBe("Test Subject"); - expect(result.text).toBe("Hello"); - expect(result.html).toBe("

Hello

"); - expect(result.headers).toEqual({ "X-Custom": "value" }); - expect(result.room_id).toBe("room-123"); - expect(result.accountId).toBe("account-123"); - } - }); - - it("accepts subject-only body", async () => { - const request = createRequest({ subject: "Test Subject" }, { "x-api-key": "test-api-key" }); - const result = await validateCreateNotificationBody(request); - - expect(result).not.toBeInstanceOf(NextResponse); - if (!(result instanceof NextResponse)) { - expect(result.subject).toBe("Test Subject"); - expect(result.accountId).toBe("account-123"); - } - }); - - it("uses account_id override for org API keys", async () => { - mockValidateAuthContext.mockResolvedValue({ - accountId: "550e8400-e29b-41d4-a716-446655440000", - orgId: "org-id", - authToken: "test-api-key", - }); - - const request = createRequest( - { subject: "Test", account_id: "550e8400-e29b-41d4-a716-446655440000" }, - { "x-api-key": "test-api-key" }, - ); - const result = await validateCreateNotificationBody(request); - - expect(mockValidateAuthContext).toHaveBeenCalledWith( - expect.anything(), - expect.objectContaining({ - accountId: "550e8400-e29b-41d4-a716-446655440000", - }), - ); - - expect(result).not.toBeInstanceOf(NextResponse); - if (!(result instanceof NextResponse)) { - expect(result.accountId).toBe("550e8400-e29b-41d4-a716-446655440000"); - } - }); - - it("passes undefined accountId to auth when account_id is omitted", async () => { - const request = createRequest({ subject: "Test" }, { "x-api-key": "test-api-key" }); - await validateCreateNotificationBody(request); - - expect(mockValidateAuthContext).toHaveBeenCalledWith(expect.anything(), { - accountId: undefined, - }); - }); - }); - - describe("schema validation errors", () => { - it("returns 400 when subject is missing", async () => { - const request = createRequest({ text: "Hello" }, { "x-api-key": "test-api-key" }); - const result = await validateCreateNotificationBody(request); - - expect(result).toBeInstanceOf(NextResponse); - if (result instanceof NextResponse) { - expect(result.status).toBe(400); - } - }); - - it("returns 400 when subject is empty", async () => { - const request = createRequest({ subject: "" }, { "x-api-key": "test-api-key" }); - const result = await validateCreateNotificationBody(request); - - expect(result).toBeInstanceOf(NextResponse); - if (result instanceof NextResponse) { - expect(result.status).toBe(400); - } - }); - - it("returns 400 when cc contains invalid email", async () => { - const request = createRequest( - { subject: "Test", cc: ["not-valid"] }, - { "x-api-key": "test-api-key" }, - ); - const result = await validateCreateNotificationBody(request); - - expect(result).toBeInstanceOf(NextResponse); - if (result instanceof NextResponse) { - expect(result.status).toBe(400); - } - }); - - it("returns 400 when account_id is not a valid UUID", async () => { - const request = createRequest( - { subject: "Test", account_id: "invalid-uuid" }, - { "x-api-key": "test-api-key" }, - ); - const result = await validateCreateNotificationBody(request); - - expect(result).toBeInstanceOf(NextResponse); - if (result instanceof NextResponse) { - expect(result.status).toBe(400); - } - }); - }); - - describe("auth errors", () => { - it("returns 401 when auth is missing", async () => { - mockValidateAuthContext.mockResolvedValue( - NextResponse.json({ status: "error", error: "Unauthorized" }, { status: 401 }), - ); - - const request = createRequest({ subject: "Test" }); - const result = await validateCreateNotificationBody(request); - - expect(result).toBeInstanceOf(NextResponse); - if (result instanceof NextResponse) { - expect(result.status).toBe(401); - } - }); - - it("returns 403 when org API key lacks access to account_id", async () => { - mockValidateAuthContext.mockResolvedValue( - NextResponse.json( - { status: "error", error: "Access denied to specified account_id" }, - { status: 403 }, - ), - ); - - const request = createRequest( - { subject: "Test", account_id: "550e8400-e29b-41d4-a716-446655440000" }, - { "x-api-key": "test-api-key" }, - ); - const result = await validateCreateNotificationBody(request); - - expect(result).toBeInstanceOf(NextResponse); - if (result instanceof NextResponse) { - expect(result.status).toBe(403); - const data = await result.json(); - expect(data.error).toBe("Access denied to specified account_id"); - } - }); - }); -}); diff --git a/lib/notifications/createNotificationHandler.ts b/lib/notifications/createNotificationHandler.ts deleted file mode 100644 index 35914a332..000000000 --- a/lib/notifications/createNotificationHandler.ts +++ /dev/null @@ -1,76 +0,0 @@ -import { NextRequest, NextResponse } from "next/server"; -import { getCorsHeaders } from "@/lib/networking/getCorsHeaders"; -import { validateCreateNotificationBody } from "./validateCreateNotificationBody"; -import { processAndSendEmail } from "@/lib/emails/processAndSendEmail"; -import selectAccountEmails from "@/lib/supabase/account_emails/selectAccountEmails"; - -/** - * Handler for POST /api/notifications. - * Sends a notification email to the authenticated account's email address. - * The recipient is automatically resolved from the API key or Bearer token. - * Supports optional account_id override for org API keys. - * Requires authentication via x-api-key header or Authorization bearer token. - * - * @param request - The request object. - * @returns A NextResponse with the send result. - */ -export async function createNotificationHandler(request: NextRequest): Promise { - const validated = await validateCreateNotificationBody(request); - if (validated instanceof NextResponse) { - return validated; - } - - const { cc = [], subject, text, html = "", headers = {}, room_id, accountId } = validated; - - // Resolve recipient email from authenticated account - const accountEmails = await selectAccountEmails({ accountIds: accountId }); - const recipientEmail = accountEmails?.[0]?.email; - - if (!recipientEmail) { - return NextResponse.json( - { - status: "error", - error: "No email address found for the authenticated account.", - }, - { - status: 400, - headers: getCorsHeaders(), - }, - ); - } - - const result = await processAndSendEmail({ - to: [recipientEmail], - cc, - subject, - text, - html, - headers, - room_id, - }); - - if (result.success === false) { - return NextResponse.json( - { - status: "error", - error: result.error, - }, - { - status: 502, - headers: getCorsHeaders(), - }, - ); - } - - return NextResponse.json( - { - success: true, - message: result.message, - id: result.id, - }, - { - status: 200, - headers: getCorsHeaders(), - }, - ); -} diff --git a/lib/notifications/validateCreateNotificationBody.ts b/lib/notifications/validateCreateNotificationBody.ts deleted file mode 100644 index 33e3b6fad..000000000 --- a/lib/notifications/validateCreateNotificationBody.ts +++ /dev/null @@ -1,74 +0,0 @@ -import { NextRequest, NextResponse } from "next/server"; -import { getCorsHeaders } from "@/lib/networking/getCorsHeaders"; -import { validateAuthContext } from "@/lib/auth/validateAuthContext"; -import { safeParseJson } from "@/lib/networking/safeParseJson"; -import { z } from "zod"; - -export const createNotificationBodySchema = z.object({ - cc: z.array(z.string().email("each 'cc' entry must be a valid email")).default([]).optional(), - subject: z.string({ message: "subject is required" }).min(1, "subject cannot be empty"), - text: z.string().optional(), - html: z.string().default("").optional(), - headers: z.record(z.string(), z.string()).default({}).optional(), - room_id: z.string().optional(), - account_id: z.string().uuid("account_id must be a valid UUID").optional(), -}); - -export type CreateNotificationBody = z.infer; - -export type ValidatedCreateNotificationRequest = { - cc?: string[]; - subject: string; - text?: string; - html?: string; - headers?: Record; - room_id?: string; - accountId: string; -}; - -/** - * Validates POST /api/notifications request including auth headers, body parsing, - * schema validation, and account access authorization. - * - * @param request - The NextRequest object - * @returns A NextResponse with an error if validation fails, or the validated request data. - */ -export async function validateCreateNotificationBody( - request: NextRequest, -): Promise { - const body = await safeParseJson(request); - const result = createNotificationBodySchema.safeParse(body); - - if (!result.success) { - const firstError = result.error.issues[0]; - return NextResponse.json( - { - status: "error", - missing_fields: firstError.path, - error: firstError.message, - }, - { - status: 400, - headers: getCorsHeaders(), - }, - ); - } - - const authContext = await validateAuthContext(request, { - accountId: result.data.account_id, - }); - - if (authContext instanceof NextResponse) { - return authContext; - } - - return { - cc: result.data.cc, - subject: result.data.subject, - text: result.data.text, - html: result.data.html, - headers: result.data.headers, - room_id: result.data.room_id, - accountId: authContext.accountId, - }; -} From 8689c21da22f2f7462700f1346d2f9cd590d6460 Mon Sep 17 00:00:00 2001 From: Sweets Sweetman Date: Mon, 29 Jun 2026 18:30:38 -0500 Subject: [PATCH 2/2] =?UTF-8?q?fix:=20repoint=20dead=20.com=20hosts=20to?= =?UTF-8?q?=20live=20.dev=20(recoupable/chat#1819=20=C2=A7A+=C2=A7B)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Repoint the dead chat.recoupable.com and docs/developers.recoupable.com hosts to their live .dev equivalents, routing all chat-app links through the existing getFrontendBaseUrl() centralizer (DRY) and docs links through a new DOCS_BASE_URL constant in lib/const.ts. - getFrontendBaseUrl(): production fallback chat.recoupable.com -> .dev - getEmailFooter, buildTaskCard, handleGitHubWebhook: build chat/task links from getFrontendBaseUrl() instead of hardcoded .com literals - app/page.tsx: docs link -> DOCS_BASE_URL (docs.recoupable.dev) - app/api/chat/route.ts contract comment + recoupApiSkillPrompt: doc host developers.recoupable.com -> docs.recoupable.dev - extractRoomIdFromHtml/Text: widen host regex to recoupable.(com|dev) so post-migration .dev links extract while legacy .com links in flight still match. RED->GREEN test added for the .dev case in both suites. Excluded: lib/credits/const.ts sandbox.recoupable.com link — sandbox.recoupable.dev is not yet provisioned (404), so it stays .com pending a sandbox .dev domain. Co-Authored-By: Claude Opus 4.8 (1M context) --- app/api/chat/route.ts | 2 +- app/page.tsx | 3 +- lib/agents/__tests__/buildTaskCard.test.ts | 5 ++-- lib/agents/buildTaskCard.ts | 5 ++-- lib/chat/recoupApiSkillPrompt.ts | 2 +- lib/coding-agent/handleGitHubWebhook.ts | 3 +- lib/composio/getFrontendBaseUrl.ts | 2 +- lib/const.ts | 3 ++ lib/emails/__tests__/getEmailFooter.test.ts | 5 ++-- lib/emails/getEmailFooter.ts | 7 +++-- .../__tests__/extractRoomIdFromHtml.test.ts | 16 ++++++++++ .../__tests__/extractRoomIdFromText.test.ts | 9 ++++++ lib/emails/inbound/extractRoomIdFromHtml.ts | 30 +++++++++++-------- lib/emails/inbound/extractRoomIdFromText.ts | 4 ++- 14 files changed, 69 insertions(+), 27 deletions(-) diff --git a/app/api/chat/route.ts b/app/api/chat/route.ts index 2df3c5016..8af93ad7a 100644 --- a/app/api/chat/route.ts +++ b/app/api/chat/route.ts @@ -25,7 +25,7 @@ export async function OPTIONS() { * retained as a backward-compatible alias while consumers (chat, * open-agents, API-key callers) migrate to `/api/chat`. * - * Contract: https://developers.recoupable.com/api-reference/chat/workflow + * Contract: https://docs.recoupable.dev/api-reference/chat/workflow * * @param request - The incoming NextRequest. * @returns A streaming Response (200) or a NextResponse error. diff --git a/app/page.tsx b/app/page.tsx index a6a6b0508..139add5d1 100644 --- a/app/page.tsx +++ b/app/page.tsx @@ -1,4 +1,5 @@ import Image from "next/image"; +import { DOCS_BASE_URL } from "@/lib/const"; export default function Home() { return ( @@ -24,7 +25,7 @@ export default function Home() {
diff --git a/lib/agents/__tests__/buildTaskCard.test.ts b/lib/agents/__tests__/buildTaskCard.test.ts index b8c50525f..4b4a45ea7 100644 --- a/lib/agents/__tests__/buildTaskCard.test.ts +++ b/lib/agents/__tests__/buildTaskCard.test.ts @@ -2,6 +2,7 @@ import { describe, it, expect, vi } from "vitest"; import { buildTaskCard } from "../buildTaskCard"; import { LinkButton } from "chat"; +import { getFrontendBaseUrl } from "@/lib/composio/getFrontendBaseUrl"; vi.mock("chat", () => ({ Card: vi.fn(({ title, children }) => ({ type: "card", title, children })), @@ -28,7 +29,7 @@ describe("buildTaskCard", () => { buttons: [ { type: "linkButton", - url: "https://chat.recoupable.com/tasks/run-abc-123", + url: `${getFrontendBaseUrl()}/tasks/run-abc-123`, label: "View Task", }, ], @@ -42,7 +43,7 @@ describe("buildTaskCard", () => { buildTaskCard("Title", "Message", "my-run-id"); expect(LinkButton).toHaveBeenCalledWith({ - url: "https://chat.recoupable.com/tasks/my-run-id", + url: `${getFrontendBaseUrl()}/tasks/my-run-id`, label: "View Task", }); }); diff --git a/lib/agents/buildTaskCard.ts b/lib/agents/buildTaskCard.ts index 27869c76d..de4ae0fc1 100644 --- a/lib/agents/buildTaskCard.ts +++ b/lib/agents/buildTaskCard.ts @@ -1,4 +1,5 @@ import { Card, CardText, Actions, LinkButton } from "chat"; +import { getFrontendBaseUrl } from "@/lib/composio/getFrontendBaseUrl"; /** * Builds a Card with a message and a View Task button. @@ -13,9 +14,7 @@ export function buildTaskCard(title: string, message: string, runId: string) { title, children: [ CardText(message), - Actions([ - LinkButton({ url: `https://chat.recoupable.com/tasks/${runId}`, label: "View Task" }), - ]), + Actions([LinkButton({ url: `${getFrontendBaseUrl()}/tasks/${runId}`, label: "View Task" })]), ], }); } diff --git a/lib/chat/recoupApiSkillPrompt.ts b/lib/chat/recoupApiSkillPrompt.ts index 446c3cd54..2a0fb41c9 100644 --- a/lib/chat/recoupApiSkillPrompt.ts +++ b/lib/chat/recoupApiSkillPrompt.ts @@ -12,4 +12,4 @@ * (recoupable/chat#1815). */ export const recoupApiSkillPrompt = - 'If you\'re asked to do anything involving their Recoup account — artists, socials, orgs, research, tasks, chats, pulses, subscriptions, **sending an email or delivering a report**, or any other resource/action at recoup-api.vercel.app / developers.recoupable.com — load the right skill first instead of guessing or assuming you lack a tool. For live data or actions against the API (socials, posts, metrics, research, tasks, and **sending email via `POST /api/emails`** — e.g. "email X to Y", scheduled-report output) load `recoup-platform-api-access`; when `RECOUP_ORG_ID` is set in the env, scope list endpoints to that org (`/api/organizations/$RECOUP_ORG_ID/...`, `--org $RECOUP_ORG_ID`) so you get the sandbox\'s org, not every org the user belongs to. For inventory questions about this sandbox ("what artists / orgs do I have", "list my artists", "what\'s in here") load `recoup-roster-list-artists` — the `artists/{artist-slug}/RECOUP.md` tree is authoritative for this sandbox (it is already org-scoped — its repo IS the org — so artists live at the top level, not under an `orgs/` directory) and the API is not. For create-artist intents ("create artist", "onboard X", "add an artist") load `recoup-roster-add-artist`; to operate inside one artist\'s folder load `recoup-roster-manage-artist`; to scaffold the folder tree load `recoup-platform-build-workspace`. Treat ambiguous account-data questions as Recoup questions by default, not repo-level TODOs.'; + 'If you\'re asked to do anything involving their Recoup account — artists, socials, orgs, research, tasks, chats, pulses, subscriptions, **sending an email or delivering a report**, or any other resource/action at recoup-api.vercel.app / docs.recoupable.dev — load the right skill first instead of guessing or assuming you lack a tool. For live data or actions against the API (socials, posts, metrics, research, tasks, and **sending email via `POST /api/emails`** — e.g. "email X to Y", scheduled-report output) load `recoup-platform-api-access`; when `RECOUP_ORG_ID` is set in the env, scope list endpoints to that org (`/api/organizations/$RECOUP_ORG_ID/...`, `--org $RECOUP_ORG_ID`) so you get the sandbox\'s org, not every org the user belongs to. For inventory questions about this sandbox ("what artists / orgs do I have", "list my artists", "what\'s in here") load `recoup-roster-list-artists` — the `artists/{artist-slug}/RECOUP.md` tree is authoritative for this sandbox (it is already org-scoped — its repo IS the org — so artists live at the top level, not under an `orgs/` directory) and the API is not. For create-artist intents ("create artist", "onboard X", "add an artist") load `recoup-roster-add-artist`; to operate inside one artist\'s folder load `recoup-roster-manage-artist`; to scaffold the folder tree load `recoup-platform-build-workspace`. Treat ambiguous account-data questions as Recoup questions by default, not repo-level TODOs.'; diff --git a/lib/coding-agent/handleGitHubWebhook.ts b/lib/coding-agent/handleGitHubWebhook.ts index fd6e5fc93..7153822d7 100644 --- a/lib/coding-agent/handleGitHubWebhook.ts +++ b/lib/coding-agent/handleGitHubWebhook.ts @@ -6,6 +6,7 @@ import { extractPRComment } from "./extractPRComment"; import { getCodingAgentPRState, setCodingAgentPRState } from "./prState"; import { triggerUpdatePR } from "@/lib/trigger/triggerUpdatePR"; import { postGitHubComment } from "./postGitHubComment"; +import { getFrontendBaseUrl } from "@/lib/composio/getFrontendBaseUrl"; const BOT_MENTION = "@recoup-coding-agent"; @@ -97,7 +98,7 @@ export async function handleGitHubWebhook(request: Request): Promise { it("includes reply note in all cases", () => { @@ -21,14 +22,14 @@ describe("getEmailFooter", () => { it("includes chat link when roomId is provided", () => { const roomId = "test-room-123"; const footer = getEmailFooter(roomId); - expect(footer).toContain(`https://chat.recoupable.com/chat/${roomId}`); + expect(footer).toContain(`${getFrontendBaseUrl()}/chat/${roomId}`); expect(footer).toContain("Or continue the conversation on Recoup"); }); it("generates proper HTML with roomId", () => { const roomId = "my-room-id"; const footer = getEmailFooter(roomId); - expect(footer).toContain(`href="https://chat.recoupable.com/chat/${roomId}"`); + expect(footer).toContain(`href="${getFrontendBaseUrl()}/chat/${roomId}"`); expect(footer).toContain('target="_blank"'); expect(footer).toContain('rel="noopener noreferrer"'); }); diff --git a/lib/emails/getEmailFooter.ts b/lib/emails/getEmailFooter.ts index 6fe173d0b..3d211f798 100644 --- a/lib/emails/getEmailFooter.ts +++ b/lib/emails/getEmailFooter.ts @@ -1,3 +1,5 @@ +import { getFrontendBaseUrl } from "@/lib/composio/getFrontendBaseUrl"; + /** * Generates a standardized email footer HTML. * @@ -6,6 +8,7 @@ * @returns HTML string for the email footer. */ export function getEmailFooter(roomId?: string, artistName?: string): string { + const chatUrl = roomId ? `${getFrontendBaseUrl()}/chat/${roomId}` : ""; const artistLine = artistName ? `

@@ -22,8 +25,8 @@ export function getEmailFooter(roomId?: string, artistName?: string): string { ? `

Or continue the conversation on Recoup: - - https://chat.recoupable.com/chat/${roomId} + + ${chatUrl}

`.trim() : ""; diff --git a/lib/emails/inbound/__tests__/extractRoomIdFromHtml.test.ts b/lib/emails/inbound/__tests__/extractRoomIdFromHtml.test.ts index d7aebeea3..4a7231d81 100644 --- a/lib/emails/inbound/__tests__/extractRoomIdFromHtml.test.ts +++ b/lib/emails/inbound/__tests__/extractRoomIdFromHtml.test.ts @@ -60,6 +60,22 @@ describe("extractRoomIdFromHtml", () => { }); }); + describe(".dev domain (post-migration links)", () => { + it("extracts roomId from a chat.recoupable.dev link", () => { + const html = ` + + +

Continue the conversation: https://chat.recoupable.dev/chat/b2c3d4e5-f6a7-8901-bcde-f23456789012

+ + + `; + + const result = extractRoomIdFromHtml(html); + + expect(result).toBe("b2c3d4e5-f6a7-8901-bcde-f23456789012"); + }); + }); + describe("Gmail reply with proper threading", () => { it("extracts roomId from Gmail reply with quoted content", () => { const html = ` diff --git a/lib/emails/inbound/__tests__/extractRoomIdFromText.test.ts b/lib/emails/inbound/__tests__/extractRoomIdFromText.test.ts index 2db2eb66d..e817ae160 100644 --- a/lib/emails/inbound/__tests__/extractRoomIdFromText.test.ts +++ b/lib/emails/inbound/__tests__/extractRoomIdFromText.test.ts @@ -27,6 +27,15 @@ describe("extractRoomIdFromText", () => { expect(result).toBe("a1b2c3d4-e5f6-7890-abcd-ef1234567890"); }); + it("extracts roomId from a chat.recoupable.dev link (post-migration)", () => { + const text = + "Check out this chat: https://chat.recoupable.dev/chat/b2c3d4e5-f6a7-8901-bcde-f23456789012"; + + const result = extractRoomIdFromText(text); + + expect(result).toBe("b2c3d4e5-f6a7-8901-bcde-f23456789012"); + }); + it("handles case-insensitive domain matching", () => { const text = "Visit HTTPS://CHAT.RECOUPABLE.COM/CHAT/12345678-1234-1234-1234-123456789abc"; diff --git a/lib/emails/inbound/extractRoomIdFromHtml.ts b/lib/emails/inbound/extractRoomIdFromHtml.ts index 6a48f954b..0b29745f9 100644 --- a/lib/emails/inbound/extractRoomIdFromHtml.ts +++ b/lib/emails/inbound/extractRoomIdFromHtml.ts @@ -1,16 +1,21 @@ const UUID_PATTERN = "[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}"; -// Matches chat.recoupable.com/chat/{uuid} in various formats: -// - Direct URL: https://chat.recoupable.com/chat/uuid -// - URL-encoded (in tracking redirects): chat.recoupable.com%2Fchat%2Fuuid +// Matches chat.recoupable.com or chat.recoupable.dev /chat/{uuid} in various formats. +// Both hosts are recognized so legacy .com links still in flight resolve alongside +// post-migration .dev links: +// - Direct URL: https://chat.recoupable.dev/chat/uuid +// - URL-encoded (in tracking redirects): chat.recoupable.dev%2Fchat%2Fuuid const CHAT_LINK_PATTERNS = [ - new RegExp(`https?://chat\\.recoupable\\.com/chat/(${UUID_PATTERN})`, "i"), - new RegExp(`chat\\.recoupable\\.com%2Fchat%2F(${UUID_PATTERN})`, "i"), + new RegExp(`https?://chat\\.recoupable\\.(com|dev)/chat/(${UUID_PATTERN})`, "i"), + new RegExp(`chat\\.recoupable\\.(com|dev)%2Fchat%2F(${UUID_PATTERN})`, "i"), ]; // Pattern to find UUID after /chat/ or %2Fchat%2F in link text that may contain tags -// The link text version: "https:///chat.recoupable.com/chat/uuid" -const WBR_STRIPPED_PATTERN = new RegExp(`chat\\.recoupable\\.com/chat/(${UUID_PATTERN})`, "i"); +// The link text version: "https:///chat.recoupable.dev/chat/uuid" +const WBR_STRIPPED_PATTERN = new RegExp( + `chat\\.recoupable\\.(com|dev)/chat/(${UUID_PATTERN})`, + "i", +); /** * Extracts the roomId from email HTML by looking for a Recoup chat link. @@ -25,11 +30,12 @@ const WBR_STRIPPED_PATTERN = new RegExp(`chat\\.recoupable\\.com/chat/(${UUID_PA export function extractRoomIdFromHtml(html: string | undefined): string | undefined { if (!html) return undefined; - // Try direct URL patterns first (most common case) + // Try direct URL patterns first (most common case). + // Group 1 is the host suffix (com|dev); group 2 is the UUID. for (const pattern of CHAT_LINK_PATTERNS) { const match = html.match(pattern); - if (match?.[1]) { - return match[1]; + if (match?.[2]) { + return match[2]; } } @@ -37,8 +43,8 @@ export function extractRoomIdFromHtml(html: string | undefined): string | undefi // This handles Superhuman's link text formatting: "https://chat...." const strippedHtml = html.replace(//gi, ""); const strippedMatch = strippedHtml.match(WBR_STRIPPED_PATTERN); - if (strippedMatch?.[1]) { - return strippedMatch[1]; + if (strippedMatch?.[2]) { + return strippedMatch[2]; } return undefined; diff --git a/lib/emails/inbound/extractRoomIdFromText.ts b/lib/emails/inbound/extractRoomIdFromText.ts index 446bdbbef..b6a0aba3b 100644 --- a/lib/emails/inbound/extractRoomIdFromText.ts +++ b/lib/emails/inbound/extractRoomIdFromText.ts @@ -1,4 +1,6 @@ -const CHAT_LINK_REGEX = /https:\/\/chat\.recoupable\.com\/chat\/([0-9a-f-]{36})/i; +// Recognizes both the legacy .com host (links still in flight) and the +// post-migration .dev host. (?:com|dev) is non-capturing so the UUID stays group 1. +const CHAT_LINK_REGEX = /https:\/\/chat\.recoupable\.(?:com|dev)\/chat\/([0-9a-f-]{36})/i; /** * Extracts the roomId from the email text body by looking for a Recoup chat link.