dexto 1.14.6 → 2.0.0-beta.1

package/dist/cli/commands/auth/sign-in-commands.js

@@ -0,0 +1,248 @@
+// `dexto login`, `logout`, `whoami` and `accounts`: signing in to Dexto and the saved profiles.
+import { CommandFailure } from '../../failure.js';
+import { dextoAccounts } from '@dexto/agent-management';
+import { UsageError } from '../../cloud/command.js';
+const { DEFAULT_PROFILE, forgetLogin, listAccounts: readAccounts, profileNameFor, readCurrentProfile, readLogin, requireProfileName, resolveCredential, resolveProfile, writeCurrentProfile, writeLogin, } = dextoAccounts;
+export async function login(context, options) {
+    const named = options.profile ?? nonEmpty(context.environment.DEXTO_PROFILE);
+    // --org names the profile and switches to it, unless --profile or DEXTO_PROFILE chose one.
+    const switches = options.org !== null && named === null;
+    const profile = options.org !== null && switches
+        ? profileNameFor(options.org)
+        : await resolveProfile(context.dir, named, {});
+    const saved = await readLogin(context.dir, profile);
+    if (options.apiKey !== null) {
+        if (options.org !== null)
+            throw new UsageError('An API key acts as itself; --org is for signing in.');
+        await saveApiKey(context, profile, options.apiKey);
+        return;
+    }
+    const previous = saved?.kind === 'oauth' ? saved : null;
+    const input = {
+        appUrl: previous?.appUrl ?? context.appUrl,
+        apiBaseUrl: previous?.apiBaseUrl ?? context.apiBaseUrl,
+        // Signing in again starts at the organization the profile was signed in for.
+        organization: options.org ?? previous?.signedInAs?.organization.id ?? null,
+        // ...and keeps the permissions granted before.
+        extraScopes: [...(previous?.scopes ?? []), ...options.scopes.flatMap(splitList)],
+    };
+    // A browser elsewhere can't reach this machine's loopback redirect, so use a code instead.
+    const device = options.device || (options.browser && !context.canOpenBrowser);
+    if (device && !options.device)
+        context.note('No browser here, so sign in with a code on any device.');
+    const signedIn = device
+        ? await context.dexto.signInWithDevice(input)
+        : await context.dexto.signInWithBrowser({ ...input, openBrowser: options.browser });
+    // A name made from --org can match another organization's profile: keep that sign-in.
+    const savedOrganization = previous?.signedInAs?.organization ?? null;
+    const newOrganization = signedIn.signedInAs?.organization ?? null;
+    if (switches &&
+        savedOrganization !== null &&
+        newOrganization !== null &&
+        savedOrganization.id !== newOrganization.id)
+        throw new UsageError(`The profile ${profile} already signs in to ${savedOrganization.name}. Sign in to ${newOrganization.name} with --profile <name> to keep both.`);
+    const withProject = {
+        ...signedIn,
+        cloudProject: chooseProject(await context.dexto.listProjects(signedIn), previous?.cloudProject ?? null),
+    };
+    await writeLogin(context.dir, profile, withProject);
+    if (switches)
+        await writeCurrentProfile(context.dir, profile);
+    const current = (await resolveProfile(context.dir, null, context.environment)) === profile;
+    context.result({
+        profile,
+        current,
+        account: signedIn.signedInAs?.account ?? null,
+        organization: signedIn.signedInAs?.organization ?? null,
+        cloud_project: withProject.cloudProject,
+        scopes: withProject.scopes,
+    }, [
+        `Signed in${describeSignedInAs(signedIn.signedInAs)}${profile === DEFAULT_PROFILE ? '' : ` (profile ${profile})`}.`,
+        withProject.cloudProject === null
+            ? 'This organization has no Cloud project for Dexto models to bill.'
+            : `Dexto models bill Cloud project ${withProject.cloudProject.name}.`,
+        ...(current
+            ? []
+            : [
+                `Other commands still use another profile: pass --profile ${profile}, or run dexto accounts use ${profile}.`,
+            ]),
+    ].join(' '));
+}
+/**
+ * The project chosen before while it is still live, so signing in again doesn't move anyone;
+ * otherwise the organization's default project.
+ */
+function chooseProject(projects, previous) {
+    const chosen = projects.find((project) => project.id === previous?.id && !project.archived) ??
+        projects.find((project) => project.isDefault && !project.archived) ??
+        null;
+    return chosen === null ? null : { id: chosen.id, name: chosen.name };
+}
+async function saveApiKey(context, profile, apiKey) {
+    if (!(await context.dexto.acceptsApiKey(context.apiBaseUrl, apiKey)))
+        throw new CommandFailure('needs_sign_in', 'Dexto refused this API key.', null);
+    await writeLogin(context.dir, profile, {
+        kind: 'api_key',
+        apiKey,
+        apiBaseUrl: context.apiBaseUrl,
+        savedAt: new Date().toISOString(),
+    });
+    context.result({ profile, key: maskApiKey(apiKey) }, `Saved API key ${maskApiKey(apiKey)}${profile === DEFAULT_PROFILE ? '' : ` (profile ${profile})`}.`);
+}
+/** Who the current profile acts as, in a few words, or null when signed out. */
+export async function describeSignIn(context) {
+    const environmentKey = nonEmpty(context.environment.DEXTO_API_KEY);
+    if (environmentKey !== null)
+        return `API key ${maskApiKey(environmentKey)} from DEXTO_API_KEY`;
+    const profile = await resolveProfile(context.dir, null, context.environment);
+    const saved = await readLogin(context.dir, profile);
+    if (saved === null)
+        return null;
+    const suffix = profile === DEFAULT_PROFILE ? '' : ` (profile ${profile})`;
+    if (saved.kind === 'api_key')
+        return `API key ${maskApiKey(saved.apiKey)}${suffix}`;
+    const who = saved.signedInAs === null
+        ? saved.appUrl
+        : `${saved.signedInAs.account.email} in ${saved.signedInAs.organization.name}`;
+    return `${who}${suffix}`;
+}
+export async function logout(context, options) {
+    const profile = await resolveProfile(context.dir, options.profile, context.environment);
+    const removed = await logOutProfile(context, profile);
+    const named = profile === DEFAULT_PROFILE ? '' : ` for profile ${profile}`;
+    context.result({ profile, logged_out: removed }, removed ? `Logged out${named}.` : `No saved sign-in${named}.`);
+}
+/**
+ * Ends a profile's sign-in on its server, then forgets it here. A sign-in the server didn't end
+ * keeps working until it expires, so a note says where to end it.
+ */
+async function logOutProfile(context, profile) {
+    const saved = await readLogin(context.dir, profile);
+    if (saved?.kind === 'oauth') {
+        const ended = await context.dexto.endSignIn(saved);
+        if (ended.status === 'failed')
+            context.note(`Couldn't end the sign-in on ${saved.appUrl} (${ended.reason}). Sign it out at ${new URL('/settings/sign-ins', saved.appUrl).href}, or it keeps working until it expires.`);
+    }
+    return await forgetLogin(context.dir, profile);
+}
+export async function whoami(context, options) {
+    const credential = await resolveCredential({
+        dir: context.dir,
+        apiKey: options.apiKey,
+        profile: options.profile,
+        environment: context.environment,
+        refresh: context.dexto.refreshSignIn,
+    });
+    if (credential === null)
+        throw new CommandFailure('needs_sign_in', 'Not signed in.', 'dexto login');
+    if (credential.kind === 'api_key') {
+        const from = credential.source === 'flag'
+            ? ' (from --api-key)'
+            : credential.source === 'environment'
+                ? ' (from DEXTO_API_KEY)'
+                : `, profile ${credential.profile}`;
+        context.result({ as: 'api_key', key: maskApiKey(credential.token), source: credential.source }, field('api key', `${maskApiKey(credential.token)}${from}`));
+        return;
+    }
+    const { login: saved } = credential;
+    context.result({
+        as: 'person',
+        profile: credential.profile,
+        account: saved.signedInAs?.account ?? null,
+        organization: saved.signedInAs?.organization ?? null,
+        app_url: saved.appUrl,
+        cloud_project: saved.cloudProject,
+        scopes: saved.scopes,
+    }, [
+        field('profile', credential.profile),
+        field('account', saved.signedInAs?.account.email ?? 'unknown'),
+        field('organization', saved.signedInAs === null
+            ? 'unknown'
+            : `${saved.signedInAs.organization.name} (${saved.signedInAs.organization.slug})`),
+        field('app', saved.appUrl),
+        field('scopes', saved.scopes.join(' ')),
+    ].join('\n'));
+}
+export async function listAccounts(context, options) {
+    const inUse = await resolveProfile(context.dir, options.profile, context.environment);
+    const accounts = (await readAccounts(context.dir)).map(({ name, login: saved }) => ({
+        profile: name,
+        current: name === inUse,
+        kind: saved.kind,
+        account: saved.kind === 'oauth' ? (saved.signedInAs?.account ?? null) : null,
+        organization: saved.kind === 'oauth' ? (saved.signedInAs?.organization ?? null) : null,
+        key: saved.kind === 'api_key' ? maskApiKey(saved.apiKey) : null,
+        url: saved.kind === 'oauth' ? saved.appUrl : saved.apiBaseUrl,
+    }));
+    const rows = accounts.map((account) => [
+        `${account.current ? '*' : ' '} ${account.profile}`,
+        account.key !== null ? `API key ${account.key}` : (account.account?.email ?? account.url),
+        account.organization?.name ?? '',
+    ]);
+    context.result({ data: accounts }, rows.length === 0 ? 'No saved sign-ins. Run dexto login.' : table(rows));
+}
+export async function useAccount(context, wanted) {
+    const { name, login: saved } = await requireSaved(context, wanted);
+    await writeCurrentProfile(context.dir, name);
+    const overridden = (await resolveProfile(context.dir, null, context.environment)) !== name;
+    context.result({ current: name }, `Now using ${describeProfile(name, saved)}.${overridden ? ' DEXTO_PROFILE still chooses another profile here.' : ''}`);
+}
+export async function removeAccount(context, wanted, options) {
+    const { name, login: saved } = await requireSaved(context, wanted);
+    const question = saved.kind === 'oauth'
+        ? `Log ${describeProfile(name, saved)} out and forget it on this machine?`
+        : `Forget ${describeProfile(name, saved)} on this machine?`;
+    if (!options.yes && !(await context.confirm(question)))
+        throw new CommandFailure('needs_confirmation', `${question} Pass --yes once your person has agreed.`, `dexto accounts remove ${name} --yes`);
+    const wasCurrent = (await readCurrentProfile(context.dir)) === name;
+    await logOutProfile(context, name);
+    if (wasCurrent)
+        await writeCurrentProfile(context.dir, DEFAULT_PROFILE);
+    context.result({ removed: name, current: wasCurrent ? DEFAULT_PROFILE : null }, `Removed ${name}.${wasCurrent && name !== DEFAULT_PROFILE ? ` Now using ${DEFAULT_PROFILE}.` : ''}`);
+}
+async function requireSaved(context, wanted) {
+    const name = requireProfileName(wanted);
+    const saved = await readLogin(context.dir, name);
+    if (saved === null)
+        throw new CommandFailure('not_found', `No saved sign-in is named ${name}.`, `dexto login --profile ${name}`);
+    return { name, login: saved };
+}
+/** `work (ada@example.com in Acme)`, or the key or app a profile signs in with. */
+function describeProfile(name, saved) {
+    if (saved.kind === 'api_key')
+        return `${name} (API key ${maskApiKey(saved.apiKey)})`;
+    return saved.signedInAs === null
+        ? `${name} (${saved.appUrl})`
+        : `${name} (${saved.signedInAs.account.email} in ${saved.signedInAs.organization.name})`;
+}
+/** ` as ada@example.com in Acme`, or nothing when the server didn't say. */
+function describeSignedInAs(signedInAs) {
+    return signedInAs === null
+        ? ''
+        : ` as ${signedInAs.account.email} in ${signedInAs.organization.name}`;
+}
+/** `dxt_123…abcd`: enough to recognize a key without showing it. */
+function maskApiKey(apiKey) {
+    return apiKey.length <= 12 ? '…' : `${apiKey.slice(0, 7)}…${apiKey.slice(-4)}`;
+}
+function field(name, value) {
+    return `${name.padEnd(13)} ${value}`;
+}
+function table(rows) {
+    const widths = rows[0]?.map((_, column) => Math.max(...rows.map((row) => row[column]?.length ?? 0)));
+    return rows
+        .map((row) => row
+        .map((cell, column) => column === row.length - 1 ? cell : cell.padEnd(widths?.[column] ?? 0))
+        .join('  ')
+        .trimEnd())
+        .join('\n');
+}
+function splitList(value) {
+    return value
+        .split(/[\s,]+/u)
+        .map((each) => each.trim())
+        .filter((each) => each.length > 0);
+}
+function nonEmpty(value) {
+    return value === undefined || value.length === 0 ? null : value;
+}

package/dist/cli/commands/auth/sign-in-context.d.ts

@@ -0,0 +1,16 @@
+import type { SignInContext } from './sign-in-commands.js';
+/** Where results and notes go, and what cancels a sign-in; the terminal's by default. */
+export interface SignInIo {
+    readonly result: (value: unknown, text: string) => void;
+    readonly note: (text: string) => void;
+    /** Asks the person; false when there is no one to ask. */
+    readonly confirm: (question: string) => Promise<boolean>;
+    readonly signal: AbortSignal;
+}
+/**
+ * Carries this machine's earlier sign-ins into ~/.dexto/accounts, once: the `dexto-cloud` preview
+ * CLI's, else dexto 1.x's saved API key.
+ */
+export declare function carryOverEarlierSignIns(): Promise<void>;
+export declare function nodeSignInContext(io?: SignInIo): Promise<SignInContext>;
+//# sourceMappingURL=sign-in-context.d.ts.map

package/dist/cli/commands/auth/sign-in-context.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"sign-in-context.d.ts","sourceRoot":"","sources":["../../../../src/cli/commands/auth/sign-in-context.ts"],"names":[],"mappings":"AAUA,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,uBAAuB,CAAC;AAE3D,yFAAyF;AACzF,MAAM,WAAW,QAAQ;IACrB,QAAQ,CAAC,MAAM,EAAE,CAAC,KAAK,EAAE,OAAO,EAAE,IAAI,EAAE,MAAM,KAAK,IAAI,CAAC;IACxD,QAAQ,CAAC,IAAI,EAAE,CAAC,IAAI,EAAE,MAAM,KAAK,IAAI,CAAC;IACtC,0DAA0D;IAC1D,QAAQ,CAAC,OAAO,EAAE,CAAC,QAAQ,EAAE,MAAM,KAAK,OAAO,CAAC,OAAO,CAAC,CAAC;IACzD,QAAQ,CAAC,MAAM,EAAE,WAAW,CAAC;CAChC;AAmBD;;;GAGG;AACH,wBAAsB,uBAAuB,IAAI,OAAO,CAAC,IAAI,CAAC,CAQ7D;AAED,wBAAsB,iBAAiB,CAAC,EAAE,GAAE,QAAmB,GAAG,OAAO,CAAC,aAAa,CAAC,CAiCvF"}

package/dist/cli/commands/auth/sign-in-context.js

@@ -0,0 +1,68 @@
+// The sign-in context for this machine: ~/.dexto/accounts, Dexto's OAuth server and the browser.
+import os from 'node:os';
+import path from 'node:path';
+import * as p from '@clack/prompts';
+import { dextoAccounts, dextoCloud, dextoSignIn } from '@dexto/agent-management';
+import { getDextoGlobalPath } from '@dexto/core';
+import { shouldAttemptBrowserLaunch } from '../../auth/browser-launch.js';
+import { DEXTO_PLATFORM_URL, DEXTO_PUBLIC_API_URL } from '../../auth/constants.js';
+import { nodeSignInRuntime } from '../../auth/sign-in-runtime.js';
+const TERMINAL = {
+    result: (_value, text) => process.stdout.write(`${text}\n`),
+    note: (text) => process.stderr.write(`${text}\n`),
+    confirm: async (question) => {
+        if (!process.stdin.isTTY)
+            return false;
+        const answer = await p.confirm({ message: question, initialValue: false });
+        return answer === true;
+    },
+    signal: new AbortController().signal,
+};
+/** The folder the internal `dexto-cloud` CLI saved its sign-ins in. */
+function cloudCliDirectory() {
+    const configHome = process.env.XDG_CONFIG_HOME ?? path.join(os.homedir(), '.config');
+    return path.join(configHome, 'dexto-cloud');
+}
+/**
+ * Carries this machine's earlier sign-ins into ~/.dexto/accounts, once: the `dexto-cloud` preview
+ * CLI's, else dexto 1.x's saved API key.
+ */
+export async function carryOverEarlierSignIns() {
+    const dir = getDextoGlobalPath('accounts');
+    await dextoAccounts.carryOverCloudCliLogins(dir, cloudCliDirectory());
+    await dextoAccounts.carryOverDexto1ApiKey(dir, getDextoGlobalPath('', 'auth.json'), DEXTO_PUBLIC_API_URL);
+}
+export async function nodeSignInContext(io = TERMINAL) {
+    const dir = getDextoGlobalPath('accounts');
+    await carryOverEarlierSignIns();
+    const runtime = { ...nodeSignInRuntime(io.signal), note: io.note };
+    return {
+        dir,
+        environment: process.env,
+        appUrl: DEXTO_PLATFORM_URL,
+        apiBaseUrl: DEXTO_PUBLIC_API_URL,
+        result: io.result,
+        note: io.note,
+        confirm: io.confirm,
+        canOpenBrowser: shouldAttemptBrowserLaunch(),
+        dexto: {
+            signInWithBrowser: (input) => dextoSignIn.signInWithBrowser(runtime, input),
+            signInWithDevice: (input) => dextoSignIn.signInWithDevice(runtime, input),
+            endSignIn: (login) => dextoSignIn.endSignIn(runtime, login),
+            refreshSignIn: (login) => dextoSignIn.refreshSignIn(runtime, login),
+            listProjects: (login) => dextoCloud.listCloudProjects(runtime.fetch, login.apiBaseUrl, login.accessToken),
+            acceptsApiKey: async (apiBaseUrl, apiKey) => {
+                const response = await fetch(`${apiBaseUrl}/v1/models`, {
+                    headers: { authorization: `Bearer ${apiKey}` },
+                    signal: AbortSignal.timeout(10_000),
+                });
+                await response.body?.cancel();
+                if (response.status === 401)
+                    return false;
+                if (!response.ok)
+                    throw new Error(`Couldn't check the API key: HTTP ${response.status}.`);
+                return true;
+            },
+        },
+    };
+}

package/dist/cli/commands/cloud/register.d.ts

@@ -1,3 +1,8 @@
 import type { Command } from 'commander';
+/**
+ * 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 declare function registerCloudCommand(program: Command): void;
 //# sourceMappingURL=register.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"register.d.ts","sourceRoot":"","sources":["../../../../src/cli/commands/cloud/register.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AAazC,wBAAgB,oBAAoB,CAAC,OAAO,EAAE,OAAO,GAAG,IAAI,CAgC3D"}
+{"version":3,"file":"register.d.ts","sourceRoot":"","sources":["../../../../src/cli/commands/cloud/register.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AAqBzC;;;;GAIG;AACH,wBAAgB,oBAAoB,CAAC,OAAO,EAAE,OAAO,GAAG,IAAI,CAuB3D"}

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

@@ -1,27 +1,47 @@
 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',
+    trace: "List your run traces and show one run's trace from Dexto",
+    span: "List one run's spans from Dexto",
+};
+/**
+ * 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":"AACA,OAAO,KAAK,EAAe,gBAAgB,EAAE,MAAM,qBAAqB,CAAC;AAgBzE,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AA0CzC,KAAK,mBAAmB,GAAG,SAAS,GAAG,UAAU,CAAC;AAClD,KAAK,oBAAoB,GAAG,SAAS,GAAG,UAAU,GAAG,SAAS,CAAC;AAE/D,MAAM,WAAW,uBAAuB;IACpC,IAAI,EAAE,MAAM,CAAC;IACb,UAAU,EAAE;QAAE,IAAI,EAAE,MAAM,CAAC;QAAC,MAAM,EAAE,mBAAmB,CAAA;KAAE,CAAC;IAC1D,WAAW,EAAE,KAAK,CAAC;QAAE,IAAI,EAAE,MAAM,CAAC;QAAC,MAAM,EAAE,mBAAmB,CAAA;KAAE,CAAC,CAAC;CACrE;AAED,MAAM,WAAW,4BAA4B;IACzC,SAAS,EAAE,uBAAuB,CAAC;IACnC,QAAQ,EAAE;QAAE,IAAI,EAAE,MAAM,CAAC;QAAC,MAAM,EAAE,oBAAoB,CAAA;KAAE,CAAC;IACzD,WAAW,EAAE;QAAE,IAAI,EAAE,MAAM,CAAC;QAAC,MAAM,EAAE,mBAAmB,CAAA;KAAE,CAAC;IAC3D,YAAY,EAAE;QAAE,EAAE,EAAE,MAAM,GAAG,IAAI,CAAC;QAAC,MAAM,EAAE,KAAK,GAAG,WAAW,CAAA;KAAE,CAAC;CACpE;AAED,MAAM,WAAW,4BAA4B;IACzC,SAAS,EAAE,uBAAuB,CAAC;IACnC,SAAS,EAAE;QAAE,IAAI,EAAE,MAAM,CAAC;QAAC,MAAM,EAAE,mBAAmB,CAAA;KAAE,CAAC;IACzD,mBAAmB,EAAE,KAAK,CAAC;QAAE,IAAI,EAAE,MAAM,CAAC;QAAC,MAAM,EAAE,mBAAmB,CAAA;KAAE,CAAC,CAAC;IAC1E,UAAU,EAAE,KAAK,CAAC;QAAE,IAAI,EAAE,MAAM,CAAC;QAAC,MAAM,EAAE,mBAAmB,CAAA;KAAE,CAAC,CAAC;CACpE;AAED,MAAM,WAAW,2BAA2B;IACxC,SAAS,EAAE,uBAAuB,CAAC;IACnC,QAAQ,EAAE;QAAE,IAAI,EAAE,MAAM,CAAC;QAAC,MAAM,EAAE,OAAO,CAAC,oBAAoB,EAAE,SAAS,CAAC,CAAA;KAAE,CAAC;IAC7E,YAAY,EAAE;QAAE,EAAE,EAAE,MAAM,CAAC;QAAC,MAAM,EAAE,KAAK,GAAG,UAAU,CAAA;KAAE,CAAC;CAC5D;AAED,MAAM,WAAW,2BAA2B;IACxC,SAAS,EAAE,uBAAuB,CAAC;IACnC,QAAQ,EAAE;QAAE,IAAI,EAAE,MAAM,CAAC;QAAC,MAAM,EAAE,SAAS,GAAG,UAAU,CAAA;KAAE,CAAC;IAC3D,UAAU,EAAE,MAAM,CAAC;IACnB,aAAa,EAAE,MAAM,GAAG,IAAI,CAAC;IAC7B,MAAM,EAAE,KAAK,GAAG,UAAU,GAAG,YAAY,CAAC;CAC7C;AAED,MAAM,WAAW,qBAAqB;IAClC,aAAa,EAAE,MAAM,CAAC;IACtB,iBAAiB,EAAE,OAAO,CAAC;IAC3B,sBAAsB,EAAE,OAAO,CAAC;IAChC,sBAAsB,EAAE,OAAO,CAAC;IAChC,YAAY,EAAE,MAAM,GAAG,IAAI,CAAC;IAC5B,cAAc,EAAE,MAAM,GAAG,IAAI,CAAC;IAC9B,iBAAiB,EAAE,OAAO,GAAG,IAAI,CAAC;IAClC,MAAM,EAAE,KAAK,CAAC;QACV,EAAE,EAAE,MAAM,CAAC;QACX,SAAS,EAAE,OAAO,CAAC;QACnB,UAAU,EAAE,OAAO,CAAC;QACpB,aAAa,EAAE,MAAM,GAAG,IAAI,CAAC;KAChC,CAAC,CAAC;IACH,MAAM,EAAE,MAAM,EAAE,CAAC;CACpB;AAED,MAAM,WAAW,0BAA0B;IACvC,OAAO,EAAE,OAAO,CAAC;CACpB;AAED,KAAK,uBAAuB,GAAG;IAC3B,QAAQ,CAAC,EAAE,OAAO,CAAC;IACnB,OAAO,CAAC,EAAE,OAAO,CAAC;IAClB,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,KAAK,CAAC,EAAE,gBAAgB,EAAE,CAAC;CAC9B,CAAC;AAozCF,wBAAsB,uBAAuB,CACzC,aAAa,GAAE,MAAsB,GACtC,OAAO,CAAC,uBAAuB,CAAC,CAgClC;AAED,wBAAsB,4BAA4B,CAC9C,YAAY,EAAE,MAAM,EACpB,OAAO,GAAE,uBAA4B,EACrC,aAAa,GAAE,MAAsB,GACtC,OAAO,CAAC,4BAA4B,CAAC,CA8GvC;AAED,wBAAsB,4BAA4B,CAC9C,YAAY,EAAE,MAAM,EACpB,aAAa,GAAE,MAAsB,GACtC,OAAO,CAAC,4BAA4B,CAAC,CAkCvC;AAED,wBAAsB,wBAAwB,CAC1C,YAAY,EAAE,MAAM,EACpB,aAAa,GAAE,MAAsB,GACtC,OAAO,CAAC,2BAA2B,CAAC,CAqCtC;AAED,wBAAsB,mCAAmC,CACrD,eAAe,EAAE,MAAM,EACvB,aAAa,GAAE,MAAsB,GACtC,OAAO,CAAC,2BAA2B,CAAC,CAmDtC;AAmED,wBAAsB,sBAAsB,CACxC,aAAa,GAAE,MAAsB,GACtC,OAAO,CAAC,qBAAqB,CAAC,CAoChC;AA4ED,wBAAsB,iBAAiB,CAAC,aAAa,GAAE,MAAsB,GAAG,OAAO,CAAC,IAAI,CAAC,CAsB5F;AAED,wBAAsB,sBAAsB,CACxC,YAAY,EAAE,MAAM,GAAG,SAAS,EAChC,OAAO,GAAE,uBAA4B,EACrC,aAAa,GAAE,MAAsB,GACtC,OAAO,CAAC,IAAI,CAAC,CAuDf;AAED,wBAAsB,sBAAsB,CACxC,OAAO,EAAE,MAAM,EACf,aAAa,GAAE,MAAsB,GACtC,OAAO,CAAC,IAAI,CAAC,CAaf;AAED,wBAAsB,wBAAwB,CAC1C,YAAY,EAAE,MAAM,GAAG,SAAS,EAChC,aAAa,GAAE,MAAsB,GACtC,OAAO,CAAC,IAAI,CAAC,CAaf;AAED,wBAAsB,uBAAuB,CACzC,aAAa,GAAE,MAAsB,GACtC,OAAO,CAAC,IAAI,CAAC,CAIf;AAED,wBAAgB,mBAAmB,CAAC,EAAE,OAAO,EAAE,EAAE,0BAA0B,GAAG,IAAI,CAmGjF"}