openplanr 2.2641.2 → 3.0.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 +33 -0
- package/dist/cli/commands/doctor.d.ts.map +1 -1
- package/dist/cli/commands/doctor.js +19 -4
- package/dist/cli/commands/doctor.js.map +1 -1
- package/dist/cli/commands/upgrade.d.ts.map +1 -1
- package/dist/cli/commands/upgrade.js +15 -11
- package/dist/cli/commands/upgrade.js.map +1 -1
- package/dist/cli/error-boundary.d.ts.map +1 -1
- package/dist/cli/error-boundary.js +2 -1
- package/dist/cli/error-boundary.js.map +1 -1
- package/dist/dashboard/.vite/manifest.json +1 -1
- package/dist/dashboard/assets/{index-DI_TKz9J.js → index-n08LJ6bK.js} +2 -2
- package/dist/dashboard/assets/{index-DI_TKz9J.js.map → index-n08LJ6bK.js.map} +1 -1
- package/dist/dashboard/dashboard-manifest.json +8 -8
- package/dist/dashboard/index.html +1 -1
- package/dist/services/claude-plugin-service.d.ts +9 -0
- package/dist/services/claude-plugin-service.d.ts.map +1 -1
- package/dist/services/claude-plugin-service.js +12 -0
- package/dist/services/claude-plugin-service.js.map +1 -1
- package/dist/services/runtime-change-summary.d.ts +4 -0
- package/dist/services/runtime-change-summary.d.ts.map +1 -1
- package/dist/services/runtime-change-summary.js +7 -0
- package/dist/services/runtime-change-summary.js.map +1 -1
- package/dist/services/runtime-manager/doctor.js +1 -1
- package/dist/services/runtime-manager/doctor.js.map +1 -1
- package/dist/services/runtime-manager/runtime-package.d.ts +15 -0
- package/dist/services/runtime-manager/runtime-package.d.ts.map +1 -1
- package/dist/services/runtime-manager/runtime-package.js +50 -10
- package/dist/services/runtime-manager/runtime-package.js.map +1 -1
- package/dist/services/runtime-manager-service.d.ts +11 -0
- package/dist/services/runtime-manager-service.d.ts.map +1 -1
- package/dist/services/runtime-manager-service.js +88 -16
- package/dist/services/runtime-manager-service.js.map +1 -1
- package/dist/services/upgrade-report.d.ts +2 -2
- package/dist/services/upgrade-report.d.ts.map +1 -1
- package/dist/services/upgrade-report.js +14 -2
- package/dist/services/upgrade-report.js.map +1 -1
- package/dist/services/upgrade-service.d.ts +22 -2
- package/dist/services/upgrade-service.d.ts.map +1 -1
- package/dist/services/upgrade-service.js +108 -20
- package/dist/services/upgrade-service.js.map +1 -1
- package/docs/CLI.md +4 -1
- package/docs/TROUBLESHOOTING.md +9 -6
- package/install.ps1 +3 -3
- package/install.sh +3 -3
- package/lib/host-packages/adapter-registry.json +5 -5
- package/lib/host-packages/capability-map.json +1 -1
- package/lib/host-packages/claude/.claude-plugin/marketplace.json +2 -2
- package/lib/host-packages/claude/openplanr/.claude-plugin/plugin.json +2 -2
- package/lib/host-packages/claude/openplanr/.openplanr-content.json +21 -21
- package/lib/host-packages/claude/openplanr/README.md +1 -1
- package/lib/host-packages/claude/openplanr/runtime/design/scripts/runtime/packages/artifact/lib/artifact/ui/studio-shell.css +1 -1
- package/lib/host-packages/claude/openplanr/runtime/design/scripts/runtime/packages/design/package.json +4 -4
- package/lib/host-packages/claude/openplanr/runtime/design/scripts/runtime/packages/design/templates/studio/enhancements.css +14 -4
- package/lib/host-packages/claude/openplanr/runtime/design/scripts/runtime/packages/design/templates/studio/studio.css +14 -5
- package/lib/host-packages/claude/openplanr/runtime/design/scripts/runtime/packages/design/templates/studio/studio.js.sources/12-design-review-experience.js +28 -0
- package/lib/host-packages/claude/openplanr/runtime/design/scripts/runtime/packages/design/templates/studio/studio.js.sources/16-studio-shell.js +238 -68
- package/lib/host-packages/claude/openplanr/runtime/design/scripts/runtime/packages/design/templates/studio/studio.js.sources.json +6 -6
- package/lib/host-packages/claude/openplanr/runtime/design/scripts/runtime/packages/protocol/package.json +6 -2
- package/lib/host-packages/claude/openplanr/runtime/plan/scripts/runtime/packages/protocol/package.json +6 -2
- package/lib/host-packages/claude/openplanr/skills/delegate/SKILL.md +1 -1
- package/lib/host-packages/claude/openplanr/skills/delegate/references/capsule-contract.md +1 -1
- package/lib/host-packages/claude/openplanr/skills/delegate/scripts/run-preparation.mjs +3 -3
- package/lib/host-packages/claude/openplanr/skills/design/references/utilities.md +1 -1
- package/lib/host-packages/claude/openplanr/skills/design-loop/references/utilities.md +1 -1
- package/lib/host-packages/claude/openplanr/skills/design-review/references/utilities.md +1 -1
- package/lib/host-packages/claude/openplanr/skills/doctor/SKILL.md +4 -1
- package/lib/host-packages/claude/openplanr/skills/doctor/references/upgrade.md +8 -0
- package/lib/host-packages/claude/openplanr/skills/plan/SKILL.md +2 -2
- package/lib/host-packages/cursor/openplanr/.openplanr-content.json +20 -20
- package/lib/host-packages/cursor/openplanr/manifest.json +1 -1
- package/lib/host-packages/cursor/openplanr/rules/planr-delegate/references/capsule-contract.md +1 -1
- package/lib/host-packages/cursor/openplanr/rules/planr-delegate/scripts/run-preparation.mjs +3 -3
- package/lib/host-packages/cursor/openplanr/rules/planr-delegate.mdc +1 -1
- package/lib/host-packages/cursor/openplanr/rules/planr-design/references/utilities.md +1 -1
- package/lib/host-packages/cursor/openplanr/rules/planr-design-loop/references/utilities.md +1 -1
- package/lib/host-packages/cursor/openplanr/rules/planr-design-review/references/utilities.md +1 -1
- package/lib/host-packages/cursor/openplanr/rules/planr-doctor/references/upgrade.md +8 -0
- package/lib/host-packages/cursor/openplanr/rules/planr-doctor.mdc +4 -1
- package/lib/host-packages/cursor/openplanr/rules/planr-plan.mdc +2 -2
- package/lib/host-packages/cursor/openplanr/runtime/design/scripts/runtime/packages/artifact/lib/artifact/ui/studio-shell.css +1 -1
- package/lib/host-packages/cursor/openplanr/runtime/design/scripts/runtime/packages/design/package.json +4 -4
- package/lib/host-packages/cursor/openplanr/runtime/design/scripts/runtime/packages/design/templates/studio/enhancements.css +14 -4
- package/lib/host-packages/cursor/openplanr/runtime/design/scripts/runtime/packages/design/templates/studio/studio.css +14 -5
- package/lib/host-packages/cursor/openplanr/runtime/design/scripts/runtime/packages/design/templates/studio/studio.js.sources/12-design-review-experience.js +28 -0
- package/lib/host-packages/cursor/openplanr/runtime/design/scripts/runtime/packages/design/templates/studio/studio.js.sources/16-studio-shell.js +238 -68
- package/lib/host-packages/cursor/openplanr/runtime/design/scripts/runtime/packages/design/templates/studio/studio.js.sources.json +6 -6
- package/lib/host-packages/cursor/openplanr/runtime/design/scripts/runtime/packages/protocol/package.json +6 -2
- package/lib/host-packages/cursor/openplanr/runtime/plan/scripts/runtime/packages/protocol/package.json +6 -2
- package/lib/host-packages/openai/.claude-plugin/marketplace.json +2 -2
- package/lib/host-packages/openai/openplanr/.codex-plugin/plugin.json +1 -1
- package/lib/host-packages/openai/openplanr/.openplanr-content.json +20 -20
- package/lib/host-packages/openai/openplanr/runtime/design/scripts/runtime/packages/artifact/lib/artifact/ui/studio-shell.css +1 -1
- package/lib/host-packages/openai/openplanr/runtime/design/scripts/runtime/packages/design/package.json +4 -4
- package/lib/host-packages/openai/openplanr/runtime/design/scripts/runtime/packages/design/templates/studio/enhancements.css +14 -4
- package/lib/host-packages/openai/openplanr/runtime/design/scripts/runtime/packages/design/templates/studio/studio.css +14 -5
- package/lib/host-packages/openai/openplanr/runtime/design/scripts/runtime/packages/design/templates/studio/studio.js.sources/12-design-review-experience.js +28 -0
- package/lib/host-packages/openai/openplanr/runtime/design/scripts/runtime/packages/design/templates/studio/studio.js.sources/16-studio-shell.js +238 -68
- package/lib/host-packages/openai/openplanr/runtime/design/scripts/runtime/packages/design/templates/studio/studio.js.sources.json +6 -6
- package/lib/host-packages/openai/openplanr/runtime/design/scripts/runtime/packages/protocol/package.json +6 -2
- package/lib/host-packages/openai/openplanr/runtime/plan/scripts/runtime/packages/protocol/package.json +6 -2
- package/lib/host-packages/openai/openplanr/skills/delegate/SKILL.md +1 -1
- package/lib/host-packages/openai/openplanr/skills/delegate/references/capsule-contract.md +1 -1
- package/lib/host-packages/openai/openplanr/skills/delegate/scripts/run-preparation.mjs +3 -3
- package/lib/host-packages/openai/openplanr/skills/design/references/utilities.md +1 -1
- package/lib/host-packages/openai/openplanr/skills/design-loop/references/utilities.md +1 -1
- package/lib/host-packages/openai/openplanr/skills/design-review/references/utilities.md +1 -1
- package/lib/host-packages/openai/openplanr/skills/doctor/SKILL.md +4 -1
- package/lib/host-packages/openai/openplanr/skills/doctor/references/upgrade.md +8 -0
- package/lib/host-packages/openai/openplanr/skills/plan/SKILL.md +2 -2
- package/lib/node-runtime.d.mts +1 -1
- package/lib/node-runtime.mjs +2 -7
- package/package.json +5 -6
- package/bin/planr.js +0 -7
|
@@ -1,6 +1,7 @@
|
|
|
1
1
|
import { CLI_COMMAND } from '../utils/constants.js';
|
|
2
2
|
import { display, logger } from '../utils/logger.js';
|
|
3
3
|
import { joinNames } from './runtime-change-summary.js';
|
|
4
|
+
import { claudeManagedPluginNote, isRepairStep, } from './upgrade-service.js';
|
|
4
5
|
const HIGHLIGHTS_PER_RELEASE = 5;
|
|
5
6
|
function releaseNotesUrl(version) {
|
|
6
7
|
return `https://github.com/openplanr/OpenPlanr/releases/tag/openplanr%40${version}`;
|
|
@@ -69,7 +70,9 @@ export function printNextSteps(steps, error) {
|
|
|
69
70
|
display.numbered(index + 1, step.command);
|
|
70
71
|
display.line(` ${step.host}: ${step.detail}`);
|
|
71
72
|
});
|
|
72
|
-
const hosts = [
|
|
73
|
+
const hosts = [
|
|
74
|
+
...new Set(steps.filter((step) => step.runtime && !isRepairStep(step)).map((step) => step.host)),
|
|
75
|
+
];
|
|
73
76
|
display.line(hosts.length > 0
|
|
74
77
|
? ` Then restart ${joinNames(hosts)} and check with \`${CLI_COMMAND} upgrade status\`.`
|
|
75
78
|
: ` Then check with \`${CLI_COMMAND} upgrade status\`.`);
|
|
@@ -89,7 +92,7 @@ export function printUpgradeReport(result, mode) {
|
|
|
89
92
|
printNextSteps(result.nextSteps, result.nextStepsError);
|
|
90
93
|
}
|
|
91
94
|
/** Cached compatibility evidence is useful, but is never a fresh latest-release check. */
|
|
92
|
-
export function printReconciliationStatus(result) {
|
|
95
|
+
export function printReconciliationStatus(result, nextSteps = []) {
|
|
93
96
|
if (result.ecosystemSource === 'stale-cache') {
|
|
94
97
|
logger.warn('The registry could not be reached. Results use stale cached release metadata; the latest release is not confirmed.');
|
|
95
98
|
}
|
|
@@ -102,9 +105,18 @@ export function printReconciliationStatus(result) {
|
|
|
102
105
|
else if (result.status === 'upgrade-available') {
|
|
103
106
|
logger.info('An upgrade is available in the release metadata; the installed components are still mutually compatible.');
|
|
104
107
|
}
|
|
108
|
+
else if (result.status === 'agents-behind') {
|
|
109
|
+
const note = claudeManagedPluginNote(result);
|
|
110
|
+
logger.info(note
|
|
111
|
+
? `The OpenPlanr CLI is up to date (${result.installed.cli}). ${note}`
|
|
112
|
+
: `The OpenPlanr CLI is up to date (${result.installed.cli}). Update your coding agents with the commands below.`);
|
|
113
|
+
}
|
|
105
114
|
else if (result.status === 'incompatible') {
|
|
106
115
|
logger.warn('The installed components are on mutually incompatible versions.');
|
|
107
116
|
}
|
|
117
|
+
else if (nextSteps.some(isRepairStep)) {
|
|
118
|
+
logger.warn('The installed versions are current, but an installation needs a repair; run the commands below.');
|
|
119
|
+
}
|
|
108
120
|
else if (result.ecosystemSource === 'network') {
|
|
109
121
|
logger.success('The installed components match the freshly checked published compatible set.');
|
|
110
122
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"upgrade-report.js","sourceRoot":"","sources":["../../src/services/upgrade-report.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAE,MAAM,uBAAuB,CAAC;AACpD,OAAO,EAAE,OAAO,EAAE,MAAM,EAAE,MAAM,oBAAoB,CAAC;AACrD,OAAO,EAAE,SAAS,EAAE,MAAM,6BAA6B,CAAC;
|
|
1
|
+
{"version":3,"file":"upgrade-report.js","sourceRoot":"","sources":["../../src/services/upgrade-report.ts"],"names":[],"mappings":"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"}
|
|
@@ -45,7 +45,8 @@ export interface EcosystemComponents {
|
|
|
45
45
|
*/
|
|
46
46
|
export type EcosystemSource = 'network' | 'cache' | 'stale-cache' | 'unavailable';
|
|
47
47
|
export interface UpgradeReconciliation {
|
|
48
|
-
|
|
48
|
+
/** `agents-behind`: the CLI is current and a coding agent's OpenPlanr install needs updating. */
|
|
49
|
+
status: 'aligned' | 'upgrade-available' | 'agents-behind' | 'incompatible' | 'unknown';
|
|
49
50
|
installed: {
|
|
50
51
|
cli: string;
|
|
51
52
|
skills: string | null;
|
|
@@ -57,6 +58,16 @@ export interface UpgradeReconciliation {
|
|
|
57
58
|
bundledPipeline?: string | null;
|
|
58
59
|
/** Retired host plugins (`openplanr@…`, `planr-pipeline@…`); informational, doctor warns about them. */
|
|
59
60
|
legacyPlugins?: string[];
|
|
61
|
+
/** The `planr` plugin Claude Code loads, from whichever source installed it. */
|
|
62
|
+
hostPlugin?: InstalledHostPlugin;
|
|
63
|
+
}
|
|
64
|
+
export interface InstalledHostPlugin {
|
|
65
|
+
id: string;
|
|
66
|
+
version: string | null;
|
|
67
|
+
/** `cli` for this CLI's bundled marketplace; `claude` when Claude updates it (directory, synced, another marketplace). */
|
|
68
|
+
managedBy: 'cli' | 'claude';
|
|
69
|
+
/** Older than the plugin this CLI bundles. */
|
|
70
|
+
behind: boolean;
|
|
60
71
|
}
|
|
61
72
|
export interface ReconcileOptions {
|
|
62
73
|
/** Injectable `claude` runner; defaults to the real host command. */
|
|
@@ -78,10 +89,15 @@ export interface ReconcileOptions {
|
|
|
78
89
|
* accepted there.
|
|
79
90
|
*/
|
|
80
91
|
export declare const DEFAULT_ECOSYSTEM_SOURCE = "https://registry.npmjs.org/openplanr/latest";
|
|
92
|
+
/** Where the plugin came from: the plugin directory, a marketplace, or this CLI. */
|
|
93
|
+
export declare function hostPluginSource(plugin: InstalledHostPlugin): string;
|
|
94
|
+
/** How a plugin Claude manages catches up with this CLI, or `undefined` when it need not. */
|
|
95
|
+
export declare function claudeManagedPluginNote(reconciliation: UpgradeReconciliation): string | undefined;
|
|
81
96
|
/**
|
|
82
97
|
* Read the published compatibility manifest, compare it against the real
|
|
83
98
|
* installed tuple (this CLI's version plus the host plugin), and report whether
|
|
84
|
-
* the tuple is aligned, has an upgrade available,
|
|
99
|
+
* the tuple is aligned, has an upgrade available, has a coding agent behind the
|
|
100
|
+
* CLI, or is genuinely incompatible.
|
|
85
101
|
* The warn-vs-fail call is delegated to `classifyComponentDrift` so it is
|
|
86
102
|
* doctor's exact distinction, not a re-derivation.
|
|
87
103
|
*/
|
|
@@ -142,6 +158,10 @@ export interface UpgradeNextStep {
|
|
|
142
158
|
command: string;
|
|
143
159
|
detail: string;
|
|
144
160
|
}
|
|
161
|
+
/** A step that runs doctor to diagnose or repair an install instead of updating it. */
|
|
162
|
+
export declare function isRepairStep(step: UpgradeNextStep): boolean;
|
|
163
|
+
/** An `aligned` CLI whose coding agents still have updates to run reads as `agents-behind`. */
|
|
164
|
+
export declare function withAgentNextSteps(reconciliation: UpgradeReconciliation, nextSteps: readonly UpgradeNextStep[]): UpgradeReconciliation;
|
|
145
165
|
/**
|
|
146
166
|
* One command per installed coding agent whose OpenPlanr files or plugin trail this CLI,
|
|
147
167
|
* planned with the same preview `openplanr runtime update` applies.
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"upgrade-service.d.ts","sourceRoot":"","sources":["../../src/services/upgrade-service.ts"],"names":[],"mappings":"AAAA;;;;;;GAMG;AAWH,OAAO,EACL,KAAK,mBAAmB,
|
|
1
|
+
{"version":3,"file":"upgrade-service.d.ts","sourceRoot":"","sources":["../../src/services/upgrade-service.ts"],"names":[],"mappings":"AAAA;;;;;;GAMG;AAWH,OAAO,EACL,KAAK,mBAAmB,EAIzB,MAAM,4BAA4B,CAAC;AAIpC,OAAO,EAKL,KAAK,SAAS,EAKf,MAAM,8BAA8B,CAAC;AAEtC;;;;GAIG;AACH,eAAO,MAAM,2BAA2B,QAAuD,CAAC;AAEhG;;;;GAIG;AACH,MAAM,WAAW,kBAAkB;IACjC,OAAO,EAAE,MAAM,CAAC;IAChB,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,aAAa,CAAC,EAAE,MAAM,CAAC;CACxB;AAED,MAAM,WAAW,mBAAmB;IAClC,GAAG,EAAE,kBAAkB,CAAC;IACxB,QAAQ,EAAE,kBAAkB,CAAC;IAC7B,MAAM,EAAE,kBAAkB,CAAC;IAC3B,WAAW,CAAC,EAAE,kBAAkB,CAAC;IACjC;;;;OAIG;IACH,KAAK,CAAC,EAAE,UAAU,GAAG,UAAU,CAAC;CACjC;AAED;;;;;;;GAOG;AACH,MAAM,MAAM,eAAe,GAAG,SAAS,GAAG,OAAO,GAAG,aAAa,GAAG,aAAa,CAAC;AAElF,MAAM,WAAW,qBAAqB;IACpC,iGAAiG;IACjG,MAAM,EAAE,SAAS,GAAG,mBAAmB,GAAG,eAAe,GAAG,cAAc,GAAG,SAAS,CAAC;IACvF,SAAS,EAAE;QAAE,GAAG,EAAE,MAAM,CAAC;QAAC,MAAM,EAAE,MAAM,GAAG,IAAI,CAAC;QAAC,QAAQ,EAAE,MAAM,GAAG,IAAI,CAAA;KAAE,CAAC;IAC3E,SAAS,EAAE,mBAAmB,GAAG,IAAI,CAAC;IACtC,eAAe,EAAE,eAAe,CAAC;IACjC,4GAA4G;IAC5G,eAAe,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IAChC,wGAAwG;IACxG,aAAa,CAAC,EAAE,MAAM,EAAE,CAAC;IACzB,gFAAgF;IAChF,UAAU,CAAC,EAAE,mBAAmB,CAAC;CAClC;AAED,MAAM,WAAW,mBAAmB;IAClC,EAAE,EAAE,MAAM,CAAC;IACX,OAAO,EAAE,MAAM,GAAG,IAAI,CAAC;IACvB,0HAA0H;IAC1H,SAAS,EAAE,KAAK,GAAG,QAAQ,CAAC;IAC5B,8CAA8C;IAC9C,MAAM,EAAE,OAAO,CAAC;CACjB;AAED,MAAM,WAAW,gBAAgB;IAC/B,qEAAqE;IACrE,mBAAmB,CAAC,EAAE,mBAAmB,CAAC;IAC1C,iEAAiE;IACjE,SAAS,CAAC,EAAE,OAAO,KAAK,CAAC;IACzB,oEAAoE;IACpE,GAAG,CAAC,EAAE,MAAM,CAAC;IACb,uEAAuE;IACvE,SAAS,CAAC,EAAE,MAAM,CAAC;CACpB;AAED;;;;;;;;GAQG;AACH,eAAO,MAAM,wBAAwB,gDAAgD,CAAC;AA0StF,oFAAoF;AACpF,wBAAgB,gBAAgB,CAAC,MAAM,EAAE,mBAAmB,GAAG,MAAM,CAIpE;AAED,6FAA6F;AAC7F,wBAAgB,uBAAuB,CAAC,cAAc,EAAE,qBAAqB,GAAG,MAAM,GAAG,SAAS,CAIjG;AAED;;;;;;;GAOG;AACH,wBAAsB,uBAAuB,CAC3C,WAAW,EAAE,MAAM,EACnB,OAAO,GAAE,gBAAqB,GAC7B,OAAO,CAAC,qBAAqB,CAAC,CA4EhC;AAQD,MAAM,WAAW,gBAAgB;IAC/B,MAAM,EAAE,MAAM,GAAG,IAAI,CAAC;IACtB,MAAM,EAAE,MAAM,CAAC;IACf,MAAM,EAAE,MAAM,CAAC;IACf,KAAK,CAAC,EAAE,KAAK,CAAC;CACf;AAED,MAAM,MAAM,gBAAgB,GAAG,CAAC,IAAI,EAAE,MAAM,EAAE,KAAK,gBAAgB,CAAC;AA0CpE,MAAM,WAAW,WAAW;IAC1B,OAAO,EAAE,OAAO,CAAC;IACjB,gBAAgB,EAAE,MAAM,GAAG,IAAI,CAAC;IAChC,MAAM,EAAE,MAAM,CAAC;CAChB;AAED;;;;;;;GAOG;AACH,wBAAgB,cAAc,CAAC,cAAc,EAAE,qBAAqB,GAAG,WAAW,CA0DjF;AA2CD;;;;;;;;;;GAUG;AACH,wBAAgB,yBAAyB,CAAC,UAAU,EAAE,MAAM,EAAE,UAAU,EAAE,MAAM,GAAG,MAAM,EAAE,CA6B1F;AAED,gDAAgD;AAChD,MAAM,WAAW,kBAAkB;IACjC,OAAO,EAAE,MAAM,CAAC;IAChB,OAAO,EAAE,MAAM,EAAE,CAAC;CACnB;AAID,4FAA4F;AAC5F,wBAAgB,qBAAqB,CACnC,UAAU,EAAE,MAAM,EAClB,UAAU,EAAE,MAAM,GACjB,kBAAkB,EAAE,CAItB;AAED;;;;GAIG;AACH,wBAAgB,iBAAiB,CAC/B,SAAS,EAAE,MAAM,EACjB,UAAU,EAAE,MAAM,EAClB,UAAU,EAAE,MAAM,GACjB,kBAAkB,EAAE,CAkCtB;AAED;;;GAGG;AACH,MAAM,WAAW,eAAe;IAC9B,OAAO,CAAC,EAAE,SAAS,CAAC;IACpB,IAAI,EAAE,MAAM,CAAC;IACb,OAAO,EAAE,MAAM,CAAC;IAChB,MAAM,EAAE,MAAM,CAAC;CAChB;AA4BD,uFAAuF;AACvF,wBAAgB,YAAY,CAAC,IAAI,EAAE,eAAe,GAAG,OAAO,CAE3D;AAED,+FAA+F;AAC/F,wBAAgB,kBAAkB,CAChC,cAAc,EAAE,qBAAqB,EACrC,SAAS,EAAE,SAAS,eAAe,EAAE,GACpC,qBAAqB,CAKvB;AAuED;;;GAGG;AACH,wBAAsB,gBAAgB,CACpC,UAAU,EAAE,MAAM,EAClB,OAAO,GAAE;IAAE,mBAAmB,CAAC,EAAE,mBAAmB,CAAA;CAAO,GAC1D,OAAO,CAAC,eAAe,EAAE,CAAC,CA4B5B;AAED,0EAA0E;AAC1E,MAAM,WAAW,kBAAkB;IACjC,EAAE,EAAE,MAAM,CAAC;IACX,OAAO,EAAE,OAAO,CAAC;IACjB,cAAc,EAAE,OAAO,CAAC;IACxB,OAAO,CAAC,EAAE,MAAM,CAAC;CAClB;AAED;;;;;;GAMG;AACH,MAAM,MAAM,eAAe,GAAG,CAC5B,WAAW,EAAE,MAAM,EACnB,SAAS,EAAE,MAAM,EACjB,GAAG,EAAE;IAAE,UAAU,EAAE,MAAM,CAAA;CAAE,KACxB,OAAO,CAAC,kBAAkB,EAAE,CAAC,CAAC;AAEnC,6EAA6E;AAC7E,MAAM,MAAM,kBAAkB,GAAG,CAAC,IAAI,EAAE,MAAM,EAAE,KAAK,gBAAgB,CAAC;AA2CtE,8FAA8F;AAC9F,wBAAgB,yBAAyB,CACvC,UAAU,EAAE,MAAM,EAClB,MAAM,GAAE,kBAA8C,GACrD;IAAE,SAAS,EAAE,eAAe,EAAE,CAAC;IAAC,KAAK,CAAC,EAAE,MAAM,CAAA;CAAE,CAwBlD;AAED,MAAM,WAAW,0BAA0B;IACzC,UAAU,EAAE,MAAM,CAAC;IACnB,gBAAgB,EAAE,MAAM,CAAC;IACzB,gFAAgF;IAChF,gBAAgB,CAAC,EAAE,gBAAgB,CAAC;IACpC,6FAA6F;IAC7F,kBAAkB,CAAC,EAAE,kBAAkB,CAAC;IACxC;;;;OAIG;IACH,eAAe,CAAC,EAAE,eAAe,CAAC;CACnC;AAED,MAAM,WAAW,2BAA2B;IAC1C,EAAE,EAAE,OAAO,CAAC;IACZ,WAAW,EAAE,OAAO,CAAC;IACrB,eAAe,EAAE,MAAM,CAAC;IACxB,gBAAgB,EAAE,MAAM,CAAC;IACzB,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,gBAAgB,EAAE,MAAM,EAAE,CAAC;IAC3B,YAAY,EAAE,kBAAkB,EAAE,CAAC;IACnC,iBAAiB,CAAC,EAAE,MAAM,CAAC;IAC3B,SAAS,EAAE,eAAe,EAAE,CAAC;IAC7B,cAAc,CAAC,EAAE,MAAM,CAAC;IACxB,mEAAmE;IACnE,kBAAkB,EAAE,MAAM,EAAE,CAAC;IAC7B,iFAAiF;IACjF,UAAU,EAAE,kBAAkB,EAAE,CAAC;IACjC,OAAO,CAAC,EAAE;QACR,IAAI,EAAE,aAAa,GAAG,QAAQ,GAAG,WAAW,GAAG,WAAW,CAAC;QAC3D,OAAO,EAAE,MAAM,CAAC;KACjB,CAAC;CACH;AAED;;;;;;;;;;;GAWG;AACH,wBAAsB,qBAAqB,CACzC,KAAK,EAAE,0BAA0B,GAChC,OAAO,CAAC,2BAA2B,CAAC,CAoHtC"}
|
|
@@ -283,10 +283,48 @@ function isBehind(installed, published) {
|
|
|
283
283
|
function inspectBundledHostPlugin(runner) {
|
|
284
284
|
return inspectBundledClaudePluginIntegration(bundledHostRoot('claude'), runner);
|
|
285
285
|
}
|
|
286
|
+
/** The bundled plugin when installed, else an enabled `planr` plugin from another source. */
|
|
287
|
+
function installedHostPlugin(inspection) {
|
|
288
|
+
const bundled = inspection.plugins.find((plugin) => plugin.name === OPENPLANR_CLAUDE_PLUGIN && plugin.installed);
|
|
289
|
+
if (bundled) {
|
|
290
|
+
const version = bundled.installedVersion ?? null;
|
|
291
|
+
return {
|
|
292
|
+
id: bundled.id,
|
|
293
|
+
version,
|
|
294
|
+
managedBy: 'cli',
|
|
295
|
+
behind: isBehind(version, bundled.expectedVersion),
|
|
296
|
+
};
|
|
297
|
+
}
|
|
298
|
+
const external = inspection.externalPlugins.find((plugin) => plugin.enabled) ?? inspection.externalPlugins[0];
|
|
299
|
+
if (!external)
|
|
300
|
+
return undefined;
|
|
301
|
+
const version = external.version ?? null;
|
|
302
|
+
return {
|
|
303
|
+
id: external.id,
|
|
304
|
+
version,
|
|
305
|
+
managedBy: 'claude',
|
|
306
|
+
behind: isBehind(version, inspection.plugins[0]?.expectedVersion),
|
|
307
|
+
};
|
|
308
|
+
}
|
|
309
|
+
/** Where the plugin came from: the plugin directory, a marketplace, or this CLI. */
|
|
310
|
+
export function hostPluginSource(plugin) {
|
|
311
|
+
if (plugin.managedBy === 'cli')
|
|
312
|
+
return `${CLI_COMMAND} setup`;
|
|
313
|
+
const marketplace = plugin.id.slice(plugin.id.indexOf('@') + 1);
|
|
314
|
+
return marketplace === 'synced' ? 'Claude plugin directory' : `${marketplace} marketplace`;
|
|
315
|
+
}
|
|
316
|
+
/** How a plugin Claude manages catches up with this CLI, or `undefined` when it need not. */
|
|
317
|
+
export function claudeManagedPluginNote(reconciliation) {
|
|
318
|
+
const plugin = reconciliation.hostPlugin;
|
|
319
|
+
if (plugin?.managedBy !== 'claude' || !plugin.behind)
|
|
320
|
+
return undefined;
|
|
321
|
+
return `Claude Code's ${plugin.id} ${plugin.version} is older than this CLI; Claude updates it from the ${hostPluginSource(plugin)}.`;
|
|
322
|
+
}
|
|
286
323
|
/**
|
|
287
324
|
* Read the published compatibility manifest, compare it against the real
|
|
288
325
|
* installed tuple (this CLI's version plus the host plugin), and report whether
|
|
289
|
-
* the tuple is aligned, has an upgrade available,
|
|
326
|
+
* the tuple is aligned, has an upgrade available, has a coding agent behind the
|
|
327
|
+
* CLI, or is genuinely incompatible.
|
|
290
328
|
* The warn-vs-fail call is delegated to `classifyComponentDrift` so it is
|
|
291
329
|
* doctor's exact distinction, not a re-derivation.
|
|
292
330
|
*/
|
|
@@ -294,13 +332,14 @@ export async function reconcileInstalledTuple(_projectDir, options = {}) {
|
|
|
294
332
|
const cliVersion = readOpenPlanrVersion();
|
|
295
333
|
const bundledPipeline = resolvePipelinePackage(false)?.version ?? null;
|
|
296
334
|
const inspection = inspectBundledHostPlugin(options.claudeCommandRunner);
|
|
297
|
-
const hostPlugin = inspection
|
|
335
|
+
const hostPlugin = installedHostPlugin(inspection);
|
|
298
336
|
const installed = {
|
|
299
337
|
cli: cliVersion,
|
|
300
|
-
skills: hostPlugin?.
|
|
338
|
+
skills: hostPlugin?.version ?? null,
|
|
301
339
|
pipeline: null,
|
|
302
340
|
};
|
|
303
341
|
const legacyPlugins = inspection.legacyPluginIds;
|
|
342
|
+
const pluginReport = hostPlugin ? { hostPlugin } : {};
|
|
304
343
|
const { components: published, source: ecosystemSource } = await loadEcosystem(options);
|
|
305
344
|
if (!published) {
|
|
306
345
|
return {
|
|
@@ -310,12 +349,15 @@ export async function reconcileInstalledTuple(_projectDir, options = {}) {
|
|
|
310
349
|
ecosystemSource,
|
|
311
350
|
bundledPipeline,
|
|
312
351
|
legacyPlugins,
|
|
352
|
+
...pluginReport,
|
|
313
353
|
};
|
|
314
354
|
}
|
|
315
355
|
// "Behind", not "different". `classifyComponentDrift` documents `cliDrift` as "a CLI
|
|
316
356
|
// that merely trails an upgrade", so a direction check is what that input was always
|
|
317
357
|
// meant to carry — an installed component ahead of the registry has nothing to upgrade.
|
|
318
358
|
const cliDrift = isBehind(installed.cli, published.cli.version);
|
|
359
|
+
let agentsBehind;
|
|
360
|
+
let pipelineBehind;
|
|
319
361
|
let componentDrift;
|
|
320
362
|
let incompatibleDrift;
|
|
321
363
|
if (published.shape === 'registry') {
|
|
@@ -323,18 +365,15 @@ export async function reconcileInstalledTuple(_projectDir, options = {}) {
|
|
|
323
365
|
// the pipeline against the pin the published CLI bundles. A registry-described set
|
|
324
366
|
// declares no mutual ranges, so it cannot be incompatible; leftover legacy plugins are
|
|
325
367
|
// reported for doctor's warning, not judged here.
|
|
326
|
-
|
|
327
|
-
|
|
328
|
-
|
|
329
|
-
pluginTrailing ||
|
|
330
|
-
isBehind(installed.pipeline ?? bundledPipeline, published.pipeline.version);
|
|
368
|
+
agentsBehind = hostPlugin?.behind === true;
|
|
369
|
+
pipelineBehind = isBehind(installed.pipeline ?? bundledPipeline, published.pipeline.version);
|
|
370
|
+
componentDrift = cliDrift || agentsBehind || pipelineBehind;
|
|
331
371
|
incompatibleDrift = false;
|
|
332
372
|
}
|
|
333
373
|
else {
|
|
334
|
-
|
|
335
|
-
|
|
336
|
-
|
|
337
|
-
isBehind(installed.pipeline, published.pipeline.version);
|
|
374
|
+
agentsBehind = isBehind(installed.skills, published.skills.version);
|
|
375
|
+
pipelineBehind = isBehind(installed.pipeline, published.pipeline.version);
|
|
376
|
+
componentDrift = cliDrift || agentsBehind || pipelineBehind;
|
|
338
377
|
// A real mutual-compatibility violation: an installed component sits outside
|
|
339
378
|
// the range its published sibling declares. Absent (uninstalled) plugins are
|
|
340
379
|
// not violations — that is a different condition from incompatibility.
|
|
@@ -344,12 +383,23 @@ export async function reconcileInstalledTuple(_projectDir, options = {}) {
|
|
|
344
383
|
violatesRange(installed.cli, published.pipeline.cliRange);
|
|
345
384
|
}
|
|
346
385
|
const classification = classifyComponentDrift({ cliDrift, componentDrift, incompatibleDrift });
|
|
386
|
+
// A current CLI with an agent install behind it is an update to run, not an incompatibility.
|
|
347
387
|
const status = classification.status === 'pass'
|
|
348
388
|
? 'aligned'
|
|
349
389
|
: classification.status === 'warn'
|
|
350
390
|
? 'upgrade-available'
|
|
351
|
-
:
|
|
352
|
-
|
|
391
|
+
: !classification.genuineDrift && agentsBehind && !pipelineBehind
|
|
392
|
+
? 'agents-behind'
|
|
393
|
+
: 'incompatible';
|
|
394
|
+
return {
|
|
395
|
+
status,
|
|
396
|
+
installed,
|
|
397
|
+
published,
|
|
398
|
+
ecosystemSource,
|
|
399
|
+
bundledPipeline,
|
|
400
|
+
legacyPlugins,
|
|
401
|
+
...pluginReport,
|
|
402
|
+
};
|
|
353
403
|
}
|
|
354
404
|
/**
|
|
355
405
|
* The npm-owned half of an upgrade is a single global install. This mirrors
|
|
@@ -428,6 +478,16 @@ export function planCliUpgrade(reconciliation) {
|
|
|
428
478
|
reason: `OpenPlanr ${target} is available; ${installed.cli} is installed.`,
|
|
429
479
|
};
|
|
430
480
|
}
|
|
481
|
+
if (status === 'agents-behind') {
|
|
482
|
+
const note = claudeManagedPluginNote(reconciliation);
|
|
483
|
+
return {
|
|
484
|
+
proceed: false,
|
|
485
|
+
targetCliVersion: null,
|
|
486
|
+
reason: note
|
|
487
|
+
? `OpenPlanr ${installed.cli} is up to date. ${note}`
|
|
488
|
+
: `OpenPlanr ${installed.cli} is up to date. Update your coding agents with the commands below.`,
|
|
489
|
+
};
|
|
490
|
+
}
|
|
431
491
|
if (status === 'incompatible' && compareStableVersions(installed.cli, target) < 0) {
|
|
432
492
|
return {
|
|
433
493
|
proceed: true,
|
|
@@ -602,7 +662,21 @@ function nextStepCommand(runtime, scope, skillMode, operations) {
|
|
|
602
662
|
}
|
|
603
663
|
return `${CLI_COMMAND} runtime update ${RUNTIME_COMMAND_NAMES[runtime]} --scope ${scope} --yes`;
|
|
604
664
|
}
|
|
605
|
-
/**
|
|
665
|
+
/** A step that runs doctor to diagnose or repair an install instead of updating it. */
|
|
666
|
+
export function isRepairStep(step) {
|
|
667
|
+
return step.command.startsWith(`${CLI_COMMAND} doctor`);
|
|
668
|
+
}
|
|
669
|
+
/** An `aligned` CLI whose coding agents still have updates to run reads as `agents-behind`. */
|
|
670
|
+
export function withAgentNextSteps(reconciliation, nextSteps) {
|
|
671
|
+
return reconciliation.status === 'aligned' &&
|
|
672
|
+
nextSteps.some((step) => step.runtime && !isRepairStep(step))
|
|
673
|
+
? { ...reconciliation, status: 'agents-behind' }
|
|
674
|
+
: reconciliation;
|
|
675
|
+
}
|
|
676
|
+
/**
|
|
677
|
+
* Recorded installs, plus a Claude plugin installed without a record of it. A user-scope Claude
|
|
678
|
+
* install is left out while Claude manages the `planr` plugin, since setup would add a second one.
|
|
679
|
+
*/
|
|
606
680
|
async function nextStepCandidates(projectDir, claudeCommandRunner) {
|
|
607
681
|
let candidates = [];
|
|
608
682
|
let stateError;
|
|
@@ -614,10 +688,13 @@ async function nextStepCandidates(projectDir, claudeCommandRunner) {
|
|
|
614
688
|
throw error;
|
|
615
689
|
stateError = error;
|
|
616
690
|
}
|
|
617
|
-
|
|
618
|
-
|
|
619
|
-
|
|
620
|
-
|
|
691
|
+
const claudeUser = ({ runtime, scope }) => runtime === 'claude-code' && scope === 'user';
|
|
692
|
+
const hostPlugin = installedHostPlugin(inspectBundledHostPlugin(claudeCommandRunner));
|
|
693
|
+
if (hostPlugin?.managedBy === 'claude') {
|
|
694
|
+
candidates = candidates.filter((candidate) => !claudeUser(candidate));
|
|
695
|
+
}
|
|
696
|
+
else if (hostPlugin && !candidates.some(claudeUser)) {
|
|
697
|
+
candidates.unshift({ runtime: 'claude-code', scope: 'user' });
|
|
621
698
|
}
|
|
622
699
|
return { candidates, ...(stateError ? { stateError } : {}) };
|
|
623
700
|
}
|
|
@@ -632,6 +709,16 @@ async function planNextStep({ runtime, scope, skillMode }, projectDir, claudeCom
|
|
|
632
709
|
...(skillMode ? { skillMode } : {}),
|
|
633
710
|
...(claudeCommandRunner ? { claudeCommandRunner } : {}),
|
|
634
711
|
});
|
|
712
|
+
// `runtime update` refuses to apply a preview with a failed check, so point at doctor instead.
|
|
713
|
+
const failure = preview.runtimeDiagnostics.find((diagnostic) => diagnostic.runtime === runtime && diagnostic.status === 'fail');
|
|
714
|
+
if (failure) {
|
|
715
|
+
return {
|
|
716
|
+
runtime,
|
|
717
|
+
host: RUNTIME_LABELS[runtime],
|
|
718
|
+
command: `${CLI_COMMAND} doctor`,
|
|
719
|
+
detail: failure.fix ? `${failure.message} ${failure.fix}` : failure.message,
|
|
720
|
+
};
|
|
721
|
+
}
|
|
635
722
|
const change = summarizeRuntimeChanges(preview, {
|
|
636
723
|
bookkeepingRoot: runtimeRoot(),
|
|
637
724
|
applied: false,
|
|
@@ -654,10 +741,11 @@ export async function upgradeNextSteps(projectDir, options = {}) {
|
|
|
654
741
|
const doctorStep = (error, runtime) => {
|
|
655
742
|
if (steps.some((step) => step.detail === error.message))
|
|
656
743
|
return;
|
|
744
|
+
const repairable = error instanceof RuntimeManagerError && error.code === 'E_RUNTIME_PACKAGE_CHANGED';
|
|
657
745
|
steps.push({
|
|
658
746
|
...(runtime ? { runtime } : {}),
|
|
659
747
|
host: runtime ? RUNTIME_LABELS[runtime] : 'OpenPlanr',
|
|
660
|
-
command: `${CLI_COMMAND} doctor`,
|
|
748
|
+
command: `${CLI_COMMAND} doctor${repairable ? ' --fix' : ''}`,
|
|
661
749
|
detail: error.message,
|
|
662
750
|
});
|
|
663
751
|
};
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"upgrade-service.js","sourceRoot":"","sources":["../../src/services/upgrade-service.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"upgrade-service.js","sourceRoot":"","sources":["../../src/services/upgrade-service.ts"],"names":[],"mappings":"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"}
|
package/docs/CLI.md
CHANGED
|
@@ -593,7 +593,10 @@ Failures from packet commands are bounded in both human and `--json` output;
|
|
|
593
593
|
machine output contains `ok`, `code`, and `problem` without stack traces or host
|
|
594
594
|
paths. For setup or command parity failures, run `openplanr doctor --strict --json`.
|
|
595
595
|
Use `openplanr upgrade status`, then `openplanr upgrade apply` when doctor reports an
|
|
596
|
-
incompatible installed CLI. `upgrade
|
|
596
|
+
incompatible installed CLI. `upgrade status` reports `aligned`, `upgrade-available`
|
|
597
|
+
(a newer CLI is published), `agents-behind` (the CLI is current; run the commands it
|
|
598
|
+
lists to update your coding agents) or `incompatible`.
|
|
599
|
+
`upgrade apply` prints the new version, up to five
|
|
597
600
|
highlights per release (`--notes full` prints every entry), and the command that
|
|
598
601
|
updates each installed coding agent. The published compatible set is read from the npm
|
|
599
602
|
registry's `latest` CLI document (its version and the exact `planr-pipeline` it
|
package/docs/TROUBLESHOOTING.md
CHANGED
|
@@ -260,9 +260,12 @@ or changed package closure. `openplanr doctor --fix` uses the same preview, back
|
|
|
260
260
|
ownership checks and transaction as setup. It preserves the saved scope and
|
|
261
261
|
Codex mode. `openplanr runtime update <agent>` updates only that agent.
|
|
262
262
|
|
|
263
|
-
A partially copied exact cache can resume from the installed CLI.
|
|
264
|
-
|
|
265
|
-
|
|
266
|
-
|
|
267
|
-
|
|
268
|
-
|
|
263
|
+
A partially copied exact cache can resume from the installed CLI. When a file in
|
|
264
|
+
the package for the installed CLI version was changed or added, setup and
|
|
265
|
+
`openplanr runtime update` stop and name it. `openplanr doctor --fix` previews
|
|
266
|
+
restoring that package from the installed CLI and, after you confirm, backs up the
|
|
267
|
+
changed files before it replaces or removes them. Edited discovery entries are
|
|
268
|
+
preserved as conflicts; inspect them instead of deleting the cache or relaxing
|
|
269
|
+
ownership checks. Packages retained for other versions are never changed or
|
|
270
|
+
cleaned up during repair. If a concurrent edit prevents rollback, the edit and
|
|
271
|
+
migration backup remain available and the error names the affected paths.
|
package/install.ps1
CHANGED
|
@@ -7,12 +7,12 @@ $ErrorActionPreference = 'Stop'
|
|
|
7
7
|
|
|
8
8
|
$node = Get-Command node -ErrorAction SilentlyContinue
|
|
9
9
|
if (-not $node) {
|
|
10
|
-
throw 'E_NODE_NOT_FOUND: OpenPlanr requires Node.js ^
|
|
10
|
+
throw 'E_NODE_NOT_FOUND: OpenPlanr requires Node.js ^22.13.0 || >=23.5.0. Install Node.js and rerun; it is never installed silently.'
|
|
11
11
|
}
|
|
12
12
|
|
|
13
|
-
& node -e 'const version = process.versions.node; const [major, minor, patch] = version.replace(/^v/u, String()).split(String.fromCharCode(46)).map(Number); process.exit(/^v?(0|[1-9]\d*)\.(0|[1-9]\d*)\.(0|[1-9]\d*)$/u.test(version) && [major, minor, patch].every(Number.isSafeInteger) && ((major ===
|
|
13
|
+
& node -e 'const version = process.versions.node; const [major, minor, patch] = version.replace(/^v/u, String()).split(String.fromCharCode(46)).map(Number); process.exit(/^v?(0|[1-9]\d*)\.(0|[1-9]\d*)\.(0|[1-9]\d*)$/u.test(version) && [major, minor, patch].every(Number.isSafeInteger) && ((major === 22 && minor >= 13) || (major === 23 && minor >= 5) || major > 23) ? 0 : 1)'
|
|
14
14
|
if ($LASTEXITCODE -ne 0) {
|
|
15
|
-
throw "E_NODE_VERSION: OpenPlanr requires Node.js ^
|
|
15
|
+
throw "E_NODE_VERSION: OpenPlanr requires Node.js ^22.13.0 || >=23.5.0; found $(& node --version)."
|
|
16
16
|
}
|
|
17
17
|
|
|
18
18
|
$installArgs = @('install', '--global', '--no-audit', '--no-fund', '--loglevel=error')
|
package/install.sh
CHANGED
|
@@ -26,13 +26,13 @@ while [ "$#" -gt 0 ]; do
|
|
|
26
26
|
done
|
|
27
27
|
|
|
28
28
|
if ! command -v node >/dev/null 2>&1; then
|
|
29
|
-
printf '%s\n' 'E_NODE_NOT_FOUND: OpenPlanr requires Node.js ^
|
|
29
|
+
printf '%s\n' 'E_NODE_NOT_FOUND: OpenPlanr requires Node.js ^22.13.0 || >=23.5.0.' >&2
|
|
30
30
|
printf '%s\n' 'Install Node.js, then rerun this installer. Node.js is never installed silently.' >&2
|
|
31
31
|
exit 1
|
|
32
32
|
fi
|
|
33
33
|
|
|
34
|
-
if ! node -e 'const version = process.versions.node; const [major, minor, patch] = version.replace(/^v/u, String()).split(String.fromCharCode(46)).map(Number); process.exit(/^v?(0|[1-9]\d*)\.(0|[1-9]\d*)\.(0|[1-9]\d*)$/u.test(version) && [major, minor, patch].every(Number.isSafeInteger) && ((major ===
|
|
35
|
-
printf '%s\n' "E_NODE_VERSION: OpenPlanr requires Node.js ^
|
|
34
|
+
if ! node -e 'const version = process.versions.node; const [major, minor, patch] = version.replace(/^v/u, String()).split(String.fromCharCode(46)).map(Number); process.exit(/^v?(0|[1-9]\d*)\.(0|[1-9]\d*)\.(0|[1-9]\d*)$/u.test(version) && [major, minor, patch].every(Number.isSafeInteger) && ((major === 22 && minor >= 13) || (major === 23 && minor >= 5) || major > 23) ? 0 : 1)'; then
|
|
35
|
+
printf '%s\n' "E_NODE_VERSION: OpenPlanr requires Node.js ^22.13.0 || >=23.5.0; found $(node --version)." >&2
|
|
36
36
|
exit 1
|
|
37
37
|
fi
|
|
38
38
|
|
|
@@ -2,12 +2,12 @@
|
|
|
2
2
|
"kind": "host-native-adapter-registry",
|
|
3
3
|
"schemaVersion": "1.0.0",
|
|
4
4
|
"protocolVersion": "1.8.0",
|
|
5
|
-
"pipelineVersion": "0.
|
|
6
|
-
"pluginVersion": "
|
|
5
|
+
"pipelineVersion": "0.59.0",
|
|
6
|
+
"pluginVersion": "3.0.1",
|
|
7
7
|
"adapters": [
|
|
8
8
|
{
|
|
9
9
|
"id": "claude-code",
|
|
10
|
-
"version": "
|
|
10
|
+
"version": "3.0.1",
|
|
11
11
|
"capabilityLevel": "product",
|
|
12
12
|
"installScopes": [
|
|
13
13
|
"user",
|
|
@@ -19,7 +19,7 @@
|
|
|
19
19
|
},
|
|
20
20
|
{
|
|
21
21
|
"id": "codex",
|
|
22
|
-
"version": "
|
|
22
|
+
"version": "3.0.1",
|
|
23
23
|
"capabilityLevel": "product",
|
|
24
24
|
"installScopes": [
|
|
25
25
|
"user",
|
|
@@ -31,7 +31,7 @@
|
|
|
31
31
|
},
|
|
32
32
|
{
|
|
33
33
|
"id": "cursor",
|
|
34
|
-
"version": "
|
|
34
|
+
"version": "3.0.1",
|
|
35
35
|
"capabilityLevel": "workflow",
|
|
36
36
|
"installScopes": [
|
|
37
37
|
"project"
|