@clawmasons/mason 0.1.1 → 0.1.2

package/dist/acp/rewriter.js

@@ -0,0 +1,46 @@
+/**
+ * Extract all credential key-value pairs from matched servers' env fields.
+ *
+ * Merges all env records into a single flat record. If two servers provide
+ * the same key, the later one wins (iteration order of matched array).
+ *
+ * @param matched - The matched servers from the matcher
+ * @returns A flat record of all credential key-value pairs
+ */
+export function extractCredentials(matched) {
+    const credentials = {};
+    for (const server of matched) {
+        if (server.config.env) {
+            for (const [key, value] of Object.entries(server.config.env)) {
+                credentials[key] = value;
+            }
+        }
+    }
+    return credentials;
+}
+/**
+ * Rewrite the ACP client's mcpServers config for the agent container.
+ *
+ * Replaces all matched MCP server entries with a single `chapter` entry
+ * pointing to the chapter proxy's streamable-http endpoint. Extracts
+ * credentials from matched servers' env fields for injection into the
+ * credential-service as session overrides.
+ *
+ * @param matchResult - The result from matchServers()
+ * @param proxyUrl - The chapter proxy URL inside the Docker network (e.g., "http://proxy:3000/mcp")
+ * @param sessionToken - The session authentication token
+ * @returns The rewritten mcpServers config and extracted credentials
+ */
+export function rewriteMcpConfig(matchResult, proxyUrl, sessionToken) {
+    const extractedCredentials = extractCredentials(matchResult.matched);
+    const mcpServers = {
+        chapter: {
+            url: proxyUrl,
+            headers: {
+                Authorization: `Bearer ${sessionToken}`,
+            },
+        },
+    };
+    return { mcpServers, extractedCredentials };
+}
+//# sourceMappingURL=rewriter.js.map

package/dist/acp/rewriter.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"rewriter.js","sourceRoot":"","sources":["../../src/acp/rewriter.ts"],"names":[],"mappings":"AAYA;;;;;;;;GAQG;AACH,MAAM,UAAU,kBAAkB,CAChC,OAAwB;IAExB,MAAM,WAAW,GAA2B,EAAE,CAAC;IAC/C,KAAK,MAAM,MAAM,IAAI,OAAO,EAAE,CAAC;QAC7B,IAAI,MAAM,CAAC,MAAM,CAAC,GAAG,EAAE,CAAC;YACtB,KAAK,MAAM,CAAC,GAAG,EAAE,KAAK,CAAC,IAAI,MAAM,CAAC,OAAO,CAAC,MAAM,CAAC,MAAM,CAAC,GAAG,CAAC,EAAE,CAAC;gBAC7D,WAAW,CAAC,GAAG,CAAC,GAAG,KAAK,CAAC;YAC3B,CAAC;QACH,CAAC;IACH,CAAC;IACD,OAAO,WAAW,CAAC;AACrB,CAAC;AAED;;;;;;;;;;;;GAYG;AACH,MAAM,UAAU,gBAAgB,CAC9B,WAAwB,EACxB,QAAgB,EAChB,YAAoB;IAEpB,MAAM,oBAAoB,GAAG,kBAAkB,CAAC,WAAW,CAAC,OAAO,CAAC,CAAC;IAErE,MAAM,UAAU,GAAoC;QAClD,OAAO,EAAE;YACP,GAAG,EAAE,QAAQ;YACb,OAAO,EAAE;gBACP,aAAa,EAAE,UAAU,YAAY,EAAE;aACxC;SACF;KACF,CAAC;IAEF,OAAO,EAAE,UAAU,EAAE,oBAAoB,EAAE,CAAC;AAC9C,CAAC"}

package/dist/acp/session.d.ts

@@ -0,0 +1,202 @@
+/**
+ * ACP Session — Docker Session Orchestration for ACP
+ *
+ * Manages Docker Compose sessions for ACP mode. All services (proxy,
+ * agent) live in a single compose file so they share a Docker network.
+ * The credential service runs in-process on the host. The lifecycle is:
+ *
+ *   1. `startInfrastructure()` — `docker compose up -d` proxy
+ *   2. `startAgentProcess(cwd)` — `docker compose run` (foreground, piped stdio)
+ *      or `startAgent(cwd)` — `docker compose run -d` (legacy detached mode)
+ *   3. `stopAgent()` — stops/kills the agent container
+ *   4. `stop()` — `docker compose down` everything
+ *
+ * PRD refs: REQ-005 (Docker Session Lifecycle, ACP Session CWD Support)
+ */
+import * as child_process from "node:child_process";
+import type { ChildProcess } from "node:child_process";
+import { type RoleMount } from "../generator/mount-volumes.js";
+import type { AcpLogger } from "./logger.js";
+export interface AcpSessionConfig {
+    /** Workspace root directory */
+    projectDir: string;
+    /** Agent short name (e.g., "claude-code-agent") */
+    agent: string;
+    /** Role short name (e.g., "writer") */
+    role: string;
+    /** Internal proxy port (default: 3000) */
+    proxyPort?: number;
+    /** Session credential overrides extracted from ACP client mcpServers */
+    credentials?: Record<string, string>;
+    /** ACP client editor name (from ACP handshake, if available). */
+    acpClient?: string;
+    /** ACP command args appended to the agent entrypoint (e.g., ["--acp", "--port", "3002"]) */
+    acpCommand?: string[];
+    /** Declared credential keys for the agent (passed as AGENT_CREDENTIALS env var) */
+    credentialKeys?: string[];
+    /** Role-specific Docker build directory (e.g. {projectDir}/.mason/docker/{role-name}/) */
+    dockerBuildDir: string;
+    /** Shared Docker directory containing node_modules (e.g. {projectDir}/.mason/docker/) */
+    dockerDir: string;
+}
+export interface SessionInfo {
+    /** Unique session identifier */
+    sessionId: string;
+    /** Path to session directory */
+    sessionDir: string;
+    /** Path to generated docker-compose.yml */
+    composeFile: string;
+    /** Name of the proxy service in compose */
+    proxyServiceName: string;
+    /** Name of the agent service in compose */
+    agentServiceName: string;
+}
+export interface InfrastructureInfo {
+    /** Unique session identifier for infrastructure */
+    sessionId: string;
+    /** Path to infrastructure session directory */
+    sessionDir: string;
+    /** Path to infrastructure docker-compose.yml */
+    composeFile: string;
+    /** Name of the proxy service */
+    proxyServiceName: string;
+    /** Name of the agent service */
+    agentServiceName: string;
+    /** Generated proxy token (shared with agent sessions) */
+    proxyToken: string;
+    /** Generated credential proxy token (shared with agent sessions) */
+    credentialProxyToken: string;
+    /** Role-specific Docker build directory */
+    dockerBuildDir: string;
+}
+export interface AgentSessionInfo {
+    /** Unique agent session identifier */
+    sessionId: string;
+    /** Path to agent session directory (same compose file as infra) */
+    sessionDir: string;
+    /** Path to the shared docker-compose.yml */
+    composeFile: string;
+    /** Name of the agent service */
+    agentServiceName: string;
+    /** The project directory mounted into the container */
+    projectDir: string;
+}
+/**
+ * Dependencies for AcpSession, injectable for testing.
+ */
+export interface AcpSessionDeps {
+    /** Override the compose command executor (for testing). */
+    execComposeFn?: (composeFile: string, args: string[], opts?: {
+        interactive?: boolean;
+    }) => Promise<number>;
+    /** Override session ID generation (for testing). */
+    generateSessionIdFn?: () => string;
+    /** Override docker compose check (for testing). */
+    checkDockerComposeFn?: () => void;
+    /** Override child_process.spawn (for testing startAgentProcess). */
+    spawnFn?: (command: string, args: string[], options: child_process.SpawnOptions) => ChildProcess;
+    /** Optional logger for diagnostics. */
+    logger?: AcpLogger;
+}
+/**
+ * Generate a docker-compose.yml with proxy and agent services.
+ * The credential service runs in-process on the host, not in Docker.
+ *
+ * The agent service is defined with `profiles: ["agent"]` so that
+ * `docker compose up -d` only starts the proxy.
+ * The agent is started later via `docker compose run`.
+ *
+ * Docker build layout (project-local):
+ *   .mason/docker/              ← dockerDir (shared, has node_modules)
+ *     {role-name}/                   ← dockerBuildDir
+ *       mcp-proxy/Dockerfile
+ *       {agent-type}/Dockerfile
+ */
+export declare function generateAcpComposeYml(opts: {
+    dockerBuildDir: string;
+    dockerDir: string;
+    projectDir?: string;
+    agent: string;
+    role: string;
+    logsDir: string;
+    proxyToken: string;
+    credentialProxyToken: string;
+    proxyPort?: number;
+    acpClient?: string;
+    acpCommand?: string[];
+    roleMounts?: RoleMount[];
+    credentialKeys?: string[];
+}): string;
+export declare class AcpSession {
+    private readonly config;
+    private readonly deps;
+    private running;
+    private sessionInfo;
+    private infraInfo;
+    private infraRunning;
+    private agentInfo;
+    private agentRunning;
+    private agentChild;
+    constructor(config: AcpSessionConfig, deps?: AcpSessionDeps);
+    /**
+     * Start the ACP Docker session (legacy all-at-once mode).
+     * Starts all services including the agent in a single compose up.
+     */
+    start(): Promise<SessionInfo>;
+    /**
+     * Start infrastructure services only (proxy).
+     * These are long-lived and shared across agent sessions.
+     * The agent service is in the same compose file but behind a profile,
+     * so `up -d` skips it.
+     */
+    startInfrastructure(): Promise<InfrastructureInfo>;
+    /**
+     * Start an agent container for a specific project directory.
+     * Uses `docker compose run -d` on the agent service from the
+     * same compose file, so it shares the network with infra.
+     *
+     * @param projectDir The project directory to mount into the container.
+     */
+    startAgent(projectDir: string): Promise<AgentSessionInfo>;
+    /**
+     * Start an agent container as a foreground child process with piped stdio.
+     *
+     * Unlike `startAgent()` (which uses `docker compose run -d`), this method
+     * spawns `docker compose run` without `-d` so the child process's
+     * stdin/stdout can be wrapped with `ndJsonStream()` for direct ACP
+     * communication. No port mapping or container ID discovery is needed.
+     *
+     * @param projectDir The project directory to mount into the container.
+     * @returns The spawned child process and agent session info.
+     */
+    startAgentProcess(projectDir: string): Promise<{
+        child: ChildProcess;
+        agentInfo: AgentSessionInfo;
+    }>;
+    /**
+     * Stop only the agent container. Infrastructure remains running.
+     * Idempotent — calling when agent is not running is a no-op.
+     *
+     * If a child process exists (from `startAgentProcess()`), it is killed.
+     * Otherwise, the agent service is stopped via compose commands.
+     */
+    stopAgent(): Promise<void>;
+    /**
+     * Stop all services (infrastructure + agent).
+     * Idempotent — calling stop when not running is a no-op.
+     */
+    stop(): Promise<void>;
+    /**
+     * Check if the session is currently running (legacy mode).
+     */
+    isRunning(): boolean;
+    /**
+     * Check if infrastructure is currently running.
+     */
+    isInfrastructureRunning(): boolean;
+    /**
+     * Check if an agent is currently running.
+     */
+    isAgentRunning(): boolean;
+}
+//# sourceMappingURL=session.d.ts.map

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

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