@punch-bot/cli 1.4.0 → 1.5.1

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 (198) hide show
  1. package/CHANGELOG.md +60 -0
  2. package/README.md +1 -1
  3. package/dist/bundle/chunks/anthropic-messages-WAYXCPZL.js +6 -0
  4. package/dist/bundle/chunks/azure-openai-responses-LUIPKPFC.js +2 -0
  5. package/dist/bundle/chunks/bedrock-converse-stream.js +8 -8
  6. package/dist/bundle/chunks/chunk-275CIYA5.js +16 -0
  7. package/dist/bundle/chunks/chunk-2W2ATKZM.js +2 -0
  8. package/dist/bundle/chunks/{chunk-PYGXRV27.js → chunk-3V45WARH.js} +1 -1
  9. package/dist/bundle/chunks/chunk-4LBJE4YM.js +14 -0
  10. package/dist/bundle/chunks/{chunk-J7I2NFJ7.js → chunk-4NE64BTO.js} +1 -1
  11. package/dist/bundle/chunks/{chunk-S3GGRYIO.js → chunk-5AGIVGSV.js} +1 -1
  12. package/dist/bundle/chunks/{chunk-F5ZABL6Z.js → chunk-7CBJINYJ.js} +2 -2
  13. package/dist/bundle/chunks/{chunk-DRQDKNXA.js → chunk-7DDKXS2Q.js} +1 -1
  14. package/dist/bundle/chunks/{chunk-MCGQGCDS.js → chunk-7SFLP7ZK.js} +102 -93
  15. package/dist/bundle/chunks/{chunk-OO6DJ3CL.js → chunk-A3Y7H47A.js} +1 -1
  16. package/dist/bundle/chunks/{chunk-LP6WVVUV.js → chunk-BQU3RKDL.js} +1 -1
  17. package/dist/bundle/chunks/chunk-CRILLKNU.js +2 -0
  18. package/dist/bundle/chunks/chunk-HMPP4ECW.js +2 -0
  19. package/dist/bundle/chunks/chunk-HS7GCDEX.js +6 -0
  20. package/dist/bundle/chunks/{chunk-4L3WN2XY.js → chunk-JXWJOIH4.js} +1 -1
  21. package/dist/bundle/chunks/{chunk-6CYCI3EJ.js → chunk-LVVZS2NO.js} +1 -1
  22. package/dist/bundle/chunks/{chunk-6C5VKHGV.js → chunk-MYNHUMKE.js} +2 -2
  23. package/dist/bundle/chunks/{chunk-2M76JOVH.js → chunk-NJK3U3WK.js} +2 -2
  24. package/dist/bundle/chunks/chunk-NQWQE4BR.js +11 -0
  25. package/dist/bundle/chunks/{chunk-YGGF2ZM6.js → chunk-RROECCMX.js} +3 -3
  26. package/dist/bundle/chunks/{chunk-ZBURYEWF.js → chunk-TMTOQ7H7.js} +1 -1
  27. package/dist/bundle/chunks/chunk-TRN3ET6M.js +2 -0
  28. package/dist/bundle/chunks/{chunk-YWHGLBPB.js → chunk-UE7JCDFW.js} +1 -1
  29. package/dist/bundle/chunks/{chunk-22CYIUS4.js → chunk-UKVNB6C4.js} +1 -1
  30. package/dist/bundle/chunks/{cli-QAQLORRY.js → cli-W5KJM7YB.js} +1 -1
  31. package/dist/bundle/chunks/cloudflare-workers-ai-system-one-JWAAZATQ.js +2 -0
  32. package/dist/bundle/chunks/{execute-2Z6BN5R3.js → execute-HXULRBCI.js} +9 -3
  33. package/dist/bundle/chunks/github-copilot.js +1 -1
  34. package/dist/bundle/chunks/google-generative-ai-EHUU7JII.js +2 -0
  35. package/dist/bundle/chunks/google-vertex-AFMVUS5C.js +2 -0
  36. package/dist/bundle/chunks/{https-proxy-agent-US7JVRJG.js → https-proxy-agent-VTEOYAYG.js} +1 -1
  37. package/dist/bundle/chunks/{jiti-loader-C3NU2SDH.js → jiti-loader-GL4HJFAD.js} +1 -1
  38. package/dist/bundle/chunks/{jiti-static-loader-E6ANQD5T.js → jiti-static-loader-2RCDI6B4.js} +1 -1
  39. package/dist/bundle/chunks/{lib-TEDK3E5I.js → lib-4AVRLBHM.js} +1 -1
  40. package/dist/bundle/chunks/{llama-cpp-classify-FYN623RH.js → llama-cpp-classify-YVA2UOJG.js} +2 -2
  41. package/dist/bundle/chunks/{mistral-conversations-VNJYBSRF.js → mistral-conversations-FEBYNTL2.js} +1 -1
  42. package/dist/bundle/chunks/{multipart-parser-SQ6GDJL7.js → multipart-parser-FMGQ7342.js} +1 -1
  43. package/dist/bundle/chunks/{node-TWVVAGPO.js → node-AUOGOBCN.js} +1 -1
  44. package/dist/bundle/chunks/{node-N5BSDOA5.js → node-KCMANYC2.js} +1 -1
  45. package/dist/bundle/chunks/openai-codex-responses-MI7TTP3C.js +10 -0
  46. package/dist/bundle/chunks/openai-completions-BVORSTAM.js +7 -0
  47. package/dist/bundle/chunks/{openai-decisions-WVPMQ4JD.js → openai-decisions-GNOLFL74.js} +1 -1
  48. package/dist/bundle/chunks/openai-responses-TLIV5OQA.js +4 -0
  49. package/dist/bundle/chunks/openrouter-images-ZTNVFSL2.js +2 -0
  50. package/dist/bundle/chunks/pi-messages-4MVQCGGY.js +8 -0
  51. package/dist/bundle/chunks/{runtime-R6O72Q4R.js → runtime-R5GXO4CV.js} +1 -1
  52. package/dist/bundle/chunks/{src-UK77SYZE.js → src-QKGKDFSU.js} +1 -1
  53. package/dist/bundle/chunks/typesafe-system-one-I5AHLF6T.js +2 -0
  54. package/dist/bundle/chunks/virtual-modules-QK7S56IZ.js +2 -0
  55. package/dist/bundle/cli-runtime.js +1 -1
  56. package/dist/bundle/index.js +1 -1
  57. package/dist/bundle/rpc-entry.js +1 -1
  58. package/dist/core/agent-session.d.ts +5 -1
  59. package/dist/core/agent-session.d.ts.map +1 -1
  60. package/dist/core/agent-session.js +41 -12
  61. package/dist/core/agent-session.js.map +1 -1
  62. package/dist/core/client-identity.d.ts +8 -0
  63. package/dist/core/client-identity.d.ts.map +1 -0
  64. package/dist/core/client-identity.js +15 -0
  65. package/dist/core/client-identity.js.map +1 -0
  66. package/dist/core/compaction/branch-summarization.d.ts.map +1 -1
  67. package/dist/core/compaction/branch-summarization.js +1 -2
  68. package/dist/core/compaction/branch-summarization.js.map +1 -1
  69. package/dist/core/compaction/compaction.d.ts +2 -2
  70. package/dist/core/compaction/compaction.d.ts.map +1 -1
  71. package/dist/core/compaction/compaction.js +20 -15
  72. package/dist/core/compaction/compaction.js.map +1 -1
  73. package/dist/core/export-html/index.d.ts.map +1 -1
  74. package/dist/core/export-html/index.js +2 -0
  75. package/dist/core/export-html/index.js.map +1 -1
  76. package/dist/core/export-html/template.html +1 -0
  77. package/dist/core/export-html/template.js +2 -1
  78. package/dist/core/export-html/vendor/marked-cjk-friendly.min.js +6 -0
  79. package/dist/core/export-html/vendor/marked.min.js +30 -29
  80. package/dist/core/extensions/loader.d.ts.map +1 -1
  81. package/dist/core/extensions/loader.js +3 -0
  82. package/dist/core/extensions/loader.js.map +1 -1
  83. package/dist/core/extensions/virtual-modules.d.ts.map +1 -1
  84. package/dist/core/extensions/virtual-modules.js +3 -0
  85. package/dist/core/extensions/virtual-modules.js.map +1 -1
  86. package/dist/core/model-config.d.ts +915 -0
  87. package/dist/core/model-config.d.ts.map +1 -1
  88. package/dist/core/model-config.js +48 -24
  89. package/dist/core/model-config.js.map +1 -1
  90. package/dist/core/model-resolver.js +2 -2
  91. package/dist/core/model-resolver.js.map +1 -1
  92. package/dist/core/model-runtime.d.ts.map +1 -1
  93. package/dist/core/model-runtime.js +6 -3
  94. package/dist/core/model-runtime.js.map +1 -1
  95. package/dist/core/provider-composer.d.ts +2 -1
  96. package/dist/core/provider-composer.d.ts.map +1 -1
  97. package/dist/core/provider-composer.js +7 -3
  98. package/dist/core/provider-composer.js.map +1 -1
  99. package/dist/core/sdk.d.ts.map +1 -1
  100. package/dist/core/sdk.js +8 -9
  101. package/dist/core/sdk.js.map +1 -1
  102. package/dist/core/tools/grep.d.ts.map +1 -1
  103. package/dist/core/tools/grep.js +3 -1
  104. package/dist/core/tools/grep.js.map +1 -1
  105. package/dist/extensions/codemode/execute.d.ts.map +1 -1
  106. package/dist/extensions/codemode/execute.js +99 -24
  107. package/dist/extensions/codemode/execute.js.map +1 -1
  108. package/dist/extensions/mcp/config.d.ts.map +1 -1
  109. package/dist/extensions/mcp/config.js +3 -2
  110. package/dist/extensions/mcp/config.js.map +1 -1
  111. package/dist/extensions/punch/a2a-listen.d.ts.map +1 -1
  112. package/dist/extensions/punch/a2a-listen.js +1 -0
  113. package/dist/extensions/punch/a2a-listen.js.map +1 -1
  114. package/dist/extensions/punch/a2a.d.ts.map +1 -1
  115. package/dist/extensions/punch/a2a.js +12 -5
  116. package/dist/extensions/punch/a2a.js.map +1 -1
  117. package/dist/extensions/punch/auth.d.ts +4 -1
  118. package/dist/extensions/punch/auth.d.ts.map +1 -1
  119. package/dist/extensions/punch/auth.js +17 -2
  120. package/dist/extensions/punch/auth.js.map +1 -1
  121. package/dist/extensions/punch/collabs.d.ts.map +1 -1
  122. package/dist/extensions/punch/collabs.js +46 -40
  123. package/dist/extensions/punch/collabs.js.map +1 -1
  124. package/dist/extensions/punch/index.d.ts.map +1 -1
  125. package/dist/extensions/punch/index.js +2 -0
  126. package/dist/extensions/punch/index.js.map +1 -1
  127. package/dist/extensions/punch/plan-gate.d.ts +34 -0
  128. package/dist/extensions/punch/plan-gate.d.ts.map +1 -0
  129. package/dist/extensions/punch/plan-gate.js +149 -0
  130. package/dist/extensions/punch/plan-gate.js.map +1 -0
  131. package/dist/extensions/webfetch/index.d.ts.map +1 -1
  132. package/dist/extensions/webfetch/index.js +2 -1
  133. package/dist/extensions/webfetch/index.js.map +1 -1
  134. package/dist/package-manager-cli.d.ts.map +1 -1
  135. package/dist/package-manager-cli.js +2 -1
  136. package/dist/package-manager-cli.js.map +1 -1
  137. package/dist/server/a2a/run-server.d.ts +2 -0
  138. package/dist/server/a2a/run-server.d.ts.map +1 -1
  139. package/dist/server/a2a/run-server.js +2 -0
  140. package/dist/server/a2a/run-server.js.map +1 -1
  141. package/dist/utils/clipboard-command.d.ts.map +1 -1
  142. package/dist/utils/clipboard-command.js +3 -0
  143. package/dist/utils/clipboard-command.js.map +1 -1
  144. package/dist/utils/pi-user-agent.d.ts +1 -0
  145. package/dist/utils/pi-user-agent.d.ts.map +1 -1
  146. package/dist/utils/pi-user-agent.js +3 -2
  147. package/dist/utils/pi-user-agent.js.map +1 -1
  148. package/dist/utils/shell.d.ts.map +1 -1
  149. package/dist/utils/shell.js +45 -13
  150. package/dist/utils/shell.js.map +1 -1
  151. package/dist/utils/tools-manager.d.ts.map +1 -1
  152. package/dist/utils/tools-manager.js +4 -3
  153. package/dist/utils/tools-manager.js.map +1 -1
  154. package/docs/codemode.md +2 -2
  155. package/docs/compaction.md +3 -3
  156. package/docs/custom-provider.md +53 -1
  157. package/docs/docs.json +4 -0
  158. package/docs/environment-variables.md +3 -0
  159. package/docs/extensions.md +129 -10
  160. package/docs/models-configuration.md +196 -0
  161. package/docs/models.md +21 -5
  162. package/docs/settings.md +1 -1
  163. package/docs/windows.md +16 -2
  164. package/examples/extensions/custom-provider-anthropic/package-lock.json +2 -2
  165. package/examples/extensions/custom-provider-anthropic/package.json +1 -1
  166. package/examples/extensions/custom-provider-gitlab-duo/package.json +1 -1
  167. package/examples/extensions/gondolin/package-lock.json +8 -8
  168. package/examples/extensions/gondolin/package.json +1 -1
  169. package/examples/extensions/sandbox/package-lock.json +18 -44
  170. package/examples/extensions/sandbox/package.json +5 -2
  171. package/examples/extensions/with-deps/package-lock.json +2 -2
  172. package/examples/extensions/with-deps/package.json +1 -1
  173. package/npm-shrinkwrap.json +54 -43
  174. package/package.json +12 -11
  175. package/schemas/models.schema.json +83 -29
  176. package/dist/bundle/chunks/anthropic-messages-BUUFZMRE.js +0 -6
  177. package/dist/bundle/chunks/azure-openai-responses-WZ4GZHD2.js +0 -2
  178. package/dist/bundle/chunks/chunk-BYHXHV4K.js +0 -11
  179. package/dist/bundle/chunks/chunk-HACVPRBJ.js +0 -11
  180. package/dist/bundle/chunks/chunk-ITZNWD4K.js +0 -2
  181. package/dist/bundle/chunks/chunk-OWCYH5W2.js +0 -2
  182. package/dist/bundle/chunks/chunk-QQO2NSV6.js +0 -6
  183. package/dist/bundle/chunks/chunk-WUIPA42N.js +0 -14
  184. package/dist/bundle/chunks/chunk-XIX7LUWI.js +0 -2
  185. package/dist/bundle/chunks/cloudflare-workers-ai-system-one-UTBL2KOF.js +0 -2
  186. package/dist/bundle/chunks/google-generative-ai-S2KXX5PQ.js +0 -2
  187. package/dist/bundle/chunks/google-vertex-LQOUTFJN.js +0 -2
  188. package/dist/bundle/chunks/openai-codex-responses-E6BLZPYJ.js +0 -10
  189. package/dist/bundle/chunks/openai-completions-LUDIAWSG.js +0 -7
  190. package/dist/bundle/chunks/openai-responses-IOCBEIVC.js +0 -3
  191. package/dist/bundle/chunks/openrouter-images-YU24TD7D.js +0 -2
  192. package/dist/bundle/chunks/pi-messages-V27DSLVC.js +0 -8
  193. package/dist/bundle/chunks/typesafe-system-one-ZSK3RN4B.js +0 -2
  194. package/dist/bundle/chunks/virtual-modules-WOHWUS3S.js +0 -2
  195. package/dist/core/provider-attribution.d.ts +0 -4
  196. package/dist/core/provider-attribution.d.ts.map +0 -1
  197. package/dist/core/provider-attribution.js +0 -72
  198. package/dist/core/provider-attribution.js.map +0 -1
@@ -32,6 +32,7 @@ import { existsSync, mkdirSync, readFileSync, writeFileSync } from "node:fs";
32
32
  import { dirname, join } from "node:path";
33
33
  import { CONFIG_DIR_NAME } from "../../config.js";
34
34
  import { mcpNamespace, validateMcpServerConfig, } from "../../core/mcp-servers.js";
35
+ import { stripBom } from "../../utils/text.js";
35
36
  export { getMcpToolExposure } from "../../core/mcp-servers.js";
36
37
  const OVERRIDE_KEYS = ["enabled", "exposure", "toolExposure"];
37
38
  /** Whether an entry overrides a server defined elsewhere instead of defining one. */
@@ -47,7 +48,7 @@ function readConfigFile(path, scope, state) {
47
48
  return;
48
49
  let parsed;
49
50
  try {
50
- parsed = JSON.parse(readFileSync(path, "utf8"));
51
+ parsed = JSON.parse(stripBom(readFileSync(path, "utf8")));
51
52
  }
52
53
  catch (error) {
53
54
  errors.push(`${path}: ${error instanceof Error ? error.message : String(error)}`);
@@ -179,7 +180,7 @@ export function removeMcpServerConfig(path, name) {
179
180
  * it back with its indentation when `edit` returns true. Other content is kept.
180
181
  */
181
182
  function editMcpServers(path, edit) {
182
- const text = existsSync(path) ? readFileSync(path, "utf8") : undefined;
183
+ const text = existsSync(path) ? stripBom(readFileSync(path, "utf8")) : undefined;
183
184
  const parsed = text === undefined ? {} : JSON.parse(text);
184
185
  if (!isRecord(parsed) || (parsed.mcpServers !== undefined && !isRecord(parsed.mcpServers))) {
185
186
  throw new Error(`${path}: expected an object with an "mcpServers" object`);
@@ -1 +1 @@
1
- {"version":3,"file":"config.js","sourceRoot":"","sources":["../../../src/extensions/mcp/config.ts"],"names":[],"mappings":"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","sourcesContent":["/**\n * MCP server configuration.\n *\n * Servers are read from `mcp.json` in the agent directory and, for trusted projects, from\n * `<project>/.pi/mcp.json`. Both use the `mcpServers` shape shared by other MCP clients, so\n * existing configurations can be copied over. Project entries replace global entries with the\n * same name.\n *\n * A project entry without `command`, `url`, or `type` overrides only `enabled`, `exposure`, and\n * `toolExposure` of the global server with the same name, for example to turn it off in one project:\n * `{ \"mcpServers\": { \"internal-tools\": { \"enabled\": false } } }`. The rest of the global entry is kept,\n * including credentials the project could not set itself.\n *\n * ```json\n * {\n * \"mcpServers\": {\n * \"filesystem\": { \"command\": \"npx\", \"args\": [\"-y\", \"@modelcontextprotocol/server-filesystem\", \".\"] },\n * \"docs\": { \"url\": \"https://example.com/mcp\", \"headers\": { \"Authorization\": \"Bearer ${DOCS_TOKEN}\" } },\n * \"sentry\": { \"url\": \"https://mcp.sentry.dev/mcp\" }\n * }\n * }\n * ```\n *\n * HTTP servers without an `Authorization` header use OAuth when they answer 401 (sign in with `/mcp`).\n * `\"auth\": { \"provider\": \"<provider>\" }` sends the token of a `/login` provider instead. Project files\n * cannot use it, so a repository cannot pick where the credential goes.\n *\n * The top-level `autoEnableCodemode` (default true) activates the codemode tool when a server\n * with `codemode` exposure connects. A project value overrides the global one.\n */\n\nimport { existsSync, mkdirSync, readFileSync, writeFileSync } from \"node:fs\";\nimport { dirname, join } from \"node:path\";\nimport { CONFIG_DIR_NAME } from \"../../config.ts\";\nimport {\n\ttype McpExposure,\n\ttype McpServerConfig,\n\tmcpNamespace,\n\tvalidateMcpServerConfig,\n} from \"../../core/mcp-servers.ts\";\n\nexport type {\n\tMcpExposure,\n\tMcpHttpServerConfig,\n\tMcpOAuthConfig,\n\tMcpServerConfig,\n\tMcpStdioServerConfig,\n} from \"../../core/mcp-servers.ts\";\nexport { getMcpToolExposure } from \"../../core/mcp-servers.ts\";\n\nexport interface McpServerEntry {\n\tname: string;\n\tconfig: McpServerConfig;\n\t/** Config file that defined the entry, or the path of the extension that registered it. */\n\tsource: string;\n\t/**\n\t * The global or the project `mcp.json`, or `extension` for servers registered with\n\t * `pi.registerMcpServer()`. Changes to extension servers are not saved.\n\t */\n\tscope?: \"global\" | \"project\" | \"extension\";\n\t/** Project `mcp.json` with an override of this global server's `enabled`, `exposure`, or `toolExposure`. */\n\toverride?: string;\n}\n\nexport interface LoadedMcpConfig {\n\tservers: McpServerEntry[];\n\t/** Activate the codemode tool when `codemode` servers connect. Default: true. */\n\tautoEnableCodemode?: boolean;\n\terrors: string[];\n\t/** The project `mcp.json` when the project is trusted, where `/mcp` saves project overrides. */\n\tprojectConfig?: string;\n}\n\nconst OVERRIDE_KEYS = [\"enabled\", \"exposure\", \"toolExposure\"];\n\n/** Whether an entry overrides a server defined elsewhere instead of defining one. */\nfunction isOverride(value: Record<string, unknown>): boolean {\n\treturn value.command === undefined && value.url === undefined && value.type === undefined;\n}\n\nfunction isRecord(value: unknown): value is Record<string, unknown> {\n\treturn typeof value === \"object\" && value !== null && !Array.isArray(value);\n}\n\ninterface McpConfigState {\n\tservers: Map<string, McpServerEntry>;\n\tautoEnableCodemode?: boolean;\n\terrors: string[];\n}\n\nfunction readConfigFile(path: string, scope: \"global\" | \"project\", state: McpConfigState): void {\n\tconst { servers, errors } = state;\n\tif (!existsSync(path)) return;\n\tlet parsed: unknown;\n\ttry {\n\t\tparsed = JSON.parse(readFileSync(path, \"utf8\"));\n\t} catch (error) {\n\t\terrors.push(`${path}: ${error instanceof Error ? error.message : String(error)}`);\n\t\treturn;\n\t}\n\tif (!isRecord(parsed) || (parsed.mcpServers !== undefined && !isRecord(parsed.mcpServers))) {\n\t\terrors.push(`${path}: expected an object with an \"mcpServers\" object`);\n\t\treturn;\n\t}\n\tif (typeof parsed.autoEnableCodemode === \"boolean\") state.autoEnableCodemode = parsed.autoEnableCodemode;\n\telse if (parsed.autoEnableCodemode !== undefined) errors.push(`${path}: autoEnableCodemode must be a boolean`);\n\tfor (const [name, value] of Object.entries(parsed.mcpServers ?? {})) {\n\t\tif (scope === \"project\" && isRecord(value) && isOverride(value)) {\n\t\t\tconst base = servers.get(name);\n\t\t\tconst extra = Object.keys(value).filter((key) => !OVERRIDE_KEYS.includes(key));\n\t\t\tif (!base) {\n\t\t\t\terrors.push(`${path}: server \"${name}\" needs \"command\" or \"url\", or a global server to override`);\n\t\t\t} else if (extra.length > 0) {\n\t\t\t\terrors.push(`${path}: server \"${name}\": an override can only set ${OVERRIDE_KEYS.join(\", \")}`);\n\t\t\t} else {\n\t\t\t\tconst config = validateMcpServerConfig(name, { ...base.config, ...value });\n\t\t\t\tif (typeof config === \"string\") errors.push(`${path}: ${config}`);\n\t\t\t\telse servers.set(name, { ...base, config, override: path });\n\t\t\t}\n\t\t\tcontinue;\n\t\t}\n\t\tconst config = validateMcpServerConfig(name, value);\n\t\tif (typeof config === \"string\") {\n\t\t\terrors.push(`${path}: ${config}`);\n\t\t\tcontinue;\n\t\t}\n\t\t// Names that differ only in `-` and `_` would share a namespace.\n\t\tconst clash = [...servers.keys()].find((other) => other !== name && mcpNamespace(other) === mcpNamespace(name));\n\t\tif (clash) {\n\t\t\terrors.push(`${path}: server \"${name}\" conflicts with \"${clash}\"`);\n\t\t\tcontinue;\n\t\t}\n\t\tif (scope === \"project\" && \"url\" in config && config.auth) {\n\t\t\terrors.push(`${path}: server \"${name}\": auth is only allowed in the global mcp.json`);\n\t\t\tcontinue;\n\t\t}\n\t\tservers.set(name, { name, config, source: path, scope });\n\t}\n}\n\n/**\n * Load global and (when trusted) project MCP configuration. Disabled servers are included with\n * `enabled: false`, so they can be enabled again.\n */\nexport function loadMcpConfig(options: { agentDir: string; cwd: string; projectTrusted: boolean }): LoadedMcpConfig {\n\tconst state: McpConfigState = { servers: new Map(), errors: [] };\n\treadConfigFile(join(options.agentDir, \"mcp.json\"), \"global\", state);\n\tconst projectConfig = options.projectTrusted ? join(options.cwd, CONFIG_DIR_NAME, \"mcp.json\") : undefined;\n\tif (projectConfig) readConfigFile(projectConfig, \"project\", state);\n\treturn {\n\t\tservers: [...state.servers.values()],\n\t\t...(state.autoEnableCodemode === undefined ? {} : { autoEnableCodemode: state.autoEnableCodemode }),\n\t\terrors: state.errors,\n\t\t...(projectConfig ? { projectConfig } : {}),\n\t};\n}\n\n/** Settings `/mcp` changes. `enabled: true` and `exposure: \"codemode\"` are the defaults and remove the key. */\nexport interface McpServerConfigPatch {\n\tenabled?: boolean;\n\texposure?: McpExposure;\n}\n\n/**\n * Change one server's settings in the `mcp.json` that defines or overrides it. With `override`, a\n * missing entry is added as an override. Overrides keep default values, since they replace the global\n * server's. Other content is kept; the file is rewritten with its indentation.\n */\nexport function updateMcpServerConfig(\n\tpath: string,\n\tname: string,\n\tpatch: McpServerConfigPatch,\n\toptions: { override?: boolean } = {},\n): void {\n\teditMcpServers(path, (servers, parsed) => {\n\t\tlet server = servers?.[name];\n\t\tif (server === undefined && options.override) {\n\t\t\tserver = {};\n\t\t\tparsed.mcpServers = { ...servers, [name]: server };\n\t\t}\n\t\tif (!isRecord(server)) throw new Error(`${path} does not define MCP server \"${name}\"`);\n\t\tconst keepDefaults = isOverride(server);\n\t\tif (patch.enabled !== undefined) {\n\t\t\tif (patch.enabled && !keepDefaults) delete server.enabled;\n\t\t\telse server.enabled = patch.enabled;\n\t\t}\n\t\tif (patch.exposure !== undefined) {\n\t\t\tif (patch.exposure === \"codemode\" && !keepDefaults) delete server.exposure;\n\t\t\telse server.exposure = patch.exposure;\n\t\t}\n\t\treturn true;\n\t});\n}\n\n/**\n * Add a server to an `mcp.json`, creating the file when missing. An existing entry with the same\n * name is replaced. Returns true when an entry was replaced.\n */\nexport function addMcpServerConfig(path: string, name: string, config: McpServerConfig): boolean {\n\tlet replaced = false;\n\teditMcpServers(path, (servers, parsed) => {\n\t\tconst target = servers ?? {};\n\t\treplaced = target[name] !== undefined;\n\t\ttarget[name] = config;\n\t\tparsed.mcpServers = target;\n\t\treturn true;\n\t});\n\treturn replaced;\n}\n\n/** Remove a server from an `mcp.json`. Returns false when the file does not define it. */\nexport function removeMcpServerConfig(path: string, name: string): boolean {\n\tif (!existsSync(path)) return false;\n\tlet removed = false;\n\teditMcpServers(path, (servers) => {\n\t\tif (!servers || servers[name] === undefined) return false;\n\t\tdelete servers[name];\n\t\tremoved = true;\n\t\treturn true;\n\t});\n\treturn removed;\n}\n\n/**\n * Read an `mcp.json` (an empty config when missing), let `edit` change its `mcpServers`, and write\n * it back with its indentation when `edit` returns true. Other content is kept.\n */\nfunction editMcpServers(\n\tpath: string,\n\tedit: (servers: Record<string, unknown> | undefined, parsed: Record<string, unknown>) => boolean,\n): void {\n\tconst text = existsSync(path) ? readFileSync(path, \"utf8\") : undefined;\n\tconst parsed: unknown = text === undefined ? {} : JSON.parse(text);\n\tif (!isRecord(parsed) || (parsed.mcpServers !== undefined && !isRecord(parsed.mcpServers))) {\n\t\tthrow new Error(`${path}: expected an object with an \"mcpServers\" object`);\n\t}\n\tconst servers = isRecord(parsed.mcpServers) ? parsed.mcpServers : undefined;\n\tif (!edit(servers, parsed)) return;\n\tconst indent = (text && /^([ \\t]+)\\S/m.exec(text)?.[1]) || \" \";\n\t// mcp.json can hold literal credentials. The modes apply only to a newly created directory or file, so existing\n\t// permissions are kept.\n\tmkdirSync(dirname(path), { recursive: true, mode: 0o700 });\n\twriteFileSync(path, `${JSON.stringify(parsed, null, indent)}\\n`, { mode: 0o600 });\n}\n"]}
1
+ {"version":3,"file":"config.js","sourceRoot":"","sources":["../../../src/extensions/mcp/config.ts"],"names":[],"mappings":"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","sourcesContent":["/**\n * MCP server configuration.\n *\n * Servers are read from `mcp.json` in the agent directory and, for trusted projects, from\n * `<project>/.pi/mcp.json`. Both use the `mcpServers` shape shared by other MCP clients, so\n * existing configurations can be copied over. Project entries replace global entries with the\n * same name.\n *\n * A project entry without `command`, `url`, or `type` overrides only `enabled`, `exposure`, and\n * `toolExposure` of the global server with the same name, for example to turn it off in one project:\n * `{ \"mcpServers\": { \"internal-tools\": { \"enabled\": false } } }`. The rest of the global entry is kept,\n * including credentials the project could not set itself.\n *\n * ```json\n * {\n * \"mcpServers\": {\n * \"filesystem\": { \"command\": \"npx\", \"args\": [\"-y\", \"@modelcontextprotocol/server-filesystem\", \".\"] },\n * \"docs\": { \"url\": \"https://example.com/mcp\", \"headers\": { \"Authorization\": \"Bearer ${DOCS_TOKEN}\" } },\n * \"sentry\": { \"url\": \"https://mcp.sentry.dev/mcp\" }\n * }\n * }\n * ```\n *\n * HTTP servers without an `Authorization` header use OAuth when they answer 401 (sign in with `/mcp`).\n * `\"auth\": { \"provider\": \"<provider>\" }` sends the token of a `/login` provider instead. Project files\n * cannot use it, so a repository cannot pick where the credential goes.\n *\n * The top-level `autoEnableCodemode` (default true) activates the codemode tool when a server\n * with `codemode` exposure connects. A project value overrides the global one.\n */\n\nimport { existsSync, mkdirSync, readFileSync, writeFileSync } from \"node:fs\";\nimport { dirname, join } from \"node:path\";\nimport { CONFIG_DIR_NAME } from \"../../config.ts\";\nimport {\n\ttype McpExposure,\n\ttype McpServerConfig,\n\tmcpNamespace,\n\tvalidateMcpServerConfig,\n} from \"../../core/mcp-servers.ts\";\nimport { stripBom } from \"../../utils/text.ts\";\n\nexport type {\n\tMcpExposure,\n\tMcpHttpServerConfig,\n\tMcpOAuthConfig,\n\tMcpServerConfig,\n\tMcpStdioServerConfig,\n} from \"../../core/mcp-servers.ts\";\nexport { getMcpToolExposure } from \"../../core/mcp-servers.ts\";\n\nexport interface McpServerEntry {\n\tname: string;\n\tconfig: McpServerConfig;\n\t/** Config file that defined the entry, or the path of the extension that registered it. */\n\tsource: string;\n\t/**\n\t * The global or the project `mcp.json`, or `extension` for servers registered with\n\t * `pi.registerMcpServer()`. Changes to extension servers are not saved.\n\t */\n\tscope?: \"global\" | \"project\" | \"extension\";\n\t/** Project `mcp.json` with an override of this global server's `enabled`, `exposure`, or `toolExposure`. */\n\toverride?: string;\n}\n\nexport interface LoadedMcpConfig {\n\tservers: McpServerEntry[];\n\t/** Activate the codemode tool when `codemode` servers connect. Default: true. */\n\tautoEnableCodemode?: boolean;\n\terrors: string[];\n\t/** The project `mcp.json` when the project is trusted, where `/mcp` saves project overrides. */\n\tprojectConfig?: string;\n}\n\nconst OVERRIDE_KEYS = [\"enabled\", \"exposure\", \"toolExposure\"];\n\n/** Whether an entry overrides a server defined elsewhere instead of defining one. */\nfunction isOverride(value: Record<string, unknown>): boolean {\n\treturn value.command === undefined && value.url === undefined && value.type === undefined;\n}\n\nfunction isRecord(value: unknown): value is Record<string, unknown> {\n\treturn typeof value === \"object\" && value !== null && !Array.isArray(value);\n}\n\ninterface McpConfigState {\n\tservers: Map<string, McpServerEntry>;\n\tautoEnableCodemode?: boolean;\n\terrors: string[];\n}\n\nfunction readConfigFile(path: string, scope: \"global\" | \"project\", state: McpConfigState): void {\n\tconst { servers, errors } = state;\n\tif (!existsSync(path)) return;\n\tlet parsed: unknown;\n\ttry {\n\t\tparsed = JSON.parse(stripBom(readFileSync(path, \"utf8\")));\n\t} catch (error) {\n\t\terrors.push(`${path}: ${error instanceof Error ? error.message : String(error)}`);\n\t\treturn;\n\t}\n\tif (!isRecord(parsed) || (parsed.mcpServers !== undefined && !isRecord(parsed.mcpServers))) {\n\t\terrors.push(`${path}: expected an object with an \"mcpServers\" object`);\n\t\treturn;\n\t}\n\tif (typeof parsed.autoEnableCodemode === \"boolean\") state.autoEnableCodemode = parsed.autoEnableCodemode;\n\telse if (parsed.autoEnableCodemode !== undefined) errors.push(`${path}: autoEnableCodemode must be a boolean`);\n\tfor (const [name, value] of Object.entries(parsed.mcpServers ?? {})) {\n\t\tif (scope === \"project\" && isRecord(value) && isOverride(value)) {\n\t\t\tconst base = servers.get(name);\n\t\t\tconst extra = Object.keys(value).filter((key) => !OVERRIDE_KEYS.includes(key));\n\t\t\tif (!base) {\n\t\t\t\terrors.push(`${path}: server \"${name}\" needs \"command\" or \"url\", or a global server to override`);\n\t\t\t} else if (extra.length > 0) {\n\t\t\t\terrors.push(`${path}: server \"${name}\": an override can only set ${OVERRIDE_KEYS.join(\", \")}`);\n\t\t\t} else {\n\t\t\t\tconst config = validateMcpServerConfig(name, { ...base.config, ...value });\n\t\t\t\tif (typeof config === \"string\") errors.push(`${path}: ${config}`);\n\t\t\t\telse servers.set(name, { ...base, config, override: path });\n\t\t\t}\n\t\t\tcontinue;\n\t\t}\n\t\tconst config = validateMcpServerConfig(name, value);\n\t\tif (typeof config === \"string\") {\n\t\t\terrors.push(`${path}: ${config}`);\n\t\t\tcontinue;\n\t\t}\n\t\t// Names that differ only in `-` and `_` would share a namespace.\n\t\tconst clash = [...servers.keys()].find((other) => other !== name && mcpNamespace(other) === mcpNamespace(name));\n\t\tif (clash) {\n\t\t\terrors.push(`${path}: server \"${name}\" conflicts with \"${clash}\"`);\n\t\t\tcontinue;\n\t\t}\n\t\tif (scope === \"project\" && \"url\" in config && config.auth) {\n\t\t\terrors.push(`${path}: server \"${name}\": auth is only allowed in the global mcp.json`);\n\t\t\tcontinue;\n\t\t}\n\t\tservers.set(name, { name, config, source: path, scope });\n\t}\n}\n\n/**\n * Load global and (when trusted) project MCP configuration. Disabled servers are included with\n * `enabled: false`, so they can be enabled again.\n */\nexport function loadMcpConfig(options: { agentDir: string; cwd: string; projectTrusted: boolean }): LoadedMcpConfig {\n\tconst state: McpConfigState = { servers: new Map(), errors: [] };\n\treadConfigFile(join(options.agentDir, \"mcp.json\"), \"global\", state);\n\tconst projectConfig = options.projectTrusted ? join(options.cwd, CONFIG_DIR_NAME, \"mcp.json\") : undefined;\n\tif (projectConfig) readConfigFile(projectConfig, \"project\", state);\n\treturn {\n\t\tservers: [...state.servers.values()],\n\t\t...(state.autoEnableCodemode === undefined ? {} : { autoEnableCodemode: state.autoEnableCodemode }),\n\t\terrors: state.errors,\n\t\t...(projectConfig ? { projectConfig } : {}),\n\t};\n}\n\n/** Settings `/mcp` changes. `enabled: true` and `exposure: \"codemode\"` are the defaults and remove the key. */\nexport interface McpServerConfigPatch {\n\tenabled?: boolean;\n\texposure?: McpExposure;\n}\n\n/**\n * Change one server's settings in the `mcp.json` that defines or overrides it. With `override`, a\n * missing entry is added as an override. Overrides keep default values, since they replace the global\n * server's. Other content is kept; the file is rewritten with its indentation.\n */\nexport function updateMcpServerConfig(\n\tpath: string,\n\tname: string,\n\tpatch: McpServerConfigPatch,\n\toptions: { override?: boolean } = {},\n): void {\n\teditMcpServers(path, (servers, parsed) => {\n\t\tlet server = servers?.[name];\n\t\tif (server === undefined && options.override) {\n\t\t\tserver = {};\n\t\t\tparsed.mcpServers = { ...servers, [name]: server };\n\t\t}\n\t\tif (!isRecord(server)) throw new Error(`${path} does not define MCP server \"${name}\"`);\n\t\tconst keepDefaults = isOverride(server);\n\t\tif (patch.enabled !== undefined) {\n\t\t\tif (patch.enabled && !keepDefaults) delete server.enabled;\n\t\t\telse server.enabled = patch.enabled;\n\t\t}\n\t\tif (patch.exposure !== undefined) {\n\t\t\tif (patch.exposure === \"codemode\" && !keepDefaults) delete server.exposure;\n\t\t\telse server.exposure = patch.exposure;\n\t\t}\n\t\treturn true;\n\t});\n}\n\n/**\n * Add a server to an `mcp.json`, creating the file when missing. An existing entry with the same\n * name is replaced. Returns true when an entry was replaced.\n */\nexport function addMcpServerConfig(path: string, name: string, config: McpServerConfig): boolean {\n\tlet replaced = false;\n\teditMcpServers(path, (servers, parsed) => {\n\t\tconst target = servers ?? {};\n\t\treplaced = target[name] !== undefined;\n\t\ttarget[name] = config;\n\t\tparsed.mcpServers = target;\n\t\treturn true;\n\t});\n\treturn replaced;\n}\n\n/** Remove a server from an `mcp.json`. Returns false when the file does not define it. */\nexport function removeMcpServerConfig(path: string, name: string): boolean {\n\tif (!existsSync(path)) return false;\n\tlet removed = false;\n\teditMcpServers(path, (servers) => {\n\t\tif (!servers || servers[name] === undefined) return false;\n\t\tdelete servers[name];\n\t\tremoved = true;\n\t\treturn true;\n\t});\n\treturn removed;\n}\n\n/**\n * Read an `mcp.json` (an empty config when missing), let `edit` change its `mcpServers`, and write\n * it back with its indentation when `edit` returns true. Other content is kept.\n */\nfunction editMcpServers(\n\tpath: string,\n\tedit: (servers: Record<string, unknown> | undefined, parsed: Record<string, unknown>) => boolean,\n): void {\n\tconst text = existsSync(path) ? stripBom(readFileSync(path, \"utf8\")) : undefined;\n\tconst parsed: unknown = text === undefined ? {} : JSON.parse(text);\n\tif (!isRecord(parsed) || (parsed.mcpServers !== undefined && !isRecord(parsed.mcpServers))) {\n\t\tthrow new Error(`${path}: expected an object with an \"mcpServers\" object`);\n\t}\n\tconst servers = isRecord(parsed.mcpServers) ? parsed.mcpServers : undefined;\n\tif (!edit(servers, parsed)) return;\n\tconst indent = (text && /^([ \\t]+)\\S/m.exec(text)?.[1]) || \" \";\n\t// mcp.json can hold literal credentials. The modes apply only to a newly created directory or file, so existing\n\t// permissions are kept.\n\tmkdirSync(dirname(path), { recursive: true, mode: 0o700 });\n\twriteFileSync(path, `${JSON.stringify(parsed, null, indent)}\\n`, { mode: 0o600 });\n}\n"]}
@@ -1 +1 @@
1
- {"version":3,"file":"a2a-listen.d.ts","sourceRoot":"","sources":["../../../src/extensions/punch/a2a-listen.ts"],"names":[],"mappings":"AAEA,OAAO,EAAmB,KAAK,iBAAiB,EAAE,MAAM,gBAAgB,CAAC;AAOzE,UAAU,UAAU;IACnB,SAAS,EAAE,iBAAiB,CAAC;IAC7B,KAAK,IAAI,OAAO,CAAC,IAAI,CAAC,CAAC;CACvB;AAcD,wBAAsB,qBAAqB,CAC1C,GAAG,GAAE,MAAM,CAAC,UAAwB,EACpC,SAAS,CAAC,EAAE,iBAAiB,GAC3B,OAAO,CAAC,UAAU,GAAG,SAAS,CAAC,CA2DjC;AAED,wBAAsB,oBAAoB,IAAI,OAAO,CAAC,IAAI,CAAC,CAM1D"}
1
+ {"version":3,"file":"a2a-listen.d.ts","sourceRoot":"","sources":["../../../src/extensions/punch/a2a-listen.ts"],"names":[],"mappings":"AAEA,OAAO,EAAmB,KAAK,iBAAiB,EAAE,MAAM,gBAAgB,CAAC;AAOzE,UAAU,UAAU;IACnB,SAAS,EAAE,iBAAiB,CAAC;IAC7B,KAAK,IAAI,OAAO,CAAC,IAAI,CAAC,CAAC;CACvB;AAcD,wBAAsB,qBAAqB,CAC1C,GAAG,GAAE,MAAM,CAAC,UAAwB,EACpC,SAAS,CAAC,EAAE,iBAAiB,GAC3B,OAAO,CAAC,UAAU,GAAG,SAAS,CAAC,CA4DjC;AAED,wBAAsB,oBAAoB,IAAI,OAAO,CAAC,IAAI,CAAC,CAM1D"}
@@ -42,6 +42,7 @@ export async function startPunchA2aListener(env = process.env, discovery) {
42
42
  id: randomUUID(),
43
43
  name,
44
44
  url,
45
+ token: server.authToken,
45
46
  pid: process.pid,
46
47
  cwd: process.cwd(),
47
48
  startedAt: Date.now(),
@@ -1 +1 @@
1
- {"version":3,"file":"a2a-listen.js","sourceRoot":"","sources":["../../../src/extensions/punch/a2a-listen.ts"],"names":[],"mappings":"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","sourcesContent":["import { randomUUID } from \"node:crypto\";\n\nimport { createA2aServer, type LocalA2aDiscovery } from \"@punch-bot/a2a\";\n\nimport { createCodingAgentHarnessRunnerFactory } from \"../../server/a2a/harness-runner.ts\";\nimport { punchA2aDiscovery, punchSandboxName } from \"./a2a.ts\";\n\nconst HEARTBEAT_MS = 15_000;\n\ninterface ProcessA2a {\n\tdiscovery: LocalA2aDiscovery;\n\tclose(): Promise<void>;\n}\n\nlet processA2a: ProcessA2a | undefined;\nlet processA2aStart: Promise<ProcessA2a | undefined> | undefined;\n\nfunction parseListenPort(env: NodeJS.ProcessEnv): number {\n\tif (!env.PUNCH_A2A_PORT) return 0;\n\tconst port = Number(env.PUNCH_A2A_PORT);\n\tif (!Number.isInteger(port) || port < 0 || port > 65_535) {\n\t\tthrow new Error(`Invalid PUNCH_A2A_PORT \"${env.PUNCH_A2A_PORT}\"`);\n\t}\n\treturn port;\n}\n\nexport async function startPunchA2aListener(\n\tenv: NodeJS.ProcessEnv = process.env,\n\tdiscovery?: LocalA2aDiscovery,\n): Promise<ProcessA2a | undefined> {\n\tif (processA2a) return processA2a;\n\tif (processA2aStart) return processA2aStart;\n\tprocessA2aStart = (async () => {\n\t\tconst registry = discovery ?? punchA2aDiscovery(env);\n\t\tconst host = env.PUNCH_A2A_HOST || \"127.0.0.1\";\n\t\tconst port = parseListenPort(env);\n\t\tconst name = punchSandboxName(env);\n\t\tconst advertiseUrl = env.PUNCH_A2A_ADVERTISE_URL?.trim();\n\t\tconst publicHost = env.PUNCH_A2A_ADVERTISE_HOST?.trim();\n\t\tconst runnerFactory = await createCodingAgentHarnessRunnerFactory({ cwd: process.cwd() });\n\t\tconst server = await createA2aServer({\n\t\t\trunnerFactory,\n\t\t\tname,\n\t\t\tdescription: `Punch sandbox ${name}`,\n\t\t\t...(advertiseUrl ? { baseUrl: advertiseUrl } : {}),\n\t\t\t...(publicHost ? { publicHost } : {}),\n\t\t});\n\t\ttry {\n\t\t\tconst bound = await server.listen(port, host);\n\t\t\tserver.unref();\n\t\t\tconst url = advertiseUrl || bound.url;\n\t\t\tregistry.advertise({\n\t\t\t\tid: randomUUID(),\n\t\t\t\tname,\n\t\t\t\turl,\n\t\t\t\tpid: process.pid,\n\t\t\t\tcwd: process.cwd(),\n\t\t\t\tstartedAt: Date.now(),\n\t\t\t});\n\t\t\tconst timer = setInterval(() => {\n\t\t\t\ttry {\n\t\t\t\t\tregistry.heartbeat();\n\t\t\t\t} catch (err) {\n\t\t\t\t\tconsole.warn(`punch a2a heartbeat failed: ${(err as Error).message}`);\n\t\t\t\t}\n\t\t\t}, HEARTBEAT_MS);\n\t\t\ttimer.unref();\n\t\t\tconst close = async () => {\n\t\t\t\tclearInterval(timer);\n\t\t\t\tregistry.close();\n\t\t\t\tawait server.close();\n\t\t\t};\n\t\t\tconst runtime: ProcessA2a = { discovery: registry, close };\n\t\t\tprocessA2a = runtime;\n\t\t\tprocess.on(\"exit\", () => {\n\t\t\t\tregistry.close();\n\t\t\t});\n\t\t\treturn runtime;\n\t\t} catch (err) {\n\t\t\tawait server.close().catch(() => undefined);\n\t\t\tthrow err;\n\t\t}\n\t})().catch((err) => {\n\t\tprocessA2aStart = undefined;\n\t\tconsole.warn(`punch a2a discovery disabled: ${(err as Error).message}`);\n\t\treturn undefined;\n\t});\n\treturn processA2aStart;\n}\n\nexport async function stopPunchA2aListener(): Promise<void> {\n\tconst pending = processA2aStart;\n\tprocessA2aStart = undefined;\n\tconst runtime = processA2a ?? (await pending);\n\tprocessA2a = undefined;\n\tawait runtime?.close();\n}\n"]}
1
+ {"version":3,"file":"a2a-listen.js","sourceRoot":"","sources":["../../../src/extensions/punch/a2a-listen.ts"],"names":[],"mappings":"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","sourcesContent":["import { randomUUID } from \"node:crypto\";\n\nimport { createA2aServer, type LocalA2aDiscovery } from \"@punch-bot/a2a\";\n\nimport { createCodingAgentHarnessRunnerFactory } from \"../../server/a2a/harness-runner.ts\";\nimport { punchA2aDiscovery, punchSandboxName } from \"./a2a.ts\";\n\nconst HEARTBEAT_MS = 15_000;\n\ninterface ProcessA2a {\n\tdiscovery: LocalA2aDiscovery;\n\tclose(): Promise<void>;\n}\n\nlet processA2a: ProcessA2a | undefined;\nlet processA2aStart: Promise<ProcessA2a | undefined> | undefined;\n\nfunction parseListenPort(env: NodeJS.ProcessEnv): number {\n\tif (!env.PUNCH_A2A_PORT) return 0;\n\tconst port = Number(env.PUNCH_A2A_PORT);\n\tif (!Number.isInteger(port) || port < 0 || port > 65_535) {\n\t\tthrow new Error(`Invalid PUNCH_A2A_PORT \"${env.PUNCH_A2A_PORT}\"`);\n\t}\n\treturn port;\n}\n\nexport async function startPunchA2aListener(\n\tenv: NodeJS.ProcessEnv = process.env,\n\tdiscovery?: LocalA2aDiscovery,\n): Promise<ProcessA2a | undefined> {\n\tif (processA2a) return processA2a;\n\tif (processA2aStart) return processA2aStart;\n\tprocessA2aStart = (async () => {\n\t\tconst registry = discovery ?? punchA2aDiscovery(env);\n\t\tconst host = env.PUNCH_A2A_HOST || \"127.0.0.1\";\n\t\tconst port = parseListenPort(env);\n\t\tconst name = punchSandboxName(env);\n\t\tconst advertiseUrl = env.PUNCH_A2A_ADVERTISE_URL?.trim();\n\t\tconst publicHost = env.PUNCH_A2A_ADVERTISE_HOST?.trim();\n\t\tconst runnerFactory = await createCodingAgentHarnessRunnerFactory({ cwd: process.cwd() });\n\t\tconst server = await createA2aServer({\n\t\t\trunnerFactory,\n\t\t\tname,\n\t\t\tdescription: `Punch sandbox ${name}`,\n\t\t\t...(advertiseUrl ? { baseUrl: advertiseUrl } : {}),\n\t\t\t...(publicHost ? { publicHost } : {}),\n\t\t});\n\t\ttry {\n\t\t\tconst bound = await server.listen(port, host);\n\t\t\tserver.unref();\n\t\t\tconst url = advertiseUrl || bound.url;\n\t\t\tregistry.advertise({\n\t\t\t\tid: randomUUID(),\n\t\t\t\tname,\n\t\t\t\turl,\n\t\t\t\ttoken: server.authToken,\n\t\t\t\tpid: process.pid,\n\t\t\t\tcwd: process.cwd(),\n\t\t\t\tstartedAt: Date.now(),\n\t\t\t});\n\t\t\tconst timer = setInterval(() => {\n\t\t\t\ttry {\n\t\t\t\t\tregistry.heartbeat();\n\t\t\t\t} catch (err) {\n\t\t\t\t\tconsole.warn(`punch a2a heartbeat failed: ${(err as Error).message}`);\n\t\t\t\t}\n\t\t\t}, HEARTBEAT_MS);\n\t\t\ttimer.unref();\n\t\t\tconst close = async () => {\n\t\t\t\tclearInterval(timer);\n\t\t\t\tregistry.close();\n\t\t\t\tawait server.close();\n\t\t\t};\n\t\t\tconst runtime: ProcessA2a = { discovery: registry, close };\n\t\t\tprocessA2a = runtime;\n\t\t\tprocess.on(\"exit\", () => {\n\t\t\t\tregistry.close();\n\t\t\t});\n\t\t\treturn runtime;\n\t\t} catch (err) {\n\t\t\tawait server.close().catch(() => undefined);\n\t\t\tthrow err;\n\t\t}\n\t})().catch((err) => {\n\t\tprocessA2aStart = undefined;\n\t\tconsole.warn(`punch a2a discovery disabled: ${(err as Error).message}`);\n\t\treturn undefined;\n\t});\n\treturn processA2aStart;\n}\n\nexport async function stopPunchA2aListener(): Promise<void> {\n\tconst pending = processA2aStart;\n\tprocessA2aStart = undefined;\n\tconst runtime = processA2a ?? (await pending);\n\tprocessA2a = undefined;\n\tawait runtime?.close();\n}\n"]}
@@ -1 +1 @@
1
- {"version":3,"file":"a2a.d.ts","sourceRoot":"","sources":["../../../src/extensions/punch/a2a.ts"],"names":[],"mappings":"AAAA,OAAO,EACN,KAAK,aAAa,EAGlB,iBAAiB,EACjB,MAAM,gBAAgB,CAAC;AAIxB,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,gCAAgC,CAAC;AAEnE,MAAM,WAAW,sBAAsB;IACtC,GAAG,CAAC,EAAE,MAAM,CAAC,UAAU,CAAC;IACxB,SAAS,CAAC,EAAE,iBAAiB,CAAC;CAC9B;AAcD,wBAAgB,iBAAiB,CAAC,GAAG,GAAE,MAAM,CAAC,UAAwB,GAAG,OAAO,CAI/E;AAED,wBAAgB,gBAAgB,CAAC,GAAG,GAAE,MAAM,CAAC,UAAwB,GAAG,MAAM,CAI7E;AAED,wBAAgB,cAAc,CAAC,KAAK,EAAE,SAAS,aAAa,EAAE,GAAG,MAAM,CAQtE;AAID,wBAAgB,iBAAiB,CAAC,GAAG,GAAE,MAAM,CAAC,UAAwB,GAAG,iBAAiB,CAGzF;AAED,wBAAgB,UAAU,CAAC,EAAE,EAAE,YAAY,EAAE,OAAO,GAAE,sBAA2B,GAAG,IAAI,CA6DvF"}
1
+ {"version":3,"file":"a2a.d.ts","sourceRoot":"","sources":["../../../src/extensions/punch/a2a.ts"],"names":[],"mappings":"AAAA,OAAO,EACN,KAAK,aAAa,EAGlB,iBAAiB,EACjB,MAAM,gBAAgB,CAAC;AAIxB,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,gCAAgC,CAAC;AAEnE,MAAM,WAAW,sBAAsB;IACtC,GAAG,CAAC,EAAE,MAAM,CAAC,UAAU,CAAC;IACxB,SAAS,CAAC,EAAE,iBAAiB,CAAC;CAC9B;AAcD,wBAAgB,iBAAiB,CAAC,GAAG,GAAE,MAAM,CAAC,UAAwB,GAAG,OAAO,CAI/E;AAED,wBAAgB,gBAAgB,CAAC,GAAG,GAAE,MAAM,CAAC,UAAwB,GAAG,MAAM,CAI7E;AAED,wBAAgB,cAAc,CAAC,KAAK,EAAE,SAAS,aAAa,EAAE,GAAG,MAAM,CAQtE;AASD,wBAAgB,iBAAiB,CAAC,GAAG,GAAE,MAAM,CAAC,UAAwB,GAAG,iBAAiB,CAGzF;AAED,wBAAgB,UAAU,CAAC,EAAE,EAAE,YAAY,EAAE,OAAO,GAAE,sBAA2B,GAAG,IAAI,CAmEvF"}
@@ -35,6 +35,10 @@ export function formatA2aPeers(peers) {
35
35
  })
36
36
  .join("\n");
37
37
  }
38
+ function publicPeer(peer) {
39
+ const { token: _token, ...rest } = peer;
40
+ return rest;
41
+ }
38
42
  let sharedDiscovery;
39
43
  export function punchA2aDiscovery(env = process.env) {
40
44
  sharedDiscovery ??= new LocalA2aDiscovery({ dir: defaultA2aDiscoveryDir(env) });
@@ -75,7 +79,10 @@ export function installA2a(pi, options = {}) {
75
79
  async execute(_toolCallId, args, signal, onUpdate) {
76
80
  if (args.action === "list") {
77
81
  const peers = discovery.list();
78
- return { content: [{ type: "text", text: formatA2aPeers(peers) }], details: { peers } };
82
+ return {
83
+ content: [{ type: "text", text: formatA2aPeers(peers) }],
84
+ details: { peers: peers.map(publicPeer) },
85
+ };
79
86
  }
80
87
  if (!args.name?.trim())
81
88
  throw new Error("name is required to send");
@@ -84,21 +91,21 @@ export function installA2a(pi, options = {}) {
84
91
  const peer = discovery.find(args.name);
85
92
  if (!peer)
86
93
  throw new Error(`No local punch sandbox named "${args.name.trim()}"`);
87
- const result = await delegateToA2aAgentPreferStream({ url: peer.url, task: args.task, signal }, (text) => {
94
+ const result = await delegateToA2aAgentPreferStream({ url: peer.url, task: args.task, signal, token: peer.token }, (text) => {
88
95
  onUpdate?.({
89
96
  content: [{ type: "text", text }],
90
- details: { peer },
97
+ details: { peer: publicPeer(peer) },
91
98
  });
92
99
  });
93
100
  if (result.failed) {
94
101
  return {
95
102
  content: [{ type: "text", text: result.error ?? "A2A send failed" }],
96
- details: { peer, failed: true, error: result.error },
103
+ details: { peer: publicPeer(peer), failed: true, error: result.error },
97
104
  };
98
105
  }
99
106
  return {
100
107
  content: [{ type: "text", text: result.text || "(empty response)" }],
101
- details: { peer },
108
+ details: { peer: publicPeer(peer) },
102
109
  };
103
110
  },
104
111
  });
@@ -1 +1 @@
1
- {"version":3,"file":"a2a.js","sourceRoot":"","sources":["../../../src/extensions/punch/a2a.ts"],"names":[],"mappings":"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","sourcesContent":["import {\n\ttype A2aPeerRecord,\n\tdefaultA2aDiscoveryDir,\n\tdelegateToA2aAgentPreferStream,\n\tLocalA2aDiscovery,\n} from \"@punch-bot/a2a\";\nimport type { AgentMessage } from \"@punch-bot/agent\";\nimport { Type } from \"typebox\";\n\nimport type { ExtensionAPI } from \"../../core/extensions/types.ts\";\n\nexport interface InstallPunchA2aOptions {\n\tenv?: NodeJS.ProcessEnv;\n\tdiscovery?: LocalA2aDiscovery;\n}\n\nfunction isTruthy(value: string | undefined): boolean {\n\tif (!value) return false;\n\tconst normalized = value.toLowerCase();\n\treturn value === \"1\" || normalized === \"true\" || normalized === \"yes\";\n}\n\nfunction isDisabled(value: string | undefined): boolean {\n\tif (!value) return false;\n\tconst normalized = value.toLowerCase();\n\treturn value === \"0\" || normalized === \"false\" || normalized === \"no\";\n}\n\nexport function isPunchA2aEnabled(env: NodeJS.ProcessEnv = process.env): boolean {\n\tif (isDisabled(env.PUNCH_A2A)) return false;\n\tif (isTruthy(env.PUNCH_A2A)) return true;\n\treturn Boolean(env.SANDBOX_NAME?.trim());\n}\n\nexport function punchSandboxName(env: NodeJS.ProcessEnv = process.env): string {\n\tconst named = env.SANDBOX_NAME || env.PI_SERVER_USERNAME || env.OPENCODE_SERVER_USERNAME;\n\tif (named?.trim()) return named.trim();\n\treturn `pi-${process.pid}`;\n}\n\nexport function formatA2aPeers(peers: readonly A2aPeerRecord[]): string {\n\tif (peers.length === 0) return \"No other punch sandboxes discovered on this machine.\";\n\treturn peers\n\t\t.map((peer) => {\n\t\t\tconst cwd = peer.cwd ? ` cwd=${peer.cwd}` : \"\";\n\t\t\treturn `${peer.name} ${peer.url}${cwd}`;\n\t\t})\n\t\t.join(\"\\n\");\n}\n\nlet sharedDiscovery: LocalA2aDiscovery | undefined;\n\nexport function punchA2aDiscovery(env: NodeJS.ProcessEnv = process.env): LocalA2aDiscovery {\n\tsharedDiscovery ??= new LocalA2aDiscovery({ dir: defaultA2aDiscoveryDir(env) });\n\treturn sharedDiscovery;\n}\n\nexport function installA2a(pi: ExtensionAPI, options: InstallPunchA2aOptions = {}): void {\n\tconst env = options.env ?? process.env;\n\tif (!isPunchA2aEnabled(env)) return;\n\n\tconst discovery = options.discovery ?? punchA2aDiscovery(env);\n\n\tpi.on(\"context\", (event) => {\n\t\tconst peers = discovery.list();\n\t\tif (peers.length === 0) return;\n\t\tconst message: AgentMessage = {\n\t\t\trole: \"custom\",\n\t\t\tcustomType: \"punch-a2a-peers\",\n\t\t\tcontent: `Local punch sandboxes reachable over A2A:\\n${formatA2aPeers(peers)}`,\n\t\t\tdisplay: false,\n\t\t\ttimestamp: Date.now(),\n\t\t};\n\t\treturn { messages: [...event.messages, message] };\n\t});\n\n\tpi.registerTool({\n\t\tname: \"a2a\",\n\t\tlabel: \"Punch A2A\",\n\t\tdescription:\n\t\t\t\"Discover and message other punch sandboxes on this machine over A2A. Use list to see peers, send to delegate a task by sandbox name.\",\n\t\tpromptSnippet: \"Talk to other local punch sandboxes over A2A\",\n\t\tpromptGuidelines: [\n\t\t\t\"Use a2a with action=list to see punch sandboxes on this machine.\",\n\t\t\t\"Use a2a with action=send to ask a named local sandbox to do work.\",\n\t\t],\n\t\tparameters: Type.Object({\n\t\t\taction: Type.Union([Type.Literal(\"list\"), Type.Literal(\"send\")]),\n\t\t\tname: Type.Optional(Type.String({ description: \"Sandbox name, for send\" })),\n\t\t\ttask: Type.Optional(Type.String({ description: \"Work to send to the peer sandbox\" })),\n\t\t}),\n\t\tasync execute(_toolCallId, args, signal, onUpdate) {\n\t\t\tif (args.action === \"list\") {\n\t\t\t\tconst peers = discovery.list();\n\t\t\t\treturn { content: [{ type: \"text\", text: formatA2aPeers(peers) }], details: { peers } };\n\t\t\t}\n\t\t\tif (!args.name?.trim()) throw new Error(\"name is required to send\");\n\t\t\tif (!args.task?.trim()) throw new Error(\"task is required to send\");\n\t\t\tconst peer = discovery.find(args.name);\n\t\t\tif (!peer) throw new Error(`No local punch sandbox named \"${args.name.trim()}\"`);\n\t\t\tconst result = await delegateToA2aAgentPreferStream({ url: peer.url, task: args.task, signal }, (text) => {\n\t\t\t\tonUpdate?.({\n\t\t\t\t\tcontent: [{ type: \"text\", text }],\n\t\t\t\t\tdetails: { peer },\n\t\t\t\t});\n\t\t\t});\n\t\t\tif (result.failed) {\n\t\t\t\treturn {\n\t\t\t\t\tcontent: [{ type: \"text\", text: result.error ?? \"A2A send failed\" }],\n\t\t\t\t\tdetails: { peer, failed: true, error: result.error },\n\t\t\t\t};\n\t\t\t}\n\t\t\treturn {\n\t\t\t\tcontent: [{ type: \"text\", text: result.text || \"(empty response)\" }],\n\t\t\t\tdetails: { peer },\n\t\t\t};\n\t\t},\n\t});\n}\n"]}
1
+ {"version":3,"file":"a2a.js","sourceRoot":"","sources":["../../../src/extensions/punch/a2a.ts"],"names":[],"mappings":"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","sourcesContent":["import {\n\ttype A2aPeerRecord,\n\tdefaultA2aDiscoveryDir,\n\tdelegateToA2aAgentPreferStream,\n\tLocalA2aDiscovery,\n} from \"@punch-bot/a2a\";\nimport type { AgentMessage } from \"@punch-bot/agent\";\nimport { Type } from \"typebox\";\n\nimport type { ExtensionAPI } from \"../../core/extensions/types.ts\";\n\nexport interface InstallPunchA2aOptions {\n\tenv?: NodeJS.ProcessEnv;\n\tdiscovery?: LocalA2aDiscovery;\n}\n\nfunction isTruthy(value: string | undefined): boolean {\n\tif (!value) return false;\n\tconst normalized = value.toLowerCase();\n\treturn value === \"1\" || normalized === \"true\" || normalized === \"yes\";\n}\n\nfunction isDisabled(value: string | undefined): boolean {\n\tif (!value) return false;\n\tconst normalized = value.toLowerCase();\n\treturn value === \"0\" || normalized === \"false\" || normalized === \"no\";\n}\n\nexport function isPunchA2aEnabled(env: NodeJS.ProcessEnv = process.env): boolean {\n\tif (isDisabled(env.PUNCH_A2A)) return false;\n\tif (isTruthy(env.PUNCH_A2A)) return true;\n\treturn Boolean(env.SANDBOX_NAME?.trim());\n}\n\nexport function punchSandboxName(env: NodeJS.ProcessEnv = process.env): string {\n\tconst named = env.SANDBOX_NAME || env.PI_SERVER_USERNAME || env.OPENCODE_SERVER_USERNAME;\n\tif (named?.trim()) return named.trim();\n\treturn `pi-${process.pid}`;\n}\n\nexport function formatA2aPeers(peers: readonly A2aPeerRecord[]): string {\n\tif (peers.length === 0) return \"No other punch sandboxes discovered on this machine.\";\n\treturn peers\n\t\t.map((peer) => {\n\t\t\tconst cwd = peer.cwd ? ` cwd=${peer.cwd}` : \"\";\n\t\t\treturn `${peer.name} ${peer.url}${cwd}`;\n\t\t})\n\t\t.join(\"\\n\");\n}\n\nfunction publicPeer(peer: A2aPeerRecord): Omit<A2aPeerRecord, \"token\"> {\n\tconst { token: _token, ...rest } = peer;\n\treturn rest;\n}\n\nlet sharedDiscovery: LocalA2aDiscovery | undefined;\n\nexport function punchA2aDiscovery(env: NodeJS.ProcessEnv = process.env): LocalA2aDiscovery {\n\tsharedDiscovery ??= new LocalA2aDiscovery({ dir: defaultA2aDiscoveryDir(env) });\n\treturn sharedDiscovery;\n}\n\nexport function installA2a(pi: ExtensionAPI, options: InstallPunchA2aOptions = {}): void {\n\tconst env = options.env ?? process.env;\n\tif (!isPunchA2aEnabled(env)) return;\n\n\tconst discovery = options.discovery ?? punchA2aDiscovery(env);\n\n\tpi.on(\"context\", (event) => {\n\t\tconst peers = discovery.list();\n\t\tif (peers.length === 0) return;\n\t\tconst message: AgentMessage = {\n\t\t\trole: \"custom\",\n\t\t\tcustomType: \"punch-a2a-peers\",\n\t\t\tcontent: `Local punch sandboxes reachable over A2A:\\n${formatA2aPeers(peers)}`,\n\t\t\tdisplay: false,\n\t\t\ttimestamp: Date.now(),\n\t\t};\n\t\treturn { messages: [...event.messages, message] };\n\t});\n\n\tpi.registerTool({\n\t\tname: \"a2a\",\n\t\tlabel: \"Punch A2A\",\n\t\tdescription:\n\t\t\t\"Discover and message other punch sandboxes on this machine over A2A. Use list to see peers, send to delegate a task by sandbox name.\",\n\t\tpromptSnippet: \"Talk to other local punch sandboxes over A2A\",\n\t\tpromptGuidelines: [\n\t\t\t\"Use a2a with action=list to see punch sandboxes on this machine.\",\n\t\t\t\"Use a2a with action=send to ask a named local sandbox to do work.\",\n\t\t],\n\t\tparameters: Type.Object({\n\t\t\taction: Type.Union([Type.Literal(\"list\"), Type.Literal(\"send\")]),\n\t\t\tname: Type.Optional(Type.String({ description: \"Sandbox name, for send\" })),\n\t\t\ttask: Type.Optional(Type.String({ description: \"Work to send to the peer sandbox\" })),\n\t\t}),\n\t\tasync execute(_toolCallId, args, signal, onUpdate) {\n\t\t\tif (args.action === \"list\") {\n\t\t\t\tconst peers = discovery.list();\n\t\t\t\treturn {\n\t\t\t\t\tcontent: [{ type: \"text\", text: formatA2aPeers(peers) }],\n\t\t\t\t\tdetails: { peers: peers.map(publicPeer) },\n\t\t\t\t};\n\t\t\t}\n\t\t\tif (!args.name?.trim()) throw new Error(\"name is required to send\");\n\t\t\tif (!args.task?.trim()) throw new Error(\"task is required to send\");\n\t\t\tconst peer = discovery.find(args.name);\n\t\t\tif (!peer) throw new Error(`No local punch sandbox named \"${args.name.trim()}\"`);\n\t\t\tconst result = await delegateToA2aAgentPreferStream(\n\t\t\t\t{ url: peer.url, task: args.task, signal, token: peer.token },\n\t\t\t\t(text) => {\n\t\t\t\t\tonUpdate?.({\n\t\t\t\t\t\tcontent: [{ type: \"text\", text }],\n\t\t\t\t\t\tdetails: { peer: publicPeer(peer) },\n\t\t\t\t\t});\n\t\t\t\t},\n\t\t\t);\n\t\t\tif (result.failed) {\n\t\t\t\treturn {\n\t\t\t\t\tcontent: [{ type: \"text\", text: result.error ?? \"A2A send failed\" }],\n\t\t\t\t\tdetails: { peer: publicPeer(peer), failed: true, error: result.error },\n\t\t\t\t};\n\t\t\t}\n\t\t\treturn {\n\t\t\t\tcontent: [{ type: \"text\", text: result.text || \"(empty response)\" }],\n\t\t\t\tdetails: { peer: publicPeer(peer) },\n\t\t\t};\n\t\t},\n\t});\n}\n"]}
@@ -2,6 +2,9 @@ import type { IncomingMessage } from "node:http";
2
2
  declare function isAuthConfigured(): boolean;
3
3
  declare function getAuthHeader(): string | null;
4
4
  declare function isSandboxOwner(actor: string): boolean;
5
+ declare function configuredUserName(name: string): string | null;
6
+ /** Directory a user may share through collabs: the sandbox owner gets the workspace root, other users only their `workspace` from users.json. */
7
+ declare function userWorkspaceRoot(actor: string): string | null;
5
8
  declare function issueToken(userId: string, scope?: string): {
6
9
  token: string;
7
10
  expiresAt: number;
@@ -9,5 +12,5 @@ declare function issueToken(userId: string, scope?: string): {
9
12
  declare function verifyToken(token: string): string | null;
10
13
  declare function authenticateBasic(req: IncomingMessage): string;
11
14
  declare function authenticate(req: IncomingMessage): string;
12
- export { authenticate, authenticateBasic, getAuthHeader, isAuthConfigured, isSandboxOwner, issueToken, verifyToken };
15
+ export { authenticate, authenticateBasic, configuredUserName, getAuthHeader, isAuthConfigured, isSandboxOwner, issueToken, userWorkspaceRoot, verifyToken, };
13
16
  //# sourceMappingURL=auth.d.ts.map
@@ -1 +1 @@
1
- {"version":3,"file":"auth.d.ts","sourceRoot":"","sources":["../../../src/extensions/punch/auth.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,WAAW,CAAC;AA+EjD,iBAAS,gBAAgB,IAAI,OAAO,CAEnC;AAED,iBAAS,aAAa,IAAI,MAAM,GAAG,IAAI,CAItC;AAED,iBAAS,cAAc,CAAC,KAAK,EAAE,MAAM,GAAG,OAAO,CAG9C;AA4BD,iBAAS,UAAU,CAAC,MAAM,EAAE,MAAM,EAAE,KAAK,SAAY,GAAG;IAAE,KAAK,EAAE,MAAM,CAAC;IAAC,SAAS,EAAE,MAAM,CAAA;CAAE,CAM3F;AAED,iBAAS,WAAW,CAAC,KAAK,EAAE,MAAM,GAAG,MAAM,GAAG,IAAI,CAKjD;AAED,iBAAS,iBAAiB,CAAC,GAAG,EAAE,eAAe,GAAG,MAAM,CAIvD;AAED,iBAAS,YAAY,CAAC,GAAG,EAAE,eAAe,GAAG,MAAM,CAWlD;AAED,OAAO,EAAE,YAAY,EAAE,iBAAiB,EAAE,aAAa,EAAE,gBAAgB,EAAE,cAAc,EAAE,UAAU,EAAE,WAAW,EAAE,CAAC"}
1
+ {"version":3,"file":"auth.d.ts","sourceRoot":"","sources":["../../../src/extensions/punch/auth.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,WAAW,CAAC;AAkFjD,iBAAS,gBAAgB,IAAI,OAAO,CAEnC;AAED,iBAAS,aAAa,IAAI,MAAM,GAAG,IAAI,CAItC;AAED,iBAAS,cAAc,CAAC,KAAK,EAAE,MAAM,GAAG,OAAO,CAG9C;AAED,iBAAS,kBAAkB,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM,GAAG,IAAI,CAGvD;AAED,iJAAiJ;AACjJ,iBAAS,iBAAiB,CAAC,KAAK,EAAE,MAAM,GAAG,MAAM,GAAG,IAAI,CAQvD;AA4BD,iBAAS,UAAU,CAAC,MAAM,EAAE,MAAM,EAAE,KAAK,SAAY,GAAG;IAAE,KAAK,EAAE,MAAM,CAAC;IAAC,SAAS,EAAE,MAAM,CAAA;CAAE,CAM3F;AAED,iBAAS,WAAW,CAAC,KAAK,EAAE,MAAM,GAAG,MAAM,GAAG,IAAI,CAKjD;AAED,iBAAS,iBAAiB,CAAC,GAAG,EAAE,eAAe,GAAG,MAAM,CAIvD;AAED,iBAAS,YAAY,CAAC,GAAG,EAAE,eAAe,GAAG,MAAM,CAWlD;AAED,OAAO,EACN,YAAY,EACZ,iBAAiB,EACjB,kBAAkB,EAClB,aAAa,EACb,gBAAgB,EAChB,cAAc,EACd,UAAU,EACV,iBAAiB,EACjB,WAAW,GACX,CAAC"}
@@ -45,7 +45,8 @@ function loadUsers() {
45
45
  user.password.length > 0) {
46
46
  if (user.name.includes(":"))
47
47
  continue;
48
- users.push({ name: user.name, password: user.password });
48
+ const workspace = typeof user.workspace === "string" && path.isAbsolute(user.workspace) ? user.workspace : undefined;
49
+ users.push({ name: user.name, password: user.password, workspace });
49
50
  }
50
51
  }
51
52
  }
@@ -76,6 +77,20 @@ function isSandboxOwner(actor) {
76
77
  const owner = loadUsers()[0];
77
78
  return owner !== undefined && owner.name.toLowerCase() === actor.toLowerCase();
78
79
  }
80
+ function configuredUserName(name) {
81
+ const lowered = name.toLowerCase();
82
+ return loadUsers().find((u) => u.name.toLowerCase() === lowered)?.name ?? null;
83
+ }
84
+ /** Directory a user may share through collabs: the sandbox owner gets the workspace root, other users only their `workspace` from users.json. */
85
+ function userWorkspaceRoot(actor) {
86
+ const users = loadUsers();
87
+ const owner = users[0];
88
+ if (owner && owner.name.toLowerCase() === actor.toLowerCase()) {
89
+ return path.resolve(process.env.PI_WORKSPACE_ROOT || process.cwd());
90
+ }
91
+ const user = users.find((u) => u.name.toLowerCase() === actor.toLowerCase());
92
+ return user?.workspace ? path.resolve(user.workspace) : null;
93
+ }
79
94
  function verifyBasic(header) {
80
95
  const match = /^Basic\s+(.+)$/i.exec(header ?? "");
81
96
  if (!match)
@@ -135,5 +150,5 @@ function authenticate(req) {
135
150
  throw new Error("Unauthorized");
136
151
  return userId;
137
152
  }
138
- export { authenticate, authenticateBasic, getAuthHeader, isAuthConfigured, isSandboxOwner, issueToken, verifyToken };
153
+ export { authenticate, authenticateBasic, configuredUserName, getAuthHeader, isAuthConfigured, isSandboxOwner, issueToken, userWorkspaceRoot, verifyToken, };
139
154
  //# sourceMappingURL=auth.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"auth.js","sourceRoot":"","sources":["../../../src/extensions/punch/auth.ts"],"names":[],"mappings":"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","sourcesContent":["import { createHash, randomBytes, timingSafeEqual } from \"node:crypto\";\nimport { readFileSync, statSync } from \"node:fs\";\nimport type { IncomingMessage } from \"node:http\";\nimport * as path from \"node:path\";\n\ninterface TokenRecord {\n\tuserId: string;\n\tscope: string;\n\texpiresAt: number;\n}\n\ninterface UserRecord {\n\tname: string;\n\tpassword: string;\n}\n\nconst DEFAULT_USER = \"opencode\";\nconst ttlSecs = Number(process.env.PI_OAUTH_TOKEN_TTL);\nconst TOKEN_TTL_MS = (Number.isFinite(ttlSecs) && ttlSecs > 0 ? ttlSecs : 3600) * 1000;\n\nconst tokens = new Map<string, TokenRecord>();\n\nlet cachedUsers: UserRecord[] | undefined;\nlet cachedUsersMtimeMs = -1;\n\nfunction defaultUser(): string {\n\treturn process.env.PI_SERVER_USERNAME || process.env.OPENCODE_SERVER_USERNAME || DEFAULT_USER;\n}\n\nfunction usersFile(): string {\n\treturn path.join(process.cwd(), \".pi\", \"users.json\");\n}\n\nfunction digest(value: string): Buffer {\n\treturn createHash(\"sha256\").update(value).digest();\n}\n\nfunction loadUsers(): UserRecord[] {\n\tconst file = usersFile();\n\tlet mtimeMs = -1;\n\ttry {\n\t\tmtimeMs = statSync(file).mtimeMs;\n\t} catch {}\n\tif (cachedUsers && cachedUsersMtimeMs === mtimeMs) return cachedUsers;\n\tconst users: UserRecord[] = [];\n\tconst password = process.env.PI_SERVER_PASSWORD || process.env.OPENCODE_SERVER_PASSWORD || \"\";\n\tif (password) {\n\t\tconst name = defaultUser();\n\t\tif (name.includes(\":\")) throw new Error(\"PI_SERVER_USERNAME must not contain ':'\");\n\t\tusers.push({ name, password });\n\t}\n\ttry {\n\t\tconst parsed = JSON.parse(readFileSync(file, \"utf8\")) as unknown;\n\t\tif (Array.isArray(parsed)) {\n\t\t\tfor (const entry of parsed) {\n\t\t\t\tif (entry && typeof entry === \"object\") {\n\t\t\t\t\tconst user = entry as Partial<UserRecord>;\n\t\t\t\t\tif (\n\t\t\t\t\t\ttypeof user.name === \"string\" &&\n\t\t\t\t\t\tuser.name.length > 0 &&\n\t\t\t\t\t\ttypeof user.password === \"string\" &&\n\t\t\t\t\t\tuser.password.length > 0\n\t\t\t\t\t) {\n\t\t\t\t\t\tif (user.name.includes(\":\")) continue;\n\t\t\t\t\t\tusers.push({ name: user.name, password: user.password });\n\t\t\t\t\t}\n\t\t\t\t}\n\t\t\t}\n\t\t}\n\t} catch {}\n\tconst seen = new Set<string>();\n\tfor (const user of users) {\n\t\tconst key = user.name.toLowerCase();\n\t\tif (seen.has(key)) throw new Error(`Duplicate punch user name (case-insensitive): ${user.name}`);\n\t\tseen.add(key);\n\t}\n\tcachedUsers = users;\n\tcachedUsersMtimeMs = mtimeMs;\n\treturn users;\n}\n\nfunction isAuthConfigured(): boolean {\n\treturn loadUsers().length > 0;\n}\n\nfunction getAuthHeader(): string | null {\n\tconst user = loadUsers()[0];\n\tif (!user) return null;\n\treturn `Basic ${Buffer.from(`${user.name}:${user.password}`).toString(\"base64\")}`;\n}\n\nfunction isSandboxOwner(actor: string): boolean {\n\tconst owner = loadUsers()[0];\n\treturn owner !== undefined && owner.name.toLowerCase() === actor.toLowerCase();\n}\n\nfunction verifyBasic(header: string | undefined): string | null {\n\tconst match = /^Basic\\s+(.+)$/i.exec(header ?? \"\");\n\tif (!match) return null;\n\tconst [username, ...rest] = Buffer.from(match[1], \"base64\").toString(\"utf8\").split(\":\");\n\tconst password = rest.join(\":\");\n\tconst users = loadUsers();\n\tconst lowered = username.toLowerCase();\n\tconst user = users.find(\n\t\t(u) =>\n\t\t\tu.name.toLowerCase() === lowered ||\n\t\t\t(lowered === DEFAULT_USER.toLowerCase() && u.name.toLowerCase() === defaultUser().toLowerCase()),\n\t);\n\tif (!user) return null;\n\tconst provided = digest(password);\n\tconst expected = digest(user.password);\n\tif (provided.length !== expected.length || !timingSafeEqual(provided, expected)) return null;\n\treturn user.name;\n}\n\nfunction pruneTokens(): void {\n\tconst now = Date.now();\n\tfor (const [token, record] of tokens) {\n\t\tif (record.expiresAt <= now) tokens.delete(token);\n\t}\n}\n\nfunction issueToken(userId: string, scope = \"sandbox\"): { token: string; expiresAt: number } {\n\tpruneTokens();\n\tconst token = randomBytes(32).toString(\"base64url\");\n\tconst expiresAt = Date.now() + TOKEN_TTL_MS;\n\ttokens.set(token, { userId, scope, expiresAt });\n\treturn { token, expiresAt };\n}\n\nfunction verifyToken(token: string): string | null {\n\tpruneTokens();\n\tconst record = tokens.get(token);\n\tif (!record || record.expiresAt <= Date.now()) return null;\n\treturn record.userId;\n}\n\nfunction authenticateBasic(req: IncomingMessage): string {\n\tconst userId = verifyBasic(req.headers.authorization ?? \"\");\n\tif (!userId) throw new Error(\"Unauthorized\");\n\treturn userId;\n}\n\nfunction authenticate(req: IncomingMessage): string {\n\tconst header = req.headers.authorization ?? \"\";\n\tconst bearerMatch = /^Bearer\\s+(.+)$/i.exec(header);\n\tif (bearerMatch) {\n\t\tconst userId = verifyToken(bearerMatch[1].trim());\n\t\tif (userId) return userId;\n\t\tthrow new Error(\"Unauthorized\");\n\t}\n\tconst userId = verifyBasic(header);\n\tif (!userId) throw new Error(\"Unauthorized\");\n\treturn userId;\n}\n\nexport { authenticate, authenticateBasic, getAuthHeader, isAuthConfigured, isSandboxOwner, issueToken, verifyToken };\n"]}
1
+ {"version":3,"file":"auth.js","sourceRoot":"","sources":["../../../src/extensions/punch/auth.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,WAAW,EAAE,eAAe,EAAE,MAAM,aAAa,CAAC;AACvE,OAAO,EAAE,YAAY,EAAE,QAAQ,EAAE,MAAM,SAAS,CAAC;AAEjD,OAAO,KAAK,IAAI,MAAM,WAAW,CAAC;AAclC,MAAM,YAAY,GAAG,UAAU,CAAC;AAChC,MAAM,OAAO,GAAG,MAAM,CAAC,OAAO,CAAC,GAAG,CAAC,kBAAkB,CAAC,CAAC;AACvD,MAAM,YAAY,GAAG,CAAC,MAAM,CAAC,QAAQ,CAAC,OAAO,CAAC,IAAI,OAAO,GAAG,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,IAAI,CAAC,GAAG,IAAI,CAAC;AAEvF,MAAM,MAAM,GAAG,IAAI,GAAG,EAAuB,CAAC;AAE9C,IAAI,WAAqC,CAAC;AAC1C,IAAI,kBAAkB,GAAG,CAAC,CAAC,CAAC;AAE5B,SAAS,WAAW;IACnB,OAAO,OAAO,CAAC,GAAG,CAAC,kBAAkB,IAAI,OAAO,CAAC,GAAG,CAAC,wBAAwB,IAAI,YAAY,CAAC;AAC/F,CAAC;AAED,SAAS,SAAS;IACjB,OAAO,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,GAAG,EAAE,EAAE,KAAK,EAAE,YAAY,CAAC,CAAC;AACtD,CAAC;AAED,SAAS,MAAM,CAAC,KAAa;IAC5B,OAAO,UAAU,CAAC,QAAQ,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,MAAM,EAAE,CAAC;AACpD,CAAC;AAED,SAAS,SAAS;IACjB,MAAM,IAAI,GAAG,SAAS,EAAE,CAAC;IACzB,IAAI,OAAO,GAAG,CAAC,CAAC,CAAC;IACjB,IAAI,CAAC;QACJ,OAAO,GAAG,QAAQ,CAAC,IAAI,CAAC,CAAC,OAAO,CAAC;IAClC,CAAC;IAAC,MAAM,CAAC,CAAA,CAAC;IACV,IAAI,WAAW,IAAI,kBAAkB,KAAK,OAAO;QAAE,OAAO,WAAW,CAAC;IACtE,MAAM,KAAK,GAAiB,EAAE,CAAC;IAC/B,MAAM,QAAQ,GAAG,OAAO,CAAC,GAAG,CAAC,kBAAkB,IAAI,OAAO,CAAC,GAAG,CAAC,wBAAwB,IAAI,EAAE,CAAC;IAC9F,IAAI,QAAQ,EAAE,CAAC;QACd,MAAM,IAAI,GAAG,WAAW,EAAE,CAAC;QAC3B,IAAI,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC;YAAE,MAAM,IAAI,KAAK,CAAC,yCAAyC,CAAC,CAAC;QACnF,KAAK,CAAC,IAAI,CAAC,EAAE,IAAI,EAAE,QAAQ,EAAE,CAAC,CAAC;IAChC,CAAC;IACD,IAAI,CAAC;QACJ,MAAM,MAAM,GAAG,IAAI,CAAC,KAAK,CAAC,YAAY,CAAC,IAAI,EAAE,MAAM,CAAC,CAAY,CAAC;QACjE,IAAI,KAAK,CAAC,OAAO,CAAC,MAAM,CAAC,EAAE,CAAC;YAC3B,KAAK,MAAM,KAAK,IAAI,MAAM,EAAE,CAAC;gBAC5B,IAAI,KAAK,IAAI,OAAO,KAAK,KAAK,QAAQ,EAAE,CAAC;oBACxC,MAAM,IAAI,GAAG,KAA4B,CAAC;oBAC1C,IACC,OAAO,IAAI,CAAC,IAAI,KAAK,QAAQ;wBAC7B,IAAI,CAAC,IAAI,CAAC,MAAM,GAAG,CAAC;wBACpB,OAAO,IAAI,CAAC,QAAQ,KAAK,QAAQ;wBACjC,IAAI,CAAC,QAAQ,CAAC,MAAM,GAAG,CAAC,EACvB,CAAC;wBACF,IAAI,IAAI,CAAC,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC;4BAAE,SAAS;wBACtC,MAAM,SAAS,GACd,OAAO,IAAI,CAAC,SAAS,KAAK,QAAQ,IAAI,IAAI,CAAC,UAAU,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC,CAAC,SAAS,CAAC;wBACpG,KAAK,CAAC,IAAI,CAAC,EAAE,IAAI,EAAE,IAAI,CAAC,IAAI,EAAE,QAAQ,EAAE,IAAI,CAAC,QAAQ,EAAE,SAAS,EAAE,CAAC,CAAC;oBACrE,CAAC;gBACF,CAAC;YACF,CAAC;QACF,CAAC;IACF,CAAC;IAAC,MAAM,CAAC,CAAA,CAAC;IACV,MAAM,IAAI,GAAG,IAAI,GAAG,EAAU,CAAC;IAC/B,KAAK,MAAM,IAAI,IAAI,KAAK,EAAE,CAAC;QAC1B,MAAM,GAAG,GAAG,IAAI,CAAC,IAAI,CAAC,WAAW,EAAE,CAAC;QACpC,IAAI,IAAI,CAAC,GAAG,CAAC,GAAG,CAAC;YAAE,MAAM,IAAI,KAAK,CAAC,iDAAiD,IAAI,CAAC,IAAI,EAAE,CAAC,CAAC;QACjG,IAAI,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC;IACf,CAAC;IACD,WAAW,GAAG,KAAK,CAAC;IACpB,kBAAkB,GAAG,OAAO,CAAC;IAC7B,OAAO,KAAK,CAAC;AACd,CAAC;AAED,SAAS,gBAAgB;IACxB,OAAO,SAAS,EAAE,CAAC,MAAM,GAAG,CAAC,CAAC;AAC/B,CAAC;AAED,SAAS,aAAa;IACrB,MAAM,IAAI,GAAG,SAAS,EAAE,CAAC,CAAC,CAAC,CAAC;IAC5B,IAAI,CAAC,IAAI;QAAE,OAAO,IAAI,CAAC;IACvB,OAAO,SAAS,MAAM,CAAC,IAAI,CAAC,GAAG,IAAI,CAAC,IAAI,IAAI,IAAI,CAAC,QAAQ,EAAE,CAAC,CAAC,QAAQ,CAAC,QAAQ,CAAC,EAAE,CAAC;AACnF,CAAC;AAED,SAAS,cAAc,CAAC,KAAa;IACpC,MAAM,KAAK,GAAG,SAAS,EAAE,CAAC,CAAC,CAAC,CAAC;IAC7B,OAAO,KAAK,KAAK,SAAS,IAAI,KAAK,CAAC,IAAI,CAAC,WAAW,EAAE,KAAK,KAAK,CAAC,WAAW,EAAE,CAAC;AAChF,CAAC;AAED,SAAS,kBAAkB,CAAC,IAAY;IACvC,MAAM,OAAO,GAAG,IAAI,CAAC,WAAW,EAAE,CAAC;IACnC,OAAO,SAAS,EAAE,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,WAAW,EAAE,KAAK,OAAO,CAAC,EAAE,IAAI,IAAI,IAAI,CAAC;AAChF,CAAC;AAED,iJAAiJ;AACjJ,SAAS,iBAAiB,CAAC,KAAa;IACvC,MAAM,KAAK,GAAG,SAAS,EAAE,CAAC;IAC1B,MAAM,KAAK,GAAG,KAAK,CAAC,CAAC,CAAC,CAAC;IACvB,IAAI,KAAK,IAAI,KAAK,CAAC,IAAI,CAAC,WAAW,EAAE,KAAK,KAAK,CAAC,WAAW,EAAE,EAAE,CAAC;QAC/D,OAAO,IAAI,CAAC,OAAO,CAAC,OAAO,CAAC,GAAG,CAAC,iBAAiB,IAAI,OAAO,CAAC,GAAG,EAAE,CAAC,CAAC;IACrE,CAAC;IACD,MAAM,IAAI,GAAG,KAAK,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,WAAW,EAAE,KAAK,KAAK,CAAC,WAAW,EAAE,CAAC,CAAC;IAC7E,OAAO,IAAI,EAAE,SAAS,CAAC,CAAC,CAAC,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC;AAC9D,CAAC;AAED,SAAS,WAAW,CAAC,MAA0B;IAC9C,MAAM,KAAK,GAAG,iBAAiB,CAAC,IAAI,CAAC,MAAM,IAAI,EAAE,CAAC,CAAC;IACnD,IAAI,CAAC,KAAK;QAAE,OAAO,IAAI,CAAC;IACxB,MAAM,CAAC,QAAQ,EAAE,GAAG,IAAI,CAAC,GAAG,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,EAAE,QAAQ,CAAC,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;IACxF,MAAM,QAAQ,GAAG,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;IAChC,MAAM,KAAK,GAAG,SAAS,EAAE,CAAC;IAC1B,MAAM,OAAO,GAAG,QAAQ,CAAC,WAAW,EAAE,CAAC;IACvC,MAAM,IAAI,GAAG,KAAK,CAAC,IAAI,CACtB,CAAC,CAAC,EAAE,EAAE,CACL,CAAC,CAAC,IAAI,CAAC,WAAW,EAAE,KAAK,OAAO;QAChC,CAAC,OAAO,KAAK,YAAY,CAAC,WAAW,EAAE,IAAI,CAAC,CAAC,IAAI,CAAC,WAAW,EAAE,KAAK,WAAW,EAAE,CAAC,WAAW,EAAE,CAAC,CACjG,CAAC;IACF,IAAI,CAAC,IAAI;QAAE,OAAO,IAAI,CAAC;IACvB,MAAM,QAAQ,GAAG,MAAM,CAAC,QAAQ,CAAC,CAAC;IAClC,MAAM,QAAQ,GAAG,MAAM,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;IACvC,IAAI,QAAQ,CAAC,MAAM,KAAK,QAAQ,CAAC,MAAM,IAAI,CAAC,eAAe,CAAC,QAAQ,EAAE,QAAQ,CAAC;QAAE,OAAO,IAAI,CAAC;IAC7F,OAAO,IAAI,CAAC,IAAI,CAAC;AAClB,CAAC;AAED,SAAS,WAAW;IACnB,MAAM,GAAG,GAAG,IAAI,CAAC,GAAG,EAAE,CAAC;IACvB,KAAK,MAAM,CAAC,KAAK,EAAE,MAAM,CAAC,IAAI,MAAM,EAAE,CAAC;QACtC,IAAI,MAAM,CAAC,SAAS,IAAI,GAAG;YAAE,MAAM,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC;IACnD,CAAC;AACF,CAAC;AAED,SAAS,UAAU,CAAC,MAAc,EAAE,KAAK,GAAG,SAAS;IACpD,WAAW,EAAE,CAAC;IACd,MAAM,KAAK,GAAG,WAAW,CAAC,EAAE,CAAC,CAAC,QAAQ,CAAC,WAAW,CAAC,CAAC;IACpD,MAAM,SAAS,GAAG,IAAI,CAAC,GAAG,EAAE,GAAG,YAAY,CAAC;IAC5C,MAAM,CAAC,GAAG,CAAC,KAAK,EAAE,EAAE,MAAM,EAAE,KAAK,EAAE,SAAS,EAAE,CAAC,CAAC;IAChD,OAAO,EAAE,KAAK,EAAE,SAAS,EAAE,CAAC;AAC7B,CAAC;AAED,SAAS,WAAW,CAAC,KAAa;IACjC,WAAW,EAAE,CAAC;IACd,MAAM,MAAM,GAAG,MAAM,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC;IACjC,IAAI,CAAC,MAAM,IAAI,MAAM,CAAC,SAAS,IAAI,IAAI,CAAC,GAAG,EAAE;QAAE,OAAO,IAAI,CAAC;IAC3D,OAAO,MAAM,CAAC,MAAM,CAAC;AACtB,CAAC;AAED,SAAS,iBAAiB,CAAC,GAAoB;IAC9C,MAAM,MAAM,GAAG,WAAW,CAAC,GAAG,CAAC,OAAO,CAAC,aAAa,IAAI,EAAE,CAAC,CAAC;IAC5D,IAAI,CAAC,MAAM;QAAE,MAAM,IAAI,KAAK,CAAC,cAAc,CAAC,CAAC;IAC7C,OAAO,MAAM,CAAC;AACf,CAAC;AAED,SAAS,YAAY,CAAC,GAAoB;IACzC,MAAM,MAAM,GAAG,GAAG,CAAC,OAAO,CAAC,aAAa,IAAI,EAAE,CAAC;IAC/C,MAAM,WAAW,GAAG,kBAAkB,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;IACpD,IAAI,WAAW,EAAE,CAAC;QACjB,MAAM,MAAM,GAAG,WAAW,CAAC,WAAW,CAAC,CAAC,CAAC,CAAC,IAAI,EAAE,CAAC,CAAC;QAClD,IAAI,MAAM;YAAE,OAAO,MAAM,CAAC;QAC1B,MAAM,IAAI,KAAK,CAAC,cAAc,CAAC,CAAC;IACjC,CAAC;IACD,MAAM,MAAM,GAAG,WAAW,CAAC,MAAM,CAAC,CAAC;IACnC,IAAI,CAAC,MAAM;QAAE,MAAM,IAAI,KAAK,CAAC,cAAc,CAAC,CAAC;IAC7C,OAAO,MAAM,CAAC;AACf,CAAC;AAED,OAAO,EACN,YAAY,EACZ,iBAAiB,EACjB,kBAAkB,EAClB,aAAa,EACb,gBAAgB,EAChB,cAAc,EACd,UAAU,EACV,iBAAiB,EACjB,WAAW,GACX,CAAC","sourcesContent":["import { createHash, randomBytes, timingSafeEqual } from \"node:crypto\";\nimport { readFileSync, statSync } from \"node:fs\";\nimport type { IncomingMessage } from \"node:http\";\nimport * as path from \"node:path\";\n\ninterface TokenRecord {\n\tuserId: string;\n\tscope: string;\n\texpiresAt: number;\n}\n\ninterface UserRecord {\n\tname: string;\n\tpassword: string;\n\tworkspace?: string;\n}\n\nconst DEFAULT_USER = \"opencode\";\nconst ttlSecs = Number(process.env.PI_OAUTH_TOKEN_TTL);\nconst TOKEN_TTL_MS = (Number.isFinite(ttlSecs) && ttlSecs > 0 ? ttlSecs : 3600) * 1000;\n\nconst tokens = new Map<string, TokenRecord>();\n\nlet cachedUsers: UserRecord[] | undefined;\nlet cachedUsersMtimeMs = -1;\n\nfunction defaultUser(): string {\n\treturn process.env.PI_SERVER_USERNAME || process.env.OPENCODE_SERVER_USERNAME || DEFAULT_USER;\n}\n\nfunction usersFile(): string {\n\treturn path.join(process.cwd(), \".pi\", \"users.json\");\n}\n\nfunction digest(value: string): Buffer {\n\treturn createHash(\"sha256\").update(value).digest();\n}\n\nfunction loadUsers(): UserRecord[] {\n\tconst file = usersFile();\n\tlet mtimeMs = -1;\n\ttry {\n\t\tmtimeMs = statSync(file).mtimeMs;\n\t} catch {}\n\tif (cachedUsers && cachedUsersMtimeMs === mtimeMs) return cachedUsers;\n\tconst users: UserRecord[] = [];\n\tconst password = process.env.PI_SERVER_PASSWORD || process.env.OPENCODE_SERVER_PASSWORD || \"\";\n\tif (password) {\n\t\tconst name = defaultUser();\n\t\tif (name.includes(\":\")) throw new Error(\"PI_SERVER_USERNAME must not contain ':'\");\n\t\tusers.push({ name, password });\n\t}\n\ttry {\n\t\tconst parsed = JSON.parse(readFileSync(file, \"utf8\")) as unknown;\n\t\tif (Array.isArray(parsed)) {\n\t\t\tfor (const entry of parsed) {\n\t\t\t\tif (entry && typeof entry === \"object\") {\n\t\t\t\t\tconst user = entry as Partial<UserRecord>;\n\t\t\t\t\tif (\n\t\t\t\t\t\ttypeof user.name === \"string\" &&\n\t\t\t\t\t\tuser.name.length > 0 &&\n\t\t\t\t\t\ttypeof user.password === \"string\" &&\n\t\t\t\t\t\tuser.password.length > 0\n\t\t\t\t\t) {\n\t\t\t\t\t\tif (user.name.includes(\":\")) continue;\n\t\t\t\t\t\tconst workspace =\n\t\t\t\t\t\t\ttypeof user.workspace === \"string\" && path.isAbsolute(user.workspace) ? user.workspace : undefined;\n\t\t\t\t\t\tusers.push({ name: user.name, password: user.password, workspace });\n\t\t\t\t\t}\n\t\t\t\t}\n\t\t\t}\n\t\t}\n\t} catch {}\n\tconst seen = new Set<string>();\n\tfor (const user of users) {\n\t\tconst key = user.name.toLowerCase();\n\t\tif (seen.has(key)) throw new Error(`Duplicate punch user name (case-insensitive): ${user.name}`);\n\t\tseen.add(key);\n\t}\n\tcachedUsers = users;\n\tcachedUsersMtimeMs = mtimeMs;\n\treturn users;\n}\n\nfunction isAuthConfigured(): boolean {\n\treturn loadUsers().length > 0;\n}\n\nfunction getAuthHeader(): string | null {\n\tconst user = loadUsers()[0];\n\tif (!user) return null;\n\treturn `Basic ${Buffer.from(`${user.name}:${user.password}`).toString(\"base64\")}`;\n}\n\nfunction isSandboxOwner(actor: string): boolean {\n\tconst owner = loadUsers()[0];\n\treturn owner !== undefined && owner.name.toLowerCase() === actor.toLowerCase();\n}\n\nfunction configuredUserName(name: string): string | null {\n\tconst lowered = name.toLowerCase();\n\treturn loadUsers().find((u) => u.name.toLowerCase() === lowered)?.name ?? null;\n}\n\n/** Directory a user may share through collabs: the sandbox owner gets the workspace root, other users only their `workspace` from users.json. */\nfunction userWorkspaceRoot(actor: string): string | null {\n\tconst users = loadUsers();\n\tconst owner = users[0];\n\tif (owner && owner.name.toLowerCase() === actor.toLowerCase()) {\n\t\treturn path.resolve(process.env.PI_WORKSPACE_ROOT || process.cwd());\n\t}\n\tconst user = users.find((u) => u.name.toLowerCase() === actor.toLowerCase());\n\treturn user?.workspace ? path.resolve(user.workspace) : null;\n}\n\nfunction verifyBasic(header: string | undefined): string | null {\n\tconst match = /^Basic\\s+(.+)$/i.exec(header ?? \"\");\n\tif (!match) return null;\n\tconst [username, ...rest] = Buffer.from(match[1], \"base64\").toString(\"utf8\").split(\":\");\n\tconst password = rest.join(\":\");\n\tconst users = loadUsers();\n\tconst lowered = username.toLowerCase();\n\tconst user = users.find(\n\t\t(u) =>\n\t\t\tu.name.toLowerCase() === lowered ||\n\t\t\t(lowered === DEFAULT_USER.toLowerCase() && u.name.toLowerCase() === defaultUser().toLowerCase()),\n\t);\n\tif (!user) return null;\n\tconst provided = digest(password);\n\tconst expected = digest(user.password);\n\tif (provided.length !== expected.length || !timingSafeEqual(provided, expected)) return null;\n\treturn user.name;\n}\n\nfunction pruneTokens(): void {\n\tconst now = Date.now();\n\tfor (const [token, record] of tokens) {\n\t\tif (record.expiresAt <= now) tokens.delete(token);\n\t}\n}\n\nfunction issueToken(userId: string, scope = \"sandbox\"): { token: string; expiresAt: number } {\n\tpruneTokens();\n\tconst token = randomBytes(32).toString(\"base64url\");\n\tconst expiresAt = Date.now() + TOKEN_TTL_MS;\n\ttokens.set(token, { userId, scope, expiresAt });\n\treturn { token, expiresAt };\n}\n\nfunction verifyToken(token: string): string | null {\n\tpruneTokens();\n\tconst record = tokens.get(token);\n\tif (!record || record.expiresAt <= Date.now()) return null;\n\treturn record.userId;\n}\n\nfunction authenticateBasic(req: IncomingMessage): string {\n\tconst userId = verifyBasic(req.headers.authorization ?? \"\");\n\tif (!userId) throw new Error(\"Unauthorized\");\n\treturn userId;\n}\n\nfunction authenticate(req: IncomingMessage): string {\n\tconst header = req.headers.authorization ?? \"\";\n\tconst bearerMatch = /^Bearer\\s+(.+)$/i.exec(header);\n\tif (bearerMatch) {\n\t\tconst userId = verifyToken(bearerMatch[1].trim());\n\t\tif (userId) return userId;\n\t\tthrow new Error(\"Unauthorized\");\n\t}\n\tconst userId = verifyBasic(header);\n\tif (!userId) throw new Error(\"Unauthorized\");\n\treturn userId;\n}\n\nexport {\n\tauthenticate,\n\tauthenticateBasic,\n\tconfiguredUserName,\n\tgetAuthHeader,\n\tisAuthConfigured,\n\tisSandboxOwner,\n\tissueToken,\n\tuserWorkspaceRoot,\n\tverifyToken,\n};\n"]}
@@ -1 +1 @@
1
- {"version":3,"file":"collabs.d.ts","sourceRoot":"","sources":["../../../src/extensions/punch/collabs.ts"],"names":[],"mappings":"AAKA,MAAM,WAAW,cAAc;IAC9B,MAAM,EAAE,MAAM,CAAC;IACf,MAAM,EAAE,MAAM,CAAC;IACf,QAAQ,EAAE,MAAM,CAAC;IACjB,IAAI,EAAE,MAAM,CAAC;IACb,gBAAgB,EAAE,MAAM,GAAG,IAAI,CAAC;IAChC,kBAAkB,EAAE,MAAM,GAAG,IAAI,CAAC;IAClC,YAAY,EAAE,MAAM,GAAG,IAAI,CAAC;IAC5B,WAAW,EAAE,MAAM,CAAC;IACpB,MAAM,EAAE,gBAAgB,GAAG,UAAU,GAAG,mBAAmB,GAAG,QAAQ,CAAC;IACvE,QAAQ,CAAC,EAAE,MAAM,CAAC;CAClB;AAED,MAAM,WAAW,MAAM;IACtB,EAAE,EAAE,MAAM,CAAC;IACX,KAAK,EAAE,MAAM,CAAC;IACd,YAAY,EAAE,MAAM,EAAE,CAAC;IACvB,IAAI,EAAE,MAAM,CAAC;IACb,OAAO,EAAE,MAAM,CAAC;IAChB,IAAI,EAAE,MAAM,CAAC;IACb,UAAU,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IACnC,QAAQ,EAAE,cAAc,GAAG,IAAI,CAAC;IAChC,SAAS,EAAE,MAAM,CAAC;IAClB,SAAS,EAAE,MAAM,CAAC;CAClB;AAOD,wBAAgB,eAAe,IAAI,MAAM,CAExC;AA2GD,wBAAgB,uBAAuB,CAAC,SAAS,EAAE,MAAM,GAAG,MAAM,CAEjE;AAED,wBAAgB,SAAS,IAAI,MAAM,CAIlC;AAED,wBAAgB,OAAO,CAAC,KAAK,EAAE,MAAM,GAAG,MAAM,EAAE,CAI/C;AAED,wBAAgB,MAAM,CAAC,EAAE,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,GAAG,MAAM,CAKxD;AAED,wBAAgB,MAAM,CAAC,IAAI,EAAE;IAAE,KAAK,EAAE,MAAM,CAAC;IAAC,QAAQ,EAAE,MAAM,CAAC;IAAC,SAAS,EAAE,MAAM,CAAA;CAAE,GAAG,MAAM,CAoD3F;AAED,wBAAgB,OAAO,CAAC,IAAI,EAAE;IAAE,EAAE,EAAE,MAAM,CAAC;IAAC,KAAK,EAAE,MAAM,CAAC;IAAC,IAAI,EAAE,MAAM,CAAA;CAAE,GAAG,MAAM,CAsCjF;AAED,wBAAgB,MAAM,CAAC,IAAI,EAAE;IAAE,EAAE,EAAE,MAAM,CAAC;IAAC,KAAK,EAAE,MAAM,CAAC;IAAC,OAAO,EAAE,OAAO,CAAC;IAAC,KAAK,CAAC,EAAE,MAAM,CAAA;CAAE,GAAG,MAAM,CAmCpG"}
1
+ {"version":3,"file":"collabs.d.ts","sourceRoot":"","sources":["../../../src/extensions/punch/collabs.ts"],"names":[],"mappings":"AAQA,MAAM,WAAW,cAAc;IAC9B,MAAM,EAAE,MAAM,CAAC;IACf,MAAM,EAAE,MAAM,CAAC;IACf,QAAQ,EAAE,MAAM,CAAC;IACjB,IAAI,EAAE,MAAM,CAAC;IACb,gBAAgB,EAAE,MAAM,GAAG,IAAI,CAAC;IAChC,kBAAkB,EAAE,MAAM,GAAG,IAAI,CAAC;IAClC,YAAY,EAAE,MAAM,GAAG,IAAI,CAAC;IAC5B,WAAW,EAAE,MAAM,CAAC;IACpB,MAAM,EAAE,gBAAgB,GAAG,UAAU,GAAG,mBAAmB,GAAG,QAAQ,CAAC;IACvE,QAAQ,CAAC,EAAE,MAAM,CAAC;CAClB;AAED,MAAM,WAAW,MAAM;IACtB,EAAE,EAAE,MAAM,CAAC;IACX,KAAK,EAAE,MAAM,CAAC;IACd,YAAY,EAAE,MAAM,EAAE,CAAC;IACvB,IAAI,EAAE,MAAM,CAAC;IACb,OAAO,EAAE,MAAM,CAAC;IAChB,IAAI,EAAE,MAAM,CAAC;IACb,UAAU,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IACnC,QAAQ,EAAE,cAAc,GAAG,IAAI,CAAC;IAChC,SAAS,EAAE,MAAM,CAAC;IAClB,SAAS,EAAE,MAAM,CAAC;CAClB;AAOD,wBAAgB,eAAe,IAAI,MAAM,CAExC;AA8GD,wBAAgB,uBAAuB,CAAC,SAAS,EAAE,MAAM,GAAG,MAAM,CAEjE;AAED,wBAAgB,SAAS,IAAI,MAAM,CAIlC;AAED,wBAAgB,OAAO,CAAC,KAAK,EAAE,MAAM,GAAG,MAAM,EAAE,CAI/C;AAED,wBAAgB,MAAM,CAAC,EAAE,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,GAAG,MAAM,CAKxD;AAED,wBAAgB,MAAM,CAAC,IAAI,EAAE;IAAE,KAAK,EAAE,MAAM,CAAC;IAAC,QAAQ,EAAE,MAAM,CAAC;IAAC,SAAS,EAAE,MAAM,CAAA;CAAE,GAAG,MAAM,CAyD3F;AAED,wBAAgB,OAAO,CAAC,IAAI,EAAE;IAAE,EAAE,EAAE,MAAM,CAAC;IAAC,KAAK,EAAE,MAAM,CAAC;IAAC,IAAI,EAAE,MAAM,CAAA;CAAE,GAAG,MAAM,CAsCjF;AAED,wBAAgB,MAAM,CAAC,IAAI,EAAE;IAAE,EAAE,EAAE,MAAM,CAAC;IAAC,KAAK,EAAE,MAAM,CAAC;IAAC,OAAO,EAAE,OAAO,CAAC;IAAC,KAAK,CAAC,EAAE,MAAM,CAAA;CAAE,GAAG,MAAM,CAmCpG"}
@@ -2,6 +2,8 @@ import { execFileSync } from "node:child_process";
2
2
  import { randomUUID } from "node:crypto";
3
3
  import { existsSync, mkdirSync, readFileSync, realpathSync, renameSync, writeFileSync } from "node:fs";
4
4
  import * as path from "node:path";
5
+ import { getAgentDir } from "../../config.js";
6
+ import { configuredUserName, userWorkspaceRoot } from "./auth.js";
5
7
  const ID_PATTERN = /^col_[a-f0-9]{12}$/;
6
8
  const SHA_PATTERN = /^[a-f0-9]{40,64}$/;
7
9
  let records = [];
@@ -63,50 +65,46 @@ function write(collab) {
63
65
  function workspaceRoot() {
64
66
  return process.env.PI_WORKSPACE_ROOT || process.cwd();
65
67
  }
66
- function safeWorkspace(p) {
67
- if (typeof p !== "string")
68
- throw new Error("Workspace must be an absolute path under the workspace root.");
69
- if (p.includes("\0"))
70
- throw new Error("Workspace must be an absolute path under the workspace root.");
71
- if (!path.isAbsolute(p))
72
- throw new Error("Workspace must be an absolute path under the workspace root.");
73
- const resolved = path.resolve(p).replace(/\/+$/, "");
74
- const root = path.resolve(workspaceRoot()).replace(/\/+$/, "");
75
- if (!resolved.startsWith(root + path.sep) || resolved === root) {
76
- throw new Error("Workspace must be an absolute path under the workspace root.");
77
- }
78
- let realRoot;
79
- try {
80
- realRoot = realpathSync(root);
81
- }
82
- catch {
83
- return resolved;
84
- }
85
- let existing = resolved;
68
+ const INVALID_WORKSPACE = "Workspace must be an absolute path under the workspace root.";
69
+ function isInside(child, parent) {
70
+ return child.startsWith(parent.endsWith(path.sep) ? parent : parent + path.sep);
71
+ }
72
+ function overlaps(a, b) {
73
+ return a === b || isInside(a, b) || isInside(b, a);
74
+ }
75
+ /** Resolves symlinks through the nearest existing ancestor, keeping the missing suffix. */
76
+ function realPathOf(p) {
77
+ let existing = p;
86
78
  while (true) {
87
- let realExisting = null;
88
79
  try {
89
- realExisting = realpathSync(existing);
80
+ return realpathSync(existing) + p.slice(existing.length);
90
81
  }
91
82
  catch { }
92
- if (realExisting !== null) {
93
- if (realExisting !== realRoot && !realExisting.startsWith(realRoot + path.sep)) {
94
- throw new Error("Workspace must be an absolute path under the workspace root.");
95
- }
96
- const suffix = resolved.slice(existing.length);
97
- const fullReal = `${realExisting}${suffix}`;
98
- if (!fullReal.startsWith(realRoot + path.sep)) {
99
- throw new Error("Workspace must be an absolute path under the workspace root.");
100
- }
101
- return resolved;
102
- }
103
83
  const parent = path.dirname(existing);
104
- if (parent === existing) {
105
- return resolved;
106
- }
84
+ if (parent === existing)
85
+ return p;
107
86
  existing = parent;
108
87
  }
109
88
  }
89
+ function safeWorkspace(p, rootDir = workspaceRoot()) {
90
+ if (typeof p !== "string" || p.includes("\0") || !path.isAbsolute(p))
91
+ throw new Error(INVALID_WORKSPACE);
92
+ const resolved = path.resolve(p);
93
+ const root = path.resolve(rootDir);
94
+ if (!isInside(resolved, root) || !isInside(realPathOf(resolved), realPathOf(root))) {
95
+ throw new Error(INVALID_WORKSPACE);
96
+ }
97
+ return resolved;
98
+ }
99
+ function assertNotServerState(workspace) {
100
+ const real = realPathOf(workspace);
101
+ for (const dir of [path.join(process.cwd(), ".pi"), collabDir(), getAgentDir()]) {
102
+ const resolved = path.resolve(dir);
103
+ if (overlaps(workspace, resolved) || overlaps(real, realPathOf(resolved))) {
104
+ throw new Error("Workspace must not contain or be inside punch server state.");
105
+ }
106
+ }
107
+ }
110
108
  function git(args, cwd) {
111
109
  return execFileSync("git", args, { encoding: "utf8", cwd }).trim();
112
110
  }
@@ -134,12 +132,20 @@ export function getFor(id, actor) {
134
132
  return collab;
135
133
  }
136
134
  export function create(opts) {
137
- const owner = opts.owner;
138
- const reviewer = opts.reviewer;
139
- if (!reviewer || reviewer.toLowerCase() === owner.toLowerCase()) {
135
+ const owner = configuredUserName(opts.owner);
136
+ if (!owner)
137
+ throw new Error("Collaboration owner must be a configured punch user.");
138
+ const reviewer = configuredUserName(opts.reviewer);
139
+ if (!reviewer)
140
+ throw new Error("reviewer must be a configured punch user");
141
+ if (reviewer.toLowerCase() === owner.toLowerCase()) {
140
142
  throw new Error("reviewer must be a different sandbox");
141
143
  }
142
- const source = safeWorkspace(opts.workspace);
144
+ const allowedRoot = userWorkspaceRoot(owner);
145
+ if (!allowedRoot)
146
+ throw new Error("No collaboration workspace is configured for this user.");
147
+ const source = safeWorkspace(opts.workspace, allowedRoot);
148
+ assertNotServerState(source);
143
149
  const id = `col_${randomUUID().replace(/-/g, "").slice(0, 12)}`;
144
150
  const repo = path.join(collabDir(), `${id}.git`);
145
151
  const clonePath = path.join(collabDir(), id);