@the-open-engine/zeroshot 6.3.0 → 6.5.0

package/cli/commands/providers.js

@@ -1,8 +1,14 @@
 const readline = require('readline');
 const { loadSettings, saveSettings } = require('../../lib/settings');
-const { VALID_PROVIDERS, normalizeProviderName } = require('../../lib/provider-names');
+const {
+  VALID_PROVIDERS,
+  normalizeProviderName,
+  providerSupportsCapability,
+} = require('../../lib/provider-names');
 const { detectProviders, getProvider } = require('../../src/providers');
 
+const PROVIDER_CHOICES = VALID_PROVIDERS.join(', ');
+
 function question(rl, prompt) {
   return new Promise((resolve) => {
     rl.question(prompt, (answer) => resolve(answer.trim()));
@@ -45,7 +51,7 @@ async function providersCommand() {
 function setDefaultCommand(args) {
   const provider = normalizeProviderName(args[0]);
   if (!VALID_PROVIDERS.includes(provider)) {
-    console.error(`Invalid provider: ${args[0]}`);
+    console.error(`Invalid provider: ${args[0]}. Valid: ${PROVIDER_CHOICES}`);
     process.exit(1);
   }
 
@@ -58,8 +64,8 @@ function setDefaultCommand(args) {
 
 async function setupCommand(args) {
   const provider = normalizeProviderName(args[0]);
-  if (!provider) {
-    console.error('Provider is required (claude, codex, gemini, opencode)');
+  if (!provider || !VALID_PROVIDERS.includes(provider)) {
+    console.error(`Provider is required (${PROVIDER_CHOICES})`);
     process.exit(1);
   }
 
@@ -115,7 +121,7 @@ async function setupCommand(args) {
       for (const level of levelKeys) {
         const modelChoice = await question(rl, `Model for ${level} (${catalog.join(', ')}): `);
         if (modelChoice) levelOverrides[level] = { model: modelChoice };
-        if (provider !== 'codex') continue;
+        if (!providerSupportsCapability(provider, 'reasoningEffort')) continue;
         const reasoning = await question(rl, `Reasoning for ${level} (low|medium|high|xhigh): `);
         if (reasoning) {
           levelOverrides[level] = {

package/cli/index.js

@@ -46,8 +46,9 @@ const {
   validateSetting,
   coerceValue,
   DEFAULT_SETTINGS,
+  settingsFileExists,
 } = require('../lib/settings');
-const { normalizeProviderName } = require('../lib/provider-names');
+const { VALID_PROVIDERS, normalizeProviderName } = require('../lib/provider-names');
 const { getProvider, parseProviderChunk } = require('../src/providers');
 const { readClustersFileSync } = require('../lib/clusters-registry');
 const { MOUNT_PRESETS, resolveEnvs } = require('../lib/docker-config');
@@ -89,6 +90,7 @@ const { EVENT_COPY, formatMergeStatus } = require('./event-copy');
 let activeClusterId = null;
 /** @type {import('../src/orchestrator') | null} */
 let orchestratorInstance = null;
+const PROVIDER_CHOICES = VALID_PROVIDERS.join(', ');
 
 // Track active status footer for safe output routing
 // When set, all output routes through statusFooter.print() to prevent garbling
@@ -189,7 +191,9 @@ function normalizeRunOptions(options) {
   if (options.docker) {
     options.worktree = false;
   }
-  options.autoMerge = Boolean(options.ship);
+  // autoMerge is NOT stored here — it is derived from the run plan (delivery ===
+  // 'ship') at every consumer. Writing it here unconditionally would clobber an
+  // explicit autoMerge intent (e.g. a future `--auto-merge` flag) back to false.
 }
 
 async function runClusterPreflight({ input, options, providerOverride, settings, forceProvider }) {
@@ -2411,10 +2415,7 @@ program
     'When to close issue after merge: auto|always|never (default: from .zeroshot/settings.json or never)'
   )
   .option('--workers <n>', 'Max sub-agents for worker to spawn in parallel', parseInt)
-  .option(
-    '--provider <provider>',
-    'Override all agents to use a provider (claude, codex, gemini, opencode)'
-  )
+  .option('--provider <provider>', `Override all agents to use a provider (${PROVIDER_CHOICES})`)
   .option('--model <model>', 'Override all agent models (provider-specific model id)')
   .option(
     '--sim <mode>',
@@ -2610,6 +2611,7 @@ Force provider flags: -G (GitHub), -L (GitLab), -J (Jira), -D (DevOps), -N (Line
 
       if (!process.env.ZEROSHOT_DAEMON) {
         await streamClusterInForeground(cluster, orchestrator, clusterId, options);
+        orchestrator.close();
       }
 
       setupDaemonCleanup(orchestrator, clusterId);
@@ -2679,7 +2681,7 @@ taskCmd
   .command('run <prompt>')
   .description('Run a single-agent background task')
   .option('-C, --cwd <path>', 'Working directory for task')
-  .option('--provider <provider>', 'Provider to use (claude, codex, gemini, opencode)')
+  .option('--provider <provider>', `Provider to use (${PROVIDER_CHOICES})`)
   .option('--model <model>', 'Model id override for the provider')
   .option('--model-level <level>', 'Model level override (level1, level2, level3)')
   .option('--reasoning-effort <effort>', 'Reasoning effort (low, medium, high, xhigh)')
@@ -2691,6 +2693,12 @@ taskCmd
     'stream-json'
   )
   .option('--json-schema <schema>', 'JSON schema for structured output')
+  .option(
+    '--mcp-config <config>',
+    'MCP server config for providers that accept an MCP config flag (e.g. Copilot). ' +
+      'Inline JSON string ({"mcpServers":{...}}) or @<path>. Repeatable.',
+    (value, previous) => (previous || []).concat([value])
+  )
   .option('--silent-json-output', 'Log ONLY final structured output')
   .action(async (prompt, options) => {
     try {
@@ -3602,15 +3610,15 @@ function registerTuiEntrypoint(commandName, providerName) {
     .action(failTuiUnavailable);
 }
 
-registerTuiEntrypoint('codex', 'codex');
-registerTuiEntrypoint('claude', 'claude');
-registerTuiEntrypoint('gemini', 'gemini');
-registerTuiEntrypoint('opencode', 'opencode');
+for (const providerName of VALID_PROVIDERS) {
+  registerTuiEntrypoint(providerName, providerName);
+}
 
 // Settings management
 const settingsCmd = program.command('settings').description('Manage zeroshot settings');
 
 function printSettingsUsage() {
+  const mountPresetList = Object.keys(MOUNT_PRESETS).join(', ');
   console.log(chalk.dim('Usage:'));
   console.log(chalk.dim('  zeroshot settings set <key> <value>'));
   console.log(chalk.dim('  zeroshot settings get <key>'));
@@ -3621,11 +3629,7 @@ function printSettingsUsage() {
   console.log(chalk.dim('  zeroshot settings set dockerMounts \'["gh","git","ssh","aws"]\''));
   console.log(chalk.dim('  zeroshot settings set dockerEnvPassthrough \'["AWS_*","TF_VAR_*"]\''));
   console.log('');
-  console.log(
-    chalk.dim(
-      'Available mount presets: gh, git, ssh, aws, azure, kube, terraform, gcloud, claude, codex, gemini'
-    )
-  );
+  console.log(chalk.dim(`Available mount presets: ${mountPresetList}`));
   console.log('');
 }
 
@@ -4126,7 +4130,7 @@ providersCmd.action(async () => {
 
 providersCmd
   .command('set-default <provider>')
-  .description('Set default provider (claude, codex, gemini, opencode)')
+  .description(`Set default provider (${PROVIDER_CHOICES})`)
   .action(async (provider) => {
     await setDefaultCommand([provider]);
   });
@@ -4138,6 +4142,68 @@ providersCmd
     await setupCommand([provider]);
   });
 
+// Setup wizard (read-only facts + setup contract; apply/undo/TTY wizard land separately)
+const setupCmd = program.command('setup').description('Setup and configuration wizard');
+setupCmd
+  .command('plan')
+  .description('Show read-only setup facts and proposed contract (no writes)')
+  .option('--json', 'Output as JSON')
+  .action(() => {
+    const { buildSetupPlan } = require('../lib/setup-plan');
+    const { readRepoSettings } = require('../lib/repo-settings');
+
+    const cwd = process.cwd();
+    const settings = loadSettings();
+    settings.__meta = { fileExists: settingsFileExists() };
+    const { settings: repoSettings } = readRepoSettings(cwd);
+    const plan = buildSetupPlan({
+      cwd,
+      settings,
+      repoSettings,
+      env: { ...process.env, __isTTY: !!process.stdout.isTTY },
+    });
+    console.log(JSON.stringify(plan, null, 2));
+  });
+
+setupCmd
+  .command('apply')
+  .description('Apply a decisions file to global/repo settings (writes)')
+  .requiredOption('--decisions <file>', 'Path to decisions JSON file')
+  .option('--json', 'Output as JSON')
+  .option(
+    '--allow-risky-defaults',
+    'Allow storing defaultDelivery=ship as a global default (auto-merge by default)'
+  )
+  .action((opts) => {
+    const { applyDecisions } = require('../lib/setup-apply');
+    try {
+      const results = applyDecisions({
+        decisionsPath: opts.decisions,
+        cwd: process.cwd(),
+        allowRiskyDefaults: !!opts.allowRiskyDefaults,
+      });
+      console.log(JSON.stringify({ results }, null, 2));
+    } catch (err) {
+      console.error(JSON.stringify({ error: err.message }, null, 2));
+      process.exitCode = 1;
+    }
+  });
+
+setupCmd
+  .command('undo')
+  .description('Undo writes made by the most recent `zeroshot setup apply` runs')
+  .option('--json', 'Output as JSON')
+  .action(() => {
+    const { undo } = require('../lib/setup-undo');
+    try {
+      const results = undo({});
+      console.log(JSON.stringify({ results }, null, 2));
+    } catch (err) {
+      console.error(JSON.stringify({ error: err.message }, null, 2));
+      process.exitCode = 1;
+    }
+  });
+
 // Update command
 program
   .command('update')

package/cli/lib/first-run.js

@@ -10,6 +10,7 @@
 
 const readline = require('readline');
 const { loadSettings, saveSettings } = require('../../lib/settings');
+const { listProviderMetadata } = require('../../lib/provider-names');
 const { detectProviders } = require('../../src/providers');
 
 /**
@@ -39,6 +40,16 @@ function createReadline() {
   });
 }
 
+function printProviderInstallChoices() {
+  for (const provider of listProviderMetadata()) {
+    const [firstLine, ...remainingLines] = provider.installInstructions.split('\n');
+    console.log(`  - ${provider.displayName}: ${firstLine}`);
+    for (const line of remainingLines) {
+      console.log(`    ${line}`);
+    }
+  }
+}
+
 /**
  * Prompt for provider selection
  * @param {readline.Interface} rl
@@ -52,9 +63,7 @@ function promptProvider(rl, detected) {
 
   if (available.length === 0) {
     console.log('No AI CLI tools detected. Please install one of:');
-    console.log('  - Claude Code: npm install -g @anthropic-ai/claude-code');
-    console.log('  - Codex CLI:   npm install -g @openai/codex');
-    console.log('  - Gemini CLI:  npm install -g @google/gemini-cli');
+    printProviderInstallChoices();
     process.exit(1);
   }
 
@@ -208,4 +217,6 @@ module.exports = {
   detectFirstRun,
   printWelcome,
   printComplete,
+  promptProvider,
+  printProviderInstallChoices,
 };

package/docker/zeroshot-cluster/Dockerfile

@@ -8,7 +8,9 @@ FROM node:20-slim
 
 # Upgrade npm to fix Arborist isDescendantOf bug (npm 10.x crash on complex peer deps)
 # See: https://github.com/npm/cli/issues/7682
-RUN npm install -g npm@latest
+# Pinned to npm@11 (the latest line that still supports the node:20-slim base); npm@latest (12.x)
+# now requires node >=22 and breaks the build with EBADENGINE.
+RUN npm install -g npm@11
 
 # Version pinning for infrastructure tools
 ARG AWS_CLI_VERSION=2.15.10
@@ -146,6 +148,14 @@ RUN mkdir -p /home/node/.claude /home/node/.config/gh \
 RUN mkdir -p /workspace && chown node:node /workspace
 WORKDIR /workspace
 
+# Install the running provider's CLI as a docker-cached layer (per-provider image variant).
+# Claude is baked in above, so its variant passes an empty PROVIDER_INSTALL and skips this step.
+# Kept last in the root phase so every heavy layer above is shared across all provider images;
+# Docker caches this layer keyed on the install command, so it builds once per provider and is
+# then reused. The command comes from the provider registry (docker.install), never hardcoded.
+ARG PROVIDER_INSTALL=""
+RUN if [ -n "$PROVIDER_INSTALL" ]; then sh -c "$PROVIDER_INSTALL"; fi
+
 # Switch to non-root user (required for --dangerously-skip-permissions)
 USER node
 

package/lib/agent-cli-provider/acp-stdio-runner.d.ts

@@ -0,0 +1,4 @@
+import type { CommandSpec, ProviderId } from './types';
+import type { ProcessResult, ProcessRunnerOptions } from './process-runner';
+export declare function runAcpStdioPrompt(provider: ProviderId, commandSpec: CommandSpec, prompt: string, options?: ProcessRunnerOptions): Promise<ProcessResult>;
+//# sourceMappingURL=acp-stdio-runner.d.ts.map

package/lib/agent-cli-provider/acp-stdio-runner.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"acp-stdio-runner.d.ts","sourceRoot":"","sources":["../../src/agent-cli-provider/acp-stdio-runner.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,WAAW,EAAE,UAAU,EAAE,MAAM,SAAS,CAAC;AACvD,OAAO,KAAK,EAAE,aAAa,EAAE,oBAAoB,EAAE,MAAM,kBAAkB,CAAC;AA2F5E,wBAAgB,iBAAiB,CAC/B,QAAQ,EAAE,UAAU,EACpB,WAAW,EAAE,WAAW,EACxB,MAAM,EAAE,MAAM,EACd,OAAO,GAAE,oBAAyB,GACjC,OAAO,CAAC,aAAa,CAAC,CAqNxB"}

package/lib/agent-cli-provider/acp-stdio-runner.js

@@ -0,0 +1,259 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.runAcpStdioPrompt = runAcpStdioPrompt;
+/* eslint-disable max-lines-per-function */
+const node_child_process_1 = require("node:child_process");
+const env_safety_1 = require("./env-safety");
+const DEFAULT_TIMEOUT_KILL_GRACE_MS = 100;
+function spawnOptions(commandSpec) {
+    const options = {
+        shell: false,
+        env: { ...(0, env_safety_1.omitProcessControlEnv)(process.env), ...(0, env_safety_1.omitUnsafeProviderEnv)(commandSpec.env) },
+        stdio: ['pipe', 'pipe', 'pipe'],
+    };
+    if (commandSpec.cwd !== undefined)
+        options.cwd = commandSpec.cwd;
+    return options;
+}
+function processResult(input) {
+    return {
+        stdout: Buffer.concat(input.stdout).toString('utf8'),
+        stderr: Buffer.concat(input.stderr).toString('utf8'),
+        exitCode: input.exitCode,
+        signal: input.signal,
+        durationMs: Date.now() - input.startedAt,
+        timedOut: input.timedOut,
+        ...(input.timedOut && input.timeoutMs !== undefined ? { timeoutMs: input.timeoutMs } : {}),
+    };
+}
+function isRecord(value) {
+    return value !== null && typeof value === 'object' && !Array.isArray(value);
+}
+function parseProtocolLine(line) {
+    let parsed;
+    try {
+        parsed = JSON.parse(line);
+    }
+    catch (error) {
+        const reason = error instanceof Error ? error.message : 'Unknown JSON parse error.';
+        throw new Error(`malformed ACP stdout JSON: ${reason}`);
+    }
+    if (!isRecord(parsed))
+        throw new Error('malformed ACP stdout JSON: expected a JSON object.');
+    return parsed;
+}
+function createPromptParams(sessionId, prompt) {
+    return {
+        sessionId,
+        prompt: [
+            {
+                role: 'user',
+                content: [{ type: 'text', text: prompt }],
+            },
+        ],
+    };
+}
+function runAcpStdioPrompt(provider, commandSpec, prompt, options = {}) {
+    return new Promise((resolve, reject) => {
+        const startedAt = Date.now();
+        const stdout = [];
+        const stderr = [];
+        const child = (0, node_child_process_1.spawn)(commandSpec.binary, [...commandSpec.args], spawnOptions(commandSpec));
+        const pending = new Map();
+        let stdoutBuffer = '';
+        let nextId = 1;
+        let timedOut = false;
+        let protocolFailure = null;
+        let sessionId = null;
+        let closeResolved = false;
+        let timeout;
+        let timeoutKill;
+        function cleanupTimers() {
+            if (timeout !== undefined)
+                clearTimeout(timeout);
+            if (timeoutKill !== undefined)
+                clearTimeout(timeoutKill);
+        }
+        function finalize(exitCode, signal) {
+            if (closeResolved)
+                return;
+            closeResolved = true;
+            cleanupTimers();
+            if (protocolFailure) {
+                const failureMessage = protocolFailure.message;
+                if (!stderr.some((chunk) => chunk.toString('utf8').includes(failureMessage))) {
+                    stderr.push(Buffer.from(`${failureMessage}\n`, 'utf8'));
+                }
+            }
+            const effectiveExitCode = protocolFailure && exitCode === 0 && signal === null ? 1 : exitCode;
+            resolve(processResult({
+                stdout,
+                stderr,
+                exitCode: effectiveExitCode,
+                signal,
+                startedAt,
+                timedOut,
+                ...(options.timeoutMs === undefined ? {} : { timeoutMs: options.timeoutMs }),
+            }));
+        }
+        function failClosed(message) {
+            if (protocolFailure)
+                return;
+            protocolFailure = new Error(`${provider} ACP stdio fail-closed: ${message}`);
+            for (const request of pending.values()) {
+                request.reject(protocolFailure);
+            }
+            pending.clear();
+            if (sessionId && child.stdin && !child.stdin.destroyed) {
+                child.stdin.write(`${JSON.stringify({
+                    jsonrpc: '2.0',
+                    method: 'session/cancel',
+                    params: { sessionId },
+                })}\n`);
+            }
+            child.stdin?.end();
+            child.kill('SIGTERM');
+        }
+        function handleProtocolMessage(message) {
+            const responseId = typeof message.id === 'number' ? message.id : null;
+            if (responseId !== null && (message.result !== undefined || message.error !== undefined)) {
+                const request = pending.get(responseId);
+                if (request) {
+                    pending.delete(responseId);
+                    request.resolve(message);
+                }
+                return;
+            }
+            const method = typeof message.method === 'string' ? message.method : null;
+            if (!method)
+                return;
+            if (method === 'session/update')
+                return;
+            if (method.startsWith('_'))
+                return;
+            if (method === 'session/request_permission') {
+                failClosed('unsupported session/request_permission callback.');
+                return;
+            }
+            if (method.startsWith('fs/')) {
+                failClosed(`unsupported ${method} callback.`);
+                return;
+            }
+            if (method.startsWith('terminal/')) {
+                failClosed(`unsupported ${method} callback.`);
+                return;
+            }
+            if (method.startsWith('session/')) {
+                failClosed(`unsupported ${method} session-control callback.`);
+            }
+        }
+        function consumeStdoutLine(line) {
+            try {
+                handleProtocolMessage(parseProtocolLine(line));
+            }
+            catch (error) {
+                failClosed(error instanceof Error ? error.message : 'malformed ACP stdout JSON.');
+            }
+        }
+        function flushStdoutRemainder() {
+            const line = stdoutBuffer.trim();
+            stdoutBuffer = '';
+            if (line)
+                consumeStdoutLine(line);
+        }
+        function flushStdout(data) {
+            stdout.push(data);
+            stdoutBuffer += data.toString('utf8');
+            let newline = stdoutBuffer.indexOf('\n');
+            while (newline !== -1) {
+                const line = stdoutBuffer.slice(0, newline).trim();
+                stdoutBuffer = stdoutBuffer.slice(newline + 1);
+                if (line)
+                    consumeStdoutLine(line);
+                newline = stdoutBuffer.indexOf('\n');
+            }
+        }
+        function sendRequest(method, params) {
+            const id = nextId;
+            nextId += 1;
+            const request = {
+                jsonrpc: '2.0',
+                id,
+                method,
+                params,
+            };
+            return new Promise((requestResolve, requestReject) => {
+                pending.set(id, { resolve: requestResolve, reject: requestReject });
+                child.stdin?.write(`${JSON.stringify(request)}\n`);
+            });
+        }
+        async function driveProtocol() {
+            const initialize = await sendRequest('initialize', {
+                protocolVersion: 1,
+                clientInfo: {
+                    name: '@the-open-engine/zeroshot',
+                    version: '1',
+                },
+                clientCapabilities: {
+                    fs: false,
+                    terminal: false,
+                    promptCapabilities: {
+                        image: false,
+                    },
+                },
+            });
+            if (initialize.error !== undefined) {
+                child.stdin?.end();
+                return;
+            }
+            const session = await sendRequest('session/new', {
+                cwd: commandSpec.cwd ?? process.cwd(),
+                mcpServers: [],
+            });
+            if (session.error !== undefined) {
+                child.stdin?.end();
+                return;
+            }
+            const sessionResult = isRecord(session.result) ? session.result : {};
+            const nextSessionId = typeof sessionResult.sessionId === 'string' ? sessionResult.sessionId : null;
+            if (!nextSessionId) {
+                failClosed('session/new response omitted sessionId.');
+                return;
+            }
+            sessionId = nextSessionId;
+            await sendRequest('session/prompt', createPromptParams(sessionId, prompt));
+            child.stdin?.end();
+        }
+        if (options.timeoutMs !== undefined) {
+            timeout = setTimeout(() => {
+                timedOut = true;
+                if (sessionId && child.stdin && !child.stdin.destroyed) {
+                    child.stdin.write(`${JSON.stringify({
+                        jsonrpc: '2.0',
+                        method: 'session/cancel',
+                        params: { sessionId },
+                    })}\n`);
+                }
+                child.kill('SIGTERM');
+                timeoutKill = setTimeout(() => {
+                    if (!closeResolved)
+                        child.kill('SIGKILL');
+                }, options.timeoutKillGraceMs ?? DEFAULT_TIMEOUT_KILL_GRACE_MS);
+            }, options.timeoutMs);
+        }
+        child.stdout?.on('data', flushStdout);
+        child.stdout?.once('end', flushStdoutRemainder);
+        child.stderr?.on('data', (data) => stderr.push(data));
+        child.once('error', (error) => {
+            cleanupTimers();
+            reject(error);
+        });
+        child.once('close', (exitCode, signal) => {
+            finalize(exitCode, signal);
+        });
+        driveProtocol().catch((error) => {
+            failClosed(error instanceof Error ? error.message : 'ACP protocol failed.');
+        });
+    });
+}
+//# sourceMappingURL=acp-stdio-runner.js.map

package/lib/agent-cli-provider/acp-stdio-runner.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"acp-stdio-runner.js","sourceRoot":"","sources":["../../src/agent-cli-provider/acp-stdio-runner.ts"],"names":[],"mappings":"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"}

package/lib/agent-cli-provider/adapters/acp.d.ts

@@ -0,0 +1,23 @@
+import { type BuildProviderCommandOptions, type LevelModelSpec, type ModelCatalogEntry, type ModelLevel, type ProviderAdapter, type ProviderId } from '../types';
+export interface AcpAdapterMetadata {
+    readonly provider: ProviderId;
+    readonly displayName: string;
+    readonly binary: string;
+    readonly commandArgs: readonly string[];
+    readonly credentialEnvKeys: readonly string[];
+    readonly modelCatalog?: Readonly<Record<string, ModelCatalogEntry>>;
+    readonly levelMapping?: Readonly<Record<ModelLevel, LevelModelSpec>>;
+    readonly defaultLevel?: ModelLevel;
+    readonly defaultMaxLevel?: ModelLevel;
+    readonly defaultMinLevel?: ModelLevel;
+    readonly supportsPromptImages: boolean;
+    readonly supportsLoadSession: boolean;
+    readonly supportsSessionCancel: boolean;
+    readonly supportsSessionSetModel: boolean;
+    readonly supportsSessionSetMode: boolean;
+    readonly retryableErrorPatterns?: readonly RegExp[];
+    readonly permanentErrorPatterns?: readonly RegExp[];
+}
+export declare function buildAcpPrompt(context: string, options?: BuildProviderCommandOptions): string;
+export declare function createAcpAdapter(meta: AcpAdapterMetadata): ProviderAdapter;
+//# sourceMappingURL=acp.d.ts.map

package/lib/agent-cli-provider/adapters/acp.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"acp.d.ts","sourceRoot":"","sources":["../../../src/agent-cli-provider/adapters/acp.ts"],"names":[],"mappings":"AAYA,OAAO,EAEL,KAAK,2BAA2B,EAGhC,KAAK,cAAc,EAEnB,KAAK,iBAAiB,EACtB,KAAK,UAAU,EAEf,KAAK,eAAe,EACpB,KAAK,UAAU,EAKhB,MAAM,UAAU,CAAC;AAWlB,MAAM,WAAW,kBAAkB;IACjC,QAAQ,CAAC,QAAQ,EAAE,UAAU,CAAC;IAC9B,QAAQ,CAAC,WAAW,EAAE,MAAM,CAAC;IAC7B,QAAQ,CAAC,MAAM,EAAE,MAAM,CAAC;IACxB,QAAQ,CAAC,WAAW,EAAE,SAAS,MAAM,EAAE,CAAC;IACxC,QAAQ,CAAC,iBAAiB,EAAE,SAAS,MAAM,EAAE,CAAC;IAC9C,QAAQ,CAAC,YAAY,CAAC,EAAE,QAAQ,CAAC,MAAM,CAAC,MAAM,EAAE,iBAAiB,CAAC,CAAC,CAAC;IACpE,QAAQ,CAAC,YAAY,CAAC,EAAE,QAAQ,CAAC,MAAM,CAAC,UAAU,EAAE,cAAc,CAAC,CAAC,CAAC;IACrE,QAAQ,CAAC,YAAY,CAAC,EAAE,UAAU,CAAC;IACnC,QAAQ,CAAC,eAAe,CAAC,EAAE,UAAU,CAAC;IACtC,QAAQ,CAAC,eAAe,CAAC,EAAE,UAAU,CAAC;IACtC,QAAQ,CAAC,oBAAoB,EAAE,OAAO,CAAC;IACvC,QAAQ,CAAC,mBAAmB,EAAE,OAAO,CAAC;IACtC,QAAQ,CAAC,qBAAqB,EAAE,OAAO,CAAC;IACxC,QAAQ,CAAC,uBAAuB,EAAE,OAAO,CAAC;IAC1C,QAAQ,CAAC,sBAAsB,EAAE,OAAO,CAAC;IACzC,QAAQ,CAAC,sBAAsB,CAAC,EAAE,SAAS,MAAM,EAAE,CAAC;IACpD,QAAQ,CAAC,sBAAsB,CAAC,EAAE,SAAS,MAAM,EAAE,CAAC;CACrD;AAsGD,wBAAgB,cAAc,CAAC,OAAO,EAAE,MAAM,EAAE,OAAO,GAAE,2BAAgC,GAAG,MAAM,CAEjG;AAuTD,wBAAgB,gBAAgB,CAAC,IAAI,EAAE,kBAAkB,GAAG,eAAe,CAoB1E"}