fix(mothership): preserve catalog curation and embedded CLI access

Author: Sg312

apps/sim/lib/mothership/agent-cli/curation.test.ts

@@ -1,4 +1,5 @@
 import { beforeEach, describe, expect, it, vi } from 'vitest'
+import type { V2BlockDetail } from '@/lib/api/contracts/v2/catalog'
 import { curateBlockDetail } from '@/lib/mothership/agent-cli/curation'
 
 const { permissionConfig, denied } = vi.hoisted(() => ({
@@ -21,14 +22,39 @@ vi.mock('@/lib/mothership/integration-tool-projection', () => ({
 
 const viewer = { workspaceId: 'ws', userId: 'user' }
 
-function blockDetail() {
+function blockDetail(): V2BlockDetail {
   return {
-    type: 'slack',
+    id: 'slack',
+    name: 'Slack',
+    description: 'Messaging',
+    category: 'tools',
+    source: 'builtin',
+    triggerAllowed: false,
+    triggerCapable: false,
+    triggerIds: [],
+    triggers: [],
+    tags: [],
+    preview: false,
+    operationIds: ['send', 'canvas'],
+    toolIds: ['slack_send', 'slack_canvas'],
+    inputSchema: [
+      { id: 'operation', type: 'dropdown', options: [{ id: 'send' }, { id: 'canvas' }] },
+    ],
+    operationInputSchema: { send: [], canvas: [] },
+    inputDefinitions: {},
+    outputs: {},
     operations: {
-      send: { toolId: 'slack_send' },
-      canvas: { toolId: 'slack_canvas' },
+      send: { toolId: 'slack_send', inputs: {}, outputs: {}, inputSchema: [] },
+      canvas: { toolId: 'slack_canvas', inputs: {}, outputs: {}, inputSchema: [] },
     },
-    tools: [{ id: 'slack_send' }, { id: 'slack_canvas' }],
+    tools: ['slack_send', 'slack_canvas'].map((id) => ({
+      id,
+      name: id,
+      description: '',
+      hostedApiKey: 'none',
+      params: {},
+      outputs: {},
+    })),
   }
 }
 
@@ -63,7 +89,11 @@ describe('curateBlockDetail', () => {
     expect(result.exitCode).toBe(0)
     const curated = JSON.parse(result.stdout)
     expect(Object.keys(curated.operations)).toEqual(['send'])
-    expect(curated.tools).toEqual([{ id: 'slack_send' }])
+    expect(curated.tools.map((tool: { id: string }) => tool.id)).toEqual(['slack_send'])
+    expect(curated.operationIds).toEqual(['send'])
+    expect(curated.operationInputSchema).toEqual({ send: [] })
+    expect(curated.inputSchema[0].options).toEqual([{ id: 'send' }])
+    expect(curated.toolIds).toEqual(['slack_send'])
   })
 
   it('refuses a fully denied block', async () => {

apps/sim/lib/mothership/agent-cli/curation.ts

@@ -5,6 +5,8 @@
  * so a partially-denied block is trimmed to the operations this viewer may configure.
  */
 
+import { omit } from '@sim/utils/object'
+import { type V2BlockDetail, v2BlockDetailSchema } from '@/lib/api/contracts/v2/catalog'
 import { agentCliFail } from '@/lib/mothership/agent-cli/types'
 import type { AgentCliRawResult } from '@/lib/mothership/generated/agent-cli'
 import { resolveDeniedBlockOperations } from '@/lib/mothership/integration-tool-projection'
@@ -16,22 +18,13 @@ export interface CurationViewer {
   userId: string
 }
 
-interface BlockDetailShape {
-  type: string
-  operations?: Record<string, unknown>
-  tools?: Array<{ id?: unknown }>
-}
-
-function parseBlockDetail(stdout: string): BlockDetailShape | null {
-  let parsed: unknown
+function parseBlockDetail(stdout: string): V2BlockDetail | null {
   try {
-    parsed = JSON.parse(stdout)
+    const parsed = v2BlockDetailSchema.safeParse(JSON.parse(stdout))
+    return parsed.success ? parsed.data : null
   } catch {
     return null
   }
-  if (!parsed || typeof parsed !== 'object' || Array.isArray(parsed)) return null
-  const candidate = parsed as { type?: unknown }
-  return typeof candidate.type === 'string' ? (parsed as BlockDetailShape) : null
 }
 
 export async function curateBlockDetail(
@@ -45,16 +38,28 @@ export async function curateBlockDetail(
   if (!deniedTools?.length) return result
   const isToolAllowed = createToolAccessGate(deniedTools)
   const denied = resolveDeniedBlockOperations(deniedTools, isToolAllowed)
-  if (denied.fullyDenied.has(detail.type)) {
-    return agentCliFail(`Block "${detail.type}" is not available to you in this workspace.`)
+  if (denied.fullyDenied.has(detail.id)) {
+    return agentCliFail(`Block "${detail.id}" is not available to you in this workspace.`)
   }
-  const deniedOperations = denied.needsProjection.get(detail.type)
+  const deniedOperations = denied.needsProjection.get(detail.id)
   if (!deniedOperations) return result
-  const operations = Object.fromEntries(
-    Object.entries(detail.operations ?? {}).filter(([id]) => !deniedOperations.has(id))
+  const operations = omit(detail.operations, [...deniedOperations])
+  const tools = detail.tools.filter((tool) => isToolAllowed(tool.id))
+  const inputSchema = detail.inputSchema.map((field) =>
+    field.id === 'operation'
+      ? { ...field, options: field.options?.filter((option) => !deniedOperations.has(option.id)) }
+      : field
   )
-  const tools = (detail.tools ?? []).filter(
-    (tool) => typeof tool.id !== 'string' || isToolAllowed(tool.id)
-  )
-  return { ...result, stdout: JSON.stringify({ ...detail, operations, tools }, null, 2) }
+  return {
+    ...result,
+    stdout: JSON.stringify({
+      ...detail,
+      operations,
+      operationIds: detail.operationIds.filter((id) => !deniedOperations.has(id)),
+      operationInputSchema: omit(detail.operationInputSchema, [...deniedOperations]),
+      inputSchema,
+      tools,
+      toolIds: detail.toolIds.filter(isToolAllowed),
+    }),
+  }
 }

apps/sim/lib/mothership/generated/workbench.ts

@@ -6,6 +6,6 @@ import { z } from "zod";
 /** Executable bootstrap is served only on the authenticated Sim → worker connection. */
 export const WorkbenchBootstrap = z.strictObject({
   version: z.literal(1),
-  entrypoint: z.string().min(1).max(65_536),
+  entrypoint: z.string().min(1).max(1_048_576),
 });
 export type WorkbenchBootstrap = z.infer<typeof WorkbenchBootstrap>;

packages/sim-cli/src/runtime.ts

@@ -1,4 +1,5 @@
 export { Command } from 'commander'
+export { runEmbeddedCli } from './embed'
 export { SimApiError } from './http/client'
 export { buildProgram } from './program'
 export { runTerminalCli } from './terminal'