@build-astron-co/nimbus 0.4.2 → 0.4.3

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 (430) hide show
  1. package/dist/src/agent/compaction-agent.js +24 -12
  2. package/dist/src/agent/context-manager.js +2 -1
  3. package/dist/src/agent/expand-files.js +2 -1
  4. package/dist/src/agent/loop.js +71 -33
  5. package/dist/src/agent/permissions.js +4 -2
  6. package/dist/src/agent/system-prompt.js +34 -17
  7. package/dist/src/app.js +1 -1
  8. package/dist/src/auth/keychain.js +8 -4
  9. package/dist/src/auth/store.js +70 -107
  10. package/dist/src/cli/init.js +35 -19
  11. package/dist/src/cli/run.js +18 -10
  12. package/dist/src/cli/serve.js +4 -2
  13. package/dist/src/cli.js +52 -11
  14. package/dist/src/commands/alias.js +5 -3
  15. package/dist/src/commands/audit/index.js +2 -1
  16. package/dist/src/commands/aws-terraform.js +36 -18
  17. package/dist/src/commands/completions.js +1 -1
  18. package/dist/src/commands/config.js +3 -2
  19. package/dist/src/commands/connect-github.js +92 -0
  20. package/dist/src/commands/cost/index.js +3 -2
  21. package/dist/src/commands/deploy.js +15 -10
  22. package/dist/src/commands/doctor.js +6 -3
  23. package/dist/src/commands/drift/index.js +2 -1
  24. package/dist/src/commands/export.js +5 -3
  25. package/dist/src/commands/generate-terraform.js +110 -2
  26. package/dist/src/commands/import.js +3 -3
  27. package/dist/src/commands/incident.js +10 -5
  28. package/dist/src/commands/login.js +8 -93
  29. package/dist/src/commands/logs.js +16 -8
  30. package/dist/src/commands/onboarding.js +6 -4
  31. package/dist/src/commands/pipeline.js +6 -3
  32. package/dist/src/commands/plugin.js +3 -2
  33. package/dist/src/commands/profile.js +27 -14
  34. package/dist/src/commands/questionnaire.js +1 -1
  35. package/dist/src/commands/rollback.js +3 -2
  36. package/dist/src/commands/rollout.js +5 -3
  37. package/dist/src/commands/runbook.js +17 -10
  38. package/dist/src/commands/schedule.js +10 -5
  39. package/dist/src/commands/status.js +2 -1
  40. package/dist/src/commands/team-context.js +12 -7
  41. package/dist/src/commands/template.js +1 -1
  42. package/dist/src/commands/tf/index.js +6 -3
  43. package/dist/src/commands/version.js +6 -3
  44. package/dist/src/commands/watch.js +6 -3
  45. package/dist/src/compat/sqlite.js +5 -3
  46. package/dist/src/config/mode-store.js +2 -1
  47. package/dist/src/config/profiles.js +4 -2
  48. package/dist/src/config/types.js +2 -1
  49. package/dist/src/engine/executor.js +8 -4
  50. package/dist/src/engine/planner.js +9 -5
  51. package/dist/src/llm/providers/anthropic.js +6 -3
  52. package/dist/src/llm/providers/ollama.js +1 -1
  53. package/dist/src/llm/router.js +22 -7
  54. package/dist/src/sessions/manager.js +6 -3
  55. package/dist/src/sharing/viewer.js +2 -1
  56. package/dist/src/tools/file-ops.js +1 -2
  57. package/dist/src/tools/schemas/devops.js +197 -108
  58. package/dist/src/tools/schemas/standard.js +1 -1
  59. package/dist/src/ui/App.js +25 -13
  60. package/dist/src/ui/FileDiffModal.js +22 -11
  61. package/dist/src/ui/HelpModal.js +2 -1
  62. package/dist/src/ui/InputBox.js +6 -3
  63. package/dist/src/ui/MessageList.js +40 -20
  64. package/dist/src/ui/TerminalPane.js +2 -1
  65. package/dist/src/ui/ToolCallDisplay.js +12 -6
  66. package/dist/src/ui/TreePane.js +2 -1
  67. package/dist/src/ui/ink/index.js +37 -21
  68. package/dist/src/watcher/index.js +8 -4
  69. package/package.json +3 -5
  70. package/src/__tests__/alias.test.ts +0 -133
  71. package/src/__tests__/app.test.ts +0 -76
  72. package/src/__tests__/audit.test.ts +0 -877
  73. package/src/__tests__/circuit-breaker.test.ts +0 -116
  74. package/src/__tests__/cli-run.test.ts +0 -351
  75. package/src/__tests__/compat-sqlite.test.ts +0 -68
  76. package/src/__tests__/context-manager.test.ts +0 -632
  77. package/src/__tests__/context.test.ts +0 -242
  78. package/src/__tests__/devops-terminal-gaps.test.ts +0 -718
  79. package/src/__tests__/doctor.test.ts +0 -48
  80. package/src/__tests__/enterprise.test.ts +0 -401
  81. package/src/__tests__/export.test.ts +0 -236
  82. package/src/__tests__/gap-11-18-20.test.ts +0 -958
  83. package/src/__tests__/generator.test.ts +0 -433
  84. package/src/__tests__/helm-streaming.test.ts +0 -127
  85. package/src/__tests__/hooks.test.ts +0 -582
  86. package/src/__tests__/incident.test.ts +0 -179
  87. package/src/__tests__/init.test.ts +0 -487
  88. package/src/__tests__/intent-parser.test.ts +0 -229
  89. package/src/__tests__/llm-router.test.ts +0 -209
  90. package/src/__tests__/logs.test.ts +0 -107
  91. package/src/__tests__/loop-errors.test.ts +0 -244
  92. package/src/__tests__/lsp.test.ts +0 -293
  93. package/src/__tests__/modes.test.ts +0 -336
  94. package/src/__tests__/perf-optimizations.test.ts +0 -847
  95. package/src/__tests__/permissions.test.ts +0 -338
  96. package/src/__tests__/pipeline.test.ts +0 -50
  97. package/src/__tests__/polish-phase3.test.ts +0 -340
  98. package/src/__tests__/profile.test.ts +0 -237
  99. package/src/__tests__/rollback.test.ts +0 -83
  100. package/src/__tests__/runbook.test.ts +0 -219
  101. package/src/__tests__/schedule.test.ts +0 -206
  102. package/src/__tests__/serve.test.ts +0 -275
  103. package/src/__tests__/sessions.test.ts +0 -322
  104. package/src/__tests__/sharing.test.ts +0 -340
  105. package/src/__tests__/snapshots.test.ts +0 -581
  106. package/src/__tests__/standalone-migration.test.ts +0 -199
  107. package/src/__tests__/state-db.test.ts +0 -334
  108. package/src/__tests__/status.test.ts +0 -158
  109. package/src/__tests__/stream-with-tools.test.ts +0 -778
  110. package/src/__tests__/subagents.test.ts +0 -176
  111. package/src/__tests__/system-prompt.test.ts +0 -248
  112. package/src/__tests__/terminal-gap-v2.test.ts +0 -395
  113. package/src/__tests__/terminal-parity.test.ts +0 -393
  114. package/src/__tests__/tf-apply.test.ts +0 -187
  115. package/src/__tests__/tool-converter.test.ts +0 -256
  116. package/src/__tests__/tool-schemas.test.ts +0 -602
  117. package/src/__tests__/tools.test.ts +0 -144
  118. package/src/__tests__/version-json.test.ts +0 -184
  119. package/src/__tests__/version.test.ts +0 -49
  120. package/src/__tests__/watch.test.ts +0 -129
  121. package/src/agent/compaction-agent.ts +0 -266
  122. package/src/agent/context-manager.ts +0 -499
  123. package/src/agent/context.ts +0 -427
  124. package/src/agent/deploy-preview.ts +0 -487
  125. package/src/agent/expand-files.ts +0 -108
  126. package/src/agent/index.ts +0 -68
  127. package/src/agent/loop.ts +0 -1998
  128. package/src/agent/modes.ts +0 -429
  129. package/src/agent/permissions.ts +0 -513
  130. package/src/agent/subagents/base.ts +0 -116
  131. package/src/agent/subagents/cost.ts +0 -51
  132. package/src/agent/subagents/explore.ts +0 -42
  133. package/src/agent/subagents/general.ts +0 -54
  134. package/src/agent/subagents/index.ts +0 -102
  135. package/src/agent/subagents/infra.ts +0 -59
  136. package/src/agent/subagents/security.ts +0 -69
  137. package/src/agent/system-prompt.ts +0 -990
  138. package/src/app.ts +0 -180
  139. package/src/audit/activity-log.ts +0 -290
  140. package/src/audit/compliance-checker.ts +0 -540
  141. package/src/audit/cost-tracker.ts +0 -318
  142. package/src/audit/index.ts +0 -23
  143. package/src/audit/security-scanner.ts +0 -641
  144. package/src/auth/guard.ts +0 -75
  145. package/src/auth/index.ts +0 -56
  146. package/src/auth/keychain.ts +0 -82
  147. package/src/auth/oauth.ts +0 -465
  148. package/src/auth/providers.ts +0 -470
  149. package/src/auth/sso.ts +0 -113
  150. package/src/auth/store.ts +0 -505
  151. package/src/auth/types.ts +0 -187
  152. package/src/build.ts +0 -141
  153. package/src/cli/index.ts +0 -16
  154. package/src/cli/init.ts +0 -1227
  155. package/src/cli/openapi-spec.ts +0 -356
  156. package/src/cli/run.ts +0 -628
  157. package/src/cli/serve-auth.ts +0 -80
  158. package/src/cli/serve.ts +0 -539
  159. package/src/cli/web.ts +0 -71
  160. package/src/cli.ts +0 -1728
  161. package/src/clients/core-engine-client.ts +0 -227
  162. package/src/clients/enterprise-client.ts +0 -334
  163. package/src/clients/generator-client.ts +0 -351
  164. package/src/clients/git-client.ts +0 -627
  165. package/src/clients/github-client.ts +0 -410
  166. package/src/clients/helm-client.ts +0 -504
  167. package/src/clients/index.ts +0 -80
  168. package/src/clients/k8s-client.ts +0 -497
  169. package/src/clients/llm-client.ts +0 -161
  170. package/src/clients/rest-client.ts +0 -130
  171. package/src/clients/service-discovery.ts +0 -38
  172. package/src/clients/terraform-client.ts +0 -482
  173. package/src/clients/tools-client.ts +0 -1843
  174. package/src/clients/ws-client.ts +0 -115
  175. package/src/commands/alias.ts +0 -100
  176. package/src/commands/analyze/index.ts +0 -352
  177. package/src/commands/apply/helm.ts +0 -473
  178. package/src/commands/apply/index.ts +0 -213
  179. package/src/commands/apply/k8s.ts +0 -454
  180. package/src/commands/apply/terraform.ts +0 -582
  181. package/src/commands/ask.ts +0 -167
  182. package/src/commands/audit/index.ts +0 -357
  183. package/src/commands/auth-cloud.ts +0 -407
  184. package/src/commands/auth-list.ts +0 -134
  185. package/src/commands/auth-profile.ts +0 -121
  186. package/src/commands/auth-refresh.ts +0 -187
  187. package/src/commands/auth-status.ts +0 -141
  188. package/src/commands/aws/ec2.ts +0 -501
  189. package/src/commands/aws/iam.ts +0 -397
  190. package/src/commands/aws/index.ts +0 -133
  191. package/src/commands/aws/lambda.ts +0 -396
  192. package/src/commands/aws/rds.ts +0 -439
  193. package/src/commands/aws/s3.ts +0 -439
  194. package/src/commands/aws/vpc.ts +0 -393
  195. package/src/commands/aws-discover.ts +0 -542
  196. package/src/commands/aws-terraform.ts +0 -755
  197. package/src/commands/azure/aks.ts +0 -376
  198. package/src/commands/azure/functions.ts +0 -253
  199. package/src/commands/azure/index.ts +0 -116
  200. package/src/commands/azure/storage.ts +0 -478
  201. package/src/commands/azure/vm.ts +0 -355
  202. package/src/commands/billing/index.ts +0 -256
  203. package/src/commands/chat.ts +0 -320
  204. package/src/commands/completions.ts +0 -268
  205. package/src/commands/config.ts +0 -372
  206. package/src/commands/cost/cloud-cost-estimator.ts +0 -266
  207. package/src/commands/cost/estimator.ts +0 -79
  208. package/src/commands/cost/index.ts +0 -810
  209. package/src/commands/cost/parsers/terraform.ts +0 -273
  210. package/src/commands/cost/parsers/types.ts +0 -25
  211. package/src/commands/cost/pricing/aws.ts +0 -544
  212. package/src/commands/cost/pricing/azure.ts +0 -499
  213. package/src/commands/cost/pricing/gcp.ts +0 -396
  214. package/src/commands/cost/pricing/index.ts +0 -40
  215. package/src/commands/demo.ts +0 -250
  216. package/src/commands/deploy.ts +0 -260
  217. package/src/commands/doctor.ts +0 -1386
  218. package/src/commands/drift/index.ts +0 -787
  219. package/src/commands/explain.ts +0 -277
  220. package/src/commands/export.ts +0 -146
  221. package/src/commands/feedback.ts +0 -389
  222. package/src/commands/fix.ts +0 -324
  223. package/src/commands/fs/index.ts +0 -402
  224. package/src/commands/gcp/compute.ts +0 -325
  225. package/src/commands/gcp/functions.ts +0 -271
  226. package/src/commands/gcp/gke.ts +0 -438
  227. package/src/commands/gcp/iam.ts +0 -344
  228. package/src/commands/gcp/index.ts +0 -129
  229. package/src/commands/gcp/storage.ts +0 -284
  230. package/src/commands/generate-helm.ts +0 -1249
  231. package/src/commands/generate-k8s.ts +0 -1508
  232. package/src/commands/generate-terraform.ts +0 -1202
  233. package/src/commands/gh/index.ts +0 -863
  234. package/src/commands/git/index.ts +0 -1343
  235. package/src/commands/helm/index.ts +0 -1126
  236. package/src/commands/help.ts +0 -715
  237. package/src/commands/history.ts +0 -149
  238. package/src/commands/import.ts +0 -868
  239. package/src/commands/incident.ts +0 -166
  240. package/src/commands/index.ts +0 -367
  241. package/src/commands/init.ts +0 -1051
  242. package/src/commands/k8s/index.ts +0 -1137
  243. package/src/commands/login.ts +0 -716
  244. package/src/commands/logout.ts +0 -83
  245. package/src/commands/logs.ts +0 -167
  246. package/src/commands/onboarding.ts +0 -405
  247. package/src/commands/pipeline.ts +0 -186
  248. package/src/commands/plan/display.ts +0 -279
  249. package/src/commands/plan/index.ts +0 -599
  250. package/src/commands/plugin.ts +0 -398
  251. package/src/commands/preview.ts +0 -452
  252. package/src/commands/profile.ts +0 -342
  253. package/src/commands/questionnaire.ts +0 -1172
  254. package/src/commands/resume.ts +0 -47
  255. package/src/commands/rollback.ts +0 -315
  256. package/src/commands/rollout.ts +0 -88
  257. package/src/commands/runbook.ts +0 -346
  258. package/src/commands/schedule.ts +0 -236
  259. package/src/commands/status.ts +0 -252
  260. package/src/commands/team/index.ts +0 -346
  261. package/src/commands/team-context.ts +0 -220
  262. package/src/commands/template.ts +0 -233
  263. package/src/commands/tf/index.ts +0 -1093
  264. package/src/commands/upgrade.ts +0 -609
  265. package/src/commands/usage/index.ts +0 -134
  266. package/src/commands/version.ts +0 -174
  267. package/src/commands/watch.ts +0 -153
  268. package/src/compat/index.ts +0 -2
  269. package/src/compat/runtime.ts +0 -12
  270. package/src/compat/sqlite.ts +0 -177
  271. package/src/config/index.ts +0 -17
  272. package/src/config/manager.ts +0 -530
  273. package/src/config/mode-store.ts +0 -62
  274. package/src/config/profiles.ts +0 -84
  275. package/src/config/safety-policy.ts +0 -358
  276. package/src/config/schema.ts +0 -125
  277. package/src/config/types.ts +0 -609
  278. package/src/config/workspace-state.ts +0 -53
  279. package/src/context/context-db.ts +0 -199
  280. package/src/demo/index.ts +0 -349
  281. package/src/demo/scenarios/full-journey.ts +0 -229
  282. package/src/demo/scenarios/getting-started.ts +0 -127
  283. package/src/demo/scenarios/helm-release.ts +0 -341
  284. package/src/demo/scenarios/k8s-deployment.ts +0 -194
  285. package/src/demo/scenarios/terraform-vpc.ts +0 -170
  286. package/src/demo/types.ts +0 -92
  287. package/src/engine/cost-estimator.ts +0 -480
  288. package/src/engine/diagram-generator.ts +0 -256
  289. package/src/engine/drift-detector.ts +0 -902
  290. package/src/engine/executor.ts +0 -1066
  291. package/src/engine/index.ts +0 -76
  292. package/src/engine/orchestrator.ts +0 -636
  293. package/src/engine/planner.ts +0 -787
  294. package/src/engine/safety.ts +0 -743
  295. package/src/engine/verifier.ts +0 -770
  296. package/src/enterprise/audit.ts +0 -348
  297. package/src/enterprise/auth.ts +0 -270
  298. package/src/enterprise/billing.ts +0 -822
  299. package/src/enterprise/index.ts +0 -17
  300. package/src/enterprise/teams.ts +0 -443
  301. package/src/generator/best-practices.ts +0 -1608
  302. package/src/generator/helm.ts +0 -630
  303. package/src/generator/index.ts +0 -37
  304. package/src/generator/intent-parser.ts +0 -514
  305. package/src/generator/kubernetes.ts +0 -976
  306. package/src/generator/terraform.ts +0 -1875
  307. package/src/history/index.ts +0 -8
  308. package/src/history/manager.ts +0 -250
  309. package/src/history/types.ts +0 -34
  310. package/src/hooks/config.ts +0 -432
  311. package/src/hooks/engine.ts +0 -392
  312. package/src/hooks/index.ts +0 -4
  313. package/src/llm/auth-bridge.ts +0 -198
  314. package/src/llm/circuit-breaker.ts +0 -140
  315. package/src/llm/config-loader.ts +0 -201
  316. package/src/llm/cost-calculator.ts +0 -171
  317. package/src/llm/index.ts +0 -8
  318. package/src/llm/model-aliases.ts +0 -115
  319. package/src/llm/provider-registry.ts +0 -63
  320. package/src/llm/providers/anthropic.ts +0 -462
  321. package/src/llm/providers/bedrock.ts +0 -477
  322. package/src/llm/providers/google.ts +0 -405
  323. package/src/llm/providers/ollama.ts +0 -767
  324. package/src/llm/providers/openai-compatible.ts +0 -340
  325. package/src/llm/providers/openai.ts +0 -328
  326. package/src/llm/providers/openrouter.ts +0 -338
  327. package/src/llm/router.ts +0 -1104
  328. package/src/llm/types.ts +0 -232
  329. package/src/lsp/client.ts +0 -298
  330. package/src/lsp/languages.ts +0 -119
  331. package/src/lsp/manager.ts +0 -294
  332. package/src/mcp/client.ts +0 -402
  333. package/src/mcp/index.ts +0 -5
  334. package/src/mcp/manager.ts +0 -133
  335. package/src/nimbus.ts +0 -234
  336. package/src/plugins/index.ts +0 -27
  337. package/src/plugins/loader.ts +0 -334
  338. package/src/plugins/manager.ts +0 -376
  339. package/src/plugins/types.ts +0 -284
  340. package/src/scanners/cicd-scanner.ts +0 -258
  341. package/src/scanners/cloud-scanner.ts +0 -466
  342. package/src/scanners/framework-scanner.ts +0 -469
  343. package/src/scanners/iac-scanner.ts +0 -388
  344. package/src/scanners/index.ts +0 -539
  345. package/src/scanners/language-scanner.ts +0 -276
  346. package/src/scanners/package-manager-scanner.ts +0 -277
  347. package/src/scanners/types.ts +0 -172
  348. package/src/sessions/manager.ts +0 -472
  349. package/src/sessions/types.ts +0 -44
  350. package/src/sharing/sync.ts +0 -300
  351. package/src/sharing/viewer.ts +0 -163
  352. package/src/snapshots/index.ts +0 -2
  353. package/src/snapshots/manager.ts +0 -530
  354. package/src/state/artifacts.ts +0 -147
  355. package/src/state/audit.ts +0 -137
  356. package/src/state/billing.ts +0 -240
  357. package/src/state/checkpoints.ts +0 -117
  358. package/src/state/config.ts +0 -67
  359. package/src/state/conversations.ts +0 -14
  360. package/src/state/credentials.ts +0 -154
  361. package/src/state/db.ts +0 -58
  362. package/src/state/index.ts +0 -26
  363. package/src/state/messages.ts +0 -115
  364. package/src/state/projects.ts +0 -123
  365. package/src/state/schema.ts +0 -236
  366. package/src/state/sessions.ts +0 -147
  367. package/src/state/teams.ts +0 -200
  368. package/src/telemetry.ts +0 -108
  369. package/src/tools/aws-ops.ts +0 -952
  370. package/src/tools/azure-ops.ts +0 -579
  371. package/src/tools/file-ops.ts +0 -615
  372. package/src/tools/gcp-ops.ts +0 -625
  373. package/src/tools/git-ops.ts +0 -773
  374. package/src/tools/github-ops.ts +0 -799
  375. package/src/tools/helm-ops.ts +0 -943
  376. package/src/tools/index.ts +0 -17
  377. package/src/tools/k8s-ops.ts +0 -819
  378. package/src/tools/schemas/converter.ts +0 -184
  379. package/src/tools/schemas/devops.ts +0 -3502
  380. package/src/tools/schemas/index.ts +0 -73
  381. package/src/tools/schemas/standard.ts +0 -1148
  382. package/src/tools/schemas/types.ts +0 -735
  383. package/src/tools/spawn-exec.ts +0 -148
  384. package/src/tools/terraform-ops.ts +0 -862
  385. package/src/types/ambient.d.ts +0 -193
  386. package/src/types/config.ts +0 -83
  387. package/src/types/drift.ts +0 -116
  388. package/src/types/enterprise.ts +0 -335
  389. package/src/types/index.ts +0 -20
  390. package/src/types/plan.ts +0 -44
  391. package/src/types/request.ts +0 -65
  392. package/src/types/response.ts +0 -54
  393. package/src/types/service.ts +0 -51
  394. package/src/ui/App.tsx +0 -2114
  395. package/src/ui/DeployPreview.tsx +0 -174
  396. package/src/ui/FileDiffModal.tsx +0 -162
  397. package/src/ui/Header.tsx +0 -131
  398. package/src/ui/HelpModal.tsx +0 -57
  399. package/src/ui/InputBox.tsx +0 -503
  400. package/src/ui/MessageList.tsx +0 -1032
  401. package/src/ui/PermissionPrompt.tsx +0 -163
  402. package/src/ui/StatusBar.tsx +0 -277
  403. package/src/ui/TerminalPane.tsx +0 -84
  404. package/src/ui/ToolCallDisplay.tsx +0 -643
  405. package/src/ui/TreePane.tsx +0 -132
  406. package/src/ui/chat-ui.ts +0 -850
  407. package/src/ui/index.ts +0 -33
  408. package/src/ui/ink/index.ts +0 -1444
  409. package/src/ui/streaming.ts +0 -176
  410. package/src/ui/theme.ts +0 -104
  411. package/src/ui/types.ts +0 -75
  412. package/src/utils/analytics.ts +0 -72
  413. package/src/utils/cost-warning.ts +0 -27
  414. package/src/utils/env.ts +0 -46
  415. package/src/utils/errors.ts +0 -69
  416. package/src/utils/event-bus.ts +0 -38
  417. package/src/utils/index.ts +0 -24
  418. package/src/utils/logger.ts +0 -171
  419. package/src/utils/rate-limiter.ts +0 -121
  420. package/src/utils/service-auth.ts +0 -49
  421. package/src/utils/validation.ts +0 -53
  422. package/src/version.ts +0 -4
  423. package/src/watcher/index.ts +0 -214
  424. package/src/wizard/approval.ts +0 -383
  425. package/src/wizard/index.ts +0 -25
  426. package/src/wizard/prompts.ts +0 -338
  427. package/src/wizard/types.ts +0 -172
  428. package/src/wizard/ui.ts +0 -556
  429. package/src/wizard/wizard.ts +0 -304
  430. package/tsconfig.json +0 -24
@@ -1,767 +0,0 @@
1
- /**
2
- * Ollama Provider
3
- * Supports local Ollama models: Llama 3.2, CodeLlama, Mistral, etc.
4
- */
5
-
6
- import {
7
- BaseProvider,
8
- getTextContent,
9
- type CompletionRequest,
10
- type LLMMessage,
11
- type LLMResponse,
12
- type StreamChunk,
13
- type ToolCall,
14
- type ToolCompletionRequest,
15
- type ToolDefinition,
16
- } from '../types';
17
- import { getProviderBaseUrl } from '../auth-bridge';
18
-
19
- export class OllamaProvider extends BaseProvider {
20
- name = 'ollama';
21
- private baseUrl: string;
22
- private defaultModel = 'llama3.2';
23
-
24
- constructor(baseUrl?: string) {
25
- super();
26
- this.baseUrl =
27
- baseUrl ||
28
- getProviderBaseUrl('ollama') ||
29
- process.env.OLLAMA_BASE_URL ||
30
- 'http://localhost:11434';
31
- }
32
-
33
- async complete(request: CompletionRequest): Promise<LLMResponse> {
34
- const messages = this.convertMessages(request.messages);
35
-
36
- const controller = new AbortController();
37
- const timeoutId = setTimeout(() => controller.abort(), 120000); // 2 minute timeout
38
-
39
- try {
40
- const response = await fetch(`${this.baseUrl}/api/chat`, {
41
- method: 'POST',
42
- headers: { 'Content-Type': 'application/json' },
43
- body: JSON.stringify({
44
- model: request.model || this.defaultModel,
45
- messages,
46
- options: {
47
- temperature: request.temperature,
48
- num_predict: request.maxTokens,
49
- stop: request.stopSequences,
50
- },
51
- stream: false,
52
- }),
53
- signal: controller.signal,
54
- });
55
- clearTimeout(timeoutId);
56
-
57
- if (!response.ok) {
58
- throw new Error(`Ollama API error: ${response.status} ${await response.text()}`);
59
- }
60
-
61
- const data = (await response.json()) as {
62
- message: { content: string };
63
- model: string;
64
- prompt_eval_count?: number;
65
- eval_count?: number;
66
- };
67
-
68
- return {
69
- content: data.message.content,
70
- usage: {
71
- promptTokens: data.prompt_eval_count || 0,
72
- completionTokens: data.eval_count || 0,
73
- totalTokens: (data.prompt_eval_count || 0) + (data.eval_count || 0),
74
- },
75
- model: data.model,
76
- finishReason: 'stop',
77
- };
78
- } catch (error: any) {
79
- clearTimeout(timeoutId);
80
- if (error.name === 'AbortError') {
81
- throw new Error('Ollama request timed out after 120 seconds');
82
- }
83
- throw error;
84
- }
85
- }
86
-
87
- async *stream(request: CompletionRequest): AsyncIterable<StreamChunk> {
88
- const messages = this.convertMessages(request.messages);
89
-
90
- const response = await fetch(`${this.baseUrl}/api/chat`, {
91
- method: 'POST',
92
- headers: { 'Content-Type': 'application/json' },
93
- body: JSON.stringify({
94
- model: request.model || this.defaultModel,
95
- messages,
96
- options: {
97
- temperature: request.temperature,
98
- num_predict: request.maxTokens,
99
- },
100
- stream: true,
101
- }),
102
- });
103
-
104
- if (!response.ok) {
105
- throw new Error(`Ollama API error: ${response.status} ${await response.text()}`);
106
- }
107
-
108
- const reader = response.body?.getReader();
109
- if (!reader) {
110
- throw new Error('No response body');
111
- }
112
-
113
- const decoder = new TextDecoder();
114
- let buffer = '';
115
-
116
- while (true) {
117
- const { done, value } = await reader.read();
118
- if (done) {
119
- break;
120
- }
121
-
122
- buffer += decoder.decode(value, { stream: true });
123
- const lines = buffer.split('\n');
124
-
125
- // Keep the last incomplete line in the buffer
126
- buffer = lines.pop() || '';
127
-
128
- for (const line of lines) {
129
- if (!line.trim()) {
130
- continue;
131
- }
132
-
133
- try {
134
- const data = JSON.parse(line);
135
-
136
- if (data.message?.content) {
137
- yield {
138
- content: data.message.content,
139
- done: false,
140
- };
141
- }
142
-
143
- if (data.done) {
144
- yield { done: true };
145
- }
146
- } catch (e) {
147
- // Ignore malformed JSON lines
148
- continue;
149
- }
150
- }
151
- }
152
- }
153
-
154
- async completeWithTools(request: ToolCompletionRequest): Promise<LLMResponse> {
155
- // Try native Ollama tool calling first (supported by llama3.x, mistral, etc.)
156
- try {
157
- const nativeResult = await this.completeWithNativeTools(request);
158
- if (nativeResult) {
159
- return nativeResult;
160
- }
161
- } catch {
162
- // Native tool calling not supported by this model — fall through
163
- }
164
-
165
- // Fallback: prompt engineering approach for models without native tool support
166
- const toolPrompt = this.buildToolPrompt(request.tools);
167
- const modifiedRequest: CompletionRequest = {
168
- ...request,
169
- messages: [{ role: 'system', content: toolPrompt }, ...request.messages],
170
- };
171
-
172
- const response = await this.complete(modifiedRequest);
173
-
174
- // Attempt to extract tool calls from the text response. If extraction
175
- // fails for any reason (malformed JSON, unexpected structure, etc.),
176
- // return the raw text so the agent loop can still display it.
177
- let toolCalls: ToolCall[] = [];
178
- try {
179
- toolCalls = this.extractToolCalls(response.content);
180
- } catch {
181
- // Extraction failed -- return the original text as a plain response
182
- return response;
183
- }
184
-
185
- return {
186
- ...response,
187
- content: toolCalls.length > 0 ? '' : response.content,
188
- toolCalls: toolCalls.length > 0 ? toolCalls : undefined,
189
- };
190
- }
191
-
192
- /**
193
- * Attempt native Ollama tool calling via the /api/chat tools parameter.
194
- * Returns null if the model doesn't support tools (response has no tool_calls).
195
- */
196
- private async completeWithNativeTools(
197
- request: ToolCompletionRequest
198
- ): Promise<LLMResponse | null> {
199
- const messages = this.convertMessages(request.messages);
200
- const tools = request.tools.map(t => ({
201
- type: 'function',
202
- function: {
203
- name: t.function.name,
204
- description: t.function.description,
205
- parameters: t.function.parameters,
206
- },
207
- }));
208
-
209
- const controller = new AbortController();
210
- const timeoutId = setTimeout(() => controller.abort(), 120000);
211
-
212
- try {
213
- const response = await fetch(`${this.baseUrl}/api/chat`, {
214
- method: 'POST',
215
- headers: { 'Content-Type': 'application/json' },
216
- body: JSON.stringify({
217
- model: request.model || this.defaultModel,
218
- messages,
219
- tools,
220
- options: {
221
- temperature: request.temperature,
222
- num_predict: request.maxTokens,
223
- },
224
- stream: false,
225
- }),
226
- signal: controller.signal,
227
- });
228
- clearTimeout(timeoutId);
229
-
230
- if (!response.ok) {
231
- return null;
232
- }
233
-
234
- const data = (await response.json()) as {
235
- message?: {
236
- content?: string;
237
- tool_calls?: Array<{
238
- function: { name: string; arguments: Record<string, unknown> };
239
- }>;
240
- };
241
- model: string;
242
- prompt_eval_count?: number;
243
- eval_count?: number;
244
- };
245
- const msg = data.message;
246
-
247
- // If no tool_calls in response, native tools aren't working
248
- if (!msg?.tool_calls || msg.tool_calls.length === 0) {
249
- return null;
250
- }
251
-
252
- const toolCalls: ToolCall[] = msg.tool_calls.map(tc => ({
253
- id: crypto.randomUUID(),
254
- type: 'function' as const,
255
- function: {
256
- name: tc.function.name,
257
- arguments: JSON.stringify(tc.function.arguments),
258
- },
259
- }));
260
-
261
- return {
262
- content: msg.content || '',
263
- toolCalls,
264
- usage: {
265
- promptTokens: data.prompt_eval_count || 0,
266
- completionTokens: data.eval_count || 0,
267
- totalTokens: (data.prompt_eval_count || 0) + (data.eval_count || 0),
268
- },
269
- model: data.model,
270
- finishReason: 'tool_calls',
271
- };
272
- } catch {
273
- clearTimeout(timeoutId);
274
- return null;
275
- }
276
- }
277
-
278
- /**
279
- * Stream a chat completion with tool calling support.
280
- * Attempts native Ollama tool streaming via the OpenAI-compatible endpoint first.
281
- * Falls back to the non-streaming completeWithTools for models without native
282
- * tool support, yielding the result as a single chunk.
283
- */
284
- async *streamWithTools(request: ToolCompletionRequest): AsyncGenerator<StreamChunk> {
285
- // Try native streaming with tools via the OpenAI-compatible endpoint
286
- try {
287
- const nativeStream = this.streamWithNativeTools(request);
288
- let gotToolCalls = false;
289
-
290
- for await (const chunk of nativeStream) {
291
- if (chunk.toolCalls && chunk.toolCalls.length > 0) {
292
- gotToolCalls = true;
293
- }
294
- yield chunk;
295
- }
296
-
297
- // If we successfully streamed (even without tool calls), we're done
298
- if (gotToolCalls) {
299
- return;
300
- }
301
-
302
- // If the native stream completed without any tool calls, it may mean
303
- // the model answered with text only, which is a valid response — return.
304
- return;
305
- } catch {
306
- // Native streaming not supported — fall through to fallback
307
- }
308
-
309
- // Fallback: use non-streaming completeWithTools and yield as a single chunk
310
- const response = await this.completeWithTools(request);
311
- if (response.content) {
312
- yield { content: response.content, done: false };
313
- }
314
- yield {
315
- done: true,
316
- toolCalls: response.toolCalls,
317
- usage: response.usage,
318
- };
319
- }
320
-
321
- /**
322
- * Stream with native tool calling via the Ollama OpenAI-compatible endpoint.
323
- * Uses fetch + SSE parsing against /v1/chat/completions with stream: true.
324
- */
325
- private async *streamWithNativeTools(
326
- request: ToolCompletionRequest
327
- ): AsyncGenerator<StreamChunk> {
328
- const messages = this.convertMessages(request.messages);
329
- const tools = request.tools.map(t => ({
330
- type: 'function',
331
- function: {
332
- name: t.function.name,
333
- description: t.function.description,
334
- parameters: t.function.parameters,
335
- },
336
- }));
337
-
338
- const response = await fetch(`${this.baseUrl}/v1/chat/completions`, {
339
- method: 'POST',
340
- headers: { 'Content-Type': 'application/json' },
341
- body: JSON.stringify({
342
- model: request.model || this.defaultModel,
343
- messages,
344
- tools,
345
- tool_choice: request.toolChoice || 'auto',
346
- max_tokens: request.maxTokens,
347
- temperature: request.temperature,
348
- stream: true,
349
- }),
350
- });
351
-
352
- if (!response.ok) {
353
- throw new Error(
354
- `Ollama OpenAI-compatible API error: ${response.status} ${await response.text()}`
355
- );
356
- }
357
-
358
- const reader = response.body?.getReader();
359
- if (!reader) {
360
- throw new Error('No response body');
361
- }
362
-
363
- const decoder = new TextDecoder();
364
- let buffer = '';
365
-
366
- const toolCallAccumulator = new Map<number, { id: string; name: string; arguments: string }>();
367
- let usage: StreamChunk['usage'] | undefined;
368
-
369
- while (true) {
370
- const { done, value } = await reader.read();
371
- if (done) {
372
- break;
373
- }
374
-
375
- buffer += decoder.decode(value, { stream: true });
376
- const lines = buffer.split('\n');
377
-
378
- // Keep the last incomplete line in the buffer
379
- buffer = lines.pop() || '';
380
-
381
- for (const line of lines) {
382
- const trimmed = line.trim();
383
- if (!trimmed || trimmed === 'data: [DONE]') {
384
- continue;
385
- }
386
- if (!trimmed.startsWith('data: ')) {
387
- continue;
388
- }
389
-
390
- try {
391
- const data = JSON.parse(trimmed.slice(6));
392
- const delta = data.choices?.[0]?.delta;
393
- const finishReason = data.choices?.[0]?.finish_reason;
394
-
395
- if (delta?.content) {
396
- yield { content: delta.content, done: false };
397
- }
398
-
399
- if (delta?.tool_calls) {
400
- for (const tc of delta.tool_calls) {
401
- const index = tc.index ?? 0;
402
- const existing = toolCallAccumulator.get(index);
403
- if (existing) {
404
- if (tc.function?.arguments) {
405
- existing.arguments += tc.function.arguments;
406
- }
407
- } else {
408
- toolCallAccumulator.set(index, {
409
- id: tc.id || crypto.randomUUID(),
410
- name: tc.function?.name || '',
411
- arguments: tc.function?.arguments || '',
412
- });
413
- }
414
- }
415
- }
416
-
417
- if (data.usage) {
418
- usage = {
419
- promptTokens: data.usage.prompt_tokens || 0,
420
- completionTokens: data.usage.completion_tokens || 0,
421
- totalTokens: data.usage.total_tokens || 0,
422
- };
423
- }
424
-
425
- if (finishReason) {
426
- const toolCalls =
427
- toolCallAccumulator.size > 0
428
- ? Array.from(toolCallAccumulator.values()).map(tc => ({
429
- id: tc.id,
430
- type: 'function' as const,
431
- function: { name: tc.name, arguments: tc.arguments },
432
- }))
433
- : undefined;
434
- yield { done: true, toolCalls, usage };
435
- return;
436
- }
437
- } catch {
438
- // Ignore malformed SSE lines
439
- continue;
440
- }
441
- }
442
- }
443
-
444
- // If we reach here without a finishReason, emit a final done chunk
445
- const toolCalls =
446
- toolCallAccumulator.size > 0
447
- ? Array.from(toolCallAccumulator.values()).map(tc => ({
448
- id: tc.id,
449
- type: 'function' as const,
450
- function: { name: tc.name, arguments: tc.arguments },
451
- }))
452
- : undefined;
453
- yield { done: true, toolCalls, usage };
454
- }
455
-
456
- async countTokens(text: string): Promise<number> {
457
- try {
458
- // Use gpt-tokenizer (already a dependency) for better approximation
459
- const { encode } = await import('gpt-tokenizer');
460
- return encode(text).length;
461
- } catch {
462
- // Fallback to approximation if tokenizer fails
463
- return Math.ceil(text.length / 4);
464
- }
465
- }
466
-
467
- getMaxTokens(model: string): number {
468
- // Check the runtime cache first (populated by getModelInfo)
469
- const cached = this.modelContextCache.get(model);
470
- if (cached !== undefined) {
471
- return cached;
472
- }
473
-
474
- const limits: Record<string, number> = {
475
- // Llama 3.x family
476
- llama3: 8192,
477
- 'llama3.1': 131072,
478
- 'llama3.1:8b': 131072,
479
- 'llama3.1:70b': 131072,
480
- 'llama3.1:405b': 131072,
481
- 'llama3.2': 131072,
482
- 'llama3.2:1b': 131072,
483
- 'llama3.2:3b': 131072,
484
- 'llama3.2:70b': 131072,
485
- 'llama3.3': 131072,
486
- 'llama3.3:70b': 131072,
487
- // Llama 2 family
488
- llama2: 4096,
489
- 'llama2:13b': 4096,
490
- 'llama2:70b': 4096,
491
- // CodeLlama
492
- codellama: 16384,
493
- 'codellama:7b': 16384,
494
- 'codellama:13b': 16384,
495
- 'codellama:34b': 16384,
496
- 'codellama:70b': 16384,
497
- // Mistral / Mixtral
498
- mistral: 32768,
499
- 'mistral:7b': 32768,
500
- 'mistral-nemo': 128000,
501
- 'mistral-large': 128000,
502
- 'mistral-small': 32768,
503
- mixtral: 32768,
504
- 'mixtral:8x7b': 32768,
505
- 'mixtral:8x22b': 65536,
506
- // Phi family
507
- phi: 2048,
508
- phi3: 131072,
509
- 'phi3:mini': 131072,
510
- 'phi3:medium': 131072,
511
- 'phi3.5': 131072,
512
- phi4: 16384,
513
- // Gemma family
514
- gemma: 8192,
515
- 'gemma:2b': 8192,
516
- 'gemma:7b': 8192,
517
- gemma2: 8192,
518
- 'gemma2:2b': 8192,
519
- 'gemma2:9b': 8192,
520
- 'gemma2:27b': 8192,
521
- // Qwen family
522
- qwen: 32768,
523
- qwen2: 131072,
524
- 'qwen2:7b': 131072,
525
- 'qwen2:72b': 131072,
526
- 'qwen2.5': 131072,
527
- 'qwen2.5:7b': 131072,
528
- 'qwen2.5:14b': 131072,
529
- 'qwen2.5:32b': 131072,
530
- 'qwen2.5:72b': 131072,
531
- 'qwen2.5-coder': 131072,
532
- // DeepSeek family
533
- 'deepseek-coder': 16384,
534
- 'deepseek-coder-v2': 131072,
535
- 'deepseek-r1': 131072,
536
- // StarCoder
537
- starcoder: 8192,
538
- starcoder2: 16384,
539
- // Command R
540
- 'command-r': 131072,
541
- 'command-r-plus': 131072,
542
- // Others
543
- 'nomic-embed-text': 8192,
544
- 'mxbai-embed-large': 512,
545
- yi: 200000,
546
- solar: 4096,
547
- 'neural-chat': 4096,
548
- 'wizard-vicuna': 4096,
549
- };
550
-
551
- // Handle model variants (e.g., "llama3.2:7b-instruct" -> "llama3.2:7b" -> "llama3.2")
552
- if (limits[model]) {
553
- return limits[model];
554
- }
555
- const baseModel = model.split(':')[0];
556
- return limits[baseModel] || 8192;
557
- }
558
-
559
- /**
560
- * Query the Ollama `/api/show` endpoint to retrieve the actual model
561
- * context length from the running server. Results are cached in memory
562
- * so repeated calls for the same model are free.
563
- *
564
- * If the call fails (Ollama not running, model not pulled, etc.) the
565
- * method returns `null` and the caller should fall back to the
566
- * hardcoded map in {@link getMaxTokens}.
567
- */
568
- async getModelInfo(model: string): Promise<number | null> {
569
- const cached = this.modelContextCache.get(model);
570
- if (cached !== undefined) {
571
- return cached;
572
- }
573
-
574
- try {
575
- const response = await fetch(`${this.baseUrl}/api/show`, {
576
- method: 'POST',
577
- headers: { 'Content-Type': 'application/json' },
578
- body: JSON.stringify({ name: model }),
579
- signal: AbortSignal.timeout(5000),
580
- });
581
-
582
- if (!response.ok) {
583
- return null;
584
- }
585
-
586
- const data = (await response.json()) as {
587
- model_info?: Record<string, unknown>;
588
- parameters?: string;
589
- };
590
-
591
- // Strategy 1: Check model_info for context_length or num_ctx keys
592
- if (data.model_info) {
593
- for (const [key, value] of Object.entries(data.model_info)) {
594
- if (
595
- (key.includes('context_length') || key.includes('num_ctx')) &&
596
- typeof value === 'number' &&
597
- value > 0
598
- ) {
599
- this.modelContextCache.set(model, value);
600
- return value;
601
- }
602
- }
603
- }
604
-
605
- // Strategy 2: Parse the parameters string for num_ctx
606
- if (data.parameters) {
607
- const match = data.parameters.match(/num_ctx\s+(\d+)/);
608
- if (match) {
609
- const numCtx = parseInt(match[1], 10);
610
- if (numCtx > 0) {
611
- this.modelContextCache.set(model, numCtx);
612
- return numCtx;
613
- }
614
- }
615
- }
616
-
617
- return null;
618
- } catch {
619
- return null;
620
- }
621
- }
622
-
623
- /** In-memory cache for model context lengths retrieved via /api/show. */
624
- private modelContextCache = new Map<string, number>();
625
-
626
- async listModels(): Promise<string[]> {
627
- try {
628
- const response = await fetch(`${this.baseUrl}/api/tags`, {
629
- signal: AbortSignal.timeout(3000),
630
- });
631
- if (response.ok) {
632
- const data = (await response.json()) as {
633
- models?: Array<{ name?: string; model?: string }>;
634
- };
635
- if (data.models && Array.isArray(data.models)) {
636
- return data.models.map(m => m.name || m.model || '').filter(Boolean);
637
- }
638
- }
639
- } catch {
640
- // Ollama not available, return static fallback
641
- }
642
- return ['llama3.2', 'llama3.2:70b', 'codellama', 'mistral', 'mixtral', 'phi'];
643
- }
644
-
645
- /**
646
- * Convert messages to Ollama format
647
- */
648
- private convertMessages(messages: LLMMessage[]): Array<{ role: string; content: string }> {
649
- return messages.map(m => ({
650
- role: m.role === 'assistant' ? 'assistant' : m.role === 'system' ? 'system' : 'user',
651
- content: getTextContent(m.content),
652
- }));
653
- }
654
-
655
- /**
656
- * Build tool prompt for prompt engineering approach
657
- */
658
- private buildToolPrompt(tools: ToolDefinition[]): string {
659
- const toolDescriptions = tools
660
- .map(t => {
661
- const params = t.function.parameters;
662
- const required = params.required || [];
663
- const props = params.properties || {};
664
- const paramList = Object.entries(props)
665
- .map(([k, v]: [string, Record<string, unknown>]) => {
666
- const req = required.includes(k) ? ' (required)' : ' (optional)';
667
- return ` "${k}": ${v.type || 'string'}${req} — ${v.description || ''}`;
668
- })
669
- .join('\n');
670
- return `- ${t.function.name}: ${t.function.description}\n Parameters:\n${paramList}`;
671
- })
672
- .join('\n\n');
673
-
674
- return `You are a helpful AI assistant with access to tools. When you need to use a tool, respond with ONLY a JSON object in this exact format (no other text before or after):
675
-
676
- \`\`\`json
677
- {"tool": "tool_name", "arguments": {"param1": "value1"}}
678
- \`\`\`
679
-
680
- Available tools:
681
-
682
- ${toolDescriptions}
683
-
684
- IMPORTANT: When using a tool, output ONLY the JSON object. Do not include any explanation text before or after it. If you want to respond without using a tool, respond normally with plain text (no JSON).`;
685
- }
686
-
687
- /**
688
- * Extract tool calls from response content using robust pattern matching.
689
- * Handles JSON in code blocks, bare JSON, and multiple tool calls.
690
- */
691
- private extractToolCalls(content: string): ToolCall[] {
692
- const toolCalls: ToolCall[] = [];
693
-
694
- // Strategy 1: Look for JSON in code blocks
695
- const codeBlockRegex = /```(?:json)?\s*\n?([\s\S]*?)\n?```/g;
696
- let match;
697
- while ((match = codeBlockRegex.exec(content)) !== null) {
698
- const parsed = this.tryParseToolCall(match[1].trim());
699
- if (parsed) {
700
- toolCalls.push(parsed);
701
- }
702
- }
703
- if (toolCalls.length > 0) {
704
- return toolCalls;
705
- }
706
-
707
- // Strategy 2: Try to parse the entire content as JSON
708
- const wholeContent = content.trim();
709
- if (wholeContent.startsWith('{')) {
710
- const parsed = this.tryParseToolCall(wholeContent);
711
- if (parsed) {
712
- return [parsed];
713
- }
714
- }
715
-
716
- // Strategy 3: Find JSON objects using balanced brace matching
717
- let depth = 0;
718
- let start = -1;
719
- for (let i = 0; i < content.length; i++) {
720
- if (content[i] === '{') {
721
- if (depth === 0) {
722
- start = i;
723
- }
724
- depth++;
725
- } else if (content[i] === '}') {
726
- depth--;
727
- if (depth === 0 && start !== -1) {
728
- const candidate = content.slice(start, i + 1);
729
- const parsed = this.tryParseToolCall(candidate);
730
- if (parsed) {
731
- toolCalls.push(parsed);
732
- }
733
- start = -1;
734
- }
735
- }
736
- }
737
-
738
- return toolCalls;
739
- }
740
-
741
- /**
742
- * Try to parse a string as a tool call JSON object.
743
- */
744
- private tryParseToolCall(text: string): ToolCall | null {
745
- try {
746
- const parsed = JSON.parse(text);
747
- if (
748
- parsed.tool &&
749
- typeof parsed.tool === 'string' &&
750
- parsed.arguments &&
751
- typeof parsed.arguments === 'object'
752
- ) {
753
- return {
754
- id: crypto.randomUUID(),
755
- type: 'function',
756
- function: {
757
- name: parsed.tool,
758
- arguments: JSON.stringify(parsed.arguments),
759
- },
760
- };
761
- }
762
- } catch {
763
- // Not valid JSON
764
- }
765
- return null;
766
- }
767
- }