Files
Netcatty/components/terminal/sftpCwd.ts
T
陈大猫 eae760db3f fix: upload terminal drops to current cwd
Fix terminal drag-and-drop uploads so they target the active terminal cwd and avoid fallback home/login-shell cwd when the active cwd cannot be confirmed.
2026-06-09 21:25:32 +08:00

111 lines
3.2 KiB
TypeScript

type SessionPwdResult = {
success: boolean;
cwd?: string | null;
};
type SessionPwdOptions = {
allowHomeFallback?: boolean;
};
type ResolvePreferredTerminalCwdOptions = {
rendererCwd?: string | null;
sessionId?: string | null;
getSessionPwd: (sessionId: string, options?: SessionPwdOptions) => Promise<SessionPwdResult>;
/** When true, always probe the backend instead of trusting renderer cwd. */
preferFreshBackend?: boolean;
};
const normalizeCwd = (cwd?: string | null): string | null => {
if (typeof cwd !== "string" || cwd.trim().length === 0) return null;
return cwd;
};
export type TerminalCwdTracker = {
getRendererCwd: () => string | undefined;
setRendererCwd: (cwd?: string | null) => string | undefined;
clearRendererCwd: () => void;
};
export const createTerminalCwdTracker = (): TerminalCwdTracker => {
let rendererCwd: string | undefined;
return {
getRendererCwd: () => rendererCwd,
setRendererCwd: (cwd) => {
rendererCwd = normalizeCwd(cwd) ?? undefined;
return rendererCwd;
},
clearRendererCwd: () => {
rendererCwd = undefined;
},
};
};
export const resolvePreferredTerminalCwd = async ({
rendererCwd,
sessionId,
getSessionPwd,
preferFreshBackend = false,
}: ResolvePreferredTerminalCwdOptions): Promise<string | null> => {
const knownCwd = normalizeCwd(rendererCwd);
if (!preferFreshBackend && knownCwd) return knownCwd;
if (!sessionId) return null;
try {
const result = await getSessionPwd(
sessionId,
preferFreshBackend ? { allowHomeFallback: false } : undefined,
);
const backendCwd = result.success ? normalizeCwd(result.cwd) : null;
return backendCwd ?? knownCwd;
} catch {
return knownCwd;
}
};
export const PROBE_SESSION_CWD_AFTER_COMMAND_MS = 150;
export type ProbeBackendSessionCwdAfterCommandOptions = {
sessionId: string;
cwdRevisionAtCommand: number;
getCwdRevision: () => number;
getSessionPwd: (sessionId: string, options?: SessionPwdOptions) => Promise<SessionPwdResult>;
canProbe?: () => boolean | Promise<boolean>;
};
/** Probe backend pwd when OSC 7 did not update cwd after a command. */
export const probeBackendSessionCwdAfterCommand = async ({
sessionId,
cwdRevisionAtCommand,
getCwdRevision,
getSessionPwd,
canProbe = () => true,
}: ProbeBackendSessionCwdAfterCommandOptions): Promise<string | null> => {
if (getCwdRevision() !== cwdRevisionAtCommand) return null;
const allowed = await canProbe();
if (!allowed || getCwdRevision() !== cwdRevisionAtCommand) return null;
try {
const result = await getSessionPwd(sessionId);
if (getCwdRevision() !== cwdRevisionAtCommand) return null;
return result.success ? normalizeCwd(result.cwd) : null;
} catch {
return null;
}
};
export const scheduleBackendCwdProbeAfterCommand = (
options: ProbeBackendSessionCwdAfterCommandOptions & {
onProbedCwd: (cwd: string) => void;
delayMs?: number;
},
): (() => void) => {
const delayMs = options.delayMs ?? PROBE_SESSION_CWD_AFTER_COMMAND_MS;
const timeoutId = setTimeout(() => {
void probeBackendSessionCwdAfterCommand(options).then((cwd) => {
if (cwd) options.onProbedCwd(cwd);
});
}, delayMs);
return () => clearTimeout(timeoutId);
};