@viewportai/daemon 0.5.0 → 0.5.2
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/dist/cli/context-sync-target.d.ts +22 -0
- package/dist/cli/context-sync-target.d.ts.map +1 -1
- package/dist/cli/context-sync-target.js +103 -18
- package/dist/cli/context-sync-target.js.map +1 -1
- package/dist/cli/context-vault-metadata-command.d.ts.map +1 -1
- package/dist/cli/context-vault-metadata-command.js +15 -19
- package/dist/cli/context-vault-metadata-command.js.map +1 -1
- package/dist/cli/contract-authorization.d.ts.map +1 -1
- package/dist/cli/contract-authorization.js +17 -19
- package/dist/cli/contract-authorization.js.map +1 -1
- package/dist/cli/hook-command.d.ts.map +1 -1
- package/dist/cli/hook-command.js +23 -1
- package/dist/cli/hook-command.js.map +1 -1
- package/dist/cli/install-command.d.ts.map +1 -1
- package/dist/cli/install-command.js +31 -6
- package/dist/cli/install-command.js.map +1 -1
- package/dist/cli/lifecycle-pair-command.js +2 -21
- package/dist/cli/lifecycle-pair-command.js.map +1 -1
- package/dist/cli/lifecycle-pair-server.d.ts.map +1 -1
- package/dist/cli/lifecycle-pair-server.js +4 -0
- package/dist/cli/lifecycle-pair-server.js.map +1 -1
- package/dist/cli/open-url.d.ts +2 -0
- package/dist/cli/open-url.d.ts.map +1 -0
- package/dist/cli/open-url.js +21 -0
- package/dist/cli/open-url.js.map +1 -0
- package/dist/cli/skills-command.d.ts.map +1 -1
- package/dist/cli/skills-command.js +27 -0
- package/dist/cli/skills-command.js.map +1 -1
- package/dist/context/local-edge-sync.d.ts.map +1 -1
- package/dist/context/local-edge-sync.js +1 -0
- package/dist/context/local-edge-sync.js.map +1 -1
- package/dist/core/daemon.d.ts +5 -0
- package/dist/core/daemon.d.ts.map +1 -1
- package/dist/core/daemon.js +11 -0
- package/dist/core/daemon.js.map +1 -1
- package/dist/hooks/ephemeral-plan-drafts.d.ts +34 -0
- package/dist/hooks/ephemeral-plan-drafts.d.ts.map +1 -0
- package/dist/hooks/ephemeral-plan-drafts.js +62 -0
- package/dist/hooks/ephemeral-plan-drafts.js.map +1 -0
- package/dist/hooks/installers/base.d.ts +2 -2
- package/dist/hooks/installers/base.d.ts.map +1 -1
- package/dist/hooks/installers/claude.d.ts.map +1 -1
- package/dist/hooks/installers/claude.js +35 -16
- package/dist/hooks/installers/claude.js.map +1 -1
- package/dist/hooks/plan-extractor.d.ts.map +1 -1
- package/dist/hooks/plan-extractor.js +6 -1
- package/dist/hooks/plan-extractor.js.map +1 -1
- package/dist/hooks/platform-plan-sync.d.ts +7 -8
- package/dist/hooks/platform-plan-sync.d.ts.map +1 -1
- package/dist/hooks/platform-plan-sync.js +63 -45
- package/dist/hooks/platform-plan-sync.js.map +1 -1
- package/dist/hooks/router.d.ts.map +1 -1
- package/dist/hooks/router.js +14 -0
- package/dist/hooks/router.js.map +1 -1
- package/dist/hooks/specific-events.d.ts.map +1 -1
- package/dist/hooks/specific-events.js +78 -2
- package/dist/hooks/specific-events.js.map +1 -1
- package/dist/server/http-context-routes.d.ts.map +1 -1
- package/dist/server/http-context-routes.js +12 -18
- package/dist/server/http-context-routes.js.map +1 -1
- package/dist/server/rate-limiter.d.ts.map +1 -1
- package/dist/server/rate-limiter.js +1 -0
- package/dist/server/rate-limiter.js.map +1 -1
- package/dist/server/ws-command-handlers.d.ts.map +1 -1
- package/dist/server/ws-command-handlers.js +27 -0
- package/dist/server/ws-command-handlers.js.map +1 -1
- package/dist/server/ws-protocol.d.ts +9 -0
- package/dist/server/ws-protocol.d.ts.map +1 -1
- package/dist/server/ws-protocol.js +6 -0
- package/dist/server/ws-protocol.js.map +1 -1
- package/dist/startup.js +1 -1
- package/dist/startup.js.map +1 -1
- package/dist/workflows/platform-sync.d.ts.map +1 -1
- package/dist/workflows/platform-sync.js +12 -12
- package/dist/workflows/platform-sync.js.map +1 -1
- package/docs/protocol-matrix.json +10 -0
- package/docs/{relay-noise-conformance-vectors.json → test-vectors/relay-noise-v2.json} +1 -0
- package/docs/{relay-noise-v3-conformance-vectors.json → test-vectors/relay-noise-v3.json} +1 -0
- package/package.json +1 -1
|
@@ -1,3 +1,4 @@
|
|
|
1
|
+
import { type ViewportConfig } from '../core/config.js';
|
|
1
2
|
export interface ContextSyncTarget {
|
|
2
3
|
contextResourceId: string;
|
|
3
4
|
workspaceId: string;
|
|
@@ -8,5 +9,26 @@ export interface ContextSyncTarget {
|
|
|
8
9
|
tlsPins?: string[];
|
|
9
10
|
decisionSigningKeys?: Record<string, string>;
|
|
10
11
|
}
|
|
12
|
+
export interface WorkspaceSyncTarget {
|
|
13
|
+
workspaceId: string;
|
|
14
|
+
serverUrl: string;
|
|
15
|
+
credential: string;
|
|
16
|
+
runtimeTargetId?: string;
|
|
17
|
+
tlsVerify?: 'auto' | '0' | '1';
|
|
18
|
+
caCertPath?: string;
|
|
19
|
+
tlsPins?: string[];
|
|
20
|
+
}
|
|
11
21
|
export declare function resolveContextSyncTarget(commandName: 'sync-push' | 'sync-pull'): Promise<ContextSyncTarget>;
|
|
22
|
+
export declare function resolveConfiguredContextSyncTarget(daemon: NonNullable<ViewportConfig['daemon']>, options: {
|
|
23
|
+
contextResourceId: string;
|
|
24
|
+
requestedWorkspaceId?: string;
|
|
25
|
+
explicitServerUrl?: string;
|
|
26
|
+
explicitCredential?: string;
|
|
27
|
+
decisionSigningKeys?: Record<string, string>;
|
|
28
|
+
}): ContextSyncTarget | null;
|
|
29
|
+
export declare function resolveConfiguredWorkspaceSyncTarget(daemon: NonNullable<ViewportConfig['daemon']>, options?: {
|
|
30
|
+
requestedWorkspaceId?: string;
|
|
31
|
+
explicitServerUrl?: string;
|
|
32
|
+
explicitCredential?: string;
|
|
33
|
+
}): WorkspaceSyncTarget | null;
|
|
12
34
|
//# sourceMappingURL=context-sync-target.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"context-sync-target.d.ts","sourceRoot":"","sources":["../../src/cli/context-sync-target.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"context-sync-target.d.ts","sourceRoot":"","sources":["../../src/cli/context-sync-target.ts"],"names":[],"mappings":"AACA,OAAO,EAAiB,KAAK,cAAc,EAAE,MAAM,mBAAmB,CAAC;AAGvE,MAAM,WAAW,iBAAiB;IAChC,iBAAiB,EAAE,MAAM,CAAC;IAC1B,WAAW,EAAE,MAAM,CAAC;IACpB,SAAS,EAAE,MAAM,CAAC;IAClB,UAAU,EAAE,MAAM,CAAC;IACnB,SAAS,CAAC,EAAE,MAAM,GAAG,GAAG,GAAG,GAAG,CAAC;IAC/B,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,OAAO,CAAC,EAAE,MAAM,EAAE,CAAC;IACnB,mBAAmB,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;CAC9C;AAED,MAAM,WAAW,mBAAmB;IAClC,WAAW,EAAE,MAAM,CAAC;IACpB,SAAS,EAAE,MAAM,CAAC;IAClB,UAAU,EAAE,MAAM,CAAC;IACnB,eAAe,CAAC,EAAE,MAAM,CAAC;IACzB,SAAS,CAAC,EAAE,MAAM,GAAG,GAAG,GAAG,GAAG,CAAC;IAC/B,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,OAAO,CAAC,EAAE,MAAM,EAAE,CAAC;CACpB;AAED,wBAAsB,wBAAwB,CAC5C,WAAW,EAAE,WAAW,GAAG,WAAW,GACrC,OAAO,CAAC,iBAAiB,CAAC,CAoD5B;AAED,wBAAgB,kCAAkC,CAChD,MAAM,EAAE,WAAW,CAAC,cAAc,CAAC,QAAQ,CAAC,CAAC,EAC7C,OAAO,EAAE;IACP,iBAAiB,EAAE,MAAM,CAAC;IAC1B,oBAAoB,CAAC,EAAE,MAAM,CAAC;IAC9B,iBAAiB,CAAC,EAAE,MAAM,CAAC;IAC3B,kBAAkB,CAAC,EAAE,MAAM,CAAC;IAC5B,mBAAmB,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;CAC9C,GACA,iBAAiB,GAAG,IAAI,CAS1B;AAED,wBAAgB,oCAAoC,CAClD,MAAM,EAAE,WAAW,CAAC,cAAc,CAAC,QAAQ,CAAC,CAAC,EAC7C,OAAO,GAAE;IACP,oBAAoB,CAAC,EAAE,MAAM,CAAC;IAC9B,iBAAiB,CAAC,EAAE,MAAM,CAAC;IAC3B,kBAAkB,CAAC,EAAE,MAAM,CAAC;CACxB,GACL,mBAAmB,GAAG,IAAI,CAkC5B"}
|
|
@@ -1,40 +1,125 @@
|
|
|
1
1
|
import { getFlag } from './args.js';
|
|
2
2
|
import { ConfigManager } from '../core/config.js';
|
|
3
|
+
import { resolveLocalOrgBindingSync } from './org-binding.js';
|
|
3
4
|
export async function resolveContextSyncTarget(commandName) {
|
|
4
5
|
const manager = new ConfigManager();
|
|
5
6
|
await manager.load();
|
|
6
7
|
const daemon = manager.getDaemonConfig() ?? {};
|
|
7
8
|
const relay = daemon.relay ?? {};
|
|
8
9
|
const contextResourceId = getFlag('context') ?? getFlag('project');
|
|
9
|
-
const
|
|
10
|
-
const
|
|
11
|
-
const
|
|
10
|
+
const explicitWorkspaceId = getFlag('workspace');
|
|
11
|
+
const explicitServerUrl = getFlag('server-url');
|
|
12
|
+
const explicitCredential = getFlag('credential');
|
|
12
13
|
const decisionSigningKeys = parseDecisionSigningKeys(getFlag('context-decision-key') ??
|
|
13
14
|
getFlag('decision-key') ??
|
|
14
15
|
envValue('VIEWPORT_CONTEXT_DECISION_KEY')) ?? daemon.server?.contextCandidateDecisionKeys;
|
|
15
16
|
if (!contextResourceId) {
|
|
16
17
|
throw new Error(`vpd context ${commandName} requires --context <resource-id>; saved remote workspace ids are not context ids`);
|
|
17
18
|
}
|
|
18
|
-
if (
|
|
19
|
-
|
|
19
|
+
if (explicitWorkspaceId && explicitServerUrl && explicitCredential) {
|
|
20
|
+
return {
|
|
21
|
+
contextResourceId,
|
|
22
|
+
workspaceId: explicitWorkspaceId,
|
|
23
|
+
serverUrl: explicitServerUrl,
|
|
24
|
+
credential: explicitCredential,
|
|
25
|
+
tlsVerify: daemon.server?.tlsVerify ?? relay.tlsVerify,
|
|
26
|
+
caCertPath: daemon.server?.caCertPath ?? relay.caCertPath,
|
|
27
|
+
tlsPins: daemon.server?.tlsPins ?? relay.tlsPins,
|
|
28
|
+
decisionSigningKeys,
|
|
29
|
+
};
|
|
20
30
|
}
|
|
21
|
-
|
|
22
|
-
throw new Error(`vpd context ${commandName} requires --workspace <id> or a saved remote workspace from vpd remote login`);
|
|
23
|
-
}
|
|
24
|
-
if (!credential) {
|
|
25
|
-
throw new Error(`vpd context ${commandName} requires --credential or a saved relay issue token from vpd remote login`);
|
|
26
|
-
}
|
|
27
|
-
return {
|
|
31
|
+
const target = resolveConfiguredContextSyncTarget(daemon, {
|
|
28
32
|
contextResourceId,
|
|
29
|
-
|
|
30
|
-
|
|
31
|
-
|
|
32
|
-
tlsVerify: daemon.server?.tlsVerify ?? relay.tlsVerify,
|
|
33
|
-
caCertPath: daemon.server?.caCertPath ?? relay.caCertPath,
|
|
34
|
-
tlsPins: daemon.server?.tlsPins ?? relay.tlsPins,
|
|
33
|
+
requestedWorkspaceId: explicitWorkspaceId ?? resolveLocalOrgBindingSync(process.cwd())?.organizationId,
|
|
34
|
+
explicitServerUrl,
|
|
35
|
+
explicitCredential,
|
|
35
36
|
decisionSigningKeys,
|
|
37
|
+
});
|
|
38
|
+
if (!target) {
|
|
39
|
+
throw new Error(`vpd context ${commandName} requires an unambiguous remote workspace. Pass --workspace <id>, run from a bound repo, or keep exactly one saved remote workspace binding.`);
|
|
40
|
+
}
|
|
41
|
+
return target;
|
|
42
|
+
}
|
|
43
|
+
export function resolveConfiguredContextSyncTarget(daemon, options) {
|
|
44
|
+
const target = resolveConfiguredWorkspaceSyncTarget(daemon, options);
|
|
45
|
+
if (!target)
|
|
46
|
+
return null;
|
|
47
|
+
return {
|
|
48
|
+
...target,
|
|
49
|
+
contextResourceId: options.contextResourceId,
|
|
50
|
+
decisionSigningKeys: options.decisionSigningKeys,
|
|
36
51
|
};
|
|
37
52
|
}
|
|
53
|
+
export function resolveConfiguredWorkspaceSyncTarget(daemon, options = {}) {
|
|
54
|
+
const relay = daemon.relay ?? {};
|
|
55
|
+
if (options.requestedWorkspaceId && options.explicitServerUrl && options.explicitCredential) {
|
|
56
|
+
return {
|
|
57
|
+
workspaceId: options.requestedWorkspaceId,
|
|
58
|
+
serverUrl: options.explicitServerUrl,
|
|
59
|
+
credential: options.explicitCredential,
|
|
60
|
+
tlsVerify: daemon.server?.tlsVerify ?? relay.tlsVerify,
|
|
61
|
+
caCertPath: daemon.server?.caCertPath ?? relay.caCertPath,
|
|
62
|
+
tlsPins: daemon.server?.tlsPins ?? relay.tlsPins,
|
|
63
|
+
};
|
|
64
|
+
}
|
|
65
|
+
const targets = configuredWorkspaceTargets(daemon)
|
|
66
|
+
.map((target) => ({
|
|
67
|
+
...target,
|
|
68
|
+
serverUrl: options.explicitServerUrl ?? target.serverUrl,
|
|
69
|
+
credential: options.explicitCredential ?? target.credential,
|
|
70
|
+
}))
|
|
71
|
+
.filter((target) => target.workspaceId && target.serverUrl && target.credential);
|
|
72
|
+
if (options.requestedWorkspaceId) {
|
|
73
|
+
const match = targets.find((target) => target.workspaceId === options.requestedWorkspaceId);
|
|
74
|
+
return match ?? null;
|
|
75
|
+
}
|
|
76
|
+
const unique = new Map();
|
|
77
|
+
for (const target of targets) {
|
|
78
|
+
unique.set(target.workspaceId, target);
|
|
79
|
+
}
|
|
80
|
+
if (unique.size !== 1)
|
|
81
|
+
return null;
|
|
82
|
+
const [target] = unique.values();
|
|
83
|
+
return target ?? null;
|
|
84
|
+
}
|
|
85
|
+
function configuredWorkspaceTargets(daemon) {
|
|
86
|
+
const relay = daemon.relay ?? {};
|
|
87
|
+
const bindings = relay.bindings ?? [];
|
|
88
|
+
const candidates = [
|
|
89
|
+
...bindings.filter((binding) => binding.enabled !== false),
|
|
90
|
+
...(relay.workspaceId || relay.serverUrl || relay.issueToken
|
|
91
|
+
? [
|
|
92
|
+
{
|
|
93
|
+
enabled: relay.enabled,
|
|
94
|
+
workspaceId: relay.workspaceId,
|
|
95
|
+
serverUrl: relay.serverUrl,
|
|
96
|
+
issueToken: relay.issueToken,
|
|
97
|
+
tlsVerify: relay.tlsVerify,
|
|
98
|
+
caCertPath: relay.caCertPath,
|
|
99
|
+
tlsPins: relay.tlsPins,
|
|
100
|
+
},
|
|
101
|
+
]
|
|
102
|
+
: []),
|
|
103
|
+
];
|
|
104
|
+
return candidates.flatMap((binding) => {
|
|
105
|
+
const workspaceId = binding.workspaceId;
|
|
106
|
+
const serverUrl = binding.serverUrl ?? relay.serverUrl ?? daemon.server?.url;
|
|
107
|
+
const credential = binding.issueToken;
|
|
108
|
+
if (!workspaceId || !serverUrl || !credential)
|
|
109
|
+
return [];
|
|
110
|
+
return [
|
|
111
|
+
{
|
|
112
|
+
workspaceId,
|
|
113
|
+
serverUrl,
|
|
114
|
+
credential,
|
|
115
|
+
runtimeTargetId: binding.runtimeTargetId,
|
|
116
|
+
tlsVerify: daemon.server?.tlsVerify ?? binding.tlsVerify ?? relay.tlsVerify,
|
|
117
|
+
caCertPath: daemon.server?.caCertPath ?? binding.caCertPath ?? relay.caCertPath,
|
|
118
|
+
tlsPins: daemon.server?.tlsPins ?? binding.tlsPins ?? relay.tlsPins,
|
|
119
|
+
},
|
|
120
|
+
];
|
|
121
|
+
});
|
|
122
|
+
}
|
|
38
123
|
function parseDecisionSigningKeys(raw) {
|
|
39
124
|
if (!raw)
|
|
40
125
|
return undefined;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"context-sync-target.js","sourceRoot":"","sources":["../../src/cli/context-sync-target.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AACpC,OAAO,EAAE,aAAa,
|
|
1
|
+
{"version":3,"file":"context-sync-target.js","sourceRoot":"","sources":["../../src/cli/context-sync-target.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"context-vault-metadata-command.d.ts","sourceRoot":"","sources":["../../src/cli/context-vault-metadata-command.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"context-vault-metadata-command.d.ts","sourceRoot":"","sources":["../../src/cli/context-vault-metadata-command.ts"],"names":[],"mappings":"AA6DA,wBAAsB,iBAAiB,IAAI,OAAO,CAAC,IAAI,CAAC,CAuBvD;AAED,wBAAsB,kBAAkB,IAAI,OAAO,CAAC,IAAI,CAAC,CAuCxD"}
|
|
@@ -1,6 +1,8 @@
|
|
|
1
1
|
import { getFlag } from './args.js';
|
|
2
2
|
import { isJsonMode, printJson } from './command-shared.js';
|
|
3
3
|
import { transportFetch } from './network.js';
|
|
4
|
+
import { resolveConfiguredWorkspaceSyncTarget } from './context-sync-target.js';
|
|
5
|
+
import { resolveLocalOrgBindingSync } from './org-binding.js';
|
|
4
6
|
import { ConfigManager } from '../core/config.js';
|
|
5
7
|
import { initContextResource } from '../context/local-edge-store.js';
|
|
6
8
|
import { resolveContextKeyStore } from '../context/local-edge-key-store.js';
|
|
@@ -108,27 +110,21 @@ async function resolveRuntimeContextVaultTarget(commandName) {
|
|
|
108
110
|
const manager = new ConfigManager();
|
|
109
111
|
await manager.load();
|
|
110
112
|
const daemon = manager.getDaemonConfig() ?? {};
|
|
111
|
-
const
|
|
112
|
-
|
|
113
|
-
|
|
114
|
-
|
|
115
|
-
|
|
116
|
-
if (!
|
|
117
|
-
throw new Error(`vpd context ${commandName} requires --
|
|
118
|
-
}
|
|
119
|
-
if (!workspaceId) {
|
|
120
|
-
throw new Error(`vpd context ${commandName} requires --workspace <id> or a saved remote workspace from vpd remote login`);
|
|
121
|
-
}
|
|
122
|
-
if (!credential) {
|
|
123
|
-
throw new Error(`vpd context ${commandName} requires --credential or a saved relay issue token from vpd remote login`);
|
|
113
|
+
const target = resolveConfiguredWorkspaceSyncTarget(daemon, {
|
|
114
|
+
requestedWorkspaceId: getFlag('workspace') ?? resolveLocalOrgBindingSync(process.cwd())?.organizationId,
|
|
115
|
+
explicitServerUrl: getFlag('server-url'),
|
|
116
|
+
explicitCredential: getFlag('credential'),
|
|
117
|
+
});
|
|
118
|
+
if (!target) {
|
|
119
|
+
throw new Error(`vpd context ${commandName} requires an unambiguous remote workspace. Pass --workspace <id>, run from a bound repo, or keep exactly one saved remote workspace binding.`);
|
|
124
120
|
}
|
|
125
121
|
return {
|
|
126
|
-
serverUrl,
|
|
127
|
-
workspaceId,
|
|
128
|
-
credential,
|
|
129
|
-
tlsVerify:
|
|
130
|
-
caCertPath:
|
|
131
|
-
tlsPins:
|
|
122
|
+
serverUrl: target.serverUrl,
|
|
123
|
+
workspaceId: target.workspaceId,
|
|
124
|
+
credential: target.credential,
|
|
125
|
+
tlsVerify: target.tlsVerify,
|
|
126
|
+
caCertPath: target.caCertPath,
|
|
127
|
+
tlsPins: target.tlsPins,
|
|
132
128
|
};
|
|
133
129
|
}
|
|
134
130
|
async function requestRuntimeContextVaults(target) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"context-vault-metadata-command.js","sourceRoot":"","sources":["../../src/cli/context-vault-metadata-command.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"context-vault-metadata-command.js","sourceRoot":"","sources":["../../src/cli/context-vault-metadata-command.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"contract-authorization.d.ts","sourceRoot":"","sources":["../../src/cli/contract-authorization.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"contract-authorization.d.ts","sourceRoot":"","sources":["../../src/cli/contract-authorization.ts"],"names":[],"mappings":"AAKA,OAAO,KAAK,EAAE,uBAAuB,EAAE,MAAM,+BAA+B,CAAC;AAE7E,MAAM,WAAW,mBAAmB;IAClC,SAAS,EAAE,MAAM,CAAC;IAClB,WAAW,EAAE,MAAM,CAAC;IACpB,UAAU,EAAE,MAAM,CAAC;IACnB,SAAS,CAAC,EAAE,MAAM,GAAG,GAAG,GAAG,GAAG,CAAC;IAC/B,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,OAAO,CAAC,EAAE,MAAM,EAAE,CAAC;CACpB;AAED,MAAM,WAAW,mBAAmB;IAClC,MAAM,EAAE,MAAM,CAAC;IACf,eAAe,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IAChC,SAAS,CAAC,EAAE,KAAK,CAAC,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC,CAAC;IAC3C,SAAS,CAAC,EAAE,KAAK,CAAC,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC,CAAC;IAC3C,OAAO,CAAC,EAAE;QACR,OAAO,CAAC,EAAE,MAAM,CAAC;QACjB,MAAM,CAAC,EAAE,MAAM,CAAC;QAChB,KAAK,CAAC,EAAE,MAAM,CAAC;QACf,SAAS,CAAC,EAAE,MAAM,CAAC;KACpB,CAAC;CACH;AAED,wBAAsB,0BAA0B,IAAI,OAAO,CAAC,mBAAmB,CAAC,CA2B/E;AAED,wBAAsB,oBAAoB,CACxC,MAAM,EAAE,mBAAmB,EAC3B,QAAQ,EAAE,uBAAuB,GAChC,OAAO,CAAC,mBAAmB,CAAC,CAqC9B;AAED,wBAAgB,kBAAkB,CAChC,QAAQ,EAAE,uBAAuB,EACjC,aAAa,EAAE,mBAAmB,EAClC,WAAW,EAAE,MAAM,GAClB,IAAI,CAyBN"}
|
|
@@ -1,31 +1,29 @@
|
|
|
1
1
|
import { getFlag } from './args.js';
|
|
2
2
|
import { transportFetch } from './network.js';
|
|
3
|
+
import { resolveConfiguredWorkspaceSyncTarget } from './context-sync-target.js';
|
|
4
|
+
import { resolveLocalOrgBindingSync } from './org-binding.js';
|
|
3
5
|
import { ConfigManager } from '../core/config.js';
|
|
4
6
|
export async function resolveAuthorizationTarget() {
|
|
5
7
|
const manager = new ConfigManager();
|
|
6
8
|
await manager.load();
|
|
7
9
|
const daemon = manager.getDaemonConfig() ?? {};
|
|
8
|
-
const
|
|
9
|
-
|
|
10
|
-
|
|
11
|
-
|
|
12
|
-
|
|
13
|
-
|
|
14
|
-
|
|
15
|
-
|
|
16
|
-
|
|
17
|
-
throw new Error('vpd contract authorize requires --workspace <id> or a saved remote workspace from vpd remote login');
|
|
18
|
-
}
|
|
19
|
-
if (!credential) {
|
|
20
|
-
throw new Error('vpd contract authorize requires --credential or a saved relay issue token from vpd remote login');
|
|
10
|
+
const target = resolveConfiguredWorkspaceSyncTarget(daemon, {
|
|
11
|
+
requestedWorkspaceId: getFlag('workspace') ??
|
|
12
|
+
getFlag('resource') ??
|
|
13
|
+
resolveLocalOrgBindingSync(process.cwd())?.organizationId,
|
|
14
|
+
explicitServerUrl: getFlag('server-url'),
|
|
15
|
+
explicitCredential: getFlag('credential'),
|
|
16
|
+
});
|
|
17
|
+
if (!target) {
|
|
18
|
+
throw new Error('vpd contract authorize requires an unambiguous remote workspace. Pass --workspace <id>, run from a bound repo, or keep exactly one saved remote workspace binding.');
|
|
21
19
|
}
|
|
22
20
|
return {
|
|
23
|
-
serverUrl,
|
|
24
|
-
workspaceId,
|
|
25
|
-
credential,
|
|
26
|
-
tlsVerify:
|
|
27
|
-
caCertPath:
|
|
28
|
-
tlsPins:
|
|
21
|
+
serverUrl: target.serverUrl,
|
|
22
|
+
workspaceId: target.workspaceId,
|
|
23
|
+
credential: target.credential,
|
|
24
|
+
tlsVerify: target.tlsVerify,
|
|
25
|
+
caCertPath: target.caCertPath,
|
|
26
|
+
tlsPins: target.tlsPins,
|
|
29
27
|
};
|
|
30
28
|
}
|
|
31
29
|
export async function requestAuthorization(target, manifest) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"contract-authorization.js","sourceRoot":"","sources":["../../src/cli/contract-authorization.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AACpC,OAAO,EAAE,cAAc,EAAE,MAAM,cAAc,CAAC;AAC9C,OAAO,EAAE,aAAa,EAAE,MAAM,mBAAmB,CAAC;AAyBlD,MAAM,CAAC,KAAK,UAAU,0BAA0B;IAC9C,MAAM,OAAO,GAAG,IAAI,aAAa,EAAE,CAAC;IACpC,MAAM,OAAO,CAAC,IAAI,EAAE,CAAC;IACrB,MAAM,MAAM,GAAG,OAAO,CAAC,eAAe,EAAE,IAAI,EAAE,CAAC;IAC/C,MAAM,
|
|
1
|
+
{"version":3,"file":"contract-authorization.js","sourceRoot":"","sources":["../../src/cli/contract-authorization.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"hook-command.d.ts","sourceRoot":"","sources":["../../src/cli/hook-command.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;GAWG;AAYH,wBAAgB,YAAY,IAAI,IAAI,CAUnC;AAED,wBAAsB,UAAU,CAAC,WAAW,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CA+EpE;
|
|
1
|
+
{"version":3,"file":"hook-command.d.ts","sourceRoot":"","sources":["../../src/cli/hook-command.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;GAWG;AAYH,wBAAgB,YAAY,IAAI,IAAI,CAUnC;AAED,wBAAsB,UAAU,CAAC,WAAW,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CA+EpE;AA6BD,wBAAsB,gBAAgB,IAAI,OAAO,CAAC,IAAI,CAAC,CAYtD"}
|
package/dist/cli/hook-command.js
CHANGED
|
@@ -73,7 +73,7 @@ export async function hookNotify(forcedEvent) {
|
|
|
73
73
|
}
|
|
74
74
|
// Return the decision (PermissionRequest) or acknowledgment
|
|
75
75
|
if (result.decision) {
|
|
76
|
-
process.stdout.write(JSON.stringify(
|
|
76
|
+
process.stdout.write(JSON.stringify(formatHookDecision(event, result.decision)) + '\n');
|
|
77
77
|
}
|
|
78
78
|
else if (result.hookSpecificOutput) {
|
|
79
79
|
process.stdout.write(JSON.stringify({
|
|
@@ -88,6 +88,28 @@ export async function hookNotify(forcedEvent) {
|
|
|
88
88
|
process.exit(1);
|
|
89
89
|
}
|
|
90
90
|
}
|
|
91
|
+
function formatHookDecision(event, decision) {
|
|
92
|
+
if (!isDecisionObject(decision)) {
|
|
93
|
+
return { decision };
|
|
94
|
+
}
|
|
95
|
+
if (event !== 'PermissionRequest') {
|
|
96
|
+
return { decision };
|
|
97
|
+
}
|
|
98
|
+
const behavior = decision.behavior === 'deny' ? 'deny' : 'allow';
|
|
99
|
+
const outputDecision = { behavior };
|
|
100
|
+
if (behavior === 'deny' && typeof decision.message === 'string' && decision.message.trim()) {
|
|
101
|
+
outputDecision.message = decision.message.trim();
|
|
102
|
+
}
|
|
103
|
+
return {
|
|
104
|
+
hookSpecificOutput: {
|
|
105
|
+
hookEventName: 'PermissionRequest',
|
|
106
|
+
decision: outputDecision,
|
|
107
|
+
},
|
|
108
|
+
};
|
|
109
|
+
}
|
|
110
|
+
function isDecisionObject(value) {
|
|
111
|
+
return typeof value === 'object' && value !== null && !Array.isArray(value);
|
|
112
|
+
}
|
|
91
113
|
export async function hookCapabilities() {
|
|
92
114
|
const adapter = getFlag('adapter');
|
|
93
115
|
const profiles = adapter ? [getHookAdapterCapabilities(adapter)] : listHookAdapterCapabilities();
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"hook-command.js","sourceRoot":"","sources":["../../src/cli/hook-command.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;GAWG;AAEH,OAAO,EAAE,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AAC7C,OAAO,EAAE,WAAW,EAAE,MAAM,oBAAoB,CAAC;AACjD,OAAO,EACL,0BAA0B,EAC1B,2BAA2B,GAE5B,MAAM,0BAA0B,CAAC;AAElC,MAAM,eAAe,GAAG,OAAO,CAAC,CAAC,uDAAuD;AAExF,MAAM,UAAU,YAAY;IAC1B,OAAO,CAAC,MAAM,CAAC,KAAK,CAClB;QACE,8DAA8D;QAC9D,4CAA4C;QAC5C,0CAA0C;QAC1C,0DAA0D;QAC1D,EAAE;KACH,CAAC,IAAI,CAAC,IAAI,CAAC,CACb,CAAC;AACJ,CAAC;AAED,MAAM,CAAC,KAAK,UAAU,UAAU,CAAC,WAAoB;IACnD,MAAM,KAAK,GAAG,WAAW,IAAI,OAAO,CAAC,OAAO,CAAC,CAAC;IAC9C,IAAI,CAAC,KAAK,EAAE,CAAC;QACX,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC,8CAA8C,CAAC,CAAC;QACrE,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;IAClB,CAAC;IACD,MAAM,KAAK,GAAG,MAAM,SAAS,EAAE,CAAC;IAEhC,IAAI,CAAC,KAAK,EAAE,CAAC;QACX,+CAA+C;QAC/C,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC,+BAA+B,CAAC,CAAC;QACtD,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;IAClB,CAAC;IAED,IAAI,IAA6B,CAAC;IAClC,IAAI,CAAC;QACH,IAAI,GAAG,IAAI,CAAC,KAAK,CAAC,KAAK,CAA4B,CAAC;IACtD,CAAC;IAAC,MAAM,CAAC;QACP,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC,mCAAmC,CAAC,CAAC;QAC1D,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;QAChB,OAAO,CAAC,2BAA2B;IACrC,CAAC;IAED,gCAAgC;IAChC,IAAI,CAAC,IAAI,CAAC,eAAe,EAAE,CAAC;QAC1B,IAAI,CAAC,eAAe,GAAG,KAAK,CAAC;IAC/B,CAAC;IAED,IAAI,CAAC;QACH,0CAA0C;QAC1C,IAAI,KAAK,KAAK,mBAAmB,EAAE,CAAC;YAClC,MAAM,QAAQ,GAAI,IAAI,CAAC,SAAoB,IAAI,cAAc,CAAC;YAC9D,OAAO,CAAC,MAAM,CAAC,KAAK,CAClB,kDAAkD,QAAQ,YAAY;gBACpE,qEAAqE,CACxE,CAAC;QACJ,CAAC;QAED,MAAM,GAAG,GAAG,MAAM,WAAW,CAAC,WAAW,EAAE;YACzC,MAAM,EAAE,MAAM;YACd,OAAO,EAAE,EAAE,cAAc,EAAE,kBAAkB,EAAE;YAC/C,IAAI,EAAE,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC;YAC1B,SAAS,EAAE,eAAe;SAC3B,CAAC,CAAC;QACH,IAAI,CAAC,GAAG,IAAI,CAAC,GAAG,CAAC,EAAE,EAAE,CAAC;YACpB,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;YAChB,OAAO;QACT,CAAC;QAED,MAAM,MAAM,GAAG,CAAC,MAAM,GAAG,CAAC,IAAI,EAAE,CAK/B,CAAC;QAEF,IAAI,MAAM,CAAC,WAAW,EAAE,CAAC;YACvB,sEAAsE;YACtE,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;YAChB,OAAO;QACT,CAAC;QAED,4DAA4D;QAC5D,IAAI,MAAM,CAAC,QAAQ,EAAE,CAAC;YACpB,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC,IAAI,CAAC,SAAS,CAAC,
|
|
1
|
+
{"version":3,"file":"hook-command.js","sourceRoot":"","sources":["../../src/cli/hook-command.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"install-command.d.ts","sourceRoot":"","sources":["../../src/cli/install-command.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"install-command.d.ts","sourceRoot":"","sources":["../../src/cli/install-command.ts"],"names":[],"mappings":"AA0DA,wBAAsB,OAAO,IAAI,OAAO,CAAC,IAAI,CAAC,CAgF7C"}
|
|
@@ -1,11 +1,13 @@
|
|
|
1
1
|
import path from 'node:path';
|
|
2
2
|
import fs from 'node:fs/promises';
|
|
3
3
|
import { AgentRegistry } from '../core/agent-registry.js';
|
|
4
|
-
import { configDir } from '../core/config.js';
|
|
5
|
-
import { getDaemonPort } from './args.js';
|
|
4
|
+
import { ConfigManager, configDir } from '../core/config.js';
|
|
5
|
+
import { getDaemonPort, getFlag } from './args.js';
|
|
6
6
|
import { BUILT_IN_AGENTS } from '../agents/built-in.js';
|
|
7
|
-
import { ClaudeHookInstaller,
|
|
7
|
+
import { ClaudeHookInstaller, HOOK_EVENT_KINDS } from '../hooks/index.js';
|
|
8
8
|
import { isJsonMode, printJson, shortError } from './command-shared.js';
|
|
9
|
+
import { readDaemonRuntimeState } from './daemon-lifecycle.js';
|
|
10
|
+
import { parseListenTarget } from './listen-target.js';
|
|
9
11
|
/** Hook installers for each supported agent. */
|
|
10
12
|
const HOOK_INSTALLERS = [new ClaudeHookInstaller()];
|
|
11
13
|
/**
|
|
@@ -21,6 +23,28 @@ function resolveVpdPath() {
|
|
|
21
23
|
}
|
|
22
24
|
return arg1;
|
|
23
25
|
}
|
|
26
|
+
async function resolveHookDaemonListen() {
|
|
27
|
+
const explicitListen = getFlag('listen');
|
|
28
|
+
if (explicitListen) {
|
|
29
|
+
return parseListenTarget(explicitListen).listen;
|
|
30
|
+
}
|
|
31
|
+
const explicitPort = getFlag('port');
|
|
32
|
+
if (explicitPort) {
|
|
33
|
+
const host = getFlag('host') ?? '127.0.0.1';
|
|
34
|
+
return parseListenTarget(`${host}:${explicitPort}`).listen;
|
|
35
|
+
}
|
|
36
|
+
const runtimeState = await readDaemonRuntimeState();
|
|
37
|
+
if (runtimeState?.listen) {
|
|
38
|
+
return runtimeState.listen;
|
|
39
|
+
}
|
|
40
|
+
const manager = new ConfigManager();
|
|
41
|
+
await manager.load();
|
|
42
|
+
const configuredListen = manager.getDaemonConfig()?.listen;
|
|
43
|
+
if (configuredListen) {
|
|
44
|
+
return parseListenTarget(configuredListen).listen;
|
|
45
|
+
}
|
|
46
|
+
return parseListenTarget(`${getFlag('host') ?? '127.0.0.1'}:${getDaemonPort()}`).listen;
|
|
47
|
+
}
|
|
24
48
|
export async function install() {
|
|
25
49
|
const asJson = isJsonMode();
|
|
26
50
|
const registry = new AgentRegistry();
|
|
@@ -29,14 +53,14 @@ export async function install() {
|
|
|
29
53
|
}
|
|
30
54
|
const availability = await registry.detectAvailable();
|
|
31
55
|
const vpdPath = resolveVpdPath();
|
|
32
|
-
const
|
|
56
|
+
const daemonListen = await resolveHookDaemonListen();
|
|
33
57
|
const hookResults = [];
|
|
34
58
|
for (const installer of HOOK_INSTALLERS) {
|
|
35
59
|
try {
|
|
36
60
|
const changed = await installer.install({
|
|
37
61
|
vpdBinaryPath: vpdPath,
|
|
38
|
-
|
|
39
|
-
events: [...
|
|
62
|
+
daemonListen,
|
|
63
|
+
events: [...HOOK_EVENT_KINDS],
|
|
40
64
|
});
|
|
41
65
|
hookResults.push({
|
|
42
66
|
adapter: installer.adapterName,
|
|
@@ -64,6 +88,7 @@ export async function install() {
|
|
|
64
88
|
detection: def.detection.description,
|
|
65
89
|
})),
|
|
66
90
|
hooks: hookResults,
|
|
91
|
+
daemonListen,
|
|
67
92
|
});
|
|
68
93
|
return;
|
|
69
94
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"install-command.js","sourceRoot":"","sources":["../../src/cli/install-command.ts"],"names":[],"mappings":"AAAA,OAAO,IAAI,MAAM,WAAW,CAAC;AAC7B,OAAO,EAAE,MAAM,kBAAkB,CAAC;AAClC,OAAO,EAAE,aAAa,EAAE,MAAM,2BAA2B,CAAC;AAC1D,OAAO,EAAE,SAAS,EAAE,MAAM,mBAAmB,CAAC;
|
|
1
|
+
{"version":3,"file":"install-command.js","sourceRoot":"","sources":["../../src/cli/install-command.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,4 +1,3 @@
|
|
|
1
|
-
import { spawn } from 'node:child_process';
|
|
2
1
|
import { resolveDaemonRuntimeIdentity, toInstallCapabilities } from '../core/runtime-identity.js';
|
|
3
2
|
import { resolveDisplayVersion } from '../core/package-meta.js';
|
|
4
3
|
import { loadOrCreateIdentity as loadOrCreateRelayIdentity } from '../relay/bridge-key-exchange.js';
|
|
@@ -6,6 +5,7 @@ import { getOrCreateTrustAnchor, rotateAuthToken } from '../server/pairing-offer
|
|
|
6
5
|
import { getArgs } from './args.js';
|
|
7
6
|
import { isJsonMode, printJson, waitForDaemonReady } from './command-shared.js';
|
|
8
7
|
import { transportFetch } from './network.js';
|
|
8
|
+
import { openUrl } from './open-url.js';
|
|
9
9
|
import { resolveDefaultPairingName } from './pairing-name-resolver.js';
|
|
10
10
|
import { joinPairingUrl, pollForApproval, resolvePairingServerTransport, storePairingCredentials, } from './lifecycle-pair-server.js';
|
|
11
11
|
export async function runPairCommand(options) {
|
|
@@ -54,25 +54,6 @@ export async function runPairCommand(options) {
|
|
|
54
54
|
await pairWithoutCode(undefined, asJson, options.restartDaemon);
|
|
55
55
|
}
|
|
56
56
|
}
|
|
57
|
-
function openPairingUrl(url) {
|
|
58
|
-
const platform = process.platform;
|
|
59
|
-
if (platform === 'darwin') {
|
|
60
|
-
const child = spawn('open', [url], { detached: true, stdio: 'ignore' });
|
|
61
|
-
child.unref();
|
|
62
|
-
return;
|
|
63
|
-
}
|
|
64
|
-
if (platform === 'win32') {
|
|
65
|
-
const child = spawn('cmd', ['/c', 'start', '', url], {
|
|
66
|
-
detached: true,
|
|
67
|
-
stdio: 'ignore',
|
|
68
|
-
windowsVerbatimArguments: true,
|
|
69
|
-
});
|
|
70
|
-
child.unref();
|
|
71
|
-
return;
|
|
72
|
-
}
|
|
73
|
-
const child = spawn('xdg-open', [url], { detached: true, stdio: 'ignore' });
|
|
74
|
-
child.unref();
|
|
75
|
-
}
|
|
76
57
|
async function autoRestartDaemon(silent, restartDaemon) {
|
|
77
58
|
if (!silent) {
|
|
78
59
|
console.log('Restarting daemon...');
|
|
@@ -246,7 +227,7 @@ async function pairWithoutCode(explicitServerUrl, asJson, restartDaemon) {
|
|
|
246
227
|
console.log('');
|
|
247
228
|
}
|
|
248
229
|
try {
|
|
249
|
-
|
|
230
|
+
openUrl(pairUrl);
|
|
250
231
|
}
|
|
251
232
|
catch {
|
|
252
233
|
// Opening the browser is best effort.
|