@general-input/cli 0.2.0 → 0.3.0

package/dist/cli.js

@@ -384,7 +384,7 @@ import chalk4 from "chalk";
 // package.json
 var package_default = {
   name: "@general-input/cli",
-  version: "0.2.0",
+  version: "0.3.0",
   type: "module",
   description: "The agent-facing CLI for General Input. Authenticate, manage workflows, run bash with operator credentials injected by the cloud.",
   license: "SEE LICENSE IN LICENSE",
@@ -1072,7 +1072,7 @@ import {
   existsSync,
   statSync
 } from "fs";
-import { join, dirname, relative, sep } from "path";
+import { join, relative, sep } from "path";
 var RESOURCE_MARKER_FILE = ".geni-resource.json";
 var SKIP_DIRS = /* @__PURE__ */ new Set(["node_modules", ".git", "dist", ".turbo"]);
 function readMarker(dir) {
@@ -1107,14 +1107,14 @@ function resolveResourceId(args) {
   );
   exit(ExitCode.InvalidArgs);
 }
-function readLocalFiles(dir) {
+function listResourceRelPaths(dir) {
   if (!existsSync(dir)) {
     printError(`Directory not found: ${dir}`);
     exit(ExitCode.InvalidArgs);
   }
-  const files = [];
-  walk(dir, dir, files);
-  return files;
+  const out = [];
+  walk(dir, dir, out);
+  return out;
 }
 function walk(root, current, out) {
   for (const entry of readdirSync(current)) {
@@ -1127,27 +1127,9 @@ function walk(root, current, out) {
       continue;
     }
     if (!stat.isFile()) continue;
-    const rel = relative(root, full).split(sep).join("/");
-    out.push(bufferToCliFile(rel, readFileSync(full)));
-  }
-}
-function writeLocalFiles(dir, files) {
-  for (const file of files) {
-    const target = join(dir, file.path);
-    mkdirSync(dirname(target), { recursive: true });
-    writeFileSync(target, cliFileBytes(file));
+    out.push(relative(root, full).split(sep).join("/"));
   }
 }
-function bufferToCliFile(path, buf) {
-  const asUtf8 = buf.toString("utf-8");
-  if (Buffer.from(asUtf8, "utf-8").equals(buf)) {
-    return { path, content: asUtf8, encoding: "utf8" };
-  }
-  return { path, content: buf.toString("base64"), encoding: "base64" };
-}
-function cliFileBytes(file) {
-  return file.encoding === "base64" ? Buffer.from(file.content, "base64") : file.content;
-}
 var MIME_BY_EXT = {
   json: "application/json",
   csv: "text/csv",
@@ -1176,6 +1158,32 @@ function dirHasResourceFiles(dir) {
   );
 }
 
+// src/lib/bundleArchive.ts
+import { mkdirSync as mkdirSync2 } from "fs";
+import { Readable } from "stream";
+import { create, extract } from "tar";
+async function packResourceDir(dir) {
+  const files = listResourceRelPaths(dir);
+  const stream = create({ gzip: true, cwd: dir, portable: true }, files);
+  const chunks = [];
+  for await (const chunk of stream) {
+    chunks.push(Buffer.from(chunk));
+  }
+  return Buffer.concat(chunks);
+}
+async function extractBundle(dir, buffer) {
+  mkdirSync2(dir, { recursive: true });
+  await new Promise((resolve20, reject) => {
+    const unpack = extract({
+      cwd: dir,
+      filter: (path) => !SKIP_DIRS.has(path.split("/")[0])
+    });
+    unpack.on("close", resolve20);
+    unpack.on("error", reject);
+    Readable.from(buffer).on("error", reject).pipe(unpack);
+  });
+}
+
 // src/services/WorkflowAuthoringService.ts
 var WorkflowAuthoringService = class {
   constructor(sessionContext) {
@@ -1189,13 +1197,13 @@ var WorkflowAuthoringService = class {
       workflowType: args.workflowType,
       name: args.name
     });
-    const filesResponse = await client.workflows.files(detail.id);
-    writeLocalFiles(args.dir, filesResponse.files);
+    const { downloadUrl } = await client.workflows.bundleUrl(detail.id);
+    const fileCount = await this.downloadBundleInto(downloadUrl, args.dir);
     writeMarker(args.dir, {
       resourceId: detail.id,
       resourceType: detail.workflowType
     });
-    return { detail, fileCount: filesResponse.files.length };
+    return { detail, fileCount };
   }
   async list() {
     const { client } = await this.sessionContext.requireAuthed();
@@ -1212,30 +1220,54 @@ var WorkflowAuthoringService = class {
   /** Download a workflow's live files into `dir` + write its marker. */
   async pull(args) {
     const { client } = await this.sessionContext.requireAuthed();
-    const response = await client.workflows.files(args.id);
-    writeLocalFiles(args.dir, response.files);
+    const { workflowType, downloadUrl } = await client.workflows.bundleUrl(
+      args.id
+    );
+    const fileCount = await this.downloadBundleInto(downloadUrl, args.dir);
     writeMarker(args.dir, {
       resourceId: args.id,
-      resourceType: response.workflowType
+      resourceType: workflowType
     });
-    return {
-      fileCount: response.files.length,
-      workflowType: response.workflowType
-    };
+    return { fileCount, workflowType };
   }
   async validate(args) {
     const { client } = await this.sessionContext.requireAuthed();
-    const files = readLocalFiles(args.dir);
-    return client.workflows.validate(args.id, { files });
+    const bundleKey = await this.uploadBundle(args.id, args.dir);
+    return client.workflows.validate(args.id, { bundleKey });
   }
   async publish(args) {
     const { client } = await this.sessionContext.requireAuthed();
-    const files = readLocalFiles(args.dir);
+    const bundleKey = await this.uploadBundle(args.id, args.dir);
     return client.workflows.publish(args.id, {
-      files,
+      bundleKey,
       changeSummary: args.changeSummary
     });
   }
+  /** Tar `dir`, PUT it to a presigned URL, return the staged `bundleKey`. */
+  async uploadBundle(id, dir) {
+    const { client } = await this.sessionContext.requireAuthed();
+    const buffer = await packResourceDir(dir);
+    const { uploadUrl, bundleKey, contentType } = await client.workflows.bundleUploadUrl(id);
+    const response = await fetch(uploadUrl, {
+      method: "PUT",
+      headers: { "Content-Type": contentType },
+      body: new Uint8Array(buffer)
+    });
+    if (!response.ok) {
+      throw new Error(`Bundle upload failed (HTTP ${response.status}).`);
+    }
+    return bundleKey;
+  }
+  /** GET a presigned bundle URL, extract it into `dir`, return the file count. */
+  async downloadBundleInto(downloadUrl, dir) {
+    const response = await fetch(downloadUrl);
+    if (!response.ok) {
+      throw new Error(`Bundle download failed (HTTP ${response.status}).`);
+    }
+    const buffer = Buffer.from(await response.arrayBuffer());
+    await extractBundle(dir, buffer);
+    return listResourceRelPaths(dir).length;
+  }
   async getConfig(id) {
     const { client } = await this.sessionContext.requireAuthed();
     return client.workflows.getConfig(id);
@@ -1467,9 +1499,18 @@ var WorkflowsApiClient = class {
       body
     });
   }
-  async files(id) {
+  async bundleUrl(id) {
     this.http.requireAuthed();
-    return this.http.fetch(`/cli/workflows/${encodeURIComponent(id)}/files`);
+    return this.http.fetch(
+      `/cli/workflows/${encodeURIComponent(id)}/bundle-url`
+    );
+  }
+  async bundleUploadUrl(id) {
+    this.http.requireAuthed();
+    return this.http.fetch(
+      `/cli/workflows/${encodeURIComponent(id)}/bundle-upload-url`,
+      { method: "POST" }
+    );
   }
   async validate(id, body) {
     this.http.requireAuthed();
@@ -1720,7 +1761,7 @@ function isErrnoCode(err, expected) {
 // src/clients/ConfigStore.ts
 import { readFileSync as readFileSync3 } from "fs";
 import { mkdir as mkdir2, writeFile as writeFile2, unlink as unlink2 } from "fs/promises";
-import { dirname as dirname2 } from "path";
+import { dirname } from "path";
 var ConfigStore = class {
   constructor(filePath) {
     this.filePath = filePath;
@@ -1752,7 +1793,7 @@ var ConfigStore = class {
    * config is non-secret, unlike the session file.
    */
   async save(config) {
-    await mkdir2(dirname2(this.filePath), { recursive: true });
+    await mkdir2(dirname(this.filePath), { recursive: true });
     await writeFile2(this.filePath, JSON.stringify(config, null, 2) + "\n", {
       mode: 420
     });
@@ -3571,12 +3612,12 @@ function registerWorkflowExecutions(parent) {
 import { resolve as resolve14 } from "path";
 
 // src/lib/executionTrace.ts
-import { mkdirSync as mkdirSync2, writeFileSync as writeFileSync2 } from "fs";
+import { mkdirSync as mkdirSync3, writeFileSync as writeFileSync2 } from "fs";
 import { join as join3, resolve as resolve13 } from "path";
 function writeExecutionTraceBundle(args) {
   const { baseDir, trace } = args;
   const dir = resolve13(baseDir, trace.id);
-  mkdirSync2(dir, { recursive: true });
+  mkdirSync3(dir, { recursive: true });
   const files = [];
   const write = (name, content) => {
     const path = join3(dir, name);
@@ -4118,7 +4159,7 @@ logout (or use \`geni login --server <url>\`) to switch in one step.
 import { homedir as homedir2 } from "os";
 import { join as join4 } from "path";
 import {
-  mkdirSync as mkdirSync3,
+  mkdirSync as mkdirSync4,
   writeFileSync as writeFileSync3,
   existsSync as existsSync3,
   readFileSync as readFileSync4,
@@ -4177,7 +4218,7 @@ function installSkills() {
     if (!target.detect()) continue;
     const path = target.skillPath;
     try {
-      mkdirSync3(target.skillDir, { recursive: true });
+      mkdirSync4(target.skillDir, { recursive: true });
       const previous = existsSync3(path) ? readFileSync4(path, "utf-8") : null;
       const changed = previous !== GENI_SKILL_MD;
       writeFileSync3(path, GENI_SKILL_MD);