@snappedly-tools/shipyard 0.7.0-staging.36082887921 → 0.7.0-staging.36121841659

package/README.md

@@ -41,7 +41,11 @@ npx shipyard init
 
 During `shipyard init`, choose your agent, **Docker**, the template you want, and install the optional
 [repository runner](docs/content/docs/repository-runner.mdx). Follow
-the authentication prompts.
+the authentication prompts. Init offers to commit and push the generated
+Shipyard setup to the current branch. The offer stages `.shipyard/` and, when
+installed, `.github/workflows/shipyard-wake.yml`. It leaves `.shipyard/.env`
+untracked. Non-interactive init skips the offer; pass `--commit-setup true` to
+commit and push the generated files.
 
 On a local Mac, the repository runner automatically wakes Shipyard when you label an issue.
 It runs as long as its terminal stays open.
@@ -60,8 +64,8 @@ conflict resolution, and integration. The review-enabled planner also uses
 strong for ticket and final specification reviews. See
 [agent setup](docs/content/docs/agents.mdx).
 
-Commit the setup and prompt so the sandbox can read them. Make sure the Git ignore file keeps
-`.shipyard/.env` out of the commit.
+If you decline the commit, commit `.shipyard/` before running Shipyard. Docker
+sandboxes read setup files from Git history. Keep `.shipyard/.env` untracked.
 
 ```sh
 npx shipyard run

package/dist/main.js

@@ -271,8 +271,7 @@ var ISSUE_TRACKER_REGISTRY = [
 # Required repository permissions: Contents, Issues, and Pull requests (Read and write); Metadata (Read)
 # Or leave blank and run: GH_TOKEN="$(gh auth token)" npx shipyard run
 GH_TOKEN=
-# GitHub repository (owner/repository)
-GH_REPO=`
+`
   }
 ];
 var listIssueTrackers = () => ISSUE_TRACKER_REGISTRY;
@@ -358,8 +357,8 @@ var rewriteMainTs = (configDir, agent, model, modelExplicit, sandboxProvider, ma
   }
   if (agent.name === "codex" && codexAuth === "chatgpt") {
     content = content.replace(
-      /\bdocker\(\)/g,
-      `docker(${CODEX_CHATGPT_AUTH_OPTIONS})`
+      "const sandboxAuthOptions = {};",
+      `const sandboxAuthOptions = ${CODEX_CHATGPT_AUTH_OPTIONS};`
     );
   }
   content = content.replace(/\bdocker\b/g, sandboxProvider.name);
@@ -1293,12 +1292,57 @@ var initializeRepositoryRunner = async (options) => {
   }
 };
 var repositoryRunnerNextSteps = () => [
-  `First, commit and push ${REPOSITORY_RUNNER_WORKFLOW_PATH} to the repository's default branch`,
+  `Ensure ${REPOSITORY_RUNNER_WORKFLOW_PATH} is committed and pushed to the repository's default branch`,
   `Keep the foreground controller open with \`npx ${CLI_NAME} runner start\``,
   `Inspect it from another terminal with \`npx ${CLI_NAME} runner status\``,
   `Stop it with \`npx ${CLI_NAME} runner stop\``,
   `Unregister and delete its protected files with \`npx ${CLI_NAME} runner remove\``
 ];
+var errorText = (error) => {
+  if (error !== null && typeof error === "object" && "stderr" in error) {
+    const stderr = error.stderr;
+    if (typeof stderr === "string" || Buffer.isBuffer(stderr)) {
+      const text = stderr.toString().trim();
+      if (text) return text;
+    }
+  }
+  return error instanceof Error ? error.message : String(error);
+};
+var commitAndPushInitSetup = (repoDir) => {
+  const branch = execFileSync("git", ["branch", "--show-current"], {
+    cwd: repoDir,
+    encoding: "utf8"
+  }).trim();
+  if (!branch) {
+    throw new Error("Cannot push the Shipyard setup from a detached HEAD.");
+  }
+  const paths = [CONFIG_DIR];
+  if (existsSync(join(repoDir, REPOSITORY_RUNNER_WORKFLOW_PATH))) {
+    paths.push(REPOSITORY_RUNNER_WORKFLOW_PATH);
+  }
+  execFileSync("git", ["add", "--", ...paths], {
+    cwd: repoDir,
+    stdio: "ignore"
+  });
+  execFileSync(
+    "git",
+    ["commit", "--only", "-m", "Add Shipyard setup", "--", ...paths],
+    { cwd: repoDir, stdio: "pipe" }
+  );
+  const commit = execFileSync("git", ["rev-parse", "--short", "HEAD"], {
+    cwd: repoDir,
+    encoding: "utf8"
+  }).trim();
+  try {
+    execFileSync("git", ["push", "origin", `HEAD:refs/heads/${branch}`], {
+      cwd: repoDir,
+      stdio: "pipe"
+    });
+    return { branch, commit };
+  } catch (error) {
+    return { branch, commit, pushError: errorText(error) };
+  }
+};
 var execFileAsync2 = promisify(execFile);
 var CONTROLLER_STATE = ".shipyard-state.json";
 var LAST_FAILURE = ".shipyard-last-failure.json";
@@ -2367,7 +2411,7 @@ var runnerCommand = Command.make(
     purgeRunnerCommand
   ])
 );
-var VERSION = "0.7.0-staging.36082887921" ;
+var VERSION = "0.7.0-staging.36121841659" ;
 
 // src/cli.ts
 var imageNameOption = Options.text("image-name").pipe(
@@ -2588,6 +2632,11 @@ var installRunnerOption = Options.choice("install-runner", [
   ),
   Options.optional
 );
+var commitSetupOption = Options.choice("commit-setup", ["true", "false"]).pipe(
+  Options.withDescription(
+    "Whether to commit and push .shipyard/ and the optional runner workflow"
+  )
+).pipe(Options.optional);
 var choiceToTriBool = (opt) => opt._tag === "Some" ? Option.some(opt.value === "true") : Option.none();
 var initCommand = Command.make(
   "init",
@@ -2601,7 +2650,8 @@ var initCommand = Command.make(
     issueTracker: issueTrackerOption,
     buildImage: buildImageOption,
     installTemplateDeps: installTemplateDepsOption,
-    installRunner: installRunnerOption
+    installRunner: installRunnerOption,
+    commitSetup: commitSetupOption
   },
   ({
     imageName: imageNameFlag,
@@ -2613,7 +2663,8 @@ var initCommand = Command.make(
     issueTracker: issueTrackerFlag,
     buildImage: buildImageFlag,
     installTemplateDeps: installTemplateDepsFlag,
-    installRunner: installRunnerFlag
+    installRunner: installRunnerFlag,
+    commitSetup: commitSetupFlag
   }) => Effect.gen(function* () {
     const d = yield* Display;
     const cwd = process.cwd();
@@ -2657,6 +2708,7 @@ var initCommand = Command.make(
       installTemplateDepsFlag
     );
     const installRunnerChoice = choiceToTriBool(installRunnerFlag);
+    const commitSetupChoice = choiceToTriBool(commitSetupFlag);
     const isInteractive = process.stdin.isTTY === true;
     const failIfNonInteractive = (flag) => Effect.fail(
       new InitError({
@@ -2966,15 +3018,12 @@ var initCommand = Command.make(
         message: `Repository-runner setup failed: ${error instanceof Error ? error.message : String(error)}`
       })
     });
-    if (runnerInit.status === "installed") {
+    const runnerInstalled = runnerInit.status === "installed";
+    if (runnerInstalled) {
       yield* d.status(
         `Installed ${runnerInit.result.name} for ${runnerInit.result.repository}.`,
         "success"
       );
-      yield* d.text("Repository runner next steps:");
-      for (const [index, line] of repositoryRunnerNextSteps().entries()) {
-        yield* d.text(styleText("dim", `${index + 1}. ${line}`));
-      }
     } else if (runnerInit.status === "failed") {
       yield* d.status(
         `Shipyard scaffolding is ready, but repository runner installation failed: ${runnerInit.message}`,
@@ -2985,6 +3034,77 @@ var initCommand = Command.make(
         "warn"
       );
     }
+    let shouldCommitSetup = commitSetupChoice._tag === "Some" && commitSetupChoice.value;
+    if (commitSetupChoice._tag === "None" && isInteractive) {
+      const confirmed = yield* Effect.promise(
+        () => clack2.confirm({
+          message: "Commit .shipyard/ and the optional runner workflow, then push this branch to origin? Sandboxes need the setup committed. The push also sends any local commits not already on origin.",
+          initialValue: true
+        })
+      );
+      if (clack2.isCancel(confirmed)) {
+        yield* Effect.fail(
+          new InitError({ message: "Shipyard setup commit cancelled." })
+        );
+      }
+      shouldCommitSetup = confirmed === true;
+    }
+    if (shouldCommitSetup) {
+      const publishResult = yield* Effect.sync(() => {
+        try {
+          return {
+            status: "committed",
+            result: commitAndPushInitSetup(cwd)
+          };
+        } catch (error) {
+          return {
+            status: "failed",
+            message: error instanceof Error ? error.message : String(error)
+          };
+        }
+      });
+      if (publishResult.status === "failed") {
+        yield* d.status(
+          `Could not commit the Shipyard setup: ${publishResult.message}`,
+          "warn"
+        );
+        yield* d.status(
+          `Commit \`${CONFIG_DIR}/\` before running Shipyard.`,
+          "warn"
+        );
+      } else if (publishResult.result.pushError) {
+        yield* d.status(
+          `Committed ${publishResult.result.commit}, but could not push to origin/${publishResult.result.branch}: ${publishResult.result.pushError}`,
+          "warn"
+        );
+        yield* d.status(
+          `Push it later with \`git push origin ${publishResult.result.branch}\`.`,
+          "warn"
+        );
+      } else {
+        yield* d.status(
+          `Committed ${publishResult.result.commit} and pushed origin/${publishResult.result.branch}.`,
+          "success"
+        );
+      }
+    } else {
+      yield* d.status(
+        `Commit \`${CONFIG_DIR}/\` before running Shipyard. Sandboxes do not receive uncommitted setup files.`,
+        "warn"
+      );
+      if (runnerInstalled) {
+        yield* d.status(
+          "Push the runner wake workflow to the repository's default branch before starting the runner.",
+          "warn"
+        );
+      }
+    }
+    if (runnerInstalled) {
+      yield* d.text("Repository runner next steps:");
+      for (const [index, line] of repositoryRunnerNextSteps().entries()) {
+        yield* d.text(styleText("dim", `${index + 1}. ${line}`));
+      }
+    }
     yield* d.status("Init complete!", "success");
     const nextSteps = getNextStepsLines();
     for (const [i, line] of nextSteps.entries()) {