sim-cli: --output json prints the API data verbatim; the single-key unwrap stays a table-only convenience

Author: Sg312

packages/sim-cli/src/commands/protocol/workflow-run-wait.ts

@@ -101,6 +101,11 @@ function optionalString(value: unknown): string | null {
  * record — what a self-hosted deployment behind an unwrapping proxy hands back —
  * still polls, rather than refusing to find a status that is right there.
  */
+/** The run itself: v2 answers `{ data: run }` and the renderer prints exactly what it is handed. */
+function runData(raw: unknown): unknown {
+  return isRecord(raw) && isRecord(raw.data) ? raw.data : raw
+}
+
 function readRun(raw: unknown): RunSnapshot {
   const run = isRecord(raw) && isRecord(raw.data) ? raw.data : raw
   if (!isRecord(run) || typeof run.status !== 'string') {
@@ -254,7 +259,7 @@ export function attachWorkflowRunWait(runs: Command): void {
 
             if (outcome) {
               progress.finish()
-              renderResult('getWorkflowRun', profile.output, raw, runSpec())
+              renderResult('getWorkflowRun', profile.output, runData(raw), runSpec())
               const message = explain(outcome, runId, options.workflow, snapshot)
               if (message) console.error(chalk.red(message))
               setSoftExitCode(WAIT_EXIT_CODES[outcome])
@@ -264,7 +269,7 @@ export function attachWorkflowRunWait(runs: Command): void {
             const remainingMs = deadline - Date.now()
             if (remainingMs <= 0) {
               progress.finish()
-              renderResult('getWorkflowRun', profile.output, raw, runSpec())
+              renderResult('getWorkflowRun', profile.output, runData(raw), runSpec())
               console.error(
                 chalk.red(
                   `Timed out after ${timeoutSeconds}s waiting for run ${runId} (status: ${snapshot.status}${

packages/sim-cli/src/runtime/build.test.ts

@@ -1044,6 +1044,30 @@ describe('single-resource rendering', () => {
     expect(printed.join('\n')).toMatch(/Deepwiki/)
   })
 
+  it('prints the API data verbatim for machine output, envelope included', async () => {
+    // `--output json` is what scripts and the agent reference card (generated from the
+    // OpenAPI response shapes) consume: the single-key unwrap above is a table-only
+    // convenience, so JSON keeps `mcpServer` exactly as the API returned it.
+    const printed = await lines(
+      [
+        'mcp-servers',
+        'create',
+        '--name',
+        'Deepwiki',
+        '--transport',
+        'streamable-http',
+        '--url',
+        'https://mcp.deepwiki.com/mcp',
+      ],
+      { mcpServer: { id: 'mcp-1', name: 'Deepwiki', enabled: true } },
+      'json'
+    )
+
+    expect(JSON.parse(printed.join('\n'))).toEqual({
+      mcpServer: { id: 'mcp-1', name: 'Deepwiki', enabled: true },
+    })
+  })
+
   it('renders nested fields instead of dropping them', async () => {
     // `workflows export` printed `version` and `exportedAt` and nothing else:
     // the record builder kept only scalars, so `workflow` and `state` — the

packages/sim-cli/src/runtime/result.ts

@@ -458,7 +458,10 @@ export function renderResult(
     return
   }
 
-  const data = unwrapResource(raw)
+  // The single-key unwrap exists for the human table: `{ mcpServer: {...} }` rendered as-is
+  // printed nothing. Machine formats print the API's data verbatim, so `--output json`
+  // matches the OpenAPI shape the docs and the agent reference card are generated from.
+  const data = format === 'json' || format === 'yaml' ? raw : unwrapResource(raw)
   if (spec.itemsPath) {
     const items = at(data, spec.itemsPath)
     if (!Array.isArray(items)) {