@skyramp/mcp 0.4.4-rc.1 → 0.4.4

package/build/utils/initAgent.d.ts

@@ -16,9 +16,9 @@ export declare function ensureSkyrampMdInstalled(): Promise<void>;
  *   Previously both images were always pulled regardless.
  * - Parallel pulls: missing images are pulled concurrently via Promise.all, halving
  *   wall-clock time when both need to be downloaded.
- * - Arch-aware: pull platform is detected from process.arch (linux/arm64 on Apple Silicon,
- *   linux/amd64 otherwise) with an automatic amd64 fallback if no arm64 manifest exists
- *   (e.g. skyramp/executor is amd64-only; skyramp/worker supports both).
+ * - Arch-aware: the worker's pull platform is detected from process.arch (linux/arm64 on
+ *   Apple Silicon, linux/amd64 otherwise) with an automatic amd64 fallback if no arm64
+ *   manifest exists. The executor is always pulled as amd64, the platform it runs as.
  * - No FFI overhead: direct Dockerode calls replace the Go shared-library bridge,
  *   removing the cost of loading the .so and marshalling output through a C string.
  * - Cleaner error propagation: structured errors from Dockerode replace parsing a

package/build/utils/initAgent.js

@@ -4,7 +4,8 @@ import path from "path";
 import { logger } from "./logger.js";
 import { SKYRAMP_MD_CONTENT } from "./skyrampMdContent.js";
 import { EXECUTOR_DOCKER_IMAGE, WORKER_DOCKER_IMAGE } from "./versions.js";
-import { dockerImageExistsLocally, pullDockerImage } from "./docker.js";
+import { dockerDaemonOsType, dockerImageExistsLocally, getDockerPlatform, isPlatformUnavailableError, pullDockerImage, } from "./docker.js";
+import { resolveExecutorImage } from "../services/FleetExecutionService.js";
 // Global skill discovery paths (resolved relative to os.homedir()).
 const SKILL_INSTALL_PATHS = [
     {
@@ -83,9 +84,9 @@ export async function ensureSkyrampMdInstalled() {
  *   Previously both images were always pulled regardless.
  * - Parallel pulls: missing images are pulled concurrently via Promise.all, halving
  *   wall-clock time when both need to be downloaded.
- * - Arch-aware: pull platform is detected from process.arch (linux/arm64 on Apple Silicon,
- *   linux/amd64 otherwise) with an automatic amd64 fallback if no arm64 manifest exists
- *   (e.g. skyramp/executor is amd64-only; skyramp/worker supports both).
+ * - Arch-aware: the worker's pull platform is detected from process.arch (linux/arm64 on
+ *   Apple Silicon, linux/amd64 otherwise) with an automatic amd64 fallback if no arm64
+ *   manifest exists. The executor is always pulled as amd64, the platform it runs as.
  * - No FFI overhead: direct Dockerode calls replace the Go shared-library bridge,
  *   removing the cost of loading the .so and marshalling output through a C string.
  * - Cleaner error propagation: structured errors from Dockerode replace parsing a
@@ -99,33 +100,64 @@ export async function initCheck() {
         await ensureSkyrampMdInstalled();
         logger.info("Skyramp skill files installed/refreshed");
     }
-    // Check each image independently and pull only what is missing
-    const [hasExecutor, hasWorker] = await Promise.all([
-        dockerImageExistsLocally(EXECUTOR_DOCKER_IMAGE),
-        dockerImageExistsLocally(WORKER_DOCKER_IMAGE),
-    ]);
+    // Two executors can be in use: skyramp_execute_test always runs the released constant,
+    // and skyramp_execute_fleet runs SKYRAMP_EXECUTOR_IMAGE when it is set. Fetch both, or a
+    // normal test run pays for the pull the override displaced.
+    const fleetExecutor = resolveExecutorImage();
+    // Every image is pulled for the daemon's own OS: a released executor is one tag carrying
+    // both, and the tag names no platform. Both run paths start the executor as amd64, so it
+    // is pulled as amd64 on every host -- an arm64 copy would not be the one the run starts.
+    const daemonOs = await dockerDaemonOsType();
+    const executorPlatform = daemonOs === "windows" ? "windows/amd64" : "linux/amd64";
+    const workerPlatform = daemonOs === "windows" ? "windows/amd64" : getDockerPlatform();
+    const executors = [...new Set([EXECUTOR_DOCKER_IMAGE, fleetExecutor])];
+    // An executor image without this daemon's OS -- an older release, or a single-OS
+    // SKYRAMP_EXECUTOR_IMAGE -- has nothing to pull here. That is a fact about the image,
+    // not a broken environment, so its pull is optional.
+    const wanted = [
+        ...executors.map((image) => ({
+            what: "executor",
+            image,
+            platform: executorPlatform,
+            optional: true,
+        })),
+        {
+            what: "worker",
+            image: WORKER_DOCKER_IMAGE,
+            platform: workerPlatform,
+            optional: false,
+        },
+    ];
+    // Presence is checked for all of them at once; only the pulls that follow are conditional.
+    const present = await Promise.all(wanted.map((w) => dockerImageExistsLocally(w.image)));
     const pulls = [];
-    if (!hasExecutor) {
-        logger.info("Pulling missing executor image", {
-            image: EXECUTOR_DOCKER_IMAGE,
-            platform: "linux/amd64",
-        });
-        pulls.push(pullDockerImage(EXECUTOR_DOCKER_IMAGE, "linux/amd64"));
-    }
-    if (!hasWorker) {
-        logger.info("Pulling missing worker image", { image: WORKER_DOCKER_IMAGE });
-        pulls.push(pullDockerImage(WORKER_DOCKER_IMAGE));
+    wanted.forEach(({ what, image, platform, optional }, i) => {
+        if (present[i])
+            return;
+        logger.info(`Pulling missing ${what} image`, { image, platform });
+        const pull = pullDockerImage(image, platform);
+        // Only an image with nothing for this platform is tolerated, and only when optional.
+        // Any other failure -- the network, a rate limit, a full disk -- fails init so it is
+        // retried, instead of being reported as a missing variant.
+        pulls.push(optional
+            ? pull.catch((err) => {
+                if (!isPlatformUnavailableError(err))
+                    throw err;
+                logger.warning("Executor image has no variant for this daemon's platform: fleet runs " +
+                    "need an executor built for it (a release that carries it, or " +
+                    "SKYRAMP_EXECUTOR_IMAGE)", { image, platform, error: err.message });
+            })
+            : pull);
+    });
+    if (pulls.length > 0) {
+        await Promise.all(pulls);
+        logger.info("Skyramp init completed");
     }
-    if (pulls.length === 0) {
+    else {
         logger.info("Skyramp images already present locally, skipping pull", {
-            executor: EXECUTOR_DOCKER_IMAGE,
-            worker: WORKER_DOCKER_IMAGE,
+            images: wanted.map((w) => w.image),
         });
     }
-    else {
-        await Promise.all(pulls);
-        logger.info("Skyramp init completed");
-    }
 }
 let initInFlight = false;
 let initCompleted = false;

package/build/utils/progress.d.ts

@@ -1,16 +1,15 @@
-import { ServerRequest, ServerNotification } from "@modelcontextprotocol/sdk/types.js";
-import { RequestHandlerExtra } from "@modelcontextprotocol/sdk/shared/protocol.js";
+import { ServerContext } from "@modelcontextprotocol/server";
 /**
  * Reports incremental progress for a long-running tool call. No-ops when the
  * client did not supply a progress token.
  */
 export type ProgressReporter = (progress: number, total: number, message: string) => Promise<void>;
 /**
- * Build a progress reporter bound to a tool handler's `extra`. Sends
+ * Build a progress reporter bound to a tool handler's context. Sends
  * `notifications/progress` only when the client provided a `progressToken`,
  * otherwise silently no-ops.
  *
  * Consolidates the identical closure that previously lived inline in multiple
  * progress-emitting tools (analyzeChanges, startTraceCollection).
  */
-export declare function makeProgressReporter(extra: RequestHandlerExtra<ServerRequest, ServerNotification>): ProgressReporter;
+export declare function makeProgressReporter(ctx: ServerContext): ProgressReporter;

package/build/utils/progress.js

@@ -1,21 +1,21 @@
 /**
- * Build a progress reporter bound to a tool handler's `extra`. Sends
+ * Build a progress reporter bound to a tool handler's context. Sends
  * `notifications/progress` only when the client provided a `progressToken`,
  * otherwise silently no-ops.
  *
  * Consolidates the identical closure that previously lived inline in multiple
  * progress-emitting tools (analyzeChanges, startTraceCollection).
  */
-export function makeProgressReporter(extra) {
+export function makeProgressReporter(ctx) {
     return async (progress, total, message) => {
-        const progressToken = extra._meta?.progressToken;
+        const progressToken = ctx.mcpReq._meta?.progressToken;
         if (progressToken !== undefined) {
             try {
                 const notification = {
                     method: "notifications/progress",
                     params: { progressToken, progress, total, message },
                 };
-                await extra.sendNotification(notification);
+                await ctx.mcpReq.notify(notification);
             }
             catch {
                 // Progress is best-effort; a disconnected client should not fail the tool.

package/build/utils/utils.d.ts

@@ -1,4 +1,4 @@
-import { CallToolResult, ReadResourceResult } from "@modelcontextprotocol/sdk/types.js";
+import { CallToolResult, ReadResourceResult } from "@modelcontextprotocol/server";
 export declare function toolError(message: string): CallToolResult;
 /**
  * Build a successful tool result whose payload is delivered on BOTH MCP result

package/build/utils/versions.d.ts

@@ -1,4 +1,4 @@
-export declare const SKYRAMP_IMAGE_VERSION = "v1.3.47";
-export declare const EXECUTOR_DOCKER_IMAGE = "skyramp/executor:v1.3.47";
-export declare const WORKER_DOCKER_IMAGE = "skyramp/worker:v1.3.47";
+export declare const SKYRAMP_IMAGE_VERSION = "v1.3.50";
+export declare const EXECUTOR_DOCKER_IMAGE = "skyramp/executor:v1.3.50";
+export declare const WORKER_DOCKER_IMAGE = "skyramp/worker:v1.3.50";
 export declare const WORKER_CONTROL_PORT = 35142;

package/build/utils/versions.js

@@ -1,4 +1,4 @@
-export const SKYRAMP_IMAGE_VERSION = "v1.3.47";
+export const SKYRAMP_IMAGE_VERSION = "v1.3.50";
 export const EXECUTOR_DOCKER_IMAGE = `skyramp/executor:${SKYRAMP_IMAGE_VERSION}`;
 export const WORKER_DOCKER_IMAGE = `skyramp/worker:${SKYRAMP_IMAGE_VERSION}`;
 // Control port the Skyramp worker listens on (SDK `CONTAINER_PORT`).