@hyperfixation/cli 0.1.3 → 0.1.4

package/dist/cloud-steps/coolify.js

@@ -233,12 +233,11 @@ async function findOrCreateProject(context, coolify) {
 async function productionEnvironment(context, coolify, projectUuid) {
     const environments = await coolify.listEnvironments(projectUuid);
     const production = environments.find((environment) => environment.name === COOLIFY_ENVIRONMENT);
-    if (production === undefined) {
-        throw new StepFailed(`the Coolify project ${context.names.given} has no ${COOLIFY_ENVIRONMENT} environment ` +
-            `(it has ${environments.map((environment) => environment.name).join(", ") || "none"}), ` +
-            "and the API has no endpoint that creates one: add it in Coolify and re-run hf new");
-    }
-    return production.uuid;
+    if (production !== undefined)
+        return production.uuid;
+    const created = await coolify.createEnvironment(projectUuid, { name: COOLIFY_ENVIRONMENT });
+    context.io.out(`${context.names.given}: created the ${COOLIFY_ENVIRONMENT} environment in the Coolify project`);
+    return created.uuid;
 }
 async function findOrCreateApplication(context, coolify, projectUuid, environmentUuid) {
     const name = context.names.given;

package/dist/cloud-steps/template.js

@@ -37,19 +37,33 @@ export const templateStep = {
         await substituteTree(fetched, names);
         // The marker is what `assertTemplateSource` looks for: an app is never a template twice.
         await rm(path.join(fetched, TEMPLATE_MARKER));
+        // Recorded before the rename, not after: a crash between the two must leave a directory this
+        // run's state vouches for, or the rerun would refuse the app it just made.
+        await context.state.patch({ templateStartedAt: new Date(context.now()).toISOString() });
         await rename(fetched, dir);
         context.io.out(`${names.given}: template fetched into ${dir}`);
     },
 };
 /**
- * A directory already at the target: this app on a run whose state was lost, or something else.
+ * A directory already at the target: this app on a run that crashed after the rename, or
+ * something else.
  *
- * "This app" means a substituted template — its `package.json` carries the underscored app name
- * and the marker is gone. Anything else is the local flow's rule, refused rather than written
- * into.
+ * Adopted only on a genuine resume — the state cache records that this app's template step began
+ * (`templateStartedAt`) or finished. With no such record the directory is not ours however much it
+ * looks like it: an earlier `hf new --local` leaves a substituted scaffold with the right
+ * `package.json` name, and adopting it once pushed a stale template to a new repo.
+ *
+ * On a resume, "this app" means a substituted template — its `package.json` carries the
+ * underscored app name and the marker is gone. Anything else is the local flow's rule, refused
+ * rather than written into.
  */
 async function adoptOrRefuse(context) {
-    const { dir, names } = context;
+    const { dir, names, state } = context;
+    const resuming = state.state.templateStartedAt !== undefined || state.isDone("template");
+    if (!resuming) {
+        throw new TemplateError(`${dir} already exists and hf has no record of creating it, so it will not adopt it on a ` +
+            `first run. Move it away (or delete it) and rerun; the template is fetched fresh.`);
+    }
     const substituted = !(await exists(path.join(dir, TEMPLATE_MARKER))) && (await packageName(dir)) === names.appName;
     if (!substituted) {
         throw new TemplateError(`${dir} already exists; hf new will not write into it`);

package/dist/providers/coolify.d.ts

@@ -132,6 +132,11 @@ export declare class CoolifyClient {
     listProjects(): Promise<CoolifyProject[]>;
     getProject(uuid: string): Promise<CoolifyProject>;
     listEnvironments(projectUuid: string): Promise<CoolifyEnvironment[]>;
+    createEnvironment(projectUuid: string, body: {
+        name: string;
+    }): Promise<{
+        uuid: string;
+    }>;
     createPrivateGithubAppApplication(body: CoolifyApplicationRequest): Promise<CoolifyApplication>;
     /**
      * Every application, so a rerun can find the one it created last time by name.

package/dist/providers/coolify.js

@@ -26,6 +26,13 @@ export class CoolifyClient {
             path: `/projects/${segment(projectUuid)}/environments`,
         });
     }
+    async createEnvironment(projectUuid, body) {
+        return await this.request({
+            method: "POST",
+            path: `/projects/${segment(projectUuid)}/environments`,
+            body,
+        });
+    }
     async createPrivateGithubAppApplication(body) {
         return await this.request({ method: "POST", path: "/applications/private-github-app", body });
     }

package/dist/state.d.ts

@@ -50,6 +50,15 @@ export interface StatusTokenState {
  */
 export interface AppState {
     steps: Partial<Record<StepName, StepRecord>>;
+    /**
+     * ISO 8601, written just before the `template` step renames the substituted fetch into place.
+     *
+     * The proof that a directory at the app's path is this run's own: `steps.template` is only
+     * recorded after the rename, so a crash in between would otherwise leave a directory no state
+     * vouches for. Without it the step refuses to adopt a directory — a stale scaffold from an
+     * earlier `hf new --local` looks exactly like a lost run.
+     */
+    templateStartedAt?: string;
     /** `owner/name` of the app's GitHub repository. */
     repo?: string;
     coolify?: CoolifyState;

package/dist/state.js

@@ -149,6 +149,7 @@ function parseAppState(contents, file) {
                 state.steps = parseSteps(value, file);
                 break;
             case "repo":
+            case "templateStartedAt":
             case "sentryDsn":
             case "betterAuthSecret":
             case "lastRestoreCheckAt":

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@hyperfixation/cli",
-  "version": "0.1.3",
+  "version": "0.1.4",
   "license": "MIT",
   "description": "The hf binary and its Turborepo generator templates",
   "repository": {
@@ -29,15 +29,15 @@
     "!dist/test-support/**"
   ],
   "dependencies": {
-    "@hyperfixation/auth": "0.1.3",
-    "@hyperfixation/core": "0.1.3",
-    "@hyperfixation/db": "0.1.3",
+    "@hyperfixation/auth": "0.1.4",
+    "@hyperfixation/core": "0.1.4",
+    "@hyperfixation/db": "0.1.4",
     "giget": "3.3.1",
     "pg": "^8.23.0"
   },
   "devDependencies": {
-    "@hyperfixation/eslint-config": "0.1.3",
-    "@hyperfixation/testing": "0.1.3",
+    "@hyperfixation/eslint-config": "0.1.4",
+    "@hyperfixation/testing": "0.1.4",
     "@microsoft/api-extractor": "^7.59.1",
     "@types/pg": "^8.23.1",
     "eslint": "^10.10.0",