mirror of
https://github.com/Tencent/BrowserSkill.git
synced 2026-09-10 13:01:23 +08:00
BB-fat
afdc398730
Review hardening for daemon-sharing deployments (other agents, terminals, or dsh instances on the same bsk daemon): - Ownership split: only sessions created by browser_session_start are 'owned'. Explicitly referenced foreign sessions are still tracked for the current-session pointer, but browser_session_stop refuses them and unload cleanup stops exactly the owned set — no path can stop a session this plugin did not create. - Start race: the capacity check is now a synchronous reserveStart/completeStart/abandonStart protocol, so two concurrent starts can never both pass the cap (check-and-reserve is atomic on the event loop); a rejected or failed start never leaks a session. - Stale handles: dispose already swallowed per-stop errors; the owned set is computed at dispose time so an externally stopped session is a no-op, not a failure. Tests (+7): reservation race (two concurrent starts, cap 1 -> exactly one spawn), foreign-stop refusal (no stop command reaches the daemon), reference adoption never becoming owned, resolveForStop pointer stability, and an apply-level dispose test proving only owned sessions are stopped while stale stops are tolerated. e2e: a manually started foreign session survived the plugin's full lifecycle while both plugin sessions were cleaned up.
92 lines
3.4 KiB
TypeScript
92 lines
3.4 KiB
TypeScript
/**
|
|
* dsh-plugin-browserskill — a DeepSeek Harness bundle that registers
|
|
* BrowserSkill (`bsk`) browser automation as model-visible tools.
|
|
*
|
|
* Each tool spawns `bsk <cmd> --json`, parses the structured output, and
|
|
* returns a canonical JSON value. The plugin tracks the sessions it starts so
|
|
* one agent conversation can drive several browsers at once; unloading the
|
|
* plugin stops every tracked session and kills any in-flight bsk children.
|
|
*
|
|
* @module dsh-plugin-browserskill
|
|
*/
|
|
|
|
import type { Context } from "@deepseek-ai/cordis";
|
|
import Schema from "@deepseek-ai/schemastery";
|
|
import { type BskRunner, createBskRunner } from "./runner";
|
|
import { SessionRegistry } from "./sessions";
|
|
import { type PluginConfig, registerTools } from "./tools";
|
|
|
|
export const name = "dsh-plugin-browserskill";
|
|
export const inject = ["tools"];
|
|
|
|
/** Runtime configuration schema (validated and defaulted by Cordis). */
|
|
export const Config = Schema.object({
|
|
bskPath: Schema.string()
|
|
.default("bsk")
|
|
.description("Path to the bsk CLI binary (defaults to resolving `bsk` from PATH)."),
|
|
defaultTimeoutMs: Schema.number()
|
|
.default(120_000)
|
|
.description("Default per-command timeout in milliseconds."),
|
|
maxSessions: Schema.number()
|
|
.default(5)
|
|
.description("Maximum number of concurrent browser sessions started through this plugin."),
|
|
});
|
|
|
|
export type Config = PluginConfig;
|
|
|
|
/** Test seams: swap the process runner (unit tests never spawn a real bsk). */
|
|
export interface ApplyOptions {
|
|
runnerFactory?: (bskPath: string) => BskRunner;
|
|
}
|
|
|
|
export function apply(
|
|
ctx: Context,
|
|
config: Partial<PluginConfig> = {},
|
|
options: ApplyOptions = {},
|
|
): void {
|
|
const resolved: PluginConfig = {
|
|
bskPath: config.bskPath ?? "bsk",
|
|
defaultTimeoutMs: config.defaultTimeoutMs ?? 120_000,
|
|
maxSessions: config.maxSessions ?? 5,
|
|
};
|
|
const runner = options.runnerFactory?.(resolved.bskPath) ?? createBskRunner(resolved.bskPath);
|
|
const registry = new SessionRegistry(resolved.maxSessions);
|
|
|
|
registerTools({ ctx, runner, registry, config: resolved });
|
|
|
|
// Non-blocking install probe: warn early when bsk is missing instead of
|
|
// failing the first tool call with a bare spawn error.
|
|
runner.run(["status"], { timeoutMs: 10_000 }).then(
|
|
() => {},
|
|
(error: unknown) => {
|
|
const detail = error instanceof Error ? error.message : String(error);
|
|
console.warn(
|
|
`[${name}] bsk probe failed (${detail}); browser tools will report install guidance until the bsk CLI is available`,
|
|
);
|
|
},
|
|
);
|
|
|
|
// Unload cleanup: kill in-flight children, then stop every session this
|
|
// plugin OWNS (created via browser_session_start). Referenced or unknown
|
|
// sessions belonging to other programs on the shared daemon are never
|
|
// touched; per-stop failures (already stopped externally, daemon restart)
|
|
// are swallowed so one stale handle cannot abort the rest.
|
|
ctx.effect(() => {
|
|
return () => {
|
|
runner.killAll();
|
|
const stops = registry
|
|
.ownedIds()
|
|
.map((sessionId) =>
|
|
runner.run(["session", "stop", sessionId], { timeoutMs: 15_000 }).catch(() => {}),
|
|
);
|
|
return Promise.all(stops).then(() => {});
|
|
};
|
|
});
|
|
}
|
|
|
|
export type { BskRunner, BskRunResult, SpawnImpl } from "./runner";
|
|
export { BskError, createBskRunner } from "./runner";
|
|
export { SessionRegistry } from "./sessions";
|
|
export type { PluginConfig, ToolDeps } from "./tools";
|
|
export { registerTools } from "./tools";
|