mirror of
https://github.com/diegosouzapw/OmniRoute.git
synced 2026-08-26 09:02:11 +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.
41 lines
1.6 KiB
TypeScript
41 lines
1.6 KiB
TypeScript
import { existsSync } from "fs";
|
|
import { dirname, join } from "path";
|
|
|
|
/** Injectable seams for {@link resolveBundledNpmEntry} (all default to the real ones). */
|
|
export interface ResolveNpmEntryDeps {
|
|
execPath?: string;
|
|
/** `process.env.npm_execpath` — set by npm itself when running under `npm run`. */
|
|
npmExecPath?: string;
|
|
exists?: (p: string) => boolean;
|
|
}
|
|
|
|
/**
|
|
* Locate `npm-cli.js` / `npx-cli.js` so build steps can run npm/npx through
|
|
* `process.execPath` directly and never touch a `.cmd` shim (#8858), covering
|
|
* BOTH install layouts:
|
|
* - Windows: `<dir(node.exe)>\node_modules\npm\bin\<name>` (npm beside the binary)
|
|
* - POSIX: `<dir(node)>/../lib/node_modules/npm/bin/<name>` (node under `<prefix>/bin`,
|
|
* the shape of GitHub hosted runners, nvm and system installs)
|
|
* When the script itself runs under `npm run`, npm exports `npm_execpath` pointing at
|
|
* its own npm-cli.js — the most reliable source, tried first (npx-cli.js is its sibling).
|
|
*/
|
|
export function resolveBundledNpmEntry(
|
|
name: "npm-cli.js" | "npx-cli.js",
|
|
deps: ResolveNpmEntryDeps = {}
|
|
): string | null {
|
|
const execPath = deps.execPath ?? process.execPath;
|
|
const exists = deps.exists ?? existsSync;
|
|
const npmExecPath = deps.npmExecPath ?? process.env.npm_execpath;
|
|
|
|
const binDir = dirname(execPath);
|
|
const candidates: string[] = [];
|
|
if (npmExecPath) candidates.push(join(dirname(npmExecPath), name));
|
|
candidates.push(join(binDir, "node_modules", "npm", "bin", name));
|
|
candidates.push(join(binDir, "..", "lib", "node_modules", "npm", "bin", name));
|
|
|
|
for (const candidate of candidates) {
|
|
if (exists(candidate)) return candidate;
|
|
}
|
|
return null;
|
|
}
|