@orion-agents/orion-code 0.1.7 → 0.1.9
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/CHANGELOG.md +445 -0
- package/README.md +60 -41
- package/README.zh-CN.md +34 -8
- package/dist/agents/coordinator.d.ts.map +1 -1
- package/dist/agents/coordinator.js +49 -9
- package/dist/agents/coordinator.js.map +1 -1
- package/dist/agents/fork.d.ts +5 -1
- package/dist/agents/fork.d.ts.map +1 -1
- package/dist/agents/fork.js +9 -10
- package/dist/agents/fork.js.map +1 -1
- package/dist/agents/worker-pool.d.ts.map +1 -1
- package/dist/agents/worker-pool.js +8 -3
- package/dist/agents/worker-pool.js.map +1 -1
- package/dist/cli.js +6 -6
- package/dist/cli.js.map +1 -1
- package/dist/commands/context-tool-command-handlers.d.ts.map +1 -1
- package/dist/commands/context-tool-command-handlers.js +42 -0
- package/dist/commands/context-tool-command-handlers.js.map +1 -1
- package/dist/commands/core-command-handlers.d.ts.map +1 -1
- package/dist/commands/core-command-handlers.js +3 -4
- package/dist/commands/core-command-handlers.js.map +1 -1
- package/dist/commands/diagnostic-command-handlers.d.ts.map +1 -1
- package/dist/commands/diagnostic-command-handlers.js +3 -0
- package/dist/commands/diagnostic-command-handlers.js.map +1 -1
- package/dist/commands/model-command-handlers.d.ts +1 -1
- package/dist/commands/model-command-handlers.d.ts.map +1 -1
- package/dist/commands/model-command-handlers.js +166 -1
- package/dist/commands/model-command-handlers.js.map +1 -1
- package/dist/commands/registry.d.ts.map +1 -1
- package/dist/commands/registry.js +7 -3
- package/dist/commands/registry.js.map +1 -1
- package/dist/commands/session-command-handlers.d.ts.map +1 -1
- package/dist/commands/session-command-handlers.js +97 -5
- package/dist/commands/session-command-handlers.js.map +1 -1
- package/dist/commands/session-commands.js +2 -2
- package/dist/commands/session-commands.js.map +1 -1
- package/dist/commands/types.d.ts +6 -0
- package/dist/commands/types.d.ts.map +1 -1
- package/dist/commands/types.js.map +1 -1
- package/dist/commands/workflow-command-handlers.d.ts.map +1 -1
- package/dist/commands/workflow-command-handlers.js +2 -2
- package/dist/commands/workflow-command-handlers.js.map +1 -1
- package/dist/commands/workflow-commands.d.ts.map +1 -1
- package/dist/commands/workflow-commands.js +1 -1
- package/dist/commands/workflow-commands.js.map +1 -1
- package/dist/core/checkpoint.d.ts.map +1 -1
- package/dist/core/checkpoint.js +9 -8
- package/dist/core/checkpoint.js.map +1 -1
- package/dist/framework/index.d.ts +5 -3
- package/dist/framework/index.d.ts.map +1 -1
- package/dist/framework/index.js +9 -1
- package/dist/framework/index.js.map +1 -1
- package/dist/framework/prompt.d.ts +1 -1
- package/dist/framework/prompt.d.ts.map +1 -1
- package/dist/framework/prompt.js +5 -4
- package/dist/framework/prompt.js.map +1 -1
- package/dist/framework/query.d.ts +30 -4
- package/dist/framework/query.d.ts.map +1 -1
- package/dist/framework/query.js +329 -62
- package/dist/framework/query.js.map +1 -1
- package/dist/framework/stop-decision.d.ts +56 -0
- package/dist/framework/stop-decision.d.ts.map +1 -0
- package/dist/framework/stop-decision.js +36 -0
- package/dist/framework/stop-decision.js.map +1 -0
- package/dist/framework/store.d.ts.map +1 -1
- package/dist/framework/store.js +4 -4
- package/dist/framework/store.js.map +1 -1
- package/dist/framework/tool-scheduler.d.ts +23 -13
- package/dist/framework/tool-scheduler.d.ts.map +1 -1
- package/dist/framework/tool-scheduler.js +93 -77
- package/dist/framework/tool-scheduler.js.map +1 -1
- package/dist/framework/tool.d.ts +7 -0
- package/dist/framework/tool.d.ts.map +1 -1
- package/dist/framework/tool.js +9 -0
- package/dist/framework/tool.js.map +1 -1
- package/dist/harness/assembler.d.ts.map +1 -1
- package/dist/harness/assembler.js +77 -19
- package/dist/harness/assembler.js.map +1 -1
- package/dist/harness/capability-profile.d.ts +3 -0
- package/dist/harness/capability-profile.d.ts.map +1 -0
- package/dist/harness/capability-profile.js +44 -0
- package/dist/harness/capability-profile.js.map +1 -0
- package/dist/harness/capsule.d.ts.map +1 -1
- package/dist/harness/capsule.js +22 -3
- package/dist/harness/capsule.js.map +1 -1
- package/dist/harness/compact-benchmark-corpus.d.ts +10 -0
- package/dist/harness/compact-benchmark-corpus.d.ts.map +1 -0
- package/dist/harness/compact-benchmark-corpus.js +56 -0
- package/dist/harness/compact-benchmark-corpus.js.map +1 -0
- package/dist/harness/context-harness.d.ts +23 -3
- package/dist/harness/context-harness.d.ts.map +1 -1
- package/dist/harness/context-harness.js +183 -11
- package/dist/harness/context-harness.js.map +1 -1
- package/dist/harness/contract.d.ts.map +1 -1
- package/dist/harness/contract.js +106 -11
- package/dist/harness/contract.js.map +1 -1
- package/dist/harness/drift-guard.d.ts +2 -1
- package/dist/harness/drift-guard.d.ts.map +1 -1
- package/dist/harness/drift-guard.js +315 -20
- package/dist/harness/drift-guard.js.map +1 -1
- package/dist/harness/evidence.d.ts.map +1 -1
- package/dist/harness/evidence.js +25 -12
- package/dist/harness/evidence.js.map +1 -1
- package/dist/harness/index.d.ts +7 -2
- package/dist/harness/index.d.ts.map +1 -1
- package/dist/harness/index.js +19 -1
- package/dist/harness/index.js.map +1 -1
- package/dist/harness/ledger.d.ts.map +1 -1
- package/dist/harness/ledger.js +44 -14
- package/dist/harness/ledger.js.map +1 -1
- package/dist/harness/progress-controller.d.ts +14 -0
- package/dist/harness/progress-controller.d.ts.map +1 -0
- package/dist/harness/progress-controller.js +110 -0
- package/dist/harness/progress-controller.js.map +1 -0
- package/dist/harness/state.d.ts.map +1 -1
- package/dist/harness/state.js +5 -2
- package/dist/harness/state.js.map +1 -1
- package/dist/harness/stop-controller.d.ts +15 -0
- package/dist/harness/stop-controller.d.ts.map +1 -0
- package/dist/harness/stop-controller.js +87 -0
- package/dist/harness/stop-controller.js.map +1 -0
- package/dist/harness/types.d.ts +137 -0
- package/dist/harness/types.d.ts.map +1 -1
- package/dist/harness/verification.d.ts +7 -0
- package/dist/harness/verification.d.ts.map +1 -0
- package/dist/harness/verification.js +122 -0
- package/dist/harness/verification.js.map +1 -0
- package/dist/index.d.ts +5 -5
- package/dist/index.d.ts.map +1 -1
- package/dist/index.js +7 -1
- package/dist/index.js.map +1 -1
- package/dist/ink-ui/screens/ReplScreen.d.ts +3 -0
- package/dist/ink-ui/screens/ReplScreen.d.ts.map +1 -1
- package/dist/ink-ui/screens/ReplScreen.js +30 -5
- package/dist/ink-ui/screens/ReplScreen.js.map +1 -1
- package/dist/memory/index.d.ts +1 -0
- package/dist/memory/index.d.ts.map +1 -1
- package/dist/memory/index.js +1 -0
- package/dist/memory/index.js.map +1 -1
- package/dist/memory/prompt-context.d.ts +42 -0
- package/dist/memory/prompt-context.d.ts.map +1 -0
- package/dist/memory/prompt-context.js +129 -0
- package/dist/memory/prompt-context.js.map +1 -0
- package/dist/print-ui/launch.d.ts +1 -0
- package/dist/print-ui/launch.d.ts.map +1 -1
- package/dist/print-ui/launch.js +5 -2
- package/dist/print-ui/launch.js.map +1 -1
- package/dist/runtime/agent-runtime-controller.d.ts.map +1 -1
- package/dist/runtime/agent-runtime-controller.js +60 -22
- package/dist/runtime/agent-runtime-controller.js.map +1 -1
- package/dist/runtime/chat-checkpoint.d.ts.map +1 -1
- package/dist/runtime/chat-checkpoint.js +2 -5
- package/dist/runtime/chat-checkpoint.js.map +1 -1
- package/dist/runtime/chat-command-scope.d.ts +5 -0
- package/dist/runtime/chat-command-scope.d.ts.map +1 -0
- package/dist/runtime/chat-command-scope.js +22 -0
- package/dist/runtime/chat-command-scope.js.map +1 -0
- package/dist/runtime/chat-compact.d.ts +26 -0
- package/dist/runtime/chat-compact.d.ts.map +1 -0
- package/dist/runtime/chat-compact.js +132 -0
- package/dist/runtime/chat-compact.js.map +1 -0
- package/dist/runtime/chat-controller.d.ts.map +1 -1
- package/dist/runtime/chat-controller.js +102 -130
- package/dist/runtime/chat-controller.js.map +1 -1
- package/dist/runtime/chat-presentation.d.ts +6 -3
- package/dist/runtime/chat-presentation.d.ts.map +1 -1
- package/dist/runtime/chat-presentation.js +30 -6
- package/dist/runtime/chat-presentation.js.map +1 -1
- package/dist/runtime/goals/coordinator.d.ts +8 -0
- package/dist/runtime/goals/coordinator.d.ts.map +1 -1
- package/dist/runtime/goals/coordinator.js +103 -30
- package/dist/runtime/goals/coordinator.js.map +1 -1
- package/dist/runtime/goals/evidence.d.ts +10 -0
- package/dist/runtime/goals/evidence.d.ts.map +1 -1
- package/dist/runtime/goals/evidence.js +18 -0
- package/dist/runtime/goals/evidence.js.map +1 -1
- package/dist/runtime/goals/lifecycle.d.ts +13 -0
- package/dist/runtime/goals/lifecycle.d.ts.map +1 -0
- package/dist/runtime/goals/lifecycle.js +46 -0
- package/dist/runtime/goals/lifecycle.js.map +1 -0
- package/dist/runtime/goals/objective.d.ts +18 -0
- package/dist/runtime/goals/objective.d.ts.map +1 -0
- package/dist/runtime/goals/objective.js +60 -0
- package/dist/runtime/goals/objective.js.map +1 -0
- package/dist/runtime/goals/prompt.d.ts.map +1 -1
- package/dist/runtime/goals/prompt.js +7 -1
- package/dist/runtime/goals/prompt.js.map +1 -1
- package/dist/runtime/goals/stop-policy.d.ts +9 -0
- package/dist/runtime/goals/stop-policy.d.ts.map +1 -0
- package/dist/runtime/goals/stop-policy.js +83 -0
- package/dist/runtime/goals/stop-policy.js.map +1 -0
- package/dist/runtime/goals/tools.d.ts.map +1 -1
- package/dist/runtime/goals/tools.js +2 -2
- package/dist/runtime/goals/tools.js.map +1 -1
- package/dist/runtime/goals/types.d.ts +4 -1
- package/dist/runtime/goals/types.d.ts.map +1 -1
- package/dist/runtime/goals/types.js +2 -1
- package/dist/runtime/goals/types.js.map +1 -1
- package/dist/runtime/loop-budget.d.ts +2 -0
- package/dist/runtime/loop-budget.d.ts.map +1 -1
- package/dist/runtime/loop-budget.js +6 -2
- package/dist/runtime/loop-budget.js.map +1 -1
- package/dist/runtime/model-coordinator.d.ts +44 -1
- package/dist/runtime/model-coordinator.d.ts.map +1 -1
- package/dist/runtime/model-coordinator.js +161 -19
- package/dist/runtime/model-coordinator.js.map +1 -1
- package/dist/runtime/subagents/index.d.ts +1 -1
- package/dist/runtime/subagents/index.d.ts.map +1 -1
- package/dist/runtime/subagents/index.js.map +1 -1
- package/dist/runtime/subagents/production.d.ts +6 -2
- package/dist/runtime/subagents/production.d.ts.map +1 -1
- package/dist/runtime/subagents/production.js +25 -6
- package/dist/runtime/subagents/production.js.map +1 -1
- package/dist/runtime/subagents/runner.d.ts +12 -1
- package/dist/runtime/subagents/runner.d.ts.map +1 -1
- package/dist/runtime/subagents/runner.js +62 -1
- package/dist/runtime/subagents/runner.js.map +1 -1
- package/dist/runtime/subagents/runtime-integration.d.ts.map +1 -1
- package/dist/runtime/subagents/runtime-integration.js +2 -1
- package/dist/runtime/subagents/runtime-integration.js.map +1 -1
- package/dist/runtime/subagents/supervisor.d.ts.map +1 -1
- package/dist/runtime/subagents/supervisor.js +6 -0
- package/dist/runtime/subagents/supervisor.js.map +1 -1
- package/dist/runtime/subagents/types.d.ts +4 -1
- package/dist/runtime/subagents/types.d.ts.map +1 -1
- package/dist/runtime/subagents/types.js.map +1 -1
- package/dist/runtime/ui-events.d.ts +37 -1
- package/dist/runtime/ui-events.d.ts.map +1 -1
- package/dist/runtime/ui-events.js.map +1 -1
- package/dist/runtime/ui-view-model.d.ts +10 -1
- package/dist/runtime/ui-view-model.d.ts.map +1 -1
- package/dist/runtime/ui-view-model.js +93 -4
- package/dist/runtime/ui-view-model.js.map +1 -1
- package/dist/services/bounded-response.d.ts +12 -0
- package/dist/services/bounded-response.d.ts.map +1 -0
- package/dist/services/bounded-response.js +67 -0
- package/dist/services/bounded-response.js.map +1 -0
- package/dist/services/compact/auto-compact.d.ts +82 -2
- package/dist/services/compact/auto-compact.d.ts.map +1 -1
- package/dist/services/compact/auto-compact.js +226 -44
- package/dist/services/compact/auto-compact.js.map +1 -1
- package/dist/services/compact/compact.d.ts +54 -37
- package/dist/services/compact/compact.d.ts.map +1 -1
- package/dist/services/compact/compact.js +512 -127
- package/dist/services/compact/compact.js.map +1 -1
- package/dist/services/compact/coordinator.d.ts +5 -1
- package/dist/services/compact/coordinator.d.ts.map +1 -1
- package/dist/services/compact/coordinator.js +10 -1
- package/dist/services/compact/coordinator.js.map +1 -1
- package/dist/services/compact/fingerprint.d.ts +27 -0
- package/dist/services/compact/fingerprint.d.ts.map +1 -0
- package/dist/services/compact/fingerprint.js +69 -0
- package/dist/services/compact/fingerprint.js.map +1 -0
- package/dist/services/compact/index.d.ts +7 -5
- package/dist/services/compact/index.d.ts.map +1 -1
- package/dist/services/compact/index.js +19 -6
- package/dist/services/compact/index.js.map +1 -1
- package/dist/services/compact/planner.d.ts +41 -0
- package/dist/services/compact/planner.d.ts.map +1 -0
- package/dist/services/compact/planner.js +102 -0
- package/dist/services/compact/planner.js.map +1 -0
- package/dist/services/compact/semantic-summary.d.ts +93 -0
- package/dist/services/compact/semantic-summary.d.ts.map +1 -0
- package/dist/services/compact/semantic-summary.js +158 -0
- package/dist/services/compact/semantic-summary.js.map +1 -0
- package/dist/services/compact/summary-generator.d.ts +23 -0
- package/dist/services/compact/summary-generator.d.ts.map +1 -1
- package/dist/services/compact/summary-generator.js +173 -39
- package/dist/services/compact/summary-generator.js.map +1 -1
- package/dist/services/concurrent-sessions.d.ts +1 -0
- package/dist/services/concurrent-sessions.d.ts.map +1 -1
- package/dist/services/concurrent-sessions.js +35 -22
- package/dist/services/concurrent-sessions.js.map +1 -1
- package/dist/services/file-context.d.ts.map +1 -1
- package/dist/services/file-context.js +29 -33
- package/dist/services/file-context.js.map +1 -1
- package/dist/services/file-lock.d.ts.map +1 -1
- package/dist/services/file-lock.js +60 -27
- package/dist/services/file-lock.js.map +1 -1
- package/dist/services/global-config.d.ts +6 -0
- package/dist/services/global-config.d.ts.map +1 -1
- package/dist/services/global-config.js +23 -13
- package/dist/services/global-config.js.map +1 -1
- package/dist/services/goal-storage.d.ts +1 -1
- package/dist/services/goal-storage.d.ts.map +1 -1
- package/dist/services/goal-storage.js +14 -4
- package/dist/services/goal-storage.js.map +1 -1
- package/dist/services/llm.d.ts +3 -0
- package/dist/services/llm.d.ts.map +1 -1
- package/dist/services/llm.js +7 -0
- package/dist/services/llm.js.map +1 -1
- package/dist/services/project-instructions.d.ts +8 -0
- package/dist/services/project-instructions.d.ts.map +1 -1
- package/dist/services/project-instructions.js +101 -51
- package/dist/services/project-instructions.js.map +1 -1
- package/dist/services/provider-resilience/request-gate.d.ts +9 -5
- package/dist/services/provider-resilience/request-gate.d.ts.map +1 -1
- package/dist/services/provider-resilience/request-gate.js +71 -23
- package/dist/services/provider-resilience/request-gate.js.map +1 -1
- package/dist/services/safe-project-reader.d.ts +30 -0
- package/dist/services/safe-project-reader.d.ts.map +1 -0
- package/dist/services/safe-project-reader.js +141 -0
- package/dist/services/safe-project-reader.js.map +1 -0
- package/dist/services/session-storage.d.ts +146 -10
- package/dist/services/session-storage.d.ts.map +1 -1
- package/dist/services/session-storage.js +851 -120
- package/dist/services/session-storage.js.map +1 -1
- package/dist/services/tool-allowlist.d.ts +4 -4
- package/dist/services/tool-allowlist.js +4 -4
- package/dist/services/usage-state.d.ts +7 -0
- package/dist/services/usage-state.d.ts.map +1 -1
- package/dist/services/usage-state.js +117 -16
- package/dist/services/usage-state.js.map +1 -1
- package/dist/services/web-search-adapters.d.ts.map +1 -1
- package/dist/services/web-search-adapters.js +24 -10
- package/dist/services/web-search-adapters.js.map +1 -1
- package/dist/services/web-search-mcp.d.ts.map +1 -1
- package/dist/services/web-search-mcp.js +13 -3
- package/dist/services/web-search-mcp.js.map +1 -1
- package/dist/services/workspace-containment.d.ts +8 -0
- package/dist/services/workspace-containment.d.ts.map +1 -0
- package/dist/services/workspace-containment.js +44 -0
- package/dist/services/workspace-containment.js.map +1 -0
- package/dist/skills/runtime.d.ts.map +1 -1
- package/dist/skills/runtime.js +34 -35
- package/dist/skills/runtime.js.map +1 -1
- package/dist/terminal-ui/completion.d.ts.map +1 -1
- package/dist/terminal-ui/completion.js +5 -1
- package/dist/terminal-ui/completion.js.map +1 -1
- package/dist/terminal-ui/launch.d.ts +5 -0
- package/dist/terminal-ui/launch.d.ts.map +1 -1
- package/dist/terminal-ui/launch.js +53 -17
- package/dist/terminal-ui/launch.js.map +1 -1
- package/dist/tools/git.d.ts.map +1 -1
- package/dist/tools/git.js +47 -12
- package/dist/tools/git.js.map +1 -1
- package/dist/tools/index.d.ts.map +1 -1
- package/dist/tools/index.js +73 -64
- package/dist/tools/index.js.map +1 -1
- package/dist/tools/plan.d.ts.map +1 -1
- package/dist/tools/plan.js +7 -6
- package/dist/tools/plan.js.map +1 -1
- package/dist/tools/web.d.ts.map +1 -1
- package/dist/tools/web.js +11 -2
- package/dist/tools/web.js.map +1 -1
- package/dist/tui-ui/chrome-view-model.js +1 -1
- package/dist/tui-ui/chrome-view-model.js.map +1 -1
- package/dist/tui-ui/inline-surface.d.ts +1 -1
- package/dist/tui-ui/inline-surface.d.ts.map +1 -1
- package/dist/tui-ui/inline-surface.js +24 -16
- package/dist/tui-ui/inline-surface.js.map +1 -1
- package/dist/tui-ui/state.d.ts.map +1 -1
- package/dist/tui-ui/state.js +93 -13
- package/dist/tui-ui/state.js.map +1 -1
- package/dist/tui-ui/transcript-layout.d.ts.map +1 -1
- package/dist/tui-ui/transcript-layout.js +38 -29
- package/dist/tui-ui/transcript-layout.js.map +1 -1
- package/dist/ui/command-panel.d.ts +2 -0
- package/dist/ui/command-panel.d.ts.map +1 -1
- package/dist/ui/command-panel.js +46 -20
- package/dist/ui/command-panel.js.map +1 -1
- package/dist/ui/file-completion.d.ts.map +1 -1
- package/dist/ui/file-completion.js +12 -6
- package/dist/ui/file-completion.js.map +1 -1
- package/dist/ui/shared/command-palette.d.ts.map +1 -1
- package/dist/ui/shared/command-palette.js +13 -9
- package/dist/ui/shared/command-palette.js.map +1 -1
- package/dist/ui/shared/text.d.ts +2 -0
- package/dist/ui/shared/text.d.ts.map +1 -1
- package/dist/ui/shared/text.js +20 -12
- package/dist/ui/shared/text.js.map +1 -1
- package/dist/ui/suggestions.d.ts.map +1 -1
- package/dist/ui/suggestions.js +7 -6
- package/dist/ui/suggestions.js.map +1 -1
- package/docs/migration/v0.1.8-to-v0.1.9.md +60 -0
- package/docs/plan/v0.1.9-release-checklist.md +64 -0
- package/docs/readme.md +27 -0
- package/npm-shrinkwrap.json +7124 -0
- package/package.json +17 -7
- package/dist/ink/index.d.ts +0 -54
- package/dist/ink/index.d.ts.map +0 -1
- package/dist/ink/index.js +0 -111
- package/dist/ink/index.js.map +0 -1
- package/dist/services/compact/micro-compact.d.ts +0 -21
- package/dist/services/compact/micro-compact.d.ts.map +0 -1
- package/dist/services/compact/micro-compact.js +0 -99
- package/dist/services/compact/micro-compact.js.map +0 -1
- package/dist/ui-v2/components/command-palette.d.ts +0 -2
- package/dist/ui-v2/components/command-palette.d.ts.map +0 -1
- package/dist/ui-v2/components/command-palette.js +0 -18
- package/dist/ui-v2/components/command-palette.js.map +0 -1
- package/dist/ui-v2/components/edit-preview-picker.d.ts +0 -26
- package/dist/ui-v2/components/edit-preview-picker.d.ts.map +0 -1
- package/dist/ui-v2/components/edit-preview-picker.js +0 -79
- package/dist/ui-v2/components/edit-preview-picker.js.map +0 -1
- package/dist/ui-v2/components/session-picker.d.ts +0 -19
- package/dist/ui-v2/components/session-picker.d.ts.map +0 -1
- package/dist/ui-v2/components/session-picker.js +0 -52
- package/dist/ui-v2/components/session-picker.js.map +0 -1
- package/dist/ui-v2/components/shell.d.ts +0 -36
- package/dist/ui-v2/components/shell.d.ts.map +0 -1
- package/dist/ui-v2/components/shell.js +0 -131
- package/dist/ui-v2/components/shell.js.map +0 -1
- package/dist/ui-v2/index.d.ts +0 -11
- package/dist/ui-v2/index.d.ts.map +0 -1
- package/dist/ui-v2/index.js +0 -27
- package/dist/ui-v2/index.js.map +0 -1
- package/dist/ui-v2/runtime/text.d.ts +0 -2
- package/dist/ui-v2/runtime/text.d.ts.map +0 -1
- package/dist/ui-v2/runtime/text.js +0 -18
- package/dist/ui-v2/runtime/text.js.map +0 -1
- package/dist/ui-v2/state/input-reducer.d.ts +0 -39
- package/dist/ui-v2/state/input-reducer.d.ts.map +0 -1
- package/dist/ui-v2/state/input-reducer.js +0 -82
- package/dist/ui-v2/state/input-reducer.js.map +0 -1
- package/dist/ui-v2/state/picker.d.ts +0 -16
- package/dist/ui-v2/state/picker.d.ts.map +0 -1
- package/dist/ui-v2/state/picker.js +0 -52
- package/dist/ui-v2/state/picker.js.map +0 -1
- package/dist/ui-v2/state/sessions.d.ts +0 -15
- package/dist/ui-v2/state/sessions.d.ts.map +0 -1
- package/dist/ui-v2/state/sessions.js +0 -70
- package/dist/ui-v2/state/sessions.js.map +0 -1
- package/dist/ui-v2/state/suggestions.d.ts +0 -2
- package/dist/ui-v2/state/suggestions.d.ts.map +0 -1
- package/dist/ui-v2/state/suggestions.js +0 -18
- package/dist/ui-v2/state/suggestions.js.map +0 -1
- package/dist/ui-v2/types.d.ts +0 -2
- package/dist/ui-v2/types.d.ts.map +0 -1
- package/dist/ui-v2/types.js +0 -18
- package/dist/ui-v2/types.js.map +0 -1
|
@@ -4,16 +4,16 @@ exports.findProjectRoot = findProjectRoot;
|
|
|
4
4
|
exports.loadProjectInstructionFiles = loadProjectInstructionFiles;
|
|
5
5
|
exports.renderProjectInstructions = renderProjectInstructions;
|
|
6
6
|
exports.loadProjectInstructions = loadProjectInstructions;
|
|
7
|
+
exports.clearProjectInstructionsCache = clearProjectInstructionsCache;
|
|
8
|
+
exports.getProjectInstructionsCacheStats = getProjectInstructionsCacheStats;
|
|
7
9
|
const fs_1 = require("fs");
|
|
8
10
|
const path_1 = require("path");
|
|
11
|
+
const safe_project_reader_1 = require("./safe-project-reader");
|
|
9
12
|
const DEFAULT_MAX_FILE_BYTES = 32 * 1024;
|
|
10
13
|
const DEFAULT_MAX_TOTAL_CHARS = 96000;
|
|
11
|
-
const
|
|
12
|
-
|
|
13
|
-
|
|
14
|
-
'.orion-code/instructions.md',
|
|
15
|
-
'.cursorrules',
|
|
16
|
-
];
|
|
14
|
+
const DEFAULT_MAX_TOTAL_READ_BYTES = 256 * 1024;
|
|
15
|
+
const DEFAULT_MAX_FILES = 128;
|
|
16
|
+
const DIRECT_FILES = ['AGENTS.md', 'CLAUDE.md', '.orion-code/instructions.md', '.cursorrules'];
|
|
17
17
|
function parent(path) {
|
|
18
18
|
const next = (0, path_1.dirname)(path);
|
|
19
19
|
return next === path ? path : next;
|
|
@@ -45,62 +45,71 @@ function directoriesFromRoot(root, cwd) {
|
|
|
45
45
|
}
|
|
46
46
|
return dirs.filter(dir => dir === resolvedRoot || !(0, path_1.relative)(resolvedRoot, dir).startsWith('..'));
|
|
47
47
|
}
|
|
48
|
-
function readTextPrefix(path, maxBytes) {
|
|
49
|
-
|
|
50
|
-
|
|
51
|
-
if (!stat.isFile())
|
|
52
|
-
return null;
|
|
53
|
-
const content = (0, fs_1.readFileSync)(path).subarray(0, maxBytes).toString('utf8');
|
|
54
|
-
return {
|
|
55
|
-
content,
|
|
56
|
-
truncated: stat.size > maxBytes,
|
|
57
|
-
};
|
|
58
|
-
}
|
|
59
|
-
catch {
|
|
48
|
+
function readTextPrefix(path, root, maxBytes) {
|
|
49
|
+
const read = (0, safe_project_reader_1.readSafeProjectFilePrefix)(path, root, maxBytes);
|
|
50
|
+
if (!read.ok || read.bytes.includes(0))
|
|
60
51
|
return null;
|
|
61
|
-
}
|
|
52
|
+
return { content: read.bytes.toString('utf8'), truncated: read.truncated };
|
|
62
53
|
}
|
|
63
|
-
function
|
|
64
|
-
const
|
|
65
|
-
const
|
|
66
|
-
|
|
54
|
+
function discoverProjectInstructionFiles(root, cwd, maxFiles) {
|
|
55
|
+
const candidates = [];
|
|
56
|
+
const watchPaths = new Set([(0, path_1.join)(root, '.git')]);
|
|
57
|
+
const addCandidate = (path) => {
|
|
58
|
+
watchPaths.add(path);
|
|
59
|
+
if (candidates.length < maxFiles && (0, fs_1.existsSync)(path))
|
|
60
|
+
candidates.push(path);
|
|
61
|
+
};
|
|
62
|
+
for (const dir of directoriesFromRoot(root, cwd)) {
|
|
63
|
+
DIRECT_FILES.forEach(file => addCandidate((0, path_1.join)(dir, file)));
|
|
64
|
+
const cursorRulesDir = (0, path_1.join)(dir, '.cursor', 'rules');
|
|
65
|
+
watchPaths.add(cursorRulesDir);
|
|
66
|
+
const inspectedRulesDir = (0, safe_project_reader_1.inspectSafeProjectPath)(cursorRulesDir, root);
|
|
67
|
+
if (!inspectedRulesDir.ok || !inspectedRulesDir.stats.isDirectory())
|
|
68
|
+
continue;
|
|
67
69
|
try {
|
|
68
|
-
const
|
|
70
|
+
for (const file of (0, fs_1.readdirSync)(inspectedRulesDir.canonicalPath)
|
|
69
71
|
.filter(file => file.endsWith('.md') || file.endsWith('.mdc'))
|
|
70
|
-
.sort((a, b) => a.localeCompare(b))
|
|
71
|
-
|
|
72
|
-
|
|
72
|
+
.sort((a, b) => a.localeCompare(b))) {
|
|
73
|
+
addCandidate((0, path_1.join)(cursorRulesDir, file));
|
|
74
|
+
}
|
|
73
75
|
}
|
|
74
76
|
catch {
|
|
75
77
|
// Ignore unreadable rule directories.
|
|
76
78
|
}
|
|
77
79
|
}
|
|
78
|
-
return
|
|
80
|
+
return { candidates, watchPaths: [...watchPaths] };
|
|
79
81
|
}
|
|
80
|
-
function
|
|
81
|
-
const root = (0, path_1.resolve)(options.root ?? findProjectRoot(cwd));
|
|
82
|
+
function loadDiscoveredFiles(root, discovery, options) {
|
|
82
83
|
const maxFileBytes = options.maxFileBytes ?? DEFAULT_MAX_FILE_BYTES;
|
|
84
|
+
let remainingReadBytes = options.maxTotalReadBytes ?? DEFAULT_MAX_TOTAL_READ_BYTES;
|
|
83
85
|
const files = [];
|
|
84
86
|
const seen = new Set();
|
|
85
|
-
for (const
|
|
86
|
-
|
|
87
|
-
|
|
88
|
-
|
|
89
|
-
|
|
90
|
-
|
|
91
|
-
|
|
92
|
-
|
|
93
|
-
|
|
94
|
-
|
|
95
|
-
|
|
96
|
-
|
|
97
|
-
|
|
98
|
-
|
|
99
|
-
|
|
100
|
-
|
|
87
|
+
for (const filePath of discovery.candidates) {
|
|
88
|
+
const absolutePath = (0, path_1.resolve)(filePath);
|
|
89
|
+
if (seen.has(absolutePath) || remainingReadBytes <= 0)
|
|
90
|
+
continue;
|
|
91
|
+
seen.add(absolutePath);
|
|
92
|
+
const readLimit = Math.min(maxFileBytes, remainingReadBytes);
|
|
93
|
+
const read = readTextPrefix(absolutePath, root, readLimit);
|
|
94
|
+
if (!read)
|
|
95
|
+
continue;
|
|
96
|
+
remainingReadBytes -= Buffer.byteLength(read.content, 'utf8');
|
|
97
|
+
if (!read.content.trim())
|
|
98
|
+
continue;
|
|
99
|
+
files.push({
|
|
100
|
+
path: (0, path_1.relative)(root, absolutePath) || absolutePath,
|
|
101
|
+
absolutePath,
|
|
102
|
+
content: read.content.trimEnd(),
|
|
103
|
+
truncated: read.truncated,
|
|
104
|
+
});
|
|
101
105
|
}
|
|
102
106
|
return files;
|
|
103
107
|
}
|
|
108
|
+
function loadProjectInstructionFiles(cwd, options = {}) {
|
|
109
|
+
const root = (0, path_1.resolve)(options.root ?? findProjectRoot(cwd));
|
|
110
|
+
const discovery = discoverProjectInstructionFiles(root, cwd, options.maxFiles ?? DEFAULT_MAX_FILES);
|
|
111
|
+
return loadDiscoveredFiles(root, discovery, options);
|
|
112
|
+
}
|
|
104
113
|
function renderProjectInstructions(files, options = {}) {
|
|
105
114
|
if (files.length === 0)
|
|
106
115
|
return '';
|
|
@@ -109,10 +118,7 @@ function renderProjectInstructions(files, options = {}) {
|
|
|
109
118
|
for (const file of files) {
|
|
110
119
|
if (remaining <= 0)
|
|
111
120
|
break;
|
|
112
|
-
let block = [
|
|
113
|
-
`## ${file.path}${file.truncated ? ' (truncated)' : ''}`,
|
|
114
|
-
file.content,
|
|
115
|
-
].join('\n\n');
|
|
121
|
+
let block = [`## ${file.path}${file.truncated ? ' (truncated)' : ''}`, file.content].join('\n\n');
|
|
116
122
|
if (block.length > remaining) {
|
|
117
123
|
block = `${block.slice(0, Math.max(0, remaining - 32))}\n[truncated by instruction budget]`;
|
|
118
124
|
remaining = 0;
|
|
@@ -130,6 +136,50 @@ function renderProjectInstructions(files, options = {}) {
|
|
|
130
136
|
].join('\n');
|
|
131
137
|
}
|
|
132
138
|
function loadProjectInstructions(cwd, options = {}) {
|
|
133
|
-
|
|
139
|
+
const cacheKey = [
|
|
140
|
+
(0, path_1.resolve)(cwd),
|
|
141
|
+
options.root ? (0, path_1.resolve)(options.root) : 'auto',
|
|
142
|
+
options.maxFileBytes ?? DEFAULT_MAX_FILE_BYTES,
|
|
143
|
+
options.maxTotalChars ?? DEFAULT_MAX_TOTAL_CHARS,
|
|
144
|
+
options.maxTotalReadBytes ?? DEFAULT_MAX_TOTAL_READ_BYTES,
|
|
145
|
+
options.maxFiles ?? DEFAULT_MAX_FILES,
|
|
146
|
+
].join('|');
|
|
147
|
+
const cached = projectInstructionCache.get(cacheKey);
|
|
148
|
+
if (cached && watchFingerprint(cached.watchPaths) === cached.fingerprint) {
|
|
149
|
+
return cached.content;
|
|
150
|
+
}
|
|
151
|
+
const root = (0, path_1.resolve)(options.root ?? findProjectRoot(cwd));
|
|
152
|
+
const discovery = discoverProjectInstructionFiles(root, cwd, options.maxFiles ?? DEFAULT_MAX_FILES);
|
|
153
|
+
const content = renderProjectInstructions(loadDiscoveredFiles(root, discovery, options), options);
|
|
154
|
+
projectInstructionReloads += 1;
|
|
155
|
+
projectInstructionCache.set(cacheKey, {
|
|
156
|
+
content,
|
|
157
|
+
watchPaths: discovery.watchPaths,
|
|
158
|
+
fingerprint: watchFingerprint(discovery.watchPaths),
|
|
159
|
+
});
|
|
160
|
+
return content;
|
|
161
|
+
}
|
|
162
|
+
const projectInstructionCache = new Map();
|
|
163
|
+
let projectInstructionReloads = 0;
|
|
164
|
+
function watchFingerprint(paths) {
|
|
165
|
+
return paths
|
|
166
|
+
.map(path => {
|
|
167
|
+
try {
|
|
168
|
+
const stat = (0, fs_1.lstatSync)(path);
|
|
169
|
+
return `${path}:${stat.ino}:${stat.size}:${stat.mtimeMs}:${stat.ctimeMs}`;
|
|
170
|
+
}
|
|
171
|
+
catch {
|
|
172
|
+
return `${path}:missing`;
|
|
173
|
+
}
|
|
174
|
+
})
|
|
175
|
+
.join('|');
|
|
176
|
+
}
|
|
177
|
+
function clearProjectInstructionsCache() {
|
|
178
|
+
projectInstructionCache.clear();
|
|
179
|
+
projectInstructionReloads = 0;
|
|
180
|
+
}
|
|
181
|
+
/** Lightweight diagnostics used by doctor/tests without exposing cached content. */
|
|
182
|
+
function getProjectInstructionsCacheStats() {
|
|
183
|
+
return { entries: projectInstructionCache.size, reloads: projectInstructionReloads };
|
|
134
184
|
}
|
|
135
185
|
//# sourceMappingURL=project-instructions.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"project-instructions.js","sourceRoot":"","sources":["../../src/services/project-instructions.ts"],"names":[],"mappings":";;AA+BA,0CAWC;
|
|
1
|
+
{"version":3,"file":"project-instructions.js","sourceRoot":"","sources":["../../src/services/project-instructions.ts"],"names":[],"mappings":"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"}
|
|
@@ -26,9 +26,11 @@ export interface ProviderRequestGateOptions {
|
|
|
26
26
|
export declare class ProviderRequestGate {
|
|
27
27
|
private readonly maxConcurrent;
|
|
28
28
|
private activeCount;
|
|
29
|
+
private readonly activeByProvider;
|
|
29
30
|
private waiters;
|
|
30
|
-
private
|
|
31
|
-
private
|
|
31
|
+
private readonly cooldowns;
|
|
32
|
+
private cooldownTimer;
|
|
33
|
+
private cooldownTimerDue;
|
|
32
34
|
constructor(options?: ProviderRequestGateOptions);
|
|
33
35
|
/**
|
|
34
36
|
* Acquire a gate lease. If cooldown is active, waits until it expires.
|
|
@@ -36,12 +38,14 @@ export declare class ProviderRequestGate {
|
|
|
36
38
|
*/
|
|
37
39
|
acquire(request: GateRequest): Promise<GateLease>;
|
|
38
40
|
/**
|
|
39
|
-
* Enter cooldown for
|
|
40
|
-
* the
|
|
41
|
+
* Enter cooldown for one provider key. Other providers may continue to use
|
|
42
|
+
* the shared concurrency budget. Existing requests are not aborted.
|
|
41
43
|
*/
|
|
42
44
|
enterCooldown(providerKey: string, until: number, reason: string): void;
|
|
43
45
|
/** Snapshot for diagnostics / UI. */
|
|
44
|
-
snapshot(): GateSnapshot;
|
|
46
|
+
snapshot(providerKey?: string): GateSnapshot;
|
|
45
47
|
private tryDispatch;
|
|
48
|
+
private clearExpiredCooldowns;
|
|
49
|
+
private scheduleCooldownWake;
|
|
46
50
|
}
|
|
47
51
|
//# sourceMappingURL=request-gate.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"request-gate.d.ts","sourceRoot":"","sources":["../../../src/services/provider-resilience/request-gate.ts"],"names":[],"mappings":"AAAA;;;;;;GAMG;AAEH,MAAM,WAAW,WAAW;IAC1B,QAAQ,EAAE,MAAM,CAAC;IACjB,WAAW,EAAE,MAAM,CAAC;IACpB,WAAW,CAAC,EAAE,WAAW,CAAC;CAC3B;AAED,MAAM,WAAW,SAAS;IACxB,OAAO,EAAE,MAAM,IAAI,CAAC;CACrB;AAED,MAAM,WAAW,YAAY;IAC3B,WAAW,EAAE,MAAM,CAAC;IACpB,YAAY,EAAE,MAAM,CAAC;IACrB,aAAa,EAAE,MAAM,GAAG,IAAI,CAAC;IAC7B,cAAc,EAAE,MAAM,GAAG,IAAI,CAAC;CAC/B;AAED,MAAM,WAAW,0BAA0B;IACzC,qDAAqD;IACrD,aAAa,CAAC,EAAE,MAAM,CAAC;CACxB;
|
|
1
|
+
{"version":3,"file":"request-gate.d.ts","sourceRoot":"","sources":["../../../src/services/provider-resilience/request-gate.ts"],"names":[],"mappings":"AAAA;;;;;;GAMG;AAEH,MAAM,WAAW,WAAW;IAC1B,QAAQ,EAAE,MAAM,CAAC;IACjB,WAAW,EAAE,MAAM,CAAC;IACpB,WAAW,CAAC,EAAE,WAAW,CAAC;CAC3B;AAED,MAAM,WAAW,SAAS;IACxB,OAAO,EAAE,MAAM,IAAI,CAAC;CACrB;AAED,MAAM,WAAW,YAAY;IAC3B,WAAW,EAAE,MAAM,CAAC;IACpB,YAAY,EAAE,MAAM,CAAC;IACrB,aAAa,EAAE,MAAM,GAAG,IAAI,CAAC;IAC7B,cAAc,EAAE,MAAM,GAAG,IAAI,CAAC;CAC/B;AAED,MAAM,WAAW,0BAA0B;IACzC,qDAAqD;IACrD,aAAa,CAAC,EAAE,MAAM,CAAC;CACxB;AAcD,qBAAa,mBAAmB;IAC9B,OAAO,CAAC,QAAQ,CAAC,aAAa,CAAS;IACvC,OAAO,CAAC,WAAW,CAAK;IACxB,OAAO,CAAC,QAAQ,CAAC,gBAAgB,CAA6B;IAC9D,OAAO,CAAC,OAAO,CAAoB;IACnC,OAAO,CAAC,QAAQ,CAAC,SAAS,CAAuC;IACjE,OAAO,CAAC,aAAa,CAA8C;IACnE,OAAO,CAAC,gBAAgB,CAAK;gBAEjB,OAAO,GAAE,0BAA+B;IAMpD;;;OAGG;IACH,OAAO,CAAC,OAAO,EAAE,WAAW,GAAG,OAAO,CAAC,SAAS,CAAC;IA4BjD;;;OAGG;IACH,aAAa,CAAC,WAAW,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,GAAG,IAAI;IAQvE,qCAAqC;IACrC,QAAQ,CAAC,WAAW,CAAC,EAAE,MAAM,GAAG,YAAY;IAe5C,OAAO,CAAC,WAAW;IA8BnB,OAAO,CAAC,qBAAqB;IAO7B,OAAO,CAAC,oBAAoB;CA6B7B"}
|
|
@@ -11,13 +11,14 @@ exports.ProviderRequestGate = void 0;
|
|
|
11
11
|
class ProviderRequestGate {
|
|
12
12
|
constructor(options = {}) {
|
|
13
13
|
this.activeCount = 0;
|
|
14
|
+
this.activeByProvider = new Map();
|
|
14
15
|
this.waiters = [];
|
|
15
|
-
this.
|
|
16
|
-
this.
|
|
16
|
+
this.cooldowns = new Map();
|
|
17
|
+
this.cooldownTimer = null;
|
|
18
|
+
this.cooldownTimerDue = 0;
|
|
17
19
|
const configured = Number(options.maxConcurrent ?? 6);
|
|
18
|
-
this.maxConcurrent =
|
|
19
|
-
? Math.floor(configured)
|
|
20
|
-
: 1;
|
|
20
|
+
this.maxConcurrent =
|
|
21
|
+
Number.isFinite(configured) && configured >= 1 ? Math.floor(configured) : 1;
|
|
21
22
|
}
|
|
22
23
|
/**
|
|
23
24
|
* Acquire a gate lease. If cooldown is active, waits until it expires.
|
|
@@ -35,6 +36,7 @@ class ProviderRequestGate {
|
|
|
35
36
|
if (idx >= 0) {
|
|
36
37
|
this.waiters.splice(idx, 1);
|
|
37
38
|
reject(new Error('aborted'));
|
|
39
|
+
this.tryDispatch();
|
|
38
40
|
}
|
|
39
41
|
request.abortSignal?.removeEventListener('abort', onAbort);
|
|
40
42
|
};
|
|
@@ -48,38 +50,44 @@ class ProviderRequestGate {
|
|
|
48
50
|
});
|
|
49
51
|
}
|
|
50
52
|
/**
|
|
51
|
-
* Enter cooldown for
|
|
52
|
-
* the
|
|
53
|
+
* Enter cooldown for one provider key. Other providers may continue to use
|
|
54
|
+
* the shared concurrency budget. Existing requests are not aborted.
|
|
53
55
|
*/
|
|
54
56
|
enterCooldown(providerKey, until, reason) {
|
|
55
|
-
|
|
56
|
-
|
|
57
|
-
this.
|
|
57
|
+
const current = this.cooldowns.get(providerKey);
|
|
58
|
+
if (!current || until > current.until) {
|
|
59
|
+
this.cooldowns.set(providerKey, { until, reason });
|
|
60
|
+
this.tryDispatch();
|
|
58
61
|
}
|
|
59
62
|
}
|
|
60
63
|
/** Snapshot for diagnostics / UI. */
|
|
61
|
-
snapshot() {
|
|
64
|
+
snapshot(providerKey) {
|
|
65
|
+
this.clearExpiredCooldowns();
|
|
66
|
+
const cooldown = providerKey
|
|
67
|
+
? this.cooldowns.get(providerKey)
|
|
68
|
+
: [...this.cooldowns.values()].sort((a, b) => b.until - a.until)[0];
|
|
62
69
|
return {
|
|
63
|
-
activeCount: this.activeCount,
|
|
64
|
-
waitingCount:
|
|
65
|
-
|
|
66
|
-
|
|
70
|
+
activeCount: providerKey ? (this.activeByProvider.get(providerKey) ?? 0) : this.activeCount,
|
|
71
|
+
waitingCount: providerKey
|
|
72
|
+
? this.waiters.filter(waiter => waiter.request.providerKey === providerKey).length
|
|
73
|
+
: this.waiters.length,
|
|
74
|
+
cooldownUntil: cooldown?.until ?? null,
|
|
75
|
+
cooldownReason: cooldown?.reason ?? null,
|
|
67
76
|
};
|
|
68
77
|
}
|
|
69
78
|
tryDispatch() {
|
|
79
|
+
this.clearExpiredCooldowns();
|
|
70
80
|
while (this.waiters.length > 0 && this.activeCount < this.maxConcurrent) {
|
|
71
|
-
|
|
72
|
-
if (
|
|
73
|
-
|
|
74
|
-
|
|
75
|
-
setTimeout(() => this.tryDispatch(), remaining + 50);
|
|
76
|
-
return;
|
|
77
|
-
}
|
|
78
|
-
const next = this.waiters.shift();
|
|
81
|
+
const nextIndex = this.waiters.findIndex(waiter => !this.cooldowns.has(waiter.request.providerKey));
|
|
82
|
+
if (nextIndex < 0)
|
|
83
|
+
break;
|
|
84
|
+
const [next] = this.waiters.splice(nextIndex, 1);
|
|
79
85
|
if (next.request.abortSignal && next.onAbort) {
|
|
80
86
|
next.request.abortSignal.removeEventListener('abort', next.onAbort);
|
|
81
87
|
}
|
|
82
88
|
this.activeCount++;
|
|
89
|
+
const providerKey = next.request.providerKey;
|
|
90
|
+
this.activeByProvider.set(providerKey, (this.activeByProvider.get(providerKey) ?? 0) + 1);
|
|
83
91
|
let released = false;
|
|
84
92
|
next.resolve({
|
|
85
93
|
release: () => {
|
|
@@ -87,10 +95,50 @@ class ProviderRequestGate {
|
|
|
87
95
|
return;
|
|
88
96
|
released = true;
|
|
89
97
|
this.activeCount = Math.max(0, this.activeCount - 1);
|
|
98
|
+
const providerActive = Math.max(0, (this.activeByProvider.get(providerKey) ?? 1) - 1);
|
|
99
|
+
if (providerActive === 0)
|
|
100
|
+
this.activeByProvider.delete(providerKey);
|
|
101
|
+
else
|
|
102
|
+
this.activeByProvider.set(providerKey, providerActive);
|
|
90
103
|
this.tryDispatch();
|
|
91
104
|
},
|
|
92
105
|
});
|
|
93
106
|
}
|
|
107
|
+
this.scheduleCooldownWake();
|
|
108
|
+
}
|
|
109
|
+
clearExpiredCooldowns() {
|
|
110
|
+
const now = Date.now();
|
|
111
|
+
for (const [key, cooldown] of this.cooldowns) {
|
|
112
|
+
if (cooldown.until <= now)
|
|
113
|
+
this.cooldowns.delete(key);
|
|
114
|
+
}
|
|
115
|
+
}
|
|
116
|
+
scheduleCooldownWake() {
|
|
117
|
+
const waitingKeys = new Set(this.waiters.map(waiter => waiter.request.providerKey));
|
|
118
|
+
const earliest = [...waitingKeys]
|
|
119
|
+
.map(key => this.cooldowns.get(key)?.until)
|
|
120
|
+
.filter((until) => until !== undefined)
|
|
121
|
+
.sort((a, b) => a - b)[0];
|
|
122
|
+
if (earliest === undefined || this.activeCount >= this.maxConcurrent) {
|
|
123
|
+
if (this.cooldownTimer && earliest === undefined) {
|
|
124
|
+
clearTimeout(this.cooldownTimer);
|
|
125
|
+
this.cooldownTimer = null;
|
|
126
|
+
this.cooldownTimerDue = 0;
|
|
127
|
+
}
|
|
128
|
+
return;
|
|
129
|
+
}
|
|
130
|
+
if (this.cooldownTimer && this.cooldownTimerDue <= earliest)
|
|
131
|
+
return;
|
|
132
|
+
if (this.cooldownTimer)
|
|
133
|
+
clearTimeout(this.cooldownTimer);
|
|
134
|
+
this.cooldownTimerDue = earliest;
|
|
135
|
+
this.cooldownTimer = setTimeout(() => {
|
|
136
|
+
this.cooldownTimer = null;
|
|
137
|
+
this.cooldownTimerDue = 0;
|
|
138
|
+
this.tryDispatch();
|
|
139
|
+
}, Math.max(0, earliest - Date.now()) + 1);
|
|
140
|
+
const timer = this.cooldownTimer;
|
|
141
|
+
timer.unref?.();
|
|
94
142
|
}
|
|
95
143
|
}
|
|
96
144
|
exports.ProviderRequestGate = ProviderRequestGate;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"request-gate.js","sourceRoot":"","sources":["../../../src/services/provider-resilience/request-gate.ts"],"names":[],"mappings":";AAAA;;;;;;GAMG;;;
|
|
1
|
+
{"version":3,"file":"request-gate.js","sourceRoot":"","sources":["../../../src/services/provider-resilience/request-gate.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,30 @@
|
|
|
1
|
+
import { type Stats } from 'fs';
|
|
2
|
+
export type SafeProjectPathFailureReason = 'missing' | 'outside' | 'symlink' | 'non_regular' | 'unreadable';
|
|
3
|
+
export interface SafeProjectPathFailure {
|
|
4
|
+
ok: false;
|
|
5
|
+
reason: SafeProjectPathFailureReason;
|
|
6
|
+
error: string;
|
|
7
|
+
}
|
|
8
|
+
export interface SafeProjectPathSuccess {
|
|
9
|
+
ok: true;
|
|
10
|
+
canonicalPath: string;
|
|
11
|
+
canonicalRoot: string;
|
|
12
|
+
stats: Stats;
|
|
13
|
+
}
|
|
14
|
+
export type SafeProjectPathResult = SafeProjectPathFailure | SafeProjectPathSuccess;
|
|
15
|
+
export interface SafeProjectFileSuccess extends SafeProjectPathSuccess {
|
|
16
|
+
bytes: Buffer;
|
|
17
|
+
sizeBytes: number;
|
|
18
|
+
truncated: boolean;
|
|
19
|
+
}
|
|
20
|
+
export type SafeProjectFileResult = SafeProjectPathFailure | SafeProjectFileSuccess;
|
|
21
|
+
/**
|
|
22
|
+
* Resolve an existing path beneath a trusted root without crossing a symbolic
|
|
23
|
+
* link. The root itself may be reached through a platform alias such as
|
|
24
|
+
* `/tmp -> /private/tmp`; descendants must still map one-to-one below its
|
|
25
|
+
* canonical path.
|
|
26
|
+
*/
|
|
27
|
+
export declare function inspectSafeProjectPath(path: string, root: string): SafeProjectPathResult;
|
|
28
|
+
/** Open and read a bounded prefix while re-checking the opened inode. */
|
|
29
|
+
export declare function readSafeProjectFilePrefix(path: string, root: string, maxBytes: number): SafeProjectFileResult;
|
|
30
|
+
//# sourceMappingURL=safe-project-reader.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"safe-project-reader.d.ts","sourceRoot":"","sources":["../../src/services/safe-project-reader.ts"],"names":[],"mappings":"AAAA,OAAO,EASL,KAAK,KAAK,EACX,MAAM,IAAI,CAAC;AAGZ,MAAM,MAAM,4BAA4B,GACpC,SAAS,GACT,SAAS,GACT,SAAS,GACT,aAAa,GACb,YAAY,CAAC;AAEjB,MAAM,WAAW,sBAAsB;IACrC,EAAE,EAAE,KAAK,CAAC;IACV,MAAM,EAAE,4BAA4B,CAAC;IACrC,KAAK,EAAE,MAAM,CAAC;CACf;AAED,MAAM,WAAW,sBAAsB;IACrC,EAAE,EAAE,IAAI,CAAC;IACT,aAAa,EAAE,MAAM,CAAC;IACtB,aAAa,EAAE,MAAM,CAAC;IACtB,KAAK,EAAE,KAAK,CAAC;CACd;AAED,MAAM,MAAM,qBAAqB,GAAG,sBAAsB,GAAG,sBAAsB,CAAC;AAEpF,MAAM,WAAW,sBAAuB,SAAQ,sBAAsB;IACpE,KAAK,EAAE,MAAM,CAAC;IACd,SAAS,EAAE,MAAM,CAAC;IAClB,SAAS,EAAE,OAAO,CAAC;CACpB;AAED,MAAM,MAAM,qBAAqB,GAAG,sBAAsB,GAAG,sBAAsB,CAAC;AA0BpF;;;;;GAKG;AACH,wBAAgB,sBAAsB,CAAC,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,GAAG,qBAAqB,CAqDxF;AAED,yEAAyE;AACzE,wBAAgB,yBAAyB,CACvC,IAAI,EAAE,MAAM,EACZ,IAAI,EAAE,MAAM,EACZ,QAAQ,EAAE,MAAM,GACf,qBAAqB,CA2DvB"}
|
|
@@ -0,0 +1,141 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.inspectSafeProjectPath = inspectSafeProjectPath;
|
|
4
|
+
exports.readSafeProjectFilePrefix = readSafeProjectFilePrefix;
|
|
5
|
+
const fs_1 = require("fs");
|
|
6
|
+
const path_1 = require("path");
|
|
7
|
+
function isWithin(root, target) {
|
|
8
|
+
const rel = (0, path_1.relative)(root, target);
|
|
9
|
+
return rel === '' || (!rel.startsWith('..') && !(0, path_1.isAbsolute)(rel));
|
|
10
|
+
}
|
|
11
|
+
function failure(reason, error) {
|
|
12
|
+
return { ok: false, reason, error };
|
|
13
|
+
}
|
|
14
|
+
function errorCode(error) {
|
|
15
|
+
if (!error || typeof error !== 'object' || !('code' in error))
|
|
16
|
+
return undefined;
|
|
17
|
+
return typeof error.code === 'string' && /^[A-Z0-9_]+$/u.test(error.code)
|
|
18
|
+
? error.code
|
|
19
|
+
: undefined;
|
|
20
|
+
}
|
|
21
|
+
function unreadable(operation, error) {
|
|
22
|
+
const code = errorCode(error);
|
|
23
|
+
return failure('unreadable', `${operation} failed inside the allowed project boundary${code ? ` (${code})` : ''}.`);
|
|
24
|
+
}
|
|
25
|
+
/**
|
|
26
|
+
* Resolve an existing path beneath a trusted root without crossing a symbolic
|
|
27
|
+
* link. The root itself may be reached through a platform alias such as
|
|
28
|
+
* `/tmp -> /private/tmp`; descendants must still map one-to-one below its
|
|
29
|
+
* canonical path.
|
|
30
|
+
*/
|
|
31
|
+
function inspectSafeProjectPath(path, root) {
|
|
32
|
+
const resolvedRoot = (0, path_1.resolve)(root);
|
|
33
|
+
const resolvedPath = (0, path_1.resolve)(path);
|
|
34
|
+
const lexicalRelative = (0, path_1.relative)(resolvedRoot, resolvedPath);
|
|
35
|
+
if (lexicalRelative.startsWith('..') || (0, path_1.isAbsolute)(lexicalRelative)) {
|
|
36
|
+
return failure('outside', 'Path is outside the allowed project root.');
|
|
37
|
+
}
|
|
38
|
+
let canonicalRoot;
|
|
39
|
+
try {
|
|
40
|
+
canonicalRoot = (0, fs_1.realpathSync)(resolvedRoot);
|
|
41
|
+
}
|
|
42
|
+
catch (error) {
|
|
43
|
+
return unreadable('Allowed project root resolution', error);
|
|
44
|
+
}
|
|
45
|
+
let linkStats;
|
|
46
|
+
try {
|
|
47
|
+
linkStats = (0, fs_1.lstatSync)(resolvedPath);
|
|
48
|
+
}
|
|
49
|
+
catch (error) {
|
|
50
|
+
const code = errorCode(error);
|
|
51
|
+
return code === 'ENOENT'
|
|
52
|
+
? failure('missing', 'Path does not exist.')
|
|
53
|
+
: unreadable('Path metadata inspection', error);
|
|
54
|
+
}
|
|
55
|
+
if (linkStats.isSymbolicLink()) {
|
|
56
|
+
return failure('symlink', 'Symbolic links are not loaded across the project trust boundary.');
|
|
57
|
+
}
|
|
58
|
+
let canonicalPath;
|
|
59
|
+
try {
|
|
60
|
+
canonicalPath = (0, fs_1.realpathSync)(resolvedPath);
|
|
61
|
+
}
|
|
62
|
+
catch (error) {
|
|
63
|
+
return unreadable('Canonical path resolution', error);
|
|
64
|
+
}
|
|
65
|
+
const expectedCanonicalPath = (0, path_1.resolve)(canonicalRoot, lexicalRelative);
|
|
66
|
+
if (canonicalPath !== expectedCanonicalPath) {
|
|
67
|
+
return failure('symlink', 'Path traverses a symbolic link and was not loaded.');
|
|
68
|
+
}
|
|
69
|
+
if (!isWithin(canonicalRoot, canonicalPath)) {
|
|
70
|
+
return failure('outside', 'Canonical path is outside the allowed project root.');
|
|
71
|
+
}
|
|
72
|
+
let stats;
|
|
73
|
+
try {
|
|
74
|
+
stats = (0, fs_1.statSync)(canonicalPath);
|
|
75
|
+
}
|
|
76
|
+
catch (error) {
|
|
77
|
+
return unreadable('Canonical path metadata inspection', error);
|
|
78
|
+
}
|
|
79
|
+
if (!stats.isFile() && !stats.isDirectory()) {
|
|
80
|
+
return failure('non_regular', 'Path is not a regular file or directory.');
|
|
81
|
+
}
|
|
82
|
+
return { ok: true, canonicalPath, canonicalRoot, stats };
|
|
83
|
+
}
|
|
84
|
+
/** Open and read a bounded prefix while re-checking the opened inode. */
|
|
85
|
+
function readSafeProjectFilePrefix(path, root, maxBytes) {
|
|
86
|
+
const inspected = inspectSafeProjectPath(path, root);
|
|
87
|
+
if (!inspected.ok)
|
|
88
|
+
return inspected;
|
|
89
|
+
if (!inspected.stats.isFile()) {
|
|
90
|
+
return failure('non_regular', 'Path is not a regular file.');
|
|
91
|
+
}
|
|
92
|
+
const limit = Number.isSafeInteger(maxBytes) && maxBytes >= 0 ? maxBytes : 0;
|
|
93
|
+
const noFollow = typeof fs_1.constants.O_NOFOLLOW === 'number' ? fs_1.constants.O_NOFOLLOW : 0;
|
|
94
|
+
let descriptor;
|
|
95
|
+
try {
|
|
96
|
+
descriptor = (0, fs_1.openSync)(inspected.canonicalPath, fs_1.constants.O_RDONLY | noFollow);
|
|
97
|
+
}
|
|
98
|
+
catch (error) {
|
|
99
|
+
return errorCode(error) === 'ELOOP'
|
|
100
|
+
? failure('symlink', 'Path changed to a symbolic link while it was being opened.')
|
|
101
|
+
: unreadable('File open', error);
|
|
102
|
+
}
|
|
103
|
+
try {
|
|
104
|
+
const openedStats = (0, fs_1.fstatSync)(descriptor);
|
|
105
|
+
if (!openedStats.isFile()) {
|
|
106
|
+
return failure('non_regular', 'Opened path is not a regular file.');
|
|
107
|
+
}
|
|
108
|
+
// Re-resolve after open and compare the descriptor inode with the current
|
|
109
|
+
// canonical target. A replacement between validation and open fails closed.
|
|
110
|
+
const currentCanonicalPath = (0, fs_1.realpathSync)(inspected.canonicalPath);
|
|
111
|
+
if (currentCanonicalPath !== inspected.canonicalPath ||
|
|
112
|
+
!isWithin(inspected.canonicalRoot, currentCanonicalPath)) {
|
|
113
|
+
return failure('symlink', 'Path changed while it was being opened.');
|
|
114
|
+
}
|
|
115
|
+
// lstat the final path instead of following a replacement symlink with
|
|
116
|
+
// stat. The pathname must still resolve to the descriptor's exact inode.
|
|
117
|
+
const currentStats = (0, fs_1.lstatSync)(inspected.canonicalPath);
|
|
118
|
+
if (currentStats.isSymbolicLink() ||
|
|
119
|
+
currentStats.dev !== openedStats.dev ||
|
|
120
|
+
currentStats.ino !== openedStats.ino) {
|
|
121
|
+
return failure('symlink', 'Path changed while it was being opened.');
|
|
122
|
+
}
|
|
123
|
+
const bytesToRead = Math.min(openedStats.size, limit);
|
|
124
|
+
const buffer = Buffer.alloc(bytesToRead);
|
|
125
|
+
const bytesRead = bytesToRead > 0 ? (0, fs_1.readSync)(descriptor, buffer, 0, bytesToRead, 0) : 0;
|
|
126
|
+
return {
|
|
127
|
+
...inspected,
|
|
128
|
+
stats: openedStats,
|
|
129
|
+
bytes: buffer.subarray(0, bytesRead),
|
|
130
|
+
sizeBytes: openedStats.size,
|
|
131
|
+
truncated: openedStats.size > limit,
|
|
132
|
+
};
|
|
133
|
+
}
|
|
134
|
+
catch (error) {
|
|
135
|
+
return unreadable('Opened file validation or read', error);
|
|
136
|
+
}
|
|
137
|
+
finally {
|
|
138
|
+
(0, fs_1.closeSync)(descriptor);
|
|
139
|
+
}
|
|
140
|
+
}
|
|
141
|
+
//# sourceMappingURL=safe-project-reader.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"safe-project-reader.js","sourceRoot":"","sources":["../../src/services/safe-project-reader.ts"],"names":[],"mappings":"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"}
|