@geminilight/mindos 1.1.51 → 1.1.52

package/dist/protocols/acp/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/protocols/acp/index.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,aAAa,EACb,iBAAiB,EACjB,gBAAgB,EAChB,mBAAmB,EACnB,wBAAwB,EACxB,wBAAwB,EACxB,uBAAuB,EACvB,6BAA6B,EAC7B,mBAAmB,EACnB,sBAAsB,EACtB,8BAA8B,EAC9B,mBAAmB,EACnB,YAAY,GACb,MAAM,wBAAwB,CAAC;AAChC,OAAO,EACL,kBAAkB,EAClB,gBAAgB,EAChB,YAAY,EACZ,YAAY,GACb,MAAM,eAAe,CAAC;AACvB,OAAO,EACL,oBAAoB,EACpB,UAAU,EACV,iBAAiB,EACjB,kBAAkB,EAClB,4BAA4B,EAC5B,sBAAsB,EACtB,wBAAwB,EACxB,0BAA0B,GAC3B,MAAM,mBAAmB,CAAC;AAC3B,OAAO,EACL,kBAAkB,EAClB,UAAU,EACV,SAAS,EACT,aAAa,EACb,aAAa,EACb,eAAe,GAChB,MAAM,iBAAiB,CAAC;AACzB,OAAO,EACL,YAAY,EACZ,gBAAgB,EAChB,YAAY,EACZ,aAAa,EACb,sBAAsB,EACtB,iBAAiB,EACjB,yBAAyB,EACzB,UAAU,EACV,kBAAkB,EAClB,YAAY,EACZ,WAAW,EACX,MAAM,EACN,YAAY,EACZ,eAAe,EACf,OAAO,GACR,MAAM,cAAc,CAAC;AACtB,OAAO,EAAE,UAAU,EAAE,MAAM,YAAY,CAAC"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/protocols/acp/index.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,aAAa,EACb,iBAAiB,EACjB,gBAAgB,EAChB,mBAAmB,EACnB,wBAAwB,EACxB,wBAAwB,EACxB,uBAAuB,EACvB,6BAA6B,EAC7B,mBAAmB,EACnB,sBAAsB,EACtB,8BAA8B,EAC9B,mBAAmB,EACnB,YAAY,GACb,MAAM,wBAAwB,CAAC;AAChC,OAAO,EACL,kBAAkB,EAClB,gBAAgB,EAChB,YAAY,EACZ,YAAY,GACb,MAAM,eAAe,CAAC;AACvB,OAAO,EACL,oBAAoB,EACpB,UAAU,EACV,iBAAiB,EACjB,kBAAkB,EAClB,4BAA4B,EAC5B,sBAAsB,EACtB,wBAAwB,EACxB,0BAA0B,GAC3B,MAAM,mBAAmB,CAAC;AAC3B,OAAO,EACL,kBAAkB,EAClB,UAAU,EACV,SAAS,EACT,aAAa,EACb,aAAa,EACb,eAAe,GAChB,MAAM,iBAAiB,CAAC;AACzB,OAAO,EACL,iCAAiC,EACjC,2BAA2B,GAC5B,MAAM,8BAA8B,CAAC;AACtC,OAAO,EACL,YAAY,EACZ,gBAAgB,EAChB,YAAY,EACZ,aAAa,EACb,sBAAsB,EACtB,iBAAiB,EACjB,yBAAyB,EACzB,UAAU,EACV,kBAAkB,EAClB,YAAY,EACZ,WAAW,EACX,MAAM,EACN,YAAY,EACZ,eAAe,EACf,OAAO,GACR,MAAM,cAAc,CAAC;AACtB,OAAO,EAAE,UAAU,EAAE,MAAM,YAAY,CAAC"}

package/dist/protocols/acp/mcp-session-inheritance.d.ts

@@ -0,0 +1,49 @@
+import type { McpCapabilities, McpServer } from '@agentclientprotocol/sdk';
+import type { AcpSessionMcpServerSummary } from './types.js';
+export type AcpSessionMcpAccess = boolean | string[] | {
+    enabled?: boolean;
+    tools?: true | string[];
+    directTools?: true | string[];
+};
+export type AcpSessionMcpConfigEntry = {
+    command?: unknown;
+    args?: unknown;
+    env?: unknown;
+    url?: unknown;
+    headers?: unknown;
+    type?: unknown;
+    transport?: unknown;
+    mindosAgent?: AcpSessionMcpAccess;
+    agentSession?: AcpSessionMcpAccess;
+    agentSessions?: AcpSessionMcpAccess;
+    acpSession?: AcpSessionMcpAccess;
+    acpSessions?: AcpSessionMcpAccess;
+    mindos?: Record<string, unknown>;
+    [key: string]: unknown;
+};
+export type AcpSessionMcpConfigLike = {
+    mcpServers?: Record<string, AcpSessionMcpConfigEntry>;
+    'mcp-servers'?: Record<string, AcpSessionMcpConfigEntry>;
+    settings?: Record<string, unknown>;
+};
+export type AcpSessionMcpInheritancePlan = {
+    servers: McpServer[];
+    summaries: AcpSessionMcpServerSummary[];
+    skipped: Array<{
+        name: string;
+        reason: string;
+    }>;
+};
+export declare function buildAcpSessionMcpInheritancePlan(input: {
+    config?: AcpSessionMcpConfigLike | null;
+    agentCapabilities?: {
+        mcpCapabilities?: McpCapabilities;
+    } | null;
+}): AcpSessionMcpInheritancePlan;
+export declare function resolveAcpSessionMcpServers(input: {
+    config?: AcpSessionMcpConfigLike | null;
+    agentCapabilities?: {
+        mcpCapabilities?: McpCapabilities;
+    } | null;
+}): McpServer[];
+//# sourceMappingURL=mcp-session-inheritance.d.ts.map

package/dist/protocols/acp/mcp-session-inheritance.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"mcp-session-inheritance.d.ts","sourceRoot":"","sources":["../../../src/protocols/acp/mcp-session-inheritance.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,eAAe,EAAE,SAAS,EAAE,MAAM,0BAA0B,CAAC;AAC3E,OAAO,KAAK,EAAE,0BAA0B,EAAE,MAAM,YAAY,CAAC;AAE7D,MAAM,MAAM,mBAAmB,GAC3B,OAAO,GACP,MAAM,EAAE,GACR;IACA,OAAO,CAAC,EAAE,OAAO,CAAC;IAClB,KAAK,CAAC,EAAE,IAAI,GAAG,MAAM,EAAE,CAAC;IACxB,WAAW,CAAC,EAAE,IAAI,GAAG,MAAM,EAAE,CAAC;CAC/B,CAAC;AAEJ,MAAM,MAAM,wBAAwB,GAAG;IACrC,OAAO,CAAC,EAAE,OAAO,CAAC;IAClB,IAAI,CAAC,EAAE,OAAO,CAAC;IACf,GAAG,CAAC,EAAE,OAAO,CAAC;IACd,GAAG,CAAC,EAAE,OAAO,CAAC;IACd,OAAO,CAAC,EAAE,OAAO,CAAC;IAClB,IAAI,CAAC,EAAE,OAAO,CAAC;IACf,SAAS,CAAC,EAAE,OAAO,CAAC;IACpB,WAAW,CAAC,EAAE,mBAAmB,CAAC;IAClC,YAAY,CAAC,EAAE,mBAAmB,CAAC;IACnC,aAAa,CAAC,EAAE,mBAAmB,CAAC;IACpC,UAAU,CAAC,EAAE,mBAAmB,CAAC;IACjC,WAAW,CAAC,EAAE,mBAAmB,CAAC;IAClC,MAAM,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;IACjC,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAAC;CACxB,CAAC;AAEF,MAAM,MAAM,uBAAuB,GAAG;IACpC,UAAU,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,wBAAwB,CAAC,CAAC;IACtD,aAAa,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,wBAAwB,CAAC,CAAC;IACzD,QAAQ,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;CACpC,CAAC;AAEF,MAAM,MAAM,4BAA4B,GAAG;IACzC,OAAO,EAAE,SAAS,EAAE,CAAC;IACrB,SAAS,EAAE,0BAA0B,EAAE,CAAC;IACxC,OAAO,EAAE,KAAK,CAAC;QAAE,IAAI,EAAE,MAAM,CAAC;QAAC,MAAM,EAAE,MAAM,CAAA;KAAE,CAAC,CAAC;CAClD,CAAC;AAEF,wBAAgB,iCAAiC,CAAC,KAAK,EAAE;IACvD,MAAM,CAAC,EAAE,uBAAuB,GAAG,IAAI,CAAC;IACxC,iBAAiB,CAAC,EAAE;QAAE,eAAe,CAAC,EAAE,eAAe,CAAA;KAAE,GAAG,IAAI,CAAC;CAClE,GAAG,4BAA4B,CA2B/B;AAED,wBAAgB,2BAA2B,CAAC,KAAK,EAAE;IACjD,MAAM,CAAC,EAAE,uBAAuB,GAAG,IAAI,CAAC;IACxC,iBAAiB,CAAC,EAAE;QAAE,eAAe,CAAC,EAAE,eAAe,CAAA;KAAE,GAAG,IAAI,CAAC;CAClE,GAAG,SAAS,EAAE,CAEd"}

package/dist/protocols/acp/mcp-session-inheritance.js

@@ -0,0 +1,162 @@
+export function buildAcpSessionMcpInheritancePlan(input) {
+    const config = normalizeMcpConfig(input.config);
+    const capabilities = input.agentCapabilities?.mcpCapabilities;
+    const servers = [];
+    const summaries = [];
+    const skipped = [];
+    for (const [name, entry] of Object.entries(config.mcpServers).sort(([left], [right]) => left.localeCompare(right))) {
+        if (isUnsafeName(name)) {
+            skipped.push({ name, reason: 'unsafe-name' });
+            continue;
+        }
+        const access = resolveAgentSessionAccess(name, entry, config);
+        if (access !== true) {
+            skipped.push({ name, reason: access ? 'tool-subset-not-injectable' : 'not-allowlisted' });
+            continue;
+        }
+        const server = toAcpMcpServer(name, entry, capabilities);
+        if (!server) {
+            skipped.push({ name, reason: 'unsupported-transport' });
+            continue;
+        }
+        servers.push(server);
+        summaries.push({ name, type: mcpServerType(server) });
+    }
+    return { servers, summaries, skipped };
+}
+export function resolveAcpSessionMcpServers(input) {
+    return buildAcpSessionMcpInheritancePlan(input).servers;
+}
+function normalizeMcpConfig(config) {
+    if (!config || typeof config !== 'object')
+        return { mcpServers: {} };
+    const mcpServers = readRecord(config.mcpServers) ?? readRecord(config['mcp-servers']) ?? {};
+    return {
+        mcpServers: Object.fromEntries(Object.entries(mcpServers)
+            .filter(([, entry]) => !!entry && typeof entry === 'object' && !Array.isArray(entry))),
+        ...(readRecord(config.settings) ? { settings: readRecord(config.settings) } : {}),
+    };
+}
+function resolveAgentSessionAccess(name, entry, config) {
+    const settings = config.settings;
+    const agentSessions = readRecord(settings?.agentSessions);
+    const acpSessions = readRecord(settings?.acpSessions);
+    const mindosAgent = readRecord(settings?.mindosAgent);
+    const mindos = readRecord(entry.mindos);
+    return normalizeAccess(readRecord(agentSessions?.mcpServers)?.[name])
+        ?? normalizeAccess(readRecord(acpSessions?.mcpServers)?.[name])
+        ?? normalizeAccess(readRecord(mindosAgent?.mcpServers)?.[name])
+        ?? normalizeAccess(entry.agentSessions)
+        ?? normalizeAccess(entry.agentSession)
+        ?? normalizeAccess(entry.acpSessions)
+        ?? normalizeAccess(entry.acpSession)
+        ?? normalizeAccess(entry.mindosAgent)
+        ?? normalizeAccess(mindos?.agentSessions)
+        ?? normalizeAccess(mindos?.agent)
+        ?? null;
+}
+function normalizeAccess(access) {
+    if (access === true)
+        return true;
+    if (access === false || access === undefined || access === null)
+        return null;
+    if (Array.isArray(access))
+        return normalizeToolNames(access);
+    if (!access || typeof access !== 'object')
+        return null;
+    const record = access;
+    if (record.enabled === false)
+        return null;
+    if (record.tools === true || record.directTools === true || record.enabled === true)
+        return true;
+    if (Array.isArray(record.tools))
+        return normalizeToolNames(record.tools);
+    if (Array.isArray(record.directTools))
+        return normalizeToolNames(record.directTools);
+    return null;
+}
+function normalizeToolNames(value) {
+    const tools = Array.from(new Set(value.map((item) => (typeof item === 'string' ? item.trim() : '')).filter(Boolean)));
+    return tools.length > 0 ? tools : null;
+}
+function toAcpMcpServer(name, entry, capabilities) {
+    const url = typeof entry.url === 'string' ? entry.url.trim() : '';
+    if (url) {
+        const transport = normalizeTransport(entry.type) ?? normalizeTransport(entry.transport) ?? 'http';
+        if (transport === 'sse') {
+            if (capabilities?.sse !== true)
+                return null;
+            return { type: 'sse', name, url, headers: normalizeHeaders(entry.headers) };
+        }
+        if (transport === 'http') {
+            if (capabilities?.http !== true)
+                return null;
+            return { type: 'http', name, url, headers: normalizeHeaders(entry.headers) };
+        }
+        return null;
+    }
+    const command = typeof entry.command === 'string' ? entry.command.trim() : '';
+    if (!command)
+        return null;
+    return {
+        name,
+        command,
+        args: normalizeStringArray(entry.args),
+        env: normalizeEnv(entry.env),
+    };
+}
+function normalizeTransport(value) {
+    if (typeof value !== 'string')
+        return null;
+    const normalized = value.trim().toLowerCase();
+    if (normalized === 'http' || normalized === 'streamable-http')
+        return 'http';
+    if (normalized === 'sse')
+        return 'sse';
+    if (normalized === 'stdio')
+        return 'stdio';
+    return null;
+}
+function normalizeHeaders(value) {
+    if (Array.isArray(value)) {
+        return value.flatMap((item) => {
+            if (!item || typeof item !== 'object' || Array.isArray(item))
+                return [];
+            const record = item;
+            const name = typeof record.name === 'string' ? record.name.trim() : '';
+            const headerValue = typeof record.value === 'string' ? record.value : '';
+            return name ? [{ name, value: headerValue }] : [];
+        });
+    }
+    const record = readRecord(value);
+    if (!record)
+        return [];
+    return Object.entries(record).flatMap(([name, headerValue]) => (typeof headerValue === 'string' ? [{ name, value: headerValue }] : []));
+}
+function normalizeEnv(value) {
+    const record = readRecord(value);
+    if (!record)
+        return [];
+    return Object.entries(record).flatMap(([name, envValue]) => (typeof envValue === 'string' ? [{ name, value: envValue }] : []));
+}
+function normalizeStringArray(value) {
+    return Array.isArray(value)
+        ? value.filter((item) => typeof item === 'string')
+        : [];
+}
+function mcpServerType(server) {
+    if ('type' in server && server.type === 'http')
+        return 'http';
+    if ('type' in server && server.type === 'sse')
+        return 'sse';
+    return 'stdio';
+}
+function readRecord(value) {
+    return value && typeof value === 'object' && !Array.isArray(value)
+        ? value
+        : undefined;
+}
+function isUnsafeName(name) {
+    return !name.trim() || name === '__proto__' || name === 'prototype' || name === 'constructor';
+}
+//# sourceMappingURL=mcp-session-inheritance.js.map

package/dist/protocols/acp/mcp-session-inheritance.js.map

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

package/dist/protocols/acp/session.d.ts

@@ -3,10 +3,15 @@
  * Uses @agentclientprotocol/sdk for all protocol handling.
  * Implements: initialize → session/new → session/prompt → session/cancel → close.
  */
+import type { McpServer } from '@agentclientprotocol/sdk';
 import type { AcpSession, AcpSessionUpdate, AcpPromptResponse, AcpRegistryEntry, AcpConfigOption, AcpSessionInfo, AcpSessionSnapshot } from './types.js';
 import { type AcpLaunchOptions } from './subprocess.js';
+import { type AcpSessionMcpConfigLike } from './mcp-session-inheritance.js';
 export interface AcpSessionOptions extends AcpLaunchOptions {
     clientVersion?: string;
+    inheritMcpServers?: boolean;
+    mcpConfig?: AcpSessionMcpConfigLike | null;
+    mcpServers?: McpServer[];
 }
 /**
  * Create a new ACP session by spawning an agent process.

package/dist/protocols/acp/session.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"session.d.ts","sourceRoot":"","sources":["../../../src/protocols/acp/session.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAOH,OAAO,KAAK,EACV,UAAU,EAEV,gBAAgB,EAChB,iBAAiB,EACjB,gBAAgB,EAGhB,eAAe,EACf,cAAc,EAMd,kBAAkB,EAEnB,MAAM,YAAY,CAAC;AACpB,OAAO,EAIL,KAAK,gBAAgB,EAGtB,MAAM,iBAAiB,CAAC;AAIzB,MAAM,WAAW,iBAAkB,SAAQ,gBAAgB;IACzD,aAAa,CAAC,EAAE,MAAM,CAAC;CACxB;AAyED;;GAEG;AACH,wBAAsB,aAAa,CACjC,OAAO,EAAE,MAAM,EACf,OAAO,CAAC,EAAE,iBAAiB,GAC1B,OAAO,CAAC,UAAU,CAAC,CAOrB;AAED;;GAEG;AACH,wBAAsB,sBAAsB,CAC1C,KAAK,EAAE,gBAAgB,EACvB,OAAO,CAAC,EAAE,iBAAiB,GAC1B,OAAO,CAAC,UAAU,CAAC,CAmFrB;AAED;;GAEG;AACH,wBAAsB,WAAW,CAC/B,OAAO,EAAE,MAAM,EACf,iBAAiB,EAAE,MAAM,EACzB,OAAO,CAAC,EAAE,iBAAiB,GAC1B,OAAO,CAAC,UAAU,CAAC,CAmErB;AAED;;GAEG;AACH,wBAAsB,YAAY,CAChC,SAAS,EAAE,MAAM,EACjB,OAAO,CAAC,EAAE;IAAE,MAAM,CAAC,EAAE,MAAM,CAAC;IAAC,GAAG,CAAC,EAAE,MAAM,CAAA;CAAE,GAC1C,OAAO,CAAC;IAAE,QAAQ,EAAE,cAAc,EAAE,CAAC;IAAC,UAAU,CAAC,EAAE,MAAM,CAAA;CAAE,CAAC,CAqB9D;AAMD;;;GAGG;AACH,wBAAsB,MAAM,CAC1B,SAAS,EAAE,MAAM,EACjB,IAAI,EAAE,MAAM,GACX,OAAO,CAAC,iBAAiB,CAAC,CAkD5B;AAED;;GAEG;AACH,wBAAsB,YAAY,CAChC,SAAS,EAAE,MAAM,EACjB,IAAI,EAAE,MAAM,EACZ,QAAQ,EAAE,CAAC,MAAM,EAAE,gBAAgB,KAAK,IAAI,GAC3C,OAAO,CAAC,iBAAiB,CAAC,CAyD5B;AAID,wBAAsB,YAAY,CAAC,SAAS,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAWnE;AAED,wBAAsB,OAAO,CAAC,SAAS,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAM9E;AAED,wBAAsB,eAAe,CACnC,SAAS,EAAE,MAAM,EACjB,QAAQ,EAAE,MAAM,EAChB,KAAK,EAAE,MAAM,GACZ,OAAO,CAAC,eAAe,EAAE,CAAC,CAiB5B;AAED,wBAAsB,YAAY,CAAC,SAAS,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAgBnE;AAID,wBAAgB,UAAU,CAAC,SAAS,EAAE,MAAM,GAAG,UAAU,GAAG,SAAS,CAEpE;AAED,wBAAgB,iBAAiB,IAAI,UAAU,EAAE,CAGhD;AAED,wBAAgB,kBAAkB,CAAC,SAAS,EAAE,MAAM,GAAG,kBAAkB,GAAG,SAAS,CAGpF;AAED,wBAAgB,yBAAyB,IAAI,kBAAkB,EAAE,CAGhE;AAED,wBAAsB,gBAAgB,IAAI,OAAO,CAAC,IAAI,CAAC,CAGtD;AAsBD,wBAAgB,uBAAuB,CAAC,OAAO,EAAE,UAAU,GAAG,kBAAkB,CA+B/E"}
+{"version":3,"file":"session.d.ts","sourceRoot":"","sources":["../../../src/protocols/acp/session.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH,OAAO,KAAK,EAEV,SAAS,EAGV,MAAM,0BAA0B,CAAC;AAClC,OAAO,KAAK,EACV,UAAU,EAEV,gBAAgB,EAChB,iBAAiB,EACjB,gBAAgB,EAGhB,eAAe,EACf,cAAc,EAMd,kBAAkB,EAGnB,MAAM,YAAY,CAAC;AACpB,OAAO,EAIL,KAAK,gBAAgB,EAGtB,MAAM,iBAAiB,CAAC;AAGzB,OAAO,EAEL,KAAK,uBAAuB,EAC7B,MAAM,8BAA8B,CAAC;AAItC,MAAM,WAAW,iBAAkB,SAAQ,gBAAgB;IACzD,aAAa,CAAC,EAAE,MAAM,CAAC;IACvB,iBAAiB,CAAC,EAAE,OAAO,CAAC;IAC5B,SAAS,CAAC,EAAE,uBAAuB,GAAG,IAAI,CAAC;IAC3C,UAAU,CAAC,EAAE,SAAS,EAAE,CAAC;CAC1B;AAuGD;;GAEG;AACH,wBAAsB,aAAa,CACjC,OAAO,EAAE,MAAM,EACf,OAAO,CAAC,EAAE,iBAAiB,GAC1B,OAAO,CAAC,UAAU,CAAC,CAOrB;AAED;;GAEG;AACH,wBAAsB,sBAAsB,CAC1C,KAAK,EAAE,gBAAgB,EACvB,OAAO,CAAC,EAAE,iBAAiB,GAC1B,OAAO,CAAC,UAAU,CAAC,CAqFrB;AAED;;GAEG;AACH,wBAAsB,WAAW,CAC/B,OAAO,EAAE,MAAM,EACf,iBAAiB,EAAE,MAAM,EACzB,OAAO,CAAC,EAAE,iBAAiB,GAC1B,OAAO,CAAC,UAAU,CAAC,CAqErB;AAED;;GAEG;AACH,wBAAsB,YAAY,CAChC,SAAS,EAAE,MAAM,EACjB,OAAO,CAAC,EAAE;IAAE,MAAM,CAAC,EAAE,MAAM,CAAC;IAAC,GAAG,CAAC,EAAE,MAAM,CAAA;CAAE,GAC1C,OAAO,CAAC;IAAE,QAAQ,EAAE,cAAc,EAAE,CAAC;IAAC,UAAU,CAAC,EAAE,MAAM,CAAA;CAAE,CAAC,CAqB9D;AASD;;;GAGG;AACH,wBAAsB,MAAM,CAC1B,SAAS,EAAE,MAAM,EACjB,IAAI,EAAE,MAAM,GACX,OAAO,CAAC,iBAAiB,CAAC,CAkD5B;AAED;;GAEG;AACH,wBAAsB,YAAY,CAChC,SAAS,EAAE,MAAM,EACjB,IAAI,EAAE,MAAM,EACZ,QAAQ,EAAE,CAAC,MAAM,EAAE,gBAAgB,KAAK,IAAI,GAC3C,OAAO,CAAC,iBAAiB,CAAC,CAyD5B;AAID,wBAAsB,YAAY,CAAC,SAAS,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAWnE;AAED,wBAAsB,OAAO,CAAC,SAAS,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAM9E;AAED,wBAAsB,eAAe,CACnC,SAAS,EAAE,MAAM,EACjB,QAAQ,EAAE,MAAM,EAChB,KAAK,EAAE,MAAM,GACZ,OAAO,CAAC,eAAe,EAAE,CAAC,CAiB5B;AAED,wBAAsB,YAAY,CAAC,SAAS,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAgBnE;AAID,wBAAgB,UAAU,CAAC,SAAS,EAAE,MAAM,GAAG,UAAU,GAAG,SAAS,CAEpE;AAED,wBAAgB,iBAAiB,IAAI,UAAU,EAAE,CAGhD;AAED,wBAAgB,kBAAkB,CAAC,SAAS,EAAE,MAAM,GAAG,kBAAkB,GAAG,SAAS,CAGpF;AAED,wBAAgB,yBAAyB,IAAI,kBAAkB,EAAE,CAGhE;AAED,wBAAsB,gBAAgB,IAAI,OAAO,CAAC,IAAI,CAAC,CAGtD;AAsBD,wBAAgB,uBAAuB,CAAC,OAAO,EAAE,UAAU,GAAG,kBAAkB,CAgC/E"}

package/dist/protocols/acp/session.js

@@ -6,6 +6,9 @@
 import { spawnAndConnect, killAgent, } from './subprocess.js';
 import { findAcpAgent } from './registry.js';
 import { resolveConfiguredAcpAgentEntry } from './agent-descriptors.js';
+import { buildAcpSessionMcpInheritancePlan, } from './mcp-session-inheritance.js';
+import { recordArtifactsFromAcpToolCall } from '../../agent/ledger/artifact-ledger.js';
+import { redactSensitiveText } from '../../agent/redaction.js';
 function withTimeout(promise, timeoutMs, message) {
     return new Promise((resolve, reject) => {
         const timer = setTimeout(() => reject(new Error(message)), timeoutMs);
@@ -53,6 +56,32 @@ function clientCapabilitiesForPermissionMode(mode) {
         terminal: !readonly,
     };
 }
+function resolveSessionMcpInheritance(options, agentCapabilities) {
+    if (options?.mcpServers) {
+        return {
+            servers: options.mcpServers,
+            summaries: options.mcpServers.map((server) => ({
+                name: server.name,
+                type: 'type' in server && server.type === 'http'
+                    ? 'http'
+                    : 'type' in server && server.type === 'sse'
+                        ? 'sse'
+                        : 'stdio',
+            })),
+        };
+    }
+    if (options?.inheritMcpServers === false || !options?.mcpConfig) {
+        return { servers: [], summaries: [] };
+    }
+    const plan = buildAcpSessionMcpInheritancePlan({
+        config: options.mcpConfig,
+        agentCapabilities,
+    });
+    return {
+        servers: plan.servers,
+        summaries: plan.summaries,
+    };
+}
 /* ── State ─────────────────────────────────────────────────────────────── */
 const sessions = new Map();
 const sessionConnections = new Map();
@@ -111,10 +140,11 @@ export async function createSessionFromEntry(entry, options) {
     let configOptions;
     let currentModeId;
     let agentSessionId;
+    const mcpInheritance = resolveSessionMcpInheritance(options, agentCapabilities);
     try {
         const newResult = await conn.connection.newSession({
             cwd: sessionCwd,
-            mcpServers: [],
+            mcpServers: mcpInheritance.servers,
         });
         if (typeof newResult.sessionId === 'string') {
             agentSessionId = newResult.sessionId;
@@ -144,6 +174,7 @@ export async function createSessionFromEntry(entry, options) {
         configOptions,
         currentModeId,
         authMethods,
+        mcpServers: mcpInheritance.summaries,
     };
     sessions.set(sessionId, session);
     sessionConnections.set(sessionId, conn);
@@ -182,11 +213,12 @@ export async function loadSession(agentId, existingSessionId, options) {
     let modes;
     let configOptions;
     let currentModeId;
+    const mcpInheritance = resolveSessionMcpInheritance(options, agentCapabilities);
     try {
         const loadResult = await conn.connection.loadSession({
             sessionId: existingSessionId,
             cwd: loadCwd,
-            mcpServers: [],
+            mcpServers: mcpInheritance.servers,
         });
         modes = parseModes(loadResult.modes);
         currentModeId = parseCurrentModeId(loadResult.modes);
@@ -209,6 +241,7 @@ export async function loadSession(agentId, existingSessionId, options) {
         modes,
         configOptions,
         currentModeId,
+        mcpServers: mcpInheritance.summaries,
     };
     sessions.set(existingSessionId, session);
     sessionConnections.set(existingSessionId, conn);
@@ -238,6 +271,9 @@ export async function listSessions(sessionId, options) {
 }
 /* ── Public API — Prompt ──────────────────────────────────────────────── */
 const PROMPT_TIMEOUT_MS = 5 * 60 * 1000; // 5 minutes
+const TOOL_RAW_TEXT_LIMIT = 4000;
+const INLINE_IMAGE_RESULT_LIMIT = 64 * 1024;
+const INLINE_IMAGE_PREFIX_RE = /^(?:data:image\/|iVBORw0KGgo|\/9j\/|UklGR)/;
 /**
  * Send a prompt and collect the full response.
  * Text arrives via session/update notifications (handled by SDK → Client.sessionUpdate).
@@ -458,6 +494,7 @@ export function buildAcpSessionSnapshot(session) {
         permissionEvents,
         pendingPermissions: permissionEvents.filter((event) => event.status === 'pending'),
         ...(session.sessionInfo ? { sessionInfo: session.sessionInfo } : {}),
+        mcpServers: session.mcpServers ?? [],
     };
 }
 function applySessionUpdate(session, update) {
@@ -477,6 +514,13 @@ function applySessionUpdate(session, update) {
     }
     if ((update.type === 'tool_call' || update.type === 'tool_call_update') && update.toolCall) {
         session.toolCalls = upsertToolCall(session.toolCalls, update.toolCall);
+        recordArtifactsFromAcpToolCall({
+            runtimeId: session.agentId,
+            sessionId: session.id,
+            ...(session.agentSessionId ? { externalSessionId: session.agentSessionId } : {}),
+            ...(session.cwd ? { cwd: session.cwd } : {}),
+            toolCall: update.toolCall,
+        });
         return;
     }
     if (update.type === 'session_info_update' && update.sessionInfo) {
@@ -516,13 +560,20 @@ function sdkNotificationToUpdate(sessionId, params) {
         case 'tool_call':
         case 'tool_call_update': {
             const tc = update;
+            const rawOutputPointers = extractRawOutputPointers(tc.rawOutput ?? tc.raw_output);
+            const locations = [
+                ...parseToolCallLocations(tc.locations),
+                ...rawOutputPointers.locations,
+            ];
             base.toolCall = {
                 toolCallId: String(tc.toolCallId ?? ''),
                 title: typeof tc.title === 'string' ? tc.title : undefined,
                 status: tc.status ?? 'pending',
                 kind: tc.kind,
-                rawInput: typeof tc.rawInput === 'string' ? tc.rawInput : undefined,
-                rawOutput: typeof tc.rawOutput === 'string' ? tc.rawOutput : undefined,
+                rawInput: safeToolRawText(tc.rawInput),
+                rawOutput: safeToolRawText(tc.rawOutput ?? tc.raw_output),
+                content: parseToolCallContent(tc.content),
+                ...(locations.length > 0 ? { locations } : {}),
             };
             break;
         }
@@ -557,6 +608,110 @@ function sdkNotificationToUpdate(sessionId, params) {
     }
     return base;
 }
+function safeToolRawText(value) {
+    if (typeof value !== 'string')
+        return undefined;
+    const trimmed = value.trim();
+    if (trimmed.length > INLINE_IMAGE_RESULT_LIMIT
+        && INLINE_IMAGE_PREFIX_RE.test(trimmed)) {
+        return undefined;
+    }
+    const redacted = redactSensitiveText(trimmed);
+    return redacted.length > TOOL_RAW_TEXT_LIMIT
+        ? `${redacted.slice(0, TOOL_RAW_TEXT_LIMIT)}...`
+        : redacted;
+}
+function parseToolCallLocations(value) {
+    if (!Array.isArray(value))
+        return [];
+    const locations = [];
+    const seen = new Set();
+    for (const item of value) {
+        if (!item || typeof item !== 'object' || Array.isArray(item))
+            continue;
+        const record = item;
+        const rawPath = typeof record.path === 'string'
+            ? record.path
+            : typeof record.uri === 'string' && record.uri.startsWith('file://')
+                ? record.uri.slice('file://'.length)
+                : '';
+        const path = rawPath.trim();
+        if (!path)
+            continue;
+        const line = typeof record.line === 'number' && Number.isFinite(record.line)
+            ? Math.max(1, Math.floor(record.line))
+            : undefined;
+        const key = `${path}:${line ?? ''}`;
+        if (seen.has(key))
+            continue;
+        seen.add(key);
+        locations.push({ path, ...(line ? { line } : {}) });
+        if (locations.length >= 50)
+            break;
+    }
+    return locations;
+}
+function parseToolCallContent(value) {
+    if (!Array.isArray(value))
+        return undefined;
+    const blocks = [];
+    for (const item of value) {
+        const block = parseToolCallContentBlock(item);
+        if (block)
+            blocks.push(block);
+        if (blocks.length >= 50)
+            break;
+    }
+    return blocks.length > 0 ? blocks : undefined;
+}
+function parseToolCallContentBlock(value) {
+    if (!value || typeof value !== 'object' || Array.isArray(value))
+        return null;
+    const record = value;
+    if (record.type === 'resource_link' && typeof record.uri === 'string') {
+        return {
+            type: 'resource_link',
+            uri: record.uri,
+            name: typeof record.name === 'string' && record.name.trim() ? record.name : 'resource',
+        };
+    }
+    if (record.type === 'resource') {
+        const resource = record.resource;
+        if (!resource || typeof resource !== 'object' || Array.isArray(resource))
+            return null;
+        const resourceRecord = resource;
+        if (typeof resourceRecord.uri !== 'string')
+            return null;
+        return {
+            type: 'resource',
+            resource: {
+                uri: resourceRecord.uri,
+                ...(typeof resourceRecord.text === 'string' ? { text: safeToolRawText(resourceRecord.text) ?? '' } : {}),
+            },
+        };
+    }
+    return null;
+}
+function extractRawOutputPointers(value) {
+    if (!value || typeof value !== 'object' || Array.isArray(value))
+        return { locations: [] };
+    const record = value;
+    const candidates = [
+        record.saved_path,
+        record.savedPath,
+        readNestedString(record.image, 'path'),
+        readNestedString(record.artifact, 'path'),
+    ];
+    const locations = candidates
+        .filter((candidate) => typeof candidate === 'string' && candidate.trim().length > 0)
+        .map((candidate) => ({ path: candidate.trim() }));
+    return { locations };
+}
+function readNestedString(value, key) {
+    return value && typeof value === 'object' && !Array.isArray(value) && typeof value[key] === 'string'
+        ? value[key]
+        : undefined;
+}
 /* ── Internal — Parsers ───────────────────────────────────────────────── */
 function parseAgentCapabilities(raw) {
     if (!raw || typeof raw !== 'object')