@snappedly-tools/shipyard 0.9.1 → 0.9.2-staging.36240532373

package/dist/main.js

@@ -289,7 +289,7 @@ function getNextStepsLines() {
     "2. If using a model subscription, sign in. For Codex:",
     `   codex --config 'cli_auth_credentials_store="file"' login`,
     "   test -f ~/.codex/auth.json",
-    `3. If the runner installed successfully, start it with \`npx ${CLI_NAME} runner start\`; otherwise run \`npx ${CLI_NAME} run\`.`
+    `3. Start the repository runner with \`npx ${CLI_NAME} runner start\`.`
   ];
 }
 function getTemplatesDir() {
@@ -1261,15 +1261,6 @@ var installRepositoryRunner = async (options, adapters = defaultAdapters) => {
   reportProgress(options, 8, progressTotal, "Installed wake-up workflow");
   return { name: runnerName, repository, version, runnerDir };
 };
-
-// src/InitRepositoryRunner.ts
-var repositoryRunnerNextSteps = () => [
-  `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;
@@ -1292,6 +1283,9 @@ var commitAndPushInitSetup = (repoDir) => {
   if (existsSync(join(repoDir, REPOSITORY_RUNNER_WORKFLOW_PATH))) {
     paths.push(REPOSITORY_RUNNER_WORKFLOW_PATH);
   }
+  for (const packageFile of ["package.json", "package-lock.json"]) {
+    if (existsSync(join(repoDir, packageFile))) paths.push(packageFile);
+  }
   execFileSync("git", ["add", "--", ...paths], {
     cwd: repoDir,
     stdio: "ignore"
@@ -2387,7 +2381,7 @@ var runnerCommand = Command.make(
     purgeRunnerCommand
   ])
 );
-var VERSION = "0.9.1" ;
+var VERSION = "0.9.2-staging.36240532373" ;
 var SHIPYARD_PACKAGE_NAME = "@snappedly-tools/shipyard";
 var isMissingPath = (error) => error !== null && typeof error === "object" && "code" in error && error.code === "ENOENT";
 var lstatIfPresent = async (path) => {
@@ -2461,6 +2455,7 @@ var removeShipyardRepositoryFiles = async (options) => {
 };
 
 // src/cli.ts
+var execFileAsync3 = promisify(execFile);
 var imageNameOption = Options.text("image-name").pipe(
   Options.withDescription("Docker image name"),
   Options.optional
@@ -2802,8 +2797,7 @@ var initCommand = Command.make(
                 initialValue: DEFAULT_AGENT_NAME,
                 options: agents.map((a) => ({
                   value: a.name,
-                  label: a.label,
-                  hint: `Default model: ${a.defaultModel}`
+                  label: a.label
                 }))
               })
             )
@@ -2930,14 +2924,26 @@ var initCommand = Command.make(
           ]
         ];
         for (const [index, [name, description, color]] of labels.entries()) {
-          try {
-            execSync(
-              `gh label create "${name}" --description "${description}" --color "${color}" --force`,
-              { cwd, stdio: "ignore" }
-            );
-          } catch {
-            failedLabels.push(name);
-          }
+          const created = yield* Effect.promise(
+            () => execFileAsync3(
+              "gh",
+              [
+                "label",
+                "create",
+                name,
+                "--description",
+                description,
+                "--color",
+                color,
+                "--force"
+              ],
+              { cwd }
+            ).then(
+              () => true,
+              () => false
+            )
+          );
+          if (!created) failedLabels.push(name);
           progressAt(
             24 + Math.round((index + 1) / labels.length * 10),
             "Provisioning GitHub labels"
@@ -3056,7 +3062,7 @@ var initCommand = Command.make(
           const confirmed = yield* Effect.promise(
             () => whilePrompt(
               () => clack2.confirm({
-                message: "Commit .shipyard/ and any generated runner workflow, then push this branch to origin? Sandboxes need the setup committed. The push also sends any local commits not already on origin.",
+                message: "Commit .shipyard/, any generated runner workflow, and package.json/package-lock.json when present, then push this branch to origin? Sandboxes need the setup committed. The push also sends any local commits not already on origin.",
                 initialValue: true
               })
             )
@@ -3126,10 +3132,6 @@ var initCommand = Command.make(
         progressAt(100, "Initialization complete");
       })
     );
-    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()) {