freestyle 0.1.46 → 0.1.47

package/cli.mjs

@@ -6,7 +6,7 @@ import { Freestyle, VmSpec } from './index.mjs';
 import * as fs from 'fs';
 import * as path from 'path';
 import * as os from 'os';
-import { spawn } from 'child_process';
+import { spawn, spawnSync } from 'child_process';
 
 const DEFAULT_STACK_API_URL = "https://api.stack-auth.com";
 const DEFAULT_STACK_APP_URL = "https://dash.freestyle.sh";
@@ -1105,6 +1105,27 @@ const runCommand = {
   }
 };
 
+function spawnGit(args) {
+  return new Promise((resolve, reject) => {
+    const sigintHandler = () => {
+    };
+    process.on("SIGINT", sigintHandler);
+    const child = spawn("git", args, { stdio: "inherit" });
+    child.on("error", (err) => {
+      process.off("SIGINT", sigintHandler);
+      reject(err);
+    });
+    child.on("close", (code, signal) => {
+      process.off("SIGINT", sigintHandler);
+      if (code === 0) {
+        resolve();
+      } else {
+        const detail = signal ? `signal ${signal}` : `exit code ${code}`;
+        reject(new Error(`git ${args[0]} failed with ${detail}`));
+      }
+    });
+  });
+}
 const gitCommand = {
   command: "git <action>",
   describe: "Manage Git repositories",
@@ -1224,6 +1245,99 @@ Total: ${repos.total}`);
           handleError(error);
         }
       }
+    ).command(
+      "clone <repoId> [directory]",
+      "Clone a repo and persist an access token in the checkout so git push/pull work",
+      (yargs2) => {
+        return yargs2.positional("repoId", {
+          type: "string",
+          description: "Repository ID to clone",
+          demandOption: true
+        }).positional("directory", {
+          type: "string",
+          description: "Destination directory (defaults to <repoId>)"
+        }).option("readonly", {
+          type: "boolean",
+          description: "Provision a read-only token instead of read/write",
+          default: false
+        });
+      },
+      async (argv) => {
+        loadEnv();
+        const args = argv;
+        const permission = args.readonly ? "read" : "write";
+        const destination = args.directory ?? args.repoId;
+        const freestyle = await getFreestyleClient();
+        let identityId;
+        let tokenId;
+        let cloneSucceeded = false;
+        try {
+          console.log(
+            `Provisioning ${permission} access token for ${args.repoId}...`
+          );
+          const { identity, identityId: newIdentityId } = await freestyle.identities.create();
+          identityId = newIdentityId;
+          await identity.permissions.git.grant({
+            repoId: args.repoId,
+            permission
+          });
+          const created = await identity.tokens.create();
+          tokenId = created.tokenId;
+          const url = new URL(`/${args.repoId}`, "https://git.freestyle.sh");
+          url.username = "x-access-token";
+          url.password = created.token;
+          console.log(`Cloning repository ${args.repoId} into ${destination}...`);
+          await spawnGit([
+            "clone",
+            url.toString(),
+            ...args.directory ? [args.directory] : []
+          ]);
+          spawnSync(
+            "git",
+            ["-C", destination, "config", "freestyle.identityId", identityId],
+            { stdio: "ignore" }
+          );
+          spawnSync(
+            "git",
+            ["-C", destination, "config", "freestyle.tokenId", tokenId],
+            { stdio: "ignore" }
+          );
+          spawnSync(
+            "git",
+            ["-C", destination, "config", "freestyle.permission", permission],
+            { stdio: "ignore" }
+          );
+          cloneSucceeded = true;
+          console.log(`
+\u2713 Clone complete (${permission} access)`);
+          console.log(
+            `  The access token is stored in ${destination}/.git/config;`
+          );
+          console.log(
+            `  git push and git pull will work from inside ${destination}.`
+          );
+        } catch (error) {
+          handleError(error);
+        } finally {
+          if (!cloneSucceeded) {
+            if (tokenId && identityId) {
+              try {
+                const identity = freestyle.identities.ref({ identityId });
+                await identity.tokens.revoke({ tokenId });
+              } catch (err) {
+                console.error("Warning: failed to revoke token:", err);
+              }
+            }
+            if (identityId) {
+              try {
+                await freestyle.identities.delete({ identityId });
+              } catch (err) {
+                console.error("Warning: failed to delete identity:", err);
+              }
+            }
+          }
+        }
+      }
     ).command(
       "delete <repoId>",
       "Delete a git repository",
@@ -1923,7 +2037,7 @@ const loginCommand = {
       if (teams.length > 1) {
         console.log(
           `
-\u2139\uFE0F  You have ${teams.length} teams. Use 'freestyle team switch' to change teams.`
+\u2139\uFE0F  You have ${teams.length} teams.`
         );
       }
     } catch (error) {

package/index.d.cts

@@ -5009,6 +5009,18 @@ interface PostV1VmsRequestBody {
         vmPort?: number | null;
     }[] | null;
     activityThresholdBytes?: number | null;
+    /**
+     * Optional Docker registry credentials required when using a private image
+     * in `baseImage` or `template.baseImage`.
+     */
+    dockerCredentials?: null | {
+        /** Docker registry URL (e.g., "ghcr.io", "docker.io") */
+        registry: string;
+        /** Username for the registry */
+        username: string;
+        /** Password or token for the registry */
+        password: string;
+    };
 }
 interface GetV1VmsSnapshotsQueryParams {
     includeDeleted?: boolean | null;
@@ -5375,6 +5387,18 @@ interface PostV1VmsSnapshotsRequestBody {
     } | {
         type: "persistent";
     });
+    /**
+     * Optional Docker registry credentials required when using a private image
+     * in `template.baseImage`.
+     */
+    dockerCredentials?: null | {
+        /** Docker registry URL (e.g., "ghcr.io", "docker.io") */
+        registry: string;
+        /** Username for the registry */
+        username: string;
+        /** Password or token for the registry */
+        password: string;
+    };
 }
 interface DeleteV1VmsSnapshotsSnapshotIdPathParams {
     /**
@@ -13361,6 +13385,10 @@ declare const VmBuilder: typeof VmWith;
 type RawBaseImage = {
     dockerfileContent: string;
 };
+/**
+ * Docker registry credentials for pulling private images.
+ */
+type DockerCredentials = NonNullable<PostV1VmsRequestBody["dockerCredentials"]>;
 /**
  * The raw systemd service type from the generated API
  */
@@ -13852,4 +13880,4 @@ declare class Freestyle {
 declare const freestyle: Freestyle;
 
 export { CronNamespace, Deployment, errors as Errors, FileSystem, Freestyle, GitRepo, Identity, requests as Requests, responses as Responses, Systemd, SystemdService, Vm, VmBaseImage, VmBuilder, VmService, VmSpec, VmTemplate, VmWith, VmWithInstance, debugCreateRequests, freestyle, readFiles };
-export type { BackgroundRequestLogger, CreateVmOptions, CronSchedule, FreestyleOptions, GitCommitSearchEntry, GitCommitSearchResult, GitDiffFileMatch, GitDiffLineMatch, GitDiffSearchCommit, GitDiffSearchResult, GitFilenameEntry, GitFilenameSearchResult, GitSearchFileResult, GitSearchLineMatch, GitSearchResult, SystemdServiceInput, VmWaitForConfig, VmWithDefaultFieldRecord };
+export type { BackgroundRequestLogger, CreateVmOptions, CronSchedule, DockerCredentials, FreestyleOptions, GitCommitSearchEntry, GitCommitSearchResult, GitDiffFileMatch, GitDiffLineMatch, GitDiffSearchCommit, GitDiffSearchResult, GitFilenameEntry, GitFilenameSearchResult, GitSearchFileResult, GitSearchLineMatch, GitSearchResult, SystemdServiceInput, VmWaitForConfig, VmWithDefaultFieldRecord };

package/index.d.mts

@@ -5009,6 +5009,18 @@ interface PostV1VmsRequestBody {
         vmPort?: number | null;
     }[] | null;
     activityThresholdBytes?: number | null;
+    /**
+     * Optional Docker registry credentials required when using a private image
+     * in `baseImage` or `template.baseImage`.
+     */
+    dockerCredentials?: null | {
+        /** Docker registry URL (e.g., "ghcr.io", "docker.io") */
+        registry: string;
+        /** Username for the registry */
+        username: string;
+        /** Password or token for the registry */
+        password: string;
+    };
 }
 interface GetV1VmsSnapshotsQueryParams {
     includeDeleted?: boolean | null;
@@ -5375,6 +5387,18 @@ interface PostV1VmsSnapshotsRequestBody {
     } | {
         type: "persistent";
     });
+    /**
+     * Optional Docker registry credentials required when using a private image
+     * in `template.baseImage`.
+     */
+    dockerCredentials?: null | {
+        /** Docker registry URL (e.g., "ghcr.io", "docker.io") */
+        registry: string;
+        /** Username for the registry */
+        username: string;
+        /** Password or token for the registry */
+        password: string;
+    };
 }
 interface DeleteV1VmsSnapshotsSnapshotIdPathParams {
     /**
@@ -13361,6 +13385,10 @@ declare const VmBuilder: typeof VmWith;
 type RawBaseImage = {
     dockerfileContent: string;
 };
+/**
+ * Docker registry credentials for pulling private images.
+ */
+type DockerCredentials = NonNullable<PostV1VmsRequestBody["dockerCredentials"]>;
 /**
  * The raw systemd service type from the generated API
  */
@@ -13852,4 +13880,4 @@ declare class Freestyle {
 declare const freestyle: Freestyle;
 
 export { CronNamespace, Deployment, errors as Errors, FileSystem, Freestyle, GitRepo, Identity, requests as Requests, responses as Responses, Systemd, SystemdService, Vm, VmBaseImage, VmBuilder, VmService, VmSpec, VmTemplate, VmWith, VmWithInstance, debugCreateRequests, freestyle, readFiles };
-export type { BackgroundRequestLogger, CreateVmOptions, CronSchedule, FreestyleOptions, GitCommitSearchEntry, GitCommitSearchResult, GitDiffFileMatch, GitDiffLineMatch, GitDiffSearchCommit, GitDiffSearchResult, GitFilenameEntry, GitFilenameSearchResult, GitSearchFileResult, GitSearchLineMatch, GitSearchResult, SystemdServiceInput, VmWaitForConfig, VmWithDefaultFieldRecord };
+export type { BackgroundRequestLogger, CreateVmOptions, CronSchedule, DockerCredentials, FreestyleOptions, GitCommitSearchEntry, GitCommitSearchResult, GitDiffFileMatch, GitDiffLineMatch, GitDiffSearchCommit, GitDiffSearchResult, GitFilenameEntry, GitFilenameSearchResult, GitSearchFileResult, GitSearchLineMatch, GitSearchResult, SystemdServiceInput, VmWaitForConfig, VmWithDefaultFieldRecord };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "freestyle",
-  "version": "0.1.46",
+  "version": "0.1.47",
   "type": "module",
   "exports": {
     "require": {