@aligndottech/cli 0.47.0 → 0.48.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/commands/agents.d.ts +20 -0
- package/dist/commands/agents.d.ts.map +1 -0
- package/dist/commands/agents.js +60 -0
- package/dist/commands/agents.js.map +1 -0
- package/dist/commands/connect-agents.d.ts +3 -1
- package/dist/commands/connect-agents.d.ts.map +1 -1
- package/dist/commands/connect-agents.js +15 -5
- package/dist/commands/connect-agents.js.map +1 -1
- package/dist/commands/registry.d.ts.map +1 -1
- package/dist/commands/registry.js +3 -0
- package/dist/commands/registry.js.map +1 -1
- package/dist/commands/setup.d.ts +1 -0
- package/dist/commands/setup.d.ts.map +1 -1
- package/dist/commands/setup.js +10 -5
- package/dist/commands/setup.js.map +1 -1
- package/dist/commands/use.js +1 -1
- package/dist/commands/use.js.map +1 -1
- package/dist/lib/foreign-env.d.ts +11 -0
- package/dist/lib/foreign-env.d.ts.map +1 -1
- package/dist/lib/foreign-env.js +23 -0
- package/dist/lib/foreign-env.js.map +1 -1
- package/dist/lib/launch/adapters/claude-code.d.ts +8 -0
- package/dist/lib/launch/adapters/claude-code.d.ts.map +1 -1
- package/dist/lib/launch/adapters/claude-code.js.map +1 -1
- package/dist/lib/launch/adapters/codex.d.ts +17 -0
- package/dist/lib/launch/adapters/codex.d.ts.map +1 -0
- package/dist/lib/launch/adapters/codex.js +44 -0
- package/dist/lib/launch/adapters/codex.js.map +1 -0
- package/dist/lib/launch/adapters/copilot.d.ts +17 -0
- package/dist/lib/launch/adapters/copilot.d.ts.map +1 -0
- package/dist/lib/launch/adapters/copilot.js +29 -0
- package/dist/lib/launch/adapters/copilot.js.map +1 -0
- package/dist/lib/launch/adapters/gemini-cli.d.ts +25 -0
- package/dist/lib/launch/adapters/gemini-cli.d.ts.map +1 -0
- package/dist/lib/launch/adapters/gemini-cli.js +73 -0
- package/dist/lib/launch/adapters/gemini-cli.js.map +1 -0
- package/dist/lib/launch/agents.d.ts +12 -2
- package/dist/lib/launch/agents.d.ts.map +1 -1
- package/dist/lib/launch/agents.js +18 -8
- package/dist/lib/launch/agents.js.map +1 -1
- package/dist/lib/launch/codex-state.d.ts +31 -0
- package/dist/lib/launch/codex-state.d.ts.map +1 -0
- package/dist/lib/launch/codex-state.js +92 -0
- package/dist/lib/launch/codex-state.js.map +1 -0
- package/dist/lib/launch/copilot-state.d.ts +19 -0
- package/dist/lib/launch/copilot-state.d.ts.map +1 -0
- package/dist/lib/launch/copilot-state.js +51 -0
- package/dist/lib/launch/copilot-state.js.map +1 -0
- package/dist/lib/launch/gemini-state.d.ts +32 -0
- package/dist/lib/launch/gemini-state.d.ts.map +1 -0
- package/dist/lib/launch/gemini-state.js +59 -0
- package/dist/lib/launch/gemini-state.js.map +1 -0
- package/dist/lib/launch/gemini-trust.d.ts +26 -0
- package/dist/lib/launch/gemini-trust.d.ts.map +1 -0
- package/dist/lib/launch/gemini-trust.js +103 -0
- package/dist/lib/launch/gemini-trust.js.map +1 -0
- package/dist/lib/launch/install.d.ts +33 -0
- package/dist/lib/launch/install.d.ts.map +1 -0
- package/dist/lib/launch/install.js +48 -0
- package/dist/lib/launch/install.js.map +1 -0
- package/dist/lib/launch/launch-files.d.ts +15 -0
- package/dist/lib/launch/launch-files.d.ts.map +1 -1
- package/dist/lib/launch/launch-files.js +64 -4
- package/dist/lib/launch/launch-files.js.map +1 -1
- package/dist/lib/launch/launch.d.ts +32 -7
- package/dist/lib/launch/launch.d.ts.map +1 -1
- package/dist/lib/launch/launch.js +66 -40
- package/dist/lib/launch/launch.js.map +1 -1
- package/dist/lib/launch/pick-agent.d.ts +12 -5
- package/dist/lib/launch/pick-agent.d.ts.map +1 -1
- package/dist/lib/launch/pick-agent.js +46 -19
- package/dist/lib/launch/pick-agent.js.map +1 -1
- package/dist/lib/launch/picker-options.d.ts +30 -0
- package/dist/lib/launch/picker-options.d.ts.map +1 -0
- package/dist/lib/launch/picker-options.js +42 -0
- package/dist/lib/launch/picker-options.js.map +1 -0
- package/dist/lib/launch/prompts.d.ts +11 -0
- package/dist/lib/launch/prompts.d.ts.map +1 -0
- package/dist/lib/launch/prompts.js +27 -0
- package/dist/lib/launch/prompts.js.map +1 -0
- package/dist/lib/launch/registry/agents/claude-code.d.ts +3 -0
- package/dist/lib/launch/registry/agents/claude-code.d.ts.map +1 -0
- package/dist/lib/launch/registry/agents/claude-code.js +11 -0
- package/dist/lib/launch/registry/agents/claude-code.js.map +1 -0
- package/dist/lib/launch/registry/agents/codex.d.ts +3 -0
- package/dist/lib/launch/registry/agents/codex.d.ts.map +1 -0
- package/dist/lib/launch/registry/agents/codex.js +11 -0
- package/dist/lib/launch/registry/agents/codex.js.map +1 -0
- package/dist/lib/launch/registry/agents/copilot.d.ts +3 -0
- package/dist/lib/launch/registry/agents/copilot.d.ts.map +1 -0
- package/dist/lib/launch/registry/agents/copilot.js +11 -0
- package/dist/lib/launch/registry/agents/copilot.js.map +1 -0
- package/dist/lib/launch/registry/agents/cursor.d.ts +3 -0
- package/dist/lib/launch/registry/agents/cursor.d.ts.map +1 -0
- package/dist/lib/launch/registry/agents/cursor.js +11 -0
- package/dist/lib/launch/registry/agents/cursor.js.map +1 -0
- package/dist/lib/launch/registry/agents/gemini-cli.d.ts +3 -0
- package/dist/lib/launch/registry/agents/gemini-cli.d.ts.map +1 -0
- package/dist/lib/launch/registry/agents/gemini-cli.js +11 -0
- package/dist/lib/launch/registry/agents/gemini-cli.js.map +1 -0
- package/dist/lib/launch/registry/agents/opencode.d.ts +3 -0
- package/dist/lib/launch/registry/agents/opencode.d.ts.map +1 -0
- package/dist/lib/launch/registry/agents/opencode.js +11 -0
- package/dist/lib/launch/registry/agents/opencode.js.map +1 -0
- package/dist/lib/launch/registry/agents/pi.d.ts +3 -0
- package/dist/lib/launch/registry/agents/pi.d.ts.map +1 -0
- package/dist/lib/launch/registry/agents/pi.js +11 -0
- package/dist/lib/launch/registry/agents/pi.js.map +1 -0
- package/dist/lib/launch/registry/index.d.ts +5 -0
- package/dist/lib/launch/registry/index.d.ts.map +1 -0
- package/dist/lib/launch/registry/index.js +13 -0
- package/dist/lib/launch/registry/index.js.map +1 -0
- package/dist/lib/launch/registry/types.d.ts +31 -0
- package/dist/lib/launch/registry/types.d.ts.map +1 -0
- package/dist/lib/launch/registry/types.js +2 -0
- package/dist/lib/launch/registry/types.js.map +1 -0
- package/dist/lib/launch/run-agent.d.ts +4 -0
- package/dist/lib/launch/run-agent.d.ts.map +1 -1
- package/dist/lib/launch/run-agent.js +1 -1
- package/dist/lib/launch/run-agent.js.map +1 -1
- package/dist/lib/launch/strict-entry.d.ts +49 -0
- package/dist/lib/launch/strict-entry.d.ts.map +1 -0
- package/dist/lib/launch/strict-entry.js +106 -0
- package/dist/lib/launch/strict-entry.js.map +1 -0
- package/package.json +3 -2
|
@@ -0,0 +1,51 @@
|
|
|
1
|
+
import { existsSync, readFileSync } from 'node:fs';
|
|
2
|
+
import path from 'node:path';
|
|
3
|
+
import { foldLayers, parseJsonc } from './strict-entry.js';
|
|
4
|
+
function layer(file) {
|
|
5
|
+
let text = null;
|
|
6
|
+
try {
|
|
7
|
+
text = readFileSync(file, 'utf8');
|
|
8
|
+
}
|
|
9
|
+
catch {
|
|
10
|
+
// missing or unreadable: no servers
|
|
11
|
+
}
|
|
12
|
+
return { file, servers: parseJsonc(text)?.['mcpServers'] };
|
|
13
|
+
}
|
|
14
|
+
/** cwd up to and including the git root; with no .git anywhere above, cwd alone. Never past the root. */
|
|
15
|
+
function workspaceDirs(cwd) {
|
|
16
|
+
const dirs = [];
|
|
17
|
+
for (let dir = cwd;; dir = path.dirname(dir)) {
|
|
18
|
+
dirs.push(dir);
|
|
19
|
+
if (existsSync(path.join(dir, '.git')))
|
|
20
|
+
return dirs;
|
|
21
|
+
if (path.dirname(dir) === dir)
|
|
22
|
+
return [cwd];
|
|
23
|
+
}
|
|
24
|
+
}
|
|
25
|
+
/**
|
|
26
|
+
* What Copilot CLI (1.0.95) would already load for align. User: $COPILOT_HOME (or ~/.copilot)
|
|
27
|
+
* /mcp-config.json. Workspace: .mcp.json and .github/mcp.json from cwd up to the git root.
|
|
28
|
+
*
|
|
29
|
+
* Copilot loads the workspace files only in a trusted folder, but that verdict comes from its
|
|
30
|
+
* native runtime and several sources (its own store, IDE workspace folders, settings), none of
|
|
31
|
+
* which align can read reliably; only COPILOT_ALLOW_ALL=true is certain. And whether
|
|
32
|
+
* --additional-mcp-config replaces a same-named server whole is also native. So, both ways safe:
|
|
33
|
+
* - a workspace entry counts as "already present" only under COPILOT_ALLOW_ALL=true
|
|
34
|
+
* (otherwise inject: the worst case is a duplicate server, never a missing graph);
|
|
35
|
+
* - a non-canonical align-local in ANY of these files is a conflict (no injection), because
|
|
36
|
+
* a merged, repo-shaped align-local must never be launched.
|
|
37
|
+
*/
|
|
38
|
+
export function readCopilotState(cwd, home, opts, env, platform) {
|
|
39
|
+
const o = { ...opts, platform, host: 'copilot' };
|
|
40
|
+
const userFile = path.join(env['COPILOT_HOME'] ? env['COPILOT_HOME'] : path.join(home, '.copilot'), 'mcp-config.json');
|
|
41
|
+
const never = () => false;
|
|
42
|
+
const user = foldLayers([layer(userFile)], o, never);
|
|
43
|
+
const workspace = foldLayers(workspaceDirs(cwd).reverse().flatMap((d) => [layer(path.join(d, '.mcp.json')), layer(path.join(d, '.github', 'mcp.json'))]), o, never);
|
|
44
|
+
const conflict = user.conflict ?? workspace.conflict;
|
|
45
|
+
return {
|
|
46
|
+
present: user.present || (env['COPILOT_ALLOW_ALL'] === 'true' && workspace.present),
|
|
47
|
+
overridden: [],
|
|
48
|
+
...(conflict ? { conflict } : {}),
|
|
49
|
+
};
|
|
50
|
+
}
|
|
51
|
+
//# sourceMappingURL=copilot-state.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"copilot-state.js","sourceRoot":"","sources":["../../../src/lib/launch/copilot-state.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,YAAY,EAAE,MAAM,SAAS,CAAC;AACnD,OAAO,IAAI,MAAM,WAAW,CAAC;AAC7B,OAAO,EAAwB,UAAU,EAAc,UAAU,EAAE,MAAM,mBAAmB,CAAC;AAI7F,SAAS,KAAK,CAAC,IAAY;IACzB,IAAI,IAAI,GAAkB,IAAI,CAAC;IAC/B,IAAI,CAAC;QACH,IAAI,GAAG,YAAY,CAAC,IAAI,EAAE,MAAM,CAAC,CAAC;IACpC,CAAC;IAAC,MAAM,CAAC;QACP,oCAAoC;IACtC,CAAC;IACD,OAAO,EAAE,IAAI,EAAE,OAAO,EAAE,UAAU,CAAC,IAAI,CAAC,EAAE,CAAC,YAAY,CAAC,EAAE,CAAC;AAC7D,CAAC;AAED,yGAAyG;AACzG,SAAS,aAAa,CAAC,GAAW;IAChC,MAAM,IAAI,GAAa,EAAE,CAAC;IAC1B,KAAK,IAAI,GAAG,GAAG,GAAG,GAAI,GAAG,GAAG,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,EAAE,CAAC;QAC9C,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;QACf,IAAI,UAAU,CAAC,IAAI,CAAC,IAAI,CAAC,GAAG,EAAE,MAAM,CAAC,CAAC;YAAE,OAAO,IAAI,CAAC;QACpD,IAAI,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,KAAK,GAAG;YAAE,OAAO,CAAC,GAAG,CAAC,CAAC;IAC9C,CAAC;AACH,CAAC;AAED;;;;;;;;;;;;GAYG;AACH,MAAM,UAAU,gBAAgB,CAC9B,GAAW,EACX,IAAY,EACZ,IAAiC,EACjC,GAAuC,EACvC,QAAgB;IAEhB,MAAM,CAAC,GAAG,EAAE,GAAG,IAAI,EAAE,QAAQ,EAAE,IAAI,EAAE,SAAkB,EAAE,CAAC;IAC1D,MAAM,QAAQ,GAAG,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,cAAc,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,cAAc,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,EAAE,UAAU,CAAC,EAAE,iBAAiB,CAAC,CAAC;IACvH,MAAM,KAAK,GAAG,GAAY,EAAE,CAAC,KAAK,CAAC;IACnC,MAAM,IAAI,GAAG,UAAU,CAAC,CAAC,KAAK,CAAC,QAAQ,CAAC,CAAC,EAAE,CAAC,EAAE,KAAK,CAAC,CAAC;IACrD,MAAM,SAAS,GAAG,UAAU,CAC1B,aAAa,CAAC,GAAG,CAAC,CAAC,OAAO,EAAE,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,EAAE,WAAW,CAAC,CAAC,EAAE,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,EAAE,SAAS,EAAE,UAAU,CAAC,CAAC,CAAC,CAAC,EAC3H,CAAC,EACD,KAAK,CACN,CAAC;IACF,MAAM,QAAQ,GAAG,IAAI,CAAC,QAAQ,IAAI,SAAS,CAAC,QAAQ,CAAC;IACrD,OAAO;QACL,OAAO,EAAE,IAAI,CAAC,OAAO,IAAI,CAAC,GAAG,CAAC,mBAAmB,CAAC,KAAK,MAAM,IAAI,SAAS,CAAC,OAAO,CAAC;QACnF,UAAU,EAAE,EAAE;QACd,GAAG,CAAC,QAAQ,CAAC,CAAC,CAAC,EAAE,QAAQ,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;KAClC,CAAC;AACJ,CAAC"}
|
|
@@ -0,0 +1,32 @@
|
|
|
1
|
+
import { type GeminiTrust } from './gemini-trust.js';
|
|
2
|
+
import { type AlignLocalState } from './strict-entry.js';
|
|
3
|
+
/** The system settings file Gemini would read with no help from align, and what it holds. */
|
|
4
|
+
export interface GeminiSystemSettings {
|
|
5
|
+
path: string;
|
|
6
|
+
/** Its text; null when it does not exist (or is unreadable). */
|
|
7
|
+
text: string | null;
|
|
8
|
+
/** It exists but could not be read (a directory, no permission). */
|
|
9
|
+
unreadable: boolean;
|
|
10
|
+
}
|
|
11
|
+
export interface GeminiProjectState extends AlignLocalState {
|
|
12
|
+
systemSettings: GeminiSystemSettings;
|
|
13
|
+
trust: GeminiTrust;
|
|
14
|
+
}
|
|
15
|
+
/**
|
|
16
|
+
* The launch-cache name of the merged copy of one system settings file. One name per SOURCE,
|
|
17
|
+
* so two concurrent launches that read different system files never write the same copy.
|
|
18
|
+
*/
|
|
19
|
+
export declare const COPY_PREFIX = "gemini-system-settings-";
|
|
20
|
+
export declare function geminiCopyName(source: string): string;
|
|
21
|
+
/**
|
|
22
|
+
* What Gemini CLI would already load here, in its merge order (gemini 0.58.0 mergeSettings:
|
|
23
|
+
* system-defaults, user, workspace, system): system-defaults, ~/.gemini (or $GEMINI_CLI_HOME)
|
|
24
|
+
* settings, the project's .gemini/settings.json ONLY when the folder is trusted (Gemini drops
|
|
25
|
+
* the workspace layer otherwise), and the system file. Files are JSONC, as Gemini reads them.
|
|
26
|
+
* mcpServers merges shallowly with the system tier last, so the injected system copy replaces
|
|
27
|
+
* any align-local whole: a non-canonical one is overridden, never a conflict.
|
|
28
|
+
*/
|
|
29
|
+
export declare function readGeminiState(cwd: string, home: string, opts: {
|
|
30
|
+
localIsDefault: boolean;
|
|
31
|
+
}, env: Record<string, string | undefined>, platform: string): GeminiProjectState;
|
|
32
|
+
//# sourceMappingURL=gemini-state.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"gemini-state.d.ts","sourceRoot":"","sources":["../../../src/lib/launch/gemini-state.ts"],"names":[],"mappings":"AAGA,OAAO,EAAoF,KAAK,WAAW,EAAE,MAAM,mBAAmB,CAAC;AACvI,OAAO,EAAE,KAAK,eAAe,EAA6D,MAAM,mBAAmB,CAAC;AAEpH,6FAA6F;AAC7F,MAAM,WAAW,oBAAoB;IACnC,IAAI,EAAE,MAAM,CAAC;IACb,gEAAgE;IAChE,IAAI,EAAE,MAAM,GAAG,IAAI,CAAC;IACpB,oEAAoE;IACpE,UAAU,EAAE,OAAO,CAAC;CACrB;AAED,MAAM,WAAW,kBAAmB,SAAQ,eAAe;IACzD,cAAc,EAAE,oBAAoB,CAAC;IACrC,KAAK,EAAE,WAAW,CAAC;CACpB;AAED;;;GAGG;AACH,eAAO,MAAM,WAAW,4BAA4B,CAAC;AAErD,wBAAgB,cAAc,CAAC,MAAM,EAAE,MAAM,GAAG,MAAM,CAErD;AAoBD;;;;;;;GAOG;AACH,wBAAgB,eAAe,CAC7B,GAAG,EAAE,MAAM,EACX,IAAI,EAAE,MAAM,EACZ,IAAI,EAAE;IAAE,cAAc,EAAE,OAAO,CAAA;CAAE,EACjC,GAAG,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,GAAG,SAAS,CAAC,EACvC,QAAQ,EAAE,MAAM,GACf,kBAAkB,CAmBpB"}
|
|
@@ -0,0 +1,59 @@
|
|
|
1
|
+
import { createHash } from 'node:crypto';
|
|
2
|
+
import { readFileSync } from 'node:fs';
|
|
3
|
+
import path from 'node:path';
|
|
4
|
+
import { geminiDir, geminiFolderTrust, geminiSystemDefaultsPath, geminiSystemSettingsPath } from './gemini-trust.js';
|
|
5
|
+
import { foldLayers, isCanonicalLocalEntry, parseJsonc } from './strict-entry.js';
|
|
6
|
+
/**
|
|
7
|
+
* The launch-cache name of the merged copy of one system settings file. One name per SOURCE,
|
|
8
|
+
* so two concurrent launches that read different system files never write the same copy.
|
|
9
|
+
*/
|
|
10
|
+
export const COPY_PREFIX = 'gemini-system-settings-';
|
|
11
|
+
export function geminiCopyName(source) {
|
|
12
|
+
return `${COPY_PREFIX}${createHash('sha256').update(path.resolve(source)).digest('hex').slice(0, 12)}.json`;
|
|
13
|
+
}
|
|
14
|
+
function readSystem(file) {
|
|
15
|
+
try {
|
|
16
|
+
return { path: file, text: readFileSync(file, 'utf8'), unreadable: false };
|
|
17
|
+
}
|
|
18
|
+
catch (e) {
|
|
19
|
+
return { path: file, text: null, unreadable: e.code !== 'ENOENT' };
|
|
20
|
+
}
|
|
21
|
+
}
|
|
22
|
+
function readText(file) {
|
|
23
|
+
try {
|
|
24
|
+
return readFileSync(file, 'utf8');
|
|
25
|
+
}
|
|
26
|
+
catch {
|
|
27
|
+
return null;
|
|
28
|
+
}
|
|
29
|
+
}
|
|
30
|
+
const layer = (file, text) => ({ file, servers: parseJsonc(text)?.['mcpServers'] });
|
|
31
|
+
/**
|
|
32
|
+
* What Gemini CLI would already load here, in its merge order (gemini 0.58.0 mergeSettings:
|
|
33
|
+
* system-defaults, user, workspace, system): system-defaults, ~/.gemini (or $GEMINI_CLI_HOME)
|
|
34
|
+
* settings, the project's .gemini/settings.json ONLY when the folder is trusted (Gemini drops
|
|
35
|
+
* the workspace layer otherwise), and the system file. Files are JSONC, as Gemini reads them.
|
|
36
|
+
* mcpServers merges shallowly with the system tier last, so the injected system copy replaces
|
|
37
|
+
* any align-local whole: a non-canonical one is overridden, never a conflict.
|
|
38
|
+
*/
|
|
39
|
+
export function readGeminiState(cwd, home, opts, env, platform) {
|
|
40
|
+
const system = readSystem(geminiSystemSettingsPath(env, platform));
|
|
41
|
+
const trust = geminiFolderTrust(cwd, home, env, platform);
|
|
42
|
+
const defaultsPath = env['GEMINI_CLI_SYSTEM_DEFAULTS_PATH'] ? env['GEMINI_CLI_SYSTEM_DEFAULTS_PATH'] : geminiSystemDefaultsPath(system.path, platform);
|
|
43
|
+
const userPath = path.join(geminiDir(home, env), 'settings.json');
|
|
44
|
+
const workspacePath = path.join(cwd, '.gemini', 'settings.json');
|
|
45
|
+
const layers = [
|
|
46
|
+
layer(defaultsPath, readText(defaultsPath)),
|
|
47
|
+
layer(userPath, readText(userPath)),
|
|
48
|
+
...(trust === 'trusted' || trust === 'off' ? [layer(workspacePath, readText(workspacePath))] : []),
|
|
49
|
+
layer(system.path, system.text),
|
|
50
|
+
];
|
|
51
|
+
const o = { ...opts, platform, host: 'mcpServers' };
|
|
52
|
+
const { overridden } = foldLayers(layers, o, () => true);
|
|
53
|
+
// Only the user's own `align` stands in for us. A canonical align-local does not: the system
|
|
54
|
+
// copy replaces it whole anyway, and skipping would let a workspace align-local trusted later
|
|
55
|
+
// take its place.
|
|
56
|
+
const present = layers.some((l) => isCanonicalLocalEntry(l.servers?.['align'], o));
|
|
57
|
+
return { present, overridden, systemSettings: system, trust };
|
|
58
|
+
}
|
|
59
|
+
//# sourceMappingURL=gemini-state.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"gemini-state.js","sourceRoot":"","sources":["../../../src/lib/launch/gemini-state.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,26 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* Whether Gemini CLI will run MCP servers in this folder. Gemini turns off EVERY MCP server,
|
|
3
|
+
* the injected align-local included, in a folder it does not trust.
|
|
4
|
+
* - trusted / untrusted: what Gemini will decide.
|
|
5
|
+
* - off: folder trust is turned off in the user's settings, so nothing is disabled.
|
|
6
|
+
* - unknown: trustedFolders.json is unreadable or invalid (Gemini itself refuses to start then).
|
|
7
|
+
*/
|
|
8
|
+
export type GeminiTrust = 'trusted' | 'untrusted' | 'off' | 'unknown';
|
|
9
|
+
/** Gemini's own default system settings file, used when GEMINI_CLI_SYSTEM_SETTINGS_PATH is unset. */
|
|
10
|
+
export declare function geminiSystemSettingsPath(env: Record<string, string | undefined>, platform: string): string;
|
|
11
|
+
/** GEMINI_CLI_SYSTEM_DEFAULTS_PATH, else `system-defaults.json` beside the system settings file. */
|
|
12
|
+
export declare function geminiSystemDefaultsPath(systemSettingsPath: string, platform: string): string;
|
|
13
|
+
/** ~/.gemini, or $GEMINI_CLI_HOME/.gemini when set. */
|
|
14
|
+
export declare function geminiDir(home: string, env: Record<string, string | undefined>): string;
|
|
15
|
+
/**
|
|
16
|
+
* Gemini CLI 0.58.0's folder-trust verdict for `cwd`, read from its own files and never written
|
|
17
|
+
* (packages/core/src/utils/trust.ts, cli/src/config/trustedFolders.ts):
|
|
18
|
+
* - GEMINI_CLI_TRUST_WORKSPACE=true|false decides outright;
|
|
19
|
+
* - folder trust turned off in settings means nothing is disabled;
|
|
20
|
+
* - else the LONGEST matching rule in trustedFolders.json decides, where TRUST_PARENT matches
|
|
21
|
+
* the rule's parent directory, and no matching rule is untrusted.
|
|
22
|
+
* Gemini also accepts a trust decision from a connected IDE; align cannot see that, so in an IDE
|
|
23
|
+
* terminal this can say untrusted for a folder Gemini will treat as trusted (one extra line).
|
|
24
|
+
*/
|
|
25
|
+
export declare function geminiFolderTrust(cwd: string, home: string, env: Record<string, string | undefined>, platform: string): GeminiTrust;
|
|
26
|
+
//# sourceMappingURL=gemini-trust.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"gemini-trust.d.ts","sourceRoot":"","sources":["../../../src/lib/launch/gemini-trust.ts"],"names":[],"mappings":"AAIA;;;;;;GAMG;AACH,MAAM,MAAM,WAAW,GAAG,SAAS,GAAG,WAAW,GAAG,KAAK,GAAG,SAAS,CAAC;AAgBtE,qGAAqG;AACrG,wBAAgB,wBAAwB,CAAC,GAAG,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,GAAG,SAAS,CAAC,EAAE,QAAQ,EAAE,MAAM,GAAG,MAAM,CAK1G;AAED,oGAAoG;AACpG,wBAAgB,wBAAwB,CAAC,kBAAkB,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,GAAG,MAAM,CAG7F;AAED,uDAAuD;AACvD,wBAAgB,SAAS,CAAC,IAAI,EAAE,MAAM,EAAE,GAAG,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,GAAG,SAAS,CAAC,GAAG,MAAM,CAEvF;AAqCD;;;;;;;;;GASG;AACH,wBAAgB,iBAAiB,CAAC,GAAG,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,EAAE,GAAG,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,GAAG,SAAS,CAAC,EAAE,QAAQ,EAAE,MAAM,GAAG,WAAW,CAuBnI"}
|
|
@@ -0,0 +1,103 @@
|
|
|
1
|
+
import { existsSync, readFileSync, realpathSync } from 'node:fs';
|
|
2
|
+
import path from 'node:path';
|
|
3
|
+
import { parseJsonc } from './strict-entry.js';
|
|
4
|
+
const LEVELS = new Set(['TRUST_FOLDER', 'TRUST_PARENT', 'DO_NOT_TRUST']);
|
|
5
|
+
/** Gemini reads these files through strip-json-comments, so comments are allowed. */
|
|
6
|
+
function readJson(file) {
|
|
7
|
+
try {
|
|
8
|
+
return parseJsonc(readFileSync(file, 'utf8'));
|
|
9
|
+
}
|
|
10
|
+
catch {
|
|
11
|
+
return null;
|
|
12
|
+
}
|
|
13
|
+
}
|
|
14
|
+
const pathFor = (platform) => (platform === 'win32' ? path.win32 : path.posix);
|
|
15
|
+
/** Gemini's own default system settings file, used when GEMINI_CLI_SYSTEM_SETTINGS_PATH is unset. */
|
|
16
|
+
export function geminiSystemSettingsPath(env, platform) {
|
|
17
|
+
if (env['GEMINI_CLI_SYSTEM_SETTINGS_PATH'])
|
|
18
|
+
return env['GEMINI_CLI_SYSTEM_SETTINGS_PATH'];
|
|
19
|
+
if (platform === 'darwin')
|
|
20
|
+
return '/Library/Application Support/GeminiCli/settings.json';
|
|
21
|
+
if (platform === 'win32')
|
|
22
|
+
return 'C:\\ProgramData\\gemini-cli\\settings.json';
|
|
23
|
+
return '/etc/gemini-cli/settings.json';
|
|
24
|
+
}
|
|
25
|
+
/** GEMINI_CLI_SYSTEM_DEFAULTS_PATH, else `system-defaults.json` beside the system settings file. */
|
|
26
|
+
export function geminiSystemDefaultsPath(systemSettingsPath, platform) {
|
|
27
|
+
const p = pathFor(platform);
|
|
28
|
+
return p.join(p.dirname(systemSettingsPath), 'system-defaults.json');
|
|
29
|
+
}
|
|
30
|
+
/** ~/.gemini, or $GEMINI_CLI_HOME/.gemini when set. */
|
|
31
|
+
export function geminiDir(home, env) {
|
|
32
|
+
return path.join(env['GEMINI_CLI_HOME'] ? env['GEMINI_CLI_HOME'] : home, '.gemini');
|
|
33
|
+
}
|
|
34
|
+
const folderTrustSetting = (s) => s?.['security']?.['folderTrust']?.['enabled'];
|
|
35
|
+
/** security.folderTrust.enabled, merged system-defaults < user < system as Gemini does; default on. */
|
|
36
|
+
function folderTrustEnabled(home, env, platform) {
|
|
37
|
+
const system = geminiSystemSettingsPath(env, platform);
|
|
38
|
+
const defaults = env['GEMINI_CLI_SYSTEM_DEFAULTS_PATH'] ? env['GEMINI_CLI_SYSTEM_DEFAULTS_PATH'] : geminiSystemDefaultsPath(system, platform);
|
|
39
|
+
let enabled = true;
|
|
40
|
+
for (const file of [defaults, path.join(geminiDir(home, env), 'settings.json'), system]) {
|
|
41
|
+
const v = folderTrustSetting(readJson(file));
|
|
42
|
+
if (typeof v === 'boolean')
|
|
43
|
+
enabled = v;
|
|
44
|
+
}
|
|
45
|
+
return enabled;
|
|
46
|
+
}
|
|
47
|
+
function realPath(p) {
|
|
48
|
+
try {
|
|
49
|
+
return existsSync(p) ? realpathSync(p) : p;
|
|
50
|
+
}
|
|
51
|
+
catch {
|
|
52
|
+
return p;
|
|
53
|
+
}
|
|
54
|
+
}
|
|
55
|
+
/** Gemini's normalizePath: absolute, and lower-cased where the filesystem is case-insensitive. */
|
|
56
|
+
function normalize(p, platform) {
|
|
57
|
+
const abs = pathFor(platform).resolve(p);
|
|
58
|
+
return platform === 'win32' || platform === 'darwin' ? abs.toLowerCase() : abs;
|
|
59
|
+
}
|
|
60
|
+
/** Gemini's isSubpath: `child` is `parent` or below it. A shared string prefix is not enough. */
|
|
61
|
+
function isSubpath(parent, child, platform) {
|
|
62
|
+
const p = pathFor(platform);
|
|
63
|
+
const rel = p.relative(parent, child);
|
|
64
|
+
return !rel.startsWith(`..${p.sep}`) && rel !== '..' && !p.isAbsolute(rel);
|
|
65
|
+
}
|
|
66
|
+
/**
|
|
67
|
+
* Gemini CLI 0.58.0's folder-trust verdict for `cwd`, read from its own files and never written
|
|
68
|
+
* (packages/core/src/utils/trust.ts, cli/src/config/trustedFolders.ts):
|
|
69
|
+
* - GEMINI_CLI_TRUST_WORKSPACE=true|false decides outright;
|
|
70
|
+
* - folder trust turned off in settings means nothing is disabled;
|
|
71
|
+
* - else the LONGEST matching rule in trustedFolders.json decides, where TRUST_PARENT matches
|
|
72
|
+
* the rule's parent directory, and no matching rule is untrusted.
|
|
73
|
+
* Gemini also accepts a trust decision from a connected IDE; align cannot see that, so in an IDE
|
|
74
|
+
* terminal this can say untrusted for a folder Gemini will treat as trusted (one extra line).
|
|
75
|
+
*/
|
|
76
|
+
export function geminiFolderTrust(cwd, home, env, platform) {
|
|
77
|
+
if (env['GEMINI_CLI_TRUST_WORKSPACE'] === 'true')
|
|
78
|
+
return 'trusted';
|
|
79
|
+
if (env['GEMINI_CLI_TRUST_WORKSPACE'] === 'false')
|
|
80
|
+
return 'untrusted';
|
|
81
|
+
if (!folderTrustEnabled(home, env, platform))
|
|
82
|
+
return 'off';
|
|
83
|
+
const file = env['GEMINI_CLI_TRUSTED_FOLDERS_PATH'] ? env['GEMINI_CLI_TRUSTED_FOLDERS_PATH'] : path.join(geminiDir(home, env), 'trustedFolders.json');
|
|
84
|
+
if (!existsSync(file))
|
|
85
|
+
return 'untrusted';
|
|
86
|
+
const rules = readJson(file);
|
|
87
|
+
if (!rules || !Object.values(rules).every((v) => typeof v === 'string' && LEVELS.has(v)))
|
|
88
|
+
return 'unknown';
|
|
89
|
+
const p = pathFor(platform);
|
|
90
|
+
const location = normalize(realPath(cwd), platform);
|
|
91
|
+
let longest = -1;
|
|
92
|
+
let verdict;
|
|
93
|
+
for (const [raw, level] of Object.entries(rules)) {
|
|
94
|
+
const rule = normalize(raw, platform);
|
|
95
|
+
const effective = normalize(realPath(level === 'TRUST_PARENT' ? p.dirname(rule) : rule), platform);
|
|
96
|
+
if (isSubpath(effective, location, platform) && rule.length > longest) {
|
|
97
|
+
longest = rule.length;
|
|
98
|
+
verdict = level;
|
|
99
|
+
}
|
|
100
|
+
}
|
|
101
|
+
return verdict === 'TRUST_FOLDER' || verdict === 'TRUST_PARENT' ? 'trusted' : 'untrusted';
|
|
102
|
+
}
|
|
103
|
+
//# sourceMappingURL=gemini-trust.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"gemini-trust.js","sourceRoot":"","sources":["../../../src/lib/launch/gemini-trust.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,33 @@
|
|
|
1
|
+
import type { ChildProcess, SpawnOptions } from 'node:child_process';
|
|
2
|
+
import type { AgentSpec } from './registry/types.js';
|
|
3
|
+
/**
|
|
4
|
+
* How an agent is installed (plan Decision 4). `npm`: one package-manager argv, which Align may
|
|
5
|
+
* run after the user says yes. `docs`: a script or URL installer; piping a remote script into a
|
|
6
|
+
* shell is the user's decision, so Align only ever prints it.
|
|
7
|
+
*/
|
|
8
|
+
export type AgentInstall = {
|
|
9
|
+
kind: 'npm';
|
|
10
|
+
argv: readonly string[];
|
|
11
|
+
} | {
|
|
12
|
+
kind: 'docs';
|
|
13
|
+
url: string;
|
|
14
|
+
text?: string;
|
|
15
|
+
};
|
|
16
|
+
/** `cancelled`: Ctrl-C at the question, which leaves the picker; `declined`: a plain No. */
|
|
17
|
+
export type InstallOutcome = 'installed' | 'declined' | 'cancelled' | 'manual' | 'failed';
|
|
18
|
+
export interface InstallOfferDeps {
|
|
19
|
+
isTTY: boolean;
|
|
20
|
+
platform: string;
|
|
21
|
+
/** true only on an explicit yes, false on No (the default), null on Ctrl-C. */
|
|
22
|
+
confirm(message: string): Promise<boolean | null>;
|
|
23
|
+
spawn(command: string, args: string[], options: SpawnOptions): ChildProcess;
|
|
24
|
+
onPath(bin: string): string | null;
|
|
25
|
+
say(line: string): void;
|
|
26
|
+
}
|
|
27
|
+
export declare function installText(i: AgentInstall): string;
|
|
28
|
+
/**
|
|
29
|
+
* Offer to install an agent the user picked. Never runs anything without a TTY and a yes, and
|
|
30
|
+
* never runs a script or URL installer. The argv runs with no shell, output visible.
|
|
31
|
+
*/
|
|
32
|
+
export declare function offerInstall(spec: Pick<AgentSpec, 'label' | 'install'>, d: InstallOfferDeps): Promise<InstallOutcome>;
|
|
33
|
+
//# sourceMappingURL=install.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"install.d.ts","sourceRoot":"","sources":["../../../src/lib/launch/install.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,YAAY,EAAE,YAAY,EAAE,MAAM,oBAAoB,CAAC;AACrE,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,qBAAqB,CAAC;AAGrD;;;;GAIG;AACH,MAAM,MAAM,YAAY,GAAG;IAAE,IAAI,EAAE,KAAK,CAAC;IAAC,IAAI,EAAE,SAAS,MAAM,EAAE,CAAA;CAAE,GAAG;IAAE,IAAI,EAAE,MAAM,CAAC;IAAC,GAAG,EAAE,MAAM,CAAC;IAAC,IAAI,CAAC,EAAE,MAAM,CAAA;CAAE,CAAC;AACnH,4FAA4F;AAC5F,MAAM,MAAM,cAAc,GAAG,WAAW,GAAG,UAAU,GAAG,WAAW,GAAG,QAAQ,GAAG,QAAQ,CAAC;AAE1F,MAAM,WAAW,gBAAgB;IAC/B,KAAK,EAAE,OAAO,CAAC;IACf,QAAQ,EAAE,MAAM,CAAC;IACjB,+EAA+E;IAC/E,OAAO,CAAC,OAAO,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,GAAG,IAAI,CAAC,CAAC;IAClD,KAAK,CAAC,OAAO,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,EAAE,EAAE,OAAO,EAAE,YAAY,GAAG,YAAY,CAAC;IAC5E,MAAM,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,GAAG,IAAI,CAAC;IACnC,GAAG,CAAC,IAAI,EAAE,MAAM,GAAG,IAAI,CAAC;CACzB;AAED,wBAAgB,WAAW,CAAC,CAAC,EAAE,YAAY,GAAG,MAAM,CAEnD;AAED;;;GAGG;AACH,wBAAsB,YAAY,CAAC,IAAI,EAAE,IAAI,CAAC,SAAS,EAAE,OAAO,GAAG,SAAS,CAAC,EAAE,CAAC,EAAE,gBAAgB,GAAG,OAAO,CAAC,cAAc,CAAC,CAmC3H"}
|
|
@@ -0,0 +1,48 @@
|
|
|
1
|
+
import { winShimCommand } from './run-agent.js';
|
|
2
|
+
export function installText(i) {
|
|
3
|
+
return i.kind === 'npm' ? i.argv.join(' ') : (i.text ?? i.url);
|
|
4
|
+
}
|
|
5
|
+
/**
|
|
6
|
+
* Offer to install an agent the user picked. Never runs anything without a TTY and a yes, and
|
|
7
|
+
* never runs a script or URL installer. The argv runs with no shell, output visible.
|
|
8
|
+
*/
|
|
9
|
+
export async function offerInstall(spec, d) {
|
|
10
|
+
const text = installText(spec.install);
|
|
11
|
+
const manager = spec.install.kind === 'npm' ? d.onPath(spec.install.argv[0]) : null;
|
|
12
|
+
if (spec.install.kind !== 'npm' || !d.isTTY || !manager) {
|
|
13
|
+
d.say(`${spec.label} is not installed. Install it with: ${text}`);
|
|
14
|
+
return 'manual';
|
|
15
|
+
}
|
|
16
|
+
const answer = await d.confirm(`Install ${spec.label} now? (runs: ${text})`);
|
|
17
|
+
if (answer === null)
|
|
18
|
+
return 'cancelled';
|
|
19
|
+
if (answer !== true)
|
|
20
|
+
return 'declined';
|
|
21
|
+
const args = spec.install.argv.slice(1);
|
|
22
|
+
let code;
|
|
23
|
+
try {
|
|
24
|
+
// Run the npm the PATH scan found, by its path: the one the question just named. npm on
|
|
25
|
+
// Windows is npm.cmd, which cannot be spawned without a shell, so it goes through the same
|
|
26
|
+
// quoted cmd.exe line the agent launch uses (which refuses a path cmd.exe would reinterpret).
|
|
27
|
+
const shim = d.platform === 'win32' && /\.(cmd|bat)$/i.test(manager);
|
|
28
|
+
const cmd = shim ? winShimCommand({ bin: manager, args }) : { command: manager, args };
|
|
29
|
+
const options = { shell: false, stdio: 'inherit' };
|
|
30
|
+
if (shim)
|
|
31
|
+
options.windowsVerbatimArguments = true;
|
|
32
|
+
code = await new Promise((resolve, reject) => {
|
|
33
|
+
const child = d.spawn(cmd.command, cmd.args, options);
|
|
34
|
+
child.on('error', reject);
|
|
35
|
+
child.on('exit', (c) => resolve(c ?? 1));
|
|
36
|
+
});
|
|
37
|
+
}
|
|
38
|
+
catch (e) {
|
|
39
|
+
d.say(`Could not run ${text} (${e.message}). ${spec.label} is not installed.`);
|
|
40
|
+
return 'failed';
|
|
41
|
+
}
|
|
42
|
+
if (code !== 0) {
|
|
43
|
+
d.say(`${spec.install.argv[0]} exited ${code}. ${spec.label} is not installed.`);
|
|
44
|
+
return 'failed';
|
|
45
|
+
}
|
|
46
|
+
return 'installed';
|
|
47
|
+
}
|
|
48
|
+
//# sourceMappingURL=install.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"install.js","sourceRoot":"","sources":["../../../src/lib/launch/install.ts"],"names":[],"mappings":"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"}
|
|
@@ -11,5 +11,20 @@ export declare function launchCacheDir(env: Record<string, string | undefined>):
|
|
|
11
11
|
*/
|
|
12
12
|
export declare function writeIfChanged(dir: string, name: string, content: string, opts?: {
|
|
13
13
|
uid?: number;
|
|
14
|
+
mode?: number;
|
|
14
15
|
}): boolean;
|
|
16
|
+
/** How long a copy nobody launched with is kept: long enough for any session still reading it to have started. */
|
|
17
|
+
export declare const STALE_AFTER_MS: number;
|
|
18
|
+
/**
|
|
19
|
+
* Tidy launch files named `<prefix>...` without pulling one from under a concurrent session:
|
|
20
|
+
* - `keep`: the file this launch uses; its mtime is refreshed, so it is never aged out while in use;
|
|
21
|
+
* - `remove`: this launch's own file when it is NOT used (its source no longer injects);
|
|
22
|
+
* - any other `<prefix>` file untouched for longer than STALE_AFTER_MS.
|
|
23
|
+
* A missing dir is fine.
|
|
24
|
+
*/
|
|
25
|
+
export declare function pruneLaunchFiles(dir: string, prefix: string, opts?: {
|
|
26
|
+
keep?: string;
|
|
27
|
+
remove?: string;
|
|
28
|
+
now?: number;
|
|
29
|
+
}): void;
|
|
15
30
|
//# sourceMappingURL=launch-files.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"launch-files.d.ts","sourceRoot":"","sources":["../../../src/lib/launch/launch-files.ts"],"names":[],"mappings":"AAIA;;;GAGG;AACH,wBAAgB,cAAc,CAAC,GAAG,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,GAAG,SAAS,CAAC,GAAG,MAAM,CAG9E;AAgBD;;;;;GAKG;AACH,wBAAgB,cAAc,CAAC,GAAG,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,EAAE,IAAI,GAAE;IAAE,GAAG,CAAC,EAAE,MAAM,CAAA;CAAO,GAAG,OAAO,
|
|
1
|
+
{"version":3,"file":"launch-files.d.ts","sourceRoot":"","sources":["../../../src/lib/launch/launch-files.ts"],"names":[],"mappings":"AAIA;;;GAGG;AACH,wBAAgB,cAAc,CAAC,GAAG,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,GAAG,SAAS,CAAC,GAAG,MAAM,CAG9E;AAgBD;;;;;GAKG;AACH,wBAAgB,cAAc,CAAC,GAAG,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,EAAE,IAAI,GAAE;IAAE,GAAG,CAAC,EAAE,MAAM,CAAC;IAAC,IAAI,CAAC,EAAE,MAAM,CAAA;CAAO,GAAG,OAAO,CAqC9H;AAED,kHAAkH;AAClH,eAAO,MAAM,cAAc,QAAsB,CAAC;AAElD;;;;;;GAMG;AACH,wBAAgB,gBAAgB,CAAC,GAAG,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,IAAI,GAAE;IAAE,IAAI,CAAC,EAAE,MAAM,CAAC;IAAC,MAAM,CAAC,EAAE,MAAM,CAAC;IAAC,GAAG,CAAC,EAAE,MAAM,CAAA;CAAO,GAAG,IAAI,CAuB/H"}
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import envPaths from 'env-paths';
|
|
2
|
-
import { mkdirSync, readFileSync, renameSync, statSync, writeFileSync } from 'node:fs';
|
|
2
|
+
import { chmodSync, lstatSync, mkdirSync, readdirSync, readFileSync, renameSync, rmSync, statSync, utimesSync, writeFileSync } from 'node:fs';
|
|
3
3
|
import path from 'node:path';
|
|
4
4
|
/**
|
|
5
5
|
* $XDG_CACHE_HOME/align-cli/launch, honoured on every platform; else the OS cache dir.
|
|
@@ -33,24 +33,84 @@ function defaultCacheDir() {
|
|
|
33
33
|
export function writeIfChanged(dir, name, content, opts = {}) {
|
|
34
34
|
mkdirSync(dir, { recursive: true, mode: 0o700 });
|
|
35
35
|
const uid = 'uid' in opts ? opts.uid : process.getuid?.();
|
|
36
|
-
|
|
36
|
+
const posix = process.platform !== 'win32';
|
|
37
|
+
const st = statSync(dir);
|
|
38
|
+
if (uid !== undefined && posix && st.uid !== uid) {
|
|
37
39
|
throw new Error(`${dir} is owned by another user; refusing to use it for launch files`);
|
|
38
40
|
}
|
|
41
|
+
// A dir made before mkdir's 0700 (or by hand) can be looser; it is ours, so tighten it.
|
|
42
|
+
if (posix && (st.mode & 0o077) !== 0)
|
|
43
|
+
chmodSync(dir, 0o700);
|
|
39
44
|
const target = path.join(dir, name);
|
|
40
45
|
// A name may carry sub-directories (OpenCode loads plugins/align.js from a config dir).
|
|
41
46
|
const targetDir = path.dirname(target);
|
|
42
47
|
if (targetDir !== dir)
|
|
43
48
|
mkdirSync(targetDir, { recursive: true, mode: 0o700 });
|
|
44
49
|
try {
|
|
45
|
-
|
|
50
|
+
// Only a regular file counts as up to date: a link here (planted, or left by hand) is replaced.
|
|
51
|
+
if (lstatSync(target).isFile() && readFileSync(target, 'utf8') === content) {
|
|
52
|
+
if (opts.mode !== undefined && posix && (statSync(target).mode & 0o777) !== opts.mode)
|
|
53
|
+
chmodSync(target, opts.mode);
|
|
46
54
|
return false;
|
|
55
|
+
}
|
|
47
56
|
}
|
|
48
57
|
catch {
|
|
49
58
|
// missing: write it
|
|
50
59
|
}
|
|
51
60
|
const tmp = path.join(targetDir, `.${path.basename(name)}.${process.pid}.tmp`);
|
|
52
|
-
|
|
61
|
+
// Never through whatever sits at the temp path: create it exclusively (wx), with the mode from
|
|
62
|
+
// the first byte (a umask only removes bits). Something already there (a crashed launch's
|
|
63
|
+
// leftover, or a planted link) is removed, not followed, and the exclusive create is retried.
|
|
64
|
+
const create = () => writeFileSync(tmp, content, { encoding: 'utf8', flag: 'wx', ...(opts.mode === undefined ? {} : { mode: opts.mode }) });
|
|
65
|
+
try {
|
|
66
|
+
create();
|
|
67
|
+
}
|
|
68
|
+
catch (e) {
|
|
69
|
+
if (e.code !== 'EEXIST')
|
|
70
|
+
throw e;
|
|
71
|
+
rmSync(tmp, { force: true });
|
|
72
|
+
create();
|
|
73
|
+
}
|
|
53
74
|
renameSync(tmp, target);
|
|
54
75
|
return true;
|
|
55
76
|
}
|
|
77
|
+
/** How long a copy nobody launched with is kept: long enough for any session still reading it to have started. */
|
|
78
|
+
export const STALE_AFTER_MS = 24 * 60 * 60 * 1000;
|
|
79
|
+
/**
|
|
80
|
+
* Tidy launch files named `<prefix>...` without pulling one from under a concurrent session:
|
|
81
|
+
* - `keep`: the file this launch uses; its mtime is refreshed, so it is never aged out while in use;
|
|
82
|
+
* - `remove`: this launch's own file when it is NOT used (its source no longer injects);
|
|
83
|
+
* - any other `<prefix>` file untouched for longer than STALE_AFTER_MS.
|
|
84
|
+
* A missing dir is fine.
|
|
85
|
+
*/
|
|
86
|
+
export function pruneLaunchFiles(dir, prefix, opts = {}) {
|
|
87
|
+
const now = opts.now ?? Date.now();
|
|
88
|
+
let names;
|
|
89
|
+
try {
|
|
90
|
+
names = readdirSync(dir);
|
|
91
|
+
}
|
|
92
|
+
catch {
|
|
93
|
+
return;
|
|
94
|
+
}
|
|
95
|
+
for (const n of names) {
|
|
96
|
+
if (!n.startsWith(prefix))
|
|
97
|
+
continue;
|
|
98
|
+
const file = path.join(dir, n);
|
|
99
|
+
if (n === opts.keep) {
|
|
100
|
+
utimesSync(file, new Date(now), new Date(now));
|
|
101
|
+
}
|
|
102
|
+
else if (n === opts.remove) {
|
|
103
|
+
rmSync(file, { force: true });
|
|
104
|
+
}
|
|
105
|
+
else {
|
|
106
|
+
try {
|
|
107
|
+
if (now - lstatSync(file).mtimeMs > STALE_AFTER_MS)
|
|
108
|
+
rmSync(file, { force: true });
|
|
109
|
+
}
|
|
110
|
+
catch {
|
|
111
|
+
// gone already
|
|
112
|
+
}
|
|
113
|
+
}
|
|
114
|
+
}
|
|
115
|
+
}
|
|
56
116
|
//# sourceMappingURL=launch-files.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"launch-files.js","sourceRoot":"","sources":["../../../src/lib/launch/launch-files.ts"],"names":[],"mappings":"AAAA,OAAO,QAAQ,MAAM,WAAW,CAAC;AACjC,OAAO,EAAE,SAAS,EAAE,YAAY,EAAE,UAAU,EAAE,QAAQ,EAAE,aAAa,EAAE,MAAM,SAAS,CAAC;
|
|
1
|
+
{"version":3,"file":"launch-files.js","sourceRoot":"","sources":["../../../src/lib/launch/launch-files.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,11 +1,15 @@
|
|
|
1
|
-
import type {
|
|
2
|
-
import { type LaunchAgent } from './agents.js';
|
|
3
|
-
import { type LaunchSpec } from './adapters/claude-code.js';
|
|
1
|
+
import type { LaunchSpec } from './adapters/claude-code.js';
|
|
4
2
|
import { type ConfigWrite } from './config-writes.js';
|
|
3
|
+
import { type CodexProjectState } from './codex-state.js';
|
|
4
|
+
import { type CopilotProjectState } from './copilot-state.js';
|
|
5
5
|
import { type CursorProjectState } from './cursor-state.js';
|
|
6
|
+
import { type InstallOfferDeps } from './install.js';
|
|
7
|
+
import { type PickerOption } from './picker-options.js';
|
|
8
|
+
import { type GeminiProjectState } from './gemini-state.js';
|
|
6
9
|
import { type OpenCodeProjectState } from './opencode-state.js';
|
|
7
10
|
import { type PiProjectState } from './pi-state.js';
|
|
8
11
|
import { type ProjectState } from './project-state.js';
|
|
12
|
+
import type { LaunchAgentId } from './registry/types.js';
|
|
9
13
|
export interface LaunchDeps {
|
|
10
14
|
env: Record<string, string | undefined>;
|
|
11
15
|
argv: string[];
|
|
@@ -26,15 +30,32 @@ export interface LaunchDeps {
|
|
|
26
30
|
readPiState(cwd: string, home: string, env: Record<string, string | undefined>): PiProjectState;
|
|
27
31
|
/** What Cursor would already read. */
|
|
28
32
|
readCursorState(cwd: string, home: string): CursorProjectState;
|
|
33
|
+
/** What Codex would already load (/etc/codex, $CODEX_HOME or ~/.codex, a -p profile in the user's args, every ancestor .codex/). */
|
|
34
|
+
readCodexState(cwd: string, home: string, env: Record<string, string | undefined>, platform: string, passthrough: string[]): CodexProjectState;
|
|
35
|
+
/** What Gemini CLI would already load, the system settings file it reads, and folder trust. */
|
|
36
|
+
readGeminiState(cwd: string, home: string, env: Record<string, string | undefined>, platform: string): GeminiProjectState;
|
|
37
|
+
/** What Copilot CLI would already load ($COPILOT_HOME or ~/.copilot, and the workspace). */
|
|
38
|
+
readCopilotState(cwd: string, home: string, env: Record<string, string | undefined>, platform: string): CopilotProjectState;
|
|
29
39
|
/** Add to a file in the user's own agent config, once (C4). Lines go to `note`. */
|
|
30
40
|
applyConfigWrite(w: ConfigWrite, note: (line: string) => void): void;
|
|
31
41
|
cacheDir(env: Record<string, string | undefined>): string;
|
|
32
|
-
writeIfChanged(dir: string, name: string, content: string
|
|
42
|
+
writeIfChanged(dir: string, name: string, content: string, opts?: {
|
|
43
|
+
mode?: number;
|
|
44
|
+
}): boolean;
|
|
45
|
+
/** Tidy launch files from earlier launches without removing one a concurrent session uses. */
|
|
46
|
+
pruneLaunchFiles(dir: string, prefix: string, opts: {
|
|
47
|
+
keep?: string;
|
|
48
|
+
remove?: string;
|
|
49
|
+
}): void;
|
|
33
50
|
runAgent(spec: LaunchSpec): Promise<number>;
|
|
34
51
|
/** Fire and forget: the caller never awaits what this returns. */
|
|
35
|
-
record(agent:
|
|
36
|
-
/** Ask which agent. Only called on a TTY with
|
|
37
|
-
pick(
|
|
52
|
+
record(agent: LaunchAgentId): void;
|
|
53
|
+
/** Ask which agent. Only called on a TTY with no stored agent. `initial` is preselected. */
|
|
54
|
+
pick(options: PickerOption[], initial?: LaunchAgentId): Promise<LaunchAgentId | null>;
|
|
55
|
+
/** Default-No question: true on yes, false on no, null on Ctrl-C. Only asked on a TTY (Decision 4). */
|
|
56
|
+
confirm(message: string): Promise<boolean | null>;
|
|
57
|
+
/** Runs an install argv the user approved. Never reached without a TTY and a yes. */
|
|
58
|
+
spawnInstall: InstallOfferDeps['spawn'];
|
|
38
59
|
/** Every line align itself writes on this path. stderr only: stdout belongs to the agent (`align -- -p ... | jq`). */
|
|
39
60
|
err(line: string): void;
|
|
40
61
|
now(): number;
|
|
@@ -50,6 +71,10 @@ export type LaunchResult = {
|
|
|
50
71
|
* ALIGN_ENV, the signed-in rule and the demo-mode rule all apply exactly as they do for `align ask`.
|
|
51
72
|
*/
|
|
52
73
|
export declare function isLocalDefault(): boolean;
|
|
74
|
+
export interface BuildInput {
|
|
75
|
+
passthrough: string[];
|
|
76
|
+
cachePath(name: string): string;
|
|
77
|
+
}
|
|
53
78
|
/**
|
|
54
79
|
* What bare `align` does once a local graph exists: open the user's coding agent with Align
|
|
55
80
|
* wired in for that session only. Returns `handled: false` when the caller should show the
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"launch.d.ts","sourceRoot":"","sources":["../../../src/lib/launch/launch.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"launch.d.ts","sourceRoot":"","sources":["../../../src/lib/launch/launch.ts"],"names":[],"mappings":"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"}
|