@phnx-labs/agents-cli 1.22.47 → 1.22.50
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/CHANGELOG.md +503 -17
- package/README.md +76 -32
- package/dist/bootstrap.js +4 -2
- package/dist/cli/command-registry.d.ts +1 -0
- package/dist/cli/command-registry.js +2 -0
- package/dist/commands/accounts.d.ts +58 -0
- package/dist/commands/accounts.js +201 -39
- package/dist/commands/artifacts.js +7 -6
- package/dist/commands/attach.js +1 -1
- package/dist/commands/browser.js +501 -103
- package/dist/commands/config.d.ts +0 -1
- package/dist/commands/config.js +0 -20
- package/dist/commands/daemon-test-harness.d.ts +42 -0
- package/dist/commands/daemon-test-harness.js +90 -0
- package/dist/commands/daemon.d.ts +21 -0
- package/dist/commands/daemon.js +147 -12
- package/dist/commands/device-config-test-harness.d.ts +11 -0
- package/dist/commands/device-config-test-harness.js +59 -0
- package/dist/commands/exec.js +76 -16
- package/dist/commands/focus.d.ts +14 -0
- package/dist/commands/focus.js +48 -5
- package/dist/commands/go.d.ts +3 -0
- package/dist/commands/go.js +16 -3
- package/dist/commands/inspect.js +2 -2
- package/dist/commands/lease.d.ts +1 -1
- package/dist/commands/lease.js +4 -3
- package/dist/commands/mailboxes.js +4 -3
- package/dist/commands/menubar.js +11 -4
- package/dist/commands/projects.d.ts +16 -1
- package/dist/commands/projects.js +58 -64
- package/dist/commands/resume.js +1 -1
- package/dist/commands/route.js +4 -4
- package/dist/commands/routines.js +3 -2
- package/dist/commands/run-broadcast.d.ts +1 -1
- package/dist/commands/run-broadcast.js +1 -1
- package/dist/commands/sessions-picker.d.ts +22 -0
- package/dist/commands/sessions-picker.js +48 -9
- package/dist/commands/sessions-trace.js +1 -1
- package/dist/commands/sessions.js +1 -0
- package/dist/commands/setup-secrets.js +23 -0
- package/dist/commands/share.d.ts +20 -5
- package/dist/commands/share.js +158 -53
- package/dist/commands/ssh.js +54 -7
- package/dist/commands/teams.d.ts +12 -0
- package/dist/commands/teams.js +44 -67
- package/dist/commands/traces.d.ts +2 -0
- package/dist/commands/traces.js +188 -0
- package/dist/commands/view.d.ts +1 -1
- package/dist/commands/view.js +17 -34
- package/dist/index.d.ts +1 -0
- package/dist/index.js +5 -0
- package/dist/lib/account-provider-registry.d.ts +9 -0
- package/dist/lib/account-provider-registry.js +20 -0
- package/dist/lib/accounting/account-pool-collect.d.ts +34 -0
- package/dist/lib/accounting/account-pool-collect.js +71 -0
- package/dist/lib/accounting/account-pool.d.ts +46 -0
- package/dist/lib/accounting/account-pool.js +33 -0
- package/dist/lib/accounting/capacity.d.ts +24 -0
- package/dist/lib/accounting/capacity.js +30 -0
- package/dist/lib/accounting/rotate.d.ts +11 -18
- package/dist/lib/accounting/rotate.js +6 -24
- package/dist/lib/accounting/usage.d.ts +14 -3
- package/dist/lib/accounting/usage.js +64 -18
- package/dist/lib/agent-spec/agents.js +11 -9
- package/dist/lib/browser/drivers/ssh.d.ts +16 -2
- package/dist/lib/browser/drivers/ssh.js +36 -9
- package/dist/lib/browser/ipc.js +8 -3
- package/dist/lib/browser/profiles.d.ts +35 -101
- package/dist/lib/browser/profiles.js +130 -301
- package/dist/lib/browser/registry.d.ts +39 -0
- package/dist/lib/browser/registry.js +149 -0
- package/dist/lib/browser/remote-control.d.ts +8 -6
- package/dist/lib/browser/remote-control.js +8 -6
- package/dist/lib/browser/resolve-target.d.ts +68 -0
- package/dist/lib/browser/resolve-target.js +250 -0
- package/dist/lib/browser/runtime-state.d.ts +40 -16
- package/dist/lib/browser/runtime-state.js +92 -25
- package/dist/lib/browser/service.d.ts +28 -9
- package/dist/lib/browser/service.js +139 -62
- package/dist/lib/browser/task-index.d.ts +70 -0
- package/dist/lib/browser/task-index.js +180 -0
- package/dist/lib/byok-usage.js +2 -2
- package/dist/lib/claude-statusline.d.ts +29 -0
- package/dist/lib/claude-statusline.js +139 -0
- package/dist/lib/cloud/host.d.ts +1 -1
- package/dist/lib/cloud/host.js +1 -1
- package/dist/lib/cloud/rush.js +1 -1
- package/dist/lib/computer/computer-rpc.js +2 -2
- package/dist/lib/computer/download.d.ts +15 -15
- package/dist/lib/computer/download.js +35 -98
- package/dist/lib/computer/ssh-tunnel.d.ts +0 -3
- package/dist/lib/computer/ssh-tunnel.js +12 -22
- package/dist/lib/config-keys.d.ts +2 -8
- package/dist/lib/config-keys.js +2 -13
- package/dist/lib/crabbox/cli.d.ts +1 -1
- package/dist/lib/crabbox/cli.js +2 -2
- package/dist/lib/crabbox/lease.d.ts +9 -0
- package/dist/lib/crabbox/lease.js +70 -15
- package/dist/lib/crabbox/runtimes.js +1 -1
- package/dist/lib/daemon/account-state-daemon-service.d.ts +16 -0
- package/dist/lib/daemon/account-state-daemon-service.js +26 -0
- package/dist/lib/daemon/browser-ipc-service.d.ts +20 -0
- package/dist/lib/daemon/browser-ipc-service.js +46 -0
- package/dist/lib/daemon/daemon.d.ts +3 -0
- package/dist/lib/daemon/daemon.js +212 -444
- package/dist/lib/daemon/device-probe-service.d.ts +26 -0
- package/dist/lib/daemon/device-probe-service.js +47 -0
- package/dist/lib/daemon/keychain-reap-service.d.ts +17 -0
- package/dist/lib/daemon/keychain-reap-service.js +32 -0
- package/dist/lib/daemon/monitor-engine-service.d.ts +22 -0
- package/dist/lib/daemon/monitor-engine-service.js +29 -0
- package/dist/lib/daemon/secrets-broker-service.d.ts +20 -0
- package/dist/lib/daemon/secrets-broker-service.js +66 -0
- package/dist/lib/daemon/self-heal-service.d.ts +27 -0
- package/dist/lib/daemon/self-heal-service.js +48 -0
- package/dist/lib/daemon/service.d.ts +102 -0
- package/dist/lib/daemon/service.js +98 -0
- package/dist/lib/daemon/session-index-service.d.ts +22 -0
- package/dist/lib/daemon/session-index-service.js +40 -0
- package/dist/lib/daemon/state-dir-check-service.d.ts +43 -0
- package/dist/lib/daemon/state-dir-check-service.js +63 -0
- package/dist/lib/daemon/supervisor.d.ts +87 -0
- package/dist/lib/daemon/supervisor.js +298 -0
- package/dist/lib/daemon/watchdog-service.d.ts +19 -0
- package/dist/lib/daemon/watchdog-service.js +40 -0
- package/dist/lib/daemon-health.d.ts +15 -0
- package/dist/lib/daemon-health.js +29 -5
- package/dist/lib/daemon-services.d.ts +8 -1
- package/dist/lib/daemon-services.js +55 -0
- package/dist/lib/daemon-ticks.d.ts +13 -2
- package/dist/lib/daemon-ticks.js +20 -18
- package/dist/lib/device-config.d.ts +0 -2
- package/dist/lib/device-config.js +1 -23
- package/dist/lib/devices/registry.d.ts +1 -1
- package/dist/lib/devices/registry.js +1 -1
- package/dist/lib/devices/stats-cache.d.ts +20 -0
- package/dist/lib/devices/stats-cache.js +49 -5
- package/dist/lib/devices/worker-pick.d.ts +48 -0
- package/dist/lib/devices/worker-pick.js +113 -0
- package/dist/lib/exec.d.ts +67 -13
- package/dist/lib/exec.js +85 -29
- package/dist/lib/harness/adapters/cursor.js +8 -11
- package/dist/lib/helper-download.d.ts +108 -0
- package/dist/lib/helper-download.js +194 -0
- package/dist/lib/helper-versions.d.ts +52 -0
- package/dist/lib/helper-versions.js +58 -0
- package/dist/lib/hooks/cache.js +11 -0
- package/dist/lib/hooks/install.js +2 -2
- package/dist/lib/hosts/credentials.d.ts +1 -1
- package/dist/lib/hosts/credentials.js +1 -1
- package/dist/lib/hosts/dispatch.d.ts +7 -1
- package/dist/lib/hosts/dispatch.js +24 -5
- package/dist/lib/hosts/passthrough.d.ts +8 -15
- package/dist/lib/hosts/passthrough.js +19 -16
- package/dist/lib/hosts/providers/devices.d.ts +1 -1
- package/dist/lib/hosts/providers/devices.js +1 -1
- package/dist/lib/hosts/reconnect.d.ts +179 -21
- package/dist/lib/hosts/reconnect.js +266 -45
- package/dist/lib/installations/migrate.d.ts +4 -5
- package/dist/lib/installations/migrate.js +6 -7
- package/dist/lib/installations/shims.d.ts +1 -1
- package/dist/lib/installations/shims.js +23 -13
- package/dist/lib/installations/store.js +6 -3
- package/dist/lib/installations/versions.js +73 -48
- package/dist/lib/linear-autoclose.d.ts +1 -1
- package/dist/lib/linear-autoclose.js +1 -1
- package/dist/lib/loop.d.ts +2 -2
- package/dist/lib/loop.js +1 -1
- package/dist/lib/menubar/download-menubar.d.ts +47 -0
- package/dist/lib/menubar/download-menubar.js +60 -0
- package/dist/lib/menubar/install-menubar.d.ts +31 -7
- package/dist/lib/menubar/install-menubar.js +79 -21
- package/dist/lib/menubar/notify-desktop.d.ts +3 -3
- package/dist/lib/menubar/notify-desktop.js +6 -6
- package/dist/lib/model-tiers.d.ts +1 -1
- package/dist/lib/project-probe.d.ts +1 -1
- package/dist/lib/project-probe.js +1 -1
- package/dist/lib/project-pull.d.ts +1 -1
- package/dist/lib/project-pull.js +2 -2
- package/dist/lib/projects.d.ts +1 -1
- package/dist/lib/projects.js +1 -1
- package/dist/lib/sandbox.js +6 -7
- package/dist/lib/secrets/download-keychain.d.ts +47 -0
- package/dist/lib/secrets/download-keychain.js +70 -0
- package/dist/lib/secrets/install-helper.d.ts +20 -1
- package/dist/lib/secrets/install-helper.js +44 -3
- package/dist/lib/session/active.js +17 -1
- package/dist/lib/session/db.d.ts +11 -1
- package/dist/lib/session/db.js +138 -6
- package/dist/lib/session/discover.d.ts +21 -1
- package/dist/lib/session/discover.js +33 -5
- package/dist/lib/session/highlights.d.ts +49 -1
- package/dist/lib/session/highlights.js +95 -0
- package/dist/lib/session/host-link.d.ts +16 -2
- package/dist/lib/session/host-link.js +7 -1
- package/dist/lib/session/parse.js +33 -1
- package/dist/lib/session/remote/remote-list.d.ts +9 -0
- package/dist/lib/session/remote/remote-list.js +19 -2
- package/dist/lib/session/remote/watch.js +11 -2
- package/dist/lib/session/session-cache.d.ts +53 -0
- package/dist/lib/session/session-cache.js +88 -0
- package/dist/lib/session/state.js +1 -1
- package/dist/lib/session/tool-calls.d.ts +2 -0
- package/dist/lib/session/tool-calls.js +1 -1
- package/dist/lib/session/trajectory-html.d.ts +5 -1
- package/dist/lib/session/trajectory-html.js +42 -22
- package/dist/lib/session/trajectory-text.js +9 -2
- package/dist/lib/session/trajectory.js +53 -4
- package/dist/lib/session/types.d.ts +15 -0
- package/dist/lib/sha256-asset.d.ts +26 -0
- package/dist/lib/sha256-asset.js +41 -0
- package/dist/lib/share/backend.d.ts +95 -0
- package/dist/lib/share/backend.js +139 -0
- package/dist/lib/share/delete.d.ts +6 -2
- package/dist/lib/share/delete.js +8 -9
- package/dist/lib/share/html.d.ts +22 -0
- package/dist/lib/share/html.js +88 -0
- package/dist/lib/share/provision.d.ts +18 -4
- package/dist/lib/share/provision.js +38 -4
- package/dist/lib/share/publish.d.ts +44 -15
- package/dist/lib/share/publish.js +58 -26
- package/dist/lib/share/worker-template.js +402 -25
- package/dist/lib/sqlite.js +16 -3
- package/dist/lib/ssh-exec.d.ts +65 -0
- package/dist/lib/ssh-exec.js +120 -4
- package/dist/lib/startup/command-registry.js +1 -1
- package/dist/lib/startup/dev-build.js +3 -3
- package/dist/lib/state.d.ts +1 -1
- package/dist/lib/state.js +7 -3
- package/dist/lib/subagents-registry.js +1 -1
- package/dist/lib/teams/agents.d.ts +14 -12
- package/dist/lib/teams/agents.js +188 -73
- package/dist/lib/teams/api.d.ts +6 -1
- package/dist/lib/teams/api.js +2 -0
- package/dist/lib/teams/scheduler.d.ts +7 -0
- package/dist/lib/teams/scheduler.js +26 -8
- package/dist/lib/terminal/index.d.ts +1 -1
- package/dist/lib/terminal/types.d.ts +1 -1
- package/dist/lib/terminal/types.js +1 -1
- package/dist/lib/tmux/orphan-reap.js +1 -1
- package/dist/lib/tmux/session.js +31 -0
- package/dist/lib/traces/backend.d.ts +29 -0
- package/dist/lib/traces/backend.js +46 -0
- package/dist/lib/traces/classify.d.ts +52 -0
- package/dist/lib/traces/classify.js +72 -0
- package/dist/lib/traces/config.d.ts +10 -0
- package/dist/lib/traces/config.js +2 -0
- package/dist/lib/traces/provision.d.ts +19 -0
- package/dist/lib/traces/provision.js +30 -0
- package/dist/lib/traces/sync.d.ts +150 -0
- package/dist/lib/traces/sync.js +459 -0
- package/dist/lib/traces/worker-template.d.ts +4 -0
- package/dist/lib/traces/worker-template.js +159 -0
- package/dist/lib/types.d.ts +18 -19
- package/dist/lib/types.js +14 -0
- package/dist/lib/usage-refresh.d.ts +1 -1
- package/dist/lib/usage-refresh.js +11 -8
- package/dist/lib/workflows.d.ts +1 -1
- package/package.json +4 -6
- package/dist/lib/menubar/MenubarHelper.app/Contents/CodeResources +0 -0
- package/dist/lib/menubar/MenubarHelper.app/Contents/Info.plist +0 -24
- package/dist/lib/menubar/MenubarHelper.app/Contents/MacOS/MenubarHelper +0 -0
- package/dist/lib/menubar/MenubarHelper.app/Contents/Resources/AppIcon.icns +0 -0
- package/dist/lib/menubar/MenubarHelper.app/Contents/_CodeSignature/CodeResources +0 -128
- package/dist/lib/secrets/Agents CLI.app/Contents/CodeResources +0 -0
- package/dist/lib/secrets/Agents CLI.app/Contents/Info.plist +0 -26
- package/dist/lib/secrets/Agents CLI.app/Contents/MacOS/Agents CLI +0 -0
- package/dist/lib/secrets/Agents CLI.app/Contents/Resources/AppIcon.icns +0 -0
- package/dist/lib/secrets/Agents CLI.app/Contents/_CodeSignature/CodeResources +0 -135
- package/dist/lib/secrets/Agents CLI.app/Contents/embedded.provisionprofile +0 -0
- package/dist/lib/usage-fleet.d.ts +0 -32
- package/dist/lib/usage-fleet.js +0 -125
|
@@ -0,0 +1,26 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* sha256 helpers for verifying downloaded release assets.
|
|
3
|
+
*
|
|
4
|
+
* These live in their own LEAF module — importing only `node:crypto` and
|
|
5
|
+
* `node:fs` — on purpose. They used to sit in `computer/ssh-tunnel.ts`, whose
|
|
6
|
+
* own import graph reaches `browser/drivers/ssh.ts` -> `browser/chrome.ts` ->
|
|
7
|
+
* `secrets/*`. `helper-download.ts` needs nothing from that graph but these two
|
|
8
|
+
* pure functions, and importing them from there closed a module-initialization
|
|
9
|
+
* cycle:
|
|
10
|
+
*
|
|
11
|
+
* helper-download.ts
|
|
12
|
+
* -> computer/ssh-tunnel.ts (evaluated BEFORE `EXPECTED_TEAM_ID`)
|
|
13
|
+
* -> browser/drivers/ssh.ts -> browser/chrome.ts
|
|
14
|
+
* -> secrets/bundles.ts -> secrets/index.ts -> secrets/install-helper.ts
|
|
15
|
+
* -> secrets/download-keychain.ts
|
|
16
|
+
* -> helper-download.ts (still evaluating; const not yet bound)
|
|
17
|
+
*
|
|
18
|
+
* which threw `ReferenceError: Cannot access 'EXPECTED_TEAM_ID' before
|
|
19
|
+
* initialization` at `secrets/download-keychain.ts:45` for any entry point that
|
|
20
|
+
* reached `helper-download.ts` first (RUSH-3113). Keep this module a leaf: adding
|
|
21
|
+
* a local import here can reintroduce that cycle.
|
|
22
|
+
*/
|
|
23
|
+
/** Pull the digest out of a `<sha256> <filename>` release asset. */
|
|
24
|
+
export declare function parseSha256Asset(text: string): string;
|
|
25
|
+
/** Stream a file through sha256 — the exe is ~157MB, never read it whole. */
|
|
26
|
+
export declare function sha256File(file: string): Promise<string>;
|
|
@@ -0,0 +1,41 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* sha256 helpers for verifying downloaded release assets.
|
|
3
|
+
*
|
|
4
|
+
* These live in their own LEAF module — importing only `node:crypto` and
|
|
5
|
+
* `node:fs` — on purpose. They used to sit in `computer/ssh-tunnel.ts`, whose
|
|
6
|
+
* own import graph reaches `browser/drivers/ssh.ts` -> `browser/chrome.ts` ->
|
|
7
|
+
* `secrets/*`. `helper-download.ts` needs nothing from that graph but these two
|
|
8
|
+
* pure functions, and importing them from there closed a module-initialization
|
|
9
|
+
* cycle:
|
|
10
|
+
*
|
|
11
|
+
* helper-download.ts
|
|
12
|
+
* -> computer/ssh-tunnel.ts (evaluated BEFORE `EXPECTED_TEAM_ID`)
|
|
13
|
+
* -> browser/drivers/ssh.ts -> browser/chrome.ts
|
|
14
|
+
* -> secrets/bundles.ts -> secrets/index.ts -> secrets/install-helper.ts
|
|
15
|
+
* -> secrets/download-keychain.ts
|
|
16
|
+
* -> helper-download.ts (still evaluating; const not yet bound)
|
|
17
|
+
*
|
|
18
|
+
* which threw `ReferenceError: Cannot access 'EXPECTED_TEAM_ID' before
|
|
19
|
+
* initialization` at `secrets/download-keychain.ts:45` for any entry point that
|
|
20
|
+
* reached `helper-download.ts` first (RUSH-3113). Keep this module a leaf: adding
|
|
21
|
+
* a local import here can reintroduce that cycle.
|
|
22
|
+
*/
|
|
23
|
+
import { createHash } from 'node:crypto';
|
|
24
|
+
import * as fs from 'node:fs';
|
|
25
|
+
/** Pull the digest out of a `<sha256> <filename>` release asset. */
|
|
26
|
+
export function parseSha256Asset(text) {
|
|
27
|
+
const m = text.trim().match(/^([A-Fa-f0-9]{64})(\s|$)/);
|
|
28
|
+
if (!m)
|
|
29
|
+
throw new Error(`malformed .sha256 release asset: ${JSON.stringify(text.slice(0, 80))}`);
|
|
30
|
+
return m[1].toLowerCase();
|
|
31
|
+
}
|
|
32
|
+
/** Stream a file through sha256 — the exe is ~157MB, never read it whole. */
|
|
33
|
+
export function sha256File(file) {
|
|
34
|
+
return new Promise((resolve, reject) => {
|
|
35
|
+
const hash = createHash('sha256');
|
|
36
|
+
fs.createReadStream(file)
|
|
37
|
+
.on('error', reject)
|
|
38
|
+
.on('data', (d) => hash.update(d))
|
|
39
|
+
.on('end', () => resolve(hash.digest('hex')));
|
|
40
|
+
});
|
|
41
|
+
}
|
|
@@ -0,0 +1,95 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* ShareBackend — the token-source seam for `agents artifacts share`.
|
|
3
|
+
*
|
|
4
|
+
* Two legitimate principals, picked once at publish time:
|
|
5
|
+
* - **managed**: the caller is signed in to Phoenix (`readSession()`), no
|
|
6
|
+
* explicit BYO override. Token is the Phoenix access_token; endpoint is
|
|
7
|
+
* the already-live `share.agents-cli.sh`. Zero Cloudflare setup.
|
|
8
|
+
* - **byo**: the existing static WRITE_TOKEN path (`readShareConfig()` +
|
|
9
|
+
* `readWriteToken()`). Unchanged for power users / custom domains / fleet
|
|
10
|
+
* injection of `SHARE_WRITE_TOKEN`.
|
|
11
|
+
*
|
|
12
|
+
* Dispatch is not a fallback: signed-in AND no BYO override → managed;
|
|
13
|
+
* otherwise BYO. Fail loud when neither principal can authenticate.
|
|
14
|
+
*
|
|
15
|
+
* Explicit BYO override (any one is enough):
|
|
16
|
+
* - `opts.byo === true`
|
|
17
|
+
* - `opts.writeToken` (a caller-supplied static token, including tests)
|
|
18
|
+
* - `AGENTS_SHARE_BACKEND=byo`
|
|
19
|
+
*/
|
|
20
|
+
import { type PhoenixSession } from '../identity/client.js';
|
|
21
|
+
import { type ShareConfig } from './config.js';
|
|
22
|
+
export type ShareBackendKind = 'managed' | 'byo';
|
|
23
|
+
export interface ShareBackend {
|
|
24
|
+
kind: ShareBackendKind;
|
|
25
|
+
/** Public base URL of the share Worker, no trailing slash. */
|
|
26
|
+
baseUrl: string;
|
|
27
|
+
/** Bearer sent as `Authorization`. Phoenix access_token or WRITE_TOKEN. */
|
|
28
|
+
token: string;
|
|
29
|
+
/** URL namespace prefix (`<namespace>/<slug>`). Phoenix handle (email local-part) or GitHub username. */
|
|
30
|
+
namespace: string;
|
|
31
|
+
}
|
|
32
|
+
export interface ResolveShareBackendOpts {
|
|
33
|
+
/** Force the BYO Cloudflare path even when signed in. */
|
|
34
|
+
byo?: boolean;
|
|
35
|
+
/** Override the namespace (BYO: GitHub username; ignored on managed — the
|
|
36
|
+
* worker 403s a Phoenix PUT whose first segment is not the verified handle). */
|
|
37
|
+
githubUser?: string;
|
|
38
|
+
/** DI seam — a static write token selects BYO. */
|
|
39
|
+
writeToken?: string;
|
|
40
|
+
/** DI seam — persisted BYO endpoint config. */
|
|
41
|
+
config?: ShareConfig;
|
|
42
|
+
/** DI seam — override `readSession()`. `null` means signed out. */
|
|
43
|
+
session?: PhoenixSession | null;
|
|
44
|
+
/**
|
|
45
|
+
* When false, BYO may resolve without a WRITE_TOKEN. Public GET routes
|
|
46
|
+
* (list / revisions / status) don't need one; publish and delete do.
|
|
47
|
+
* Default true.
|
|
48
|
+
*/
|
|
49
|
+
requireToken?: boolean;
|
|
50
|
+
}
|
|
51
|
+
/** Env var that forces the BYO path. Value must be exactly `byo`. */
|
|
52
|
+
export declare const SHARE_BACKEND_ENV = "AGENTS_SHARE_BACKEND";
|
|
53
|
+
/** URL-safe namespace: lowercase `[a-z0-9-]+`. Matches the Worker's sanitize.
|
|
54
|
+
*
|
|
55
|
+
* This is URL-safety, not collision-resistance: two values that differ only
|
|
56
|
+
* in case or punctuation share a prefix. */
|
|
57
|
+
export declare function sanitizeShareNamespace(s: string): string;
|
|
58
|
+
/**
|
|
59
|
+
* Public managed-share handle from a verified email.
|
|
60
|
+
*
|
|
61
|
+
* `muqsitnawaz@gmail.com` → `muqsitnawaz`. Plus-tags are dropped
|
|
62
|
+
* (`muqsitnawaz+dev@gmail.com` → `muqsitnawaz`) so the URL stays the
|
|
63
|
+
* account's default name. Empty / missing email → `''` (caller falls
|
|
64
|
+
* back to userId). Must match the Worker `handleFromEmail`.
|
|
65
|
+
*/
|
|
66
|
+
export declare function handleFromEmail(email: string | undefined): string;
|
|
67
|
+
/** Managed URL namespace: email handle, else sanitized userId (never empty if either is set). */
|
|
68
|
+
export declare function managedShareHandle(session: Pick<PhoenixSession, 'email' | 'userId'>): string;
|
|
69
|
+
export declare function managedShareBaseUrl(): string;
|
|
70
|
+
/**
|
|
71
|
+
* True when this config is the platform managed endpoint (`share.agents-cli.sh`).
|
|
72
|
+
* The deploy path uses this — not "the caller is signed in" — to decide whether
|
|
73
|
+
* to bind `PHOENIX_ID_BASE` on the Worker.
|
|
74
|
+
*/
|
|
75
|
+
export declare function isManagedShareEndpoint(cfg: {
|
|
76
|
+
baseUrl?: string;
|
|
77
|
+
domain?: string;
|
|
78
|
+
}): boolean;
|
|
79
|
+
/**
|
|
80
|
+
* Phoenix ID URL to bind on a managed Worker deploy. `undefined` for a
|
|
81
|
+
* pure-BYO Worker (WRITE_TOKEN only). Fail loud if this is a managed deploy
|
|
82
|
+
* but the base is empty — never skip-set a blank secret.
|
|
83
|
+
*/
|
|
84
|
+
export declare function phoenixIdBaseForDeploy(opts?: {
|
|
85
|
+
managed?: boolean;
|
|
86
|
+
}, cfg?: {
|
|
87
|
+
baseUrl?: string;
|
|
88
|
+
domain?: string;
|
|
89
|
+
}): string | undefined;
|
|
90
|
+
/**
|
|
91
|
+
* Pick the principal. Signed-in (`readSession() != null`) AND no explicit BYO
|
|
92
|
+
* override → managed; otherwise BYO.
|
|
93
|
+
*/
|
|
94
|
+
export declare function shouldUseManaged(opts?: ResolveShareBackendOpts): boolean;
|
|
95
|
+
export declare function resolveShareBackend(opts?: ResolveShareBackendOpts): ShareBackend;
|
|
@@ -0,0 +1,139 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* ShareBackend — the token-source seam for `agents artifacts share`.
|
|
3
|
+
*
|
|
4
|
+
* Two legitimate principals, picked once at publish time:
|
|
5
|
+
* - **managed**: the caller is signed in to Phoenix (`readSession()`), no
|
|
6
|
+
* explicit BYO override. Token is the Phoenix access_token; endpoint is
|
|
7
|
+
* the already-live `share.agents-cli.sh`. Zero Cloudflare setup.
|
|
8
|
+
* - **byo**: the existing static WRITE_TOKEN path (`readShareConfig()` +
|
|
9
|
+
* `readWriteToken()`). Unchanged for power users / custom domains / fleet
|
|
10
|
+
* injection of `SHARE_WRITE_TOKEN`.
|
|
11
|
+
*
|
|
12
|
+
* Dispatch is not a fallback: signed-in AND no BYO override → managed;
|
|
13
|
+
* otherwise BYO. Fail loud when neither principal can authenticate.
|
|
14
|
+
*
|
|
15
|
+
* Explicit BYO override (any one is enough):
|
|
16
|
+
* - `opts.byo === true`
|
|
17
|
+
* - `opts.writeToken` (a caller-supplied static token, including tests)
|
|
18
|
+
* - `AGENTS_SHARE_BACKEND=byo`
|
|
19
|
+
*/
|
|
20
|
+
import { PHOENIX_ID_BASE, readSession } from '../identity/client.js';
|
|
21
|
+
import { DEFAULT_SHARE_DOMAIN, readShareConfig, readWriteToken, readWriteTokenEnv, } from './config.js';
|
|
22
|
+
/** Env var that forces the BYO path. Value must be exactly `byo`. */
|
|
23
|
+
export const SHARE_BACKEND_ENV = 'AGENTS_SHARE_BACKEND';
|
|
24
|
+
/** URL-safe namespace: lowercase `[a-z0-9-]+`. Matches the Worker's sanitize.
|
|
25
|
+
*
|
|
26
|
+
* This is URL-safety, not collision-resistance: two values that differ only
|
|
27
|
+
* in case or punctuation share a prefix. */
|
|
28
|
+
export function sanitizeShareNamespace(s) {
|
|
29
|
+
return s.toLowerCase().replace(/[^a-z0-9]+/g, '-').replace(/^-+|-+$/g, '');
|
|
30
|
+
}
|
|
31
|
+
/**
|
|
32
|
+
* Public managed-share handle from a verified email.
|
|
33
|
+
*
|
|
34
|
+
* `muqsitnawaz@gmail.com` → `muqsitnawaz`. Plus-tags are dropped
|
|
35
|
+
* (`muqsitnawaz+dev@gmail.com` → `muqsitnawaz`) so the URL stays the
|
|
36
|
+
* account's default name. Empty / missing email → `''` (caller falls
|
|
37
|
+
* back to userId). Must match the Worker `handleFromEmail`.
|
|
38
|
+
*/
|
|
39
|
+
export function handleFromEmail(email) {
|
|
40
|
+
if (!email)
|
|
41
|
+
return '';
|
|
42
|
+
const local = email.split('@')[0] ?? '';
|
|
43
|
+
const beforePlus = local.split('+')[0] ?? local;
|
|
44
|
+
return sanitizeShareNamespace(beforePlus);
|
|
45
|
+
}
|
|
46
|
+
/** Managed URL namespace: email handle, else sanitized userId (never empty if either is set). */
|
|
47
|
+
export function managedShareHandle(session) {
|
|
48
|
+
return handleFromEmail(session.email) || sanitizeShareNamespace(session.userId ?? '');
|
|
49
|
+
}
|
|
50
|
+
export function managedShareBaseUrl() {
|
|
51
|
+
return `https://${DEFAULT_SHARE_DOMAIN}`;
|
|
52
|
+
}
|
|
53
|
+
function shareEndpointHost(value) {
|
|
54
|
+
return value.replace(/^https?:\/\//i, '').replace(/\/+$/, '').toLowerCase();
|
|
55
|
+
}
|
|
56
|
+
/**
|
|
57
|
+
* True when this config is the platform managed endpoint (`share.agents-cli.sh`).
|
|
58
|
+
* The deploy path uses this — not "the caller is signed in" — to decide whether
|
|
59
|
+
* to bind `PHOENIX_ID_BASE` on the Worker.
|
|
60
|
+
*/
|
|
61
|
+
export function isManagedShareEndpoint(cfg) {
|
|
62
|
+
const managedHost = DEFAULT_SHARE_DOMAIN.toLowerCase();
|
|
63
|
+
if (cfg.domain && shareEndpointHost(cfg.domain) === managedHost)
|
|
64
|
+
return true;
|
|
65
|
+
if (cfg.baseUrl && shareEndpointHost(cfg.baseUrl) === managedHost)
|
|
66
|
+
return true;
|
|
67
|
+
return false;
|
|
68
|
+
}
|
|
69
|
+
/**
|
|
70
|
+
* Phoenix ID URL to bind on a managed Worker deploy. `undefined` for a
|
|
71
|
+
* pure-BYO Worker (WRITE_TOKEN only). Fail loud if this is a managed deploy
|
|
72
|
+
* but the base is empty — never skip-set a blank secret.
|
|
73
|
+
*/
|
|
74
|
+
export function phoenixIdBaseForDeploy(opts = {}, cfg) {
|
|
75
|
+
const managed = opts.managed === true || (cfg != null && isManagedShareEndpoint(cfg));
|
|
76
|
+
if (!managed)
|
|
77
|
+
return undefined;
|
|
78
|
+
const base = PHOENIX_ID_BASE.replace(/\/+$/, '').trim();
|
|
79
|
+
if (!base) {
|
|
80
|
+
throw new Error('Managed share deploy requires PHOENIX_ID_BASE so the Worker can verify Phoenix bearers. Set the PHOENIX_ID_BASE env var.');
|
|
81
|
+
}
|
|
82
|
+
return base;
|
|
83
|
+
}
|
|
84
|
+
/**
|
|
85
|
+
* Pick the principal. Signed-in (`readSession() != null`) AND no explicit BYO
|
|
86
|
+
* override → managed; otherwise BYO.
|
|
87
|
+
*/
|
|
88
|
+
export function shouldUseManaged(opts = {}) {
|
|
89
|
+
if (opts.byo === true)
|
|
90
|
+
return false;
|
|
91
|
+
if (opts.writeToken)
|
|
92
|
+
return false;
|
|
93
|
+
if ((process.env[SHARE_BACKEND_ENV] ?? '').trim().toLowerCase() === 'byo')
|
|
94
|
+
return false;
|
|
95
|
+
const session = opts.session === undefined ? readSession() : opts.session;
|
|
96
|
+
return session != null;
|
|
97
|
+
}
|
|
98
|
+
export function resolveShareBackend(opts = {}) {
|
|
99
|
+
if (shouldUseManaged(opts)) {
|
|
100
|
+
const session = opts.session === undefined ? readSession() : opts.session;
|
|
101
|
+
if (!session) {
|
|
102
|
+
throw new Error("Not signed in. Run 'agents auth login'.");
|
|
103
|
+
}
|
|
104
|
+
return resolveManagedBackend(session);
|
|
105
|
+
}
|
|
106
|
+
return resolveByoBackend(opts);
|
|
107
|
+
}
|
|
108
|
+
function resolveManagedBackend(session) {
|
|
109
|
+
if (!session.access_token) {
|
|
110
|
+
throw new Error("Not signed in. Run 'agents auth login'.");
|
|
111
|
+
}
|
|
112
|
+
const namespace = managedShareHandle(session);
|
|
113
|
+
if (!namespace) {
|
|
114
|
+
throw new Error("Signed in but the session has no email or user id. Run 'agents auth login' again.");
|
|
115
|
+
}
|
|
116
|
+
return {
|
|
117
|
+
kind: 'managed',
|
|
118
|
+
baseUrl: managedShareBaseUrl(),
|
|
119
|
+
token: session.access_token,
|
|
120
|
+
namespace,
|
|
121
|
+
};
|
|
122
|
+
}
|
|
123
|
+
function resolveByoBackend(opts) {
|
|
124
|
+
const cfg = opts.config ?? readShareConfig();
|
|
125
|
+
if (!cfg) {
|
|
126
|
+
throw new Error("Not set up yet. Run 'agents auth login' to publish on the managed endpoint (zero Cloudflare setup), or 'agents artifacts setup' / 'agents artifacts share join' for your own Cloudflare.");
|
|
127
|
+
}
|
|
128
|
+
const token = opts.writeToken ??
|
|
129
|
+
(opts.requireToken === false ? (readWriteTokenEnv() ?? '') : readWriteToken());
|
|
130
|
+
// Namespace is the GitHub username. An explicit --github-user is sanitized
|
|
131
|
+
// here; otherwise publish fills it via resolveShareUsername (gh/git config).
|
|
132
|
+
const namespace = opts.githubUser ? sanitizeShareNamespace(opts.githubUser) : '';
|
|
133
|
+
return {
|
|
134
|
+
kind: 'byo',
|
|
135
|
+
baseUrl: cfg.baseUrl.replace(/\/+$/, ''),
|
|
136
|
+
token,
|
|
137
|
+
namespace,
|
|
138
|
+
};
|
|
139
|
+
}
|
|
@@ -68,7 +68,7 @@ export interface DeleteShareOptions {
|
|
|
68
68
|
/** Skip deleting the target's retained revisions (`<key>/rev-*`, RUSH-2683
|
|
69
69
|
* revision retention) — default: delete them too. A republished-then-deleted
|
|
70
70
|
* share would otherwise leave its prior world-readable versions live for up
|
|
71
|
-
* to the bucket's lifecycle max-age (see docs/
|
|
71
|
+
* to the bucket's lifecycle max-age (see docs/distribution.md). */
|
|
72
72
|
keepRevisions?: boolean;
|
|
73
73
|
/** Treat an already-missing target as a no-op success instead of an error
|
|
74
74
|
* (mirrors SQL's `DROP ... IF EXISTS`). Default: missing target is an error. */
|
|
@@ -77,8 +77,12 @@ export interface DeleteShareOptions {
|
|
|
77
77
|
githubUser?: string;
|
|
78
78
|
/** DI seam for tests — override the persisted share endpoint config. */
|
|
79
79
|
config?: ShareConfig;
|
|
80
|
-
/** DI seam for tests — override the keychain-backed write token. */
|
|
80
|
+
/** DI seam for tests — override the keychain-backed write token. Selects BYO. */
|
|
81
81
|
writeToken?: string;
|
|
82
|
+
/** DI seam for tests — override `readSession()`. `null` means signed out. */
|
|
83
|
+
session?: import('../identity/client.js').PhoenixSession | null;
|
|
84
|
+
/** Force the BYO Cloudflare path even when signed in. */
|
|
85
|
+
byo?: boolean;
|
|
82
86
|
/** DI seam for tests — override the real HTTP DELETE. */
|
|
83
87
|
deleter?: DeleteFn;
|
|
84
88
|
/** DI seam for tests — override the real HTTP existence check. */
|
package/dist/lib/share/delete.js
CHANGED
|
@@ -7,7 +7,7 @@
|
|
|
7
7
|
// returns `{"ok":true}` — so `{"ok":true}` alone is never proof of a takedown.
|
|
8
8
|
// Every delete here is followed by a status check that must observe 404 before
|
|
9
9
|
// the operation is reported as successful.
|
|
10
|
-
import {
|
|
10
|
+
import { resolveShareBackend } from './backend.js';
|
|
11
11
|
import { buildShareKey, resolveShareUsername } from './publish.js';
|
|
12
12
|
/**
|
|
13
13
|
* Normalize any of the three accepted target forms to the R2 key that publish
|
|
@@ -103,7 +103,7 @@ export async function deleteObject(endpoint, key, opts = {}) {
|
|
|
103
103
|
const existedBefore = before.status !== 404;
|
|
104
104
|
const r = await del(url, { authorization: `Bearer ${endpoint.token}` });
|
|
105
105
|
if (!r.ok) {
|
|
106
|
-
throw new Error(`Delete failed (${r.status}) for ${url}. Check the
|
|
106
|
+
throw new Error(`Delete failed (${r.status}) for ${url}. Check the bearer (Phoenix session or WRITE_TOKEN), or that 'agents artifacts setup' completed.`);
|
|
107
107
|
}
|
|
108
108
|
const after = await check(url);
|
|
109
109
|
const verified404 = after.status === 404;
|
|
@@ -113,13 +113,12 @@ export async function deleteObject(endpoint, key, opts = {}) {
|
|
|
113
113
|
* are gone. Throws on an unverified takedown — never reports success for an
|
|
114
114
|
* object that still resolves. */
|
|
115
115
|
export async function deleteShare(target, opts = {}) {
|
|
116
|
-
const
|
|
117
|
-
|
|
118
|
-
|
|
119
|
-
|
|
120
|
-
const
|
|
121
|
-
const
|
|
122
|
-
const endpoint = { baseUrl: cfg.baseUrl, token };
|
|
116
|
+
const backend = resolveShareBackend(opts);
|
|
117
|
+
const githubUser = backend.kind === 'managed'
|
|
118
|
+
? backend.namespace
|
|
119
|
+
: opts.githubUser || backend.namespace || undefined;
|
|
120
|
+
const resolved = await resolveDeleteTarget(target, { githubUser });
|
|
121
|
+
const endpoint = { baseUrl: backend.baseUrl, token: backend.token };
|
|
123
122
|
const page = await deleteObject(endpoint, resolved.key, { deleter: opts.deleter, checker: opts.checker });
|
|
124
123
|
if (!page.existedBefore) {
|
|
125
124
|
if (opts.ifExists) {
|
|
@@ -0,0 +1,22 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* Make an HTML page self-contained enough to view on share.agents-cli.sh.
|
|
3
|
+
*
|
|
4
|
+
* Chrome "Save as" (and some renderers) leave `file:///…html#section` TOC
|
|
5
|
+
* links and sibling image paths. Those work on disk and 404 on the share
|
|
6
|
+
* Worker, which only stores the one PUT body. Rewrite same-document file
|
|
7
|
+
* anchors to `#section`, and inline local image files as data URIs.
|
|
8
|
+
*
|
|
9
|
+
* https citations, data: URIs already in the page, and missing files are
|
|
10
|
+
* left alone. This is not a bundler — it only fixes what would otherwise
|
|
11
|
+
* render as a broken page after a single-file publish.
|
|
12
|
+
*/
|
|
13
|
+
/** Skip inlining a sibling that would bloat the page past a reasonable PUT. */
|
|
14
|
+
export declare const MAX_INLINE_BYTES: number;
|
|
15
|
+
/**
|
|
16
|
+
* `href="file:///tmp/page.html#purpose"` → `href="#purpose"`.
|
|
17
|
+
* Bare `file:///tmp/page.html` (no hash) becomes `href="#"`.
|
|
18
|
+
*/
|
|
19
|
+
export declare function rewriteFileAnchors(html: string): string;
|
|
20
|
+
/** Replace local image src/href with a data URI when the file exists next to the page. */
|
|
21
|
+
export declare function inlineLocalAssets(html: string, htmlPath: string): string;
|
|
22
|
+
export declare function prepareShareHtml(html: string, htmlPath: string): string;
|
|
@@ -0,0 +1,88 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* Make an HTML page self-contained enough to view on share.agents-cli.sh.
|
|
3
|
+
*
|
|
4
|
+
* Chrome "Save as" (and some renderers) leave `file:///…html#section` TOC
|
|
5
|
+
* links and sibling image paths. Those work on disk and 404 on the share
|
|
6
|
+
* Worker, which only stores the one PUT body. Rewrite same-document file
|
|
7
|
+
* anchors to `#section`, and inline local image files as data URIs.
|
|
8
|
+
*
|
|
9
|
+
* https citations, data: URIs already in the page, and missing files are
|
|
10
|
+
* left alone. This is not a bundler — it only fixes what would otherwise
|
|
11
|
+
* render as a broken page after a single-file publish.
|
|
12
|
+
*/
|
|
13
|
+
import { existsSync, readFileSync } from 'node:fs';
|
|
14
|
+
import { dirname, extname, resolve } from 'node:path';
|
|
15
|
+
import { fileURLToPath } from 'node:url';
|
|
16
|
+
/** Skip inlining a sibling that would bloat the page past a reasonable PUT. */
|
|
17
|
+
export const MAX_INLINE_BYTES = 4 * 1024 * 1024;
|
|
18
|
+
const IMAGE_MIME = {
|
|
19
|
+
'.png': 'image/png',
|
|
20
|
+
'.jpg': 'image/jpeg',
|
|
21
|
+
'.jpeg': 'image/jpeg',
|
|
22
|
+
'.gif': 'image/gif',
|
|
23
|
+
'.webp': 'image/webp',
|
|
24
|
+
'.svg': 'image/svg+xml',
|
|
25
|
+
'.ico': 'image/x-icon',
|
|
26
|
+
'.avif': 'image/avif',
|
|
27
|
+
};
|
|
28
|
+
/**
|
|
29
|
+
* `href="file:///tmp/page.html#purpose"` → `href="#purpose"`.
|
|
30
|
+
* Bare `file:///tmp/page.html` (no hash) becomes `href="#"`.
|
|
31
|
+
*/
|
|
32
|
+
export function rewriteFileAnchors(html) {
|
|
33
|
+
return html.replace(/\b(href\s*=\s*["'])file:\/\/[^"'#]*(#[^"']*)?(["'])/gi, (_m, attr, hash, quote) => `${attr}${hash ?? '#'}${quote}`);
|
|
34
|
+
}
|
|
35
|
+
function isRemoteOrSpecial(url) {
|
|
36
|
+
return (url.startsWith('data:') ||
|
|
37
|
+
url.startsWith('http://') ||
|
|
38
|
+
url.startsWith('https://') ||
|
|
39
|
+
url.startsWith('//') ||
|
|
40
|
+
url.startsWith('#') ||
|
|
41
|
+
url.startsWith('mailto:') ||
|
|
42
|
+
url.startsWith('javascript:') ||
|
|
43
|
+
url.startsWith('agents:'));
|
|
44
|
+
}
|
|
45
|
+
function localImagePath(url, htmlDir) {
|
|
46
|
+
if (!url || isRemoteOrSpecial(url))
|
|
47
|
+
return null;
|
|
48
|
+
const withoutHash = url.split('#')[0] ?? url;
|
|
49
|
+
let fsPath;
|
|
50
|
+
if (withoutHash.startsWith('file:')) {
|
|
51
|
+
try {
|
|
52
|
+
fsPath = fileURLToPath(withoutHash);
|
|
53
|
+
}
|
|
54
|
+
catch {
|
|
55
|
+
return null;
|
|
56
|
+
}
|
|
57
|
+
}
|
|
58
|
+
else {
|
|
59
|
+
fsPath = resolve(htmlDir, withoutHash);
|
|
60
|
+
}
|
|
61
|
+
if (!existsSync(fsPath))
|
|
62
|
+
return null;
|
|
63
|
+
const mime = IMAGE_MIME[extname(fsPath).toLowerCase()];
|
|
64
|
+
if (!mime)
|
|
65
|
+
return null;
|
|
66
|
+
return { path: fsPath, mime };
|
|
67
|
+
}
|
|
68
|
+
/** Replace local image src/href with a data URI when the file exists next to the page. */
|
|
69
|
+
export function inlineLocalAssets(html, htmlPath) {
|
|
70
|
+
const dir = dirname(htmlPath);
|
|
71
|
+
return html.replace(/\b((?:src|href)\s*=\s*["'])([^"']+)(["'])/gi, (full, pre, url, post) => {
|
|
72
|
+
const local = localImagePath(url, dir);
|
|
73
|
+
if (!local)
|
|
74
|
+
return full;
|
|
75
|
+
try {
|
|
76
|
+
const buf = readFileSync(local.path);
|
|
77
|
+
if (buf.length > MAX_INLINE_BYTES)
|
|
78
|
+
return full;
|
|
79
|
+
return `${pre}data:${local.mime};base64,${buf.toString('base64')}${post}`;
|
|
80
|
+
}
|
|
81
|
+
catch {
|
|
82
|
+
return full;
|
|
83
|
+
}
|
|
84
|
+
});
|
|
85
|
+
}
|
|
86
|
+
export function prepareShareHtml(html, htmlPath) {
|
|
87
|
+
return inlineLocalAssets(rewriteFileAnchors(html), htmlPath);
|
|
88
|
+
}
|
|
@@ -61,6 +61,18 @@ export interface UpdateWorkerResult {
|
|
|
61
61
|
/** True when the upload was skipped because `previousHash` already matched. */
|
|
62
62
|
skipped: boolean;
|
|
63
63
|
}
|
|
64
|
+
/** Cloudflare `secret_text` name the Worker reads as `env.PHOENIX_ID_BASE`. */
|
|
65
|
+
export declare const WORKER_PHOENIX_ID_BASE_SECRET = "PHOENIX_ID_BASE";
|
|
66
|
+
export type UpdateWorkerOpts = ProvisionOptions & {
|
|
67
|
+
force?: boolean;
|
|
68
|
+
/**
|
|
69
|
+
* Phoenix ID base URL to bind as `PHOENIX_ID_BASE` after the script upload.
|
|
70
|
+
* Pass this for a managed deployment; omit it for a pure-BYO Worker (which
|
|
71
|
+
* authenticates only via WRITE_TOKEN). An empty string is a caller bug and
|
|
72
|
+
* fails loud — do not pass a blank to "skip".
|
|
73
|
+
*/
|
|
74
|
+
phoenixIdBase?: string;
|
|
75
|
+
};
|
|
64
76
|
/**
|
|
65
77
|
* Re-deploy the Worker script against an ALREADY-provisioned endpoint (same
|
|
66
78
|
* account/worker/bucket `deployWorker` was first called with) and idempotently
|
|
@@ -78,7 +90,9 @@ export interface UpdateWorkerResult {
|
|
|
78
90
|
* API right after the upload — the same two-call sequence first-time
|
|
79
91
|
* provisioning already uses (`deployWorker` then `setWorkerSecret`), except
|
|
80
92
|
* `writeToken` here is the caller's EXISTING token, never a freshly generated
|
|
81
|
-
* one.
|
|
93
|
+
* one. A managed deploy also re-applies `PHOENIX_ID_BASE` the same way (the
|
|
94
|
+
* Worker reads it to verify Phoenix bearers); a pure-BYO deploy omits it.
|
|
95
|
+
* Cloudflare's own docs describe exactly this "secrets survive a
|
|
82
96
|
* subsequent write" contract for the sibling `wrangler versions upload
|
|
83
97
|
* --secrets-file` flow ("Secrets not included in the file are preserved from
|
|
84
98
|
* the previous version" —
|
|
@@ -86,9 +100,9 @@ export interface UpdateWorkerResult {
|
|
|
86
100
|
* re-setting the secret to its own value after every deploy gets the same
|
|
87
101
|
* outcome without depending on an unverified upload-time flag.
|
|
88
102
|
*/
|
|
89
|
-
export declare function updateWorker(apiToken: string, accountId: string, workerName: string, bucketName: string, script: string, writeToken: string, previousHash: string | undefined, opts?:
|
|
90
|
-
|
|
91
|
-
|
|
103
|
+
export declare function updateWorker(apiToken: string, accountId: string, workerName: string, bucketName: string, script: string, writeToken: string, previousHash: string | undefined, opts?: UpdateWorkerOpts): Promise<UpdateWorkerResult>;
|
|
104
|
+
/** Add/update a secret_text binding using Cloudflare's Workers Secrets API. */
|
|
105
|
+
export declare function putWorkerSecret(apiToken: string, accountId: string, workerName: string, name: string, text: string, opts?: ProvisionOptions): Promise<void>;
|
|
92
106
|
/** Add/update the WRITE_TOKEN binding using Cloudflare's Workers Secrets API. */
|
|
93
107
|
export declare function setWorkerSecret(apiToken: string, accountId: string, workerName: string, writeToken: string, opts?: ProvisionOptions): Promise<void>;
|
|
94
108
|
/** Enable the free `*.workers.dev` route for the script, and return the account subdomain. */
|
|
@@ -101,6 +101,8 @@ export async function deployWorker(apiToken, accountId, workerName, script, buck
|
|
|
101
101
|
export function hashWorkerScript(script) {
|
|
102
102
|
return createHash('sha256').update(script, 'utf8').digest('hex');
|
|
103
103
|
}
|
|
104
|
+
/** Cloudflare `secret_text` name the Worker reads as `env.PHOENIX_ID_BASE`. */
|
|
105
|
+
export const WORKER_PHOENIX_ID_BASE_SECRET = 'PHOENIX_ID_BASE';
|
|
104
106
|
/**
|
|
105
107
|
* Re-deploy the Worker script against an ALREADY-provisioned endpoint (same
|
|
106
108
|
* account/worker/bucket `deployWorker` was first called with) and idempotently
|
|
@@ -118,7 +120,9 @@ export function hashWorkerScript(script) {
|
|
|
118
120
|
* API right after the upload — the same two-call sequence first-time
|
|
119
121
|
* provisioning already uses (`deployWorker` then `setWorkerSecret`), except
|
|
120
122
|
* `writeToken` here is the caller's EXISTING token, never a freshly generated
|
|
121
|
-
* one.
|
|
123
|
+
* one. A managed deploy also re-applies `PHOENIX_ID_BASE` the same way (the
|
|
124
|
+
* Worker reads it to verify Phoenix bearers); a pure-BYO deploy omits it.
|
|
125
|
+
* Cloudflare's own docs describe exactly this "secrets survive a
|
|
122
126
|
* subsequent write" contract for the sibling `wrangler versions upload
|
|
123
127
|
* --secrets-file` flow ("Secrets not included in the file are preserved from
|
|
124
128
|
* the previous version" —
|
|
@@ -129,6 +133,13 @@ export function hashWorkerScript(script) {
|
|
|
129
133
|
export async function updateWorker(apiToken, accountId, workerName, bucketName, script, writeToken, previousHash, opts = {}) {
|
|
130
134
|
const templateHash = hashWorkerScript(script);
|
|
131
135
|
if (!opts.force && previousHash === templateHash) {
|
|
136
|
+
// Script is current so we skip the upload (which would wipe secrets). A
|
|
137
|
+
// managed Worker still needs PHOENIX_ID_BASE present — a prior upload from
|
|
138
|
+
// a CLI that never set it left the secret missing, and this is the heal
|
|
139
|
+
// that does not require --force or a dummy template bump.
|
|
140
|
+
if (opts.phoenixIdBase !== undefined) {
|
|
141
|
+
await applyPhoenixIdBaseSecret(apiToken, accountId, workerName, opts.phoenixIdBase, opts);
|
|
142
|
+
}
|
|
132
143
|
return { templateHash, skipped: true };
|
|
133
144
|
}
|
|
134
145
|
await deployWorker(apiToken, accountId, workerName, script, bucketName, opts);
|
|
@@ -143,18 +154,41 @@ export async function updateWorker(apiToken, accountId, workerName, bucketName,
|
|
|
143
154
|
const detail = e instanceof Error ? e.message : String(e);
|
|
144
155
|
throw new Error(`Worker deployed but the write token failed to re-apply — re-run \`agents artifacts share update\` to fix this before publishing/deleting anything. (${detail})`);
|
|
145
156
|
}
|
|
157
|
+
if (opts.phoenixIdBase !== undefined) {
|
|
158
|
+
try {
|
|
159
|
+
await applyPhoenixIdBaseSecret(apiToken, accountId, workerName, opts.phoenixIdBase, opts);
|
|
160
|
+
}
|
|
161
|
+
catch (e) {
|
|
162
|
+
const detail = e instanceof Error ? e.message : String(e);
|
|
163
|
+
throw new Error(`Worker deployed but PHOENIX_ID_BASE failed to re-apply — Phoenix-bearer publishes will 401 until you re-run \`agents artifacts share update\`. (${detail})`);
|
|
164
|
+
}
|
|
165
|
+
}
|
|
146
166
|
return { templateHash, skipped: false };
|
|
147
167
|
}
|
|
148
|
-
/** Add/update
|
|
149
|
-
export async function
|
|
168
|
+
/** Add/update a secret_text binding using Cloudflare's Workers Secrets API. */
|
|
169
|
+
export async function putWorkerSecret(apiToken, accountId, workerName, name, text, opts = {}) {
|
|
150
170
|
const request = opts.request ?? defaultCloudflareRequester;
|
|
151
171
|
await request({
|
|
152
172
|
apiToken,
|
|
153
173
|
method: 'PUT',
|
|
154
174
|
pathname: `/accounts/${accountId}/workers/scripts/${workerName}/secrets`,
|
|
155
|
-
body: { name
|
|
175
|
+
body: { name, text, type: 'secret_text' },
|
|
156
176
|
});
|
|
157
177
|
}
|
|
178
|
+
/** Add/update the WRITE_TOKEN binding using Cloudflare's Workers Secrets API. */
|
|
179
|
+
export async function setWorkerSecret(apiToken, accountId, workerName, writeToken, opts = {}) {
|
|
180
|
+
await putWorkerSecret(apiToken, accountId, workerName, 'WRITE_TOKEN', writeToken, opts);
|
|
181
|
+
}
|
|
182
|
+
function normalizePhoenixIdBase(phoenixIdBase) {
|
|
183
|
+
const base = phoenixIdBase.replace(/\/+$/, '').trim();
|
|
184
|
+
if (!base) {
|
|
185
|
+
throw new Error('Managed share deploy requires a non-empty PHOENIX_ID_BASE so the Worker can verify Phoenix bearers. Set the PHOENIX_ID_BASE env var.');
|
|
186
|
+
}
|
|
187
|
+
return base;
|
|
188
|
+
}
|
|
189
|
+
async function applyPhoenixIdBaseSecret(apiToken, accountId, workerName, phoenixIdBase, opts = {}) {
|
|
190
|
+
await putWorkerSecret(apiToken, accountId, workerName, WORKER_PHOENIX_ID_BASE_SECRET, normalizePhoenixIdBase(phoenixIdBase), opts);
|
|
191
|
+
}
|
|
158
192
|
/** Enable the free `*.workers.dev` route for the script, and return the account subdomain. */
|
|
159
193
|
export async function enableWorkersDev(apiToken, accountId, workerName, opts = {}) {
|
|
160
194
|
const request = opts.request ?? defaultCloudflareRequester;
|