@thinkrun/cli 0.1.39 → 0.1.42
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/README.md +27 -0
- package/dist/bin/thinkrun.js +9 -2
- package/dist/bin/thinkrun.js.map +1 -1
- package/dist/scripts/browse.sh +40 -7
- package/dist/shared/analysis-plans.d.ts +10 -0
- package/dist/shared/analysis-plans.js +12 -0
- package/dist/shared/batch-steps.d.ts +49 -0
- package/dist/shared/batch-steps.js +171 -0
- package/dist/shared/batch-steps.test.js +127 -0
- package/dist/shared/group-binding-key.d.ts +5 -0
- package/dist/shared/group-binding-key.js +15 -0
- package/dist/shared/group-binding-key.test.js +50 -0
- package/dist/shared/issue-report.d.ts +10 -0
- package/dist/shared/issue-report.js +126 -0
- package/dist/shared/issue-report.test.ts +110 -0
- package/dist/shared/native-type-budget.d.ts +16 -0
- package/dist/shared/native-type-budget.js +28 -0
- package/dist/shared/navigation-retry.d.ts +2 -0
- package/dist/shared/navigation-retry.js +26 -0
- package/dist/shared/navigation-retry.test.js +25 -0
- package/dist/shared/onboarding-drips.d.ts +13 -0
- package/dist/shared/onboarding-drips.js +100 -0
- package/dist/shared/onboarding-metrics.d.ts +4 -0
- package/dist/shared/onboarding-metrics.js +53 -0
- package/dist/shared/selector-hints.d.ts +1 -0
- package/dist/shared/selector-hints.js +43 -0
- package/dist/shared/selector-hints.test.js +31 -0
- package/dist/shared/slack-report.d.ts +21 -0
- package/dist/shared/slack-report.js +381 -0
- package/dist/src/adapters/cloud.d.ts +2 -0
- package/dist/src/adapters/cloud.d.ts.map +1 -1
- package/dist/src/adapters/cloud.js +112 -17
- package/dist/src/adapters/cloud.js.map +1 -1
- package/dist/src/adapters/index.d.ts.map +1 -1
- package/dist/src/adapters/index.js +30 -5
- package/dist/src/adapters/index.js.map +1 -1
- package/dist/src/adapters/local.d.ts +3 -0
- package/dist/src/adapters/local.d.ts.map +1 -1
- package/dist/src/adapters/local.js +52 -13
- package/dist/src/adapters/local.js.map +1 -1
- package/dist/src/commands/actions.d.ts +12 -0
- package/dist/src/commands/actions.d.ts.map +1 -1
- package/dist/src/commands/actions.js +115 -28
- package/dist/src/commands/actions.js.map +1 -1
- package/dist/src/commands/analyze.d.ts.map +1 -1
- package/dist/src/commands/analyze.js +29 -1
- package/dist/src/commands/analyze.js.map +1 -1
- package/dist/src/commands/audit.d.ts.map +1 -1
- package/dist/src/commands/audit.js +5 -4
- package/dist/src/commands/audit.js.map +1 -1
- package/dist/src/commands/cloud.d.ts.map +1 -1
- package/dist/src/commands/cloud.js +3 -1
- package/dist/src/commands/cloud.js.map +1 -1
- package/dist/src/commands/config.d.ts.map +1 -1
- package/dist/src/commands/config.js +15 -0
- package/dist/src/commands/config.js.map +1 -1
- package/dist/src/commands/evaluate-helpers.d.ts.map +1 -1
- package/dist/src/commands/evaluate-helpers.js +10 -2
- package/dist/src/commands/evaluate-helpers.js.map +1 -1
- package/dist/src/commands/install-skills.d.ts +27 -0
- package/dist/src/commands/install-skills.d.ts.map +1 -0
- package/dist/src/commands/install-skills.js +81 -0
- package/dist/src/commands/install-skills.js.map +1 -0
- package/dist/src/commands/install.d.ts.map +1 -1
- package/dist/src/commands/install.js +44 -1
- package/dist/src/commands/install.js.map +1 -1
- package/dist/src/commands/login.d.ts +3 -0
- package/dist/src/commands/login.d.ts.map +1 -0
- package/dist/src/commands/login.js +62 -0
- package/dist/src/commands/login.js.map +1 -0
- package/dist/src/commands/setup.d.ts.map +1 -1
- package/dist/src/commands/setup.js +8 -16
- package/dist/src/commands/setup.js.map +1 -1
- package/dist/src/config/store.d.ts.map +1 -1
- package/dist/src/config/store.js +1 -0
- package/dist/src/config/store.js.map +1 -1
- package/dist/src/local-bridge-timing.d.ts +3 -0
- package/dist/src/local-bridge-timing.d.ts.map +1 -1
- package/dist/src/local-bridge-timing.js +3 -0
- package/dist/src/local-bridge-timing.js.map +1 -1
- package/dist/src/session/account-guidance.d.ts +10 -0
- package/dist/src/session/account-guidance.d.ts.map +1 -0
- package/dist/src/session/account-guidance.js +32 -0
- package/dist/src/session/account-guidance.js.map +1 -0
- package/dist/src/session/browser-login.d.ts +6 -0
- package/dist/src/session/browser-login.d.ts.map +1 -0
- package/dist/src/session/browser-login.js +83 -0
- package/dist/src/session/browser-login.js.map +1 -0
- package/dist/src/types.d.ts +3 -1
- package/dist/src/types.d.ts.map +1 -1
- package/dist/src/utils.d.ts +9 -3
- package/dist/src/utils.d.ts.map +1 -1
- package/dist/src/utils.js +24 -3
- package/dist/src/utils.js.map +1 -1
- package/dist/src/working-location.d.ts +1 -1
- package/dist/src/working-location.d.ts.map +1 -1
- package/dist/src/working-location.js +89 -67
- package/dist/src/working-location.js.map +1 -1
- package/package.json +3 -2
- package/skills/thinkrun/SKILL.md +66 -0
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"browser-login.d.ts","sourceRoot":"","sources":["../../../src/session/browser-login.ts"],"names":[],"mappings":"AAOA,wBAAsB,iBAAiB,CAAC,IAAI,EAAE,CAAC,GAAG,EAAE,MAAM,KAAK,IAAI,GAAG,OAAO,CAAC,IAAI,CAAC,EAAE,SAAS,SAAc;;;;GAuD3G"}
|
|
@@ -0,0 +1,83 @@
|
|
|
1
|
+
import { constants, generateKeyPairSync, privateDecrypt, randomBytes } from 'node:crypto';
|
|
2
|
+
import { createServer } from 'node:http';
|
|
3
|
+
const webOrigin = 'https://thinkrun.ai';
|
|
4
|
+
// The browser only sends ciphertext to loopback. The private key and one-time state
|
|
5
|
+
// both belong to this process, so a later listener on a reused port cannot recover a key.
|
|
6
|
+
export async function startBrowserLogin(save, timeoutMs = 10 * 60_000) {
|
|
7
|
+
const state = randomBytes(32).toString('base64url');
|
|
8
|
+
const { publicKey, privateKey } = generateKeyPairSync('rsa', { modulusLength: 2048 });
|
|
9
|
+
const spki = publicKey.export({ type: 'spki', format: 'der' }).toString('base64');
|
|
10
|
+
let port = 0;
|
|
11
|
+
let used = false;
|
|
12
|
+
let complete;
|
|
13
|
+
let fail;
|
|
14
|
+
const done = new Promise((resolve, reject) => { complete = resolve; fail = reject; });
|
|
15
|
+
const server = createServer(async (req, res) => {
|
|
16
|
+
const end = (code, body = '') => { res.writeHead(code); res.end(body); };
|
|
17
|
+
if (req.headers.host !== '127.0.0.1:' + port || req.headers.origin !== webOrigin || req.url !== '/connect')
|
|
18
|
+
return end(403);
|
|
19
|
+
res.setHeader('Cache-Control', 'no-store');
|
|
20
|
+
res.setHeader('Access-Control-Allow-Origin', webOrigin);
|
|
21
|
+
if (req.method === 'OPTIONS') {
|
|
22
|
+
res.setHeader('Access-Control-Allow-Methods', 'GET, POST');
|
|
23
|
+
res.setHeader('Access-Control-Allow-Headers', 'x-thinkrun-state, content-type');
|
|
24
|
+
res.setHeader('Access-Control-Allow-Private-Network', 'true');
|
|
25
|
+
return end(204);
|
|
26
|
+
}
|
|
27
|
+
if (used || req.headers['x-thinkrun-state'] !== state)
|
|
28
|
+
return end(403);
|
|
29
|
+
if (req.method === 'GET')
|
|
30
|
+
return end(200, spki);
|
|
31
|
+
if (req.method !== 'POST' || req.headers['content-type'] !== 'text/plain')
|
|
32
|
+
return end(400);
|
|
33
|
+
try {
|
|
34
|
+
let body = '';
|
|
35
|
+
for await (const chunk of req) {
|
|
36
|
+
if (body.length + chunk.length > 512)
|
|
37
|
+
return end(413);
|
|
38
|
+
body += chunk.toString('ascii');
|
|
39
|
+
}
|
|
40
|
+
if (used || !/^[A-Za-z0-9+/]{342}==$/.test(body))
|
|
41
|
+
return end(400);
|
|
42
|
+
const key = privateDecrypt({ key: privateKey, padding: constants.RSA_PKCS1_OAEP_PADDING, oaepHash: 'sha256' }, Buffer.from(body, 'base64')).toString('utf8');
|
|
43
|
+
if (!/^(?:tb_|mech_browse_|ak_)[A-Za-z0-9_-]{12,160}$/.test(key))
|
|
44
|
+
return end(400);
|
|
45
|
+
used = true;
|
|
46
|
+
clearTimeout(timer);
|
|
47
|
+
try {
|
|
48
|
+
await save(key);
|
|
49
|
+
}
|
|
50
|
+
catch {
|
|
51
|
+
end(502);
|
|
52
|
+
fail(Error('Could not verify or save this connection. Revoke the new key in ThinkRun Settings and try again.'));
|
|
53
|
+
server.close();
|
|
54
|
+
return;
|
|
55
|
+
}
|
|
56
|
+
end(200);
|
|
57
|
+
complete();
|
|
58
|
+
server.close();
|
|
59
|
+
}
|
|
60
|
+
catch {
|
|
61
|
+
if (!res.headersSent)
|
|
62
|
+
end(400);
|
|
63
|
+
}
|
|
64
|
+
});
|
|
65
|
+
server.requestTimeout = 5000;
|
|
66
|
+
server.headersTimeout = 5000;
|
|
67
|
+
await new Promise((resolve, reject) => {
|
|
68
|
+
server.once('error', reject);
|
|
69
|
+
server.listen(0, '127.0.0.1', resolve);
|
|
70
|
+
});
|
|
71
|
+
const address = server.address();
|
|
72
|
+
if (!address || typeof address === 'string') {
|
|
73
|
+
server.close();
|
|
74
|
+
throw Error('Could not open a local login connection.');
|
|
75
|
+
}
|
|
76
|
+
port = address.port;
|
|
77
|
+
const timer = setTimeout(() => { used = true; server.close(); server.closeAllConnections(); fail(Error('Login expired. Run thinkrun login to start again.')); }, timeoutMs);
|
|
78
|
+
const loginUrl = webOrigin + '/cli/connect#' + new URLSearchParams({ state, port: String(port),
|
|
79
|
+
// Pin the expected key so port reuse cannot substitute a new receiver.
|
|
80
|
+
key: spki }).toString();
|
|
81
|
+
return { loginUrl, code: state.slice(-6), done: done.finally(() => clearTimeout(timer)) };
|
|
82
|
+
}
|
|
83
|
+
//# sourceMappingURL=browser-login.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"browser-login.js","sourceRoot":"","sources":["../../../src/session/browser-login.ts"],"names":[],"mappings":"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"}
|
package/dist/src/types.d.ts
CHANGED
|
@@ -9,7 +9,9 @@ export interface SessionOptions {
|
|
|
9
9
|
}
|
|
10
10
|
export interface Session {
|
|
11
11
|
sessionId: string;
|
|
12
|
-
status: 'pending' | 'creating' | 'provisioning' | 'active' | 'ready' | 'running' | 'busy' | 'error' | 'failed' | 'terminated' | 'closed';
|
|
12
|
+
status: 'pending' | 'creating' | 'provisioning' | 'active' | 'ready' | 'running' | 'busy' | 'error' | 'failed' | 'terminated' | 'closed' | 'completed' | 'cancelled';
|
|
13
|
+
/** Cloud browser action readiness; absent on older servers and local sessions. */
|
|
14
|
+
browserReady?: boolean;
|
|
13
15
|
currentUrl?: string;
|
|
14
16
|
title?: string;
|
|
15
17
|
createdAt: string;
|
package/dist/src/types.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../src/types.ts"],"names":[],"mappings":"AAAA;;GAEG;AAEH,MAAM,WAAW,cAAc;IAC7B,OAAO,CAAC,EAAE,UAAU,GAAG,SAAS,GAAG,QAAQ,CAAC;IAC5C,KAAK,CAAC,EAAE,OAAO,CAAC;IAChB,OAAO,CAAC,EAAE,OAAO,CAAC;IAClB,QAAQ,CAAC,EAAE,OAAO,CAAC;CACpB;AAED,MAAM,WAAW,OAAO;IACtB,SAAS,EAAE,MAAM,CAAC;IAClB,MAAM,EAAE,SAAS,GAAG,UAAU,GAAG,cAAc,GAAG,QAAQ,GAAG,OAAO,GAAG,SAAS,GAAG,MAAM,GAAG,OAAO,GAAG,QAAQ,GAAG,YAAY,GAAG,QAAQ,CAAC;
|
|
1
|
+
{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../src/types.ts"],"names":[],"mappings":"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"}
|
package/dist/src/utils.d.ts
CHANGED
|
@@ -6,6 +6,12 @@ export declare const API_KEY_HELP_FALLBACK = "Run `thinkrun doctor` or check you
|
|
|
6
6
|
export declare function handleError(error: any, command?: string, startMs?: number): never;
|
|
7
7
|
export declare function isLocalApiUrl(apiUrl: string): boolean;
|
|
8
8
|
export declare const DEFAULT_BRIDGE_PORT = 3012;
|
|
9
|
+
/**
|
|
10
|
+
* Read and validate the explicit bridge port override shared with the MCP CLI.
|
|
11
|
+
* An invalid non-empty override is an error: silently using discovery here can
|
|
12
|
+
* send an isolated runner to a different browser than the one it selected.
|
|
13
|
+
*/
|
|
14
|
+
export declare function readExplicitBridgePort(value?: string | undefined): number | undefined;
|
|
9
15
|
/**
|
|
10
16
|
* Longer timeout for cold-start / health GET /tabs checks (e.g. embed verify script).
|
|
11
17
|
* Interactive CLI bridge calls should use {@link BRIDGE_REQUEST_TIMEOUT_MS}.
|
|
@@ -27,9 +33,9 @@ export declare const BRIDGE_REQUEST_TIMEOUT_MS = 10000;
|
|
|
27
33
|
*/
|
|
28
34
|
export declare function unwrapEvaluatePayload(data: unknown): unknown;
|
|
29
35
|
/**
|
|
30
|
-
* Read the native
|
|
31
|
-
*
|
|
32
|
-
*
|
|
36
|
+
* Read the effective native-host bridge port: explicit environment override,
|
|
37
|
+
* then ~/.thinkbrowse/port, then DEFAULT_BRIDGE_PORT. An invalid explicit
|
|
38
|
+
* override throws instead of silently routing to another bridge.
|
|
33
39
|
* This utility is shared by the doctor, tabs, and attach commands.
|
|
34
40
|
*/
|
|
35
41
|
export declare function readBridgePort(portFilePath?: string): number;
|
package/dist/src/utils.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../../src/utils.ts"],"names":[],"mappings":"AAAA;;GAEG;AAaH,kEAAkE;AAClE,eAAO,MAAM,qBAAqB,gFAC6C,CAAC;AAEhF,wBAAgB,WAAW,CAAC,KAAK,EAAE,GAAG,EAAE,OAAO,CAAC,EAAE,MAAM,EAAE,OAAO,CAAC,EAAE,MAAM,GAAG,KAAK,CA0CjF;AAED,wBAAgB,aAAa,CAAC,MAAM,EAAE,MAAM,GAAG,OAAO,CAQrD;AAED,eAAO,MAAM,mBAAmB,OAAO,CAAC;AAExC;;;GAGG;AACH,eAAO,MAAM,8BAA8B,QAA8C,CAAC;AAE1F;;;;GAIG;AACH,eAAO,MAAM,yBAAyB,QAAyC,CAAC;AAEhF;;;;;;;GAOG;AACH,wBAAgB,qBAAqB,CAAC,IAAI,EAAE,OAAO,GAAG,OAAO,CAS5D;AAED;;;;;GAKG;AACH,wBAAgB,cAAc,CAAC,YAAY,SAA0C,GAAG,MAAM,
|
|
1
|
+
{"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../../src/utils.ts"],"names":[],"mappings":"AAAA;;GAEG;AAaH,kEAAkE;AAClE,eAAO,MAAM,qBAAqB,gFAC6C,CAAC;AAEhF,wBAAgB,WAAW,CAAC,KAAK,EAAE,GAAG,EAAE,OAAO,CAAC,EAAE,MAAM,EAAE,OAAO,CAAC,EAAE,MAAM,GAAG,KAAK,CA0CjF;AAED,wBAAgB,aAAa,CAAC,MAAM,EAAE,MAAM,GAAG,OAAO,CAQrD;AAED,eAAO,MAAM,mBAAmB,OAAO,CAAC;AAExC;;;;GAIG;AACH,wBAAgB,sBAAsB,CAAC,KAAK,qBAAsC,GAAG,MAAM,GAAG,SAAS,CAWtG;AAED;;;GAGG;AACH,eAAO,MAAM,8BAA8B,QAA8C,CAAC;AAE1F;;;;GAIG;AACH,eAAO,MAAM,yBAAyB,QAAyC,CAAC;AAEhF;;;;;;;GAOG;AACH,wBAAgB,qBAAqB,CAAC,IAAI,EAAE,OAAO,GAAG,OAAO,CAS5D;AAED;;;;;GAKG;AACH,wBAAgB,cAAc,CAAC,YAAY,SAA0C,GAAG,MAAM,CAc7F;AAED;;;;GAIG;AACH,wBAAgB,wBAAwB,CAAC,YAAY,SAA0C,GAAG,MAAM,GAAG,IAAI,CAM9G;AAID;;;GAGG;AACH,wBAAgB,2BAA2B,CACzC,OAAO,EAAE,MAAM,GAAG,IAAI,EACtB,IAAI,CAAC,EAAE;IAAE,KAAK,CAAC,EAAE,MAAM,CAAC;IAAC,QAAQ,CAAC,EAAE,MAAM,CAAA;CAAE,GAC3C,MAAM,GAAG,IAAI,CAMf"}
|
package/dist/src/utils.js
CHANGED
|
@@ -66,6 +66,24 @@ export function isLocalApiUrl(apiUrl) {
|
|
|
66
66
|
}
|
|
67
67
|
}
|
|
68
68
|
export const DEFAULT_BRIDGE_PORT = 3012;
|
|
69
|
+
/**
|
|
70
|
+
* Read and validate the explicit bridge port override shared with the MCP CLI.
|
|
71
|
+
* An invalid non-empty override is an error: silently using discovery here can
|
|
72
|
+
* send an isolated runner to a different browser than the one it selected.
|
|
73
|
+
*/
|
|
74
|
+
export function readExplicitBridgePort(value = process.env['THINKRUN_BRIDGE_PORT']) {
|
|
75
|
+
if (value === undefined || value.trim() === '')
|
|
76
|
+
return undefined;
|
|
77
|
+
const normalized = value.trim();
|
|
78
|
+
if (!/^\d+$/.test(normalized)) {
|
|
79
|
+
throw new Error('Invalid THINKRUN_BRIDGE_PORT: expected an integer from 1 to 65535');
|
|
80
|
+
}
|
|
81
|
+
const parsed = Number(normalized);
|
|
82
|
+
if (!Number.isSafeInteger(parsed) || parsed < 1 || parsed > 65535) {
|
|
83
|
+
throw new Error('Invalid THINKRUN_BRIDGE_PORT: expected an integer from 1 to 65535');
|
|
84
|
+
}
|
|
85
|
+
return parsed;
|
|
86
|
+
}
|
|
69
87
|
/**
|
|
70
88
|
* Longer timeout for cold-start / health GET /tabs checks (e.g. embed verify script).
|
|
71
89
|
* Interactive CLI bridge calls should use {@link BRIDGE_REQUEST_TIMEOUT_MS}.
|
|
@@ -98,12 +116,15 @@ export function unwrapEvaluatePayload(data) {
|
|
|
98
116
|
return data;
|
|
99
117
|
}
|
|
100
118
|
/**
|
|
101
|
-
* Read the native
|
|
102
|
-
*
|
|
103
|
-
*
|
|
119
|
+
* Read the effective native-host bridge port: explicit environment override,
|
|
120
|
+
* then ~/.thinkbrowse/port, then DEFAULT_BRIDGE_PORT. An invalid explicit
|
|
121
|
+
* override throws instead of silently routing to another bridge.
|
|
104
122
|
* This utility is shared by the doctor, tabs, and attach commands.
|
|
105
123
|
*/
|
|
106
124
|
export function readBridgePort(portFilePath = join(homedir(), '.thinkbrowse', 'port')) {
|
|
125
|
+
const explicitPort = readExplicitBridgePort();
|
|
126
|
+
if (explicitPort !== undefined)
|
|
127
|
+
return explicitPort;
|
|
107
128
|
if (!existsSync(portFilePath))
|
|
108
129
|
return DEFAULT_BRIDGE_PORT;
|
|
109
130
|
try {
|
package/dist/src/utils.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"utils.js","sourceRoot":"","sources":["../../src/utils.ts"],"names":[],"mappings":"AAAA;;GAEG;AAEH,OAAO,KAAK,MAAM,OAAO,CAAC;AAC1B,OAAO,EAAE,UAAU,EAAE,YAAY,EAAE,QAAQ,EAAE,MAAM,IAAI,CAAC;AACxD,OAAO,EAAE,IAAI,EAAE,MAAM,MAAM,CAAC;AAC5B,OAAO,EAAE,OAAO,EAAE,MAAM,IAAI,CAAC;AAC7B,OAAO,EAAE,QAAQ,EAAE,YAAY,EAAE,aAAa,EAAE,MAAM,aAAa,CAAC;AACpE,OAAO,EAAE,UAAU,EAAE,MAAM,kBAAkB,CAAC;AAC9C,OAAO,EACL,oCAAoC,IAAI,2CAA2C,EACnF,+BAA+B,IAAI,sCAAsC,GAC1E,MAAM,0BAA0B,CAAC;AAElC,kEAAkE;AAClE,MAAM,CAAC,MAAM,qBAAqB,GAChC,6EAA6E,CAAC;AAEhF,MAAM,UAAU,WAAW,CAAC,KAAU,EAAE,OAAgB,EAAE,OAAgB;IACxE,MAAM,UAAU,GAAG,OAAO,KAAK,SAAS,CAAC,CAAC,CAAC,IAAI,CAAC,GAAG,EAAE,GAAG,OAAO,CAAC,CAAC,CAAC,SAAS,CAAC;IAE5E,IAAI,UAAU,EAAE,EAAE,CAAC;QACjB,MAAM,QAAQ,GAA4B,EAAE,OAAO,EAAE,KAAK,EAAE,CAAC;QAC7D,IAAI,OAAO;YAAE,QAAQ,CAAC,OAAO,GAAG,OAAO,CAAC;QACxC,IAAI,UAAU,KAAK,SAAS;YAAE,QAAQ,CAAC,UAAU,GAAG,UAAU,CAAC;QAE/D,IAAI,KAAK,YAAY,aAAa,EAAE,CAAC;YACnC,QAAQ,CAAC,KAAK,GAAG,KAAK,CAAC,OAAO,CAAC;YAC/B,QAAQ,CAAC,IAAI,GAAG,CAAC,KAAK,YAAY,QAAQ,IAAI,KAAK,CAAC,UAAU,CAAC;gBAC7D,CAAC,CAAC,KAAK,CAAC,UAAU;gBAClB,CAAC,CAAC,KAAK,CAAC,IAAI,CAAC;YACf,IAAI,KAAK,YAAY,QAAQ,IAAI,KAAK,CAAC,SAAS,KAAK,SAAS,EAAE,CAAC;gBAC/D,QAAQ,CAAC,SAAS,GAAG,KAAK,CAAC,SAAS,CAAC;YACvC,CAAC;YACD,IAAI,KAAK,CAAC,UAAU;gBAAE,QAAQ,CAAC,IAAI,GAAG,KAAK,CAAC,UAAU,CAAC;YACvD,IAAI,KAAK,YAAY,QAAQ,IAAI,KAAK,CAAC,UAAU,EAAE,CAAC;gBAClD,QAAQ,CAAC,UAAU,GAAG,KAAK,CAAC,UAAU,CAAC;YACzC,CAAC;QACH,CAAC;aAAM,CAAC;YACN,QAAQ,CAAC,KAAK,GAAG,KAAK,CAAC,OAAO,IAAI,MAAM,CAAC,KAAK,CAAC,CAAC;YAChD,QAAQ,CAAC,IAAI,GAAG,gBAAgB,CAAC;QACnC,CAAC;QAED,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC,IAAI,CAAC,SAAS,CAAC,QAAQ,CAAC,GAAG,IAAI,CAAC,CAAC;QACtD,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;IAClB,CAAC;IAED,WAAW;IACX,IAAI,KAAK,YAAY,QAAQ,IAAI,KAAK,YAAY,YAAY,EAAE,CAAC;QAC/D,OAAO,CAAC,KAAK,CAAC,KAAK,CAAC,GAAG,CAAC,QAAQ,CAAC,EAAE,KAAK,CAAC,OAAO,CAAC,CAAC;QAClD,IAAI,KAAK,YAAY,QAAQ,IAAI,KAAK,CAAC,UAAU,KAAK,oBAAoB,IAAI,KAAK,CAAC,UAAU,EAAE,CAAC;YAC/F,OAAO,CAAC,KAAK,CAAC,KAAK,CAAC,MAAM,CAAC,UAAU,CAAC,EAAE,KAAK,CAAC,UAAU,CAAC,CAAC;QAC5D,CAAC;QACD,IAAI,KAAK,CAAC,UAAU,EAAE,CAAC;YACrB,OAAO,CAAC,KAAK,CAAC,KAAK,CAAC,MAAM,CAAC,MAAM,CAAC,EAAE,KAAK,CAAC,UAAU,CAAC,CAAC;QACxD,CAAC;IACH,CAAC;SAAM,CAAC;QACN,OAAO,CAAC,KAAK,CAAC,KAAK,CAAC,GAAG,CAAC,QAAQ,CAAC,EAAE,KAAK,CAAC,OAAO,IAAI,KAAK,CAAC,CAAC;IAC7D,CAAC;IACD,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;AAClB,CAAC;AAED,MAAM,UAAU,aAAa,CAAC,MAAc;IAC1C,IAAI,CAAC;QACH,MAAM,CAAC,GAAG,IAAI,GAAG,CAAC,MAAM,CAAC,CAAC;QAC1B,IAAI,CAAC,CAAC,QAAQ,KAAK,OAAO,IAAI,CAAC,CAAC,QAAQ,KAAK,QAAQ;YAAE,OAAO,KAAK,CAAC;QACpE,OAAO,CAAC,CAAC,QAAQ,KAAK,WAAW,IAAI,CAAC,CAAC,QAAQ,KAAK,WAAW,IAAI,CAAC,CAAC,QAAQ,KAAK,OAAO,CAAC;IAC5F,CAAC;IAAC,MAAM,CAAC;QACP,OAAO,KAAK,CAAC;IACf,CAAC;AACH,CAAC;AAED,MAAM,CAAC,MAAM,mBAAmB,GAAG,IAAI,CAAC;AAExC;;;GAGG;AACH,MAAM,CAAC,MAAM,8BAA8B,GAAG,2CAA2C,CAAC;AAE1F;;;;GAIG;AACH,MAAM,CAAC,MAAM,yBAAyB,GAAG,sCAAsC,CAAC;AAEhF;;;;;;;GAOG;AACH,MAAM,UAAU,qBAAqB,CAAC,IAAa;IACjD,IAAI,IAAI,KAAK,IAAI,IAAI,IAAI,KAAK,SAAS;QAAE,OAAO,IAAI,CAAC;IACrD,IAAI,OAAO,IAAI,KAAK,QAAQ;QAAE,OAAO,IAAI,CAAC;IAC1C,MAAM,CAAC,GAAG,IAA+B,CAAC;IAC1C,MAAM,IAAI,GAAG,MAAM,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;IAC5B,IAAI,IAAI,CAAC,MAAM,KAAK,CAAC,IAAI,MAAM,CAAC,SAAS,CAAC,cAAc,CAAC,IAAI,CAAC,CAAC,EAAE,QAAQ,CAAC,EAAE,CAAC;QAC3E,OAAO,CAAC,CAAC,MAAM,CAAC;IAClB,CAAC;IACD,OAAO,IAAI,CAAC;AACd,CAAC;AAED;;;;;GAKG;AACH,MAAM,UAAU,cAAc,CAAC,YAAY,GAAG,IAAI,CAAC,OAAO,EAAE,EAAE,cAAc,EAAE,MAAM,CAAC;IACnF,IAAI,CAAC,UAAU,CAAC,YAAY,CAAC;QAAE,OAAO,mBAAmB,CAAC;IAC1D,IAAI,CAAC;QACH,MAAM,GAAG,GAAG,YAAY,CAAC,YAAY,EAAE,OAAO,CAAC,CAAC,IAAI,EAAE,CAAC;QACvD,MAAM,MAAM,GAAG,MAAM,CAAC,GAAG,CAAC,CAAC;QAC3B,IAAI,MAAM,CAAC,SAAS,CAAC,MAAM,CAAC,IAAI,MAAM,GAAG,CAAC,IAAI,MAAM,IAAI,KAAK,EAAE,CAAC;YAC9D,OAAO,MAAM,CAAC;QAChB,CAAC;IACH,CAAC;IAAC,MAAM,CAAC;QACP,SAAS;IACX,CAAC;IACD,OAAO,mBAAmB,CAAC;AAC7B,CAAC;AAED;;;;GAIG;AACH,MAAM,UAAU,wBAAwB,CAAC,YAAY,GAAG,IAAI,CAAC,OAAO,EAAE,EAAE,cAAc,EAAE,MAAM,CAAC;IAC7F,IAAI,CAAC;QACH,OAAO,QAAQ,CAAC,YAAY,CAAC,CAAC,OAAO,CAAC;IACxC,CAAC;IAAC,MAAM,CAAC;QACP,OAAO,IAAI,CAAC;IACd,CAAC;AACH,CAAC;AAED,MAAM,iCAAiC,GAAG,CAAC,GAAG,EAAE,GAAG,IAAI,CAAC;AAExD;;;GAGG;AACH,MAAM,UAAU,2BAA2B,CACzC,OAAsB,EACtB,IAA4C;IAE5C,IAAI,OAAO,KAAK,IAAI;QAAE,OAAO,IAAI,CAAC;IAClC,MAAM,KAAK,GAAG,IAAI,EAAE,KAAK,IAAI,IAAI,CAAC,GAAG,EAAE,CAAC;IACxC,MAAM,QAAQ,GAAG,IAAI,EAAE,QAAQ,IAAI,iCAAiC,CAAC;IACrE,MAAM,KAAK,GAAG,KAAK,GAAG,OAAO,CAAC;IAC9B,OAAO,KAAK,GAAG,QAAQ,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,IAAI,CAAC;AACzC,CAAC"}
|
|
1
|
+
{"version":3,"file":"utils.js","sourceRoot":"","sources":["../../src/utils.ts"],"names":[],"mappings":"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"}
|
|
@@ -8,7 +8,7 @@
|
|
|
8
8
|
* Files written under `~/.thinkrun/` (or THINKRUN_LOCK_DIR in tests):
|
|
9
9
|
* locks/{tabId}.lock — who currently owns this tab (persists across commands)
|
|
10
10
|
* working-location.json — which tab this agent is currently using (shared, stable)
|
|
11
|
-
* groups/{name}.lock
|
|
11
|
+
* groups/{hashed-name}.lock — named group pointing to a tab
|
|
12
12
|
*
|
|
13
13
|
* The working-location file uses a stable name (not PID-scoped) so that separate
|
|
14
14
|
* CLI command invocations (each a new process) can share the same attachment
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"working-location.d.ts","sourceRoot":"","sources":["../../src/working-location.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;;GAqBG;
|
|
1
|
+
{"version":3,"file":"working-location.d.ts","sourceRoot":"","sources":["../../src/working-location.ts"],"names":[],"mappings":"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"}
|
|
@@ -8,7 +8,7 @@
|
|
|
8
8
|
* Files written under `~/.thinkrun/` (or THINKRUN_LOCK_DIR in tests):
|
|
9
9
|
* locks/{tabId}.lock — who currently owns this tab (persists across commands)
|
|
10
10
|
* working-location.json — which tab this agent is currently using (shared, stable)
|
|
11
|
-
* groups/{name}.lock
|
|
11
|
+
* groups/{hashed-name}.lock — named group pointing to a tab
|
|
12
12
|
*
|
|
13
13
|
* The working-location file uses a stable name (not PID-scoped) so that separate
|
|
14
14
|
* CLI command invocations (each a new process) can share the same attachment
|
|
@@ -26,6 +26,7 @@ import { dirname, join } from 'node:path';
|
|
|
26
26
|
import { randomUUID } from 'node:crypto';
|
|
27
27
|
import { getAgentFilePath, resolveAgentId } from './session/agent-identity.js';
|
|
28
28
|
import { config } from './config/store.js';
|
|
29
|
+
import { getGroupBindingKey, getLegacyGroupBindingKey } from '../shared/group-binding-key.js';
|
|
29
30
|
// ─── Directory resolution ────────────────────────────────────────────────────
|
|
30
31
|
function getLockDir() {
|
|
31
32
|
const configuredDir = process.env['THINKRUN_LOCK_DIR'] ?? process.env['THINKBROWSE_LOCK_DIR'];
|
|
@@ -113,11 +114,49 @@ export function getCliSessionFilePath(tabId) {
|
|
|
113
114
|
return join(getLockDir(), `local-session-${safe}.json`);
|
|
114
115
|
}
|
|
115
116
|
function groupFilePath(group) {
|
|
116
|
-
|
|
117
|
-
|
|
118
|
-
|
|
119
|
-
|
|
120
|
-
|
|
117
|
+
return join(getLockDir(), 'groups', `${getGroupBindingKey(group)}.lock`);
|
|
118
|
+
}
|
|
119
|
+
function legacyGroupFilePath(group) {
|
|
120
|
+
return join(getLockDir(), 'groups', `${getLegacyGroupBindingKey(group)}.lock`);
|
|
121
|
+
}
|
|
122
|
+
function groupFileCandidates(group) {
|
|
123
|
+
const currentPath = groupFilePath(group);
|
|
124
|
+
const legacyPath = legacyGroupFilePath(group);
|
|
125
|
+
return currentPath === legacyPath ? [currentPath] : [currentPath, legacyPath];
|
|
126
|
+
}
|
|
127
|
+
function readMatchingGroupBinding(path, group) {
|
|
128
|
+
try {
|
|
129
|
+
const location = JSON.parse(readFileSync(path, 'utf-8'));
|
|
130
|
+
return location.group === group ? location : null;
|
|
131
|
+
}
|
|
132
|
+
catch {
|
|
133
|
+
return null;
|
|
134
|
+
}
|
|
135
|
+
}
|
|
136
|
+
function writeGroupBinding(group, location) {
|
|
137
|
+
ensureDir(join(getLockDir(), 'groups'));
|
|
138
|
+
writeFileSync(groupFilePath(group), JSON.stringify(location), 'utf-8');
|
|
139
|
+
const legacyPath = legacyGroupFilePath(group);
|
|
140
|
+
if (legacyPath === groupFilePath(group))
|
|
141
|
+
return;
|
|
142
|
+
const legacy = readMatchingGroupBinding(legacyPath, group);
|
|
143
|
+
if (legacy) {
|
|
144
|
+
try {
|
|
145
|
+
rmSync(legacyPath, { force: true });
|
|
146
|
+
}
|
|
147
|
+
catch { /* best-effort cleanup; preserve prior write semantics */ }
|
|
148
|
+
}
|
|
149
|
+
}
|
|
150
|
+
function removeGroupBindingIfMatches(group, expected) {
|
|
151
|
+
for (const path of groupFileCandidates(group)) {
|
|
152
|
+
const location = readMatchingGroupBinding(path, group);
|
|
153
|
+
if (location && sameLeaseIdentity(location, expected)) {
|
|
154
|
+
try {
|
|
155
|
+
rmSync(path, { force: true });
|
|
156
|
+
}
|
|
157
|
+
catch { /* best-effort cleanup; preserve prior release semantics */ }
|
|
158
|
+
}
|
|
159
|
+
}
|
|
121
160
|
}
|
|
122
161
|
function sharedLocalSessionTabId() {
|
|
123
162
|
try {
|
|
@@ -762,18 +801,8 @@ export function commitReleaseReservation(reservation, group, bindingClaimHeld =
|
|
|
762
801
|
rmSync(lockFilePath(reservation.tabId), { force: true });
|
|
763
802
|
const groupName = group ?? reservation.previousLock?.group;
|
|
764
803
|
if (groupName != null) {
|
|
765
|
-
|
|
766
|
-
|
|
767
|
-
if (existsSync(path)) {
|
|
768
|
-
const groupLoc = JSON.parse(readFileSync(path, 'utf-8'));
|
|
769
|
-
if (reservation.previousLock && sameLeaseIdentity(groupLoc, reservation.previousLock)) {
|
|
770
|
-
rmSync(path, { force: true });
|
|
771
|
-
}
|
|
772
|
-
}
|
|
773
|
-
}
|
|
774
|
-
catch {
|
|
775
|
-
// Preserve an ambiguous group pointer rather than deleting a newer binding.
|
|
776
|
-
}
|
|
804
|
+
if (reservation.previousLock)
|
|
805
|
+
removeGroupBindingIfMatches(groupName, reservation.previousLock);
|
|
777
806
|
}
|
|
778
807
|
return finalize({ released: true, contextCleared: false });
|
|
779
808
|
}
|
|
@@ -918,13 +947,7 @@ export function clearStaleWorkingLocationPointerAfterPrivateRelease(releasedTabI
|
|
|
918
947
|
}
|
|
919
948
|
catch { /* preserve absent, malformed, or ambiguous legacy state */ }
|
|
920
949
|
if (currentPointer.group != null) {
|
|
921
|
-
|
|
922
|
-
try {
|
|
923
|
-
const groupPointer = JSON.parse(readFileSync(path, 'utf-8'));
|
|
924
|
-
if (sameLeaseIdentity(groupPointer, currentPointer))
|
|
925
|
-
rmSync(path, { force: true });
|
|
926
|
-
}
|
|
927
|
-
catch { /* preserve absent, malformed, or rebound group state */ }
|
|
950
|
+
removeGroupBindingIfMatches(currentPointer.group, currentPointer);
|
|
928
951
|
}
|
|
929
952
|
rmSync(workingLocationFilePath(), { force: true });
|
|
930
953
|
_currentLocation = null;
|
|
@@ -980,18 +1003,17 @@ export function setWorkingLocation(loc, bindingClaimHeld = false, reservation) {
|
|
|
980
1003
|
// process crashes between the lock acquisition and the writeFileSync completing.
|
|
981
1004
|
ensureDir(join(getLockDir(), 'working-locations'));
|
|
982
1005
|
atomicWrite(workingLocationFilePath(), JSON.stringify(full));
|
|
983
|
-
// Write named group file if requested (group may be empty string —
|
|
1006
|
+
// Write named group file if requested (group may be empty string — hashed in groupFilePath).
|
|
984
1007
|
// Use != null to guard against both undefined and null at JS runtime boundaries.
|
|
985
1008
|
if (group != null) {
|
|
986
|
-
|
|
987
|
-
writeFileSync(groupFilePath(group), JSON.stringify(full), 'utf-8');
|
|
1009
|
+
writeGroupBinding(group, full);
|
|
988
1010
|
}
|
|
989
|
-
//
|
|
990
|
-
//
|
|
991
|
-
// we never leave the directory in an inconsistent state.
|
|
1011
|
+
// Retire a previous group pointer only after writing the new binding; the
|
|
1012
|
+
// file-level writes are best-effort and are not a multi-file transaction.
|
|
992
1013
|
if (prevGroup != null && prevGroup !== group) {
|
|
993
1014
|
try {
|
|
994
|
-
|
|
1015
|
+
if (_currentLocation)
|
|
1016
|
+
removeGroupBindingIfMatches(prevGroup, _currentLocation);
|
|
995
1017
|
}
|
|
996
1018
|
catch (err) {
|
|
997
1019
|
// Suppress ENOENT (file already gone) but warn on permission or other errors
|
|
@@ -1022,8 +1044,7 @@ export function updateWorkingLocationControlSession(controlSessionId, bindingCla
|
|
|
1022
1044
|
atomicWrite(lockFilePath(current.tabId), JSON.stringify(next));
|
|
1023
1045
|
atomicWrite(workingLocationFilePath(), JSON.stringify(next));
|
|
1024
1046
|
if (current.group != null) {
|
|
1025
|
-
|
|
1026
|
-
writeFileSync(groupFilePath(current.group), JSON.stringify(next), 'utf-8');
|
|
1047
|
+
writeGroupBinding(current.group, next);
|
|
1027
1048
|
}
|
|
1028
1049
|
_currentLocation = next;
|
|
1029
1050
|
}
|
|
@@ -1105,6 +1126,8 @@ export function releaseWorkingLocation(group, reservation, tabIdHint, claimHeld
|
|
|
1105
1126
|
: tabIdHint != null
|
|
1106
1127
|
? readWorkingLocationPointer()
|
|
1107
1128
|
: getWorkingLocation();
|
|
1129
|
+
if (group != null && loc && loc.group !== group)
|
|
1130
|
+
return false;
|
|
1108
1131
|
let staleHintFallback = false;
|
|
1109
1132
|
let usedTabIdHint = false;
|
|
1110
1133
|
if (tabIdHint != null && loc && loc.tabId !== tabIdHint)
|
|
@@ -1135,28 +1158,38 @@ export function releaseWorkingLocation(group, reservation, tabIdHint, claimHeld
|
|
|
1135
1158
|
let groupFallback = false; // tracks whether we resolved via the group file
|
|
1136
1159
|
let groupFallbackStale = false;
|
|
1137
1160
|
if (!loc && group != null) {
|
|
1138
|
-
const gPath
|
|
1139
|
-
|
|
1140
|
-
|
|
1141
|
-
|
|
1142
|
-
|
|
1143
|
-
|
|
1144
|
-
|
|
1145
|
-
|
|
1146
|
-
|
|
1147
|
-
|
|
1148
|
-
|
|
1149
|
-
|
|
1150
|
-
|
|
1151
|
-
|
|
1152
|
-
|
|
1153
|
-
|
|
1154
|
-
|
|
1155
|
-
|
|
1156
|
-
|
|
1157
|
-
|
|
1161
|
+
for (const gPath of groupFileCandidates(group)) {
|
|
1162
|
+
if (!existsSync(gPath))
|
|
1163
|
+
continue;
|
|
1164
|
+
const groupLoc = readMatchingGroupBinding(gPath, group);
|
|
1165
|
+
// A lossy legacy key may belong to another group. Do not guess or try a
|
|
1166
|
+
// second binding when a candidate path contains mismatched/corrupt data.
|
|
1167
|
+
if (!groupLoc)
|
|
1168
|
+
return false;
|
|
1169
|
+
let activeLock = getLockedBy(groupLoc.tabId);
|
|
1170
|
+
if (activeLock?.reservationId) {
|
|
1171
|
+
activeLock = recoverStaleReservation(groupLoc.tabId, activeLock);
|
|
1172
|
+
}
|
|
1173
|
+
const committedLock = activeLock?.reservationBase ?? activeLock;
|
|
1174
|
+
if (committedLock && (committedLock.group !== group
|
|
1175
|
+
|| groupLoc.group !== group
|
|
1176
|
+
|| !sameLeaseIdentity(committedLock, groupLoc)))
|
|
1177
|
+
return false;
|
|
1178
|
+
const currentAgentId = resolveAgentId();
|
|
1179
|
+
const ownedByAgent = !!groupLoc.agentId && groupLoc.agentId === currentAgentId;
|
|
1180
|
+
const ownedByPid = groupLoc.pid === process.pid;
|
|
1181
|
+
const ownerPid = groupLoc.ownerShellPid ?? groupLoc.pid;
|
|
1182
|
+
const stale = !isPidAlive(ownerPid);
|
|
1183
|
+
// A command PID can be gone while its owning shell remains live. Only
|
|
1184
|
+
// same-agent ownership, this process, or a genuinely stale owner may release it.
|
|
1185
|
+
if (!ownedByAgent && !ownedByPid && !stale) {
|
|
1186
|
+
process.stderr.write(`[thinkrun] warn: group '${group}' is held by live owner PID ${ownerPid} — cannot release\n`);
|
|
1187
|
+
return false;
|
|
1158
1188
|
}
|
|
1159
|
-
|
|
1189
|
+
loc = groupLoc;
|
|
1190
|
+
groupFallback = true;
|
|
1191
|
+
groupFallbackStale = stale && !ownedByAgent && !ownedByPid;
|
|
1192
|
+
break;
|
|
1160
1193
|
}
|
|
1161
1194
|
}
|
|
1162
1195
|
if (loc) {
|
|
@@ -1252,18 +1285,7 @@ export function releaseWorkingLocation(group, reservation, tabIdHint, claimHeld
|
|
|
1252
1285
|
// back to the one stored in the working location.
|
|
1253
1286
|
const groupName = group ?? loc.group;
|
|
1254
1287
|
if (groupName != null) {
|
|
1255
|
-
|
|
1256
|
-
if (existsSync(gPath)) {
|
|
1257
|
-
try {
|
|
1258
|
-
const groupLoc = JSON.parse(readFileSync(gPath, 'utf-8'));
|
|
1259
|
-
if (sameLeaseIdentity(groupLoc, loc)) {
|
|
1260
|
-
rmSync(gPath, { force: true });
|
|
1261
|
-
}
|
|
1262
|
-
}
|
|
1263
|
-
catch {
|
|
1264
|
-
// Preserve an ambiguous or newer group pointer.
|
|
1265
|
-
}
|
|
1266
|
-
}
|
|
1288
|
+
removeGroupBindingIfMatches(groupName, loc);
|
|
1267
1289
|
}
|
|
1268
1290
|
}
|
|
1269
1291
|
if (loc && _currentLocation?.tabId === loc.tabId)
|