iskills 0.2.59 → 0.2.61
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/AGENT-CLI.md +61 -0
- package/README.md +20 -17
- package/README.zh-CN.md +20 -17
- package/bin/command-route.mjs +15 -0
- package/bin/iskills.js +14 -7
- package/dist/src/cli.js +4 -12
- package/dist/src/cli.js.map +1 -1
- package/dist/src/commands/agent/arguments.d.ts +10 -0
- package/dist/src/commands/agent/arguments.js +60 -0
- package/dist/src/commands/agent/arguments.js.map +1 -0
- package/dist/src/commands/agent/index.d.ts +1 -0
- package/dist/src/commands/agent/index.js +773 -0
- package/dist/src/commands/agent/index.js.map +1 -0
- package/dist/src/commands/browser-actions.js +36 -7
- package/dist/src/commands/browser-actions.js.map +1 -1
- package/dist/src/commands/index.d.ts +0 -3
- package/dist/src/commands/index.js +0 -33
- package/dist/src/commands/index.js.map +1 -1
- package/dist/src/commands/library.js +79 -146
- package/dist/src/commands/library.js.map +1 -1
- package/dist/src/commands/mcp.d.ts +1 -3
- package/dist/src/commands/mcp.js +7 -240
- package/dist/src/commands/mcp.js.map +1 -1
- package/dist/src/domain/agent-collection-write.d.ts +2 -0
- package/dist/src/domain/agent-collection-write.js +230 -0
- package/dist/src/domain/agent-collection-write.js.map +1 -0
- package/dist/src/domain/agent-mcp-write.d.ts +23 -0
- package/dist/src/domain/agent-mcp-write.js +927 -0
- package/dist/src/domain/agent-mcp-write.js.map +1 -0
- package/dist/src/domain/agent-read.d.ts +38 -0
- package/dist/src/domain/agent-read.js +524 -0
- package/dist/src/domain/agent-read.js.map +1 -0
- package/dist/src/domain/agent-skill-write.d.ts +34 -0
- package/dist/src/domain/agent-skill-write.js +859 -0
- package/dist/src/domain/agent-skill-write.js.map +1 -0
- package/dist/src/domain/agent-write.d.ts +9 -0
- package/dist/src/domain/agent-write.js +127 -0
- package/dist/src/domain/agent-write.js.map +1 -0
- package/dist/src/domain/collection-write.d.ts +3 -1
- package/dist/src/domain/collection-write.js +109 -33
- package/dist/src/domain/collection-write.js.map +1 -1
- package/dist/src/domain/core.d.ts +11 -0
- package/dist/src/domain/core.js +39 -1
- package/dist/src/domain/core.js.map +1 -1
- package/dist/src/domain/cross-agent-install.js +3 -5
- package/dist/src/domain/cross-agent-install.js.map +1 -1
- package/dist/src/domain/errors.d.ts +2 -1
- package/dist/src/domain/errors.js +5 -2
- package/dist/src/domain/errors.js.map +1 -1
- package/dist/src/domain/git.d.ts +19 -1
- package/dist/src/domain/git.js +112 -72
- package/dist/src/domain/git.js.map +1 -1
- package/dist/src/domain/install-target.d.ts +2 -0
- package/dist/src/domain/install-target.js +68 -0
- package/dist/src/domain/install-target.js.map +1 -0
- package/dist/src/domain/mcp/collection.d.ts +3 -0
- package/dist/src/domain/mcp/collection.js +26 -4
- package/dist/src/domain/mcp/collection.js.map +1 -1
- package/dist/src/domain/mcp/dialects/borrow.js +1 -5
- package/dist/src/domain/mcp/dialects/borrow.js.map +1 -1
- package/dist/src/domain/mcp/index.d.ts +1 -1
- package/dist/src/domain/mcp/index.js +1 -1
- package/dist/src/domain/mcp/index.js.map +1 -1
- package/dist/src/domain/mcp/io.js +1 -1
- package/dist/src/domain/mcp/io.js.map +1 -1
- package/dist/src/domain/mcp/location-write.d.ts +3 -0
- package/dist/src/domain/mcp/location-write.js +39 -0
- package/dist/src/domain/mcp/location-write.js.map +1 -0
- package/dist/src/domain/mcp/probe.d.ts +2 -0
- package/dist/src/domain/mcp/probe.js +2 -1
- package/dist/src/domain/mcp/probe.js.map +1 -1
- package/dist/src/domain/mcp/recipe.d.ts +1 -1
- package/dist/src/domain/mcp/recipe.js +6 -5
- package/dist/src/domain/mcp/recipe.js.map +1 -1
- package/dist/src/domain/mcp/secrets.js +12 -11
- package/dist/src/domain/mcp/secrets.js.map +1 -1
- package/dist/src/domain/mcp/types.d.ts +2 -0
- package/dist/src/domain/mcp/write.js +49 -35
- package/dist/src/domain/mcp/write.js.map +1 -1
- package/dist/src/domain/operation.d.ts +30 -0
- package/dist/src/domain/operation.js +107 -0
- package/dist/src/domain/operation.js.map +1 -0
- package/dist/src/domain/process.d.ts +3 -0
- package/dist/src/domain/process.js +81 -0
- package/dist/src/domain/process.js.map +1 -0
- package/dist/src/domain/tags.d.ts +11 -0
- package/dist/src/domain/tags.js +42 -0
- package/dist/src/domain/tags.js.map +1 -0
- package/dist/src/domain/user-config.js +9 -1
- package/dist/src/domain/user-config.js.map +1 -1
- package/dist/src/i18n/en.js +52 -28
- package/dist/src/i18n/en.js.map +1 -1
- package/dist/src/i18n/index.js +2 -0
- package/dist/src/i18n/index.js.map +1 -1
- package/dist/src/i18n/zh.d.ts +53 -29
- package/dist/src/i18n/zh.js +53 -29
- package/dist/src/i18n/zh.js.map +1 -1
- package/dist/src/ui/browser/browse-capabilities.js +7 -1
- package/dist/src/ui/browser/browse-capabilities.js.map +1 -1
- package/dist/src/ui/browser/browse-session.d.ts +2 -0
- package/dist/src/ui/browser/browse-session.js +4 -0
- package/dist/src/ui/browser/browse-session.js.map +1 -1
- package/dist/src/ui/browser/browser.js +18 -1
- package/dist/src/ui/browser/browser.js.map +1 -1
- package/dist/src/ui/browser/index.js +3 -1
- package/dist/src/ui/browser/index.js.map +1 -1
- package/dist/src/ui/browser/types.d.ts +5 -0
- package/dist/src/ui/components/mouse/provider.d.ts +4 -0
- package/dist/src/ui/components/mouse/provider.js +22 -6
- package/dist/src/ui/components/mouse/provider.js.map +1 -1
- package/dist/src/ui/footer/resolve-footer.js +3 -0
- package/dist/src/ui/footer/resolve-footer.js.map +1 -1
- package/dist/src/ui/footer/types.d.ts +1 -0
- package/dist/src/ui/mcp/browse-capabilities.d.ts +1 -0
- package/dist/src/ui/mcp/browse-capabilities.js +1 -0
- package/dist/src/ui/mcp/browse-capabilities.js.map +1 -1
- package/dist/src/ui/mcp/browser.d.ts +2 -1
- package/dist/src/ui/mcp/browser.js +33 -5
- package/dist/src/ui/mcp/browser.js.map +1 -1
- package/dist/src/ui/mcp/index.js +29 -2
- package/dist/src/ui/mcp/index.js.map +1 -1
- package/dist/src/ui/overlay/bridge.d.ts +2 -0
- package/dist/src/ui/overlay/bridge.js +6 -2
- package/dist/src/ui/overlay/bridge.js.map +1 -1
- package/dist/src/ui/prompts/index.d.ts +1 -1
- package/dist/src/ui/prompts/index.js +1 -1
- package/dist/src/ui/prompts/index.js.map +1 -1
- package/dist/src/ui/prompts/present.d.ts +4 -0
- package/dist/src/ui/prompts/present.js +9 -0
- package/dist/src/ui/prompts/present.js.map +1 -1
- package/dist/src/ui/shell/lifecycle.js +2 -0
- package/dist/src/ui/shell/lifecycle.js.map +1 -1
- package/dist/src/ui/shell/run.js +1 -1
- package/package.json +3 -2
|
@@ -4,6 +4,7 @@ import { collectionPaths, commitCollection, ensureCollection, exists } from '../
|
|
|
4
4
|
import { DomainError } from '../errors.js';
|
|
5
5
|
import { assertMcpName } from './identity.js';
|
|
6
6
|
import { readJsonObject, writeJsonObject } from './io.js';
|
|
7
|
+
import { normalizeNewTagName, renameTagInList, writeTagRenameBatch, } from '../tags.js';
|
|
7
8
|
export function mcpCollectionDir() {
|
|
8
9
|
return join(collectionPaths().root, 'mcps');
|
|
9
10
|
}
|
|
@@ -50,10 +51,10 @@ export function collectedFromRecord(raw, fallbackName) {
|
|
|
50
51
|
note: typeof raw.note === 'string' ? raw.note : '',
|
|
51
52
|
source: normalizeSource(raw.source),
|
|
52
53
|
recipe: normalizeRecipe(raw.recipe),
|
|
54
|
+
...(raw.secretsResetPending === true ? { secretsResetPending: true } : {}),
|
|
53
55
|
};
|
|
54
56
|
}
|
|
55
57
|
export async function listCollectedMcps() {
|
|
56
|
-
await ensureMcpCollection();
|
|
57
58
|
const dir = mcpCollectionDir();
|
|
58
59
|
if (!(await exists(dir)))
|
|
59
60
|
return [];
|
|
@@ -73,8 +74,7 @@ export async function readCollectedMcp(name) {
|
|
|
73
74
|
return undefined;
|
|
74
75
|
return collectedFromRecord(await readJsonObject(path), name);
|
|
75
76
|
}
|
|
76
|
-
export async function
|
|
77
|
-
await ensureMcpCollection();
|
|
77
|
+
export async function writeCollectedMcpRecord(mcp) {
|
|
78
78
|
const name = assertMcpName(mcp.name);
|
|
79
79
|
await writeJsonObject(mcpCollectionPath(name), {
|
|
80
80
|
name,
|
|
@@ -83,8 +83,30 @@ export async function writeCollectedMcp(mcp, commitMessage) {
|
|
|
83
83
|
note: mcp.note,
|
|
84
84
|
source: mcp.source,
|
|
85
85
|
recipe: mcp.recipe,
|
|
86
|
+
...(mcp.secretsResetPending ? { secretsResetPending: true } : {}),
|
|
86
87
|
});
|
|
87
|
-
|
|
88
|
+
}
|
|
89
|
+
export async function writeCollectedMcp(mcp, commitMessage) {
|
|
90
|
+
await ensureMcpCollection();
|
|
91
|
+
await writeCollectedMcpRecord(mcp);
|
|
92
|
+
return commitCollection(commitMessage ?? `mcp: save ${mcp.name}`);
|
|
93
|
+
}
|
|
94
|
+
export async function renameCollectedMcpTag(oldTag, nextTag) {
|
|
95
|
+
const newTag = normalizeNewTagName(nextTag);
|
|
96
|
+
if (!oldTag || oldTag === newTag)
|
|
97
|
+
return { updated: 0, committed: true };
|
|
98
|
+
const changes = [];
|
|
99
|
+
for (const before of await listCollectedMcps()) {
|
|
100
|
+
const tags = renameTagInList(before.tags, oldTag, newTag);
|
|
101
|
+
if (!tags)
|
|
102
|
+
continue;
|
|
103
|
+
changes.push({ before, after: { ...before, tags } });
|
|
104
|
+
}
|
|
105
|
+
if (!changes.length)
|
|
106
|
+
return { updated: 0, committed: true };
|
|
107
|
+
await writeTagRenameBatch(changes, writeCollectedMcpRecord);
|
|
108
|
+
const committed = await commitCollection(`rename mcp tag ${oldTag} to ${newTag}`);
|
|
109
|
+
return { updated: changes.length, committed };
|
|
88
110
|
}
|
|
89
111
|
export async function deleteCollectedMcpFile(name) {
|
|
90
112
|
await rm(mcpCollectionPath(name), { force: true });
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"collection.js","sourceRoot":"","sources":["../../../../src/domain/mcp/collection.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,EAAE,OAAO,EAAE,EAAE,EAAE,MAAM,kBAAkB,CAAC;AACtD,OAAO,EAAE,IAAI,EAAE,MAAM,WAAW,CAAC;AACjC,OAAO,EAAE,eAAe,EAAE,gBAAgB,EAAE,gBAAgB,EAAE,MAAM,EAAE,MAAM,YAAY,CAAC;AACzF,OAAO,EAAE,WAAW,EAAE,MAAM,cAAc,CAAC;AAC3C,OAAO,EAAE,aAAa,EAAE,MAAM,eAAe,CAAC;AAC9C,OAAO,EAAE,cAAc,EAAE,eAAe,EAAE,MAAM,SAAS,CAAC;
|
|
1
|
+
{"version":3,"file":"collection.js","sourceRoot":"","sources":["../../../../src/domain/mcp/collection.ts"],"names":[],"mappings":"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"}
|
|
@@ -5,11 +5,7 @@ import { getDialect } from './registry.js';
|
|
|
5
5
|
export async function asBorrowed(viewer, viewerScope, sourceAgent, sourceScope, ctx, borrowedFrom) {
|
|
6
6
|
const source = getDialect(sourceAgent);
|
|
7
7
|
const rows = await source.readOwned(sourceScope, ctx);
|
|
8
|
-
|
|
9
|
-
return toLocationEntries(viewer, viewerScope, rows, 'borrowed', false, borrowedFrom).map((entry) => ({
|
|
10
|
-
...entry,
|
|
11
|
-
filePath: path || entry.filePath,
|
|
12
|
-
}));
|
|
8
|
+
return toLocationEntries(viewer, viewerScope, rows, 'borrowed', false, borrowedFrom);
|
|
13
9
|
}
|
|
14
10
|
export async function sharedJsonBorrowed(path, borrowedFrom, ctx, viewer, scope) {
|
|
15
11
|
if (!(await exists(path)))
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"borrow.js","sourceRoot":"","sources":["../../../../../src/domain/mcp/dialects/borrow.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,IAAI,EAAE,MAAM,WAAW,CAAC;AACjC,OAAO,EAAE,MAAM,EAAE,MAAM,eAAe,CAAC;AACvC,OAAO,EAAE,kBAAkB,EAAE,iBAAiB,EAAE,MAAM,aAAa,CAAC;AACpE,OAAO,EAAE,UAAU,EAAE,MAAM,eAAe,CAAC;AAI3C,MAAM,CAAC,KAAK,UAAU,UAAU,CAC9B,MAAc,EACd,WAAqB,EACrB,WAAuB,EACvB,WAAqB,EACrB,GAAmB,EACnB,YAAoB;IAEpB,MAAM,MAAM,GAAG,UAAU,CAAC,WAAW,CAAC,CAAC;IACvC,MAAM,IAAI,GAAG,MAAM,MAAM,CAAC,SAAS,CAAC,WAAW,EAAE,GAAG,CAAC,CAAC;IACtD,
|
|
1
|
+
{"version":3,"file":"borrow.js","sourceRoot":"","sources":["../../../../../src/domain/mcp/dialects/borrow.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,IAAI,EAAE,MAAM,WAAW,CAAC;AACjC,OAAO,EAAE,MAAM,EAAE,MAAM,eAAe,CAAC;AACvC,OAAO,EAAE,kBAAkB,EAAE,iBAAiB,EAAE,MAAM,aAAa,CAAC;AACpE,OAAO,EAAE,UAAU,EAAE,MAAM,eAAe,CAAC;AAI3C,MAAM,CAAC,KAAK,UAAU,UAAU,CAC9B,MAAc,EACd,WAAqB,EACrB,WAAuB,EACvB,WAAqB,EACrB,GAAmB,EACnB,YAAoB;IAEpB,MAAM,MAAM,GAAG,UAAU,CAAC,WAAW,CAAC,CAAC;IACvC,MAAM,IAAI,GAAG,MAAM,MAAM,CAAC,SAAS,CAAC,WAAW,EAAE,GAAG,CAAC,CAAC;IACtD,OAAO,iBAAiB,CAAC,MAAM,EAAE,WAAW,EAAE,IAAI,EAAE,UAAU,EAAE,KAAK,EAAE,YAAY,CAAC,CAAC;AACvF,CAAC;AAED,MAAM,CAAC,KAAK,UAAU,kBAAkB,CACtC,IAAY,EACZ,YAAoB,EACpB,GAAmB,EACnB,MAAc,EACd,KAAe;IAEf,IAAI,CAAC,CAAC,MAAM,MAAM,CAAC,IAAI,CAAC,CAAC;QAAE,OAAO,EAAE,CAAC;IACrC,MAAM,IAAI,GAAG,MAAM,kBAAkB,CAAC,IAAI,EAAE,YAAY,CAAC,CAAC;IAC1D,OAAO,iBAAiB,CAAC,MAAM,EAAE,KAAK,EAAE,IAAI,EAAE,UAAU,EAAE,KAAK,EAAE,YAAY,CAAC,CAAC,GAAG,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,CAAC;QAC7F,GAAG,KAAK;QACR,QAAQ,EAAE,IAAI;KACf,CAAC,CAAC,CAAC;AACN,CAAC;AAED,MAAM,UAAU,oBAAoB,CAAC,GAAmB;IACtD,OAAO,IAAI,CAAC,GAAG,CAAC,GAAG,EAAE,WAAW,CAAC,CAAC;AACpC,CAAC"}
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
export type { AddMcpTarget, CollectedMcp, CreateMcpInput, HttpProbeStatus, ImportMcpOptions, ImportMcpResult, McpInstallReviewOptions, McpInstallReviewTarget, McpCollectionMatch, McpLocationEntry, McpRecipe, McpScanContext, McpScope, McpSecretValues, McpSource, McpTransport, UpdateMcpLocationsOptions, } from './types.js';
|
|
2
2
|
export { assertMcpName, classifyMcpMatch, findCollectedByEndpoint, findCollectedByName, recipeEndpoint, recipesSameEndpoint, } from './identity.js';
|
|
3
|
-
export { listCollectedMcps, readCollectedMcp,
|
|
3
|
+
export { ensureMcpCollection, listCollectedMcps, readCollectedMcp, renameCollectedMcpTag, } from './collection.js';
|
|
4
4
|
export { deleteMcpSecrets, emptySecrets, isEmptySecrets, mcpProtocolLoginState, mcpSecretState, readMcpSecrets, readMcpSecretsInGit, setMcpSecretsInGit, writeMcpSecrets, } from './secrets.js';
|
|
5
5
|
export type { McpLoginState, McpSecretState } from './secrets.js';
|
|
6
6
|
export { probeHttp } from './probe.js';
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
export { assertMcpName, classifyMcpMatch, findCollectedByEndpoint, findCollectedByName, recipeEndpoint, recipesSameEndpoint, } from './identity.js';
|
|
2
|
-
export { listCollectedMcps, readCollectedMcp,
|
|
2
|
+
export { ensureMcpCollection, listCollectedMcps, readCollectedMcp, renameCollectedMcpTag, } from './collection.js';
|
|
3
3
|
export { deleteMcpSecrets, emptySecrets, isEmptySecrets, mcpProtocolLoginState, mcpSecretState, readMcpSecrets, readMcpSecretsInGit, setMcpSecretsInGit, writeMcpSecrets, } from './secrets.js';
|
|
4
4
|
export { probeHttp } from './probe.js';
|
|
5
5
|
export { isSecretHeaderName, parseColonPairs, secretsFromPairs, } from './headers.js';
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../src/domain/mcp/index.ts"],"names":[],"mappings":"AAoBA,OAAO,EACL,aAAa,EACb,gBAAgB,EAChB,uBAAuB,EACvB,mBAAmB,EACnB,cAAc,EACd,mBAAmB,GACpB,MAAM,eAAe,CAAC;AAEvB,OAAO,
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../src/domain/mcp/index.ts"],"names":[],"mappings":"AAoBA,OAAO,EACL,aAAa,EACb,gBAAgB,EAChB,uBAAuB,EACvB,mBAAmB,EACnB,cAAc,EACd,mBAAmB,GACpB,MAAM,eAAe,CAAC;AAEvB,OAAO,EACL,mBAAmB,EACnB,iBAAiB,EACjB,gBAAgB,EAChB,qBAAqB,GACtB,MAAM,iBAAiB,CAAC;AAEzB,OAAO,EACL,gBAAgB,EAChB,YAAY,EACZ,cAAc,EACd,qBAAqB,EACrB,cAAc,EACd,cAAc,EACd,mBAAmB,EACnB,kBAAkB,EAClB,eAAe,GAChB,MAAM,cAAc,CAAC;AAItB,OAAO,EAAE,SAAS,EAAE,MAAM,YAAY,CAAC;AAEvC,OAAO,EACL,kBAAkB,EAClB,eAAe,EACf,gBAAgB,GACjB,MAAM,cAAc,CAAC;AAEtB,OAAO,EAAE,YAAY,EAAE,WAAW,EAAE,gBAAgB,EAAE,MAAM,eAAe,CAAC;AAE5E,OAAO,EACL,mBAAmB,EACnB,oBAAoB,EACpB,mBAAmB,GACpB,MAAM,mBAAmB,CAAC;AAS3B,OAAO,EAAE,aAAa,EAAE,MAAM,aAAa,CAAC;AAE5C,OAAO,EACL,eAAe,EACf,kBAAkB,EAClB,uBAAuB,EACvB,kBAAkB,EAClB,0BAA0B,EAC1B,yBAAyB,EACzB,gBAAgB,EAChB,kBAAkB,EAClB,kBAAkB,EAClB,iBAAiB,EACjB,kBAAkB,EAClB,WAAW,EACX,yBAAyB,EACzB,2BAA2B,EAC3B,iBAAiB,EACjB,mBAAmB,EACnB,qBAAqB,EACrB,6BAA6B,GAC9B,MAAM,YAAY,CAAC"}
|
|
@@ -18,7 +18,7 @@ export async function readJsonObject(path) {
|
|
|
18
18
|
return {};
|
|
19
19
|
const parsed = JSON5.parse(text);
|
|
20
20
|
if (!parsed || typeof parsed !== 'object' || Array.isArray(parsed))
|
|
21
|
-
|
|
21
|
+
throw new Error('MCP configuration must be an object');
|
|
22
22
|
return parsed;
|
|
23
23
|
}
|
|
24
24
|
export async function writeJsonObject(path, value) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"io.js","sourceRoot":"","sources":["../../../../src/domain/mcp/io.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,EAAE,QAAQ,EAAE,MAAM,EAAE,EAAE,EAAE,SAAS,EAAE,MAAM,kBAAkB,CAAC;AAC1E,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AACpC,OAAO,KAAK,MAAM,OAAO,CAAC;AAC1B,OAAO,EAAE,KAAK,IAAI,SAAS,EAAE,SAAS,IAAI,aAAa,EAAE,MAAM,WAAW,CAAC;AAE3E,MAAM,CAAC,KAAK,UAAU,QAAQ,CAAC,IAAY;IACzC,IAAI,CAAC;QACH,OAAO,MAAM,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC,CAAC;IACtC,CAAC;IAAC,OAAO,KAAK,EAAE,CAAC;QACf,IAAK,KAA+B,CAAC,IAAI,KAAK,QAAQ;YAAE,OAAO,SAAS,CAAC;QACzE,MAAM,KAAK,CAAC;IACd,CAAC;AACH,CAAC;AAED,MAAM,CAAC,KAAK,UAAU,cAAc,CAAC,IAAY;IAC/C,MAAM,IAAI,GAAG,MAAM,QAAQ,CAAC,IAAI,CAAC,CAAC;IAClC,IAAI,IAAI,KAAK,SAAS,IAAI,CAAC,IAAI,CAAC,IAAI,EAAE;QAAE,OAAO,EAAE,CAAC;IAClD,MAAM,MAAM,GAAG,KAAK,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;IACjC,IAAI,CAAC,MAAM,IAAI,OAAO,MAAM,KAAK,QAAQ,IAAI,KAAK,CAAC,OAAO,CAAC,MAAM,CAAC;QAAE,
|
|
1
|
+
{"version":3,"file":"io.js","sourceRoot":"","sources":["../../../../src/domain/mcp/io.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,3 @@
|
|
|
1
|
+
import type { McpLocationEntry, McpRecipe, McpScanContext, McpSecretValues } from './types.js';
|
|
2
|
+
/** Preserve Claude's distinct project-local object instead of routing it to .mcp.json. */
|
|
3
|
+
export declare function writeMcpLocation(entry: McpLocationEntry, ctx: McpScanContext, recipe?: McpRecipe, secrets?: McpSecretValues): Promise<void>;
|
|
@@ -0,0 +1,39 @@
|
|
|
1
|
+
import { join } from 'node:path';
|
|
2
|
+
import { readJsonObject, writeJsonObject } from './io.js';
|
|
3
|
+
import { projectServerObject } from './recipe.js';
|
|
4
|
+
import { removeOwnedServer, writeOwnedServer, isMcpAgentId, setLocationEnabled, } from './dialects/index.js';
|
|
5
|
+
import { OperationFailure } from '../operation.js';
|
|
6
|
+
/** Preserve Claude's distinct project-local object instead of routing it to .mcp.json. */
|
|
7
|
+
export async function writeMcpLocation(entry, ctx, recipe, secrets) {
|
|
8
|
+
if (entry.ownership !== 'owned' || !entry.writable)
|
|
9
|
+
throw new OperationFailure('mcp.borrowedNotMutable', 'This MCP location cannot be changed.', { nativeKey: entry.nativeKey });
|
|
10
|
+
if (!isMcpAgentId(entry.agent))
|
|
11
|
+
throw new OperationFailure('usage.unsupportedCapability', 'Unknown Agent.');
|
|
12
|
+
if (entry.agent === 'claude' &&
|
|
13
|
+
entry.scope === 'project' &&
|
|
14
|
+
entry.filePath === join(ctx.home, '.claude.json')) {
|
|
15
|
+
const doc = await readJsonObject(entry.filePath);
|
|
16
|
+
const projects = (doc.projects ?? {});
|
|
17
|
+
const project = projects[ctx.cwd] ?? {};
|
|
18
|
+
const servers = (project.mcpServers ?? {});
|
|
19
|
+
if (recipe) {
|
|
20
|
+
const next = projectServerObject(recipe, secrets ?? entry.secrets, 'json');
|
|
21
|
+
delete next.disabled;
|
|
22
|
+
servers[entry.nativeKey] = next;
|
|
23
|
+
}
|
|
24
|
+
else
|
|
25
|
+
delete servers[entry.nativeKey];
|
|
26
|
+
project.mcpServers = servers;
|
|
27
|
+
projects[ctx.cwd] = project;
|
|
28
|
+
doc.projects = projects;
|
|
29
|
+
await writeJsonObject(entry.filePath, doc);
|
|
30
|
+
}
|
|
31
|
+
else if (recipe) {
|
|
32
|
+
await writeOwnedServer(entry.agent, entry.scope, ctx, entry.nativeKey, recipe, secrets ?? entry.secrets);
|
|
33
|
+
if (!entry.enabled)
|
|
34
|
+
await setLocationEnabled(entry, ctx, false);
|
|
35
|
+
}
|
|
36
|
+
else
|
|
37
|
+
await removeOwnedServer(entry.agent, entry.scope, ctx, entry.nativeKey);
|
|
38
|
+
}
|
|
39
|
+
//# sourceMappingURL=location-write.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"location-write.js","sourceRoot":"","sources":["../../../../src/domain/mcp/location-write.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,IAAI,EAAE,MAAM,WAAW,CAAC;AACjC,OAAO,EAAE,cAAc,EAAE,eAAe,EAAE,MAAM,SAAS,CAAC;AAC1D,OAAO,EAAE,mBAAmB,EAAE,MAAM,aAAa,CAAC;AAClD,OAAO,EACL,iBAAiB,EACjB,gBAAgB,EAChB,YAAY,EACZ,kBAAkB,GACnB,MAAM,qBAAqB,CAAC;AAO7B,OAAO,EAAE,gBAAgB,EAAE,MAAM,iBAAiB,CAAC;AAEnD,0FAA0F;AAC1F,MAAM,CAAC,KAAK,UAAU,gBAAgB,CACpC,KAAuB,EACvB,GAAmB,EACnB,MAAkB,EAClB,OAAyB;IAEzB,IAAI,KAAK,CAAC,SAAS,KAAK,OAAO,IAAI,CAAC,KAAK,CAAC,QAAQ;QAChD,MAAM,IAAI,gBAAgB,CACxB,wBAAwB,EACxB,sCAAsC,EACtC,EAAE,SAAS,EAAE,KAAK,CAAC,SAAS,EAAE,CAC/B,CAAC;IACJ,IAAI,CAAC,YAAY,CAAC,KAAK,CAAC,KAAK,CAAC;QAC5B,MAAM,IAAI,gBAAgB,CAAC,6BAA6B,EAAE,gBAAgB,CAAC,CAAC;IAC9E,IACE,KAAK,CAAC,KAAK,KAAK,QAAQ;QACxB,KAAK,CAAC,KAAK,KAAK,SAAS;QACzB,KAAK,CAAC,QAAQ,KAAK,IAAI,CAAC,GAAG,CAAC,IAAI,EAAE,cAAc,CAAC,EACjD,CAAC;QACD,MAAM,GAAG,GAAG,MAAM,cAAc,CAAC,KAAK,CAAC,QAAQ,CAAC,CAAC;QACjD,MAAM,QAAQ,GAAG,CAAC,GAAG,CAAC,QAAQ,IAAI,EAAE,CAGnC,CAAC;QACF,MAAM,OAAO,GAAG,QAAQ,CAAC,GAAG,CAAC,GAAG,CAAC,IAAI,EAAE,CAAC;QACxC,MAAM,OAAO,GAAG,CAAC,OAAO,CAAC,UAAU,IAAI,EAAE,CAA4B,CAAC;QACtE,IAAI,MAAM,EAAE,CAAC;YACX,MAAM,IAAI,GAAG,mBAAmB,CAC9B,MAAM,EACN,OAAO,IAAI,KAAK,CAAC,OAAO,EACxB,MAAM,CACP,CAAC;YACF,OAAO,IAAI,CAAC,QAAQ,CAAC;YACrB,OAAO,CAAC,KAAK,CAAC,SAAS,CAAC,GAAG,IAAI,CAAC;QAClC,CAAC;;YAAM,OAAO,OAAO,CAAC,KAAK,CAAC,SAAS,CAAC,CAAC;QACvC,OAAO,CAAC,UAAU,GAAG,OAAO,CAAC;QAC7B,QAAQ,CAAC,GAAG,CAAC,GAAG,CAAC,GAAG,OAAO,CAAC;QAC5B,GAAG,CAAC,QAAQ,GAAG,QAAQ,CAAC;QACxB,MAAM,eAAe,CAAC,KAAK,CAAC,QAAQ,EAAE,GAAG,CAAC,CAAC;IAC7C,CAAC;SAAM,IAAI,MAAM,EAAE,CAAC;QAClB,MAAM,gBAAgB,CACpB,KAAK,CAAC,KAAK,EACX,KAAK,CAAC,KAAK,EACX,GAAG,EACH,KAAK,CAAC,SAAS,EACf,MAAM,EACN,OAAO,IAAI,KAAK,CAAC,OAAO,CACzB,CAAC;QACF,IAAI,CAAC,KAAK,CAAC,OAAO;YAAE,MAAM,kBAAkB,CAAC,KAAK,EAAE,GAAG,EAAE,KAAK,CAAC,CAAC;IAClE,CAAC;;QACC,MAAM,iBAAiB,CAAC,KAAK,CAAC,KAAK,EAAE,KAAK,CAAC,KAAK,EAAE,GAAG,EAAE,KAAK,CAAC,SAAS,CAAC,CAAC;AAC5E,CAAC"}
|
|
@@ -2,5 +2,7 @@ import type { HttpProbeStatus, McpRecipe, McpSecretValues } from './types.js';
|
|
|
2
2
|
export interface HttpProbeInit {
|
|
3
3
|
fetchImpl?: typeof fetch;
|
|
4
4
|
timeoutMs?: number;
|
|
5
|
+
signal?: AbortSignal;
|
|
6
|
+
onResponse?: (status: number) => void;
|
|
5
7
|
}
|
|
6
8
|
export declare function probeHttp(recipe: McpRecipe, secrets: McpSecretValues, init?: HttpProbeInit): Promise<HttpProbeStatus>;
|
|
@@ -14,8 +14,9 @@ export async function probeHttp(recipe, secrets, init = {}) {
|
|
|
14
14
|
method: 'GET',
|
|
15
15
|
headers,
|
|
16
16
|
redirect: 'manual',
|
|
17
|
-
signal: controller.signal,
|
|
17
|
+
signal: init.signal ? AbortSignal.any([controller.signal, init.signal]) : controller.signal,
|
|
18
18
|
});
|
|
19
|
+
init.onResponse?.(response.status);
|
|
19
20
|
if (response.status === 401 || response.status === 403)
|
|
20
21
|
return 'needs-auth';
|
|
21
22
|
if (response.status >= 200 && response.status < 400)
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"probe.js","sourceRoot":"","sources":["../../../../src/domain/mcp/probe.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"probe.js","sourceRoot":"","sources":["../../../../src/domain/mcp/probe.ts"],"names":[],"mappings":"AASA,MAAM,CAAC,KAAK,UAAU,SAAS,CAC7B,MAAiB,EACjB,OAAwB,EACxB,IAAI,GAAkB,EAAE;IAExB,IAAI,MAAM,CAAC,SAAS,KAAK,MAAM,IAAI,MAAM,CAAC,SAAS,KAAK,KAAK;QAAE,OAAO,QAAQ,CAAC;IAC/E,MAAM,GAAG,GAAG,OAAO,CAAC,GAAG,IAAI,MAAM,CAAC,GAAG,CAAC;IACtC,IAAI,CAAC,GAAG;QAAE,OAAO,QAAQ,CAAC;IAC1B,MAAM,SAAS,GAAG,IAAI,CAAC,SAAS,IAAI,KAAK,CAAC;IAC1C,MAAM,SAAS,GAAG,IAAI,CAAC,SAAS,IAAI,IAAI,CAAC;IACzC,MAAM,OAAO,GAAG,IAAI,OAAO,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC;IAC7C,MAAM,UAAU,GAAG,IAAI,eAAe,EAAE,CAAC;IACzC,MAAM,KAAK,GAAG,UAAU,CAAC,GAAG,EAAE,CAAC,UAAU,CAAC,KAAK,EAAE,EAAE,SAAS,CAAC,CAAC;IAC9D,IAAI,CAAC;QACH,MAAM,QAAQ,GAAG,MAAM,SAAS,CAAC,GAAG,EAAE;YACpC,MAAM,EAAE,KAAK;YACb,OAAO;YACP,QAAQ,EAAE,QAAQ;YAClB,MAAM,EAAE,IAAI,CAAC,MAAM,CAAC,CAAC,CAAC,WAAW,CAAC,GAAG,CAAC,CAAC,UAAU,CAAC,MAAM,EAAE,IAAI,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,CAAC,UAAU,CAAC,MAAM;SAC5F,CAAC,CAAC;QACH,IAAI,CAAC,UAAU,EAAE,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAC;QACnC,IAAI,QAAQ,CAAC,MAAM,KAAK,GAAG,IAAI,QAAQ,CAAC,MAAM,KAAK,GAAG;YAAE,OAAO,YAAY,CAAC;QAC5E,IAAI,QAAQ,CAAC,MAAM,IAAI,GAAG,IAAI,QAAQ,CAAC,MAAM,GAAG,GAAG;YAAE,OAAO,WAAW,CAAC;QACxE,OAAO,QAAQ,CAAC;IAClB,CAAC;IAAC,MAAM,CAAC;QACP,OAAO,QAAQ,CAAC;IAClB,CAAC;YAAS,CAAC;QACT,YAAY,CAAC,KAAK,CAAC,CAAC;IACtB,CAAC;AACH,CAAC"}
|
|
@@ -10,5 +10,5 @@ export declare function extractFromServerObject(raw: Record<string, unknown>): {
|
|
|
10
10
|
};
|
|
11
11
|
export declare function projectServerObject(recipe: McpRecipe, secrets: McpSecretValues, style: 'json' | 'opencode'): Record<string, unknown>;
|
|
12
12
|
export declare function projectTomlServer(recipe: McpRecipe, secrets: McpSecretValues): Record<string, unknown>;
|
|
13
|
-
export declare function projectMap(keys: string[], values: Record<string, string
|
|
13
|
+
export declare function projectMap(keys: string[], values: Record<string, string>, caseInsensitive?: boolean): Record<string, string>;
|
|
14
14
|
export declare function fillMissingSecrets(existing: McpSecretValues, overlay: McpSecretValues): McpSecretValues;
|
|
@@ -68,7 +68,7 @@ export function extractFromServerObject(raw) {
|
|
|
68
68
|
}
|
|
69
69
|
export function projectServerObject(recipe, secrets, style) {
|
|
70
70
|
const env = projectMap(recipe.envKeys, secrets.env);
|
|
71
|
-
const headers = projectMap(recipe.headerKeys, secrets.headers);
|
|
71
|
+
const headers = projectMap(recipe.headerKeys, secrets.headers, true);
|
|
72
72
|
const url = secrets.url ?? recipe.url;
|
|
73
73
|
if (style === 'opencode') {
|
|
74
74
|
if (recipe.transport === 'stdio') {
|
|
@@ -105,7 +105,7 @@ export function projectServerObject(recipe, secrets, style) {
|
|
|
105
105
|
}
|
|
106
106
|
export function projectTomlServer(recipe, secrets) {
|
|
107
107
|
const env = projectMap(recipe.envKeys, secrets.env);
|
|
108
|
-
const headers = projectMap(recipe.headerKeys, secrets.headers);
|
|
108
|
+
const headers = projectMap(recipe.headerKeys, secrets.headers, true);
|
|
109
109
|
const url = secrets.url ?? recipe.url;
|
|
110
110
|
const out = {};
|
|
111
111
|
if (recipe.transport === 'stdio') {
|
|
@@ -128,11 +128,12 @@ export function projectTomlServer(recipe, secrets) {
|
|
|
128
128
|
}
|
|
129
129
|
return out;
|
|
130
130
|
}
|
|
131
|
-
export function projectMap(keys, values) {
|
|
131
|
+
export function projectMap(keys, values, caseInsensitive = false) {
|
|
132
132
|
const out = {};
|
|
133
133
|
for (const key of keys) {
|
|
134
|
-
|
|
135
|
-
|
|
134
|
+
const stored = caseInsensitive ? Object.keys(values).find((name) => name.toLowerCase() === key.toLowerCase()) : key;
|
|
135
|
+
if (stored && values[stored])
|
|
136
|
+
out[key] = values[stored];
|
|
136
137
|
else
|
|
137
138
|
out[key] = `\${${key}}`;
|
|
138
139
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"recipe.js","sourceRoot":"","sources":["../../../../src/domain/mcp/recipe.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,cAAc,EAAE,cAAc,EAAE,MAAM,eAAe,CAAC;AAC/D,OAAO,EAAE,YAAY,EAAE,MAAM,cAAc,CAAC;AAG5C,MAAM,UAAU,GAAG,0DAA0D,CAAC;AAE9E,MAAM,UAAU,WAAW,CAAC,GAAW;IACrC,OAAO,UAAU,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;AAC9B,CAAC;AAED,kGAAkG;AAClG,MAAM,UAAU,wBAAwB,CAAC,GAA4B;IACnE,IAAI,OAAO,GAAG,CAAC,GAAG,KAAK,QAAQ,IAAI,GAAG,CAAC,GAAG,CAAC,IAAI,EAAE;QAAE,OAAO,IAAI,CAAC;IAC/D,IAAI,OAAO,GAAG,CAAC,OAAO,KAAK,QAAQ,IAAI,GAAG,CAAC,OAAO,CAAC,IAAI,EAAE;QAAE,OAAO,IAAI,CAAC;IACvE,IAAI,KAAK,CAAC,OAAO,CAAC,GAAG,CAAC,OAAO,CAAC,IAAI,GAAG,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC,IAAI,EAAE,CAAC;QAAE,OAAO,IAAI,CAAC;IAC/F,OAAO,KAAK,CAAC;AACf,CAAC;AAED,MAAM,UAAU,aAAa,CAAC,KAAa;IACzC,MAAM,OAAO,GAAG,KAAK,CAAC,IAAI,EAAE,CAAC;IAC7B,IAAI,gCAAgC,CAAC,IAAI,CAAC,OAAO,CAAC;QAAE,OAAO,IAAI,CAAC;IAChE,IAAI,6BAA6B,CAAC,IAAI,CAAC,OAAO,CAAC;QAAE,OAAO,IAAI,CAAC;IAC7D,IAAI,8BAA8B,CAAC,IAAI,CAAC,OAAO,CAAC;QAAE,OAAO,IAAI,CAAC;IAC9D,IAAI,2BAA2B,CAAC,IAAI,CAAC,OAAO,CAAC;QAAE,OAAO,IAAI,CAAC;IAC3D,OAAO,KAAK,CAAC;AACf,CAAC;AAED,MAAM,UAAU,uBAAuB,CAAC,GAA4B;IAKlE,MAAM,SAAS,GAAG,cAAc,CAAC,GAAG,CAAC,CAAC;IACtC,MAAM,SAAS,GAAG,eAAe,CAAC,GAAG,CAAC,GAAG,IAAI,GAAG,CAAC,WAAW,CAAC,CAAC;IAC9D,MAAM,YAAY,GAAG,eAAe,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC;IAClD,MAAM,OAAO,GAAG,MAAM,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC;IACvC,MAAM,UAAU,GAAG,MAAM,CAAC,IAAI,CAAC,YAAY,CAAC,CAAC;IAC7C,MAAM,OAAO,GAAG,YAAY,EAAE,CAAC;IAC/B,KAAK,MAAM,CAAC,GAAG,EAAE,KAAK,CAAC,IAAI,MAAM,CAAC,OAAO,CAAC,SAAS,CAAC,EAAE,CAAC;QACrD,IAAI,CAAC,aAAa,CAAC,KAAK,CAAC,IAAI,CAAC,WAAW,CAAC,GAAG,CAAC,IAAI,gBAAgB,CAAC,KAAK,CAAC,CAAC,EAAE,CAAC;YAC3E,OAAO,CAAC,GAAG,CAAC,GAAG,CAAC,GAAG,KAAK,CAAC;QAC3B,CAAC;IACH,CAAC;IACD,KAAK,MAAM,CAAC,GAAG,EAAE,KAAK,CAAC,IAAI,MAAM,CAAC,OAAO,CAAC,YAAY,CAAC,EAAE,CAAC;QACxD,IAAI,CAAC,aAAa,CAAC,KAAK,CAAC,IAAI,CAAC,WAAW,CAAC,GAAG,CAAC,IAAI,gBAAgB,CAAC,KAAK,CAAC,CAAC,EAAE,CAAC;YAC3E,OAAO,CAAC,OAAO,CAAC,GAAG,CAAC,GAAG,KAAK,CAAC;QAC/B,CAAC;IACH,CAAC;IAED,IAAI,GAAuB,CAAC;IAC5B,IAAI,OAAO,GAAG,CAAC,GAAG,KAAK,QAAQ,IAAI,GAAG,CAAC,GAAG,CAAC,IAAI,EAAE,EAAE,CAAC;QAClD,MAAM,QAAQ,GAAG,cAAc,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC;QACzC,GAAG,GAAG,QAAQ,CAAC,SAAS,CAAC;QACzB,IAAI,QAAQ,CAAC,SAAS;YAAE,OAAO,CAAC,GAAG,GAAG,QAAQ,CAAC,SAAS,CAAC;IAC3D,CAAC;IAED,MAAM,YAAY,GAAG,cAAc,CAAC,GAAG,EAAE,SAAS,CAAC,CAAC;IACpD,MAAM,OAAO,GAAG,GAAG,CAAC,OAAO,KAAK,KAAK,IAAI,GAAG,CAAC,QAAQ,KAAK,IAAI,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,IAAI,CAAC;IAE9E,OAAO;QACL,MAAM,EAAE;YACN,SAAS;YACT,GAAG,CAAC,YAAY,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,OAAO,EAAE,YAAY,CAAC,OAAO,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;YAClE,GAAG,CAAC,YAAY,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,IAAI,EAAE,YAAY,CAAC,IAAI,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;YAChE,GAAG,CAAC,OAAO,GAAG,CAAC,GAAG,KAAK,QAAQ,CAAC,CAAC,CAAC,EAAE,GAAG,EAAE,GAAG,CAAC,GAAG,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;YACxD,GAAG,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,GAAG,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;YACvB,OAAO;YACP,UAAU;SACX;QACD,OAAO;QACP,OAAO;KACR,CAAC;AACJ,CAAC;AAED,MAAM,UAAU,mBAAmB,CACjC,MAAiB,EACjB,OAAwB,EACxB,KAA0B;IAE1B,MAAM,GAAG,GAAG,UAAU,CAAC,MAAM,CAAC,OAAO,EAAE,OAAO,CAAC,GAAG,CAAC,CAAC;IACpD,MAAM,OAAO,GAAG,UAAU,CAAC,MAAM,CAAC,UAAU,EAAE,OAAO,CAAC,OAAO,CAAC,CAAC;
|
|
1
|
+
{"version":3,"file":"recipe.js","sourceRoot":"","sources":["../../../../src/domain/mcp/recipe.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,4 +1,3 @@
|
|
|
1
|
-
import { execFileSync } from 'node:child_process';
|
|
2
1
|
import { existsSync } from 'node:fs';
|
|
3
2
|
import { readFile, writeFile } from 'node:fs/promises';
|
|
4
3
|
import { join } from 'node:path';
|
|
@@ -6,6 +5,8 @@ import { collectionPaths, exists } from '../core.js';
|
|
|
6
5
|
import { readUserConfig, writeUserConfig } from '../user-config.js';
|
|
7
6
|
import { assertMcpName } from './identity.js';
|
|
8
7
|
import { readJsonObject, writeJsonObject } from './io.js';
|
|
8
|
+
import { runGit } from '../process.js';
|
|
9
|
+
import { registerSecrets } from '../operation.js';
|
|
9
10
|
export function mcpSecretState(recipe, secrets) {
|
|
10
11
|
if (!recipe.headerKeys.length && !recipe.envKeys.length)
|
|
11
12
|
return 'none';
|
|
@@ -40,7 +41,7 @@ export async function setMcpSecretsInGit(enabled) {
|
|
|
40
41
|
await writeUserConfig({ ...current, mcpSecretsInGit: enabled });
|
|
41
42
|
await syncSecretsGitignore(enabled);
|
|
42
43
|
if (enabled && (await exists(mcpSecretsPath())))
|
|
43
|
-
forceAddSecretsFile();
|
|
44
|
+
await forceAddSecretsFile();
|
|
44
45
|
}
|
|
45
46
|
export async function readAllMcpSecrets() {
|
|
46
47
|
const raw = await readJsonObject(mcpSecretsPath());
|
|
@@ -49,6 +50,7 @@ export async function readAllMcpSecrets() {
|
|
|
49
50
|
if (!value || typeof value !== 'object')
|
|
50
51
|
continue;
|
|
51
52
|
out[name] = normalizeSecrets(value);
|
|
53
|
+
registerSecrets(out[name]);
|
|
52
54
|
}
|
|
53
55
|
return out;
|
|
54
56
|
}
|
|
@@ -60,6 +62,7 @@ export function emptySecrets() {
|
|
|
60
62
|
return { env: {}, headers: {} };
|
|
61
63
|
}
|
|
62
64
|
export async function writeMcpSecrets(name, secrets) {
|
|
65
|
+
registerSecrets(secrets);
|
|
63
66
|
const key = assertMcpName(name);
|
|
64
67
|
const all = await readAllMcpSecrets();
|
|
65
68
|
if (isEmptySecrets(secrets))
|
|
@@ -68,7 +71,7 @@ export async function writeMcpSecrets(name, secrets) {
|
|
|
68
71
|
all[key] = secrets;
|
|
69
72
|
await writeJsonObject(mcpSecretsPath(), all);
|
|
70
73
|
if (await readMcpSecretsInGit())
|
|
71
|
-
forceAddSecretsFile();
|
|
74
|
+
await forceAddSecretsFile();
|
|
72
75
|
}
|
|
73
76
|
export async function deleteMcpSecrets(name) {
|
|
74
77
|
const key = assertMcpName(name);
|
|
@@ -78,7 +81,7 @@ export async function deleteMcpSecrets(name) {
|
|
|
78
81
|
delete all[key];
|
|
79
82
|
await writeJsonObject(mcpSecretsPath(), all);
|
|
80
83
|
if (await readMcpSecretsInGit())
|
|
81
|
-
forceAddSecretsFile();
|
|
84
|
+
await forceAddSecretsFile();
|
|
82
85
|
}
|
|
83
86
|
export async function moveMcpSecrets(from, to) {
|
|
84
87
|
const secrets = await readMcpSecrets(from);
|
|
@@ -126,27 +129,25 @@ async function syncSecretsGitignore(enabled) {
|
|
|
126
129
|
lines.pop();
|
|
127
130
|
await writeFile(gitignore, `${lines.join('\n')}\n`, 'utf8');
|
|
128
131
|
if (!enabled)
|
|
129
|
-
untrackSecretsFile();
|
|
132
|
+
await untrackSecretsFile();
|
|
130
133
|
}
|
|
131
|
-
function forceAddSecretsFile() {
|
|
134
|
+
async function forceAddSecretsFile() {
|
|
132
135
|
const root = collectionPaths().root;
|
|
133
136
|
if (!existsSync(join(root, '.git')))
|
|
134
137
|
return;
|
|
135
138
|
try {
|
|
136
|
-
|
|
139
|
+
await runGit(['-C', root, 'add', '-f', '--', SECRETS_REL]);
|
|
137
140
|
}
|
|
138
141
|
catch {
|
|
139
142
|
/* not a git repo or add failed */
|
|
140
143
|
}
|
|
141
144
|
}
|
|
142
|
-
function untrackSecretsFile() {
|
|
145
|
+
async function untrackSecretsFile() {
|
|
143
146
|
const root = collectionPaths().root;
|
|
144
147
|
if (!existsSync(join(root, '.git')))
|
|
145
148
|
return;
|
|
146
149
|
try {
|
|
147
|
-
|
|
148
|
-
stdio: 'ignore',
|
|
149
|
-
});
|
|
150
|
+
await runGit(['-C', root, 'rm', '--cached', '-f', '--', SECRETS_REL]);
|
|
150
151
|
}
|
|
151
152
|
catch {
|
|
152
153
|
/* not tracked */
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"secrets.js","sourceRoot":"","sources":["../../../../src/domain/mcp/secrets.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,
|
|
1
|
+
{"version":3,"file":"secrets.js","sourceRoot":"","sources":["../../../../src/domain/mcp/secrets.ts"],"names":[],"mappings":"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"}
|
|
@@ -31,6 +31,8 @@ export interface CollectedMcp {
|
|
|
31
31
|
note: string;
|
|
32
32
|
source: McpSource;
|
|
33
33
|
recipe: McpRecipe;
|
|
34
|
+
/** Recipe committed; old endpoint credentials must not be reused until reset completes. */
|
|
35
|
+
secretsResetPending?: boolean;
|
|
34
36
|
}
|
|
35
37
|
export interface McpLocationEntry {
|
|
36
38
|
agent: string;
|
|
@@ -1,12 +1,12 @@
|
|
|
1
1
|
import { homedir } from 'node:os';
|
|
2
2
|
import { commitCollection, exists } from '../core.js';
|
|
3
|
-
import { DomainError } from '../errors.js';
|
|
4
|
-
import { createCollectedRecord, deleteCollectedMcpFile, listCollectedMcps, readCollectedMcp, writeCollectedMcp, } from './collection.js';
|
|
5
|
-
import { agentMcpWritable, isMcpAgentId, mcpAgentIds, ownedFilePath, readBorrowedEntries, readOwnedRows,
|
|
3
|
+
import { DomainError, domainNotify } from '../errors.js';
|
|
4
|
+
import { createCollectedRecord, deleteCollectedMcpFile, listCollectedMcps, readCollectedMcp, writeCollectedMcp, writeCollectedMcpRecord, } from './collection.js';
|
|
5
|
+
import { agentMcpWritable, isMcpAgentId, mcpAgentIds, ownedFilePath, readBorrowedEntries, readOwnedRows, setLocationEnabled, toLocationEntries, } from './dialects.js';
|
|
6
6
|
import { assertMcpName, classifyMcpMatch, findCollectedByEndpoint, findCollectedByName, recipesSameEndpoint, } from './identity.js';
|
|
7
7
|
import { probeHttp } from './probe.js';
|
|
8
8
|
import { fillMissingSecrets } from './recipe.js';
|
|
9
|
-
import { deleteMcpSecrets,
|
|
9
|
+
import { deleteMcpSecrets, mergeSecrets, moveMcpSecrets, readMcpSecrets, writeMcpSecrets, } from './secrets.js';
|
|
10
10
|
export function scanContext(home = homedir(), cwd = process.cwd()) {
|
|
11
11
|
return { home, cwd };
|
|
12
12
|
}
|
|
@@ -57,8 +57,19 @@ async function commitImportedMcp(incoming, secrets, options) {
|
|
|
57
57
|
const existing = findCollectedByName(collection, incoming.name);
|
|
58
58
|
if (existing) {
|
|
59
59
|
const match = classifyMcpMatch(existing, incoming);
|
|
60
|
-
if (match === 'same-source')
|
|
60
|
+
if (match === 'same-source' && !existing.secretsResetPending) {
|
|
61
|
+
if (options.keepSecrets !== false) {
|
|
62
|
+
const { fillMissing } = await import('../agent-mcp-write.js');
|
|
63
|
+
const before = await readMcpSecrets(existing.name);
|
|
64
|
+
const next = fillMissing(before, secrets);
|
|
65
|
+
if (JSON.stringify(before) !== JSON.stringify(next)) {
|
|
66
|
+
await writeMcpSecrets(existing.name, next);
|
|
67
|
+
await commitCollection(`mcp: complete secrets ${existing.name}`);
|
|
68
|
+
return { result: 'imported', name: existing.name };
|
|
69
|
+
}
|
|
70
|
+
}
|
|
61
71
|
return { result: 'unchanged', name: existing.name };
|
|
72
|
+
}
|
|
62
73
|
if (match === 'collected-as')
|
|
63
74
|
return { result: 'collected-as', name: existing.name };
|
|
64
75
|
if (!options.allowReplace) {
|
|
@@ -75,12 +86,12 @@ async function commitImportedMcp(incoming, secrets, options) {
|
|
|
75
86
|
return { result: 'cancelled', name: incoming.name };
|
|
76
87
|
}
|
|
77
88
|
}
|
|
78
|
-
const
|
|
79
|
-
|
|
80
|
-
|
|
81
|
-
|
|
82
|
-
|
|
83
|
-
|
|
89
|
+
const { collectMcpRecords } = await import('../agent-mcp-write.js');
|
|
90
|
+
const result = await collectMcpRecords([{ mcp: incoming, secrets: options.keepSecrets === false ? { env: {}, headers: {} } : secrets }], { replace: true }, 'mcp.import', new AbortController().signal);
|
|
91
|
+
if (result.error)
|
|
92
|
+
throw new DomainError('mcp.writeFailed', { name: incoming.name }, { cause: new Error(result.error.code) });
|
|
93
|
+
for (const warning of result.warnings ?? [])
|
|
94
|
+
domainNotify('domain.gitCommitFailed', { error: warning.code });
|
|
84
95
|
return { result: 'imported', name: incoming.name };
|
|
85
96
|
}
|
|
86
97
|
export async function createCollectedMcp(input) {
|
|
@@ -130,28 +141,21 @@ export async function mcpInstallReviewOptions(ctx = scanContext()) {
|
|
|
130
141
|
return { targets, defaultProjectAgents, defaultGlobalAgents };
|
|
131
142
|
}
|
|
132
143
|
export async function addCollectedMcp(name, targets, ctx = scanContext()) {
|
|
133
|
-
const
|
|
134
|
-
|
|
135
|
-
|
|
136
|
-
|
|
137
|
-
|
|
138
|
-
|
|
139
|
-
|
|
140
|
-
|
|
141
|
-
|
|
142
|
-
|
|
143
|
-
const
|
|
144
|
-
if (
|
|
145
|
-
|
|
146
|
-
|
|
147
|
-
}
|
|
148
|
-
if (!(await agentMcpWritable(target.agent, target.scope, ctx))) {
|
|
149
|
-
throw new DomainError('mcp.notWritable', { name: target.agent });
|
|
150
|
-
}
|
|
151
|
-
await writeOwnedServer(target.agent, target.scope, ctx, collected.name, collected.recipe, secrets);
|
|
152
|
-
added += 1;
|
|
144
|
+
const { planMcpAdds } = await import('../agent-mcp-write.js');
|
|
145
|
+
const { executeWrites } = await import('../agent-write.js');
|
|
146
|
+
try {
|
|
147
|
+
const result = await executeWrites(await planMcpAdds([name], targets, ctx), false, false, 'mcp.add', new AbortController().signal);
|
|
148
|
+
if (result.error)
|
|
149
|
+
throw new DomainError('mcp.sameNameExistsReplace', { name });
|
|
150
|
+
const items = result.result.items;
|
|
151
|
+
return { added: items.filter((item) => item.status === 'committed').length, skipped: items.filter((item) => item.status === 'unchanged').length };
|
|
152
|
+
}
|
|
153
|
+
catch (error) {
|
|
154
|
+
const failure = error;
|
|
155
|
+
if (failure.code === 'mcp.notWritable')
|
|
156
|
+
throw new DomainError('mcp.notWritable', { name: String(failure.details?.agent) });
|
|
157
|
+
throw error;
|
|
153
158
|
}
|
|
154
|
-
return { added, skipped };
|
|
155
159
|
}
|
|
156
160
|
export async function toggleMcpLocation(entry, ctx = scanContext()) {
|
|
157
161
|
const next = !entry.enabled;
|
|
@@ -163,6 +167,8 @@ export async function updateLocationsFromCollection(name, options = {}, ctx = sc
|
|
|
163
167
|
if (!collected)
|
|
164
168
|
throw new DomainError('mcp.missingInCollection', { name });
|
|
165
169
|
const overlay = await readMcpSecrets(collected.name);
|
|
170
|
+
if (collected.secretsResetPending)
|
|
171
|
+
throw new DomainError('mcp.missingSecrets', { name });
|
|
166
172
|
let updated = 0;
|
|
167
173
|
let skipped = 0;
|
|
168
174
|
let cancelled = 0;
|
|
@@ -191,7 +197,8 @@ export async function updateLocationsFromCollection(name, options = {}, ctx = sc
|
|
|
191
197
|
continue;
|
|
192
198
|
}
|
|
193
199
|
const secrets = fillMissingSecrets(entry.secrets, overlay);
|
|
194
|
-
|
|
200
|
+
const { writeMcpLocation } = await import('./location-write.js');
|
|
201
|
+
await writeMcpLocation(entry, ctx, collected.recipe, secrets);
|
|
195
202
|
updated += 1;
|
|
196
203
|
}
|
|
197
204
|
}
|
|
@@ -211,7 +218,8 @@ export async function removeMcpLocation(entry, ctx = scanContext()) {
|
|
|
211
218
|
}
|
|
212
219
|
if (!isMcpAgentId(entry.agent))
|
|
213
220
|
throw new DomainError('mcp.unknownAgent', { name: entry.agent });
|
|
214
|
-
|
|
221
|
+
const { writeMcpLocation } = await import('./location-write.js');
|
|
222
|
+
await writeMcpLocation(entry, ctx);
|
|
215
223
|
}
|
|
216
224
|
export async function renameCollectedMcp(from, to) {
|
|
217
225
|
const current = await readCollectedMcp(from);
|
|
@@ -239,7 +247,13 @@ export async function updateCollectedRecipe(name, recipe) {
|
|
|
239
247
|
if (!current)
|
|
240
248
|
throw new DomainError('mcp.missingInCollection', { name });
|
|
241
249
|
const next = { ...current, recipe };
|
|
242
|
-
const
|
|
250
|
+
const clear = Boolean(current.secretsResetPending || !recipesSameEndpoint(current.recipe, recipe));
|
|
251
|
+
await writeCollectedMcpRecord({ ...next, secretsResetPending: clear });
|
|
252
|
+
if (clear) {
|
|
253
|
+
await deleteMcpSecrets(name);
|
|
254
|
+
await writeCollectedMcpRecord({ ...next, secretsResetPending: false });
|
|
255
|
+
}
|
|
256
|
+
const committed = await commitCollection(`mcp: edit ${name}`);
|
|
243
257
|
if (!committed)
|
|
244
258
|
throw new DomainError('domain.gitCommitFailed', { error: name });
|
|
245
259
|
return next;
|