@ouro.bot/cli 0.1.0-alpha.28 → 0.1.0-alpha.281
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/README.md +187 -191
- package/{AdoptionSpecialist.ouro → SerpentGuide.ouro}/agent.json +3 -2
- package/{AdoptionSpecialist.ouro → SerpentGuide.ouro}/psyche/SOUL.md +1 -1
- package/changelog.json +1703 -0
- package/dist/arc/attention-types.js +8 -0
- package/dist/arc/cares.js +140 -0
- package/dist/arc/episodes.js +117 -0
- package/dist/arc/intentions.js +133 -0
- package/dist/arc/json-store.js +117 -0
- package/dist/arc/obligations.js +237 -0
- package/dist/arc/presence.js +185 -0
- package/dist/heart/active-work.js +832 -0
- package/dist/heart/agent-entry.js +37 -2
- package/dist/heart/auth/auth-flow.js +456 -0
- package/dist/heart/bridges/manager.js +358 -0
- package/dist/heart/bridges/state-machine.js +135 -0
- package/dist/heart/bridges/store.js +123 -0
- package/dist/heart/bundle-state.js +147 -0
- package/dist/heart/commitments.js +111 -0
- package/dist/heart/config-registry.js +304 -0
- package/dist/heart/config.js +63 -30
- package/dist/heart/core.js +644 -196
- package/dist/heart/cross-chat-delivery.js +131 -0
- package/dist/heart/daemon/agent-config-check.js +149 -0
- package/dist/heart/daemon/agent-discovery.js +79 -3
- package/dist/heart/daemon/agent-service.js +360 -0
- package/dist/heart/daemon/cadence.js +70 -0
- package/dist/heart/daemon/cli-defaults.js +574 -0
- package/dist/heart/daemon/cli-exec.js +1932 -0
- package/dist/heart/daemon/cli-parse.js +762 -0
- package/dist/heart/daemon/cli-render.js +503 -0
- package/dist/heart/daemon/cli-types.js +8 -0
- package/dist/heart/daemon/daemon-cli.js +29 -1155
- package/dist/heart/daemon/daemon-entry.js +234 -3
- package/dist/heart/daemon/daemon-health.js +136 -0
- package/dist/heart/daemon/daemon-runtime-sync.js +153 -12
- package/dist/heart/daemon/daemon-tombstone.js +236 -0
- package/dist/heart/daemon/daemon.js +702 -57
- package/dist/heart/daemon/hooks/agent-config-v2.js +33 -0
- package/dist/heart/daemon/hooks/bundle-meta.js +115 -1
- package/dist/heart/daemon/inner-status.js +89 -0
- package/dist/heart/daemon/launchd.js +46 -9
- package/dist/heart/daemon/log-tailer.js +82 -12
- package/dist/heart/daemon/logs-prune.js +105 -0
- package/dist/heart/daemon/message-router.js +17 -8
- package/dist/heart/daemon/os-cron-deps.js +134 -0
- package/dist/heart/daemon/ouro-bot-entry.js +1 -1
- package/dist/heart/daemon/process-manager.js +180 -0
- package/dist/heart/daemon/pulse.js +463 -0
- package/dist/heart/daemon/run-hooks.js +2 -0
- package/dist/heart/daemon/runtime-logging.js +67 -16
- package/dist/heart/daemon/runtime-metadata.js +101 -0
- package/dist/heart/daemon/runtime-mode.js +67 -0
- package/dist/heart/daemon/safe-mode.js +161 -0
- package/dist/heart/daemon/sense-manager.js +72 -3
- package/dist/heart/daemon/session-id-resolver.js +131 -0
- package/dist/heart/daemon/skill-management-installer.js +94 -0
- package/dist/heart/daemon/socket-client.js +307 -0
- package/dist/heart/daemon/task-scheduler.js +3 -25
- package/dist/heart/daemon/thoughts.js +510 -0
- package/dist/heart/delegation.js +62 -0
- package/dist/heart/habits/habit-migration.js +181 -0
- package/dist/heart/habits/habit-parser.js +119 -0
- package/dist/heart/habits/habit-scheduler.js +371 -0
- package/dist/heart/{daemon → hatch}/hatch-flow.js +30 -120
- package/dist/heart/{daemon → hatch}/hatch-specialist.js +3 -3
- package/dist/heart/{daemon → hatch}/specialist-prompt.js +10 -7
- package/dist/heart/{daemon → hatch}/specialist-tools.js +49 -3
- package/dist/heart/identity.js +163 -60
- package/dist/heart/kicks.js +2 -20
- package/dist/heart/mcp/mcp-server.js +653 -0
- package/dist/heart/migrate-config.js +127 -0
- package/dist/heart/model-capabilities.js +59 -0
- package/dist/heart/outlook/outlook-http.js +439 -0
- package/dist/heart/outlook/outlook-read.js +1618 -0
- package/dist/heart/outlook/outlook-render.js +1032 -0
- package/dist/heart/outlook/outlook-types.js +7 -0
- package/dist/heart/outlook/outlook-view.js +194 -0
- package/dist/heart/progress-story.js +42 -0
- package/dist/heart/provider-failover.js +88 -0
- package/dist/heart/provider-ping.js +162 -0
- package/dist/heart/providers/anthropic-token.js +163 -0
- package/dist/heart/providers/anthropic.js +169 -46
- package/dist/heart/providers/azure.js +98 -11
- package/dist/heart/providers/error-classification.js +63 -0
- package/dist/heart/providers/github-copilot.js +136 -0
- package/dist/heart/providers/minimax-vlm.js +189 -0
- package/dist/heart/providers/minimax.js +23 -5
- package/dist/heart/providers/openai-codex.js +33 -22
- package/dist/heart/session-activity.js +172 -0
- package/dist/heart/session-recall.js +216 -0
- package/dist/heart/start-of-turn-packet.js +339 -0
- package/dist/heart/streaming.js +36 -27
- package/dist/heart/sync.js +277 -0
- package/dist/heart/target-resolution.js +127 -0
- package/dist/heart/tempo.js +93 -0
- package/dist/heart/temporal-view.js +41 -0
- package/dist/heart/tool-activity-callbacks.js +36 -0
- package/dist/heart/tool-description.js +135 -0
- package/dist/heart/tool-loop.js +200 -0
- package/dist/heart/turn-context.js +358 -0
- package/dist/heart/turn-coordinator.js +28 -0
- package/dist/heart/versioning/ouro-bot-global-installer.js +128 -0
- package/dist/heart/{daemon → versioning}/ouro-bot-wrapper.js +1 -1
- package/dist/heart/{daemon → versioning}/ouro-path-installer.js +78 -35
- package/dist/heart/versioning/ouro-version-manager.js +295 -0
- package/dist/heart/{daemon → versioning}/staged-restart.js +40 -8
- package/dist/heart/{daemon → versioning}/update-checker.js +12 -2
- package/dist/heart/{daemon → versioning}/update-hooks.js +63 -59
- package/dist/mind/associative-recall.js +126 -66
- package/dist/mind/bundle-manifest.js +8 -1
- package/dist/mind/context.js +125 -14
- package/dist/mind/{memory.js → diary.js} +68 -96
- package/dist/mind/embedding-provider.js +60 -0
- package/dist/mind/file-state.js +179 -0
- package/dist/mind/first-impressions.js +14 -1
- package/dist/mind/friends/channel.js +56 -0
- package/dist/mind/friends/group-context.js +144 -0
- package/dist/mind/friends/resolver.js +37 -0
- package/dist/mind/friends/store-file.js +58 -3
- package/dist/mind/friends/trust-explanation.js +74 -0
- package/dist/mind/friends/types.js +8 -0
- package/dist/mind/journal-index.js +161 -0
- package/dist/mind/obligation-steering.js +221 -0
- package/dist/mind/pending.js +76 -9
- package/dist/mind/prompt.js +874 -109
- package/dist/mind/scrutiny.js +173 -0
- package/dist/mind/token-estimate.js +8 -12
- package/dist/nerves/cli-logging.js +7 -1
- package/dist/nerves/coverage/audit.js +1 -1
- package/dist/nerves/coverage/file-completeness.js +50 -5
- package/dist/nerves/coverage/run-artifacts.js +1 -1
- package/dist/nerves/event-buffer.js +111 -0
- package/dist/nerves/index.js +220 -4
- package/dist/nerves/observation.js +20 -0
- package/dist/nerves/runtime.js +5 -1
- package/dist/outlook-ui/assets/index-Ck8agNeO.js +61 -0
- package/dist/outlook-ui/assets/index-LwChZTgL.css +1 -0
- package/dist/outlook-ui/index.html +15 -0
- package/dist/repertoire/ado-client.js +15 -56
- package/dist/repertoire/ado-semantic.js +11 -10
- package/dist/repertoire/api-client.js +97 -0
- package/dist/repertoire/bitwarden-store.js +319 -0
- package/dist/repertoire/bw-installer.js +79 -0
- package/dist/repertoire/coding/codex-jsonl.js +64 -0
- package/dist/repertoire/coding/context-pack.js +330 -0
- package/dist/repertoire/coding/feedback.js +197 -30
- package/dist/repertoire/coding/manager.js +149 -2
- package/dist/repertoire/coding/spawner.js +55 -9
- package/dist/repertoire/coding/tools.js +170 -7
- package/dist/repertoire/commerce-errors.js +109 -0
- package/dist/repertoire/commerce-self-test.js +156 -0
- package/dist/repertoire/credential-access.js +515 -0
- package/dist/repertoire/duffel-client.js +185 -0
- package/dist/repertoire/github-client.js +14 -55
- package/dist/repertoire/graph-client.js +11 -52
- package/dist/repertoire/guardrails.js +369 -0
- package/dist/repertoire/mcp-client.js +255 -0
- package/dist/repertoire/mcp-manager.js +305 -0
- package/dist/repertoire/mcp-tools.js +63 -0
- package/dist/repertoire/shell-sessions.js +133 -0
- package/dist/repertoire/skills.js +14 -23
- package/dist/repertoire/stripe-client.js +131 -0
- package/dist/repertoire/tasks/board.js +43 -5
- package/dist/repertoire/tasks/fix.js +182 -0
- package/dist/repertoire/tasks/index.js +28 -10
- package/dist/repertoire/tasks/lifecycle.js +2 -2
- package/dist/repertoire/tasks/parser.js +3 -2
- package/dist/repertoire/tasks/scanner.js +194 -37
- package/dist/repertoire/tasks/transitions.js +11 -28
- package/dist/repertoire/tools-base.js +43 -771
- package/dist/repertoire/tools-bluebubbles.js +201 -0
- package/dist/repertoire/tools-bridge.js +141 -0
- package/dist/repertoire/tools-config.js +185 -0
- package/dist/repertoire/tools-continuity.js +248 -0
- package/dist/repertoire/tools-credential.js +182 -0
- package/dist/repertoire/tools-files.js +342 -0
- package/dist/repertoire/tools-flight.js +224 -0
- package/dist/repertoire/tools-flow.js +62 -0
- package/dist/repertoire/tools-github.js +1 -7
- package/dist/repertoire/tools-memory.js +347 -0
- package/dist/repertoire/tools-session.js +739 -0
- package/dist/repertoire/tools-shell.js +120 -0
- package/dist/repertoire/tools-stripe.js +180 -0
- package/dist/repertoire/tools-surface.js +243 -0
- package/dist/repertoire/tools-teams.js +12 -62
- package/dist/repertoire/tools-travel.js +125 -0
- package/dist/repertoire/tools-user-profile.js +144 -0
- package/dist/repertoire/tools-vault.js +110 -0
- package/dist/repertoire/tools.js +155 -130
- package/dist/repertoire/travel-api-client.js +360 -0
- package/dist/repertoire/user-profile.js +118 -0
- package/dist/repertoire/vault-setup.js +241 -0
- package/dist/scripts/claude-code-hook.js +41 -0
- package/dist/scripts/claude-code-stop-hook.js +47 -0
- package/dist/senses/attention-queue.js +97 -0
- package/dist/senses/bluebubbles/attachment-cache.js +53 -0
- package/dist/senses/{bluebubbles-client.js → bluebubbles/client.js} +143 -9
- package/dist/senses/bluebubbles/entry.js +13 -0
- package/dist/senses/bluebubbles/inbound-log.js +110 -0
- package/dist/senses/bluebubbles/index.js +1410 -0
- package/dist/senses/{bluebubbles-media.js → bluebubbles/media.js} +140 -23
- package/dist/senses/{bluebubbles-model.js → bluebubbles/model.js} +20 -5
- package/dist/senses/{bluebubbles-mutation-log.js → bluebubbles/mutation-log.js} +46 -6
- package/dist/senses/bluebubbles/runtime-state.js +109 -0
- package/dist/senses/bluebubbles/session-cleanup.js +72 -0
- package/dist/senses/cli/bracketed-paste.js +82 -0
- package/dist/senses/cli/image-paste.js +211 -0
- package/dist/senses/cli/image-ref-navigation.js +75 -0
- package/dist/senses/cli/ink-app.js +156 -0
- package/dist/senses/cli/inline-diff.js +64 -0
- package/dist/senses/cli/input-keys.js +174 -0
- package/dist/senses/cli/kill-ring.js +86 -0
- package/dist/senses/cli/message-list.js +51 -0
- package/dist/senses/cli/ouro-tui.js +595 -0
- package/dist/senses/cli/spinner-imperative.js +135 -0
- package/dist/senses/cli/spinner.js +101 -0
- package/dist/senses/cli/status-line.js +60 -0
- package/dist/senses/cli/streaming-markdown.js +526 -0
- package/dist/senses/cli/tool-display.js +83 -0
- package/dist/senses/cli/tool-render.js +85 -0
- package/dist/senses/cli/tui-store.js +240 -0
- package/dist/senses/cli/virtual-list.js +35 -0
- package/dist/senses/cli-entry.js +1 -1
- package/dist/senses/cli-layout.js +187 -0
- package/dist/senses/cli.js +569 -246
- package/dist/senses/commands.js +65 -1
- package/dist/senses/continuity.js +94 -0
- package/dist/senses/habit-turn-message.js +108 -0
- package/dist/senses/inner-dialog-worker.js +112 -19
- package/dist/senses/inner-dialog.js +593 -85
- package/dist/senses/pipeline.js +560 -0
- package/dist/senses/shared-turn.js +199 -0
- package/dist/senses/surface-tool.js +68 -0
- package/dist/senses/teams.js +664 -165
- package/dist/senses/trust-gate.js +112 -2
- package/package.json +14 -7
- package/skills/agent-commerce.md +106 -0
- package/skills/browser-navigation.md +110 -0
- package/skills/commerce-setup-guide.md +116 -0
- package/skills/commerce-setup.md +84 -0
- package/skills/configure-dev-tools.md +81 -0
- package/skills/travel-planning.md +138 -0
- package/dist/heart/daemon/subagent-installer.js +0 -134
- package/dist/senses/bluebubbles-entry.js +0 -11
- package/dist/senses/bluebubbles.js +0 -421
- package/dist/senses/debug-activity.js +0 -108
- package/subagents/README.md +0 -73
- package/subagents/work-doer.md +0 -235
- package/subagents/work-merger.md +0 -618
- package/subagents/work-planner.md +0 -382
- /package/{AdoptionSpecialist.ouro → SerpentGuide.ouro}/psyche/identities/basilisk.md +0 -0
- /package/{AdoptionSpecialist.ouro → SerpentGuide.ouro}/psyche/identities/jafar.md +0 -0
- /package/{AdoptionSpecialist.ouro → SerpentGuide.ouro}/psyche/identities/jormungandr.md +0 -0
- /package/{AdoptionSpecialist.ouro → SerpentGuide.ouro}/psyche/identities/kaa.md +0 -0
- /package/{AdoptionSpecialist.ouro → SerpentGuide.ouro}/psyche/identities/medusa.md +0 -0
- /package/{AdoptionSpecialist.ouro → SerpentGuide.ouro}/psyche/identities/monty.md +0 -0
- /package/{AdoptionSpecialist.ouro → SerpentGuide.ouro}/psyche/identities/nagini.md +0 -0
- /package/{AdoptionSpecialist.ouro → SerpentGuide.ouro}/psyche/identities/ouroboros.md +0 -0
- /package/{AdoptionSpecialist.ouro → SerpentGuide.ouro}/psyche/identities/python.md +0 -0
- /package/{AdoptionSpecialist.ouro → SerpentGuide.ouro}/psyche/identities/quetzalcoatl.md +0 -0
- /package/{AdoptionSpecialist.ouro → SerpentGuide.ouro}/psyche/identities/sir-hiss.md +0 -0
- /package/{AdoptionSpecialist.ouro → SerpentGuide.ouro}/psyche/identities/the-serpent.md +0 -0
- /package/{AdoptionSpecialist.ouro → SerpentGuide.ouro}/psyche/identities/the-snake.md +0 -0
- /package/dist/heart/{daemon → hatch}/hatch-animation.js +0 -0
- /package/dist/heart/{daemon → hatch}/specialist-orchestrator.js +0 -0
- /package/dist/heart/{daemon → versioning}/ouro-uti.js +0 -0
- /package/dist/heart/{daemon → versioning}/wrapper-publish-guard.js +0 -0
|
@@ -1,7 +1,16 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.createTurnCoordinator = createTurnCoordinator;
|
|
4
|
+
exports.withSharedTurnLock = withSharedTurnLock;
|
|
5
|
+
exports.tryBeginSharedTurn = tryBeginSharedTurn;
|
|
6
|
+
exports.endSharedTurn = endSharedTurn;
|
|
7
|
+
exports.isSharedTurnActive = isSharedTurnActive;
|
|
8
|
+
exports.enqueueSharedFollowUp = enqueueSharedFollowUp;
|
|
9
|
+
exports.drainSharedFollowUps = drainSharedFollowUps;
|
|
4
10
|
const runtime_1 = require("../nerves/runtime");
|
|
11
|
+
function scopedKey(scope, key) {
|
|
12
|
+
return `${scope}:${key}`;
|
|
13
|
+
}
|
|
5
14
|
function createTurnCoordinator() {
|
|
6
15
|
const turnLocks = new Map();
|
|
7
16
|
const activeTurns = new Set();
|
|
@@ -60,3 +69,22 @@ function createTurnCoordinator() {
|
|
|
60
69
|
},
|
|
61
70
|
};
|
|
62
71
|
}
|
|
72
|
+
const _sharedTurnCoordinator = createTurnCoordinator();
|
|
73
|
+
function withSharedTurnLock(scope, key, fn) {
|
|
74
|
+
return _sharedTurnCoordinator.withTurnLock(scopedKey(scope, key), fn);
|
|
75
|
+
}
|
|
76
|
+
function tryBeginSharedTurn(scope, key) {
|
|
77
|
+
return _sharedTurnCoordinator.tryBeginTurn(scopedKey(scope, key));
|
|
78
|
+
}
|
|
79
|
+
function endSharedTurn(scope, key) {
|
|
80
|
+
_sharedTurnCoordinator.endTurn(scopedKey(scope, key));
|
|
81
|
+
}
|
|
82
|
+
function isSharedTurnActive(scope, key) {
|
|
83
|
+
return _sharedTurnCoordinator.isTurnActive(scopedKey(scope, key));
|
|
84
|
+
}
|
|
85
|
+
function enqueueSharedFollowUp(scope, key, followUp) {
|
|
86
|
+
_sharedTurnCoordinator.enqueueFollowUp(scopedKey(scope, key), followUp);
|
|
87
|
+
}
|
|
88
|
+
function drainSharedFollowUps(scope, key) {
|
|
89
|
+
return _sharedTurnCoordinator.drainFollowUps(scopedKey(scope, key));
|
|
90
|
+
}
|
|
@@ -0,0 +1,128 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
|
|
3
|
+
if (k2 === undefined) k2 = k;
|
|
4
|
+
var desc = Object.getOwnPropertyDescriptor(m, k);
|
|
5
|
+
if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
|
|
6
|
+
desc = { enumerable: true, get: function() { return m[k]; } };
|
|
7
|
+
}
|
|
8
|
+
Object.defineProperty(o, k2, desc);
|
|
9
|
+
}) : (function(o, m, k, k2) {
|
|
10
|
+
if (k2 === undefined) k2 = k;
|
|
11
|
+
o[k2] = m[k];
|
|
12
|
+
}));
|
|
13
|
+
var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
|
|
14
|
+
Object.defineProperty(o, "default", { enumerable: true, value: v });
|
|
15
|
+
}) : function(o, v) {
|
|
16
|
+
o["default"] = v;
|
|
17
|
+
});
|
|
18
|
+
var __importStar = (this && this.__importStar) || (function () {
|
|
19
|
+
var ownKeys = function(o) {
|
|
20
|
+
ownKeys = Object.getOwnPropertyNames || function (o) {
|
|
21
|
+
var ar = [];
|
|
22
|
+
for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
|
|
23
|
+
return ar;
|
|
24
|
+
};
|
|
25
|
+
return ownKeys(o);
|
|
26
|
+
};
|
|
27
|
+
return function (mod) {
|
|
28
|
+
if (mod && mod.__esModule) return mod;
|
|
29
|
+
var result = {};
|
|
30
|
+
if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
|
|
31
|
+
__setModuleDefault(result, mod);
|
|
32
|
+
return result;
|
|
33
|
+
};
|
|
34
|
+
})();
|
|
35
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
36
|
+
exports.syncGlobalOuroBotWrapper = syncGlobalOuroBotWrapper;
|
|
37
|
+
const child_process_1 = require("child_process");
|
|
38
|
+
const fs = __importStar(require("fs"));
|
|
39
|
+
const path = __importStar(require("path"));
|
|
40
|
+
const runtime_1 = require("../../nerves/runtime");
|
|
41
|
+
const runtime_metadata_1 = require("../daemon/runtime-metadata");
|
|
42
|
+
function normalizeOutput(output) {
|
|
43
|
+
return (typeof output === "string" ? output : output.toString("utf-8")).trim();
|
|
44
|
+
}
|
|
45
|
+
function resolveGlobalPrefix(execFileSyncImpl) {
|
|
46
|
+
return normalizeOutput(execFileSyncImpl("npm", ["prefix", "-g"], { encoding: "utf-8" }));
|
|
47
|
+
}
|
|
48
|
+
function resolveGlobalRoot(execFileSyncImpl) {
|
|
49
|
+
return normalizeOutput(execFileSyncImpl("npm", ["root", "-g"], { encoding: "utf-8" }));
|
|
50
|
+
}
|
|
51
|
+
function readInstalledWrapperVersion(globalRoot, existsSyncImpl, readFileSyncImpl) {
|
|
52
|
+
const packageJsonPath = path.join(globalRoot, "ouro.bot", "package.json");
|
|
53
|
+
if (!existsSyncImpl(packageJsonPath))
|
|
54
|
+
return null;
|
|
55
|
+
try {
|
|
56
|
+
const parsed = JSON.parse(readFileSyncImpl(packageJsonPath, "utf-8"));
|
|
57
|
+
return typeof parsed.version === "string" && parsed.version.trim().length > 0 ? parsed.version.trim() : null;
|
|
58
|
+
}
|
|
59
|
+
catch {
|
|
60
|
+
return null;
|
|
61
|
+
}
|
|
62
|
+
}
|
|
63
|
+
function resolveExecutableOwner(globalPrefix, platform, existsSyncImpl, realpathSyncImpl) {
|
|
64
|
+
const binName = platform === "win32" ? "ouro.bot.cmd" : "ouro.bot";
|
|
65
|
+
const binPath = platform === "win32"
|
|
66
|
+
? path.join(globalPrefix, binName)
|
|
67
|
+
: path.join(globalPrefix, "bin", binName);
|
|
68
|
+
if (!existsSyncImpl(binPath))
|
|
69
|
+
return null;
|
|
70
|
+
try {
|
|
71
|
+
const resolved = realpathSyncImpl(binPath);
|
|
72
|
+
if (resolved.includes(`${path.sep}node_modules${path.sep}ouro.bot${path.sep}`))
|
|
73
|
+
return "wrapper";
|
|
74
|
+
if (resolved.includes(`${path.sep}node_modules${path.sep}@ouro.bot${path.sep}cli${path.sep}`))
|
|
75
|
+
return "cli";
|
|
76
|
+
return "other";
|
|
77
|
+
}
|
|
78
|
+
catch {
|
|
79
|
+
return "unknown";
|
|
80
|
+
}
|
|
81
|
+
}
|
|
82
|
+
function syncGlobalOuroBotWrapper(deps = {}) {
|
|
83
|
+
/* v8 ignore start -- dependency-injection defaults are only exercised in the live runtime */
|
|
84
|
+
const execFileSyncImpl = deps.execFileSync ?? child_process_1.execFileSync;
|
|
85
|
+
const existsSyncImpl = deps.existsSync ?? fs.existsSync;
|
|
86
|
+
const readFileSyncImpl = deps.readFileSync ?? fs.readFileSync;
|
|
87
|
+
const realpathSyncImpl = deps.realpathSync ?? fs.realpathSync;
|
|
88
|
+
const runtimeVersion = deps.runtimeVersion ?? (0, runtime_metadata_1.getRuntimeMetadata)().version;
|
|
89
|
+
const platform = deps.platform ?? process.platform;
|
|
90
|
+
/* v8 ignore stop */
|
|
91
|
+
(0, runtime_1.emitNervesEvent)({
|
|
92
|
+
component: "daemon",
|
|
93
|
+
event: "daemon.ouro_bot_global_sync_start",
|
|
94
|
+
message: "checking global ouro.bot wrapper",
|
|
95
|
+
meta: { version: runtimeVersion },
|
|
96
|
+
});
|
|
97
|
+
const globalPrefix = resolveGlobalPrefix(execFileSyncImpl);
|
|
98
|
+
const globalRoot = resolveGlobalRoot(execFileSyncImpl);
|
|
99
|
+
const installedVersion = readInstalledWrapperVersion(globalRoot, existsSyncImpl, readFileSyncImpl);
|
|
100
|
+
const executableOwner = resolveExecutableOwner(globalPrefix, platform, existsSyncImpl, realpathSyncImpl);
|
|
101
|
+
if (executableOwner === "wrapper") {
|
|
102
|
+
(0, runtime_1.emitNervesEvent)({
|
|
103
|
+
component: "daemon",
|
|
104
|
+
event: "daemon.ouro_bot_global_sync_end",
|
|
105
|
+
message: "global ouro.bot wrapper already current",
|
|
106
|
+
meta: { version: runtimeVersion, installedVersion, executableOwner, installed: false },
|
|
107
|
+
});
|
|
108
|
+
return {
|
|
109
|
+
installed: false,
|
|
110
|
+
version: runtimeVersion,
|
|
111
|
+
installedVersion,
|
|
112
|
+
executableOwner,
|
|
113
|
+
};
|
|
114
|
+
}
|
|
115
|
+
execFileSyncImpl("npm", ["install", "-g", "--force", "ouro.bot@latest"], { stdio: "pipe", encoding: "utf-8" });
|
|
116
|
+
(0, runtime_1.emitNervesEvent)({
|
|
117
|
+
component: "daemon",
|
|
118
|
+
event: "daemon.ouro_bot_global_sync_end",
|
|
119
|
+
message: "global ouro.bot wrapper synced",
|
|
120
|
+
meta: { version: runtimeVersion, installedVersion, executableOwner, installed: true },
|
|
121
|
+
});
|
|
122
|
+
return {
|
|
123
|
+
installed: true,
|
|
124
|
+
version: runtimeVersion,
|
|
125
|
+
installedVersion,
|
|
126
|
+
executableOwner,
|
|
127
|
+
};
|
|
128
|
+
}
|
|
@@ -35,7 +35,7 @@ var __importStar = (this && this.__importStar) || (function () {
|
|
|
35
35
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
36
36
|
exports.runOuroBotWrapper = runOuroBotWrapper;
|
|
37
37
|
const runtime_1 = require("../../nerves/runtime");
|
|
38
|
-
const daemon_cli_1 = require("
|
|
38
|
+
const daemon_cli_1 = require("../daemon/daemon-cli");
|
|
39
39
|
async function defaultLoadCanonicalRunner() {
|
|
40
40
|
// Use the subpath export so we get the daemon-cli module directly,
|
|
41
41
|
// NOT the root entry point which has side-effects (immediately runs the CLI).
|
|
@@ -38,10 +38,30 @@ const fs = __importStar(require("fs"));
|
|
|
38
38
|
const os = __importStar(require("os"));
|
|
39
39
|
const path = __importStar(require("path"));
|
|
40
40
|
const runtime_1 = require("../../nerves/runtime");
|
|
41
|
-
const CLI_PACKAGE_SPECIFIER = "@ouro.bot/cli@alpha";
|
|
42
41
|
const WRAPPER_SCRIPT = `#!/bin/sh
|
|
43
|
-
|
|
42
|
+
# Check for dev mode — if dev-config.json exists, dispatch to the dev repo
|
|
43
|
+
# Skip dev dispatch for "up" command (explicitly returns to production)
|
|
44
|
+
DEV_CONFIG="$HOME/.ouro-cli/dev-config.json"
|
|
45
|
+
if [ -f "$DEV_CONFIG" ] && [ "$1" != "up" ]; then
|
|
46
|
+
DEV_REPO=$(node -e "try{console.log(JSON.parse(require('fs').readFileSync('$DEV_CONFIG','utf-8')).repoPath)}catch{}" 2>/dev/null)
|
|
47
|
+
DEV_ENTRY="$DEV_REPO/dist/heart/daemon/ouro-entry.js"
|
|
48
|
+
if [ -n "$DEV_REPO" ] && [ -e "$DEV_ENTRY" ]; then
|
|
49
|
+
exec node "$DEV_ENTRY" "$@"
|
|
50
|
+
fi
|
|
51
|
+
fi
|
|
52
|
+
# Fall back to installed version
|
|
53
|
+
ENTRY="$HOME/.ouro-cli/CurrentVersion/node_modules/@ouro.bot/cli/dist/heart/daemon/ouro-entry.js"
|
|
54
|
+
if [ ! -e "$ENTRY" ]; then
|
|
55
|
+
echo "ouro not installed. Run: npx ouro.bot" >&2
|
|
56
|
+
exit 1
|
|
57
|
+
fi
|
|
58
|
+
exec node "$ENTRY" "$@"
|
|
44
59
|
`;
|
|
60
|
+
function writeWrapperScript(scriptPath, mkdirSync, writeFileSync, chmodSync) {
|
|
61
|
+
mkdirSync(path.dirname(scriptPath), { recursive: true });
|
|
62
|
+
writeFileSync(scriptPath, WRAPPER_SCRIPT, { mode: 0o755 });
|
|
63
|
+
chmodSync(scriptPath, 0o755);
|
|
64
|
+
}
|
|
45
65
|
function detectShellProfile(homeDir, shell) {
|
|
46
66
|
if (!shell)
|
|
47
67
|
return null;
|
|
@@ -67,6 +87,16 @@ function buildPathExportLine(binDir, shell) {
|
|
|
67
87
|
}
|
|
68
88
|
return `\n# Added by ouro\nexport PATH="${binDir}:$PATH"\n`;
|
|
69
89
|
}
|
|
90
|
+
function isWrapperCurrent(scriptPath, existsSync, readFileSync) {
|
|
91
|
+
if (!existsSync(scriptPath))
|
|
92
|
+
return false;
|
|
93
|
+
try {
|
|
94
|
+
return readFileSync(scriptPath, "utf-8") === WRAPPER_SCRIPT;
|
|
95
|
+
}
|
|
96
|
+
catch {
|
|
97
|
+
return false;
|
|
98
|
+
}
|
|
99
|
+
}
|
|
70
100
|
function installOuroCommand(deps = {}) {
|
|
71
101
|
/* v8 ignore start -- dep defaults: only used in real runtime, tests always inject @preserve */
|
|
72
102
|
const platform = deps.platform ?? process.platform;
|
|
@@ -87,46 +117,59 @@ function installOuroCommand(deps = {}) {
|
|
|
87
117
|
message: "skipped ouro PATH install on Windows",
|
|
88
118
|
meta: { platform },
|
|
89
119
|
});
|
|
90
|
-
return { installed: false, scriptPath: null, pathReady: false, shellProfileUpdated: null, skippedReason: "windows" };
|
|
120
|
+
return { installed: false, scriptPath: null, pathReady: false, shellProfileUpdated: null, skippedReason: "windows", repairedOldLauncher: false };
|
|
121
|
+
}
|
|
122
|
+
// Ensure ~/.ouro-cli/ directory layout exists
|
|
123
|
+
if (deps.ensureCliLayout) {
|
|
124
|
+
deps.ensureCliLayout();
|
|
91
125
|
}
|
|
92
|
-
const binDir = path.join(homeDir, ".
|
|
126
|
+
const binDir = path.join(homeDir, ".ouro-cli", "bin");
|
|
93
127
|
const scriptPath = path.join(binDir, "ouro");
|
|
94
|
-
(
|
|
95
|
-
|
|
96
|
-
|
|
97
|
-
|
|
98
|
-
|
|
99
|
-
|
|
100
|
-
//
|
|
101
|
-
|
|
102
|
-
|
|
128
|
+
const oldScriptPath = path.join(homeDir, ".local", "bin", "ouro");
|
|
129
|
+
const modernCurrent = isWrapperCurrent(scriptPath, existsSync, readFileSync);
|
|
130
|
+
const oldExists = existsSync(oldScriptPath);
|
|
131
|
+
const oldCurrent = oldExists && isWrapperCurrent(oldScriptPath, existsSync, readFileSync);
|
|
132
|
+
// ── Repair old ~/.local/bin/ouro launcher ──
|
|
133
|
+
// If the old launcher exists with stale content it can shadow the modern
|
|
134
|
+
// path and cause the wrong CLI version to run. Overwrite it with the
|
|
135
|
+
// current wrapper so both paths resolve to ~/.ouro-cli/CurrentVersion.
|
|
136
|
+
let repairedOldLauncher = false;
|
|
137
|
+
if (oldExists && !oldCurrent) {
|
|
138
|
+
(0, runtime_1.emitNervesEvent)({
|
|
139
|
+
component: "daemon",
|
|
140
|
+
event: "daemon.ouro_path_repair_old",
|
|
141
|
+
message: "repairing stale old launcher at ~/.local/bin/ouro",
|
|
142
|
+
meta: { oldScriptPath },
|
|
143
|
+
});
|
|
103
144
|
try {
|
|
104
|
-
|
|
145
|
+
writeFileSync(oldScriptPath, WRAPPER_SCRIPT, { mode: 0o755 });
|
|
146
|
+
chmodSync(oldScriptPath, 0o755);
|
|
147
|
+
repairedOldLauncher = true;
|
|
105
148
|
}
|
|
106
149
|
catch {
|
|
107
|
-
//
|
|
108
|
-
}
|
|
109
|
-
if (existingContent === WRAPPER_SCRIPT) {
|
|
110
|
-
(0, runtime_1.emitNervesEvent)({
|
|
111
|
-
component: "daemon",
|
|
112
|
-
event: "daemon.ouro_path_install_skip",
|
|
113
|
-
message: "ouro command already installed",
|
|
114
|
-
meta: { scriptPath },
|
|
115
|
-
});
|
|
116
|
-
return { installed: false, scriptPath, pathReady: isBinDirInPath(binDir, envPath), shellProfileUpdated: null, skippedReason: "already-installed" };
|
|
150
|
+
// Best effort — old launcher repair failure must not block modern install
|
|
117
151
|
}
|
|
118
|
-
|
|
152
|
+
}
|
|
153
|
+
// ── Fast-path: modern wrapper already current ──
|
|
154
|
+
if (modernCurrent) {
|
|
119
155
|
(0, runtime_1.emitNervesEvent)({
|
|
120
156
|
component: "daemon",
|
|
121
|
-
event: "daemon.
|
|
122
|
-
message: "
|
|
157
|
+
event: "daemon.ouro_path_install_skip",
|
|
158
|
+
message: "ouro command already installed",
|
|
123
159
|
meta: { scriptPath },
|
|
124
160
|
});
|
|
161
|
+
return { installed: false, scriptPath, pathReady: isBinDirInPath(binDir, envPath), shellProfileUpdated: null, skippedReason: "already-installed", repairedOldLauncher };
|
|
125
162
|
}
|
|
163
|
+
(0, runtime_1.emitNervesEvent)({
|
|
164
|
+
component: "daemon",
|
|
165
|
+
event: "daemon.ouro_path_install_start",
|
|
166
|
+
message: existsSync(scriptPath) ? "repairing stale ouro wrapper script" : "installing ouro command to PATH",
|
|
167
|
+
meta: { scriptPath, binDir },
|
|
168
|
+
});
|
|
126
169
|
try {
|
|
127
|
-
|
|
128
|
-
|
|
129
|
-
|
|
170
|
+
if (!modernCurrent) {
|
|
171
|
+
writeWrapperScript(scriptPath, mkdirSync, writeFileSync, chmodSync);
|
|
172
|
+
}
|
|
130
173
|
}
|
|
131
174
|
catch (error) {
|
|
132
175
|
(0, runtime_1.emitNervesEvent)({
|
|
@@ -136,11 +179,11 @@ function installOuroCommand(deps = {}) {
|
|
|
136
179
|
message: "failed to install ouro command",
|
|
137
180
|
meta: { error: error instanceof Error ? error.message : /* v8 ignore next -- defensive: non-Error catch branch @preserve */ String(error) },
|
|
138
181
|
});
|
|
139
|
-
return { installed: false, scriptPath: null, pathReady: false, shellProfileUpdated: null, skippedReason: error instanceof Error ? error.message : /* v8 ignore next -- defensive @preserve */ String(error) };
|
|
182
|
+
return { installed: false, scriptPath: null, pathReady: false, shellProfileUpdated: null, skippedReason: error instanceof Error ? error.message : /* v8 ignore next -- defensive @preserve */ String(error), repairedOldLauncher };
|
|
140
183
|
}
|
|
141
|
-
// Check if ~/.
|
|
142
|
-
let shellProfileUpdated = null;
|
|
184
|
+
// Check if ~/.ouro-cli/bin is already in PATH
|
|
143
185
|
const pathReady = isBinDirInPath(binDir, envPath);
|
|
186
|
+
let shellProfileUpdated = null;
|
|
144
187
|
if (!pathReady) {
|
|
145
188
|
const profilePath = detectShellProfile(homeDir, shell);
|
|
146
189
|
if (profilePath) {
|
|
@@ -172,7 +215,7 @@ function installOuroCommand(deps = {}) {
|
|
|
172
215
|
component: "daemon",
|
|
173
216
|
event: "daemon.ouro_path_install_end",
|
|
174
217
|
message: "ouro command installed",
|
|
175
|
-
meta: { scriptPath, pathReady, shellProfileUpdated },
|
|
218
|
+
meta: { scriptPath, pathReady, shellProfileUpdated, oldScriptPath: oldExists ? oldScriptPath : null },
|
|
176
219
|
});
|
|
177
|
-
return { installed: true, scriptPath, pathReady, shellProfileUpdated };
|
|
220
|
+
return { installed: true, scriptPath, pathReady, shellProfileUpdated, repairedOldLauncher };
|
|
178
221
|
}
|
|
@@ -0,0 +1,295 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
|
|
3
|
+
if (k2 === undefined) k2 = k;
|
|
4
|
+
var desc = Object.getOwnPropertyDescriptor(m, k);
|
|
5
|
+
if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
|
|
6
|
+
desc = { enumerable: true, get: function() { return m[k]; } };
|
|
7
|
+
}
|
|
8
|
+
Object.defineProperty(o, k2, desc);
|
|
9
|
+
}) : (function(o, m, k, k2) {
|
|
10
|
+
if (k2 === undefined) k2 = k;
|
|
11
|
+
o[k2] = m[k];
|
|
12
|
+
}));
|
|
13
|
+
var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
|
|
14
|
+
Object.defineProperty(o, "default", { enumerable: true, value: v });
|
|
15
|
+
}) : function(o, v) {
|
|
16
|
+
o["default"] = v;
|
|
17
|
+
});
|
|
18
|
+
var __importStar = (this && this.__importStar) || (function () {
|
|
19
|
+
var ownKeys = function(o) {
|
|
20
|
+
ownKeys = Object.getOwnPropertyNames || function (o) {
|
|
21
|
+
var ar = [];
|
|
22
|
+
for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
|
|
23
|
+
return ar;
|
|
24
|
+
};
|
|
25
|
+
return ownKeys(o);
|
|
26
|
+
};
|
|
27
|
+
return function (mod) {
|
|
28
|
+
if (mod && mod.__esModule) return mod;
|
|
29
|
+
var result = {};
|
|
30
|
+
if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
|
|
31
|
+
__setModuleDefault(result, mod);
|
|
32
|
+
return result;
|
|
33
|
+
};
|
|
34
|
+
})();
|
|
35
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
36
|
+
exports.DEFAULT_RETAIN_VERSIONS = void 0;
|
|
37
|
+
exports.getOuroCliHome = getOuroCliHome;
|
|
38
|
+
exports.getCurrentVersion = getCurrentVersion;
|
|
39
|
+
exports.getPreviousVersion = getPreviousVersion;
|
|
40
|
+
exports.buildChangelogCommand = buildChangelogCommand;
|
|
41
|
+
exports.listInstalledVersions = listInstalledVersions;
|
|
42
|
+
exports.installVersion = installVersion;
|
|
43
|
+
exports.activateVersion = activateVersion;
|
|
44
|
+
exports.compareCliVersions = compareCliVersions;
|
|
45
|
+
exports.selectVersionsToPrune = selectVersionsToPrune;
|
|
46
|
+
exports.pruneOldVersions = pruneOldVersions;
|
|
47
|
+
exports.ensureLayout = ensureLayout;
|
|
48
|
+
const fs = __importStar(require("fs"));
|
|
49
|
+
const os = __importStar(require("os"));
|
|
50
|
+
const path = __importStar(require("path"));
|
|
51
|
+
const runtime_1 = require("../../nerves/runtime");
|
|
52
|
+
/** Maximum number of installed CLI versions to retain after pruning. */
|
|
53
|
+
exports.DEFAULT_RETAIN_VERSIONS = 5;
|
|
54
|
+
function getOuroCliHome(homeDir) {
|
|
55
|
+
/* v8 ignore next -- dep default: tests always inject @preserve */
|
|
56
|
+
const home = homeDir ?? os.homedir();
|
|
57
|
+
return path.join(home, ".ouro-cli");
|
|
58
|
+
}
|
|
59
|
+
function getCurrentVersion(deps) {
|
|
60
|
+
const cliHome = getOuroCliHome(deps.homeDir);
|
|
61
|
+
/* v8 ignore next -- dep default: tests always inject @preserve */
|
|
62
|
+
const readlinkSync = deps.readlinkSync ?? fs.readlinkSync;
|
|
63
|
+
try {
|
|
64
|
+
const target = readlinkSync(path.join(cliHome, "CurrentVersion"));
|
|
65
|
+
return path.basename(target);
|
|
66
|
+
}
|
|
67
|
+
catch {
|
|
68
|
+
return null;
|
|
69
|
+
}
|
|
70
|
+
}
|
|
71
|
+
function getPreviousVersion(deps) {
|
|
72
|
+
const cliHome = getOuroCliHome(deps.homeDir);
|
|
73
|
+
/* v8 ignore next -- dep default: tests always inject @preserve */
|
|
74
|
+
const readlinkSync = deps.readlinkSync ?? fs.readlinkSync;
|
|
75
|
+
try {
|
|
76
|
+
const target = readlinkSync(path.join(cliHome, "previous"));
|
|
77
|
+
return path.basename(target);
|
|
78
|
+
}
|
|
79
|
+
catch {
|
|
80
|
+
return null;
|
|
81
|
+
}
|
|
82
|
+
}
|
|
83
|
+
function buildChangelogCommand(previousVersion, currentVersion) {
|
|
84
|
+
if (!previousVersion || !currentVersion || previousVersion === currentVersion) {
|
|
85
|
+
return null;
|
|
86
|
+
}
|
|
87
|
+
return `ouro changelog --from ${previousVersion}`;
|
|
88
|
+
}
|
|
89
|
+
function listInstalledVersions(deps) {
|
|
90
|
+
const cliHome = getOuroCliHome(deps.homeDir);
|
|
91
|
+
/* v8 ignore next -- dep default: tests always inject @preserve */
|
|
92
|
+
const readdirSync = deps.readdirSync ?? ((p, opts) => fs.readdirSync(p, opts));
|
|
93
|
+
try {
|
|
94
|
+
const entries = readdirSync(path.join(cliHome, "versions"), { withFileTypes: true });
|
|
95
|
+
return entries.filter((e) => e.isDirectory()).map((e) => e.name);
|
|
96
|
+
}
|
|
97
|
+
catch {
|
|
98
|
+
return [];
|
|
99
|
+
}
|
|
100
|
+
}
|
|
101
|
+
function installVersion(version, deps) {
|
|
102
|
+
const cliHome = getOuroCliHome(deps.homeDir);
|
|
103
|
+
/* v8 ignore start -- dep defaults: tests always inject @preserve */
|
|
104
|
+
const mkdirSync = deps.mkdirSync ?? fs.mkdirSync;
|
|
105
|
+
const execSync = deps.execSync ?? ((cmd, opts) => require("child_process").execSync(cmd, opts));
|
|
106
|
+
/* v8 ignore stop */
|
|
107
|
+
const versionDir = path.join(cliHome, "versions", version);
|
|
108
|
+
(0, runtime_1.emitNervesEvent)({
|
|
109
|
+
component: "daemon",
|
|
110
|
+
event: "daemon.cli_version_install_start",
|
|
111
|
+
message: "installing CLI version",
|
|
112
|
+
meta: { version, versionDir },
|
|
113
|
+
});
|
|
114
|
+
mkdirSync(versionDir, { recursive: true });
|
|
115
|
+
execSync(`npm install --prefix ${versionDir} @ouro.bot/cli@${version}`, { stdio: "pipe" });
|
|
116
|
+
(0, runtime_1.emitNervesEvent)({
|
|
117
|
+
component: "daemon",
|
|
118
|
+
event: "daemon.cli_version_install_end",
|
|
119
|
+
message: "CLI version installed",
|
|
120
|
+
meta: { version, versionDir },
|
|
121
|
+
});
|
|
122
|
+
}
|
|
123
|
+
function activateVersion(version, deps) {
|
|
124
|
+
const cliHome = getOuroCliHome(deps.homeDir);
|
|
125
|
+
/* v8 ignore start -- dep defaults: tests always inject @preserve */
|
|
126
|
+
const readlinkSync = deps.readlinkSync ?? fs.readlinkSync;
|
|
127
|
+
const unlinkSync = deps.unlinkSync ?? fs.unlinkSync;
|
|
128
|
+
const symlinkSync = deps.symlinkSync ?? fs.symlinkSync;
|
|
129
|
+
const existsSync = deps.existsSync ?? fs.existsSync;
|
|
130
|
+
/* v8 ignore stop */
|
|
131
|
+
const currentVersionPath = path.join(cliHome, "CurrentVersion");
|
|
132
|
+
const previousPath = path.join(cliHome, "previous");
|
|
133
|
+
const newTarget = path.join(cliHome, "versions", version);
|
|
134
|
+
(0, runtime_1.emitNervesEvent)({
|
|
135
|
+
component: "daemon",
|
|
136
|
+
event: "daemon.cli_version_activate",
|
|
137
|
+
message: "activating CLI version",
|
|
138
|
+
meta: { version },
|
|
139
|
+
});
|
|
140
|
+
// Read old CurrentVersion target (may not exist)
|
|
141
|
+
let oldTarget = null;
|
|
142
|
+
try {
|
|
143
|
+
oldTarget = readlinkSync(currentVersionPath);
|
|
144
|
+
}
|
|
145
|
+
catch {
|
|
146
|
+
// No current version — first install
|
|
147
|
+
}
|
|
148
|
+
// Update previous symlink to point to old current
|
|
149
|
+
if (oldTarget) {
|
|
150
|
+
try {
|
|
151
|
+
unlinkSync(previousPath);
|
|
152
|
+
}
|
|
153
|
+
catch {
|
|
154
|
+
// previous symlink may not exist yet
|
|
155
|
+
}
|
|
156
|
+
symlinkSync(oldTarget, previousPath);
|
|
157
|
+
}
|
|
158
|
+
// Update CurrentVersion symlink
|
|
159
|
+
if (existsSync(currentVersionPath)) {
|
|
160
|
+
unlinkSync(currentVersionPath);
|
|
161
|
+
}
|
|
162
|
+
symlinkSync(newTarget, currentVersionPath);
|
|
163
|
+
}
|
|
164
|
+
/**
|
|
165
|
+
* Compare two version strings of the form `0.1.0-alpha.{n}`. Returns
|
|
166
|
+
* positive when `a` is newer, negative when `b` is newer, 0 when equal.
|
|
167
|
+
*
|
|
168
|
+
* The harness only ships `0.1.0-alpha.{n}` versions today; this comparator
|
|
169
|
+
* extracts the numeric tail and falls back to a lexicographic compare for
|
|
170
|
+
* any version that doesn't match the pattern (so unexpected version
|
|
171
|
+
* formats sort consistently rather than throwing).
|
|
172
|
+
*/
|
|
173
|
+
function compareCliVersions(a, b) {
|
|
174
|
+
const aMatch = /alpha\.(\d+)/.exec(a);
|
|
175
|
+
const bMatch = /alpha\.(\d+)/.exec(b);
|
|
176
|
+
if (aMatch && bMatch) {
|
|
177
|
+
const aN = parseInt(aMatch[1], 10);
|
|
178
|
+
const bN = parseInt(bMatch[1], 10);
|
|
179
|
+
return aN - bN;
|
|
180
|
+
}
|
|
181
|
+
// Fallback: lexicographic. Both-mismatched and one-mismatched cases land
|
|
182
|
+
// here. Predictable, even if not strictly semver-correct.
|
|
183
|
+
if (a < b)
|
|
184
|
+
return -1;
|
|
185
|
+
if (a > b)
|
|
186
|
+
return 1;
|
|
187
|
+
return 0;
|
|
188
|
+
}
|
|
189
|
+
/**
|
|
190
|
+
* Identify which installed CLI versions can be safely deleted, given a
|
|
191
|
+
* retention policy. Pure: takes the full version list and the protected
|
|
192
|
+
* (current/previous) versions, returns the versions to delete.
|
|
193
|
+
*
|
|
194
|
+
* Retention rules:
|
|
195
|
+
* - Always keep the N most recent versions (default 5).
|
|
196
|
+
* - Always keep the currently-active version (CurrentVersion symlink target).
|
|
197
|
+
* - Always keep the previous version (previous symlink target) so rollback
|
|
198
|
+
* stays one command away.
|
|
199
|
+
* - Delete everything else.
|
|
200
|
+
*
|
|
201
|
+
* Exported so tests can pin the policy without shelling out to a real fs.
|
|
202
|
+
*/
|
|
203
|
+
function selectVersionsToPrune(installedVersions, protectedVersions, retain = exports.DEFAULT_RETAIN_VERSIONS) {
|
|
204
|
+
if (installedVersions.length <= retain)
|
|
205
|
+
return [];
|
|
206
|
+
const sorted = [...installedVersions].sort(compareCliVersions).reverse();
|
|
207
|
+
const keepers = new Set(sorted.slice(0, retain));
|
|
208
|
+
if (protectedVersions.current)
|
|
209
|
+
keepers.add(protectedVersions.current);
|
|
210
|
+
if (protectedVersions.previous)
|
|
211
|
+
keepers.add(protectedVersions.previous);
|
|
212
|
+
return installedVersions.filter((v) => !keepers.has(v));
|
|
213
|
+
}
|
|
214
|
+
/**
|
|
215
|
+
* Prune installed CLI versions according to the retention policy. Removes
|
|
216
|
+
* `~/.ouro-cli/versions/{version}/` directories for versions outside the
|
|
217
|
+
* retention window. Best-effort: per-version delete failures are logged
|
|
218
|
+
* via nerves but don't propagate.
|
|
219
|
+
*
|
|
220
|
+
* Called from the activate path (cli-defaults.ts) so that every successful
|
|
221
|
+
* `ouro up` self-prunes. The user observed `~/.ouro-cli/versions/` going
|
|
222
|
+
* back to alpha.85 from March 20 — every CLI version they'd ever installed
|
|
223
|
+
* was still on disk because nothing ever GCed.
|
|
224
|
+
*/
|
|
225
|
+
function pruneOldVersions(retain = exports.DEFAULT_RETAIN_VERSIONS, deps = {}) {
|
|
226
|
+
const cliHome = getOuroCliHome(deps.homeDir);
|
|
227
|
+
/* v8 ignore start -- dep defaults: tests always inject @preserve */
|
|
228
|
+
const readdirSync = deps.readdirSync ?? ((p, opts) => fs.readdirSync(p, opts));
|
|
229
|
+
const readlinkSync = deps.readlinkSync ?? fs.readlinkSync;
|
|
230
|
+
const rmSync = deps.rmSync ?? fs.rmSync;
|
|
231
|
+
/* v8 ignore stop */
|
|
232
|
+
const versionsDir = path.join(cliHome, "versions");
|
|
233
|
+
let installed;
|
|
234
|
+
try {
|
|
235
|
+
installed = readdirSync(versionsDir, { withFileTypes: true })
|
|
236
|
+
.filter((e) => e.isDirectory())
|
|
237
|
+
.map((e) => e.name);
|
|
238
|
+
}
|
|
239
|
+
catch {
|
|
240
|
+
return { kept: [], deleted: [], failed: [] };
|
|
241
|
+
}
|
|
242
|
+
const current = (() => {
|
|
243
|
+
try {
|
|
244
|
+
return path.basename(readlinkSync(path.join(cliHome, "CurrentVersion")));
|
|
245
|
+
}
|
|
246
|
+
catch {
|
|
247
|
+
return null;
|
|
248
|
+
}
|
|
249
|
+
})();
|
|
250
|
+
const previous = (() => {
|
|
251
|
+
try {
|
|
252
|
+
return path.basename(readlinkSync(path.join(cliHome, "previous")));
|
|
253
|
+
}
|
|
254
|
+
catch {
|
|
255
|
+
return null;
|
|
256
|
+
}
|
|
257
|
+
})();
|
|
258
|
+
const toDelete = selectVersionsToPrune(installed, { current, previous }, retain);
|
|
259
|
+
const deleted = [];
|
|
260
|
+
const failed = [];
|
|
261
|
+
for (const version of toDelete) {
|
|
262
|
+
const versionDir = path.join(versionsDir, version);
|
|
263
|
+
try {
|
|
264
|
+
rmSync(versionDir, { recursive: true, force: true });
|
|
265
|
+
deleted.push(version);
|
|
266
|
+
}
|
|
267
|
+
catch (error) {
|
|
268
|
+
failed.push({
|
|
269
|
+
version,
|
|
270
|
+
error: error instanceof Error ? error.message : /* v8 ignore next -- defensive: non-Error catch branch @preserve */ String(error),
|
|
271
|
+
});
|
|
272
|
+
}
|
|
273
|
+
}
|
|
274
|
+
(0, runtime_1.emitNervesEvent)({
|
|
275
|
+
component: "daemon",
|
|
276
|
+
event: "daemon.cli_versions_pruned",
|
|
277
|
+
message: `pruned ${deleted.length} old CLI versions`,
|
|
278
|
+
meta: { retain, deleted, failed: failed.length, kept: installed.filter((v) => !deleted.includes(v)) },
|
|
279
|
+
});
|
|
280
|
+
return { kept: installed.filter((v) => !deleted.includes(v)), deleted, failed };
|
|
281
|
+
}
|
|
282
|
+
function ensureLayout(deps) {
|
|
283
|
+
const cliHome = getOuroCliHome(deps.homeDir);
|
|
284
|
+
/* v8 ignore next -- dep default: tests always inject @preserve */
|
|
285
|
+
const mkdirSync = deps.mkdirSync ?? fs.mkdirSync;
|
|
286
|
+
mkdirSync(cliHome, { recursive: true });
|
|
287
|
+
mkdirSync(path.join(cliHome, "bin"), { recursive: true });
|
|
288
|
+
mkdirSync(path.join(cliHome, "versions"), { recursive: true });
|
|
289
|
+
(0, runtime_1.emitNervesEvent)({
|
|
290
|
+
component: "daemon",
|
|
291
|
+
event: "daemon.cli_layout_ensured",
|
|
292
|
+
message: "CLI directory layout ensured",
|
|
293
|
+
meta: { cliHome },
|
|
294
|
+
});
|
|
295
|
+
}
|