dexto 1.14.5 → 2.0.0-beta.0

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

@@ -1,27 +1,45 @@
 import { withAnalytics, safeExit } from '../../../analytics/wrapper.js';
-async function discover(command, options) {
-    const { runCloudDiscovery } = await import('./discovery.js');
-    const exitCode = await runCloudDiscovery(command, options);
-    safeExit(`cloud ${command.command}`, exitCode);
-}
+/** The top-level words the cloud command engine owns, and what each is for. */
+const ENGINE_WORDS = {
+    login: 'Sign in to Dexto with your browser or a device code, or save an API key for CI',
+    logout: 'End the sign-in on the server and forget it here',
+    whoami: 'Show who Dexto commands act as',
+    accounts: 'List, switch and remove saved sign-ins, one per account and organization',
+    models: 'Models Dexto serves on your sign-in',
+    billing: "Show the organization's credit balance and recent spending",
+    cloud: 'Build in Dexto Cloud: projects, agents, files, sandboxes and more',
+    workspace: 'Use your Dexto workspace as yourself: its apps and tools, over the Dexto MCP',
+    find: 'Find the command for something you want to do in Dexto',
+    publish: 'Publish a file, folder or .zip as a link anyone with it can open',
+    profile: 'Show and change your Dexto profile: handle, name, bio and who can see it',
+    skills: 'Push a local Skill folder into your Dexto Skills library',
+};
+/**
+ * These words run on the cloud command engine, which reads its own arguments and global options
+ * (--json, --api-key, --profile, --project). Analytics records only the command name, never its
+ * arguments, which can hold a key.
+ */
 export function registerCloudCommand(program) {
-    const cloud = program.command('cloud').description('Discover Dexto Cloud capabilities');
-    const sources = cloud.command('sources').description('List available capability sources');
-    const search = cloud.command('search <query>').description('Find capabilities by name or task');
-    const describe = cloud
-        .command('describe <path>')
-        .description('Show capability schemas and availability');
-    for (const command of [sources, search, describe]) {
-        command
-            .option('--json', 'Emit machine-readable JSON')
-            .option('--platform-url <origin>', 'Use a Cloud application origin');
-    }
-    for (const command of [sources, search]) {
-        command
-            .option('--limit <count>', 'Page size (1–100; default 20)')
-            .option('--offset <count>', 'Page offset (default 0)');
-    }
-    sources.action(withAnalytics('cloud sources', (options) => discover({ command: 'sources' }, options)));
-    search.action(withAnalytics('cloud search', (query, options) => discover({ command: 'search', query }, options)));
-    describe.action(withAnalytics('cloud describe', (path, options) => discover({ command: 'describe', path }, options)));
+    for (const [word, description] of Object.entries(ENGINE_WORDS))
+        program
+            .command(word)
+            .description(description)
+            .helpOption(false)
+            .passThroughOptions()
+            .allowUnknownOption()
+            .allowExcessArguments()
+            .argument('[args...]')
+            .action(async (args) => {
+            await withAnalytics(word, async () => {
+                const [{ runCloud }, { nodeCloudHost }] = await Promise.all([
+                    import('../../cloud/run.js'),
+                    import('../../cloud/host.js'),
+                ]);
+                const code = await runCloud(nodeCloudHost(new AbortController().signal), [
+                    word,
+                    ...args,
+                ]);
+                safeExit(word, code);
+            })();
+        });
 }

package/dist/cli/commands/create-app.js

@@ -3,7 +3,7 @@ import path from 'path';
 import chalk from 'chalk';
 import * as p from '@clack/prompts';
 import { selectOrExit } from '../utils/prompt-helpers.js';
-import { promptForProjectName, createProjectDirectory, setupGitRepo, createGitignore, initPackageJson, createTsconfigForApp, installDependencies, createEnvExample, ensureDirectory, getDextoVersionRange, } from '../utils/scaffolding-utils.js';
+import { promptForProjectName, createProjectDirectory, setupGitRepo, createGitignore, initPackageJson, createTsconfigForApp, installDependencies, createEnvExample, ensureDirectory, dextoPackageRange, } from '../utils/scaffolding-utils.js';
 import { generateIndexForCodeFirstDI, generateWebServerIndexForCodeFirstDI, generateWebAppHTML, generateWebAppJS, generateWebAppCSS, generateAppReadme, } from '../utils/template-engine.js';
 import { getExecutionContext } from '@dexto/agent-management';
 /**
@@ -115,18 +115,17 @@ async function scaffoldCodeFirstDI(projectPath, projectName, appType, spinner) {
     spinner.message('Installing dependencies...');
     const executionContext = getExecutionContext();
     const isDextoSource = executionContext === 'dexto-source';
-    const versionRange = getDextoVersionRange();
-    const dextoDependencyVersion = isDextoSource ? 'workspace:*' : versionRange;
+    const dexto = (name) => `${name}@${isDextoSource ? 'workspace:*' : dextoPackageRange(name)}`;
     const dependencies = [
-        `@dexto/core@${dextoDependencyVersion}`,
-        `@dexto/storage@${dextoDependencyVersion}`,
+        dexto('@dexto/core'),
+        dexto('@dexto/storage'),
         // Intentionally omit tool packs in the scaffold to keep the onboarding example minimal.
         // TODO: Revisit adding a default tool pack once tool IDs no longer require manual qualification.
         'dotenv',
         'tsx',
     ];
     if (appType === 'webapp') {
-        dependencies.push(`@dexto/server@${dextoDependencyVersion}`);
+        dependencies.push(dexto('@dexto/server'));
     }
     await installDependencies(projectPath, {
         dependencies,

package/dist/cli/commands/create-image.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"create-image.d.ts","sourceRoot":"","sources":["../../../src/cli/commands/create-image.ts"],"names":[],"mappings":"AA0BA;;;;GAIG;AACH,wBAAsB,WAAW,CAAC,IAAI,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC,CA0OhE"}
+{"version":3,"file":"create-image.d.ts","sourceRoot":"","sources":["../../../src/cli/commands/create-image.ts"],"names":[],"mappings":"AA2BA;;;;GAIG;AACH,wBAAsB,WAAW,CAAC,IAAI,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC,CAuOhE"}

package/dist/cli/commands/create-image.js

@@ -2,7 +2,7 @@ import path from 'path';
 import * as p from '@clack/prompts';
 import chalk from 'chalk';
 import { selectOrExit, textOrExit } from '../utils/prompt-helpers.js';
-import { promptForProjectName, createProjectDirectory, setupGitRepo, createGitignore, initPackageJson, createTsconfigForImage, getDextoVersionRange, installDependencies, pinDextoPackageIfUnversioned, ensureDirectory, } from '../utils/scaffolding-utils.js';
+import { promptForProjectName, createProjectDirectory, setupGitRepo, createGitignore, initPackageJson, createTsconfigForImage, dextoPackageRange, dextoPeerRange, installDependencies, pinDextoPackageIfUnversioned, ensureDirectory, } from '../utils/scaffolding-utils.js';
 import { generateDextoImageFile, generateImageReadme, generateExampleTool, generateExampleHook, generateExampleCompaction, } from '../utils/template-engine.js';
 import fs from 'fs-extra';
 import { getExecutionContext } from '@dexto/agent-management';
@@ -133,23 +133,22 @@ export async function createImage(name) {
         // Detect if we're in dexto source - use workspace protocol for local development
         const executionContext = getExecutionContext();
         const isDextoSource = executionContext === 'dexto-source';
-        const versionRange = getDextoVersionRange();
-        const dextoDependencyVersion = isDextoSource ? 'workspace:*' : versionRange;
+        const dextoRange = (name) => isDextoSource ? 'workspace:*' : dextoPackageRange(name);
+        const dexto = (name) => `${name}@${dextoRange(name)}`;
         // Determine dependencies based on whether extending
         const dependencies = [
-            `@dexto/core@${dextoDependencyVersion}`,
-            `@dexto/agent-config@${dextoDependencyVersion}`,
-            `@dexto/storage@${dextoDependencyVersion}`,
-            'zod@^3.25.0',
+            dexto('@dexto/core'),
+            dexto('@dexto/agent-config'),
+            dexto('@dexto/storage'),
+            `zod@${dextoPeerRange('zod')}`,
         ];
         const devDependencies = [
             'typescript@^5.0.0',
             '@types/node@^20.0.0',
-            `@dexto/image-bundler@${dextoDependencyVersion}`,
+            dexto('@dexto/image-bundler'),
         ];
         if (baseImage) {
-            const baseImageDependency = pinDextoPackageIfUnversioned(baseImage, isDextoSource ? dextoDependencyVersion : versionRange);
-            dependencies.push(baseImageDependency);
+            dependencies.push(pinDextoPackageIfUnversioned(baseImage, dextoRange));
         }
         // Install dependencies (use pnpm in dexto source for workspace protocol support)
         await installDependencies(projectPath, {

package/dist/cli/commands/index.d.ts

@@ -12,7 +12,5 @@ export { handleListAgentsCommand, type ListAgentsCommandOptions, type ListAgents
 export { handleWhichCommand, type WhichCommandOptions } from './which.js';
 export { handleSyncAgentsCommand, shouldPromptForSync, type SyncAgentsCommandOptions, } from './agents/sync.js';
 export { handleImageInstallCommand, handleImageListCommand, handleImageUseCommand, handleImageRemoveCommand, handleImageDoctorCommand, type ImageInstallCommandOptions, type ImageInstallCommandOptionsInput, } from './image.js';
-export { handleLoginCommand, handleLogoutCommand, handleStatusCommand } from './auth/index.js';
-export { handleBillingStatusCommand } from './billing/index.js';
 export { handlePluginListCommand, handlePluginInstallCommand, handlePluginUninstallCommand, handlePluginValidateCommand, handleMarketplaceAddCommand, handleMarketplaceRemoveCommand, handleMarketplaceUpdateCommand, handleMarketplaceListCommand, handleMarketplacePluginsCommand, handleMarketplaceInstallCommand, type PluginListCommandOptions, type PluginListCommandOptionsInput, type PluginInstallCommandOptions, type PluginInstallCommandOptionsInput, type PluginUninstallCommandOptions, type PluginUninstallCommandOptionsInput, type PluginValidateCommandOptions, type PluginValidateCommandOptionsInput, type MarketplaceAddCommandOptionsInput, type MarketplaceRemoveCommandOptionsInput, type MarketplaceUpdateCommandOptionsInput, type MarketplaceListCommandOptionsInput, type MarketplaceInstallCommandOptionsInput, } from './plugin.js';
 //# sourceMappingURL=index.d.ts.map

package/dist/cli/commands/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/cli/commands/index.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,kBAAkB,EAAE,KAAK,gBAAgB,EAAE,MAAM,iBAAiB,CAAC;AAE5E,OAAO,EAAE,WAAW,EAAE,MAAM,mBAAmB,CAAC;AAEhD,OAAO,EACH,iBAAiB,EACjB,sBAAsB,EACtB,wBAAwB,EACxB,sBAAsB,GACzB,MAAM,WAAW,CAAC;AACnB,OAAO,EAAE,0BAA0B,EAAE,SAAS,EAAE,aAAa,EAAE,MAAM,eAAe,CAAC;AAErF,OAAO,EAAE,kBAAkB,EAAE,KAAK,eAAe,EAAE,KAAK,oBAAoB,EAAE,MAAM,YAAY,CAAC;AACjG,OAAO,EAAE,oBAAoB,EAAE,KAAK,qBAAqB,EAAE,MAAM,cAAc,CAAC;AAChF,OAAO,EAAE,oBAAoB,EAAE,KAAK,qBAAqB,EAAE,MAAM,qBAAqB,CAAC;AACvF,OAAO,EAAE,sBAAsB,EAAE,KAAK,uBAAuB,EAAE,MAAM,uBAAuB,CAAC;AAC7F,OAAO,EAAE,oBAAoB,EAAE,KAAK,qBAAqB,EAAE,MAAM,cAAc,CAAC;AAChF,OAAO,EAAE,yBAAyB,EAAE,KAAK,0BAA0B,EAAE,MAAM,gBAAgB,CAAC;AAC5F,OAAO,EACH,uBAAuB,EACvB,KAAK,wBAAwB,EAC7B,KAAK,6BAA6B,GACrC,MAAM,kBAAkB,CAAC;AAC1B,OAAO,EAAE,kBAAkB,EAAE,KAAK,mBAAmB,EAAE,MAAM,YAAY,CAAC;AAC1E,OAAO,EACH,uBAAuB,EACvB,mBAAmB,EACnB,KAAK,wBAAwB,GAChC,MAAM,kBAAkB,CAAC;AAG1B,OAAO,EACH,yBAAyB,EACzB,sBAAsB,EACtB,qBAAqB,EACrB,wBAAwB,EACxB,wBAAwB,EACxB,KAAK,0BAA0B,EAC/B,KAAK,+BAA+B,GACvC,MAAM,YAAY,CAAC;AAGpB,OAAO,EAAE,kBAAkB,EAAE,mBAAmB,EAAE,mBAAmB,EAAE,MAAM,iBAAiB,CAAC;AAG/F,OAAO,EAAE,0BAA0B,EAAE,MAAM,oBAAoB,CAAC;AAGhE,OAAO,EACH,uBAAuB,EACvB,0BAA0B,EAC1B,4BAA4B,EAC5B,2BAA2B,EAE3B,2BAA2B,EAC3B,8BAA8B,EAC9B,8BAA8B,EAC9B,4BAA4B,EAC5B,+BAA+B,EAC/B,+BAA+B,EAC/B,KAAK,wBAAwB,EAC7B,KAAK,6BAA6B,EAClC,KAAK,2BAA2B,EAChC,KAAK,gCAAgC,EACrC,KAAK,6BAA6B,EAClC,KAAK,kCAAkC,EACvC,KAAK,4BAA4B,EACjC,KAAK,iCAAiC,EAEtC,KAAK,iCAAiC,EACtC,KAAK,oCAAoC,EACzC,KAAK,oCAAoC,EACzC,KAAK,kCAAkC,EACvC,KAAK,qCAAqC,GAC7C,MAAM,aAAa,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/cli/commands/index.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,kBAAkB,EAAE,KAAK,gBAAgB,EAAE,MAAM,iBAAiB,CAAC;AAE5E,OAAO,EAAE,WAAW,EAAE,MAAM,mBAAmB,CAAC;AAEhD,OAAO,EACH,iBAAiB,EACjB,sBAAsB,EACtB,wBAAwB,EACxB,sBAAsB,GACzB,MAAM,WAAW,CAAC;AACnB,OAAO,EAAE,0BAA0B,EAAE,SAAS,EAAE,aAAa,EAAE,MAAM,eAAe,CAAC;AAErF,OAAO,EAAE,kBAAkB,EAAE,KAAK,eAAe,EAAE,KAAK,oBAAoB,EAAE,MAAM,YAAY,CAAC;AACjG,OAAO,EAAE,oBAAoB,EAAE,KAAK,qBAAqB,EAAE,MAAM,cAAc,CAAC;AAChF,OAAO,EAAE,oBAAoB,EAAE,KAAK,qBAAqB,EAAE,MAAM,qBAAqB,CAAC;AACvF,OAAO,EAAE,sBAAsB,EAAE,KAAK,uBAAuB,EAAE,MAAM,uBAAuB,CAAC;AAC7F,OAAO,EAAE,oBAAoB,EAAE,KAAK,qBAAqB,EAAE,MAAM,cAAc,CAAC;AAChF,OAAO,EAAE,yBAAyB,EAAE,KAAK,0BAA0B,EAAE,MAAM,gBAAgB,CAAC;AAC5F,OAAO,EACH,uBAAuB,EACvB,KAAK,wBAAwB,EAC7B,KAAK,6BAA6B,GACrC,MAAM,kBAAkB,CAAC;AAC1B,OAAO,EAAE,kBAAkB,EAAE,KAAK,mBAAmB,EAAE,MAAM,YAAY,CAAC;AAC1E,OAAO,EACH,uBAAuB,EACvB,mBAAmB,EACnB,KAAK,wBAAwB,GAChC,MAAM,kBAAkB,CAAC;AAG1B,OAAO,EACH,yBAAyB,EACzB,sBAAsB,EACtB,qBAAqB,EACrB,wBAAwB,EACxB,wBAAwB,EACxB,KAAK,0BAA0B,EAC/B,KAAK,+BAA+B,GACvC,MAAM,YAAY,CAAC;AAOpB,OAAO,EACH,uBAAuB,EACvB,0BAA0B,EAC1B,4BAA4B,EAC5B,2BAA2B,EAE3B,2BAA2B,EAC3B,8BAA8B,EAC9B,8BAA8B,EAC9B,4BAA4B,EAC5B,+BAA+B,EAC/B,+BAA+B,EAC/B,KAAK,wBAAwB,EAC7B,KAAK,6BAA6B,EAClC,KAAK,2BAA2B,EAChC,KAAK,gCAAgC,EACrC,KAAK,6BAA6B,EAClC,KAAK,kCAAkC,EACvC,KAAK,4BAA4B,EACjC,KAAK,iCAAiC,EAEtC,KAAK,iCAAiC,EACtC,KAAK,oCAAoC,EACzC,KAAK,oCAAoC,EACzC,KAAK,kCAAkC,EACvC,KAAK,qCAAqC,GAC7C,MAAM,aAAa,CAAC"}

package/dist/cli/commands/index.js

@@ -16,9 +16,7 @@ export { handleSyncAgentsCommand, shouldPromptForSync, } from './agents/sync.js'
 // Image commands
 export { handleImageInstallCommand, handleImageListCommand, handleImageUseCommand, handleImageRemoveCommand, handleImageDoctorCommand, } from './image.js';
 // Auth commands
-export { handleLoginCommand, handleLogoutCommand, handleStatusCommand } from './auth/index.js';
 // Billing commands
-export { handleBillingStatusCommand } from './billing/index.js';
 // Plugin commands
 export { handlePluginListCommand, handlePluginInstallCommand, handlePluginUninstallCommand, handlePluginValidateCommand, 
 // Marketplace handlers

package/dist/cli/commands/init.d.ts

@@ -79,8 +79,6 @@ export interface WorkspaceStatusResult {
         parentAgentId: string | null;
     }>;
     skills: string[];
-    deployConfigPath: string | null;
-    effectiveDeploySummary: string;
 }
 export interface InitCommandRegisterContext {
     program: Command;

package/dist/cli/commands/init.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"init.d.ts","sourceRoot":"","sources":["../../../src/cli/commands/init.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"init.d.ts","sourceRoot":"","sources":["../../../src/cli/commands/init.ts"],"names":[],"mappings":"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"}

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.js

@@ -173,13 +173,13 @@ 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})`);
+                    writeHeadlessTaggedLine('APPROVAL_REQUIRED', `${'tool_name' in required ? required.tool_name : required.approval_type}: ${required.message} (approval ${required.approval_id})`);
                     break;
                 }
                 case 'llm:tool-call': {

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/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"}