@bastani/atomic 0.9.4 → 0.9.5-alpha.10
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 +136 -2
- package/README.md +2 -2
- package/dist/builtin/cursor/CHANGELOG.md +6 -0
- package/dist/builtin/cursor/package.json +3 -3
- package/dist/builtin/cursor/src/model-mapper.ts +6 -3
- package/dist/builtin/intercom/CHANGELOG.md +31 -0
- package/dist/builtin/intercom/README.md +29 -21
- package/dist/builtin/intercom/broker/broker.ts +9 -120
- package/dist/builtin/intercom/broker/client.ts +29 -54
- package/dist/builtin/intercom/broker/delivered-message-cache.ts +44 -0
- package/dist/builtin/intercom/broker/paths.ts +42 -5
- package/dist/builtin/intercom/broker/pending-send-registry.ts +142 -0
- package/dist/builtin/intercom/broker/send-handler.ts +106 -0
- package/dist/builtin/intercom/broker/send-signature.ts +37 -0
- package/dist/builtin/intercom/broker/spawn.ts +78 -10
- package/dist/builtin/intercom/config.ts +6 -3
- package/dist/builtin/intercom/contact-supervisor-tool.ts +6 -4
- package/dist/builtin/intercom/foreground-detach-handoff.ts +136 -0
- package/dist/builtin/intercom/index-heavy.ts +50 -54
- package/dist/builtin/intercom/index.ts +320 -272
- package/dist/builtin/intercom/intercom-tool.ts +9 -3
- package/dist/builtin/intercom/lazy-heavy-proxy.ts +114 -0
- package/dist/builtin/intercom/lazy-subagent-ack.ts +20 -0
- package/dist/builtin/intercom/lazy-tool-execution.ts +39 -0
- package/dist/builtin/intercom/lifecycle-lease.ts +51 -0
- package/dist/builtin/intercom/lifecycle.ts +37 -20
- package/dist/builtin/intercom/package.json +12 -6
- package/dist/builtin/intercom/reply-routing.ts +17 -0
- package/dist/builtin/intercom/result-renderers.ts +1 -1
- package/dist/builtin/intercom/subagent-relay.ts +58 -12
- package/dist/builtin/intercom/types.ts +3 -3
- package/dist/builtin/intercom/ui/compose.ts +2 -2
- package/dist/builtin/intercom/ui/inline-message.ts +2 -2
- package/dist/builtin/intercom/ui/session-list.ts +2 -2
- package/dist/builtin/mcp/CHANGELOG.md +23 -0
- package/dist/builtin/mcp/OAUTH.md +1 -0
- package/dist/builtin/mcp/README.md +10 -6
- package/dist/builtin/mcp/apps-cancellation.ts +32 -0
- package/dist/builtin/mcp/call-tool-result.ts +9 -0
- package/dist/builtin/mcp/caller-wait.ts +50 -0
- package/dist/builtin/mcp/command-registration.ts +82 -0
- package/dist/builtin/mcp/direct-tool-executor.ts +279 -0
- package/dist/builtin/mcp/direct-tools.ts +40 -255
- package/dist/builtin/mcp/host-html-template.ts +4 -2
- package/dist/builtin/mcp/index.ts +274 -239
- package/dist/builtin/mcp/init.ts +96 -126
- package/dist/builtin/mcp/mcp-auth-flow.ts +247 -237
- package/dist/builtin/mcp/mcp-callback-server.ts +89 -68
- package/dist/builtin/mcp/mcp-oauth-provider.ts +23 -1
- package/dist/builtin/mcp/metadata-hydration.ts +52 -0
- package/dist/builtin/mcp/package.json +3 -3
- package/dist/builtin/mcp/proxy-auth.ts +4 -4
- package/dist/builtin/mcp/proxy-call.ts +111 -40
- package/dist/builtin/mcp/proxy-connect.ts +35 -15
- package/dist/builtin/mcp/proxy-info-modes.ts +106 -23
- package/dist/builtin/mcp/proxy-modes.ts +3 -3
- package/dist/builtin/mcp/session-cleanup-barrier.ts +43 -0
- package/dist/builtin/mcp/startup-warmup.ts +98 -0
- package/dist/builtin/mcp/state-lease.ts +12 -0
- package/dist/builtin/mcp/tool-result-renderer.ts +3 -3
- package/dist/builtin/mcp/ui-server.ts +8 -8
- package/dist/builtin/mcp/ui-session.ts +9 -18
- package/dist/builtin/subagents/CHANGELOG.md +60 -0
- package/dist/builtin/subagents/README.md +30 -29
- package/dist/builtin/subagents/agents/code-simplifier.md +2 -2
- package/dist/builtin/subagents/agents/codebase-analyzer.md +2 -2
- package/dist/builtin/subagents/agents/codebase-locator.md +2 -2
- package/dist/builtin/subagents/agents/codebase-online-researcher.md +2 -2
- package/dist/builtin/subagents/agents/codebase-pattern-finder.md +2 -2
- package/dist/builtin/subagents/agents/codebase-research-analyzer.md +2 -2
- package/dist/builtin/subagents/agents/codebase-research-locator.md +2 -2
- package/dist/builtin/subagents/agents/debugger.md +2 -2
- package/dist/builtin/subagents/agents/worker.md +2 -2
- package/dist/builtin/subagents/package.json +5 -5
- package/dist/builtin/subagents/prompts/review-loop.md +1 -1
- package/dist/builtin/subagents/skills/subagent/SKILL.md +37 -36
- package/dist/builtin/subagents/src/extension/api-lifecycle.ts +64 -0
- package/dist/builtin/subagents/src/extension/fanout-child.ts +44 -51
- package/dist/builtin/subagents/src/extension/index.ts +289 -320
- package/dist/builtin/subagents/src/extension/prompt-guidance.ts +7 -10
- package/dist/builtin/subagents/src/extension/schemas.ts +22 -5
- package/dist/builtin/subagents/src/extension/startup-maintenance.ts +89 -0
- package/dist/builtin/subagents/src/extension/tool-description.ts +29 -0
- package/dist/builtin/subagents/src/intercom/intercom-bridge.ts +13 -2
- package/dist/builtin/subagents/src/intercom/result-intercom.ts +4 -4
- package/dist/builtin/subagents/src/runs/background/async-event-journal.ts +106 -0
- package/dist/builtin/subagents/src/runs/background/async-execution-common.ts +26 -20
- package/dist/builtin/subagents/src/runs/background/async-execution-single.ts +13 -2
- package/dist/builtin/subagents/src/runs/background/async-execution-types.ts +3 -0
- package/dist/builtin/subagents/src/runs/background/async-job-tracker.ts +1 -1
- package/dist/builtin/subagents/src/runs/background/completion-claims.ts +189 -0
- package/dist/builtin/subagents/src/runs/background/completion-dedupe.ts +44 -7
- package/dist/builtin/subagents/src/runs/background/completion-notification.ts +34 -0
- package/dist/builtin/subagents/src/runs/background/notify.ts +72 -22
- package/dist/builtin/subagents/src/runs/background/result-delivery-processor.ts +232 -0
- package/dist/builtin/subagents/src/runs/background/result-file-claims.ts +151 -0
- package/dist/builtin/subagents/src/runs/background/result-quarantine.ts +72 -0
- package/dist/builtin/subagents/src/runs/background/result-retry-scheduler.ts +48 -0
- package/dist/builtin/subagents/src/runs/background/result-status.ts +81 -0
- package/dist/builtin/subagents/src/runs/background/result-watcher-data.ts +59 -0
- package/dist/builtin/subagents/src/runs/background/result-watcher.ts +177 -233
- package/dist/builtin/subagents/src/runs/background/run-id-resolver.ts +3 -2
- package/dist/builtin/subagents/src/runs/background/stale-run-reconciler.ts +73 -14
- package/dist/builtin/subagents/src/runs/background/subagent-runner-streaming.ts +29 -15
- package/dist/builtin/subagents/src/runs/background/top-level-async.ts +1 -2
- package/dist/builtin/subagents/src/runs/foreground/chain-execution-dynamic-step.ts +1 -0
- package/dist/builtin/subagents/src/runs/foreground/chain-execution-parallel-runner.ts +1 -0
- package/dist/builtin/subagents/src/runs/foreground/chain-execution-parallel-step.ts +1 -0
- package/dist/builtin/subagents/src/runs/foreground/chain-execution-sequential-step.ts +7 -9
- package/dist/builtin/subagents/src/runs/foreground/chain-execution-types.ts +3 -13
- package/dist/builtin/subagents/src/runs/foreground/chain-execution.ts +2 -15
- package/dist/builtin/subagents/src/runs/foreground/execution-attempt-finalize.ts +2 -2
- package/dist/builtin/subagents/src/runs/foreground/execution-attempt.ts +63 -46
- package/dist/builtin/subagents/src/runs/foreground/execution-detach-reservations.ts +48 -0
- package/dist/builtin/subagents/src/runs/foreground/execution-detach-route.ts +17 -0
- package/dist/builtin/subagents/src/runs/foreground/execution-run-sync.ts +39 -26
- package/dist/builtin/subagents/src/runs/foreground/subagent-executor-async.ts +3 -1
- package/dist/builtin/subagents/src/runs/foreground/subagent-executor-chain.ts +3 -51
- package/dist/builtin/subagents/src/runs/foreground/subagent-executor-context.ts +6 -11
- package/dist/builtin/subagents/src/runs/foreground/subagent-executor-input.ts +11 -2
- package/dist/builtin/subagents/src/runs/foreground/subagent-executor-parallel-task.ts +2 -0
- package/dist/builtin/subagents/src/runs/foreground/subagent-executor-parallel.ts +5 -112
- package/dist/builtin/subagents/src/runs/foreground/subagent-executor-resume.ts +2 -0
- package/dist/builtin/subagents/src/runs/foreground/subagent-executor-single.ts +68 -118
- package/dist/builtin/subagents/src/runs/foreground/subagent-executor-status.ts +79 -7
- package/dist/builtin/subagents/src/runs/foreground/subagent-executor-types.ts +2 -2
- package/dist/builtin/subagents/src/runs/foreground/subagent-executor.ts +3 -0
- package/dist/builtin/subagents/src/runs/shared/pi-args.ts +2 -2
- package/dist/builtin/subagents/src/runs/shared/pi-spawn.ts +55 -12
- package/dist/builtin/subagents/src/shared/artifacts.ts +22 -11
- package/dist/builtin/subagents/src/shared/event-jsonl-writer.ts +294 -0
- package/dist/builtin/subagents/src/shared/exclusive-file-publication.ts +44 -0
- package/dist/builtin/subagents/src/shared/jsonl-writer.ts +1 -0
- package/dist/builtin/subagents/src/shared/model-info.ts +2 -2
- package/dist/builtin/subagents/src/shared/settings.ts +20 -10
- package/dist/builtin/subagents/src/shared/types-async.ts +3 -1
- package/dist/builtin/subagents/src/shared/types-config.ts +2 -0
- package/dist/builtin/subagents/src/shared/types-runtime.ts +3 -2
- package/dist/builtin/subagents/src/slash/slash-commands.ts +9 -12
- package/dist/builtin/subagents/src/slash/slash-live-state.ts +63 -32
- package/dist/builtin/subagents/src/tui/render-event-formatting.ts +15 -48
- package/dist/builtin/subagents/src/tui/render-layout.ts +9 -0
- package/dist/builtin/subagents/src/tui/render-result.ts +7 -0
- package/dist/builtin/subagents/src/tui/render-stable-output.ts +1 -0
- package/dist/builtin/subagents/src/tui/render-widget-graph.ts +27 -25
- package/dist/builtin/subagents/src/tui/render-widget.ts +177 -132
- package/dist/builtin/subagents/src/tui/render.ts +1 -1
- package/dist/builtin/web-access/CHANGELOG.md +14 -0
- package/dist/builtin/web-access/README.md +4 -0
- package/dist/builtin/web-access/content-tools.ts +8 -3
- package/dist/builtin/web-access/index-heavy.ts +1 -1
- package/dist/builtin/web-access/index.ts +190 -46
- package/dist/builtin/web-access/lifecycle-lease.ts +38 -0
- package/dist/builtin/web-access/package.json +2 -2
- package/dist/builtin/web-access/result-renderers.ts +1 -1
- package/dist/builtin/web-access/summary-review.ts +1 -1
- package/dist/builtin/web-access/web-search-activity.ts +1 -1
- package/dist/builtin/web-access/web-search-return.ts +7 -0
- package/dist/builtin/web-access/web-search-summary.ts +1 -1
- package/dist/builtin/web-access/web-search-tool.ts +4 -2
- package/dist/builtin/workflows/CHANGELOG.md +98 -0
- package/dist/builtin/workflows/README.md +20 -16
- package/dist/builtin/workflows/builtin/deep-research-codebase-utils.ts +33 -9
- package/dist/builtin/workflows/builtin/goal-artifacts.ts +3 -1
- package/dist/builtin/workflows/builtin/goal-ledger.ts +3 -0
- package/dist/builtin/workflows/builtin/goal-prompts.ts +39 -5
- package/dist/builtin/workflows/builtin/goal-reducer.ts +21 -0
- package/dist/builtin/workflows/builtin/goal-reports.ts +23 -0
- package/dist/builtin/workflows/builtin/goal-review.ts +85 -6
- package/dist/builtin/workflows/builtin/goal-runner.ts +122 -49
- package/dist/builtin/workflows/builtin/goal-schemas.ts +22 -0
- package/dist/builtin/workflows/builtin/goal-types.ts +25 -1
- package/dist/builtin/workflows/builtin/goal.d.ts +5 -0
- package/dist/builtin/workflows/builtin/goal.ts +13 -2
- package/dist/builtin/workflows/builtin/index.d.ts +8 -0
- package/dist/builtin/workflows/builtin/open-claude-design-runner.ts +16 -5
- package/dist/builtin/workflows/builtin/ralph-core.ts +100 -15
- package/dist/builtin/workflows/builtin/ralph-models.ts +98 -66
- package/dist/builtin/workflows/builtin/ralph-review-gate.ts +37 -5
- package/dist/builtin/workflows/builtin/ralph-reviewer-prompt.ts +159 -0
- package/dist/builtin/workflows/builtin/ralph-runner.ts +75 -165
- package/dist/builtin/workflows/builtin/ralph.d.ts +3 -0
- package/dist/builtin/workflows/builtin/ralph.ts +4 -1
- package/dist/builtin/workflows/builtin/review-convergence.ts +111 -0
- package/dist/builtin/workflows/builtin/shared-prompts.ts +20 -1
- package/dist/builtin/workflows/package.json +2 -2
- package/dist/builtin/workflows/skills/create-spec/SKILL.md +2 -0
- package/dist/builtin/workflows/skills/impeccable/SKILL.md +16 -13
- package/dist/builtin/workflows/skills/impeccable/reference/adapt.md +1 -0
- package/dist/builtin/workflows/skills/impeccable/reference/adapt.native.md +58 -0
- package/dist/builtin/workflows/skills/impeccable/reference/android.md +40 -0
- package/dist/builtin/workflows/skills/impeccable/reference/animate.md +2 -0
- package/dist/builtin/workflows/skills/impeccable/reference/audit.md +2 -0
- package/dist/builtin/workflows/skills/impeccable/reference/audit.native.md +139 -0
- package/dist/builtin/workflows/skills/impeccable/reference/bolder.md +69 -62
- package/dist/builtin/workflows/skills/impeccable/reference/critique.md +21 -7
- package/dist/builtin/workflows/skills/impeccable/reference/document.md +1 -1
- package/dist/builtin/workflows/skills/impeccable/reference/hooks.md +92 -0
- package/dist/builtin/workflows/skills/impeccable/reference/init.md +29 -7
- package/dist/builtin/workflows/skills/impeccable/reference/ios.md +45 -0
- package/dist/builtin/workflows/skills/impeccable/reference/layout.md +25 -1
- package/dist/builtin/workflows/skills/impeccable/reference/typeset.md +23 -1
- package/dist/builtin/workflows/skills/impeccable/scripts/context-signals.mjs +2 -1
- package/dist/builtin/workflows/skills/impeccable/scripts/context.mjs +75 -14
- package/dist/builtin/workflows/skills/impeccable/scripts/detector/browser/injected/index.mjs +1 -1
- package/dist/builtin/workflows/skills/impeccable/scripts/detector/cli/main.mjs +31 -0
- package/dist/builtin/workflows/skills/impeccable/scripts/detector/design-system.mjs +64 -0
- package/dist/builtin/workflows/skills/impeccable/scripts/detector/detect-antipatterns-browser.js +118 -11
- package/dist/builtin/workflows/skills/impeccable/scripts/detector/engines/regex/detect-text.mjs +16 -11
- package/dist/builtin/workflows/skills/impeccable/scripts/detector/registry/antipatterns.mjs +66 -0
- package/dist/builtin/workflows/skills/impeccable/scripts/detector/rules/checks.mjs +42 -10
- package/dist/builtin/workflows/skills/impeccable/scripts/detector/shared/fonts.mjs +30 -0
- package/dist/builtin/workflows/skills/impeccable/scripts/detector/shared/page.mjs +4 -6
- package/dist/builtin/workflows/skills/impeccable/scripts/hook-admin.mjs +660 -0
- package/dist/builtin/workflows/skills/impeccable/scripts/hook-before-edit.mjs +516 -0
- package/dist/builtin/workflows/skills/impeccable/scripts/hook-lib.mjs +1764 -0
- package/dist/builtin/workflows/skills/impeccable/scripts/hook.mjs +61 -0
- package/dist/builtin/workflows/skills/impeccable/scripts/lib/impeccable-config.mjs +4 -2
- package/dist/builtin/workflows/skills/impeccable/scripts/lib/is-generated.mjs +2 -2
- package/dist/builtin/workflows/skills/impeccable/scripts/live/svelte-component.mjs +13 -16
- package/dist/builtin/workflows/skills/impeccable/scripts/live-accept.mjs +17 -11
- package/dist/builtin/workflows/skills/impeccable/scripts/live-browser.js +104 -37
- package/dist/builtin/workflows/skills/impeccable/scripts/live-wrap.mjs +9 -0
- package/dist/builtin/workflows/src/durable/backend.ts +12 -0
- package/dist/builtin/workflows/src/durable/child-primitive.ts +12 -8
- package/dist/builtin/workflows/src/durable/dbos-backend.ts +63 -2
- package/dist/builtin/workflows/src/durable/dbos-envelope.ts +28 -0
- package/dist/builtin/workflows/src/durable/resume-catalog.ts +12 -0
- package/dist/builtin/workflows/src/durable/resume-runtime.ts +5 -2
- package/dist/builtin/workflows/src/durable/stage-primitive.ts +167 -28
- package/dist/builtin/workflows/src/durable/types.ts +30 -1
- package/dist/builtin/workflows/src/engine/primitives/task.ts +3 -1
- package/dist/builtin/workflows/src/engine/run-durable-finalize.ts +1 -2
- package/dist/builtin/workflows/src/engine/run-returned-status.ts +50 -16
- package/dist/builtin/workflows/src/engine/run.ts +32 -32
- package/dist/builtin/workflows/src/engine/runtime.ts +5 -0
- package/dist/builtin/workflows/src/extension/extension-factory.ts +3 -0
- package/dist/builtin/workflows/src/extension/extension-lifecycle.ts +9 -2
- package/dist/builtin/workflows/src/extension/extension-runtime-state.ts +137 -27
- package/dist/builtin/workflows/src/extension/lifecycle-notifications.ts +22 -6
- package/dist/builtin/workflows/src/extension/public-types.ts +1 -1
- package/dist/builtin/workflows/src/extension/workflow-command-completions.ts +13 -1
- package/dist/builtin/workflows/src/extension/workflow-command-registration.ts +19 -4
- package/dist/builtin/workflows/src/extension/workflow-command-surfaces.ts +9 -0
- package/dist/builtin/workflows/src/extension/workflow-prompts.ts +17 -17
- package/dist/builtin/workflows/src/extension/workflow-run-control-command.ts +48 -23
- package/dist/builtin/workflows/src/extension/workflow-schema.ts +15 -2
- package/dist/builtin/workflows/src/extension/workflow-tool-control.ts +20 -8
- package/dist/builtin/workflows/src/extension/workflow-tool.ts +24 -8
- package/dist/builtin/workflows/src/runs/background/status.ts +4 -3
- package/dist/builtin/workflows/src/runs/foreground/executor-continuation.ts +13 -3
- package/dist/builtin/workflows/src/runs/foreground/executor-direct-helpers.ts +29 -8
- package/dist/builtin/workflows/src/runs/foreground/executor-hil.ts +1 -1
- package/dist/builtin/workflows/src/runs/foreground/executor-stage-control.ts +8 -0
- package/dist/builtin/workflows/src/runs/foreground/executor-stage-factory.ts +4 -3
- package/dist/builtin/workflows/src/runs/foreground/stage-control-registry.ts +2 -0
- package/dist/builtin/workflows/src/runs/foreground/stage-runner-controller.ts +18 -19
- package/dist/builtin/workflows/src/runs/foreground/stage-runner-unresolved-overflow.ts +38 -0
- package/dist/builtin/workflows/src/runs/foreground/stage-tool-execution-buffer.ts +47 -0
- package/dist/builtin/workflows/src/runs/shared/model-fallback-candidates.ts +1 -1
- package/dist/builtin/workflows/src/runs/shared/worktree-git.ts +155 -20
- package/dist/builtin/workflows/src/runs/shared/worktree-types.ts +6 -0
- package/dist/builtin/workflows/src/runs/shared/worktree.ts +2 -1
- package/dist/builtin/workflows/src/shared/authoring-contract-stage.d.ts +2 -2
- package/dist/builtin/workflows/src/shared/authoring-contract-stage.ts +2 -2
- package/dist/builtin/workflows/src/shared/persistence-restore-helpers.ts +18 -1
- package/dist/builtin/workflows/src/shared/persistence-restore.ts +23 -5
- package/dist/builtin/workflows/src/shared/persistence-session-entries.ts +4 -0
- package/dist/builtin/workflows/src/shared/resume-continuation.ts +2 -0
- package/dist/builtin/workflows/src/shared/returned-run-status.ts +116 -0
- package/dist/builtin/workflows/src/shared/workflow-failures-decisions.ts +2 -0
- package/dist/builtin/workflows/src/tui/graph-view-render-helpers.ts +21 -3
- package/dist/builtin/workflows/src/tui/graph-view-state.ts +3 -0
- package/dist/builtin/workflows/src/tui/graph-view-types.ts +3 -0
- package/dist/builtin/workflows/src/tui/stage-chat-view-archive-history.ts +1 -23
- package/dist/builtin/workflows/src/tui/stage-chat-view-footer-status.ts +54 -9
- package/dist/builtin/workflows/src/tui/stage-chat-view-pending-tools.ts +9 -0
- package/dist/builtin/workflows/src/tui/stage-chat-view-render-settings.ts +27 -0
- package/dist/builtin/workflows/src/tui/stage-chat-view-state.ts +5 -6
- package/dist/builtin/workflows/src/tui/stage-chat-view.ts +5 -2
- package/dist/builtin/workflows/src/tui/status-list.ts +22 -15
- package/dist/builtin/workflows/src/tui/workflow-attach-pane.ts +4 -4
- package/dist/bun/internal-intercom-broker.d.ts +6 -0
- package/dist/bun/internal-intercom-broker.d.ts.map +1 -0
- package/dist/bun/internal-intercom-broker.js +39 -0
- package/dist/bun/internal-intercom-broker.js.map +1 -0
- package/dist/bun/split-loader.d.ts +2 -0
- package/dist/bun/split-loader.d.ts.map +1 -0
- package/dist/bun/split-loader.js +50 -0
- package/dist/bun/split-loader.js.map +1 -0
- package/dist/cli/args.d.ts.map +1 -1
- package/dist/cli/args.js +2 -2
- package/dist/cli/args.js.map +1 -1
- package/dist/config.d.ts.map +1 -1
- package/dist/config.js +6 -4
- package/dist/config.js.map +1 -1
- package/dist/core/agent-session-auto-compaction.d.ts +26 -6
- package/dist/core/agent-session-auto-compaction.d.ts.map +1 -1
- package/dist/core/agent-session-auto-compaction.js +178 -19
- package/dist/core/agent-session-auto-compaction.js.map +1 -1
- package/dist/core/agent-session-compaction.d.ts.map +1 -1
- package/dist/core/agent-session-compaction.js +25 -4
- package/dist/core/agent-session-compaction.js.map +1 -1
- package/dist/core/agent-session-events.d.ts.map +1 -1
- package/dist/core/agent-session-events.js +12 -2
- package/dist/core/agent-session-events.js.map +1 -1
- package/dist/core/agent-session-extension-bindings.d.ts.map +1 -1
- package/dist/core/agent-session-extension-bindings.js +1 -1
- package/dist/core/agent-session-extension-bindings.js.map +1 -1
- package/dist/core/agent-session-message-queue.d.ts.map +1 -1
- package/dist/core/agent-session-message-queue.js +1 -1
- package/dist/core/agent-session-message-queue.js.map +1 -1
- package/dist/core/agent-session-methods.d.ts +13 -4
- package/dist/core/agent-session-methods.d.ts.map +1 -1
- package/dist/core/agent-session-methods.js.map +1 -1
- package/dist/core/agent-session-models.d.ts +2 -2
- package/dist/core/agent-session-models.d.ts.map +1 -1
- package/dist/core/agent-session-models.js.map +1 -1
- package/dist/core/agent-session-prompt.d.ts.map +1 -1
- package/dist/core/agent-session-prompt.js +2 -1
- package/dist/core/agent-session-prompt.js.map +1 -1
- package/dist/core/agent-session-retry.d.ts +2 -0
- package/dist/core/agent-session-retry.d.ts.map +1 -1
- package/dist/core/agent-session-retry.js +152 -4
- package/dist/core/agent-session-retry.js.map +1 -1
- package/dist/core/agent-session-services.d.ts +1 -0
- package/dist/core/agent-session-services.d.ts.map +1 -1
- package/dist/core/agent-session-services.js +4 -2
- package/dist/core/agent-session-services.js.map +1 -1
- package/dist/core/agent-session-types.d.ts +15 -1
- package/dist/core/agent-session-types.d.ts.map +1 -1
- package/dist/core/agent-session-types.js +1 -1
- package/dist/core/agent-session-types.js.map +1 -1
- package/dist/core/agent-session.d.ts +6 -0
- package/dist/core/agent-session.d.ts.map +1 -1
- package/dist/core/agent-session.js +6 -0
- package/dist/core/agent-session.js.map +1 -1
- package/dist/core/anthropic-thinking-guard.d.ts +5 -5
- package/dist/core/anthropic-thinking-guard.d.ts.map +1 -1
- package/dist/core/anthropic-thinking-guard.js +42 -32
- package/dist/core/anthropic-thinking-guard.js.map +1 -1
- package/dist/core/atomic-guide-command.d.ts.map +1 -1
- package/dist/core/atomic-guide-command.js +15 -15
- package/dist/core/atomic-guide-command.js.map +1 -1
- package/dist/core/auth-storage.d.ts.map +1 -1
- package/dist/core/auth-storage.js +14 -9
- package/dist/core/auth-storage.js.map +1 -1
- package/dist/core/builtin-packages.d.ts.map +1 -1
- package/dist/core/builtin-packages.js +8 -4
- package/dist/core/builtin-packages.js.map +1 -1
- package/dist/core/compaction/compaction.d.ts +2 -0
- package/dist/core/compaction/compaction.d.ts.map +1 -1
- package/dist/core/compaction/compaction.js +79 -46
- package/dist/core/compaction/compaction.js.map +1 -1
- package/dist/core/compaction/context-assistant-turns.d.ts +42 -0
- package/dist/core/compaction/context-assistant-turns.d.ts.map +1 -0
- package/dist/core/compaction/context-assistant-turns.js +87 -0
- package/dist/core/compaction/context-assistant-turns.js.map +1 -0
- package/dist/core/compaction/context-compaction-critical.d.ts +15 -0
- package/dist/core/compaction/context-compaction-critical.d.ts.map +1 -0
- package/dist/core/compaction/context-compaction-critical.js +57 -0
- package/dist/core/compaction/context-compaction-critical.js.map +1 -0
- package/dist/core/compaction/context-compaction-eviction-alternates.d.ts +18 -0
- package/dist/core/compaction/context-compaction-eviction-alternates.d.ts.map +1 -0
- package/dist/core/compaction/context-compaction-eviction-alternates.js +186 -0
- package/dist/core/compaction/context-compaction-eviction-alternates.js.map +1 -0
- package/dist/core/compaction/context-compaction-eviction.d.ts +12 -0
- package/dist/core/compaction/context-compaction-eviction.d.ts.map +1 -0
- package/dist/core/compaction/context-compaction-eviction.js +222 -0
- package/dist/core/compaction/context-compaction-eviction.js.map +1 -0
- package/dist/core/compaction/context-compaction-prompt.d.ts.map +1 -1
- package/dist/core/compaction/context-compaction-prompt.js +1 -1
- package/dist/core/compaction/context-compaction-prompt.js.map +1 -1
- package/dist/core/compaction/context-compaction-runner.d.ts +7 -1
- package/dist/core/compaction/context-compaction-runner.d.ts.map +1 -1
- package/dist/core/compaction/context-compaction-runner.js +113 -21
- package/dist/core/compaction/context-compaction-runner.js.map +1 -1
- package/dist/core/compaction/context-compaction-types.d.ts +2 -0
- package/dist/core/compaction/context-compaction-types.d.ts.map +1 -1
- package/dist/core/compaction/context-compaction-types.js.map +1 -1
- package/dist/core/compaction/context-deletion-application.d.ts +5 -4
- package/dist/core/compaction/context-deletion-application.d.ts.map +1 -1
- package/dist/core/compaction/context-deletion-application.js +17 -15
- package/dist/core/compaction/context-deletion-application.js.map +1 -1
- package/dist/core/compaction/context-deletion-store.d.ts.map +1 -1
- package/dist/core/compaction/context-deletion-store.js +1 -1
- package/dist/core/compaction/context-deletion-store.js.map +1 -1
- package/dist/core/compaction/context-deletion-targets.d.ts +2 -1
- package/dist/core/compaction/context-deletion-targets.d.ts.map +1 -1
- package/dist/core/compaction/context-deletion-targets.js +36 -31
- package/dist/core/compaction/context-deletion-targets.js.map +1 -1
- package/dist/core/compaction/context-deletion-tool-helpers.d.ts.map +1 -1
- package/dist/core/compaction/context-deletion-tool-helpers.js +116 -43
- package/dist/core/compaction/context-deletion-tool-helpers.js.map +1 -1
- package/dist/core/compaction/context-transcript-analysis.d.ts +4 -2
- package/dist/core/compaction/context-transcript-analysis.d.ts.map +1 -1
- package/dist/core/compaction/context-transcript-analysis.js +36 -40
- package/dist/core/compaction/context-transcript-analysis.js.map +1 -1
- package/dist/core/copilot-anthropic-sse-repair.d.ts +23 -0
- package/dist/core/copilot-anthropic-sse-repair.d.ts.map +1 -0
- package/dist/core/copilot-anthropic-sse-repair.js +340 -0
- package/dist/core/copilot-anthropic-sse-repair.js.map +1 -0
- package/dist/core/copilot-gemini-reasoning.d.ts +16 -8
- package/dist/core/copilot-gemini-reasoning.d.ts.map +1 -1
- package/dist/core/copilot-gemini-reasoning.js +27 -22
- package/dist/core/copilot-gemini-reasoning.js.map +1 -1
- package/dist/core/copilot-hosts.d.ts +12 -0
- package/dist/core/copilot-hosts.d.ts.map +1 -0
- package/dist/core/copilot-hosts.js +33 -0
- package/dist/core/copilot-hosts.js.map +1 -0
- package/dist/core/copilot-model-catalog.d.ts.map +1 -1
- package/dist/core/copilot-model-catalog.js +3 -2
- package/dist/core/copilot-model-catalog.js.map +1 -1
- package/dist/core/copilot-model-synthesis.d.ts.map +1 -1
- package/dist/core/copilot-model-synthesis.js +3 -1
- package/dist/core/copilot-model-synthesis.js.map +1 -1
- package/dist/core/extensions/agent-events.d.ts +1 -1
- package/dist/core/extensions/agent-events.d.ts.map +1 -1
- package/dist/core/extensions/agent-events.js.map +1 -1
- package/dist/core/extensions/loader-core.d.ts.map +1 -1
- package/dist/core/extensions/loader-core.js +6 -0
- package/dist/core/extensions/loader-core.js.map +1 -1
- package/dist/core/extensions/loader-virtual-modules.d.ts +8 -1
- package/dist/core/extensions/loader-virtual-modules.d.ts.map +1 -1
- package/dist/core/extensions/loader-virtual-modules.js +10 -4
- package/dist/core/extensions/loader-virtual-modules.js.map +1 -1
- package/dist/core/extensions/provider-types.d.ts +2 -7
- package/dist/core/extensions/provider-types.d.ts.map +1 -1
- package/dist/core/extensions/provider-types.js.map +1 -1
- package/dist/core/footer-data-provider.d.ts +6 -0
- package/dist/core/footer-data-provider.d.ts.map +1 -1
- package/dist/core/footer-data-provider.js +72 -29
- package/dist/core/footer-data-provider.js.map +1 -1
- package/dist/core/http-dispatcher.d.ts.map +1 -1
- package/dist/core/http-dispatcher.js +5 -5
- package/dist/core/http-dispatcher.js.map +1 -1
- package/dist/core/messages.d.ts +9 -0
- package/dist/core/messages.d.ts.map +1 -1
- package/dist/core/messages.js +100 -18
- package/dist/core/messages.js.map +1 -1
- package/dist/core/model-registry-builtins.d.ts.map +1 -1
- package/dist/core/model-registry-builtins.js +5 -0
- package/dist/core/model-registry-builtins.js.map +1 -1
- package/dist/core/model-registry-custom-loader.d.ts.map +1 -1
- package/dist/core/model-registry-custom-loader.js +49 -8
- package/dist/core/model-registry-custom-loader.js.map +1 -1
- package/dist/core/model-registry-dynamic.d.ts.map +1 -1
- package/dist/core/model-registry-dynamic.js +11 -5
- package/dist/core/model-registry-dynamic.js.map +1 -1
- package/dist/core/model-registry-loader.d.ts.map +1 -1
- package/dist/core/model-registry-loader.js +8 -0
- package/dist/core/model-registry-loader.js.map +1 -1
- package/dist/core/model-registry-schemas.d.ts +93 -8
- package/dist/core/model-registry-schemas.d.ts.map +1 -1
- package/dist/core/model-registry-schemas.js +24 -12
- package/dist/core/model-registry-schemas.js.map +1 -1
- package/dist/core/model-registry-types.d.ts +7 -6
- package/dist/core/model-registry-types.d.ts.map +1 -1
- package/dist/core/model-registry-types.js.map +1 -1
- package/dist/core/model-registry.d.ts +5 -0
- package/dist/core/model-registry.d.ts.map +1 -1
- package/dist/core/model-registry.js +23 -0
- package/dist/core/model-registry.js.map +1 -1
- package/dist/core/model-resolver-cli.d.ts.map +1 -1
- package/dist/core/model-resolver-cli.js +33 -5
- package/dist/core/model-resolver-cli.js.map +1 -1
- package/dist/core/model-resolver-initial.d.ts +6 -1
- package/dist/core/model-resolver-initial.d.ts.map +1 -1
- package/dist/core/model-resolver-initial.js +12 -7
- package/dist/core/model-resolver-initial.js.map +1 -1
- package/dist/core/model-resolver-scope.d.ts +9 -0
- package/dist/core/model-resolver-scope.d.ts.map +1 -1
- package/dist/core/model-resolver-scope.js +12 -4
- package/dist/core/model-resolver-scope.js.map +1 -1
- package/dist/core/model-resolver.d.ts +4 -3
- package/dist/core/model-resolver.d.ts.map +1 -1
- package/dist/core/model-resolver.js +2 -2
- package/dist/core/model-resolver.js.map +1 -1
- package/dist/core/openai-responses-payload-sanitizer.d.ts +7 -0
- package/dist/core/openai-responses-payload-sanitizer.d.ts.map +1 -0
- package/dist/core/openai-responses-payload-sanitizer.js +74 -0
- package/dist/core/openai-responses-payload-sanitizer.js.map +1 -0
- package/dist/core/package-manager-auto-resources.d.ts +2 -2
- package/dist/core/package-manager-auto-resources.d.ts.map +1 -1
- package/dist/core/package-manager-auto-resources.js +32 -52
- package/dist/core/package-manager-auto-resources.js.map +1 -1
- package/dist/core/package-manager-resolver.d.ts.map +1 -1
- package/dist/core/package-manager-resolver.js +23 -14
- package/dist/core/package-manager-resolver.js.map +1 -1
- package/dist/core/package-manager-resource-collector.d.ts +3 -3
- package/dist/core/package-manager-resource-collector.d.ts.map +1 -1
- package/dist/core/package-manager-resource-collector.js +76 -73
- package/dist/core/package-manager-resource-collector.js.map +1 -1
- package/dist/core/package-manager-resource-files.d.ts +9 -8
- package/dist/core/package-manager-resource-files.d.ts.map +1 -1
- package/dist/core/package-manager-resource-files.js +92 -81
- package/dist/core/package-manager-resource-files.js.map +1 -1
- package/dist/core/prompt-templates-async.d.ts +3 -0
- package/dist/core/prompt-templates-async.d.ts.map +1 -0
- package/dist/core/prompt-templates-async.js +118 -0
- package/dist/core/prompt-templates-async.js.map +1 -0
- package/dist/core/provider-context-usage.d.ts +11 -0
- package/dist/core/provider-context-usage.d.ts.map +1 -0
- package/dist/core/provider-context-usage.js +58 -0
- package/dist/core/provider-context-usage.js.map +1 -0
- package/dist/core/resource-loader-assets.d.ts +3 -3
- package/dist/core/resource-loader-assets.d.ts.map +1 -1
- package/dist/core/resource-loader-assets.js +66 -83
- package/dist/core/resource-loader-assets.js.map +1 -1
- package/dist/core/resource-loader-context-files.d.ts +1 -0
- package/dist/core/resource-loader-context-files.d.ts.map +1 -1
- package/dist/core/resource-loader-context-files.js +13 -10
- package/dist/core/resource-loader-context-files.js.map +1 -1
- package/dist/core/resource-loader-core.d.ts +1 -1
- package/dist/core/resource-loader-core.d.ts.map +1 -1
- package/dist/core/resource-loader-core.js +5 -5
- package/dist/core/resource-loader-core.js.map +1 -1
- package/dist/core/resource-loader-extensions.d.ts.map +1 -1
- package/dist/core/resource-loader-extensions.js +4 -0
- package/dist/core/resource-loader-extensions.js.map +1 -1
- package/dist/core/resource-loader-reload.d.ts.map +1 -1
- package/dist/core/resource-loader-reload.js +54 -7
- package/dist/core/resource-loader-reload.js.map +1 -1
- package/dist/core/resource-loader-types.d.ts +7 -1
- package/dist/core/resource-loader-types.d.ts.map +1 -1
- package/dist/core/resource-loader-types.js.map +1 -1
- package/dist/core/sdk-types.d.ts +2 -0
- package/dist/core/sdk-types.d.ts.map +1 -1
- package/dist/core/sdk-types.js.map +1 -1
- package/dist/core/sdk.d.ts.map +1 -1
- package/dist/core/sdk.js +9 -6
- package/dist/core/sdk.js.map +1 -1
- package/dist/core/session-entry-normalization.d.ts +7 -0
- package/dist/core/session-entry-normalization.d.ts.map +1 -0
- package/dist/core/session-entry-normalization.js +14 -0
- package/dist/core/session-entry-normalization.js.map +1 -0
- package/dist/core/session-manager-core.d.ts.map +1 -1
- package/dist/core/session-manager-core.js +1 -0
- package/dist/core/session-manager-core.js.map +1 -1
- package/dist/core/session-manager-history.d.ts +2 -2
- package/dist/core/session-manager-history.d.ts.map +1 -1
- package/dist/core/session-manager-history.js +127 -108
- package/dist/core/session-manager-history.js.map +1 -1
- package/dist/core/settings-manager-basic-accessors.d.ts +3 -2
- package/dist/core/settings-manager-basic-accessors.d.ts.map +1 -1
- package/dist/core/settings-manager-basic-accessors.js +6 -0
- package/dist/core/settings-manager-basic-accessors.js.map +1 -1
- package/dist/core/settings-manager-core.d.ts.map +1 -1
- package/dist/core/settings-manager-core.js +3 -2
- package/dist/core/settings-manager-core.js.map +1 -1
- package/dist/core/settings-storage.d.ts.map +1 -1
- package/dist/core/settings-storage.js +2 -1
- package/dist/core/settings-storage.js.map +1 -1
- package/dist/core/settings-types.d.ts +2 -1
- package/dist/core/settings-types.d.ts.map +1 -1
- package/dist/core/settings-types.js.map +1 -1
- package/dist/core/skills-async.d.ts +3 -0
- package/dist/core/skills-async.d.ts.map +1 -0
- package/dist/core/skills-async.js +269 -0
- package/dist/core/skills-async.js.map +1 -0
- package/dist/core/slash-commands.d.ts +2 -0
- package/dist/core/slash-commands.d.ts.map +1 -1
- package/dist/core/slash-commands.js +141 -0
- package/dist/core/slash-commands.js.map +1 -1
- package/dist/core/tools/bash.d.ts.map +1 -1
- package/dist/core/tools/bash.js +11 -8
- package/dist/core/tools/bash.js.map +1 -1
- package/dist/core/trust-manager.d.ts +9 -0
- package/dist/core/trust-manager.d.ts.map +1 -1
- package/dist/core/trust-manager.js +44 -2
- package/dist/core/trust-manager.js.map +1 -1
- package/dist/index-extensions.d.ts +1 -1
- package/dist/index-extensions.d.ts.map +1 -1
- package/dist/index-extensions.js.map +1 -1
- package/dist/index.d.ts +2 -1
- package/dist/index.d.ts.map +1 -1
- package/dist/index.js +2 -1
- package/dist/index.js.map +1 -1
- package/dist/main-deferred-startup.d.ts +33 -0
- package/dist/main-deferred-startup.d.ts.map +1 -0
- package/dist/main-deferred-startup.js +44 -0
- package/dist/main-deferred-startup.js.map +1 -0
- package/dist/main-early-input.d.ts +41 -0
- package/dist/main-early-input.d.ts.map +1 -0
- package/dist/main-early-input.js +154 -0
- package/dist/main-early-input.js.map +1 -0
- package/dist/main-session.d.ts.map +1 -1
- package/dist/main-session.js +1 -0
- package/dist/main-session.js.map +1 -1
- package/dist/main.d.ts +0 -6
- package/dist/main.d.ts.map +1 -1
- package/dist/main.js +47 -39
- package/dist/main.js.map +1 -1
- package/dist/modes/interactive/components/chat-session-host-actions.d.ts.map +1 -1
- package/dist/modes/interactive/components/chat-session-host-actions.js +0 -1
- package/dist/modes/interactive/components/chat-session-host-actions.js.map +1 -1
- package/dist/modes/interactive/components/chat-session-host-events.d.ts.map +1 -1
- package/dist/modes/interactive/components/chat-session-host-events.js +15 -0
- package/dist/modes/interactive/components/chat-session-host-events.js.map +1 -1
- package/dist/modes/interactive/components/settings-selector-options.d.ts.map +1 -1
- package/dist/modes/interactive/components/settings-selector-options.js +3 -1
- package/dist/modes/interactive/components/settings-selector-options.js.map +1 -1
- package/dist/modes/interactive/components/thinking-selector.d.ts.map +1 -1
- package/dist/modes/interactive/components/thinking-selector.js +2 -1
- package/dist/modes/interactive/components/thinking-selector.js.map +1 -1
- package/dist/modes/interactive/interactive-agent-events.d.ts.map +1 -1
- package/dist/modes/interactive/interactive-agent-events.js +37 -2
- package/dist/modes/interactive/interactive-agent-events.js.map +1 -1
- package/dist/modes/interactive/interactive-auth-login.d.ts.map +1 -1
- package/dist/modes/interactive/interactive-auth-login.js +0 -1
- package/dist/modes/interactive/interactive-auth-login.js.map +1 -1
- package/dist/modes/interactive/interactive-autocomplete.d.ts.map +1 -1
- package/dist/modes/interactive/interactive-autocomplete.js +21 -9
- package/dist/modes/interactive/interactive-autocomplete.js.map +1 -1
- package/dist/modes/interactive/interactive-child-ordering.d.ts +7 -0
- package/dist/modes/interactive/interactive-child-ordering.d.ts.map +1 -0
- package/dist/modes/interactive/interactive-child-ordering.js +26 -0
- package/dist/modes/interactive/interactive-child-ordering.js.map +1 -0
- package/dist/modes/interactive/interactive-deferred-startup.d.ts +8 -1
- package/dist/modes/interactive/interactive-deferred-startup.d.ts.map +1 -1
- package/dist/modes/interactive/interactive-deferred-startup.js +86 -26
- package/dist/modes/interactive/interactive-deferred-startup.js.map +1 -1
- package/dist/modes/interactive/interactive-editor-actions.d.ts.map +1 -1
- package/dist/modes/interactive/interactive-editor-actions.js +13 -13
- package/dist/modes/interactive/interactive-editor-actions.js.map +1 -1
- package/dist/modes/interactive/interactive-extension-runtime.d.ts.map +1 -1
- package/dist/modes/interactive/interactive-extension-runtime.js +16 -0
- package/dist/modes/interactive/interactive-extension-runtime.js.map +1 -1
- package/dist/modes/interactive/interactive-hotkeys-debug.d.ts.map +1 -1
- package/dist/modes/interactive/interactive-hotkeys-debug.js +4 -3
- package/dist/modes/interactive/interactive-hotkeys-debug.js.map +1 -1
- package/dist/modes/interactive/interactive-input-handling.d.ts.map +1 -1
- package/dist/modes/interactive/interactive-input-handling.js +360 -230
- package/dist/modes/interactive/interactive-input-handling.js.map +1 -1
- package/dist/modes/interactive/interactive-mode-base.d.ts +19 -4
- package/dist/modes/interactive/interactive-mode-base.d.ts.map +1 -1
- package/dist/modes/interactive/interactive-mode-base.js +46 -4
- package/dist/modes/interactive/interactive-mode-base.js.map +1 -1
- package/dist/modes/interactive/interactive-mode-deps.d.ts +3 -3
- package/dist/modes/interactive/interactive-mode-deps.d.ts.map +1 -1
- package/dist/modes/interactive/interactive-mode-deps.js +3 -3
- package/dist/modes/interactive/interactive-mode-deps.js.map +1 -1
- package/dist/modes/interactive/interactive-mode-surface.d.ts +27 -17
- package/dist/modes/interactive/interactive-mode-surface.d.ts.map +1 -1
- package/dist/modes/interactive/interactive-mode-surface.js.map +1 -1
- package/dist/modes/interactive/interactive-mode-types.d.ts +8 -1
- package/dist/modes/interactive/interactive-mode-types.d.ts.map +1 -1
- package/dist/modes/interactive/interactive-mode-types.js.map +1 -1
- package/dist/modes/interactive/interactive-model-routing.d.ts.map +1 -1
- package/dist/modes/interactive/interactive-model-routing.js +14 -10
- package/dist/modes/interactive/interactive-model-routing.js.map +1 -1
- package/dist/modes/interactive/interactive-onboarding.d.ts +0 -9
- package/dist/modes/interactive/interactive-onboarding.d.ts.map +1 -1
- package/dist/modes/interactive/interactive-onboarding.js +24 -201
- package/dist/modes/interactive/interactive-onboarding.js.map +1 -1
- package/dist/modes/interactive/interactive-process-lifecycle.d.ts.map +1 -1
- package/dist/modes/interactive/interactive-process-lifecycle.js +43 -9
- package/dist/modes/interactive/interactive-process-lifecycle.js.map +1 -1
- package/dist/modes/interactive/interactive-render-chat.d.ts.map +1 -1
- package/dist/modes/interactive/interactive-render-chat.js +93 -10
- package/dist/modes/interactive/interactive-render-chat.js.map +1 -1
- package/dist/modes/interactive/interactive-resource-disclosure.d.ts.map +1 -1
- package/dist/modes/interactive/interactive-resource-disclosure.js +3 -2
- package/dist/modes/interactive/interactive-resource-disclosure.js.map +1 -1
- package/dist/modes/interactive/interactive-resource-rendering.d.ts.map +1 -1
- package/dist/modes/interactive/interactive-resource-rendering.js +10 -8
- package/dist/modes/interactive/interactive-resource-rendering.js.map +1 -1
- package/dist/modes/interactive/interactive-session-routing.d.ts.map +1 -1
- package/dist/modes/interactive/interactive-session-routing.js +9 -5
- package/dist/modes/interactive/interactive-session-routing.js.map +1 -1
- package/dist/modes/interactive/interactive-session-runtime.d.ts.map +1 -1
- package/dist/modes/interactive/interactive-session-runtime.js +1 -1
- package/dist/modes/interactive/interactive-session-runtime.js.map +1 -1
- package/dist/modes/interactive/interactive-slash-commands.d.ts.map +1 -1
- package/dist/modes/interactive/interactive-slash-commands.js +1 -1
- package/dist/modes/interactive/interactive-slash-commands.js.map +1 -1
- package/dist/modes/interactive/interactive-startup.d.ts.map +1 -1
- package/dist/modes/interactive/interactive-startup.js +102 -98
- package/dist/modes/interactive/interactive-startup.js.map +1 -1
- package/dist/modes/interactive/theme/global-theme.d.ts.map +1 -1
- package/dist/modes/interactive/theme/global-theme.js +26 -2
- package/dist/modes/interactive/theme/global-theme.js.map +1 -1
- package/dist/modes/interactive/theme/theme-class.d.ts +1 -1
- package/dist/modes/interactive/theme/theme-class.d.ts.map +1 -1
- package/dist/modes/interactive/theme/theme-class.js +2 -0
- package/dist/modes/interactive/theme/theme-class.js.map +1 -1
- package/dist/modes/interactive/theme/theme-loading.d.ts +1 -0
- package/dist/modes/interactive/theme/theme-loading.d.ts.map +1 -1
- package/dist/modes/interactive/theme/theme-loading.js +3 -0
- package/dist/modes/interactive/theme/theme-loading.js.map +1 -1
- package/dist/modes/interactive/theme/theme.d.ts +1 -1
- package/dist/modes/interactive/theme/theme.d.ts.map +1 -1
- package/dist/modes/interactive/theme/theme.js +1 -1
- package/dist/modes/interactive/theme/theme.js.map +1 -1
- package/dist/utils/child-process.d.ts +8 -1
- package/dist/utils/child-process.d.ts.map +1 -1
- package/dist/utils/child-process.js +39 -6
- package/dist/utils/child-process.js.map +1 -1
- package/dist/utils/clipboard-image.d.ts.map +1 -1
- package/dist/utils/clipboard-image.js +3 -0
- package/dist/utils/clipboard-image.js.map +1 -1
- package/dist/utils/event-loop.d.ts +7 -0
- package/dist/utils/event-loop.d.ts.map +1 -0
- package/dist/utils/event-loop.js +14 -0
- package/dist/utils/event-loop.js.map +1 -0
- package/dist/utils/fs-watch.d.ts +24 -1
- package/dist/utils/fs-watch.d.ts.map +1 -1
- package/dist/utils/fs-watch.js +60 -5
- package/dist/utils/fs-watch.js.map +1 -1
- package/dist/utils/json.d.ts +4 -0
- package/dist/utils/json.d.ts.map +1 -1
- package/dist/utils/json.js +8 -0
- package/dist/utils/json.js.map +1 -1
- package/dist/utils/module-require.d.ts +11 -0
- package/dist/utils/module-require.d.ts.map +1 -1
- package/dist/utils/module-require.js +14 -1
- package/dist/utils/module-require.js.map +1 -1
- package/dist/utils/split-launcher.d.ts +38 -0
- package/dist/utils/split-launcher.d.ts.map +1 -0
- package/dist/utils/split-launcher.js +63 -0
- package/dist/utils/split-launcher.js.map +1 -0
- package/docs/changelog.mdx +19 -0
- package/docs/compaction.md +100 -64
- package/docs/custom-provider.md +18 -5
- package/docs/development.md +4 -0
- package/docs/extensions.md +11 -2
- package/docs/json.md +3 -1
- package/docs/keybindings.md +2 -2
- package/docs/models.md +69 -10
- package/docs/providers.md +3 -2
- package/docs/quickstart.md +15 -11
- package/docs/rpc.md +5 -3
- package/docs/sdk.md +1 -1
- package/docs/settings.md +33 -3
- package/docs/subagents.md +40 -5
- package/docs/terminal-setup.md +4 -0
- package/docs/tools.md +1 -1
- package/docs/usage.md +8 -6
- package/docs/windows.md +4 -0
- package/docs/workflows.md +59 -36
- package/examples/extensions/preset.ts +2 -2
- package/examples/extensions/subagent/README.md +2 -2
- package/examples/extensions/subagent/index.ts +1 -2
- package/examples/extensions/subagent/schemas.ts +4 -1
- package/examples/sdk/12-full-control.ts +1 -1
- package/npm-shrinkwrap.json +538 -51
- package/package.json +10 -9
- package/dist/builtin/subagents/src/runs/foreground/chain-clarify-behavior.ts +0 -75
- package/dist/builtin/subagents/src/runs/foreground/chain-clarify-component.ts +0 -202
- package/dist/builtin/subagents/src/runs/foreground/chain-clarify-edit.ts +0 -97
- package/dist/builtin/subagents/src/runs/foreground/chain-clarify-editor.ts +0 -160
- package/dist/builtin/subagents/src/runs/foreground/chain-clarify-frame.ts +0 -72
- package/dist/builtin/subagents/src/runs/foreground/chain-clarify-render-modes.ts +0 -161
- package/dist/builtin/subagents/src/runs/foreground/chain-clarify-render-selectors.ts +0 -203
- package/dist/builtin/subagents/src/runs/foreground/chain-clarify-selectors.ts +0 -234
- package/dist/builtin/subagents/src/runs/foreground/chain-clarify-state.ts +0 -103
- package/dist/builtin/subagents/src/runs/foreground/chain-clarify-types.ts +0 -29
- package/dist/builtin/subagents/src/runs/foreground/chain-clarify.ts +0 -9
- package/dist/builtin/subagents/src/runs/foreground/chain-execution-clarify.ts +0 -117
|
@@ -0,0 +1,58 @@
|
|
|
1
|
+
function findLatestCompactionBoundary(entries) {
|
|
2
|
+
for (let i = entries.length - 1; i >= 0; i--) {
|
|
3
|
+
const entry = entries[i];
|
|
4
|
+
if (entry.type === "context_compaction") {
|
|
5
|
+
return entry;
|
|
6
|
+
}
|
|
7
|
+
}
|
|
8
|
+
return undefined;
|
|
9
|
+
}
|
|
10
|
+
function hasTokenUsage(usage) {
|
|
11
|
+
return usage.input > 0 || usage.output > 0 || usage.cacheRead > 0 || usage.cacheWrite > 0 || usage.totalTokens > 0;
|
|
12
|
+
}
|
|
13
|
+
function createZeroUsage(usage) {
|
|
14
|
+
const zeroed = {
|
|
15
|
+
...usage,
|
|
16
|
+
input: 0,
|
|
17
|
+
output: 0,
|
|
18
|
+
cacheRead: 0,
|
|
19
|
+
cacheWrite: 0,
|
|
20
|
+
totalTokens: 0,
|
|
21
|
+
cost: { input: 0, output: 0, cacheRead: 0, cacheWrite: 0, total: 0 },
|
|
22
|
+
};
|
|
23
|
+
if (usage.cacheWrite1h !== undefined) {
|
|
24
|
+
zeroed.cacheWrite1h = 0;
|
|
25
|
+
}
|
|
26
|
+
if (usage.reasoning !== undefined) {
|
|
27
|
+
zeroed.reasoning = 0;
|
|
28
|
+
}
|
|
29
|
+
return zeroed;
|
|
30
|
+
}
|
|
31
|
+
/**
|
|
32
|
+
* Provider-side token-budget estimators use the last assistant usage in the
|
|
33
|
+
* request context as an anchor. After logical context compaction, retained
|
|
34
|
+
* pre-compaction assistant messages still carry usage from the old, larger
|
|
35
|
+
* context. Scrub only the provider-bound clone so the durable transcript keeps
|
|
36
|
+
* historical billing data while the next request estimates the compacted prompt.
|
|
37
|
+
*/
|
|
38
|
+
export function scrubPreCompactionAssistantUsage(messages, entries) {
|
|
39
|
+
const compactionBoundary = findLatestCompactionBoundary(entries);
|
|
40
|
+
if (!compactionBoundary)
|
|
41
|
+
return messages;
|
|
42
|
+
const boundaryTime = Date.parse(compactionBoundary.timestamp);
|
|
43
|
+
if (!Number.isFinite(boundaryTime))
|
|
44
|
+
return messages;
|
|
45
|
+
let changed = false;
|
|
46
|
+
const scrubbed = messages.map((message) => {
|
|
47
|
+
if (message.role !== "assistant")
|
|
48
|
+
return message;
|
|
49
|
+
const assistant = message;
|
|
50
|
+
if (assistant.timestamp > boundaryTime || !hasTokenUsage(assistant.usage)) {
|
|
51
|
+
return message;
|
|
52
|
+
}
|
|
53
|
+
changed = true;
|
|
54
|
+
return { ...assistant, usage: createZeroUsage(assistant.usage) };
|
|
55
|
+
});
|
|
56
|
+
return changed ? scrubbed : messages;
|
|
57
|
+
}
|
|
58
|
+
//# sourceMappingURL=provider-context-usage.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"provider-context-usage.js","sourceRoot":"","sources":["../../src/core/provider-context-usage.ts"],"names":[],"mappings":"AAIA,SAAS,4BAA4B,CAAC,OAAgC;IACrE,KAAK,IAAI,CAAC,GAAG,OAAO,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC,IAAI,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC;QAC9C,MAAM,KAAK,GAAG,OAAO,CAAC,CAAC,CAAC,CAAC;QACzB,IAAI,KAAK,CAAC,IAAI,KAAK,oBAAoB,EAAE,CAAC;YACzC,OAAO,KAAK,CAAC;QACd,CAAC;IACF,CAAC;IACD,OAAO,SAAS,CAAC;AAClB,CAAC;AAED,SAAS,aAAa,CAAC,KAAY;IAClC,OAAO,KAAK,CAAC,KAAK,GAAG,CAAC,IAAI,KAAK,CAAC,MAAM,GAAG,CAAC,IAAI,KAAK,CAAC,SAAS,GAAG,CAAC,IAAI,KAAK,CAAC,UAAU,GAAG,CAAC,IAAI,KAAK,CAAC,WAAW,GAAG,CAAC,CAAC;AACpH,CAAC;AAED,SAAS,eAAe,CAAC,KAAY;IACpC,MAAM,MAAM,GAAU;QACrB,GAAG,KAAK;QACR,KAAK,EAAE,CAAC;QACR,MAAM,EAAE,CAAC;QACT,SAAS,EAAE,CAAC;QACZ,UAAU,EAAE,CAAC;QACb,WAAW,EAAE,CAAC;QACd,IAAI,EAAE,EAAE,KAAK,EAAE,CAAC,EAAE,MAAM,EAAE,CAAC,EAAE,SAAS,EAAE,CAAC,EAAE,UAAU,EAAE,CAAC,EAAE,KAAK,EAAE,CAAC,EAAE;KACpE,CAAC;IAEF,IAAI,KAAK,CAAC,YAAY,KAAK,SAAS,EAAE,CAAC;QACtC,MAAM,CAAC,YAAY,GAAG,CAAC,CAAC;IACzB,CAAC;IACD,IAAI,KAAK,CAAC,SAAS,KAAK,SAAS,EAAE,CAAC;QACnC,MAAM,CAAC,SAAS,GAAG,CAAC,CAAC;IACtB,CAAC;IAED,OAAO,MAAM,CAAC;AACf,CAAC;AAED;;;;;;GAMG;AACH,MAAM,UAAU,gCAAgC,CAC/C,QAAwB,EACxB,OAAgC;IAEhC,MAAM,kBAAkB,GAAG,4BAA4B,CAAC,OAAO,CAAC,CAAC;IACjE,IAAI,CAAC,kBAAkB;QAAE,OAAO,QAAQ,CAAC;IAEzC,MAAM,YAAY,GAAG,IAAI,CAAC,KAAK,CAAC,kBAAkB,CAAC,SAAS,CAAC,CAAC;IAC9D,IAAI,CAAC,MAAM,CAAC,QAAQ,CAAC,YAAY,CAAC;QAAE,OAAO,QAAQ,CAAC;IAEpD,IAAI,OAAO,GAAG,KAAK,CAAC;IACpB,MAAM,QAAQ,GAAG,QAAQ,CAAC,GAAG,CAAC,CAAC,OAAO,EAAE,EAAE;QACzC,IAAI,OAAO,CAAC,IAAI,KAAK,WAAW;YAAE,OAAO,OAAO,CAAC;QAEjD,MAAM,SAAS,GAAG,OAA2B,CAAC;QAC9C,IAAI,SAAS,CAAC,SAAS,GAAG,YAAY,IAAI,CAAC,aAAa,CAAC,SAAS,CAAC,KAAK,CAAC,EAAE,CAAC;YAC3E,OAAO,OAAO,CAAC;QAChB,CAAC;QAED,OAAO,GAAG,IAAI,CAAC;QACf,OAAO,EAAE,GAAG,SAAS,EAAE,KAAK,EAAE,eAAe,CAAC,SAAS,CAAC,KAAK,CAAC,EAAE,CAAC;IAClE,CAAC,CAAC,CAAC;IAEH,OAAO,OAAO,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,QAAQ,CAAC;AACtC,CAAC","sourcesContent":["import type { AgentMessage } from \"@earendil-works/pi-agent-core\";\nimport type { AssistantMessage, Usage } from \"@earendil-works/pi-ai/compat\";\nimport type { ContextCompactionEntry, SessionEntry } from \"./session-manager.ts\";\n\nfunction findLatestCompactionBoundary(entries: readonly SessionEntry[]): ContextCompactionEntry | undefined {\n\tfor (let i = entries.length - 1; i >= 0; i--) {\n\t\tconst entry = entries[i];\n\t\tif (entry.type === \"context_compaction\") {\n\t\t\treturn entry;\n\t\t}\n\t}\n\treturn undefined;\n}\n\nfunction hasTokenUsage(usage: Usage): boolean {\n\treturn usage.input > 0 || usage.output > 0 || usage.cacheRead > 0 || usage.cacheWrite > 0 || usage.totalTokens > 0;\n}\n\nfunction createZeroUsage(usage: Usage): Usage {\n\tconst zeroed: Usage = {\n\t\t...usage,\n\t\tinput: 0,\n\t\toutput: 0,\n\t\tcacheRead: 0,\n\t\tcacheWrite: 0,\n\t\ttotalTokens: 0,\n\t\tcost: { input: 0, output: 0, cacheRead: 0, cacheWrite: 0, total: 0 },\n\t};\n\n\tif (usage.cacheWrite1h !== undefined) {\n\t\tzeroed.cacheWrite1h = 0;\n\t}\n\tif (usage.reasoning !== undefined) {\n\t\tzeroed.reasoning = 0;\n\t}\n\n\treturn zeroed;\n}\n\n/**\n * Provider-side token-budget estimators use the last assistant usage in the\n * request context as an anchor. After logical context compaction, retained\n * pre-compaction assistant messages still carry usage from the old, larger\n * context. Scrub only the provider-bound clone so the durable transcript keeps\n * historical billing data while the next request estimates the compacted prompt.\n */\nexport function scrubPreCompactionAssistantUsage(\n\tmessages: AgentMessage[],\n\tentries: readonly SessionEntry[],\n): AgentMessage[] {\n\tconst compactionBoundary = findLatestCompactionBoundary(entries);\n\tif (!compactionBoundary) return messages;\n\n\tconst boundaryTime = Date.parse(compactionBoundary.timestamp);\n\tif (!Number.isFinite(boundaryTime)) return messages;\n\n\tlet changed = false;\n\tconst scrubbed = messages.map((message) => {\n\t\tif (message.role !== \"assistant\") return message;\n\n\t\tconst assistant = message as AssistantMessage;\n\t\tif (assistant.timestamp > boundaryTime || !hasTokenUsage(assistant.usage)) {\n\t\t\treturn message;\n\t\t}\n\n\t\tchanged = true;\n\t\treturn { ...assistant, usage: createZeroUsage(assistant.usage) };\n\t});\n\n\treturn changed ? scrubbed : messages;\n}\n"]}
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import type { PathMetadata } from "./package-manager.ts";
|
|
2
2
|
import type { DefaultResourceLoader } from "./resource-loader-core.ts";
|
|
3
|
-
export declare function
|
|
4
|
-
export declare function
|
|
5
|
-
export declare function
|
|
3
|
+
export declare function updateSkillsFromPathsAsync(loader: DefaultResourceLoader, skillPaths: string[], metadataByPath?: Map<string, PathMetadata>): Promise<void>;
|
|
4
|
+
export declare function updatePromptsFromPathsAsync(loader: DefaultResourceLoader, promptPaths: string[], metadataByPath?: Map<string, PathMetadata>): Promise<void>;
|
|
5
|
+
export declare function updateThemesFromPathsAsync(loader: DefaultResourceLoader, themePaths: string[], metadataByPath?: Map<string, PathMetadata>): Promise<void>;
|
|
6
6
|
//# sourceMappingURL=resource-loader-assets.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"resource-loader-assets.d.ts","sourceRoot":"","sources":["../../src/core/resource-loader-assets.ts"],"names":[],"mappings":"AAKA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,sBAAsB,CAAC;AAOzD,OAAO,KAAK,EAAE,qBAAqB,EAAE,MAAM,2BAA2B,CAAC;AAGvE,wBAAgB,qBAAqB,CACpC,MAAM,EAAE,qBAAqB,EAC7B,UAAU,EAAE,MAAM,EAAE,EACpB,cAAc,CAAC,EAAE,GAAG,CAAC,MAAM,EAAE,YAAY,CAAC,GACxC,IAAI,CAsBN;AAED,wBAAgB,sBAAsB,CACrC,MAAM,EAAE,qBAAqB,EAC7B,WAAW,EAAE,MAAM,EAAE,EACrB,cAAc,CAAC,EAAE,GAAG,CAAC,MAAM,EAAE,YAAY,CAAC,GACxC,IAAI,CAuBN;AAED,wBAAgB,qBAAqB,CACpC,MAAM,EAAE,qBAAqB,EAC7B,UAAU,EAAE,MAAM,EAAE,EACpB,cAAc,CAAC,EAAE,GAAG,CAAC,MAAM,EAAE,YAAY,CAAC,GACxC,IAAI,CAqBN","sourcesContent":["import { existsSync, readdirSync, statSync } from \"node:fs\";\nimport { join } from \"node:path\";\nimport { getProjectConfigDirs } from \"../config.ts\";\nimport { loadThemeFromPath, type Theme } from \"../modes/interactive/theme/theme.ts\";\nimport type { ResourceDiagnostic } from \"./diagnostics.ts\";\nimport type { PathMetadata } from \"./package-manager.ts\";\nimport type { PromptTemplate } from \"./prompt-templates.ts\";\nimport { loadPromptTemplates } from \"./prompt-templates.ts\";\nimport type { Skill } from \"./skills.ts\";\nimport { loadSkills } from \"./skills.ts\";\nimport { resourceInternals } from \"./resource-loader-internals.ts\";\nimport { getLoaderAgentDirs, resolveResourcePath } from \"./resource-loader-paths.ts\";\nimport type { DefaultResourceLoader } from \"./resource-loader-core.ts\";\nimport { findSourceInfoForPath, getDefaultSourceInfoForPath } from \"./resource-loader-source-info.ts\";\n\nexport function updateSkillsFromPaths(\n\tloader: DefaultResourceLoader,\n\tskillPaths: string[],\n\tmetadataByPath?: Map<string, PathMetadata>,\n): void {\n\tconst state = resourceInternals(loader);\n\tlet skillsResult: { skills: Skill[]; diagnostics: ResourceDiagnostic[] };\n\tif (state.noSkills && skillPaths.length === 0) {\n\t\tskillsResult = { skills: [], diagnostics: [] };\n\t} else {\n\t\tskillsResult = loadSkills({\n\t\t\tcwd: state.cwd,\n\t\t\tagentDir: state.agentDir,\n\t\t\tskillPaths,\n\t\t\tincludeDefaults: false,\n\t\t});\n\t}\n\tconst resolvedSkills = state.skillsOverride ? state.skillsOverride(skillsResult) : skillsResult;\n\tstate.skills = resolvedSkills.skills.map((skill) => ({\n\t\t...skill,\n\t\tsourceInfo:\n\t\t\tfindSourceInfoForPath(loader, skill.filePath, state.extensionSkillSourceInfos, metadataByPath) ??\n\t\t\tskill.sourceInfo ??\n\t\t\tgetDefaultSourceInfoForPath(loader, skill.filePath),\n\t}));\n\tstate.skillDiagnostics = resolvedSkills.diagnostics;\n}\n\nexport function updatePromptsFromPaths(\n\tloader: DefaultResourceLoader,\n\tpromptPaths: string[],\n\tmetadataByPath?: Map<string, PathMetadata>,\n): void {\n\tconst state = resourceInternals(loader);\n\tlet promptsResult: { prompts: PromptTemplate[]; diagnostics: ResourceDiagnostic[] };\n\tif (state.noPromptTemplates && promptPaths.length === 0) {\n\t\tpromptsResult = { prompts: [], diagnostics: [] };\n\t} else {\n\t\tconst allPrompts = loadPromptTemplates({\n\t\t\tcwd: state.cwd,\n\t\t\tagentDir: state.agentDir,\n\t\t\tpromptPaths,\n\t\t\tincludeDefaults: false,\n\t\t});\n\t\tpromptsResult = dedupePrompts(allPrompts);\n\t}\n\tconst resolvedPrompts = state.promptsOverride ? state.promptsOverride(promptsResult) : promptsResult;\n\tstate.prompts = resolvedPrompts.prompts.map((prompt) => ({\n\t\t...prompt,\n\t\tsourceInfo:\n\t\t\tfindSourceInfoForPath(loader, prompt.filePath, state.extensionPromptSourceInfos, metadataByPath) ??\n\t\t\tprompt.sourceInfo ??\n\t\t\tgetDefaultSourceInfoForPath(loader, prompt.filePath),\n\t}));\n\tstate.promptDiagnostics = resolvedPrompts.diagnostics;\n}\n\nexport function updateThemesFromPaths(\n\tloader: DefaultResourceLoader,\n\tthemePaths: string[],\n\tmetadataByPath?: Map<string, PathMetadata>,\n): void {\n\tconst state = resourceInternals(loader);\n\tlet themesResult: { themes: Theme[]; diagnostics: ResourceDiagnostic[] };\n\tif (state.noThemes && themePaths.length === 0) {\n\t\tthemesResult = { themes: [], diagnostics: [] };\n\t} else {\n\t\tconst loaded = loadThemes(loader, themePaths, false);\n\t\tconst deduped = dedupeThemes(loaded.themes);\n\t\tthemesResult = { themes: deduped.themes, diagnostics: [...loaded.diagnostics, ...deduped.diagnostics] };\n\t}\n\tconst resolvedThemes = state.themesOverride ? state.themesOverride(themesResult) : themesResult;\n\tstate.themes = resolvedThemes.themes.map((theme) => {\n\t\tconst sourcePath = theme.sourcePath;\n\t\ttheme.sourceInfo = sourcePath\n\t\t\t? (findSourceInfoForPath(loader, sourcePath, state.extensionThemeSourceInfos, metadataByPath) ??\n\t\t\t\ttheme.sourceInfo ??\n\t\t\t\tgetDefaultSourceInfoForPath(loader, sourcePath))\n\t\t\t: theme.sourceInfo;\n\t\treturn theme;\n\t});\n\tstate.themeDiagnostics = resolvedThemes.diagnostics;\n}\n\nfunction loadThemes(\n\tloader: DefaultResourceLoader,\n\tpaths: string[],\n\tincludeDefaults = true,\n): {\n\tthemes: Theme[];\n\tdiagnostics: ResourceDiagnostic[];\n} {\n\tconst state = resourceInternals(loader);\n\tconst themes: Theme[] = [];\n\tconst diagnostics: ResourceDiagnostic[] = [];\n\tif (includeDefaults) {\n\t\tconst defaultDirs = [\n\t\t\t...getLoaderAgentDirs(state.agentDir).map((agentDir) => join(agentDir, \"themes\")),\n\t\t\t...getProjectThemeDirs(state.cwd),\n\t\t];\n\n\t\tfor (const dir of defaultDirs) {\n\t\t\tloadThemesFromDir(dir, themes, diagnostics);\n\t\t}\n\t}\n\n\tfor (const p of paths) {\n\t\tconst resolved = resolveResourcePath(state.cwd, p);\n\t\tif (!existsSync(resolved)) {\n\t\t\tdiagnostics.push({ type: \"warning\", message: \"theme path does not exist\", path: resolved });\n\t\t\tcontinue;\n\t\t}\n\n\t\ttry {\n\t\t\tconst stats = statSync(resolved);\n\t\t\tif (stats.isDirectory()) {\n\t\t\t\tloadThemesFromDir(resolved, themes, diagnostics);\n\t\t\t} else if (stats.isFile() && resolved.endsWith(\".json\")) {\n\t\t\t\tloadThemeFromFile(resolved, themes, diagnostics);\n\t\t\t} else {\n\t\t\t\tdiagnostics.push({ type: \"warning\", message: \"theme path is not a json file\", path: resolved });\n\t\t\t}\n\t\t} catch (error) {\n\t\t\tconst message = error instanceof Error ? error.message : \"failed to read theme path\";\n\t\t\tdiagnostics.push({ type: \"warning\", message, path: resolved });\n\t\t}\n\t}\n\n\treturn { themes, diagnostics };\n}\n\nfunction getProjectThemeDirs(cwd: string): string[] {\n\treturn getProjectConfigDirs(cwd).map((configDir) => join(configDir, \"themes\"));\n}\n\nfunction loadThemesFromDir(dir: string, themes: Theme[], diagnostics: ResourceDiagnostic[]): void {\n\tif (!existsSync(dir)) {\n\t\treturn;\n\t}\n\n\ttry {\n\t\tconst entries = readdirSync(dir, { withFileTypes: true });\n\t\tfor (const entry of entries) {\n\t\t\tlet isFile = entry.isFile();\n\t\t\tif (entry.isSymbolicLink()) {\n\t\t\t\ttry {\n\t\t\t\t\tisFile = statSync(join(dir, entry.name)).isFile();\n\t\t\t\t} catch {\n\t\t\t\t\tcontinue;\n\t\t\t\t}\n\t\t\t}\n\t\t\tif (!isFile) {\n\t\t\t\tcontinue;\n\t\t\t}\n\t\t\tif (!entry.name.endsWith(\".json\")) {\n\t\t\t\tcontinue;\n\t\t\t}\n\t\t\tloadThemeFromFile(join(dir, entry.name), themes, diagnostics);\n\t\t}\n\t} catch (error) {\n\t\tconst message = error instanceof Error ? error.message : \"failed to read theme directory\";\n\t\tdiagnostics.push({ type: \"warning\", message, path: dir });\n\t}\n}\n\nfunction loadThemeFromFile(filePath: string, themes: Theme[], diagnostics: ResourceDiagnostic[]): void {\n\ttry {\n\t\tthemes.push(loadThemeFromPath(filePath));\n\t} catch (error) {\n\t\tconst message = error instanceof Error ? error.message : \"failed to load theme\";\n\t\tdiagnostics.push({ type: \"warning\", message, path: filePath });\n\t}\n}\n\nfunction dedupePrompts(prompts: PromptTemplate[]): { prompts: PromptTemplate[]; diagnostics: ResourceDiagnostic[] } {\n\tconst seen = new Map<string, PromptTemplate>();\n\tconst diagnostics: ResourceDiagnostic[] = [];\n\n\tfor (const prompt of prompts) {\n\t\tconst existing = seen.get(prompt.name);\n\t\tif (existing) {\n\t\t\tdiagnostics.push({\n\t\t\t\ttype: \"collision\",\n\t\t\t\tmessage: `name \"/${prompt.name}\" collision`,\n\t\t\t\tpath: prompt.filePath,\n\t\t\t\tcollision: {\n\t\t\t\t\tresourceType: \"prompt\",\n\t\t\t\t\tname: prompt.name,\n\t\t\t\t\twinnerPath: existing.filePath,\n\t\t\t\t\tloserPath: prompt.filePath,\n\t\t\t\t},\n\t\t\t});\n\t\t} else {\n\t\t\tseen.set(prompt.name, prompt);\n\t\t}\n\t}\n\n\treturn { prompts: Array.from(seen.values()), diagnostics };\n}\n\nfunction dedupeThemes(themes: Theme[]): { themes: Theme[]; diagnostics: ResourceDiagnostic[] } {\n\tconst seen = new Map<string, Theme>();\n\tconst diagnostics: ResourceDiagnostic[] = [];\n\n\tfor (const t of themes) {\n\t\tconst name = t.name ?? \"unnamed\";\n\t\tconst existing = seen.get(name);\n\t\tif (existing) {\n\t\t\tdiagnostics.push({\n\t\t\t\ttype: \"collision\",\n\t\t\t\tmessage: `name \"${name}\" collision`,\n\t\t\t\tpath: t.sourcePath,\n\t\t\t\tcollision: {\n\t\t\t\t\tresourceType: \"theme\",\n\t\t\t\t\tname,\n\t\t\t\t\twinnerPath: existing.sourcePath ?? \"<builtin>\",\n\t\t\t\t\tloserPath: t.sourcePath ?? \"<builtin>\",\n\t\t\t\t},\n\t\t\t});\n\t\t} else {\n\t\t\tseen.set(name, t);\n\t\t}\n\t}\n\n\treturn { themes: Array.from(seen.values()), diagnostics };\n}\n"]}
|
|
1
|
+
{"version":3,"file":"resource-loader-assets.d.ts","sourceRoot":"","sources":["../../src/core/resource-loader-assets.ts"],"names":[],"mappings":"AAMA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,sBAAsB,CAAC;AAKzD,OAAO,KAAK,EAAE,qBAAqB,EAAE,MAAM,2BAA2B,CAAC;AA4BvE,wBAAsB,0BAA0B,CAC/C,MAAM,EAAE,qBAAqB,EAC7B,UAAU,EAAE,MAAM,EAAE,EACpB,cAAc,CAAC,EAAE,GAAG,CAAC,MAAM,EAAE,YAAY,CAAC,GACxC,OAAO,CAAC,IAAI,CAAC,CAMf;AAmBD,wBAAsB,2BAA2B,CAChD,MAAM,EAAE,qBAAqB,EAC7B,WAAW,EAAE,MAAM,EAAE,EACrB,cAAc,CAAC,EAAE,GAAG,CAAC,MAAM,EAAE,YAAY,CAAC,GACxC,OAAO,CAAC,IAAI,CAAC,CAMf;AAqBD,wBAAsB,0BAA0B,CAC/C,MAAM,EAAE,qBAAqB,EAC7B,UAAU,EAAE,MAAM,EAAE,EACpB,cAAc,CAAC,EAAE,GAAG,CAAC,MAAM,EAAE,YAAY,CAAC,GACxC,OAAO,CAAC,IAAI,CAAC,CAMf","sourcesContent":["import { access, readdir, readFile, stat } from \"node:fs/promises\";\nimport { join } from \"node:path\";\nimport { getProjectConfigDirs } from \"../config.ts\";\nimport { loadThemeFromContent, type Theme } from \"../modes/interactive/theme/theme.ts\";\nimport { yieldToEventLoopIfSlow } from \"../utils/event-loop.ts\";\nimport type { ResourceDiagnostic } from \"./diagnostics.ts\";\nimport type { PathMetadata } from \"./package-manager.ts\";\nimport type { PromptTemplate } from \"./prompt-templates.ts\";\nimport { loadPromptTemplatesAsync } from \"./prompt-templates-async.ts\";\nimport type { Skill } from \"./skills.ts\";\nimport { loadSkillsAsync } from \"./skills-async.ts\";\nimport type { DefaultResourceLoader } from \"./resource-loader-core.ts\";\nimport { resourceInternals } from \"./resource-loader-internals.ts\";\nimport { getLoaderAgentDirs, resolveResourcePath } from \"./resource-loader-paths.ts\";\nimport { findSourceInfoForPath, getDefaultSourceInfoForPath } from \"./resource-loader-source-info.ts\";\n\nconst RESOURCE_LOAD_YIELD_AFTER_MS = 8;\n\nasync function existsAsync(path: string): Promise<boolean> {\n\ttry { await access(path); return true; } catch { return false; }\n}\n\nfunction applySkillsResult(\n\tloader: DefaultResourceLoader,\n\tskillsResult: { skills: Skill[]; diagnostics: ResourceDiagnostic[] },\n\tmetadataByPath?: Map<string, PathMetadata>,\n): void {\n\tconst state = resourceInternals(loader);\n\tconst resolvedSkills = state.skillsOverride ? state.skillsOverride(skillsResult) : skillsResult;\n\tstate.skills = resolvedSkills.skills.map((skill) => ({\n\t\t...skill,\n\t\tsourceInfo:\n\t\t\tfindSourceInfoForPath(loader, skill.filePath, state.extensionSkillSourceInfos, metadataByPath) ??\n\t\t\tskill.sourceInfo ??\n\t\t\tgetDefaultSourceInfoForPath(loader, skill.filePath),\n\t}));\n\tstate.skillDiagnostics = resolvedSkills.diagnostics;\n}\n\nexport async function updateSkillsFromPathsAsync(\n\tloader: DefaultResourceLoader,\n\tskillPaths: string[],\n\tmetadataByPath?: Map<string, PathMetadata>,\n): Promise<void> {\n\tconst state = resourceInternals(loader);\n\tconst skillsResult = state.noSkills && skillPaths.length === 0\n\t\t? { skills: [], diagnostics: [] }\n\t\t: await loadSkillsAsync({ cwd: state.cwd, agentDir: state.agentDir, skillPaths, includeDefaults: false });\n\tapplySkillsResult(loader, skillsResult, metadataByPath);\n}\n\nfunction applyPromptsResult(\n\tloader: DefaultResourceLoader,\n\tpromptsResult: { prompts: PromptTemplate[]; diagnostics: ResourceDiagnostic[] },\n\tmetadataByPath?: Map<string, PathMetadata>,\n): void {\n\tconst state = resourceInternals(loader);\n\tconst resolvedPrompts = state.promptsOverride ? state.promptsOverride(promptsResult) : promptsResult;\n\tstate.prompts = resolvedPrompts.prompts.map((prompt) => ({\n\t\t...prompt,\n\t\tsourceInfo:\n\t\t\tfindSourceInfoForPath(loader, prompt.filePath, state.extensionPromptSourceInfos, metadataByPath) ??\n\t\t\tprompt.sourceInfo ??\n\t\t\tgetDefaultSourceInfoForPath(loader, prompt.filePath),\n\t}));\n\tstate.promptDiagnostics = resolvedPrompts.diagnostics;\n}\n\nexport async function updatePromptsFromPathsAsync(\n\tloader: DefaultResourceLoader,\n\tpromptPaths: string[],\n\tmetadataByPath?: Map<string, PathMetadata>,\n): Promise<void> {\n\tconst state = resourceInternals(loader);\n\tconst promptsResult = state.noPromptTemplates && promptPaths.length === 0\n\t\t? { prompts: [], diagnostics: [] }\n\t\t: dedupePrompts(await loadPromptTemplatesAsync({ cwd: state.cwd, agentDir: state.agentDir, promptPaths, includeDefaults: false }));\n\tapplyPromptsResult(loader, promptsResult, metadataByPath);\n}\n\nfunction applyThemesResult(\n\tloader: DefaultResourceLoader,\n\tthemesResult: { themes: Theme[]; diagnostics: ResourceDiagnostic[] },\n\tmetadataByPath?: Map<string, PathMetadata>,\n): void {\n\tconst state = resourceInternals(loader);\n\tconst resolvedThemes = state.themesOverride ? state.themesOverride(themesResult) : themesResult;\n\tstate.themes = resolvedThemes.themes.map((theme) => {\n\t\tconst sourcePath = theme.sourcePath;\n\t\ttheme.sourceInfo = sourcePath\n\t\t\t? (findSourceInfoForPath(loader, sourcePath, state.extensionThemeSourceInfos, metadataByPath) ??\n\t\t\t\ttheme.sourceInfo ??\n\t\t\t\tgetDefaultSourceInfoForPath(loader, sourcePath))\n\t\t\t: theme.sourceInfo;\n\t\treturn theme;\n\t});\n\tstate.themeDiagnostics = resolvedThemes.diagnostics;\n}\n\nexport async function updateThemesFromPathsAsync(\n\tloader: DefaultResourceLoader,\n\tthemePaths: string[],\n\tmetadataByPath?: Map<string, PathMetadata>,\n): Promise<void> {\n\tconst state = resourceInternals(loader);\n\tconst themesResult = state.noThemes && themePaths.length === 0\n\t\t? { themes: [], diagnostics: [] }\n\t\t: loadAndDedupeThemes(await loadThemesAsync(loader, themePaths, false));\n\tapplyThemesResult(loader, themesResult, metadataByPath);\n}\n\nfunction loadAndDedupeThemes(loaded: { themes: Theme[]; diagnostics: ResourceDiagnostic[] }): { themes: Theme[]; diagnostics: ResourceDiagnostic[] } {\n\tconst deduped = dedupeThemes(loaded.themes);\n\treturn { themes: deduped.themes, diagnostics: [...loaded.diagnostics, ...deduped.diagnostics] };\n}\n\n\nasync function loadThemesAsync(loader: DefaultResourceLoader, paths: string[], includeDefaults = true): Promise<{ themes: Theme[]; diagnostics: ResourceDiagnostic[] }> {\n\tconst state = resourceInternals(loader);\n\tconst themes: Theme[] = [];\n\tconst diagnostics: ResourceDiagnostic[] = [];\n\tif (includeDefaults) {\n\t\tfor (const dir of [...getLoaderAgentDirs(state.agentDir).map((agentDir) => join(agentDir, \"themes\")), ...getProjectThemeDirs(state.cwd)]) {\n\t\t\tawait loadThemesFromDirAsync(dir, themes, diagnostics);\n\t\t}\n\t}\n\tconst startedAt = Date.now();\n\tfor (const p of paths) {\n\t\tawait yieldToEventLoopIfSlow(startedAt, RESOURCE_LOAD_YIELD_AFTER_MS);\n\t\tconst resolved = resolveResourcePath(state.cwd, p);\n\t\tif (!(await existsAsync(resolved))) {\n\t\t\tdiagnostics.push({ type: \"warning\", message: \"theme path does not exist\", path: resolved });\n\t\t\tcontinue;\n\t\t}\n\t\ttry {\n\t\t\tconst stats = await stat(resolved);\n\t\t\tif (stats.isDirectory()) await loadThemesFromDirAsync(resolved, themes, diagnostics);\n\t\t\telse if (stats.isFile() && resolved.endsWith(\".json\")) await loadThemeFromFileAsync(resolved, themes, diagnostics);\n\t\t\telse diagnostics.push({ type: \"warning\", message: \"theme path is not a json file\", path: resolved });\n\t\t} catch (error) {\n\t\t\tconst message = error instanceof Error ? error.message : \"failed to read theme path\";\n\t\t\tdiagnostics.push({ type: \"warning\", message, path: resolved });\n\t\t}\n\t}\n\treturn { themes, diagnostics };\n}\n\nfunction getProjectThemeDirs(cwd: string): string[] {\n\treturn getProjectConfigDirs(cwd).map((configDir) => join(configDir, \"themes\"));\n}\n\n\nasync function loadThemesFromDirAsync(dir: string, themes: Theme[], diagnostics: ResourceDiagnostic[]): Promise<void> {\n\tif (!(await existsAsync(dir))) return;\n\tconst startedAt = Date.now();\n\ttry {\n\t\tconst entries = await readdir(dir, { withFileTypes: true });\n\t\tfor (const entry of entries) {\n\t\t\tawait yieldToEventLoopIfSlow(startedAt, RESOURCE_LOAD_YIELD_AFTER_MS);\n\t\t\tlet isFile = entry.isFile();\n\t\t\tif (entry.isSymbolicLink()) {\n\t\t\t\ttry { isFile = (await stat(join(dir, entry.name))).isFile(); } catch { continue; }\n\t\t\t}\n\t\t\tif (isFile && entry.name.endsWith(\".json\")) await loadThemeFromFileAsync(join(dir, entry.name), themes, diagnostics);\n\t\t}\n\t} catch (error) {\n\t\tconst message = error instanceof Error ? error.message : \"failed to read theme directory\";\n\t\tdiagnostics.push({ type: \"warning\", message, path: dir });\n\t}\n}\n\n\nasync function loadThemeFromFileAsync(filePath: string, themes: Theme[], diagnostics: ResourceDiagnostic[]): Promise<void> {\n\ttry { themes.push(loadThemeFromContent(filePath, await readFile(filePath, \"utf-8\"))); }\n\tcatch (error) {\n\t\tconst message = error instanceof Error ? error.message : \"failed to load theme\";\n\t\tdiagnostics.push({ type: \"warning\", message, path: filePath });\n\t}\n}\n\nfunction dedupePrompts(prompts: PromptTemplate[]): { prompts: PromptTemplate[]; diagnostics: ResourceDiagnostic[] } {\n\tconst seen = new Map<string, PromptTemplate>();\n\tconst diagnostics: ResourceDiagnostic[] = [];\n\tfor (const prompt of prompts) {\n\t\tconst existing = seen.get(prompt.name);\n\t\tif (existing) {\n\t\t\tdiagnostics.push({\n\t\t\t\ttype: \"collision\",\n\t\t\t\tmessage: `name \"/${prompt.name}\" collision`,\n\t\t\t\tpath: prompt.filePath,\n\t\t\t\tcollision: { resourceType: \"prompt\", name: prompt.name, winnerPath: existing.filePath, loserPath: prompt.filePath },\n\t\t\t});\n\t\t} else {\n\t\t\tseen.set(prompt.name, prompt);\n\t\t}\n\t}\n\treturn { prompts: Array.from(seen.values()), diagnostics };\n}\n\nfunction dedupeThemes(themes: Theme[]): { themes: Theme[]; diagnostics: ResourceDiagnostic[] } {\n\tconst seen = new Map<string, Theme>();\n\tconst diagnostics: ResourceDiagnostic[] = [];\n\tfor (const t of themes) {\n\t\tconst name = t.name ?? \"unnamed\";\n\t\tconst existing = seen.get(name);\n\t\tif (existing) {\n\t\t\tdiagnostics.push({\n\t\t\t\ttype: \"collision\",\n\t\t\t\tmessage: `name \"${name}\" collision`,\n\t\t\t\tpath: t.sourcePath,\n\t\t\t\tcollision: { resourceType: \"theme\", name, winnerPath: existing.sourcePath ?? \"<builtin>\", loserPath: t.sourcePath ?? \"<builtin>\" },\n\t\t\t});\n\t\t} else {\n\t\t\tseen.set(name, t);\n\t\t}\n\t}\n\treturn { themes: Array.from(seen.values()), diagnostics };\n}\n"]}
|
|
@@ -1,26 +1,25 @@
|
|
|
1
|
-
import {
|
|
1
|
+
import { access, readdir, readFile, stat } from "node:fs/promises";
|
|
2
2
|
import { join } from "node:path";
|
|
3
3
|
import { getProjectConfigDirs } from "../config.js";
|
|
4
|
-
import {
|
|
5
|
-
import {
|
|
6
|
-
import {
|
|
4
|
+
import { loadThemeFromContent } from "../modes/interactive/theme/theme.js";
|
|
5
|
+
import { yieldToEventLoopIfSlow } from "../utils/event-loop.js";
|
|
6
|
+
import { loadPromptTemplatesAsync } from "./prompt-templates-async.js";
|
|
7
|
+
import { loadSkillsAsync } from "./skills-async.js";
|
|
7
8
|
import { resourceInternals } from "./resource-loader-internals.js";
|
|
8
9
|
import { getLoaderAgentDirs, resolveResourcePath } from "./resource-loader-paths.js";
|
|
9
10
|
import { findSourceInfoForPath, getDefaultSourceInfoForPath } from "./resource-loader-source-info.js";
|
|
10
|
-
|
|
11
|
-
|
|
12
|
-
|
|
13
|
-
|
|
14
|
-
|
|
11
|
+
const RESOURCE_LOAD_YIELD_AFTER_MS = 8;
|
|
12
|
+
async function existsAsync(path) {
|
|
13
|
+
try {
|
|
14
|
+
await access(path);
|
|
15
|
+
return true;
|
|
15
16
|
}
|
|
16
|
-
|
|
17
|
-
|
|
18
|
-
cwd: state.cwd,
|
|
19
|
-
agentDir: state.agentDir,
|
|
20
|
-
skillPaths,
|
|
21
|
-
includeDefaults: false,
|
|
22
|
-
});
|
|
17
|
+
catch {
|
|
18
|
+
return false;
|
|
23
19
|
}
|
|
20
|
+
}
|
|
21
|
+
function applySkillsResult(loader, skillsResult, metadataByPath) {
|
|
22
|
+
const state = resourceInternals(loader);
|
|
24
23
|
const resolvedSkills = state.skillsOverride ? state.skillsOverride(skillsResult) : skillsResult;
|
|
25
24
|
state.skills = resolvedSkills.skills.map((skill) => ({
|
|
26
25
|
...skill,
|
|
@@ -30,21 +29,15 @@ export function updateSkillsFromPaths(loader, skillPaths, metadataByPath) {
|
|
|
30
29
|
}));
|
|
31
30
|
state.skillDiagnostics = resolvedSkills.diagnostics;
|
|
32
31
|
}
|
|
33
|
-
export function
|
|
32
|
+
export async function updateSkillsFromPathsAsync(loader, skillPaths, metadataByPath) {
|
|
33
|
+
const state = resourceInternals(loader);
|
|
34
|
+
const skillsResult = state.noSkills && skillPaths.length === 0
|
|
35
|
+
? { skills: [], diagnostics: [] }
|
|
36
|
+
: await loadSkillsAsync({ cwd: state.cwd, agentDir: state.agentDir, skillPaths, includeDefaults: false });
|
|
37
|
+
applySkillsResult(loader, skillsResult, metadataByPath);
|
|
38
|
+
}
|
|
39
|
+
function applyPromptsResult(loader, promptsResult, metadataByPath) {
|
|
34
40
|
const state = resourceInternals(loader);
|
|
35
|
-
let promptsResult;
|
|
36
|
-
if (state.noPromptTemplates && promptPaths.length === 0) {
|
|
37
|
-
promptsResult = { prompts: [], diagnostics: [] };
|
|
38
|
-
}
|
|
39
|
-
else {
|
|
40
|
-
const allPrompts = loadPromptTemplates({
|
|
41
|
-
cwd: state.cwd,
|
|
42
|
-
agentDir: state.agentDir,
|
|
43
|
-
promptPaths,
|
|
44
|
-
includeDefaults: false,
|
|
45
|
-
});
|
|
46
|
-
promptsResult = dedupePrompts(allPrompts);
|
|
47
|
-
}
|
|
48
41
|
const resolvedPrompts = state.promptsOverride ? state.promptsOverride(promptsResult) : promptsResult;
|
|
49
42
|
state.prompts = resolvedPrompts.prompts.map((prompt) => ({
|
|
50
43
|
...prompt,
|
|
@@ -54,17 +47,15 @@ export function updatePromptsFromPaths(loader, promptPaths, metadataByPath) {
|
|
|
54
47
|
}));
|
|
55
48
|
state.promptDiagnostics = resolvedPrompts.diagnostics;
|
|
56
49
|
}
|
|
57
|
-
export function
|
|
50
|
+
export async function updatePromptsFromPathsAsync(loader, promptPaths, metadataByPath) {
|
|
51
|
+
const state = resourceInternals(loader);
|
|
52
|
+
const promptsResult = state.noPromptTemplates && promptPaths.length === 0
|
|
53
|
+
? { prompts: [], diagnostics: [] }
|
|
54
|
+
: dedupePrompts(await loadPromptTemplatesAsync({ cwd: state.cwd, agentDir: state.agentDir, promptPaths, includeDefaults: false }));
|
|
55
|
+
applyPromptsResult(loader, promptsResult, metadataByPath);
|
|
56
|
+
}
|
|
57
|
+
function applyThemesResult(loader, themesResult, metadataByPath) {
|
|
58
58
|
const state = resourceInternals(loader);
|
|
59
|
-
let themesResult;
|
|
60
|
-
if (state.noThemes && themePaths.length === 0) {
|
|
61
|
-
themesResult = { themes: [], diagnostics: [] };
|
|
62
|
-
}
|
|
63
|
-
else {
|
|
64
|
-
const loaded = loadThemes(loader, themePaths, false);
|
|
65
|
-
const deduped = dedupeThemes(loaded.themes);
|
|
66
|
-
themesResult = { themes: deduped.themes, diagnostics: [...loaded.diagnostics, ...deduped.diagnostics] };
|
|
67
|
-
}
|
|
68
59
|
const resolvedThemes = state.themesOverride ? state.themesOverride(themesResult) : themesResult;
|
|
69
60
|
state.themes = resolvedThemes.themes.map((theme) => {
|
|
70
61
|
const sourcePath = theme.sourcePath;
|
|
@@ -77,36 +68,42 @@ export function updateThemesFromPaths(loader, themePaths, metadataByPath) {
|
|
|
77
68
|
});
|
|
78
69
|
state.themeDiagnostics = resolvedThemes.diagnostics;
|
|
79
70
|
}
|
|
80
|
-
function
|
|
71
|
+
export async function updateThemesFromPathsAsync(loader, themePaths, metadataByPath) {
|
|
72
|
+
const state = resourceInternals(loader);
|
|
73
|
+
const themesResult = state.noThemes && themePaths.length === 0
|
|
74
|
+
? { themes: [], diagnostics: [] }
|
|
75
|
+
: loadAndDedupeThemes(await loadThemesAsync(loader, themePaths, false));
|
|
76
|
+
applyThemesResult(loader, themesResult, metadataByPath);
|
|
77
|
+
}
|
|
78
|
+
function loadAndDedupeThemes(loaded) {
|
|
79
|
+
const deduped = dedupeThemes(loaded.themes);
|
|
80
|
+
return { themes: deduped.themes, diagnostics: [...loaded.diagnostics, ...deduped.diagnostics] };
|
|
81
|
+
}
|
|
82
|
+
async function loadThemesAsync(loader, paths, includeDefaults = true) {
|
|
81
83
|
const state = resourceInternals(loader);
|
|
82
84
|
const themes = [];
|
|
83
85
|
const diagnostics = [];
|
|
84
86
|
if (includeDefaults) {
|
|
85
|
-
const
|
|
86
|
-
|
|
87
|
-
...getProjectThemeDirs(state.cwd),
|
|
88
|
-
];
|
|
89
|
-
for (const dir of defaultDirs) {
|
|
90
|
-
loadThemesFromDir(dir, themes, diagnostics);
|
|
87
|
+
for (const dir of [...getLoaderAgentDirs(state.agentDir).map((agentDir) => join(agentDir, "themes")), ...getProjectThemeDirs(state.cwd)]) {
|
|
88
|
+
await loadThemesFromDirAsync(dir, themes, diagnostics);
|
|
91
89
|
}
|
|
92
90
|
}
|
|
91
|
+
const startedAt = Date.now();
|
|
93
92
|
for (const p of paths) {
|
|
93
|
+
await yieldToEventLoopIfSlow(startedAt, RESOURCE_LOAD_YIELD_AFTER_MS);
|
|
94
94
|
const resolved = resolveResourcePath(state.cwd, p);
|
|
95
|
-
if (!
|
|
95
|
+
if (!(await existsAsync(resolved))) {
|
|
96
96
|
diagnostics.push({ type: "warning", message: "theme path does not exist", path: resolved });
|
|
97
97
|
continue;
|
|
98
98
|
}
|
|
99
99
|
try {
|
|
100
|
-
const stats =
|
|
101
|
-
if (stats.isDirectory())
|
|
102
|
-
|
|
103
|
-
|
|
104
|
-
|
|
105
|
-
|
|
106
|
-
}
|
|
107
|
-
else {
|
|
100
|
+
const stats = await stat(resolved);
|
|
101
|
+
if (stats.isDirectory())
|
|
102
|
+
await loadThemesFromDirAsync(resolved, themes, diagnostics);
|
|
103
|
+
else if (stats.isFile() && resolved.endsWith(".json"))
|
|
104
|
+
await loadThemeFromFileAsync(resolved, themes, diagnostics);
|
|
105
|
+
else
|
|
108
106
|
diagnostics.push({ type: "warning", message: "theme path is not a json file", path: resolved });
|
|
109
|
-
}
|
|
110
107
|
}
|
|
111
108
|
catch (error) {
|
|
112
109
|
const message = error instanceof Error ? error.message : "failed to read theme path";
|
|
@@ -118,29 +115,25 @@ function loadThemes(loader, paths, includeDefaults = true) {
|
|
|
118
115
|
function getProjectThemeDirs(cwd) {
|
|
119
116
|
return getProjectConfigDirs(cwd).map((configDir) => join(configDir, "themes"));
|
|
120
117
|
}
|
|
121
|
-
function
|
|
122
|
-
if (!
|
|
118
|
+
async function loadThemesFromDirAsync(dir, themes, diagnostics) {
|
|
119
|
+
if (!(await existsAsync(dir)))
|
|
123
120
|
return;
|
|
124
|
-
|
|
121
|
+
const startedAt = Date.now();
|
|
125
122
|
try {
|
|
126
|
-
const entries =
|
|
123
|
+
const entries = await readdir(dir, { withFileTypes: true });
|
|
127
124
|
for (const entry of entries) {
|
|
125
|
+
await yieldToEventLoopIfSlow(startedAt, RESOURCE_LOAD_YIELD_AFTER_MS);
|
|
128
126
|
let isFile = entry.isFile();
|
|
129
127
|
if (entry.isSymbolicLink()) {
|
|
130
128
|
try {
|
|
131
|
-
isFile =
|
|
129
|
+
isFile = (await stat(join(dir, entry.name))).isFile();
|
|
132
130
|
}
|
|
133
131
|
catch {
|
|
134
132
|
continue;
|
|
135
133
|
}
|
|
136
134
|
}
|
|
137
|
-
if (
|
|
138
|
-
|
|
139
|
-
}
|
|
140
|
-
if (!entry.name.endsWith(".json")) {
|
|
141
|
-
continue;
|
|
142
|
-
}
|
|
143
|
-
loadThemeFromFile(join(dir, entry.name), themes, diagnostics);
|
|
135
|
+
if (isFile && entry.name.endsWith(".json"))
|
|
136
|
+
await loadThemeFromFileAsync(join(dir, entry.name), themes, diagnostics);
|
|
144
137
|
}
|
|
145
138
|
}
|
|
146
139
|
catch (error) {
|
|
@@ -148,9 +141,9 @@ function loadThemesFromDir(dir, themes, diagnostics) {
|
|
|
148
141
|
diagnostics.push({ type: "warning", message, path: dir });
|
|
149
142
|
}
|
|
150
143
|
}
|
|
151
|
-
function
|
|
144
|
+
async function loadThemeFromFileAsync(filePath, themes, diagnostics) {
|
|
152
145
|
try {
|
|
153
|
-
themes.push(
|
|
146
|
+
themes.push(loadThemeFromContent(filePath, await readFile(filePath, "utf-8")));
|
|
154
147
|
}
|
|
155
148
|
catch (error) {
|
|
156
149
|
const message = error instanceof Error ? error.message : "failed to load theme";
|
|
@@ -167,12 +160,7 @@ function dedupePrompts(prompts) {
|
|
|
167
160
|
type: "collision",
|
|
168
161
|
message: `name "/${prompt.name}" collision`,
|
|
169
162
|
path: prompt.filePath,
|
|
170
|
-
collision: {
|
|
171
|
-
resourceType: "prompt",
|
|
172
|
-
name: prompt.name,
|
|
173
|
-
winnerPath: existing.filePath,
|
|
174
|
-
loserPath: prompt.filePath,
|
|
175
|
-
},
|
|
163
|
+
collision: { resourceType: "prompt", name: prompt.name, winnerPath: existing.filePath, loserPath: prompt.filePath },
|
|
176
164
|
});
|
|
177
165
|
}
|
|
178
166
|
else {
|
|
@@ -192,12 +180,7 @@ function dedupeThemes(themes) {
|
|
|
192
180
|
type: "collision",
|
|
193
181
|
message: `name "${name}" collision`,
|
|
194
182
|
path: t.sourcePath,
|
|
195
|
-
collision: {
|
|
196
|
-
resourceType: "theme",
|
|
197
|
-
name,
|
|
198
|
-
winnerPath: existing.sourcePath ?? "<builtin>",
|
|
199
|
-
loserPath: t.sourcePath ?? "<builtin>",
|
|
200
|
-
},
|
|
183
|
+
collision: { resourceType: "theme", name, winnerPath: existing.sourcePath ?? "<builtin>", loserPath: t.sourcePath ?? "<builtin>" },
|
|
201
184
|
});
|
|
202
185
|
}
|
|
203
186
|
else {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"resource-loader-assets.js","sourceRoot":"","sources":["../../src/core/resource-loader-assets.ts"],"names":[],"mappings":"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","sourcesContent":["import { existsSync, readdirSync, statSync } from \"node:fs\";\nimport { join } from \"node:path\";\nimport { getProjectConfigDirs } from \"../config.ts\";\nimport { loadThemeFromPath, type Theme } from \"../modes/interactive/theme/theme.ts\";\nimport type { ResourceDiagnostic } from \"./diagnostics.ts\";\nimport type { PathMetadata } from \"./package-manager.ts\";\nimport type { PromptTemplate } from \"./prompt-templates.ts\";\nimport { loadPromptTemplates } from \"./prompt-templates.ts\";\nimport type { Skill } from \"./skills.ts\";\nimport { loadSkills } from \"./skills.ts\";\nimport { resourceInternals } from \"./resource-loader-internals.ts\";\nimport { getLoaderAgentDirs, resolveResourcePath } from \"./resource-loader-paths.ts\";\nimport type { DefaultResourceLoader } from \"./resource-loader-core.ts\";\nimport { findSourceInfoForPath, getDefaultSourceInfoForPath } from \"./resource-loader-source-info.ts\";\n\nexport function updateSkillsFromPaths(\n\tloader: DefaultResourceLoader,\n\tskillPaths: string[],\n\tmetadataByPath?: Map<string, PathMetadata>,\n): void {\n\tconst state = resourceInternals(loader);\n\tlet skillsResult: { skills: Skill[]; diagnostics: ResourceDiagnostic[] };\n\tif (state.noSkills && skillPaths.length === 0) {\n\t\tskillsResult = { skills: [], diagnostics: [] };\n\t} else {\n\t\tskillsResult = loadSkills({\n\t\t\tcwd: state.cwd,\n\t\t\tagentDir: state.agentDir,\n\t\t\tskillPaths,\n\t\t\tincludeDefaults: false,\n\t\t});\n\t}\n\tconst resolvedSkills = state.skillsOverride ? state.skillsOverride(skillsResult) : skillsResult;\n\tstate.skills = resolvedSkills.skills.map((skill) => ({\n\t\t...skill,\n\t\tsourceInfo:\n\t\t\tfindSourceInfoForPath(loader, skill.filePath, state.extensionSkillSourceInfos, metadataByPath) ??\n\t\t\tskill.sourceInfo ??\n\t\t\tgetDefaultSourceInfoForPath(loader, skill.filePath),\n\t}));\n\tstate.skillDiagnostics = resolvedSkills.diagnostics;\n}\n\nexport function updatePromptsFromPaths(\n\tloader: DefaultResourceLoader,\n\tpromptPaths: string[],\n\tmetadataByPath?: Map<string, PathMetadata>,\n): void {\n\tconst state = resourceInternals(loader);\n\tlet promptsResult: { prompts: PromptTemplate[]; diagnostics: ResourceDiagnostic[] };\n\tif (state.noPromptTemplates && promptPaths.length === 0) {\n\t\tpromptsResult = { prompts: [], diagnostics: [] };\n\t} else {\n\t\tconst allPrompts = loadPromptTemplates({\n\t\t\tcwd: state.cwd,\n\t\t\tagentDir: state.agentDir,\n\t\t\tpromptPaths,\n\t\t\tincludeDefaults: false,\n\t\t});\n\t\tpromptsResult = dedupePrompts(allPrompts);\n\t}\n\tconst resolvedPrompts = state.promptsOverride ? state.promptsOverride(promptsResult) : promptsResult;\n\tstate.prompts = resolvedPrompts.prompts.map((prompt) => ({\n\t\t...prompt,\n\t\tsourceInfo:\n\t\t\tfindSourceInfoForPath(loader, prompt.filePath, state.extensionPromptSourceInfos, metadataByPath) ??\n\t\t\tprompt.sourceInfo ??\n\t\t\tgetDefaultSourceInfoForPath(loader, prompt.filePath),\n\t}));\n\tstate.promptDiagnostics = resolvedPrompts.diagnostics;\n}\n\nexport function updateThemesFromPaths(\n\tloader: DefaultResourceLoader,\n\tthemePaths: string[],\n\tmetadataByPath?: Map<string, PathMetadata>,\n): void {\n\tconst state = resourceInternals(loader);\n\tlet themesResult: { themes: Theme[]; diagnostics: ResourceDiagnostic[] };\n\tif (state.noThemes && themePaths.length === 0) {\n\t\tthemesResult = { themes: [], diagnostics: [] };\n\t} else {\n\t\tconst loaded = loadThemes(loader, themePaths, false);\n\t\tconst deduped = dedupeThemes(loaded.themes);\n\t\tthemesResult = { themes: deduped.themes, diagnostics: [...loaded.diagnostics, ...deduped.diagnostics] };\n\t}\n\tconst resolvedThemes = state.themesOverride ? state.themesOverride(themesResult) : themesResult;\n\tstate.themes = resolvedThemes.themes.map((theme) => {\n\t\tconst sourcePath = theme.sourcePath;\n\t\ttheme.sourceInfo = sourcePath\n\t\t\t? (findSourceInfoForPath(loader, sourcePath, state.extensionThemeSourceInfos, metadataByPath) ??\n\t\t\t\ttheme.sourceInfo ??\n\t\t\t\tgetDefaultSourceInfoForPath(loader, sourcePath))\n\t\t\t: theme.sourceInfo;\n\t\treturn theme;\n\t});\n\tstate.themeDiagnostics = resolvedThemes.diagnostics;\n}\n\nfunction loadThemes(\n\tloader: DefaultResourceLoader,\n\tpaths: string[],\n\tincludeDefaults = true,\n): {\n\tthemes: Theme[];\n\tdiagnostics: ResourceDiagnostic[];\n} {\n\tconst state = resourceInternals(loader);\n\tconst themes: Theme[] = [];\n\tconst diagnostics: ResourceDiagnostic[] = [];\n\tif (includeDefaults) {\n\t\tconst defaultDirs = [\n\t\t\t...getLoaderAgentDirs(state.agentDir).map((agentDir) => join(agentDir, \"themes\")),\n\t\t\t...getProjectThemeDirs(state.cwd),\n\t\t];\n\n\t\tfor (const dir of defaultDirs) {\n\t\t\tloadThemesFromDir(dir, themes, diagnostics);\n\t\t}\n\t}\n\n\tfor (const p of paths) {\n\t\tconst resolved = resolveResourcePath(state.cwd, p);\n\t\tif (!existsSync(resolved)) {\n\t\t\tdiagnostics.push({ type: \"warning\", message: \"theme path does not exist\", path: resolved });\n\t\t\tcontinue;\n\t\t}\n\n\t\ttry {\n\t\t\tconst stats = statSync(resolved);\n\t\t\tif (stats.isDirectory()) {\n\t\t\t\tloadThemesFromDir(resolved, themes, diagnostics);\n\t\t\t} else if (stats.isFile() && resolved.endsWith(\".json\")) {\n\t\t\t\tloadThemeFromFile(resolved, themes, diagnostics);\n\t\t\t} else {\n\t\t\t\tdiagnostics.push({ type: \"warning\", message: \"theme path is not a json file\", path: resolved });\n\t\t\t}\n\t\t} catch (error) {\n\t\t\tconst message = error instanceof Error ? error.message : \"failed to read theme path\";\n\t\t\tdiagnostics.push({ type: \"warning\", message, path: resolved });\n\t\t}\n\t}\n\n\treturn { themes, diagnostics };\n}\n\nfunction getProjectThemeDirs(cwd: string): string[] {\n\treturn getProjectConfigDirs(cwd).map((configDir) => join(configDir, \"themes\"));\n}\n\nfunction loadThemesFromDir(dir: string, themes: Theme[], diagnostics: ResourceDiagnostic[]): void {\n\tif (!existsSync(dir)) {\n\t\treturn;\n\t}\n\n\ttry {\n\t\tconst entries = readdirSync(dir, { withFileTypes: true });\n\t\tfor (const entry of entries) {\n\t\t\tlet isFile = entry.isFile();\n\t\t\tif (entry.isSymbolicLink()) {\n\t\t\t\ttry {\n\t\t\t\t\tisFile = statSync(join(dir, entry.name)).isFile();\n\t\t\t\t} catch {\n\t\t\t\t\tcontinue;\n\t\t\t\t}\n\t\t\t}\n\t\t\tif (!isFile) {\n\t\t\t\tcontinue;\n\t\t\t}\n\t\t\tif (!entry.name.endsWith(\".json\")) {\n\t\t\t\tcontinue;\n\t\t\t}\n\t\t\tloadThemeFromFile(join(dir, entry.name), themes, diagnostics);\n\t\t}\n\t} catch (error) {\n\t\tconst message = error instanceof Error ? error.message : \"failed to read theme directory\";\n\t\tdiagnostics.push({ type: \"warning\", message, path: dir });\n\t}\n}\n\nfunction loadThemeFromFile(filePath: string, themes: Theme[], diagnostics: ResourceDiagnostic[]): void {\n\ttry {\n\t\tthemes.push(loadThemeFromPath(filePath));\n\t} catch (error) {\n\t\tconst message = error instanceof Error ? error.message : \"failed to load theme\";\n\t\tdiagnostics.push({ type: \"warning\", message, path: filePath });\n\t}\n}\n\nfunction dedupePrompts(prompts: PromptTemplate[]): { prompts: PromptTemplate[]; diagnostics: ResourceDiagnostic[] } {\n\tconst seen = new Map<string, PromptTemplate>();\n\tconst diagnostics: ResourceDiagnostic[] = [];\n\n\tfor (const prompt of prompts) {\n\t\tconst existing = seen.get(prompt.name);\n\t\tif (existing) {\n\t\t\tdiagnostics.push({\n\t\t\t\ttype: \"collision\",\n\t\t\t\tmessage: `name \"/${prompt.name}\" collision`,\n\t\t\t\tpath: prompt.filePath,\n\t\t\t\tcollision: {\n\t\t\t\t\tresourceType: \"prompt\",\n\t\t\t\t\tname: prompt.name,\n\t\t\t\t\twinnerPath: existing.filePath,\n\t\t\t\t\tloserPath: prompt.filePath,\n\t\t\t\t},\n\t\t\t});\n\t\t} else {\n\t\t\tseen.set(prompt.name, prompt);\n\t\t}\n\t}\n\n\treturn { prompts: Array.from(seen.values()), diagnostics };\n}\n\nfunction dedupeThemes(themes: Theme[]): { themes: Theme[]; diagnostics: ResourceDiagnostic[] } {\n\tconst seen = new Map<string, Theme>();\n\tconst diagnostics: ResourceDiagnostic[] = [];\n\n\tfor (const t of themes) {\n\t\tconst name = t.name ?? \"unnamed\";\n\t\tconst existing = seen.get(name);\n\t\tif (existing) {\n\t\t\tdiagnostics.push({\n\t\t\t\ttype: \"collision\",\n\t\t\t\tmessage: `name \"${name}\" collision`,\n\t\t\t\tpath: t.sourcePath,\n\t\t\t\tcollision: {\n\t\t\t\t\tresourceType: \"theme\",\n\t\t\t\t\tname,\n\t\t\t\t\twinnerPath: existing.sourcePath ?? \"<builtin>\",\n\t\t\t\t\tloserPath: t.sourcePath ?? \"<builtin>\",\n\t\t\t\t},\n\t\t\t});\n\t\t} else {\n\t\t\tseen.set(name, t);\n\t\t}\n\t}\n\n\treturn { themes: Array.from(seen.values()), diagnostics };\n}\n"]}
|
|
1
|
+
{"version":3,"file":"resource-loader-assets.js","sourceRoot":"","sources":["../../src/core/resource-loader-assets.ts"],"names":[],"mappings":"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","sourcesContent":["import { access, readdir, readFile, stat } from \"node:fs/promises\";\nimport { join } from \"node:path\";\nimport { getProjectConfigDirs } from \"../config.ts\";\nimport { loadThemeFromContent, type Theme } from \"../modes/interactive/theme/theme.ts\";\nimport { yieldToEventLoopIfSlow } from \"../utils/event-loop.ts\";\nimport type { ResourceDiagnostic } from \"./diagnostics.ts\";\nimport type { PathMetadata } from \"./package-manager.ts\";\nimport type { PromptTemplate } from \"./prompt-templates.ts\";\nimport { loadPromptTemplatesAsync } from \"./prompt-templates-async.ts\";\nimport type { Skill } from \"./skills.ts\";\nimport { loadSkillsAsync } from \"./skills-async.ts\";\nimport type { DefaultResourceLoader } from \"./resource-loader-core.ts\";\nimport { resourceInternals } from \"./resource-loader-internals.ts\";\nimport { getLoaderAgentDirs, resolveResourcePath } from \"./resource-loader-paths.ts\";\nimport { findSourceInfoForPath, getDefaultSourceInfoForPath } from \"./resource-loader-source-info.ts\";\n\nconst RESOURCE_LOAD_YIELD_AFTER_MS = 8;\n\nasync function existsAsync(path: string): Promise<boolean> {\n\ttry { await access(path); return true; } catch { return false; }\n}\n\nfunction applySkillsResult(\n\tloader: DefaultResourceLoader,\n\tskillsResult: { skills: Skill[]; diagnostics: ResourceDiagnostic[] },\n\tmetadataByPath?: Map<string, PathMetadata>,\n): void {\n\tconst state = resourceInternals(loader);\n\tconst resolvedSkills = state.skillsOverride ? state.skillsOverride(skillsResult) : skillsResult;\n\tstate.skills = resolvedSkills.skills.map((skill) => ({\n\t\t...skill,\n\t\tsourceInfo:\n\t\t\tfindSourceInfoForPath(loader, skill.filePath, state.extensionSkillSourceInfos, metadataByPath) ??\n\t\t\tskill.sourceInfo ??\n\t\t\tgetDefaultSourceInfoForPath(loader, skill.filePath),\n\t}));\n\tstate.skillDiagnostics = resolvedSkills.diagnostics;\n}\n\nexport async function updateSkillsFromPathsAsync(\n\tloader: DefaultResourceLoader,\n\tskillPaths: string[],\n\tmetadataByPath?: Map<string, PathMetadata>,\n): Promise<void> {\n\tconst state = resourceInternals(loader);\n\tconst skillsResult = state.noSkills && skillPaths.length === 0\n\t\t? { skills: [], diagnostics: [] }\n\t\t: await loadSkillsAsync({ cwd: state.cwd, agentDir: state.agentDir, skillPaths, includeDefaults: false });\n\tapplySkillsResult(loader, skillsResult, metadataByPath);\n}\n\nfunction applyPromptsResult(\n\tloader: DefaultResourceLoader,\n\tpromptsResult: { prompts: PromptTemplate[]; diagnostics: ResourceDiagnostic[] },\n\tmetadataByPath?: Map<string, PathMetadata>,\n): void {\n\tconst state = resourceInternals(loader);\n\tconst resolvedPrompts = state.promptsOverride ? state.promptsOverride(promptsResult) : promptsResult;\n\tstate.prompts = resolvedPrompts.prompts.map((prompt) => ({\n\t\t...prompt,\n\t\tsourceInfo:\n\t\t\tfindSourceInfoForPath(loader, prompt.filePath, state.extensionPromptSourceInfos, metadataByPath) ??\n\t\t\tprompt.sourceInfo ??\n\t\t\tgetDefaultSourceInfoForPath(loader, prompt.filePath),\n\t}));\n\tstate.promptDiagnostics = resolvedPrompts.diagnostics;\n}\n\nexport async function updatePromptsFromPathsAsync(\n\tloader: DefaultResourceLoader,\n\tpromptPaths: string[],\n\tmetadataByPath?: Map<string, PathMetadata>,\n): Promise<void> {\n\tconst state = resourceInternals(loader);\n\tconst promptsResult = state.noPromptTemplates && promptPaths.length === 0\n\t\t? { prompts: [], diagnostics: [] }\n\t\t: dedupePrompts(await loadPromptTemplatesAsync({ cwd: state.cwd, agentDir: state.agentDir, promptPaths, includeDefaults: false }));\n\tapplyPromptsResult(loader, promptsResult, metadataByPath);\n}\n\nfunction applyThemesResult(\n\tloader: DefaultResourceLoader,\n\tthemesResult: { themes: Theme[]; diagnostics: ResourceDiagnostic[] },\n\tmetadataByPath?: Map<string, PathMetadata>,\n): void {\n\tconst state = resourceInternals(loader);\n\tconst resolvedThemes = state.themesOverride ? state.themesOverride(themesResult) : themesResult;\n\tstate.themes = resolvedThemes.themes.map((theme) => {\n\t\tconst sourcePath = theme.sourcePath;\n\t\ttheme.sourceInfo = sourcePath\n\t\t\t? (findSourceInfoForPath(loader, sourcePath, state.extensionThemeSourceInfos, metadataByPath) ??\n\t\t\t\ttheme.sourceInfo ??\n\t\t\t\tgetDefaultSourceInfoForPath(loader, sourcePath))\n\t\t\t: theme.sourceInfo;\n\t\treturn theme;\n\t});\n\tstate.themeDiagnostics = resolvedThemes.diagnostics;\n}\n\nexport async function updateThemesFromPathsAsync(\n\tloader: DefaultResourceLoader,\n\tthemePaths: string[],\n\tmetadataByPath?: Map<string, PathMetadata>,\n): Promise<void> {\n\tconst state = resourceInternals(loader);\n\tconst themesResult = state.noThemes && themePaths.length === 0\n\t\t? { themes: [], diagnostics: [] }\n\t\t: loadAndDedupeThemes(await loadThemesAsync(loader, themePaths, false));\n\tapplyThemesResult(loader, themesResult, metadataByPath);\n}\n\nfunction loadAndDedupeThemes(loaded: { themes: Theme[]; diagnostics: ResourceDiagnostic[] }): { themes: Theme[]; diagnostics: ResourceDiagnostic[] } {\n\tconst deduped = dedupeThemes(loaded.themes);\n\treturn { themes: deduped.themes, diagnostics: [...loaded.diagnostics, ...deduped.diagnostics] };\n}\n\n\nasync function loadThemesAsync(loader: DefaultResourceLoader, paths: string[], includeDefaults = true): Promise<{ themes: Theme[]; diagnostics: ResourceDiagnostic[] }> {\n\tconst state = resourceInternals(loader);\n\tconst themes: Theme[] = [];\n\tconst diagnostics: ResourceDiagnostic[] = [];\n\tif (includeDefaults) {\n\t\tfor (const dir of [...getLoaderAgentDirs(state.agentDir).map((agentDir) => join(agentDir, \"themes\")), ...getProjectThemeDirs(state.cwd)]) {\n\t\t\tawait loadThemesFromDirAsync(dir, themes, diagnostics);\n\t\t}\n\t}\n\tconst startedAt = Date.now();\n\tfor (const p of paths) {\n\t\tawait yieldToEventLoopIfSlow(startedAt, RESOURCE_LOAD_YIELD_AFTER_MS);\n\t\tconst resolved = resolveResourcePath(state.cwd, p);\n\t\tif (!(await existsAsync(resolved))) {\n\t\t\tdiagnostics.push({ type: \"warning\", message: \"theme path does not exist\", path: resolved });\n\t\t\tcontinue;\n\t\t}\n\t\ttry {\n\t\t\tconst stats = await stat(resolved);\n\t\t\tif (stats.isDirectory()) await loadThemesFromDirAsync(resolved, themes, diagnostics);\n\t\t\telse if (stats.isFile() && resolved.endsWith(\".json\")) await loadThemeFromFileAsync(resolved, themes, diagnostics);\n\t\t\telse diagnostics.push({ type: \"warning\", message: \"theme path is not a json file\", path: resolved });\n\t\t} catch (error) {\n\t\t\tconst message = error instanceof Error ? error.message : \"failed to read theme path\";\n\t\t\tdiagnostics.push({ type: \"warning\", message, path: resolved });\n\t\t}\n\t}\n\treturn { themes, diagnostics };\n}\n\nfunction getProjectThemeDirs(cwd: string): string[] {\n\treturn getProjectConfigDirs(cwd).map((configDir) => join(configDir, \"themes\"));\n}\n\n\nasync function loadThemesFromDirAsync(dir: string, themes: Theme[], diagnostics: ResourceDiagnostic[]): Promise<void> {\n\tif (!(await existsAsync(dir))) return;\n\tconst startedAt = Date.now();\n\ttry {\n\t\tconst entries = await readdir(dir, { withFileTypes: true });\n\t\tfor (const entry of entries) {\n\t\t\tawait yieldToEventLoopIfSlow(startedAt, RESOURCE_LOAD_YIELD_AFTER_MS);\n\t\t\tlet isFile = entry.isFile();\n\t\t\tif (entry.isSymbolicLink()) {\n\t\t\t\ttry { isFile = (await stat(join(dir, entry.name))).isFile(); } catch { continue; }\n\t\t\t}\n\t\t\tif (isFile && entry.name.endsWith(\".json\")) await loadThemeFromFileAsync(join(dir, entry.name), themes, diagnostics);\n\t\t}\n\t} catch (error) {\n\t\tconst message = error instanceof Error ? error.message : \"failed to read theme directory\";\n\t\tdiagnostics.push({ type: \"warning\", message, path: dir });\n\t}\n}\n\n\nasync function loadThemeFromFileAsync(filePath: string, themes: Theme[], diagnostics: ResourceDiagnostic[]): Promise<void> {\n\ttry { themes.push(loadThemeFromContent(filePath, await readFile(filePath, \"utf-8\"))); }\n\tcatch (error) {\n\t\tconst message = error instanceof Error ? error.message : \"failed to load theme\";\n\t\tdiagnostics.push({ type: \"warning\", message, path: filePath });\n\t}\n}\n\nfunction dedupePrompts(prompts: PromptTemplate[]): { prompts: PromptTemplate[]; diagnostics: ResourceDiagnostic[] } {\n\tconst seen = new Map<string, PromptTemplate>();\n\tconst diagnostics: ResourceDiagnostic[] = [];\n\tfor (const prompt of prompts) {\n\t\tconst existing = seen.get(prompt.name);\n\t\tif (existing) {\n\t\t\tdiagnostics.push({\n\t\t\t\ttype: \"collision\",\n\t\t\t\tmessage: `name \"/${prompt.name}\" collision`,\n\t\t\t\tpath: prompt.filePath,\n\t\t\t\tcollision: { resourceType: \"prompt\", name: prompt.name, winnerPath: existing.filePath, loserPath: prompt.filePath },\n\t\t\t});\n\t\t} else {\n\t\t\tseen.set(prompt.name, prompt);\n\t\t}\n\t}\n\treturn { prompts: Array.from(seen.values()), diagnostics };\n}\n\nfunction dedupeThemes(themes: Theme[]): { themes: Theme[]; diagnostics: ResourceDiagnostic[] } {\n\tconst seen = new Map<string, Theme>();\n\tconst diagnostics: ResourceDiagnostic[] = [];\n\tfor (const t of themes) {\n\t\tconst name = t.name ?? \"unnamed\";\n\t\tconst existing = seen.get(name);\n\t\tif (existing) {\n\t\t\tdiagnostics.push({\n\t\t\t\ttype: \"collision\",\n\t\t\t\tmessage: `name \"${name}\" collision`,\n\t\t\t\tpath: t.sourcePath,\n\t\t\t\tcollision: { resourceType: \"theme\", name, winnerPath: existing.sourcePath ?? \"<builtin>\", loserPath: t.sourcePath ?? \"<builtin>\" },\n\t\t\t});\n\t\t} else {\n\t\t\tseen.set(name, t);\n\t\t}\n\t}\n\treturn { themes: Array.from(seen.values()), diagnostics };\n}\n"]}
|
|
@@ -1,4 +1,5 @@
|
|
|
1
1
|
export declare function resolvePromptInput(input: string | undefined, description: string): string | undefined;
|
|
2
|
+
export declare function getAncestorDirectories(startDir: string, parentOf?: (path: string) => string): string[];
|
|
2
3
|
export declare function loadProjectContextFiles(options: {
|
|
3
4
|
cwd: string;
|
|
4
5
|
agentDir: string;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"resource-loader-context-files.d.ts","sourceRoot":"","sources":["../../src/core/resource-loader-context-files.ts"],"names":[],"mappings":"AAMA,wBAAgB,kBAAkB,CAAC,KAAK,EAAE,MAAM,GAAG,SAAS,EAAE,WAAW,EAAE,MAAM,GAAG,MAAM,GAAG,SAAS,CAerG;AAoBD,wBAAgB,uBAAuB,CAAC,OAAO,EAAE;IAChD,GAAG,EAAE,MAAM,CAAC;IACZ,QAAQ,EAAE,MAAM,CAAC;IACjB,cAAc,CAAC,EAAE,OAAO,CAAC;CACzB,GAAG,KAAK,CAAC;IAAE,IAAI,EAAE,MAAM,CAAC;IAAC,OAAO,EAAE,MAAM,CAAA;CAAE,CAAC,
|
|
1
|
+
{"version":3,"file":"resource-loader-context-files.d.ts","sourceRoot":"","sources":["../../src/core/resource-loader-context-files.ts"],"names":[],"mappings":"AAMA,wBAAgB,kBAAkB,CAAC,KAAK,EAAE,MAAM,GAAG,SAAS,EAAE,WAAW,EAAE,MAAM,GAAG,MAAM,GAAG,SAAS,CAerG;AAoBD,wBAAgB,sBAAsB,CACrC,QAAQ,EAAE,MAAM,EAChB,QAAQ,GAAE,CAAC,IAAI,EAAE,MAAM,KAAK,MAAgB,GAC1C,MAAM,EAAE,CASV;AAED,wBAAgB,uBAAuB,CAAC,OAAO,EAAE;IAChD,GAAG,EAAE,MAAM,CAAC;IACZ,QAAQ,EAAE,MAAM,CAAC;IACjB,cAAc,CAAC,EAAE,OAAO,CAAC;CACzB,GAAG,KAAK,CAAC;IAAE,IAAI,EAAE,MAAM,CAAC;IAAC,OAAO,EAAE,MAAM,CAAA;CAAE,CAAC,CAkC3C","sourcesContent":["import { existsSync, readFileSync } from \"node:fs\";\nimport { dirname, join } from \"node:path\";\nimport chalk from \"chalk\";\nimport { getAgentDir, getAgentDirs } from \"../config.ts\";\nimport { resolvePath } from \"../utils/paths.ts\";\n\nexport function resolvePromptInput(input: string | undefined, description: string): string | undefined {\n\tif (!input) {\n\t\treturn undefined;\n\t}\n\n\tif (existsSync(input)) {\n\t\ttry {\n\t\t\treturn readFileSync(input, \"utf-8\");\n\t\t} catch (error) {\n\t\t\tconsole.error(chalk.yellow(`Warning: Could not read ${description} file ${input}: ${error}`));\n\t\t\treturn input;\n\t\t}\n\t}\n\n\treturn input;\n}\n\nfunction loadContextFileFromDir(dir: string): { path: string; content: string } | null {\n\tconst candidates = [\"AGENTS.md\", \"AGENTS.MD\", \"CLAUDE.md\", \"CLAUDE.MD\"];\n\tfor (const filename of candidates) {\n\t\tconst filePath = join(dir, filename);\n\t\tif (existsSync(filePath)) {\n\t\t\ttry {\n\t\t\t\treturn {\n\t\t\t\t\tpath: filePath,\n\t\t\t\t\tcontent: readFileSync(filePath, \"utf-8\"),\n\t\t\t\t};\n\t\t\t} catch (error) {\n\t\t\t\tconsole.error(chalk.yellow(`Warning: Could not read ${filePath}: ${error}`));\n\t\t\t}\n\t\t}\n\t}\n\treturn null;\n}\n\nexport function getAncestorDirectories(\n\tstartDir: string,\n\tparentOf: (path: string) => string = dirname,\n): string[] {\n\tconst directories: string[] = [];\n\tlet currentDir = startDir;\n\twhile (true) {\n\t\tdirectories.push(currentDir);\n\t\tconst parentDir = parentOf(currentDir);\n\t\tif (parentDir === currentDir) return directories;\n\t\tcurrentDir = parentDir;\n\t}\n}\n\nexport function loadProjectContextFiles(options: {\n\tcwd: string;\n\tagentDir: string;\n\tprojectTrusted?: boolean;\n}): Array<{ path: string; content: string }> {\n\tconst resolvedCwd = resolvePath(options.cwd);\n\tconst resolvedAgentDir = resolvePath(options.agentDir);\n\n\tconst contextFiles: Array<{ path: string; content: string }> = [];\n\tconst seenPaths = new Set<string>();\n\n\tconst contextAgentDirs = Array.from(\n\t\tnew Set(resolvedAgentDir === getAgentDir() ? getAgentDirs() : [resolvedAgentDir]),\n\t).reverse();\n\tfor (const agentDir of contextAgentDirs) {\n\t\tconst context = loadContextFileFromDir(agentDir);\n\t\tif (context && !seenPaths.has(context.path)) {\n\t\t\tcontextFiles.push(context);\n\t\t\tseenPaths.add(context.path);\n\t\t}\n\t}\n\n\tconst ancestorContextFiles: Array<{ path: string; content: string }> = [];\n\tif (options.projectTrusted === false) {\n\t\treturn contextFiles;\n\t}\n\n\tfor (const currentDir of getAncestorDirectories(resolvedCwd)) {\n\t\tconst contextFile = loadContextFileFromDir(currentDir);\n\t\tif (contextFile && !seenPaths.has(contextFile.path)) {\n\t\t\tancestorContextFiles.unshift(contextFile);\n\t\t\tseenPaths.add(contextFile.path);\n\t\t}\n\t}\n\n\tcontextFiles.push(...ancestorContextFiles);\n\n\treturn contextFiles;\n}\n"]}
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import { existsSync, readFileSync } from "node:fs";
|
|
2
|
-
import {
|
|
2
|
+
import { dirname, join } from "node:path";
|
|
3
3
|
import chalk from "chalk";
|
|
4
4
|
import { getAgentDir, getAgentDirs } from "../config.js";
|
|
5
5
|
import { resolvePath } from "../utils/paths.js";
|
|
@@ -36,6 +36,17 @@ function loadContextFileFromDir(dir) {
|
|
|
36
36
|
}
|
|
37
37
|
return null;
|
|
38
38
|
}
|
|
39
|
+
export function getAncestorDirectories(startDir, parentOf = dirname) {
|
|
40
|
+
const directories = [];
|
|
41
|
+
let currentDir = startDir;
|
|
42
|
+
while (true) {
|
|
43
|
+
directories.push(currentDir);
|
|
44
|
+
const parentDir = parentOf(currentDir);
|
|
45
|
+
if (parentDir === currentDir)
|
|
46
|
+
return directories;
|
|
47
|
+
currentDir = parentDir;
|
|
48
|
+
}
|
|
49
|
+
}
|
|
39
50
|
export function loadProjectContextFiles(options) {
|
|
40
51
|
const resolvedCwd = resolvePath(options.cwd);
|
|
41
52
|
const resolvedAgentDir = resolvePath(options.agentDir);
|
|
@@ -53,20 +64,12 @@ export function loadProjectContextFiles(options) {
|
|
|
53
64
|
if (options.projectTrusted === false) {
|
|
54
65
|
return contextFiles;
|
|
55
66
|
}
|
|
56
|
-
|
|
57
|
-
const root = resolve("/");
|
|
58
|
-
while (true) {
|
|
67
|
+
for (const currentDir of getAncestorDirectories(resolvedCwd)) {
|
|
59
68
|
const contextFile = loadContextFileFromDir(currentDir);
|
|
60
69
|
if (contextFile && !seenPaths.has(contextFile.path)) {
|
|
61
70
|
ancestorContextFiles.unshift(contextFile);
|
|
62
71
|
seenPaths.add(contextFile.path);
|
|
63
72
|
}
|
|
64
|
-
if (currentDir === root)
|
|
65
|
-
break;
|
|
66
|
-
const parentDir = resolve(currentDir, "..");
|
|
67
|
-
if (parentDir === currentDir)
|
|
68
|
-
break;
|
|
69
|
-
currentDir = parentDir;
|
|
70
73
|
}
|
|
71
74
|
contextFiles.push(...ancestorContextFiles);
|
|
72
75
|
return contextFiles;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"resource-loader-context-files.js","sourceRoot":"","sources":["../../src/core/resource-loader-context-files.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,YAAY,EAAE,MAAM,SAAS,CAAC;AACnD,OAAO,EAAE,
|
|
1
|
+
{"version":3,"file":"resource-loader-context-files.js","sourceRoot":"","sources":["../../src/core/resource-loader-context-files.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,YAAY,EAAE,MAAM,SAAS,CAAC;AACnD,OAAO,EAAE,OAAO,EAAE,IAAI,EAAE,MAAM,WAAW,CAAC;AAC1C,OAAO,KAAK,MAAM,OAAO,CAAC;AAC1B,OAAO,EAAE,WAAW,EAAE,YAAY,EAAE,MAAM,cAAc,CAAC;AACzD,OAAO,EAAE,WAAW,EAAE,MAAM,mBAAmB,CAAC;AAEhD,MAAM,UAAU,kBAAkB,CAAC,KAAyB,EAAE,WAAmB;IAChF,IAAI,CAAC,KAAK,EAAE,CAAC;QACZ,OAAO,SAAS,CAAC;IAClB,CAAC;IAED,IAAI,UAAU,CAAC,KAAK,CAAC,EAAE,CAAC;QACvB,IAAI,CAAC;YACJ,OAAO,YAAY,CAAC,KAAK,EAAE,OAAO,CAAC,CAAC;QACrC,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YAChB,OAAO,CAAC,KAAK,CAAC,KAAK,CAAC,MAAM,CAAC,2BAA2B,WAAW,SAAS,KAAK,KAAK,KAAK,EAAE,CAAC,CAAC,CAAC;YAC9F,OAAO,KAAK,CAAC;QACd,CAAC;IACF,CAAC;IAED,OAAO,KAAK,CAAC;AACd,CAAC;AAED,SAAS,sBAAsB,CAAC,GAAW;IAC1C,MAAM,UAAU,GAAG,CAAC,WAAW,EAAE,WAAW,EAAE,WAAW,EAAE,WAAW,CAAC,CAAC;IACxE,KAAK,MAAM,QAAQ,IAAI,UAAU,EAAE,CAAC;QACnC,MAAM,QAAQ,GAAG,IAAI,CAAC,GAAG,EAAE,QAAQ,CAAC,CAAC;QACrC,IAAI,UAAU,CAAC,QAAQ,CAAC,EAAE,CAAC;YAC1B,IAAI,CAAC;gBACJ,OAAO;oBACN,IAAI,EAAE,QAAQ;oBACd,OAAO,EAAE,YAAY,CAAC,QAAQ,EAAE,OAAO,CAAC;iBACxC,CAAC;YACH,CAAC;YAAC,OAAO,KAAK,EAAE,CAAC;gBAChB,OAAO,CAAC,KAAK,CAAC,KAAK,CAAC,MAAM,CAAC,2BAA2B,QAAQ,KAAK,KAAK,EAAE,CAAC,CAAC,CAAC;YAC9E,CAAC;QACF,CAAC;IACF,CAAC;IACD,OAAO,IAAI,CAAC;AACb,CAAC;AAED,MAAM,UAAU,sBAAsB,CACrC,QAAgB,EAChB,QAAQ,GAA6B,OAAO;IAE5C,MAAM,WAAW,GAAa,EAAE,CAAC;IACjC,IAAI,UAAU,GAAG,QAAQ,CAAC;IAC1B,OAAO,IAAI,EAAE,CAAC;QACb,WAAW,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC;QAC7B,MAAM,SAAS,GAAG,QAAQ,CAAC,UAAU,CAAC,CAAC;QACvC,IAAI,SAAS,KAAK,UAAU;YAAE,OAAO,WAAW,CAAC;QACjD,UAAU,GAAG,SAAS,CAAC;IACxB,CAAC;AACF,CAAC;AAED,MAAM,UAAU,uBAAuB,CAAC,OAIvC;IACA,MAAM,WAAW,GAAG,WAAW,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC;IAC7C,MAAM,gBAAgB,GAAG,WAAW,CAAC,OAAO,CAAC,QAAQ,CAAC,CAAC;IAEvD,MAAM,YAAY,GAA6C,EAAE,CAAC;IAClE,MAAM,SAAS,GAAG,IAAI,GAAG,EAAU,CAAC;IAEpC,MAAM,gBAAgB,GAAG,KAAK,CAAC,IAAI,CAClC,IAAI,GAAG,CAAC,gBAAgB,KAAK,WAAW,EAAE,CAAC,CAAC,CAAC,YAAY,EAAE,CAAC,CAAC,CAAC,CAAC,gBAAgB,CAAC,CAAC,CACjF,CAAC,OAAO,EAAE,CAAC;IACZ,KAAK,MAAM,QAAQ,IAAI,gBAAgB,EAAE,CAAC;QACzC,MAAM,OAAO,GAAG,sBAAsB,CAAC,QAAQ,CAAC,CAAC;QACjD,IAAI,OAAO,IAAI,CAAC,SAAS,CAAC,GAAG,CAAC,OAAO,CAAC,IAAI,CAAC,EAAE,CAAC;YAC7C,YAAY,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;YAC3B,SAAS,CAAC,GAAG,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC;QAC7B,CAAC;IACF,CAAC;IAED,MAAM,oBAAoB,GAA6C,EAAE,CAAC;IAC1E,IAAI,OAAO,CAAC,cAAc,KAAK,KAAK,EAAE,CAAC;QACtC,OAAO,YAAY,CAAC;IACrB,CAAC;IAED,KAAK,MAAM,UAAU,IAAI,sBAAsB,CAAC,WAAW,CAAC,EAAE,CAAC;QAC9D,MAAM,WAAW,GAAG,sBAAsB,CAAC,UAAU,CAAC,CAAC;QACvD,IAAI,WAAW,IAAI,CAAC,SAAS,CAAC,GAAG,CAAC,WAAW,CAAC,IAAI,CAAC,EAAE,CAAC;YACrD,oBAAoB,CAAC,OAAO,CAAC,WAAW,CAAC,CAAC;YAC1C,SAAS,CAAC,GAAG,CAAC,WAAW,CAAC,IAAI,CAAC,CAAC;QACjC,CAAC;IACF,CAAC;IAED,YAAY,CAAC,IAAI,CAAC,GAAG,oBAAoB,CAAC,CAAC;IAE3C,OAAO,YAAY,CAAC;AACrB,CAAC","sourcesContent":["import { existsSync, readFileSync } from \"node:fs\";\nimport { dirname, join } from \"node:path\";\nimport chalk from \"chalk\";\nimport { getAgentDir, getAgentDirs } from \"../config.ts\";\nimport { resolvePath } from \"../utils/paths.ts\";\n\nexport function resolvePromptInput(input: string | undefined, description: string): string | undefined {\n\tif (!input) {\n\t\treturn undefined;\n\t}\n\n\tif (existsSync(input)) {\n\t\ttry {\n\t\t\treturn readFileSync(input, \"utf-8\");\n\t\t} catch (error) {\n\t\t\tconsole.error(chalk.yellow(`Warning: Could not read ${description} file ${input}: ${error}`));\n\t\t\treturn input;\n\t\t}\n\t}\n\n\treturn input;\n}\n\nfunction loadContextFileFromDir(dir: string): { path: string; content: string } | null {\n\tconst candidates = [\"AGENTS.md\", \"AGENTS.MD\", \"CLAUDE.md\", \"CLAUDE.MD\"];\n\tfor (const filename of candidates) {\n\t\tconst filePath = join(dir, filename);\n\t\tif (existsSync(filePath)) {\n\t\t\ttry {\n\t\t\t\treturn {\n\t\t\t\t\tpath: filePath,\n\t\t\t\t\tcontent: readFileSync(filePath, \"utf-8\"),\n\t\t\t\t};\n\t\t\t} catch (error) {\n\t\t\t\tconsole.error(chalk.yellow(`Warning: Could not read ${filePath}: ${error}`));\n\t\t\t}\n\t\t}\n\t}\n\treturn null;\n}\n\nexport function getAncestorDirectories(\n\tstartDir: string,\n\tparentOf: (path: string) => string = dirname,\n): string[] {\n\tconst directories: string[] = [];\n\tlet currentDir = startDir;\n\twhile (true) {\n\t\tdirectories.push(currentDir);\n\t\tconst parentDir = parentOf(currentDir);\n\t\tif (parentDir === currentDir) return directories;\n\t\tcurrentDir = parentDir;\n\t}\n}\n\nexport function loadProjectContextFiles(options: {\n\tcwd: string;\n\tagentDir: string;\n\tprojectTrusted?: boolean;\n}): Array<{ path: string; content: string }> {\n\tconst resolvedCwd = resolvePath(options.cwd);\n\tconst resolvedAgentDir = resolvePath(options.agentDir);\n\n\tconst contextFiles: Array<{ path: string; content: string }> = [];\n\tconst seenPaths = new Set<string>();\n\n\tconst contextAgentDirs = Array.from(\n\t\tnew Set(resolvedAgentDir === getAgentDir() ? getAgentDirs() : [resolvedAgentDir]),\n\t).reverse();\n\tfor (const agentDir of contextAgentDirs) {\n\t\tconst context = loadContextFileFromDir(agentDir);\n\t\tif (context && !seenPaths.has(context.path)) {\n\t\t\tcontextFiles.push(context);\n\t\t\tseenPaths.add(context.path);\n\t\t}\n\t}\n\n\tconst ancestorContextFiles: Array<{ path: string; content: string }> = [];\n\tif (options.projectTrusted === false) {\n\t\treturn contextFiles;\n\t}\n\n\tfor (const currentDir of getAncestorDirectories(resolvedCwd)) {\n\t\tconst contextFile = loadContextFileFromDir(currentDir);\n\t\tif (contextFile && !seenPaths.has(contextFile.path)) {\n\t\t\tancestorContextFiles.unshift(contextFile);\n\t\t\tseenPaths.add(contextFile.path);\n\t\t}\n\t}\n\n\tcontextFiles.push(...ancestorContextFiles);\n\n\treturn contextFiles;\n}\n"]}
|
|
@@ -75,7 +75,7 @@ export declare class DefaultResourceLoader implements ResourceLoader {
|
|
|
75
75
|
getWorkflowResources(): ResolvedResource[];
|
|
76
76
|
getInheritanceSnapshot(): DefaultResourceLoaderInheritanceSnapshot;
|
|
77
77
|
refreshWorkflowResources(): Promise<ResolvedResource[]>;
|
|
78
|
-
extendResources(paths: ResourceExtensionPaths): void
|
|
78
|
+
extendResources(paths: ResourceExtensionPaths): Promise<void>;
|
|
79
79
|
loadProjectTrustExtensions(): Promise<LoadExtensionsResult>;
|
|
80
80
|
reload(options?: ResourceLoaderReloadOptions): Promise<void>;
|
|
81
81
|
private touchInternalFieldsForSplit;
|