mirror of
https://github.com/diegosouzapw/OmniRoute.git
synced 2026-09-22 06:42:19 +03:00
65e81158ab
Landed with the design call resolved per the owner's pick — **option 1**: the synced store is now endpoint-agnostic (persistDiscoveredModels and managedModelImport no longer drop non-chat models at write time), and chat selectability moved to read time (auto-pool expansion in autoStrategy applies filterChatSelectableModels; the models-route projection already had its chatOnly filter). Your discovery test now passes end-to-end (3/3): /api/show capabilities persist per connection and image/embedding requests route through the advertising host. Reconciliation notes: conflicted areas merged onto the current tip (adobe discovery import, requestedModel preflight signature, resolvedProvider fast-path coexists with the synced-route override — explicit resolution wins); carried base-red drains (#10055 memoization, #11071 test variants) dropped as already-landed; the managed-model-import exclusion test was propagated to the new contract (image/video models persist; the read filter still hides them from chat pickers — pinned by a new assertion). Full battery: 205/206 focused (the one red is a confirmed periodic-timer timing flake on the loaded devbox — 20/20 isolated), autoCombo vitest 30/30, combo suites 46/46, gates + typecheck clean. Thank you @yourspraveen — the capability probe + routing design was right; it just needed the store contract opened up. Fixes #11087.
72 lines
2.7 KiB
TypeScript
72 lines
2.7 KiB
TypeScript
/**
|
|
* #8858 follow-up — `resolveBundledNpmEntry` only knew the WINDOWS npm layout
|
|
* (`<dir(node.exe)>\node_modules\npm\bin\...`). On POSIX installs (GitHub
|
|
* hosted runners, nvm, system node) npm lives at
|
|
* `<prefix>/lib/node_modules/npm/bin/...` while node is `<prefix>/bin/node`,
|
|
* so the resolver returned null and `npm run build:cli` (Fast Production
|
|
* Build, dast-smoke) failed on every fresh CI checkout with
|
|
* "npm-cli.js not found next to the running Node binary".
|
|
*/
|
|
import { test } from "node:test";
|
|
import assert from "node:assert/strict";
|
|
|
|
import { resolveBundledNpmEntry } from "../../../scripts/build/resolveNpmEntry.ts";
|
|
|
|
const POSIX_PREFIX = "/opt/hostedtoolcache/node/24.18.0/x64";
|
|
const POSIX_NODE = `${POSIX_PREFIX}/bin/node`;
|
|
const POSIX_NPM_CLI = `${POSIX_PREFIX}/lib/node_modules/npm/bin/npm-cli.js`;
|
|
|
|
const WIN_STYLE_DIR = "/fake/nodejs"; // Windows layout shape (npm beside the binary)
|
|
const WIN_STYLE_NODE = `${WIN_STYLE_DIR}/node.exe`;
|
|
const WIN_STYLE_NPM_CLI = `${WIN_STYLE_DIR}/node_modules/npm/bin/npm-cli.js`;
|
|
|
|
test("POSIX layout: finds npm-cli.js under <prefix>/lib/node_modules (hosted runner shape)", () => {
|
|
const resolved = resolveBundledNpmEntry("npm-cli.js", {
|
|
execPath: POSIX_NODE,
|
|
npmExecPath: undefined,
|
|
exists: (p) => p === POSIX_NPM_CLI,
|
|
});
|
|
assert.equal(resolved, POSIX_NPM_CLI);
|
|
});
|
|
|
|
test("Windows layout: still finds npm-cli.js beside the node binary", () => {
|
|
const resolved = resolveBundledNpmEntry("npm-cli.js", {
|
|
execPath: WIN_STYLE_NODE,
|
|
npmExecPath: undefined,
|
|
exists: (p) => p === WIN_STYLE_NPM_CLI,
|
|
});
|
|
assert.equal(resolved, WIN_STYLE_NPM_CLI);
|
|
});
|
|
|
|
test("npm_execpath (set by `npm run`) wins and resolves npx-cli.js as its sibling", () => {
|
|
const npmExecPath = `${POSIX_PREFIX}/lib/node_modules/npm/bin/npm-cli.js`;
|
|
const npxSibling = `${POSIX_PREFIX}/lib/node_modules/npm/bin/npx-cli.js`;
|
|
const resolved = resolveBundledNpmEntry("npx-cli.js", {
|
|
execPath: POSIX_NODE,
|
|
npmExecPath,
|
|
exists: (p) => p === npxSibling,
|
|
});
|
|
assert.equal(resolved, npxSibling);
|
|
});
|
|
|
|
test("returns null when no layout matches", () => {
|
|
const resolved = resolveBundledNpmEntry("npm-cli.js", {
|
|
execPath: POSIX_NODE,
|
|
npmExecPath: undefined,
|
|
exists: () => false,
|
|
});
|
|
assert.equal(resolved, null);
|
|
});
|
|
|
|
test("live environment: the real node install can resolve npm-cli.js (POSIX regression guard)", (t) => {
|
|
if (process.platform === "win32") {
|
|
t.skip("POSIX-only live check");
|
|
return;
|
|
}
|
|
const resolved = resolveBundledNpmEntry("npm-cli.js");
|
|
assert.ok(
|
|
resolved,
|
|
`real install must resolve npm-cli.js (execPath=${process.execPath}) — the #8858 resolver returned null on POSIX`
|
|
);
|
|
});
|