@reclaimprotocol/agent 0.1.18 → 0.1.20

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.
Files changed (158) hide show
  1. package/README.md +6 -2
  2. package/lib/authoring/backend.d.ts +4 -0
  3. package/lib/authoring/tools.js +4 -1
  4. package/lib/cdp/capture.d.ts +2 -2
  5. package/lib/cdp/capture.js +25 -21
  6. package/lib/cdp/client.d.ts +39 -1
  7. package/lib/cdp/client.js +125 -1
  8. package/lib/mcp/api/operations.gen.js +33 -9
  9. package/lib/mcp/instructions.js +27 -3
  10. package/lib/mcp/start.js +12 -8
  11. package/lib/mcp/tools/agent/attach.d.ts +18 -4
  12. package/lib/mcp/tools/agent/attach.js +142 -52
  13. package/lib/mcp/tools/agent/build.d.ts +1 -1
  14. package/lib/mcp/tools/agent/build.js +5 -3
  15. package/lib/mcp/tools/agent/capture.d.ts +1 -0
  16. package/lib/mcp/tools/agent/capture.js +8 -1
  17. package/lib/mcp/tools/agent/eval.js +2 -3
  18. package/lib/mcp/tools/agent/how-it-works.d.ts +1 -1
  19. package/lib/mcp/tools/agent/how-it-works.js +1 -1
  20. package/lib/mcp/tools/agent/publish.js +22 -1
  21. package/lib/mcp/tools/agent/session.d.ts +2 -2
  22. package/lib/mcp/tools/agent/session.js +21 -5
  23. package/lib/mcp/tools/agent/shared.js +4 -6
  24. package/lib/mcp/tools/authenticate/authenticate.d.ts +1 -1
  25. package/lib/mcp/tools/authenticate/authenticate.js +10 -4
  26. package/lib/mcp/tools/authenticate/builder-access.d.ts +8 -0
  27. package/lib/mcp/tools/authenticate/builder-access.js +31 -0
  28. package/lib/mcp/tools/authenticate/index.d.ts +1 -0
  29. package/lib/mcp/tools/authenticate/index.js +1 -0
  30. package/lib/old/login-cdp.js +11 -3
  31. package/lib/old/tools/publish.js +23 -1
  32. package/lib/provider/draft.d.ts +20 -0
  33. package/lib/provider/draft.js +75 -51
  34. package/lib/provider/index.d.ts +1 -1
  35. package/lib/provider/index.js +1 -1
  36. package/lib/provider/secrets.d.ts +37 -0
  37. package/lib/provider/secrets.js +147 -6
  38. package/lib/provider/to-version.d.ts +7 -0
  39. package/lib/provider/to-version.js +11 -1
  40. package/package.json +2 -2
  41. package/skill/SKILL.builder.md +43 -95
  42. package/skill/SKILL.common.md +102 -0
  43. package/skill/SKILL.old.md +20 -74
  44. package/skill/builder-mode.md +2 -2
  45. package/skill/injection-api.md +95 -10
  46. package/skill/old-mode.md +2 -2
  47. package/src/authoring/backend.ts +4 -0
  48. package/src/authoring/tools.ts +4 -1
  49. package/src/cdp/capture.ts +24 -24
  50. package/src/cdp/client.ts +197 -2
  51. package/src/mcp/api/operations.gen.ts +33 -9
  52. package/src/mcp/instructions.ts +36 -3
  53. package/src/mcp/start.ts +13 -8
  54. package/src/mcp/tools/agent/attach.ts +198 -57
  55. package/src/mcp/tools/agent/build.ts +9 -2
  56. package/src/mcp/tools/agent/capture.ts +10 -1
  57. package/src/mcp/tools/agent/eval.ts +2 -3
  58. package/src/mcp/tools/agent/how-it-works.ts +1 -1
  59. package/src/mcp/tools/agent/publish.ts +22 -1
  60. package/src/mcp/tools/agent/session.ts +29 -8
  61. package/src/mcp/tools/agent/shared.ts +5 -10
  62. package/src/mcp/tools/authenticate/authenticate.ts +14 -4
  63. package/src/mcp/tools/authenticate/builder-access.ts +42 -0
  64. package/src/mcp/tools/authenticate/index.ts +4 -0
  65. package/src/old/login-cdp.ts +13 -3
  66. package/src/old/tools/publish.ts +25 -3
  67. package/src/provider/draft.ts +98 -56
  68. package/src/provider/index.ts +9 -1
  69. package/src/provider/secrets.ts +171 -6
  70. package/src/provider/to-version.ts +12 -1
  71. package/lib/authoring/find.d.ts +0 -3
  72. package/lib/authoring/find.js +0 -54
  73. package/lib/authoring/propose.d.ts +0 -3
  74. package/lib/authoring/propose.js +0 -109
  75. package/lib/authoring/replay.d.ts +0 -10
  76. package/lib/authoring/replay.js +0 -34
  77. package/lib/cli/args.d.ts +0 -14
  78. package/lib/cli/args.js +0 -19
  79. package/lib/cli/commands.d.ts +0 -1
  80. package/lib/cli/commands.js +0 -19
  81. package/lib/cli.d.ts +0 -1
  82. package/lib/cli.js +0 -7
  83. package/lib/mcp/credentials/authenticate.d.ts +0 -3
  84. package/lib/mcp/credentials/authenticate.js +0 -108
  85. package/lib/mcp/credentials/build.d.ts +0 -5
  86. package/lib/mcp/credentials/build.js +0 -18
  87. package/lib/mcp/credentials/cache.d.ts +0 -70
  88. package/lib/mcp/credentials/cache.js +0 -131
  89. package/lib/mcp/credentials/env-file.d.ts +0 -25
  90. package/lib/mcp/credentials/env-file.js +0 -71
  91. package/lib/mcp/credentials/import.d.ts +0 -2
  92. package/lib/mcp/credentials/import.js +0 -52
  93. package/lib/mcp/credentials/issue.d.ts +0 -2
  94. package/lib/mcp/credentials/issue.js +0 -84
  95. package/lib/mcp/credentials/keypair.d.ts +0 -17
  96. package/lib/mcp/credentials/keypair.js +0 -48
  97. package/lib/mcp/credentials/link.d.ts +0 -3
  98. package/lib/mcp/credentials/link.js +0 -107
  99. package/lib/mcp/credentials/list-cached.d.ts +0 -2
  100. package/lib/mcp/credentials/list-cached.js +0 -55
  101. package/lib/mcp/credentials/owner-key.d.ts +0 -23
  102. package/lib/mcp/credentials/owner-key.js +0 -58
  103. package/lib/mcp/credentials/paths.d.ts +0 -12
  104. package/lib/mcp/credentials/paths.js +0 -35
  105. package/lib/mcp/credentials/poll.d.ts +0 -27
  106. package/lib/mcp/credentials/poll.js +0 -61
  107. package/lib/mcp/credentials/register.d.ts +0 -18
  108. package/lib/mcp/credentials/register.js +0 -30
  109. package/lib/mcp/credentials/resolve-owner-key.d.ts +0 -12
  110. package/lib/mcp/credentials/resolve-owner-key.js +0 -68
  111. package/lib/mcp/credentials/session-cache.d.ts +0 -14
  112. package/lib/mcp/credentials/session-cache.js +0 -42
  113. package/lib/mcp/credentials/status.d.ts +0 -3
  114. package/lib/mcp/credentials/status.js +0 -76
  115. package/lib/mcp/register.d.ts +0 -38
  116. package/lib/mcp/register.js +0 -80
  117. package/lib/mcp/tools/analyze.d.ts +0 -3
  118. package/lib/mcp/tools/analyze.js +0 -26
  119. package/lib/mcp/tools/attach.d.ts +0 -11
  120. package/lib/mcp/tools/attach.js +0 -72
  121. package/lib/mcp/tools/capture.d.ts +0 -10
  122. package/lib/mcp/tools/capture.js +0 -142
  123. package/lib/mcp/tools/eval.d.ts +0 -5
  124. package/lib/mcp/tools/eval.js +0 -127
  125. package/lib/mcp/tools/find.d.ts +0 -3
  126. package/lib/mcp/tools/find.js +0 -60
  127. package/lib/mcp/tools/owner-key.d.ts +0 -2
  128. package/lib/mcp/tools/owner-key.js +0 -63
  129. package/lib/mcp/tools/proof.d.ts +0 -3
  130. package/lib/mcp/tools/proof.js +0 -214
  131. package/lib/mcp/tools/propose.d.ts +0 -9
  132. package/lib/mcp/tools/propose.js +0 -75
  133. package/lib/mcp/tools/publish.d.ts +0 -3
  134. package/lib/mcp/tools/publish.js +0 -59
  135. package/lib/mcp/tools/replay.d.ts +0 -3
  136. package/lib/mcp/tools/replay.js +0 -46
  137. package/lib/mcp/tools/session.d.ts +0 -10
  138. package/lib/mcp/tools/session.js +0 -29
  139. package/lib/mcp/tools/verification/diagnose.d.ts +0 -11
  140. package/lib/mcp/tools/verification/diagnose.js +0 -132
  141. package/lib/mcp/verifications/build.d.ts +0 -5
  142. package/lib/mcp/verifications/build.js +0 -14
  143. package/lib/mcp/verifications/create.d.ts +0 -3
  144. package/lib/mcp/verifications/create.js +0 -57
  145. package/lib/mcp/verifications/find.d.ts +0 -3
  146. package/lib/mcp/verifications/find.js +0 -37
  147. package/lib/mcp/verifications/get.d.ts +0 -3
  148. package/lib/mcp/verifications/get.js +0 -26
  149. package/lib/mcp/verifications/update.d.ts +0 -3
  150. package/lib/mcp/verifications/update.js +0 -78
  151. package/lib/old/tools/get-version-config.d.ts +0 -17
  152. package/lib/old/tools/get-version-config.js +0 -47
  153. package/lib/routes.gen.d.ts +0 -271
  154. package/lib/routes.gen.js +0 -73
  155. package/lib/types/openapi.d.ts +0 -4
  156. package/lib/types/openapi.gen.d.ts +0 -3967
  157. package/lib/types/openapi.gen.js +0 -5
  158. package/lib/types/openapi.js +0 -1
@@ -1,4 +1,11 @@
1
- import { type CdpHandles, connectCdp } from '../../../cdp/client.ts'
1
+ import { badRequest } from '@hapi/boom'
2
+ import type { ReclaimClient } from '@reclaimprotocol/client'
3
+ import assert from 'node:assert'
4
+ import {
5
+ type CdpHandles,
6
+ connectCdp,
7
+ connectCdpUrl,
8
+ } from '../../../cdp/client.ts'
2
9
  import {
3
10
  defaultProfileDir,
4
11
  launchChrome,
@@ -8,88 +15,222 @@ import type { ConfigStore } from '../../../config/store.ts'
8
15
  import { defaultConfigPath } from '../../../config/store.ts'
9
16
  import { defineTool, type RegisteredTool } from '../../server.ts'
10
17
 
18
+ export type BrowserMode = 'dedicated' | 'attach' | 'builder' | 'custom'
19
+
11
20
  export interface AttachState {
12
21
  handles: CdpHandles
13
- port: number
22
+ mode: BrowserMode
23
+ port?: number
24
+ liveViewUrl?: string
25
+ browserSessionId?: string
26
+ orgId?: string
27
+ disposeRemote?: () => Promise<void>
14
28
  }
15
29
 
16
- export function attachTool(state: {
30
+ export interface AttachRef {
17
31
  current?: AttachState
18
32
  config: ConfigStore
19
- }): RegisteredTool {
20
- return defineTool<{ attachMode?: 'dedicated' | 'attach', port?: number }>(
33
+ }
34
+
35
+ interface AttachArgs {
36
+ mode?: BrowserMode
37
+ /** Backward-compatible local-mode spelling. */
38
+ attachMode?: 'dedicated' | 'attach'
39
+ port?: number
40
+ orgId?: string
41
+ cdpUrl?: string
42
+ liveViewUrl?: string
43
+ }
44
+
45
+ interface AttachDependencies {
46
+ connectLocal: typeof connectCdp
47
+ connectRemote: typeof connectCdpUrl
48
+ }
49
+
50
+ const DEFAULT_DEPENDENCIES: AttachDependencies = {
51
+ connectLocal: connectCdp,
52
+ connectRemote: connectCdpUrl,
53
+ }
54
+
55
+ export function attachTool(
56
+ state: AttachRef,
57
+ builderClient?: ReclaimClient,
58
+ name: 'attach_browser' | 'attach_chrome' = 'attach_browser',
59
+ beforeReplace?: () => Promise<void>,
60
+ dependencies: AttachDependencies = DEFAULT_DEPENDENCIES,
61
+ ): RegisteredTool {
62
+ return defineTool<AttachArgs>(
21
63
  {
22
- name: 'attach_chrome',
64
+ name,
23
65
  description:
24
- 'Attach to a Chrome instance via CDP. ' +
25
- 'Auto-launches a dedicated-profile Chrome ' +
26
- 'on first call if no attachMode is persisted. ' +
27
- 'Persists the chosen mode in ~/.reclaim/config.json.',
66
+ name === 'attach_chrome'
67
+ ? 'Backward-compatible alias for attach_browser.'
68
+ : 'Connect the provider-authoring tools to a browser. Choose '
69
+ + 'dedicated (launch local Chrome), attach (existing local CDP '
70
+ + 'port), builder (quota-accounted Popcorn browser with a '
71
+ + 'shareable live view), or custom (caller-supplied CDP '
72
+ + 'websocket). '
73
+ + 'Builder and custom CDP credentials are held in memory and never '
74
+ + 'returned.',
28
75
  inputSchema: {
29
76
  type: 'object',
30
77
  properties: {
31
- attachMode: { type: 'string', enum: ['dedicated', 'attach'] },
32
- port: { type: 'number' },
78
+ mode: {
79
+ type: 'string',
80
+ enum: ['dedicated', 'attach', 'builder', 'custom'],
81
+ },
82
+ attachMode: {
83
+ type: 'string',
84
+ enum: ['dedicated', 'attach'],
85
+ description: 'Deprecated local-mode alias for mode.',
86
+ },
87
+ port: { type: 'number', minimum: 1, maximum: 65535 },
88
+ orgId: { type: 'string', format: 'uuid' },
89
+ cdpUrl: { type: 'string', maxLength: 4000 },
90
+ liveViewUrl: { type: 'string', format: 'uri', maxLength: 4000 },
33
91
  },
34
92
  },
35
93
  },
36
94
  async(parsed) => {
37
- let cfg = state.config.read()?.browser_agent
38
- if(parsed.attachMode || parsed.port) {
39
- cfg = {
40
- attachMode: parsed.attachMode ?? cfg?.attachMode ?? 'dedicated',
41
- port: parsed.port ?? cfg?.port ?? 9222,
42
- }
43
- state.config.write({ browser_agent: cfg })
44
- }
45
-
46
- if(!cfg) {
95
+ const persisted = state.config.read()?.browser_agent
96
+ const mode = parsed.mode ?? parsed.attachMode ?? persisted?.attachMode
97
+ if(!mode) {
47
98
  return {
48
99
  needsChoice: true,
49
100
  message:
50
- 'First-run: choose attach mode. ' +
51
- 'Call attach_chrome again with attachMode="dedicated" ' +
52
- '(auto-launch a Chrome profile under ~/.reclaim/chrome-profile) ' +
53
- 'or attachMode="attach" ' +
54
- '(connect to a Chrome you launched yourself with ' +
55
- 'BOTH --remote-debugging-port=9222 AND ' +
56
- '--user-data-dir=<some-non-default-path>; ' +
57
- 'since Chrome 136 the debug-port flag is silently ' +
58
- 'ignored if the default profile is in use).',
101
+ 'Choose a browser mode and call attach_browser again: '
102
+ + '"dedicated" launches a local dedicated Chrome profile; '
103
+ + '"attach" connects to a local Chrome debugging port; '
104
+ + '"builder" creates a quota-accounted remote browser and '
105
+ + 'requires orgId; "custom" requires a CDP websocket URL.',
59
106
  configPath: defaultConfigPath(),
60
107
  }
61
108
  }
62
109
 
63
- if(cfg.attachMode === 'dedicated') {
64
- try {
65
- await waitForCdpReady(cfg.port, 500)
66
- } catch{
67
- launchChrome({ port: cfg.port, profileDir: defaultProfileDir() })
68
- await waitForCdpReady(cfg.port, 10_000)
69
- }
70
- } else {
71
- await waitForCdpReady(cfg.port, 2_000).catch(() => {
72
- throw new Error(
73
- `attach mode: nothing answering CDP on port ${cfg.port}. ` +
74
- 'Chrome must be launched with BOTH ' +
75
- `--remote-debugging-port=${cfg.port} AND ` +
76
- '--user-data-dir=<some-non-default-path>. ' +
77
- 'Since Chrome 136 (May 2025), the debug-port flag is ' +
78
- 'silently ignored when the default ' +
79
- "user profile is in use — that's why nothing opens the port. " +
80
- 'Either re-launch Chrome with ' +
81
- 'a custom --user-data-dir, or switch to attachMode="dedicated".',
82
- )
83
- })
110
+ const next = await connect(
111
+ mode, parsed, persisted, builderClient, dependencies,
112
+ )
113
+ try {
114
+ await beforeReplace?.()
115
+ await disposeAttached(state)
116
+ } catch(err) {
117
+ await disposeState(next).catch(() => {})
118
+ throw err
84
119
  }
85
120
 
86
- if(state.current) {
87
- await state.current.handles.close().catch(() => {})
121
+ state.current = next
122
+ if(mode === 'dedicated' || mode === 'attach') {
123
+ state.config.write({
124
+ browser_agent: { attachMode: mode, port: next.port! },
125
+ })
88
126
  }
89
127
 
90
- const handles = await connectCdp(cfg.port)
91
- state.current = { handles, port: cfg.port }
92
- return { attached: true, port: cfg.port, mode: cfg.attachMode }
128
+ return {
129
+ attached: true,
130
+ mode,
131
+ ...(next.port ? { port: next.port } : {}),
132
+ ...(next.browserSessionId
133
+ ? { browserSessionId: next.browserSessionId }
134
+ : {}),
135
+ ...(next.liveViewUrl ? { liveViewUrl: next.liveViewUrl } : {}),
136
+ }
93
137
  },
94
138
  )
95
139
  }
140
+
141
+ export async function disposeAttached(state: AttachRef) {
142
+ const current = state.current
143
+ if(!current) {
144
+ return
145
+ }
146
+
147
+ delete state.current
148
+ await disposeState(current)
149
+ }
150
+
151
+ async function connect(
152
+ mode: BrowserMode,
153
+ parsed: AttachArgs,
154
+ persisted: { attachMode: 'dedicated' | 'attach', port: number } | undefined,
155
+ builderClient: ReclaimClient | undefined,
156
+ dependencies: AttachDependencies,
157
+ ): Promise<AttachState> {
158
+ if(mode === 'builder') {
159
+ assert(builderClient, badRequest('Builder browser service is unavailable'))
160
+ assert(parsed.orgId, badRequest('orgId is required for builder mode'))
161
+ const { data } = await builderClient.call('CreateAgentBrowserSession', {
162
+ params: { orgId: parsed.orgId },
163
+ })
164
+ let handles: CdpHandles
165
+ try {
166
+ handles = await dependencies.connectRemote(data.cdpUrl)
167
+ } catch(err) {
168
+ await builderClient.call('DisposeAgentBrowserSession', {
169
+ params: {
170
+ orgId: parsed.orgId,
171
+ browserSessionId: data.id,
172
+ },
173
+ }).catch(() => {})
174
+ throw err
175
+ }
176
+
177
+ return {
178
+ handles,
179
+ mode,
180
+ liveViewUrl: data.liveViewUrl,
181
+ browserSessionId: data.id,
182
+ orgId: parsed.orgId,
183
+ disposeRemote: async() => {
184
+ await builderClient.call('DisposeAgentBrowserSession', {
185
+ params: {
186
+ orgId: parsed.orgId!,
187
+ browserSessionId: data.id,
188
+ },
189
+ })
190
+ },
191
+ }
192
+ }
193
+
194
+ if(mode === 'custom') {
195
+ assert(parsed.cdpUrl, badRequest('cdpUrl is required for custom mode'))
196
+ const url = new URL(parsed.cdpUrl)
197
+ assert(
198
+ url.protocol === 'ws:' || url.protocol === 'wss:',
199
+ badRequest('cdpUrl must use ws:// or wss://'),
200
+ )
201
+ return {
202
+ handles: await dependencies.connectRemote(parsed.cdpUrl),
203
+ mode,
204
+ ...(parsed.liveViewUrl ? { liveViewUrl: parsed.liveViewUrl } : {}),
205
+ }
206
+ }
207
+
208
+ const port = parsed.port ?? persisted?.port ?? 9222
209
+ if(mode === 'dedicated') {
210
+ try {
211
+ await waitForCdpReady(port, 500)
212
+ } catch{
213
+ launchChrome({ port, profileDir: defaultProfileDir() })
214
+ await waitForCdpReady(port, 10_000)
215
+ }
216
+ } else {
217
+ await waitForCdpReady(port, 2_000).catch(() => {
218
+ throw new Error(
219
+ `attach mode: nothing answering CDP on port ${port}. Chrome must `
220
+ + `be launched with --remote-debugging-port=${port} AND `
221
+ + '--user-data-dir=<some-non-default-path>. Chrome 136+ ignores '
222
+ + 'the debugging flag for the default profile.',
223
+ )
224
+ })
225
+ }
226
+
227
+ return { handles: await dependencies.connectLocal(port), mode, port }
228
+ }
229
+
230
+ async function disposeState(state: AttachState) {
231
+ try {
232
+ await state.handles.close()
233
+ } finally {
234
+ await state.disposeRemote?.()
235
+ }
236
+ }
@@ -16,7 +16,7 @@ import { ensureAttestorCrypto } from '../../../proof/proof-core.ts'
16
16
  import { type RegisteredTool } from '../../server.ts'
17
17
  import { analyzeTool } from './analyze.ts'
18
18
  import { type AttachState, attachTool } from './attach.ts'
19
- import { type CaptureStore, captureTools } from './capture.ts'
19
+ import { type CaptureStore, captureTools, resetCaptures } from './capture.ts'
20
20
  import { listTabsTool } from './eval.ts'
21
21
  import { howItWorksTool } from './how-it-works.ts'
22
22
  import { createVersionFromCaptureTool } from './publish.ts'
@@ -42,6 +42,7 @@ function buildAgentState(): AgentState {
42
42
  * capture/proof tools — old mode supplies its own publish tool. */
43
43
  export function buildAgentTools(
44
44
  client?: ReclaimClient,
45
+ builderClient: ReclaimClient | undefined = client,
45
46
  ): RegisteredTool[] {
46
47
  const state = buildAgentState()
47
48
  ensureAttestorCrypto()
@@ -49,7 +50,13 @@ export function buildAgentTools(
49
50
  // Stateless docs tool — serve the mode-specific authoring guide to any
50
51
  // client. No `client` ⇒ old-devtools mode (see `mcp/start.ts`).
51
52
  tools.push(howItWorksTool(!client))
52
- tools.push(attachTool(state.attach))
53
+ const beforeReplace = () => resetCaptures(state.captures)
54
+ tools.push(attachTool(
55
+ state.attach, builderClient, 'attach_browser', beforeReplace,
56
+ ))
57
+ tools.push(attachTool(
58
+ state.attach, builderClient, 'attach_chrome', beforeReplace,
59
+ ))
53
60
  tools.push(listTabsTool(state.attach))
54
61
  for(const t of captureTools(state.attach, state.captures)) {
55
62
  tools.push(t)
@@ -20,13 +20,22 @@ export interface CaptureStore {
20
20
  activeTab?: string
21
21
  }
22
22
 
23
+ export async function resetCaptures(captures: CaptureStore) {
24
+ for(const entry of captures.sessions.values()) {
25
+ await entry.session.stop().catch(() => {})
26
+ }
27
+
28
+ captures.sessions.clear()
29
+ delete captures.activeTab
30
+ }
31
+
23
32
  export function captureTools(
24
33
  attachRef: { current?: AttachState },
25
34
  captures: CaptureStore,
26
35
  ): RegisteredTool[] {
27
36
  const requireAttached = (): AttachState => {
28
37
  if(!attachRef.current) {
29
- throw new Error('Not attached. Call attach_chrome first.')
38
+ throw new Error('Not attached. Call attach_browser first.')
30
39
  }
31
40
 
32
41
  return attachRef.current
@@ -1,4 +1,3 @@
1
- import { listTabs } from '../../../cdp/tabs.ts'
2
1
  import { defineTool, type RegisteredTool } from '../../server.ts'
3
2
  import type { AttachState } from './attach.ts'
4
3
 
@@ -16,10 +15,10 @@ export function listTabsTool(attachRef: {
16
15
  },
17
16
  async() => {
18
17
  if(!attachRef.current) {
19
- throw new Error('Not attached. Call attach_chrome first.')
18
+ throw new Error('Not attached. Call attach_browser first.')
20
19
  }
21
20
 
22
- return { tabs: await listTabs(attachRef.current.port) }
21
+ return { tabs: await attachRef.current.handles.listTabs() }
23
22
  },
24
23
  )
25
24
  }
@@ -11,7 +11,7 @@ import { defineTool, type RegisteredTool } from '../../server.ts'
11
11
  * so any MCP client — not just Claude Code, which alone auto-loads skills — can
12
12
  * pull it. `oldMode` selects the backend-specific guide so the agent is never
13
13
  * told to call auth/publish tools that aren't registered in its mode.
14
- * Stateless: callable before `attach_chrome`.
14
+ * Stateless: callable before `attach_browser`.
15
15
  */
16
16
  export function howItWorksTool(oldMode: boolean): RegisteredTool {
17
17
  const guide = oldMode ? PROVIDER_GUIDE_OLD : PROVIDER_GUIDE_BUILDER
@@ -234,7 +234,28 @@ export function createVersionFromCaptureTool(
234
234
  description:
235
235
  'Extra requests the injection script is allowed to fire ' +
236
236
  '(e.g. paginated API calls), as RequestSelectionTemplates. ' +
237
- '`multiple`/`required` default to true.',
237
+ '`multiple`/`required` default to true. ' +
238
+ '⚠️ BEFORE populating this to gate ' +
239
+ '`verifyProof(proof, { providerId })` (old-devtools calls the ' +
240
+ 'same concept `allowedInjectedRequestData` — same mechanics, ' +
241
+ 'different field name): this whole entry (url, method, body, ' +
242
+ 'responseMatches, responseRedactions) feeds a client-side ' +
243
+ 'hash-equality check, and `url` is hashed VERBATIM — no regex/ ' +
244
+ 'template resolution, even with `urlType: REGEX` or ' +
245
+ '`TEMPLATE`. If the real captured URL contains ANY per-session ' +
246
+ 'part (a tracking nonce, CSRF token, cache-busting timestamp), ' +
247
+ 'no declared spec can EVER hash-match a real proof — populating' +
248
+ ' this for such a provider makes verifyProof reject every real ' +
249
+ 'proof, which is worse than leaving it empty. Diff the same ' +
250
+ 'endpoint\'s captured URL across two separate sessions before ' +
251
+ 'wiring this up. If provider-hash validation keeps causing ' +
252
+ 'problems (unstable url, or any other persistent mismatch), ' +
253
+ 'the fallback on the verifying side is `verifyProof(proof, { ' +
254
+ 'dangerouslyDisableContentValidation: true })` — trusts only ' +
255
+ 'the attestor\'s signature, skips the hash-equality check ' +
256
+ 'entirely; see the "Provider-hash validation" section of the ' +
257
+ 'injection script\'s guide for the full mechanics and when to ' +
258
+ 'reach for it.',
238
259
  items: ALLOWED_JS_REQUEST_SCHEMA,
239
260
  },
240
261
  interceptorOptions: {
@@ -1,7 +1,7 @@
1
1
  import type { ConfigStore } from '../../../config/store.ts'
2
2
  import { defineTool, type RegisteredTool } from '../../server.ts'
3
- import type { AttachState } from './attach.ts'
4
- import type { CaptureStore } from './capture.ts'
3
+ import { type AttachState, disposeAttached } from './attach.ts'
4
+ import { type CaptureStore, resetCaptures } from './capture.ts'
5
5
 
6
6
  export function sessionTools(
7
7
  attachRef: { current?: AttachState, config: ConfigStore },
@@ -18,11 +18,29 @@ export function sessionTools(
18
18
  async() => ({
19
19
  config: attachRef.config.read()?.browser_agent,
20
20
  attached: Boolean(attachRef.current),
21
+ mode: attachRef.current?.mode,
21
22
  port: attachRef.current?.port,
23
+ liveViewUrl: attachRef.current?.liveViewUrl,
24
+ browserSessionId: attachRef.current?.browserSessionId,
25
+ orgId: attachRef.current?.orgId,
22
26
  captures: [...captures.sessions.keys()],
23
27
  activeTab: captures.activeTab,
24
28
  }),
25
29
  ),
30
+ defineTool<Record<string, never>>(
31
+ {
32
+ name: 'dispose_browser',
33
+ description:
34
+ 'Stop captures, disconnect the current browser, and immediately '
35
+ + 'delete a Builder-hosted Popcorn session. Custom CDP sessions '
36
+ + 'are disconnected but never deleted by Reclaim.',
37
+ inputSchema: { type: 'object', properties: {} },
38
+ },
39
+ async() => {
40
+ await resetAll(attachRef, captures)
41
+ return { disposed: true }
42
+ },
43
+ ),
26
44
  defineTool<Record<string, never>>(
27
45
  {
28
46
  name: 'reset_session',
@@ -32,14 +50,17 @@ export function sessionTools(
32
50
  inputSchema: { type: 'object', properties: {} },
33
51
  },
34
52
  async() => {
35
- for(const entry of captures.sessions.values()) {
36
- await entry.session.stop().catch(() => {})
37
- }
38
-
39
- captures.sessions.clear()
40
- delete captures.activeTab
53
+ await resetAll(attachRef, captures)
41
54
  return { reset: true }
42
55
  },
43
56
  ),
44
57
  ]
45
58
  }
59
+
60
+ async function resetAll(
61
+ attachRef: { current?: AttachState, config: ConfigStore },
62
+ captures: CaptureStore,
63
+ ) {
64
+ await resetCaptures(captures)
65
+ await disposeAttached(attachRef)
66
+ }
@@ -54,19 +54,14 @@ function withLocalOprfMode(provider: ReclaimProvider): ReclaimProvider {
54
54
  * captured requests, prove via the in-process attestor, replay by re-fetch. */
55
55
  function localBackend(entry: CaptureEntry): AuthoringBackend {
56
56
  const { tabClient, session, drafts } = entry
57
- // The per-tab CDP client is strongly typed to `keyof Commands`; the shared
58
- // tools drive it with dynamic method/event names, so view it as string-keyed.
59
- const client = tabClient as unknown as {
60
- send: (method: string, params: object) => Promise<unknown>
61
- once: (e: string, cb: () => void) => void
62
- removeListener: (e: string, cb: () => void) => void
63
- }
64
57
 
65
58
  return {
66
59
  capture: session,
67
60
  drafts,
68
- sendCdp: (method, params) => client.send(method, params ?? {}),
61
+ sendCdp: (method, params) => tabClient.send(method, params ?? {}),
69
62
  waitForEvent: (method, timeoutMs) => new Promise((resolve) => {
63
+ let stopListening = () => {}
64
+
70
65
  const onEvent = () => {
71
66
  cleanup()
72
67
  resolve('fired')
@@ -78,10 +73,10 @@ function localBackend(entry: CaptureEntry): AuthoringBackend {
78
73
  }, timeoutMs)
79
74
  const cleanup = () => {
80
75
  clearTimeout(timer)
81
- client.removeListener(method, onEvent)
76
+ stopListening()
82
77
  }
83
78
 
84
- client.once(method, onEvent)
79
+ stopListening = tabClient.subscribeOnce(method, onEvent)
85
80
  }),
86
81
  replay: async(draft, opts) => {
87
82
  // Auth-bound check: re-fetch with the secrets dropped. replayProvider
@@ -9,13 +9,23 @@ import { writeSession } from './session-cache.ts'
9
9
  const SCOPE = 'openid profile email'
10
10
  const CALLBACK_TIMEOUT_MS = 5 * 60 * 1000
11
11
 
12
- export function authenticateTool(client: ReclaimClient): RegisteredTool {
12
+ export function authenticateTool(
13
+ client: ReclaimClient,
14
+ name: 'reclaim_authenticate' | 'authenticate_builder' =
15
+ 'reclaim_authenticate',
16
+ ): RegisteredTool {
13
17
  return defineTool<Record<string, never>>(
14
18
  {
15
- name: 'reclaim_authenticate',
19
+ name,
16
20
  description:
17
- 'Authorize the CLI / MCP to make authenticated API calls. Opens the ' +
18
- 'browser to the builder sign-in page (standard OAuth 2.0 ' +
21
+ (name === 'authenticate_builder'
22
+ ? 'Authenticate specifically with Builder. Available regardless '
23
+ + 'of '
24
+ + 'the selected publishing backend. '
25
+ : '')
26
+ + 'Authorize the CLI / MCP to make authenticated API calls. Opens '
27
+ + 'the '
28
+ + 'browser to the builder sign-in page (standard OAuth 2.0 ' +
19
29
  'authorization-code + PKCE with a localhost redirect) and waits for ' +
20
30
  'the user to sign in and approve. On success the access token is ' +
21
31
  'cached in ~/.reclaim/config.json and activated for this session.\n\n' +
@@ -0,0 +1,42 @@
1
+ import type { ReclaimClient } from '@reclaimprotocol/client'
2
+ import { defineTool, type RegisteredTool } from '../../server.ts'
3
+ import { authenticateTool } from './authenticate.ts'
4
+
5
+ /** Legacy-devtools mode needs a distinct Builder login solely for allocating
6
+ * quota-accounted Popcorn sessions. Builder mode uses its native auth tool. */
7
+ export function buildBuilderAuthenticationTools(
8
+ client: ReclaimClient,
9
+ ): RegisteredTool[] {
10
+ return [authenticateTool(client, 'authenticate_builder')]
11
+ }
12
+
13
+ /** Legacy-devtools mode lacks generated Builder API tools, so it needs this
14
+ * narrow organization-discovery bridge for remote-browser allocation. */
15
+ export function buildBuilderOrganizationTools(
16
+ client: ReclaimClient,
17
+ ): RegisteredTool[] {
18
+ return [
19
+ defineTool<{ cursor?: string }>(
20
+ {
21
+ name: 'list_builder_organizations',
22
+ description:
23
+ 'List organizations available to the authenticated Builder user. '
24
+ + 'Use an organization id from this result when calling '
25
+ + 'attach_browser with mode="builder". Available only in '
26
+ + 'legacy-devtools publishing mode; Builder mode uses list_orgs.',
27
+ inputSchema: {
28
+ type: 'object',
29
+ properties: {
30
+ cursor: { type: 'string', maxLength: 500 },
31
+ },
32
+ },
33
+ },
34
+ async({ cursor }) => {
35
+ const { data } = await client.call('ListOrgs', {
36
+ query: { ...(cursor ? { cursor } : {}) },
37
+ })
38
+ return data
39
+ },
40
+ ),
41
+ ]
42
+ }
@@ -1,4 +1,8 @@
1
1
  // Barrel for the credential tool group: local eth proof-owner key (env/PEM)
2
2
  // and the org-token-authenticated builder tools. Import from here.
3
+ export {
4
+ buildBuilderAuthenticationTools,
5
+ buildBuilderOrganizationTools,
6
+ } from './builder-access.ts'
3
7
  export { buildCredentialTools, buildLocalCredentialTools } from './build.ts'
4
8
  export { readSession } from './session-cache.ts'
@@ -138,15 +138,14 @@ export async function captureFirebaseTokenViaCdp(opts: {
138
138
 
139
139
  try {
140
140
  const session = await handles.attachToTab(targetId)
141
- const { Runtime } = session
142
141
  const deadline = Date.now() + timeoutMs
143
142
  while(Date.now() < deadline) {
144
- const r = await Runtime.evaluate({
143
+ const result = await session.send('Runtime.evaluate', {
145
144
  expression: EXTRACT_TOKEN_JS,
146
145
  awaitPromise: true,
147
146
  returnByValue: true,
148
147
  })
149
- const value = r.result?.value
148
+ const value = runtimeResultValue(result)
150
149
  if(typeof value === 'string' && value.length > 0) {
151
150
  return { token: value, closedBrowser: launchedByUs }
152
151
  }
@@ -173,3 +172,14 @@ export async function captureFirebaseTokenViaCdp(opts: {
173
172
  await handles.close().catch(() => {})
174
173
  }
175
174
  }
175
+
176
+ function runtimeResultValue(value: unknown): unknown {
177
+ if(typeof value !== 'object' || !value || !('result' in value)) {
178
+ return undefined
179
+ }
180
+
181
+ const result = value.result
182
+ return typeof result === 'object' && result && 'value' in result
183
+ ? result.value
184
+ : undefined
185
+ }
@@ -288,7 +288,29 @@ export function createVersionFromCaptureTool(
288
288
  'the whole payload), template just that part with ' +
289
289
  '`{{paramName}}` and keep the rest as fixed literal text; see ' +
290
290
  'the "bodySniff" section of the customInjection field\'s guide ' +
291
- 'for the exact mechanics and a worked example.',
291
+ 'for the exact mechanics and a worked example. ' +
292
+ '⚠️ BEFORE populating this to gate ' +
293
+ '`verifyProof(proof, { providerId })`: this whole entry (url, ' +
294
+ 'method, body, responseMatches, responseRedactions) feeds a ' +
295
+ 'client-side hash-equality check, and `url` is hashed VERBATIM ' +
296
+ '— no regex/template resolution, even with `urlType: REGEX` or ' +
297
+ '`TEMPLATE`. If the real captured URL contains ANY per-session ' +
298
+ 'part (a tracking nonce, CSRF token, cache-busting timestamp), ' +
299
+ 'no declared spec can EVER hash-match a real proof, no matter ' +
300
+ 'how correct the rest of this entry is — populating' +
301
+ 'it for such ' +
302
+ 'a provider makes verifyProof reject every real proof,' +
303
+ 'which is ' +
304
+ 'worse than leaving this field empty. Diff the same endpoint\'s' +
305
+ ' captured URL across two separate sessions before wiring this ' +
306
+ 'up. If provider-hash validation keeps causing problems ' +
307
+ '(unstable url, or any other persistent mismatch), the ' +
308
+ 'fallback on the verifying side is `verifyProof(proof, { ' +
309
+ 'dangerouslyDisableContentValidation: true })` — trusts only ' +
310
+ 'the attestor\'s signature, skips the hash-equality check ' +
311
+ 'entirely; see the "Provider-hash validation" section of the ' +
312
+ 'customInjection field\'s guide for the full mechanics and ' +
313
+ 'when to reach for it.',
292
314
  items: {
293
315
  type: 'object',
294
316
  properties: {
@@ -528,9 +550,9 @@ export function createVersionFromCaptureTool(
528
550
  'reads them when adding a version. ' +
529
551
  (followUp
530
552
  ? 'They were applied by the follow-up version the tool ' +
531
- 'created to set disableRequestReplay.'
553
+ 'created to set disableRequestReplay.'
532
554
  : 'Publish once to create the provider, then call this ' +
533
- 'again WITH the returned providerId to set them.'),
555
+ 'again WITH the returned providerId to set them.'),
534
556
  )
535
557
  }
536
558