@octopi-agent/engine 0.90.11 → 0.98.4

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 (246) hide show
  1. package/dist/config-admin/agent-presets.d.ts +70 -0
  2. package/dist/config-admin/agent-presets.js +243 -0
  3. package/dist/config-admin/discover.d.ts +30 -0
  4. package/dist/config-admin/discover.js +48 -0
  5. package/dist/config-admin/env.d.ts +22 -0
  6. package/dist/config-admin/env.js +41 -0
  7. package/dist/config-admin/index.d.ts +20 -0
  8. package/dist/config-admin/index.js +15 -0
  9. package/dist/config-admin/model-presets.d.ts +75 -0
  10. package/dist/config-admin/model-presets.js +249 -0
  11. package/dist/config-admin/name-guard.d.ts +14 -0
  12. package/dist/config-admin/name-guard.js +24 -0
  13. package/dist/config-admin/patch.d.ts +56 -0
  14. package/dist/config-admin/patch.js +201 -0
  15. package/dist/config-admin/port.d.ts +68 -0
  16. package/dist/config-admin/port.js +21 -0
  17. package/dist/config-admin/redact.d.ts +39 -0
  18. package/dist/config-admin/redact.js +42 -0
  19. package/dist/config-schema/agent.d.ts +45 -1
  20. package/dist/config-schema/context.d.ts +6 -1
  21. package/dist/config-schema/context.js +8 -0
  22. package/dist/config-schema/engine.d.ts +110 -4
  23. package/dist/config-schema/governance.d.ts +45 -1
  24. package/dist/config-schema/governance.js +187 -0
  25. package/dist/config-schema/models.d.ts +5 -2
  26. package/dist/config-schema/models.js +4 -1
  27. package/dist/config-schema/observability.d.ts +9 -0
  28. package/dist/config-schema/observability.js +29 -0
  29. package/dist/config-schema/run.d.ts +3 -0
  30. package/dist/config-schema/run.js +14 -0
  31. package/dist/config.d.ts +29 -4
  32. package/dist/config.js +15 -4
  33. package/dist/harness/activation/dispatcher.d.ts +8 -2
  34. package/dist/harness/activation/dispatcher.js +33 -5
  35. package/dist/harness/activation/inbox.d.ts +87 -0
  36. package/dist/harness/activation/inbox.js +169 -0
  37. package/dist/harness/activation/runtime.d.ts +9 -8
  38. package/dist/harness/activation/runtime.js +100 -8
  39. package/dist/harness/activation/types.d.ts +19 -0
  40. package/dist/harness/activation/types.js +2 -0
  41. package/dist/harness/agent/builder.d.ts +26 -1
  42. package/dist/harness/agent/builder.js +85 -37
  43. package/dist/harness/agent/config-bridge.d.ts +5 -0
  44. package/dist/harness/agent/config-bridge.js +3 -0
  45. package/dist/harness/agent/config-integrity.d.ts +138 -0
  46. package/dist/harness/agent/config-integrity.js +235 -0
  47. package/dist/harness/agent/wire-agent-builder.js +7 -1
  48. package/dist/harness/collaboration/autonomous-subsystem/index.d.ts +2 -2
  49. package/dist/harness/collaboration/autonomous-subsystem/index.js +1 -1
  50. package/dist/harness/collaboration/autonomous-subsystem/loader.js +3 -0
  51. package/dist/harness/collaboration/autonomous-subsystem/sense/engine.js +19 -2
  52. package/dist/harness/collaboration/autonomous-subsystem/think/completion-guard.d.ts +40 -0
  53. package/dist/harness/collaboration/autonomous-subsystem/think/completion-guard.js +59 -0
  54. package/dist/harness/collaboration/autonomous-subsystem/think/executor.js +3 -1
  55. package/dist/harness/collaboration/autonomous-subsystem/think/index.d.ts +2 -0
  56. package/dist/harness/collaboration/autonomous-subsystem/think/index.js +1 -0
  57. package/dist/harness/collaboration/autonomous-subsystem/think/model-resolver.js +1 -1
  58. package/dist/harness/collaboration/autonomous-subsystem/types.d.ts +9 -0
  59. package/dist/harness/collaboration/delegation/child-run.js +21 -5
  60. package/dist/harness/collaboration/delegation/notifier.js +4 -3
  61. package/dist/harness/collaboration/delegation/service.js +2 -3
  62. package/dist/harness/collaboration/delegation/wiring.js +6 -5
  63. package/dist/harness/collaboration/orchestration/reflector/llm-reflector.d.ts +1 -1
  64. package/dist/harness/collaboration/orchestration/reflector/llm-reflector.js +1 -1
  65. package/dist/harness/context/capabilities/compact/engine.d.ts +30 -0
  66. package/dist/harness/context/capabilities/compact/engine.js +198 -46
  67. package/dist/harness/context/capabilities/compact/handover.d.ts +78 -0
  68. package/dist/harness/context/capabilities/compact/handover.js +107 -0
  69. package/dist/harness/context/capabilities/compact/index.d.ts +3 -1
  70. package/dist/harness/context/capabilities/compact/index.js +2 -1
  71. package/dist/harness/context/capabilities/compact/types.d.ts +30 -1
  72. package/dist/harness/context/capabilities/summary/executor.js +2 -1
  73. package/dist/harness/context/capabilities/summary/policies.js +8 -5
  74. package/dist/harness/context/capabilities/summary/resolver.d.ts +1 -1
  75. package/dist/harness/context/capabilities/summary/resolver.js +4 -4
  76. package/dist/harness/context/capabilities/summary/types.d.ts +2 -2
  77. package/dist/harness/context/constitution/default-agents.md +11 -10
  78. package/dist/harness/context/default-context-engine.d.ts +34 -4
  79. package/dist/harness/context/default-context-engine.js +194 -49
  80. package/dist/harness/context/hybrid-compressor.js +6 -0
  81. package/dist/harness/context/layers.d.ts +2 -4
  82. package/dist/harness/context/layers.js +9 -11
  83. package/dist/harness/context/llm-summarizer.d.ts +2 -8
  84. package/dist/harness/context/llm-summarizer.js +69 -91
  85. package/dist/harness/context/message-selector.js +4 -3
  86. package/dist/harness/context/summarize.d.ts +3 -1
  87. package/dist/harness/context/summarize.js +9 -4
  88. package/dist/harness/context/system-prompt-assembler.d.ts +2 -0
  89. package/dist/harness/context/system-prompt-assembler.js +1 -0
  90. package/dist/harness/context/truncate-compressor.js +7 -0
  91. package/dist/harness/context/turn-envelope.d.ts +3 -2
  92. package/dist/harness/context/turn-envelope.js +3 -2
  93. package/dist/harness/context/types.d.ts +33 -1
  94. package/dist/harness/extension/execution-environment/dangerous-commands.d.ts +28 -0
  95. package/dist/harness/extension/execution-environment/dangerous-commands.js +129 -0
  96. package/dist/harness/extension/execution-environment/effect-policy.d.ts +149 -8
  97. package/dist/harness/extension/execution-environment/effect-policy.js +274 -19
  98. package/dist/harness/extension/execution-environment/index.d.ts +4 -2
  99. package/dist/harness/extension/execution-environment/index.js +2 -1
  100. package/dist/harness/extension/execution-environment/kill-switch.d.ts +34 -0
  101. package/dist/harness/extension/execution-environment/kill-switch.js +46 -0
  102. package/dist/harness/extension/execution-environment/ops-audit.d.ts +204 -0
  103. package/dist/harness/extension/execution-environment/ops-audit.js +337 -0
  104. package/dist/harness/extension/execution-environment/privileged-exec.d.ts +158 -0
  105. package/dist/harness/extension/execution-environment/privileged-exec.js +418 -0
  106. package/dist/harness/extension/execution-environment/process-info.d.ts +180 -0
  107. package/dist/harness/extension/execution-environment/process-info.js +466 -0
  108. package/dist/harness/extension/execution-environment/process-isolation.d.ts +7 -0
  109. package/dist/harness/extension/execution-environment/process-isolation.js +9 -0
  110. package/dist/harness/extension/execution-environment/sandbox.d.ts +109 -0
  111. package/dist/harness/extension/execution-environment/sandbox.js +228 -21
  112. package/dist/harness/extension/execution-environment/tool-capabilities.d.ts +1 -1
  113. package/dist/harness/extension/execution-environment/tool-capabilities.js +6 -0
  114. package/dist/harness/extension/execution-environment/types.d.ts +19 -0
  115. package/dist/harness/extension/execution-environment/undo-log.d.ts +6 -2
  116. package/dist/harness/extension/execution-environment/undo-log.js +31 -10
  117. package/dist/harness/extension/plugin-ecosystem/channel-types.d.ts +5 -0
  118. package/dist/harness/extension/plugin-ecosystem/tools/allowlisted-run.js +33 -0
  119. package/dist/harness/extension/plugin-ecosystem/tools/ask-user.d.ts +4 -5
  120. package/dist/harness/extension/plugin-ecosystem/tools/ask-user.js +5 -15
  121. package/dist/harness/extension/plugin-ecosystem/tools/builtin.d.ts +3 -0
  122. package/dist/harness/extension/plugin-ecosystem/tools/builtin.js +70 -26
  123. package/dist/harness/extension/plugin-ecosystem/tools/document-tools.js +3 -9
  124. package/dist/harness/extension/plugin-ecosystem/tools/file-edit.js +3 -6
  125. package/dist/harness/extension/plugin-ecosystem/tools/file-ops.js +9 -5
  126. package/dist/harness/extension/plugin-ecosystem/tools/file-search.js +9 -130
  127. package/dist/harness/extension/plugin-ecosystem/tools/git-tools.js +122 -14
  128. package/dist/harness/extension/plugin-ecosystem/tools/index.d.ts +2 -0
  129. package/dist/harness/extension/plugin-ecosystem/tools/index.js +2 -0
  130. package/dist/harness/extension/plugin-ecosystem/tools/package-tools.js +4 -13
  131. package/dist/harness/extension/plugin-ecosystem/tools/platform.d.ts +25 -11
  132. package/dist/harness/extension/plugin-ecosystem/tools/platform.js +168 -62
  133. package/dist/harness/extension/plugin-ecosystem/tools/privileged-tool.d.ts +43 -0
  134. package/dist/harness/extension/plugin-ecosystem/tools/privileged-tool.js +350 -0
  135. package/dist/harness/extension/plugin-ecosystem/tools/process-tools.d.ts +30 -0
  136. package/dist/harness/extension/plugin-ecosystem/tools/process-tools.js +137 -0
  137. package/dist/harness/governance/human-in-the-loop/decision-cache.d.ts +54 -4
  138. package/dist/harness/governance/human-in-the-loop/decision-cache.js +42 -16
  139. package/dist/harness/governance/security/default-risk-policy.d.ts +1 -0
  140. package/dist/harness/governance/security/default-risk-policy.js +1 -0
  141. package/dist/harness/governance/security/default-security-guard.js +9 -0
  142. package/dist/harness/governance/security/index.d.ts +1 -0
  143. package/dist/harness/governance/security/index.js +2 -0
  144. package/dist/harness/governance/security/risk-evaluator.js +13 -0
  145. package/dist/harness/governance/security/risk-types.d.ts +12 -0
  146. package/dist/harness/governance/security/shell-parser-fallback.d.ts +29 -0
  147. package/dist/harness/governance/security/shell-parser-fallback.js +410 -0
  148. package/dist/harness/governance/security/shell-parser-shared.d.ts +83 -0
  149. package/dist/harness/governance/security/shell-parser-shared.js +188 -0
  150. package/dist/harness/governance/security/shell-parser-treesitter.d.ts +52 -0
  151. package/dist/harness/governance/security/shell-parser-treesitter.js +370 -0
  152. package/dist/harness/governance/security/shell-parser.d.ts +23 -10
  153. package/dist/harness/governance/security/shell-parser.js +37 -496
  154. package/dist/harness/governance/security/temp-path.d.ts +9 -0
  155. package/dist/harness/governance/security/temp-path.js +13 -2
  156. package/dist/harness/governance/security/vendor/README.md +24 -0
  157. package/dist/harness/governance/security/vendor/tree-sitter-bash.LICENSE.txt +21 -0
  158. package/dist/harness/governance/security/vendor/tree-sitter-bash.wasm +0 -0
  159. package/dist/harness/governance/session-acl/seed-roles.js +14 -0
  160. package/dist/harness/index.d.ts +2 -0
  161. package/dist/harness/index.js +2 -0
  162. package/dist/harness/knowledge/fts.js +1 -2
  163. package/dist/harness/knowledge/index-store.js +59 -9
  164. package/dist/harness/memory/index.d.ts +6 -2
  165. package/dist/harness/memory/index.js +4 -1
  166. package/dist/harness/memory/memory-events.d.ts +25 -0
  167. package/dist/harness/memory/memory-events.js +38 -0
  168. package/dist/harness/memory/sqlite/agent-db.js +15 -0
  169. package/dist/harness/memory/sqlite/keyword-search.d.ts +1 -0
  170. package/dist/harness/memory/sqlite/keyword-search.js +4 -3
  171. package/dist/harness/memory/sqlite/wisdom-store.d.ts +7 -2
  172. package/dist/harness/memory/sqlite/wisdom-store.js +51 -2
  173. package/dist/harness/memory/steward-policy.d.ts +3 -0
  174. package/dist/harness/memory/steward-policy.js +1 -1
  175. package/dist/harness/memory/types.d.ts +41 -3
  176. package/dist/harness/memory/wisdom-attribution.d.ts +136 -0
  177. package/dist/harness/memory/wisdom-attribution.js +287 -0
  178. package/dist/harness/memory/wisdom-events.d.ts +37 -0
  179. package/dist/harness/memory/wisdom-events.js +61 -0
  180. package/dist/harness/memory/wisdom-formation.d.ts +20 -1
  181. package/dist/harness/memory/wisdom-formation.js +55 -21
  182. package/dist/harness/memory/wisdom.d.ts +7 -2
  183. package/dist/harness/memory/wisdom.js +40 -2
  184. package/dist/harness/observability/observer/hub.js +8 -0
  185. package/dist/harness/observability/observer/run-snapshot.js +1 -0
  186. package/dist/harness/observability/observer/types.d.ts +4 -0
  187. package/dist/harness/run/agent/agent.d.ts +7 -0
  188. package/dist/harness/run/agent/agent.js +23 -1
  189. package/dist/harness/run/reliability/fallback-provider.d.ts +117 -5
  190. package/dist/harness/run/reliability/fallback-provider.js +262 -22
  191. package/dist/harness/run/reliability/harness-events.d.ts +24 -1
  192. package/dist/harness/run/reliability/model-error-policy.d.ts +32 -0
  193. package/dist/harness/run/reliability/model-error-policy.js +42 -0
  194. package/dist/harness/run/reliability/provider-wrapper.js +29 -2
  195. package/dist/harness/run/reliability/refusal-guard.d.ts +20 -0
  196. package/dist/harness/run/reliability/refusal-guard.js +102 -0
  197. package/dist/harness/run/reliability/run-agent.js +231 -33
  198. package/dist/harness/run/run-guard/default-run-guard.js +1 -1
  199. package/dist/harness/run/run-scope.d.ts +35 -0
  200. package/dist/harness/run/runner.d.ts +141 -2
  201. package/dist/harness/run/runner.js +592 -42
  202. package/dist/harness/session/attachments/llm-intent.js +2 -1
  203. package/dist/harness/session/tasks/render.d.ts +4 -1
  204. package/dist/harness/session/tasks/render.js +10 -7
  205. package/dist/harness/shared/events/agent-event-map.d.ts +66 -0
  206. package/dist/harness/shared/events/agent-event-map.js +5 -0
  207. package/dist/harness/shared/paths/glob.d.ts +52 -0
  208. package/dist/harness/shared/paths/glob.js +218 -0
  209. package/dist/harness/shared/paths/index.d.ts +84 -0
  210. package/dist/harness/shared/paths/index.js +179 -0
  211. package/dist/index.d.ts +3 -3
  212. package/dist/index.js +2 -2
  213. package/dist/integration/agent-runtime/channel-message-source.js +19 -1
  214. package/dist/integration/index.d.ts +2 -0
  215. package/dist/integration/index.js +1 -0
  216. package/dist/integration/observability/loop-watchdog.d.ts +56 -0
  217. package/dist/integration/observability/loop-watchdog.js +177 -0
  218. package/dist/integration/observability/metrics.d.ts +3 -0
  219. package/dist/integration/observability/metrics.js +18 -7
  220. package/dist/integration/providers/anthropic.d.ts +23 -0
  221. package/dist/integration/providers/anthropic.js +97 -12
  222. package/dist/integration/providers/fetch-timeout.d.ts +42 -0
  223. package/dist/integration/providers/fetch-timeout.js +51 -0
  224. package/dist/integration/providers/openai.d.ts +10 -0
  225. package/dist/integration/providers/openai.js +58 -11
  226. package/dist/integration/providers/provider-diagnostics.d.ts +80 -0
  227. package/dist/integration/providers/provider-diagnostics.js +89 -0
  228. package/dist/integration/providers/timeout-coherence.d.ts +52 -0
  229. package/dist/integration/providers/timeout-coherence.js +68 -0
  230. package/dist/integration/providers/wire-dump.d.ts +62 -0
  231. package/dist/integration/providers/wire-dump.js +111 -2
  232. package/dist/integration/storage/jsonl.js +4 -1
  233. package/dist/subsystems/cognition-steward/conceptualize/config.yaml +4 -2
  234. package/dist/subsystems/cognition-steward/conceptualize/handler.js +12 -20
  235. package/dist/subsystems/memory-steward/backfill/config.yaml +4 -2
  236. package/dist/subsystems/memory-steward/backfill/handler.js +44 -52
  237. package/dist/subsystems/wisdom-steward/attribute/SUBSYSTEM.md +24 -0
  238. package/dist/subsystems/wisdom-steward/attribute/config.yaml +60 -0
  239. package/dist/subsystems/wisdom-steward/attribute/handler.d.ts +23 -0
  240. package/dist/subsystems/wisdom-steward/attribute/handler.js +167 -0
  241. package/dist/subsystems/wisdom-steward/evaluate/handler.js +3 -1
  242. package/dist/subsystems/wisdom-steward/formation/config.yaml +12 -5
  243. package/dist/subsystems/wisdom-steward/formation/handler.js +12 -18
  244. package/dist/subsystems/wisdom-steward/govern/config.yaml +1 -1
  245. package/dist/subsystems/wisdom-steward/govern/handler.js +4 -0
  246. package/package.json +8 -2
@@ -1,17 +1,20 @@
1
1
  /**
2
- * Shell Parser — 轻量级 Shell 命令解析器
2
+ * Shell Parser — 解析入口 facade
3
3
  *
4
- * 不依赖 tree-sitter,纯字符串解析。
5
- * 四层解析:
6
- * 1. 按 |, &&, ||, ; 拆分 → 命令段
7
- * 2. 每个命令段 → [wrapper...] + [command, ...args]
8
- * 3. 识别 >, >>, < 重定向 → 提取目标路径
9
- * 4. 识别 sudo, env, exec 等 wrapper → 解包实际命令
4
+ * 主引擎:tree-sitter(shell-parser-treesitter.ts,vendored bash 语法 wasm);
5
+ * 回退引擎:纯字符串解析(shell-parser-fallback.ts,长期保留的降级防线,
6
+ * 保证主引擎缺席/解析报错时硬边界探测仍有输入)。
7
+ * 消费方(risk-evaluator / degradation)只依赖本模块导出,不感知引擎差异。
10
8
  *
11
- * 设计原则:宁可解析不完整,不可解析错误。
12
- * 遇到无法解析的复杂结构,标记为 parsed: false,交给 LLM 判断。
9
+ * 回退语义:
10
+ * - 引擎未初始化(未走 Agent 构建引导的直接调用,如单元测试)→ fallback 结果;
11
+ * - tree-sitter 对某输入解析报错(语法树含 ERROR)或内部异常 → fallback 结果
12
+ * 并标记 `uncertain: true`,风险分档会附加「结构不确定」因子走 unknown 通道。
13
13
  */
14
14
  import type { ParsedCommand } from './risk-types.js';
15
+ import { initShellParser, isShellParserReady, getShellParserEngine } from './shell-parser-treesitter.js';
16
+ export { initShellParser, isShellParserReady, getShellParserEngine };
17
+ export { parseShellCommandFallback } from './shell-parser-fallback.js';
15
18
  /**
16
19
  * 解析 Shell 命令
17
20
  *
@@ -23,13 +26,23 @@ export declare function parseShellCommand(raw: string): ParsedCommand & {
23
26
  };
24
27
  /**
25
28
  * 获取所有命令名(不含 wrapper)
29
+ *
30
+ * @param parsed - 解析结果
31
+ * @returns 命令名列表
26
32
  */
27
33
  export declare function getCommandNames(parsed: ParsedCommand): string[];
28
34
  /**
29
- * 获取所有重定向目标路径
35
+ * 获取所有重定向目标路径(含未挂载到命令段的孤立重定向)
36
+ *
37
+ * @param parsed - 解析结果
38
+ * @returns 重定向目标列表
30
39
  */
31
40
  export declare function getRedirectTargets(parsed: ParsedCommand): string[];
32
41
  /**
33
42
  * 判断命令是否包含指定的命令名
43
+ *
44
+ * @param parsed - 解析结果
45
+ * @param command - 命令名
46
+ * @returns 是否包含
34
47
  */
35
48
  export declare function hasCommand(parsed: ParsedCommand, command: string): boolean;
@@ -1,59 +1,20 @@
1
1
  /**
2
- * Shell Parser — 轻量级 Shell 命令解析器
2
+ * Shell Parser — 解析入口 facade
3
3
  *
4
- * 不依赖 tree-sitter,纯字符串解析。
5
- * 四层解析:
6
- * 1. 按 |, &&, ||, ; 拆分 → 命令段
7
- * 2. 每个命令段 → [wrapper...] + [command, ...args]
8
- * 3. 识别 >, >>, < 重定向 → 提取目标路径
9
- * 4. 识别 sudo, env, exec 等 wrapper → 解包实际命令
4
+ * 主引擎:tree-sitter(shell-parser-treesitter.ts,vendored bash 语法 wasm);
5
+ * 回退引擎:纯字符串解析(shell-parser-fallback.ts,长期保留的降级防线,
6
+ * 保证主引擎缺席/解析报错时硬边界探测仍有输入)。
7
+ * 消费方(risk-evaluator / degradation)只依赖本模块导出,不感知引擎差异。
10
8
  *
11
- * 设计原则:宁可解析不完整,不可解析错误。
12
- * 遇到无法解析的复杂结构,标记为 parsed: false,交给 LLM 判断。
9
+ * 回退语义:
10
+ * - 引擎未初始化(未走 Agent 构建引导的直接调用,如单元测试)→ fallback 结果;
11
+ * - tree-sitter 对某输入解析报错(语法树含 ERROR)或内部异常 → fallback 结果
12
+ * 并标记 `uncertain: true`,风险分档会附加「结构不确定」因子走 unknown 通道。
13
13
  */
14
- // ── Wrapper 命令 ──
15
- /**
16
- * 已知的解释器名称(管道到解释器 = 执行外部代码)
17
- *
18
- * 不止 shell,python/ruby/perl/node 等也是解释器。
19
- * curl ... | python3 和 curl ... | sh 本质相同。
20
- */
21
- const INTERPRETER_NAMES = new Set([
22
- 'sh', 'bash', 'zsh', 'dash', 'ksh', 'fish',
23
- 'python', 'python3', 'ruby', 'perl', 'node', 'php',
24
- 'lua', 'tclsh', 'Rscript', 'scala', 'groovy',
25
- 'powershell', 'powershell.exe', 'pwsh', 'pwsh.exe', 'cmd', 'cmd.exe',
26
- ]);
27
- /**
28
- * 已知的内联代码执行参数
29
- *
30
- * python -c "...", node -e "...", ruby -e "...", perl -e "..."
31
- */
32
- const INLINE_CODE_FLAGS = {
33
- 'python': ['-c'], 'python3': ['-c'],
34
- 'node': ['-e', '--eval'],
35
- 'ruby': ['-e'],
36
- 'perl': ['-e'],
37
- 'php': ['-r'],
38
- 'bash': ['-c'], 'sh': ['-c'], 'zsh': ['-c'],
39
- // Windows shells
40
- 'powershell': ['-Command', '-command', '-c', '-EncodedCommand', '-encodedcommand'],
41
- 'powershell.exe': ['-Command', '-command', '-c', '-EncodedCommand', '-encodedcommand'],
42
- 'pwsh': ['-Command', '-command', '-c', '-EncodedCommand', '-encodedcommand'],
43
- 'pwsh.exe': ['-Command', '-command', '-c', '-EncodedCommand', '-encodedcommand'],
44
- 'cmd': ['/c', '/C', '/k', '/K'],
45
- 'cmd.exe': ['/c', '/C', '/k', '/K'],
46
- };
47
- /**
48
- * 仅对真正的 wrapper 剥壳。
49
- *
50
- * 不要把 cmd/start 放进来:它们的选项(/c、/b)会被误当成命令名,
51
- * 且 cmd /c 本身就是内联执行,应保留原命令以便 INLINE_CODE_FLAGS 识别。
52
- */
53
- const WRAPPER_COMMANDS = new Set([
54
- 'sudo', 'env', 'exec', 'nohup', 'strace', 'time',
55
- ]);
56
- // ── 解析入口 ──
14
+ import { parseShellCommandFallback } from './shell-parser-fallback.js';
15
+ import { initShellParser, isShellParserReady, getShellParserEngine, parseShellCommandWithTreeSitter, } from './shell-parser-treesitter.js';
16
+ export { initShellParser, isShellParserReady, getShellParserEngine };
17
+ export { parseShellCommandFallback } from './shell-parser-fallback.js';
57
18
  /**
58
19
  * 解析 Shell 命令
59
20
  *
@@ -61,464 +22,44 @@ const WRAPPER_COMMANDS = new Set([
61
22
  * @returns 解析结果(parsed: true/false 表示解析是否成功)
62
23
  */
63
24
  export function parseShellCommand(raw) {
64
- const trimmed = raw.trim();
65
- if (!trimmed) {
66
- return {
67
- parsed: true,
68
- raw,
69
- segments: [],
70
- connectors: [],
71
- hasShellPipe: false,
72
- hasInlineCode: false,
73
- hasSubshell: false,
74
- hasBackground: false,
75
- };
76
- }
77
- // 检测子 shell 和后台执行
78
- const hasSubshell = detectSubshell(trimmed);
79
- const hasBackground = detectBackground(trimmed);
80
- // 第一层:按连接符拆分
81
- const { parts, connectors } = splitByConnectors(trimmed);
82
- // 第二、三层:解析每个命令段
83
- const segments = [];
84
- let parsed = true;
85
- for (const part of parts) {
86
- const seg = parseSegment(part);
87
- if (!seg) {
88
- parsed = false;
89
- continue;
90
- }
91
- segments.push(seg);
92
- }
93
- // 第四层:检测特殊模式
94
- const hasShellPipe = detectPipeToInterpreter(segments, connectors);
95
- const hasInlineCode = detectInlineCode(segments);
96
- return {
97
- parsed,
98
- raw,
99
- segments,
100
- connectors,
101
- hasShellPipe,
102
- hasInlineCode,
103
- hasSubshell,
104
- hasBackground,
105
- };
106
- }
107
- // ── 第一层:按连接符拆分 ──
108
- /**
109
- * 按连接符拆分命令
110
- *
111
- * 注意处理引号内的连接符。
112
- */
113
- function splitByConnectors(cmd) {
114
- const parts = [];
115
- const connectors = [];
116
- let current = '';
117
- let inSingleQuote = false;
118
- let inDoubleQuote = false;
119
- let escape = false;
120
- let i = 0;
121
- while (i < cmd.length) {
122
- const ch = cmd[i];
123
- // 转义字符
124
- if (escape) {
125
- current += ch;
126
- escape = false;
127
- i++;
128
- continue;
129
- }
130
- if (ch === '\\') {
131
- escape = true;
132
- current += ch;
133
- i++;
134
- continue;
135
- }
136
- // 引号状态
137
- if (ch === "'" && !inDoubleQuote) {
138
- inSingleQuote = !inSingleQuote;
139
- current += ch;
140
- i++;
141
- continue;
142
- }
143
- if (ch === '"' && !inSingleQuote) {
144
- inDoubleQuote = !inDoubleQuote;
145
- current += ch;
146
- i++;
147
- continue;
148
- }
149
- // 在引号内,直接追加
150
- if (inSingleQuote || inDoubleQuote) {
151
- current += ch;
152
- i++;
153
- continue;
154
- }
155
- // 检测连接符
156
- if (ch === '|') {
157
- if (cmd[i + 1] === '|') {
158
- // ||
159
- pushPart(parts, current);
160
- current = '';
161
- connectors.push('||');
162
- i += 2;
163
- continue;
164
- }
165
- else {
166
- // |
167
- pushPart(parts, current);
168
- current = '';
169
- connectors.push('|');
170
- i++;
171
- continue;
172
- }
173
- }
174
- if (ch === '&') {
175
- if (cmd[i + 1] === '&') {
176
- // &&
177
- pushPart(parts, current);
178
- current = '';
179
- connectors.push('&&');
180
- i += 2;
181
- continue;
182
- }
183
- // `>&` / `N>&M`:文件描述符重定向(2>&1、>&2),不是命令分隔
184
- if (i > 0 && cmd[i - 1] === '>') {
185
- current += ch;
186
- i++;
187
- continue;
188
- }
189
- // `&>` / `&>>`:bash 重定向合一,不是命令分隔
190
- if (cmd[i + 1] === '>') {
191
- current += ch;
192
- i++;
193
- continue;
194
- }
195
- // 单 `&` 既是后台标记也是命令分隔:`true & rm -rf /` 必须拆段
196
- pushPart(parts, current);
197
- current = '';
198
- connectors.push('&');
199
- i++;
200
- continue;
201
- }
202
- if (ch === ';') {
203
- pushPart(parts, current);
204
- current = '';
205
- connectors.push(';');
206
- i++;
207
- continue;
208
- }
209
- if (ch === '\n') {
210
- pushPart(parts, current);
211
- current = '';
212
- connectors.push('\n');
213
- i++;
214
- continue;
215
- }
216
- current += ch;
217
- i++;
218
- }
219
- // 最后一段
220
- pushPart(parts, current);
221
- return { parts, connectors };
222
- }
223
- function pushPart(parts, current) {
224
- const trimmed = current.trim();
225
- if (trimmed) {
226
- parts.push(trimmed);
227
- }
228
- }
229
- // ── 第二、三层:解析命令段 ──
230
- /**
231
- * 解析单个命令段
232
- *
233
- * 提取 wrapper、命令、参数、重定向。
234
- * 遇到无法解析的结构返回 null。
235
- */
236
- function parseSegment(raw) {
237
- const tokens = mergeSplitWindowsPaths(tokenize(raw));
238
- if (tokens.length === 0)
239
- return null;
240
- // 提取重定向
241
- const redirects = [];
242
- const cleanTokens = [];
243
- let i = 0;
244
- while (i < tokens.length) {
245
- const token = tokens[i];
246
- // 检测重定向
247
- if (token === '>' || token === '>>' || token === '<') {
248
- const target = tokens[i + 1];
249
- if (!target)
250
- return null; // 重定向后没有目标,解析失败
251
- redirects.push({
252
- type: token === '>' ? 'overwrite' : token === '>>' ? 'append' : 'input',
253
- target,
254
- });
255
- i += 2;
256
- continue;
257
- }
258
- // 检测 >file 格式(无空格)
259
- const redirectMatch = matchRedirect(token);
260
- if (redirectMatch) {
261
- redirects.push(redirectMatch);
262
- i++;
263
- continue;
264
- }
265
- cleanTokens.push(token);
266
- i++;
267
- }
268
- if (cleanTokens.length === 0)
269
- return null;
270
- // 提取 wrapper
271
- const wrappers = [];
272
- let cmdStart = 0;
273
- while (cmdStart < cleanTokens.length) {
274
- const token = cleanTokens[cmdStart];
275
- if (WRAPPER_COMMANDS.has(token)) {
276
- wrappers.push(token);
277
- cmdStart++;
278
- // sudo 可能有 -u user 等参数,跳过
279
- if (token === 'sudo') {
280
- while (cmdStart < cleanTokens.length && cleanTokens[cmdStart].startsWith('-')) {
281
- cmdStart++;
282
- }
283
- }
284
- // env 跳过环境变量(KEY=VALUE 格式)
285
- if (token === 'env') {
286
- while (cmdStart < cleanTokens.length && /^[A-Z_][A-Z0-9_]*=/.test(cleanTokens[cmdStart])) {
287
- cmdStart++;
288
- }
289
- }
290
- }
291
- else {
292
- break;
293
- }
294
- }
295
- if (cmdStart >= cleanTokens.length)
296
- return null;
297
- const command = cleanTokens[cmdStart];
298
- const args = cleanTokens.slice(cmdStart + 1);
299
- return {
300
- command,
301
- args,
302
- redirects,
303
- isSudo: wrappers.includes('sudo'),
304
- wrappers,
305
- raw,
306
- };
307
- }
308
- /**
309
- * 合并被空格切开的 Windows 绝对路径
310
- *
311
- * `del C:\Program Files\App\x.exe` → `C:\Program` + `Files\App\x.exe`
312
- * → `C:\Program Files\App\x.exe`
313
- *
314
- * 规则:当前 token 是盘符/UNC 绝对路径,下一段含路径分隔符,
315
- * 且当前最后一段无文件扩展名时合并。
316
- * 已知局限:`cp C:\data backup\old` 也可能被误合并。
317
- */
318
- function mergeSplitWindowsPaths(tokens) {
319
- const out = [];
320
- let i = 0;
321
- while (i < tokens.length) {
322
- let cur = tokens[i];
323
- while (i + 1 < tokens.length) {
324
- if (!/^[A-Za-z]:[\\/]/.test(cur) && !cur.startsWith('\\\\'))
325
- break;
326
- const next = tokens[i + 1];
327
- if (!next || next.startsWith('-') || next.startsWith('/'))
328
- break;
329
- if (/^[A-Za-z]:[\\/]/.test(next) || next.startsWith('\\\\'))
330
- break;
331
- if (!next.includes('\\') && !next.includes('/'))
332
- break;
333
- const lastSeg = cur.replace(/[\\/]+$/, '').split(/[\\/]/).pop() ?? '';
334
- if (lastSeg.includes('.'))
335
- break;
336
- cur = `${cur} ${next}`;
337
- i++;
338
- }
339
- out.push(cur);
340
- i++;
341
- }
342
- return out;
343
- }
344
- /**
345
- * bash 需要被 `\` 转义的元字符。
346
- * 其余字符前的 `\` 视为 Windows 路径分隔符并原样保留。
347
- */
348
- const BASH_ESCAPE_TARGETS = new Set([
349
- '"', "'", '$', '`', ' ', '\t', '\n',
350
- '|', '&', ';', '(', ')', '<', '>',
351
- ]);
352
- /**
353
- * 简单的 tokenizer
354
- *
355
- * 处理引号和转义字符。
356
- * Windows 路径(`C:\Windows`、`\\server\share`)中的 `\` 不会被吃掉——
357
- * 否则保护路径判定会拿到被拆坏的字符串。
358
- */
359
- function tokenize(raw) {
360
- const tokens = [];
361
- let current = '';
362
- let inSingleQuote = false;
363
- let inDoubleQuote = false;
364
- for (let i = 0; i < raw.length; i++) {
365
- const ch = raw[i];
366
- if (ch === '\\' && !inSingleQuote) {
367
- const next = raw[i + 1];
368
- if (next === undefined) {
369
- current += ch;
370
- break;
371
- }
372
- // 经典 bash 转义:吃掉 `\`,保留下一字符字面量
373
- if (BASH_ESCAPE_TARGETS.has(next)) {
374
- current += next;
375
- i++;
376
- continue;
377
- }
378
- // Windows 路径分隔符 / UNC:保留 `\`
379
- current += ch;
380
- continue;
381
- }
382
- if (ch === "'" && !inDoubleQuote) {
383
- inSingleQuote = !inSingleQuote;
384
- continue;
385
- }
386
- if (ch === '"' && !inSingleQuote) {
387
- inDoubleQuote = !inDoubleQuote;
388
- continue;
389
- }
390
- if ((ch === ' ' || ch === '\t') && !inSingleQuote && !inDoubleQuote) {
391
- if (current) {
392
- tokens.push(current);
393
- current = '';
394
- }
395
- continue;
396
- }
397
- current += ch;
398
- }
399
- if (current) {
400
- tokens.push(current);
401
- }
402
- return tokens;
403
- }
404
- /**
405
- * 匹配 >file 或 >>file 格式(无空格的重定向)
406
- *
407
- * 同时识别文件描述符重定向(`2>&1`、`>&2`、`&>file`):
408
- * 它们是 IO 重定向,不是命令参数,更不是「未知命令」。
409
- */
410
- function matchRedirect(token) {
411
- // `&>` / `&>>`:bash 重定向合一
412
- if (token.startsWith('&>>')) {
413
- return { type: 'append', target: token.slice(3) };
414
- }
415
- if (token.startsWith('&>') && token.length > 2) {
416
- return { type: 'overwrite', target: token.slice(2) };
417
- }
418
- // 文件描述符重定向:`2>&1`、`>&2`、`1>&2` 等
419
- // target 用 fd: 标记,避免被当成路径做风险分类
420
- const fdDup = token.match(/^(\d*)>{1,2}&(\d+)$/);
421
- if (fdDup) {
422
- return {
423
- type: token.includes('>>') ? 'append' : 'overwrite',
424
- target: `fd:${fdDup[2]}`,
425
- };
426
- }
427
- // 先检查开头的重定向
428
- if (token.startsWith('>>')) {
429
- return { type: 'append', target: token.slice(2) };
430
- }
431
- if (token.startsWith('>') && token.length > 1) {
432
- return { type: 'overwrite', target: token.slice(1) };
433
- }
434
- if (token.startsWith('<') && token.length > 1) {
435
- return { type: 'input', target: token.slice(1) };
436
- }
437
- // 检查 token 中间的重定向(如 hello>/tmp/out.txt);`>&N` 已由 fdDup 覆盖
438
- const gtIdx = token.indexOf('>');
439
- if (gtIdx > 0 && gtIdx < token.length - 1) {
440
- if (token[gtIdx + 1] === '&') {
441
- return null;
442
- }
443
- if (token[gtIdx + 1] === '>') {
444
- return { type: 'append', target: token.slice(gtIdx + 2) };
445
- }
446
- return { type: 'overwrite', target: token.slice(gtIdx + 1) };
447
- }
448
- return null;
449
- }
450
- // ── 第四层:检测特殊模式 ──
451
- /**
452
- * 检测子 shell($(...) 或反引号)
453
- */
454
- function detectSubshell(cmd) {
455
- // $(...) 模式
456
- if (cmd.includes('$('))
457
- return true;
458
- // 反引号模式
459
- if (cmd.includes('`'))
460
- return true;
461
- return false;
462
- }
463
- /**
464
- * 检测后台执行
465
- */
466
- function detectBackground(cmd) {
467
- const trimmed = cmd.trim();
468
- return trimmed.endsWith('&') && !trimmed.endsWith('&&');
469
- }
470
- /**
471
- * 检测管道到解释器
472
- *
473
- * 不止 sh/bash,python/ruby/perl/node 等也是解释器。
474
- * curl ... | python3 和 curl ... | sh 本质相同(执行外部代码)。
475
- */
476
- function detectPipeToInterpreter(segments, connectors) {
477
- for (let i = 0; i < connectors.length; i++) {
478
- if (connectors[i] === '|') {
479
- const nextSeg = segments[i + 1];
480
- if (nextSeg && INTERPRETER_NAMES.has(nextSeg.command) && nextSeg.args.length === 0) {
481
- return true;
482
- }
483
- }
484
- }
485
- return false;
486
- }
487
- /**
488
- * 检测内联代码执行
489
- *
490
- * python -c "...", node -e "...", bash -c "...",
491
- * powershell -Command "...", cmd /c "..." 等。
492
- * 命令名大小写不敏感(Windows shell)。
493
- */
494
- function detectInlineCode(segments) {
495
- for (const seg of segments) {
496
- const flags = INLINE_CODE_FLAGS[seg.command] ??
497
- INLINE_CODE_FLAGS[seg.command.toLowerCase()];
498
- if (!flags)
499
- continue;
500
- const argSet = new Set(seg.args.map((a) => a.toLowerCase()));
501
- if (flags.some((f) => argSet.has(f.toLowerCase()))) {
502
- return true;
503
- }
504
- }
505
- return false;
25
+ if (isShellParserReady()) {
26
+ const parsed = parseShellCommandWithTreeSitter(raw);
27
+ if (parsed)
28
+ return parsed;
29
+ // tree-sitter 无法确定性解析该输入:回退 fallback 并标记不确定,
30
+ // 让风险分档把「解析不确定」显式计入(未知走 unknown 通道,不静默)。
31
+ return { ...parseShellCommandFallback(raw), uncertain: true };
32
+ }
33
+ return parseShellCommandFallback(raw);
506
34
  }
507
35
  // ── 导出工具函数 ──
508
36
  /**
509
37
  * 获取所有命令名(不含 wrapper)
38
+ *
39
+ * @param parsed - 解析结果
40
+ * @returns 命令名列表
510
41
  */
511
42
  export function getCommandNames(parsed) {
512
43
  return parsed.segments.map(s => s.command);
513
44
  }
514
45
  /**
515
- * 获取所有重定向目标路径
46
+ * 获取所有重定向目标路径(含未挂载到命令段的孤立重定向)
47
+ *
48
+ * @param parsed - 解析结果
49
+ * @returns 重定向目标列表
516
50
  */
517
51
  export function getRedirectTargets(parsed) {
518
- return parsed.segments.flatMap(s => s.redirects.map(r => r.target));
52
+ return [
53
+ ...parsed.segments.flatMap(s => s.redirects.map(r => r.target)),
54
+ ...(parsed.orphanRedirects ?? []).map(r => r.target),
55
+ ];
519
56
  }
520
57
  /**
521
58
  * 判断命令是否包含指定的命令名
59
+ *
60
+ * @param parsed - 解析结果
61
+ * @param command - 命令名
62
+ * @returns 是否包含
522
63
  */
523
64
  export function hasCommand(parsed, command) {
524
65
  return parsed.segments.some(s => s.command === command);
@@ -30,6 +30,15 @@ export declare function ensureTrailingSep(p: string): string;
30
30
  * Windows 风格路径大小写不敏感、分隔符归一为 `\`。
31
31
  */
32
32
  export declare function startsWithPathPrefix(path: string, prefix: string): boolean;
33
+ /**
34
+ * 当前用户 home(用户目录推导的单一来源)
35
+ *
36
+ * 实现与测试共用,防两侧推导漂移:env 被清洗(HOME 缺失)时实现落 `homedir()`、
37
+ * 测试若走 `?? ''` 就会分叉(曾在 darwin 上把测试打挂)。
38
+ *
39
+ * @returns 用户 home 目录(原始分隔符风格)
40
+ */
41
+ export declare function currentUserHome(): string;
33
42
  /**
34
43
  * 临时目录前缀清单
35
44
  *
@@ -68,6 +68,18 @@ export function startsWithPathPrefix(path, prefix) {
68
68
  return true;
69
69
  return p.startsWith(b + '/');
70
70
  }
71
+ /**
72
+ * 当前用户 home(用户目录推导的单一来源)
73
+ *
74
+ * 实现与测试共用,防两侧推导漂移:env 被清洗(HOME 缺失)时实现落 `homedir()`、
75
+ * 测试若走 `?? ''` 就会分叉(曾在 darwin 上把测试打挂)。
76
+ *
77
+ * @returns 用户 home 目录(原始分隔符风格)
78
+ */
79
+ export function currentUserHome() {
80
+ // `||` 而非 `??`:HOME 为空串时视为未设置,回落 homedir()(旧实现同语义)
81
+ return process.env.USERPROFILE || process.env.HOME || homedir();
82
+ }
71
83
  /**
72
84
  * 临时目录前缀清单
73
85
  *
@@ -101,8 +113,7 @@ export function getTempPrefixes() {
101
113
  prefixes.push(ensureTrailingSep(systemRoot) + 'Temp\\');
102
114
  }
103
115
  // 用户 AppData Temp(无 TEMP 环境变量时的静态路径)
104
- const userProfile = process.env.USERPROFILE ?? process.env.HOME;
105
- const home = userProfile ? userProfile.replace(/\//g, '\\') : homedir().replace(/\//g, '\\');
116
+ const home = currentUserHome().replace(/\//g, '\\');
106
117
  if (home) {
107
118
  const base = home.endsWith('\\') ? home : home + '\\';
108
119
  prefixes.push(base + 'AppData\\Local\\Temp\\');
@@ -0,0 +1,24 @@
1
+ # Vendored: tree-sitter-bash.wasm
2
+
3
+ 主 shell 解析引擎(`shell-parser-treesitter.ts`)依赖的 bash 语法 WASM。
4
+
5
+ ## 溯源
6
+
7
+ | 项 | 值 |
8
+ |----|----|
9
+ | 语法上游 | `tree-sitter/tree-sitter-bash` tag **v0.25.1** (commit `a06c2e4415e9bc0346c6b86d401879ffb44058f7`, released 2025-12-02) |
10
+ | 构建来源 | npm `@2h2d/tree-sitter-wasms@0.2.1`("Verified, lifecycle-free Tree-sitter grammar WASMs",SLSA provenance attestation + trusted publishing) |
11
+ | 构建工具链 | tree-sitter 0.26.11 · wasi-sdk 33.0+m (llvm 22.1.0) · binaryen wasm-opt 131 |
12
+ | 文件 | `tree-sitter-bash.wasm` (1,358,594 bytes) |
13
+ | sha256 | `80f035925cb4b3ba1c5126e64189fbd8eab0c62a8c5881a8111658ca4697c8e8` |
14
+ | 许可 | `tree-sitter-bash.LICENSE.txt`(语法上游许可,MIT) |
15
+
16
+ `web-tree-sitter` 运行时(packages/engine dependency)版本需与语法 ABI 兼容,
17
+ 升级任一侧后跑 `tests/harness/shell-parser-treesitter.test.ts` 验证(含加载冒烟)。
18
+
19
+ ## 更新流程
20
+
21
+ 1. 从上游 `tree-sitter/tree-sitter-bash` 的 release tag 构建 wasm
22
+ (`tree-sitter build --wasm`,或采用带 provenance 证明的预编译源)。
23
+ 2. 替换本目录 `tree-sitter-bash.wasm`,更新上表(版本 / commit / sha256 / 构建工具链)。
24
+ 3. 跑 `npm run build`(copy-engine-assets 会把本目录拷入 dist)+ 安全测试全量。