@snappedly-tools/shipyard 0.5.0-staging.36022586813 → 0.5.0-staging.36028653877

package/dist/main.js

@@ -1,13 +1,13 @@
 #!/usr/bin/env node
 import { CODEX_MODELS, purgeRunLogs, withFriendlyErrors, DEFAULT_LOG_RETENTION_DAYS, resolveEnv } from './chunk-56TDSWFU.js';
-import { buildImage, removeImage, validateExistingRepositoryRunner, RunnerLifecycleError, RUNNER_INSTALL_METADATA, removeRepositoryRunner, RUNNER_CONTROLLER_LOCK, recoverRepositoryRunner, REPOSITORY_RUNNER_OWNER_ENV, removeOwnedRepositoryRunnerContainers, RUNNER_WORK_DIR } from './chunk-WAXEMZUV.js';
-import { SANDBOX_REPO_DIR, Display, InitError, ACTIVATION_LABEL, PRODUCT_NAME, CONFIG_DIR, CLI_NAME, ClackDisplay, RUNNER_DIR, RUNNER_SANDBOX_MASK_DIR, assertProtectedDirectoryIdentities, repositoryRunnerEnvironment, ConfigDirError, defaultImageName, ExecHostError, LOCKS_DIR } from './chunk-FDYOTN55.js';
+import { buildImage, removeImage, RunnerLifecycleError, removeRepositoryRunner, validateExistingRepositoryRunner, RUNNER_INSTALL_METADATA, RUNNER_CONTROLLER_LOCK, recoverRepositoryRunner, REPOSITORY_RUNNER_OWNER_ENV, removeOwnedRepositoryRunnerContainers, RUNNER_WORK_DIR } from './chunk-WAXEMZUV.js';
+import { SANDBOX_REPO_DIR, Display, InitError, ACTIVATION_LABEL, PRODUCT_NAME, CONFIG_DIR, CLI_NAME, ClackDisplay, ConfigDirError, defaultImageName, ExecHostError, LOCKS_DIR, RUNNER_DIR, RUNNER_SANDBOX_MASK_DIR, assertProtectedDirectoryIdentities, repositoryRunnerEnvironment } from './chunk-FDYOTN55.js';
 import './chunk-KMGNFXKN.js';
 import './chunk-ACD46ZM4.js';
 import { NodeContext, NodeRuntime, NodeFileSystem } from '@effect/platform-node';
-import { Effect, Layer, Option } from 'effect';
+import { Effect, Layer, Option, Exit, Cause } from 'effect';
 import { Options, Command } from '@effect/cli';
-import * as clack from '@clack/prompts';
+import * as clack2 from '@clack/prompts';
 import { execFile, execSync, spawn, execFileSync } from 'child_process';
 import { existsSync, constants, statSync } from 'fs';
 import { join, resolve, dirname } from 'path';
@@ -441,6 +441,12 @@ var scaffold = (repoDir, options) => Effect.gen(function* () {
     // default: docker
     codexAuth = "api-key"
   } = options;
+  const totalProgressSteps = 5;
+  const reportProgress2 = (current, message) => options.onProgress?.({
+    current,
+    total: totalProgressSteps,
+    message
+  });
   if (codexAuth === "chatgpt" && agent.name !== "codex") {
     return yield* Effect.fail(
       new Error(
@@ -452,8 +458,10 @@ var scaffold = (repoDir, options) => Effect.gen(function* () {
   yield* assertConfigDirAvailable(repoDir);
   const configDir = join(repoDir, CONFIG_DIR);
   const mainFilename = yield* detectMainFilename(repoDir);
+  reportProgress2(1, "Validated repository and configuration");
   yield* fs.makeDirectory(configDir, { recursive: false }).pipe(Effect.mapError((e) => new Error(e.message)));
   const templateDir = yield* getTemplateDir(templateName);
+  reportProgress2(2, `Prepared ${CONFIG_DIR}/ directory`);
   const envExampleParts = [
     agent.name === "codex" && codexAuth === "chatgpt" ? CODEX_CHATGPT_ENV_EXAMPLE : agent.envExample
   ];
@@ -475,6 +483,7 @@ var scaffold = (repoDir, options) => Effect.gen(function* () {
     ],
     { concurrency: "unbounded" }
   );
+  reportProgress2(3, "Wrote configuration and template files");
   yield* rewriteMainTs(
     configDir,
     agent,
@@ -483,7 +492,9 @@ var scaffold = (repoDir, options) => Effect.gen(function* () {
     mainFilename,
     codexAuth
   );
+  reportProgress2(4, "Configured selected agent and sandbox");
   yield* substituteTemplateArgs(configDir, issueTracker);
+  reportProgress2(5, "Applied issue tracker settings");
   return { mainFilename };
 });
 var resolveCodexAuthMode = async (options) => {
@@ -562,6 +573,11 @@ var ensureCodexChatGptAuth = (options) => {
     });
   }
 };
+var runEffectPromise = async (effect) => {
+  const exit = await Effect.runPromiseExit(effect);
+  if (Exit.isFailure(exit)) throw Cause.squash(exit.cause);
+  return exit.value;
+};
 var REPOSITORY_RUNNER_WORKFLOW_PATH = ".github/workflows/shipyard-wake.yml";
 var REPOSITORY_RUNNER_WAKE_EXECUTABLE = "shipyard-wake";
 var REPOSITORY_RUNNER_WORKFLOW = `name: Shipyard wake-up
@@ -756,6 +772,22 @@ var RELEASES_API = "https://api.github.com/repos/actions/runner/releases/latest"
 var RunnerInstallError = class extends Error {
   name = "RunnerInstallError";
 };
+var RunnerInstallConflictError = class extends RunnerInstallError {
+  constructor(repository, runners) {
+    const names = runners.map(({ name }) => name).join(", ");
+    super(
+      `A repository runner labeled \`${ACTIVATION_LABEL}\` is already registered for ${repository}: ${names}. Remove it before installing another.`
+    );
+    this.repository = repository;
+    this.runners = runners;
+    const details = runners.map(
+      ({ id, name, status, busy }) => `${name}${id === void 0 ? "" : ` (#${id})`} (${status}${busy ? ", busy" : ""})`
+    ).join(", ");
+    this.confirmationMessage = `GitHub has ${runners.length} repository runner${runners.length === 1 ? "" : "s"} labeled \`${ACTIVATION_LABEL}\` for ${repository}: ${details}. Delete ${runners.length === 1 ? "this registration" : "these registrations"} and install a replacement?`;
+  }
+  name = "RunnerInstallConflictError";
+  confirmationMessage;
+};
 var defaultAdapters = {
   platform: () => process.platform,
   arch: () => process.arch,
@@ -892,6 +924,88 @@ var commandFailure = (purpose, error) => new RunnerInstallError(
   `${purpose} failed: ${error instanceof Error ? error.message : String(error)}`
 );
 var reportProgress = (options, current, total, message) => options.onProgress?.({ current, total, message });
+var parseExistingRunnerRegistrations = (stdout) => {
+  const lines = stdout.trim().split(/\r?\n/).filter(Boolean);
+  return lines.map((line) => {
+    let value;
+    try {
+      value = JSON.parse(line);
+    } catch {
+      return { id: void 0, name: line, status: "unknown", busy: false };
+    }
+    if (typeof value !== "object" || value === null) {
+      throw new RunnerInstallError(
+        "GitHub returned invalid repository runner information."
+      );
+    }
+    const registration = value;
+    if (typeof registration.id !== "number" || !Number.isInteger(registration.id) || registration.id <= 0 || typeof registration.name !== "string" || registration.name.length === 0 || typeof registration.status !== "string" || typeof registration.busy !== "boolean") {
+      throw new RunnerInstallError(
+        "GitHub returned invalid repository runner information."
+      );
+    }
+    return {
+      id: registration.id,
+      name: registration.name,
+      status: registration.status,
+      busy: registration.busy
+    };
+  });
+};
+var removeExistingRepositoryRunnerRegistrations = async (options, adapters = defaultAdapters) => {
+  if (options.conflict.runners.some(({ id }) => id === void 0)) {
+    throw new RunnerInstallError(
+      "GitHub did not provide runner IDs, so Shipyard cannot safely remove the existing registrations. Remove them in GitHub Settings > Actions > Runners, then retry."
+    );
+  }
+  const environment = adapters.environment();
+  const removed = [];
+  for (const runner of options.conflict.runners) {
+    try {
+      await adapters.run(
+        "gh",
+        [
+          "api",
+          "--method",
+          "DELETE",
+          `repos/${options.conflict.repository}/actions/runners/${runner.id}`
+        ],
+        { cwd: options.repoDir, env: environment }
+      );
+      removed.push(runner.name);
+    } catch (error) {
+      const previous = removed.length === 0 ? "" : ` Earlier registrations were already removed: ${removed.join(", ")}.`;
+      throw new RunnerInstallError(
+        `${commandFailure(
+          `Removing GitHub runner ${runner.name} (#${runner.id}) from ${options.conflict.repository}`,
+          error
+        ).message}${previous}`
+      );
+    }
+  }
+};
+var installRepositoryRunnerWithReplacement = async (options, adapters = defaultAdapters) => {
+  try {
+    return await options.install();
+  } catch (error) {
+    if (!(error instanceof RunnerInstallConflictError) || !options.interactive) {
+      throw error;
+    }
+    if (!await options.confirmReplacement(error)) {
+      throw new RunnerInstallError(
+        `${error.message} Existing runner registrations were left unchanged; installation cancelled.`
+      );
+    }
+    await removeExistingRepositoryRunnerRegistrations(
+      {
+        repoDir: options.repoDir,
+        conflict: error
+      },
+      adapters
+    );
+    return options.install();
+  }
+};
 var installRepositoryRunner = async (options, adapters = defaultAdapters) => {
   if (adapters.platform() !== "darwin" || adapters.arch() !== "arm64") {
     throw new RunnerInstallError(
@@ -1003,7 +1117,7 @@ var installRepositoryRunner = async (options, adapters = defaultAdapters) => {
       "--paginate",
       `repos/${repository}/actions/runners`,
       "--jq",
-      `.runners[] | select(any(.labels[]; .name == "${ACTIVATION_LABEL}")) | .name`
+      `.runners[] | select(any(.labels[]; .name == "${ACTIVATION_LABEL}")) | {id, name, status, busy}`
     ],
     { cwd: options.repoDir, env: hostEnv }
   ).catch((error) => {
@@ -1012,10 +1126,11 @@ var installRepositoryRunner = async (options, adapters = defaultAdapters) => {
       error
     );
   });
-  if (existing.stdout.trim().length > 0) {
-    throw new RunnerInstallError(
-      `A repository runner labeled \`${ACTIVATION_LABEL}\` is already registered for ${repository}. Remove it before installing another.`
-    );
+  const existingRegistrations = parseExistingRunnerRegistrations(
+    existing.stdout
+  );
+  if (existingRegistrations.length > 0) {
+    throw new RunnerInstallConflictError(repository, existingRegistrations);
   }
   reportProgress(
     options,
@@ -2123,19 +2238,38 @@ var installRunnerCommand = Command.make(
   { registrationToken: registrationTokenOption },
   ({ registrationToken }) => Effect.gen(function* () {
     const display = yield* Display;
-    const result = yield* display.progress(
-      "Installing repository runner",
-      (report) => Effect.tryPromise({
-        try: () => installRepositoryRunner({
-          repoDir: process.cwd(),
-          registrationToken: registrationToken._tag === "Some" ? registrationToken.value : void 0,
-          onProgress: report
-        }),
-        catch: (error) => new InitError({
-          message: error instanceof RunnerInstallError ? error.message : `Repository runner installation failed: ${error instanceof Error ? error.message : String(error)}`
-        })
+    const repoDir = process.cwd();
+    const result = yield* Effect.tryPromise({
+      try: () => installRepositoryRunnerWithReplacement({
+        repoDir,
+        interactive: process.stdin.isTTY === true,
+        confirmReplacement: async (conflict) => {
+          const confirmed = await clack2.confirm({
+            message: conflict.confirmationMessage,
+            initialValue: false
+          });
+          return !clack2.isCancel(confirmed) && confirmed === true;
+        },
+        install: () => runEffectPromise(
+          display.progress(
+            "Installing repository runner",
+            (report) => Effect.tryPromise({
+              try: () => installRepositoryRunner({
+                repoDir,
+                registrationToken: registrationToken._tag === "Some" ? registrationToken.value : void 0,
+                onProgress: report
+              }),
+              catch: (error) => error instanceof RunnerInstallError ? error : new InitError({
+                message: `Repository runner installation failed: ${error instanceof Error ? error.message : String(error)}`
+              })
+            })
+          )
+        )
+      }),
+      catch: (error) => new InitError({
+        message: error instanceof RunnerInstallError ? error.message : `Repository runner installation failed: ${error instanceof Error ? error.message : String(error)}`
       })
-    );
+    });
     yield* display.status(
       `Installed ${result.name} for ${result.repository}.`,
       "success"
@@ -2259,7 +2393,7 @@ var runnerCommand = Command.make(
     purgeRunnerCommand
   ])
 );
-var VERSION = "0.5.0-staging.36022586813" ;
+var VERSION = "0.5.0-staging.36028653877" ;
 
 // src/cli.ts
 var imageNameOption = Options.text("image-name").pipe(
@@ -2561,12 +2695,12 @@ var initCommand = Command.make(
         yield* failIfNonInteractive(params.flag);
       }
       const confirmed = yield* Effect.promise(
-        () => clack.confirm({
+        () => clack2.confirm({
           message: params.promptMessage,
           initialValue: true
         })
       );
-      if (clack.isCancel(confirmed)) {
+      if (clack2.isCancel(confirmed)) {
         yield* Effect.fail(
           new InitError({ message: params.cancelMessage })
         );
@@ -2591,7 +2725,7 @@ var initCommand = Command.make(
         yield* failIfNonInteractive("--agent");
       }
       const selected = yield* Effect.promise(
-        () => clack.select({
+        () => clack2.select({
           message: "Select an agent:",
           initialValue: DEFAULT_AGENT_NAME,
           options: agents.map((a) => ({
@@ -2601,7 +2735,7 @@ var initCommand = Command.make(
           }))
         })
       );
-      if (clack.isCancel(selected)) {
+      if (clack2.isCancel(selected)) {
         yield* Effect.fail(
           new InitError({ message: "Agent selection cancelled." })
         );
@@ -2614,7 +2748,7 @@ var initCommand = Command.make(
         requested: codexAuthFlag._tag === "Some" ? codexAuthFlag.value : void 0,
         interactive: isInteractive,
         select: async () => {
-          const selected = await clack.select({
+          const selected = await clack2.select({
             message: "How will you authenticate Codex?",
             initialValue: "chatgpt",
             options: [
@@ -2630,7 +2764,7 @@ var initCommand = Command.make(
               }
             ]
           });
-          return clack.isCancel(selected) ? void 0 : selected;
+          return clack2.isCancel(selected) ? void 0 : selected;
         }
       }),
       catch: (error) => error instanceof InitError ? error : new InitError({
@@ -2658,7 +2792,7 @@ var initCommand = Command.make(
         yield* failIfNonInteractive("--sandbox");
       }
       const selected = yield* Effect.promise(
-        () => clack.select({
+        () => clack2.select({
           message: "Select a sandbox provider:",
           options: sandboxProviders.map((p) => ({
             value: p.name,
@@ -2666,7 +2800,7 @@ var initCommand = Command.make(
           }))
         })
       );
-      if (clack.isCancel(selected)) {
+      if (clack2.isCancel(selected)) {
         yield* Effect.fail(
           new InitError({
             message: "Sandbox provider selection cancelled."
@@ -2684,7 +2818,7 @@ var initCommand = Command.make(
         yield* failIfNonInteractive("--issue-tracker");
       }
       const selected = yield* Effect.promise(
-        () => clack.select({
+        () => clack2.select({
           message: "Select an issue tracker:",
           initialValue: "github-issues",
           options: issueTrackers.map((b) => ({
@@ -2693,7 +2827,7 @@ var initCommand = Command.make(
           }))
         })
       );
-      if (clack.isCancel(selected)) {
+      if (clack2.isCancel(selected)) {
         yield* Effect.fail(
           new InitError({
             message: "Issue tracker selection cancelled."
@@ -2710,7 +2844,7 @@ var initCommand = Command.make(
         yield* failIfNonInteractive("--template");
       }
       const selected = yield* Effect.promise(
-        () => clack.select({
+        () => clack2.select({
           message: "Select a template:",
           initialValue: "blank",
           options: templates.map((tmpl) => ({
@@ -2720,7 +2854,7 @@ var initCommand = Command.make(
           }))
         })
       );
-      if (clack.isCancel(selected)) {
+      if (clack2.isCancel(selected)) {
         yield* Effect.fail(
           new InitError({ message: "Template selection cancelled." })
         );
@@ -2772,15 +2906,16 @@ var initCommand = Command.make(
         console.warn(message);
       }
     }
-    yield* d.spinner(
+    yield* d.progress(
       `Scaffolding ${CONFIG_DIR}/ config directory...`,
-      scaffold(cwd, {
+      (report) => scaffold(cwd, {
         agent: selectedAgent,
         model: selectedModel,
         templateName: selectedTemplate,
         issueTracker: selectedIssueTracker,
         sandboxProvider: selectedSandboxProvider,
-        codexAuth: selectedCodexAuth
+        codexAuth: selectedCodexAuth,
+        onProgress: report
       }).pipe(
         Effect.mapError(
           (e) => new InitError({
@@ -2843,28 +2978,39 @@ var initCommand = Command.make(
         interactive: isInteractive,
         requested: installRunnerChoice._tag === "Some" ? installRunnerChoice.value : void 0,
         confirm: async ({ message, initialValue }) => {
-          const confirmed = await clack.confirm({ message, initialValue });
-          if (clack.isCancel(confirmed)) {
+          const confirmed = await clack2.confirm({ message, initialValue });
+          if (clack2.isCancel(confirmed)) {
             throw new InitError({
               message: "Repository-runner installation selection cancelled."
             });
           }
           return confirmed === true;
         },
-        install: () => Effect.runPromise(
-          d.progress(
-            "Installing repository runner",
-            (report) => Effect.tryPromise({
-              try: () => installRepositoryRunner({
-                repoDir: cwd,
-                onProgress: report
-              }),
-              catch: (error) => new InitError({
-                message: error instanceof RunnerInstallError ? error.message : `Repository runner installation failed: ${error instanceof Error ? error.message : String(error)}`
+        install: () => installRepositoryRunnerWithReplacement({
+          repoDir: cwd,
+          interactive: isInteractive,
+          confirmReplacement: async (conflict) => {
+            const confirmed = await clack2.confirm({
+              message: conflict.confirmationMessage,
+              initialValue: false
+            });
+            return !clack2.isCancel(confirmed) && confirmed === true;
+          },
+          install: () => runEffectPromise(
+            d.progress(
+              "Installing repository runner",
+              (report) => Effect.tryPromise({
+                try: () => installRepositoryRunner({
+                  repoDir: cwd,
+                  onProgress: report
+                }),
+                catch: (error) => error instanceof RunnerInstallError ? error : new InitError({
+                  message: `Repository runner installation failed: ${error instanceof Error ? error.message : String(error)}`
+                })
               })
-            })
+            )
           )
-        )
+        })
       }),
       catch: (error) => error instanceof InitError ? error : new InitError({
         message: `Repository-runner setup failed: ${error instanceof Error ? error.message : String(error)}`