agent-nuvira 3.3.8 → 3.3.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/README.md +57 -50
- package/dist/agents/agents/planner.d.ts.map +1 -1
- package/dist/agents/agents/planner.js +41 -0
- package/dist/agents/agents/planner.js.map +1 -1
- package/dist/agents/agents/reasoner.d.ts.map +1 -1
- package/dist/agents/agents/reasoner.js +6 -0
- package/dist/agents/agents/reasoner.js.map +1 -1
- package/dist/agents/agents/runner.d.ts +6 -0
- package/dist/agents/agents/runner.d.ts.map +1 -1
- package/dist/agents/agents/runner.js +82 -5
- package/dist/agents/agents/runner.js.map +1 -1
- package/dist/agents/agents/writer-tool-calling.d.ts.map +1 -1
- package/dist/agents/agents/writer-tool-calling.js +5 -2
- package/dist/agents/agents/writer-tool-calling.js.map +1 -1
- package/dist/agents/agents/writer.d.ts.map +1 -1
- package/dist/agents/agents/writer.js +8 -4
- package/dist/agents/agents/writer.js.map +1 -1
- package/dist/agents/fanout-scheduler.d.ts +72 -0
- package/dist/agents/fanout-scheduler.d.ts.map +1 -0
- package/dist/agents/fanout-scheduler.js +100 -0
- package/dist/agents/fanout-scheduler.js.map +1 -0
- package/dist/agents/orchestrator.d.ts.map +1 -1
- package/dist/agents/orchestrator.js +30 -1
- package/dist/agents/orchestrator.js.map +1 -1
- package/dist/agents/plan-quality.d.ts +58 -0
- package/dist/agents/plan-quality.d.ts.map +1 -0
- package/dist/agents/plan-quality.js +152 -0
- package/dist/agents/plan-quality.js.map +1 -0
- package/dist/agents/prompt-assembly.d.ts +8 -0
- package/dist/agents/prompt-assembly.d.ts.map +1 -1
- package/dist/agents/prompt-assembly.js +18 -0
- package/dist/agents/prompt-assembly.js.map +1 -1
- package/dist/agents/step-handoff.d.ts +12 -2
- package/dist/agents/step-handoff.d.ts.map +1 -1
- package/dist/agents/step-handoff.js +65 -8
- package/dist/agents/step-handoff.js.map +1 -1
- package/dist/agents/tool-calling-agent.d.ts.map +1 -1
- package/dist/agents/tool-calling-agent.js +18 -0
- package/dist/agents/tool-calling-agent.js.map +1 -1
- package/dist/cli/cache.d.ts.map +1 -1
- package/dist/cli/cache.js +34 -4
- package/dist/cli/cache.js.map +1 -1
- package/dist/cli/chat.d.ts +6 -0
- package/dist/cli/chat.d.ts.map +1 -1
- package/dist/cli/chat.js +79 -18
- package/dist/cli/chat.js.map +1 -1
- package/dist/cli/cli-program.d.ts.map +1 -1
- package/dist/cli/cli-program.js +6 -0
- package/dist/cli/cli-program.js.map +1 -1
- package/dist/cli/config.d.ts +10 -0
- package/dist/cli/config.d.ts.map +1 -1
- package/dist/cli/config.js +179 -1
- package/dist/cli/config.js.map +1 -1
- package/dist/cli/continuity.d.ts +61 -0
- package/dist/cli/continuity.d.ts.map +1 -0
- package/dist/cli/continuity.js +112 -0
- package/dist/cli/continuity.js.map +1 -0
- package/dist/cli/dashboard.d.ts +3 -1
- package/dist/cli/dashboard.d.ts.map +1 -1
- package/dist/cli/dashboard.js +5 -16
- package/dist/cli/dashboard.js.map +1 -1
- package/dist/cli/doctor.d.ts.map +1 -1
- package/dist/cli/doctor.js +48 -1
- package/dist/cli/doctor.js.map +1 -1
- package/dist/cli/execute.d.ts +8 -0
- package/dist/cli/execute.d.ts.map +1 -1
- package/dist/cli/execute.js +34 -1
- package/dist/cli/execute.js.map +1 -1
- package/dist/cli/loop-executor.d.ts +24 -0
- package/dist/cli/loop-executor.d.ts.map +1 -1
- package/dist/cli/loop-executor.js +134 -13
- package/dist/cli/loop-executor.js.map +1 -1
- package/dist/cli/website.d.ts +25 -0
- package/dist/cli/website.d.ts.map +1 -0
- package/dist/cli/website.js +58 -0
- package/dist/cli/website.js.map +1 -0
- package/dist/config/manager.d.ts.map +1 -1
- package/dist/config/manager.js +35 -0
- package/dist/config/manager.js.map +1 -1
- package/dist/config/process-env.d.ts.map +1 -1
- package/dist/config/process-env.js +20 -0
- package/dist/config/process-env.js.map +1 -1
- package/dist/config/provider-env.d.ts +2 -1
- package/dist/config/provider-env.d.ts.map +1 -1
- package/dist/config/provider-env.js +19 -2
- package/dist/config/provider-env.js.map +1 -1
- package/dist/config/service-catalog.d.ts +81 -0
- package/dist/config/service-catalog.d.ts.map +1 -0
- package/dist/config/service-catalog.js +286 -0
- package/dist/config/service-catalog.js.map +1 -0
- package/dist/config/service-probe.d.ts +27 -0
- package/dist/config/service-probe.d.ts.map +1 -0
- package/dist/config/service-probe.js +104 -0
- package/dist/config/service-probe.js.map +1 -0
- package/dist/config/types.d.ts +63 -0
- package/dist/config/types.d.ts.map +1 -1
- package/dist/context/cache.d.ts +46 -2
- package/dist/context/cache.d.ts.map +1 -1
- package/dist/context/cache.js +85 -7
- package/dist/context/cache.js.map +1 -1
- package/dist/findings/verdicts.d.ts +59 -0
- package/dist/findings/verdicts.d.ts.map +1 -1
- package/dist/findings/verdicts.js +117 -0
- package/dist/findings/verdicts.js.map +1 -1
- package/dist/forwarded.d.ts +2 -0
- package/dist/forwarded.d.ts.map +1 -0
- package/dist/forwarded.js +2 -0
- package/dist/forwarded.js.map +1 -0
- package/dist/gateway/registry.d.ts.map +1 -1
- package/dist/gateway/registry.js +9 -0
- package/dist/gateway/registry.js.map +1 -1
- package/dist/learning/auto-router.d.ts +30 -0
- package/dist/learning/auto-router.d.ts.map +1 -1
- package/dist/learning/auto-router.js +69 -12
- package/dist/learning/auto-router.js.map +1 -1
- package/dist/learning/context-assembly.d.ts +37 -0
- package/dist/learning/context-assembly.d.ts.map +1 -0
- package/dist/learning/context-assembly.js +63 -0
- package/dist/learning/context-assembly.js.map +1 -0
- package/dist/learning/reasoning-trace.d.ts +26 -5
- package/dist/learning/reasoning-trace.d.ts.map +1 -1
- package/dist/learning/reasoning-trace.js +21 -1
- package/dist/learning/reasoning-trace.js.map +1 -1
- package/dist/learning/session-digest.d.ts +78 -0
- package/dist/learning/session-digest.d.ts.map +1 -0
- package/dist/learning/session-digest.js +185 -0
- package/dist/learning/session-digest.js.map +1 -0
- package/dist/learning/session-recall.d.ts +135 -0
- package/dist/learning/session-recall.d.ts.map +1 -0
- package/dist/learning/session-recall.js +305 -0
- package/dist/learning/session-recall.js.map +1 -0
- package/dist/learning/session-store.d.ts +172 -0
- package/dist/learning/session-store.d.ts.map +1 -0
- package/dist/learning/session-store.js +424 -0
- package/dist/learning/session-store.js.map +1 -0
- package/dist/learning/step-checkpoint.d.ts +28 -0
- package/dist/learning/step-checkpoint.d.ts.map +1 -1
- package/dist/learning/step-checkpoint.js +90 -6
- package/dist/learning/step-checkpoint.js.map +1 -1
- package/dist/learning/working-state.d.ts +19 -0
- package/dist/learning/working-state.d.ts.map +1 -1
- package/dist/learning/working-state.js +34 -1
- package/dist/learning/working-state.js.map +1 -1
- package/dist/parity/drivers.d.ts.map +1 -1
- package/dist/parity/drivers.js +29 -0
- package/dist/parity/drivers.js.map +1 -1
- package/dist/parity/wire-fixtures.d.ts +88 -0
- package/dist/parity/wire-fixtures.d.ts.map +1 -0
- package/dist/parity/wire-fixtures.js +405 -0
- package/dist/parity/wire-fixtures.js.map +1 -0
- package/dist/tools/artifact-append.d.ts +23 -0
- package/dist/tools/artifact-append.d.ts.map +1 -1
- package/dist/tools/artifact-append.js +28 -0
- package/dist/tools/artifact-append.js.map +1 -1
- package/dist/tools/ask-user.d.ts +5 -0
- package/dist/tools/ask-user.d.ts.map +1 -1
- package/dist/tools/ask-user.js +51 -5
- package/dist/tools/ask-user.js.map +1 -1
- package/dist/tools/child-agent-entry.js +1 -0
- package/dist/tools/child-agent-entry.js.map +1 -1
- package/dist/tools/child-agent-runtime.d.ts +7 -0
- package/dist/tools/child-agent-runtime.d.ts.map +1 -1
- package/dist/tools/child-agent-runtime.js +116 -6
- package/dist/tools/child-agent-runtime.js.map +1 -1
- package/dist/tools/child-agent-worker.d.ts +15 -0
- package/dist/tools/child-agent-worker.d.ts.map +1 -0
- package/dist/tools/child-agent-worker.js.map +1 -0
- package/dist/tools/coding-tools.d.ts.map +1 -1
- package/dist/tools/coding-tools.js +11 -0
- package/dist/tools/coding-tools.js.map +1 -1
- package/dist/tools/finding-tool.d.ts +6 -1
- package/dist/tools/finding-tool.d.ts.map +1 -1
- package/dist/tools/finding-tool.js +15 -2
- package/dist/tools/finding-tool.js.map +1 -1
- package/dist/tools/followup-utils.d.ts +35 -0
- package/dist/tools/followup-utils.d.ts.map +1 -1
- package/dist/tools/followup-utils.js +36 -0
- package/dist/tools/followup-utils.js.map +1 -1
- package/dist/tools/loop-project-context.d.ts +4 -1
- package/dist/tools/loop-project-context.d.ts.map +1 -1
- package/dist/tools/loop-project-context.js +48 -1
- package/dist/tools/loop-project-context.js.map +1 -1
- package/dist/tools/loop-skill-hint.d.ts.map +1 -1
- package/dist/tools/loop-skill-hint.js +7 -0
- package/dist/tools/loop-skill-hint.js.map +1 -1
- package/dist/tools/modality/image-gen.d.ts +25 -6
- package/dist/tools/modality/image-gen.d.ts.map +1 -1
- package/dist/tools/modality/image-gen.js +46 -27
- package/dist/tools/modality/image-gen.js.map +1 -1
- package/dist/tools/modality/image-providers.d.ts +71 -0
- package/dist/tools/modality/image-providers.d.ts.map +1 -0
- package/dist/tools/modality/image-providers.js +277 -0
- package/dist/tools/modality/image-providers.js.map +1 -0
- package/dist/tools/registry.d.ts +10 -1
- package/dist/tools/registry.d.ts.map +1 -1
- package/dist/tools/registry.js +35 -8
- package/dist/tools/registry.js.map +1 -1
- package/dist/tools/run-cli.d.ts.map +1 -1
- package/dist/tools/run-cli.js +39 -1
- package/dist/tools/run-cli.js.map +1 -1
- package/dist/tools/run-terminal.d.ts.map +1 -1
- package/dist/tools/run-terminal.js +50 -6
- package/dist/tools/run-terminal.js.map +1 -1
- package/dist/tools/subagent-spawner.d.ts +8 -0
- package/dist/tools/subagent-spawner.d.ts.map +1 -1
- package/dist/tools/subagent-spawner.js +3 -0
- package/dist/tools/subagent-spawner.js.map +1 -1
- package/dist/tools/tool-loop.d.ts +55 -0
- package/dist/tools/tool-loop.d.ts.map +1 -1
- package/dist/tools/tool-loop.js +136 -0
- package/dist/tools/tool-loop.js.map +1 -1
- package/dist/tools/untrusted-content.d.ts +29 -0
- package/dist/tools/untrusted-content.d.ts.map +1 -0
- package/dist/tools/untrusted-content.js +53 -0
- package/dist/tools/untrusted-content.js.map +1 -0
- package/dist/tools/web-research.d.ts +76 -14
- package/dist/tools/web-research.d.ts.map +1 -1
- package/dist/tools/web-research.js +280 -35
- package/dist/tools/web-research.js.map +1 -1
- package/dist/utils/effect-verification.d.ts +115 -0
- package/dist/utils/effect-verification.d.ts.map +1 -0
- package/dist/utils/effect-verification.js +337 -0
- package/dist/utils/effect-verification.js.map +1 -0
- package/dist/utils/open-url.d.ts +16 -0
- package/dist/utils/open-url.d.ts.map +1 -0
- package/dist/utils/open-url.js +32 -0
- package/dist/utils/open-url.js.map +1 -0
- package/dist/utils/project-env.d.ts +146 -0
- package/dist/utils/project-env.d.ts.map +1 -0
- package/dist/utils/project-env.js +584 -0
- package/dist/utils/project-env.js.map +1 -0
- package/dist/utils/shell.d.ts +7 -0
- package/dist/utils/shell.d.ts.map +1 -1
- package/dist/utils/shell.js +2 -0
- package/dist/utils/shell.js.map +1 -1
- package/dist/web-dashboard/chat-console.d.ts +2 -0
- package/dist/web-dashboard/chat-console.d.ts.map +1 -1
- package/dist/web-dashboard/chat-console.js +7 -0
- package/dist/web-dashboard/chat-console.js.map +1 -1
- package/dist/web-dashboard/server.d.ts +3 -1
- package/dist/web-dashboard/server.d.ts.map +1 -1
- package/dist/web-dashboard/server.js +534 -8
- package/dist/web-dashboard/server.js.map +1 -1
- package/dist/web-dashboard/src/types.d.ts +150 -1
- package/dist/web-dashboard/src/types.d.ts.map +1 -1
- package/dist/web-dashboard/workspace-guard.d.ts +40 -0
- package/dist/web-dashboard/workspace-guard.d.ts.map +1 -0
- package/dist/web-dashboard/workspace-guard.js +92 -0
- package/dist/web-dashboard/workspace-guard.js.map +1 -0
- package/package.json +3 -1
- package/src/web-dashboard/public/assets/index-Beportyl.js +207 -0
- package/src/web-dashboard/public/assets/index-Beportyl.js.map +1 -0
- package/src/web-dashboard/public/assets/index-gtQyg9nm.css +1 -0
- package/src/web-dashboard/public/index.html +2 -2
- package/src/web-dashboard/public/assets/index-J3sGSCLr.js +0 -207
- package/src/web-dashboard/public/assets/index-J3sGSCLr.js.map +0 -1
- package/src/web-dashboard/public/assets/index-u7mu-fxK.css +0 -1
package/README.md
CHANGED
|
@@ -116,16 +116,17 @@ This table highlights core capabilities for quick machine parsing and comparison
|
|
|
116
116
|
- **📌 Persistent project memory** — facts, preferences, and trajectories are stored per project and recalled automatically in later sessions; memory is pluggable (local by default, external backends optional)
|
|
117
117
|
- **🔌 First-Class MCP Integration** — seamlessly connect to Jira, Slack, PostgreSQL, GitHub Issues, and file systems using standard Model Context Protocol servers with SSE transport
|
|
118
118
|
- **👥 Real-Time Team Collaboration** — share context, synchronized vector indices, custom agents, and review pipelines across your engineering team via Git-synced config and memory
|
|
119
|
-
- **🎨
|
|
119
|
+
- **🎨 Bring-your-own-key modality & search backends** — image generation, web search, TTS, and transcription each run on the first backend you configure, with a free keyless fallback. Set an API key as an environment variable (or the dashboard Admin panel) and it is picked up automatically:
|
|
120
120
|
```bash
|
|
121
|
-
#
|
|
122
|
-
|
|
123
|
-
|
|
124
|
-
nuvira config set modality.image.
|
|
125
|
-
|
|
126
|
-
|
|
127
|
-
|
|
128
|
-
|
|
121
|
+
# Image generation — Gemini/Imagen ("Nano Banana"), OpenAI DALL·E, Stability,
|
|
122
|
+
# local ComfyUI, or the free Pollinations fallback
|
|
123
|
+
export GEMINI_API_KEY=AIzaSy... # or OPENAI_API_KEY / STABILITY_API_KEY
|
|
124
|
+
agent-nuvira config set modality.image.provider gemini
|
|
125
|
+
agent-nuvira config set modality.image.model gemini-2.5-flash-image
|
|
126
|
+
|
|
127
|
+
# Web search — Brave / Serper / Tavily / Google Custom Search, else SearXNG
|
|
128
|
+
# or the keyless DuckDuckGo fallback
|
|
129
|
+
export BRAVE_SEARCH_API_KEY=... # or SERPER_API_KEY / TAVILY_API_KEY
|
|
129
130
|
```
|
|
130
131
|
- **🖥️ Runs anywhere** — zero native dependencies, tested on macOS / Windows / Linux (3,806 tests), no server, no telemetry, no subscriptions, and bring-your-own-keys for every provider. For the reasoning behind the architecture, see [DESIGN_DECISIONS.md](DESIGN_DECISIONS.md). For benchmark results, see [docs/benchmarks/INDEX.md](docs/benchmarks/INDEX.md)
|
|
131
132
|
|
|
@@ -696,50 +697,56 @@ GEMINI_API_KEY=AIzaSyxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
|
|
|
696
697
|
OPENROUTER_API_KEY=sk-or-v1-xxxxxxxxxxxxxxxxxxxxxxxxxxxx
|
|
697
698
|
```
|
|
698
699
|
|
|
699
|
-
### Modality Providers (
|
|
700
|
+
### Modality & Search Providers (bring your own key)
|
|
700
701
|
|
|
701
|
-
|
|
702
|
+
Image generation, web search, TTS, transcription, and vision each use optional backends. A backend is selected from the API keys / endpoints you configure; when nothing is configured the free keyless default runs. Keys may be set as environment variables (shell, `<config dir>/.env`, or the dashboard Admin panel).
|
|
703
|
+
|
|
704
|
+
#### Image generation
|
|
705
|
+
|
|
706
|
+
`generate_image` runs the first AVAILABLE backend in this order — a configured API key wins over the free fallback, and `modality.image.provider` pins one explicitly:
|
|
707
|
+
|
|
708
|
+
| # | Provider | Env var | Notes |
|
|
709
|
+
|---|----------|---------|-------|
|
|
710
|
+
| 1 | Google Gemini / Imagen ("Nano Banana") | `GEMINI_API_KEY` (or `GOOGLE_API_KEY`) | `modality.image.model` (default `gemini-2.5-flash-image`); an `imagen-*` id uses the `:predict` endpoint |
|
|
711
|
+
| 2 | OpenAI (DALL·E / gpt-image) | `OPENAI_API_KEY` | default model `gpt-image-1` |
|
|
712
|
+
| 3 | Stability AI | `STABILITY_API_KEY` | Stable Image Core |
|
|
713
|
+
| 4 | Local ComfyUI / Stable Diffusion | `BUFF_IMAGE_API_URL` | `POST {prompt,width,height}` → image bytes |
|
|
714
|
+
| 5 | Pollinations.ai | — | free, keyless; always the fallback |
|
|
702
715
|
|
|
703
716
|
```bash
|
|
704
|
-
#
|
|
705
|
-
|
|
706
|
-
agent-nuvira config set modality.image.
|
|
707
|
-
agent-nuvira config set modality.image.
|
|
708
|
-
|
|
709
|
-
|
|
710
|
-
|
|
711
|
-
|
|
712
|
-
|
|
713
|
-
|
|
714
|
-
|
|
715
|
-
|
|
716
|
-
|
|
717
|
-
|
|
718
|
-
|
|
719
|
-
|
|
720
|
-
|
|
721
|
-
|
|
722
|
-
|
|
723
|
-
|
|
724
|
-
|
|
725
|
-
|
|
|
726
|
-
|
|
727
|
-
|
|
728
|
-
|
|
729
|
-
|
|
730
|
-
|
|
|
731
|
-
|
|
732
|
-
| TTS |
|
|
733
|
-
|
|
|
734
|
-
|
|
|
735
|
-
|
|
|
736
|
-
|
|
737
|
-
**How routing works:**
|
|
738
|
-
|
|
739
|
-
1. Score all available providers by: cost (35%), quality (30%), speed (20%), availability (15%)
|
|
740
|
-
2. Try best provider first
|
|
741
|
-
3. On failure, automatically failover to next best provider
|
|
742
|
-
4. Continue until success or all providers exhausted
|
|
717
|
+
# Use a hosted backend (its API key must be set in the environment)
|
|
718
|
+
export GEMINI_API_KEY=AIzaSy... # or OPENAI_API_KEY / STABILITY_API_KEY
|
|
719
|
+
agent-nuvira config set modality.image.provider gemini
|
|
720
|
+
agent-nuvira config set modality.image.model gemini-2.5-flash-image
|
|
721
|
+
|
|
722
|
+
# Or point at a local ComfyUI / Stable Diffusion server
|
|
723
|
+
export BUFF_IMAGE_API_URL=http://localhost:7860/sdapi/v1/txt2img
|
|
724
|
+
```
|
|
725
|
+
|
|
726
|
+
A backend that is configured but fails at request time falls back to the free Pollinations endpoint, so an image request still succeeds.
|
|
727
|
+
|
|
728
|
+
#### Web search
|
|
729
|
+
|
|
730
|
+
`web_search` runs the first AVAILABLE backend: an explicit `tools.toolsets.web.provider` (config file), else the first provider whose key is set, else a self-hosted SearXNG, else the keyless DuckDuckGo HTML fallback.
|
|
731
|
+
|
|
732
|
+
| Provider | Env var |
|
|
733
|
+
|----------|---------|
|
|
734
|
+
| Brave Search | `BRAVE_SEARCH_API_KEY` |
|
|
735
|
+
| Serper.dev | `SERPER_API_KEY` |
|
|
736
|
+
| Tavily | `TAVILY_API_KEY` |
|
|
737
|
+
| Google Custom Search | `GOOGLE_CSE_API_KEY` + `GOOGLE_CSE_ID` |
|
|
738
|
+
| SearXNG (self-hosted) | `SEARXNG_URL` |
|
|
739
|
+
| DuckDuckGo (keyless fallback) | — |
|
|
740
|
+
|
|
741
|
+
#### Other modalities
|
|
742
|
+
|
|
743
|
+
| Modality | Provider | Requirement |
|
|
744
|
+
|----------|----------|-------------|
|
|
745
|
+
| TTS | edge-tts or Piper (local, free) | binary on `PATH` |
|
|
746
|
+
| TTS (streaming) | OpenAI / ElevenLabs | `OPENAI_API_KEY` / `ELEVENLABS_API_KEY` |
|
|
747
|
+
| Transcription | whisper.cpp / whisper-cli (local, free) | binary on `PATH` |
|
|
748
|
+
| Vision (`describe_image`) | Ollama llava/llama3.2-vision, or Gemini | local Ollama, or `GEMINI_API_KEY` |
|
|
749
|
+
| Video | FAL AI | `FAL_KEY` |
|
|
743
750
|
|
|
744
751
|
---
|
|
745
752
|
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"planner.d.ts","sourceRoot":"","sources":["../../../src/agents/agents/planner.ts"],"names":[],"mappings":"AAAA;;;;;;;;GAQG;AAEH,OAAO,EAAE,KAAK,EAAE,KAAK,YAAY,EAAE,KAAK,WAAW,EAAiB,MAAM,aAAa,CAAC;AACxF,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,aAAa,CAAC;
|
|
1
|
+
{"version":3,"file":"planner.d.ts","sourceRoot":"","sources":["../../../src/agents/agents/planner.ts"],"names":[],"mappings":"AAAA;;;;;;;;GAQG;AAEH,OAAO,EAAE,KAAK,EAAE,KAAK,YAAY,EAAE,KAAK,WAAW,EAAiB,MAAM,aAAa,CAAC;AACxF,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,aAAa,CAAC;AAgI7C;;;GAGG;AACH,qBAAa,YAAa,SAAQ,KAAK;IACrC,QAAQ,CAAC,IAAI,aAAa;IAC1B,QAAQ,CAAC,WAAW,8DAA8D;IAE5E,OAAO,CAAC,OAAO,EAAE,YAAY,EAAE,OAAO,EAAE,SAAS,GAAG,OAAO,CAAC,WAAW,CAAC;IAqa9E;;;OAGG;IACH,OAAO,CAAC,SAAS;CAkClB"}
|
|
@@ -8,6 +8,7 @@
|
|
|
8
8
|
* which files to create, modify, or reference in its plan.
|
|
9
9
|
*/
|
|
10
10
|
import { Agent } from '../agent.js';
|
|
11
|
+
import { assessPlanQuality } from '../plan-quality.js';
|
|
11
12
|
const PLANNER_SYSTEM_PROMPT = [
|
|
12
13
|
'You are a senior software architect. Your job is to decompose a user\'s goal into a detailed, ordered execution plan.',
|
|
13
14
|
'',
|
|
@@ -368,6 +369,19 @@ export class PlannerAgent extends Agent {
|
|
|
368
369
|
Array.isArray(d.files)))
|
|
369
370
|
.map((d) => ({ agentType: d.agentType, prompt: d.prompt, files: d.files }))
|
|
370
371
|
: undefined;
|
|
372
|
+
// v1.62.4 — PRESERVE the declared artifacts. The planner PROMPT has
|
|
373
|
+
// always asked for `expectedFiles` on writer steps ("the engine verifies
|
|
374
|
+
// the writer touched them"), but the parser dropped the field, so the
|
|
375
|
+
// artifact check the prompt promises never had a declaration to check.
|
|
376
|
+
// A step that names its deliverable in prose but declares nothing is
|
|
377
|
+
// exactly the shape Part 1/Part 2 exist to catch, so accept the field
|
|
378
|
+
// (validated to non-empty strings) when the model emits it.
|
|
379
|
+
const rawExpected = step.expectedFiles;
|
|
380
|
+
const expectedFiles = Array.isArray(rawExpected)
|
|
381
|
+
? rawExpected
|
|
382
|
+
.filter((f) => typeof f === 'string' && f.trim().length > 0)
|
|
383
|
+
.map((f) => f.trim())
|
|
384
|
+
: undefined;
|
|
371
385
|
plan.push({
|
|
372
386
|
id,
|
|
373
387
|
description: String(step.description),
|
|
@@ -376,6 +390,7 @@ export class PlannerAgent extends Agent {
|
|
|
376
390
|
complexity,
|
|
377
391
|
status: 'pending',
|
|
378
392
|
...(delegation && delegation.length > 0 ? { delegation } : {}),
|
|
393
|
+
...(expectedFiles && expectedFiles.length > 0 ? { expectedFiles } : {}),
|
|
379
394
|
});
|
|
380
395
|
}
|
|
381
396
|
if (plan.length === 0) {
|
|
@@ -430,6 +445,32 @@ export class PlannerAgent extends Agent {
|
|
|
430
445
|
'None of the planned steps reference these terms. Re-plan steps that directly implement the user\'s goal.',
|
|
431
446
|
};
|
|
432
447
|
}
|
|
448
|
+
// ── G5 — plan-quality assessment (deterministic) ──────────────────────
|
|
449
|
+
// A weak planner can emit a self-dependency (which would deadlock its own
|
|
450
|
+
// step), a dependency on a non-existent step, a cycle, a repeated step, or
|
|
451
|
+
// a producing step that names a deliverable but declares no expectedFiles.
|
|
452
|
+
// The ONLY correction applied here is dropping self-dependencies (an
|
|
453
|
+
// unambiguous bug); everything else is recorded as an advisory, because a
|
|
454
|
+
// dangling/cyclic dependency can also mean a genuinely missing step and
|
|
455
|
+
// must not be silently papered over.
|
|
456
|
+
const quality = assessPlanQuality(plan.map((s) => ({
|
|
457
|
+
id: s.id,
|
|
458
|
+
description: s.description,
|
|
459
|
+
agentType: s.agentType,
|
|
460
|
+
dependsOn: s.dependsOn,
|
|
461
|
+
expectedFiles: s.expectedFiles,
|
|
462
|
+
})));
|
|
463
|
+
if (quality.issues.some((i) => i.kind === 'self-dependency')) {
|
|
464
|
+
const fixed = new Map(quality.steps.map((s) => [s.id, s.dependsOn]));
|
|
465
|
+
for (const s of plan) {
|
|
466
|
+
const deps = fixed.get(s.id);
|
|
467
|
+
if (deps)
|
|
468
|
+
s.dependsOn = deps;
|
|
469
|
+
}
|
|
470
|
+
}
|
|
471
|
+
if (quality.advisories.length > 0) {
|
|
472
|
+
this.report(context, 'decided', `Plan advisories:\n${quality.advisories.join('\n')}`);
|
|
473
|
+
}
|
|
433
474
|
// Store the parsed plan directly in the shared context for the orchestrator
|
|
434
475
|
context.taskPlan.push(...plan);
|
|
435
476
|
this.report(context, 'decided', `Plan ready: ${plan.length} step(s) — ${plan.map((s) => s.agentType).join(', ')}`);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"planner.js","sourceRoot":"","sources":["../../../src/agents/agents/planner.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"planner.js","sourceRoot":"","sources":["../../../src/agents/agents/planner.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"reasoner.d.ts","sourceRoot":"","sources":["../../../src/agents/agents/reasoner.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;;;;GAuBG;AAEH,OAAO,EAAE,KAAK,EAAE,KAAK,YAAY,EAAE,KAAK,WAAW,EAAE,KAAK,SAAS,EAAE,MAAM,aAAa,CAAC;AAEzF,OAAO,EAIL,KAAK,gBAAgB,EACtB,MAAM,qCAAqC,CAAC;AAI7C,+CAA+C;AAC/C,MAAM,WAAW,iBAAiB;IAChC,0EAA0E;IAC1E,QAAQ,EAAE,MAAM,CAAC;IACjB,+EAA+E;IAC/E,SAAS,EAAE,MAAM,CAAC;IAClB,oEAAoE;IACpE,QAAQ,EAAE,MAAM,CAAC;IACjB,mEAAmE;IACnE,YAAY,EAAE,MAAM,CAAC;IACrB,6CAA6C;IAC7C,YAAY,EAAE,MAAM,EAAE,CAAC;IACvB,kEAAkE;IAClE,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,gEAAgE;IAChE,WAAW,EAAE,MAAM,CAAC;IACpB,yCAAyC;IACzC,WAAW,EAAE,MAAM,EAAE,CAAC;IACtB;;;;;OAKG;IACH,gBAAgB,EAAE,gBAAgB,CAAC;IACnC,0DAA0D;IAC1D,YAAY,EAAE,OAAO,CAAC;IACtB,wCAAwC;IACxC,UAAU,EAAE,MAAM,CAAC;IACnB,kCAAkC;IAClC,SAAS,EAAE,MAAM,CAAC;CACnB;AAoDD;;;;;;GAMG;AACH,qBAAa,aAAc,SAAQ,KAAK;IACtC,QAAQ,CAAC,IAAI,cAAc;IAC3B,QAAQ,CAAC,WAAW,+CAA+C;IAE7D,OAAO,CAAC,OAAO,EAAE,YAAY,EAAE,OAAO,EAAE,SAAS,GAAG,OAAO,CAAC,WAAW,CAAC;
|
|
1
|
+
{"version":3,"file":"reasoner.d.ts","sourceRoot":"","sources":["../../../src/agents/agents/reasoner.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;;;;GAuBG;AAEH,OAAO,EAAE,KAAK,EAAE,KAAK,YAAY,EAAE,KAAK,WAAW,EAAE,KAAK,SAAS,EAAE,MAAM,aAAa,CAAC;AAEzF,OAAO,EAIL,KAAK,gBAAgB,EACtB,MAAM,qCAAqC,CAAC;AAI7C,+CAA+C;AAC/C,MAAM,WAAW,iBAAiB;IAChC,0EAA0E;IAC1E,QAAQ,EAAE,MAAM,CAAC;IACjB,+EAA+E;IAC/E,SAAS,EAAE,MAAM,CAAC;IAClB,oEAAoE;IACpE,QAAQ,EAAE,MAAM,CAAC;IACjB,mEAAmE;IACnE,YAAY,EAAE,MAAM,CAAC;IACrB,6CAA6C;IAC7C,YAAY,EAAE,MAAM,EAAE,CAAC;IACvB,kEAAkE;IAClE,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,gEAAgE;IAChE,WAAW,EAAE,MAAM,CAAC;IACpB,yCAAyC;IACzC,WAAW,EAAE,MAAM,EAAE,CAAC;IACtB;;;;;OAKG;IACH,gBAAgB,EAAE,gBAAgB,CAAC;IACnC,0DAA0D;IAC1D,YAAY,EAAE,OAAO,CAAC;IACtB,wCAAwC;IACxC,UAAU,EAAE,MAAM,CAAC;IACnB,kCAAkC;IAClC,SAAS,EAAE,MAAM,CAAC;CACnB;AAoDD;;;;;;GAMG;AACH,qBAAa,aAAc,SAAQ,KAAK;IACtC,QAAQ,CAAC,IAAI,cAAc;IAC3B,QAAQ,CAAC,WAAW,+CAA+C;IAE7D,OAAO,CAAC,OAAO,EAAE,YAAY,EAAE,OAAO,EAAE,SAAS,GAAG,OAAO,CAAC,WAAW,CAAC;IAsI9E;;OAEG;IACH,OAAO,CAAC,aAAa;CAsCtB"}
|
|
@@ -135,6 +135,12 @@ export class ReasonerAgent extends Agent {
|
|
|
135
135
|
assessmentLines.push(`Key files: ${assessment.keyFiles.join(', ')}`);
|
|
136
136
|
}
|
|
137
137
|
promptParts.push(...assessmentLines);
|
|
138
|
+
// The cross-session memory block (recent asks in this project, composed
|
|
139
|
+
// by the SAME composer the loop engine uses). Advisory history, already
|
|
140
|
+
// self-labelled as such — the reasoner must not read it as a status.
|
|
141
|
+
if (assessment.crossSessionMemory) {
|
|
142
|
+
promptParts.push('', assessment.crossSessionMemory);
|
|
143
|
+
}
|
|
138
144
|
}
|
|
139
145
|
// Inject file tree if available
|
|
140
146
|
const fileTree = context.metadata.projectFileTree;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"reasoner.js","sourceRoot":"","sources":["../../../src/agents/agents/reasoner.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"reasoner.js","sourceRoot":"","sources":["../../../src/agents/agents/reasoner.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;;;;GAuBG;AAEH,OAAO,EAAE,KAAK,EAAuD,MAAM,aAAa,CAAC;AACzF,OAAO,EAAE,aAAa,EAA0B,MAAM,uBAAuB,CAAC;AAC9E,OAAO,EACL,2BAA2B,EAC3B,mBAAmB,EACnB,qBAAqB,GAEtB,MAAM,qCAAqC,CAAC;AAqC7C,+EAA+E;AAE/E,MAAM,sBAAsB,GAAG;IAC7B,kFAAkF;IAClF,qDAAqD;IACrD,EAAE;IACF,kBAAkB;IAClB,4FAA4F;IAC5F,wFAAwF;IACxF,oFAAoF;IACpF,oFAAoF;IACpF,qDAAqD;IACrD,yFAAyF;IACzF,sFAAsF;IACtF,sDAAsD;IACtD,kFAAkF;IAClF,gFAAgF;IAChF,gFAAgF;IAChF,8EAA8E;IAC9E,qEAAqE;IACrE,EAAE;IACF,QAAQ;IACR,kDAAkD;IAClD,wDAAwD;IACxD,kEAAkE;IAClE,8EAA8E;IAC9E,gFAAgF;IAChF,8DAA8D;IAC9D,EAAE;IACF,uDAAuD;IACvD,GAAG;IACH,yBAAyB;IACzB,0BAA0B;IAC1B,yBAAyB;IACzB,6BAA6B;IAC7B,+BAA+B;IAC/B,wCAAwC;IACxC,4BAA4B;IAC5B,uEAAuE;IACvE,8BAA8B;IAC9B,4BAA4B;IAC5B,+BAA+B;IAC/B,yBAAyB;IACzB,GAAG;IACH,EAAE;IACF,+CAA+C;CAChD,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;AAEb,+EAA+E;AAE/E;;;;;;GAMG;AACH,MAAM,OAAO,aAAc,SAAQ,KAAK;IAC7B,IAAI,GAAG,UAAU,CAAC;IAClB,WAAW,GAAG,2CAA2C,CAAC;IAEnE,KAAK,CAAC,OAAO,CAAC,OAAqB,EAAE,OAAkB;QACrD,IAAI,CAAC;YACH,IAAI,CAAC,MAAM,CAAC,OAAO,EAAE,WAAW,EAAE,gDAAgD,CAAC,CAAC;YAEpF,+CAA+C;YAC/C,IAAI,UAAyC,CAAC;YAC9C,IAAI,CAAC;gBACH,UAAU,GAAG,aAAa,CAAC,OAAO,CAAC,gBAAgB,CAAC,CAAC;YACvD,CAAC;YAAC,MAAM,CAAC;gBACP,yDAAyD;YAC3D,CAAC;YAED,wEAAwE;YACxE,wEAAwE;YACxE,qEAAqE;YACrE,sEAAsE;YACtE,4BAA4B;YAC5B,MAAM,OAAO,GAAG,mBAAmB,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC;YAClD,OAAO,CAAC,QAAQ,CAAC,gBAAgB,GAAG,OAAO,CAAC,KAAK,CAAC;YAClD,OAAO,CAAC,QAAQ,CAAC,mBAAmB,GAAG,OAAO,CAAC,QAAQ,CAAC;YAExD,mBAAmB;YACnB,MAAM,WAAW,GAAa;gBAC5B,sBAAsB;gBACtB,EAAE;gBACF,cAAc;gBACd,OAAO,CAAC,IAAI;gBACZ,EAAE;gBACF,sBAAsB;gBACtB,OAAO,CAAC,gBAAgB;aACzB,CAAC;YAEF,2EAA2E;YAC3E,wEAAwE;YACxE,2EAA2E;YAC3E,6CAA6C;YAC7C,MAAM,gBAAgB,GAAG,OAAO,CAAC,QAAQ;gBACvC,CAAC,CAAC,2BAA2B,CAAC,OAAO,CAAC,KAAK,EAAE,OAAO,CAAC,UAAU,CAAC;gBAChE,CAAC,CAAC,EAAE,CAAC;YACP,IAAI,gBAAgB;gBAAE,WAAW,CAAC,IAAI,CAAC,gBAAgB,CAAC,CAAC;YAEzD,yCAAyC;YACzC,IAAI,UAAU,EAAE,CAAC;gBACf,MAAM,eAAe,GAAa,CAAC,EAAE,EAAE,0BAA0B,CAAC,CAAC;gBACnE,IAAI,UAAU,CAAC,QAAQ;oBAAE,eAAe,CAAC,IAAI,CAAC,aAAa,UAAU,CAAC,QAAQ,EAAE,CAAC,CAAC;gBAClF,IAAI,UAAU,CAAC,SAAS;oBAAE,eAAe,CAAC,IAAI,CAAC,cAAc,UAAU,CAAC,SAAS,EAAE,CAAC,CAAC;gBACrF,IAAI,UAAU,CAAC,cAAc;oBAAE,eAAe,CAAC,IAAI,CAAC,oBAAoB,UAAU,CAAC,cAAc,EAAE,CAAC,CAAC;gBACrG,eAAe,CAAC,IAAI,CAAC,kBAAkB,UAAU,CAAC,YAAY,EAAE,CAAC,CAAC;gBAClE,eAAe,CAAC,IAAI,CAAC,cAAc,UAAU,CAAC,QAAQ,EAAE,CAAC,CAAC;gBAC1D,IAAI,UAAU,CAAC,QAAQ,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;oBACnC,eAAe,CAAC,IAAI,CAAC,cAAc,UAAU,CAAC,QAAQ,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;gBACvE,CAAC;gBACD,WAAW,CAAC,IAAI,CAAC,GAAG,eAAe,CAAC,CAAC;gBAErC,wEAAwE;gBACxE,wEAAwE;gBACxE,qEAAqE;gBACrE,IAAI,UAAU,CAAC,kBAAkB,EAAE,CAAC;oBAClC,WAAW,CAAC,IAAI,CAAC,EAAE,EAAE,UAAU,CAAC,kBAAkB,CAAC,CAAC;gBACtD,CAAC;YACH,CAAC;YAED,gCAAgC;YAChC,MAAM,QAAQ,GAAG,OAAO,CAAC,QAAQ,CAAC,eAAqC,CAAC;YACxE,IAAI,QAAQ,EAAE,CAAC;gBACb,WAAW,CAAC,IAAI,CAAC,EAAE,EAAE,sBAAsB,EAAE,QAAQ,CAAC,CAAC;YACzD,CAAC;YAED,WAAW,CAAC,IAAI,CAAC,EAAE,EAAE,iFAAiF,CAAC,CAAC;YAExG,MAAM,MAAM,GAAG,WAAW,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;YAEtC,eAAe;YACf,MAAM,QAAQ,GAAG,MAAM,OAAO,CAAC,MAAM,EAAE;gBACrC,WAAW,EAAE,GAAG,EAAE,8CAA8C;gBAChE,SAAS,EAAE,IAAI;aAChB,CAAC,CAAC;YAEH,qBAAqB;YACrB,MAAM,QAAQ,GAAG,IAAI,CAAC,aAAa,CAAC,QAAQ,CAAC,CAAC;YAE9C,IAAI,CAAC,QAAQ,EAAE,CAAC;gBACd,OAAO;oBACL,OAAO,EAAE,KAAK;oBACd,KAAK,EAAE,uDAAuD;oBAC9D,OAAO,EAAE,8CAA8C;iBACxD,CAAC;YACJ,CAAC;YAED,sEAAsE;YACtE,wEAAwE;YACxE,uEAAuE;YACvE,wEAAwE;YACxE,wEAAwE;YACxE,0EAA0E;YAC1E,uCAAuC;YACvC,IAAI,OAAO,CAAC,QAAQ,EAAE,CAAC;gBACrB,QAAQ,CAAC,gBAAgB,GAAG,OAAO,CAAC,KAAK,KAAK,UAAU,CAAC,CAAC,CAAC,UAAU,CAAC,CAAC,CAAC,UAAU,CAAC;gBACnF,QAAQ,CAAC,QAAQ,GAAG,MAAM,CAAC;gBAC3B,QAAQ,CAAC,SAAS,GAAG,MAAM,CAAC;gBAC5B,QAAQ,CAAC,QAAQ,GAAG,UAAU,CAAC;gBAC/B,QAAQ,CAAC,YAAY,GAAG,UAAU,CAAC;gBACnC,QAAQ,CAAC,YAAY,GAAG,EAAE,CAAC;gBAC3B,QAAQ,CAAC,YAAY,GAAG,SAAS,CAAC;gBAClC,IAAI,CAAC,QAAQ,CAAC,WAAW,IAAI,QAAQ,CAAC,WAAW,KAAK,SAAS,IAAI,sBAAsB,CAAC,IAAI,CAAC,QAAQ,CAAC,WAAW,CAAC,EAAE,CAAC;oBACrH,QAAQ,CAAC,WAAW,GAAG,eAAe,CAAC;gBACzC,CAAC;YACH,CAAC;iBAAM,CAAC;gBACN,QAAQ,CAAC,gBAAgB,GAAG,OAAO,CAAC,KAAK,CAAC;YAC5C,CAAC;YAED,yDAAyD;YACzD,OAAO,CAAC,QAAQ,CAAC,iBAAiB,GAAG,QAAQ,CAAC;YAE9C,IAAI,CAAC,MAAM,CAAC,OAAO,EAAE,SAAS,EAC5B,wBAAwB,qBAAqB,CAAC,QAAQ,CAAC,gBAAgB,CAAC,KAAK;gBAC7E,GAAG,QAAQ,CAAC,QAAQ,IAAI,QAAQ,CAAC,SAAS,MAAM,QAAQ,CAAC,QAAQ,MAAM,QAAQ,CAAC,WAAW,EAAE,CAC9F,CAAC;YAEF,OAAO;gBACL,OAAO,EAAE,IAAI;gBACb,OAAO,EACL,6BAA6B,qBAAqB,CAAC,QAAQ,CAAC,gBAAgB,CAAC,KAAK;oBAClF,GAAG,QAAQ,CAAC,QAAQ,IAAI,QAAQ,CAAC,SAAS,OAAO,QAAQ,CAAC,QAAQ,EAAE;aACvE,CAAC;QACJ,CAAC;QAAC,OAAO,GAAG,EAAE,CAAC;YACb,OAAO;gBACL,OAAO,EAAE,KAAK;gBACd,KAAK,EAAE,qBAAqB,GAAG,EAAE;gBACjC,OAAO,EAAE,8CAA8C;aACxD,CAAC;QACJ,CAAC;IACH,CAAC;IAED;;OAEG;IACK,aAAa,CAAC,QAAgB;QACpC,IAAI,CAAC;YACH,+DAA+D;YAC/D,MAAM,SAAS,GAAG,QAAQ,CAAC,KAAK,CAAC,8BAA8B,CAAC,CAAC;YACjE,MAAM,OAAO,GAAG,SAAS,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,IAAI,EAAE,CAAC,CAAC,CAAC,QAAQ,CAAC,IAAI,EAAE,CAAC;YAElE,8CAA8C;YAC9C,MAAM,QAAQ,GAAG,OAAO,CAAC,KAAK,CAAC,aAAa,CAAC,CAAC;YAC9C,IAAI,CAAC,QAAQ;gBAAE,OAAO,IAAI,CAAC;YAE3B,MAAM,MAAM,GAAG,IAAI,CAAC,KAAK,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,CAAC;YAEvC,2BAA2B;YAC3B,IAAI,CAAC,MAAM,CAAC,QAAQ,IAAI,CAAC,MAAM,CAAC,SAAS,IAAI,CAAC,MAAM,CAAC,QAAQ,EAAE,CAAC;gBAC9D,OAAO,IAAI,CAAC;YACd,CAAC;YAED,MAAM,aAAa,GAAuB,CAAC,MAAM,EAAE,UAAU,EAAE,UAAU,EAAE,MAAM,EAAE,UAAU,CAAC,CAAC;YAC/F,MAAM,GAAG,GAAG,aAAa,CAAC,QAAQ,CAAC,MAAM,CAAC,gBAAgB,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,gBAAgB,CAAC,CAAC,CAAC,MAAM,CAAC;YAE/F,OAAO;gBACL,QAAQ,EAAE,MAAM,CAAC,MAAM,CAAC,QAAQ,CAAC;gBACjC,SAAS,EAAE,MAAM,CAAC,MAAM,CAAC,SAAS,CAAC;gBACnC,QAAQ,EAAE,MAAM,CAAC,MAAM,CAAC,QAAQ,CAAC;gBACjC,YAAY,EAAE,MAAM,CAAC,MAAM,CAAC,YAAY,IAAI,aAAa,CAAC;gBAC1D,YAAY,EAAE,KAAK,CAAC,OAAO,CAAC,MAAM,CAAC,YAAY,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,YAAY,CAAC,CAAC,CAAC,EAAE;gBAC3E,YAAY,EAAE,MAAM,CAAC,YAAY,CAAC,CAAC,CAAC,MAAM,CAAC,MAAM,CAAC,YAAY,CAAC,CAAC,CAAC,CAAC,SAAS;gBAC3E,WAAW,EAAE,MAAM,CAAC,MAAM,CAAC,WAAW,IAAI,SAAS,CAAC;gBACpD,gBAAgB,EAAE,GAAG;gBACrB,WAAW,EAAE,KAAK,CAAC,OAAO,CAAC,MAAM,CAAC,WAAW,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,WAAW,CAAC,CAAC,CAAC,EAAE;gBACxE,YAAY,EAAE,OAAO,CAAC,MAAM,CAAC,YAAY,CAAC;gBAC1C,UAAU,EAAE,OAAO,MAAM,CAAC,UAAU,KAAK,QAAQ,CAAC,CAAC,CAAC,MAAM,CAAC,UAAU,CAAC,CAAC,CAAC,GAAG;gBAC3E,SAAS,EAAE,MAAM,CAAC,MAAM,CAAC,SAAS,IAAI,EAAE,CAAC;aAC1C,CAAC;QACJ,CAAC;QAAC,MAAM,CAAC;YACP,OAAO,IAAI,CAAC;QACd,CAAC;IACH,CAAC;CACF"}
|
|
@@ -174,6 +174,12 @@ export declare class RunnerAgent extends Agent {
|
|
|
174
174
|
* to only attempt the install command without installing missing tools.
|
|
175
175
|
*/
|
|
176
176
|
private installDependencies;
|
|
177
|
+
/**
|
|
178
|
+
* The pinned project environment (PATH + VIRTUAL_ENV) for `dir`, or undefined
|
|
179
|
+
* when the directory has no project virtualenv. Shared by the command path and
|
|
180
|
+
* the dependency-install path so both use the SAME interpreter.
|
|
181
|
+
*/
|
|
182
|
+
private projectEnv;
|
|
177
183
|
private executeOnHost;
|
|
178
184
|
/**
|
|
179
185
|
* True when this runner execution is a repair/alternative-approach attempt
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"runner.d.ts","sourceRoot":"","sources":["../../../src/agents/agents/runner.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;;GAqBG;AAKH,OAAO,EAAE,KAAK,EAAE,KAAK,YAAY,EAAE,KAAK,WAAW,EAAE,MAAM,aAAa,CAAC;AACzE,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,aAAa,CAAC;
|
|
1
|
+
{"version":3,"file":"runner.d.ts","sourceRoot":"","sources":["../../../src/agents/agents/runner.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;;GAqBG;AAKH,OAAO,EAAE,KAAK,EAAE,KAAK,YAAY,EAAE,KAAK,WAAW,EAAE,MAAM,aAAa,CAAC;AACzE,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,aAAa,CAAC;AAqD7C;;GAEG;AACH,MAAM,WAAW,SAAS;IACxB,6CAA6C;IAC7C,OAAO,EAAE,OAAO,CAAC;IACjB,0CAA0C;IAC1C,OAAO,EAAE,MAAM,CAAC;IAChB,wBAAwB;IACxB,QAAQ,EAAE,MAAM,CAAC;IACjB,sBAAsB;IACtB,MAAM,EAAE,MAAM,CAAC;IACf,qBAAqB;IACrB,MAAM,EAAE,MAAM,CAAC;IACf,+BAA+B;IAC/B,QAAQ,EAAE,MAAM,CAAC;IACjB,sCAAsC;IACtC,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,8DAA8D;IAC9D,0BAA0B,CAAC,EAAE,OAAO,CAAC;IACrC,+CAA+C;IAC/C,0BAA0B,CAAC,EAAE,OAAO,CAAC;IACrC,iFAAiF;IACjF,qBAAqB,CAAC,EAAE,MAAM,CAAC;IAC/B,wEAAwE;IACxE,8BAA8B,CAAC,EAAE,OAAO,CAAC;IACzC;;;;;OAKG;IACH,eAAe,CAAC,EAAE,OAAO,CAAC;IAC1B,yEAAyE;IACzE,UAAU,CAAC,EAAE,MAAM,CAAC;CACrB;AAED,uDAAuD;AACvD,MAAM,WAAW,WAAW;IAC1B,2EAA2E;IAC3E,IAAI,EAAE,MAAM,CAAC;IACb,0CAA0C;IAC1C,OAAO,EAAE,MAAM,CAAC;IAChB,gDAAgD;IAChD,QAAQ,EAAE,MAAM,CAAC;CAClB;AAED,4EAA4E;AAC5E,MAAM,WAAW,uBAAuB;IACtC,oCAAoC;IACpC,OAAO,EAAE,OAAO,CAAC;IACjB,6CAA6C;IAC7C,OAAO,EAAE,MAAM,CAAC;IAChB,oCAAoC;IACpC,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,kDAAkD;IAClD,aAAa,CAAC,EAAE,OAAO,CAAC;IACxB,qCAAqC;IACrC,OAAO,CAAC,EAAE,MAAM,CAAC;CAClB;AAED;;GAEG;AACH,qBAAa,WAAY,SAAQ,KAAK;IACpC,QAAQ,CAAC,IAAI,YAAY;IACzB,QAAQ,CAAC,WAAW,iDAAiD;IAErE,+DAA+D;IAC/D,OAAO,CAAC,QAAQ,CAAC,CAAY;IAEvB,OAAO,CAAC,OAAO,EAAE,YAAY,EAAE,OAAO,EAAE,SAAS,GAAG,OAAO,CAAC,WAAW,CAAC;IAmE9E;;;;;;OAMG;YACW,gBAAgB;IA4C9B;;;OAGG;YACW,iBAAiB;IA6G/B;;;;OAIG;IACH,OAAO,CAAC,kBAAkB;IAgC1B;;;;;;;;OAQG;IACH,OAAO,CAAC,oBAAoB;IAuB5B;;;OAGG;IACH;;;OAGG;IACH,OAAO,CAAC,0BAA0B;IAyBlC;;;;OAIG;IACH,OAAO,CAAC,iBAAiB;IA6DzB;;OAEG;IACH,OAAO,CAAC,aAAa;IAOrB;;;;OAIG;IACH,OAAO,CAAC,WAAW;IAwInB,4EAA4E;IAC5E,OAAO,CAAC,sBAAsB;IAyC9B,oFAAoF;IACpF,OAAO,CAAC,wBAAwB;IA+BhC,qDAAqD;IACrD,OAAO,CAAC,sBAAsB;IA0B9B,oDAAoD;IACpD,OAAO,CAAC,qBAAqB;IA2B7B,mDAAmD;IACnD,OAAO,CAAC,oBAAoB;IAoB5B;;OAEG;IACH,OAAO,CAAC,iBAAiB;IA4BzB;;;;OAIG;IACH,OAAO,CAAC,qBAAqB;IAkC7B;;;;;;;;;OASG;IACH,OAAO,CAAC,mBAAmB;IAqF3B;;;;OAIG;IACH,OAAO,CAAC,UAAU;YAKJ,aAAa;IAyN3B;;;OAGG;IACH,OAAO,CAAC,eAAe;IAKvB;;;;;;;;OAQG;YACW,sBAAsB;IA8EpC;;;;;;;OAOG;YACW,gBAAgB;IAkG9B;;;;;;;;;;;;OAYG;IACH,OAAO,CAAC,sBAAsB;IA0B9B;;;;;;;;OAQG;IACH,OAAO,CAAC,uBAAuB;IAY/B;;;;;;;;;;;;;OAaG;YACW,gBAAgB;CA0C/B"}
|
|
@@ -30,6 +30,7 @@ import { detectProjectImage } from '../../sandbox/images.js';
|
|
|
30
30
|
import { getSandboxConfig } from '../../sandbox/types.js';
|
|
31
31
|
import { referenceDocsFor } from '../reference-docs.js';
|
|
32
32
|
import { detectNoOpCommand } from '../artifact-verification.js';
|
|
33
|
+
import { applyProjectEnvironment, ensureProjectVenv, getPinnedProjectVenv, guardCommandEnvironment, isPythonInstallCommand, } from '../../utils/project-env.js';
|
|
33
34
|
import { isKnownSystemTool, manualInstallSteps, promptToolInstall, toolInstallCommand, } from '../../cli/tool-install-prompt.js';
|
|
34
35
|
/** Maximum stdout/stderr length to store in context metadata */
|
|
35
36
|
const MAX_OUTPUT_LENGTH = 10_000;
|
|
@@ -41,6 +42,22 @@ const MAX_FALLBACK_ATTEMPTS = 2;
|
|
|
41
42
|
const MAX_DEP_INSTALL_RETRIES = 1;
|
|
42
43
|
/** Timeout for installing a missing package-manager tool itself (10 min) */
|
|
43
44
|
const TOOL_INSTALL_TIMEOUT_MS = 600_000;
|
|
45
|
+
/**
|
|
46
|
+
* Does `pyproject.toml` declare the project as poetry-managed? (A `[tool.poetry]`
|
|
47
|
+
* table.) Used so `detectInstallPlan` picks `poetry install` over a bare pip
|
|
48
|
+
* install that would populate the wrong environment.
|
|
49
|
+
*/
|
|
50
|
+
function pyprojectUsesPoetry(workingDir) {
|
|
51
|
+
const pyproject = join(workingDir, 'pyproject.toml');
|
|
52
|
+
if (!existsSync(pyproject))
|
|
53
|
+
return false;
|
|
54
|
+
try {
|
|
55
|
+
return /^\s*\[tool\.poetry(?:\]|\.)/m.test(readFileSync(pyproject, 'utf-8'));
|
|
56
|
+
}
|
|
57
|
+
catch {
|
|
58
|
+
return false;
|
|
59
|
+
}
|
|
60
|
+
}
|
|
44
61
|
/**
|
|
45
62
|
* RunnerAgent — Executes shell commands and captures output.
|
|
46
63
|
*/
|
|
@@ -367,7 +384,16 @@ export class RunnerAgent extends Agent {
|
|
|
367
384
|
if (existsSync(join(workingDir, 'package.json'))) {
|
|
368
385
|
return { tool: 'npm', command: 'npm install --no-audit --no-fund', manifest: 'package.json' };
|
|
369
386
|
}
|
|
370
|
-
// Python
|
|
387
|
+
// Python — poetry and pipenv own the project env when their manifests are
|
|
388
|
+
// present, so they are checked before bare pip (a poetry/pipenv project
|
|
389
|
+
// also tends to have a pyproject.toml/requirements.txt, and running pip
|
|
390
|
+
// directly would install OUTSIDE the env the project actually uses).
|
|
391
|
+
if (existsSync(join(workingDir, 'poetry.lock')) || pyprojectUsesPoetry(workingDir)) {
|
|
392
|
+
return { tool: 'poetry', command: 'poetry install', manifest: 'pyproject.toml' };
|
|
393
|
+
}
|
|
394
|
+
if (existsSync(join(workingDir, 'Pipfile'))) {
|
|
395
|
+
return { tool: 'pipenv', command: 'pipenv install', manifest: 'Pipfile' };
|
|
396
|
+
}
|
|
371
397
|
if (existsSync(join(workingDir, 'requirements.txt'))) {
|
|
372
398
|
return { tool: 'pip', command: 'pip install -r requirements.txt', manifest: 'requirements.txt' };
|
|
373
399
|
}
|
|
@@ -430,6 +456,14 @@ export class RunnerAgent extends Agent {
|
|
|
430
456
|
// yarn / pnpm are installed via npm (which we just ensured exists)
|
|
431
457
|
return this.runInstallCommand(`npm install -g ${tool}`, process.cwd());
|
|
432
458
|
}
|
|
459
|
+
// ── poetry / pipenv (project env managers) ───────────────────────────
|
|
460
|
+
if (tool === 'poetry' || tool === 'pipenv') {
|
|
461
|
+
// Both ship as Python packages; bootstrap them into whichever interpreter
|
|
462
|
+
// this project uses (the pinned venv, once applyProjectEnvironment has
|
|
463
|
+
// put it on PATH) rather than assuming a global one exists.
|
|
464
|
+
const python = this.commandExists('python3') ? 'python3' : 'python';
|
|
465
|
+
return this.runInstallCommand(`${python} -m pip install ${tool}`, process.cwd(), this.projectEnv(process.cwd()));
|
|
466
|
+
}
|
|
433
467
|
// ── pip ──────────────────────────────────────────────────────────────
|
|
434
468
|
if (tool === 'pip') {
|
|
435
469
|
if (this.commandExists('python3') || this.commandExists('python')) {
|
|
@@ -662,12 +696,24 @@ export class RunnerAgent extends Agent {
|
|
|
662
696
|
/**
|
|
663
697
|
* Run an install command and return its outcome.
|
|
664
698
|
*/
|
|
665
|
-
runInstallCommand(command, cwd) {
|
|
699
|
+
runInstallCommand(command, cwd, env) {
|
|
700
|
+
// ── C3: never install project Python packages into the global interpreter.
|
|
701
|
+
// The auto-install path reaches here without passing through the guard, so
|
|
702
|
+
// if this is a Python package install and no project venv is pinned, create
|
|
703
|
+
// one and land the install there. (Non-Python installs — npm/brew/cargo —
|
|
704
|
+
// are unaffected: they have no interpreter to pollute.)
|
|
705
|
+
let effectiveEnv = env;
|
|
706
|
+
if (!effectiveEnv && isPythonInstallCommand(command)) {
|
|
707
|
+
const venv = ensureProjectVenv(cwd);
|
|
708
|
+
if (venv)
|
|
709
|
+
effectiveEnv = applyProjectEnvironment({ ...process.env }, venv);
|
|
710
|
+
}
|
|
666
711
|
const result = runShellSync(command, {
|
|
667
712
|
cwd,
|
|
668
713
|
timeoutMs: TOOL_INSTALL_TIMEOUT_MS,
|
|
669
714
|
maxBuffer: 2 * 1024 * 1024,
|
|
670
715
|
source: 'runner',
|
|
716
|
+
...(effectiveEnv ? { env: effectiveEnv } : {}),
|
|
671
717
|
});
|
|
672
718
|
if (result.success) {
|
|
673
719
|
return { success: true, command, toolInstalled: true, message: `Installed via: ${command}` };
|
|
@@ -761,7 +807,7 @@ export class RunnerAgent extends Agent {
|
|
|
761
807
|
// Tool was installed — retry the actual install command (normalize
|
|
762
808
|
// `pip` → `pip3` first — after ensurepip on macOS only the versioned
|
|
763
809
|
// binary may exist on PATH).
|
|
764
|
-
const attempt = this.runInstallCommand(this.normalizeInterpreter(plan.command), workingDir);
|
|
810
|
+
const attempt = this.runInstallCommand(this.normalizeInterpreter(plan.command), workingDir, this.projectEnv(workingDir));
|
|
765
811
|
return {
|
|
766
812
|
success: attempt.success,
|
|
767
813
|
command: plan.command,
|
|
@@ -781,8 +827,10 @@ export class RunnerAgent extends Agent {
|
|
|
781
827
|
};
|
|
782
828
|
}
|
|
783
829
|
// ── Tool exists — just run the install command (normalized: macOS has
|
|
784
|
-
// `pip3`, not `pip`, so `pip install -r …` would otherwise 127).
|
|
785
|
-
|
|
830
|
+
// `pip3`, not `pip`, so `pip install -r …` would otherwise 127). The
|
|
831
|
+
// project's pinned venv is applied so the install lands in the project
|
|
832
|
+
// env, never the system interpreter.
|
|
833
|
+
const attempt = this.runInstallCommand(this.normalizeInterpreter(plan.command), workingDir, this.projectEnv(workingDir));
|
|
786
834
|
return {
|
|
787
835
|
success: attempt.success,
|
|
788
836
|
command: plan.command,
|
|
@@ -791,9 +839,37 @@ export class RunnerAgent extends Agent {
|
|
|
791
839
|
message: attempt.success ? undefined : attempt.message,
|
|
792
840
|
};
|
|
793
841
|
}
|
|
842
|
+
/**
|
|
843
|
+
* The pinned project environment (PATH + VIRTUAL_ENV) for `dir`, or undefined
|
|
844
|
+
* when the directory has no project virtualenv. Shared by the command path and
|
|
845
|
+
* the dependency-install path so both use the SAME interpreter.
|
|
846
|
+
*/
|
|
847
|
+
projectEnv(dir) {
|
|
848
|
+
const venv = getPinnedProjectVenv(dir);
|
|
849
|
+
return venv ? applyProjectEnvironment({ ...process.env }, venv) : undefined;
|
|
850
|
+
}
|
|
794
851
|
async executeOnHost(context, command, fallbackAttempts = 0, depRetries = 0) {
|
|
795
852
|
// (Command was already normalized at the execute() choke point — retries
|
|
796
853
|
// here simply carry the normalized command forward.)
|
|
854
|
+
// ── Project interpreter guard (C2) ────────────────────────────────
|
|
855
|
+
// The pipeline runner is the OTHER place a Python command executes (the
|
|
856
|
+
// chat loop's run_terminal is the first). Apply the same guard before it
|
|
857
|
+
// spawns: pin this project's virtualenv, refuse a package install that
|
|
858
|
+
// would mutate an interpreter OUTSIDE it, and refuse a build/run against
|
|
859
|
+
// an interpreter missing the declared dependencies — the exact mistakes
|
|
860
|
+
// that produced the live Aukat_check "success" for a bundle missing PyQt6.
|
|
861
|
+
// See src/utils/project-env.ts.
|
|
862
|
+
const envVerdict = guardCommandEnvironment(command, context.workingDirectory);
|
|
863
|
+
if (envVerdict.action === 'refuse') {
|
|
864
|
+
return {
|
|
865
|
+
success: false,
|
|
866
|
+
summary: `❌ Environment guard blocked: ${command}`,
|
|
867
|
+
error: `${envVerdict.reason}. ${envVerdict.hint} (Guard: NUVIRA_ENV_GUARD=off bypasses this.)`,
|
|
868
|
+
};
|
|
869
|
+
}
|
|
870
|
+
const shellEnv = envVerdict.action === 'proceed' && envVerdict.venv
|
|
871
|
+
? applyProjectEnvironment({ ...process.env }, envVerdict.venv)
|
|
872
|
+
: undefined;
|
|
797
873
|
// Validate the command before executing
|
|
798
874
|
const validation = this.isCommandAvailable(command, context.workingDirectory);
|
|
799
875
|
if (!validation.available) {
|
|
@@ -831,6 +907,7 @@ export class RunnerAgent extends Agent {
|
|
|
831
907
|
timeoutMs,
|
|
832
908
|
maxBuffer: 1024 * 1024,
|
|
833
909
|
source: 'runner',
|
|
910
|
+
...(shellEnv ? { env: shellEnv } : {}),
|
|
834
911
|
});
|
|
835
912
|
const exitCode = shellResult.exitCode;
|
|
836
913
|
const stdout = shellResult.stdout.trim();
|