@cellapp/cli 0.2.0 → 0.3.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/README.md +17 -13
- package/dist/packages/cli/src/client.js +4 -3
- package/dist/packages/cli/src/client.js.map +1 -1
- package/dist/packages/cli/src/data.js +6 -3
- package/dist/packages/cli/src/data.js.map +1 -1
- package/dist/packages/cli/src/deploy.js +26 -13
- package/dist/packages/cli/src/deploy.js.map +1 -1
- package/dist/packages/cli/src/main.js +25 -15
- package/dist/packages/cli/src/main.js.map +1 -1
- package/dist/packages/cli/src/origin.js +9 -1
- package/dist/packages/cli/src/origin.js.map +1 -1
- package/dist/packages/cli/src/paths.js +6 -0
- package/dist/packages/cli/src/paths.js.map +1 -0
- package/dist/packages/cli/src/project.js +20 -6
- package/dist/packages/cli/src/project.js.map +1 -1
- package/dist/packages/cli/src/update.js +57 -0
- package/dist/packages/cli/src/update.js.map +1 -0
- package/dist/packages/cli/src/version.js +2 -0
- package/dist/packages/cli/src/version.js.map +1 -0
- package/package.json +1 -1
- package/skills/cellapp-deploy/SKILL.md +25 -9
- package/skills/cellapp-deploy/SKILL.zh-CN.md +63 -0
package/README.md
CHANGED
|
@@ -1,33 +1,37 @@
|
|
|
1
1
|
# Cellapp CLI and Agent Skill
|
|
2
2
|
|
|
3
|
-
Cellapp publishes static HTML applications from a local project. The CLI builds and uploads only the chosen static output directory. The Agent Skill guides an AI agent through the same process.
|
|
3
|
+
Cellapp publishes static HTML applications from a local project. The CLI builds and uploads only the chosen static output directory. The Agent Skill guides an AI agent through the same process. The default control origin is `https://cellapp.ai`; use `--origin` or `CELLAPP_ORIGIN` for another service.
|
|
4
4
|
|
|
5
|
-
##
|
|
5
|
+
## Ask an Agent to deploy
|
|
6
6
|
|
|
7
|
-
|
|
7
|
+
Open the [Cellapp deployment guide](https://cellapp.ai/deploy), copy its one-request prompt, and paste it into the AI coding tool working on your project. The Agent reads the [machine-readable instructions](https://cellapp.ai/deploy/AGENTS.md), runs the published client on demand, builds your static frontend, and publishes it. You only need to approve the device authorization in your browser when prompted. The Agent should give you the published URL and any remaining access step.
|
|
8
|
+
|
|
9
|
+
For Agent tools that support Skills, you can also install the [Cellapp deployment Skill](skills/cellapp-deploy/SKILL.md) with `npx skills add cellapp-ai/skills`. The Skill gives the Agent additional guidance for application tables and recovery. No separate CLI installation is needed for this flow.
|
|
10
|
+
|
|
11
|
+
## Manual install
|
|
12
|
+
|
|
13
|
+
Requires Node.js 22.12 or later. To use the CLI yourself, install the published Cellapp package:
|
|
8
14
|
|
|
9
15
|
```sh
|
|
10
16
|
npm install -g @cellapp/cli
|
|
11
17
|
cellapp --help
|
|
12
18
|
```
|
|
13
19
|
|
|
14
|
-
|
|
20
|
+
If global installation is unavailable, run the CLI without installing it globally: `npm exec --yes --package=@cellapp/cli@latest -- cellapp --help`. Use the same prefix for `deploy` and other commands.
|
|
15
21
|
|
|
16
|
-
|
|
17
|
-
npx skills add cellapp-ai/skills
|
|
18
|
-
```
|
|
22
|
+
Contributors can use `npm ci`, `npm run build`, and `npm run cli -- --help` from this repository.
|
|
19
23
|
|
|
20
|
-
The
|
|
24
|
+
The CLI checks for a newer stable npm release on its first run each local day. If one is available, it prints an upgrade hint to stderr. To upgrade, run `npm install -g @cellapp/cli@latest`. The check sends no credentials or project data, times out after two seconds, and does not stop a command when offline. Its last-attempt date is stored in `~/.config/cellapp/update-check.json` (or under `--config-dir`).
|
|
21
25
|
|
|
22
26
|
## Deploy
|
|
23
27
|
|
|
24
28
|
```sh
|
|
25
|
-
cellapp login
|
|
26
|
-
cellapp deploy --project /absolute/project --output dist --build 'npm run build'
|
|
27
|
-
cellapp apps
|
|
29
|
+
cellapp login
|
|
30
|
+
cellapp deploy --project /absolute/project --output dist --build 'npm run build'
|
|
31
|
+
cellapp apps
|
|
28
32
|
```
|
|
29
33
|
|
|
30
|
-
Plain HTML directories do not need `--build`. Use `--spa` only if the site has client-side routes. The first deployment returns
|
|
34
|
+
Plain HTML directories do not need `--build`. Use `--spa` only if the site has client-side routes. The first deployment returns a `{app-slug}-{user-slug}.<apps-domain>` URL and an access key once; keep the key private. Add `--namespace <user-slug> --slug <app-slug>` on first deployment to choose it. The user slug must have at least three lowercase characters, digits or hyphens; reserved platform names are unavailable, and the combined host label must fit 63 characters. The owner console can change both slugs later; old addresses remain bound to the original application. Display names may repeat. Visitors first sign in with Cellapp. Restricted applications then require owner approval or access-key redemption; public applications admit any signed-in user. Rotating a key stops new redemptions and preserves existing user grants. `cellapp.json` stores the app association and pending deployment metadata without secrets. Credentials are stored in `~/.config/cellapp/` with private file permissions.
|
|
31
35
|
|
|
32
36
|
## Application data
|
|
33
37
|
|
|
@@ -58,4 +62,4 @@ npm run check:boundary
|
|
|
58
62
|
npm pack --dry-run --json
|
|
59
63
|
```
|
|
60
64
|
|
|
61
|
-
The [public HTTP
|
|
65
|
+
The [public HTTP v3 contract](contracts/http-v3.json) describes the current CLI paths and responses. Login uses `/auth/device` and `/auth/device/poll`; logout revokes `/auth/credentials/current`; Bearer management uses `/api/control/v1/*`. These paths work with the selected HTTPS control origin. The [v2](contracts/http-v2.json) root paths remain available for older CLI clients, and [v1](contracts/http-v1.json) records the earlier static-deploy contract. App-host `/_cellapp/*` and `/rest/v1/*` use visitor access checks, separate from the CLI credential. The CLI and Skill are MIT licensed; see [LICENSE](LICENSE). Contributions follow [CONTRIBUTING.md](CONTRIBUTING.md), and security reports follow [SECURITY.md](SECURITY.md).
|
|
@@ -3,6 +3,7 @@ import { homedir } from 'node:os';
|
|
|
3
3
|
import { dirname, join } from 'node:path';
|
|
4
4
|
import { createHash, randomBytes } from 'node:crypto';
|
|
5
5
|
import { AppError } from '../../shared/src/errors.js';
|
|
6
|
+
import { CURRENT_CREDENTIAL, DEVICE_AUTH, DEVICE_POLL } from './paths.js';
|
|
6
7
|
export const randomKey = () => randomBytes(32).toString('hex');
|
|
7
8
|
export const requestID = () => randomBytes(16).toString('hex');
|
|
8
9
|
export async function saveJSON(path, value, privateFile = false) {
|
|
@@ -89,14 +90,14 @@ export class Client {
|
|
|
89
90
|
return value;
|
|
90
91
|
}
|
|
91
92
|
async login(notify) {
|
|
92
|
-
const auth = await this.request(
|
|
93
|
+
const auth = await this.request(DEVICE_AUTH, 'POST', {});
|
|
93
94
|
notify(`请在浏览器打开 ${auth.verificationUri}\n核对授权码：${auth.userCode}`);
|
|
94
95
|
const deadline = Date.now() + auth.expiresIn * 1000;
|
|
95
96
|
let interval = auth.interval * 1000;
|
|
96
97
|
while (Date.now() < deadline) {
|
|
97
98
|
await new Promise(resolve => setTimeout(resolve, interval));
|
|
98
99
|
try {
|
|
99
|
-
const credential = await this.request(
|
|
100
|
+
const credential = await this.request(DEVICE_POLL, 'POST', { deviceSecret: auth.deviceSecret });
|
|
100
101
|
await saveJSON(this.credentialFile, { ...credential, origin: this.origin }, true);
|
|
101
102
|
this.token = credential.token;
|
|
102
103
|
return;
|
|
@@ -116,7 +117,7 @@ export class Client {
|
|
|
116
117
|
async logout() {
|
|
117
118
|
try {
|
|
118
119
|
if (this.token)
|
|
119
|
-
await this.request(
|
|
120
|
+
await this.request(CURRENT_CREDENTIAL, 'DELETE');
|
|
120
121
|
}
|
|
121
122
|
catch (e) {
|
|
122
123
|
if (!(e instanceof AppError && e.status === 401))
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"client.js","sourceRoot":"","sources":["../../../../packages/cli/src/client.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,EAAE,IAAI,EAAE,KAAK,EAAE,QAAQ,EAAE,MAAM,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM,kBAAkB,CAAC;AAC3F,OAAO,EAAE,OAAO,EAAE,MAAM,SAAS,CAAC;AAClC,OAAO,EAAE,OAAO,EAAE,IAAI,EAAE,MAAM,WAAW,CAAC;AAC1C,OAAO,EAAE,UAAU,EAAE,WAAW,EAAE,MAAM,aAAa,CAAC;AACtD,OAAO,EAAE,QAAQ,EAAE,MAAM,4BAA4B,CAAC;
|
|
1
|
+
{"version":3,"file":"client.js","sourceRoot":"","sources":["../../../../packages/cli/src/client.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,3 +1,4 @@
|
|
|
1
|
+
import { controlApp } from './paths.js';
|
|
1
2
|
import { join, resolve } from 'node:path';
|
|
2
3
|
import { readJSON } from './client.js';
|
|
3
4
|
import { parseDataManifest } from '../../shared/src/data.js';
|
|
@@ -12,15 +13,17 @@ function plan(value) {
|
|
|
12
13
|
return data;
|
|
13
14
|
}
|
|
14
15
|
export async function runData(client, action, projectPath, project, explicitAppID, manifestPath, allowDestructive = false) {
|
|
15
|
-
if (!['plan', 'apply', 'status', 'verify'].includes(action ?? ''))
|
|
16
|
-
throw new Error('Use data plan, apply, status, or
|
|
16
|
+
if (!['plan', 'apply', 'status', 'verify', 'reconcile'].includes(action ?? ''))
|
|
17
|
+
throw new Error('Use data plan, apply, status, verify, or reconcile');
|
|
17
18
|
const operation = action;
|
|
18
19
|
const appID = explicitAppID ?? project?.appId;
|
|
19
20
|
if (!appID || !/^[a-f0-9]{32}$/.test(appID))
|
|
20
21
|
throw new Error('Link a project or provide a valid app ID');
|
|
21
|
-
const path =
|
|
22
|
+
const path = `${controlApp(appID)}/data`;
|
|
22
23
|
if (operation === 'status')
|
|
23
24
|
return { appId: appID, status: await client.request(path) };
|
|
25
|
+
if (operation === 'reconcile')
|
|
26
|
+
return { appId: appID, reconciliation: await client.request(`${path}/reconcile`, 'POST', {}) };
|
|
24
27
|
if (operation === 'verify')
|
|
25
28
|
return { appId: appID, verification: await client.request(`${path}/verify`, 'POST') };
|
|
26
29
|
const input = await readJSON(resolve(projectPath, manifestPath ?? 'cellapp.data.json'));
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"data.js","sourceRoot":"","sources":["../../../../packages/cli/src/data.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,IAAI,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AAC1C,OAAO,EAAU,QAAQ,EAAE,MAAM,aAAa,CAAC;AAE/C,OAAO,EAAE,iBAAiB,EAAE,MAAM,0BAA0B,CAAC;AAK7D,SAAS,IAAI,CAAC,KAAc;IAC1B,IAAI,CAAC,KAAK,IAAI,OAAO,KAAK,KAAK,QAAQ,IAAI,KAAK,CAAC,OAAO,CAAC,KAAK,CAAC;QAAE,MAAM,IAAI,KAAK,CAAC,+BAA+B,CAAC,CAAC;IAClH,MAAM,IAAI,GAAG,KAAgC,CAAC;IAC9C,IAAI,CAAC,MAAM,CAAC,aAAa,CAAC,IAAI,CAAC,OAAO,CAAC,IAAI,OAAO,IAAI,CAAC,MAAM,KAAK,QAAQ,IAAI,CAAC,gBAAgB,CAAC,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC;QAC7G,CAAC,KAAK,CAAC,OAAO,CAAC,IAAI,CAAC,UAAU,CAAC,IAAI,IAAI,CAAC,UAAU,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC,OAAO,IAAI,KAAK,QAAQ,CAAC;QACzF,OAAO,IAAI,CAAC,mBAAmB,KAAK,SAAS,IAAI,OAAO,IAAI,CAAC,cAAc,KAAK,SAAS;QAAE,MAAM,IAAI,KAAK,CAAC,+BAA+B,CAAC,CAAC;IAChJ,OAAO,IAAgB,CAAC;AAC1B,CAAC;AAED,MAAM,CAAC,KAAK,UAAU,OAAO,CAAC,MAAc,EAAE,MAA0B,EAAE,WAAmB,EAAE,OAA4B,EACzH,aAAsB,EAAE,YAAqB,EAAE,gBAAgB,GAAG,KAAK;IACvE,IAAI,CAAC,CAAC,MAAM,EAAE,OAAO,EAAE,QAAQ,EAAE,QAAQ,CAAC,CAAC,QAAQ,CAAC,MAAM,IAAI,EAAE,CAAC;QAAE,MAAM,IAAI,KAAK,CAAC,
|
|
1
|
+
{"version":3,"file":"data.js","sourceRoot":"","sources":["../../../../packages/cli/src/data.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,9 +1,10 @@
|
|
|
1
|
-
import {
|
|
1
|
+
import { CONTROL_API, controlApp } from './paths.js';
|
|
2
|
+
import { lstat, readdir, readFile, realpath, unlink } from 'node:fs/promises';
|
|
2
3
|
import { resolve, relative, join, isAbsolute } from 'node:path';
|
|
3
4
|
import { spawn } from 'node:child_process';
|
|
4
5
|
import { manifest, sha256, validPath } from '../../shared/src/artifacts.js';
|
|
5
6
|
import { AppError, ensure } from '../../shared/src/errors.js';
|
|
6
|
-
import { randomKey, requestID, saveJSON } from './client.js';
|
|
7
|
+
import { randomKey, requestID, saveJSON, readJSON } from './client.js';
|
|
7
8
|
import { readProject } from './project.js';
|
|
8
9
|
export async function build(command, project) {
|
|
9
10
|
if (!command)
|
|
@@ -41,11 +42,11 @@ export async function collect(output, limits) {
|
|
|
41
42
|
export async function deploy(client, directory, options, notify) {
|
|
42
43
|
const projectPath = resolve(directory);
|
|
43
44
|
const configPath = join(projectPath, 'cellapp.json');
|
|
44
|
-
let project = await readProject(projectPath);
|
|
45
|
+
let project = await readProject(projectPath, client.origin);
|
|
45
46
|
if (project && project.origin !== client.origin)
|
|
46
47
|
throw new Error('Project belongs to another control origin');
|
|
47
48
|
if (project?.appId && (options.namespace !== undefined || options.slug !== undefined)) {
|
|
48
|
-
throw new Error('
|
|
49
|
+
throw new Error('CLI slugs are set only when creating an application; change existing slugs in the owner console');
|
|
49
50
|
}
|
|
50
51
|
const output = options.output ?? project?.output;
|
|
51
52
|
ensure(output, 400, 'output_required', 'Specify --output with the static build directory');
|
|
@@ -58,38 +59,48 @@ export async function deploy(client, directory, options, notify) {
|
|
|
58
59
|
const actualProject = await realpath(projectPath);
|
|
59
60
|
const actualRelative = relative(actualProject, actualOutput);
|
|
60
61
|
ensure(!isAbsolute(actualRelative) && actualRelative !== '..' && !actualRelative.startsWith('../'), 400, 'invalid_output', 'Output resolves outside the project');
|
|
61
|
-
const limits = await client.request(
|
|
62
|
+
const limits = await client.request(`${CONTROL_API}/limits`);
|
|
62
63
|
const files = await collect(outPath, limits);
|
|
63
64
|
project = { ...project, origin: client.origin, name: options.name ?? project?.name ?? 'My app', namespace: options.namespace ?? project?.namespace, slug: options.slug ?? project?.slug, output, build: command, spa: options.spa ?? project?.spa ?? false, createRequestId: project?.createRequestId ?? requestID() };
|
|
64
|
-
|
|
65
|
+
const keyPath = `${client.credentialFile}.create-${project.createRequestId}`;
|
|
66
|
+
let initialKey = (await readJSON(keyPath))?.key;
|
|
67
|
+
if (initialKey)
|
|
68
|
+
ensure(/^[a-f0-9]{64}$/.test(initialKey), 400, 'invalid_state', 'Pending application key is invalid');
|
|
65
69
|
if (!project.appId) {
|
|
66
|
-
|
|
67
|
-
|
|
68
|
-
|
|
70
|
+
initialKey ??= randomKey();
|
|
71
|
+
await saveJSON(keyPath, { key: initialKey }, true);
|
|
72
|
+
await saveJSON(configPath, project);
|
|
69
73
|
const body = { name: project.name, key: initialKey, requestId: project.createRequestId,
|
|
70
74
|
...(project.namespace ? { namespace: project.namespace } : {}), ...(project.slug ? { slug: project.slug } : {}) };
|
|
71
|
-
const create = () => client.request(
|
|
75
|
+
const create = () => client.request(`${CONTROL_API}/apps`, 'POST', body);
|
|
72
76
|
let app;
|
|
73
77
|
try {
|
|
74
78
|
app = await create();
|
|
75
79
|
}
|
|
76
80
|
catch (e) {
|
|
77
|
-
if (e instanceof AppError)
|
|
81
|
+
if (e instanceof AppError) {
|
|
82
|
+
if (e.code === 'app_data_not_ready' && typeof e.details?.appId === 'string' && /^[a-f0-9]{32}$/.test(e.details.appId)) {
|
|
83
|
+
project.appId = e.details.appId;
|
|
84
|
+
await saveJSON(configPath, project);
|
|
85
|
+
}
|
|
78
86
|
throw e;
|
|
87
|
+
}
|
|
79
88
|
app = await create();
|
|
80
89
|
}
|
|
81
90
|
project.appId = app.id;
|
|
82
91
|
await saveJSON(configPath, project);
|
|
83
92
|
}
|
|
84
|
-
const apps = await client.request(
|
|
93
|
+
const apps = await client.request(`${CONTROL_API}/apps`);
|
|
85
94
|
const app = apps.find(a => a.id === project.appId);
|
|
86
95
|
ensure(app, 404, 'app_not_found', 'Linked app was deleted or belongs to another owner');
|
|
96
|
+
if (app.dataState !== 'ready')
|
|
97
|
+
await client.request(`${controlApp(app.id)}/data/reconcile`, 'POST', {});
|
|
87
98
|
const fingerprint = sha256(JSON.stringify({ files, spa: project.spa }));
|
|
88
99
|
if (project.pending && project.pending.fingerprint !== fingerprint)
|
|
89
100
|
project.pending = undefined;
|
|
90
101
|
project.pending ??= { requestId: requestID(), fingerprint, baseVersion: app.activeDeployment };
|
|
91
102
|
await saveJSON(configPath, project);
|
|
92
|
-
const base =
|
|
103
|
+
const base = `${controlApp(app.id)}/deployments`;
|
|
93
104
|
const d = await client.request(base, 'POST', { manifest: files, requestId: project.pending.requestId, baseVersion: project.pending.baseVersion, spa: project.spa });
|
|
94
105
|
const status = await client.request(`${base}/${d.id}`);
|
|
95
106
|
if (status.status !== 'published') {
|
|
@@ -106,6 +117,8 @@ export async function deploy(client, directory, options, notify) {
|
|
|
106
117
|
const result = await client.request(`${base}/${d.id}/publish`, 'POST', {});
|
|
107
118
|
delete project.pending;
|
|
108
119
|
await saveJSON(configPath, project);
|
|
120
|
+
if (initialKey)
|
|
121
|
+
await unlink(keyPath);
|
|
109
122
|
notify('静态应用已发布。');
|
|
110
123
|
return { ...result, namespace: app.namespace, slug: app.slug, aliasUrl: app.aliasUrl,
|
|
111
124
|
...(initialKey ? { accessKey: initialKey } : { keyUnchanged: true }) };
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"deploy.js","sourceRoot":"","sources":["../../../../packages/cli/src/deploy.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,EAAE,OAAO,EAAE,QAAQ,EAAE,QAAQ,EAAE,MAAM,kBAAkB,CAAC;
|
|
1
|
+
{"version":3,"file":"deploy.js","sourceRoot":"","sources":["../../../../packages/cli/src/deploy.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,12 +1,14 @@
|
|
|
1
1
|
#!/usr/bin/env node
|
|
2
|
+
import { CONTROL_API, controlApp } from './paths.js';
|
|
2
3
|
import { parseArgs } from 'node:util';
|
|
3
4
|
import { resolve, join } from 'node:path';
|
|
4
|
-
import { Client, randomKey, readJSON, saveJSON } from './client.js';
|
|
5
|
+
import { Client, randomKey, requestID, readJSON, saveJSON } from './client.js';
|
|
5
6
|
import { deploy } from './deploy.js';
|
|
6
7
|
import { AppError } from '../../shared/src/errors.js';
|
|
7
8
|
import { readProject } from './project.js';
|
|
8
9
|
import { selectOrigin } from './origin.js';
|
|
9
10
|
import { runData } from './data.js';
|
|
11
|
+
import { checkForUpdates } from './update.js';
|
|
10
12
|
const { values, positionals } = parseArgs({ allowPositionals: true, options: {
|
|
11
13
|
origin: { type: 'string' }, project: { type: 'string', default: '.' }, output: { type: 'string' },
|
|
12
14
|
build: { type: 'string' }, name: { type: 'string' }, namespace: { type: 'string' }, slug: { type: 'string' }, spa: { type: 'boolean' }, help: { type: 'boolean' },
|
|
@@ -16,17 +18,19 @@ const { values, positionals } = parseArgs({ allowPositionals: true, options: {
|
|
|
16
18
|
const [command, appId, dataAppId] = positionals;
|
|
17
19
|
const notify = (s) => process.stderr.write(s + '\n');
|
|
18
20
|
try {
|
|
21
|
+
await checkForUpdates(values['config-dir'], notify);
|
|
19
22
|
if (values.help || !command) {
|
|
20
|
-
process.stdout.write('cellapp <login|logout|deploy|apps|link|reset-key|delete|data> [app-id] --origin https://
|
|
23
|
+
process.stdout.write('cellapp <login|logout|deploy|apps|link|reset-key|delete|data> [app-id] [--origin https://cellapp.ai]\nDeploy: --project . --output dist [--build "npm run build"] [--namespace user-slug] [--slug app-slug] [--spa]\nLink: link <app-id> --project . --output dist\nData: data <plan|apply|status|verify|reconcile> [app-id] --project . [--manifest cellapp.data.json] [--allow-destructive]\nDefault origin: https://cellapp.ai\n');
|
|
21
24
|
}
|
|
22
25
|
else {
|
|
23
26
|
const projectPath = resolve(values.project);
|
|
24
27
|
const newProject = await readJSON(join(projectPath, 'cellapp.json'));
|
|
25
28
|
const legacyProject = await readJSON(join(projectPath, 'ohmyapp.json'));
|
|
26
29
|
const origin = selectOrigin(values.origin, newProject, legacyProject, process.env);
|
|
27
|
-
|
|
28
|
-
|
|
29
|
-
|
|
30
|
+
const project = await readProject(projectPath, origin);
|
|
31
|
+
if (project && project.origin !== origin && (command === 'deploy' || command === 'link' || command === 'data')) {
|
|
32
|
+
throw new Error('Project belongs to another control origin; check --origin and CELLAPP_ORIGIN');
|
|
33
|
+
}
|
|
30
34
|
const client = new Client(origin, values['config-dir']);
|
|
31
35
|
await client.load();
|
|
32
36
|
if (command === 'login') {
|
|
@@ -44,7 +48,7 @@ try {
|
|
|
44
48
|
if (command === 'deploy')
|
|
45
49
|
result = await deploy(client, projectPath, values, notify);
|
|
46
50
|
else if (command === 'apps')
|
|
47
|
-
result = await client.request(
|
|
51
|
+
result = await client.request(`${CONTROL_API}/apps`);
|
|
48
52
|
else if (command === 'data')
|
|
49
53
|
result = await runData(client, appId, projectPath, project, dataAppId, values.manifest, values['allow-destructive']);
|
|
50
54
|
else {
|
|
@@ -52,20 +56,26 @@ try {
|
|
|
52
56
|
throw new Error('A valid app ID is required');
|
|
53
57
|
if (command === 'reset-key') {
|
|
54
58
|
const key = randomKey();
|
|
55
|
-
await client.request(
|
|
59
|
+
await client.request(`${controlApp(appId)}/key`, 'POST', { key });
|
|
56
60
|
result = { accessKey: key };
|
|
57
61
|
}
|
|
58
62
|
else if (command === 'delete')
|
|
59
|
-
result = await client.request(
|
|
63
|
+
result = await client.request(controlApp(appId), 'DELETE');
|
|
60
64
|
else if (command === 'link') {
|
|
61
|
-
|
|
62
|
-
|
|
65
|
+
if (project && project.origin !== client.origin)
|
|
66
|
+
throw new Error('Project belongs to another control origin');
|
|
67
|
+
const apps = await client.request(`${CONTROL_API}/apps`);
|
|
68
|
+
const app = apps.find(a => a.id === appId);
|
|
69
|
+
if (!app)
|
|
63
70
|
throw new Error('Application not owned by this credential');
|
|
64
|
-
if (
|
|
65
|
-
throw new Error('
|
|
66
|
-
|
|
67
|
-
|
|
68
|
-
|
|
71
|
+
if (project?.appId && project.appId !== appId)
|
|
72
|
+
throw new Error('Project is already linked to another application');
|
|
73
|
+
const output = values.output ?? project?.output;
|
|
74
|
+
if (!output)
|
|
75
|
+
throw new Error('Specify --output to link a new project');
|
|
76
|
+
const linked = { ...project, origin: client.origin, appId, name: project?.name ?? app.name, namespace: app.namespace, slug: app.slug, output, spa: project?.spa ?? false, createRequestId: project?.createRequestId ?? requestID() };
|
|
77
|
+
delete linked.pending;
|
|
78
|
+
await saveJSON(join(projectPath, 'cellapp.json'), linked);
|
|
69
79
|
result = { linked: appId };
|
|
70
80
|
}
|
|
71
81
|
else
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"main.js","sourceRoot":"","sources":["../../../../packages/cli/src/main.ts"],"names":[],"mappings":";AACA,OAAO,EAAE,SAAS,EAAE,MAAM,WAAW,CAAC;AACtC,OAAO,EAAE,OAAO,EAAE,IAAI,EAAE,MAAM,WAAW,CAAC;AAC1C,OAAO,EAAE,MAAM,EAAE,SAAS,EAAE,QAAQ,EAAE,QAAQ,EAAE,MAAM,aAAa,CAAC;
|
|
1
|
+
{"version":3,"file":"main.js","sourceRoot":"","sources":["../../../../packages/cli/src/main.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,4 +1,12 @@
|
|
|
1
|
+
export const DEFAULT_ORIGIN = 'https://cellapp.ai';
|
|
2
|
+
export const RETIRED_ORIGIN = 'https://console.cellapp.ai';
|
|
3
|
+
export function officialOrigin(origin) {
|
|
4
|
+
return origin === RETIRED_ORIGIN ? DEFAULT_ORIGIN : origin;
|
|
5
|
+
}
|
|
1
6
|
export function selectOrigin(explicit, current, legacy, environment) {
|
|
2
|
-
|
|
7
|
+
const override = explicit ?? (environment.CELLAPP_ORIGIN || undefined) ?? (environment.OHMYAPP_ORIGIN || undefined);
|
|
8
|
+
if (override === RETIRED_ORIGIN)
|
|
9
|
+
throw new Error('The official console origin has retired; use https://cellapp.ai and authorize again');
|
|
10
|
+
return override ?? officialOrigin(current?.origin ?? legacy?.origin ?? DEFAULT_ORIGIN);
|
|
3
11
|
}
|
|
4
12
|
//# sourceMappingURL=origin.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"origin.js","sourceRoot":"","sources":["../../../../packages/cli/src/origin.ts"],"names":[],"mappings":"AAEA,MAAM,UAAU,YAAY,CAAC,QAA4B,EAAE,OAA4B,EAAE,MAA2B,EAAE,WAA8B;IAClJ,
|
|
1
|
+
{"version":3,"file":"origin.js","sourceRoot":"","sources":["../../../../packages/cli/src/origin.ts"],"names":[],"mappings":"AAEA,MAAM,CAAC,MAAM,cAAc,GAAG,oBAAoB,CAAC;AACnD,MAAM,CAAC,MAAM,cAAc,GAAG,4BAA4B,CAAC;AAE3D,MAAM,UAAU,cAAc,CAAC,MAAc;IAC3C,OAAO,MAAM,KAAK,cAAc,CAAC,CAAC,CAAC,cAAc,CAAC,CAAC,CAAC,MAAM,CAAC;AAC7D,CAAC;AAED,MAAM,UAAU,YAAY,CAAC,QAA4B,EAAE,OAA4B,EAAE,MAA2B,EAAE,WAA8B;IAClJ,MAAM,QAAQ,GAAG,QAAQ,IAAI,CAAC,WAAW,CAAC,cAAc,IAAI,SAAS,CAAC,IAAI,CAAC,WAAW,CAAC,cAAc,IAAI,SAAS,CAAC,CAAC;IACpH,IAAI,QAAQ,KAAK,cAAc;QAAE,MAAM,IAAI,KAAK,CAAC,qFAAqF,CAAC,CAAC;IACxI,OAAO,QAAQ,IAAI,cAAc,CAAC,OAAO,EAAE,MAAM,IAAI,MAAM,EAAE,MAAM,IAAI,cAAc,CAAC,CAAC;AACzF,CAAC"}
|
|
@@ -0,0 +1,6 @@
|
|
|
1
|
+
export const CONTROL_API = '/api/control/v1';
|
|
2
|
+
export const controlApp = (appId) => `${CONTROL_API}/apps/${appId}`;
|
|
3
|
+
export const DEVICE_AUTH = '/auth/device';
|
|
4
|
+
export const DEVICE_POLL = '/auth/device/poll';
|
|
5
|
+
export const CURRENT_CREDENTIAL = '/auth/credentials/current';
|
|
6
|
+
//# sourceMappingURL=paths.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"paths.js","sourceRoot":"","sources":["../../../../packages/cli/src/paths.ts"],"names":[],"mappings":"AAAA,MAAM,CAAC,MAAM,WAAW,GAAG,iBAAiB,CAAC;AAC7C,MAAM,CAAC,MAAM,UAAU,GAAG,CAAC,KAAa,EAAE,EAAE,CAAC,GAAG,WAAW,SAAS,KAAK,EAAE,CAAC;AAC5E,MAAM,CAAC,MAAM,WAAW,GAAG,cAAc,CAAC;AAC1C,MAAM,CAAC,MAAM,WAAW,GAAG,mBAAmB,CAAC;AAC/C,MAAM,CAAC,MAAM,kBAAkB,GAAG,2BAA2B,CAAC"}
|
|
@@ -1,24 +1,38 @@
|
|
|
1
1
|
import { join } from 'node:path';
|
|
2
|
-
import { readJSON, saveJSONExclusive } from './client.js';
|
|
3
|
-
|
|
2
|
+
import { readJSON, saveJSON, saveJSONExclusive } from './client.js';
|
|
3
|
+
import { DEFAULT_ORIGIN, officialOrigin } from './origin.js';
|
|
4
|
+
export async function readProject(directory, selectedOrigin = DEFAULT_ORIGIN) {
|
|
4
5
|
const currentPath = join(directory, 'cellapp.json');
|
|
5
6
|
const legacyPath = join(directory, 'ohmyapp.json');
|
|
6
7
|
const current = await readJSON(currentPath);
|
|
7
8
|
const legacy = await readJSON(legacyPath);
|
|
8
|
-
|
|
9
|
+
const normalizedCurrent = current && { ...current, origin: officialOrigin(current.origin) };
|
|
10
|
+
const normalizedLegacy = legacy && { ...legacy, origin: officialOrigin(legacy.origin) };
|
|
11
|
+
if (current && legacy && (normalizedCurrent.origin !== normalizedLegacy.origin || (current.appId && legacy.appId && current.appId !== legacy.appId))) {
|
|
9
12
|
throw new Error('cellapp.json conflicts with ohmyapp.json; choose the correct project association manually');
|
|
10
13
|
}
|
|
11
|
-
if (current
|
|
14
|
+
if (current) {
|
|
15
|
+
if (current.origin !== normalizedCurrent.origin && selectedOrigin === DEFAULT_ORIGIN) {
|
|
16
|
+
const latest = await readJSON(currentPath);
|
|
17
|
+
if (JSON.stringify(latest) !== JSON.stringify(current))
|
|
18
|
+
throw new Error('cellapp.json changed during migration; retry safely');
|
|
19
|
+
await saveJSON(currentPath, normalizedCurrent);
|
|
20
|
+
return normalizedCurrent;
|
|
21
|
+
}
|
|
12
22
|
return current;
|
|
23
|
+
}
|
|
24
|
+
if (!legacy)
|
|
25
|
+
return undefined;
|
|
26
|
+
const migratedValue = selectedOrigin === DEFAULT_ORIGIN ? normalizedLegacy : legacy;
|
|
13
27
|
try {
|
|
14
|
-
await saveJSONExclusive(currentPath,
|
|
28
|
+
await saveJSONExclusive(currentPath, migratedValue);
|
|
15
29
|
}
|
|
16
30
|
catch (e) {
|
|
17
31
|
if (e.code !== 'EEXIST')
|
|
18
32
|
throw e;
|
|
19
33
|
}
|
|
20
34
|
const migrated = await readJSON(currentPath);
|
|
21
|
-
if (JSON.stringify(migrated) !== JSON.stringify(
|
|
35
|
+
if (JSON.stringify(migrated) !== JSON.stringify(migratedValue)) {
|
|
22
36
|
throw new Error('cellapp.json changed during migration; legacy ohmyapp.json was preserved');
|
|
23
37
|
}
|
|
24
38
|
return migrated;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"project.js","sourceRoot":"","sources":["../../../../packages/cli/src/project.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,IAAI,EAAE,MAAM,WAAW,CAAC;AACjC,OAAO,EAAE,QAAQ,EAAE,iBAAiB,EAAE,MAAM,aAAa,CAAC;
|
|
1
|
+
{"version":3,"file":"project.js","sourceRoot":"","sources":["../../../../packages/cli/src/project.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,IAAI,EAAE,MAAM,WAAW,CAAC;AACjC,OAAO,EAAE,QAAQ,EAAE,QAAQ,EAAE,iBAAiB,EAAE,MAAM,aAAa,CAAC;AACpE,OAAO,EAAE,cAAc,EAAE,cAAc,EAAE,MAAM,aAAa,CAAC;AAG7D,MAAM,CAAC,KAAK,UAAU,WAAW,CAAC,SAAiB,EAAE,cAAc,GAAG,cAAc;IAClF,MAAM,WAAW,GAAG,IAAI,CAAC,SAAS,EAAE,cAAc,CAAC,CAAC;IACpD,MAAM,UAAU,GAAG,IAAI,CAAC,SAAS,EAAE,cAAc,CAAC,CAAC;IACnD,MAAM,OAAO,GAAG,MAAM,QAAQ,CAAU,WAAW,CAAC,CAAC;IACrD,MAAM,MAAM,GAAG,MAAM,QAAQ,CAAU,UAAU,CAAC,CAAC;IACnD,MAAM,iBAAiB,GAAG,OAAO,IAAI,EAAC,GAAG,OAAO,EAAE,MAAM,EAAE,cAAc,CAAC,OAAO,CAAC,MAAM,CAAC,EAAC,CAAC;IAC1F,MAAM,gBAAgB,GAAG,MAAM,IAAI,EAAC,GAAG,MAAM,EAAE,MAAM,EAAE,cAAc,CAAC,MAAM,CAAC,MAAM,CAAC,EAAC,CAAC;IACtF,IAAI,OAAO,IAAI,MAAM,IAAI,CAAC,iBAAkB,CAAC,MAAM,KAAK,gBAAiB,CAAC,MAAM,IAAI,CAAC,OAAO,CAAC,KAAK,IAAI,MAAM,CAAC,KAAK,IAAI,OAAO,CAAC,KAAK,KAAK,MAAM,CAAC,KAAK,CAAC,CAAC,EAAE,CAAC;QACvJ,MAAM,IAAI,KAAK,CAAC,2FAA2F,CAAC,CAAC;IAC/G,CAAC;IACD,IAAI,OAAO,EAAE,CAAC;QACZ,IAAI,OAAO,CAAC,MAAM,KAAK,iBAAkB,CAAC,MAAM,IAAI,cAAc,KAAK,cAAc,EAAE,CAAC;YACtF,MAAM,MAAM,GAAG,MAAM,QAAQ,CAAU,WAAW,CAAC,CAAC;YACpD,IAAI,IAAI,CAAC,SAAS,CAAC,MAAM,CAAC,KAAK,IAAI,CAAC,SAAS,CAAC,OAAO,CAAC;gBAAE,MAAM,IAAI,KAAK,CAAC,qDAAqD,CAAC,CAAC;YAC/H,MAAM,QAAQ,CAAC,WAAW,EAAE,iBAAiB,CAAC,CAAC;YAC/C,OAAO,iBAAiB,CAAC;QAC3B,CAAC;QACD,OAAO,OAAO,CAAC;IACjB,CAAC;IACD,IAAI,CAAC,MAAM;QAAE,OAAO,SAAS,CAAC;IAC9B,MAAM,aAAa,GAAG,cAAc,KAAK,cAAc,CAAC,CAAC,CAAC,gBAAiB,CAAC,CAAC,CAAC,MAAM,CAAC;IACrF,IAAI,CAAC;QAAC,MAAM,iBAAiB,CAAC,WAAW,EAAE,aAAa,CAAC,CAAC;IAAC,CAAC;IAC5D,OAAO,CAAC,EAAE,CAAC;QAAC,IAAK,CAA2B,CAAC,IAAI,KAAK,QAAQ;YAAE,MAAM,CAAC,CAAC;IAAC,CAAC;IAC1E,MAAM,QAAQ,GAAG,MAAM,QAAQ,CAAU,WAAW,CAAC,CAAC;IACtD,IAAI,IAAI,CAAC,SAAS,CAAC,QAAQ,CAAC,KAAK,IAAI,CAAC,SAAS,CAAC,aAAa,CAAC,EAAE,CAAC;QAC/D,MAAM,IAAI,KAAK,CAAC,0EAA0E,CAAC,CAAC;IAC9F,CAAC;IACD,OAAO,QAAQ,CAAC;AAClB,CAAC"}
|
|
@@ -0,0 +1,57 @@
|
|
|
1
|
+
import { homedir } from 'node:os';
|
|
2
|
+
import { join } from 'node:path';
|
|
3
|
+
import { readJSON, saveJSON } from './client.js';
|
|
4
|
+
import { CLI_VERSION } from './version.js';
|
|
5
|
+
const REGISTRY_URL = 'https://registry.npmjs.org/@cellapp%2Fcli/latest';
|
|
6
|
+
function localDate(now) {
|
|
7
|
+
return `${now.getFullYear()}-${String(now.getMonth() + 1).padStart(2, '0')}-${String(now.getDate()).padStart(2, '0')}`;
|
|
8
|
+
}
|
|
9
|
+
function stableVersion(value) {
|
|
10
|
+
if (typeof value !== 'string' || !/^\d+\.\d+\.\d+$/.test(value))
|
|
11
|
+
return undefined;
|
|
12
|
+
const parts = value.split('.').map(Number);
|
|
13
|
+
return parts.every(Number.isSafeInteger) ? parts : undefined;
|
|
14
|
+
}
|
|
15
|
+
export function isNewerVersion(latest, current) {
|
|
16
|
+
const next = stableVersion(latest);
|
|
17
|
+
const installed = stableVersion(current);
|
|
18
|
+
if (!next || !installed)
|
|
19
|
+
return false;
|
|
20
|
+
for (let i = 0; i < 3; i++) {
|
|
21
|
+
if (next[i] > installed[i])
|
|
22
|
+
return true;
|
|
23
|
+
if (next[i] < installed[i])
|
|
24
|
+
return false;
|
|
25
|
+
}
|
|
26
|
+
return false;
|
|
27
|
+
}
|
|
28
|
+
export async function checkForUpdates(configDirectory, notify, now = new Date(), fetcher = fetch) {
|
|
29
|
+
const statePath = join(configDirectory ?? join(homedir(), '.config', 'cellapp'), 'update-check.json');
|
|
30
|
+
const date = localDate(now);
|
|
31
|
+
try {
|
|
32
|
+
let state;
|
|
33
|
+
try {
|
|
34
|
+
state = await readJSON(statePath);
|
|
35
|
+
}
|
|
36
|
+
catch { /* Replace invalid local state. */ }
|
|
37
|
+
if (state && typeof state === 'object' && 'date' in state && state.date === date)
|
|
38
|
+
return;
|
|
39
|
+
// Record the attempt first so an offline machine does not retry on every command.
|
|
40
|
+
await saveJSON(statePath, { date }, true);
|
|
41
|
+
const response = await fetcher(REGISTRY_URL, {
|
|
42
|
+
headers: { Accept: 'application/json' },
|
|
43
|
+
redirect: 'error',
|
|
44
|
+
signal: AbortSignal.timeout(2_000),
|
|
45
|
+
});
|
|
46
|
+
if (!response.ok)
|
|
47
|
+
return;
|
|
48
|
+
const metadata = await response.json();
|
|
49
|
+
if (!metadata || typeof metadata !== 'object' || !('version' in metadata))
|
|
50
|
+
return;
|
|
51
|
+
if (isNewerVersion(metadata.version, CLI_VERSION)) {
|
|
52
|
+
notify(`发现新版 @cellapp/cli ${metadata.version}（当前 ${CLI_VERSION}）。运行 npm install -g @cellapp/cli@latest 更新。`);
|
|
53
|
+
}
|
|
54
|
+
}
|
|
55
|
+
catch { /* Update checks never change the requested command's result. */ }
|
|
56
|
+
}
|
|
57
|
+
//# sourceMappingURL=update.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"update.js","sourceRoot":"","sources":["../../../../packages/cli/src/update.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,SAAS,CAAC;AAClC,OAAO,EAAE,IAAI,EAAE,MAAM,WAAW,CAAC;AACjC,OAAO,EAAE,QAAQ,EAAE,QAAQ,EAAE,MAAM,aAAa,CAAC;AACjD,OAAO,EAAE,WAAW,EAAE,MAAM,cAAc,CAAC;AAE3C,MAAM,YAAY,GAAG,kDAAkD,CAAC;AAExE,SAAS,SAAS,CAAC,GAAS;IAC1B,OAAO,GAAG,GAAG,CAAC,WAAW,EAAE,IAAI,MAAM,CAAC,GAAG,CAAC,QAAQ,EAAE,GAAG,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC,EAAE,GAAG,CAAC,IAAI,MAAM,CAAC,GAAG,CAAC,OAAO,EAAE,CAAC,CAAC,QAAQ,CAAC,CAAC,EAAE,GAAG,CAAC,EAAE,CAAC;AACzH,CAAC;AAED,SAAS,aAAa,CAAC,KAAc;IACnC,IAAI,OAAO,KAAK,KAAK,QAAQ,IAAI,CAAC,iBAAiB,CAAC,IAAI,CAAC,KAAK,CAAC;QAAE,OAAO,SAAS,CAAC;IAClF,MAAM,KAAK,GAAG,KAAK,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC;IAC3C,OAAO,KAAK,CAAC,KAAK,CAAC,MAAM,CAAC,aAAa,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,SAAS,CAAC;AAC/D,CAAC;AAED,MAAM,UAAU,cAAc,CAAC,MAAe,EAAE,OAAe;IAC7D,MAAM,IAAI,GAAG,aAAa,CAAC,MAAM,CAAC,CAAC;IACnC,MAAM,SAAS,GAAG,aAAa,CAAC,OAAO,CAAC,CAAC;IACzC,IAAI,CAAC,IAAI,IAAI,CAAC,SAAS;QAAE,OAAO,KAAK,CAAC;IACtC,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC;QAC3B,IAAI,IAAI,CAAC,CAAC,CAAE,GAAG,SAAS,CAAC,CAAC,CAAE;YAAE,OAAO,IAAI,CAAC;QAC1C,IAAI,IAAI,CAAC,CAAC,CAAE,GAAG,SAAS,CAAC,CAAC,CAAE;YAAE,OAAO,KAAK,CAAC;IAC7C,CAAC;IACD,OAAO,KAAK,CAAC;AACf,CAAC;AAED,MAAM,CAAC,KAAK,UAAU,eAAe,CACnC,eAAmC,EACnC,MAAiC,EACjC,GAAG,GAAG,IAAI,IAAI,EAAE,EAChB,UAAwB,KAAK;IAE7B,MAAM,SAAS,GAAG,IAAI,CAAC,eAAe,IAAI,IAAI,CAAC,OAAO,EAAE,EAAE,SAAS,EAAE,SAAS,CAAC,EAAE,mBAAmB,CAAC,CAAC;IACtG,MAAM,IAAI,GAAG,SAAS,CAAC,GAAG,CAAC,CAAC;IAC5B,IAAI,CAAC;QACH,IAAI,KAAc,CAAC;QACnB,IAAI,CAAC;YAAC,KAAK,GAAG,MAAM,QAAQ,CAAU,SAAS,CAAC,CAAC;QAAC,CAAC;QAAC,MAAM,CAAC,CAAC,kCAAkC,CAAC,CAAC;QAChG,IAAI,KAAK,IAAI,OAAO,KAAK,KAAK,QAAQ,IAAI,MAAM,IAAI,KAAK,IAAI,KAAK,CAAC,IAAI,KAAK,IAAI;YAAE,OAAO;QACzF,kFAAkF;QAClF,MAAM,QAAQ,CAAC,SAAS,EAAE,EAAC,IAAI,EAAC,EAAE,IAAI,CAAC,CAAC;QACxC,MAAM,QAAQ,GAAG,MAAM,OAAO,CAAC,YAAY,EAAE;YAC3C,OAAO,EAAE,EAAC,MAAM,EAAE,kBAAkB,EAAC;YACrC,QAAQ,EAAE,OAAO;YACjB,MAAM,EAAE,WAAW,CAAC,OAAO,CAAC,KAAK,CAAC;SACnC,CAAC,CAAC;QACH,IAAI,CAAC,QAAQ,CAAC,EAAE;YAAE,OAAO;QACzB,MAAM,QAAQ,GAAY,MAAM,QAAQ,CAAC,IAAI,EAAE,CAAC;QAChD,IAAI,CAAC,QAAQ,IAAI,OAAO,QAAQ,KAAK,QAAQ,IAAI,CAAC,CAAC,SAAS,IAAI,QAAQ,CAAC;YAAE,OAAO;QAClF,IAAI,cAAc,CAAC,QAAQ,CAAC,OAAO,EAAE,WAAW,CAAC,EAAE,CAAC;YAClD,MAAM,CAAC,qBAAqB,QAAQ,CAAC,OAAO,OAAO,WAAW,6CAA6C,CAAC,CAAC;QAC/G,CAAC;IACH,CAAC;IAAC,MAAM,CAAC,CAAC,gEAAgE,CAAC,CAAC;AAC9E,CAAC"}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"version.js","sourceRoot":"","sources":["../../../../packages/cli/src/version.ts"],"names":[],"mappings":"AAAA,MAAM,CAAC,MAAM,WAAW,GAAG,OAAO,CAAC"}
|
package/package.json
CHANGED
|
@@ -1,19 +1,35 @@
|
|
|
1
1
|
---
|
|
2
2
|
name: cellapp-deploy
|
|
3
|
-
description:
|
|
3
|
+
description: Develop, update and deploy a static Cellapp app from the user's project. Run the published client on demand, guide browser authorization, and optionally manage supported application tables.
|
|
4
4
|
---
|
|
5
5
|
|
|
6
6
|
# Develop and deploy a Cellapp application
|
|
7
7
|
|
|
8
|
-
|
|
8
|
+
[简体中文版](SKILL.zh-CN.md)
|
|
9
|
+
|
|
10
|
+
Use the official `cellapp` client for deployment and table operations. Newer client versions use `/auth/device` for browser-approved login and `/api/control/v1/*` for Bearer management; keep using CLI commands rather than constructing HTTP requests. Older root-path CLI requests remain supported during migration. The Agent obtains and runs it; the user installs only this Skill. The public [Agent deployment instructions](https://cellapp.ai/deploy/AGENTS.md) provide the short deployment path; this Skill covers data and recovery in more detail. Use a custom origin supplied by the user or environment when present; otherwise the client defaults to `https://cellapp.ai` and migrates exact `https://console.cellapp.ai` project associations. The retired origin requires fresh browser authorization and its old token is never copied. Preserve `ohmyapp.json` and `OHMYAPP_ORIGIN` compatibility. Do not invent another origin or store a credential in the project.
|
|
11
|
+
|
|
12
|
+
## Run the published client
|
|
13
|
+
|
|
14
|
+
Check Node.js is at least 22.12 and npm is available. In the project directory, verify the official published package with:
|
|
15
|
+
|
|
16
|
+
```sh
|
|
17
|
+
npm exec --yes --package=@cellapp/cli@latest -- cellapp --help
|
|
18
|
+
```
|
|
19
|
+
|
|
20
|
+
Use the same `npm exec --yes --package=@cellapp/cli@latest -- cellapp` prefix for deployment, data and recovery commands below. npm fetches and caches the official package on demand; do not install it globally or ask the user to run setup commands. If Node.js is missing or unsupported, package retrieval fails, or help verification fails, report that exact blocker and stop. Do not use `sudo`, disable TLS checks or implement the upload protocol yourself. Keep the client's upgrade hint separate from the deployment result.
|
|
9
21
|
|
|
10
22
|
## Inspect
|
|
11
23
|
|
|
12
24
|
Read `cellapp.json`, the existing build command, static output directory, and `cellapp.data.json` if present. Reuse the application association on updates. For plain HTML omit the build command. Ask only for an ambiguous output or build setting. Cellapp hosts static frontend code; do not deploy SSR, a custom server, private service key, direct PostgreSQL credential, or arbitrary SQL. Bundled frontend values are readable by admitted visitors.
|
|
13
25
|
|
|
26
|
+
## Develop the interface when needed
|
|
27
|
+
|
|
28
|
+
If the user asks you to develop or substantially redesign an app without UI direction, read the [user-app design guidance](https://cellapp.ai/deploy/app-design.md) and apply its suggestions without asking the user to opt in. Explicit user design instructions and established project conventions take precedence. Choose a framework and styling approach that fit the app; do not impose a Cellapp look or a particular library. If the guide is unavailable, continue with a coherent visual hierarchy, responsive layout, accessible controls, and a review of the built interface. A deploy-only request does not require redesigning an existing app.
|
|
29
|
+
|
|
14
30
|
## Choose an application reference
|
|
15
31
|
|
|
16
|
-
The display name may repeat. Every owner has one public namespace, and
|
|
32
|
+
The display name may repeat. Every owner has one public user slug (`namespace` in the API and CLI), and application slugs are unique inside it. On the first deployment a new owner may choose `--namespace <user-slug>`; each new app may choose `--slug <app-slug>`. Both use lowercase ASCII letters, digits and hyphens and start with a letter. The user slug needs at least three characters, reserved names such as `accounts`, `cloud`, `login` and `app` are unavailable, and `{app-slug}-{user-slug}` must fit one 63-character DNS label. Without choices, Cellapp assigns a privacy-preserving user slug and an application slug derived from the display name, adding a suffix on collision. Existing owners must reuse their established user slug for CLI creation. The console can update either slug after creation. The returned URL uses `{app-slug}-{user-slug}.<apps-domain>`; prior addresses remain assigned to the original app. The `@user-slug/app-slug` share link redirects to the current host. Never treat a slug or display name as an authorization identity; app access and tables remain bound to the immutable app ID.
|
|
17
33
|
|
|
18
34
|
## Plan, apply, and verify tables
|
|
19
35
|
|
|
@@ -22,10 +38,10 @@ The versioned, non-secret [`cellapp.data.json`](examples/notes/cellapp.data.json
|
|
|
22
38
|
A new project needs its first static deployment to create the application association in `cellapp.json`. Build and deploy the frontend once, then use the linked app and configured origin to apply the data manifest. Do not report the table-dependent page as ready until verification succeeds:
|
|
23
39
|
|
|
24
40
|
```sh
|
|
25
|
-
cellapp data status --project <project>
|
|
26
|
-
cellapp data plan --project <project>
|
|
27
|
-
cellapp data apply --project <project>
|
|
28
|
-
cellapp data verify --project <project>
|
|
41
|
+
npm exec --yes --package=@cellapp/cli@latest -- cellapp data status --project <project>
|
|
42
|
+
npm exec --yes --package=@cellapp/cli@latest -- cellapp data plan --project <project>
|
|
43
|
+
npm exec --yes --package=@cellapp/cli@latest -- cellapp data apply --project <project>
|
|
44
|
+
npm exec --yes --package=@cellapp/cli@latest -- cellapp data verify --project <project>
|
|
29
45
|
```
|
|
30
46
|
|
|
31
47
|
The first manifest version is `1`; increase by exactly one. Inspect the plan and data version separately from the static release. Identical retries are safe; changed content at an applied version conflicts. For a table or column drop, set `allowDestructive: true` in the manifest and pass `--allow-destructive` to `data apply` after reviewing the plan and backup implications. After a timeout, run status and verify, then retry the same manifest if needed. Do not create a new version for a retry. Adding a non-null column to a populated table fails and rolls back; use a nullable column in this initial subset.
|
|
@@ -40,8 +56,8 @@ Use only `.from(table).select(columns)`, `.insert(values)`, `.update(values)`, `
|
|
|
40
56
|
|
|
41
57
|
## Publish and report
|
|
42
58
|
|
|
43
|
-
Run `cellapp deploy --project <project> --output <output-directory> --build <existing-build-command>` (optionally adding `--namespace` and `--slug` on the first deployment), omitting `--build` for plain HTML. Add `--spa` only for client-side routes. The
|
|
59
|
+
Run `npm exec --yes --package=@cellapp/cli@latest -- cellapp deploy --project <project> --output <output-directory> --build <existing-build-command>` (optionally adding `--namespace` and `--slug` on the first deployment), omitting `--build` for plain HTML. Add `--spa` only for client-side routes. The client performs device authorization when needed; provide the verification link and code, keep the command running while the user approves in the browser, and never request account passwords. Do not treat a chat reply as approval. Report publication only after `status: published`. Report data version/verification and static release separately, then provide the app URL.
|
|
44
60
|
|
|
45
61
|
The first deployment returns an access key once. Give it only to the requesting owner; never put it in a URL, repository, issue or project state. Old keys can be redeemed only after platform login. `cellapp reset-key <app-id>` rotates future redemption; existing user grants remain active. Revoke an individual grant in the owner console. Use reset or delete only when requested. A lost initial key can be explicitly rotated.
|
|
46
62
|
|
|
47
|
-
On transient upload/network failure, retry the same deploy command once: pending project metadata reuses the operation. Stop after another failure and report the error. A release version conflict needs review. For data errors use `data status` and `data verify`; do not claim a table-dependent frontend is ready while its data API is unready. Browser local-only state does not synchronize between devices; managed table data does.
|
|
63
|
+
On transient upload/network failure, retry the same deploy command once: pending project metadata reuses the operation. Stop after another failure and report the error. A release version conflict needs review. If creation reports `app_data_not_ready`, keep `cellapp.json`, inspect `cellapp data status --project <project>` and retry `cellapp data reconcile --project <project>` after the platform data service is healthy; then retry deploy. Do not switch slugs or delete the app to work around this error. For an app created by an older CLI without `cellapp.json`, run `cellapp link <app-id> --project <project> --output <output-directory>` using an ID verified in `cellapp apps`. The CLI keeps the initial access key only in its private credential directory until publication; never copy it into project files. For data errors use `data status` and `data verify`; do not claim a table-dependent frontend is ready while its data API is unready. Browser local-only state does not synchronize between devices; managed table data does.
|
|
@@ -0,0 +1,63 @@
|
|
|
1
|
+
---
|
|
2
|
+
name: cellapp-deploy
|
|
3
|
+
description: 从用户项目开发、更新并部署静态 Cellapp 应用。按需运行已发布客户端，引导浏览器授权，并可管理受支持的应用数据表。
|
|
4
|
+
---
|
|
5
|
+
|
|
6
|
+
# 开发并部署 Cellapp 应用
|
|
7
|
+
|
|
8
|
+
[English version](SKILL.md)
|
|
9
|
+
|
|
10
|
+
部署和数据表操作使用官方 `cellapp` 客户端。新版客户端通过 `/auth/device` 请求浏览器批准，并使用 `/api/control/v1/*` 管理资源；旧版客户端的根路径在迁移期继续可用。请运行 CLI 命令，不自行拼接 HTTP 请求。Agent 自行获取并运行客户端；用户只需安装本 Skill。公开的 [Agent 部署指引](https://cellapp.ai/deploy/AGENTS.zh-CN.md) 提供简要部署流程；本 Skill 更详细地说明数据和失败恢复。如果用户或环境提供自定义来源，就使用该来源；否则客户端默认连接 `https://cellapp.ai`，并迁移来源恰好为 `https://console.cellapp.ai` 的项目关联。旧来源需要重新进行浏览器授权，旧令牌不会被复制。保留 `ohmyapp.json` 和 `OHMYAPP_ORIGIN` 的兼容行为。不要虚构其他来源，也不要把凭证存入项目。
|
|
11
|
+
|
|
12
|
+
## 运行已发布客户端
|
|
13
|
+
|
|
14
|
+
确认 Node.js 至少为 22.12，且 npm 可用。在项目目录中验证官方已发布的包：
|
|
15
|
+
|
|
16
|
+
```sh
|
|
17
|
+
npm exec --yes --package=@cellapp/cli@latest -- cellapp --help
|
|
18
|
+
```
|
|
19
|
+
|
|
20
|
+
下文的部署、数据和恢复命令都使用相同的 `npm exec --yes --package=@cellapp/cli@latest -- cellapp` 前缀。npm 会按需获取并缓存官方包；不要全局安装，也不要要求用户执行安装命令。如果 Node.js 缺失或版本不受支持、包获取失败或帮助命令验证失败，报告具体障碍并停止。不要使用 `sudo`、关闭 TLS 验证，或自行实现上传协议。客户端的升级提示应与部署结果分开说明。
|
|
21
|
+
|
|
22
|
+
## 检查项目
|
|
23
|
+
|
|
24
|
+
读取已有的 `cellapp.json`、构建命令、静态输出目录，以及可能存在的 `cellapp.data.json`。更新应用时复用现有关联。无需构建的普通 HTML 省略构建命令。只有输出目录或构建设置不明确时才询问。Cellapp 托管静态前端代码；不要部署 SSR、自定义服务器、私密服务密钥、直连 PostgreSQL 的凭证或任意 SQL。获准访问的访客可以读取打包后的前端内容。
|
|
25
|
+
|
|
26
|
+
## 需要开发界面时
|
|
27
|
+
|
|
28
|
+
如果用户要求开发或大幅重新设计应用，而没有提供 UI 方向，阅读[用户应用设计指导](https://cellapp.ai/deploy/app-design.zh-CN.md)，直接采用其中适合的建议，不必询问用户是否启用。用户明确的设计要求和项目已有约定优先。根据应用选择框架和样式方案，不要强加 Cellapp 的外观或特定样式库。如果暂时无法读取指导，仍继续建立清楚的视觉层级、响应式布局和可访问控件，并检查构建后的界面。仅部署现有应用的任务不要求重新设计。
|
|
29
|
+
|
|
30
|
+
## 选择应用标识
|
|
31
|
+
|
|
32
|
+
显示名称可以重复。每个所有者有一个公开的用户 slug（在 API 和 CLI 中称为 `namespace`），应用 slug 在该用户 slug 下必须唯一。首次部署时，新所有者可以选择 `--namespace <user-slug>`；每个新应用可以选择 `--slug <app-slug>`。两者均使用小写 ASCII 字母、数字和连字符，且以字母开头。用户 slug 至少为三个字符；`accounts`、`cloud`、`login` 和 `app` 等保留名称不可用；`{app-slug}-{user-slug}` 必须能放入一个不超过 63 个字符的 DNS 标签。未指定时，Cellapp 会分配保护隐私的用户 slug，并根据显示名称生成应用 slug；冲突时会添加后缀。已有用户 slug 的所有者通过 CLI 创建应用时，必须复用既有用户 slug。控制台可在创建后修改两种 slug。返回地址使用 `{app-slug}-{user-slug}.<apps-domain>`；旧地址仍归原应用所有。`@user-slug/app-slug` 分享链接会重定向到当前主机。不要把 slug 或显示名称当作授权身份；应用访问和数据表始终绑定不可变的应用 ID。
|
|
33
|
+
|
|
34
|
+
## 规划、应用和验证数据表
|
|
35
|
+
|
|
36
|
+
有版本且不包含秘密的 [`cellapp.data.json`](examples/notes/cellapp.data.json) 清单定义数据表、列、主键、索引和操作策略。类型包括 `text`、`uuid`、`bigint`、`boolean`、`timestamptz`、`jsonb`。策略模式包括 `none`（默认）、`all-admitted-users`、`own-rows`。`own-rows` 模式需要非空的文本型 `ownerColumn`；读写操作会与已登录的应用用户 ID 比对。每张表都需要主键。清单中不能包含 SQL、函数、触发器、数据库密码或提供方身份。表名按应用隔离：一个应用可以定义 `users`，而不影响平台用户或其他应用的同名表。它只是普通应用数据，不是平台身份来源。同一应用内名称必须唯一；`rpc` 为未支持的 PostgREST 路由保留，PostgreSQL 系统列名不可用，生成的索引名也不能与表名冲突。应用前用 `data plan` 检查这些规则。
|
|
37
|
+
|
|
38
|
+
新项目先完成首次静态部署，以便在 `cellapp.json` 中建立应用关联。先构建并部署一次前端，然后使用已关联的应用和配置的来源应用数据清单。验证成功前，不要报告依赖数据表的页面已准备就绪：
|
|
39
|
+
|
|
40
|
+
```sh
|
|
41
|
+
npm exec --yes --package=@cellapp/cli@latest -- cellapp data status --project <project>
|
|
42
|
+
npm exec --yes --package=@cellapp/cli@latest -- cellapp data plan --project <project>
|
|
43
|
+
npm exec --yes --package=@cellapp/cli@latest -- cellapp data apply --project <project>
|
|
44
|
+
npm exec --yes --package=@cellapp/cli@latest -- cellapp data verify --project <project>
|
|
45
|
+
```
|
|
46
|
+
|
|
47
|
+
首个清单版本为 `1`，以后每次恰好加一。数据计划和版本应与静态发布版本分开检查。相同内容重试是安全的；已应用版本的内容发生变化会返回冲突。删除表或列时，在清单中设置 `allowDestructive: true`，审查计划和备份影响后，再向 `data apply` 传入 `--allow-destructive`。超时后先运行 status 和 verify，必要时重试同一清单；不要为重试创建新版本。给已有数据的表增加非空列会失败并回滚；在当前支持范围内，先使用可空列。
|
|
48
|
+
|
|
49
|
+
新数据表和操作默认拒绝前端访问，直到明确授予权限。使用所有者凭证应用清单。交付应用地址前，分别验证一个允许的操作，以及一个跨用户或未授权而被拒绝的操作。区分仅针对数据库的测试与真实浏览器和 PostgREST 验收。应用数据库与控制数据及其他应用隔离；应用代码无法获得数据库密码。
|
|
50
|
+
|
|
51
|
+
## 连接静态前端
|
|
52
|
+
|
|
53
|
+
对已声明支持的表操作子集使用 `@supabase/supabase-js@2.117.3`。按以下方式初始化：`createClient(window.location.origin, 'cellapp-public', {auth: {autoRefreshToken: false, persistSession: false, detectSessionInUrl: false}})`。公开字符串不是秘密，也不授予任何权限。Cellapp 对每个请求检查已登录用户的仅限应用主机的会话和准入权限。通过同源凭证请求 `/_cellapp/me`，获取稳定的应用范围用户 ID；不要暴露或推导全局 Cellapp ID。可参考包含构建、清单和浏览器 CRUD 页面的[可运行笔记示例](examples/notes/README.md)。
|
|
54
|
+
|
|
55
|
+
只使用 `.from(table).select(columns)`、`.insert(values)`、`.update(values)`、`.delete()`、`.eq()`、`.order()`、`.range()`，以及写入后用于返回记录的 `.select()`。明确处理 `{data,error}` 与 401/403 状态。本期不支持 Supabase Auth、Realtime、Storage、RPC、Edge Functions、联表、任意过滤器、直连数据库或自定义应用服务器。网关忽略客户端传入的授权和 profile 请求头。公开应用允许任何已登录 Cellapp 用户进入，但数据表仍受策略控制。受限应用在登录后还需要所有者批准或兑换访问密钥。
|
|
56
|
+
|
|
57
|
+
## 发布与报告
|
|
58
|
+
|
|
59
|
+
运行 `npm exec --yes --package=@cellapp/cli@latest -- cellapp deploy --project <project> --output <output-directory> --build <existing-build-command>`；首次部署时可选传入 `--namespace` 和 `--slug`。普通 HTML 如果不需要构建，则省略 `--build`。仅当应用使用客户端路由时添加 `--spa`。需要设备授权时，由客户端发起流程；将验证链接和代码交给用户，在用户通过浏览器批准期间保持命令运行，不要索取账号密码。聊天中的回复不等于批准。仅在返回 `status: published` 后报告发布成功。数据版本及其验证结果应与静态版本分开报告，最后提供应用地址。
|
|
60
|
+
|
|
61
|
+
首次部署只返回一次访问密钥。仅交给提出请求的所有者；不要写入 URL、仓库、Issue 或项目状态。旧密钥只能在平台登录后兑换。`cellapp reset-key <app-id>` 会轮换后续兑换所用密钥，已有用户授权仍有效。可在所有者控制台撤销单个授权。仅在用户要求时才重置密钥或删除应用。初始密钥丢失后，可以按明确要求进行轮换。
|
|
62
|
+
|
|
63
|
+
暂时性上传或网络失败时，对同一部署命令重试一次：待完成的项目元数据会复用原操作。再次失败后停止并报告错误。发布版本冲突需要人工检查。创建时若返回 `app_data_not_ready`，保留 `cellapp.json`，查看 `cellapp data status --project <project>`；平台数据服务恢复后运行 `cellapp data reconcile --project <project>`，再重试部署。不要通过更换 slug 或删除应用规避此错误。对于没有 `cellapp.json` 的旧版 CLI 项目，先用 `cellapp apps` 验证所有者拥有的应用 ID，再运行 `cellapp link <app-id> --project <project> --output <output-directory>`。CLI 在首次发布成功前，只把初始访问密钥保存在私有凭证目录；不要复制到项目文件。遇到数据错误时使用 `data status` 和 `data verify`；数据 API 尚不可用时，不要声称依赖数据表的前端已经就绪。仅存于浏览器本地的数据不会跨设备同步；受管理的数据表数据可以。
|