@mondaydotcomorg/z2h-cli 0.13.1 → 0.13.2

package/dist/commands/delete.d.ts

@@ -0,0 +1,6 @@
+export interface DeleteOptions {
+    yes?: boolean;
+    json?: boolean;
+}
+export declare function deleteCommand(opts?: DeleteOptions): Promise<void>;
+//# sourceMappingURL=delete.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"delete.d.ts","sourceRoot":"","sources":["../../src/commands/delete.ts"],"names":[],"mappings":"AAMA,MAAM,WAAW,aAAa;IAC5B,GAAG,CAAC,EAAE,OAAO,CAAC;IACd,IAAI,CAAC,EAAE,OAAO,CAAC;CAChB;AAkBD,wBAAsB,aAAa,CAAC,IAAI,GAAE,aAAkB,GAAG,OAAO,CAAC,IAAI,CAAC,CAmC3E"}

package/dist/commands/delete.js

@@ -0,0 +1,53 @@
+Object.defineProperty(exports, Symbol.toStringTag, { value: 'Module' });
+
+const node_readline = require('node:readline');
+const util_logger = require('../util/logger.js');
+const util_appName = require('../util/app-name.js');
+const constants = require('../constants.js');
+const util_auth_authStore = require('../util/auth/auth-store.js');
+
+// Type-the-app-name confirmation. The caller must retype the de-scoped app
+// name (what they see in the URL) to guard against accidental deletes.
+async function confirmByName(appSlug) {
+    const rl = node_readline.createInterface({ input: process.stdin, output: process.stderr });
+    const answer = await new Promise(resolve => {
+        rl.question(`This permanently deletes "${appSlug}" and takes it offline. This cannot be undone.\n` +
+            `Type the app name to confirm: `, resolve);
+    });
+    rl.close();
+    return answer.trim() === appSlug;
+}
+// Should be run from the consumer app directory — uses process.cwd() to locate it.
+async function deleteCommand(opts = {}) {
+    if (opts.json) {
+        util_logger.setOutputMode('json');
+    }
+    const cwdName = util_appName.getCwdAppName();
+    if (!cwdName) {
+        throw new Error('Run this from inside a consumer app directory (the one with your package.json).');
+    }
+    const appSlug = util_appName.cleanAppName(cwdName); // user-facing name (matches the bigbrain.me URL)
+    const appName = util_appName.mfAppName(cwdName); // canonical mf- bundle name the backend keys on
+    // Confirmation. --json is always non-interactive, so it requires --yes.
+    if (!opts.yes) {
+        if (opts.json || !process.stdin.isTTY) {
+            throw new Error('Refusing to delete without confirmation — pass --yes to delete non-interactively.');
+        }
+        if (!(await confirmByName(appSlug))) {
+            throw new Error(`Name did not match "${appSlug}" — aborted, nothing was deleted.`);
+        }
+    }
+    const { token } = await util_auth_authStore.readZthAuth();
+    util_logger.info(`deleting "${appName}"`);
+    const res = await fetch(`${constants.brokerBaseUrl()}/z2h-apps/${encodeURIComponent(appName)}`, {
+        method: 'DELETE',
+        headers: { Authorization: `Bearer ${token}`, ...constants.routingHeaders() },
+    });
+    if (!res.ok) {
+        const text = await res.text();
+        throw new Error(`Delete failed (${res.status}): ${text.slice(0, 1024)}`);
+    }
+    util_logger.output(`[z2h-cli] "${appName}" deleted ✅ — it is now offline.`, { ok: true, appName, deleted: true });
+}
+
+exports.deleteCommand = deleteCommand;

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

@@ -0,0 +1,6 @@
+export interface DeleteOptions {
+    yes?: boolean;
+    json?: boolean;
+}
+export declare function deleteCommand(opts?: DeleteOptions): Promise<void>;
+//# sourceMappingURL=delete.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"delete.d.ts","sourceRoot":"","sources":["../../../src/commands/delete.ts"],"names":[],"mappings":"AAMA,MAAM,WAAW,aAAa;IAC5B,GAAG,CAAC,EAAE,OAAO,CAAC;IACd,IAAI,CAAC,EAAE,OAAO,CAAC;CAChB;AAkBD,wBAAsB,aAAa,CAAC,IAAI,GAAE,aAAkB,GAAG,OAAO,CAAC,IAAI,CAAC,CAmC3E"}

package/dist/esm/commands/delete.mjs

@@ -0,0 +1,51 @@
+import { createInterface } from 'node:readline';
+import { setOutputMode, info, output } from '../util/logger.mjs';
+import { getCwdAppName, cleanAppName, mfAppName } from '../util/app-name.mjs';
+import { brokerBaseUrl, routingHeaders } from '../constants.mjs';
+import { readZthAuth } from '../util/auth/auth-store.mjs';
+
+// Type-the-app-name confirmation. The caller must retype the de-scoped app
+// name (what they see in the URL) to guard against accidental deletes.
+async function confirmByName(appSlug) {
+    const rl = createInterface({ input: process.stdin, output: process.stderr });
+    const answer = await new Promise(resolve => {
+        rl.question(`This permanently deletes "${appSlug}" and takes it offline. This cannot be undone.\n` +
+            `Type the app name to confirm: `, resolve);
+    });
+    rl.close();
+    return answer.trim() === appSlug;
+}
+// Should be run from the consumer app directory — uses process.cwd() to locate it.
+async function deleteCommand(opts = {}) {
+    if (opts.json) {
+        setOutputMode('json');
+    }
+    const cwdName = getCwdAppName();
+    if (!cwdName) {
+        throw new Error('Run this from inside a consumer app directory (the one with your package.json).');
+    }
+    const appSlug = cleanAppName(cwdName); // user-facing name (matches the bigbrain.me URL)
+    const appName = mfAppName(cwdName); // canonical mf- bundle name the backend keys on
+    // Confirmation. --json is always non-interactive, so it requires --yes.
+    if (!opts.yes) {
+        if (opts.json || !process.stdin.isTTY) {
+            throw new Error('Refusing to delete without confirmation — pass --yes to delete non-interactively.');
+        }
+        if (!(await confirmByName(appSlug))) {
+            throw new Error(`Name did not match "${appSlug}" — aborted, nothing was deleted.`);
+        }
+    }
+    const { token } = await readZthAuth();
+    info(`deleting "${appName}"`);
+    const res = await fetch(`${brokerBaseUrl()}/z2h-apps/${encodeURIComponent(appName)}`, {
+        method: 'DELETE',
+        headers: { Authorization: `Bearer ${token}`, ...routingHeaders() },
+    });
+    if (!res.ok) {
+        const text = await res.text();
+        throw new Error(`Delete failed (${res.status}): ${text.slice(0, 1024)}`);
+    }
+    output(`[z2h-cli] "${appName}" deleted ✅ — it is now offline.`, { ok: true, appName, deleted: true });
+}
+
+export { deleteCommand };

package/dist/esm/index.mjs

@@ -8,6 +8,7 @@ import { devCommand } from './commands/dev.mjs';
 import { buildCommand } from './commands/build.mjs';
 import { cleanCommand } from './commands/clean.mjs';
 import { deployCommand } from './commands/deploy.mjs';
+import { deleteCommand } from './commands/delete.mjs';
 import { grantCommand, revokeCommand, transferOwnerCommand } from './commands/grant.mjs';
 import { createWorkspaceCommand } from './commands/create-workspace.mjs';
 import { createCommand } from './commands/create.mjs';
@@ -228,6 +229,21 @@ async function main() {
             await fail(`transfer-owner failed: ${err.message}`, { command: 'transfer-owner' }, 1);
         }
     });
+    program
+        .command('delete')
+        .description('Permanently delete the current app and take it offline (owners/admins only)')
+        .option('--yes', 'skip the confirmation prompt (required for --json / non-interactive)')
+        .option('--json', 'emit structured JSON on stdout')
+        .action(async (opts) => {
+        try {
+            await trackDuration('z2h_app_delete_success', () => deleteCommand(opts), {
+                app_name: getCwdAppName(),
+            });
+        }
+        catch (err) {
+            await fail(`delete failed: ${err.message}`, { command: 'delete' }, 1);
+        }
+    });
     program
         .command('migrate')
         .description('Run pending workspace migrations')

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":"AAkBA,qBAAa,gBAAiB,SAAQ,KAAK;gBAC7B,OAAO,EAAE,MAAM;CAI5B;AAED,MAAM,WAAW,YAAY;IAC3B,YAAY,EAAE,MAAM,EAAE,CAAC;IACvB,aAAa,EAAE,MAAM,EAAE,CAAC;IACxB,gBAAgB,EAAE,MAAM,EAAE,CAAC;CAC5B;AAKD,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,CAOzE;AAED,wBAAsB,YAAY,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,GAAG,SAAS,CAAC,CAI3E;AAED;;;;GAIG;AACH,wBAAsB,cAAc,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAK/D;AAED,wBAAsB,SAAS,CAAC,MAAM,EAAE,MAAM,EAAE,GAAG,EAAE,MAAM,EAAE,GAAG,GAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAG5G;AAED,wBAAsB,iBAAiB,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAclE;AAED,wBAAsB,cAAc,CAAC,GAAG,EAAE,MAAM,EAAE,GAAG,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,GAAG,OAAO,CAAC,IAAI,CAAC,CAe7F;AAED;;;;;;GAMG;AACH,wBAAsB,YAAY,CAAC,GAAG,EAAE,MAAM,EAAE,GAAG,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,GAAG,OAAO,CAAC,IAAI,CAAC,CAqB3F;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"}
+{"version":3,"file":"repo.d.ts","sourceRoot":"","sources":["../../../../src/util/git/repo.ts"],"names":[],"mappings":"AAkBA,qBAAa,gBAAiB,SAAQ,KAAK;gBAC7B,OAAO,EAAE,MAAM;CAI5B;AAED,MAAM,WAAW,YAAY;IAC3B,YAAY,EAAE,MAAM,EAAE,CAAC;IACvB,aAAa,EAAE,MAAM,EAAE,CAAC;IACxB,gBAAgB,EAAE,MAAM,EAAE,CAAC;CAC5B;AAKD,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,CAOzE;AAED,wBAAsB,YAAY,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,GAAG,SAAS,CAAC,CAI3E;AAED;;;;GAIG;AACH,wBAAsB,cAAc,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAK/D;AAED,wBAAsB,SAAS,CAAC,MAAM,EAAE,MAAM,EAAE,GAAG,EAAE,MAAM,EAAE,GAAG,GAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAG5G;AAED,wBAAsB,iBAAiB,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAclE;AAED,wBAAsB,cAAc,CAAC,GAAG,EAAE,MAAM,EAAE,GAAG,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,GAAG,OAAO,CAAC,IAAI,CAAC,CA2B7F;AAED;;;;;;GAMG;AACH,wBAAsB,YAAY,CAAC,GAAG,EAAE,MAAM,EAAE,GAAG,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,GAAG,OAAO,CAAC,IAAI,CAAC,CAqB3F;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"}

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

@@ -69,6 +69,16 @@ async function safeBackupIfDirty(dir) {
 }
 async function pullAndResolve(dir, env) {
     const gitEnv = env ? { ...process.env, ...env } : undefined;
+    // If the remote has no master branch there's nothing to pull — treat it as a
+    // first deploy and let the subsequent push create it. This covers a brand-new
+    // remote as well as one whose objects were removed (e.g. the app was deleted,
+    // wiping its S3 git prefix), which would otherwise surface as a bogus conflict.
+    const hasRemoteMaster = await execGit(['ls-remote', '--heads', 'origin', 'master'], dir, gitEnv)
+        .then(r => Boolean(r.stdout.trim()))
+        .catch(() => false);
+    if (!hasRemoteMaster) {
+        return;
+    }
     try {
         await execGit(['pull', '--ff-only'], dir, gitEnv);
     }

package/dist/index.js

@@ -8,6 +8,7 @@ const commands_dev = require('./commands/dev.js');
 const commands_build = require('./commands/build.js');
 const commands_clean = require('./commands/clean.js');
 const commands_deploy = require('./commands/deploy.js');
+const commands_delete = require('./commands/delete.js');
 const commands_grant = require('./commands/grant.js');
 const commands_createWorkspace = require('./commands/create-workspace.js');
 const commands_create = require('./commands/create.js');
@@ -234,6 +235,21 @@ async function main() {
             await util_logger.fail(`transfer-owner failed: ${err.message}`, { command: 'transfer-owner' }, 1);
         }
     });
+    program
+        .command('delete')
+        .description('Permanently delete the current app and take it offline (owners/admins only)')
+        .option('--yes', 'skip the confirmation prompt (required for --json / non-interactive)')
+        .option('--json', 'emit structured JSON on stdout')
+        .action(async (opts) => {
+        try {
+            await util_tracker.trackDuration('z2h_app_delete_success', () => commands_delete.deleteCommand(opts), {
+                app_name: util_appName.getCwdAppName(),
+            });
+        }
+        catch (err) {
+            await util_logger.fail(`delete failed: ${err.message}`, { command: 'delete' }, 1);
+        }
+    });
     program
         .command('migrate')
         .description('Run pending workspace migrations')

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":"AAkBA,qBAAa,gBAAiB,SAAQ,KAAK;gBAC7B,OAAO,EAAE,MAAM;CAI5B;AAED,MAAM,WAAW,YAAY;IAC3B,YAAY,EAAE,MAAM,EAAE,CAAC;IACvB,aAAa,EAAE,MAAM,EAAE,CAAC;IACxB,gBAAgB,EAAE,MAAM,EAAE,CAAC;CAC5B;AAKD,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,CAOzE;AAED,wBAAsB,YAAY,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,GAAG,SAAS,CAAC,CAI3E;AAED;;;;GAIG;AACH,wBAAsB,cAAc,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAK/D;AAED,wBAAsB,SAAS,CAAC,MAAM,EAAE,MAAM,EAAE,GAAG,EAAE,MAAM,EAAE,GAAG,GAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAG5G;AAED,wBAAsB,iBAAiB,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAclE;AAED,wBAAsB,cAAc,CAAC,GAAG,EAAE,MAAM,EAAE,GAAG,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,GAAG,OAAO,CAAC,IAAI,CAAC,CAe7F;AAED;;;;;;GAMG;AACH,wBAAsB,YAAY,CAAC,GAAG,EAAE,MAAM,EAAE,GAAG,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,GAAG,OAAO,CAAC,IAAI,CAAC,CAqB3F;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"}
+{"version":3,"file":"repo.d.ts","sourceRoot":"","sources":["../../../src/util/git/repo.ts"],"names":[],"mappings":"AAkBA,qBAAa,gBAAiB,SAAQ,KAAK;gBAC7B,OAAO,EAAE,MAAM;CAI5B;AAED,MAAM,WAAW,YAAY;IAC3B,YAAY,EAAE,MAAM,EAAE,CAAC;IACvB,aAAa,EAAE,MAAM,EAAE,CAAC;IACxB,gBAAgB,EAAE,MAAM,EAAE,CAAC;CAC5B;AAKD,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,CAOzE;AAED,wBAAsB,YAAY,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,GAAG,SAAS,CAAC,CAI3E;AAED;;;;GAIG;AACH,wBAAsB,cAAc,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAK/D;AAED,wBAAsB,SAAS,CAAC,MAAM,EAAE,MAAM,EAAE,GAAG,EAAE,MAAM,EAAE,GAAG,GAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAG5G;AAED,wBAAsB,iBAAiB,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAclE;AAED,wBAAsB,cAAc,CAAC,GAAG,EAAE,MAAM,EAAE,GAAG,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,GAAG,OAAO,CAAC,IAAI,CAAC,CA2B7F;AAED;;;;;;GAMG;AACH,wBAAsB,YAAY,CAAC,GAAG,EAAE,MAAM,EAAE,GAAG,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,GAAG,OAAO,CAAC,IAAI,CAAC,CAqB3F;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"}

package/dist/util/git/repo.js

@@ -76,6 +76,16 @@ async function safeBackupIfDirty(dir) {
 }
 async function pullAndResolve(dir, env) {
     const gitEnv = env ? { ...process.env, ...env } : undefined;
+    // If the remote has no master branch there's nothing to pull — treat it as a
+    // first deploy and let the subsequent push create it. This covers a brand-new
+    // remote as well as one whose objects were removed (e.g. the app was deleted,
+    // wiping its S3 git prefix), which would otherwise surface as a bogus conflict.
+    const hasRemoteMaster = await execGit(['ls-remote', '--heads', 'origin', 'master'], dir, gitEnv)
+        .then(r => Boolean(r.stdout.trim()))
+        .catch(() => false);
+    if (!hasRemoteMaster) {
+        return;
+    }
     try {
         await execGit(['pull', '--ff-only'], dir, gitEnv);
     }

package/package.json

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

package/src/commands/delete.ts

@@ -0,0 +1,63 @@
+import { createInterface } from 'node:readline';
+import { output, info, setOutputMode } from '../util/logger';
+import { getCwdAppName, cleanAppName, mfAppName } from '../util/app-name';
+import { brokerBaseUrl, routingHeaders } from '../constants';
+import { readZthAuth } from '../util/auth/auth-store';
+
+export interface DeleteOptions {
+  yes?: boolean;
+  json?: boolean;
+}
+
+// Type-the-app-name confirmation. The caller must retype the de-scoped app
+// name (what they see in the URL) to guard against accidental deletes.
+async function confirmByName(appSlug: string): Promise<boolean> {
+  const rl = createInterface({ input: process.stdin, output: process.stderr });
+  const answer = await new Promise<string>(resolve => {
+    rl.question(
+      `This permanently deletes "${appSlug}" and takes it offline. This cannot be undone.\n` +
+        `Type the app name to confirm: `,
+      resolve
+    );
+  });
+  rl.close();
+  return answer.trim() === appSlug;
+}
+
+// Should be run from the consumer app directory — uses process.cwd() to locate it.
+export async function deleteCommand(opts: DeleteOptions = {}): Promise<void> {
+  if (opts.json) {
+    setOutputMode('json');
+  }
+
+  const cwdName = getCwdAppName();
+  if (!cwdName) {
+    throw new Error('Run this from inside a consumer app directory (the one with your package.json).');
+  }
+  const appSlug = cleanAppName(cwdName); // user-facing name (matches the bigbrain.me URL)
+  const appName = mfAppName(cwdName); // canonical mf- bundle name the backend keys on
+
+  // Confirmation. --json is always non-interactive, so it requires --yes.
+  if (!opts.yes) {
+    if (opts.json || !process.stdin.isTTY) {
+      throw new Error('Refusing to delete without confirmation — pass --yes to delete non-interactively.');
+    }
+    if (!(await confirmByName(appSlug))) {
+      throw new Error(`Name did not match "${appSlug}" — aborted, nothing was deleted.`);
+    }
+  }
+
+  const { token } = await readZthAuth();
+
+  info(`deleting "${appName}"`);
+  const res = await fetch(`${brokerBaseUrl()}/z2h-apps/${encodeURIComponent(appName)}`, {
+    method: 'DELETE',
+    headers: { Authorization: `Bearer ${token}`, ...routingHeaders() },
+  });
+  if (!res.ok) {
+    const text = await res.text();
+    throw new Error(`Delete failed (${res.status}): ${text.slice(0, 1024)}`);
+  }
+
+  output(`[z2h-cli] "${appName}" deleted ✅ — it is now offline.`, { ok: true, appName, deleted: true });
+}

package/src/index.ts

@@ -8,6 +8,7 @@ import { devCommand } from './commands/dev';
 import { buildCommand } from './commands/build';
 import { cleanCommand } from './commands/clean';
 import { deployCommand } from './commands/deploy';
+import { deleteCommand } from './commands/delete';
 import { grantCommand, revokeCommand, transferOwnerCommand } from './commands/grant';
 import { createWorkspaceCommand } from './commands/create-workspace';
 import { createCommand, CreateOptions } from './commands/create';
@@ -254,6 +255,21 @@ async function main(): Promise<void> {
       }
     });
 
+  program
+    .command('delete')
+    .description('Permanently delete the current app and take it offline (owners/admins only)')
+    .option('--yes', 'skip the confirmation prompt (required for --json / non-interactive)')
+    .option('--json', 'emit structured JSON on stdout')
+    .action(async (opts: { yes?: boolean; json?: boolean }) => {
+      try {
+        await trackDuration('z2h_app_delete_success', () => deleteCommand(opts), {
+          app_name: getCwdAppName(),
+        });
+      } catch (err) {
+        await fail(`delete failed: ${(err as Error).message}`, { command: 'delete' }, 1);
+      }
+    });
+
   program
     .command('migrate')
     .description('Run pending workspace migrations')

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

@@ -179,13 +179,35 @@ describe('safeBackupIfDirty', () => {
 
 describe('pullAndResolve', () => {
   it('resolves when pull fast-forwards cleanly', async () => {
-    mockExeca.mockResolvedValueOnce(execaOk()); // git pull --ff-only
+    mockExeca
+      .mockResolvedValueOnce(execaOk('deadbeef\trefs/heads/master')) // ls-remote --heads origin master
+      .mockResolvedValueOnce(execaOk()); // git pull --ff-only
 
     await expect(pullAndResolve(DIR)).resolves.toBeUndefined();
   });
 
+  it('skips the pull (first-deploy) when the remote has no master ref', async () => {
+    mockExeca.mockResolvedValueOnce(execaOk('')); // ls-remote --heads origin master → empty (gone/new remote)
+
+    await expect(pullAndResolve(DIR)).resolves.toBeUndefined();
+
+    const calls = mockExeca.mock.calls.map(c => c.slice(0, 2));
+    expect(calls).toContainEqual(['git', ['ls-remote', '--heads', 'origin', 'master']]);
+    expect(calls).not.toContainEqual(['git', ['pull', '--ff-only']]);
+  });
+
+  it('treats an unreachable ls-remote as no remote and skips the pull', async () => {
+    mockExeca.mockRejectedValueOnce(new Error('fatal: could not read from remote')); // ls-remote fails
+
+    await expect(pullAndResolve(DIR)).resolves.toBeUndefined();
+
+    const calls = mockExeca.mock.calls.map(c => c.slice(0, 2));
+    expect(calls).not.toContainEqual(['git', ['pull', '--ff-only']]);
+  });
+
   it('throws GitConflictError with structured JSON on non-fast-forward', async () => {
     mockExeca
+      .mockResolvedValueOnce(execaOk('deadbeef\trefs/heads/master')) // ls-remote --heads origin master
       .mockRejectedValueOnce(new Error('fatal: Not possible to fast-forward')) // git pull
       .mockResolvedValueOnce(execaOk('')) // safeBackupIfDirty: git status --porcelain (clean)
       .mockResolvedValueOnce(execaOk()) // gatherConflictInfo: git fetch origin

package/src/util/git/repo.ts

@@ -86,6 +86,18 @@ export async function safeBackupIfDirty(dir: string): Promise<void> {
 
 export async function pullAndResolve(dir: string, env?: Record<string, string>): Promise<void> {
   const gitEnv = env ? { ...process.env, ...env } : undefined;
+
+  // If the remote has no master branch there's nothing to pull — treat it as a
+  // first deploy and let the subsequent push create it. This covers a brand-new
+  // remote as well as one whose objects were removed (e.g. the app was deleted,
+  // wiping its S3 git prefix), which would otherwise surface as a bogus conflict.
+  const hasRemoteMaster = await execGit(['ls-remote', '--heads', 'origin', 'master'], dir, gitEnv)
+    .then(r => Boolean(r.stdout.trim()))
+    .catch(() => false);
+  if (!hasRemoteMaster) {
+    return;
+  }
+
   try {
     await execGit(['pull', '--ff-only'], dir, gitEnv);
   } catch (err) {