dexto 1.14.6 → 2.0.0-beta.1

package/dist/cli/commands/init.js

@@ -8,8 +8,6 @@ import path from 'node:path';
 import { z } from 'zod';
 import { ExitSignal, safeExit, withAnalytics } from '../../analytics/wrapper.js';
 import { getEffectiveLLMConfig } from '../../config/effective-llm.js';
-import { getDeployConfigPath, isWorkspaceDeployAgent, loadDeployConfig } from './deploy/config.js';
-import { discoverPrimaryWorkspaceAgent } from './deploy/entry-agent.js';
 import { confirmOrExit, multiselectOrExit, selectOrExit, textOrExit, } from '../utils/prompt-helpers.js';
 import { ensureImageImporterConfigured } from '../utils/image-importer.js';
 const AGENTS_FILENAME = 'AGENTS.md';
@@ -34,7 +32,7 @@ This workspace can define project-specific agents and skills.
 
 ## Defaults
 - If no workspace agent is defined, Dexto uses your global default agent locally
-- Cloud deploys without a workspace agent use the managed cloud default agent
+- Deploy Sites and Functions with \`dexto cloud sites deploy\` and \`dexto cloud functions deploy\`
 `;
 const CORE_AGENT_TOOL_ENTRIES = [
     {
@@ -1335,18 +1333,8 @@ async function listWorkspaceSkillIds(workspaceRoot) {
         .map((skill) => skill.name)
         .sort((left, right) => left.localeCompare(right));
 }
-function describeEffectiveDeployAgent(input) {
-    if (input.deployConfig) {
-        const configuredAgent = isWorkspaceDeployAgent(input.deployConfig.agent)
-            ? `workspace agent (${input.deployConfig.agent.path})`
-            : 'default cloud agent';
-        return `${configuredAgent} via ${input.deployConfigPath ?? '.dexto/deploy.json'}`;
-    }
-    if (input.implicitWorkspaceAgent) {
-        return `workspace agent (${input.implicitWorkspaceAgent}) if you run \`dexto deploy\``;
-    }
-    return 'default cloud agent if you run `dexto deploy`';
-}
+/** Where deploys went: 1.x's workspace deploy is gone in 2.0. */
+const DEPLOY_SUMMARY = 'dexto cloud sites deploy or dexto cloud functions deploy (dexto deploy is gone in 2.0)';
 export async function inspectWorkspaceStatus(workspaceRoot = process.cwd()) {
     const root = path.resolve(workspaceRoot);
     await ensureWorkspaceRoot(root);
@@ -1365,9 +1353,6 @@ export async function inspectWorkspaceStatus(workspaceRoot = process.cwd()) {
     }))
         .sort((left, right) => left.id.localeCompare(right.id)) ?? [];
     const skills = await listWorkspaceSkillIds(root);
-    const deployConfigPath = getDeployConfigPath(root);
-    const deployConfig = await loadDeployConfig(root);
-    const implicitWorkspaceAgent = await discoverPrimaryWorkspaceAgent(root);
     return {
         workspaceRoot: root,
         agentsFilePresent,
@@ -1378,12 +1363,6 @@ export async function inspectWorkspaceStatus(workspaceRoot = process.cwd()) {
         allowGlobalAgents: registry ? registry.allowGlobalAgents : null,
         agents,
         skills,
-        deployConfigPath: deployConfig ? deployConfigPath : null,
-        effectiveDeploySummary: describeEffectiveDeployAgent({
-            deployConfigPath: deployConfig ? deployConfigPath : null,
-            deployConfig,
-            implicitWorkspaceAgent,
-        }),
     };
 }
 function formatWorkspaceStatus(result) {
@@ -1397,7 +1376,7 @@ function formatWorkspaceStatus(result) {
         `Allow global agents: ${result.allowGlobalAgents === null
             ? 'n/a (no workspace registry)'
             : String(result.allowGlobalAgents)}`,
-        `Deploy: ${result.effectiveDeploySummary}`,
+        `Deploy: ${DEPLOY_SUMMARY}`,
         '',
         'Agents:',
         ...(result.agents.length > 0
@@ -1601,7 +1580,7 @@ Examples:
     }));
     initCommand
         .command('status')
-        .description('Show the current workspace configuration and deploy preview')
+        .description('Show the current workspace configuration')
         .action(withAnalytics('init status', async () => {
         try {
             await handleInitStatusCommand();

package/dist/cli/commands/run/headless.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"headless.d.ts","sourceRoot":"","sources":["../../../../src/cli/commands/run/headless.ts"],"names":[],"mappings":"AAAA,OAAO,EAGH,KAAK,UAAU,EAIlB,MAAM,aAAa,CAAC;AAErB,OAAO,EAGH,KAAK,wBAAwB,EAC7B,KAAK,oBAAoB,EAC5B,MAAM,aAAa,CAAC;AAWrB,MAAM,MAAM,iBAAiB,GAAG;IAC5B,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,UAAU,CAAC,EAAE,KAAK,CAAC;IACnB,gBAAgB,CAAC,EAAE,wBAAwB,EAAE,CAAC;CACjD,CAAC;AA0IF,wBAAsB,qBAAqB,CAAC,SAAS,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC,CAY/E;AAED,wBAAgB,uBAAuB,CAAC,KAAK,EAAE,UAAU,GAAG,IAAI,CAgC/D;AAED,wBAAgB,uBAAuB,CAAC,MAAM,EAAE;IAC5C,KAAK,EAAE,UAAU,CAAC;IAClB,SAAS,EAAE,MAAM,CAAC;IAClB,MAAM,EAAE,MAAM,CAAC;IACf,SAAS,EAAE,MAAM,CAAC;IAClB,UAAU,EAAE,MAAM,CAAC;CACtB,GAAG,IAAI,CAgBP;AAED,wBAAsB,kBAAkB,CACpC,KAAK,EAAE,UAAU,EACjB,SAAS,EAAE,MAAM,EACjB,MAAM,EAAE,MAAM,EACd,MAAM,GAAE,oBAA6B,GACtC,OAAO,CAAC,iBAAiB,CAAC,CAmI5B;AAED,wBAAgB,8BAA8B,CAAC,OAAO,EAAE,MAAM,EAAE,WAAW,CAAC,EAAE,MAAM,GAAG,IAAI,CAM1F;AAED,wBAAgB,yBAAyB,CAAC,OAAO,EAAE,MAAM,GAAG,IAAI,CAM/D;AAED,wBAAgB,kBAAkB,CAAC,OAAO,EAAE,MAAM,GAAG,IAAI,CAExD"}
+{"version":3,"file":"headless.d.ts","sourceRoot":"","sources":["../../../../src/cli/commands/run/headless.ts"],"names":[],"mappings":"AAAA,OAAO,EAGH,KAAK,UAAU,EAIlB,MAAM,aAAa,CAAC;AAErB,OAAO,EAGH,KAAK,wBAAwB,EAC7B,KAAK,oBAAoB,EAC5B,MAAM,aAAa,CAAC;AAarB,MAAM,MAAM,iBAAiB,GAAG;IAC5B,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,UAAU,CAAC,EAAE,KAAK,CAAC;IACnB,gBAAgB,CAAC,EAAE,wBAAwB,EAAE,CAAC;CACjD,CAAC;AA+IF,wBAAsB,qBAAqB,CAAC,SAAS,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC,CAY/E;AAED,wBAAgB,uBAAuB,CAAC,KAAK,EAAE,UAAU,GAAG,IAAI,CA2C/D;AAED,wBAAgB,uBAAuB,CAAC,MAAM,EAAE;IAC5C,KAAK,EAAE,UAAU,CAAC;IAClB,SAAS,EAAE,MAAM,CAAC;IAClB,MAAM,EAAE,MAAM,CAAC;IACf,SAAS,EAAE,MAAM,CAAC;IAClB,UAAU,EAAE,MAAM,CAAC;CACtB,GAAG,IAAI,CAqBP;AAED,wBAAsB,kBAAkB,CACpC,KAAK,EAAE,UAAU,EACjB,SAAS,EAAE,MAAM,EACjB,MAAM,EAAE,MAAM,EACd,MAAM,GAAE,oBAA6B,GACtC,OAAO,CAAC,iBAAiB,CAAC,CAkK5B;AAED,wBAAgB,8BAA8B,CAAC,OAAO,EAAE,MAAM,EAAE,WAAW,CAAC,EAAE,MAAM,GAAG,IAAI,CAc1F;AAED,wBAAgB,yBAAyB,CAAC,OAAO,EAAE,MAAM,GAAG,IAAI,CAM/D;AAED,wBAAgB,kBAAkB,CAAC,OAAO,EAAE,MAAM,GAAG,IAAI,CAExD"}

package/dist/cli/commands/run/headless.js

@@ -1,5 +1,7 @@
 import { isTextPart, safeStringify, } from '@dexto/core';
 import { writeHeadlessEvent, toHeadlessApprovalRequired, } from './output.js';
+import { finishedToolStep } from '@dexto/tui/tool-step';
+import { logLine, startLine, stepLine, stepLogEnabled } from './step-log.js';
 const HEADLESS_TOOL_OUTPUT_MAX_LINES = 20;
 const HEADLESS_SECTION_SEPARATOR = '========================================';
 function writeHeadlessLine(line = '') {
@@ -9,6 +11,11 @@ function writeHeadlessSeparator() {
     writeHeadlessLine(HEADLESS_SECTION_SEPARATOR);
 }
 function writeHeadlessTaggedLine(tag, message) {
+    if (stepLogEnabled()) {
+        const error = tag === 'ERROR';
+        writeHeadlessLine(logLine(tag.toLowerCase(), message, { error }));
+        return;
+    }
     writeHeadlessLine(`[${tag}] ${message}`);
 }
 function writeHeadlessTaggedBlock(tag, content) {
@@ -123,6 +130,16 @@ export async function resolveHeadlessPrompt(promptArg) {
 }
 export function printHeadlessMcpStartup(agent) {
     const serverStatuses = agent.getMcpServersWithStatus().filter((server) => server.enabled);
+    if (stepLogEnabled()) {
+        for (const server of serverStatuses) {
+            if (server.status === 'connected')
+                continue;
+            writeHeadlessLine(logLine('mcp', `${server.name} failed: ${server.error ?? server.status}`, {
+                error: true,
+            }));
+        }
+        return;
+    }
     if (serverStatuses.length === 0) {
         writeHeadlessTaggedLine('MCP', 'startup: no servers');
         return;
@@ -151,6 +168,10 @@ export function printHeadlessMcpStartup(agent) {
 export function printHeadlessRunSummary(params) {
     const { agent, sessionId, prompt, agentPath, cliVersion } = params;
     const llmConfig = agent.getCurrentLLMConfig(sessionId);
+    if (stepLogEnabled()) {
+        writeHeadlessLine(startLine(`${llmConfig.provider}/${llmConfig.model}`, sessionId));
+        return;
+    }
     writeHeadlessSeparator();
     writeHeadlessTaggedLine('RUN', `Dexto CLI v${cliVersion}`);
     writeHeadlessSeparator();
@@ -173,13 +194,17 @@ export async function executeHeadlessRun(agent, sessionId, prompt, format = 'tex
     let fatalError;
     try {
         for await (const event of await agent.stream(prompt, sessionId)) {
-            if (format === 'jsonl')
+            if (format === 'stream-json')
                 await writeHeadlessEvent(event);
             switch (event.name) {
                 case 'approval:request': {
                     const required = toHeadlessApprovalRequired(event);
                     approvalRequired.push(required);
-                    writeHeadlessTaggedLine('APPROVAL_REQUIRED', `${'toolName' in required ? required.toolName : required.approvalType}: ${required.message} (approval ${required.approvalId})`);
+                    if (stepLogEnabled()) {
+                        writeHeadlessLine(logLine('denied', `${'tool_name' in required ? required.tool_name : required.approval_type} · ${required.message} · approval ${required.approval_id}`, { error: false }));
+                        break;
+                    }
+                    writeHeadlessTaggedLine('APPROVAL_REQUIRED', `${'tool_name' in required ? required.tool_name : required.approval_type}: ${required.message} (approval ${required.approval_id})`);
                     break;
                 }
                 case 'llm:tool-call': {
@@ -190,6 +215,8 @@ export async function executeHeadlessRun(agent, sessionId, prompt, format = 'tex
                         startedAt: Date.now(),
                     };
                     toolCallState.set(callKey, call);
+                    if (stepLogEnabled())
+                        break;
                     writeHeadlessTaggedLine('TOOL', formatToolInvocationForHeadless(call.toolName, call.args));
                     break;
                 }
@@ -215,6 +242,27 @@ export async function executeHeadlessRun(agent, sessionId, prompt, format = 'tex
                     }
                     const toolName = matchedCall?.toolName ?? event.toolName;
                     const args = matchedCall?.args ?? {};
+                    if (stepLogEnabled()) {
+                        const display = event.sanitized?.meta.display;
+                        const { step, output } = finishedToolStep({
+                            toolName,
+                            args,
+                            success: event.success,
+                            rawResult: event.rawResult,
+                            ...(event.error !== undefined && { error: event.error }),
+                            ...(event.presentationSnapshot !== undefined && {
+                                presentationSnapshot: event.presentationSnapshot,
+                            }),
+                            ...(display !== undefined && { display }),
+                        });
+                        writeHeadlessLine(stepLine(step));
+                        for (const line of output) {
+                            writeHeadlessLine(logLine('', line, { error: true }));
+                        }
+                        if (matchedCallKey)
+                            toolCallState.delete(matchedCallKey);
+                        break;
+                    }
                     const invocation = formatToolInvocationForHeadless(toolName, args);
                     const durationText = matchedCall
                         ? ` in ${formatHeadlessDuration(Date.now() - matchedCall.startedAt)}`
@@ -279,6 +327,13 @@ export async function executeHeadlessRun(agent, sessionId, prompt, format = 'tex
     return result;
 }
 export function printHeadlessAssistantResponse(message, totalTokens) {
+    if (stepLogEnabled()) {
+        const tokens = typeof totalTokens === 'number'
+            ? `${new Intl.NumberFormat('en-US').format(totalTokens)} tokens`
+            : 'finished';
+        writeHeadlessLine(logLine('done', tokens, { error: false }));
+        return;
+    }
     writeHeadlessSeparator();
     writeHeadlessTaggedBlock('DEXTO', message);
     if (typeof totalTokens === 'number') {

package/dist/cli/commands/run/output.d.ts

@@ -1,21 +1,40 @@
 import { ApprovalType, type ApprovalRequest, type StreamingEvent } from '@dexto/core';
 import type { HeadlessRunResult } from './headless.js';
-export type HeadlessOutputFormat = 'text' | 'json' | 'jsonl';
+/** How `dexto run` prints: the reply as text, one JSON result, or JSON events then the result. */
+export type HeadlessOutputFormat = 'text' | 'json' | 'stream-json';
+/**
+ * --json, --stream-json or --text as given, else JSON when stdout isn't a terminal (an agent or a
+ * pipe reads it) and text at one; null when more than one was given.
+ */
+export declare function chooseHeadlessOutput(options: {
+    json?: boolean;
+    streamJson?: boolean;
+    text?: boolean;
+}, stdoutIsTerminal: boolean): HeadlessOutputFormat | null;
+/**
+ * An approval the run asked for that no one here could give, so it was refused and the run went
+ * on without it: listed as the result's `permission_denials`.
+ */
 export type HeadlessApprovalRequired = {
-    approvalId: string;
-    sessionId?: string;
+    approval_id: string;
+    session_id?: string;
     message: string;
 } & ({
-    approvalType: typeof ApprovalType.TOOL_APPROVAL;
-    toolName: string;
-    toolCallId: string;
+    approval_type: typeof ApprovalType.TOOL_APPROVAL;
+    tool_name: string;
+    tool_call_id: string;
 } | {
-    approvalType: typeof ApprovalType.COMMAND_APPROVAL;
-    toolName: string;
+    approval_type: typeof ApprovalType.COMMAND_APPROVAL;
+    tool_name: string;
 } | {
-    approvalType: Exclude<ApprovalRequest['type'], typeof ApprovalType.TOOL_APPROVAL | typeof ApprovalType.COMMAND_APPROVAL>;
+    approval_type: Exclude<ApprovalRequest['type'], typeof ApprovalType.TOOL_APPROVAL | typeof ApprovalType.COMMAND_APPROVAL>;
 });
 export declare function toHeadlessApprovalRequired(request: ApprovalRequest): HeadlessApprovalRequired;
-export declare function writeHeadlessResult(format: HeadlessOutputFormat, result: HeadlessRunResult, sessionId: string | undefined): Promise<void>;
+/**
+ * The run's one result, for --json and as --stream-json's last line. An error says its code:
+ * `usage` for how it was called, otherwise `failed`. JSON output also puts the error on stderr as
+ * the CLI's other commands do.
+ */
+export declare function writeHeadlessResult(format: HeadlessOutputFormat, result: HeadlessRunResult, sessionId: string | undefined, errorCode?: 'usage' | 'failed'): Promise<void>;
 export declare function writeHeadlessEvent(event: StreamingEvent): Promise<void>;
 //# sourceMappingURL=output.d.ts.map

package/dist/cli/commands/run/output.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"output.d.ts","sourceRoot":"","sources":["../../../../src/cli/commands/run/output.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,KAAK,eAAe,EAAE,KAAK,cAAc,EAAE,MAAM,aAAa,CAAC;AAEtF,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,eAAe,CAAC;AAEvD,MAAM,MAAM,oBAAoB,GAAG,MAAM,GAAG,MAAM,GAAG,OAAO,CAAC;AAE7D,MAAM,MAAM,wBAAwB,GAAG;IACnC,UAAU,EAAE,MAAM,CAAC;IACnB,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,OAAO,EAAE,MAAM,CAAC;CACnB,GAAG,CACE;IAAE,YAAY,EAAE,OAAO,YAAY,CAAC,aAAa,CAAC;IAAC,QAAQ,EAAE,MAAM,CAAC;IAAC,UAAU,EAAE,MAAM,CAAA;CAAE,GACzF;IAAE,YAAY,EAAE,OAAO,YAAY,CAAC,gBAAgB,CAAC;IAAC,QAAQ,EAAE,MAAM,CAAA;CAAE,GACxE;IACI,YAAY,EAAE,OAAO,CACjB,eAAe,CAAC,MAAM,CAAC,EACvB,OAAO,YAAY,CAAC,aAAa,GAAG,OAAO,YAAY,CAAC,gBAAgB,CAC3E,CAAC;CACL,CACN,CAAC;AAEF,wBAAgB,0BAA0B,CAAC,OAAO,EAAE,eAAe,GAAG,wBAAwB,CAuB7F;AAED,wBAAsB,mBAAmB,CACrC,MAAM,EAAE,oBAAoB,EAC5B,MAAM,EAAE,iBAAiB,EACzB,SAAS,EAAE,MAAM,GAAG,SAAS,GAC9B,OAAO,CAAC,IAAI,CAAC,CAaf;AAED,wBAAsB,kBAAkB,CAAC,KAAK,EAAE,cAAc,GAAG,OAAO,CAAC,IAAI,CAAC,CAgD7E"}
+{"version":3,"file":"output.d.ts","sourceRoot":"","sources":["../../../../src/cli/commands/run/output.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,KAAK,eAAe,EAAE,KAAK,cAAc,EAAE,MAAM,aAAa,CAAC;AAEtF,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,eAAe,CAAC;AAEvD,kGAAkG;AAClG,MAAM,MAAM,oBAAoB,GAAG,MAAM,GAAG,MAAM,GAAG,aAAa,CAAC;AAEnE;;;GAGG;AACH,wBAAgB,oBAAoB,CAChC,OAAO,EAAE;IAAE,IAAI,CAAC,EAAE,OAAO,CAAC;IAAC,UAAU,CAAC,EAAE,OAAO,CAAC;IAAC,IAAI,CAAC,EAAE,OAAO,CAAA;CAAE,EACjE,gBAAgB,EAAE,OAAO,GAC1B,oBAAoB,GAAG,IAAI,CAQ7B;AAED;;;GAGG;AACH,MAAM,MAAM,wBAAwB,GAAG;IACnC,WAAW,EAAE,MAAM,CAAC;IACpB,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,OAAO,EAAE,MAAM,CAAC;CACnB,GAAG,CACE;IAAE,aAAa,EAAE,OAAO,YAAY,CAAC,aAAa,CAAC;IAAC,SAAS,EAAE,MAAM,CAAC;IAAC,YAAY,EAAE,MAAM,CAAA;CAAE,GAC7F;IAAE,aAAa,EAAE,OAAO,YAAY,CAAC,gBAAgB,CAAC;IAAC,SAAS,EAAE,MAAM,CAAA;CAAE,GAC1E;IACI,aAAa,EAAE,OAAO,CAClB,eAAe,CAAC,MAAM,CAAC,EACvB,OAAO,YAAY,CAAC,aAAa,GAAG,OAAO,YAAY,CAAC,gBAAgB,CAC3E,CAAC;CACL,CACN,CAAC;AAEF,wBAAgB,0BAA0B,CAAC,OAAO,EAAE,eAAe,GAAG,wBAAwB,CAuB7F;AAED;;;;GAIG;AACH,wBAAsB,mBAAmB,CACrC,MAAM,EAAE,oBAAoB,EAC5B,MAAM,EAAE,iBAAiB,EACzB,SAAS,EAAE,MAAM,GAAG,SAAS,EAC7B,SAAS,GAAE,OAAO,GAAG,QAAmB,GACzC,OAAO,CAAC,IAAI,CAAC,CAef;AAED,wBAAsB,kBAAkB,CAAC,KAAK,EAAE,cAAc,GAAG,OAAO,CAAC,IAAI,CAAC,CAgD7E"}

package/dist/cli/commands/run/output.js

@@ -1,42 +1,64 @@
 import { ApprovalType } from '@dexto/core';
 import { HEADLESS_APPROVAL_MESSAGE } from '../../approval/headless-approval-handler.js';
+/**
+ * --json, --stream-json or --text as given, else JSON when stdout isn't a terminal (an agent or a
+ * pipe reads it) and text at one; null when more than one was given.
+ */
+export function chooseHeadlessOutput(options, stdoutIsTerminal) {
+    const chosen = [
+        options.json === true ? 'json' : null,
+        options.streamJson === true ? 'stream-json' : null,
+        options.text === true ? 'text' : null,
+    ].filter((each) => each !== null);
+    if (chosen.length > 1)
+        return null;
+    return chosen[0] ?? (stdoutIsTerminal ? 'text' : 'json');
+}
 export function toHeadlessApprovalRequired(request) {
     const correlation = {
-        approvalId: request.approvalId,
-        ...(request.sessionId !== undefined ? { sessionId: request.sessionId } : {}),
+        approval_id: request.approvalId,
+        ...(request.sessionId !== undefined ? { session_id: request.sessionId } : {}),
         message: HEADLESS_APPROVAL_MESSAGE,
     };
     switch (request.type) {
         case ApprovalType.TOOL_APPROVAL:
             return {
                 ...correlation,
-                approvalType: request.type,
-                toolName: request.metadata.toolName,
-                toolCallId: request.metadata.toolCallId,
+                approval_type: request.type,
+                tool_name: request.metadata.toolName,
+                tool_call_id: request.metadata.toolCallId,
             };
         case ApprovalType.COMMAND_APPROVAL:
             return {
                 ...correlation,
-                approvalType: request.type,
-                toolName: request.metadata.toolName,
+                approval_type: request.type,
+                tool_name: request.metadata.toolName,
             };
         default:
-            return { ...correlation, approvalType: request.type };
+            return { ...correlation, approval_type: request.type };
     }
 }
-export async function writeHeadlessResult(format, result, sessionId) {
+/**
+ * The run's one result, for --json and as --stream-json's last line. An error says its code:
+ * `usage` for how it was called, otherwise `failed`. JSON output also puts the error on stderr as
+ * the CLI's other commands do.
+ */
+export async function writeHeadlessResult(format, result, sessionId, errorCode = 'failed') {
     if (format === 'text')
         return;
+    const error = result.fatalError
+        ? { code: errorCode, message: result.fatalError.message }
+        : null;
+    if (error !== null)
+        process.stderr.write(`${JSON.stringify({ error })}\n`);
     await writeJsonLineToStdout({
-        version: 1,
-        ...(format === 'json'
-            ? { status: result.fatalError ? 'failed' : 'completed' }
-            : { type: result.fatalError ? 'error' : 'complete' }),
-        ...(sessionId !== undefined ? { sessionId } : {}),
+        type: 'result',
+        status: result.fatalError ? 'failed' : 'completed',
+        ...(sessionId !== undefined ? { session_id: sessionId } : {}),
         ...(result.finalMessage !== undefined ? { content: result.finalMessage } : {}),
-        ...(result.totalTokens !== undefined ? { totalTokens: result.totalTokens } : {}),
-        ...(result.fatalError ? { error: result.fatalError.message } : {}),
-        ...(result.approvalRequired?.length ? { approvalRequired: result.approvalRequired } : {}),
+        ...(result.totalTokens !== undefined ? { total_tokens: result.totalTokens } : {}),
+        ...(error !== null ? { error } : {}),
+        permission_denials: result.approvalRequired ?? [],
     });
 }
 export async function writeHeadlessEvent(event) {
@@ -57,17 +79,17 @@ export async function writeHeadlessEvent(event) {
         case 'llm:tool-call':
             payload = {
                 type: 'tool_call',
-                toolName: event.toolName,
+                tool_name: event.toolName,
                 args: event.args,
-                ...(event.callId ? { callId: event.callId } : {}),
+                ...(event.callId ? { call_id: event.callId } : {}),
             };
             break;
         case 'llm:tool-result':
             payload = {
                 type: 'tool_result',
-                toolName: event.toolName,
+                tool_name: event.toolName,
                 success: event.success,
-                ...(event.callId ? { callId: event.callId } : {}),
+                ...(event.callId ? { call_id: event.callId } : {}),
                 ...(!event.success && event.error ? { error: event.error } : {}),
             };
             break;
@@ -87,7 +109,7 @@ export async function writeHeadlessEvent(event) {
         default:
             return;
     }
-    await writeJsonLineToStdout({ version: 1, ...payload });
+    await writeJsonLineToStdout(payload);
 }
 function writeJsonLineToStdout(payload) {
     return new Promise((resolve, reject) => {

package/dist/cli/commands/run/register.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"register.d.ts","sourceRoot":"","sources":["../../../../src/cli/commands/run/register.ts"],"names":[],"mappings":"AAOA,OAAO,KAAK,EAAE,6BAA6B,EAAE,MAAM,wBAAwB,CAAC;AAE5E,wBAAgB,kBAAkB,CAAC,EAC/B,OAAO,EACP,UAAU,EACV,4BAA4B,GAC/B,EAAE,6BAA6B,GAAG,IAAI,CAoItC"}
+{"version":3,"file":"register.d.ts","sourceRoot":"","sources":["../../../../src/cli/commands/run/register.ts"],"names":[],"mappings":"AAMA,OAAO,KAAK,EAAE,6BAA6B,EAAE,MAAM,wBAAwB,CAAC;AAE5E,wBAAgB,kBAAkB,CAAC,EAC/B,OAAO,EACP,UAAU,EACV,4BAA4B,GAC/B,EAAE,6BAA6B,GAAG,IAAI,CAoJtC"}

package/dist/cli/commands/run/register.js

@@ -1,6 +1,5 @@
-import { Option } from 'commander';
 import { handleHeadlessApproval } from '../../approval/headless-approval-handler.js';
-import { writeHeadlessResult } from './output.js';
+import { chooseHeadlessOutput, writeHeadlessResult } from './output.js';
 import { resolveAgentPath } from '@dexto/agent-management';
 import { withAnalytics, safeExit, ExitSignal } from '../../../analytics/wrapper.js';
 export function registerRunCommand({ program, cliVersion, bootstrapAgentFromGlobalOpts, }) {
@@ -8,29 +7,42 @@ export function registerRunCommand({ program, cliVersion, bootstrapAgentFromGlob
         .command('run [prompt]')
         .description('Run a single prompt non-interactively (headless mode)')
         .option('-m, --model <model>', 'Specify the LLM model to use for this run')
-        .addOption(new Option('--format <format>', 'Output format')
-        .choices(['text', 'json', 'jsonl'])
-        .default('text'))
+        .option('--json', 'Print one JSON result (the default when stdout is not a terminal)')
+        .option('--stream-json', 'Print JSON events, one per line, ending with one result')
+        .option('--text', 'Print only the reply (the default at a terminal)')
         .addHelpText('after', `
 Examples:
   $ dexto run "summarize this repository"
   $ echo "fix lint errors" | dexto run
   $ dexto run - < prompt.txt
+  $ dexto run "list the TODOs" --stream-json
+
+Approvals no one here can give are refused and listed in the result's permission_denials.
+Exit codes: 0 done, 1 failed, 2 usage, 3 needs sign-in or permission, 4 needs confirmation,
+5 not found, 6 waiting on a person.
 `)
         .action(withAnalytics('run', async (promptArg, runOptions) => {
+        const format = chooseHeadlessOutput(runOptions, process.stdout.isTTY === true);
+        if (format === null) {
+            process.stderr.write('Pass --json, --stream-json or --text, only one.\n');
+            safeExit('run', 2, 'usage');
+            return;
+        }
         let agent;
         let sessionId;
         let result = {};
         let exitCode = 0;
         let exitReason = 'ok';
+        let errorCode = 'failed';
         try {
             const { executeHeadlessRun, printHeadlessAssistantResponse, printHeadlessMcpStartup, printHeadlessRunSummary, resolveHeadlessPrompt, writeFinalMessageToStdout, writeHeadlessError, } = await import('./headless.js');
             const prompt = await resolveHeadlessPrompt(promptArg);
             if (prompt.trim().length === 0) {
                 writeHeadlessError('Prompt cannot be empty.');
                 result = { fatalError: new Error('Prompt cannot be empty.') };
-                exitCode = 1;
+                exitCode = 2;
                 exitReason = 'empty-prompt';
+                errorCode = 'usage';
             }
             else {
                 const bootstrapOptions = runOptions.model
@@ -51,11 +63,11 @@ Examples:
                     cliVersion,
                 });
                 printHeadlessMcpStartup(agent);
-                const runResult = await executeHeadlessRun(agent, session.id, prompt, runOptions.format);
+                const runResult = await executeHeadlessRun(agent, session.id, prompt, format);
                 result = runResult;
                 if (runResult.finalMessage !== undefined) {
                     printHeadlessAssistantResponse(runResult.finalMessage, runResult.totalTokens);
-                    if (runOptions.format === 'text') {
+                    if (format === 'text') {
                         writeFinalMessageToStdout(runResult.finalMessage);
                     }
                 }
@@ -96,7 +108,7 @@ Examples:
                 }
             }
         }
-        await writeHeadlessResult(runOptions.format, result, sessionId);
+        await writeHeadlessResult(format, result, sessionId, errorCode);
         safeExit('run', exitCode, exitReason);
     }));
 }

package/dist/cli/commands/run/step-log.d.ts

@@ -0,0 +1,11 @@
+import type { Step } from '@dexto/tui/tool-step';
+export declare function stepLogEnabled(): boolean;
+/** A line that isn't a tool call: start, done, an error. */
+export declare function logLine(word: string, text: string, { error, at }: {
+    error: boolean;
+    at?: Date;
+}): string;
+export declare function startLine(model: string, chatId: string, at?: Date): string;
+/** One finished tool call as one line: verb, target, detail, time, state. */
+export declare function stepLine(step: Step, at?: Date): string;
+//# sourceMappingURL=step-log.d.ts.map

package/dist/cli/commands/run/step-log.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"step-log.d.ts","sourceRoot":"","sources":["../../../../src/cli/commands/run/step-log.ts"],"names":[],"mappings":"AAMA,OAAO,KAAK,EAAE,IAAI,EAAE,MAAM,sBAAsB,CAAC;AAMjD,wBAAgB,cAAc,IAAI,OAAO,CAExC;AAMD,4DAA4D;AAC5D,wBAAgB,OAAO,CACnB,IAAI,EAAE,MAAM,EACZ,IAAI,EAAE,MAAM,EACZ,EAAE,KAAK,EAAE,EAAe,EAAE,EAAE;IAAE,KAAK,EAAE,OAAO,CAAC;IAAC,EAAE,CAAC,EAAE,IAAI,CAAA;CAAE,GAC1D,MAAM,CAGR;AAED,wBAAgB,SAAS,CAAC,KAAK,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,EAAE,GAAE,IAAiB,GAAG,MAAM,CAEtF;AASD,6EAA6E;AAC7E,wBAAgB,QAAQ,CAAC,IAAI,EAAE,IAAI,EAAE,EAAE,GAAE,IAAiB,GAAG,MAAM,CAWlE"}

package/dist/cli/commands/run/step-log.js

@@ -0,0 +1,42 @@
+/**
+ * The Signal log `dexto run` writes to stderr at a terminal: one time-stamped line per step, in
+ * the same words as the TUI's step rows. On until the Signal look ships only with
+ * DEXTO_PALETTE=signal; the bracketed tags stay the default until then.
+ */
+import { chalkStderr as chalk } from 'chalk';
+const VERB_CELLS = 7;
+const TARGET_CELLS = 30;
+const DETAIL_CELLS = 16;
+export function stepLogEnabled() {
+    return process.env.DEXTO_PALETTE === 'signal';
+}
+function clock(at) {
+    return chalk.dim(at.toLocaleTimeString('en-GB', { hour12: false }));
+}
+/** A line that isn't a tool call: start, done, an error. */
+export function logLine(word, text, { error, at = new Date() }) {
+    const label = word.padEnd(VERB_CELLS);
+    return `${clock(at)}  ${error ? chalk.red(label) : chalk.bold(label)} ${text}`;
+}
+export function startLine(model, chatId, at = new Date()) {
+    return logLine('start', `${model} · local · chat ${chatId}`, { error: false, at });
+}
+const STATE_WORD = {
+    ok: 'ok',
+    fail: 'fail',
+    deny: 'denied',
+    stop: 'stopped',
+};
+/** One finished tool call as one line: verb, target, detail, time, state. */
+export function stepLine(step, at = new Date()) {
+    const failed = step.state === 'fail';
+    const word = STATE_WORD[step.state] ?? step.state;
+    return [
+        `${clock(at)} `,
+        chalk.bold(step.verb.toLowerCase().padEnd(VERB_CELLS)),
+        step.target.padEnd(TARGET_CELLS),
+        (step.detail ?? '').padEnd(DETAIL_CELLS),
+        (step.time ?? '').padStart(5),
+        ` ${failed ? chalk.red(word) : chalk.dim(word)}`,
+    ].join(' ');
+}

package/dist/cli/commands/session/register.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"register.d.ts","sourceRoot":"","sources":["../../../../src/cli/commands/session/register.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,6BAA6B,EAAE,MAAM,wBAAwB,CAAC;AAE5E,wBAAgB,sBAAsB,CAAC,EACnC,OAAO,EACP,4BAA4B,GAC/B,EAAE,6BAA6B,GAAG,IAAI,CA4EtC"}
+{"version":3,"file":"register.d.ts","sourceRoot":"","sources":["../../../../src/cli/commands/session/register.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,6BAA6B,EAAE,MAAM,wBAAwB,CAAC;AAE5E,wBAAgB,sBAAsB,CAAC,EACnC,OAAO,EACP,4BAA4B,GAC/B,EAAE,6BAA6B,GAAG,IAAI,CA2GtC"}