@herbertgao/pi-extensions 2026.9.11 → 2026.9.13

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (192) hide show
  1. package/README.md +4 -4
  2. package/THIRD_PARTY_NOTICES.md +1 -1
  3. package/node_modules/@herbertgao/pi-cc-extensions/package.json +1 -1
  4. package/node_modules/@herbertgao/pi-subagents/CHANGELOG.md +8 -0
  5. package/node_modules/@herbertgao/pi-subagents/package.json +1 -1
  6. package/node_modules/@herbertgao/pi-subagents/src/agent-manager.ts +5 -4
  7. package/node_modules/@herbertgao/pi-subagents/src/mention-clone.ts +39 -16
  8. package/node_modules/@juicesharp/rpiv-ask-user-question/package.json +2 -2
  9. package/node_modules/@narumitw/pi-btw/README.md +21 -4
  10. package/node_modules/@narumitw/pi-btw/dist/index.ts +1668 -958
  11. package/node_modules/@narumitw/pi-btw/dist/index.ts.map +4 -4
  12. package/node_modules/@narumitw/pi-btw/docs/workflows.md +10 -2
  13. package/node_modules/@narumitw/pi-btw/package.json +1 -1
  14. package/node_modules/@narumitw/pi-btw/src/btw.ts +17 -79
  15. package/node_modules/@narumitw/pi-btw/src/conversation-context.ts +74 -0
  16. package/node_modules/@narumitw/pi-btw/src/fullscreen-ui.ts +196 -7
  17. package/node_modules/@narumitw/pi-btw/src/main-thread-updates.ts +40 -0
  18. package/node_modules/@narumitw/pi-btw/src/menu.ts +34 -2
  19. package/node_modules/@narumitw/pi-btw/src/settings.ts +49 -0
  20. package/node_modules/@narumitw/pi-btw/src/transcript-pager.ts +9 -1
  21. package/node_modules/@narumitw/pi-btw/src/workspace-layout.ts +559 -0
  22. package/node_modules/pi-mcp-adapter/CHANGELOG.md +62 -0
  23. package/node_modules/pi-mcp-adapter/README.md +75 -7
  24. package/node_modules/pi-mcp-adapter/bearer-command-resolver.ts +193 -0
  25. package/node_modules/pi-mcp-adapter/cli.js +56 -5
  26. package/node_modules/pi-mcp-adapter/commands.ts +96 -5
  27. package/node_modules/pi-mcp-adapter/config.ts +73 -6
  28. package/node_modules/pi-mcp-adapter/direct-tool-surface.ts +22 -28
  29. package/node_modules/pi-mcp-adapter/direct-tools.ts +13 -5
  30. package/node_modules/pi-mcp-adapter/dist/abort.d.ts +2 -0
  31. package/node_modules/pi-mcp-adapter/dist/abort.js +36 -0
  32. package/node_modules/pi-mcp-adapter/dist/abort.js.map +1 -0
  33. package/node_modules/pi-mcp-adapter/dist/bearer-command-resolver.d.ts +6 -0
  34. package/node_modules/pi-mcp-adapter/dist/bearer-command-resolver.js +194 -0
  35. package/node_modules/pi-mcp-adapter/dist/bearer-command-resolver.js.map +1 -0
  36. package/node_modules/pi-mcp-adapter/dist/config.d.ts +5 -0
  37. package/node_modules/pi-mcp-adapter/dist/config.js +75 -6
  38. package/node_modules/pi-mcp-adapter/dist/config.js.map +1 -1
  39. package/node_modules/pi-mcp-adapter/dist/consent-manager.d.ts +18 -0
  40. package/node_modules/pi-mcp-adapter/dist/consent-manager.js +88 -0
  41. package/node_modules/pi-mcp-adapter/dist/consent-manager.js.map +1 -0
  42. package/node_modules/pi-mcp-adapter/dist/elicitation-handler.d.ts +17 -0
  43. package/node_modules/pi-mcp-adapter/dist/elicitation-handler.js +316 -0
  44. package/node_modules/pi-mcp-adapter/dist/elicitation-handler.js.map +1 -0
  45. package/node_modules/pi-mcp-adapter/dist/errors.d.ts +131 -0
  46. package/node_modules/pi-mcp-adapter/dist/errors.js +278 -0
  47. package/node_modules/pi-mcp-adapter/dist/errors.js.map +1 -0
  48. package/node_modules/pi-mcp-adapter/dist/http-ca.d.ts +8 -0
  49. package/node_modules/pi-mcp-adapter/dist/http-ca.js +88 -0
  50. package/node_modules/pi-mcp-adapter/dist/http-ca.js.map +1 -0
  51. package/node_modules/pi-mcp-adapter/dist/jev-client.d.ts +15 -0
  52. package/node_modules/pi-mcp-adapter/dist/jev-client.js +340 -0
  53. package/node_modules/pi-mcp-adapter/dist/jev-client.js.map +1 -0
  54. package/node_modules/pi-mcp-adapter/dist/jev-contracts.d.ts +77 -0
  55. package/node_modules/pi-mcp-adapter/dist/jev-contracts.js +2 -0
  56. package/node_modules/pi-mcp-adapter/dist/jev-contracts.js.map +1 -0
  57. package/node_modules/pi-mcp-adapter/dist/jev-key-store.d.ts +22 -0
  58. package/node_modules/pi-mcp-adapter/dist/jev-key-store.js +85 -0
  59. package/node_modules/pi-mcp-adapter/dist/jev-key-store.js.map +1 -0
  60. package/node_modules/pi-mcp-adapter/dist/json-schema-validator.d.ts +2 -0
  61. package/node_modules/pi-mcp-adapter/dist/json-schema-validator.js +55 -0
  62. package/node_modules/pi-mcp-adapter/dist/json-schema-validator.js.map +1 -0
  63. package/node_modules/pi-mcp-adapter/dist/lifecycle.d.ts +56 -0
  64. package/node_modules/pi-mcp-adapter/dist/lifecycle.js +410 -0
  65. package/node_modules/pi-mcp-adapter/dist/lifecycle.js.map +1 -0
  66. package/node_modules/pi-mcp-adapter/dist/logger.d.ts +51 -0
  67. package/node_modules/pi-mcp-adapter/dist/logger.js +131 -0
  68. package/node_modules/pi-mcp-adapter/dist/logger.js.map +1 -0
  69. package/node_modules/pi-mcp-adapter/dist/mcp-auth-fetch.d.ts +26 -0
  70. package/node_modules/pi-mcp-adapter/dist/mcp-auth-fetch.js +103 -0
  71. package/node_modules/pi-mcp-adapter/dist/mcp-auth-fetch.js.map +1 -0
  72. package/node_modules/pi-mcp-adapter/dist/mcp-auth-flow.d.ts +118 -0
  73. package/node_modules/pi-mcp-adapter/dist/mcp-auth-flow.js +1098 -0
  74. package/node_modules/pi-mcp-adapter/dist/mcp-auth-flow.js.map +1 -0
  75. package/node_modules/pi-mcp-adapter/dist/mcp-auth.d.ts +168 -0
  76. package/node_modules/pi-mcp-adapter/dist/mcp-auth.js +1117 -0
  77. package/node_modules/pi-mcp-adapter/dist/mcp-auth.js.map +1 -0
  78. package/node_modules/pi-mcp-adapter/dist/mcp-bearer-store.js +7 -140
  79. package/node_modules/pi-mcp-adapter/dist/mcp-bearer-store.js.map +1 -1
  80. package/node_modules/pi-mcp-adapter/dist/mcp-callback-server.d.ts +53 -0
  81. package/node_modules/pi-mcp-adapter/dist/mcp-callback-server.js +441 -0
  82. package/node_modules/pi-mcp-adapter/dist/mcp-callback-server.js.map +1 -0
  83. package/node_modules/pi-mcp-adapter/dist/mcp-oauth-provider.d.ts +148 -0
  84. package/node_modules/pi-mcp-adapter/dist/mcp-oauth-provider.js +689 -0
  85. package/node_modules/pi-mcp-adapter/dist/mcp-oauth-provider.js.map +1 -0
  86. package/node_modules/pi-mcp-adapter/dist/mcp-probe.d.ts +6 -0
  87. package/node_modules/pi-mcp-adapter/dist/mcp-probe.js +166 -0
  88. package/node_modules/pi-mcp-adapter/dist/mcp-probe.js.map +1 -0
  89. package/node_modules/pi-mcp-adapter/dist/mcp-tasks.d.ts +102 -0
  90. package/node_modules/pi-mcp-adapter/dist/mcp-tasks.js +369 -0
  91. package/node_modules/pi-mcp-adapter/dist/mcp-tasks.js.map +1 -0
  92. package/node_modules/pi-mcp-adapter/dist/mcp-trace.d.ts +95 -0
  93. package/node_modules/pi-mcp-adapter/dist/mcp-trace.js +242 -0
  94. package/node_modules/pi-mcp-adapter/dist/mcp-trace.js.map +1 -0
  95. package/node_modules/pi-mcp-adapter/dist/metadata-cache.js +2 -11
  96. package/node_modules/pi-mcp-adapter/dist/metadata-cache.js.map +1 -1
  97. package/node_modules/pi-mcp-adapter/dist/npx-resolver.d.ts +6 -0
  98. package/node_modules/pi-mcp-adapter/dist/npx-resolver.js +505 -0
  99. package/node_modules/pi-mcp-adapter/dist/npx-resolver.js.map +1 -0
  100. package/node_modules/pi-mcp-adapter/dist/request-headers-command.d.ts +10 -0
  101. package/node_modules/pi-mcp-adapter/dist/request-headers-command.js +312 -0
  102. package/node_modules/pi-mcp-adapter/dist/request-headers-command.js.map +1 -0
  103. package/node_modules/pi-mcp-adapter/dist/runtime-owner.d.ts +13 -0
  104. package/node_modules/pi-mcp-adapter/dist/runtime-owner.js +97 -0
  105. package/node_modules/pi-mcp-adapter/dist/runtime-owner.js.map +1 -0
  106. package/node_modules/pi-mcp-adapter/dist/sampling-handler.d.ts +17 -0
  107. package/node_modules/pi-mcp-adapter/dist/sampling-handler.js +203 -0
  108. package/node_modules/pi-mcp-adapter/dist/sampling-handler.js.map +1 -0
  109. package/node_modules/pi-mcp-adapter/dist/secure-keyring.d.ts +11 -0
  110. package/node_modules/pi-mcp-adapter/dist/secure-keyring.js +172 -0
  111. package/node_modules/pi-mcp-adapter/dist/secure-keyring.js.map +1 -0
  112. package/node_modules/pi-mcp-adapter/dist/server-manager.d.ts +157 -0
  113. package/node_modules/pi-mcp-adapter/dist/server-manager.js +1743 -0
  114. package/node_modules/pi-mcp-adapter/dist/server-manager.js.map +1 -0
  115. package/node_modules/pi-mcp-adapter/dist/session-approvals.d.ts +34 -0
  116. package/node_modules/pi-mcp-adapter/dist/session-approvals.js +140 -0
  117. package/node_modules/pi-mcp-adapter/dist/session-approvals.js.map +1 -0
  118. package/node_modules/pi-mcp-adapter/dist/session-recovery.d.ts +26 -0
  119. package/node_modules/pi-mcp-adapter/dist/session-recovery.js +142 -0
  120. package/node_modules/pi-mcp-adapter/dist/session-recovery.js.map +1 -0
  121. package/node_modules/pi-mcp-adapter/dist/state.d.ts +73 -0
  122. package/node_modules/pi-mcp-adapter/dist/state.js +2 -0
  123. package/node_modules/pi-mcp-adapter/dist/state.js.map +1 -0
  124. package/node_modules/pi-mcp-adapter/dist/types.d.ts +36 -0
  125. package/node_modules/pi-mcp-adapter/dist/types.js +18 -0
  126. package/node_modules/pi-mcp-adapter/dist/types.js.map +1 -1
  127. package/node_modules/pi-mcp-adapter/dist/ui-resource-handler.d.ts +17 -0
  128. package/node_modules/pi-mcp-adapter/dist/ui-resource-handler.js +219 -0
  129. package/node_modules/pi-mcp-adapter/dist/ui-resource-handler.js.map +1 -0
  130. package/node_modules/pi-mcp-adapter/dist/unix-socket-transport.d.ts +15 -0
  131. package/node_modules/pi-mcp-adapter/dist/unix-socket-transport.js +85 -0
  132. package/node_modules/pi-mcp-adapter/dist/unix-socket-transport.js.map +1 -0
  133. package/node_modules/pi-mcp-adapter/dist/utils.d.ts +1 -0
  134. package/node_modules/pi-mcp-adapter/dist/utils.js +13 -0
  135. package/node_modules/pi-mcp-adapter/dist/utils.js.map +1 -1
  136. package/node_modules/pi-mcp-adapter/elicitation-handler.ts +29 -19
  137. package/node_modules/pi-mcp-adapter/examples/jev-accessibility-loop.mjs +85 -0
  138. package/node_modules/pi-mcp-adapter/examples/jev-semantic-filter.mjs +34 -0
  139. package/node_modules/pi-mcp-adapter/index.ts +129 -6
  140. package/node_modules/pi-mcp-adapter/init.ts +6 -19
  141. package/node_modules/pi-mcp-adapter/jev-client.ts +273 -0
  142. package/node_modules/pi-mcp-adapter/jev-contracts.ts +53 -0
  143. package/node_modules/pi-mcp-adapter/jev-key-store.ts +79 -0
  144. package/node_modules/pi-mcp-adapter/lifecycle.ts +14 -3
  145. package/node_modules/pi-mcp-adapter/mcp-bearer-store.ts +7 -142
  146. package/node_modules/pi-mcp-adapter/mcp-code.ts +119 -11
  147. package/node_modules/pi-mcp-adapter/mcp-output-guard.ts +4 -0
  148. package/node_modules/pi-mcp-adapter/mcp-references.ts +5 -3
  149. package/node_modules/pi-mcp-adapter/mcp-script-worker.mjs +5 -0
  150. package/node_modules/pi-mcp-adapter/mcp-tasks.ts +467 -0
  151. package/node_modules/pi-mcp-adapter/metadata-cache.ts +2 -13
  152. package/node_modules/pi-mcp-adapter/namespace-tools.ts +1 -1
  153. package/node_modules/pi-mcp-adapter/package.json +17 -9
  154. package/node_modules/pi-mcp-adapter/proxy-modes.ts +319 -166
  155. package/node_modules/pi-mcp-adapter/request-headers-command.ts +6 -3
  156. package/node_modules/pi-mcp-adapter/search-ranking.ts +38 -7
  157. package/node_modules/pi-mcp-adapter/secure-keyring.ts +170 -0
  158. package/node_modules/pi-mcp-adapter/semantic-search.ts +186 -0
  159. package/node_modules/pi-mcp-adapter/server-manager.ts +293 -50
  160. package/node_modules/pi-mcp-adapter/session-approvals.ts +14 -0
  161. package/node_modules/pi-mcp-adapter/skills/mcp-scripting/SKILL.md +2 -0
  162. package/node_modules/pi-mcp-adapter/state.ts +3 -1
  163. package/node_modules/pi-mcp-adapter/tool-approval.ts +26 -4
  164. package/node_modules/pi-mcp-adapter/tool-metadata.ts +6 -14
  165. package/node_modules/pi-mcp-adapter/tool-registrar.ts +8 -6
  166. package/node_modules/pi-mcp-adapter/tool-result-renderer.ts +4 -1
  167. package/node_modules/pi-mcp-adapter/types.ts +53 -0
  168. package/node_modules/pi-mcp-adapter/ui-server.ts +17 -9
  169. package/node_modules/pi-mcp-adapter/utils.ts +16 -0
  170. package/node_modules/pi-multi-account/CHANGELOG.md +23 -0
  171. package/node_modules/pi-multi-account/README.md +38 -11
  172. package/node_modules/pi-multi-account/index.ts +371 -96
  173. package/node_modules/pi-multi-account/package.json +5 -4
  174. package/node_modules/pi-multi-account/provider-payload-stream.ts +36 -28
  175. package/node_modules/pi-multi-account/usage.ts +31 -2
  176. package/node_modules/pi-typesafe/README.md +3 -1
  177. package/node_modules/pi-typesafe/dist/auth.d.ts +10 -3
  178. package/node_modules/pi-typesafe/dist/auth.js +13 -7
  179. package/node_modules/pi-typesafe/dist/backends.d.ts +31 -0
  180. package/node_modules/pi-typesafe/dist/backends.js +33 -0
  181. package/node_modules/pi-typesafe/dist/client.d.ts +3 -9
  182. package/node_modules/pi-typesafe/dist/client.js +63 -39
  183. package/node_modules/pi-typesafe/dist/credentials.d.ts +11 -5
  184. package/node_modules/pi-typesafe/dist/credentials.js +15 -8
  185. package/node_modules/pi-typesafe/dist/extension.js +4 -1
  186. package/node_modules/pi-typesafe/dist/index.d.ts +1 -1
  187. package/node_modules/pi-typesafe/dist/index.js +1 -1
  188. package/node_modules/pi-typesafe/dist/login.d.ts +13 -7
  189. package/node_modules/pi-typesafe/dist/login.js +17 -8
  190. package/node_modules/pi-typesafe/dist/schema.js +19 -13
  191. package/node_modules/pi-typesafe/package.json +1 -1
  192. package/package.json +11 -10
@@ -1,5 +1,5 @@
1
1
  // config.ts - Config loading with import support
2
- import { existsSync, readFileSync, realpathSync, statSync, writeFileSync, mkdirSync, renameSync } from "node:fs";
2
+ import { chmodSync, existsSync, readFileSync, realpathSync, rmSync, statSync, writeFileSync, mkdirSync, renameSync } from "node:fs";
3
3
  import { homedir } from "node:os";
4
4
  import { dirname, isAbsolute, join, relative, resolve, sep } from "node:path";
5
5
  import { parse as parseToml } from "smol-toml";
@@ -9,6 +9,7 @@ import { getAgentPluginSummaries, loadAgentPluginConfigs, type AgentPluginSummar
9
9
  import { cloneBuiltInAgentPluginEntry, isBuiltInAgentPlugin, mergeBuiltInAgentPluginEntries } from "./agent-plugin-provenance.ts";
10
10
  import { loadClaudePluginBundles } from "./claude-plugin-loader.ts";
11
11
  import { loadPackageMcpConfigs } from "./package-mcp-loader.ts";
12
+ import { validateJevSettings } from "./jev-client.ts";
12
13
  import { formatServerNamespace, isServerDisabled, type ClaudePluginConfig, type HostConfigDiscovery, type McpConfig, type ServerEntry, type McpSettings, type ImportKind, type ServerProvenance } from "./types.ts";
13
14
  import { parseJsonWithComments, toStringRecord } from "./utils.ts";
14
15
 
@@ -846,11 +847,21 @@ function validateConfig(raw: unknown): McpConfig {
846
847
  return {
847
848
  mcpServers: toServerEntries(raw.mcpServers ?? raw["mcp-servers"]),
848
849
  ...(Array.isArray(raw.imports) ? { imports: raw.imports as ImportKind[] } : {}),
849
- ...(raw.settings !== undefined ? { settings: raw.settings as McpSettings } : {}),
850
+ ...(raw.settings !== undefined ? { settings: parseSettings(raw.settings) } : {}),
850
851
  ...(raw.claudePlugins !== undefined ? { claudePlugins: parseClaudePlugins(raw.claudePlugins) } : {}),
851
852
  };
852
853
  }
853
854
 
855
+ function parseSettings(value: unknown): McpSettings {
856
+ if (!isRecord(value)) throw new Error("settings must be an object");
857
+ const settings = { ...value } as McpSettings;
858
+ if (value.jev !== undefined) {
859
+ validateJevSettings(value.jev);
860
+ settings.jev = value.jev as NonNullable<McpSettings["jev"]>;
861
+ }
862
+ return settings;
863
+ }
864
+
854
865
  function parseClaudePlugins(value: unknown): ClaudePluginConfig[] {
855
866
  if (!Array.isArray(value)) {
856
867
  console.warn("Invalid claudePlugins config: expected an array");
@@ -1139,11 +1150,67 @@ function readRawConfigObject(filePath: string): Record<string, unknown> {
1139
1150
  }
1140
1151
  }
1141
1152
 
1153
+ function writeConfigText(writePath: string, text: string): void {
1154
+ let mode: number | undefined;
1155
+ try {
1156
+ writePath = realpathSync(writePath);
1157
+ mode = statSync(writePath).mode & 0o777;
1158
+ } catch {}
1159
+ mkdirSync(dirname(writePath), { recursive: true });
1160
+ const tmpPath = `${writePath}.${process.pid}.tmp`;
1161
+ rmSync(tmpPath, { force: true });
1162
+ try {
1163
+ writeFileSync(tmpPath, text, mode === undefined ? "utf-8" : { encoding: "utf-8", mode });
1164
+ if (mode !== undefined) chmodSync(tmpPath, mode);
1165
+ renameSync(tmpPath, writePath);
1166
+ } catch (error) {
1167
+ try { rmSync(tmpPath, { force: true }); } catch {}
1168
+ throw error;
1169
+ }
1170
+ }
1171
+
1142
1172
  function writeRawConfigObject(filePath: string, raw: Record<string, unknown>): void {
1143
- mkdirSync(dirname(filePath), { recursive: true });
1144
- const tmpPath = `${filePath}.${process.pid}.tmp`;
1145
- writeFileSync(tmpPath, `${JSON.stringify(raw, null, 2)}\n`, "utf-8");
1146
- renameSync(tmpPath, filePath);
1173
+ writeConfigText(filePath, `${JSON.stringify(raw, null, 2)}\n`);
1174
+ }
1175
+
1176
+ export function writeSharedConfigText(filePath: string, text: string): void {
1177
+ if (!isRecord(parseJsonWithComments(text))) throw new Error("top-level value must be an object");
1178
+ writeConfigText(filePath, text);
1179
+ }
1180
+
1181
+ export function writeJevSemanticSearchConfig(
1182
+ overridePath: string | undefined,
1183
+ cwd: string,
1184
+ allowedServers: string[],
1185
+ effectiveJev?: unknown,
1186
+ ): { path: string; changed: boolean } {
1187
+ const filePath = overridePath ? getPiGlobalConfigPath(overridePath) : getProjectPiConfigPath(cwd);
1188
+ let raw: Record<string, unknown> = {};
1189
+ if (existsSync(filePath)) {
1190
+ try {
1191
+ const parsed = parseJsonWithComments(readFileSync(filePath, "utf8"));
1192
+ if (!isRecord(parsed)) throw new Error("top-level value must be an object");
1193
+ raw = parsed;
1194
+ } catch (error) {
1195
+ throw new Error(`Failed to update Jev settings at ${filePath}: ${error instanceof Error ? error.message : String(error)}`, { cause: error });
1196
+ }
1197
+ }
1198
+ if (raw.settings !== undefined && !isRecord(raw.settings)) {
1199
+ throw new Error(`Failed to update Jev settings at ${filePath}: settings must be an object`);
1200
+ }
1201
+ const settings = raw.settings as Record<string, unknown> | undefined;
1202
+ const currentJev = settings?.jev;
1203
+ if (currentJev !== undefined && currentJev !== false && !isRecord(currentJev)) {
1204
+ throw new Error(`Failed to update Jev settings at ${filePath}: settings.jev must be an object or false`);
1205
+ }
1206
+ const jev = isRecord(effectiveJev) ? effectiveJev : isRecord(currentJev) ? currentJev : {};
1207
+ const nextServers = [...new Set(allowedServers)].sort((a, b) => a.localeCompare(b));
1208
+ const nextJev = { ...jev, semanticSearch: true, allowedServers: nextServers };
1209
+ validateJevSettings(nextJev);
1210
+ if (isRecord(currentJev) && JSON.stringify(currentJev) === JSON.stringify(nextJev)) return { path: filePath, changed: false };
1211
+ raw.settings = { ...settings, jev: nextJev };
1212
+ writeRawConfigObject(filePath, raw);
1213
+ return { path: filePath, changed: true };
1147
1214
  }
1148
1215
 
1149
1216
  function getServersObject(raw: Record<string, unknown>): Record<string, ServerEntry> {
@@ -1,6 +1,6 @@
1
1
  import { Check, Errors } from "typebox/value";
2
2
  import type { DirectToolSpec, McpConfig, ToolPrefix } from "./types.ts";
3
- import { createToolSelectorCandidateIndex, formatToolName, getToolNameCandidates, isServerDisabled, isToolAllowed, resolveToolPrefix } from "./types.ts";
3
+ import { createToolSelectorCandidateIndex, formatToolName, getToolNameCandidates, isServerDisabled, isToolAllowed, resolveToolPrefix, resolveUniqueNameOwnership } from "./types.ts";
4
4
  import type { MetadataCache } from "./metadata-cache.ts";
5
5
  import { isServerCacheValid, parseDirectToolSelectors } from "./metadata-cache.ts";
6
6
  export { getMissingConfiguredDirectToolServers } from "./metadata-cache.ts";
@@ -10,6 +10,13 @@ import { resourceNameToToolName } from "./resource-tools.ts";
10
10
  const BUILTIN_NAMES = new Set(["read", "bash", "edit", "write", "grep", "find", "ls", "mcp"]);
11
11
  export const DIRECT_TOOLS_ADVISORY_THRESHOLD = 75;
12
12
 
13
+ export function getLargeDirectToolsAdvisory(config: McpConfig, specs: readonly DirectToolSpec[]): string | undefined {
14
+ if (config.settings?.warnOnLargeDirectTools === false) return undefined;
15
+ const eagerCount = specs.filter((spec) => !spec.lazy).length;
16
+ if (eagerCount < DIRECT_TOOLS_ADVISORY_THRESHOLD) return undefined;
17
+ return `MCP: ${eagerCount} direct tools resolved. Each direct tool adds prompt context; README guidance recommends targeted sets of 5-20 tools and using the proxy or an explicit string[] when 75+ direct tools would be registered. Set settings.warnOnLargeDirectTools to false to hide this advisory.`;
18
+ }
19
+
13
20
  /**
14
21
  * Recover one model-emitted JSON layer for schema-declared object and array
15
22
  * properties, then validate the complete input against the same schema.
@@ -28,14 +35,14 @@ export function prepareDirectToolArguments(inputSchema: unknown, args: unknown):
28
35
  for (const [name, propertySchema] of Object.entries(properties)) {
29
36
  if (!Object.hasOwn(input, name) || typeof input[name] !== "string"
30
37
  || !propertySchema || typeof propertySchema !== "object" || Array.isArray(propertySchema)) continue;
31
- const expectedType = (propertySchema as Record<string, unknown>).type;
32
- if (expectedType !== "object" && expectedType !== "array") continue;
38
+ // A valid string may be intentional (for example, string | object).
39
+ // Only recover JSON when the advertised property rejects the raw value.
40
+ if (Check(propertySchema as never, input[name])) continue;
33
41
  try {
34
42
  const parsed: unknown = JSON.parse(input[name] as string);
35
- const matches = expectedType === "array"
36
- ? Array.isArray(parsed)
37
- : parsed !== null && typeof parsed === "object" && !Array.isArray(parsed);
38
- if (matches) {
43
+ const isContainer = Array.isArray(parsed)
44
+ || (parsed !== null && typeof parsed === "object");
45
+ if (isContainer && Check(propertySchema as never, parsed)) {
39
46
  prepared ??= { ...input };
40
47
  prepared[name] = parsed;
41
48
  }
@@ -73,8 +80,6 @@ export function resolveDirectTools(
73
80
  const specs: DirectToolSpec[] = [];
74
81
  if (!cache) return specs;
75
82
 
76
- const seenNames = new Set<string>();
77
-
78
83
  const envSelection = envOverride ? parseDirectToolSelectors(envOverride) : null;
79
84
  const globalDirect = config.settings?.directTools;
80
85
 
@@ -139,11 +144,6 @@ export function resolveDirectTools(
139
144
  console.warn(`MCP: skipping direct tool "${prefixedName}" (collides with builtin)`);
140
145
  continue;
141
146
  }
142
- if (seenNames.has(prefixedName)) {
143
- console.warn(`MCP: skipping duplicate direct tool "${prefixedName}" from "${serverName}"`);
144
- continue;
145
- }
146
- seenNames.add(prefixedName);
147
147
  specs.push({
148
148
  ...(lazy ? { lazy: true } : {}),
149
149
  serverName,
@@ -166,11 +166,6 @@ export function resolveDirectTools(
166
166
  console.warn(`MCP: skipping direct resource tool "${prefixedName}" (collides with builtin)`);
167
167
  continue;
168
168
  }
169
- if (seenNames.has(prefixedName)) {
170
- console.warn(`MCP: skipping duplicate direct resource tool "${prefixedName}" from "${serverName}"`);
171
- continue;
172
- }
173
- seenNames.add(prefixedName);
174
169
  specs.push({
175
170
  ...(lazy ? { lazy: true } : {}),
176
171
  serverName,
@@ -183,17 +178,16 @@ export function resolveDirectTools(
183
178
  }
184
179
  }
185
180
 
186
- for (const spec of specs) reservedNames?.add(spec.prefixedName);
181
+ const ownership = resolveUniqueNameOwnership(specs, (spec) => spec.prefixedName);
182
+ for (const [name, colliding] of ownership.collisions) {
183
+ console.warn(`MCP: skipping colliding direct name "${name}" from ${colliding.map((spec) => `"${spec.serverName}"`).join(", ")}`);
184
+ }
185
+ const uniqueSpecs = ownership.unique;
186
+ for (const spec of uniqueSpecs) reservedNames?.add(spec.prefixedName);
187
187
 
188
188
  const emittedSpecs = unavailableServers.size === 0
189
- ? specs
190
- : specs.filter((spec) => !unavailableServers.has(spec.serverName));
191
-
192
- // Lazy specs cost nothing at turn start, so they do not count toward the advisory.
193
- const eagerCount = emittedSpecs.filter((spec) => !spec.lazy).length;
194
- if (config.settings?.warnOnLargeDirectTools !== false && eagerCount >= DIRECT_TOOLS_ADVISORY_THRESHOLD) {
195
- console.warn(`MCP: ${eagerCount} direct tools resolved. Each direct tool adds prompt context; README guidance recommends targeted sets of 5-20 tools and using the proxy or an explicit string[] when 75+ direct tools would be registered. Set settings.warnOnLargeDirectTools to false to hide this advisory.`);
196
- }
189
+ ? uniqueSpecs
190
+ : uniqueSpecs.filter((spec) => !unavailableServers.has(spec.serverName));
197
191
 
198
192
  return emittedSpecs;
199
193
  }
@@ -5,7 +5,7 @@ import type { DirectToolSpec, McpContent } from "./types.ts";
5
5
  import { lazyConnect, getFailureAgeSeconds, clearFailure } from "./init.ts";
6
6
  import { abortable, throwIfAborted } from "./abort.ts";
7
7
  import { formatSchema } from "./tool-metadata.ts";
8
- import { resolveMcpResultContent, transformMcpContent, transformMcpResourceContents } from "./tool-registrar.ts";
8
+ import { resolveMcpResultContent, transformMcpResourceContents } from "./tool-registrar.ts";
9
9
  import { guardMcpOutput, guardedMcpDetails, resolveMcpOutputGuardOptions } from "./mcp-output-guard.ts";
10
10
  import { maybeStartUiSession, summarizeUiSessionResult, type UiSessionRuntime } from "./ui-session.ts";
11
11
  import { isServerDisabled } from "./types.ts";
@@ -13,6 +13,7 @@ import { authenticate, supportsOAuth } from "./mcp-auth-flow.ts";
13
13
  import { formatAuthRequiredMessage, normalizeToolArguments, resolveServerUrl } from "./utils.ts";
14
14
  import { SessionRecoveryAuthRequiredError, withSessionRecovery } from "./session-recovery.ts";
15
15
  import { combineAbortSignals, isAbortError } from "./runtime-owner.ts";
16
+ import { callToolViaTaskSession } from "./mcp-tasks.ts";
16
17
  import { ensureToolCallApproved } from "./tool-approval.ts";
17
18
  import { getInputRequiredNeedsUiDetails } from "./errors.ts";
18
19
 
@@ -27,6 +28,7 @@ type DirectAutoAuthResult =
27
28
  export {
28
29
  DIRECT_TOOLS_ADVISORY_THRESHOLD,
29
30
  buildProxyDescription,
31
+ getLargeDirectToolsAdvisory,
30
32
  getMissingConfiguredDirectToolServers,
31
33
  prepareDirectToolArguments,
32
34
  resolveDirectTools,
@@ -310,6 +312,15 @@ export function createDirectToolExecutor(
310
312
  spec.serverName,
311
313
  async (conn) => {
312
314
  await state.manager.ensureListen?.(spec.serverName, conn);
315
+ if (conn.taskSession) {
316
+ return await callToolViaTaskSession(conn.taskSession, {
317
+ name: spec.originalName,
318
+ args: normalizedParams ?? {},
319
+ meta: uiSession?.requestMeta,
320
+ signal: ownedSignal,
321
+ requestTimeoutMs: requestOptions?.timeout,
322
+ }) as unknown as ClientCallToolResult;
323
+ }
313
324
  return abortable(conn.client.callTool({
314
325
  name: spec.originalName,
315
326
  arguments: normalizedParams,
@@ -320,14 +331,11 @@ export function createDirectToolExecutor(
320
331
  uiSession?.sendToolResult(result as unknown as import("@modelcontextprotocol/client").CallToolResult);
321
332
 
322
333
  if (result.isError) {
323
- const mcpContent = (result.content ?? []) as McpContent[];
324
- const content = transformMcpContent(mcpContent, state.owner?.signal);
334
+ const content = resolveMcpResultContent(result as Record<string, unknown>, state.owner?.signal);
325
335
  const outputContent = content.length > 0 ? content : [{ type: "text" as const, text: "(empty result)" }];
326
- const schemaText = spec.inputSchema ? `\n\nExpected parameters:\n${formatSchema(spec.inputSchema)}` : "";
327
336
  const guarded = await guardMcpOutput(outputContent, {
328
337
  ...outputGuardOptions,
329
338
  prefix: "Error: ",
330
- suffix: schemaText,
331
339
  emptyTextFallback: "Tool execution failed",
332
340
  ...(state.config.settings?.directToolResultDetails === "bounded" ? { rawMcpResult: result } : {}),
333
341
  });
@@ -0,0 +1,2 @@
1
+ export declare function throwIfAborted(signal?: AbortSignal): void;
2
+ export declare function abortable<T>(promise: Promise<T>, signal?: AbortSignal): Promise<T>;
@@ -0,0 +1,36 @@
1
+ export function throwIfAborted(signal) {
2
+ if (!signal?.aborted)
3
+ return;
4
+ throw signal.reason instanceof Error ? signal.reason : new Error(String(signal.reason ?? "MCP request aborted"));
5
+ }
6
+ export async function abortable(promise, signal) {
7
+ if (!signal)
8
+ return promise;
9
+ throwIfAborted(signal);
10
+ return await new Promise((resolve, reject) => {
11
+ let settled = false;
12
+ const cleanup = () => signal.removeEventListener("abort", onAbort);
13
+ const onAbort = () => {
14
+ if (settled)
15
+ return;
16
+ settled = true;
17
+ cleanup();
18
+ reject(signal.reason instanceof Error ? signal.reason : new Error(String(signal.reason ?? "MCP request aborted")));
19
+ };
20
+ signal.addEventListener("abort", onAbort, { once: true });
21
+ promise.then(value => {
22
+ if (settled)
23
+ return;
24
+ settled = true;
25
+ cleanup();
26
+ resolve(value);
27
+ }, error => {
28
+ if (settled)
29
+ return;
30
+ settled = true;
31
+ cleanup();
32
+ reject(error);
33
+ });
34
+ });
35
+ }
36
+ //# sourceMappingURL=abort.js.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"abort.js","sourceRoot":"","sources":["../abort.ts"],"names":[],"mappings":"AAAA,MAAM,UAAU,cAAc,CAAC,MAAoB;IACjD,IAAI,CAAC,MAAM,EAAE,OAAO;QAAE,OAAO;IAC7B,MAAM,MAAM,CAAC,MAAM,YAAY,KAAK,CAAC,CAAC,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC,CAAC,IAAI,KAAK,CAAC,MAAM,CAAC,MAAM,CAAC,MAAM,IAAI,qBAAqB,CAAC,CAAC,CAAC;AACnH,CAAC;AAED,MAAM,CAAC,KAAK,UAAU,SAAS,CAAI,OAAmB,EAAE,MAAoB;IAC1E,IAAI,CAAC,MAAM;QAAE,OAAO,OAAO,CAAC;IAC5B,cAAc,CAAC,MAAM,CAAC,CAAC;IACvB,OAAO,MAAM,IAAI,OAAO,CAAI,CAAC,OAAO,EAAE,MAAM,EAAE,EAAE;QAC9C,IAAI,OAAO,GAAG,KAAK,CAAC;QACpB,MAAM,OAAO,GAAG,GAAG,EAAE,CAAC,MAAM,CAAC,mBAAmB,CAAC,OAAO,EAAE,OAAO,CAAC,CAAC;QACnE,MAAM,OAAO,GAAG,GAAG,EAAE;YACnB,IAAI,OAAO;gBAAE,OAAO;YACpB,OAAO,GAAG,IAAI,CAAC;YACf,OAAO,EAAE,CAAC;YACV,MAAM,CAAC,MAAM,CAAC,MAAM,YAAY,KAAK,CAAC,CAAC,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC,CAAC,IAAI,KAAK,CAAC,MAAM,CAAC,MAAM,CAAC,MAAM,IAAI,qBAAqB,CAAC,CAAC,CAAC,CAAC;QACrH,CAAC,CAAC;QACF,MAAM,CAAC,gBAAgB,CAAC,OAAO,EAAE,OAAO,EAAE,EAAE,IAAI,EAAE,IAAI,EAAE,CAAC,CAAC;QAC1D,OAAO,CAAC,IAAI,CACV,KAAK,CAAC,EAAE;YACN,IAAI,OAAO;gBAAE,OAAO;YACpB,OAAO,GAAG,IAAI,CAAC;YACf,OAAO,EAAE,CAAC;YACV,OAAO,CAAC,KAAK,CAAC,CAAC;QACjB,CAAC,EACD,KAAK,CAAC,EAAE;YACN,IAAI,OAAO;gBAAE,OAAO;YACpB,OAAO,GAAG,IAAI,CAAC;YACf,OAAO,EAAE,CAAC;YACV,MAAM,CAAC,KAAK,CAAC,CAAC;QAChB,CAAC,CACF,CAAC;IACJ,CAAC,CAAC,CAAC;AACL,CAAC"}
@@ -0,0 +1,6 @@
1
+ /** Resolve and periodically refresh one command-backed bearer token. */
2
+ export declare class BearerCommandResolver {
3
+ #private;
4
+ constructor(command: string, context: string, ttlMs?: number);
5
+ resolve(signal?: AbortSignal): Promise<string>;
6
+ }
@@ -0,0 +1,194 @@
1
+ import { spawn } from "node:child_process";
2
+ const DEFAULT_TTL_MS = 5 * 60_000;
3
+ const ENV_TTL_MS = "PI_MCP_ADAPTER_BEARER_COMMAND_TTL_MS";
4
+ const COMMAND_TIMEOUT_MS = 10_000;
5
+ const COMMAND_MAX_OUTPUT_BYTES = 1024 * 1024;
6
+ const USE_PROCESS_GROUP = process.platform !== "win32";
7
+ function resolveDefaultTtlMs() {
8
+ const parsed = Number(process.env[ENV_TTL_MS] || DEFAULT_TTL_MS);
9
+ return Number.isSafeInteger(parsed) && parsed > 0 ? parsed : DEFAULT_TTL_MS;
10
+ }
11
+ function abortReason(signal) {
12
+ return signal.reason ?? new DOMException("The operation was aborted", "AbortError");
13
+ }
14
+ function runCommand(command, context, signal) {
15
+ return new Promise((resolve, reject) => {
16
+ let output = Buffer.alloc(0);
17
+ let settled = false;
18
+ let terminating = false;
19
+ const child = spawn(command.slice(1), {
20
+ shell: true,
21
+ stdio: ["ignore", "pipe", "ignore"],
22
+ windowsHide: true,
23
+ detached: USE_PROCESS_GROUP,
24
+ });
25
+ const kill = async () => {
26
+ if (child.pid === undefined)
27
+ return;
28
+ if (!USE_PROCESS_GROUP) {
29
+ await new Promise((resolveKill, rejectKill) => {
30
+ const killer = spawn("taskkill", ["/pid", String(child.pid), "/T", "/F"], {
31
+ stdio: "ignore",
32
+ windowsHide: true,
33
+ });
34
+ killer.on("error", () => rejectKill(new Error("Failed to stop bearer token command")));
35
+ killer.on("close", code => {
36
+ if (code === 0 || code === 128)
37
+ resolveKill();
38
+ else
39
+ rejectKill(new Error(`Failed to stop bearer token command: taskkill exited with code ${code ?? "unknown"}`));
40
+ });
41
+ });
42
+ return;
43
+ }
44
+ try {
45
+ process.kill(-child.pid, "SIGKILL");
46
+ }
47
+ catch (error) {
48
+ if (error.code !== "ESRCH")
49
+ throw error;
50
+ }
51
+ };
52
+ const finish = (error, token) => {
53
+ if (settled)
54
+ return;
55
+ settled = true;
56
+ clearTimeout(timer);
57
+ signal.removeEventListener("abort", onAbort);
58
+ if (error !== undefined)
59
+ reject(error);
60
+ else
61
+ resolve(token);
62
+ };
63
+ const terminate = async (error) => {
64
+ if (settled || terminating)
65
+ return;
66
+ terminating = true;
67
+ clearTimeout(timer);
68
+ signal.removeEventListener("abort", onAbort);
69
+ try {
70
+ await kill();
71
+ finish(error);
72
+ }
73
+ catch (cleanupError) {
74
+ finish(cleanupError);
75
+ }
76
+ };
77
+ const onAbort = () => {
78
+ void terminate(abortReason(signal));
79
+ };
80
+ const timer = setTimeout(() => {
81
+ void terminate(new Error(`Failed to resolve ${context}: command timed out after ${COMMAND_TIMEOUT_MS}ms`));
82
+ }, COMMAND_TIMEOUT_MS);
83
+ signal.addEventListener("abort", onAbort, { once: true });
84
+ if (signal.aborted) {
85
+ onAbort();
86
+ return;
87
+ }
88
+ child.on("error", () => {
89
+ if (!terminating)
90
+ finish(new Error(`Failed to resolve ${context}: command failed to start`));
91
+ });
92
+ child.stdout.on("data", (chunk) => {
93
+ if (settled || terminating)
94
+ return;
95
+ output = Buffer.concat([output, Buffer.from(chunk)]);
96
+ if (output.byteLength > COMMAND_MAX_OUTPUT_BYTES) {
97
+ void terminate(new Error(`Failed to resolve ${context}: command output exceeded 1 MiB`));
98
+ }
99
+ });
100
+ child.on("close", code => {
101
+ if (settled || terminating)
102
+ return;
103
+ if (code !== 0) {
104
+ finish(new Error(`Failed to resolve ${context}: command exited with code ${code ?? "unknown"}`));
105
+ return;
106
+ }
107
+ const token = output.toString("utf8").trim();
108
+ if (!token) {
109
+ finish(new Error(`Failed to resolve ${context}: command returned empty output`));
110
+ return;
111
+ }
112
+ finish(undefined, token);
113
+ });
114
+ });
115
+ }
116
+ /** Resolve and periodically refresh one command-backed bearer token. */
117
+ export class BearerCommandResolver {
118
+ #command;
119
+ #context;
120
+ #ttlMs;
121
+ #cached;
122
+ #failure;
123
+ #inflight;
124
+ constructor(command, context, ttlMs = resolveDefaultTtlMs()) {
125
+ this.#command = command;
126
+ this.#context = context;
127
+ this.#ttlMs = ttlMs;
128
+ }
129
+ resolve(signal) {
130
+ if (signal?.aborted)
131
+ return Promise.reject(abortReason(signal));
132
+ const now = Date.now();
133
+ if (this.#cached !== undefined && now < this.#cached.expiresAt) {
134
+ return Promise.resolve(this.#cached.token);
135
+ }
136
+ if (this.#failure !== undefined && now < this.#failure.retryAt) {
137
+ return this.#cached !== undefined
138
+ ? Promise.resolve(this.#cached.token)
139
+ : Promise.reject(this.#failure.error);
140
+ }
141
+ let inflight = this.#inflight;
142
+ if (inflight === undefined) {
143
+ const controller = new AbortController();
144
+ let current;
145
+ const promise = runCommand(this.#command, this.#context, controller.signal)
146
+ .then(token => {
147
+ this.#cached = { token, expiresAt: Date.now() + this.#ttlMs };
148
+ this.#failure = undefined;
149
+ return token;
150
+ })
151
+ .catch(error => {
152
+ // Request cancellation is not a helper outage. Do not let one
153
+ // cancelled request suppress refresh attempts for the next caller.
154
+ if (!controller.signal.aborted) {
155
+ this.#failure = { error, retryAt: Date.now() + this.#ttlMs };
156
+ }
157
+ if (this.#cached !== undefined)
158
+ return this.#cached.token;
159
+ throw error;
160
+ })
161
+ .finally(() => {
162
+ if (this.#inflight === current)
163
+ this.#inflight = undefined;
164
+ });
165
+ current = { controller, promise, waiters: 0 };
166
+ this.#inflight = current;
167
+ inflight = current;
168
+ }
169
+ return this.#wait(inflight, signal);
170
+ }
171
+ #wait(inflight, signal) {
172
+ inflight.waiters++;
173
+ let onAbort;
174
+ const result = signal === undefined
175
+ ? inflight.promise
176
+ : Promise.race([
177
+ inflight.promise,
178
+ new Promise((_resolve, reject) => {
179
+ onAbort = () => reject(abortReason(signal));
180
+ signal.addEventListener("abort", onAbort, { once: true });
181
+ }),
182
+ ]);
183
+ return result.finally(() => {
184
+ if (onAbort)
185
+ signal.removeEventListener("abort", onAbort);
186
+ inflight.waiters--;
187
+ if (this.#inflight === inflight && inflight.waiters === 0) {
188
+ this.#inflight = undefined;
189
+ inflight.controller.abort(signal?.reason);
190
+ }
191
+ });
192
+ }
193
+ }
194
+ //# sourceMappingURL=bearer-command-resolver.js.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"bearer-command-resolver.js","sourceRoot":"","sources":["../bearer-command-resolver.ts"],"names":[],"mappings":"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"}
@@ -101,6 +101,11 @@ export declare function cloneMcpConfig(config: McpConfig): McpConfig;
101
101
  export declare function loadMcpConfig(overridePath?: string, cwd?: string): McpConfig;
102
102
  export declare function resolveConfiguredClaudePluginMcp(config: McpConfig, cwd?: string): McpConfig;
103
103
  export declare function discoverConfiguredClaudePluginSkills(config: McpConfig, cwd?: string): string[];
104
+ export declare function writeSharedConfigText(filePath: string, text: string): void;
105
+ export declare function writeJevSemanticSearchConfig(overridePath: string | undefined, cwd: string, allowedServers: string[], effectiveJev?: unknown): {
106
+ path: string;
107
+ changed: boolean;
108
+ };
104
109
  export interface ServerDisabledOverrideResult {
105
110
  path: string;
106
111
  changed: boolean;
@@ -1,5 +1,5 @@
1
1
  // config.ts - Config loading with import support
2
- import { existsSync, readFileSync, realpathSync, statSync, writeFileSync, mkdirSync, renameSync } from "node:fs";
2
+ import { chmodSync, existsSync, readFileSync, realpathSync, rmSync, statSync, writeFileSync, mkdirSync, renameSync } from "node:fs";
3
3
  import { homedir } from "node:os";
4
4
  import { dirname, isAbsolute, join, relative, resolve, sep } from "node:path";
5
5
  import { parse as parseToml } from "smol-toml";
@@ -9,6 +9,7 @@ import { getAgentPluginSummaries, loadAgentPluginConfigs } from "./agent-plugin-
9
9
  import { cloneBuiltInAgentPluginEntry, isBuiltInAgentPlugin, mergeBuiltInAgentPluginEntries } from "./agent-plugin-provenance.js";
10
10
  import { loadClaudePluginBundles } from "./claude-plugin-loader.js";
11
11
  import { loadPackageMcpConfigs } from "./package-mcp-loader.js";
12
+ import { validateJevSettings } from "./jev-client.js";
12
13
  import { formatServerNamespace, isServerDisabled } from "./types.js";
13
14
  import { parseJsonWithComments, toStringRecord } from "./utils.js";
14
15
  const GENERIC_GLOBAL_CONFIG_PATH = join(homedir(), ".config", "mcp", "mcp.json");
@@ -696,10 +697,20 @@ function validateConfig(raw) {
696
697
  return {
697
698
  mcpServers: toServerEntries(raw.mcpServers ?? raw["mcp-servers"]),
698
699
  ...(Array.isArray(raw.imports) ? { imports: raw.imports } : {}),
699
- ...(raw.settings !== undefined ? { settings: raw.settings } : {}),
700
+ ...(raw.settings !== undefined ? { settings: parseSettings(raw.settings) } : {}),
700
701
  ...(raw.claudePlugins !== undefined ? { claudePlugins: parseClaudePlugins(raw.claudePlugins) } : {}),
701
702
  };
702
703
  }
704
+ function parseSettings(value) {
705
+ if (!isRecord(value))
706
+ throw new Error("settings must be an object");
707
+ const settings = { ...value };
708
+ if (value.jev !== undefined) {
709
+ validateJevSettings(value.jev);
710
+ settings.jev = value.jev;
711
+ }
712
+ return settings;
713
+ }
703
714
  function parseClaudePlugins(value) {
704
715
  if (!Array.isArray(value)) {
705
716
  console.warn("Invalid claudePlugins config: expected an array");
@@ -970,11 +981,69 @@ function readRawConfigObject(filePath) {
970
981
  return {};
971
982
  }
972
983
  }
984
+ function writeConfigText(writePath, text) {
985
+ let mode;
986
+ try {
987
+ writePath = realpathSync(writePath);
988
+ mode = statSync(writePath).mode & 0o777;
989
+ }
990
+ catch { }
991
+ mkdirSync(dirname(writePath), { recursive: true });
992
+ const tmpPath = `${writePath}.${process.pid}.tmp`;
993
+ rmSync(tmpPath, { force: true });
994
+ try {
995
+ writeFileSync(tmpPath, text, mode === undefined ? "utf-8" : { encoding: "utf-8", mode });
996
+ if (mode !== undefined)
997
+ chmodSync(tmpPath, mode);
998
+ renameSync(tmpPath, writePath);
999
+ }
1000
+ catch (error) {
1001
+ try {
1002
+ rmSync(tmpPath, { force: true });
1003
+ }
1004
+ catch { }
1005
+ throw error;
1006
+ }
1007
+ }
973
1008
  function writeRawConfigObject(filePath, raw) {
974
- mkdirSync(dirname(filePath), { recursive: true });
975
- const tmpPath = `${filePath}.${process.pid}.tmp`;
976
- writeFileSync(tmpPath, `${JSON.stringify(raw, null, 2)}\n`, "utf-8");
977
- renameSync(tmpPath, filePath);
1009
+ writeConfigText(filePath, `${JSON.stringify(raw, null, 2)}\n`);
1010
+ }
1011
+ export function writeSharedConfigText(filePath, text) {
1012
+ if (!isRecord(parseJsonWithComments(text)))
1013
+ throw new Error("top-level value must be an object");
1014
+ writeConfigText(filePath, text);
1015
+ }
1016
+ export function writeJevSemanticSearchConfig(overridePath, cwd, allowedServers, effectiveJev) {
1017
+ const filePath = overridePath ? getPiGlobalConfigPath(overridePath) : getProjectPiConfigPath(cwd);
1018
+ let raw = {};
1019
+ if (existsSync(filePath)) {
1020
+ try {
1021
+ const parsed = parseJsonWithComments(readFileSync(filePath, "utf8"));
1022
+ if (!isRecord(parsed))
1023
+ throw new Error("top-level value must be an object");
1024
+ raw = parsed;
1025
+ }
1026
+ catch (error) {
1027
+ throw new Error(`Failed to update Jev settings at ${filePath}: ${error instanceof Error ? error.message : String(error)}`, { cause: error });
1028
+ }
1029
+ }
1030
+ if (raw.settings !== undefined && !isRecord(raw.settings)) {
1031
+ throw new Error(`Failed to update Jev settings at ${filePath}: settings must be an object`);
1032
+ }
1033
+ const settings = raw.settings;
1034
+ const currentJev = settings?.jev;
1035
+ if (currentJev !== undefined && currentJev !== false && !isRecord(currentJev)) {
1036
+ throw new Error(`Failed to update Jev settings at ${filePath}: settings.jev must be an object or false`);
1037
+ }
1038
+ const jev = isRecord(effectiveJev) ? effectiveJev : isRecord(currentJev) ? currentJev : {};
1039
+ const nextServers = [...new Set(allowedServers)].sort((a, b) => a.localeCompare(b));
1040
+ const nextJev = { ...jev, semanticSearch: true, allowedServers: nextServers };
1041
+ validateJevSettings(nextJev);
1042
+ if (isRecord(currentJev) && JSON.stringify(currentJev) === JSON.stringify(nextJev))
1043
+ return { path: filePath, changed: false };
1044
+ raw.settings = { ...settings, jev: nextJev };
1045
+ writeRawConfigObject(filePath, raw);
1046
+ return { path: filePath, changed: true };
978
1047
  }
979
1048
  function getServersObject(raw) {
980
1049
  const existing = raw.mcpServers ?? raw["mcp-servers"] ?? {};