@1mcp/agent 0.34.4 → 0.35.0-beta.2

package/build/commands/shared/apiClient.js

@@ -27,16 +27,18 @@ export class ApiClient {
         }
         return this.request(url.toString(), 'GET');
     }
-    async post(path, body) {
+    async post(path, body, options = {}) {
         const url = `${this.baseUrl}${path}`;
-        return this.request(url, 'POST', body);
+        return this.request(url, 'POST', body, options);
     }
-    async request(url, method, body) {
+    async request(url, method, body, options = {}) {
         const controller = new AbortController();
-        const timer = setTimeout(() => controller.abort(), this.timeout);
+        const timeout = options.timeout ?? this.timeout;
+        const timer = setTimeout(() => controller.abort(), timeout);
         const headers = {
             'User-Agent': `1MCP/${MCP_SERVER_VERSION}`,
             Accept: 'application/json',
+            ...options.headers,
         };
         if (this.bearerToken) {
             headers.Authorization = `Bearer ${this.bearerToken}`;
@@ -62,17 +64,20 @@ export class ApiClient {
             if (contentType.includes('application/json')) {
                 try {
                     const json = (await response.json());
+                    data = json;
                     if (response.ok) {
-                        data = json;
+                        error = undefined;
                     }
                     else {
                         const errObj = json;
                         error =
                             typeof errObj.error === 'string'
                                 ? errObj.error
-                                : typeof errObj.message === 'string'
-                                    ? errObj.message
-                                    : `HTTP ${response.status}`;
+                                : isErrorObject(errObj.error) && typeof errObj.error.message === 'string'
+                                    ? errObj.error.message
+                                    : typeof errObj.message === 'string'
+                                        ? errObj.message
+                                        : `HTTP ${response.status}`;
                     }
                 }
                 catch {
@@ -87,10 +92,13 @@ export class ApiClient {
         catch (err) {
             clearTimeout(timer);
             if (err instanceof Error && err.name === 'AbortError') {
-                return { ok: false, status: 0, error: `Request timed out after ${this.timeout}ms` };
+                return { ok: false, status: 0, error: `Request timed out after ${timeout}ms` };
             }
             return { ok: false, status: 0, error: err instanceof Error ? err.message : String(err) };
         }
     }
 }
+function isErrorObject(value) {
+    return typeof value === 'object' && value !== null;
+}
 //# sourceMappingURL=apiClient.js.map

package/build/commands/shared/apiClient.js.map

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

package/build/commands/shared/clientSurfaceAttachment.d.ts

@@ -2,6 +2,7 @@ import { type AuthProfile } from '../../commands/shared/authProfileStore.js';
 import { type CliSessionCache } from '../../commands/shared/serveClient.js';
 import { type ResolvableServeTargetOptions } from '../../commands/shared/serveTargetResolver.js';
 import type { ProjectConfig } from '../../config/projectConfigTypes.js';
+import type { RuntimeIdentityWarning } from '../../domains/runtime-targets/runtimeIdentityVerification.js';
 import type { ContextData } from '../../types/context.js';
 export type ReusableClientSurface = 'run' | 'inspect' | 'instructions';
 export type FreshClientSurface = 'stdio-proxy';
@@ -15,10 +16,17 @@ export interface ResolvedAttachmentTarget<TOptions extends ResolvableServeTarget
     serverUrl: URL;
     serverPid?: number;
     source: 'user' | 'pidfile' | 'portscan';
+    runtimeTargetContext?: {
+        name: string;
+        kind: 'local' | 'remote';
+        runtimeScopeId?: string;
+    };
+    runtimeIdentityWarnings?: RuntimeIdentityWarning[];
 }
 export interface ClientSurfaceAttachmentPorts<TOptions extends ResolvableServeTargetOptions> {
     resolveTarget: (options: TOptions) => Promise<ResolvedAttachmentTarget<TOptions>>;
     loadAuthProfile: (configDir: string | undefined, normalizedBaseUrl: string) => Promise<AuthProfile | null>;
+    getOAuthTokenReference: (contextName: string, runtimeScopeId: string) => Promise<unknown | undefined>;
     readSessionCache: (cachePath: string, serverUrl: string, contextHash: string) => Promise<CliSessionCache | null>;
     writeSessionCache: (cachePath: string, cache: CliSessionCache) => Promise<void>;
     deleteSessionCache: (cachePath: string) => Promise<void>;
@@ -38,6 +46,11 @@ export interface ClientSurfaceAttachmentContext<TOptions extends ResolvableServe
     sessionId: string;
     restSupport?: boolean;
 }
+export interface ClientSurfaceAuthRequiredContext<TOptions extends ResolvableServeTargetOptions = ResolvableServeTargetOptions> {
+    baseUrl: string;
+    options: TOptions;
+    target: Pick<ResolvedAttachmentTarget<TOptions>, 'runtimeTargetContext'>;
+}
 export interface FreshClientSurfaceAttachmentResult<TOptions extends ResolvableServeTargetOptions> {
     target: ResolvedAttachmentTarget<TOptions>;
     options: TOptions;
@@ -129,4 +142,5 @@ export interface AttachFreshClientSurfaceOptions<TOptions extends ResolvableServ
 }
 export declare function attachFreshClientSurface<TOptions extends ResolvableServeTargetOptions>(input: AttachFreshClientSurfaceOptions<TOptions>): Promise<FreshClientSurfaceAttachmentResult<TOptions>>;
 export declare function attachReusableClientSurface<TOptions extends ResolvableServeTargetOptions, TValue>(input: AttachReusableClientSurfaceOptions<TOptions, TValue>): Promise<ReusableClientSurfaceAttachmentResult<TOptions, TValue>>;
+export declare function formatClientSurfaceAuthRequiredMessage<TOptions extends ResolvableServeTargetOptions>(context: ClientSurfaceAuthRequiredContext<TOptions>): string;
 //# sourceMappingURL=clientSurfaceAttachment.d.ts.map

package/build/commands/shared/clientSurfaceAttachment.d.ts.map

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

package/build/commands/shared/clientSurfaceAttachment.js

@@ -2,11 +2,13 @@ import { loadAuthProfile, normalizeServerUrl } from '../../commands/shared/authP
 import { buildCliContext, generateStreamableSessionId } from '../../commands/shared/cliContext.js';
 import { deleteCliSessionCache, getCliSessionCachePath, getCliSessionContextHash, readCliSessionCache, writeCliSessionCache, } from '../../commands/shared/serveClient.js';
 import { resolveServeTarget, } from '../../commands/shared/serveTargetResolver.js';
+import { RuntimeTargetStore } from '../../domains/runtime-targets/runtimeTargetStore.js';
 import { resolveCanonicalSessionId, withCanonicalSessionId } from '../../utils/context/sessionIdentity.js';
 import { stripMcpSuffix } from '../../utils/urlUtils.js';
 export async function attachFreshClientSurface(input) {
     const ports = withDefaultPorts(input.ports);
     const target = await ports.resolveTarget(input.options);
+    writeRuntimeTargetWarnings(target.runtimeIdentityWarnings);
     const options = target.mergedOptions;
     const freshSessionId = generateStreamableSessionId();
     const baseContext = buildCliContext({
@@ -19,7 +21,7 @@ export async function attachFreshClientSurface(input) {
     });
     const contextHash = getCliSessionContextHash(baseContext);
     const baseUrl = stripMcpSuffix(target.discoveredUrl);
-    const authProfile = await ports.loadAuthProfile(options['config-dir'], normalizeServerUrl(baseUrl));
+    const bearerToken = await loadBearerToken(ports, target, options, baseUrl);
     const requestSessionId = resolveCanonicalSessionId({ context: baseContext, transportSessionId: freshSessionId });
     const context = withCanonicalSessionId(baseContext, requestSessionId);
     return {
@@ -27,7 +29,7 @@ export async function attachFreshClientSurface(input) {
         options,
         baseUrl,
         serverUrl: target.serverUrl,
-        bearerToken: authProfile?.token,
+        bearerToken,
         context,
         contextHash,
         requestSessionId,
@@ -37,6 +39,7 @@ export async function attachFreshClientSurface(input) {
 export async function attachReusableClientSurface(input) {
     const ports = withDefaultPorts(input.ports);
     const target = await ports.resolveTarget(input.options);
+    writeRuntimeTargetWarnings(target.runtimeIdentityWarnings);
     const options = target.mergedOptions;
     const baseContext = buildCliContext({
         cwd: target.cwd,
@@ -53,8 +56,9 @@ export async function attachReusableClientSurface(input) {
         contextHash,
     });
     const baseUrl = stripMcpSuffix(target.discoveredUrl);
-    const [authProfile, cachedSession] = await Promise.all([
-        ports.loadAuthProfile(options['config-dir'], normalizeServerUrl(baseUrl)),
+    const bearerTokenPromise = loadBearerToken(ports, target, options, baseUrl);
+    const [bearerToken, cachedSession] = await Promise.all([
+        bearerTokenPromise,
         ports.readSessionCache(cachePath, target.serverUrl.toString(), contextHash),
     ]);
     const requestSessionId = resolveCanonicalSessionId({
@@ -68,7 +72,7 @@ export async function attachReusableClientSurface(input) {
         options,
         baseUrl,
         serverUrl: target.serverUrl,
-        bearerToken: authProfile?.token,
+        bearerToken,
         context,
         contextHash,
         cachePath,
@@ -99,7 +103,7 @@ export async function attachReusableClientSurface(input) {
                 cachePath,
                 target,
                 baseUrl,
-                bearerToken: authProfile?.token,
+                bearerToken,
                 cachedSession,
                 restSupport,
                 observed: restResponse.observed,
@@ -115,7 +119,7 @@ export async function attachReusableClientSurface(input) {
                 cachePath,
                 target,
                 baseUrl,
-                bearerToken: authProfile?.token,
+                bearerToken,
                 cachedSession,
                 restSupport,
                 observed: restResponse.observed,
@@ -159,7 +163,7 @@ export async function attachReusableClientSurface(input) {
             cachePath,
             target,
             baseUrl,
-            bearerToken: authProfile?.token,
+            bearerToken,
             cachedSession,
             restSupport,
             observed: mcpResponse.observed,
@@ -174,7 +178,7 @@ export async function attachReusableClientSurface(input) {
         cachePath,
         target,
         baseUrl,
-        bearerToken: authProfile?.token,
+        bearerToken,
         cachedSession,
         restSupport,
         observed: mcpResponse.observed,
@@ -184,12 +188,50 @@ function withDefaultPorts(ports) {
     return {
         resolveTarget: ports?.resolveTarget ?? ((options) => resolveServeTarget(options)),
         loadAuthProfile: ports?.loadAuthProfile ?? loadAuthProfile,
+        getOAuthTokenReference: ports?.getOAuthTokenReference ??
+            ((contextName, runtimeScopeId) => Promise.resolve(new RuntimeTargetStore().getOAuthTokenReference(contextName, runtimeScopeId))),
         readSessionCache: ports?.readSessionCache ?? readCliSessionCache,
         writeSessionCache: ports?.writeSessionCache ?? writeCliSessionCache,
         deleteSessionCache: ports?.deleteSessionCache ?? deleteCliSessionCache,
         now: ports?.now ?? Date.now,
     };
 }
+async function loadBearerToken(ports, target, options, baseUrl) {
+    if (options.url) {
+        return undefined;
+    }
+    const runtimeTargetContext = target.runtimeTargetContext;
+    if (runtimeTargetContext) {
+        if (!runtimeTargetContext.runtimeScopeId) {
+            return undefined;
+        }
+        const reference = await ports.getOAuthTokenReference(runtimeTargetContext.name, runtimeTargetContext.runtimeScopeId);
+        return toOAuthTokenReference(reference)?.token;
+    }
+    const authProfile = await ports.loadAuthProfile(options['config-dir'], normalizeServerUrl(baseUrl));
+    return authProfile?.token;
+}
+export function formatClientSurfaceAuthRequiredMessage(context) {
+    if (context.target.runtimeTargetContext) {
+        return `Authentication required for target context "${context.target.runtimeTargetContext.name}". Run: 1mcp auth login --context ${context.target.runtimeTargetContext.name} --token <your-token>`;
+    }
+    if (context.options.url) {
+        return `Authentication required for ephemeral URL target. Ephemeral URLs are credentialless; run: 1mcp target add <name> ${context.baseUrl} and retry with --context <name> after context-scoped credentials are available.`;
+    }
+    return 'Authentication required. Run: 1mcp auth login --context local --token <your-token>';
+}
+function toOAuthTokenReference(value) {
+    if (typeof value !== 'object' || value === null) {
+        return undefined;
+    }
+    const candidate = value;
+    return typeof candidate.token === 'string' && candidate.token.length > 0 ? { token: candidate.token } : undefined;
+}
+function writeRuntimeTargetWarnings(warnings) {
+    for (const warning of warnings ?? []) {
+        process.stderr.write(`${warning.code}: ${warning.message}\n`);
+    }
+}
 async function persistSession(ports, cachePath, options) {
     await ports.writeSessionCache(cachePath, {
         sessionId: options.sessionId,

package/build/commands/shared/clientSurfaceAttachment.js.map

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

package/build/commands/shared/commandRunner.d.ts

@@ -1,3 +1,5 @@
 import type { GlobalOptions } from '../../globalOptions.js';
-export declare function runCliCommand<T extends GlobalOptions>(argv: T, fn: (argv: T) => Promise<void>): Promise<void>;
+export declare function runCliCommand<T extends GlobalOptions & {
+    json?: boolean;
+}>(argv: T, fn: (argv: T) => Promise<void>): Promise<void>;
 //# sourceMappingURL=commandRunner.d.ts.map

package/build/commands/shared/commandRunner.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"commandRunner.d.ts","sourceRoot":"","sources":["../../../src/commands/shared/commandRunner.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,uBAAuB,CAAC;AAE3D,wBAAsB,aAAa,CAAC,CAAC,SAAS,aAAa,EAAE,IAAI,EAAE,CAAC,EAAE,EAAE,EAAE,CAAC,IAAI,EAAE,CAAC,KAAK,OAAO,CAAC,IAAI,CAAC,GAAG,OAAO,CAAC,IAAI,CAAC,CAUnH"}
+{"version":3,"file":"commandRunner.d.ts","sourceRoot":"","sources":["../../../src/commands/shared/commandRunner.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,uBAAuB,CAAC;AAE3D,wBAAsB,aAAa,CAAC,CAAC,SAAS,aAAa,GAAG;IAAE,IAAI,CAAC,EAAE,OAAO,CAAA;CAAE,EAC9E,IAAI,EAAE,CAAC,EACP,EAAE,EAAE,CAAC,IAAI,EAAE,CAAC,KAAK,OAAO,CAAC,IAAI,CAAC,GAC7B,OAAO,CAAC,IAAI,CAAC,CAgBf"}

package/build/commands/shared/commandRunner.js

@@ -6,8 +6,65 @@ export async function runCliCommand(argv, fn) {
     }
     catch (error) {
         const message = error instanceof Error ? error.message : String(error);
-        process.stderr.write(`${message}\n`);
-        process.exit(1);
+        const exitCode = exitCodeForError(error);
+        if (hasJsonOutput(argv)) {
+            process.stdout.write(`${JSON.stringify(jsonFailureEnvelope(error, message))}\n`);
+            process.exitCode = exitCode;
+            return;
+        }
+        process.stderr.write(`${formatErrorForHuman(error, message)}\n`);
+        process.exit(exitCode);
     }
 }
+function hasJsonOutput(argv) {
+    return argv.json === true;
+}
+function jsonFailureEnvelope(error, message) {
+    const coded = isCodedError(error) ? error : undefined;
+    return {
+        ok: false,
+        cliProtocolVersion: '1',
+        requestId: createCliRequestId(),
+        error: {
+            code: coded?.code ?? 'command_failed',
+            message,
+            ...(coded?.recoveryCommand ? { recoveryCommand: coded.recoveryCommand } : {}),
+            ...(coded && 'details' in coded && coded.details !== undefined ? { details: coded.details } : {}),
+        },
+    };
+}
+function isCodedError(error) {
+    return typeof error === 'object' && error !== null && 'code' in error && typeof error.code === 'string';
+}
+function formatErrorForHuman(error, message) {
+    if (!isCodedError(error)) {
+        return message;
+    }
+    const detailsMessage = 'details' in error && error.details !== undefined ? `\nDetails: ${JSON.stringify(error.details)}` : '';
+    return `${error.code}: ${message}${detailsMessage}${error.recoveryCommand ? `\nRecovery: ${error.recoveryCommand}` : ''}`;
+}
+function exitCodeForError(error) {
+    if (!isCodedError(error)) {
+        return 1;
+    }
+    if (error.code === 'target_argument_missing' ||
+        error.code.startsWith('credential_') ||
+        error.code.startsWith('validation_') ||
+        error.code.endsWith('_validation_failed')) {
+        return 2;
+    }
+    if (error.code.startsWith('auth_') || error.code.includes('session')) {
+        return 3;
+    }
+    if (error.code.startsWith('target_') ||
+        error.code.startsWith('identity_') ||
+        error.code.includes('protocol') ||
+        error.code.includes('capability')) {
+        return 4;
+    }
+    return 1;
+}
+function createCliRequestId() {
+    return `cli_${Date.now().toString(36)}_${Math.random().toString(36).slice(2, 10)}`;
+}
 //# sourceMappingURL=commandRunner.js.map

package/build/commands/shared/commandRunner.js.map

@@ -1 +1 @@
-{"version":3,"file":"commandRunner.js","sourceRoot":"","sources":["../../../src/commands/shared/commandRunner.ts"],"names":[],"mappings":"AAEA,MAAM,CAAC,KAAK,UAAU,aAAa,CAA0B,IAAO,EAAE,EAA8B;IAClG,MAAM,EAAE,qBAAqB,EAAE,GAAG,MAAM,MAAM,CAAC,sCAAsC,CAAC,CAAC;IACvF,qBAAqB,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC;IACrC,IAAI,CAAC;QACH,MAAM,EAAE,CAAC,IAAI,CAAC,CAAC;IACjB,CAAC;IAAC,OAAO,KAAK,EAAE,CAAC;QACf,MAAM,OAAO,GAAG,KAAK,YAAY,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC;QACvE,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC,GAAG,OAAO,IAAI,CAAC,CAAC;QACrC,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;IAClB,CAAC;AACH,CAAC"}
+{"version":3,"file":"commandRunner.js","sourceRoot":"","sources":["../../../src/commands/shared/commandRunner.ts"],"names":[],"mappings":"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"}

package/build/commands/shared/serveTargetResolver.d.ts

@@ -1,8 +1,11 @@
 import { type ServeUrlOptions } from '../../commands/shared/serveClient.js';
 import type { ProjectConfig } from '../../config/projectConfigTypes.js';
+import { type RuntimeIdentityWarning, verifyRuntimeIdentityForTarget } from '../../domains/runtime-targets/runtimeIdentityVerification.js';
+import { RuntimeTargetStore } from '../../domains/runtime-targets/runtimeTargetStore.js';
 import type { GlobalOptions } from '../../globalOptions.js';
 export interface ResolvableServeTargetOptions extends GlobalOptions, ServeUrlOptions {
     url?: string;
+    context?: string;
 }
 export interface ResolvedServeTarget<TOptions extends ResolvableServeTargetOptions> {
     cwd: string;
@@ -15,7 +18,17 @@ export interface ResolvedServeTarget<TOptions extends ResolvableServeTargetOptio
     serverPid?: number;
     source: 'user' | 'pidfile' | 'portscan';
     projectContextSource: 'project-config' | 'repo-root' | 'cwd';
+    runtimeTargetContext?: {
+        name: string;
+        kind: 'local' | 'remote';
+        runtimeScopeId?: string;
+    };
+    runtimeIdentityWarnings?: RuntimeIdentityWarning[];
+}
+export interface ServeTargetResolverPorts {
+    runtimeTargetStore?: Pick<RuntimeTargetStore, 'current' | 'inspect' | 'requireInsecureTlsConfirmation' | 'updateObservedIdentityMetadata'> & Partial<Pick<RuntimeTargetStore, 'resolveForConnection'>>;
+    verifyRuntimeIdentity?: typeof verifyRuntimeIdentityForTarget;
 }
 export declare function mergeServeTargetOptions<TOptions extends ResolvableServeTargetOptions>(options: TOptions, projectConfig: ProjectConfig | null): TOptions;
-export declare function resolveServeTarget<TOptions extends ResolvableServeTargetOptions>(options: TOptions): Promise<ResolvedServeTarget<TOptions>>;
+export declare function resolveServeTarget<TOptions extends ResolvableServeTargetOptions>(options: TOptions, ports?: ServeTargetResolverPorts): Promise<ResolvedServeTarget<TOptions>>;
 //# sourceMappingURL=serveTargetResolver.d.ts.map

package/build/commands/shared/serveTargetResolver.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"serveTargetResolver.d.ts","sourceRoot":"","sources":["../../../src/commands/shared/serveTargetResolver.ts"],"names":[],"mappings":"AAAA,OAAO,EAAkB,KAAK,eAAe,EAAE,MAAM,qCAAqC,CAAC;AAE3F,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,mCAAmC,CAAC;AACvE,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,uBAAuB,CAAC;AAG3D,MAAM,WAAW,4BAA6B,SAAQ,aAAa,EAAE,eAAe;IAClF,GAAG,CAAC,EAAE,MAAM,CAAC;CACd;AAED,MAAM,WAAW,mBAAmB,CAAC,QAAQ,SAAS,4BAA4B;IAChF,GAAG,EAAE,MAAM,CAAC;IACZ,WAAW,EAAE,MAAM,CAAC;IACpB,WAAW,EAAE,MAAM,CAAC;IACpB,aAAa,EAAE,aAAa,GAAG,IAAI,CAAC;IACpC,aAAa,EAAE,QAAQ,CAAC;IACxB,aAAa,EAAE,MAAM,CAAC;IACtB,SAAS,EAAE,GAAG,CAAC;IACf,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,MAAM,EAAE,MAAM,GAAG,SAAS,GAAG,UAAU,CAAC;IACxC,oBAAoB,EAAE,gBAAgB,GAAG,WAAW,GAAG,KAAK,CAAC;CAC9D;AAED,wBAAgB,uBAAuB,CAAC,QAAQ,SAAS,4BAA4B,EACnF,OAAO,EAAE,QAAQ,EACjB,aAAa,EAAE,aAAa,GAAG,IAAI,GAClC,QAAQ,CAgBV;AAsCD,wBAAsB,kBAAkB,CAAC,QAAQ,SAAS,4BAA4B,EACpF,OAAO,EAAE,QAAQ,GAChB,OAAO,CAAC,mBAAmB,CAAC,QAAQ,CAAC,CAAC,CA0BxC"}
+{"version":3,"file":"serveTargetResolver.d.ts","sourceRoot":"","sources":["../../../src/commands/shared/serveTargetResolver.ts"],"names":[],"mappings":"AAAA,OAAO,EAAkB,KAAK,eAAe,EAAE,MAAM,qCAAqC,CAAC;AAE3F,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,mCAAmC,CAAC;AACvE,OAAO,EACL,KAAK,sBAAsB,EAE3B,8BAA8B,EAC/B,MAAM,6DAA6D,CAAC;AACrE,OAAO,EAIL,kBAAkB,EAEnB,MAAM,oDAAoD,CAAC;AAC5D,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,uBAAuB,CAAC;AAG3D,MAAM,WAAW,4BAA6B,SAAQ,aAAa,EAAE,eAAe;IAClF,GAAG,CAAC,EAAE,MAAM,CAAC;IACb,OAAO,CAAC,EAAE,MAAM,CAAC;CAClB;AAED,MAAM,WAAW,mBAAmB,CAAC,QAAQ,SAAS,4BAA4B;IAChF,GAAG,EAAE,MAAM,CAAC;IACZ,WAAW,EAAE,MAAM,CAAC;IACpB,WAAW,EAAE,MAAM,CAAC;IACpB,aAAa,EAAE,aAAa,GAAG,IAAI,CAAC;IACpC,aAAa,EAAE,QAAQ,CAAC;IACxB,aAAa,EAAE,MAAM,CAAC;IACtB,SAAS,EAAE,GAAG,CAAC;IACf,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,MAAM,EAAE,MAAM,GAAG,SAAS,GAAG,UAAU,CAAC;IACxC,oBAAoB,EAAE,gBAAgB,GAAG,WAAW,GAAG,KAAK,CAAC;IAC7D,oBAAoB,CAAC,EAAE;QACrB,IAAI,EAAE,MAAM,CAAC;QACb,IAAI,EAAE,OAAO,GAAG,QAAQ,CAAC;QACzB,cAAc,CAAC,EAAE,MAAM,CAAC;KACzB,CAAC;IACF,uBAAuB,CAAC,EAAE,sBAAsB,EAAE,CAAC;CACpD;AAED,MAAM,WAAW,wBAAwB;IACvC,kBAAkB,CAAC,EAAE,IAAI,CACvB,kBAAkB,EAClB,SAAS,GAAG,SAAS,GAAG,gCAAgC,GAAG,gCAAgC,CAC5F,GACC,OAAO,CAAC,IAAI,CAAC,kBAAkB,EAAE,sBAAsB,CAAC,CAAC,CAAC;IAC5D,qBAAqB,CAAC,EAAE,OAAO,8BAA8B,CAAC;CAC/D;AAED,wBAAgB,uBAAuB,CAAC,QAAQ,SAAS,4BAA4B,EACnF,OAAO,EAAE,QAAQ,EACjB,aAAa,EAAE,aAAa,GAAG,IAAI,GAClC,QAAQ,CAgBV;AAsCD,wBAAsB,kBAAkB,CAAC,QAAQ,SAAS,4BAA4B,EACpF,OAAO,EAAE,QAAQ,EACjB,KAAK,GAAE,wBAA6B,GACnC,OAAO,CAAC,mBAAmB,CAAC,QAAQ,CAAC,CAAC,CA+FxC"}

package/build/commands/shared/serveTargetResolver.js

@@ -1,5 +1,7 @@
 import { buildServerUrl } from '../../commands/shared/serveClient.js';
 import { normalizeTags, resolveProjectContext } from '../../config/projectConfigLoader.js';
+import { verifyRuntimeIdentityForTarget, } from '../../domains/runtime-targets/runtimeIdentityVerification.js';
+import { assertRuntimeTargetConfigDirAllowed, normalizeRuntimeTargetUrl, RuntimeTargetStore, RuntimeTargetStoreError, } from '../../domains/runtime-targets/runtimeTargetStore.js';
 import { discoverServerWithPidFile, validateServer1mcpUrl } from '../../utils/validation/urlDetection.js';
 export function mergeServeTargetOptions(options, projectConfig) {
     const explicitSelectorInput = collectFilterInput(options);
@@ -48,14 +50,71 @@ function selectOneFilterInput(options) {
     }
     return { hasAnySelector, tags: collected.tags };
 }
-export async function resolveServeTarget(options) {
+export async function resolveServeTarget(options, ports = {}) {
+    if (options.url && options.context) {
+        throw new RuntimeTargetStoreError('target_selector_conflict', 'Use either --url or --context, not both, when selecting a runtime target');
+    }
     const resolvedProjectContext = await resolveProjectContext();
-    const mergedOptions = mergeServeTargetOptions(options, resolvedProjectContext.projectConfig);
-    const { url: discoveredUrl, pid: serverPid, source, } = await discoverServerWithPidFile(mergedOptions['config-dir'], mergedOptions.url);
+    const normalizedOptions = normalizeEphemeralUrlOption(options);
+    const mergedOptions = mergeServeTargetOptions(normalizedOptions, resolvedProjectContext.projectConfig);
+    const remoteTarget = await resolveRemoteRuntimeTargetContext(mergedOptions, ports);
+    if (remoteTarget) {
+        const discoveredUrl = withMcpSuffix(remoteTarget.url);
+        const tlsOptions = targetTlsOptions({
+            caFile: remoteTarget.caFile,
+            insecureSkipVerify: remoteTarget.insecureSkipVerify,
+        });
+        const validation = tlsOptions
+            ? await validateServer1mcpUrl(discoveredUrl, tlsOptions)
+            : await validateServer1mcpUrl(discoveredUrl);
+        if (!validation.valid) {
+            throw new Error(validation.error || 'Cannot connect to the running 1MCP server.');
+        }
+        return {
+            cwd: resolvedProjectContext.cwd,
+            projectRoot: resolvedProjectContext.projectRoot,
+            projectName: resolvedProjectContext.projectName,
+            projectConfig: resolvedProjectContext.projectConfig,
+            mergedOptions,
+            discoveredUrl,
+            serverUrl: buildServerUrl(discoveredUrl, mergedOptions),
+            source: 'user',
+            projectContextSource: resolvedProjectContext.source,
+            runtimeTargetContext: {
+                name: remoteTarget.name,
+                kind: 'remote',
+                runtimeScopeId: remoteTarget.observedIdentity?.runtimeScopeId,
+            },
+            runtimeIdentityWarnings: remoteTarget.runtimeIdentityWarnings,
+        };
+    }
+    const localDiscovery = mergedOptions.context === 'local'
+        ? await discoverServerWithPidFile(mergedOptions['config-dir'], mergedOptions.url, {
+            failOnOwnedRuntimeUnavailable: true,
+        })
+        : await discoverServerWithPidFile(mergedOptions['config-dir'], mergedOptions.url);
+    const { url: discoveredUrl, pid: serverPid, source } = localDiscovery;
     const validation = await validateServer1mcpUrl(discoveredUrl);
     if (!validation.valid) {
         throw new Error(validation.error || 'Cannot connect to the running 1MCP server.');
     }
+    let localRuntimeIdentity;
+    if (!mergedOptions.url && mergedOptions.context === 'local') {
+        try {
+            localRuntimeIdentity = await (ports.verifyRuntimeIdentity ?? verifyRuntimeIdentityForTarget)({
+                target: {
+                    name: 'local',
+                    url: withoutMcpSuffix(discoveredUrl),
+                    observedIdentity: undefined,
+                },
+            });
+        }
+        catch (error) {
+            if (mergedOptions.context === 'local') {
+                throw error;
+            }
+        }
+    }
     return {
         cwd: resolvedProjectContext.cwd,
         projectRoot: resolvedProjectContext.projectRoot,
@@ -67,6 +126,89 @@ export async function resolveServeTarget(options) {
         serverPid,
         source,
         projectContextSource: resolvedProjectContext.source,
+        runtimeTargetContext: localRuntimeIdentity
+            ? {
+                name: 'local',
+                kind: 'local',
+                runtimeScopeId: localRuntimeIdentity.identity.runtimeScopeId,
+            }
+            : undefined,
+        runtimeIdentityWarnings: localRuntimeIdentity?.warnings,
+    };
+}
+async function resolveRemoteRuntimeTargetContext(options, ports) {
+    if (options.url) {
+        return null;
+    }
+    const store = ports.runtimeTargetStore ?? new RuntimeTargetStore();
+    const target = store.resolveForConnection
+        ? store.resolveForConnection(options.context)
+        : options.context
+            ? store.inspect(options.context)
+            : store.current();
+    if (target.name === 'local') {
+        return null;
+    }
+    assertRuntimeTargetConfigDirAllowed({
+        command: 'verify',
+        targetName: target.name,
+        configDir: options['config-dir'],
+    });
+    if (target.kind !== 'remote' || !target.url) {
+        throw new RuntimeTargetStoreError('target_not_found', `Runtime target "${target.name}" was not found`);
+    }
+    store.requireInsecureTlsConfirmation({
+        name: target.name,
+        operation: 'credentialed-attach',
+    });
+    const remoteTarget = { ...target, url: target.url };
+    const verifyRuntimeIdentity = ports.verifyRuntimeIdentity ?? verifyRuntimeIdentityForTarget;
+    const verification = await verifyRuntimeIdentity({
+        target: {
+            name: remoteTarget.name,
+            url: remoteTarget.url,
+            caFile: remoteTarget.caFile,
+            insecureSkipVerify: remoteTarget.insecureSkipVerify,
+            observedIdentity: remoteTarget.observedIdentity,
+        },
+    });
+    store.updateObservedIdentityMetadata(remoteTarget.name, verification.identity);
+    return {
+        ...remoteTarget,
+        observedIdentity: verification.identity,
+        runtimeIdentityWarnings: verification.warnings,
+    };
+}
+function withMcpSuffix(url) {
+    const parsed = new URL(url);
+    parsed.search = '';
+    parsed.hash = '';
+    const normalized = parsed.toString().replace(/\/$/, '');
+    return normalized.endsWith('/mcp') ? normalized : `${normalized}/mcp`;
+}
+function withoutMcpSuffix(url) {
+    const parsed = new URL(url);
+    parsed.search = '';
+    parsed.hash = '';
+    const normalized = parsed.toString().replace(/\/$/, '');
+    return normalized.endsWith('/mcp') ? normalized.slice(0, -4) : normalized;
+}
+function targetTlsOptions(tls) {
+    return tls.caFile || tls.insecureSkipVerify
+        ? {
+            ...(tls.caFile ? { caFile: tls.caFile } : {}),
+            ...(tls.insecureSkipVerify ? { insecureSkipVerify: true } : {}),
+        }
+        : undefined;
+}
+function normalizeEphemeralUrlOption(options) {
+    if (!options.url) {
+        return options;
+    }
+    const normalizedUrl = normalizeRuntimeTargetUrl(options.url);
+    return {
+        ...options,
+        url: withMcpSuffix(normalizedUrl),
     };
 }
 //# sourceMappingURL=serveTargetResolver.js.map