dsh-desktop-enhance 0.4.4 → 0.4.5
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/lib/client.js +128 -74
- package/lib/index.d.ts +4 -2
- package/lib/index.js +130 -15
- package/package.json +1 -1
package/lib/client.js
CHANGED
|
@@ -1351,14 +1351,24 @@ window.__ModuleLoader__.load({
|
|
|
1351
1351
|
if (ACTION_VERB_PREFIXES.has(firstWord)) return [name];
|
|
1352
1352
|
return sub;
|
|
1353
1353
|
}
|
|
1354
|
+
const STRUCTURAL_HOST_PACKAGES = new Set([
|
|
1355
|
+
"root",
|
|
1356
|
+
"builtin",
|
|
1357
|
+
"scope",
|
|
1358
|
+
"anonymous",
|
|
1359
|
+
"cordis:group",
|
|
1360
|
+
"@deepseek-ai/dsh-agent-preset",
|
|
1361
|
+
"@deepseek-ai/dsh-agent-loop",
|
|
1362
|
+
"@deepseek-ai/dsh-scope"
|
|
1363
|
+
]);
|
|
1354
1364
|
function classifyToolOrigin(toolName, rawPluginName) {
|
|
1355
1365
|
const name = typeof toolName === "string" ? toolName.trim() : "";
|
|
1356
1366
|
if (name.startsWith("mcp__")) return makeMcpOrigin(name.split("__").filter((s) => s !== "")[1] ?? "mcp");
|
|
1357
1367
|
const explicitPkg = typeof rawPluginName === "string" ? normalizeBarePackageName(rawPluginName) : "";
|
|
1358
1368
|
const known = KNOWN_TOOL_SPECS[name];
|
|
1359
|
-
if (explicitPkg !== "" && explicitPkg
|
|
1369
|
+
if (explicitPkg !== "" && !STRUCTURAL_HOST_PACKAGES.has(explicitPkg)) {
|
|
1360
1370
|
if (explicitPkg.startsWith("mcp:")) return makeMcpOrigin(explicitPkg.slice(4));
|
|
1361
|
-
if (known !== void 0 && known.scope === "builtin") return makeKnownOrigin(known);
|
|
1371
|
+
if (known !== void 0 && (known.scope === "builtin" || known.pluginName === explicitPkg || !isPluginToolPackage(explicitPkg))) return makeKnownOrigin(known);
|
|
1362
1372
|
if (isPluginToolPackage(explicitPkg)) {
|
|
1363
1373
|
const badge = shortBadgeOfPackage(explicitPkg);
|
|
1364
1374
|
return {
|
|
@@ -5629,20 +5639,93 @@ window.__ModuleLoader__.load({
|
|
|
5629
5639
|
let contextSelectedEntryId = null;
|
|
5630
5640
|
let contextReaderSearchQuery = "";
|
|
5631
5641
|
const toolsChannel = createPolicyChannel(toolsBridge);
|
|
5632
|
-
let toolsCatalog = [];
|
|
5633
|
-
let toolsCatalogLoaded = false;
|
|
5634
|
-
let toolsCatalogAttempted = false;
|
|
5635
|
-
let toolsLoading = false;
|
|
5636
5642
|
let toolsSearchQuery = "";
|
|
5637
5643
|
const expandedToolNodes = new Set(TOOL_SCOPE_ORDER.map((s) => `scope:${s}`));
|
|
5638
5644
|
let defaultExpandedToolsSeeded = false;
|
|
5639
5645
|
const skillsChannel = createPolicyChannel(skillsBridge);
|
|
5640
|
-
let skillsCatalog = [];
|
|
5641
|
-
let skillsCatalogSessionId = null;
|
|
5642
|
-
let skillsCatalogAttemptedFor = null;
|
|
5643
|
-
let skillsLoading = false;
|
|
5644
5646
|
let skillsSearchQuery = "";
|
|
5645
5647
|
const collapsedSkillNodes = new Set();
|
|
5648
|
+
function repaintCurrent(fallbackRoot, sessionId) {
|
|
5649
|
+
lastSignature = "";
|
|
5650
|
+
const current = findActiveChatConversation();
|
|
5651
|
+
paint(current?.sessionId === sessionId ? current.root : fallbackRoot, sessionId);
|
|
5652
|
+
}
|
|
5653
|
+
function createSessionCatalogLoader(options) {
|
|
5654
|
+
let items = [];
|
|
5655
|
+
let loadedFor = null;
|
|
5656
|
+
let attemptedFor = null;
|
|
5657
|
+
let loadingFor = null;
|
|
5658
|
+
let seq = 0;
|
|
5659
|
+
return {
|
|
5660
|
+
itemsFor: (sessionId) => loadedFor === sessionId ? items : [],
|
|
5661
|
+
isLoadedFor: (sessionId) => loadedFor === sessionId,
|
|
5662
|
+
shouldAutoFetch: (sessionId) => loadedFor !== sessionId && attemptedFor !== sessionId && loadingFor !== sessionId,
|
|
5663
|
+
reset: () => {
|
|
5664
|
+
seq += 1;
|
|
5665
|
+
items = [];
|
|
5666
|
+
loadedFor = null;
|
|
5667
|
+
attemptedFor = null;
|
|
5668
|
+
loadingFor = null;
|
|
5669
|
+
},
|
|
5670
|
+
ensure: (root, sessionId, force = false) => {
|
|
5671
|
+
if (!options.isOn()) return;
|
|
5672
|
+
if (loadingFor === sessionId && !force) return;
|
|
5673
|
+
if ((loadedFor === sessionId || attemptedFor === sessionId) && !force) return;
|
|
5674
|
+
if (typeof fetchImpl !== "function") return;
|
|
5675
|
+
const url = `${options.baseUrl}?sessionId=${globalThis.encodeURIComponent(sessionId)}`;
|
|
5676
|
+
if (force) catalogCache.invalidate?.(url);
|
|
5677
|
+
const mySeq = ++seq;
|
|
5678
|
+
attemptedFor = sessionId;
|
|
5679
|
+
loadingFor = sessionId;
|
|
5680
|
+
catalogCache.get(url, fetchImpl).then((body) => {
|
|
5681
|
+
if (mySeq !== seq) return;
|
|
5682
|
+
loadingFor = null;
|
|
5683
|
+
if (activeSessionId !== null && activeSessionId !== sessionId) return;
|
|
5684
|
+
const parsed = options.parse(body);
|
|
5685
|
+
if (parsed.available) {
|
|
5686
|
+
items = parsed.items;
|
|
5687
|
+
loadedFor = sessionId;
|
|
5688
|
+
options.onLoaded?.(items, sessionId);
|
|
5689
|
+
repaintCurrent(root, sessionId);
|
|
5690
|
+
}
|
|
5691
|
+
}).catch(() => {
|
|
5692
|
+
if (mySeq === seq) loadingFor = null;
|
|
5693
|
+
});
|
|
5694
|
+
}
|
|
5695
|
+
};
|
|
5696
|
+
}
|
|
5697
|
+
const toolsCatalogLoader = createSessionCatalogLoader({
|
|
5698
|
+
baseUrl: TOOLS_URL,
|
|
5699
|
+
isOn: () => toolsChannel.isOn(),
|
|
5700
|
+
parse: (body) => {
|
|
5701
|
+
const res = parseToolCatalog(body);
|
|
5702
|
+
return {
|
|
5703
|
+
available: res.available,
|
|
5704
|
+
items: res.tools
|
|
5705
|
+
};
|
|
5706
|
+
},
|
|
5707
|
+
onLoaded: (loadedTools, sessionId) => {
|
|
5708
|
+
if (!defaultExpandedToolsSeeded) {
|
|
5709
|
+
defaultExpandedToolsSeeded = true;
|
|
5710
|
+
const initialGroups = buildToolScopeGroups(loadedTools, toolsChannel.effectiveSet(sessionId), "");
|
|
5711
|
+
for (const group of initialGroups) {
|
|
5712
|
+
expandedToolNodes.add(`scope:${group.scope}`);
|
|
5713
|
+
for (const node of group.children) if (node.kind === "node") expandedToolNodes.add(node.prefix);
|
|
5714
|
+
}
|
|
5715
|
+
}
|
|
5716
|
+
}
|
|
5717
|
+
});
|
|
5718
|
+
const skillsCatalogLoader = createSessionCatalogLoader({
|
|
5719
|
+
baseUrl: SKILLS_URL,
|
|
5720
|
+
isOn: () => skillsChannel.isOn(),
|
|
5721
|
+
parse: (body) => {
|
|
5722
|
+
const res = parseSkillCatalog(body, { includeProject: true });
|
|
5723
|
+
return {
|
|
5724
|
+
available: res.available,
|
|
5725
|
+
items: res.skills
|
|
5726
|
+
};
|
|
5727
|
+
}
|
|
5728
|
+
});
|
|
5646
5729
|
function removeToolsPopover() {
|
|
5647
5730
|
if (mountedToolsPopover !== null) {
|
|
5648
5731
|
mountedToolsPopover.remove();
|
|
@@ -5678,6 +5761,8 @@ window.__ModuleLoader__.load({
|
|
|
5678
5761
|
fetchToken += 1;
|
|
5679
5762
|
toolsChannel.clearTimer();
|
|
5680
5763
|
skillsChannel.clearTimer();
|
|
5764
|
+
toolsCatalogLoader.reset();
|
|
5765
|
+
skillsCatalogLoader.reset();
|
|
5681
5766
|
if (unsubscribeSource !== null) {
|
|
5682
5767
|
unsubscribeSource();
|
|
5683
5768
|
unsubscribeSource = null;
|
|
@@ -5694,79 +5779,23 @@ window.__ModuleLoader__.load({
|
|
|
5694
5779
|
contextReaderSearchQuery = "";
|
|
5695
5780
|
removePanel();
|
|
5696
5781
|
}
|
|
5697
|
-
function ensureToolsCatalog(root, sessionId, force = false) {
|
|
5698
|
-
if (!toolsChannel.isOn()) return;
|
|
5699
|
-
if (toolsLoading && !force) return;
|
|
5700
|
-
if ((toolsCatalogLoaded || toolsCatalogAttempted) && !force) return;
|
|
5701
|
-
if (typeof fetchImpl !== "function") return;
|
|
5702
|
-
if (force) catalogCache.invalidate?.(TOOLS_URL);
|
|
5703
|
-
toolsCatalogAttempted = true;
|
|
5704
|
-
toolsLoading = true;
|
|
5705
|
-
catalogCache.get(TOOLS_URL, fetchImpl).then((body) => {
|
|
5706
|
-
toolsLoading = false;
|
|
5707
|
-
const parsed = parseToolCatalog(body);
|
|
5708
|
-
if (parsed.available) {
|
|
5709
|
-
toolsCatalog = parsed.tools;
|
|
5710
|
-
toolsCatalogLoaded = true;
|
|
5711
|
-
if (!defaultExpandedToolsSeeded) {
|
|
5712
|
-
defaultExpandedToolsSeeded = true;
|
|
5713
|
-
const initialGroups = buildToolScopeGroups(toolsCatalog, toolsChannel.effectiveSet(sessionId), "");
|
|
5714
|
-
for (const group of initialGroups) {
|
|
5715
|
-
expandedToolNodes.add(`scope:${group.scope}`);
|
|
5716
|
-
for (const node of group.children) if (node.kind === "node") expandedToolNodes.add(node.prefix);
|
|
5717
|
-
}
|
|
5718
|
-
}
|
|
5719
|
-
lastSignature = "";
|
|
5720
|
-
const current = findActiveChatConversation();
|
|
5721
|
-
paint(current?.sessionId === sessionId ? current.root : root, sessionId);
|
|
5722
|
-
}
|
|
5723
|
-
}).catch(() => {
|
|
5724
|
-
toolsLoading = false;
|
|
5725
|
-
});
|
|
5726
|
-
}
|
|
5727
|
-
function ensureSkillsCatalog(root, sessionId, force = false) {
|
|
5728
|
-
if (!skillsChannel.isOn()) return;
|
|
5729
|
-
if (skillsLoading && !force) return;
|
|
5730
|
-
if ((skillsCatalogSessionId === sessionId || skillsCatalogAttemptedFor === sessionId) && !force) return;
|
|
5731
|
-
if (typeof fetchImpl !== "function") return;
|
|
5732
|
-
const url = `${SKILLS_URL}?sessionId=${globalThis.encodeURIComponent(sessionId)}`;
|
|
5733
|
-
if (force) catalogCache.invalidate?.(url);
|
|
5734
|
-
skillsCatalogAttemptedFor = sessionId;
|
|
5735
|
-
skillsLoading = true;
|
|
5736
|
-
catalogCache.get(url, fetchImpl).then((body) => {
|
|
5737
|
-
skillsLoading = false;
|
|
5738
|
-
const parsed = parseSkillCatalog(body, { includeProject: true });
|
|
5739
|
-
if (parsed.available) {
|
|
5740
|
-
skillsCatalog = parsed.skills;
|
|
5741
|
-
skillsCatalogSessionId = sessionId;
|
|
5742
|
-
lastSignature = "";
|
|
5743
|
-
const current = findActiveChatConversation();
|
|
5744
|
-
paint(current?.sessionId === sessionId ? current.root : root, sessionId);
|
|
5745
|
-
}
|
|
5746
|
-
}).catch(() => {
|
|
5747
|
-
skillsLoading = false;
|
|
5748
|
-
});
|
|
5749
|
-
}
|
|
5750
5782
|
function currentClientProjection() {
|
|
5751
5783
|
return projectSkills(eventsOf(retained?.binding.eventSource.getSnapshot().entries ?? []), {
|
|
5752
5784
|
systemSections: hostProjection?.systemSections,
|
|
5753
5785
|
pluginOwners: hostProjection?.pluginOwners
|
|
5754
5786
|
});
|
|
5755
5787
|
}
|
|
5756
|
-
function repaintCurrent(fallbackRoot, sessionId) {
|
|
5757
|
-
lastSignature = "";
|
|
5758
|
-
const current = findActiveChatConversation();
|
|
5759
|
-
paint(current?.sessionId === sessionId ? current.root : fallbackRoot, sessionId);
|
|
5760
|
-
}
|
|
5761
5788
|
function paint(root, sessionId) {
|
|
5762
5789
|
const toolsEnabled = toolsChannel.isOn();
|
|
5763
5790
|
const toolsWritable = toolsEnabled && toolsChannel.isWritable();
|
|
5764
|
-
if (toolsEnabled &&
|
|
5791
|
+
if (toolsEnabled && toolsCatalogLoader.shouldAutoFetch(sessionId)) toolsCatalogLoader.ensure(root, sessionId);
|
|
5765
5792
|
if (!toolsEnabled && activePopover === "tools") activePopover = null;
|
|
5766
5793
|
const skillsEnabled = skillsChannel.isOn();
|
|
5767
5794
|
const skillsWritable = skillsEnabled && skillsChannel.isWritable();
|
|
5768
|
-
if (skillsEnabled &&
|
|
5795
|
+
if (skillsEnabled && skillsCatalogLoader.shouldAutoFetch(sessionId)) skillsCatalogLoader.ensure(root, sessionId);
|
|
5769
5796
|
if (!skillsEnabled && activePopover === "skills") activePopover = null;
|
|
5797
|
+
const toolsCatalog = toolsCatalogLoader.itemsFor(sessionId);
|
|
5798
|
+
const skillsCatalog = skillsCatalogLoader.itemsFor(sessionId);
|
|
5770
5799
|
const toolsDisabledSet = toolsEnabled ? toolsChannel.effectiveSet(sessionId) : new Set();
|
|
5771
5800
|
const toolsDisabledCanonical = toolsEnabled ? formatDisabledTools(toolsDisabledSet) : "";
|
|
5772
5801
|
const toolsCustomized = toolsEnabled && toolsChannel.isCustomized(sessionId);
|
|
@@ -5889,7 +5918,7 @@ window.__ModuleLoader__.load({
|
|
|
5889
5918
|
popoverOpen: activePopover === "skills",
|
|
5890
5919
|
onTogglePopover: () => {
|
|
5891
5920
|
activePopover = activePopover === "skills" ? null : "skills";
|
|
5892
|
-
if (activePopover === "skills" &&
|
|
5921
|
+
if (activePopover === "skills" && !skillsCatalogLoader.isLoadedFor(sessionId)) skillsCatalogLoader.ensure(root, sessionId, true);
|
|
5893
5922
|
paint(root, sessionId);
|
|
5894
5923
|
}
|
|
5895
5924
|
}));
|
|
@@ -5968,7 +5997,7 @@ window.__ModuleLoader__.load({
|
|
|
5968
5997
|
popoverOpen: activePopover === "tools",
|
|
5969
5998
|
onTogglePopover: () => {
|
|
5970
5999
|
activePopover = activePopover === "tools" ? null : "tools";
|
|
5971
|
-
if (activePopover === "tools" && !
|
|
6000
|
+
if (activePopover === "tools" && !toolsCatalogLoader.isLoadedFor(sessionId)) toolsCatalogLoader.ensure(root, sessionId, true);
|
|
5972
6001
|
paint(root, sessionId);
|
|
5973
6002
|
}
|
|
5974
6003
|
}));
|
|
@@ -6012,7 +6041,7 @@ window.__ModuleLoader__.load({
|
|
|
6012
6041
|
}, () => repaintCurrent(root, sessionId));
|
|
6013
6042
|
},
|
|
6014
6043
|
onRefreshCatalog: () => {
|
|
6015
|
-
|
|
6044
|
+
toolsCatalogLoader.ensure(root, sessionId, true);
|
|
6016
6045
|
},
|
|
6017
6046
|
onClose: closePopover
|
|
6018
6047
|
});
|
|
@@ -6055,7 +6084,7 @@ window.__ModuleLoader__.load({
|
|
|
6055
6084
|
}, () => repaintCurrent(root, sessionId));
|
|
6056
6085
|
},
|
|
6057
6086
|
onRefreshCatalog: () => {
|
|
6058
|
-
|
|
6087
|
+
skillsCatalogLoader.ensure(root, sessionId, true);
|
|
6059
6088
|
},
|
|
6060
6089
|
onPreviewSkill: openSkillPreview,
|
|
6061
6090
|
onClose: closePopover
|
|
@@ -6109,6 +6138,23 @@ window.__ModuleLoader__.load({
|
|
|
6109
6138
|
paint(current?.sessionId === sessionId ? current.root : root, sessionId);
|
|
6110
6139
|
});
|
|
6111
6140
|
}
|
|
6141
|
+
function latestRequestHeaderMarker(entries) {
|
|
6142
|
+
const events = eventsOf(entries);
|
|
6143
|
+
let count = 0;
|
|
6144
|
+
let lastSeq = null;
|
|
6145
|
+
let lastToolCount = 0;
|
|
6146
|
+
for (const ev of events) {
|
|
6147
|
+
if (ev === null || typeof ev !== "object") continue;
|
|
6148
|
+
const rec = ev;
|
|
6149
|
+
if (rec.type !== "request/header") continue;
|
|
6150
|
+
count += 1;
|
|
6151
|
+
lastSeq = rec.seq ?? count;
|
|
6152
|
+
const tools = rec.data?.header?.tools;
|
|
6153
|
+
lastToolCount = Array.isArray(tools) ? tools.length : 0;
|
|
6154
|
+
}
|
|
6155
|
+
if (count === 0) return "";
|
|
6156
|
+
return `${count}:${String(lastSeq)}:${lastToolCount}`;
|
|
6157
|
+
}
|
|
6112
6158
|
function attach(sessionId, root) {
|
|
6113
6159
|
const service = getSessions();
|
|
6114
6160
|
if (service === null || service === void 0 || typeof service.retain !== "function") return;
|
|
@@ -6130,11 +6176,19 @@ window.__ModuleLoader__.load({
|
|
|
6130
6176
|
}
|
|
6131
6177
|
};
|
|
6132
6178
|
const source = next.binding.eventSource;
|
|
6179
|
+
let lastRequestHeaderMarker = latestRequestHeaderMarker(source.getSnapshot().entries ?? []);
|
|
6133
6180
|
paint(root, sessionId);
|
|
6134
6181
|
maybeRequestHost(root);
|
|
6135
6182
|
unsubscribeSource = source.subscribe(() => {
|
|
6136
6183
|
const current = findActiveChatConversation();
|
|
6137
6184
|
const targetRoot = current?.sessionId === sessionId ? current.root : root;
|
|
6185
|
+
const snapshot = source.getSnapshot();
|
|
6186
|
+
const nextHeaderMarker = latestRequestHeaderMarker(snapshot.entries ?? []);
|
|
6187
|
+
if (nextHeaderMarker !== lastRequestHeaderMarker) {
|
|
6188
|
+
const isInitialWindowLoad = lastRequestHeaderMarker === "" && snapshot.change?.kind === "replace";
|
|
6189
|
+
lastRequestHeaderMarker = nextHeaderMarker;
|
|
6190
|
+
if (!isInitialWindowLoad) toolsCatalogLoader.ensure(targetRoot, sessionId, true);
|
|
6191
|
+
}
|
|
6138
6192
|
paint(targetRoot, sessionId);
|
|
6139
6193
|
maybeRequestHost(targetRoot);
|
|
6140
6194
|
});
|
package/lib/index.d.ts
CHANGED
|
@@ -135,10 +135,11 @@ interface ToolsHostContext extends HostContext {
|
|
|
135
135
|
declare function resolveSessionIdFromScope(candidate: unknown, ctx?: HostContext): string | undefined;
|
|
136
136
|
declare function readToolsConfig(config: unknown, sessionId?: string): ToolsPolicyState;
|
|
137
137
|
declare function resolveFiberModuleName(fiber: unknown): string | undefined;
|
|
138
|
+
declare function resolveCallerPackageFromStack(stack?: string): string | undefined;
|
|
138
139
|
declare function scanCordisFiberToolOwners(ctx: HostContext, targetOwners?: Map<string, string>): Map<string, string>;
|
|
139
|
-
declare function collectAllToolSchemas(ctx: HostContext): Promise<readonly ToolSummary[]>;
|
|
140
|
+
declare function collectAllToolSchemas(ctx: HostContext, sessionId?: string): Promise<readonly ToolSummary[]>;
|
|
140
141
|
declare function installToolsPolicy(ctx: ToolsHostContext, readState: (sessionId?: string) => ToolsPolicyState): () => void;
|
|
141
|
-
declare function handleToolsCatalog(ctx: HostContext): Promise<Response>;
|
|
142
|
+
declare function handleToolsCatalog(ctx: HostContext, request?: Request): Promise<Response>;
|
|
142
143
|
declare function registerToolsRoute(ctx: HostContext): () => void;
|
|
143
144
|
//#endregion
|
|
144
145
|
//#region src/shared/skills-manager.d.ts
|
|
@@ -226,6 +227,7 @@ export declare const __test: {
|
|
|
226
227
|
installSkillsPolicy: typeof installSkillsPolicy;
|
|
227
228
|
readToolsConfig: typeof readToolsConfig;
|
|
228
229
|
readSkillsConfig: typeof readSkillsConfig;
|
|
230
|
+
resolveCallerPackageFromStack: typeof resolveCallerPackageFromStack;
|
|
229
231
|
resolveFiberModuleName: typeof resolveFiberModuleName;
|
|
230
232
|
resolveSessionIdFromScope: typeof resolveSessionIdFromScope;
|
|
231
233
|
scanCordisFiberToolOwners: typeof scanCordisFiberToolOwners;
|
package/lib/index.js
CHANGED
|
@@ -1369,14 +1369,24 @@ function splitToolName(name) {
|
|
|
1369
1369
|
if (ACTION_VERB_PREFIXES.has(firstWord)) return [name];
|
|
1370
1370
|
return sub;
|
|
1371
1371
|
}
|
|
1372
|
+
const STRUCTURAL_HOST_PACKAGES = new Set([
|
|
1373
|
+
"root",
|
|
1374
|
+
"builtin",
|
|
1375
|
+
"scope",
|
|
1376
|
+
"anonymous",
|
|
1377
|
+
"cordis:group",
|
|
1378
|
+
"@deepseek-ai/dsh-agent-preset",
|
|
1379
|
+
"@deepseek-ai/dsh-agent-loop",
|
|
1380
|
+
"@deepseek-ai/dsh-scope"
|
|
1381
|
+
]);
|
|
1372
1382
|
function classifyToolOrigin(toolName, rawPluginName) {
|
|
1373
1383
|
const name = typeof toolName === "string" ? toolName.trim() : "";
|
|
1374
1384
|
if (name.startsWith("mcp__")) return makeMcpOrigin(name.split("__").filter((s) => s !== "")[1] ?? "mcp");
|
|
1375
1385
|
const explicitPkg = typeof rawPluginName === "string" ? normalizeBarePackageName(rawPluginName) : "";
|
|
1376
1386
|
const known = KNOWN_TOOL_SPECS[name];
|
|
1377
|
-
if (explicitPkg !== "" && explicitPkg
|
|
1387
|
+
if (explicitPkg !== "" && !STRUCTURAL_HOST_PACKAGES.has(explicitPkg)) {
|
|
1378
1388
|
if (explicitPkg.startsWith("mcp:")) return makeMcpOrigin(explicitPkg.slice(4));
|
|
1379
|
-
if (known !== void 0 && known.scope === "builtin") return makeKnownOrigin(known);
|
|
1389
|
+
if (known !== void 0 && (known.scope === "builtin" || known.pluginName === explicitPkg || !isPluginToolPackage(explicitPkg))) return makeKnownOrigin(known);
|
|
1380
1390
|
if (isPluginToolPackage(explicitPkg)) {
|
|
1381
1391
|
const badge = shortBadgeOfPackage(explicitPkg);
|
|
1382
1392
|
return {
|
|
@@ -1586,6 +1596,12 @@ function unwrapCordisOriginal(value) {
|
|
|
1586
1596
|
}
|
|
1587
1597
|
return value;
|
|
1588
1598
|
}
|
|
1599
|
+
const IGNORED_STACK_PACKAGES = new Set([
|
|
1600
|
+
...STRUCTURAL_HOST_PACKAGES,
|
|
1601
|
+
"@deepseek-ai/dsh-tools",
|
|
1602
|
+
"@deepseek-ai/cordis",
|
|
1603
|
+
"dsh-desktop-enhance"
|
|
1604
|
+
]);
|
|
1589
1605
|
function resolveFiberModuleName(fiber) {
|
|
1590
1606
|
if (fiber === null || fiber === void 0 || typeof fiber !== "object") return void 0;
|
|
1591
1607
|
let cur = fiber;
|
|
@@ -1595,13 +1611,24 @@ function resolveFiberModuleName(fiber) {
|
|
|
1595
1611
|
const directEntryName = cur.entry?.options?.name;
|
|
1596
1612
|
const parentEntry = cur.parent?.[CORDIS_ENTRY_SYMBOL];
|
|
1597
1613
|
const candidate = typeof directEntryName === "string" && directEntryName.trim() !== "" ? directEntryName.trim() : typeof parentEntry?.options?.name === "string" && parentEntry.options.name.trim() !== "" ? parentEntry.options.name.trim() : "";
|
|
1598
|
-
if (candidate !== "" && candidate
|
|
1614
|
+
if (candidate !== "" && !STRUCTURAL_HOST_PACKAGES.has(candidate)) return candidate;
|
|
1599
1615
|
const next = cur.parent?.fiber;
|
|
1600
1616
|
if (next === cur) break;
|
|
1601
1617
|
cur = next;
|
|
1602
1618
|
}
|
|
1603
1619
|
const fallbackName = fiber.name;
|
|
1604
|
-
if (typeof fallbackName === "string" && fallbackName.trim() !== "" && fallbackName
|
|
1620
|
+
if (typeof fallbackName === "string" && fallbackName.trim() !== "" && !STRUCTURAL_HOST_PACKAGES.has(fallbackName.trim())) return fallbackName.trim();
|
|
1621
|
+
}
|
|
1622
|
+
function resolveCallerPackageFromStack(stack) {
|
|
1623
|
+
if (typeof stack !== "string" || stack === "") return void 0;
|
|
1624
|
+
const re = /node_modules[/\\]((?:@[^/\\]+[/\\])?[^/\\:)]+)/g;
|
|
1625
|
+
for (const line of stack.split("\n")) {
|
|
1626
|
+
re.lastIndex = 0;
|
|
1627
|
+
let lastPkg;
|
|
1628
|
+
let m;
|
|
1629
|
+
while ((m = re.exec(line)) !== null) if (typeof m[1] === "string" && m[1] !== "") lastPkg = m[1].replace(/\\/g, "/");
|
|
1630
|
+
if (lastPkg !== void 0 && !IGNORED_STACK_PACKAGES.has(lastPkg)) return lastPkg;
|
|
1631
|
+
}
|
|
1605
1632
|
}
|
|
1606
1633
|
function getAttributionStateForCtx(ctx) {
|
|
1607
1634
|
const rootKey = ctx.root ?? ctx;
|
|
@@ -1750,7 +1777,7 @@ function attachToolRegisterAttribution(ctx, toolsService) {
|
|
|
1750
1777
|
const wrappedRegister = function(definition) {
|
|
1751
1778
|
const toolName = definition !== null && definition !== void 0 && typeof definition === "object" ? definition.name : void 0;
|
|
1752
1779
|
const callerFiber = this?.ctx?.fiber;
|
|
1753
|
-
const modName = resolveFiberModuleName(callerFiber);
|
|
1780
|
+
const modName = resolveFiberModuleName(callerFiber) ?? resolveCallerPackageFromStack(new Error().stack);
|
|
1754
1781
|
if (typeof toolName === "string" && toolName.trim() !== "" && modName !== void 0 && modName !== "root") owners.set(toolName.trim(), modName);
|
|
1755
1782
|
return origRegister.call(this, definition);
|
|
1756
1783
|
};
|
|
@@ -1778,15 +1805,98 @@ function appendSchemas(target, list, owners) {
|
|
|
1778
1805
|
});
|
|
1779
1806
|
}
|
|
1780
1807
|
}
|
|
1781
|
-
|
|
1808
|
+
function extractLatestRequestHeaderTools(events) {
|
|
1809
|
+
if (!Array.isArray(events)) return [];
|
|
1810
|
+
for (let i = events.length - 1; i >= 0; i--) {
|
|
1811
|
+
const ev = events[i];
|
|
1812
|
+
if (ev === null || ev === void 0 || typeof ev !== "object") continue;
|
|
1813
|
+
if (ev.type !== "request/header") continue;
|
|
1814
|
+
const tools = ev.data?.header?.tools;
|
|
1815
|
+
if (Array.isArray(tools)) return tools;
|
|
1816
|
+
}
|
|
1817
|
+
return [];
|
|
1818
|
+
}
|
|
1819
|
+
async function resolveColdSessionToolsContext(ctx, sessionId) {
|
|
1820
|
+
let agentPreset;
|
|
1821
|
+
let headerTools = [];
|
|
1822
|
+
const sessions = ctx.get("sessions");
|
|
1823
|
+
const liveSession = typeof sessions?.get === "function" ? sessions.get(sessionId) : void 0;
|
|
1824
|
+
if (liveSession !== void 0 && liveSession !== null && typeof liveSession === "object") {
|
|
1825
|
+
const projections = ctx.get("sessionProjections");
|
|
1826
|
+
const projectedPreset = typeof projections?.stateOf === "function" ? projections.stateOf(liveSession, "agentPreset") : void 0;
|
|
1827
|
+
const rawPreset = typeof projectedPreset === "string" && projectedPreset.trim() !== "" ? projectedPreset.trim() : typeof liveSession.header?.agentPreset === "string" && liveSession.header.agentPreset.trim() !== "" ? liveSession.header.agentPreset.trim() : void 0;
|
|
1828
|
+
if (rawPreset !== void 0) agentPreset = rawPreset;
|
|
1829
|
+
if (typeof liveSession.requestHeader === "function") try {
|
|
1830
|
+
const foldedTools = liveSession.requestHeader()?.tools;
|
|
1831
|
+
if (Array.isArray(foldedTools)) headerTools = foldedTools;
|
|
1832
|
+
} catch {}
|
|
1833
|
+
else if (typeof liveSession.snapshotEvents === "function") try {
|
|
1834
|
+
const events = liveSession.snapshotEvents();
|
|
1835
|
+
if (Array.isArray(events)) headerTools = extractLatestRequestHeaderTools(events);
|
|
1836
|
+
} catch {}
|
|
1837
|
+
return {
|
|
1838
|
+
...agentPreset === void 0 ? {} : { agentPreset },
|
|
1839
|
+
headerTools
|
|
1840
|
+
};
|
|
1841
|
+
}
|
|
1842
|
+
const sessionQuery = ctx.get("sessionQuery");
|
|
1843
|
+
if (typeof sessionQuery?.observeSession === "function") {
|
|
1844
|
+
let observation;
|
|
1845
|
+
try {
|
|
1846
|
+
observation = await sessionQuery.observeSession(sessionId);
|
|
1847
|
+
const projPreset = observation?.projections?.values?.agentPreset ?? observation?.header?.agentPreset;
|
|
1848
|
+
if (typeof projPreset === "string" && projPreset.trim() !== "") agentPreset = projPreset.trim();
|
|
1849
|
+
if (Array.isArray(observation?.events)) headerTools = extractLatestRequestHeaderTools(observation.events);
|
|
1850
|
+
} catch {} finally {
|
|
1851
|
+
await disposeResource(observation);
|
|
1852
|
+
}
|
|
1853
|
+
}
|
|
1854
|
+
return {
|
|
1855
|
+
...agentPreset === void 0 ? {} : { agentPreset },
|
|
1856
|
+
headerTools
|
|
1857
|
+
};
|
|
1858
|
+
}
|
|
1859
|
+
async function collectAllToolSchemas(ctx, sessionId) {
|
|
1782
1860
|
const toolsService = ctx.get("tools");
|
|
1783
1861
|
if (toolsService === null || toolsService === void 0 || typeof toolsService.schemas !== "function") return [];
|
|
1784
1862
|
const owners = scanCordisFiberToolOwners(ctx);
|
|
1785
1863
|
const rawItems = [];
|
|
1864
|
+
const sid = typeof sessionId === "string" ? sessionId.trim() : "";
|
|
1865
|
+
const presetsService = ctx.get("agentPresets");
|
|
1866
|
+
if (sid !== "") {
|
|
1867
|
+
const agents = ctx.get("agents");
|
|
1868
|
+
const live = typeof agents?.get === "function" ? agents.get(sid) : void 0;
|
|
1869
|
+
if (live !== void 0) {
|
|
1870
|
+
try {
|
|
1871
|
+
appendSchemas(rawItems, toolsService.schemas(live), owners);
|
|
1872
|
+
} catch {}
|
|
1873
|
+
return normalizeToolSummaries(rawItems, EXCLUDED_TOOLS);
|
|
1874
|
+
}
|
|
1875
|
+
const { agentPreset, headerTools } = await resolveColdSessionToolsContext(ctx, sid);
|
|
1876
|
+
let acquiredPresetScope = false;
|
|
1877
|
+
if (presetsService !== null && presetsService !== void 0 && typeof presetsService.acquireScope === "function") {
|
|
1878
|
+
const defaultPreset = typeof presetsService.defaultId === "string" && presetsService.defaultId.trim() !== "" ? presetsService.defaultId.trim() : void 0;
|
|
1879
|
+
const targetPreset = agentPreset ?? defaultPreset;
|
|
1880
|
+
let lease;
|
|
1881
|
+
try {
|
|
1882
|
+
lease = await presetsService.acquireScope(targetPreset);
|
|
1883
|
+
if (lease !== null && lease !== void 0 && lease.key !== void 0) {
|
|
1884
|
+
appendSchemas(rawItems, toolsService.schemas(lease.key), owners);
|
|
1885
|
+
acquiredPresetScope = true;
|
|
1886
|
+
}
|
|
1887
|
+
} catch {} finally {
|
|
1888
|
+
await disposePresetLease(lease);
|
|
1889
|
+
}
|
|
1890
|
+
}
|
|
1891
|
+
if (!acquiredPresetScope) try {
|
|
1892
|
+
appendSchemas(rawItems, toolsService.schemas(), owners);
|
|
1893
|
+
} catch {}
|
|
1894
|
+
if (headerTools.length > 0) appendSchemas(rawItems, headerTools, owners);
|
|
1895
|
+
return normalizeToolSummaries(rawItems, EXCLUDED_TOOLS);
|
|
1896
|
+
}
|
|
1786
1897
|
try {
|
|
1787
1898
|
appendSchemas(rawItems, toolsService.schemas(), owners);
|
|
1788
1899
|
} catch {}
|
|
1789
|
-
const presetsService = ctx.get("agentPresets");
|
|
1790
1900
|
if (presetsService !== null && presetsService !== void 0 && typeof presetsService.list === "function" && typeof presetsService.acquireScope === "function") {
|
|
1791
1901
|
let presets = [];
|
|
1792
1902
|
try {
|
|
@@ -1865,9 +1975,17 @@ function installToolsPolicy(ctx, readState) {
|
|
|
1865
1975
|
} catch {}
|
|
1866
1976
|
};
|
|
1867
1977
|
}
|
|
1868
|
-
|
|
1978
|
+
function parseSessionIdFromRequest(request) {
|
|
1979
|
+
if (request === void 0 || typeof request.url !== "string") return void 0;
|
|
1980
|
+
try {
|
|
1981
|
+
const rawSid = new URL(request.url, "http://localhost").searchParams.get("sessionId");
|
|
1982
|
+
if (rawSid !== null && rawSid.trim() !== "") return rawSid.trim();
|
|
1983
|
+
} catch {}
|
|
1984
|
+
}
|
|
1985
|
+
async function handleToolsCatalog(ctx, request) {
|
|
1986
|
+
const sessionId = parseSessionIdFromRequest(request);
|
|
1869
1987
|
try {
|
|
1870
|
-
return jsonResponse({ tools: await collectAllToolSchemas(ctx) });
|
|
1988
|
+
return jsonResponse({ tools: await collectAllToolSchemas(ctx, sessionId) });
|
|
1871
1989
|
} catch {
|
|
1872
1990
|
return jsonResponse({ tools: [] });
|
|
1873
1991
|
}
|
|
@@ -1880,7 +1998,7 @@ function registerToolsRoute(ctx) {
|
|
|
1880
1998
|
path: TOOLS_PATH,
|
|
1881
1999
|
methods: ["GET"],
|
|
1882
2000
|
requestBody: "buffered",
|
|
1883
|
-
fetch: () => handleToolsCatalog(ctx)
|
|
2001
|
+
fetch: (request) => handleToolsCatalog(ctx, request)
|
|
1884
2002
|
});
|
|
1885
2003
|
return () => {
|
|
1886
2004
|
Promise.resolve().then(() => dispose()).catch(() => void 0);
|
|
@@ -2339,11 +2457,7 @@ function installSkillsPolicy(ctx, readState) {
|
|
|
2339
2457
|
};
|
|
2340
2458
|
}
|
|
2341
2459
|
async function handleSkillsCatalog(ctx, request) {
|
|
2342
|
-
|
|
2343
|
-
if (request !== void 0 && typeof request.url === "string") try {
|
|
2344
|
-
const rawSid = new URL(request.url, "http://localhost").searchParams.get("sessionId");
|
|
2345
|
-
if (rawSid !== null && rawSid.trim() !== "") sessionId = rawSid.trim();
|
|
2346
|
-
} catch {}
|
|
2460
|
+
const sessionId = parseSessionIdFromRequest(request);
|
|
2347
2461
|
try {
|
|
2348
2462
|
return jsonResponse({ skills: await collectSkillCatalog(ctx, sessionId) });
|
|
2349
2463
|
} catch {
|
|
@@ -2441,6 +2555,7 @@ const __test = {
|
|
|
2441
2555
|
installSkillsPolicy,
|
|
2442
2556
|
readToolsConfig,
|
|
2443
2557
|
readSkillsConfig,
|
|
2558
|
+
resolveCallerPackageFromStack,
|
|
2444
2559
|
resolveFiberModuleName,
|
|
2445
2560
|
resolveSessionIdFromScope,
|
|
2446
2561
|
scanCordisFiberToolOwners,
|