@jingyi0605/codingns4dsh 0.2.1-beta.12 → 0.2.1-beta.14

package/data/build/dist/host/cli-adapters/grok-usage.js

@@ -0,0 +1,197 @@
+import { isRecord, usageChunk } from './rpc-driver-utils.js';
+/** Model capacity belongs to the provider session, not to a billed request total. */
+export class GrokContextUsage {
+    modelId;
+    windows = new Map();
+    observe(value) {
+        if (!isRecord(value))
+            return;
+        const params = isRecord(value.params) ? value.params : value;
+        const meta = isRecord(params._meta) ? params._meta : {};
+        if (meta.isReplay === true)
+            return;
+        const models = [params.models, meta.modelState, params].find(item => isRecord(item) && Array.isArray(item.availableModels));
+        if (isRecord(models)) {
+            for (const model of models.availableModels) {
+                if (!isRecord(model))
+                    continue;
+                const id = model.modelId ?? model.id;
+                const window = token(model._meta?.totalContextTokens);
+                if (typeof id === 'string' && window !== undefined && window > 0)
+                    this.windows.set(id, window);
+            }
+            if (typeof models.currentModelId === 'string')
+                this.modelId = models.currentModelId;
+        }
+        if (typeof meta.modelId === 'string')
+            this.modelId = meta.modelId;
+    }
+    get contextWindow() {
+        return this.modelId === undefined ? undefined : this.windows.get(this.modelId);
+    }
+    setWindow(window) {
+        if (this.modelId !== undefined && window > 0)
+            this.windows.set(this.modelId, window);
+    }
+}
+/** Observe the RPC reader while DSH consumers and translation may be suspended. */
+export class GrokPromptUsage {
+    id;
+    context;
+    now;
+    aggregate;
+    responseUsage;
+    requests = [];
+    samples = [];
+    completedStreams = new Set();
+    signatures = new Set();
+    active;
+    startedAt;
+    contextTokens;
+    responseContextTokens;
+    contextWindow;
+    observedSamples = 0;
+    lastContext;
+    constructor(id, context, now = Date.now) {
+        this.id = id;
+        this.context = context;
+        this.now = now;
+        this.startedAt = now();
+    }
+    observe(message) {
+        const params = isRecord(message.params) ? message.params : message;
+        const update = isRecord(params.update) ? params.update : params;
+        const meta = isRecord(params._meta) ? params._meta : {};
+        if (meta.isReplay === true)
+            return;
+        this.context.observe(message);
+        const time = this.now();
+        const streamStart = token(meta.streamStartMs);
+        if (streamStart !== undefined && !this.completedStreams.has(streamStart)
+            && this.active?.firstTokenAt !== streamStart) {
+            // Native stream start includes hidden reasoning that precedes visible text.
+            const start = this.samples.length === 0 ? token(meta.turnStartMs) ?? this.startedAt : this.startedAt;
+            this.active = { startedAt: Math.min(start, streamStart), firstTokenAt: streamStart };
+        }
+        this.contextTokens = token(meta.totalTokens) ?? this.contextTokens;
+        const type = String(update.sessionUpdate ?? update.type ?? '').toLowerCase();
+        if (type === 'usage_update' || type === 'usage-update') {
+            this.aggregate = readUsage(update) ?? this.aggregate;
+            this.contextTokens = token(update.used ?? update.contextTokens) ?? this.contextTokens;
+            const size = token(update.size ?? update.contextWindow);
+            if (size !== undefined && size > 0) {
+                this.contextWindow = size;
+                this.context.setWindow(size);
+            }
+            return;
+        }
+        if (type === 'response_completed') {
+            const signature = typeof update.signature === 'string' ? update.signature : undefined;
+            if (signature !== undefined && this.signatures.has(signature))
+                return;
+            if (signature !== undefined)
+                this.signatures.add(signature);
+            const usage = readUsage(update);
+            if (usage !== undefined) {
+                this.requests.push(usage);
+                this.completeRequest(usage.outputTokens, time);
+            }
+            return;
+        }
+        if (type === 'tool_call_update' && ['completed', 'failed'].includes(String(update.status).toLowerCase()))
+            this.startedAt = time;
+        if (['turn_completed', 'turn_complete', 'prompt_complete', 'completed', 'done'].includes(type)) {
+            this.aggregate = readUsage(update) ?? this.aggregate;
+            // A turn total may span many calls; it cannot be paired with the last stream.
+            if (update.usage?.modelCalls === 1 && this.requests.length === 0 && this.aggregate !== undefined) {
+                this.completeRequest(this.aggregate.outputTokens, time);
+            }
+        }
+    }
+    observeResponse(value) {
+        if (!isRecord(value) || !isRecord(value._meta))
+            return;
+        this.context.observe(value);
+        const meta = value._meta;
+        this.responseUsage = readUsage({ usage: meta.usage });
+        this.responseContextTokens = token(meta.totalTokens);
+        // Some versions omit response_completed but retain the last call's usage here.
+        const lastOutput = token(meta.outputTokens);
+        if (lastOutput !== undefined)
+            this.completeRequest(lastOutput, this.now());
+    }
+    finish() {
+        const usage = this.responseUsage ?? this.aggregate ?? sumRequests(this.requests);
+        const context = this.contextFields();
+        const { contextTokens } = context;
+        if (usage === undefined && contextTokens === undefined)
+            return undefined;
+        return {
+            type: 'usage', inputTokens: 0, outputTokens: 0, ...usage,
+            ...context,
+            ...(this.samples.length === 0 ? {} : { requestPerformance: { id: this.id, samples: [...this.samples] } }),
+        };
+    }
+    /** Drain each measurement once into the notification queue, before a consumer can block it. */
+    takeObservation() {
+        const context = this.contextFields();
+        const samples = this.samples.slice(this.observedSamples);
+        if (samples.length === 0 && context.contextTokens === this.lastContext?.contextTokens
+            && context.contextWindow === this.lastContext?.contextWindow && context.contextModelId === this.lastContext?.contextModelId)
+            return undefined;
+        if (samples.length === 0 && context.contextTokens === undefined && context.contextWindow === undefined)
+            return undefined;
+        this.observedSamples = this.samples.length;
+        this.lastContext = context;
+        return {
+            type: 'usage-observation', ...context,
+            ...(samples.length === 0 ? {} : { requestPerformance: { id: samples.at(-1).id, samples } }),
+        };
+    }
+    contextFields() {
+        const contextTokens = this.responseContextTokens ?? this.contextTokens;
+        const contextWindow = this.contextWindow ?? this.context.contextWindow;
+        return {
+            ...(contextTokens === undefined ? {} : { contextTokens }),
+            ...(contextWindow === undefined ? {} : { contextWindow }),
+            ...(contextTokens === undefined || contextWindow === undefined ? {} : {
+                contextUsageRatio: Number(Math.min(1, contextTokens / contextWindow).toFixed(6)),
+            }),
+            ...(this.context.modelId === undefined ? {} : { contextModelId: this.context.modelId }),
+        };
+    }
+    completeRequest(outputTokens, time) {
+        const active = this.active;
+        this.active = undefined;
+        this.startedAt = time;
+        if (active === undefined)
+            return;
+        this.completedStreams.add(active.firstTokenAt);
+        if (outputTokens <= 0 || time <= active.firstTokenAt)
+            return;
+        this.samples.push({ id: `${this.id}:${active.firstTokenAt}`, ...active, completedAt: time, outputTokens });
+    }
+}
+function readUsage(value) {
+    const event = usageChunk(value);
+    return event?.type === 'usage' ? event : undefined;
+}
+function sumRequests(requests) {
+    if (requests.length === 0)
+        return undefined;
+    let inputTokens = 0, outputTokens = 0, cacheReadTokens = 0, cacheWriteTokens = 0;
+    let cached = false;
+    for (const usage of requests) {
+        const cache = (usage.cacheReadTokens ?? 0) + (usage.cacheWriteTokens ?? 0);
+        inputTokens += usage.uncachedInputTokens === undefined ? usage.inputTokens : usage.uncachedInputTokens + cache;
+        outputTokens += usage.outputTokens;
+        cacheReadTokens += usage.cacheReadTokens ?? 0;
+        cacheWriteTokens += usage.cacheWriteTokens ?? 0;
+        cached ||= usage.cacheReadTokens !== undefined || usage.cacheWriteTokens !== undefined;
+    }
+    return readUsage({ inputTokens, outputTokens, ...(cached ? { cacheReadTokens, cacheWriteTokens } : {}) });
+}
+function token(value) {
+    return typeof value === 'number' && Number.isSafeInteger(value) && value >= 0 ? value : undefined;
+}
+//# sourceMappingURL=grok-usage.js.map

package/data/build/dist/host/cli-adapters/grok-usage.js.map

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

package/data/build/dist/host/cli-adapters/legacy-session-adapter.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"legacy-session-adapter.d.ts","sourceRoot":"","sources":["../../../../../src/host/cli-adapters/legacy-session-adapter.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,uCAAuC,CAAA;AAEjF,6CAA6C;AAC7C,eAAO,MAAM,qBAAqB,aAmBhC,CAAA;AAEF,MAAM,WAAW,4BAA4B;IAC3C,QAAQ,CAAC,SAAS,EAAE,MAAM,CAAA;IAC1B,QAAQ,CAAC,SAAS,CAAC,EAAE,oBAAoB,CAAA;IACzC,sCAAsC;IACtC,QAAQ,CAAC,eAAe,CAAC,EAAE,MAAM,CAAA;IACjC,QAAQ,CAAC,MAAM,EAAE,OAAO,CAAA;IACxB,QAAQ,CAAC,GAAG,CAAC,EAAE,MAAM,CAAA;IACrB,QAAQ,CAAC,SAAS,CAAC,EAAE,MAAM,CAAA;IAC3B,QAAQ,CAAC,QAAQ,EAAE,OAAO,CAAA;CAC3B;AAED,2CAA2C;AAC3C,wBAAgB,2BAA2B,CAAC,KAAK,EAAE,OAAO,GAAG,OAAO,CAOnE;AAED;;;;;;;;;;GAUG;AACH,wBAAgB,2BAA2B,CAAC,KAAK,EAAE,OAAO,GAAG,4BAA4B,GAAG,SAAS,CAqCpG"}
+{"version":3,"file":"legacy-session-adapter.d.ts","sourceRoot":"","sources":["../../../../../src/host/cli-adapters/legacy-session-adapter.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,uCAAuC,CAAA;AAGjF,6CAA6C;AAC7C,eAAO,MAAM,qBAAqB,aAmBhC,CAAA;AAEF,MAAM,WAAW,4BAA4B;IAC3C,QAAQ,CAAC,SAAS,EAAE,MAAM,CAAA;IAC1B,QAAQ,CAAC,SAAS,CAAC,EAAE,oBAAoB,CAAA;IACzC,sCAAsC;IACtC,QAAQ,CAAC,eAAe,CAAC,EAAE,MAAM,CAAA;IACjC,QAAQ,CAAC,MAAM,EAAE,OAAO,CAAA;IACxB,QAAQ,CAAC,GAAG,CAAC,EAAE,MAAM,CAAA;IACrB,QAAQ,CAAC,SAAS,CAAC,EAAE,MAAM,CAAA;IAC3B,QAAQ,CAAC,QAAQ,EAAE,OAAO,CAAA;CAC3B;AAED,2CAA2C;AAC3C,wBAAgB,2BAA2B,CAAC,KAAK,EAAE,OAAO,GAAG,OAAO,CASnE;AAED;;;;;;;;;;GAUG;AACH,wBAAgB,2BAA2B,CAAC,KAAK,EAAE,OAAO,GAAG,4BAA4B,GAAG,SAAS,CAkDpG"}

package/data/build/dist/host/cli-adapters/legacy-session-adapter.js

@@ -1,3 +1,4 @@
+import { fromCliProviderId } from '../../shared/cli-provider-route.js';
 /** 当前插件注册的适配器；旧日志只能从这些稳定 ID 中选择，不能猜测任意品牌。 */
 export const KNOWN_CLI_ADAPTER_IDS = new Set([
     'command-code',
@@ -26,6 +27,9 @@ export function hasLegacySessionAdapterHint(event) {
     const source = asRecord(asRecord(data?.message)?.source);
     if (source?.plugin === 'codingns4dsh' || source?.provider === 'codingns-external')
         return true;
+    const provider = firstString(source?.provider, record?.type === 'request/context' ? data?.provider : undefined);
+    if (fromCliProviderId(provider) !== undefined)
+        return true;
     const adapterId = firstString(source?.adapterId, record?.type === 'request/context' ? data?.adapterId ?? data?.provider : undefined);
     return adapterId !== undefined && (adapterId === 'codebuddy-cn' || KNOWN_CLI_ADAPTER_IDS.has(adapterId));
 }
@@ -51,6 +55,7 @@ export function inspectLegacySessionAdapter(value) {
     const events = snapshotEvents(record);
     let external = false;
     const candidates = new Set();
+    const legacyProviders = new Set();
     for (const event of events) {
         const eventRecord = asRecord(event);
         if (eventRecord === null)
@@ -62,15 +67,26 @@ export function inspectLegacySessionAdapter(value) {
         const pluginSource = source?.plugin === 'codingns4dsh';
         if (sourceProvider === 'codingns-external' || pluginSource)
             external = true;
+        const providerAdapter = fromCliProviderId(firstString(source?.provider, eventRecord.type === 'request/context' ? data?.provider : undefined));
+        if (providerAdapter !== undefined) {
+            external = true;
+            candidates.add(providerAdapter === 'codebuddy-cn' ? 'codebuddy' : providerAdapter);
+        }
         // 只有显式 adapterId 或插件自写的 source 才能作为来源证据；DSH 自己的
         // model provider 不能因为名字碰巧叫 codex 就被绑定到 Codex 适配器。
         addCandidate(candidates, firstString(source?.adapterId));
         if (pluginSource)
             addCandidate(candidates, sourceProvider);
-        if (eventRecord.type === 'request/context')
-            addCandidate(candidates, firstString(data?.adapterId, data?.provider));
+        if (eventRecord.type === 'request/context') {
+            addCandidate(candidates, firstString(data?.adapterId));
+            addCandidate(legacyProviders, firstString(data?.provider));
+        }
     }
-    const adapterId = external && candidates.size === 1 ? [...candidates][0] : undefined;
+    // Explicit ownership wins over older native request contexts whose API
+    // provider happens to share a CLI adapter's name.
+    const adapters = candidates.size > 0 ? candidates : legacyProviders;
+    const candidate = external && adapters.size === 1 ? [...adapters][0] : undefined;
+    const adapterId = candidate !== undefined && KNOWN_CLI_ADAPTER_IDS.has(candidate) ? candidate : undefined;
     const parentSessionId = firstString(header?.parentSession);
     return {
         sessionId,
@@ -98,6 +114,7 @@ function snapshotEvents(record) {
     return Array.isArray(record.events) ? record.events : [];
 }
 function addCandidate(candidates, value) {
+    value = fromCliProviderId(value) ?? value;
     if (value === 'codebuddy-cn') {
         candidates.add('codebuddy');
         return;

package/data/build/dist/host/cli-adapters/legacy-session-adapter.js.map

@@ -1 +1 @@
-{"version":3,"file":"legacy-session-adapter.js","sourceRoot":"","sources":["../../../../../src/host/cli-adapters/legacy-session-adapter.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"legacy-session-adapter.js","sourceRoot":"","sources":["../../../../../src/host/cli-adapters/legacy-session-adapter.ts"],"names":[],"mappings":"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"}

package/data/build/dist/host/cli-adapters/management-installation.d.ts

@@ -0,0 +1,5 @@
+/** Recognize the official standalone layout without treating arbitrary binaries as owned installs. */
+export declare function codexStandaloneDirectory(command: string, platform: NodeJS.Platform, environment?: NodeJS.ProcessEnv): string | undefined;
+/** Retain the npm owner when its launcher resolves into a separate binary package. */
+export declare function resolveManagementInstallation(command: string, packageName?: string, environment?: NodeJS.ProcessEnv): Promise<string | null>;
+//# sourceMappingURL=management-installation.d.ts.map

package/data/build/dist/host/cli-adapters/management-installation.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"management-installation.d.ts","sourceRoot":"","sources":["../../../../../src/host/cli-adapters/management-installation.ts"],"names":[],"mappings":"AAKA,sGAAsG;AACtG,wBAAgB,wBAAwB,CAAC,OAAO,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,CAAC,QAAQ,EAAE,WAAW,GAAE,MAAM,CAAC,UAAwB,GAAG,MAAM,GAAG,SAAS,CAUrJ;AAED,sFAAsF;AACtF,wBAAsB,6BAA6B,CAAC,OAAO,EAAE,MAAM,EAAE,WAAW,CAAC,EAAE,MAAM,EAAE,WAAW,GAAE,MAAM,CAAC,UAAwB,GAAG,OAAO,CAAC,MAAM,GAAG,IAAI,CAAC,CAE/J"}

package/data/build/dist/host/cli-adapters/management-installation.js

@@ -0,0 +1,131 @@
+import { open, readFile, realpath, stat } from 'node:fs/promises';
+import { homedir } from 'node:os';
+import { basename, dirname, isAbsolute, join, relative, resolve, sep } from 'node:path';
+import { resolveCommandPath } from './process-utils.js';
+/** Recognize the official standalone layout without treating arbitrary binaries as owned installs. */
+export function codexStandaloneDirectory(command, platform, environment = process.env) {
+    if (platform !== 'darwin' && platform !== 'linux')
+        return undefined;
+    const directory = environment.CODEX_INSTALL_DIR || join(homedir(), '.local', 'bin');
+    const home = environment.CODEX_HOME || join(homedir(), '.codex');
+    if (!isAbsolute(directory) || !isAbsolute(home))
+        return undefined;
+    if (command === join(directory, 'codex'))
+        return directory;
+    const release = relative(join(home, 'packages', 'standalone', 'releases'), command);
+    // Current packages use <version>-<target>/bin/codex; older releases contain codex directly.
+    if (/^(?:rust-v)?\d+\.\d+\.\d+(?:-[\w.-]+)?\/(?:bin\/)?codex$/u.test(release))
+        return directory;
+    return undefined;
+}
+/** Retain the npm owner when its launcher resolves into a separate binary package. */
+export async function resolveManagementInstallation(command, packageName, environment = process.env) {
+    return resolveInstallation(command, packageName, environment, new Set());
+}
+async function resolveInstallation(command, packageName, environment, visited) {
+    const launcher = await resolveCommandPath(command);
+    if (launcher === null)
+        return null;
+    const target = await realpath(launcher).catch(() => launcher);
+    if (visited.has(target) || visited.size >= 8)
+        return null;
+    visited.add(target);
+    if (!packageName)
+        return target;
+    const normalizedTarget = target.replaceAll('\\', '/');
+    const brewPackage = normalizedTarget.match(/\/(?:Cellar|Caskroom)\/([^/]+)\//u)?.[1];
+    if ((brewPackage && !/^node(?:@\d+)?$/u.test(brewPackage)) || /\.app\/Contents\/|\/resources\/app(?:\.asar)?\//iu.test(normalizedTarget))
+        return target;
+    const roots = new Set();
+    for (const path of [launcher, target]) {
+        const normalized = path.replaceAll('\\', '/');
+        if (/\/(?:\.bun|\.pnpm|scoop|WinGet)\//iu.test(normalized))
+            return target;
+        const marker = process.platform === 'win32' ? '/node_modules/' : '/lib/node_modules/';
+        const index = normalized.indexOf(marker);
+        if (index > 0)
+            roots.add(join(normalized.slice(0, index), marker.slice(1), packageName));
+    }
+    // npm's global launchers live in <prefix>/bin on POSIX and <prefix> on Windows.
+    roots.add(process.platform === 'win32'
+        ? join(dirname(launcher), 'node_modules', packageName)
+        : join(dirname(launcher), '..', 'lib', 'node_modules', packageName));
+    for (const root of roots) {
+        try {
+            const metadata = JSON.parse(await readSmallFile(join(root, 'package.json')));
+            if (metadata.name !== packageName)
+                continue;
+            const bins = typeof metadata.bin === 'string' ? { [packageName.split('/').at(-1)]: metadata.bin } : metadata.bin;
+            if (!bins || typeof bins !== 'object' || Array.isArray(bins))
+                continue;
+            for (const [name, value] of Object.entries(bins)) {
+                if (typeof value !== 'string' || isAbsolute(value))
+                    continue;
+                const entry = resolve(root, value);
+                const within = relative(root, entry);
+                if (within === '..' || within.startsWith(`..${sep}`) || isAbsolute(within))
+                    continue;
+                const binary = await realpath(entry).catch(() => null);
+                if (binary === null)
+                    continue;
+                if (binary === target)
+                    return entry;
+                if (process.platform === 'win32' && /\.(?:cmd|ps1)$/iu.test(launcher) && basename(launcher).replace(/\.(?:cmd|ps1)$/iu, '') === name) {
+                    const shim = (await readSmallFile(launcher)).replaceAll('\\', '/');
+                    const suffix = `/node_modules/${packageName}/${value.replaceAll('\\', '/').replace(/^\.\//u, '')}`;
+                    if (['%dp0%', '$basedir'].some(base => shim.includes(`${base}${suffix}`)))
+                        return entry;
+                }
+            }
+        }
+        catch { /* Missing or unrelated metadata is not evidence of package ownership. */ }
+    }
+    if (packageName === '@openai/codex' && process.platform !== 'win32') {
+        try {
+            const script = await readExecutableScript(target);
+            if (script !== undefined) {
+                const wrapped = codexWrapperTarget(script);
+                return wrapped ? resolveInstallation(wrapped, packageName, environment, visited) : null;
+            }
+        }
+        catch {
+            return null;
+        }
+        const directory = codexStandaloneDirectory(target, process.platform, environment);
+        const entry = directory && join(directory, 'codex');
+        // Keep the active launcher only if it points to this release. Never redirect a custom installation.
+        if (entry && await realpath(entry).catch(() => null) === target)
+            return entry;
+    }
+    // A wrapper needs verified ownership; an arbitrary exec target must not select an updater.
+    return visited.size === 1 ? target : null;
+}
+/** Inspect a literal terminal exec without evaluating the wrapper or sourcing its environment files. */
+function codexWrapperTarget(script) {
+    if (!/^#![ \t]*(?:\/bin\/(?:ba|da|k|z)?sh|\/usr\/bin\/env[ \t]+(?:ba|da|k|z)?sh)[ \t]*\r?\n/u.test(script))
+        return undefined;
+    const lines = script.split(/\r?\n/u).map(line => line.trim()).filter(line => line && !line.startsWith('#'));
+    if (lines.filter(line => /^exec[ \t]/u.test(line)).length !== 1)
+        return undefined;
+    const match = lines.at(-1)?.match(/^exec[ \t]+(?:'([^']+)'|"([^"$`\\]+)"|([/\w@+=,:.-]+))(?:[ \t]+--[\w-]+(?:=[\w.-]+)?)*[ \t]+"\$@"$/u);
+    const target = match?.[1] ?? match?.[2] ?? match?.[3];
+    return target && isAbsolute(target) && /^(?:codex|codex\.js)$/u.test(basename(target)) ? target : undefined;
+}
+async function readExecutableScript(path) {
+    const file = await open(path, 'r');
+    try {
+        const header = Buffer.alloc(2);
+        await file.read(header, 0, header.length, 0);
+        return header.toString() === '#!' ? await readSmallFile(path) : undefined;
+    }
+    finally {
+        await file.close();
+    }
+}
+async function readSmallFile(path) {
+    const info = await stat(path);
+    if (!info.isFile() || info.size > 65_536)
+        throw new Error('Installation metadata is not a small regular file.');
+    return readFile(path, 'utf8');
+}
+//# sourceMappingURL=management-installation.js.map

package/data/build/dist/host/cli-adapters/management-installation.js.map

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

package/data/build/dist/host/cli-adapters/management-methods.d.ts

@@ -0,0 +1,37 @@
+import type { CodingNsCliAdapterDescriptor } from '../../shared/contracts/cli-adapter.js';
+import type { CliManagementAction, CliManagementMethod } from '../../shared/contracts/cli-management.js';
+export interface ManagementCommand {
+    readonly file: string;
+    readonly args: readonly string[];
+    readonly nsisInstallDirectory?: string;
+    readonly zcodeUpdate?: {
+        readonly platform: NodeJS.Platform;
+        readonly arch: string;
+    };
+}
+export interface ManagementMethod extends CliManagementMethod {
+    readonly invocation?: ManagementCommand;
+}
+interface Definition {
+    readonly sourceUrl: string;
+    readonly npm?: string;
+    readonly npmArgs?: readonly string[];
+    readonly script?: string;
+    readonly powershell?: string;
+    readonly scriptShell?: 'bash' | 'sh';
+    readonly update?: readonly string[];
+    readonly brew?: readonly string[];
+    readonly note?: string;
+    readonly manual?: boolean;
+    readonly windowsManual?: boolean;
+}
+export declare const AGENT_MANAGEMENT_DEFINITIONS: Readonly<Record<string, Definition>>;
+export declare function managementNpmPackage(adapter: CodingNsCliAdapterDescriptor): string | undefined;
+export declare function managementMethods(adapter: CodingNsCliAdapterDescriptor, action: CliManagementAction, platform: NodeJS.Platform, arch: string): {
+    sourceUrl: string;
+    methods: ManagementMethod[];
+};
+/** Select only a matching package owner or an official self-updater. */
+export declare function automaticUpdateMethod(adapter: CodingNsCliAdapterDescriptor, methods: ManagementMethod[], platform: NodeJS.Platform): string | undefined;
+export {};
+//# sourceMappingURL=management-methods.d.ts.map

package/data/build/dist/host/cli-adapters/management-methods.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"management-methods.d.ts","sourceRoot":"","sources":["../../../../../src/host/cli-adapters/management-methods.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,4BAA4B,EAAE,MAAM,uCAAuC,CAAA;AACzF,OAAO,KAAK,EAAE,mBAAmB,EAAE,mBAAmB,EAAE,MAAM,0CAA0C,CAAA;AAIxG,MAAM,WAAW,iBAAiB;IAChC,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAA;IACrB,QAAQ,CAAC,IAAI,EAAE,SAAS,MAAM,EAAE,CAAA;IAChC,QAAQ,CAAC,oBAAoB,CAAC,EAAE,MAAM,CAAA;IACtC,QAAQ,CAAC,WAAW,CAAC,EAAE;QAAE,QAAQ,CAAC,QAAQ,EAAE,MAAM,CAAC,QAAQ,CAAC;QAAC,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAA;KAAE,CAAA;CACrF;AAED,MAAM,WAAW,gBAAiB,SAAQ,mBAAmB;IAC3D,QAAQ,CAAC,UAAU,CAAC,EAAE,iBAAiB,CAAA;CACxC;AAED,UAAU,UAAU;IAClB,QAAQ,CAAC,SAAS,EAAE,MAAM,CAAA;IAC1B,QAAQ,CAAC,GAAG,CAAC,EAAE,MAAM,CAAA;IACrB,QAAQ,CAAC,OAAO,CAAC,EAAE,SAAS,MAAM,EAAE,CAAA;IACpC,QAAQ,CAAC,MAAM,CAAC,EAAE,MAAM,CAAA;IACxB,QAAQ,CAAC,UAAU,CAAC,EAAE,MAAM,CAAA;IAC5B,QAAQ,CAAC,WAAW,CAAC,EAAE,MAAM,GAAG,IAAI,CAAA;IACpC,QAAQ,CAAC,MAAM,CAAC,EAAE,SAAS,MAAM,EAAE,CAAA;IACnC,QAAQ,CAAC,IAAI,CAAC,EAAE,SAAS,MAAM,EAAE,CAAA;IACjC,QAAQ,CAAC,IAAI,CAAC,EAAE,MAAM,CAAA;IACtB,QAAQ,CAAC,MAAM,CAAC,EAAE,OAAO,CAAA;IACzB,QAAQ,CAAC,aAAa,CAAC,EAAE,OAAO,CAAA;CACjC;AAGD,eAAO,MAAM,4BAA4B,EAAE,QAAQ,CAAC,MAAM,CAAC,MAAM,EAAE,UAAU,CAAC,CAmB7E,CAAA;AAED,wBAAgB,oBAAoB,CAAC,OAAO,EAAE,4BAA4B,GAAG,MAAM,GAAG,SAAS,CAG9F;AAED,wBAAgB,iBAAiB,CAAC,OAAO,EAAE,4BAA4B,EAAE,MAAM,EAAE,mBAAmB,EAAE,QAAQ,EAAE,MAAM,CAAC,QAAQ,EAAE,IAAI,EAAE,MAAM,GAAG;IAAE,SAAS,EAAE,MAAM,CAAC;IAAC,OAAO,EAAE,gBAAgB,EAAE,CAAA;CAAE,CA8CjM;AAMD,wEAAwE;AACxE,wBAAgB,qBAAqB,CAAC,OAAO,EAAE,4BAA4B,EAAE,OAAO,EAAE,gBAAgB,EAAE,EAAE,QAAQ,EAAE,MAAM,CAAC,QAAQ,GAAG,MAAM,GAAG,SAAS,CAmDvJ"}