Merge remote-tracking branch 'origin/staging' into fix/secrets-sanitization-trace-spans

Author: icecrasher321

.devcontainer/docker-compose.yml

@@ -19,6 +19,7 @@ services:
       - BETTER_AUTH_SECRET=${BETTER_AUTH_SECRET:-your_auth_secret_here}
       - ENCRYPTION_KEY=${ENCRYPTION_KEY:-your_encryption_key_here}
       - COPILOT_API_KEY=${COPILOT_API_KEY}
+      - NEXT_PUBLIC_CHAT_DISABLED=${NEXT_PUBLIC_CHAT_DISABLED:-}
       - SIM_AGENT_API_URL=${SIM_AGENT_API_URL}
       - OLLAMA_URL=${OLLAMA_URL:-http://localhost:11434}
       - NEXT_PUBLIC_SOCKET_URL=${NEXT_PUBLIC_SOCKET_URL:-}

apps/docs/content/docs/en/integrations/managed_agent.mdx

@@ -64,4 +64,200 @@ Open a Claude Platform Managed Agent session and return the assistant response a
 | `inputTokens` | number | Cumulative input tokens for the session. |
 | `outputTokens` | number | Cumulative output tokens for the session. |
 
+### `managed_agent_create_session`
+
+Create a Claude Platform Managed Agent session and return its id without waiting for a reply.
+
+#### Input
+
+| Parameter | Type | Required | Description |
+| --------- | ---- | -------- | ----------- |
+| `agent` | string | Yes | Managed-agent id inside the linked Claude workspace. |
+| `environment` | string | Yes | Environment id inside the linked Claude workspace. |
+| `environmentType` | string | No | Environment execution model hint \('cloud' \| 'self_hosted'\). |
+| `userMessage` | string | No | Optional first message; seeds initial_events and starts the agent immediately. |
+| `vaults` | array | No | Zero or more vault ids for MCP tool auth. |
+| `vaultsAck` | boolean | No | Acknowledgement that the author may use the attached vaults. |
+| `memoryStoreId` | string | No | Optional Agent Memory Store id. |
+| `memoryAccess` | string | No | Memory store access mode: 'read_write' \(default\) or 'read_only'. |
+| `memoryInstructions` | string | No | Per-attachment guidance for how the agent should use the memory store. |
+| `files` | array | No | File attachments \(cloud envs only\), as \[\{fileId, mountPath?\}\]. |
+| `sessionParameters` | object | No | Key/value session metadata forwarded to the session. |
+
+#### Output
+
+| Parameter | Type | Description |
+| --------- | ---- | ----------- |
+| `sessionId` | string | Anthropic session id \(sesn_...\). |
+| `started` | boolean | True when a first message was seeded, so the agent is already running. |
+
+### `managed_agent_send_message`
+
+Send a user message to an existing Claude Platform Managed Agent session.
+
+#### Input
+
+| Parameter | Type | Required | Description |
+| --------- | ---- | -------- | ----------- |
+| `userMessage` | string | Yes | The user message to send to the session. |
+
+#### Output
+
+| Parameter | Type | Description |
+| --------- | ---- | ----------- |
+| `sessionId` | string | The session the message was sent to. |
+| `sent` | boolean | True when the event was accepted by the API. |
+
+### `managed_agent_get_session`
+
+Read a Managed Agent session: status, stop reason, token usage, metadata, and any tool calls awaiting approval.
+
+#### Input
+
+| Parameter | Type | Required | Description |
+| --------- | ---- | -------- | ----------- |
+
+#### Output
+
+| Parameter | Type | Description |
+| --------- | ---- | ----------- |
+| `sessionId` | string | The session that was read. |
+| `status` | string | Session status — 'idle', 'running', 'rescheduling', or 'terminated'. |
+| `stopReason` | string | Why the session last stopped, e.g. 'end_turn' or 'requires_action'. |
+| `requiresAction` | boolean | True when the session is waiting on a tool confirmation or custom tool result. If this is true while pendingTools is empty, the session is blocked but the API named no blocking events — surface it rather than treating the session as done. |
+| `pendingTools` | json | Blocking tool calls — \[\{id, eventType, kind, name, input\}\]. Route by kind: 'confirmation' ids go to Respond To Tool Confirmation, 'custom_tool_result' ids go to Respond To Custom Tool. |
+| `metadata` | json | Session metadata. |
+| `title` | string | Session title. |
+| `inputTokens` | number | Cumulative input tokens. |
+| `outputTokens` | number | Cumulative output tokens. |
+
+### `managed_agent_list_events`
+
+Read a Managed Agent session's event history and the agent's reply text.
+
+#### Input
+
+| Parameter | Type | Required | Description |
+| --------- | ---- | -------- | ----------- |
+| `eventTypes` | array | No | Optional event-type filter, e.g. \['agent.message'\]. Omit to return every event. |
+| `limit` | number | No | Maximum events to return, keeping the most recent \(default 500\). |
+
+#### Output
+
+| Parameter | Type | Description |
+| --------- | ---- | ----------- |
+| `sessionId` | string | The session that was read. |
+| `events` | json | Session events, oldest first. |
+| `count` | number | Number of events returned. |
+| `assistantText` | string | Concatenated text of every persisted agent.message, in order. |
+| `truncated` | boolean | True when the limit was hit and older events were dropped. |
+
+### `managed_agent_update_session`
+
+Update a Managed Agent session's title or metadata.
+
+#### Input
+
+| Parameter | Type | Required | Description |
+| --------- | ---- | -------- | ----------- |
+| `title` | string | No | New session title. |
+| `sessionParameters` | object | No | Replacement metadata map \(replaces all stored metadata, not merged\). Leaving it empty leaves the stored metadata unchanged — use clearMetadata to remove it. |
+| `clearMetadata` | boolean | No | Removes all of the session's stored metadata. Overrides any map supplied above. |
+
+#### Output
+
+| Parameter | Type | Description |
+| --------- | ---- | ----------- |
+| `sessionId` | string | The session that was updated. |
+| `updated` | boolean | True when the update was accepted. |
+| `metadata` | json | Metadata after the update. |
+| `title` | string | Title after the update. |
+
+### `managed_agent_interrupt_session`
+
+Stop a running Managed Agent session; it stays usable afterwards.
+
+#### Input
+
+| Parameter | Type | Required | Description |
+| --------- | ---- | -------- | ----------- |
+
+#### Output
+
+| Parameter | Type | Description |
+| --------- | ---- | ----------- |
+| `sessionId` | string | The session that was interrupted. |
+| `interrupted` | boolean | True when the interrupt was accepted. |
+
+### `managed_agent_respond_tool_confirmation`
+
+Allow or deny the tool calls a Managed Agent session is waiting on before it can continue.
+
+#### Input
+
+| Parameter | Type | Required | Description |
+| --------- | ---- | -------- | ----------- |
+| `toolUseIds` | array | Yes | Blocking tool-use EVENT ids, from Get Session pendingTools\[\].id where kind is 'confirmation' \(not toolu_ ids\). |
+| `decision` | string | Yes | 'allow' to let the tools run, or 'deny' to reject them. |
+| `denyMessage` | string | No | Reason surfaced to the agent. Only sent when the decision is deny. |
+
+#### Output
+
+| Parameter | Type | Description |
+| --------- | ---- | ----------- |
+| `sessionId` | string | The session that was answered. |
+| `decision` | string | The decision applied — 'allow' or 'deny'. |
+| `confirmedToolUseIds` | json | The tool-use event ids that were answered. |
+
+### `managed_agent_respond_custom_tool`
+
+Return the result of a custom tool a Managed Agent session is waiting on so it can continue.
+
+#### Input
+
+| Parameter | Type | Required | Description |
+| --------- | ---- | -------- | ----------- |
+| `customToolUseId` | string | Yes | The custom tool-use EVENT id being answered, from Get Session pendingTools\[\].id where kind is 'custom_tool_result'. |
+| `result` | string | Yes | The tool's output, returned to the agent as text. |
+| `isError` | boolean | No | Mark the result as a failure so the agent can adjust its approach. |
+
+#### Output
+
+| Parameter | Type | Description |
+| --------- | ---- | ----------- |
+| `sessionId` | string | The session that was answered. |
+| `answeredToolUseId` | string | The custom tool-use event id that was answered. |
+
+### `managed_agent_archive_session`
+
+Archive a Managed Agent session, preserving its history. Not reversible.
+
+#### Input
+
+| Parameter | Type | Required | Description |
+| --------- | ---- | -------- | ----------- |
+
+#### Output
+
+| Parameter | Type | Description |
+| --------- | ---- | ----------- |
+| `sessionId` | string | The session that was archived. |
+| `archived` | boolean | True when the archive was accepted. |
+
+### `managed_agent_delete_session`
+
+Permanently delete a Managed Agent session, its events, and its sandbox. Not reversible.
+
+#### Input
+
+| Parameter | Type | Required | Description |
+| --------- | ---- | -------- | ----------- |
+
+#### Output
+
+| Parameter | Type | Description |
+| --------- | ---- | ----------- |
+| `sessionId` | string | The session that was deleted. |
+| `deleted` | boolean | True when the delete was accepted. |
+
 

apps/docs/content/docs/en/platform/self-hosting/environment-variables.mdx

@@ -64,7 +64,8 @@ import { Callout } from 'fumadocs-ui/components/callout'
 | Variable | Description |
 |----------|-------------|
 | `API_ENCRYPTION_KEY` | Encrypts stored API keys (32 hex chars): `openssl rand -hex 32` |
-| `COPILOT_API_KEY` | API key for copilot features |
+| `COPILOT_API_KEY` | API key for Chat. Without it the Sim Chat block, scheduled prompt jobs, and Inbox cannot run |
+| `NEXT_PUBLIC_CHAT_DISABLED` | Set to `true` to hide the Chat module: the workspace lands on your first workflow, with no chats list, scheduled tasks, or editor Chat panel. Chat is shown when unset; `bun run setup` sets it for you if you skip the chat key |
 | `ADMIN_API_KEY` | Admin API key for GitOps operations |
 | `ALLOWED_LOGIN_DOMAINS` | Restrict signups to domains (comma-separated) |
 | `ALLOWED_LOGIN_EMAILS` | Restrict signups to specific emails (comma-separated) |

apps/sim/.env.example

@@ -21,6 +21,10 @@ NEXT_PUBLIC_APP_URL=http://localhost:3000
 # TRUSTED_ORIGINS=https://www.example.com,https://app.example.com  # Optional: comma-separated additional public origins to trust for auth (apex+www, alias domains). Merged into Better Auth trustedOrigins.
 # AUTH_TRUSTED_PROXIES=10.0.0.0/24,192.0.2.10  # Optional: reverse-proxy IPs/CIDRs in front of the app. Better Auth walks x-forwarded-for right to left, skips these hops, and uses the first untrusted address as the client IP (prevents forwarded-header spoofing). Use your proxies' actual addresses, not broad private ranges that also cover clients.
 
+# Chat (Optional)
+# COPILOT_API_KEY=                      # Mint one at https://sim.ai. Without it the Sim Chat block, prompt jobs, and Inbox cannot run
+# NEXT_PUBLIC_CHAT_DISABLED=true        # Hides the Chat module: the workspace lands on your first workflow, and the chats list, scheduled tasks, and editor Chat panel are absent. Chat is shown when unset; `bun run setup` sets this for you if you skip the chat key
+
 # Security (Required)
 ENCRYPTION_KEY=your_encryption_key  # Use `openssl rand -hex 32` to generate, used to encrypt environment variables
 INTERNAL_API_SECRET=your_internal_api_secret # Use `openssl rand -hex 32` to generate, used to encrypt internal api routes

apps/sim/app/api/auth/oauth2/callback/instagram/route.ts

@@ -17,14 +17,14 @@ import { getBaseUrl } from '@/lib/core/utils/urls'
 import { isSameOrigin } from '@/lib/core/utils/validation'
 import { withRouteHandler } from '@/lib/core/utils/with-route-handler'
 import { processCredentialDraft } from '@/lib/credentials/draft-processor'
-import { INSTAGRAM_GRAPH_BASE } from '@/lib/integrations/instagram/constants'
 import {
   parseInstagramLongLivedToken,
   parseInstagramProfile,
   parseInstagramShortLivedToken,
 } from '@/lib/oauth/instagram'
 import { getCanonicalScopesForProvider } from '@/lib/oauth/utils'
 import { safeAccountInsert } from '@/app/api/auth/oauth/utils'
+import { INSTAGRAM_GRAPH_BASE } from '@/tools/instagram/constants'
 
 const logger = createLogger('InstagramCallback')
 

apps/sim/app/api/mothership/events/route.ts

@@ -11,6 +11,7 @@ import type { NextRequest } from 'next/server'
 import { mothershipEventsQuerySchema } from '@/lib/api/contracts/mothership-chats'
 import { validationErrorResponse } from '@/lib/api/server'
 import { chatPubSub } from '@/lib/copilot/chat-status'
+import { isChatEnabled } from '@/lib/core/config/env-flags'
 import { withRouteHandler } from '@/lib/core/utils/with-route-handler'
 import { createWorkspaceSSE } from '@/lib/events/sse-endpoint'
 
@@ -37,6 +38,10 @@ const mothershipEventsHandler = createWorkspaceSSE({
 })
 
 export const GET = withRouteHandler((request: NextRequest) => {
+  // Closes streams held by tabs that were open when Chat was turned off; the
+  // client hook already declines to open new ones.
+  if (!isChatEnabled) return new Response(null, { status: 404 })
+
   const validation = mothershipEventsQuerySchema.safeParse(
     Object.fromEntries(request.nextUrl.searchParams.entries())
   )

apps/sim/app/api/schedules/execute/route.test.ts

@@ -9,6 +9,8 @@ import {
   requestUtilsMockFns,
   resetDbChainMock,
   resetEnvFlagsMock,
+  resetEnvMock,
+  setEnv,
   setEnvFlags,
 } from '@sim/testing'
 import { type NextRequest, NextResponse } from 'next/server'
@@ -275,7 +277,10 @@ function createMockRequest(): NextRequest {
   } as NextRequest
 }
 
-afterAll(resetEnvFlagsMock)
+afterAll(() => {
+  resetEnvFlagsMock()
+  resetEnvMock()
+})
 
 describe('Scheduled Workflow Execution API Route', () => {
   beforeEach(() => {
@@ -290,6 +295,9 @@ describe('Scheduled Workflow Execution API Route', () => {
     dbChainMockFns.execute.mockResolvedValue([{ acquired: true }] as never)
     requestUtilsMockFns.mockGenerateRequestId.mockReturnValue('test-request-id')
     setEnvFlags({ isTriggerDevEnabled: false, isHosted: false, isProd: false, isDev: true })
+    // Prompt-job claims are skipped without the mothership credential; pin it so
+    // these cases do not depend on whether the runner happens to have a .env.
+    setEnv({ COPILOT_API_KEY: 'test-api-key' })
     mockShouldExecuteInline.mockReturnValue(false)
     mockEnqueue.mockReset()
     mockEnqueue.mockResolvedValue('job-id-1')

apps/sim/app/api/schedules/execute/route.ts

@@ -17,6 +17,7 @@ import {
 } from '@/lib/billing/core/billing-attribution'
 import { getJobQueue, shouldExecuteInline } from '@/lib/core/async-jobs'
 import { JOB_STATUS, type Job } from '@/lib/core/async-jobs/types'
+import { env } from '@/lib/core/config/env'
 import { isRetryableInfrastructureError } from '@/lib/core/errors/retryable-infrastructure'
 import { getMaxExecutionTimeout } from '@/lib/core/execution-limits'
 import { runDetached } from '@/lib/core/utils/background'
@@ -1245,7 +1246,18 @@ export async function runScheduleTick(requestId: string): Promise<ScheduleTickRe
   let iterations = 0
   let remainingWorkflowBudget = SCHEDULE_WORKFLOW_ENQUEUE_LIMIT
   let schedulesExhausted = false
-  let jobsExhausted = false
+  /**
+   * Prompt jobs run through the mothership, so without a key every claim ends in
+   * a 401. Skipping the claim entirely leaves the rows `active` and resumable;
+   * claiming them would burn each one through `MAX_CONSECUTIVE_FAILURES` and
+   * permanently disable a schedule the user can no longer see, let alone stop.
+   * Keyed on the credential rather than `CHAT_ENABLED` so jobs keep running for
+   * a deployment that only hid the UI.
+   */
+  let jobsExhausted = !env.COPILOT_API_KEY
+  if (jobsExhausted) {
+    logger.info(`[${requestId}] COPILOT_API_KEY not set, skipping prompt job claims`)
+  }
 
   while (Date.now() - tickStart < MAX_TICK_DURATION_MS) {
     if (schedulesExhausted && jobsExhausted) break

apps/sim/app/api/tools/instagram/publish-carousel/route.ts

@@ -5,7 +5,7 @@ import { instagramPublishCarouselContract } from '@/lib/api/contracts/tools/inst
 import { parseRequest } from '@/lib/api/server'
 import { checkInternalAuth } from '@/lib/auth/hybrid'
 import { withRouteHandler } from '@/lib/core/utils/with-route-handler'
-import { resolveInstagramCarouselMedia } from '@/lib/integrations/instagram/resolve-media'
+import { resolveInstagramCarouselMedia } from '@/app/api/tools/instagram/resolve-media'
 import {
   createMediaContainer,
   publishMediaContainer,

apps/sim/app/api/tools/instagram/publish-image/route.ts

@@ -5,7 +5,7 @@ import { instagramPublishImageContract } from '@/lib/api/contracts/tools/instagr
 import { parseRequest } from '@/lib/api/server'
 import { checkInternalAuth } from '@/lib/auth/hybrid'
 import { withRouteHandler } from '@/lib/core/utils/with-route-handler'
-import { resolveInstagramMedia } from '@/lib/integrations/instagram/resolve-media'
+import { resolveInstagramMedia } from '@/app/api/tools/instagram/resolve-media'
 import {
   createMediaContainer,
   publishMediaContainer,