pi-agent-browser-native 0.9.3 → 0.9.5

package/dist/extensions/agent-browser/lib/argv-descriptor.js

@@ -1,26 +1,30 @@
-import { GLOBAL_BOOLEAN_FLAGS_WITH_OPTIONAL_VALUES, VALUE_FLAGS, optionalGlobalValueFlagConsumesNext, stripUpstreamGlobalFlags } from "./argv-grammar.js";
+import { GLOBAL_BOOLEAN_FLAGS_WITH_OPTIONAL_VALUES, VALUE_FLAGS, optionalGlobalValueFlagConsumesNext, stripUpstreamGlobalFlags, } from "./argv-grammar.js";
 import { isOpenNavigationCommand } from "./command-taxonomy.js";
 function isBooleanLiteral(token) {
     const normalized = token?.trim().toLowerCase();
     return normalized === "true" || normalized === "false";
 }
+function flagConsumesFollowingToken(token, nextToken) {
+    const normalizedToken = token.split("=", 1).at(0) ?? token;
+    if (optionalGlobalValueFlagConsumesNext(normalizedToken, nextToken)) {
+        return true;
+    }
+    if (token.includes("=")) {
+        return false;
+    }
+    return (VALUE_FLAGS.has(normalizedToken) ||
+        (GLOBAL_BOOLEAN_FLAGS_WITH_OPTIONAL_VALUES.has(normalizedToken) && isBooleanLiteral(nextToken)));
+}
 export function findCommandStartIndex(args) {
     for (let index = 0; index < args.length; index += 1) {
         const token = args[index];
-        if (token.startsWith("--session=") || token.startsWith("--namespace=") || token.startsWith("--restore=")) {
+        if (token.startsWith("--session=") ||
+            token.startsWith("--namespace=") ||
+            token.startsWith("--restore=")) {
             continue;
         }
         if (token.startsWith("-")) {
-            const normalizedToken = token.split("=", 1)[0] ?? token;
-            if (optionalGlobalValueFlagConsumesNext(normalizedToken, args[index + 1])) {
-                index += 1;
-            }
-            else if (VALUE_FLAGS.has(normalizedToken) && !token.includes("=")) {
-                index += 1;
-            }
-            else if (GLOBAL_BOOLEAN_FLAGS_WITH_OPTIONAL_VALUES.has(normalizedToken) &&
-                !token.includes("=") &&
-                isBooleanLiteral(args[index + 1])) {
+            if (flagConsumesFollowingToken(token, args[index + 1])) {
                 index += 1;
             }
             continue;
@@ -36,26 +40,38 @@ export function extractCommandTokens(args) {
 export function extractUpstreamCommandTokens(args) {
     return stripUpstreamGlobalFlags(extractCommandTokens(args));
 }
+function waitDownloadShape(considered, downloadIndex) {
+    const next = considered.at(downloadIndex + 1);
+    const candidate = next?.token.startsWith("--") === false ? next : undefined;
+    return {
+        downloadPath: candidate?.token,
+        downloadPathIndex: candidate?.index,
+        subcommand: considered[downloadIndex].token,
+    };
+}
 export function parseWaitCommandTokens(commandTokens) {
-    if (commandTokens[0] !== "wait")
+    if (commandTokens[0] !== "wait") {
         return {};
+    }
     const considered = commandTokens.slice(1).map((token, offset) => ({ index: offset + 1, token }));
     const timeoutIndex = considered.findIndex((entry) => entry.token === "--timeout");
-    if (timeoutIndex >= 0)
+    if (timeoutIndex >= 0) {
         considered.splice(timeoutIndex, Math.min(2, considered.length - timeoutIndex));
-    for (const flags of [["--url", "-u"], ["--load", "-l"], ["--fn", "-f"], ["--text", "-t"]]) {
-        const match = considered.find((entry) => flags.includes(entry.token));
-        if (match)
+    }
+    for (const flags of [
+        ["--url", "-u"],
+        ["--load", "-l"],
+        ["--fn", "-f"],
+        ["--text", "-t"],
+    ]) {
+        const match = considered.find((entry) => flags.some((flag) => flag === entry.token));
+        if (match) {
             return { subcommand: match.token };
+        }
     }
     const downloadIndex = considered.findIndex((entry) => entry.token === "--download" || entry.token === "-d");
     if (downloadIndex >= 0) {
-        const candidate = considered[downloadIndex + 1];
-        return {
-            downloadPath: candidate && !candidate.token.startsWith("--") ? candidate.token : undefined,
-            downloadPathIndex: candidate && !candidate.token.startsWith("--") ? candidate.index : undefined,
-            subcommand: considered[downloadIndex].token,
-        };
+        return waitDownloadShape(considered, downloadIndex);
     }
     return { subcommand: considered[0]?.token };
 }
@@ -76,14 +92,21 @@ function getOpenCommandTarget(commandTokens) {
     }
     return undefined;
 }
+function getCommandSubcommand(tokens) {
+    if (isOpenNavigationCommand(tokens.at(0))) {
+        return getOpenCommandTarget(tokens);
+    }
+    if (tokens.at(0) === "wait") {
+        return parseWaitCommandTokens(tokens).subcommand;
+    }
+    return tokens.at(1);
+}
 function parseCommandInfoFromTokens(commandTokens) {
     const upstreamCommandTokens = stripUpstreamGlobalFlags(commandTokens);
     const command = upstreamCommandTokens[0];
     return {
         command,
-        subcommand: isOpenNavigationCommand(command)
-            ? getOpenCommandTarget(upstreamCommandTokens)
-            : command === "wait" ? parseWaitCommandTokens(upstreamCommandTokens).subcommand : upstreamCommandTokens[1],
+        subcommand: getCommandSubcommand(upstreamCommandTokens),
     };
 }
 export function parseCommandInfo(args) {

package/dist/extensions/agent-browser/lib/argv-grammar.js

@@ -1,4 +1,6 @@
 import { isKnownCommandToken } from "./command-taxonomy.js";
+import { canonicalizeAgentBrowserNamespace } from "./session-identity.js";
+export { canonicalizeAgentBrowserNamespace, foldAgentBrowserFilesystemIdentity, getAgentBrowserSessionIdentityKey, isAgentBrowserSessionIdentityKeyInNamespace, deleteIdentityKeysInNamespace, } from "./session-identity.js";
 export const GLOBAL_VALUE_FLAGS = [
     "--session",
     "--namespace",
@@ -80,9 +82,15 @@ const COMMAND_VALUE_FLAGS = [
     "--wait-until",
 ];
 const OPTIONAL_GLOBAL_VALUE_FLAGS = new Set(["--restore"]);
-export const VALUE_FLAGS = new Set([...GLOBAL_VALUE_FLAGS, ...COMMAND_VALUE_FLAGS]);
+export const VALUE_FLAGS = new Set([
+    ...GLOBAL_VALUE_FLAGS,
+    ...COMMAND_VALUE_FLAGS,
+]);
 export const PREVALIDATED_VALUE_FLAGS = new Set(GLOBAL_VALUE_FLAGS);
-export const GLOBAL_VALUE_FLAGS_ALLOWING_DASH_VALUE = new Set(["--args", "--session"]);
+export const GLOBAL_VALUE_FLAGS_ALLOWING_DASH_VALUE = new Set([
+    "--args",
+    "--session",
+]);
 export const GLOBAL_BOOLEAN_FLAGS_WITH_OPTIONAL_VALUES = new Set([
     "--allow-file-access",
     "--annotate",
@@ -108,7 +116,6 @@ export const GLOBAL_BOOLEAN_FLAGS_WITH_OPTIONAL_VALUES = new Set([
     "-v",
     "--webgpu",
 ]);
-const SESSION_COMPONENT_ALPHANUMERIC = /^[\p{Alphabetic}\p{Number}]$/u;
 /** Match upstream's last-wins, case-sensitive boolean semantics; only exact `false` disables a present flag. */
 export function getBooleanFlagValue(args, flag) {
     let enabled;
@@ -116,16 +123,19 @@ export function getBooleanFlagValue(args, flag) {
         const token = args[index];
         if (token === flag) {
             enabled = args[index + 1] !== "false";
-            if (["true", "false"].includes(args[index + 1] ?? ""))
+            if (["true", "false"].includes(args[index + 1] ?? "")) {
                 index += 1;
+            }
             continue;
         }
         if (PREVALIDATED_VALUE_FLAGS.has(token)) {
             index += 1;
             continue;
         }
-        if (GLOBAL_BOOLEAN_FLAGS_WITH_OPTIONAL_VALUES.has(token) && ["true", "false"].includes(args[index + 1] ?? ""))
+        if (GLOBAL_BOOLEAN_FLAGS_WITH_OPTIONAL_VALUES.has(token) &&
+            ["true", "false"].includes(args[index + 1] ?? "")) {
             index += 1;
+        }
     }
     return enabled;
 }
@@ -136,52 +146,6 @@ export function isBooleanFlagEnabled(args, flag) {
 export function isUpstreamEnvFlagEnabled(value) {
     return value !== undefined && !["", "0", "false", "no"].includes(value.toLowerCase());
 }
-/** Mirror upstream sanitize_session_component for namespace/socket/state identity. */
-export function canonicalizeAgentBrowserNamespace(value) {
-    if (value === undefined)
-        return undefined;
-    let normalized = "";
-    let lastWasSeparator = false;
-    for (const character of value) {
-        if (SESSION_COMPONENT_ALPHANUMERIC.test(character)) {
-            normalized += character.toLowerCase();
-            lastWasSeparator = false;
-        }
-        else if (character === "-" || character === "_") {
-            if (normalized && !lastWasSeparator) {
-                normalized += character;
-                lastWasSeparator = true;
-            }
-        }
-        else if (normalized && !lastWasSeparator) {
-            normalized += "-";
-            lastWasSeparator = true;
-        }
-    }
-    return normalized.replace(/[-_]+$/u, "") || undefined;
-}
-export function foldAgentBrowserFilesystemIdentity(value, platform) {
-    if (platform !== "darwin" && platform !== "win32")
-        return value;
-    // APFS aliases include full Unicode folds such as ß/SS and ς/Σ, not just ASCII case.
-    return value.normalize("NFC").toLowerCase().toUpperCase().toLowerCase().normalize("NFC");
-}
-export function getAgentBrowserSessionIdentityKey(sessionName, namespace, platform = process.platform) {
-    const canonicalNamespace = canonicalizeAgentBrowserNamespace(namespace);
-    const identityNamespace = canonicalNamespace ? foldAgentBrowserFilesystemIdentity(canonicalNamespace, platform) : undefined;
-    const canonicalSessionName = foldAgentBrowserFilesystemIdentity(sessionName, platform);
-    return identityNamespace ? `${identityNamespace}\0${canonicalSessionName}` : canonicalSessionName;
-}
-export function isAgentBrowserSessionIdentityKeyInNamespace(identityKey, namespace) {
-    const prefix = getAgentBrowserSessionIdentityKey("", namespace);
-    return prefix ? identityKey.startsWith(prefix) : !identityKey.includes("\0");
-}
-export function deleteIdentityKeysInNamespace(entries, namespace) {
-    for (const key of entries.keys()) {
-        if (isAgentBrowserSessionIdentityKeyInNamespace(key, namespace))
-            entries.delete(key);
-    }
-}
 /** Mirror upstream global parsing: full argv, no `--` sentinel, and only global value payloads are skipped. */
 export function scanUpstreamGlobalFlagOccurrences(args, targetFlag) {
     const occurrences = [];
@@ -196,8 +160,10 @@ export function scanUpstreamGlobalFlagOccurrences(args, targetFlag) {
             index += 1;
             continue;
         }
-        if (GLOBAL_BOOLEAN_FLAGS_WITH_OPTIONAL_VALUES.has(token) && ["true", "false"].includes(args[index + 1] ?? ""))
+        if (GLOBAL_BOOLEAN_FLAGS_WITH_OPTIONAL_VALUES.has(token) &&
+            ["true", "false"].includes(args[index + 1] ?? "")) {
             index += 1;
+        }
     }
     return occurrences;
 }
@@ -209,45 +175,53 @@ export function extractExplicitNamespace(args) {
 }
 export function resolveAgentBrowserNamespace(args, envValue) {
     const occurrences = scanUpstreamGlobalFlagOccurrences(args, "--namespace");
-    if (occurrences.length > 0)
+    if (occurrences.length > 0) {
         return canonicalizeAgentBrowserNamespace(occurrences.at(-1)?.value) ?? "";
+    }
     return canonicalizeAgentBrowserNamespace(envValue);
 }
+function getRestoreFlag(token, next, seenCommand, sessionName) {
+    if (token.startsWith("--restore=")) {
+        const requested = token.slice("--restore=".length);
+        return { key: requested.length > 0 ? requested : sessionName, consumed: 0 };
+    }
+    if (token !== "--restore") {
+        return undefined;
+    }
+    if (!seenCommand && optionalGlobalValueFlagConsumesNext(token, next) && next !== undefined) {
+        return { key: next, consumed: 1 };
+    }
+    return { key: sessionName, consumed: 0 };
+}
 /** Mirror upstream's optional restore value and full-argv last-wins parsing. */
 export function extractRequestedRestoreKey(args, sessionName, envValue) {
-    let restoreKey = envValue || null;
+    let restoreKey = envValue !== undefined && envValue.length > 0 ? envValue : null;
     let seenCommand = false;
     for (let index = 0; index < args.length; index += 1) {
         const token = args[index];
-        if (token.startsWith("--restore=")) {
-            restoreKey = token.slice("--restore=".length) || sessionName;
-            continue;
-        }
-        if (token === "--restore") {
-            if (!seenCommand && optionalGlobalValueFlagConsumesNext(token, args[index + 1])) {
-                restoreKey = args[index + 1];
-                index += 1;
-            }
-            else {
-                restoreKey = sessionName;
-            }
+        const restore = getRestoreFlag(token, args[index + 1], seenCommand, sessionName);
+        if (restore !== undefined) {
+            restoreKey = restore.key;
+            index += restore.consumed;
             continue;
         }
         if (PREVALIDATED_VALUE_FLAGS.has(token)) {
             index += 1;
             continue;
         }
-        if (GLOBAL_BOOLEAN_FLAGS_WITH_OPTIONAL_VALUES.has(token) && ["true", "false"].includes(args[index + 1] ?? "")) {
+        if (GLOBAL_BOOLEAN_FLAGS_WITH_OPTIONAL_VALUES.has(token) &&
+            ["true", "false"].includes(args[index + 1] ?? "")) {
             index += 1;
             continue;
         }
-        if (isKnownCommandToken(token))
+        if (isKnownCommandToken(token)) {
             seenCommand = true;
+        }
     }
     return restoreKey;
 }
 function getFlagName(token) {
-    return token.split("=", 1)[0] ?? token;
+    return token.split("=", 1).at(0) ?? token;
 }
 export function isNonFlagToken(token) {
     return typeof token === "string" && !token.startsWith("-");
@@ -258,53 +232,66 @@ export function hasOnlyBooleanFlags(tokens, allowedFlags) {
 export function hasOnlyOptionFlags(tokens, allowedBooleanFlags, allowedValueFlags) {
     for (let index = 0; index < tokens.length; index += 1) {
         const token = tokens[index];
-        if (!token.startsWith("-"))
+        if (!token.startsWith("-")) {
             return false;
+        }
         const flagName = getFlagName(token);
-        if (allowedBooleanFlags.has(flagName))
+        if (allowedBooleanFlags.has(flagName)) {
             continue;
-        if (!allowedValueFlags.has(flagName))
+        }
+        if (!allowedValueFlags.has(flagName)) {
             return false;
-        if (token.includes("="))
+        }
+        if (token.includes("=")) {
             continue;
-        const value = tokens[index + 1];
-        if (!isNonFlagToken(value))
+        }
+        const value = tokens.at(index + 1);
+        if (!isNonFlagToken(value)) {
             return false;
+        }
         index += 1;
     }
     return true;
 }
 export function optionalGlobalValueFlagConsumesNext(flag, nextToken) {
-    if (!OPTIONAL_GLOBAL_VALUE_FLAGS.has(flag) || nextToken === undefined || nextToken.startsWith("-"))
+    if (!OPTIONAL_GLOBAL_VALUE_FLAGS.has(flag) ||
+        nextToken === undefined ||
+        nextToken.startsWith("-")) {
         return false;
+    }
     return !isKnownCommandToken(nextToken);
 }
+function globalFlagWidth(token, next, seenCommand) {
+    if (token.startsWith("--restore=")) {
+        return 1;
+    }
+    if (token === "--restore") {
+        return !seenCommand && optionalGlobalValueFlagConsumesNext(token, next) ? 2 : 1;
+    }
+    if (PREVALIDATED_VALUE_FLAGS.has(token)) {
+        return 2;
+    }
+    if (GLOBAL_BOOLEAN_FLAGS_WITH_OPTIONAL_VALUES.has(token)) {
+        return ["true", "false"].includes(next ?? "") ? 2 : 1;
+    }
+    return 0;
+}
 export function projectUpstreamGlobalFlags(args) {
     const indices = [];
     const tokens = [];
     let seenCommand = false;
     for (let index = 0; index < args.length; index += 1) {
         const token = args[index];
-        if (token.startsWith("--restore="))
-            continue;
-        if (token === "--restore") {
-            if (!seenCommand && optionalGlobalValueFlagConsumesNext(token, args[index + 1]))
-                index += 1;
-            continue;
-        }
-        if (PREVALIDATED_VALUE_FLAGS.has(token)) {
-            index += 1;
-            continue;
-        }
-        if (GLOBAL_BOOLEAN_FLAGS_WITH_OPTIONAL_VALUES.has(token)) {
-            if (["true", "false"].includes(args[index + 1] ?? ""))
-                index += 1;
+        const width = globalFlagWidth(token, args[index + 1], seenCommand);
+        if (width > 0) {
+            index += width - 1;
             continue;
         }
         tokens.push(token);
         indices.push(index);
-        if (isKnownCommandToken(token))
+        if (isKnownCommandToken(token)) {
             seenCommand = true;
+        }
     }
     return { indices, tokens };
 }
@@ -317,14 +304,16 @@ export function stripSessionlessShapeGlobalFlags(commandTokens) {
     for (let index = 0; index < commandTokens.length; index += 1) {
         const token = commandTokens[index];
         const flagName = getFlagName(token);
-        if (token === "--json")
+        if (token === "--json") {
             continue;
+        }
         if ((flagName === "--session" || flagName === "--namespace") && !token.includes("=")) {
             index += 1;
             continue;
         }
-        if (token.startsWith("--session=") || token.startsWith("--namespace="))
+        if (token.startsWith("--session=") || token.startsWith("--namespace=")) {
             continue;
+        }
         stripped.push(token);
     }
     return stripped;