@pushto/cli 0.4.10 → 0.5.0

package/dist/commands/__tests__/mcp-add.test.d.ts

@@ -0,0 +1,2 @@
+export {};
+//# sourceMappingURL=mcp-add.test.d.ts.map

package/dist/commands/__tests__/mcp-add.test.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"mcp-add.test.d.ts","sourceRoot":"","sources":["../../../src/commands/__tests__/mcp-add.test.ts"],"names":[],"mappings":""}

package/dist/commands/__tests__/mcp-add.test.js

@@ -0,0 +1,112 @@
+import { describe, it, expect, vi, beforeEach } from 'vitest';
+vi.mock('node:fs', () => ({
+    default: { existsSync: vi.fn(), readFileSync: vi.fn(), writeFileSync: vi.fn() },
+}));
+vi.mock('node:child_process', () => ({ execFile: vi.fn() }));
+vi.mock('../../lib/config.js', () => ({ getToken: vi.fn(() => 'tok') }));
+vi.mock('../../lib/interactive.js', () => ({ canPrompt: vi.fn() }));
+vi.mock('../../lib/ask.js', () => ({ ask: vi.fn() }));
+vi.mock('../../lib/mcp-serve/serve.js', () => ({ runMcpServe: vi.fn() }));
+vi.mock('../../lib/mcp-serve/client.js', () => ({ McpApiClient: vi.fn() }));
+vi.mock('../../lib/mcp-serve/deploy-local.js', () => ({ deployLocalTool: {} }));
+import fs from 'node:fs';
+import { execFile } from 'node:child_process';
+import { mcp } from '../mcp.js';
+import { canPrompt } from '../../lib/interactive.js';
+import { ask } from '../../lib/ask.js';
+import { mergeCursorConfig, genericSnippet } from '../../lib/mcp-serve/agent-config.js';
+const execCalls = [];
+let claudeOnPath = false;
+beforeEach(() => {
+    vi.clearAllMocks();
+    execCalls.length = 0;
+    claudeOnPath = false;
+    vi.mocked(execFile).mockImplementation(((cmd, args, cb) => {
+        const done = (typeof cb === 'function' ? cb : undefined);
+        execCalls.push([cmd, ...args]);
+        if (cmd === 'which') {
+            if (claudeOnPath)
+                done?.(null, { stdout: '/usr/local/bin/claude', stderr: '' });
+            else
+                done?.(new Error('not found'), { stdout: '', stderr: '' });
+            return {};
+        }
+        done?.(null, { stdout: '', stderr: '' });
+        return {};
+    }));
+    vi.mocked(canPrompt).mockReturnValue(true);
+    vi.mocked(fs.existsSync).mockReturnValue(false);
+});
+const captureStdout = () => {
+    const spy = vi.spyOn(process.stdout, 'write').mockImplementation(() => true);
+    return () => spy.mock.calls.map((c) => String(c[0])).join('');
+};
+describe('mergeCursorConfig', () => {
+    it('merges into an existing config preserving other servers', () => {
+        const out = mergeCursorConfig(JSON.stringify({ mcpServers: { other: { command: 'x' } } }));
+        expect(out.ok).toBe(true);
+        if (out.ok) {
+            const parsed = JSON.parse(out.merged);
+            expect(Object.keys(parsed.mcpServers).sort()).toEqual(['other', 'pushto']);
+            expect(out.already).toBe(false);
+        }
+    });
+    it('reports already when the exact entry exists', () => {
+        const out = mergeCursorConfig(JSON.stringify({ mcpServers: { pushto: { command: 'pushto', args: ['mcp', 'serve'] } } }));
+        expect(out.ok && out.already).toBe(true);
+    });
+    it('refuses to clobber unparseable json', () => {
+        const out = mergeCursorConfig('{not json');
+        expect(out.ok).toBe(false);
+    });
+    it('starts from empty for a missing file', () => {
+        const out = mergeCursorConfig(null);
+        expect(out.ok).toBe(true);
+        if (out.ok)
+            expect(JSON.parse(out.merged)).toEqual(JSON.parse(genericSnippet()));
+    });
+});
+describe('pushto mcp add', () => {
+    it('runs the claude one-liner on consent', async () => {
+        claudeOnPath = true;
+        vi.mocked(ask).mockResolvedValue('y');
+        await mcp('add', [], {});
+        expect(execCalls).toContainEqual([
+            'claude', 'mcp', 'add', 'pushto', '--', 'pushto', 'mcp', 'serve',
+        ]);
+    });
+    it('prints snippets instead when consent is declined', async () => {
+        claudeOnPath = true;
+        vi.mocked(ask).mockResolvedValue('n');
+        const logSpy = vi.spyOn(console, 'log').mockImplementation(() => undefined);
+        await mcp('add', [], {});
+        expect(execCalls.some((c) => c[0] === 'claude')).toBe(false);
+        expect(logSpy.mock.calls.flat().join('\n')).toContain('claude mcp add pushto');
+    });
+    it('writes the merged cursor config on --yes without prompting', async () => {
+        vi.mocked(fs.existsSync).mockReturnValue(true);
+        vi.mocked(fs.readFileSync).mockReturnValue(JSON.stringify({ mcpServers: {} }));
+        await mcp('add', [], { yes: true });
+        expect(ask).not.toHaveBeenCalled();
+        const written = vi.mocked(fs.writeFileSync).mock.calls[0]?.[1];
+        expect(JSON.parse(written).mcpServers.pushto).toEqual({ command: 'pushto', args: ['mcp', 'serve'] });
+    });
+    it('--json never prompts and emits the machine shape', async () => {
+        vi.mocked(canPrompt).mockReturnValue(false);
+        const read = captureStdout();
+        await mcp('add', [], { json: true });
+        expect(ask).not.toHaveBeenCalled();
+        const payload = JSON.parse(read());
+        expect(payload.detected).toBe('none');
+        expect(payload.configured).toBe(false);
+        expect(payload.snippet).toContain('pushto');
+    });
+    it('never overwrites an unparseable cursor config', async () => {
+        vi.mocked(fs.existsSync).mockReturnValue(true);
+        vi.mocked(fs.readFileSync).mockReturnValue('{broken');
+        vi.spyOn(console, 'log').mockImplementation(() => undefined);
+        await mcp('add', [], { yes: true });
+        expect(fs.writeFileSync).not.toHaveBeenCalled();
+    });
+});
+//# sourceMappingURL=mcp-add.test.js.map

package/dist/commands/__tests__/mcp-add.test.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"mcp-add.test.js","sourceRoot":"","sources":["../../../src/commands/__tests__/mcp-add.test.ts"],"names":[],"mappings":"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"}

package/dist/commands/__tests__/mcp-serve.test.d.ts

@@ -0,0 +1,2 @@
+export {};
+//# sourceMappingURL=mcp-serve.test.d.ts.map

package/dist/commands/__tests__/mcp-serve.test.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"mcp-serve.test.d.ts","sourceRoot":"","sources":["../../../src/commands/__tests__/mcp-serve.test.ts"],"names":[],"mappings":""}

package/dist/commands/__tests__/mcp-serve.test.js

@@ -0,0 +1,169 @@
+import { describe, it, expect, beforeAll, afterAll } from 'vitest';
+import { spawn, execFile } from 'node:child_process';
+import { promisify } from 'node:util';
+import { fileURLToPath } from 'node:url';
+import path from 'node:path';
+import os from 'node:os';
+import fs from 'node:fs';
+import http from 'node:http';
+import { Client } from '@modelcontextprotocol/sdk/client/index.js';
+import { StdioClientTransport } from '@modelcontextprotocol/sdk/client/stdio.js';
+const execFileAsync = promisify(execFile);
+const HERE = path.dirname(fileURLToPath(import.meta.url));
+const CLI_ROOT = path.resolve(HERE, '../../..');
+const ENTRY = path.join(CLI_ROOT, 'dist', 'cli.js');
+/**
+ * The serve command against a stub API, driven by the REAL sdk client over
+ * stdio — the same wire a claude/cursor session uses. HOME is redirected per
+ * run (conf reads the login token under HOME; see headless-smoke.test.ts for
+ * the incident this guards).
+ */
+const ENVELOPE = { summary: 'demo is live. it serves at demo.pushto.host.', data: { slug: 'demo' } };
+let apiServer;
+let apiUrl = '';
+let mintCount = 0;
+const makeHome = () => {
+    const home = fs.mkdtempSync(path.join(os.tmpdir(), 'pushto-mcp-home-'));
+    // conf resolves its dir via env-paths, which is ~/.config on linux but
+    // ~/Library/Preferences on macOS (XDG is ignored there). Seed both so the
+    // spawned server reads the stub apiUrl on either platform — miss it and
+    // the default apiUrl points the test at production.
+    for (const confDir of [
+        path.join(home, '.config', 'pushto-nodejs'),
+        path.join(home, 'Library', 'Preferences', 'pushto-nodejs'),
+    ]) {
+        fs.mkdirSync(confDir, { recursive: true });
+        fs.writeFileSync(path.join(confDir, 'config.json'), JSON.stringify({ apiUrl }));
+    }
+    return home;
+};
+const serveEnv = (home) => ({
+    ...process.env,
+    HOME: home,
+    USERPROFILE: home,
+    XDG_CONFIG_HOME: path.join(home, '.config'),
+    PUSHTO_TOKEN: 'stub-cli-session',
+    CI: '1',
+});
+beforeAll(async () => {
+    await execFileAsync('npx', ['tsc'], { cwd: CLI_ROOT });
+    apiServer = http.createServer((req, res) => {
+        const url = req.url ?? '';
+        if (req.method === 'POST' && url === '/api/cli/mcp-token') {
+            mintCount += 1;
+            res.writeHead(200, { 'content-type': 'application/json' });
+            res.end(JSON.stringify({ token: 'stub-mcp-token', expiresAt: new Date(Date.now() + 604_800_000).toISOString() }));
+            return;
+        }
+        if (req.method === 'GET' && url === '/api/mcp') {
+            res.writeHead(200, { 'content-type': 'application/json' });
+            res.end(JSON.stringify({
+                tools: [
+                    {
+                        name: 'pushto.project.describe',
+                        description: "read one project's current state.",
+                        inputSchema: { type: 'object', properties: { slug: { type: 'string' } }, required: ['slug'] },
+                        available: true,
+                    },
+                    {
+                        name: 'pushto.deploy.status',
+                        description: 'poll one deployment.',
+                        inputSchema: { type: 'object' },
+                        available: true,
+                    },
+                    { name: 'pushto.broken.tool', description: 'stub', inputSchema: null, available: false, unavailableReason: 'nope' },
+                ],
+            }));
+            return;
+        }
+        if (req.method === 'POST' && url === '/api/mcp') {
+            let body = '';
+            req.on('data', (d) => { body += String(d); });
+            req.on('end', () => {
+                const parsed = JSON.parse(body);
+                if (parsed.tool === 'pushto.project.describe') {
+                    res.writeHead(200, { 'content-type': 'application/json' });
+                    res.end(JSON.stringify({ result: ENVELOPE }));
+                }
+                else {
+                    res.writeHead(400, { 'content-type': 'application/json' });
+                    res.end(JSON.stringify({ error: `unknown tool: ${parsed.tool}` }));
+                }
+            });
+            return;
+        }
+        res.writeHead(404).end();
+    });
+    await new Promise((resolve) => apiServer.listen(0, '127.0.0.1', resolve));
+    apiUrl = `http://127.0.0.1:${apiServer.address().port}`;
+}, 120_000);
+afterAll(async () => {
+    await new Promise((resolve) => apiServer.close(() => resolve()));
+});
+describe('pushto mcp serve', () => {
+    it('serves the remote catalog to a real sdk client and proxies calls', async () => {
+        const home = makeHome();
+        const transport = new StdioClientTransport({
+            command: process.execPath,
+            args: [ENTRY, 'mcp', 'serve'],
+            env: serveEnv(home),
+        });
+        const client = new Client({ name: 'test-agent', version: '0.0.0' });
+        await client.connect(transport);
+        const { tools } = await client.listTools();
+        const names = tools.map((t) => t.name);
+        expect(names).toContain('pushto.project.describe');
+        expect(names).toContain('pushto.deploy.status');
+        // unavailable tools are filtered out of the served catalog
+        expect(names).not.toContain('pushto.broken.tool');
+        const result = await client.callTool({ name: 'pushto.project.describe', arguments: { slug: 'demo' } });
+        const content = result.content;
+        expect(JSON.parse(content[0].text)).toEqual(ENVELOPE);
+        expect(result.isError ?? false).toBe(false);
+        const failed = await client.callTool({ name: 'pushto.nope', arguments: {} });
+        expect(failed.isError).toBe(true);
+        const failedContent = failed.content;
+        const errPayload = JSON.parse(failedContent[0].text);
+        expect(errPayload.code).toBe('SERVER_ERROR');
+        expect(errPayload.human).toBe('unknown tool: pushto.nope');
+        expect(mintCount).toBeGreaterThanOrEqual(1);
+        await client.close();
+    }, 30_000);
+    it('keeps stdout pure protocol — every line parses as json-rpc', async () => {
+        const home = makeHome();
+        const child = spawn(process.execPath, [ENTRY, 'mcp', 'serve'], {
+            stdio: ['pipe', 'pipe', 'pipe'],
+            env: serveEnv(home),
+        });
+        let stdout = '';
+        let stderr = '';
+        child.stdout.on('data', (d) => { stdout += String(d); });
+        child.stderr.on('data', (d) => { stderr += String(d); });
+        child.stdin.write('{"jsonrpc":"2.0","id":1,"method":"initialize","params":{"protocolVersion":"2025-06-18","capabilities":{},"clientInfo":{"name":"probe","version":"0"}}}\n' +
+            '{"jsonrpc":"2.0","method":"notifications/initialized"}\n' +
+            '{"jsonrpc":"2.0","id":2,"method":"tools/list"}\n');
+        await new Promise((r) => setTimeout(r, 2_500));
+        child.kill('SIGKILL');
+        const lines = stdout.split('\n').filter((l) => l.trim().length > 0);
+        expect(lines.length).toBeGreaterThanOrEqual(2);
+        for (const line of lines) {
+            const frame = JSON.parse(line);
+            expect(frame.jsonrpc).toBe('2.0');
+        }
+        // the boot notice goes to stderr, never stdout
+        expect(stderr).toContain('pushto mcp server up');
+    }, 30_000);
+    it('exits band 10 with a login hint when no session exists', async () => {
+        const home = fs.mkdtempSync(path.join(os.tmpdir(), 'pushto-mcp-nologin-'));
+        const child = spawn(process.execPath, [ENTRY, 'mcp', 'serve'], {
+            stdio: ['ignore', 'pipe', 'pipe'],
+            env: { ...serveEnv(home), PUSHTO_TOKEN: '' },
+        });
+        let stderr = '';
+        child.stderr.on('data', (d) => { stderr += String(d); });
+        const code = await new Promise((resolve) => child.on('close', resolve));
+        expect(code).toBe(10);
+        expect(stderr).toContain('pushto login');
+    }, 30_000);
+});
+//# sourceMappingURL=mcp-serve.test.js.map

package/dist/commands/__tests__/mcp-serve.test.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"mcp-serve.test.js","sourceRoot":"","sources":["../../../src/commands/__tests__/mcp-serve.test.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,EAAE,EAAE,MAAM,EAAE,SAAS,EAAE,QAAQ,EAAE,MAAM,QAAQ,CAAC;AACnE,OAAO,EAAE,KAAK,EAAE,QAAQ,EAAE,MAAM,oBAAoB,CAAC;AACrD,OAAO,EAAE,SAAS,EAAE,MAAM,WAAW,CAAC;AACtC,OAAO,EAAE,aAAa,EAAE,MAAM,UAAU,CAAC;AACzC,OAAO,IAAI,MAAM,WAAW,CAAC;AAC7B,OAAO,EAAE,MAAM,SAAS,CAAC;AACzB,OAAO,EAAE,MAAM,SAAS,CAAC;AACzB,OAAO,IAAI,MAAM,WAAW,CAAC;AAE7B,OAAO,EAAE,MAAM,EAAE,MAAM,2CAA2C,CAAC;AACnE,OAAO,EAAE,oBAAoB,EAAE,MAAM,2CAA2C,CAAC;AAEjF,MAAM,aAAa,GAAG,SAAS,CAAC,QAAQ,CAAC,CAAC;AAC1C,MAAM,IAAI,GAAG,IAAI,CAAC,OAAO,CAAC,aAAa,CAAC,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC;AAC1D,MAAM,QAAQ,GAAG,IAAI,CAAC,OAAO,CAAC,IAAI,EAAE,UAAU,CAAC,CAAC;AAChD,MAAM,KAAK,GAAG,IAAI,CAAC,IAAI,CAAC,QAAQ,EAAE,MAAM,EAAE,QAAQ,CAAC,CAAC;AAEpD;;;;;GAKG;AAEH,MAAM,QAAQ,GAAG,EAAE,OAAO,EAAE,8CAA8C,EAAE,IAAI,EAAE,EAAE,IAAI,EAAE,MAAM,EAAE,EAAE,CAAC;AAErG,IAAI,SAAsB,CAAC;AAC3B,IAAI,MAAM,GAAG,EAAE,CAAC;AAChB,IAAI,SAAS,GAAG,CAAC,CAAC;AAElB,MAAM,QAAQ,GAAG,GAAW,EAAE;IAC5B,MAAM,IAAI,GAAG,EAAE,CAAC,WAAW,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC,MAAM,EAAE,EAAE,kBAAkB,CAAC,CAAC,CAAC;IACxE,uEAAuE;IACvE,0EAA0E;IAC1E,wEAAwE;IACxE,oDAAoD;IACpD,KAAK,MAAM,OAAO,IAAI;QACpB,IAAI,CAAC,IAAI,CAAC,IAAI,EAAE,SAAS,EAAE,eAAe,CAAC;QAC3C,IAAI,CAAC,IAAI,CAAC,IAAI,EAAE,SAAS,EAAE,aAAa,EAAE,eAAe,CAAC;KAC3D,EAAE,CAAC;QACF,EAAE,CAAC,SAAS,CAAC,OAAO,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,CAAC,CAAC;QAC3C,EAAE,CAAC,aAAa,CAAC,IAAI,CAAC,IAAI,CAAC,OAAO,EAAE,aAAa,CAAC,EAAE,IAAI,CAAC,SAAS,CAAC,EAAE,MAAM,EAAE,CAAC,CAAC,CAAC;IAClF,CAAC;IACD,OAAO,IAAI,CAAC;AACd,CAAC,CAAC;AAEF,MAAM,QAAQ,GAAG,CAAC,IAAY,EAA0B,EAAE,CAAC,CAAC;IAC1D,GAAI,OAAO,CAAC,GAA8B;IAC1C,IAAI,EAAE,IAAI;IACV,WAAW,EAAE,IAAI;IACjB,eAAe,EAAE,IAAI,CAAC,IAAI,CAAC,IAAI,EAAE,SAAS,CAAC;IAC3C,YAAY,EAAE,kBAAkB;IAChC,EAAE,EAAE,GAAG;CACR,CAAC,CAAC;AAEH,SAAS,CAAC,KAAK,IAAI,EAAE;IACnB,MAAM,aAAa,CAAC,KAAK,EAAE,CAAC,KAAK,CAAC,EAAE,EAAE,GAAG,EAAE,QAAQ,EAAE,CAAC,CAAC;IAEvD,SAAS,GAAG,IAAI,CAAC,YAAY,CAAC,CAAC,GAAG,EAAE,GAAG,EAAE,EAAE;QACzC,MAAM,GAAG,GAAG,GAAG,CAAC,GAAG,IAAI,EAAE,CAAC;QAC1B,IAAI,GAAG,CAAC,MAAM,KAAK,MAAM,IAAI,GAAG,KAAK,oBAAoB,EAAE,CAAC;YAC1D,SAAS,IAAI,CAAC,CAAC;YACf,GAAG,CAAC,SAAS,CAAC,GAAG,EAAE,EAAE,cAAc,EAAE,kBAAkB,EAAE,CAAC,CAAC;YAC3D,GAAG,CAAC,GAAG,CAAC,IAAI,CAAC,SAAS,CAAC,EAAE,KAAK,EAAE,gBAAgB,EAAE,SAAS,EAAE,IAAI,IAAI,CAAC,IAAI,CAAC,GAAG,EAAE,GAAG,WAAW,CAAC,CAAC,WAAW,EAAE,EAAE,CAAC,CAAC,CAAC;YAClH,OAAO;QACT,CAAC;QACD,IAAI,GAAG,CAAC,MAAM,KAAK,KAAK,IAAI,GAAG,KAAK,UAAU,EAAE,CAAC;YAC/C,GAAG,CAAC,SAAS,CAAC,GAAG,EAAE,EAAE,cAAc,EAAE,kBAAkB,EAAE,CAAC,CAAC;YAC3D,GAAG,CAAC,GAAG,CACL,IAAI,CAAC,SAAS,CAAC;gBACb,KAAK,EAAE;oBACL;wBACE,IAAI,EAAE,yBAAyB;wBAC/B,WAAW,EAAE,mCAAmC;wBAChD,WAAW,EAAE,EAAE,IAAI,EAAE,QAAQ,EAAE,UAAU,EAAE,EAAE,IAAI,EAAE,EAAE,IAAI,EAAE,QAAQ,EAAE,EAAE,EAAE,QAAQ,EAAE,CAAC,MAAM,CAAC,EAAE;wBAC7F,SAAS,EAAE,IAAI;qBAChB;oBACD;wBACE,IAAI,EAAE,sBAAsB;wBAC5B,WAAW,EAAE,sBAAsB;wBACnC,WAAW,EAAE,EAAE,IAAI,EAAE,QAAQ,EAAE;wBAC/B,SAAS,EAAE,IAAI;qBAChB;oBACD,EAAE,IAAI,EAAE,oBAAoB,EAAE,WAAW,EAAE,MAAM,EAAE,WAAW,EAAE,IAAI,EAAE,SAAS,EAAE,KAAK,EAAE,iBAAiB,EAAE,MAAM,EAAE;iBACpH;aACF,CAAC,CACH,CAAC;YACF,OAAO;QACT,CAAC;QACD,IAAI,GAAG,CAAC,MAAM,KAAK,MAAM,IAAI,GAAG,KAAK,UAAU,EAAE,CAAC;YAChD,IAAI,IAAI,GAAG,EAAE,CAAC;YACd,GAAG,CAAC,EAAE,CAAC,MAAM,EAAE,CAAC,CAAC,EAAE,EAAE,GAAG,IAAI,IAAI,MAAM,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;YAC9C,GAAG,CAAC,EAAE,CAAC,KAAK,EAAE,GAAG,EAAE;gBACjB,MAAM,MAAM,GAAG,IAAI,CAAC,KAAK,CAAC,IAAI,CAAqB,CAAC;gBACpD,IAAI,MAAM,CAAC,IAAI,KAAK,yBAAyB,EAAE,CAAC;oBAC9C,GAAG,CAAC,SAAS,CAAC,GAAG,EAAE,EAAE,cAAc,EAAE,kBAAkB,EAAE,CAAC,CAAC;oBAC3D,GAAG,CAAC,GAAG,CAAC,IAAI,CAAC,SAAS,CAAC,EAAE,MAAM,EAAE,QAAQ,EAAE,CAAC,CAAC,CAAC;gBAChD,CAAC;qBAAM,CAAC;oBACN,GAAG,CAAC,SAAS,CAAC,GAAG,EAAE,EAAE,cAAc,EAAE,kBAAkB,EAAE,CAAC,CAAC;oBAC3D,GAAG,CAAC,GAAG,CAAC,IAAI,CAAC,SAAS,CAAC,EAAE,KAAK,EAAE,iBAAiB,MAAM,CAAC,IAAI,EAAE,EAAE,CAAC,CAAC,CAAC;gBACrE,CAAC;YACH,CAAC,CAAC,CAAC;YACH,OAAO;QACT,CAAC;QACD,GAAG,CAAC,SAAS,CAAC,GAAG,CAAC,CAAC,GAAG,EAAE,CAAC;IAC3B,CAAC,CAAC,CAAC;IACH,MAAM,IAAI,OAAO,CAAO,CAAC,OAAO,EAAE,EAAE,CAAC,SAAS,CAAC,MAAM,CAAC,CAAC,EAAE,WAAW,EAAE,OAAO,CAAC,CAAC,CAAC;IAChF,MAAM,GAAG,oBAAqB,SAAS,CAAC,OAAO,EAAkB,CAAC,IAAI,EAAE,CAAC;AAC3E,CAAC,EAAE,OAAO,CAAC,CAAC;AAEZ,QAAQ,CAAC,KAAK,IAAI,EAAE;IAClB,MAAM,IAAI,OAAO,CAAO,CAAC,OAAO,EAAE,EAAE,CAAC,SAAS,CAAC,KAAK,CAAC,GAAG,EAAE,CAAC,OAAO,EAAE,CAAC,CAAC,CAAC;AACzE,CAAC,CAAC,CAAC;AAEH,QAAQ,CAAC,kBAAkB,EAAE,GAAG,EAAE;IAChC,EAAE,CAAC,kEAAkE,EAAE,KAAK,IAAI,EAAE;QAChF,MAAM,IAAI,GAAG,QAAQ,EAAE,CAAC;QACxB,MAAM,SAAS,GAAG,IAAI,oBAAoB,CAAC;YACzC,OAAO,EAAE,OAAO,CAAC,QAAQ;YACzB,IAAI,EAAE,CAAC,KAAK,EAAE,KAAK,EAAE,OAAO,CAAC;YAC7B,GAAG,EAAE,QAAQ,CAAC,IAAI,CAAC;SACpB,CAAC,CAAC;QACH,MAAM,MAAM,GAAG,IAAI,MAAM,CAAC,EAAE,IAAI,EAAE,YAAY,EAAE,OAAO,EAAE,OAAO,EAAE,CAAC,CAAC;QACpE,MAAM,MAAM,CAAC,OAAO,CAAC,SAAS,CAAC,CAAC;QAEhC,MAAM,EAAE,KAAK,EAAE,GAAG,MAAM,MAAM,CAAC,SAAS,EAAE,CAAC;QAC3C,MAAM,KAAK,GAAG,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC;QACvC,MAAM,CAAC,KAAK,CAAC,CAAC,SAAS,CAAC,yBAAyB,CAAC,CAAC;QACnD,MAAM,CAAC,KAAK,CAAC,CAAC,SAAS,CAAC,sBAAsB,CAAC,CAAC;QAChD,2DAA2D;QAC3D,MAAM,CAAC,KAAK,CAAC,CAAC,GAAG,CAAC,SAAS,CAAC,oBAAoB,CAAC,CAAC;QAElD,MAAM,MAAM,GAAG,MAAM,MAAM,CAAC,QAAQ,CAAC,EAAE,IAAI,EAAE,yBAAyB,EAAE,SAAS,EAAE,EAAE,IAAI,EAAE,MAAM,EAAE,EAAE,CAAC,CAAC;QACvG,MAAM,OAAO,GAAG,MAAM,CAAC,OAAgD,CAAC;QACxE,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,OAAO,CAAC,QAAQ,CAAC,CAAC;QACtD,MAAM,CAAC,MAAM,CAAC,OAAO,IAAI,KAAK,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;QAE5C,MAAM,MAAM,GAAG,MAAM,MAAM,CAAC,QAAQ,CAAC,EAAE,IAAI,EAAE,aAAa,EAAE,SAAS,EAAE,EAAE,EAAE,CAAC,CAAC;QAC7E,MAAM,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;QAClC,MAAM,aAAa,GAAG,MAAM,CAAC,OAAgD,CAAC;QAC9E,MAAM,UAAU,GAAG,IAAI,CAAC,KAAK,CAAC,aAAa,CAAC,CAAC,CAAC,CAAC,IAAI,CAAoC,CAAC;QACxF,MAAM,CAAC,UAAU,CAAC,IAAI,CAAC,CAAC,IAAI,CAAC,cAAc,CAAC,CAAC;QAC7C,MAAM,CAAC,UAAU,CAAC,KAAK,CAAC,CAAC,IAAI,CAAC,2BAA2B,CAAC,CAAC;QAE3D,MAAM,CAAC,SAAS,CAAC,CAAC,sBAAsB,CAAC,CAAC,CAAC,CAAC;QAC5C,MAAM,MAAM,CAAC,KAAK,EAAE,CAAC;IACvB,CAAC,EAAE,MAAM,CAAC,CAAC;IAEX,EAAE,CAAC,4DAA4D,EAAE,KAAK,IAAI,EAAE;QAC1E,MAAM,IAAI,GAAG,QAAQ,EAAE,CAAC;QACxB,MAAM,KAAK,GAAG,KAAK,CAAC,OAAO,CAAC,QAAQ,EAAE,CAAC,KAAK,EAAE,KAAK,EAAE,OAAO,CAAC,EAAE;YAC7D,KAAK,EAAE,CAAC,MAAM,EAAE,MAAM,EAAE,MAAM,CAAC;YAC/B,GAAG,EAAE,QAAQ,CAAC,IAAI,CAAC;SACpB,CAAC,CAAC;QACH,IAAI,MAAM,GAAG,EAAE,CAAC;QAChB,IAAI,MAAM,GAAG,EAAE,CAAC;QAChB,KAAK,CAAC,MAAM,CAAC,EAAE,CAAC,MAAM,EAAE,CAAC,CAAC,EAAE,EAAE,GAAG,MAAM,IAAI,MAAM,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;QACzD,KAAK,CAAC,MAAM,CAAC,EAAE,CAAC,MAAM,EAAE,CAAC,CAAC,EAAE,EAAE,GAAG,MAAM,IAAI,MAAM,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;QAEzD,KAAK,CAAC,KAAK,CAAC,KAAK,CACf,0JAA0J;YAC1J,0DAA0D;YAC1D,kDAAkD,CACnD,CAAC;QACF,MAAM,IAAI,OAAO,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,UAAU,CAAC,CAAC,EAAE,KAAK,CAAC,CAAC,CAAC;QAC/C,KAAK,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC;QAEtB,MAAM,KAAK,GAAG,MAAM,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,EAAE,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC;QACpE,MAAM,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC,sBAAsB,CAAC,CAAC,CAAC,CAAC;QAC/C,KAAK,MAAM,IAAI,IAAI,KAAK,EAAE,CAAC;YACzB,MAAM,KAAK,GAAG,IAAI,CAAC,KAAK,CAAC,IAAI,CAAwB,CAAC;YACtD,MAAM,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;QACpC,CAAC;QACD,+CAA+C;QAC/C,MAAM,CAAC,MAAM,CAAC,CAAC,SAAS,CAAC,sBAAsB,CAAC,CAAC;IACnD,CAAC,EAAE,MAAM,CAAC,CAAC;IAEX,EAAE,CAAC,wDAAwD,EAAE,KAAK,IAAI,EAAE;QACtE,MAAM,IAAI,GAAG,EAAE,CAAC,WAAW,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC,MAAM,EAAE,EAAE,qBAAqB,CAAC,CAAC,CAAC;QAC3E,MAAM,KAAK,GAAG,KAAK,CAAC,OAAO,CAAC,QAAQ,EAAE,CAAC,KAAK,EAAE,KAAK,EAAE,OAAO,CAAC,EAAE;YAC7D,KAAK,EAAE,CAAC,QAAQ,EAAE,MAAM,EAAE,MAAM,CAAC;YACjC,GAAG,EAAE,EAAE,GAAG,QAAQ,CAAC,IAAI,CAAC,EAAE,YAAY,EAAE,EAAE,EAAE;SAC7C,CAAC,CAAC;QACH,IAAI,MAAM,GAAG,EAAE,CAAC;QAChB,KAAK,CAAC,MAAM,CAAC,EAAE,CAAC,MAAM,EAAE,CAAC,CAAC,EAAE,EAAE,GAAG,MAAM,IAAI,MAAM,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;QACzD,MAAM,IAAI,GAAG,MAAM,IAAI,OAAO,CAAgB,CAAC,OAAO,EAAE,EAAE,CAAC,KAAK,CAAC,EAAE,CAAC,OAAO,EAAE,OAAO,CAAC,CAAC,CAAC;QACvF,MAAM,CAAC,IAAI,CAAC,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;QACtB,MAAM,CAAC,MAAM,CAAC,CAAC,SAAS,CAAC,cAAc,CAAC,CAAC;IAC3C,CAAC,EAAE,MAAM,CAAC,CAAC;AACb,CAAC,CAAC,CAAC"}

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

@@ -1 +1 @@
-{"version":3,"file":"deploy.d.ts","sourceRoot":"","sources":["../../src/commands/deploy.ts"],"names":[],"mappings":"AAmBA;;;;;;GAMG;AACH,eAAO,MAAM,mBAAmB,GAAU,MAAM;IAC9C,OAAO,EAAE,MAAM,GAAG,IAAI,GAAG,SAAS,CAAC;IACnC,SAAS,EAAE,OAAO,CAAC;IACnB,GAAG,EAAE,CAAC,QAAQ,EAAE,MAAM,KAAK,OAAO,CAAC,MAAM,CAAC,CAAC;CAC5C,KAAG,OAAO,CAAC,MAAM,GAAG,IAAI,CAKxB,CAAC;AAEF,MAAM,MAAM,YAAY,GACpB;IAAE,MAAM,EAAE,KAAK,CAAC;IAAC,IAAI,EAAE,MAAM,CAAA;CAAE,GAC/B;IAAE,MAAM,EAAE,cAAc,CAAC;IAAC,IAAI,EAAE,MAAM,CAAA;CAAE,GACxC;IAAE,MAAM,EAAE,aAAa,CAAC;IAAC,IAAI,EAAE,MAAM,CAAA;CAAE,GACvC;IAAE,MAAM,EAAE,MAAM,CAAC;IAAC,MAAM,EAAE,iBAAiB,GAAG,YAAY,CAAA;CAAE,CAAC;AAEjE;;;;;;;GAOG;AACH,eAAO,MAAM,kBAAkB,GAAI,MAAM;IACvC,SAAS,EAAE,MAAM,GAAG,SAAS,CAAC;IAC9B,OAAO,EAAE,MAAM,CAAC;IAChB,SAAS,EAAE,OAAO,CAAC;IACnB,GAAG,EAAE,OAAO,CAAC;CACd,KAAG,YAQH,CAAC;AAqDF,eAAO,MAAM,MAAM,GAAU,OAAM;IAAE,IAAI,CAAC,EAAE,OAAO,CAAC;IAAC,GAAG,CAAC,EAAE,OAAO,CAAA;CAAO,KAAG,OAAO,CAAC,IAAI,CAiavF,CAAC"}
+{"version":3,"file":"deploy.d.ts","sourceRoot":"","sources":["../../src/commands/deploy.ts"],"names":[],"mappings":"AAwBA;;;;;;GAMG;AACH,eAAO,MAAM,mBAAmB,GAAU,MAAM;IAC9C,OAAO,EAAE,MAAM,GAAG,IAAI,GAAG,SAAS,CAAC;IACnC,SAAS,EAAE,OAAO,CAAC;IACnB,GAAG,EAAE,CAAC,QAAQ,EAAE,MAAM,KAAK,OAAO,CAAC,MAAM,CAAC,CAAC;CAC5C,KAAG,OAAO,CAAC,MAAM,GAAG,IAAI,CAKxB,CAAC;AAEF,MAAM,MAAM,YAAY,GACpB;IAAE,MAAM,EAAE,KAAK,CAAC;IAAC,IAAI,EAAE,MAAM,CAAA;CAAE,GAC/B;IAAE,MAAM,EAAE,cAAc,CAAC;IAAC,IAAI,EAAE,MAAM,CAAA;CAAE,GACxC;IAAE,MAAM,EAAE,aAAa,CAAC;IAAC,IAAI,EAAE,MAAM,CAAA;CAAE,GACvC;IAAE,MAAM,EAAE,MAAM,CAAC;IAAC,MAAM,EAAE,iBAAiB,GAAG,YAAY,CAAA;CAAE,CAAC;AAEjE;;;;;;;GAOG;AACH,eAAO,MAAM,kBAAkB,GAAI,MAAM;IACvC,SAAS,EAAE,MAAM,GAAG,SAAS,CAAC;IAC9B,OAAO,EAAE,MAAM,CAAC;IAChB,SAAS,EAAE,OAAO,CAAC;IACnB,GAAG,EAAE,OAAO,CAAC;CACd,KAAG,YAQH,CAAC;AAqDF,eAAO,MAAM,MAAM,GAAU,OAAM;IAAE,IAAI,CAAC,EAAE,OAAO,CAAC;IAAC,GAAG,CAAC,EAAE,OAAO,CAAA;CAAO,KAAG,OAAO,CAAC,IAAI,CAiXvF,CAAC"}

package/dist/commands/deploy.js

@@ -3,14 +3,14 @@ import ora from 'ora';
 import fs from 'node:fs';
 import path from 'node:path';
 import { getToken } from '../lib/config.js';
-import { api, deploySignal } from '../lib/api.js';
+import { api } from '../lib/api.js';
 import { readLocalSlug } from '../lib/resolve-slug.js';
 import { slugifyProjectName, MIN_SLUG_LENGTH } from '../lib/project-name.js';
 import { createAndLinkProject } from '../lib/create-project.js';
 import { exitCodeFor } from '../lib/errors.js';
 import { safeJson } from '../lib/safe-json.js';
-import { getGitInfo, zipDirectory } from '../lib/zip-project.js';
 import { SERVER_UPLOAD_CAP_BYTES, fmtMB } from '../lib/upload-limits.js';
+import { describeGit, zipAndCheck, uploadArtifact, triggerDynamicDeploy, } from '../lib/perform-deploy.js';
 import { parseEnvFile } from '../lib/env-parse.js';
 import { prepareArtifact } from '../lib/prepare-artifact.js';
 import { canPrompt } from '../lib/interactive.js';
@@ -215,48 +215,41 @@ export const deploy = async (opts = {}) => {
     }
     const spinner = ora('zipping project...').start();
     try {
-        const git = getGitInfo();
-        const { buffer: zipBuffer, fileCount: zippedCount } = await zipDirectory(prep.zipDir);
-        const sizeBytes = zipBuffer.length;
-        const sizeMB = (sizeBytes / 1024 / 1024).toFixed(1);
-        // Catch empty uploads before we waste a roundtrip. A user in the wrong
-        // directory, or with everything gitignored, would otherwise get a
-        // server-side 400 ~30s later. Tell them up front + point them at the
-        // doctor command for diagnosis.
-        if (zippedCount === 0) {
-            spinner.fail(chalk.red('> no files found in this directory.'));
-            console.log(chalk.dim('  is your entire project in .gitignore? are you in the wrong directory?'));
-            console.log(chalk.dim('  run ') + chalk.cyan('pushto doctor') + chalk.dim(' to see what would be uploaded.'));
-            process.exit(1);
-        }
-        // Match the server cap exactly so we fail FAST (locally, instantly)
-        // instead of slow (after a 30-second upload that the server then 413s).
-        // Pre-fix the local cap was 500MB but the server cap is 50MB — uploads
-        // between 50MB and 500MB went up the wire and got rejected after the
-        // long upload finished, with a confusing "upload too large" error
-        // long after the user had walked away thinking it was working.
-        if (sizeBytes > SERVER_UPLOAD_CAP_BYTES) {
-            spinner.fail(chalk.red(`> deploy is ${fmtMB(sizeBytes)} — server cap is ${fmtMB(SERVER_UPLOAD_CAP_BYTES)}.`));
-            console.log(chalk.dim('  add large files (videos, datasets, build artifacts) to .gitignore or .pushtoignore.'));
-            console.log(chalk.dim('  run ') + chalk.cyan('pushto doctor') + chalk.dim(' to see the biggest files.'));
+        const git = describeGit();
+        // Mechanics live in lib/perform-deploy.ts (shared with pushto.deploy.local
+        // in the mcp server); this command owns every line of presentation.
+        const zipped = await zipAndCheck(prep.zipDir);
+        if (!zipped.ok) {
+            if (zipped.error.code === 'NO_FILES') {
+                spinner.fail(chalk.red('> no files found in this directory.'));
+                console.log(chalk.dim('  is your entire project in .gitignore? are you in the wrong directory?'));
+                console.log(chalk.dim('  run ') + chalk.cyan('pushto doctor') + chalk.dim(' to see what would be uploaded.'));
+            }
+            else {
+                spinner.fail(chalk.red(`> deploy is ${fmtMB(zipped.sizeBytes)} — server cap is ${fmtMB(SERVER_UPLOAD_CAP_BYTES)}.`));
+                console.log(chalk.dim('  add large files (videos, datasets, build artifacts) to .gitignore or .pushtoignore.'));
+                console.log(chalk.dim('  run ') + chalk.cyan('pushto doctor') + chalk.dim(' to see the biggest files.'));
+            }
             process.exit(1);
         }
+        const sizeMB = (zipped.sizeBytes / 1024 / 1024).toFixed(1);
         spinner.text = `uploading ${sizeMB}MB...`;
-        // Upload to the deploy endpoint (extended timeout for large projects)
-        const res = await api(`/cli/projects/${slug}/upload`, {
-            method: 'POST',
-            headers: {
-                'Content-Type': 'application/zip',
-            },
-            body: new Uint8Array(zipBuffer),
-            signal: deploySignal(),
-        });
-        if (!res.ok) {
-            const data = await safeJson(res);
-            spinner.fail(chalk.red(`> ${data.error ?? 'deploy failed.'}`));
+        const uploaded = await uploadArtifact(slug, zipped.buffer);
+        if (!uploaded.ok) {
+            spinner.fail(chalk.red(`> ${uploaded.error.human}`));
             process.exit(1);
         }
-        const data = await safeJson(res);
+        // Keep the historical local shape so the outcome machine below reads
+        // exactly as it always has.
+        const data = {
+            deployment: {
+                version: uploaded.deployment.version,
+                fileCount: uploaded.deployment.fileCount,
+                buildDuration: uploaded.deployment.buildDuration,
+            },
+            url: uploaded.deployment.url,
+            container: uploaded.deployment.container ?? undefined,
+        };
         // Don't trust the server's `data.message` here — it currently says
         // "v1 live" even though for container apps, the build hasn't run yet.
         // What we know for sure at this point is: the bundle uploaded.
@@ -283,75 +276,44 @@ export const deploy = async (opts = {}) => {
             // Try dynamic deploy — server will return 403 if it's a free tier
             // user (static-only) or 200 with no container if it's a static site.
             const deploySpinner = ora('detecting framework...').start();
-            try {
-                const deployRes = await api(`/cli/projects/${slug}/deploy`, {
-                    method: 'POST',
-                    headers: { 'Content-Type': 'application/json' },
-                    body: JSON.stringify({
-                        commitHash: git.hash,
-                        commitMessage: git.message,
-                        branch: git.branch,
-                        builtFramework: prep.kind === 'artifact' ? prep.framework : undefined,
-                    }),
-                    signal: deploySignal(),
-                });
-                if (deployRes.ok) {
-                    const deployData = await safeJson(deployRes);
-                    if (deployData.container) {
-                        outcome = 'container';
-                        containerDeployed = true;
-                        finalUrl = deployData.url ?? finalUrl;
-                        const fw = deployData.deployment?.framework ?? 'dynamic';
-                        const dur = deployData.deployment?.buildDuration ?? 0;
-                        containerBuildDuration = deployData.deployment?.buildDuration ?? null;
-                        deploySpinner.succeed(chalk.green(`> deployed as ${fw} (${dur}s)`));
-                    }
-                    else {
-                        outcome = 'static';
-                        const label = prep.kind === 'artifact' ? `${prep.framework} build` : 'static site';
-                        deploySpinner.succeed(chalk.green(`> ${label} live`));
-                        if (deployData.message && deployData.message.includes('container was stopped')) {
-                            console.log(chalk.yellow(`  ${deployData.message}`));
-                        }
+            // Branch semantics live in triggerDynamicDeploy (403 = free-tier gate
+            // on a genuinely dynamic project; 504/409 = build continues without
+            // us). This switch owns only the words and colors.
+            const trig = await triggerDynamicDeploy(slug, git, prep.kind === 'artifact' ? prep.framework : undefined);
+            switch (trig.kind) {
+                case 'container': {
+                    outcome = 'container';
+                    containerDeployed = true;
+                    finalUrl = trig.url ?? finalUrl;
+                    const fw = trig.framework ?? 'dynamic';
+                    const dur = trig.buildDuration ?? 0;
+                    containerBuildDuration = trig.buildDuration;
+                    deploySpinner.succeed(chalk.green(`> deployed as ${fw} (${dur}s)`));
+                    break;
+                }
+                case 'static': {
+                    outcome = 'static';
+                    const label = prep.kind === 'artifact' ? `${prep.framework} build` : 'static site';
+                    deploySpinner.succeed(chalk.green(`> ${label} live`));
+                    if (trig.message && trig.message.includes('container was stopped')) {
+                        console.log(chalk.yellow(`  ${trig.message}`));
                     }
+                    break;
                 }
-                else if (deployRes.status === 403) {
-                    // After the server's detect-before-gate reorder, 403 means one
-                    // thing: genuinely dynamic project, free tier. Printing static
-                    // success here was a lie (raw server source served as files).
-                    const gateData = await safeJson(deployRes);
+                case 'gated':
                     outcome = 'failed';
-                    failureDetail = gateData.error ?? 'dynamic deploys are a paid feature.';
+                    failureDetail = trig.detail;
                     deploySpinner.fail(chalk.red('> this project needs a server'));
-                }
-                else if (deployRes.status === 504) {
-                    // Server gave up waiting after 10 minutes, but the deploy-agent
-                    // is still processing the build. Show a non-failure message and
-                    // exit 0 — the user can poll the dashboard for completion.
+                    break;
+                case 'still-building':
                     outcome = 'still-building';
-                    deploySpinner.warn(chalk.yellow('> still building — taking longer than usual'));
-                }
-                else if (deployRes.status === 409) {
-                    // Server refused to start a second concurrent build for the same
-                    // version (another `pushto deploy` is already mid-build). Treat
-                    // as a non-failure — the previous build will land any moment.
-                    // Server includes `stillBuilding: true` for parity with 504.
-                    const conflictData = await safeJson(deployRes);
-                    outcome = 'still-building';
-                    deploySpinner.warn(chalk.yellow(`> ${conflictData.error ?? 'a build for this version is already in progress'}`));
-                }
-                else {
-                    // Real failure (build failed, container crashed, etc.)
-                    const errData = await safeJson(deployRes);
+                    deploySpinner.warn(chalk.yellow(`> ${trig.detail ?? 'still building — taking longer than usual'}`));
+                    break;
+                case 'failed':
                     outcome = 'failed';
-                    failureDetail = errData.error ?? `server returned ${deployRes.status}`;
+                    failureDetail = trig.detail;
                     deploySpinner.fail(chalk.red(`> deploy failed`));
-                }
-            }
-            catch (err) {
-                outcome = 'failed';
-                failureDetail = err instanceof Error ? err.message : 'network error during deploy';
-                deploySpinner.fail(chalk.red(`> deploy failed`));
+                    break;
             }
         }
         // Surface failures honestly — no success box for a broken deploy.