fix: preserve Windows cmd start URL quoting (#794) (thanks @roshanasingh4)
This commit is contained in:
@@ -20,6 +20,7 @@
|
|||||||
- TUI: keep the last streamed response instead of replacing it with "(no output)". (#747 — thanks @thewilloftheshadow)
|
- TUI: keep the last streamed response instead of replacing it with "(no output)". (#747 — thanks @thewilloftheshadow)
|
||||||
- Slack: accept slash commands with or without leading `/` for custom command configs. (#798 — thanks @thewilloftheshadow)
|
- Slack: accept slash commands with or without leading `/` for custom command configs. (#798 — thanks @thewilloftheshadow)
|
||||||
- Onboarding/Configure: refuse to proceed with invalid configs; run `clawdbot doctor` first to avoid wiping custom fields. (#764 — thanks @mukhtharcm)
|
- Onboarding/Configure: refuse to proceed with invalid configs; run `clawdbot doctor` first to avoid wiping custom fields. (#764 — thanks @mukhtharcm)
|
||||||
|
- Onboarding: quote Windows browser URLs when launching via `cmd start` to preserve OAuth query params. (#794 — thanks @roshanasingh4)
|
||||||
- Anthropic: merge consecutive user turns (preserve newest metadata) before validation to avoid “Incorrect role information” errors. (#804 — thanks @ThomsenDrake)
|
- Anthropic: merge consecutive user turns (preserve newest metadata) before validation to avoid “Incorrect role information” errors. (#804 — thanks @ThomsenDrake)
|
||||||
- Discord/Slack: centralize reply-thread planning so auto-thread replies stay in the created thread without parent reply refs.
|
- Discord/Slack: centralize reply-thread planning so auto-thread replies stay in the created thread without parent reply refs.
|
||||||
- Telegram: respect account-scoped bindings when webhook mode is enabled. (#821 — thanks @gumadeiras)
|
- Telegram: respect account-scoped bindings when webhook mode is enabled. (#821 — thanks @gumadeiras)
|
||||||
|
|||||||
@@ -10,8 +10,8 @@ import {
|
|||||||
isCloudCodeAssistFormatError,
|
isCloudCodeAssistFormatError,
|
||||||
isCompactionFailureError,
|
isCompactionFailureError,
|
||||||
isContextOverflowError,
|
isContextOverflowError,
|
||||||
isMessagingToolDuplicate,
|
|
||||||
isFailoverErrorMessage,
|
isFailoverErrorMessage,
|
||||||
|
isMessagingToolDuplicate,
|
||||||
normalizeTextForComparison,
|
normalizeTextForComparison,
|
||||||
sanitizeGoogleTurnOrdering,
|
sanitizeGoogleTurnOrdering,
|
||||||
sanitizeSessionMessagesImages,
|
sanitizeSessionMessagesImages,
|
||||||
|
|||||||
@@ -27,9 +27,13 @@ describe("openUrl", () => {
|
|||||||
expect(ok).toBe(true);
|
expect(ok).toBe(true);
|
||||||
|
|
||||||
expect(mocks.runCommandWithTimeout).toHaveBeenCalledTimes(1);
|
expect(mocks.runCommandWithTimeout).toHaveBeenCalledTimes(1);
|
||||||
const argv = mocks.runCommandWithTimeout.mock.calls[0]?.[0];
|
const [argv, options] = mocks.runCommandWithTimeout.mock.calls[0] ?? [];
|
||||||
expect(argv?.slice(0, 4)).toEqual(["cmd", "/c", "start", ""]);
|
expect(argv?.slice(0, 4)).toEqual(["cmd", "/c", "start", '""']);
|
||||||
expect(argv?.at(-1)).toBe(`"${url}"`);
|
expect(argv?.at(-1)).toBe(`"${url}"`);
|
||||||
|
expect(options).toMatchObject({
|
||||||
|
timeoutMs: 5_000,
|
||||||
|
windowsVerbatimArguments: true,
|
||||||
|
});
|
||||||
});
|
});
|
||||||
});
|
});
|
||||||
|
|
||||||
|
|||||||
@@ -232,9 +232,22 @@ function resolveSshTargetHint(): string {
|
|||||||
export async function openUrl(url: string): Promise<boolean> {
|
export async function openUrl(url: string): Promise<boolean> {
|
||||||
const resolved = await resolveBrowserOpenCommand();
|
const resolved = await resolveBrowserOpenCommand();
|
||||||
if (!resolved.argv) return false;
|
if (!resolved.argv) return false;
|
||||||
const command = [...resolved.argv, resolved.quoteUrl ? `"${url}"` : url];
|
const quoteUrl = resolved.quoteUrl === true;
|
||||||
|
const command = [...resolved.argv];
|
||||||
|
if (quoteUrl) {
|
||||||
|
if (command.at(-1) === "") {
|
||||||
|
// Preserve the empty title token for `start` when using verbatim args.
|
||||||
|
command[command.length - 1] = '""';
|
||||||
|
}
|
||||||
|
command.push(`"${url}"`);
|
||||||
|
} else {
|
||||||
|
command.push(url);
|
||||||
|
}
|
||||||
try {
|
try {
|
||||||
await runCommandWithTimeout(command, { timeoutMs: 5_000 });
|
await runCommandWithTimeout(command, {
|
||||||
|
timeoutMs: 5_000,
|
||||||
|
windowsVerbatimArguments: quoteUrl,
|
||||||
|
});
|
||||||
return true;
|
return true;
|
||||||
} catch {
|
} catch {
|
||||||
// ignore; we still print the URL for manual open
|
// ignore; we still print the URL for manual open
|
||||||
|
|||||||
@@ -48,6 +48,7 @@ export type CommandOptions = {
|
|||||||
cwd?: string;
|
cwd?: string;
|
||||||
input?: string;
|
input?: string;
|
||||||
env?: NodeJS.ProcessEnv;
|
env?: NodeJS.ProcessEnv;
|
||||||
|
windowsVerbatimArguments?: boolean;
|
||||||
};
|
};
|
||||||
|
|
||||||
export async function runCommandWithTimeout(
|
export async function runCommandWithTimeout(
|
||||||
@@ -59,6 +60,7 @@ export async function runCommandWithTimeout(
|
|||||||
? { timeoutMs: optionsOrTimeout }
|
? { timeoutMs: optionsOrTimeout }
|
||||||
: optionsOrTimeout;
|
: optionsOrTimeout;
|
||||||
const { timeoutMs, cwd, input, env } = options;
|
const { timeoutMs, cwd, input, env } = options;
|
||||||
|
const { windowsVerbatimArguments } = options;
|
||||||
const hasInput = input !== undefined;
|
const hasInput = input !== undefined;
|
||||||
|
|
||||||
// Spawn with inherited stdin (TTY) so tools like `pi` stay interactive when needed.
|
// Spawn with inherited stdin (TTY) so tools like `pi` stay interactive when needed.
|
||||||
@@ -67,6 +69,7 @@ export async function runCommandWithTimeout(
|
|||||||
stdio: [hasInput ? "pipe" : "inherit", "pipe", "pipe"],
|
stdio: [hasInput ? "pipe" : "inherit", "pipe", "pipe"],
|
||||||
cwd,
|
cwd,
|
||||||
env: env ? { ...process.env, ...env } : process.env,
|
env: env ? { ...process.env, ...env } : process.env,
|
||||||
|
windowsVerbatimArguments,
|
||||||
});
|
});
|
||||||
let stdout = "";
|
let stdout = "";
|
||||||
let stderr = "";
|
let stderr = "";
|
||||||
|
|||||||
Reference in New Issue
Block a user