* fix: exclude file content from reverted prompt text Revert and fork now restore only the user's original prompt, not server-injected file content Uses existing isSyntheticPart helper for type-safe filtering * fix: keep scrollbar visible when hovering over thumb * fix: prevent ESC abort from triggering when terminal is focused * fix: pass directory to permission/question reply calls so approvals actually resolve * fix: default model selection not responding after Base UI migration * fix: prevent modal content from shifting and clipping footer buttons * fix: improve session switching performance and add sub-agent export with prompt collapse Defer viewport anchor saving to eliminate ~800ms UI freeze when switching sessions Add export dialog to include sub-agent tasks recursively in markdown export Add collapse chevron button for expanded user prompts in sticky header * fix: resolve sidebar scroll and TDZ crash in session sidebar * perf: reduce CPU overhead and re-renders across chat, layout, and settings * fix: position collapse button at top of message and prevent ESC abort in terminal * fix: position collapse button at top and add padding only when expanded * refactor: extract shared PATH utilities and mobile keyboard hook * refactor: import shared path-utils in electron, use module-level style constants - Electron now imports pathLooksUserConfigured/mergePathValues from shared path-utils.js instead of inline duplication - ToolPart collapsedCustomStyle moved from useMemo([]) to module const * fix: resolve remaining merge conflicts and type errors - Remove duplicate variable declarations in SessionNodeItem - Remove orphaned export callback body from conflict resolution - Fix HelpDialog description -> descriptionKey (i18n rename) * fix: resolve type-check and lint errors in session-actions.test.ts - Added missing bun:test type declarations (beforeEach, mock, mock.module) - Removed unused State import - Replaced 'as any' casts with proper OpencodeClient and ChildStoreManager types - Added eslint-disable for unused _ parameter in mock function * fix PR 1028 export and PATH edge cases * fix startup retry exhaustion state * remove opencode package lock change * fix sub-session rename cancellation --------- Co-authored-by: Bohdan Triapitsyn <artmore@protonmail.com>
101 lines
2.9 KiB
JavaScript
101 lines
2.9 KiB
JavaScript
/**
|
|
* Shared PATH heuristics and merge utilities for server and Electron runtimes.
|
|
*
|
|
* The heuristic decides whether the current process.env.PATH looks like it was
|
|
* configured by the user (or their session manager) vs. a minimal system default.
|
|
* When the PATH looks user-configured we keep it; otherwise we prefer the login
|
|
* shell PATH which typically has the full toolchain.
|
|
*/
|
|
|
|
const TOOLCHAIN_SEGMENTS = [
|
|
'/opt/homebrew/',
|
|
'/opt/pkg/',
|
|
'/opt/pmk/',
|
|
'/snap/',
|
|
];
|
|
|
|
const TOOLCHAIN_BASENAMES = new Set([
|
|
'.cargo',
|
|
'.bun',
|
|
'.nvm',
|
|
'.pyenv',
|
|
'.rbenv',
|
|
'.sdkman',
|
|
'.asdf',
|
|
'.volta',
|
|
'.fnm',
|
|
'.local',
|
|
'.opencode',
|
|
'node_modules',
|
|
]);
|
|
|
|
/**
|
|
* Returns true when `value` (a PATH string) contains at least one segment that
|
|
* suggests the PATH was configured by the user or their session manager rather
|
|
* than being a bare system default.
|
|
*
|
|
* @param {string} value - The PATH string to inspect.
|
|
* @param {string} home - The user's home directory (os.homedir()).
|
|
* @param {string} delim - The PATH delimiter (':' on POSIX, ';' on Windows).
|
|
*/
|
|
export function pathLooksUserConfigured(value, home, delim) {
|
|
if (typeof value !== 'string' || !value) {
|
|
return false;
|
|
}
|
|
|
|
const normalizedHome = typeof home === 'string' ? home.replaceAll('\\', '/') : '';
|
|
const homeWithSep = normalizedHome ? normalizedHome + '/' : '';
|
|
|
|
return value.split(delim).some((segment) => {
|
|
if (!segment) return false;
|
|
const normalizedSegment = segment.replaceAll('\\', '/');
|
|
|
|
// Any path under the user's home directory.
|
|
if (normalizedHome && (normalizedSegment === normalizedHome || normalizedSegment.startsWith(homeWithSep))) {
|
|
return true;
|
|
}
|
|
|
|
// Well-known package-manager / toolchain prefixes.
|
|
if (TOOLCHAIN_SEGMENTS.some((prefix) => normalizedSegment.startsWith(prefix))) {
|
|
return true;
|
|
}
|
|
|
|
// Well-known dot-directories inside home (e.g. ~/.cargo/bin).
|
|
const parts = normalizedSegment.split('/').filter(Boolean);
|
|
if (parts.some((part) => TOOLCHAIN_BASENAMES.has(part))) {
|
|
return true;
|
|
}
|
|
|
|
return false;
|
|
});
|
|
}
|
|
|
|
/**
|
|
* Merges two PATH strings, deduplicating segments while preserving the order of
|
|
* `primary` and appending any segments from `fallback` that are not already
|
|
* present.
|
|
*
|
|
* @param {string} primary - The preferred PATH (e.g. user-configured or login shell).
|
|
* @param {string} fallback - The secondary PATH to fill gaps from.
|
|
* @param {string} delim - The PATH delimiter.
|
|
*/
|
|
export function mergePathValues(primary, fallback, delim) {
|
|
const seen = new Set();
|
|
const result = [];
|
|
|
|
const addSegments = (value) => {
|
|
if (typeof value !== 'string' || !value) return;
|
|
for (const segment of value.split(delim)) {
|
|
if (segment && !seen.has(segment)) {
|
|
seen.add(segment);
|
|
result.push(segment);
|
|
}
|
|
}
|
|
};
|
|
|
|
addSegments(primary);
|
|
addSegments(fallback);
|
|
|
|
return result.join(delim);
|
|
}
|