Reconcile the staging rebase: finish rename-followed ports, async selector resolution

Rebasing onto origin/staging carried staging's lib/copilot work into our
renamed lib/mothership files via rename detection; this finishes what the
replay left incomplete:

- Complete the #7151 port: cancel_workflow_run handler + registration on
  the mothership executor (types, tests, and catalog entry had already
  rename-followed in).
- pickRunBlockOutputs awaits the now-async resolveOutputIds (#7346 made
  selector resolution child-workflow-aware) and re-imports isValidUuid.
- Slack execution stream + tool-call-lifecycle import getToolDisplayTitle
  from the mothership tool-display module (#7296 semantics kept).
- Resolve leftover conflict markers from the first replay's failed batch
  checkout (browser-tool hardening #7311, YAML bounds #7319 kept).
- Drop the obsolete lib/mothership/tools/server/blocks scan root: the
  block-metadata tool died in the dead-code sweep; blocks reads flow
  through the already-guarded v2 blocks routes.
- Regenerate OpenAPI, CLI API, and CLI docs from the merged contracts.

Claude-Session: https://claude.ai/code/session_01CgaxNAaeD3taGdghbXn17w

Author: Sg312

apps/docs/content/docs/cli/reference.mdx

@@ -5367,7 +5367,7 @@ sim workflows run <workflowId> [options]
 | `--input <json\|@file>` | No | Trigger input as JSON (JSON, or @path / @- to read a file or stdin). |
 | `--async` | No | Queue the run and return immediately. |
 | `--execution-timeout-seconds <value>` | No | Requested server-side timeout for an asynchronous run, in seconds. An upper bound, not the effective timeout: the run uses the smaller of this value and the plan's execution timeout, so requesting more than the plan allows silently yields the plan timeout. Rejected with `400` unless `async` is true. |
-| `--select-output <value...>` | No | Return blockName.field values (e.g. agent_1.content) — in blockOutputs on a sync run, or from the streamed result with --follow; missing fields are omitted. Not available with --async (space-separated, or @path / @- with one value per line; @@value for a literal leading @). |
+| `--select-output <value...>` | No | Return blockName.field values (e.g. agent_1.content), or childWorkflowId.blockName.field for a child workflow (applies to every invocation) — in blockOutputs on a sync run, or from the streamed result with --follow; missing fields are omitted. Not available with --async (space-separated, or @path / @- with one value per line; @@value for a literal leading @). |
 | `--include-file-base64` | No | Inline eligible output files as base64 content. Rejected when `async` is true. |
 | `--no-include-file-base64` | No | Send --include-file-base64 as false. |
 | `--base64-max-bytes <value>` | No | Maximum total bytes of file content to inline as base64, lowering but never raising the server limit of 16 MiB. Rejected when `async` is true. |

apps/docs/content/docs/cli/workflows.mdx

@@ -532,7 +532,7 @@ sim workflows run <workflowId> [options]
 | `--input <json\|@file>` | No | Trigger input as JSON (JSON, or @path / @- to read a file or stdin). |
 | `--async` | No | Queue the run and return immediately. |
 | `--execution-timeout-seconds <value>` | No | Requested server-side timeout for an asynchronous run, in seconds. An upper bound, not the effective timeout: the run uses the smaller of this value and the plan's execution timeout, so requesting more than the plan allows silently yields the plan timeout. Rejected with `400` unless `async` is true. |
-| `--select-output <value...>` | No | Return blockName.field values (e.g. agent_1.content) — in blockOutputs on a sync run, or from the streamed result with --follow; missing fields are omitted. Not available with --async (space-separated, or @path / @- with one value per line; @@value for a literal leading @). |
+| `--select-output <value...>` | No | Return blockName.field values (e.g. agent_1.content), or childWorkflowId.blockName.field for a child workflow (applies to every invocation) — in blockOutputs on a sync run, or from the streamed result with --follow; missing fields are omitted. Not available with --async (space-separated, or @path / @- with one value per line; @@value for a literal leading @). |
 | `--include-file-base64` | No | Inline eligible output files as base64 content. Rejected when `async` is true. |
 | `--no-include-file-base64` | No | Send --include-file-base64 as false. |
 | `--base64-max-bytes <value>` | No | Maximum total bytes of file content to inline as base64, lowering but never raising the server limit of 16 MiB. Rejected when `async` is true. |

apps/docs/openapi-v2-workflows.json

@@ -8647,6 +8647,10 @@
       "StoredChatDeploymentOutputConfig": {
         "type": "object",
         "properties": {
+          "workflowId": {
+            "description": "Child workflow containing the selected block. Omitted for the deployed workflow.",
+            "type": "string"
+          },
           "blockId": {
             "type": "string",
             "description": "Block whose output the chat streams."
@@ -8956,6 +8960,11 @@
       "ChatDeploymentOutputConfig": {
         "type": "object",
         "properties": {
+          "workflowId": {
+            "description": "Child workflow containing the selected block. Omit for the deployed workflow.",
+            "type": "string",
+            "minLength": 1
+          },
           "blockId": {
             "type": "string",
             "minLength": 1,
@@ -9377,7 +9386,7 @@
             "type": "boolean"
           },
           "selectedOutputs": {
-            "description": "Block output references to include in the response, as `blockId`, `blockId.path`, or `BlockName.path` (resolved against the workflow state being run). On a sync request the named outputs come back in `blockOutputs`, keyed by these selector strings; on a stream they shape the streamed envelope. Selectors that resolve to no block or no value are omitted. Rejected when `async` is true — a queued run has produced nothing to select; narrow the finished run via the run resource instead.",
+            "description": "Block output references to include in the response. Use `<blockName>.<outputPath>` for the executed workflow or `<childWorkflowId>.<blockName>.<outputPath>` for a child workflow; block names are normalized workflow reference names, and selecting a child workflow applies to every invocation of it. On a sync request the named outputs come back in `blockOutputs`, keyed by these selector strings; on a stream they shape the streamed envelope. Selectors that resolve to no block or no value are omitted. Rejected when `async` is true — a queued run has produced nothing to select; narrow the finished run via the run resource instead.",
             "maxItems": 100,
             "type": "array",
             "items": {
@@ -10070,7 +10079,7 @@
             "description": "Whether a paused execution was cancelled."
           },
           "reason": {
-            "description": "Machine-readable cancellation outcome, present on every cancellation including full successes. `recorded` is the success value. `already_cancelled`, `already_completed`, and `already_failed` mean the run had already reached that terminal state, so nothing was cancelled and `durablyRecorded` is false. `redis_unavailable` and `redis_write_failed` mean the distributed cancellation signal was not written, so an already-running execution may not observe the cancellation. `paused_event_publish_failed` and `paused_database_cancel_failed` name the failing step for a paused run.",
+            "description": "Machine-readable cancellation outcome, present on every cancellation including full successes. `recorded` and `queue_cancelled` are successful cancellation values. `already_cancelled`, `already_completed`, and `already_failed` mean the run had already reached that terminal state, so nothing was cancelled and `durablyRecorded` is false. The remaining values identify a degraded or incomplete cancellation step.",
             "type": "string",
             "enum": [
               "recorded",
@@ -10080,7 +10089,10 @@
               "redis_unavailable",
               "redis_write_failed",
               "paused_event_publish_failed",
-              "paused_database_cancel_failed"
+              "paused_database_cancel_failed",
+              "queue_cancelled",
+              "active_resume_signal_failed",
+              "cancellation_not_finalized"
             ]
           }
         },

apps/sim/components/agent-stream/tool-call-lifecycle.ts

@@ -7,11 +7,7 @@
  * implementation so the three surfaces cannot drift.
  */
 
-<<<<<<< HEAD
-import { getToolDisplayTitle } from '@/lib/copilot/tools/tool-display'
-=======
-import { humanizeToolName } from '@/lib/mothership/tools/tool-display'
->>>>>>> 2ff9a4fa01 (feat: sim side of the mothership revamp)
+import { getToolDisplayTitle } from '@/lib/mothership/tools/tool-display'
 
 export type AgentStreamToolStatus = 'running' | 'success' | 'error' | 'cancelled'
 

apps/sim/lib/mothership/tool-executor/register-handlers.ts

@@ -1,5 +1,6 @@
 import { createLogger } from '@sim/logger'
 import {
+  CancelWorkflowRun,
   RunBlock,
   RunFromBlock,
   RunWorkflow,
@@ -11,6 +12,7 @@ import { executeFunctionExecute } from '../tools/handlers/function-execute'
 import { executeRunCode } from '../tools/handlers/run-code'
 import { executeSimCli } from '../tools/handlers/sim-cli'
 import {
+  executeCancelWorkflowRun,
   executeRunBlock,
   executeRunFromBlock,
   executeRunWorkflow,
@@ -47,6 +49,7 @@ function h(fn: (params: any, context: any) => Promise<any>): ToolHandler {
  */
 function buildHandlerMap(): Record<string, ToolHandler> {
   return {
+    [CancelWorkflowRun.id]: h(executeCancelWorkflowRun),
     [RunWorkflow.id]: h(executeRunWorkflow),
     [RunWorkflowUntilBlock.id]: h(executeRunWorkflowUntilBlock),
     [RunFromBlock.id]: h(executeRunFromBlock),

apps/sim/lib/mothership/tool-executor/router.test.ts

@@ -2,60 +2,14 @@
  * @vitest-environment node
  */
 
-import { describe, expect, it, vi } from 'vitest'
-
-/**
- * The handler map is a wiring table from tool id to implementation. Only its
- * shape is asserted here, so every implementation module it imports is stubbed
- * except `workflow/mutations`, which holds the cancellation handler under test
- * and loads for real so a renamed or removed export fails at link time.
- * Loading the rest reaches the block registry, the executor, and most of
- * `lib/`; every stubbed export resolves to a mock function, which is all the
- * table needs to bind.
- */
-const { stubHandlerModule } = vi.hoisted(() => ({
-  stubHandlerModule: () =>
-    new Proxy(
-      {},
-      {
-        get: (_target, name) => (typeof name === 'string' && name !== 'then' ? vi.fn() : undefined),
-        has: (_target, name) => typeof name === 'string' && name !== 'then',
-      }
-    ),
-}))
-
-vi.mock('@/lib/copilot/tools/handlers/deployment/custom-block', stubHandlerModule)
-vi.mock('@/lib/copilot/tools/handlers/deployment/deploy', stubHandlerModule)
-vi.mock('@/lib/copilot/tools/handlers/deployment/manage', stubHandlerModule)
-vi.mock('@/lib/copilot/tools/handlers/function-execute', stubHandlerModule)
-vi.mock('@/lib/copilot/tools/handlers/integration-tools', stubHandlerModule)
-vi.mock('@/lib/copilot/tools/handlers/management/connect-slack-bot', stubHandlerModule)
-vi.mock('@/lib/copilot/tools/handlers/management/manage-credential', stubHandlerModule)
-vi.mock('@/lib/copilot/tools/handlers/management/manage-custom-tool', stubHandlerModule)
-vi.mock('@/lib/copilot/tools/handlers/management/manage-mcp-tool', stubHandlerModule)
-vi.mock('@/lib/copilot/tools/handlers/management/manage-sandbox', stubHandlerModule)
-vi.mock('@/lib/copilot/tools/handlers/management/manage-skill', stubHandlerModule)
-vi.mock('@/lib/copilot/tools/handlers/materialize-file', stubHandlerModule)
-vi.mock('@/lib/copilot/tools/handlers/oauth', stubHandlerModule)
-vi.mock('@/lib/copilot/tools/handlers/resources', stubHandlerModule)
-vi.mock('@/lib/copilot/tools/handlers/restore-resource', stubHandlerModule)
-vi.mock('@/lib/copilot/tools/handlers/run-code', stubHandlerModule)
-vi.mock('@/lib/copilot/tools/handlers/vfs', stubHandlerModule)
-vi.mock('@/lib/copilot/tools/handlers/vfs-mutate', stubHandlerModule)
-vi.mock('@/lib/copilot/tools/handlers/workflow/queries', stubHandlerModule)
-
-/** Server-router tools are appended to the map from their own registry, which this test does not cover. */
-vi.mock('@/lib/copilot/tools/server/router', () => ({ getRegisteredServerToolNames: () => [] }))
-
-import { hasHandler } from '@/lib/copilot/tool-executor/executor'
-import { buildHandlerMap } from '@/lib/copilot/tool-executor/handler-map'
-import { ensureHandlersRegistered } from '@/lib/copilot/tool-executor/register-handlers'
+import { describe, expect, it } from 'vitest'
+import { hasHandler } from '@/lib/mothership/tool-executor/executor'
+import { ensureHandlersRegistered } from '@/lib/mothership/tool-executor/register-handlers'
 import {
   getToolEntry,
   isSimExecuted,
   toolRequiresApproval,
-} from '@/lib/copilot/tool-executor/router'
-import { executeCancelWorkflowRun } from '@/lib/copilot/tools/handlers/workflow/mutations'
+} from '@/lib/mothership/tool-executor/router'
 
 describe('workflow-run cancellation tool routing', () => {
   it('routes cancellation through Sim with write permission and explicit approval', () => {

apps/sim/lib/mothership/tools/client/browser-tool-execution.test.ts

@@ -29,12 +29,8 @@ vi.mock('@/lib/mothership/tools/client/completion', () => ({
   reportClientToolCompletionOnPageExit: mockReportCompletionOnPageExit,
 }))
 
-<<<<<<< HEAD:apps/sim/lib/copilot/tools/client/browser-tool-execution.test.ts
-import { executeBrowserToolOnClient } from '@/lib/copilot/tools/client/browser-tool-execution'
-import { BrowserToolReplayLedger } from '@/lib/copilot/tools/client/browser-tool-replay-ledger'
-=======
 import { executeBrowserToolOnClient } from '@/lib/mothership/tools/client/browser-tool-execution'
->>>>>>> 2ff9a4fa01 (feat: sim side of the mothership revamp):apps/sim/lib/mothership/tools/client/browser-tool-execution.test.ts
+import { BrowserToolReplayLedger } from '@/lib/mothership/tools/client/browser-tool-replay-ledger'
 import { useBrowserSessionStore } from '@/stores/browser-session/store'
 
 const CHAT_SCOPE = 'chat-test'

apps/sim/lib/mothership/tools/client/browser-tool-execution.ts

@@ -21,14 +21,9 @@ import {
   ASYNC_TOOL_CONFIRMATION_STATUS,
   type AsyncCompletionData,
   type AsyncConfirmationStatus,
-<<<<<<< HEAD:apps/sim/lib/copilot/tools/client/browser-tool-execution.ts
-} from '@/lib/copilot/async-runs/lifecycle'
-import { COPILOT_CONFIRM_API_PATH } from '@/lib/copilot/constants'
-import { BrowserToolReplayLedger } from '@/lib/copilot/tools/client/browser-tool-replay-ledger'
-=======
 } from '@/lib/mothership/async-runs/lifecycle'
 import { COPILOT_CONFIRM_API_PATH } from '@/lib/mothership/constants'
->>>>>>> 2ff9a4fa01 (feat: sim side of the mothership revamp):apps/sim/lib/mothership/tools/client/browser-tool-execution.ts
+import { BrowserToolReplayLedger } from '@/lib/mothership/tools/client/browser-tool-replay-ledger'
 import {
   reportClientToolCompletion,
   reportClientToolCompletionOnPageExit,

apps/sim/lib/mothership/tools/handlers/workflow/mutations.test.ts

@@ -2,13 +2,9 @@
  * @vitest-environment node
  */
 import { beforeEach, describe, expect, it, vi } from 'vitest'
-<<<<<<< HEAD:apps/sim/lib/copilot/tools/handlers/workflow/mutations.test.ts
-import type { ExecutionContext } from '@/lib/copilot/request/types'
-import type { CancelWorkflowRunParams } from '@/lib/copilot/tools/handlers/param-types'
 import { WorkflowRunAlreadyTerminalError } from '@/lib/execution/workflow-run-already-terminal-error'
-=======
 import type { ExecutionContext } from '@/lib/mothership/request/types'
->>>>>>> 2ff9a4fa01 (feat: sim side of the mothership revamp):apps/sim/lib/mothership/tools/handlers/workflow/mutations.test.ts
+import type { CancelWorkflowRunParams } from '@/lib/mothership/tools/handlers/param-types'
 
 const { mocks } = vi.hoisted(() => ({
   mocks: {

apps/sim/lib/mothership/tools/handlers/workflow/mutations.ts

@@ -14,6 +14,7 @@ import {
   type ToolEffectPhase,
 } from '@/lib/mothership/tool-executor/types'
 import type {
+  CancelWorkflowRunParams,
   CreateWorkflowParams,
   GenerateApiKeyParams,
   MoveWorkflowParams,
@@ -28,6 +29,7 @@ import type {
 } from '@/lib/mothership/tools/handlers/param-types'
 import { requireCopilotWorkspace } from '@/lib/mothership/tools/server/workspace-scope'
 import { decodeVfsPathSegments, encodeVfsPathSegments } from '@/lib/mothership/vfs/path-utils'
+import { cancelWorkflowRun } from '@/lib/workflows/application/cancel-run'
 import { createWorkflow } from '@/lib/workflows/application/create-workflow'
 import { moveWorkflowsBulk } from '@/lib/workflows/application/move-workflows-bulk'
 import {
@@ -281,6 +283,45 @@ export async function executeRunWorkflow(
   }
 }
 
+export async function executeCancelWorkflowRun(
+  params: CancelWorkflowRunParams,
+  context: ExecutionContext
+): Promise<ToolCallResult> {
+  try {
+    const executionId = resolveInputFromExecutionId(params.executionId)
+    if (!executionId) {
+      return { success: false, error: 'executionId is required' }
+    }
+
+    assertWorkflowMutationNotAborted(
+      context,
+      'Request aborted before workflow run cancellation could be applied.'
+    )
+    const result = await executeCopilotWorkflowUseCase(context, cancelWorkflowRun, {
+      runId: executionId,
+      ...(context.abortSignal ? { abortSignal: context.abortSignal } : {}),
+    })
+
+    return {
+      success: result.success,
+      output: {
+        workflowId: result.workflowId,
+        executionId: result.executionId,
+        durablyRecorded: result.durablyRecorded,
+        locallyAborted: result.locallyAborted,
+        pausedCancelled: result.pausedCancelled,
+        reason: result.reason,
+      },
+      error: result.success ? undefined : 'Workflow run cancellation could not be completed',
+    }
+  } catch (error) {
+    return {
+      success: false,
+      error: messageForCopilotWorkflowError(error, 'Failed to cancel workflow run'),
+    }
+  }
+}
+
 export async function executeSetGlobalWorkflowVariables(
   params: SetGlobalWorkflowVariablesParams,
   context: ExecutionContext