@mondaydotcomorg/z2h-cli 0.9.1 → 0.10.1

package/dist/commands/create.d.ts

@@ -1,6 +1,10 @@
+export declare const REMOTE_TYPES: readonly ["s3", "github"];
+export type RemoteType = (typeof REMOTE_TYPES)[number];
 export interface CreateOptions {
     template?: string;
     htmlFile?: string;
+    remote?: RemoteType;
+    repoUrl?: string;
     json?: boolean;
 }
 export declare function createCommand(appName: string, opts?: CreateOptions): Promise<void>;

package/dist/commands/create.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"create.d.ts","sourceRoot":"","sources":["../../src/commands/create.ts"],"names":[],"mappings":"AAYA,MAAM,WAAW,aAAa;IAC5B,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,IAAI,CAAC,EAAE,OAAO,CAAC;CAChB;AA6BD,wBAAsB,aAAa,CAAC,OAAO,EAAE,MAAM,EAAE,IAAI,GAAE,aAAkB,GAAG,OAAO,CAAC,IAAI,CAAC,CA8F5F"}
+{"version":3,"file":"create.d.ts","sourceRoot":"","sources":["../../src/commands/create.ts"],"names":[],"mappings":"AAaA,eAAO,MAAM,YAAY,2BAA4B,CAAC;AACtD,MAAM,MAAM,UAAU,GAAG,CAAC,OAAO,YAAY,CAAC,CAAC,MAAM,CAAC,CAAC;AAEvD,MAAM,WAAW,aAAa;IAC5B,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,MAAM,CAAC,EAAE,UAAU,CAAC;IACpB,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,IAAI,CAAC,EAAE,OAAO,CAAC;CAChB;AA6BD,wBAAsB,aAAa,CAAC,OAAO,EAAE,MAAM,EAAE,IAAI,GAAE,aAAkB,GAAG,OAAO,CAAC,IAAI,CAAC,CAoH5F"}

package/dist/commands/create.js

@@ -10,12 +10,14 @@ const util_manifest = require('../util/manifest.js');
 const util_appName = require('../util/app-name.js');
 const constants = require('../constants.js');
 const util_npm_install = require('../util/npm/install.js');
+const util_git_repo = require('../util/git/repo.js');
 const commands_build = require('./build.js');
 
 const _interopDefault = e => e && e.__esModule ? e : { default: e };
 
 const path__default = /*#__PURE__*/_interopDefault(path);
 
+const REMOTE_TYPES = ['s3', 'github'];
 // Names reserved by the host MF (mf-bigbrain-zth) for platform pages under
 // /bigbrain-vibe/<name>. Creating an app with one of these would shadow the
 // platform page in the URL, so we refuse upfront.
@@ -54,6 +56,16 @@ async function createCommand(appName, opts = {}) {
         throw new Error(`App name "${appName}" is invalid. Use lowercase kebab-case (a-z, 0-9, -), ` +
             `2-50 chars, starting with a letter.`);
     }
+    // Validate --remote up front before any file I/O.
+    if (!opts.remote) {
+        throw new Error('--remote is required. Use --remote=s3 (shared storage) or --remote=github (your GitHub repo).');
+    }
+    if (!REMOTE_TYPES.includes(opts.remote)) {
+        throw new Error(`Unknown remote "${opts.remote}". Use ${REMOTE_TYPES.join(' or ')}.`);
+    }
+    if (opts.remote === 'github' && !opts.repoUrl) {
+        throw new Error('--repo-url is required when using --remote=github.');
+    }
     // Resolve template.
     // `--html-file` implies `--template html-embed` unless the user already picked one.
     const template = (opts.template ?? (opts.htmlFile ? 'html-embed' : 'default'));
@@ -96,6 +108,15 @@ async function createCommand(appName, opts = {}) {
     if (template === 'html-embed' && opts.htmlFile) {
         await fs.copy(opts.htmlFile, path__default.default.join(appDir, 'src', 'page.html'));
     }
+    util_logger.info(`initializing git repo for ${appName}...`);
+    let gitRemote;
+    if (opts.remote === 's3') {
+        gitRemote = util_git_repo.defaultS3Remote(appName);
+    }
+    else {
+        gitRemote = opts.repoUrl;
+    }
+    await util_git_repo.initRepo(appDir, gitRemote);
     util_logger.info(`installing dependencies for ${appName}...`);
     await util_npm_install.runYarnInstall({ cwd: workspace });
     // build/dev/deploy all locate the consumer via process.cwd() — chdir before calling them.
@@ -116,7 +137,10 @@ async function createCommand(appName, opts = {}) {
         appDir,
         appName,
         template,
+        remote: opts.remote,
+        gitRemote,
     });
 }
 
+exports.REMOTE_TYPES = REMOTE_TYPES;
 exports.createCommand = createCommand;

package/dist/commands/deploy.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"deploy.d.ts","sourceRoot":"","sources":["../../src/commands/deploy.ts"],"names":[],"mappings":"AAoBA,MAAM,WAAW,aAAa;IAC5B,MAAM,CAAC,EAAE,OAAO,CAAC;IACjB,IAAI,CAAC,EAAE,OAAO,CAAC;CAChB;AAGD,wBAAsB,aAAa,CAAC,IAAI,GAAE,aAAkB,GAAG,OAAO,CAAC,IAAI,CAAC,CAuF3E"}
+{"version":3,"file":"deploy.d.ts","sourceRoot":"","sources":["../../src/commands/deploy.ts"],"names":[],"mappings":"AAsBA,MAAM,WAAW,aAAa;IAC5B,MAAM,CAAC,EAAE,OAAO,CAAC;IACjB,IAAI,CAAC,EAAE,OAAO,CAAC;CAChB;AAGD,wBAAsB,aAAa,CAAC,IAAI,GAAE,aAAkB,GAAG,OAAO,CAAC,IAAI,CAAC,CAyF3E"}

package/dist/commands/deploy.js

@@ -11,6 +11,8 @@ const constants = require('../constants.js');
 const util_s3_client = require('../util/s3/client.js');
 const util_auth_authStore = require('../util/auth/auth-store.js');
 const util_appName = require('../util/app-name.js');
+const util_machineIdentity = require('../util/machine-identity.js');
+const util_git_repo = require('../util/git/repo.js');
 const commands_build = require('./build.js');
 
 const _interopDefault = e => e && e.__esModule ? e : { default: e };
@@ -49,12 +51,14 @@ async function deployCommand(opts = {}) {
         throw new Error(`Missing asset-manifest.json at ${assetManifestPath}.`);
     }
     const assetManifest = (await fs.readJson(assetManifestPath));
-    const deployedBy = os__default.default.userInfo().username;
+    const deployedBy = util_machineIdentity.getMachineAppName() ?? os__default.default.userInfo().username;
+    const gitRemote = await util_git_repo.getRemoteUrl(process.cwd());
     const entry = {
         ...assetManifest,
         version,
         url,
         deployedBy,
+        gitRemote,
     };
     if (opts.dryRun) {
         util_logger.output(`[z2h-cli] dry-run: would upload to s3://${constants.BUCKET_WRITE_NAME}/${keyPrefix}/ as v${version}`, {

package/dist/esm/commands/create.d.ts

@@ -1,6 +1,10 @@
+export declare const REMOTE_TYPES: readonly ["s3", "github"];
+export type RemoteType = (typeof REMOTE_TYPES)[number];
 export interface CreateOptions {
     template?: string;
     htmlFile?: string;
+    remote?: RemoteType;
+    repoUrl?: string;
     json?: boolean;
 }
 export declare function createCommand(appName: string, opts?: CreateOptions): Promise<void>;

package/dist/esm/commands/create.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"create.d.ts","sourceRoot":"","sources":["../../../src/commands/create.ts"],"names":[],"mappings":"AAYA,MAAM,WAAW,aAAa;IAC5B,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,IAAI,CAAC,EAAE,OAAO,CAAC;CAChB;AA6BD,wBAAsB,aAAa,CAAC,OAAO,EAAE,MAAM,EAAE,IAAI,GAAE,aAAkB,GAAG,OAAO,CAAC,IAAI,CAAC,CA8F5F"}
+{"version":3,"file":"create.d.ts","sourceRoot":"","sources":["../../../src/commands/create.ts"],"names":[],"mappings":"AAaA,eAAO,MAAM,YAAY,2BAA4B,CAAC;AACtD,MAAM,MAAM,UAAU,GAAG,CAAC,OAAO,YAAY,CAAC,CAAC,MAAM,CAAC,CAAC;AAEvD,MAAM,WAAW,aAAa;IAC5B,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,MAAM,CAAC,EAAE,UAAU,CAAC;IACpB,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,IAAI,CAAC,EAAE,OAAO,CAAC;CAChB;AA6BD,wBAAsB,aAAa,CAAC,OAAO,EAAE,MAAM,EAAE,IAAI,GAAE,aAAkB,GAAG,OAAO,CAAC,IAAI,CAAC,CAoH5F"}

package/dist/esm/commands/create.mjs

@@ -8,8 +8,10 @@ import { readManifest } from '../util/manifest.mjs';
 import { mfAppName } from '../util/app-name.mjs';
 import { APP_NAME_PATTERN } from '../constants.mjs';
 import { runYarnInstall } from '../util/npm/install.mjs';
+import { defaultS3Remote, initRepo } from '../util/git/repo.mjs';
 import { buildCommand } from './build.mjs';
 
+const REMOTE_TYPES = ['s3', 'github'];
 // Names reserved by the host MF (mf-bigbrain-zth) for platform pages under
 // /bigbrain-vibe/<name>. Creating an app with one of these would shadow the
 // platform page in the URL, so we refuse upfront.
@@ -48,6 +50,16 @@ async function createCommand(appName, opts = {}) {
         throw new Error(`App name "${appName}" is invalid. Use lowercase kebab-case (a-z, 0-9, -), ` +
             `2-50 chars, starting with a letter.`);
     }
+    // Validate --remote up front before any file I/O.
+    if (!opts.remote) {
+        throw new Error('--remote is required. Use --remote=s3 (shared storage) or --remote=github (your GitHub repo).');
+    }
+    if (!REMOTE_TYPES.includes(opts.remote)) {
+        throw new Error(`Unknown remote "${opts.remote}". Use ${REMOTE_TYPES.join(' or ')}.`);
+    }
+    if (opts.remote === 'github' && !opts.repoUrl) {
+        throw new Error('--repo-url is required when using --remote=github.');
+    }
     // Resolve template.
     // `--html-file` implies `--template html-embed` unless the user already picked one.
     const template = (opts.template ?? (opts.htmlFile ? 'html-embed' : 'default'));
@@ -90,6 +102,15 @@ async function createCommand(appName, opts = {}) {
     if (template === 'html-embed' && opts.htmlFile) {
         await copy(opts.htmlFile, path.join(appDir, 'src', 'page.html'));
     }
+    info(`initializing git repo for ${appName}...`);
+    let gitRemote;
+    if (opts.remote === 's3') {
+        gitRemote = defaultS3Remote(appName);
+    }
+    else {
+        gitRemote = opts.repoUrl;
+    }
+    await initRepo(appDir, gitRemote);
     info(`installing dependencies for ${appName}...`);
     await runYarnInstall({ cwd: workspace });
     // build/dev/deploy all locate the consumer via process.cwd() — chdir before calling them.
@@ -110,7 +131,9 @@ async function createCommand(appName, opts = {}) {
         appDir,
         appName,
         template,
+        remote: opts.remote,
+        gitRemote,
     });
 }
 
-export { createCommand };
+export { REMOTE_TYPES, createCommand };

package/dist/esm/commands/deploy.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"deploy.d.ts","sourceRoot":"","sources":["../../../src/commands/deploy.ts"],"names":[],"mappings":"AAoBA,MAAM,WAAW,aAAa;IAC5B,MAAM,CAAC,EAAE,OAAO,CAAC;IACjB,IAAI,CAAC,EAAE,OAAO,CAAC;CAChB;AAGD,wBAAsB,aAAa,CAAC,IAAI,GAAE,aAAkB,GAAG,OAAO,CAAC,IAAI,CAAC,CAuF3E"}
+{"version":3,"file":"deploy.d.ts","sourceRoot":"","sources":["../../../src/commands/deploy.ts"],"names":[],"mappings":"AAsBA,MAAM,WAAW,aAAa;IAC5B,MAAM,CAAC,EAAE,OAAO,CAAC;IACjB,IAAI,CAAC,EAAE,OAAO,CAAC;CAChB;AAGD,wBAAsB,aAAa,CAAC,IAAI,GAAE,aAAkB,GAAG,OAAO,CAAC,IAAI,CAAC,CAyF3E"}

package/dist/esm/commands/deploy.mjs

@@ -9,6 +9,8 @@ import { BUCKET_WRITE_NAME, brokerBaseUrl, BUCKET_READ_DNS_URL } from '../consta
 import { setupS3Client } from '../util/s3/client.mjs';
 import { readZthAuth } from '../util/auth/auth-store.mjs';
 import { mfAppName, cleanAppName } from '../util/app-name.mjs';
+import { getMachineAppName } from '../util/machine-identity.mjs';
+import { getRemoteUrl } from '../util/git/repo.mjs';
 import { buildCommand } from './build.mjs';
 
 // Should be run from the consumer app directory — uses process.cwd() to locate it.
@@ -42,12 +44,14 @@ async function deployCommand(opts = {}) {
         throw new Error(`Missing asset-manifest.json at ${assetManifestPath}.`);
     }
     const assetManifest = (await readJson(assetManifestPath));
-    const deployedBy = os.userInfo().username;
+    const deployedBy = getMachineAppName() ?? os.userInfo().username;
+    const gitRemote = await getRemoteUrl(process.cwd());
     const entry = {
         ...assetManifest,
         version,
         url,
         deployedBy,
+        gitRemote,
     };
     if (opts.dryRun) {
         output(`[z2h-cli] dry-run: would upload to s3://${BUCKET_WRITE_NAME}/${keyPrefix}/ as v${version}`, {

package/dist/esm/index.mjs

@@ -135,12 +135,15 @@ async function main() {
         .description('Scaffold a new Z2H consumer app inside ~/zth-projects/')
         .option('--template <name>', 'Template name (default | html-embed)')
         .option('--html-file <path>', 'Path to an HTML file to embed (implies --template html-embed)')
+        .option('--remote <type>', 'Source control remote: s3 (shared storage) or github (your repo)')
+        .option('--repo-url <url>', 'GitHub repo URL — required when --remote=github')
         .option('--json', 'emit structured JSON on stdout')
         .action(async (appName, opts) => {
         try {
             await trackDuration('z2h_app_created', () => createCommand(appName, opts), {
                 app_name: appName,
                 template: opts.template ?? 'default',
+                remote: opts.remote ?? 'unknown',
             });
         }
         catch (err) {

package/dist/esm/util/auth/auth-store.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"auth-store.d.ts","sourceRoot":"","sources":["../../../../src/util/auth/auth-store.ts"],"names":[],"mappings":"AAOA,eAAO,MAAM,YAAY,QAAkC,CAAC;AAC5D,eAAO,MAAM,aAAa,QAAuC,CAAC;AAElE,MAAM,WAAW,OAAO;IACtB,KAAK,EAAE,MAAM,CAAC;CACf;AAED,qBAAa,mBAAoB,SAAQ,KAAK;aAChB,YAAY,EAAE,MAAM;gBAApB,YAAY,EAAE,MAAM;CAIjD;AAED,wBAAsB,WAAW,IAAI,OAAO,CAAC,OAAO,CAAC,CASpD;AAED;;;;;;;;GAQG;AACH,wBAAgB,oBAAoB,IAAI,MAAM,GAAG,IAAI,CAOpD"}
+{"version":3,"file":"auth-store.d.ts","sourceRoot":"","sources":["../../../../src/util/auth/auth-store.ts"],"names":[],"mappings":"AAOA,eAAO,MAAM,YAAY,QAAkC,CAAC;AAC5D,eAAO,MAAM,aAAa,QAAuC,CAAC;AAElE,MAAM,WAAW,OAAO;IACtB,KAAK,EAAE,MAAM,CAAC;CACf;AAED,qBAAa,mBAAoB,SAAQ,KAAK;aAChB,YAAY,EAAE,MAAM;gBAApB,YAAY,EAAE,MAAM;CAIjD;AAED,wBAAsB,WAAW,IAAI,OAAO,CAAC,OAAO,CAAC,CAkBpD;AAED;;;;;;;;GAQG;AACH,wBAAgB,oBAAoB,IAAI,MAAM,GAAG,IAAI,CAUpD"}

package/dist/esm/util/auth/auth-store.mjs

@@ -16,6 +16,13 @@ class Z2hAuthMissingError extends Error {
     }
 }
 async function readZthAuth() {
+    if (process.env.Z2H_AUTH_TOKEN) {
+        const token = process.env.Z2H_AUTH_TOKEN;
+        if (!/^[\w-]+\.[\w-]+\.[\w-]+$/.test(token)) {
+            throw new Error('Z2H_AUTH_TOKEN is not a valid JWT (expected three dot-separated segments). Please re-set the environment variable.');
+        }
+        return { token };
+    }
     if (!(await pathExists(Z2H_AUTH_FILE))) {
         throw new Z2hAuthMissingError(Z2H_AUTH_FILE);
     }
@@ -35,6 +42,9 @@ async function readZthAuth() {
  * blow up — and where an inline sync read keeps the spawn call site simple.
  */
 function tryReadAuthTokenSync() {
+    if (process.env.Z2H_AUTH_TOKEN) {
+        return process.env.Z2H_AUTH_TOKEN;
+    }
     try {
         const parsed = readJsonSync(Z2H_AUTH_FILE);
         return parsed?.token ?? null;

package/dist/esm/util/git/repo.d.ts

@@ -2,7 +2,8 @@ export declare class GitConflictError extends Error {
     constructor(message: string);
 }
 export declare function defaultS3Remote(app: string): string;
-export declare function initAndPush(dir: string, remote: string): Promise<void>;
+export declare function initRepo(dir: string, remote: string): Promise<void>;
+export declare function getRemoteUrl(dir: string): Promise<string | undefined>;
 export declare function cloneRepo(remote: string, dir: string): Promise<void>;
 export declare function safeBackupIfDirty(dir: string): Promise<void>;
 export declare function pullAndResolve(dir: string): Promise<void>;

package/dist/esm/util/git/repo.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"repo.d.ts","sourceRoot":"","sources":["../../../../src/util/git/repo.ts"],"names":[],"mappings":"AAKA,qBAAa,gBAAiB,SAAQ,KAAK;gBAC7B,OAAO,EAAE,MAAM;CAI5B;AAID,wBAAgB,eAAe,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,CAEnD;AAED,wBAAsB,WAAW,CAAC,GAAG,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAO5E;AAED,wBAAsB,SAAS,CAAC,MAAM,EAAE,MAAM,EAAE,GAAG,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAE1E;AAED,wBAAsB,iBAAiB,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAclE;AAED,wBAAsB,cAAc,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAS/D;AAED,wBAAsB,UAAU,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC,CAO7D;AAED,wBAAsB,SAAS,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC,CAG5D;AAED,wBAAsB,qBAAqB,CAAC,GAAG,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CASvF"}
+{"version":3,"file":"repo.d.ts","sourceRoot":"","sources":["../../../../src/util/git/repo.ts"],"names":[],"mappings":"AAMA,qBAAa,gBAAiB,SAAQ,KAAK;gBAC7B,OAAO,EAAE,MAAM;CAI5B;AAID,wBAAgB,eAAe,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,CAEnD;AAED,wBAAsB,QAAQ,CAAC,GAAG,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAMzE;AAED,wBAAsB,YAAY,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,GAAG,SAAS,CAAC,CAI3E;AAED,wBAAsB,SAAS,CAAC,MAAM,EAAE,MAAM,EAAE,GAAG,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAE1E;AAED,wBAAsB,iBAAiB,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAclE;AAED,wBAAsB,cAAc,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAS/D;AAED,wBAAsB,UAAU,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC,CAO7D;AAED,wBAAsB,SAAS,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC,CAG5D;AAED,wBAAsB,qBAAqB,CAAC,GAAG,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAoBvF"}

package/dist/esm/util/git/repo.mjs

@@ -2,6 +2,7 @@ import path from 'node:path';
 import fs from 'fs-extra';
 import { execa } from 'execa';
 import { BUCKET_WRITE_NAME } from '../../constants.mjs';
+import { mfAppName } from '../app-name.mjs';
 
 class GitConflictError extends Error {
     constructor(message) {
@@ -11,15 +12,19 @@ class GitConflictError extends Error {
 }
 const REQUIRED_GITIGNORE_ENTRIES = ['node_modules/', '.zth/', 'build/'];
 function defaultS3Remote(app) {
-    return `s3://${BUCKET_WRITE_NAME}/${app}/git`;
+    return `s3://${BUCKET_WRITE_NAME}/${mfAppName(app)}/git`;
 }
-async function initAndPush(dir, remote) {
+async function initRepo(dir, remote) {
     await ensureGitignore(dir);
     await execa('git', ['init', '-b', 'master'], { cwd: dir });
     await execa('git', ['add', '.'], { cwd: dir });
     await execa('git', ['commit', '-m', 'Initial commit'], { cwd: dir });
     await execa('git', ['remote', 'add', 'origin', remote], { cwd: dir });
-    await execa('git', ['push', '-u', 'origin', 'master'], { cwd: dir });
+}
+async function getRemoteUrl(dir) {
+    return execa('git', ['remote', 'get-url', 'origin'], { cwd: dir })
+        .then(r => r.stdout.trim() || undefined)
+        .catch(() => undefined);
 }
 async function cloneRepo(remote, dir) {
     await execa('git', ['clone', remote, dir]);
@@ -62,14 +67,25 @@ async function localHead(dir) {
     return stdout.trim();
 }
 async function commitDetailedAndPush(dir, version) {
-    const message = await buildCommitMessage(dir, version);
+    const { stdout: branch } = await execa('git', ['rev-parse', '--abbrev-ref', 'HEAD'], { cwd: dir });
+    if (branch.trim() !== 'master') {
+        throw new Error(`expected branch "master" but you are on "${branch.trim()}" — switch back before deploying.`);
+    }
     await execa('git', ['add', '.'], { cwd: dir });
+    const { stdout: staged } = await execa('git', ['diff', '--cached', '--name-only'], { cwd: dir });
+    if (!staged.trim()) {
+        throw new Error('Nothing new to deploy — no files have changed since the last deploy.');
+    }
+    const message = await buildCommitMessage(dir, version);
     await execa('git', ['commit', '-m', message], { cwd: dir });
     try {
-        await execa('git', ['push'], { cwd: dir });
+        await execa('git', ['push', '-u', 'origin', 'master'], { cwd: dir });
     }
-    catch {
-        throw new GitConflictError('push rejected — remote has new commits');
+    catch (err) {
+        if (/\[rejected\]|non-fast-forward/.test(err.message)) {
+            throw new GitConflictError('push rejected — remote has new commits');
+        }
+        throw err;
     }
 }
 async function buildCommitMessage(dir, version) {
@@ -102,4 +118,4 @@ async function ensureGitignore(dir) {
     await fs.outputFile(gitignorePath, content + separator + missing.join('\n') + '\n');
 }
 
-export { GitConflictError, cloneRepo, commitDetailedAndPush, defaultS3Remote, initAndPush, localHead, pullAndResolve, remoteHead, safeBackupIfDirty };
+export { GitConflictError, cloneRepo, commitDetailedAndPush, defaultS3Remote, getRemoteUrl, initRepo, localHead, pullAndResolve, remoteHead, safeBackupIfDirty };

package/dist/esm/util/machine-identity.d.ts

@@ -0,0 +1,9 @@
+/**
+ * Returns the machine app name when running as a service (e.g. agent-runner).
+ * Available when the process is a monday.com microservice with `APP_NAME` set
+ * by the platform runtime.
+ *
+ * Returns `undefined` for interactive human users (fallback to os.userInfo).
+ */
+export declare function getMachineAppName(): string | undefined;
+//# sourceMappingURL=machine-identity.d.ts.map

package/dist/esm/util/machine-identity.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"machine-identity.d.ts","sourceRoot":"","sources":["../../../src/util/machine-identity.ts"],"names":[],"mappings":"AAAA;;;;;;GAMG;AACH,wBAAgB,iBAAiB,IAAI,MAAM,GAAG,SAAS,CAEtD"}

package/dist/esm/util/machine-identity.mjs

@@ -0,0 +1,12 @@
+/**
+ * Returns the machine app name when running as a service (e.g. agent-runner).
+ * Available when the process is a monday.com microservice with `APP_NAME` set
+ * by the platform runtime.
+ *
+ * Returns `undefined` for interactive human users (fallback to os.userInfo).
+ */
+function getMachineAppName() {
+    return process.env.APP_NAME || undefined;
+}
+
+export { getMachineAppName };

package/dist/esm/util/manifest.d.ts

@@ -18,12 +18,12 @@ export interface AssetManifestFile {
     nonExternalsEntrypoints?: string[];
     scriptType?: 'module' | 'classic';
     mfs?: string[];
-    gitRemote: string;
 }
 export interface ManifestEntry extends AssetManifestFile {
     version: number;
     url: string;
     deployedBy: string;
+    gitRemote?: string;
 }
 export type Manifest = Record<string, ManifestEntry>;
 export declare function readManifest(): Promise<Manifest>;

package/dist/esm/util/manifest.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"manifest.d.ts","sourceRoot":"","sources":["../../../src/util/manifest.ts"],"names":[],"mappings":"AAIA,MAAM,WAAW,SAAS;IACxB,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,UAAU,EAAE,MAAM,CAAC;IACnB,GAAG,CAAC,EAAE,MAAM,CAAC;IACb,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,YAAY,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;CACtC;AAED;;;;GAIG;AACH,MAAM,WAAW,iBAAiB;IAChC,UAAU,EAAE,OAAO,CAAC;IACpB,oBAAoB,EAAE,OAAO,CAAC;IAC9B,MAAM,EAAE,SAAS,EAAE,CAAC;IACpB,WAAW,EAAE,MAAM,EAAE,CAAC;IACtB,uBAAuB,CAAC,EAAE,MAAM,EAAE,CAAC;IACnC,UAAU,CAAC,EAAE,QAAQ,GAAG,SAAS,CAAC;IAClC,GAAG,CAAC,EAAE,MAAM,EAAE,CAAC;IACf,SAAS,EAAE,MAAM,CAAC;CACnB;AAED,MAAM,WAAW,aAAc,SAAQ,iBAAiB;IACtD,OAAO,EAAE,MAAM,CAAC;IAChB,GAAG,EAAE,MAAM,CAAC;IACZ,UAAU,EAAE,MAAM,CAAC;CACpB;AAED,MAAM,MAAM,QAAQ,GAAG,MAAM,CAAC,MAAM,EAAE,aAAa,CAAC,CAAC;AAErD,wBAAsB,YAAY,IAAI,OAAO,CAAC,QAAQ,CAAC,CAQtD;AAED,wBAAgB,WAAW,CAAC,QAAQ,EAAE,QAAQ,EAAE,GAAG,EAAE,MAAM,UAI1D;AAED,wBAAgB,WAAW,CAAC,QAAQ,EAAE,QAAQ,EAAE,GAAG,EAAE,MAAM,EAAE,KAAK,EAAE,aAAa,GAAG,QAAQ,CAE3F;AAED,wBAAsB,aAAa,CAAC,QAAQ,EAAE,QAAQ,GAAG,OAAO,CAAC,IAAI,CAAC,CAWrE"}
+{"version":3,"file":"manifest.d.ts","sourceRoot":"","sources":["../../../src/util/manifest.ts"],"names":[],"mappings":"AAIA,MAAM,WAAW,SAAS;IACxB,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,UAAU,EAAE,MAAM,CAAC;IACnB,GAAG,CAAC,EAAE,MAAM,CAAC;IACb,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,YAAY,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;CACtC;AAED;;;;GAIG;AACH,MAAM,WAAW,iBAAiB;IAChC,UAAU,EAAE,OAAO,CAAC;IACpB,oBAAoB,EAAE,OAAO,CAAC;IAC9B,MAAM,EAAE,SAAS,EAAE,CAAC;IACpB,WAAW,EAAE,MAAM,EAAE,CAAC;IACtB,uBAAuB,CAAC,EAAE,MAAM,EAAE,CAAC;IACnC,UAAU,CAAC,EAAE,QAAQ,GAAG,SAAS,CAAC;IAClC,GAAG,CAAC,EAAE,MAAM,EAAE,CAAC;CAChB;AAED,MAAM,WAAW,aAAc,SAAQ,iBAAiB;IACtD,OAAO,EAAE,MAAM,CAAC;IAChB,GAAG,EAAE,MAAM,CAAC;IACZ,UAAU,EAAE,MAAM,CAAC;IACnB,SAAS,CAAC,EAAE,MAAM,CAAC;CACpB;AAED,MAAM,MAAM,QAAQ,GAAG,MAAM,CAAC,MAAM,EAAE,aAAa,CAAC,CAAC;AAErD,wBAAsB,YAAY,IAAI,OAAO,CAAC,QAAQ,CAAC,CAQtD;AAED,wBAAgB,WAAW,CAAC,QAAQ,EAAE,QAAQ,EAAE,GAAG,EAAE,MAAM,UAI1D;AAED,wBAAgB,WAAW,CAAC,QAAQ,EAAE,QAAQ,EAAE,GAAG,EAAE,MAAM,EAAE,KAAK,EAAE,aAAa,GAAG,QAAQ,CAE3F;AAED,wBAAsB,aAAa,CAAC,QAAQ,EAAE,QAAQ,GAAG,OAAO,CAAC,IAAI,CAAC,CAWrE"}

package/dist/index.js

@@ -141,12 +141,15 @@ async function main() {
         .description('Scaffold a new Z2H consumer app inside ~/zth-projects/')
         .option('--template <name>', 'Template name (default | html-embed)')
         .option('--html-file <path>', 'Path to an HTML file to embed (implies --template html-embed)')
+        .option('--remote <type>', 'Source control remote: s3 (shared storage) or github (your repo)')
+        .option('--repo-url <url>', 'GitHub repo URL — required when --remote=github')
         .option('--json', 'emit structured JSON on stdout')
         .action(async (appName, opts) => {
         try {
             await util_tracker.trackDuration('z2h_app_created', () => commands_create.createCommand(appName, opts), {
                 app_name: appName,
                 template: opts.template ?? 'default',
+                remote: opts.remote ?? 'unknown',
             });
         }
         catch (err) {

package/dist/util/auth/auth-store.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"auth-store.d.ts","sourceRoot":"","sources":["../../../src/util/auth/auth-store.ts"],"names":[],"mappings":"AAOA,eAAO,MAAM,YAAY,QAAkC,CAAC;AAC5D,eAAO,MAAM,aAAa,QAAuC,CAAC;AAElE,MAAM,WAAW,OAAO;IACtB,KAAK,EAAE,MAAM,CAAC;CACf;AAED,qBAAa,mBAAoB,SAAQ,KAAK;aAChB,YAAY,EAAE,MAAM;gBAApB,YAAY,EAAE,MAAM;CAIjD;AAED,wBAAsB,WAAW,IAAI,OAAO,CAAC,OAAO,CAAC,CASpD;AAED;;;;;;;;GAQG;AACH,wBAAgB,oBAAoB,IAAI,MAAM,GAAG,IAAI,CAOpD"}
+{"version":3,"file":"auth-store.d.ts","sourceRoot":"","sources":["../../../src/util/auth/auth-store.ts"],"names":[],"mappings":"AAOA,eAAO,MAAM,YAAY,QAAkC,CAAC;AAC5D,eAAO,MAAM,aAAa,QAAuC,CAAC;AAElE,MAAM,WAAW,OAAO;IACtB,KAAK,EAAE,MAAM,CAAC;CACf;AAED,qBAAa,mBAAoB,SAAQ,KAAK;aAChB,YAAY,EAAE,MAAM;gBAApB,YAAY,EAAE,MAAM;CAIjD;AAED,wBAAsB,WAAW,IAAI,OAAO,CAAC,OAAO,CAAC,CAkBpD;AAED;;;;;;;;GAQG;AACH,wBAAgB,oBAAoB,IAAI,MAAM,GAAG,IAAI,CAUpD"}

package/dist/util/auth/auth-store.js

@@ -23,6 +23,13 @@ class Z2hAuthMissingError extends Error {
     }
 }
 async function readZthAuth() {
+    if (process.env.Z2H_AUTH_TOKEN) {
+        const token = process.env.Z2H_AUTH_TOKEN;
+        if (!/^[\w-]+\.[\w-]+\.[\w-]+$/.test(token)) {
+            throw new Error('Z2H_AUTH_TOKEN is not a valid JWT (expected three dot-separated segments). Please re-set the environment variable.');
+        }
+        return { token };
+    }
     if (!(await fs.pathExists(Z2H_AUTH_FILE))) {
         throw new Z2hAuthMissingError(Z2H_AUTH_FILE);
     }
@@ -42,6 +49,9 @@ async function readZthAuth() {
  * blow up — and where an inline sync read keeps the spawn call site simple.
  */
 function tryReadAuthTokenSync() {
+    if (process.env.Z2H_AUTH_TOKEN) {
+        return process.env.Z2H_AUTH_TOKEN;
+    }
     try {
         const parsed = fs.readJsonSync(Z2H_AUTH_FILE);
         return parsed?.token ?? null;

package/dist/util/git/repo.d.ts

@@ -2,7 +2,8 @@ export declare class GitConflictError extends Error {
     constructor(message: string);
 }
 export declare function defaultS3Remote(app: string): string;
-export declare function initAndPush(dir: string, remote: string): Promise<void>;
+export declare function initRepo(dir: string, remote: string): Promise<void>;
+export declare function getRemoteUrl(dir: string): Promise<string | undefined>;
 export declare function cloneRepo(remote: string, dir: string): Promise<void>;
 export declare function safeBackupIfDirty(dir: string): Promise<void>;
 export declare function pullAndResolve(dir: string): Promise<void>;

package/dist/util/git/repo.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"repo.d.ts","sourceRoot":"","sources":["../../../src/util/git/repo.ts"],"names":[],"mappings":"AAKA,qBAAa,gBAAiB,SAAQ,KAAK;gBAC7B,OAAO,EAAE,MAAM;CAI5B;AAID,wBAAgB,eAAe,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,CAEnD;AAED,wBAAsB,WAAW,CAAC,GAAG,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAO5E;AAED,wBAAsB,SAAS,CAAC,MAAM,EAAE,MAAM,EAAE,GAAG,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAE1E;AAED,wBAAsB,iBAAiB,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAclE;AAED,wBAAsB,cAAc,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAS/D;AAED,wBAAsB,UAAU,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC,CAO7D;AAED,wBAAsB,SAAS,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC,CAG5D;AAED,wBAAsB,qBAAqB,CAAC,GAAG,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CASvF"}
+{"version":3,"file":"repo.d.ts","sourceRoot":"","sources":["../../../src/util/git/repo.ts"],"names":[],"mappings":"AAMA,qBAAa,gBAAiB,SAAQ,KAAK;gBAC7B,OAAO,EAAE,MAAM;CAI5B;AAID,wBAAgB,eAAe,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,CAEnD;AAED,wBAAsB,QAAQ,CAAC,GAAG,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAMzE;AAED,wBAAsB,YAAY,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,GAAG,SAAS,CAAC,CAI3E;AAED,wBAAsB,SAAS,CAAC,MAAM,EAAE,MAAM,EAAE,GAAG,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAE1E;AAED,wBAAsB,iBAAiB,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAclE;AAED,wBAAsB,cAAc,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAS/D;AAED,wBAAsB,UAAU,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC,CAO7D;AAED,wBAAsB,SAAS,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC,CAG5D;AAED,wBAAsB,qBAAqB,CAAC,GAAG,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAoBvF"}

package/dist/util/git/repo.js

@@ -4,6 +4,7 @@ const path = require('node:path');
 const fs = require('fs-extra');
 const execa = require('execa');
 const constants = require('../../constants.js');
+const util_appName = require('../app-name.js');
 
 const _interopDefault = e => e && e.__esModule ? e : { default: e };
 
@@ -18,15 +19,19 @@ class GitConflictError extends Error {
 }
 const REQUIRED_GITIGNORE_ENTRIES = ['node_modules/', '.zth/', 'build/'];
 function defaultS3Remote(app) {
-    return `s3://${constants.BUCKET_WRITE_NAME}/${app}/git`;
+    return `s3://${constants.BUCKET_WRITE_NAME}/${util_appName.mfAppName(app)}/git`;
 }
-async function initAndPush(dir, remote) {
+async function initRepo(dir, remote) {
     await ensureGitignore(dir);
     await execa.execa('git', ['init', '-b', 'master'], { cwd: dir });
     await execa.execa('git', ['add', '.'], { cwd: dir });
     await execa.execa('git', ['commit', '-m', 'Initial commit'], { cwd: dir });
     await execa.execa('git', ['remote', 'add', 'origin', remote], { cwd: dir });
-    await execa.execa('git', ['push', '-u', 'origin', 'master'], { cwd: dir });
+}
+async function getRemoteUrl(dir) {
+    return execa.execa('git', ['remote', 'get-url', 'origin'], { cwd: dir })
+        .then(r => r.stdout.trim() || undefined)
+        .catch(() => undefined);
 }
 async function cloneRepo(remote, dir) {
     await execa.execa('git', ['clone', remote, dir]);
@@ -69,14 +74,25 @@ async function localHead(dir) {
     return stdout.trim();
 }
 async function commitDetailedAndPush(dir, version) {
-    const message = await buildCommitMessage(dir, version);
+    const { stdout: branch } = await execa.execa('git', ['rev-parse', '--abbrev-ref', 'HEAD'], { cwd: dir });
+    if (branch.trim() !== 'master') {
+        throw new Error(`expected branch "master" but you are on "${branch.trim()}" — switch back before deploying.`);
+    }
     await execa.execa('git', ['add', '.'], { cwd: dir });
+    const { stdout: staged } = await execa.execa('git', ['diff', '--cached', '--name-only'], { cwd: dir });
+    if (!staged.trim()) {
+        throw new Error('Nothing new to deploy — no files have changed since the last deploy.');
+    }
+    const message = await buildCommitMessage(dir, version);
     await execa.execa('git', ['commit', '-m', message], { cwd: dir });
     try {
-        await execa.execa('git', ['push'], { cwd: dir });
+        await execa.execa('git', ['push', '-u', 'origin', 'master'], { cwd: dir });
     }
-    catch {
-        throw new GitConflictError('push rejected — remote has new commits');
+    catch (err) {
+        if (/\[rejected\]|non-fast-forward/.test(err.message)) {
+            throw new GitConflictError('push rejected — remote has new commits');
+        }
+        throw err;
     }
 }
 async function buildCommitMessage(dir, version) {
@@ -113,7 +129,8 @@ exports.GitConflictError = GitConflictError;
 exports.cloneRepo = cloneRepo;
 exports.commitDetailedAndPush = commitDetailedAndPush;
 exports.defaultS3Remote = defaultS3Remote;
-exports.initAndPush = initAndPush;
+exports.getRemoteUrl = getRemoteUrl;
+exports.initRepo = initRepo;
 exports.localHead = localHead;
 exports.pullAndResolve = pullAndResolve;
 exports.remoteHead = remoteHead;

package/dist/util/machine-identity.d.ts

@@ -0,0 +1,9 @@
+/**
+ * Returns the machine app name when running as a service (e.g. agent-runner).
+ * Available when the process is a monday.com microservice with `APP_NAME` set
+ * by the platform runtime.
+ *
+ * Returns `undefined` for interactive human users (fallback to os.userInfo).
+ */
+export declare function getMachineAppName(): string | undefined;
+//# sourceMappingURL=machine-identity.d.ts.map

package/dist/util/machine-identity.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"machine-identity.d.ts","sourceRoot":"","sources":["../../src/util/machine-identity.ts"],"names":[],"mappings":"AAAA;;;;;;GAMG;AACH,wBAAgB,iBAAiB,IAAI,MAAM,GAAG,SAAS,CAEtD"}

package/dist/util/machine-identity.js

@@ -0,0 +1,14 @@
+Object.defineProperty(exports, Symbol.toStringTag, { value: 'Module' });
+
+/**
+ * Returns the machine app name when running as a service (e.g. agent-runner).
+ * Available when the process is a monday.com microservice with `APP_NAME` set
+ * by the platform runtime.
+ *
+ * Returns `undefined` for interactive human users (fallback to os.userInfo).
+ */
+function getMachineAppName() {
+    return process.env.APP_NAME || undefined;
+}
+
+exports.getMachineAppName = getMachineAppName;

package/dist/util/manifest.d.ts

@@ -18,12 +18,12 @@ export interface AssetManifestFile {
     nonExternalsEntrypoints?: string[];
     scriptType?: 'module' | 'classic';
     mfs?: string[];
-    gitRemote: string;
 }
 export interface ManifestEntry extends AssetManifestFile {
     version: number;
     url: string;
     deployedBy: string;
+    gitRemote?: string;
 }
 export type Manifest = Record<string, ManifestEntry>;
 export declare function readManifest(): Promise<Manifest>;

package/dist/util/manifest.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"manifest.d.ts","sourceRoot":"","sources":["../../src/util/manifest.ts"],"names":[],"mappings":"AAIA,MAAM,WAAW,SAAS;IACxB,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,UAAU,EAAE,MAAM,CAAC;IACnB,GAAG,CAAC,EAAE,MAAM,CAAC;IACb,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,YAAY,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;CACtC;AAED;;;;GAIG;AACH,MAAM,WAAW,iBAAiB;IAChC,UAAU,EAAE,OAAO,CAAC;IACpB,oBAAoB,EAAE,OAAO,CAAC;IAC9B,MAAM,EAAE,SAAS,EAAE,CAAC;IACpB,WAAW,EAAE,MAAM,EAAE,CAAC;IACtB,uBAAuB,CAAC,EAAE,MAAM,EAAE,CAAC;IACnC,UAAU,CAAC,EAAE,QAAQ,GAAG,SAAS,CAAC;IAClC,GAAG,CAAC,EAAE,MAAM,EAAE,CAAC;IACf,SAAS,EAAE,MAAM,CAAC;CACnB;AAED,MAAM,WAAW,aAAc,SAAQ,iBAAiB;IACtD,OAAO,EAAE,MAAM,CAAC;IAChB,GAAG,EAAE,MAAM,CAAC;IACZ,UAAU,EAAE,MAAM,CAAC;CACpB;AAED,MAAM,MAAM,QAAQ,GAAG,MAAM,CAAC,MAAM,EAAE,aAAa,CAAC,CAAC;AAErD,wBAAsB,YAAY,IAAI,OAAO,CAAC,QAAQ,CAAC,CAQtD;AAED,wBAAgB,WAAW,CAAC,QAAQ,EAAE,QAAQ,EAAE,GAAG,EAAE,MAAM,UAI1D;AAED,wBAAgB,WAAW,CAAC,QAAQ,EAAE,QAAQ,EAAE,GAAG,EAAE,MAAM,EAAE,KAAK,EAAE,aAAa,GAAG,QAAQ,CAE3F;AAED,wBAAsB,aAAa,CAAC,QAAQ,EAAE,QAAQ,GAAG,OAAO,CAAC,IAAI,CAAC,CAWrE"}
+{"version":3,"file":"manifest.d.ts","sourceRoot":"","sources":["../../src/util/manifest.ts"],"names":[],"mappings":"AAIA,MAAM,WAAW,SAAS;IACxB,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,UAAU,EAAE,MAAM,CAAC;IACnB,GAAG,CAAC,EAAE,MAAM,CAAC;IACb,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,YAAY,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;CACtC;AAED;;;;GAIG;AACH,MAAM,WAAW,iBAAiB;IAChC,UAAU,EAAE,OAAO,CAAC;IACpB,oBAAoB,EAAE,OAAO,CAAC;IAC9B,MAAM,EAAE,SAAS,EAAE,CAAC;IACpB,WAAW,EAAE,MAAM,EAAE,CAAC;IACtB,uBAAuB,CAAC,EAAE,MAAM,EAAE,CAAC;IACnC,UAAU,CAAC,EAAE,QAAQ,GAAG,SAAS,CAAC;IAClC,GAAG,CAAC,EAAE,MAAM,EAAE,CAAC;CAChB;AAED,MAAM,WAAW,aAAc,SAAQ,iBAAiB;IACtD,OAAO,EAAE,MAAM,CAAC;IAChB,GAAG,EAAE,MAAM,CAAC;IACZ,UAAU,EAAE,MAAM,CAAC;IACnB,SAAS,CAAC,EAAE,MAAM,CAAC;CACpB;AAED,MAAM,MAAM,QAAQ,GAAG,MAAM,CAAC,MAAM,EAAE,aAAa,CAAC,CAAC;AAErD,wBAAsB,YAAY,IAAI,OAAO,CAAC,QAAQ,CAAC,CAQtD;AAED,wBAAgB,WAAW,CAAC,QAAQ,EAAE,QAAQ,EAAE,GAAG,EAAE,MAAM,UAI1D;AAED,wBAAgB,WAAW,CAAC,QAAQ,EAAE,QAAQ,EAAE,GAAG,EAAE,MAAM,EAAE,KAAK,EAAE,aAAa,GAAG,QAAQ,CAE3F;AAED,wBAAsB,aAAa,CAAC,QAAQ,EAAE,QAAQ,GAAG,OAAO,CAAC,IAAI,CAAC,CAWrE"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mondaydotcomorg/z2h-cli",
-  "version": "0.9.1",
+  "version": "0.10.1",
   "bin": "./bin/z2h-cli.js",
   "main": "./dist/index.js",
   "types": "./dist/index.d.ts",

package/src/commands/__tests__/create.test.ts

@@ -4,6 +4,7 @@ import { mkdtemp, rm, writeJson, readJson, ensureDir, pathExists, writeFile } fr
 import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest';
 
 import { runYarnInstall } from '../../util/npm/install';
+import { initRepo, defaultS3Remote } from '../../util/git/repo';
 import { buildCommand } from '../build';
 import { createCommand } from '../create';
 import * as manifest from '../../util/manifest';
@@ -15,6 +16,11 @@ vi.mock('../../util/npm/install', () => ({
   runYarnInstall: vi.fn().mockResolvedValue(undefined),
 }));
 
+vi.mock('../../util/git/repo', () => ({
+  initRepo: vi.fn().mockResolvedValue(undefined),
+  defaultS3Remote: vi.fn((app: string) => `s3://prod-use1-bigbrain-zth-mf-assets/mf-${app}/git`),
+}));
+
 // Mock build so tsc/yarn build don't run in tests.
 vi.mock('../build', () => ({
   buildCommand: vi.fn().mockResolvedValue(undefined),
@@ -39,6 +45,8 @@ describe('create', () => {
     tmp = await mkdtemp(path.join(os.tmpdir(), 'z2h-c-'));
     process.env.Z2H_WORKSPACE_HOME = tmp;
     vi.mocked(runYarnInstall).mockClear();
+    vi.mocked(initRepo).mockClear();
+    vi.mocked(defaultS3Remote).mockClear();
     vi.mocked(buildCommand).mockClear();
   });
 
@@ -63,12 +71,12 @@ describe('create', () => {
     const appDir = path.join(tmp, 'demo-app');
     await ensureDir(appDir);
     await writeFile(path.join(appDir, 'something.txt'), 'hi');
-    await expect(createCommand('demo-app')).rejects.toThrow(/non-empty/);
+    await expect(createCommand('demo-app', { remote: 's3' })).rejects.toThrow(/non-empty/);
   });
 
   it('scaffolds an app with the default React template', async () => {
     await makeWorkspace(tmp);
-    await createCommand('demo-app');
+    await createCommand('demo-app', { remote: 's3' });
 
     const appDir = path.join(tmp, 'demo-app');
     expect(await pathExists(path.join(appDir, 'package.json'))).toBe(true);
@@ -94,7 +102,7 @@ describe('create', () => {
     const htmlPath = path.join(tmp, 'page.html');
     await writeFile(htmlPath, '<html><body>Hi</body></html>');
 
-    await createCommand('html-app', { template: 'html-embed', htmlFile: htmlPath });
+    await createCommand('html-app', { template: 'html-embed', htmlFile: htmlPath, remote: 's3' });
 
     const appDir = path.join(tmp, 'html-app');
     expect(await pathExists(path.join(appDir, 'src', 'page.html'))).toBe(true);
@@ -107,13 +115,44 @@ describe('create', () => {
 
   it('rejects unknown templates', async () => {
     await makeWorkspace(tmp);
-    await expect(createCommand('demo', { template: 'nonexistent' })).rejects.toThrow(/unknown template/i);
+    await expect(createCommand('demo', { remote: 's3', template: 'nonexistent' })).rejects.toThrow(/unknown template/i);
   });
 
   it('rejects --html-file when the file does not exist', async () => {
     await makeWorkspace(tmp);
-    await expect(createCommand('demo', { template: 'html-embed', htmlFile: '/no/such/file.html' })).rejects.toThrow(
-      /html file/i
+    await expect(
+      createCommand('demo', { remote: 's3', template: 'html-embed', htmlFile: '/no/such/file.html' })
+    ).rejects.toThrow(/html file/i);
+  });
+
+  it('rejects when --remote is missing', async () => {
+    await makeWorkspace(tmp);
+    await expect(createCommand('demo-app', {})).rejects.toThrow(/--remote is required/);
+  });
+
+  it('rejects an unknown --remote value', async () => {
+    await makeWorkspace(tmp);
+    await expect(createCommand('demo-app', { remote: 'bitbucket' as 's3' })).rejects.toThrow(/Unknown remote/);
+  });
+
+  it('rejects --remote=github without --repo-url', async () => {
+    await makeWorkspace(tmp);
+    await expect(createCommand('demo-app', { remote: 'github' })).rejects.toThrow(/--repo-url is required/);
+  });
+
+  it('calls initRepo with the S3 remote for --remote=s3', async () => {
+    await makeWorkspace(tmp);
+    await createCommand('my-app', { remote: 's3' });
+    expect(vi.mocked(defaultS3Remote)).toHaveBeenCalledWith('my-app');
+    expect(vi.mocked(initRepo)).toHaveBeenCalledWith(
+      path.join(tmp, 'my-app'),
+      's3://prod-use1-bigbrain-zth-mf-assets/mf-my-app/git'
     );
   });
+
+  it('calls initRepo with the repo URL for --remote=github', async () => {
+    await makeWorkspace(tmp);
+    await createCommand('gh-app', { remote: 'github', repoUrl: 'https://github.com/acme/gh-app' });
+    expect(vi.mocked(initRepo)).toHaveBeenCalledWith(path.join(tmp, 'gh-app'), 'https://github.com/acme/gh-app');
+  });
 });

package/src/commands/create.ts

@@ -8,11 +8,17 @@ import { readManifest } from '../util/manifest';
 import { mfAppName } from '../util/app-name';
 import { APP_NAME_PATTERN } from '../constants';
 import { runYarnInstall } from '../util/npm/install';
+import { initRepo, defaultS3Remote } from '../util/git/repo';
 import { buildCommand } from './build';
 
+export const REMOTE_TYPES = ['s3', 'github'] as const;
+export type RemoteType = (typeof REMOTE_TYPES)[number];
+
 export interface CreateOptions {
   template?: string;
   htmlFile?: string;
+  remote?: RemoteType;
+  repoUrl?: string;
   json?: boolean;
 }
 
@@ -64,6 +70,17 @@ export async function createCommand(appName: string, opts: CreateOptions = {}):
     );
   }
 
+  // Validate --remote up front before any file I/O.
+  if (!opts.remote) {
+    throw new Error('--remote is required. Use --remote=s3 (shared storage) or --remote=github (your GitHub repo).');
+  }
+  if (!(REMOTE_TYPES as readonly string[]).includes(opts.remote)) {
+    throw new Error(`Unknown remote "${opts.remote}". Use ${REMOTE_TYPES.join(' or ')}.`);
+  }
+  if (opts.remote === 'github' && !opts.repoUrl) {
+    throw new Error('--repo-url is required when using --remote=github.');
+  }
+
   // Resolve template.
   // `--html-file` implies `--template html-embed` unless the user already picked one.
   const template: AppTemplate = (opts.template ?? (opts.htmlFile ? 'html-embed' : 'default')) as AppTemplate;
@@ -116,6 +133,15 @@ export async function createCommand(appName: string, opts: CreateOptions = {}):
     await copy(opts.htmlFile, path.join(appDir, 'src', 'page.html'));
   }
 
+  info(`initializing git repo for ${appName}...`);
+  let gitRemote: string;
+  if (opts.remote === 's3') {
+    gitRemote = defaultS3Remote(appName);
+  } else {
+    gitRemote = opts.repoUrl as string;
+  }
+  await initRepo(appDir, gitRemote);
+
   info(`installing dependencies for ${appName}...`);
   await runYarnInstall({ cwd: workspace });
 
@@ -136,5 +162,7 @@ export async function createCommand(appName: string, opts: CreateOptions = {}):
     appDir,
     appName,
     template,
+    remote: opts.remote,
+    gitRemote,
   });
 }

package/src/commands/deploy.ts

@@ -16,6 +16,8 @@ import { BUCKET_WRITE_NAME, BUCKET_READ_DNS_URL, brokerBaseUrl } from '../consta
 import { setupS3Client } from '../util/s3/client';
 import { readZthAuth } from '../util/auth/auth-store';
 import { cleanAppName, mfAppName } from '../util/app-name';
+import { getMachineAppName } from '../util/machine-identity';
+import { getRemoteUrl } from '../util/git/repo';
 import { buildCommand } from './build';
 
 export interface DeployOptions {
@@ -61,12 +63,14 @@ export async function deployCommand(opts: DeployOptions = {}): Promise<void> {
   }
   const assetManifest = (await readJson(assetManifestPath)) as AssetManifestFile;
 
-  const deployedBy = os.userInfo().username;
+  const deployedBy = getMachineAppName() ?? os.userInfo().username;
+  const gitRemote = await getRemoteUrl(process.cwd());
   const entry: ManifestEntry = {
     ...assetManifest,
     version,
     url,
     deployedBy,
+    gitRemote,
   };
 
   if (opts.dryRun) {

package/src/index.ts

@@ -9,7 +9,7 @@ import { buildCommand } from './commands/build';
 import { cleanCommand } from './commands/clean';
 import { deployCommand } from './commands/deploy';
 import { createWorkspaceCommand } from './commands/create-workspace';
-import { createCommand } from './commands/create';
+import { createCommand, CreateOptions } from './commands/create';
 import { generateZ2HTokenCommand } from './commands/generate-z2h-token';
 import { migrateCommand } from './commands/migrate';
 import { errorLog, fail, getOutputMode } from './util/logger';
@@ -142,17 +142,25 @@ async function main(): Promise<void> {
     .description('Scaffold a new Z2H consumer app inside ~/zth-projects/')
     .option('--template <name>', 'Template name (default | html-embed)')
     .option('--html-file <path>', 'Path to an HTML file to embed (implies --template html-embed)')
+    .option('--remote <type>', 'Source control remote: s3 (shared storage) or github (your repo)')
+    .option('--repo-url <url>', 'GitHub repo URL — required when --remote=github')
     .option('--json', 'emit structured JSON on stdout')
-    .action(async (appName: string, opts: { template?: string; htmlFile?: string; json?: boolean }) => {
-      try {
-        await trackDuration('z2h_app_created', () => createCommand(appName, opts), {
-          app_name: appName,
-          template: opts.template ?? 'default',
-        });
-      } catch (err) {
-        await fail(`create failed: ${(err as Error).message}`, { command: 'create' }, 1);
+    .action(
+      async (
+        appName: string,
+        opts: { template?: string; htmlFile?: string; remote?: string; repoUrl?: string; json?: boolean }
+      ) => {
+        try {
+          await trackDuration('z2h_app_created', () => createCommand(appName, opts as CreateOptions), {
+            app_name: appName,
+            template: opts.template ?? 'default',
+            remote: opts.remote ?? 'unknown',
+          });
+        } catch (err) {
+          await fail(`create failed: ${(err as Error).message}`, { command: 'create' }, 1);
+        }
       }
-    });
+    );
 
   program
     .command('migrate')

package/src/util/auth/auth-store.ts

@@ -20,6 +20,15 @@ export class Z2hAuthMissingError extends Error {
 }
 
 export async function readZthAuth(): Promise<ZthAuth> {
+  if (process.env.Z2H_AUTH_TOKEN) {
+    const token = process.env.Z2H_AUTH_TOKEN;
+    if (!/^[\w-]+\.[\w-]+\.[\w-]+$/.test(token)) {
+      throw new Error(
+        'Z2H_AUTH_TOKEN is not a valid JWT (expected three dot-separated segments). Please re-set the environment variable.'
+      );
+    }
+    return { token };
+  }
   if (!(await pathExists(Z2H_AUTH_FILE))) {
     throw new Z2hAuthMissingError(Z2H_AUTH_FILE);
   }
@@ -40,6 +49,9 @@ export async function readZthAuth(): Promise<ZthAuth> {
  * blow up — and where an inline sync read keeps the spawn call site simple.
  */
 export function tryReadAuthTokenSync(): string | null {
+  if (process.env.Z2H_AUTH_TOKEN) {
+    return process.env.Z2H_AUTH_TOKEN;
+  }
   try {
     const parsed = readJsonSync(Z2H_AUTH_FILE) as Partial<ZthAuth> | null;
     return parsed?.token ?? null;

package/src/util/git/__tests__/repo.test.ts

@@ -6,13 +6,13 @@ import fs from 'fs-extra';
 import {
   GitConflictError,
   defaultS3Remote,
+  initRepo,
   cloneRepo,
   safeBackupIfDirty,
   pullAndResolve,
   remoteHead,
   localHead,
   commitDetailedAndPush,
-  initAndPush,
 } from '../repo';
 
 vi.mock('execa', () => ({ execa: vi.fn() }));
@@ -42,7 +42,7 @@ beforeEach(() => {
 
 describe('defaultS3Remote', () => {
   it('returns the expected S3 URL', () => {
-    expect(defaultS3Remote('my-app')).toBe('s3://prod-use1-bigbrain-zth-mf-assets/my-app/git');
+    expect(defaultS3Remote('my-app')).toBe('s3://prod-use1-bigbrain-zth-mf-assets/mf-my-app/git');
   });
 });
 
@@ -56,27 +56,27 @@ describe('cloneRepo', () => {
   });
 });
 
-// ── initAndPush ──────────────────────────────────────────────────────────────
+// ── initRepo ─────────────────────────────────────────────────────────────────
 
-describe('initAndPush', () => {
-  it('runs the correct git command sequence', async () => {
+describe('initRepo', () => {
+  it('runs the correct git command sequence without pushing', async () => {
     mockExeca.mockResolvedValue(execaOk());
 
-    await initAndPush(DIR, 's3://bucket/my-app/git');
+    await initRepo(DIR, 's3://bucket/my-app/git');
 
     const calls = mockExeca.mock.calls.map(c => c.slice(0, 2));
     expect(calls).toContainEqual(['git', ['init', '-b', 'master']]);
     expect(calls).toContainEqual(['git', ['add', '.']]);
     expect(calls).toContainEqual(['git', ['commit', '-m', 'Initial commit']]);
     expect(calls).toContainEqual(['git', ['remote', 'add', 'origin', 's3://bucket/my-app/git']]);
-    expect(calls).toContainEqual(['git', ['push', '-u', 'origin', 'master']]);
+    expect(calls).not.toContainEqual(['git', expect.arrayContaining(['push'])]);
   });
 
   it('writes missing gitignore entries', async () => {
     mockFs.readFile.mockResolvedValueOnce('' as never);
     mockExeca.mockResolvedValue(execaOk());
 
-    await initAndPush(DIR, 's3://bucket/my-app/git');
+    await initRepo(DIR, 's3://bucket/my-app/git');
 
     expect(mockFs.outputFile).toHaveBeenCalledWith(
       path.join(DIR, '.gitignore'),
@@ -88,7 +88,7 @@ describe('initAndPush', () => {
     mockFs.readFile.mockResolvedValueOnce('node_modules/\n.zth/\nbuild/\n' as never);
     mockExeca.mockResolvedValue(execaOk());
 
-    await initAndPush(DIR, 's3://bucket/my-app/git');
+    await initRepo(DIR, 's3://bucket/my-app/git');
 
     expect(mockFs.outputFile).not.toHaveBeenCalled();
   });
@@ -165,12 +165,20 @@ describe('localHead', () => {
 // ── commitDetailedAndPush ────────────────────────────────────────────────────
 
 describe('commitDetailedAndPush', () => {
+  it('throws when not on master branch', async () => {
+    mockExeca.mockResolvedValueOnce(execaOk('feature/oops\n')); // git rev-parse --abbrev-ref HEAD
+
+    await expect(commitDetailedAndPush(DIR, 1)).rejects.toThrow(/expected branch "master"/);
+  });
+
   it('commits with a version-prefixed message and pushes', async () => {
     mockExeca
-      .mockResolvedValueOnce(execaOk(' M src/index.ts\n?? new-file.ts')) // git status --short (XY + space prefix)
+      .mockResolvedValueOnce(execaOk('master\n')) // git rev-parse --abbrev-ref HEAD
       .mockResolvedValueOnce(execaOk()) // git add .
+      .mockResolvedValueOnce(execaOk('src/index.ts\nnew-file.ts')) // git diff --cached --name-only
+      .mockResolvedValueOnce(execaOk('M  src/index.ts\nA  new-file.ts')) // git status --short
       .mockResolvedValueOnce(execaOk()) // git commit
-      .mockResolvedValueOnce(execaOk()); // git push
+      .mockResolvedValueOnce(execaOk()); // git push -u origin master
 
     await commitDetailedAndPush(DIR, 3);
 
@@ -179,25 +187,56 @@ describe('commitDetailedAndPush', () => {
     const msg = (commitCall![1] as string[])[2];
     expect(msg).toMatch(/^v3:/);
     expect(msg).toContain('src/index.ts');
+
+    const pushCall = mockExeca.mock.calls.find(c => c[0] === 'git' && (c[1] as string[])[0] === 'push');
+    expect(pushCall![1]).toEqual(['push', '-u', 'origin', 'master']);
+  });
+
+  it('throws when there is nothing to commit', async () => {
+    mockExeca
+      .mockResolvedValueOnce(execaOk('master\n')) // git rev-parse --abbrev-ref HEAD
+      .mockResolvedValueOnce(execaOk()) // git add .
+      .mockResolvedValueOnce(execaOk('')); // git diff --cached --name-only (empty)
+
+    await expect(commitDetailedAndPush(DIR, 4)).rejects.toThrow(/Nothing new to deploy/);
   });
 
   it('throws GitConflictError when push is rejected', async () => {
     mockExeca
-      .mockResolvedValueOnce(execaOk('')) // git status --short
+      .mockResolvedValueOnce(execaOk('master\n')) // git rev-parse --abbrev-ref HEAD
       .mockResolvedValueOnce(execaOk()) // git add .
+      .mockResolvedValueOnce(execaOk('src/index.ts')) // git diff --cached --name-only
+      .mockResolvedValueOnce(execaOk(' M src/index.ts')) // git status --short
       .mockResolvedValueOnce(execaOk()) // git commit
-      .mockRejectedValueOnce(new Error('[rejected]')); // git push
+      .mockRejectedValueOnce(new Error('[rejected]')); // git push -u origin master
 
     await expect(commitDetailedAndPush(DIR, 4)).rejects.toThrow(GitConflictError);
   });
 
+  it('re-throws non-rejection push errors as-is', async () => {
+    mockExeca
+      .mockResolvedValueOnce(execaOk('master\n')) // git rev-parse --abbrev-ref HEAD
+      .mockResolvedValueOnce(execaOk()) // git add .
+      .mockResolvedValueOnce(execaOk('src/index.ts')) // git diff --cached --name-only
+      .mockResolvedValueOnce(execaOk(' M src/index.ts')) // git status --short
+      .mockResolvedValueOnce(execaOk()) // git commit
+      .mockRejectedValueOnce(new Error('Connection refused')); // git push — auth/network error
+
+    const err = await commitDetailedAndPush(DIR, 4).catch(e => e);
+    expect(err).not.toBeInstanceOf(GitConflictError);
+    expect(err.message).toMatch(/Connection refused/);
+  });
+
   it('truncates long file lists to 5 entries', async () => {
-    const manyFiles = Array.from({ length: 8 }, (_, i) => ` M file${i}.ts`).join('\n');
+    const manyFiles = Array.from({ length: 8 }, (_, i) => `M  file${i}.ts`).join('\n');
+    const manyNames = Array.from({ length: 8 }, (_, i) => `file${i}.ts`).join('\n');
     mockExeca
-      .mockResolvedValueOnce(execaOk(manyFiles))
-      .mockResolvedValueOnce(execaOk())
-      .mockResolvedValueOnce(execaOk())
-      .mockResolvedValueOnce(execaOk());
+      .mockResolvedValueOnce(execaOk('master\n')) // git rev-parse --abbrev-ref HEAD
+      .mockResolvedValueOnce(execaOk()) // git add .
+      .mockResolvedValueOnce(execaOk(manyNames)) // git diff --cached --name-only
+      .mockResolvedValueOnce(execaOk(manyFiles)) // git status --short
+      .mockResolvedValueOnce(execaOk()) // git commit
+      .mockResolvedValueOnce(execaOk()); // git push
 
     await commitDetailedAndPush(DIR, 1);
 

package/src/util/git/repo.ts

@@ -2,6 +2,7 @@ import path from 'node:path';
 import fs from 'fs-extra';
 import { execa } from 'execa';
 import { BUCKET_WRITE_NAME } from '../../constants';
+import { mfAppName } from '../app-name';
 
 export class GitConflictError extends Error {
   constructor(message: string) {
@@ -13,16 +14,21 @@ export class GitConflictError extends Error {
 const REQUIRED_GITIGNORE_ENTRIES = ['node_modules/', '.zth/', 'build/'];
 
 export function defaultS3Remote(app: string): string {
-  return `s3://${BUCKET_WRITE_NAME}/${app}/git`;
+  return `s3://${BUCKET_WRITE_NAME}/${mfAppName(app)}/git`;
 }
 
-export async function initAndPush(dir: string, remote: string): Promise<void> {
+export async function initRepo(dir: string, remote: string): Promise<void> {
   await ensureGitignore(dir);
   await execa('git', ['init', '-b', 'master'], { cwd: dir });
   await execa('git', ['add', '.'], { cwd: dir });
   await execa('git', ['commit', '-m', 'Initial commit'], { cwd: dir });
   await execa('git', ['remote', 'add', 'origin', remote], { cwd: dir });
-  await execa('git', ['push', '-u', 'origin', 'master'], { cwd: dir });
+}
+
+export async function getRemoteUrl(dir: string): Promise<string | undefined> {
+  return execa('git', ['remote', 'get-url', 'origin'], { cwd: dir })
+    .then(r => r.stdout.trim() || undefined)
+    .catch(() => undefined);
 }
 
 export async function cloneRepo(remote: string, dir: string): Promise<void> {
@@ -71,13 +77,24 @@ export async function localHead(dir: string): Promise<string> {
 }
 
 export async function commitDetailedAndPush(dir: string, version: number): Promise<void> {
-  const message = await buildCommitMessage(dir, version);
+  const { stdout: branch } = await execa('git', ['rev-parse', '--abbrev-ref', 'HEAD'], { cwd: dir });
+  if (branch.trim() !== 'master') {
+    throw new Error(`expected branch "master" but you are on "${branch.trim()}" — switch back before deploying.`);
+  }
   await execa('git', ['add', '.'], { cwd: dir });
+  const { stdout: staged } = await execa('git', ['diff', '--cached', '--name-only'], { cwd: dir });
+  if (!staged.trim()) {
+    throw new Error('Nothing new to deploy — no files have changed since the last deploy.');
+  }
+  const message = await buildCommitMessage(dir, version);
   await execa('git', ['commit', '-m', message], { cwd: dir });
   try {
-    await execa('git', ['push'], { cwd: dir });
-  } catch {
-    throw new GitConflictError('push rejected — remote has new commits');
+    await execa('git', ['push', '-u', 'origin', 'master'], { cwd: dir });
+  } catch (err) {
+    if (/\[rejected\]|non-fast-forward/.test((err as Error).message)) {
+      throw new GitConflictError('push rejected — remote has new commits');
+    }
+    throw err;
   }
 }
 

package/src/util/machine-identity.ts

@@ -0,0 +1,10 @@
+/**
+ * Returns the machine app name when running as a service (e.g. agent-runner).
+ * Available when the process is a monday.com microservice with `APP_NAME` set
+ * by the platform runtime.
+ *
+ * Returns `undefined` for interactive human users (fallback to os.userInfo).
+ */
+export function getMachineAppName(): string | undefined {
+  return process.env.APP_NAME || undefined;
+}

package/src/util/manifest.ts

@@ -23,13 +23,13 @@ export interface AssetManifestFile {
   nonExternalsEntrypoints?: string[];
   scriptType?: 'module' | 'classic';
   mfs?: string[];
-  gitRemote: string;
 }
 
 export interface ManifestEntry extends AssetManifestFile {
   version: number;
   url: string;
   deployedBy: string;
+  gitRemote?: string;
 }
 
 export type Manifest = Record<string, ManifestEntry>;