@draht/coding-agent 2026.6.11 → 2026.7.7-1
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 +21 -0
- package/README.md +1 -4
- package/dist/bun/register-bedrock.d.ts.map +1 -1
- package/dist/bun/register-bedrock.js +1 -1
- package/dist/bun/register-bedrock.js.map +1 -1
- package/dist/bun/restore-sandbox-env.d.ts +4 -0
- package/dist/bun/restore-sandbox-env.d.ts.map +1 -1
- package/dist/bun/restore-sandbox-env.js +4 -0
- package/dist/bun/restore-sandbox-env.js.map +1 -1
- package/dist/cli/args.d.ts.map +1 -1
- package/dist/cli/args.js +4 -4
- package/dist/cli/args.js.map +1 -1
- package/dist/cli/config-selector.d.ts +4 -2
- package/dist/cli/config-selector.d.ts.map +1 -1
- package/dist/cli/config-selector.js +1 -1
- package/dist/cli/config-selector.js.map +1 -1
- package/dist/cli/file-processor.d.ts.map +1 -1
- package/dist/cli/file-processor.js +13 -25
- package/dist/cli/file-processor.js.map +1 -1
- package/dist/cli/session-picker.d.ts +2 -1
- package/dist/cli/session-picker.d.ts.map +1 -1
- package/dist/cli/session-picker.js +5 -4
- package/dist/cli/session-picker.js.map +1 -1
- package/dist/cli/startup-ui.d.ts +5 -1
- package/dist/cli/startup-ui.d.ts.map +1 -1
- package/dist/cli/startup-ui.js +94 -22
- package/dist/cli/startup-ui.js.map +1 -1
- package/dist/config.d.ts +6 -2
- package/dist/config.d.ts.map +1 -1
- package/dist/config.js +35 -16
- package/dist/config.js.map +1 -1
- package/dist/core/agent-session.d.ts +10 -4
- package/dist/core/agent-session.d.ts.map +1 -1
- package/dist/core/agent-session.js +124 -83
- package/dist/core/agent-session.js.map +1 -1
- package/dist/core/auth-storage.d.ts +11 -12
- package/dist/core/auth-storage.d.ts.map +1 -1
- package/dist/core/auth-storage.js +25 -26
- package/dist/core/auth-storage.js.map +1 -1
- package/dist/core/compaction/branch-summarization.d.ts +3 -1
- package/dist/core/compaction/branch-summarization.d.ts.map +1 -1
- package/dist/core/compaction/branch-summarization.js +3 -3
- package/dist/core/compaction/branch-summarization.js.map +1 -1
- package/dist/core/compaction/compaction.d.ts +5 -4
- package/dist/core/compaction/compaction.d.ts.map +1 -1
- package/dist/core/compaction/compaction.js +23 -20
- package/dist/core/compaction/compaction.js.map +1 -1
- package/dist/core/export-html/vendor/marked.min.js +75 -3
- package/dist/core/extensions/index.d.ts +1 -1
- package/dist/core/extensions/index.d.ts.map +1 -1
- package/dist/core/extensions/index.js.map +1 -1
- package/dist/core/extensions/loader.d.ts +2 -3
- package/dist/core/extensions/loader.d.ts.map +1 -1
- package/dist/core/extensions/loader.js +77 -14
- package/dist/core/extensions/loader.js.map +1 -1
- package/dist/core/extensions/runner.d.ts +2 -1
- package/dist/core/extensions/runner.d.ts.map +1 -1
- package/dist/core/extensions/runner.js +33 -1
- package/dist/core/extensions/runner.js.map +1 -1
- package/dist/core/extensions/types.d.ts +29 -2
- package/dist/core/extensions/types.d.ts.map +1 -1
- package/dist/core/extensions/types.js.map +1 -1
- package/dist/core/http-dispatcher.d.ts +1 -0
- package/dist/core/http-dispatcher.d.ts.map +1 -1
- package/dist/core/http-dispatcher.js +45 -2
- package/dist/core/http-dispatcher.js.map +1 -1
- package/dist/core/index.d.ts +1 -1
- package/dist/core/index.d.ts.map +1 -1
- package/dist/core/index.js.map +1 -1
- package/dist/core/keybindings.d.ts +1 -1
- package/dist/core/keybindings.d.ts.map +1 -1
- package/dist/core/keybindings.js +3 -6
- package/dist/core/keybindings.js.map +1 -1
- package/dist/core/model-registry.d.ts +2 -1
- package/dist/core/model-registry.d.ts.map +1 -1
- package/dist/core/model-registry.js +32 -67
- package/dist/core/model-registry.js.map +1 -1
- package/dist/core/model-resolver.d.ts +11 -1
- package/dist/core/model-resolver.d.ts.map +1 -1
- package/dist/core/model-resolver.js +37 -19
- package/dist/core/model-resolver.js.map +1 -1
- package/dist/core/package-manager.d.ts +5 -2
- package/dist/core/package-manager.d.ts.map +1 -1
- package/dist/core/package-manager.js +99 -43
- package/dist/core/package-manager.js.map +1 -1
- package/dist/core/project-trust.d.ts.map +1 -1
- package/dist/core/project-trust.js +4 -3
- package/dist/core/project-trust.js.map +1 -1
- package/dist/core/provider-attribution.d.ts +2 -2
- package/dist/core/provider-attribution.d.ts.map +1 -1
- package/dist/core/provider-attribution.js.map +1 -1
- package/dist/core/provider-display-names.d.ts.map +1 -1
- package/dist/core/provider-display-names.js +1 -1
- package/dist/core/provider-display-names.js.map +1 -1
- package/dist/core/resolve-config-value.d.ts +7 -8
- package/dist/core/resolve-config-value.d.ts.map +1 -1
- package/dist/core/resolve-config-value.js +24 -26
- package/dist/core/resolve-config-value.js.map +1 -1
- package/dist/core/resource-loader.d.ts +3 -2
- package/dist/core/resource-loader.d.ts.map +1 -1
- package/dist/core/resource-loader.js +16 -6
- package/dist/core/resource-loader.js.map +1 -1
- package/dist/core/sdk.d.ts +9 -9
- package/dist/core/sdk.d.ts.map +1 -1
- package/dist/core/sdk.js +3 -1
- package/dist/core/sdk.js.map +1 -1
- package/dist/core/session-manager.d.ts +21 -2
- package/dist/core/session-manager.d.ts.map +1 -1
- package/dist/core/session-manager.js +121 -77
- package/dist/core/session-manager.js.map +1 -1
- package/dist/core/settings-manager.d.ts +10 -1
- package/dist/core/settings-manager.d.ts.map +1 -1
- package/dist/core/settings-manager.js +29 -3
- package/dist/core/settings-manager.js.map +1 -1
- package/dist/core/system-prompt.d.ts.map +1 -1
- package/dist/core/system-prompt.js +7 -7
- package/dist/core/system-prompt.js.map +1 -1
- package/dist/core/timings.d.ts +4 -2
- package/dist/core/timings.d.ts.map +1 -1
- package/dist/core/timings.js +24 -14
- package/dist/core/timings.js.map +1 -1
- package/dist/core/tools/bash.d.ts.map +1 -1
- package/dist/core/tools/bash.js +32 -8
- package/dist/core/tools/bash.js.map +1 -1
- package/dist/core/tools/edit-diff.d.ts +23 -4
- package/dist/core/tools/edit-diff.d.ts.map +1 -1
- package/dist/core/tools/edit-diff.js +99 -20
- package/dist/core/tools/edit-diff.js.map +1 -1
- package/dist/core/tools/edit.d.ts.map +1 -1
- package/dist/core/tools/edit.js +2 -2
- package/dist/core/tools/edit.js.map +1 -1
- package/dist/core/tools/find.d.ts.map +1 -1
- package/dist/core/tools/find.js +19 -11
- package/dist/core/tools/find.js.map +1 -1
- package/dist/core/tools/read.d.ts.map +1 -1
- package/dist/core/tools/read.js +12 -25
- package/dist/core/tools/read.js.map +1 -1
- package/dist/core/trust-manager.d.ts +8 -3
- package/dist/core/trust-manager.d.ts.map +1 -1
- package/dist/core/trust-manager.js +26 -11
- package/dist/core/trust-manager.js.map +1 -1
- package/dist/index.d.ts +6 -4
- package/dist/index.d.ts.map +1 -1
- package/dist/index.js +5 -3
- package/dist/index.js.map +1 -1
- package/dist/main.d.ts +2 -2
- package/dist/main.d.ts.map +1 -1
- package/dist/main.js +47 -15
- package/dist/main.js.map +1 -1
- package/dist/migrations.d.ts.map +1 -1
- package/dist/migrations.js +1 -123
- package/dist/migrations.js.map +1 -1
- package/dist/modes/interactive/assets/clankolas.png +0 -0
- package/dist/modes/interactive/components/assistant-message.d.ts +3 -1
- package/dist/modes/interactive/components/assistant-message.d.ts.map +1 -1
- package/dist/modes/interactive/components/assistant-message.js +23 -15
- package/dist/modes/interactive/components/assistant-message.js.map +1 -1
- package/dist/modes/interactive/components/config-selector.d.ts +34 -3
- package/dist/modes/interactive/components/config-selector.d.ts.map +1 -1
- package/dist/modes/interactive/components/config-selector.js +284 -29
- package/dist/modes/interactive/components/config-selector.js.map +1 -1
- package/dist/modes/interactive/components/custom-entry.d.ts +19 -0
- package/dist/modes/interactive/components/custom-entry.d.ts.map +1 -0
- package/dist/modes/interactive/components/custom-entry.js +52 -0
- package/dist/modes/interactive/components/custom-entry.js.map +1 -0
- package/dist/modes/interactive/components/extension-editor.d.ts +3 -1
- package/dist/modes/interactive/components/extension-editor.d.ts.map +1 -1
- package/dist/modes/interactive/components/extension-editor.js +12 -3
- package/dist/modes/interactive/components/extension-editor.js.map +1 -1
- package/dist/modes/interactive/components/footer.d.ts +2 -2
- package/dist/modes/interactive/components/footer.d.ts.map +1 -1
- package/dist/modes/interactive/components/footer.js +4 -0
- package/dist/modes/interactive/components/footer.js.map +1 -1
- package/dist/modes/interactive/components/login-dialog.d.ts.map +1 -1
- package/dist/modes/interactive/components/login-dialog.js +0 -1
- package/dist/modes/interactive/components/login-dialog.js.map +1 -1
- package/dist/modes/interactive/components/model-selector.d.ts.map +1 -1
- package/dist/modes/interactive/components/model-selector.js +2 -1
- package/dist/modes/interactive/components/model-selector.js.map +1 -1
- package/dist/modes/interactive/components/scoped-models-selector.d.ts.map +1 -1
- package/dist/modes/interactive/components/scoped-models-selector.js +4 -1
- package/dist/modes/interactive/components/scoped-models-selector.js.map +1 -1
- package/dist/modes/interactive/components/session-selector.d.ts +0 -1
- package/dist/modes/interactive/components/session-selector.d.ts.map +1 -1
- package/dist/modes/interactive/components/session-selector.js +14 -8
- package/dist/modes/interactive/components/session-selector.js.map +1 -1
- package/dist/modes/interactive/components/settings-selector.d.ts +4 -0
- package/dist/modes/interactive/components/settings-selector.d.ts.map +1 -1
- package/dist/modes/interactive/components/settings-selector.js +188 -16
- package/dist/modes/interactive/components/settings-selector.js.map +1 -1
- package/dist/modes/interactive/components/status-indicator.d.ts +28 -0
- package/dist/modes/interactive/components/status-indicator.d.ts.map +1 -0
- package/dist/modes/interactive/components/status-indicator.js +60 -0
- package/dist/modes/interactive/components/status-indicator.js.map +1 -0
- package/dist/modes/interactive/components/tree-selector.d.ts +1 -1
- package/dist/modes/interactive/components/tree-selector.d.ts.map +1 -1
- package/dist/modes/interactive/components/tree-selector.js +130 -15
- package/dist/modes/interactive/components/tree-selector.js.map +1 -1
- package/dist/modes/interactive/components/trust-selector.d.ts.map +1 -1
- package/dist/modes/interactive/components/trust-selector.js +4 -4
- package/dist/modes/interactive/components/trust-selector.js.map +1 -1
- package/dist/modes/interactive/components/user-message.d.ts +6 -2
- package/dist/modes/interactive/components/user-message.d.ts.map +1 -1
- package/dist/modes/interactive/components/user-message.js +19 -6
- package/dist/modes/interactive/components/user-message.js.map +1 -1
- package/dist/modes/interactive/interactive-mode.d.ts +13 -11
- package/dist/modes/interactive/interactive-mode.d.ts.map +1 -1
- package/dist/modes/interactive/interactive-mode.js +252 -233
- package/dist/modes/interactive/interactive-mode.js.map +1 -1
- package/dist/modes/interactive/model-search.d.ts +12 -0
- package/dist/modes/interactive/model-search.d.ts.map +1 -0
- package/dist/modes/interactive/model-search.js +15 -0
- package/dist/modes/interactive/model-search.js.map +1 -0
- package/dist/modes/interactive/theme/theme-controller.d.ts +29 -0
- package/dist/modes/interactive/theme/theme-controller.d.ts.map +1 -0
- package/dist/modes/interactive/theme/theme-controller.js +102 -0
- package/dist/modes/interactive/theme/theme-controller.js.map +1 -0
- package/dist/modes/interactive/theme/theme-schema.json +2 -1
- package/dist/modes/interactive/theme/theme.d.ts +27 -8
- package/dist/modes/interactive/theme/theme.d.ts.map +1 -1
- package/dist/modes/interactive/theme/theme.js +64 -42
- package/dist/modes/interactive/theme/theme.js.map +1 -1
- package/dist/modes/rpc/rpc-client.d.ts +19 -4
- package/dist/modes/rpc/rpc-client.d.ts.map +1 -1
- package/dist/modes/rpc/rpc-client.js +14 -0
- package/dist/modes/rpc/rpc-client.js.map +1 -1
- package/dist/modes/rpc/rpc-mode.d.ts.map +1 -1
- package/dist/modes/rpc/rpc-mode.js +17 -1
- package/dist/modes/rpc/rpc-mode.js.map +1 -1
- package/dist/modes/rpc/rpc-types.d.ts +26 -0
- package/dist/modes/rpc/rpc-types.d.ts.map +1 -1
- package/dist/modes/rpc/rpc-types.js.map +1 -1
- package/dist/package-manager-cli.d.ts +2 -2
- package/dist/package-manager-cli.d.ts.map +1 -1
- package/dist/package-manager-cli.js +152 -48
- package/dist/package-manager-cli.js.map +1 -1
- package/dist/prompts/agents/build.md +38 -0
- package/dist/prompts/agents/plan.md +36 -0
- package/dist/prompts/agents/verify.md +36 -4
- package/dist/prompts/commands/brainstorm.md +162 -0
- package/dist/prompts/commands/discuss-phase.md +1 -1
- package/dist/prompts/commands/execute-phase.md +4 -1
- package/dist/prompts/commands/fix.md +12 -0
- package/dist/prompts/commands/init-project.md +1 -0
- package/dist/prompts/commands/map-codebase.md +1 -1
- package/dist/prompts/commands/new-project.md +1 -0
- package/dist/prompts/commands/next-milestone.md +2 -0
- package/dist/prompts/commands/orchestrate.md +4 -4
- package/dist/prompts/commands/plan-phase.md +5 -0
- package/dist/prompts/commands/quick.md +4 -0
- package/dist/prompts/commands/review.md +4 -1
- package/dist/prompts/commands/verify-work.md +10 -8
- package/dist/rpc-entry.d.ts +3 -0
- package/dist/rpc-entry.d.ts.map +1 -0
- package/dist/rpc-entry.js +10 -0
- package/dist/rpc-entry.js.map +1 -0
- package/dist/utils/child-process.d.ts +7 -4
- package/dist/utils/child-process.d.ts.map +1 -1
- package/dist/utils/child-process.js +23 -5
- package/dist/utils/child-process.js.map +1 -1
- package/dist/utils/image-convert.d.ts +1 -0
- package/dist/utils/image-convert.d.ts.map +1 -1
- package/dist/utils/image-convert.js +21 -15
- package/dist/utils/image-convert.js.map +1 -1
- package/dist/utils/image-process.d.ts +18 -0
- package/dist/utils/image-process.d.ts.map +1 -0
- package/dist/utils/image-process.js +83 -0
- package/dist/utils/image-process.js.map +1 -0
- package/dist/utils/mime.d.ts.map +1 -1
- package/dist/utils/mime.js +41 -0
- package/dist/utils/mime.js.map +1 -1
- package/dist/utils/shell.d.ts +1 -0
- package/dist/utils/shell.d.ts.map +1 -1
- package/dist/utils/shell.js +12 -5
- package/dist/utils/shell.js.map +1 -1
- package/dist/utils/version-check.d.ts.map +1 -1
- package/dist/utils/version-check.js +4 -27
- package/dist/utils/version-check.js.map +1 -1
- package/docs/extensions.md +55 -8
- package/docs/keybindings.md +1 -1
- package/docs/packages.md +2 -2
- package/docs/providers.md +2 -1
- package/docs/rpc.md +58 -0
- package/docs/sdk.md +50 -0
- package/docs/session-format.md +18 -8
- package/docs/settings.md +10 -0
- package/docs/usage.md +2 -2
- package/examples/extensions/README.md +1 -0
- package/examples/extensions/custom-compaction.ts +2 -1
- package/examples/extensions/custom-provider-anthropic/index.ts +1 -1
- package/examples/extensions/custom-provider-anthropic/package-lock.json +2 -2
- package/examples/extensions/custom-provider-anthropic/package.json +1 -1
- package/examples/extensions/custom-provider-gitlab-duo/index.ts +9 -5
- package/examples/extensions/custom-provider-gitlab-duo/package.json +1 -1
- package/examples/extensions/custom-provider-gitlab-duo/test.ts +1 -1
- package/examples/extensions/entry-renderer.ts +41 -0
- package/examples/extensions/gondolin/package-lock.json +2 -2
- package/examples/extensions/gondolin/package.json +1 -1
- package/examples/extensions/handoff.ts +2 -2
- package/examples/extensions/plan-mode/index.ts +87 -37
- package/examples/extensions/preset.ts +10 -4
- package/examples/extensions/provider-payload.ts +5 -5
- package/examples/extensions/qna.ts +2 -2
- package/examples/extensions/question.ts +32 -18
- package/examples/extensions/questionnaire.ts +41 -28
- package/examples/extensions/sandbox/index.ts +2 -2
- package/examples/extensions/sandbox/package-lock.json +2 -2
- package/examples/extensions/sandbox/package.json +1 -1
- package/examples/extensions/subagent/agents.ts +2 -2
- package/examples/extensions/subagent/index.ts +9 -3
- package/examples/extensions/summarize.ts +2 -1
- package/examples/extensions/with-deps/package-lock.json +2 -2
- package/examples/extensions/with-deps/package.json +1 -1
- package/examples/sdk/02-custom-model.ts +1 -1
- package/examples/sdk/12-full-control.ts +2 -2
- package/package.json +14 -15
- package/prompts/agents/build.md +38 -0
- package/prompts/agents/plan.md +36 -0
- package/prompts/agents/verify.md +36 -4
- package/prompts/commands/brainstorm.md +162 -0
- package/prompts/commands/discuss-phase.md +1 -1
- package/prompts/commands/execute-phase.md +4 -1
- package/prompts/commands/fix.md +12 -0
- package/prompts/commands/init-project.md +1 -0
- package/prompts/commands/map-codebase.md +1 -1
- package/prompts/commands/new-project.md +1 -0
- package/prompts/commands/next-milestone.md +2 -0
- package/prompts/commands/orchestrate.md +4 -4
- package/prompts/commands/plan-phase.md +5 -0
- package/prompts/commands/quick.md +4 -0
- package/prompts/commands/review.md +4 -1
- package/prompts/commands/verify-work.md +10 -8
|
@@ -24,6 +24,7 @@ import { basename, dirname, join, relative, resolve, sep } from "node:path";
|
|
|
24
24
|
import { globSync } from "glob";
|
|
25
25
|
import ignore from "ignore";
|
|
26
26
|
import { minimatch } from "minimatch";
|
|
27
|
+
import { maxSatisfying, rcompare, satisfies, valid, validRange } from "semver";
|
|
27
28
|
import { CONFIG_DIR_NAME } from "../config.js";
|
|
28
29
|
import { spawnProcess, spawnProcessSync } from "../utils/child-process.js";
|
|
29
30
|
import { parseGitUrl } from "../utils/git.js";
|
|
@@ -38,6 +39,12 @@ function isOfflineModeEnabled() {
|
|
|
38
39
|
return false;
|
|
39
40
|
return value === "1" || value.toLowerCase() === "true" || value.toLowerCase() === "yes";
|
|
40
41
|
}
|
|
42
|
+
function isExactNpmVersion(version) {
|
|
43
|
+
return valid(version ?? "") !== null;
|
|
44
|
+
}
|
|
45
|
+
function getNpmVersionRange(version) {
|
|
46
|
+
return version ? (validRange(version) ?? undefined) : undefined;
|
|
47
|
+
}
|
|
41
48
|
/**
|
|
42
49
|
* Compute a numeric precedence rank for a resource based on its metadata.
|
|
43
50
|
* Lower rank = higher precedence. Used to sort resolved resources so that
|
|
@@ -575,6 +582,20 @@ function applyPatterns(allPaths, patterns, baseDir) {
|
|
|
575
582
|
}
|
|
576
583
|
return new Set(result);
|
|
577
584
|
}
|
|
585
|
+
function applyAutoloadDisabledPatterns(allPaths, patterns, baseDir) {
|
|
586
|
+
const result = new Map();
|
|
587
|
+
for (const pattern of patterns) {
|
|
588
|
+
const target = pattern.slice(pattern.startsWith("+") || pattern.startsWith("-") || pattern.startsWith("!") ? 1 : 0);
|
|
589
|
+
const enabled = !pattern.startsWith("-") && !pattern.startsWith("!");
|
|
590
|
+
const exact = pattern.startsWith("+") || pattern.startsWith("-");
|
|
591
|
+
for (const filePath of allPaths) {
|
|
592
|
+
if (exact ? matchesAnyExactPattern(filePath, [target], baseDir) : matchesAnyPattern(filePath, [target], baseDir)) {
|
|
593
|
+
result.set(filePath, enabled);
|
|
594
|
+
}
|
|
595
|
+
}
|
|
596
|
+
}
|
|
597
|
+
return result;
|
|
598
|
+
}
|
|
578
599
|
export class DefaultPackageManager {
|
|
579
600
|
cwd;
|
|
580
601
|
agentDir;
|
|
@@ -873,8 +894,8 @@ export class DefaultPackageManager {
|
|
|
873
894
|
return true;
|
|
874
895
|
}
|
|
875
896
|
try {
|
|
876
|
-
const
|
|
877
|
-
return
|
|
897
|
+
const targetVersion = await this.getLatestNpmVersion(source.version ? source.spec : source.name, source.range);
|
|
898
|
+
return targetVersion !== installedVersion;
|
|
878
899
|
}
|
|
879
900
|
catch {
|
|
880
901
|
// Preserve existing update behavior when version lookup fails.
|
|
@@ -887,7 +908,7 @@ export class DefaultPackageManager {
|
|
|
887
908
|
}
|
|
888
909
|
const sourceLabel = sources.length === 1 ? sources[0].source : `${scope} npm packages`;
|
|
889
910
|
const message = sources.length === 1 ? `Updating ${sources[0].source}...` : `Updating ${scope} npm packages...`;
|
|
890
|
-
const specs = sources.map((entry) => `${entry.parsed.name}@latest`);
|
|
911
|
+
const specs = sources.map((entry) => (entry.parsed.version ? entry.parsed.spec : `${entry.parsed.name}@latest`));
|
|
891
912
|
await this.withProgress("update", sourceLabel, message, async () => {
|
|
892
913
|
await this.installNpmBatch(specs, scope);
|
|
893
914
|
});
|
|
@@ -957,58 +978,67 @@ export class DefaultPackageManager {
|
|
|
957
978
|
for (const { pkg, scope } of sources) {
|
|
958
979
|
const sourceStr = typeof pkg === "string" ? pkg : pkg.source;
|
|
959
980
|
const filter = typeof pkg === "object" ? pkg : undefined;
|
|
960
|
-
const
|
|
981
|
+
const deltaBase = this.findAutoloadDeltaBase(pkg, scope, sources);
|
|
982
|
+
const resolvedSource = deltaBase?.source ?? sourceStr;
|
|
983
|
+
const resolvedScope = deltaBase?.scope ?? scope;
|
|
984
|
+
const parsed = this.parseSource(resolvedSource);
|
|
961
985
|
const metadata = { source: sourceStr, scope, origin: "package" };
|
|
962
986
|
if (parsed.type === "local") {
|
|
963
|
-
const baseDir = this.getBaseDirForScope(
|
|
987
|
+
const baseDir = this.getBaseDirForScope(resolvedScope);
|
|
964
988
|
this.resolveLocalExtensionSource(parsed, accumulator, filter, metadata, baseDir);
|
|
965
989
|
continue;
|
|
966
990
|
}
|
|
967
991
|
const installMissing = async () => {
|
|
968
|
-
if (isOfflineModeEnabled())
|
|
992
|
+
if (isOfflineModeEnabled())
|
|
969
993
|
return false;
|
|
970
|
-
}
|
|
971
994
|
if (!onMissing) {
|
|
972
|
-
await this.installParsedSource(parsed,
|
|
995
|
+
await this.installParsedSource(parsed, resolvedScope);
|
|
973
996
|
return true;
|
|
974
997
|
}
|
|
975
|
-
const action = await onMissing(
|
|
998
|
+
const action = await onMissing(resolvedSource);
|
|
976
999
|
if (action === "skip")
|
|
977
1000
|
return false;
|
|
978
1001
|
if (action === "error")
|
|
979
|
-
throw new Error(`Missing source: ${
|
|
980
|
-
await this.installParsedSource(parsed,
|
|
1002
|
+
throw new Error(`Missing source: ${resolvedSource}`);
|
|
1003
|
+
await this.installParsedSource(parsed, resolvedScope);
|
|
981
1004
|
return true;
|
|
982
1005
|
};
|
|
983
1006
|
if (parsed.type === "npm") {
|
|
984
|
-
let installedPath = this.getNpmInstallPath(parsed,
|
|
985
|
-
const needsInstall = !existsSync(installedPath) ||
|
|
986
|
-
(parsed.pinned && !(await this.installedNpmMatchesPinnedVersion(parsed, installedPath)));
|
|
1007
|
+
let installedPath = this.getNpmInstallPath(parsed, resolvedScope);
|
|
1008
|
+
const needsInstall = !existsSync(installedPath) || !(await this.installedNpmMatchesConfiguredVersion(parsed, installedPath));
|
|
987
1009
|
if (needsInstall) {
|
|
988
1010
|
const installed = await installMissing();
|
|
989
1011
|
if (!installed)
|
|
990
1012
|
continue;
|
|
991
|
-
installedPath = this.getNpmInstallPath(parsed,
|
|
1013
|
+
installedPath = this.getNpmInstallPath(parsed, resolvedScope);
|
|
992
1014
|
}
|
|
993
1015
|
metadata.baseDir = installedPath;
|
|
994
1016
|
this.collectPackageResources(installedPath, accumulator, filter, metadata);
|
|
995
1017
|
continue;
|
|
996
1018
|
}
|
|
997
1019
|
if (parsed.type === "git") {
|
|
998
|
-
const installedPath = this.getGitInstallPath(parsed,
|
|
1020
|
+
const installedPath = this.getGitInstallPath(parsed, resolvedScope);
|
|
999
1021
|
if (!existsSync(installedPath)) {
|
|
1000
1022
|
const installed = await installMissing();
|
|
1001
1023
|
if (!installed)
|
|
1002
1024
|
continue;
|
|
1003
1025
|
}
|
|
1004
|
-
else if (
|
|
1005
|
-
await this.refreshTemporaryGitSource(parsed,
|
|
1026
|
+
else if (resolvedScope === "temporary" && !parsed.pinned && !isOfflineModeEnabled()) {
|
|
1027
|
+
await this.refreshTemporaryGitSource(parsed, resolvedSource);
|
|
1006
1028
|
}
|
|
1007
1029
|
metadata.baseDir = installedPath;
|
|
1008
1030
|
this.collectPackageResources(installedPath, accumulator, filter, metadata);
|
|
1009
1031
|
}
|
|
1010
1032
|
}
|
|
1011
1033
|
}
|
|
1034
|
+
findAutoloadDeltaBase(pkg, scope, sources) {
|
|
1035
|
+
if (scope !== "project" || typeof pkg !== "object" || pkg.autoload !== false)
|
|
1036
|
+
return undefined;
|
|
1037
|
+
const identity = this.getPackageIdentity(pkg.source, scope);
|
|
1038
|
+
const userEntry = sources.find((entry) => entry.scope === "user" &&
|
|
1039
|
+
this.getPackageIdentity(this.getPackageSourceString(entry.pkg), "user") === identity);
|
|
1040
|
+
return userEntry ? { source: this.getPackageSourceString(userEntry.pkg), scope: "user" } : undefined;
|
|
1041
|
+
}
|
|
1012
1042
|
resolveLocalExtensionSource(source, accumulator, filter, metadata, baseDir) {
|
|
1013
1043
|
const resolved = this.resolvePathFromBase(source.path, baseDir);
|
|
1014
1044
|
if (!existsSync(resolved)) {
|
|
@@ -1119,7 +1149,9 @@ export class DefaultPackageManager {
|
|
|
1119
1149
|
type: "npm",
|
|
1120
1150
|
spec,
|
|
1121
1151
|
name,
|
|
1122
|
-
|
|
1152
|
+
version,
|
|
1153
|
+
range: getNpmVersionRange(version),
|
|
1154
|
+
pinned: isExactNpmVersion(version),
|
|
1123
1155
|
};
|
|
1124
1156
|
}
|
|
1125
1157
|
if (isLocalPath(source)) {
|
|
@@ -1132,16 +1164,12 @@ export class DefaultPackageManager {
|
|
|
1132
1164
|
}
|
|
1133
1165
|
return { type: "local", path: source };
|
|
1134
1166
|
}
|
|
1135
|
-
async
|
|
1167
|
+
async installedNpmMatchesConfiguredVersion(source, installedPath) {
|
|
1136
1168
|
const installedVersion = this.getInstalledNpmVersion(installedPath);
|
|
1137
1169
|
if (!installedVersion) {
|
|
1138
1170
|
return false;
|
|
1139
1171
|
}
|
|
1140
|
-
|
|
1141
|
-
if (!pinnedVersion) {
|
|
1142
|
-
return true;
|
|
1143
|
-
}
|
|
1144
|
-
return installedVersion === pinnedVersion;
|
|
1172
|
+
return source.range ? satisfies(installedVersion, source.range) : true;
|
|
1145
1173
|
}
|
|
1146
1174
|
async npmHasAvailableUpdate(source, installedPath) {
|
|
1147
1175
|
if (isOfflineModeEnabled()) {
|
|
@@ -1152,8 +1180,8 @@ export class DefaultPackageManager {
|
|
|
1152
1180
|
return false;
|
|
1153
1181
|
}
|
|
1154
1182
|
try {
|
|
1155
|
-
const
|
|
1156
|
-
return
|
|
1183
|
+
const targetVersion = await this.getLatestNpmVersion(source.version ? source.spec : source.name, source.range);
|
|
1184
|
+
return targetVersion !== installedVersion;
|
|
1157
1185
|
}
|
|
1158
1186
|
catch {
|
|
1159
1187
|
return false;
|
|
@@ -1172,13 +1200,23 @@ export class DefaultPackageManager {
|
|
|
1172
1200
|
return undefined;
|
|
1173
1201
|
}
|
|
1174
1202
|
}
|
|
1175
|
-
async getLatestNpmVersion(
|
|
1203
|
+
async getLatestNpmVersion(packageSpec, range) {
|
|
1176
1204
|
const npmCommand = this.getNpmCommand();
|
|
1177
|
-
const stdout = await this.runCommandCapture(npmCommand.command, [...npmCommand.args, "view",
|
|
1205
|
+
const stdout = await this.runCommandCapture(npmCommand.command, [...npmCommand.args, "view", packageSpec, "version", "--json"], { cwd: this.cwd, timeoutMs: NETWORK_TIMEOUT_MS });
|
|
1178
1206
|
const raw = stdout.trim();
|
|
1179
1207
|
if (!raw)
|
|
1180
1208
|
throw new Error("Empty response from npm view");
|
|
1181
|
-
|
|
1209
|
+
const parsed = JSON.parse(raw);
|
|
1210
|
+
if (typeof parsed === "string") {
|
|
1211
|
+
return parsed;
|
|
1212
|
+
}
|
|
1213
|
+
if (Array.isArray(parsed)) {
|
|
1214
|
+
const versions = parsed.filter((value) => typeof value === "string" && value.length > 0);
|
|
1215
|
+
const latest = range ? maxSatisfying(versions, range) : [...versions].sort(rcompare)[0];
|
|
1216
|
+
if (latest)
|
|
1217
|
+
return latest;
|
|
1218
|
+
}
|
|
1219
|
+
throw new Error("Unexpected response from npm view");
|
|
1182
1220
|
}
|
|
1183
1221
|
async gitHasAvailableUpdate(installedPath) {
|
|
1184
1222
|
if (isOfflineModeEnabled()) {
|
|
@@ -1342,25 +1380,30 @@ export class DefaultPackageManager {
|
|
|
1342
1380
|
}
|
|
1343
1381
|
/**
|
|
1344
1382
|
* Dedupe packages: if same package identity appears in both global and project,
|
|
1345
|
-
* keep only the project one (project wins).
|
|
1383
|
+
* keep only the project one (project wins). A project entry with autoload=false
|
|
1384
|
+
* is a delta over the global entry, so both are kept (delta first).
|
|
1346
1385
|
*/
|
|
1347
1386
|
dedupePackages(packages) {
|
|
1387
|
+
const result = [];
|
|
1348
1388
|
const seen = new Map();
|
|
1349
1389
|
for (const entry of packages) {
|
|
1350
|
-
const
|
|
1351
|
-
const
|
|
1352
|
-
|
|
1353
|
-
|
|
1354
|
-
|
|
1390
|
+
const identity = this.getPackageIdentity(this.getPackageSourceString(entry.pkg), entry.scope);
|
|
1391
|
+
const index = seen.get(identity);
|
|
1392
|
+
if (index === undefined) {
|
|
1393
|
+
seen.set(identity, result.length);
|
|
1394
|
+
result.push(entry);
|
|
1395
|
+
continue;
|
|
1396
|
+
}
|
|
1397
|
+
const existing = result[index];
|
|
1398
|
+
if (existing?.scope === "project" && entry.scope === "user") {
|
|
1399
|
+
if (typeof existing.pkg === "object" && existing.pkg.autoload === false)
|
|
1400
|
+
result.push(entry);
|
|
1355
1401
|
}
|
|
1356
|
-
else if (entry.scope === "project"
|
|
1357
|
-
|
|
1358
|
-
seen.set(identity, entry);
|
|
1402
|
+
else if (entry.scope === "project") {
|
|
1403
|
+
result[index] = entry;
|
|
1359
1404
|
}
|
|
1360
|
-
// If existing is project and new is global, keep existing (project)
|
|
1361
|
-
// If both are same scope, keep first one
|
|
1362
1405
|
}
|
|
1363
|
-
return
|
|
1406
|
+
return result;
|
|
1364
1407
|
}
|
|
1365
1408
|
parseNpmSpec(spec) {
|
|
1366
1409
|
const match = spec.match(/^(@?[^@]+(?:\/[^@]+)?)(?:@(.+))?$/);
|
|
@@ -1694,7 +1737,10 @@ export class DefaultPackageManager {
|
|
|
1694
1737
|
for (const resourceType of RESOURCE_TYPES) {
|
|
1695
1738
|
const patterns = filter[resourceType];
|
|
1696
1739
|
const target = this.getTargetMap(accumulator, resourceType);
|
|
1697
|
-
if (
|
|
1740
|
+
if (filter.autoload === false) {
|
|
1741
|
+
this.applyPackageDeltaFilter(packageRoot, patterns ?? [], resourceType, target, metadata);
|
|
1742
|
+
}
|
|
1743
|
+
else if (patterns !== undefined) {
|
|
1698
1744
|
this.applyPackageFilter(packageRoot, patterns, resourceType, target, metadata);
|
|
1699
1745
|
}
|
|
1700
1746
|
else {
|
|
@@ -1757,6 +1803,16 @@ export class DefaultPackageManager {
|
|
|
1757
1803
|
this.addResource(target, f, metadata, enabled);
|
|
1758
1804
|
}
|
|
1759
1805
|
}
|
|
1806
|
+
applyPackageDeltaFilter(packageRoot, userPatterns, resourceType, target, metadata) {
|
|
1807
|
+
if (userPatterns.length === 0) {
|
|
1808
|
+
return;
|
|
1809
|
+
}
|
|
1810
|
+
const { allFiles } = this.collectManifestFiles(packageRoot, resourceType);
|
|
1811
|
+
const enabledByUser = applyAutoloadDisabledPatterns(allFiles, userPatterns, packageRoot);
|
|
1812
|
+
for (const [filePath, enabled] of enabledByUser) {
|
|
1813
|
+
this.addResource(target, filePath, metadata, enabled);
|
|
1814
|
+
}
|
|
1815
|
+
}
|
|
1760
1816
|
/**
|
|
1761
1817
|
* Collect all files from a package for a resource type, applying manifest patterns.
|
|
1762
1818
|
* Returns { allFiles, enabledByManifest } where enabledByManifest is the set of files
|