惯性聚合 高效追踪和阅读你感兴趣的博客、新闻、科技资讯
阅读原文 在惯性聚合中打开

推荐订阅源

V
Visual Studio Blog
罗磊的独立博客
宝玉的分享
宝玉的分享
奇客Solidot–传递最新科技情报
奇客Solidot–传递最新科技情报
V
V2EX
酷 壳 – CoolShell
酷 壳 – CoolShell
T
Tailwind CSS Blog
博客园_首页
量子位
月光博客
月光博客
钛媒体:引领未来商业与生活新知
钛媒体:引领未来商业与生活新知
博客园 - 司徒正美
人人都是产品经理
人人都是产品经理
让小产品的独立变现更简单 - ezindie.com
让小产品的独立变现更简单 - ezindie.com
爱范儿
爱范儿
S
SegmentFault 最新的问题
雷峰网
雷峰网
小众软件
小众软件
博客园 - 聂微东
美团技术团队
Apple Machine Learning Research
Apple Machine Learning Research
WordPress大学
WordPress大学
Jina AI
Jina AI
Hugging Face - Blog
Hugging Face - Blog

Recent Commits to openclaw:main

test: merge chat side-result checks · openclaw/openclaw@ddd2c2a test: merge cron history checks · openclaw/openclaw@f7eb746 test: merge responsive navigation shell checks · openclaw/openclaw@c2e4b47 docs(changelog): add codex oauth fixes · openclaw/openclaw@628e6cd test: merge navigation routing cases · openclaw/openclaw@5d8cecb Tests: mock channel registry bundled fallback · openclaw/openclaw@2b08233 Secrets: avoid broad web search discovery for single plugin config · openclaw/openclaw@a464f59 test: merge config view browser checks · openclaw/openclaw@20cf511 fix(status): align oauth health with runtime · openclaw/openclaw@eed7116 feat: add macOS screen snapshots for monitor preview (#67954) thanks … · openclaw/openclaw@f377db1 fix: report shared auth scopes in hello-ok (#67810) thanks @BunsDev · openclaw/openclaw@0b6c39b Auto-reply: avoid eager bundled route fallback · openclaw/openclaw@3ea1bf4 Tests: narrow session binding contract setup · openclaw/openclaw@54e4e16 fix(macOS): enable undo/redo in webchat composer text input (#34962) · openclaw/openclaw@00951dc Tests: speed up channel setup promotion · openclaw/openclaw@82b529a Docs: refresh agent instructions · openclaw/openclaw@5775fe2 fix(auth): serialize OAuth refresh across agents to fix #26322 (#67876) · openclaw/openclaw@8e79080 test: allow ollama public surface boundary test · openclaw/openclaw@7d4f1a6 Docs: add test performance guardrails · openclaw/openclaw@89706d3 Tests: restore context-engine usage proof · openclaw/openclaw@e4c4f95 Tests: slim context engine runtime coverage · openclaw/openclaw@74c198f ci: retry failed custom checkouts · openclaw/openclaw@0ee5baf test: trim duplicate provider auth onboarding cases · openclaw/openclaw@1ffc02e matrix: fix sessions_spawn --thread subagent session spawning (#67643) · openclaw/openclaw@1ce2596 test: reduce auth choice fixture churn · openclaw/openclaw@857b9cd test: mock health status config boundaries · openclaw/openclaw@9d5ab4a test: mock onboard config io boundary · openclaw/openclaw@299694d test: mock legacy state plugin boundaries · openclaw/openclaw@2713089 test: mock channel install boundaries · openclaw/openclaw@b945248 test: mock doctor preview channel boundaries · openclaw/openclaw@b1a3ad4
refactor(plugin-sdk): extract shared dedupe helpers · ope...
steipete · 2026-04-29 · via Recent Commits to openclaw:main

@@ -1,7 +1,5 @@

1-

import fs from "node:fs";

2-

import os from "node:os";

3-

import path from "node:path";

41

import { loadBundledPluginPublicSurfaceModuleSync } from "./facade-loader.js";

2+

export { movePathToTrash, type MovePathToTrashOptions } from "./browser-trash.js";

5364

type CloseTrackedBrowserTabsParams = {

75

sessionKeys: Array<string | undefined>;

@@ -14,8 +12,6 @@ type BrowserMaintenanceSurface = {

1412

};

15131614

let cachedBrowserMaintenanceSurface: BrowserMaintenanceSurface | undefined;

17-

const TRASH_DESTINATION_COLLISION_CODES = new Set(["EEXIST", "ENOTEMPTY", "ERR_FS_CP_EEXIST"]);

18-

const TRASH_DESTINATION_RETRY_LIMIT = 4;

19152016

function hasRequestedSessionKeys(sessionKeys: Array<string | undefined>): boolean {

2117

return sessionKeys.some((key) => Boolean(key?.trim()));

@@ -30,125 +26,6 @@ function loadBrowserMaintenanceSurface(): BrowserMaintenanceSurface {

3026

return cachedBrowserMaintenanceSurface;

3127

}

322833-

function getFsErrorCode(error: unknown): string | undefined {

34-

if (!error || typeof error !== "object" || !("code" in error)) {

35-

return undefined;

36-

}

37-

const code = (error as NodeJS.ErrnoException).code;

38-

return typeof code === "string" ? code : undefined;

39-

}

40-41-

function isTrashDestinationCollision(error: unknown): boolean {

42-

const code = getFsErrorCode(error);

43-

return Boolean(code && TRASH_DESTINATION_COLLISION_CODES.has(code));

44-

}

45-46-

function isSameOrChildPath(candidate: string, parent: string): boolean {

47-

return candidate === parent || candidate.startsWith(`${parent}${path.sep}`);

48-

}

49-50-

function resolveAllowedTrashRoots(): string[] {

51-

const roots = [os.homedir(), os.tmpdir()].map((root) => {

52-

try {

53-

return path.resolve(fs.realpathSync.native(root));

54-

} catch {

55-

return path.resolve(root);

56-

}

57-

});

58-

return [...new Set(roots)];

59-

}

60-61-

function assertAllowedTrashTarget(targetPath: string): void {

62-

let resolvedTargetPath = path.resolve(targetPath);

63-

try {

64-

resolvedTargetPath = path.resolve(fs.realpathSync.native(targetPath));

65-

} catch {

66-

// The subsequent move will surface missing or inaccessible targets.

67-

}

68-

const isAllowed = resolveAllowedTrashRoots().some(

69-

(root) => resolvedTargetPath !== root && isSameOrChildPath(resolvedTargetPath, root),

70-

);

71-

if (!isAllowed) {

72-

throw new Error(`Refusing to trash path outside allowed roots: ${targetPath}`);

73-

}

74-

}

75-76-

function resolveTrashDir(): string {

77-

const homeDir = os.homedir();

78-

const trashDir = path.join(homeDir, ".Trash");

79-

fs.mkdirSync(trashDir, { recursive: true, mode: 0o700 });

80-

const trashDirStat = fs.lstatSync(trashDir);

81-

if (!trashDirStat.isDirectory() || trashDirStat.isSymbolicLink()) {

82-

throw new Error(`Refusing to use non-directory/symlink trash directory: ${trashDir}`);

83-

}

84-

const realHome = path.resolve(fs.realpathSync.native(homeDir));

85-

const resolvedTrashDir = path.resolve(fs.realpathSync.native(trashDir));

86-

if (resolvedTrashDir === realHome || !isSameOrChildPath(resolvedTrashDir, realHome)) {

87-

throw new Error(`Trash directory escaped home directory: ${trashDir}`);

88-

}

89-

return resolvedTrashDir;

90-

}

91-92-

function trashBaseName(targetPath: string): string {

93-

const resolvedTargetPath = path.resolve(targetPath);

94-

if (resolvedTargetPath === path.parse(resolvedTargetPath).root) {

95-

throw new Error(`Refusing to trash root path: ${targetPath}`);

96-

}

97-

const base = path.basename(resolvedTargetPath).replace(/[\\/]+/g, "");

98-

if (!base) {

99-

throw new Error(`Unable to derive safe trash basename for: ${targetPath}`);

100-

}

101-

return base;

102-

}

103-104-

function resolveContainedPath(root: string, leaf: string): string {

105-

const resolvedRoot = path.resolve(root);

106-

const resolvedPath = path.resolve(resolvedRoot, leaf);

107-

if (!isSameOrChildPath(resolvedPath, resolvedRoot) || resolvedPath === resolvedRoot) {

108-

throw new Error(`Trash destination escaped trash directory: ${resolvedPath}`);

109-

}

110-

return resolvedPath;

111-

}

112-113-

function reserveTrashDestination(trashDir: string, base: string, timestamp: number): string {

114-

const containerPrefix = resolveContainedPath(trashDir, `${base}-${timestamp}-`);

115-

const container = fs.mkdtempSync(containerPrefix);

116-

const resolvedContainer = path.resolve(container);

117-

const resolvedTrashDir = path.resolve(trashDir);

118-

if (

119-

resolvedContainer === resolvedTrashDir ||

120-

!isSameOrChildPath(resolvedContainer, resolvedTrashDir)

121-

) {

122-

throw new Error(`Trash destination escaped trash directory: ${container}`);

123-

}

124-

return resolveContainedPath(container, base);

125-

}

126-127-

function movePathToDestination(targetPath: string, dest: string): boolean {

128-

try {

129-

fs.renameSync(targetPath, dest);

130-

return true;

131-

} catch (error) {

132-

if (getFsErrorCode(error) !== "EXDEV") {

133-

if (isTrashDestinationCollision(error)) {

134-

return false;

135-

}

136-

throw error;

137-

}

138-

}

139-140-

try {

141-

fs.cpSync(targetPath, dest, { recursive: true, force: false, errorOnExist: true });

142-

fs.rmSync(targetPath, { recursive: true, force: false });

143-

return true;

144-

} catch (error) {

145-

if (isTrashDestinationCollision(error)) {

146-

return false;

147-

}

148-

throw error;

149-

}

150-

}

151-15229

export async function closeTrackedBrowserTabsForSessions(

15330

params: CloseTrackedBrowserTabsParams,

15431

): Promise<number> {

@@ -165,19 +42,3 @@ export async function closeTrackedBrowserTabsForSessions(

16542

}

16643

return await surface.closeTrackedBrowserTabsForSessions(params);

16744

}

168-169-

export async function movePathToTrash(targetPath: string): Promise<string> {

170-

// Avoid resolving external trash helpers through the service PATH during cleanup.

171-

const base = trashBaseName(targetPath);

172-

assertAllowedTrashTarget(targetPath);

173-

const trashDir = resolveTrashDir();

174-

const timestamp = Date.now();

175-

for (let attempt = 0; attempt < TRASH_DESTINATION_RETRY_LIMIT; attempt += 1) {

176-

const dest = reserveTrashDestination(trashDir, base, timestamp);

177-

if (movePathToDestination(targetPath, dest)) {

178-

return dest;

179-

}

180-

}

181-182-

throw new Error(`Unable to choose a unique trash destination for ${targetPath}`);

183-

}