echo-cli-agent 0.1.7 → 0.1.9

package/dist/src/providers/detection.js

@@ -0,0 +1,96 @@
+import { spawn } from 'node:child_process';
+import { hydrateShellPath, mergePathSegments } from '../runtime/cli/hydrate-shell-path.js';
+import { getProviderDetectionProbeCommands, PROVIDER_CONFIGS, resolveDetectedProviderCommands } from './registry.js';
+import { resolveCliCommandDetailed } from '../shared/node-cli-command-resolution.js';
+function probeVersion(path, args) {
+    if (args.length === 0)
+        return Promise.resolve({});
+    return new Promise((resolve) => {
+        const child = spawn(path, [...args], { stdio: ['ignore', 'pipe', 'pipe'], shell: false });
+        let stdout = '';
+        let stderr = '';
+        let settled = false;
+        let timer;
+        const finish = (result) => {
+            if (settled)
+                return;
+            settled = true;
+            if (timer)
+                clearTimeout(timer);
+            resolve(result);
+        };
+        timer = setTimeout(() => {
+            child.kill('SIGKILL');
+            finish({ detail: 'version probe timeout' });
+        }, 5_000);
+        child.stdout.on('data', (chunk) => { stdout += chunk.toString(); });
+        child.stderr.on('data', (chunk) => { stderr += chunk.toString(); });
+        child.on('error', (error) => finish({ detail: error.message }));
+        child.on('close', (code) => {
+            const detail = (stdout || stderr || `exit ${code ?? 'unknown'}`).trim().slice(0, 200);
+            const version = stdout.split(/\r?\n/).map((line) => line.trim()).find(Boolean);
+            finish(version ? { version, detail } : { detail });
+        });
+    });
+}
+export class CliDetectionService {
+    snapshot;
+    pending;
+    async detect(forceRefresh = false) {
+        if (this.pending)
+            return this.pending;
+        if (!forceRefresh && this.snapshot)
+            return this.snapshot;
+        this.pending = this.detectNow(forceRefresh).finally(() => {
+            this.pending = undefined;
+        });
+        return this.pending;
+    }
+    async detectNow(forceRefresh) {
+        const hydration = await hydrateShellPath({ force: forceRefresh });
+        const addedPathSegments = hydration.ok ? mergePathSegments(hydration.segments) : [];
+        const commands = getProviderDetectionProbeCommands();
+        const resolved = new Map(commands.map((command) => [command, resolveCliCommandDetailed(command)]));
+        const foundCommands = new Set(commands.filter((command) => resolved.get(command)?.found));
+        const detected = resolveDetectedProviderCommands(foundCommands);
+        const providers = await Promise.all(PROVIDER_CONFIGS.map(async (config) => {
+            const matchedDetectionCommand = detected.get(config.id);
+            const result = matchedDetectionCommand ? resolved.get(matchedDetectionCommand) : undefined;
+            const executablePath = result?.found ? result.path : undefined;
+            const installed = Boolean(executablePath);
+            const unsupported = config.detectUnsupportedRuntimes?.includes(process.platform) ?? false;
+            const diagnostic = executablePath ? await probeVersion(executablePath, config.versionArguments ?? []) : {};
+            const detail = installed
+                ? diagnostic.detail
+                : unsupported
+                    ? 'unsupported runtime'
+                    : config.detectRequiredCommands?.length
+                        ? 'command or required command not found'
+                        : 'command not found';
+            return {
+                id: config.id,
+                installed,
+                available: installed,
+                ...(matchedDetectionCommand ? { matchedDetectionCommand } : {}),
+                ...(result?.path ? { resolvedPath: result.path } : {}),
+                ...(diagnostic.version ? { version: diagnostic.version } : {}),
+                ...(detail ? { detail } : {})
+            };
+        }));
+        this.snapshot = {
+            providers,
+            detectedIds: providers.filter((provider) => provider.installed).map((provider) => provider.id),
+            addedPathSegments,
+            shellHydrationOk: hydration.ok,
+            pathSource: hydration.ok ? 'shell_hydrated' : 'process_path',
+            pathFailureReason: hydration.failureReason,
+            refreshedAt: new Date().toISOString()
+        };
+        return this.snapshot;
+    }
+}
+export const cliDetection = new CliDetectionService();
+export function providerCapabilityIds(snapshot) {
+    return snapshot.detectedIds;
+}
+//# sourceMappingURL=detection.js.map

package/dist/src/providers/detection.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"detection.js","sourceRoot":"","sources":["../../../src/providers/detection.ts"],"names":[],"mappings":"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"}

package/dist/src/providers/registry.d.ts

@@ -1,4 +1,27 @@
 import type { AgentProvider } from './provider.js';
+export type ProviderRuntime = NodeJS.Platform | 'wsl';
+export type ProviderConfig = {
+    id: string;
+    aliases: readonly string[];
+    detectCmd: string;
+    detectCmdAliases?: readonly string[];
+    detectRequiredCommands?: readonly string[];
+    detectUnsupportedRuntimes?: readonly ProviderRuntime[];
+    implementation: AgentProvider;
+    versionArguments?: readonly string[];
+};
+export declare const PROVIDER_CONFIGS: readonly ProviderConfig[];
+export type ProviderDetectionCommand = {
+    id: string;
+    cmd: string;
+    requiredCommands?: readonly string[];
+    unsupportedRuntimes?: readonly ProviderRuntime[];
+};
+export declare const PROVIDER_DETECTION_COMMANDS: ProviderDetectionCommand[];
+export declare function providerConfig(idOrAlias: string): ProviderConfig;
+export declare function buildProviderDetectionCommands(configs: readonly ProviderConfig[]): ProviderDetectionCommand[];
+export declare function getProviderDetectionProbeCommands(commands?: readonly ProviderDetectionCommand[], runtime?: ProviderRuntime): string[];
+export declare function resolveDetectedProviderCommands(foundCommands: ReadonlySet<string>, commands?: readonly ProviderDetectionCommand[], runtime?: ProviderRuntime): Map<string, string>;
 export declare function resolveProvider(agentType: string): AgentProvider;
 export declare function probeProviders(): Array<{
     id: string;

package/dist/src/providers/registry.js

@@ -1,14 +1,52 @@
-import { spawnSync } from 'node:child_process';
 import { claudeProvider } from './claude.js';
 import { codexProvider } from './codex.js';
 import { kiroProvider } from './kiro.js';
-import { resolveCliCommand } from '../shared/node-cli-command-resolution.js';
-const providers = new Map([
-    ['claude', claudeProvider],
-    ['claude-code', claudeProvider],
-    ['codex', codexProvider],
-    ['kiro', kiroProvider]
-]);
+import { resolveCliCommandDetailed } from '../shared/node-cli-command-resolution.js';
+export const PROVIDER_CONFIGS = [
+    { id: 'claude', aliases: ['claude-code'], detectCmd: 'claude', implementation: claudeProvider, versionArguments: ['--version'] },
+    { id: 'codex', aliases: [], detectCmd: 'codex', implementation: codexProvider, versionArguments: ['--version'] },
+    { id: 'kiro', aliases: ['kiro-cli'], detectCmd: 'kiro-cli', implementation: kiroProvider, versionArguments: ['--version'] }
+];
+export const PROVIDER_DETECTION_COMMANDS = buildProviderDetectionCommands(PROVIDER_CONFIGS);
+const providers = new Map(PROVIDER_CONFIGS.flatMap((config) => [config.id, ...config.aliases].map((alias) => [alias, config.implementation])));
+export function providerConfig(idOrAlias) {
+    const normalized = idOrAlias.trim().toLowerCase();
+    const config = PROVIDER_CONFIGS.find((item) => item.id === normalized || item.aliases.includes(normalized));
+    if (!config)
+        throw new Error(`unsupported agent type: ${idOrAlias}`);
+    return config;
+}
+export function buildProviderDetectionCommands(configs) {
+    return configs.flatMap((config) => [config.detectCmd, ...(config.detectCmdAliases ?? [])].map((cmd) => ({
+        id: config.id,
+        cmd,
+        ...(config.detectRequiredCommands?.length
+            ? { requiredCommands: config.detectRequiredCommands }
+            : {}),
+        ...(config.detectUnsupportedRuntimes?.length
+            ? { unsupportedRuntimes: config.detectUnsupportedRuntimes }
+            : {})
+    })));
+}
+export function getProviderDetectionProbeCommands(commands = PROVIDER_DETECTION_COMMANDS, runtime = process.platform) {
+    return [...new Set(commands
+            .filter((command) => !command.unsupportedRuntimes?.includes(runtime))
+            .flatMap((command) => [command.cmd, ...(command.requiredCommands ?? [])]))];
+}
+export function resolveDetectedProviderCommands(foundCommands, commands = PROVIDER_DETECTION_COMMANDS, runtime = process.platform) {
+    const detected = new Map();
+    for (const command of commands) {
+        if (command.unsupportedRuntimes?.includes(runtime))
+            continue;
+        if (!foundCommands.has(command.cmd))
+            continue;
+        if (!(command.requiredCommands ?? []).every((required) => foundCommands.has(required)))
+            continue;
+        if (!detected.has(command.id))
+            detected.set(command.id, command.cmd);
+    }
+    return detected;
+}
 export function resolveProvider(agentType) {
     const provider = providers.get(agentType.toLowerCase());
     if (!provider)
@@ -16,28 +54,20 @@ export function resolveProvider(agentType) {
     return provider;
 }
 export function probeProviders() {
-    return [claudeProvider, codexProvider, kiroProvider].map((provider) => {
-        const executableName = provider.id === 'claude'
-            ? 'claude'
-            : provider.id === 'codex'
-                ? 'codex'
-                : 'kiro-cli';
-        const executable = resolveCliCommand(executableName);
-        const result = spawnSync(executable, provider.versionArguments(), {
-            encoding: 'utf8',
-            timeout: 5_000,
-            shell: false
-        });
-        const detail = result.error
-            ? result.error.message
-            : (result.stdout || result.stderr || `exit ${result.status ?? 'unknown'}`).trim().slice(0, 200);
-        const version = (result.stdout || '').split(/\r?\n/).map((line) => line.trim()).find(Boolean);
+    const resolved = new Map(getProviderDetectionProbeCommands().map((command) => [
+        command,
+        resolveCliCommandDetailed(command)
+    ]));
+    const found = new Set([...resolved].filter(([, result]) => result.found).map(([command]) => command));
+    const detected = resolveDetectedProviderCommands(found);
+    return PROVIDER_CONFIGS.map((config) => {
+        const matchedCommand = detected.get(config.id);
+        const result = matchedCommand ? resolved.get(matchedCommand) : undefined;
         return {
-            id: provider.id,
-            available: result.status === 0,
-            ...(result.status === 0 && executable !== executableName ? { path: executable } : {}),
-            ...(version ? { version } : {}),
-            detail
+            id: config.id,
+            available: Boolean(result?.found),
+            ...(result?.path ? { path: result.path } : {}),
+            detail: result?.found ? 'filesystem detection' : 'command not found'
         };
     });
 }

package/dist/src/providers/registry.js.map

@@ -1 +1 @@
-{"version":3,"file":"registry.js","sourceRoot":"","sources":["../../../src/providers/registry.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,oBAAoB,CAAA;AAC9C,OAAO,EAAE,cAAc,EAAE,MAAM,aAAa,CAAA;AAC5C,OAAO,EAAE,aAAa,EAAE,MAAM,YAAY,CAAA;AAC1C,OAAO,EAAE,YAAY,EAAE,MAAM,WAAW,CAAA;AAExC,OAAO,EAAE,iBAAiB,EAAE,MAAM,0CAA0C,CAAA;AAE5E,MAAM,SAAS,GAAG,IAAI,GAAG,CAAwB;IAC/C,CAAC,QAAQ,EAAE,cAAc,CAAC;IAC1B,CAAC,aAAa,EAAE,cAAc,CAAC;IAC/B,CAAC,OAAO,EAAE,aAAa,CAAC;IACxB,CAAC,MAAM,EAAE,YAAY,CAAC;CACvB,CAAC,CAAA;AAEF,MAAM,UAAU,eAAe,CAAC,SAAiB;IAC/C,MAAM,QAAQ,GAAG,SAAS,CAAC,GAAG,CAAC,SAAS,CAAC,WAAW,EAAE,CAAC,CAAA;IACvD,IAAI,CAAC,QAAQ;QAAE,MAAM,IAAI,KAAK,CAAC,2BAA2B,SAAS,EAAE,CAAC,CAAA;IACtE,OAAO,QAAQ,CAAA;AACjB,CAAC;AAED,MAAM,UAAU,cAAc;IAC5B,OAAO,CAAC,cAAc,EAAE,aAAa,EAAE,YAAY,CAAC,CAAC,GAAG,CAAC,CAAC,QAAQ,EAAE,EAAE;QACpE,MAAM,cAAc,GAAG,QAAQ,CAAC,EAAE,KAAK,QAAQ;YAC7C,CAAC,CAAC,QAAQ;YACV,CAAC,CAAC,QAAQ,CAAC,EAAE,KAAK,OAAO;gBACvB,CAAC,CAAC,OAAO;gBACT,CAAC,CAAC,UAAU,CAAA;QAChB,MAAM,UAAU,GAAG,iBAAiB,CAAC,cAAc,CAAC,CAAA;QACpD,MAAM,MAAM,GAAG,SAAS,CAAC,UAAU,EAAE,QAAQ,CAAC,gBAAgB,EAAE,EAAE;YAChE,QAAQ,EAAE,MAAM;YAChB,OAAO,EAAE,KAAK;YACd,KAAK,EAAE,KAAK;SACb,CAAC,CAAA;QACF,MAAM,MAAM,GAAG,MAAM,CAAC,KAAK;YACzB,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC,OAAO;YACtB,CAAC,CAAC,CAAC,MAAM,CAAC,MAAM,IAAI,MAAM,CAAC,MAAM,IAAI,QAAQ,MAAM,CAAC,MAAM,IAAI,SAAS,EAAE,CAAC,CAAC,IAAI,EAAE,CAAC,KAAK,CAAC,CAAC,EAAE,GAAG,CAAC,CAAA;QACjG,MAAM,OAAO,GAAG,CAAC,MAAM,CAAC,MAAM,IAAI,EAAE,CAAC,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,IAAI,EAAE,CAAC,CAAC,IAAI,CAAC,OAAO,CAAC,CAAA;QAC7F,OAAO;YACL,EAAE,EAAE,QAAQ,CAAC,EAAE;YACf,SAAS,EAAE,MAAM,CAAC,MAAM,KAAK,CAAC;YAC9B,GAAG,CAAC,MAAM,CAAC,MAAM,KAAK,CAAC,IAAI,UAAU,KAAK,cAAc,CAAC,CAAC,CAAC,EAAE,IAAI,EAAE,UAAU,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;YACrF,GAAG,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,OAAO,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;YAC/B,MAAM;SACP,CAAA;IACH,CAAC,CAAC,CAAA;AACJ,CAAC"}
+{"version":3,"file":"registry.js","sourceRoot":"","sources":["../../../src/providers/registry.ts"],"names":[],"mappings":"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"}

package/dist/src/runtime/agent-runtime.js

@@ -1,13 +1,20 @@
 import { Dispatcher } from '../dispatch/dispatcher.js';
 import { HealthServer } from '../health/server.js';
 import { createDiagnosticLogger } from '../logging/diagnostic-log.js';
-import { probeProviders } from '../providers/registry.js';
+import { cliDetection } from '../providers/detection.js';
+import { providerConfig } from '../providers/registry.js';
 import { SessionManager } from '../session/session-manager.js';
 import { StateStore } from '../state/state-store.js';
 import { TaskMcpClient } from '../transport/taskmcp-client.js';
-import { hydrateShellPath, mergePathSegments } from './cli/hydrate-shell-path.js';
 export function selectCapabilities(configured, probes) {
-    const explicit = [...new Set(configured.map((value) => value.trim().toLowerCase()).filter(Boolean))];
+    const explicit = [...new Set(configured.map((value) => {
+            try {
+                return providerConfig(value).id;
+            }
+            catch {
+                return value.trim().toLowerCase();
+            }
+        }).filter(Boolean))];
     if (explicit.length > 0)
         return explicit;
     return [...new Set(probes.filter((probe) => probe.available).map((probe) => probe.id.trim().toLowerCase()).filter(Boolean))];
@@ -29,15 +36,19 @@ export class AgentRuntime {
         this.state = new StateStore(config.stateFile);
     }
     async start() {
-        const hydration = await hydrateShellPath();
-        if (hydration.ok)
-            mergePathSegments(hydration.segments);
-        this.config.capabilities = selectCapabilities(this.config.capabilities, probeProviders());
+        const configuredCapabilities = [...this.config.capabilities];
+        let currentDetection = await cliDetection.detect();
+        this.config.capabilities = selectCapabilities(configuredCapabilities, currentDetection.providers);
+        const refreshDetection = async (refresh) => {
+            currentDetection = await cliDetection.detect(refresh);
+            this.config.capabilities = selectCapabilities(configuredCapabilities, currentDetection.providers);
+            return currentDetection;
+        };
         await this.state.initialize();
         const deviceId = this.config.deviceId;
         this.sessions = new SessionManager(this.config, this.state, this.logger);
         this.client = new TaskMcpClient(this.config, deviceId, this.logger);
-        const dispatcher = new Dispatcher(this.sessions, this.state, this.client, this.logger, this.config);
+        const dispatcher = new Dispatcher(this.sessions, this.state, this.client, this.logger, this.config, refreshDetection);
         this.client.on('message', (message) => dispatcher.accept(message));
         this.health = new HealthServer(this.config.healthHost, this.config.healthPort, () => ({
             deviceId,
@@ -46,8 +57,9 @@ export class AgentRuntime {
             activeSessions: this.sessions?.activeCount ?? 0,
             storedRuns: this.state.snapshot().runs,
             startedAt: this.startedAt,
-            runs: this.state.recentRuns()
-        }), this.config.logFile, this.logger);
+            runs: this.state.recentRuns(),
+            detection: currentDetection
+        }), this.config.logFile, this.logger, refreshDetection);
         await this.health.start();
         this.client.start();
         this.logger.info('agent-started', {

package/dist/src/runtime/agent-runtime.js.map

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

package/dist/src/session/session-manager.d.ts

@@ -2,6 +2,27 @@ import type { AgentConfig } from '../config.js';
 import type { DiagnosticLogger } from '../logging/diagnostic-log.js';
 import type { CliWindowRecord, StateStore } from '../state/state-store.js';
 import type { AgentCliRequest, DeliveryResult } from '../types/protocol.js';
+import { type TerminalTailReadOptions } from './terminal-tail-buffer.js';
+export type TerminalTailQuery = {
+    runId?: string;
+    taskId?: string;
+    agentType?: string;
+};
+export type TerminalTailSnapshot = {
+    runId: string;
+    sessionId: string;
+    agentType: string;
+    lines: string[];
+    startCursor: number;
+    nextCursor: number;
+    oldestCursor: number;
+    latestCursor: number;
+    hasMore: boolean;
+    truncated: boolean;
+    limited: boolean;
+    idleMs: number | undefined;
+    markers: string[];
+};
 export type CliProcessExit = {
     exitCode: number;
     signal?: number;
@@ -23,16 +44,34 @@ export declare class SessionManager {
     constructor(config: AgentConfig, state: StateStore, logger: DiagnosticLogger);
     get activeCount(): number;
     /**
-     * Register a named local window before its first prompt. The server task id is
-     * the only routing key; a provider-native session id remains optional.
+     * Register a stable local window before its first prompt. This mirrors Orca's
+     * host-owned terminal identity: the provider-native session id is learned only
+     * after the CLI has actually started and emitted it.
      */
     createWindow(request: AgentCliRequest): Promise<CliWindowRecord>;
     listWindows(agentType?: string): CliWindowRecord[];
     deliver(request: AgentCliRequest, hooks: DeliveryHooks): Promise<DeliveryResult>;
     dispose(): void;
+    /**
+     * Read the newest terminal rows of a live session, or page backwards from a
+     * cursor a previous read returned. Nothing is persisted and nothing is logged:
+     * the rows are sanitized, handed to the caller, and forgotten.
+     *
+     * A run id is matched first. Sessions outlive a single run, so a task plus
+     * agent type still resolves after a later prompt has taken over the session.
+     */
+    peekOutput(query: TerminalTailQuery, options?: TerminalTailReadOptions): TerminalTailSnapshot | undefined;
+    private findSession;
+    /**
+     * Look for the provider-native session id in a bounded rolling window instead
+     * of the retained tail. CLIs print the id during startup, so the window is
+     * released after the first hit rather than re-scanned for the whole session.
+     */
+    private discoverProviderSession;
     /** Stop the PTY that owns the requested remote run. */
     cancelRun(runId: string): boolean;
     private writePrompt;
+    private waitForProviderSession;
     private waitForStartupOutput;
     private autoApproveTrustPrompt;
     private outputMarkers;