@agentuity/cli 3.0.0-alpha.7 → 3.0.0-beta.0

package/dist/cmd/project/random-name.js

@@ -0,0 +1,144 @@
+/**
+ * Generates project-derived suggestions for resource names (DB / S3 bucket).
+ *
+ * The CLI shows these as a dim "press Enter to use ..." default in the create flow.
+ * If the user presses Enter, the suggestion is sent to the server. Otherwise the
+ * server is responsible for assigning a name when none is provided.
+ *
+ * Both suggestions are validated against the same rules the server enforces
+ * (`validateBucketName` / `validateDatabaseName` from `@agentuity/server`) so the
+ * happy path can never produce an invalid suggestion.
+ */
+import { validateBucketName, validateDatabaseName } from '@agentuity/server';
+const BUCKET_MAX = 63;
+const BUCKET_MIN = 3;
+const DB_MAX = 63;
+/** 3 lowercase alphanumeric chars, e.g. "k7p". */
+function shortSuffix() {
+    // toString(36) yields [0-9a-z]; slice 3 chars after the "0." prefix.
+    const s = Math.random().toString(36).slice(2, 5);
+    // Pad in the (extremely unlikely) case the slice is shorter than 3 chars.
+    return s.length === 3 ? s : (s + '000').slice(0, 3);
+}
+/**
+ * Sanitize a project name into the bucket-name alphabet:
+ * - lowercase
+ * - spaces / underscores / dots → hyphens
+ * - drop anything else
+ * - collapse and trim hyphens
+ * - strip reserved prefixes (`agentuity*`, `ag-*`, `ago-*`, `xn--`)
+ */
+function sanitizeForBucket(name) {
+    let out = name
+        .toLowerCase()
+        .trim()
+        .replace(/[\s_.]+/g, '-')
+        .replace(/[^a-z0-9-]/g, '')
+        .replace(/-+/g, '-')
+        .replace(/^-+|-+$/g, '');
+    // Strip reserved prefixes (rules from validateBucketName).
+    while (out.startsWith('agentuity') ||
+        out.startsWith('ag-') ||
+        out.startsWith('ago-') ||
+        out.startsWith('xn--')) {
+        if (out.startsWith('agentuity'))
+            out = out.slice('agentuity'.length);
+        else if (out.startsWith('ago-'))
+            out = out.slice('ago-'.length);
+        else if (out.startsWith('ag-'))
+            out = out.slice('ag-'.length);
+        else if (out.startsWith('xn--'))
+            out = out.slice('xn--'.length);
+        out = out.replace(/^-+/, '');
+    }
+    return out;
+}
+/**
+ * Sanitize a project name into the database-name alphabet:
+ * - lowercase
+ * - non `[a-z0-9_]` → `_`
+ * - collapse and trim underscores
+ * - ensure it starts with a letter or underscore (prepend `p_` otherwise)
+ * - strip reserved `pg_` prefix
+ */
+function sanitizeForDatabase(name) {
+    let out = name
+        .toLowerCase()
+        .trim()
+        .replace(/[^a-z0-9_]+/g, '_')
+        .replace(/_+/g, '_')
+        .replace(/^_+|_+$/g, '');
+    if (!/^[a-z_]/.test(out)) {
+        out = out.length > 0 ? `p_${out}` : '';
+    }
+    while (out.startsWith('pg_')) {
+        out = out.slice(3).replace(/^_+/, '');
+        if (!/^[a-z_]/.test(out) && out.length > 0)
+            out = `p_${out}`;
+    }
+    return out;
+}
+/**
+ * Truncate so the final string (`<base>-<suffixWithDash>`) fits within `max` chars
+ * while keeping the suffix intact and not ending on a hyphen.
+ */
+function truncateBaseHyphen(base, suffixWithDash, max) {
+    const room = max - suffixWithDash.length;
+    if (room <= 0)
+        return '';
+    let out = base.slice(0, room);
+    out = out.replace(/-+$/, '');
+    return out;
+}
+/** Same as `truncateBaseHyphen` but for underscore-joined names (database). */
+function truncateBaseUnderscore(base, suffixWithUnderscore, max) {
+    const room = max - suffixWithUnderscore.length;
+    if (room <= 0)
+        return '';
+    let out = base.slice(0, room);
+    out = out.replace(/_+$/, '');
+    return out;
+}
+/**
+ * Generate a suggested S3 bucket name derived from the project name.
+ * Format: `<sanitized-project>-storage-<3char>` (≤ 63 chars).
+ *
+ * Falls back to `bucket-<3char><3char>` if the project name produces nothing usable.
+ * Always returns a value that passes `validateBucketName`.
+ */
+export function suggestBucketName(projectName) {
+    const sanitized = sanitizeForBucket(projectName);
+    // Try a few times in case sanitization + suffix happens to land on something invalid.
+    for (let attempt = 0; attempt < 5; attempt++) {
+        const suffix = `-storage-${shortSuffix()}`;
+        const base = truncateBaseHyphen(sanitized, suffix, BUCKET_MAX);
+        const candidate = base.length > 0 ? `${base}${suffix}` : `bucket${suffix}`;
+        if (candidate.length >= BUCKET_MIN && validateBucketName(candidate).valid) {
+            return candidate;
+        }
+    }
+    // Pure fallback: short, always-valid generic name.
+    const fallback = `bucket-${shortSuffix()}${shortSuffix()}`;
+    return validateBucketName(fallback).valid ? fallback : `bucket-${shortSuffix()}aaa`;
+}
+/**
+ * Generate a suggested PostgreSQL database name derived from the project name.
+ * Format: `<sanitized-project>_db_<3char>` (≤ 63 chars).
+ *
+ * Falls back to `db_<3char><3char>` if the project name produces nothing usable.
+ * Always returns a value that passes `validateDatabaseName`.
+ */
+export function suggestDatabaseName(projectName) {
+    const sanitized = sanitizeForDatabase(projectName);
+    for (let attempt = 0; attempt < 5; attempt++) {
+        const suffix = `_db_${shortSuffix()}`;
+        const base = truncateBaseUnderscore(sanitized, suffix, DB_MAX);
+        const candidate = base.length > 0 ? `${base}${suffix}` : `db${suffix}`;
+        if (validateDatabaseName(candidate).valid) {
+            return candidate;
+        }
+    }
+    const fallback = `db_${shortSuffix()}${shortSuffix()}`;
+    return validateDatabaseName(fallback).valid ? fallback : `db_${shortSuffix()}aaa`;
+}
+//# sourceMappingURL=random-name.js.map

package/dist/cmd/project/random-name.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"random-name.js","sourceRoot":"","sources":["../../../src/cmd/project/random-name.ts"],"names":[],"mappings":"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"}

package/dist/cmd/project/reconcile.d.ts

@@ -1,10 +1,10 @@
 import type { Logger } from '@agentuity/core';
 import { projectGet, projectCreate, projectEnvUpdate, listOrganizations } from '@agentuity/server';
-import type { APIClient } from '../../api';
-import type { AuthData, Config, Project } from '../../types';
-import { loadProjectConfig, createProjectConfig } from '../../config';
-import * as tui from '../../tui';
-import { isTTY } from '../../auth';
+import type { APIClient } from '../../api.ts';
+import type { AuthData, Config, Project } from '../../types.ts';
+import { loadProjectConfig, createProjectConfig } from '../../config.ts';
+import * as tui from '../../tui.ts';
+import { isTTY } from '../../auth.ts';
 export interface ReconcileResult {
     status: 'valid' | 'imported' | 'skipped' | 'error';
     project?: Project;

package/dist/cmd/project/reconcile.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"reconcile.d.ts","sourceRoot":"","sources":["../../../src/cmd/project/reconcile.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,iBAAiB,CAAC;AAC9C,OAAO,EACN,UAAU,EACV,aAAa,EACb,gBAAgB,EAChB,iBAAiB,EAGjB,MAAM,mBAAmB,CAAC;AAC3B,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,WAAW,CAAC;AAC3C,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,aAAa,CAAC;AAC7D,OAAO,EAAE,iBAAiB,EAAE,mBAAmB,EAAE,MAAM,cAAc,CAAC;AACtE,OAAO,KAAK,GAAG,MAAM,WAAW,CAAC;AAEjC,OAAO,EAAE,KAAK,EAAE,MAAM,YAAY,CAAC;AAWnC,MAAM,WAAW,eAAe;IAC/B,MAAM,EAAE,OAAO,GAAG,UAAU,GAAG,SAAS,GAAG,OAAO,CAAC;IACnD,OAAO,CAAC,EAAE,OAAO,CAAC;IAClB,OAAO,CAAC,EAAE,MAAM,CAAC;CACjB;AAED,MAAM,WAAW,gBAAgB;IAChC,GAAG,EAAE,MAAM,CAAC;IACZ,IAAI,EAAE,QAAQ,CAAC;IACf,SAAS,EAAE,SAAS,CAAC;IACrB,MAAM,EAAE,MAAM,CAAC;IACf,MAAM,EAAE,MAAM,CAAC;IACf,WAAW,CAAC,EAAE,OAAO,CAAC;IACtB,8CAA8C;IAC9C,YAAY,CAAC,EAAE,OAAO,CAAC;IACvB,yDAAyD;IACzD,OAAO,CAAC,EAAE,OAAO,CAAC;IAClB,gEAAgE;IAChE,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,0DAA0D;IAC1D,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,oCAAoC;IACpC,IAAI,CAAC,EAAE,MAAM,CAAC;CACd;AAED;;GAEG;AACH,MAAM,WAAW,aAAa;IAC7B,UAAU,EAAE,OAAO,UAAU,CAAC;IAC9B,aAAa,EAAE,OAAO,aAAa,CAAC;IACpC,gBAAgB,EAAE,OAAO,gBAAgB,CAAC;IAC1C,iBAAiB,EAAE,OAAO,iBAAiB,CAAC;IAC5C,iBAAiB,EAAE,OAAO,iBAAiB,CAAC;IAC5C,mBAAmB,EAAE,OAAO,mBAAmB,CAAC;IAChD,KAAK,EAAE,OAAO,KAAK,CAAC;IACpB,OAAO,EAAE,OAAO,GAAG,CAAC,OAAO,CAAC;IAC5B,kBAAkB,EAAE,OAAO,GAAG,CAAC,kBAAkB,CAAC;CAClD;AAcD;;;GAGG;AACH,wBAAsB,oBAAoB,CACzC,GAAG,EAAE,MAAM,EACX,MAAM,EAAE,MAAM,GAAG,IAAI,EACrB,IAAI,GAAE,IAAI,CAAC,aAAa,EAAE,mBAAmB,CAAe,GAC1D,OAAO,CAAC,OAAO,GAAG,IAAI,CAAC,CAMzB;AAED;;;GAGG;AACH,wBAAsB,qBAAqB,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC,CAcxE;AAED;;;GAGG;AACH,wBAAsB,uBAAuB,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC,CA2B3E;AAyaD;;;;;;;;;GASG;AACH,wBAAsB,gBAAgB,CAAC,IAAI,EAAE,gBAAgB,GAAG,OAAO,CAAC,eAAe,CAAC,CA2EvF;AAED;;GAEG;AACH,wBAAsB,gBAAgB,CAAC,IAAI,EAAE,gBAAgB,GAAG,OAAO,CAAC,eAAe,CAAC,CA6FvF"}
+{"version":3,"file":"reconcile.d.ts","sourceRoot":"","sources":["../../../src/cmd/project/reconcile.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,iBAAiB,CAAC;AAE9C,OAAO,EACN,UAAU,EACV,aAAa,EACb,gBAAgB,EAChB,iBAAiB,EAGjB,MAAM,mBAAmB,CAAC;AAC3B,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,cAAc,CAAC;AAC9C,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,gBAAgB,CAAC;AAChE,OAAO,EAAE,iBAAiB,EAAE,mBAAmB,EAAE,MAAM,iBAAiB,CAAC;AACzE,OAAO,KAAK,GAAG,MAAM,cAAc,CAAC;AAEpC,OAAO,EAAE,KAAK,EAAE,MAAM,eAAe,CAAC;AAWtC,MAAM,WAAW,eAAe;IAC/B,MAAM,EAAE,OAAO,GAAG,UAAU,GAAG,SAAS,GAAG,OAAO,CAAC;IACnD,OAAO,CAAC,EAAE,OAAO,CAAC;IAClB,OAAO,CAAC,EAAE,MAAM,CAAC;CACjB;AAED,MAAM,WAAW,gBAAgB;IAChC,GAAG,EAAE,MAAM,CAAC;IACZ,IAAI,EAAE,QAAQ,CAAC;IACf,SAAS,EAAE,SAAS,CAAC;IACrB,MAAM,EAAE,MAAM,CAAC;IACf,MAAM,EAAE,MAAM,CAAC;IACf,WAAW,CAAC,EAAE,OAAO,CAAC;IACtB,8CAA8C;IAC9C,YAAY,CAAC,EAAE,OAAO,CAAC;IACvB,yDAAyD;IACzD,OAAO,CAAC,EAAE,OAAO,CAAC;IAClB,gEAAgE;IAChE,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,0DAA0D;IAC1D,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,oCAAoC;IACpC,IAAI,CAAC,EAAE,MAAM,CAAC;CACd;AAED;;GAEG;AACH,MAAM,WAAW,aAAa;IAC7B,UAAU,EAAE,OAAO,UAAU,CAAC;IAC9B,aAAa,EAAE,OAAO,aAAa,CAAC;IACpC,gBAAgB,EAAE,OAAO,gBAAgB,CAAC;IAC1C,iBAAiB,EAAE,OAAO,iBAAiB,CAAC;IAC5C,iBAAiB,EAAE,OAAO,iBAAiB,CAAC;IAC5C,mBAAmB,EAAE,OAAO,mBAAmB,CAAC;IAChD,KAAK,EAAE,OAAO,KAAK,CAAC;IACpB,OAAO,EAAE,OAAO,GAAG,CAAC,OAAO,CAAC;IAC5B,kBAAkB,EAAE,OAAO,GAAG,CAAC,kBAAkB,CAAC;CAClD;AAcD;;;GAGG;AACH,wBAAsB,oBAAoB,CACzC,GAAG,EAAE,MAAM,EACX,MAAM,EAAE,MAAM,GAAG,IAAI,EACrB,IAAI,GAAE,IAAI,CAAC,aAAa,EAAE,mBAAmB,CAAe,GAC1D,OAAO,CAAC,OAAO,GAAG,IAAI,CAAC,CAMzB;AAED;;;GAGG;AACH,wBAAsB,qBAAqB,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC,CAcxE;AAED;;;GAGG;AACH,wBAAsB,uBAAuB,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC,CA2B3E;AAwaD;;;;;;;;;GASG;AACH,wBAAsB,gBAAgB,CAAC,IAAI,EAAE,gBAAgB,GAAG,OAAO,CAAC,eAAe,CAAC,CA2EvF;AAED;;GAEG;AACH,wBAAsB,gBAAgB,CAAC,IAAI,EAAE,gBAAgB,GAAG,OAAO,CAAC,eAAe,CAAC,CA6FvF"}

package/dist/cmd/project/reconcile.js

@@ -1,13 +1,15 @@
-import { join, basename } from 'node:path';
 import { existsSync, statSync } from 'node:fs';
+import { readFile, writeFile } from 'node:fs/promises';
+import { basename, join } from 'node:path';
+import { pathExists } from "../../node-compat/fs.js";
 import { projectGet, projectCreate, projectEnvUpdate, listOrganizations, } from '@agentuity/server';
-import { loadProjectConfig, createProjectConfig } from '../../config';
-import * as tui from '../../tui';
-import { createPrompt } from '../../tui';
-import { isTTY } from '../../auth';
-import { findExistingEnvFile, readEnvFile, writeEnvFile, filterAgentuitySdkKeys, splitEnvAndSecrets, } from '../../env-util';
-import { fetchRegionsWithCache } from '../../regions';
-import { getCachedProject, setCachedProject } from '../../cache';
+import { loadProjectConfig, createProjectConfig } from "../../config.js";
+import * as tui from "../../tui.js";
+import { createPrompt } from "../../tui.js";
+import { isTTY } from "../../auth.js";
+import { findExistingEnvFile, readEnvFile, writeEnvFile, filterAgentuitySdkKeys, splitEnvAndSecrets, } from "../../env-util.js";
+import { fetchRegionsWithCache } from "../../regions.js";
+import { getCachedProject, setCachedProject } from "../../cache/index.js";
 const defaultDeps = {
     projectGet,
     projectCreate,
@@ -37,9 +39,9 @@ export async function tryLoadProjectConfig(dir, config, deps = defaultDeps) {
  */
 export async function getDefaultProjectName(dir) {
     const pkgPath = join(dir, 'package.json');
-    if (await Bun.file(pkgPath).exists()) {
+    if (await pathExists(pkgPath)) {
         try {
-            const pkg = await Bun.file(pkgPath).json();
+            const pkg = JSON.parse(await readFile(pkgPath, 'utf-8'));
             if (pkg.name && typeof pkg.name === 'string' && pkg.name.trim()) {
                 // Strip org scope if present (e.g., @myorg/project-name -> project-name)
                 return pkg.name.replace(/^@[^/]+\//, '').trim();
@@ -58,9 +60,9 @@ export async function getDefaultProjectName(dir) {
 export async function isValidProjectStructure(dir) {
     // Check 1: package.json exists (any JS/TS project is valid)
     const pkgPath = join(dir, 'package.json');
-    if (await Bun.file(pkgPath).exists()) {
+    if (await pathExists(pkgPath)) {
         try {
-            const pkg = await Bun.file(pkgPath).json();
+            const pkg = JSON.parse(await readFile(pkgPath, 'utf-8'));
             // Valid if it has a name and at least some structure
             if (pkg.name || pkg.dependencies || pkg.devDependencies) {
                 return true;
@@ -74,7 +76,7 @@ export async function isValidProjectStructure(dir) {
     const agentuityDir = join(dir, 'agentuity');
     if (existsSync(agentuityDir) && statSync(agentuityDir).isDirectory()) {
         const childPkgPath = join(agentuityDir, 'package.json');
-        if (await Bun.file(childPkgPath).exists()) {
+        if (await pathExists(childPkgPath)) {
             return true;
         }
     }
@@ -85,8 +87,7 @@ export async function isValidProjectStructure(dir) {
  */
 async function updateSdkKeyInEnv(dir, sdkKey) {
     const envPath = join(dir, '.env');
-    const envFile = Bun.file(envPath);
-    if (await envFile.exists()) {
+    if (await pathExists(envPath)) {
         // Update existing .env - read, modify, write
         const existing = await readEnvFile(envPath);
         existing.AGENTUITY_SDK_KEY = sdkKey;
@@ -96,7 +97,7 @@ async function updateSdkKeyInEnv(dir, sdkKey) {
         // Create new .env
         const comment = '# AGENTUITY_SDK_KEY is a sensitive value and should not be committed to version control.';
         const content = `${comment}\nAGENTUITY_SDK_KEY=${sdkKey}\n`;
-        await Bun.write(envPath, content);
+        await writeFile(envPath, content);
     }
 }
 /**

package/dist/cmd/project/reconcile.js.map

@@ -1 +1 @@
-{"version":3,"file":"reconcile.js","sourceRoot":"","sources":["../../../src/cmd/project/reconcile.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"reconcile.js","sourceRoot":"","sources":["../../../src/cmd/project/reconcile.ts"],"names":[],"mappings":"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"}

package/dist/cmd/project/remote-import.d.ts

@@ -1,6 +1,6 @@
 import { type Logger } from '@agentuity/core';
-import type { APIClient } from '../../api';
-import type { AuthData, Config } from '../../types';
+import type { APIClient } from '../../api.ts';
+import type { AuthData, Config } from '../../types.ts';
 export interface RemoteImportOptions {
     url: string;
     deploy: boolean;

package/dist/cmd/project/remote-import.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"remote-import.d.ts","sourceRoot":"","sources":["../../../src/cmd/project/remote-import.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,KAAK,MAAM,EAAoC,MAAM,iBAAiB,CAAC;AAUhF,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,WAAW,CAAC;AAY3C,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,EAAE,MAAM,aAAa,CAAC;AA8BpD,MAAM,WAAW,mBAAmB;IACnC,GAAG,EAAE,MAAM,CAAC;IACZ,MAAM,EAAE,OAAO,CAAC;IAChB,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,GAAG,CAAC,EAAE,MAAM,EAAE,CAAC;IACf,GAAG,CAAC,EAAE,MAAM,CAAC;IACb,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,0DAA0D;IAC1D,OAAO,CAAC,EAAE,OAAO,CAAC;IAClB,SAAS,EAAE,SAAS,CAAC;IACrB,IAAI,EAAE,QAAQ,CAAC;IACf,MAAM,EAAE,MAAM,CAAC;IACf,MAAM,EAAE,MAAM,CAAC;CACf;AAED,UAAU,eAAe;IACxB,KAAK,EAAE,MAAM,CAAC;IACd,IAAI,EAAE,MAAM,CAAC;IACb,MAAM,EAAE,MAAM,CAAC;IACf,SAAS,CAAC,EAAE,MAAM,CAAC;CACnB;AAsDD;;;;;;;;;;GAUG;AACH,wBAAsB,cAAc,CAAC,GAAG,EAAE,MAAM,EAAE,SAAS,EAAE,SAAS,GAAG,OAAO,CAAC,eAAe,CAAC,CA0ChG;AA2aD;;GAEG;AACH,wBAAsB,eAAe,CAAC,OAAO,EAAE,mBAAmB,GAAG,OAAO,CAAC,IAAI,CAAC,CA8tBjF"}
+{"version":3,"file":"remote-import.d.ts","sourceRoot":"","sources":["../../../src/cmd/project/remote-import.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,KAAK,MAAM,EAAoC,MAAM,iBAAiB,CAAC;AAahF,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,cAAc,CAAC;AAY9C,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,EAAE,MAAM,gBAAgB,CAAC;AA8BvD,MAAM,WAAW,mBAAmB;IACnC,GAAG,EAAE,MAAM,CAAC;IACZ,MAAM,EAAE,OAAO,CAAC;IAChB,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,GAAG,CAAC,EAAE,MAAM,EAAE,CAAC;IACf,GAAG,CAAC,EAAE,MAAM,CAAC;IACb,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,0DAA0D;IAC1D,OAAO,CAAC,EAAE,OAAO,CAAC;IAClB,SAAS,EAAE,SAAS,CAAC;IACrB,IAAI,EAAE,QAAQ,CAAC;IACf,MAAM,EAAE,MAAM,CAAC;IACf,MAAM,EAAE,MAAM,CAAC;CACf;AAED,UAAU,eAAe;IACxB,KAAK,EAAE,MAAM,CAAC;IACd,IAAI,EAAE,MAAM,CAAC;IACb,MAAM,EAAE,MAAM,CAAC;IACf,SAAS,CAAC,EAAE,MAAM,CAAC;CACnB;AAsDD;;;;;;;;;;GAUG;AACH,wBAAsB,cAAc,CAAC,GAAG,EAAE,MAAM,EAAE,SAAS,EAAE,SAAS,GAAG,OAAO,CAAC,eAAe,CAAC,CA0ChG;AAmZD;;GAEG;AACH,wBAAsB,eAAe,CAAC,OAAO,EAAE,mBAAmB,GAAG,OAAO,CAAC,IAAI,CAAC,CAqtBjF"}

package/dist/cmd/project/remote-import.js

@@ -1,17 +1,21 @@
 import { cpSync, existsSync, mkdirSync, mkdtempSync, readdirSync, rmSync } from 'node:fs';
+import { readFile, writeFile } from 'node:fs/promises';
 import { tmpdir } from 'node:os';
 import { join } from 'node:path';
 import { parseEnvExample, StructuredError } from '@agentuity/core';
+import { parse as parseYaml } from 'yaml';
+import { pathExists } from "../../node-compat/fs.js";
+import { run, spawnInherit } from "../../node-compat/proc.js";
 import { createQueue, createResources, listOrganizations, listQueues, listResources, projectCreate, validateDatabaseName, } from '@agentuity/server';
-import { isTTY } from '../../auth';
-import { createProjectConfig, getCatalystAPIClient, getGlobalCatalystAPIClient, } from '../../config';
-import { addResourceEnvVars } from '../../env-util';
-import { getDefaultBranch, isGitAvailable } from '../../git-helper';
-import { fetchRegionsWithCache } from '../../regions';
-import * as tui from '../../tui';
-import { createPrompt } from '../../tui';
-import { checkGithubRepo, createGithubRepo, getGithubBotIdentity, getGithubToken, linkProjectToRepo, } from '../git/api';
-import { initGitRepo } from './scaffold';
+import { isTTY } from "../../auth.js";
+import { createProjectConfig, getCatalystAPIClient, getGlobalCatalystAPIClient, } from "../../config.js";
+import { addResourceEnvVars } from "../../env-util.js";
+import { getDefaultBranch, isGitAvailable, runGit } from "../../git-helper.js";
+import { fetchRegionsWithCache } from "../../regions.js";
+import * as tui from "../../tui.js";
+import { createPrompt } from "../../tui.js";
+import { checkGithubRepo, createGithubRepo, getGithubBotIdentity, getGithubToken, linkProjectToRepo, } from "../git/api.js";
+import { initGitRepo } from "./scaffold.js";
 // ─── Structured Errors ───
 const RemoteImportInvalidURLError = StructuredError('RemoteImportInvalidURLError');
 const RemoteImportUnsupportedHostError = StructuredError('RemoteImportUnsupportedHostError');
@@ -148,7 +152,7 @@ async function downloadAndExtract(parsed, apiClient, logger) {
                     });
                 }
                 const buffer = Buffer.from(await resp.arrayBuffer());
-                await Bun.write(zipPath, buffer);
+                await writeFile(zipPath, buffer);
                 logger.debug('[remote-import] Downloaded %d bytes to %s', buffer.length, zipPath);
                 return resp;
             },
@@ -160,15 +164,14 @@ async function downloadAndExtract(parsed, apiClient, logger) {
             message: 'Extracting template...',
             clearOnSuccess: true,
             callback: async () => {
-                // Use Bun's built-in unzip via subprocess
-                const proc = Bun.spawnSync(['unzip', '-q', '-o', zipPath, '-d', extractDir], {
-                    stdout: 'pipe',
-                    stderr: 'pipe',
+                // Use the system unzip via subprocess (avoids bundling a JS
+                // zip library; unzip is available on macOS/Linux by default).
+                const proc = await run({
+                    cmd: ['unzip', '-q', '-o', zipPath, '-d', extractDir],
                 });
                 if (proc.exitCode !== 0) {
-                    const stderr = proc.stderr.toString();
                     throw new RemoteImportExtractError({
-                        message: `Failed to extract zip: ${stderr}`,
+                        message: `Failed to extract zip: ${proc.stderr}`,
                     });
                 }
                 logger.debug('[remote-import] Extracted to %s', extractDir);
@@ -200,15 +203,13 @@ async function downloadAndExtract(parsed, apiClient, logger) {
  */
 async function findAgentuityYaml(dir, logger) {
     const yamlPath = join(dir, 'agentuity.yaml');
-    const file = Bun.file(yamlPath);
-    if (!(await file.exists())) {
+    if (!(await pathExists(yamlPath))) {
         logger.debug('[remote-import] No agentuity.yaml found at %s', yamlPath);
         return null;
     }
     try {
-        const { YAML } = await import('bun');
-        const content = await file.text();
-        const parsed = YAML.parse(content);
+        const content = await readFile(yamlPath, 'utf-8');
+        const parsed = parseYaml(content);
         logger.debug('[remote-import] Parsed agentuity.yaml: %o', parsed);
         return parsed;
     }
@@ -409,33 +410,21 @@ async function pushToRepo(dest, repoUrl, apiClient, logger) {
         clearOnSuccess: true,
         callback: async () => {
             // Add remote origin
-            const addRemote = Bun.spawnSync(['git', 'remote', 'add', 'origin', remoteUrl], {
-                cwd: dest,
-                stdout: 'pipe',
-                stderr: 'pipe',
-            });
-            if (addRemote.exitCode !== 0) {
+            const addRemote = await runGit(['remote', 'add', 'origin', remoteUrl], { cwd: dest });
+            if (!addRemote.ok) {
                 // Remote might already exist, try set-url instead
-                const setUrl = Bun.spawnSync(['git', 'remote', 'set-url', 'origin', remoteUrl], {
-                    cwd: dest,
-                    stdout: 'pipe',
-                    stderr: 'pipe',
-                });
-                if (setUrl.exitCode !== 0) {
+                const setUrl = await runGit(['remote', 'set-url', 'origin', remoteUrl], { cwd: dest });
+                if (!setUrl.ok) {
                     throw new RemoteImportGitError({
-                        message: `Failed to set git remote: ${sanitizeTokens(setUrl.stderr.toString())}`,
+                        message: `Failed to set git remote: ${sanitizeTokens(setUrl.stderr)}`,
                     });
                 }
             }
             // Push to remote
-            const push = Bun.spawnSync(['git', 'push', '-u', 'origin', defaultBranch], {
-                cwd: dest,
-                stdout: 'pipe',
-                stderr: 'pipe',
-            });
-            if (push.exitCode !== 0) {
+            const push = await runGit(['push', '-u', 'origin', defaultBranch], { cwd: dest });
+            if (!push.ok) {
                 throw new RemoteImportGitError({
-                    message: `Failed to push to remote: ${sanitizeTokens(push.stderr.toString())}`,
+                    message: `Failed to push to remote: ${sanitizeTokens(push.stderr)}`,
                 });
             }
             logger.debug('[remote-import] Pushed to %s on branch %s', repoUrl, defaultBranch);
@@ -454,15 +443,7 @@ async function runDeploy(dest, logger) {
     tui.info('Deploying project...');
     const args = ['bunx', 'agentuity', 'deploy', '--trigger', 'cli', '--event', 'manual'];
     logger.debug('[remote-import] Running deploy: %s', args.join(' '));
-    const proc = Bun.spawn(args, {
-        cwd: dest,
-        stdout: 'inherit',
-        stderr: 'inherit',
-        env: {
-            ...process.env,
-        },
-    });
-    const exitCode = await proc.exited;
+    const { exitCode } = await spawnInherit({ cmd: args, cwd: dest });
     if (exitCode !== 0) {
         throw new RemoteImportDeployError({
             message: `Deploy failed with exit code ${exitCode}`,
@@ -475,19 +456,14 @@ async function runDeploy(dest, logger) {
 export async function runRemoteImport(options) {
     const { url, deploy, projectId, repo, name, env, org, region: optRegion, apiClient, auth, config, logger, } = options;
     // Safety check: refuse to run inside an existing git repo
-    try {
-        const result = Bun.spawnSync(['git', 'rev-parse', '--is-inside-work-tree'], {
-            cwd: process.cwd(),
-            stdout: 'pipe',
-            stderr: 'pipe',
-        });
-        if (result.exitCode === 0 && result.stdout.toString().trim() === 'true') {
-            tui.fatal('Cannot run remote import inside an existing git repository. Please run from an empty directory.');
-        }
-    }
-    catch {
-        // git not found or command failed — not inside a repo, which is fine
+    const insideTree = await runGit(['rev-parse', '--is-inside-work-tree'], {
+        cwd: process.cwd(),
+    });
+    if (insideTree.ok && insideTree.stdout === 'true') {
+        tui.fatal('Cannot run remote import inside an existing git repository. Please run from an empty directory.');
     }
+    // If git wasn't found or the command failed for any other reason, we're not inside
+    // a repo (or can't tell), which is the same outcome — fall through.
     // 1. Parse GitHub URL (async — may query GitHub API for default branch)
     const parsed = await parseGitHubUrl(url, apiClient);
     logger.debug('[remote-import] Parsed URL: owner=%s repo=%s branch=%s dir=%s', parsed.owner, parsed.repo, parsed.branch, parsed.directory ?? '(root)');
@@ -576,9 +552,9 @@ export async function runRemoteImport(options) {
         ]);
         let template;
         const envExamplePath = join(sourceDir, '.env.example');
-        if (await Bun.file(envExamplePath).exists()) {
+        if (await pathExists(envExamplePath)) {
             try {
-                const envContent = await Bun.file(envExamplePath).text();
+                const envContent = await readFile(envExamplePath, 'utf-8');
                 const envFields = parseEnvExample(envContent).filter((f) => !platformManagedVars.has(f.key));
                 const resources = envFields
                     .filter((f) => f.resource)
@@ -596,9 +572,9 @@ export async function runRemoteImport(options) {
                 }));
                 // Merge curated metadata from the source template's existing agentuity.json
                 const existingConfigPath = join(sourceDir, 'agentuity.json');
-                if (await Bun.file(existingConfigPath).exists()) {
+                if (await pathExists(existingConfigPath)) {
                     try {
-                        const existingConfig = JSON.parse(await Bun.file(existingConfigPath).text());
+                        const existingConfig = JSON.parse(await readFile(existingConfigPath, 'utf-8'));
                         const existingResources = existingConfig?.template?.requirements?.resources;
                         if (Array.isArray(existingResources)) {
                             // Merge extra fields (like defaultName) from curated config
@@ -962,25 +938,24 @@ export async function runRemoteImport(options) {
         tui.success('Created agentuity.json');
         // Ensure .env is gitignored before any git operations (prevents secret leak)
         const gitignorePath = join(sourceDir, '.gitignore');
-        const gitignoreFile = Bun.file(gitignorePath);
-        if (await gitignoreFile.exists()) {
-            const gitignoreContent = await gitignoreFile.text();
+        if (await pathExists(gitignorePath)) {
+            const gitignoreContent = await readFile(gitignorePath, 'utf-8');
             const lines = gitignoreContent.split('\n').map((l) => l.trim());
             if (!lines.includes('.env')) {
-                await Bun.write(gitignorePath, `${gitignoreContent.trimEnd()}\n.env\n`);
+                await writeFile(gitignorePath, `${gitignoreContent.trimEnd()}\n.env\n`);
             }
         }
         else {
-            await Bun.write(gitignorePath, '.env\n.env.*\n');
+            await writeFile(gitignorePath, '.env\n.env.*\n');
         }
         // Update package.json name to match the project name
         const pkgJsonPath = join(sourceDir, 'package.json');
-        if (await Bun.file(pkgJsonPath).exists()) {
+        if (await pathExists(pkgJsonPath)) {
             try {
-                const pkgRaw = await Bun.file(pkgJsonPath).text();
+                const pkgRaw = await readFile(pkgJsonPath, 'utf-8');
                 const pkg = JSON.parse(pkgRaw);
                 pkg.name = projectDirName;
-                await Bun.write(pkgJsonPath, JSON.stringify(pkg, null, 2) + '\n');
+                await writeFile(pkgJsonPath, JSON.stringify(pkg, null, 2) + '\n');
                 logger.debug('[remote-import] Updated package.json name to %s', projectDirName);
             }
             catch (err) {
@@ -1045,11 +1020,7 @@ export async function runRemoteImport(options) {
         if (repo) {
             const { owner, name: repoName } = parseRepoTarget(repo);
             const cleanUrl = `https://github.com/${owner}/${repoName}.git`;
-            Bun.spawnSync(['git', 'remote', 'set-url', 'origin', cleanUrl], {
-                cwd: dest,
-                stdout: 'pipe',
-                stderr: 'pipe',
-            });
+            await runGit(['remote', 'set-url', 'origin', cleanUrl], { cwd: dest });
         }
         tui.success(`Project created in ./${projectDirName}`);
         // 7. Deploy (if --deploy flag)