Skip to content

armgit / cindy

Public Imported from GitHub
0

Consider it done. The open-source AI agent that works out of the box · 想到,就能做到。开源、开箱即用的 AI Agent。

Merge remote-tracking branch 'origin/main' into feat/builtin-skill-creator-review

xd-boboe1bc133a79f3
diff --cc apps/desktop/forge.config.ts
index fefa31c9be,ae5937bdf1..b06d3222be
--- a/apps/desktop/forge.config.ts
+++ b/apps/desktop/forge.config.ts
@@@ -1155,33 -1370,14 +1372,53 @@@ function buildWindowsTaskbarAddon(platf
}
}
+function buildWindowsAtomicRenameHelper(platform: ForgePlatform, arch: ForgeArch): void {
+ if (process.platform !== 'win32' || platform !== 'win32') return;
- const target = arch === 'arm64' ? 'aarch64-pc-windows-msvc' : arch === 'x64' ? 'x86_64-pc-windows-msvc' : null;
++ const target =
++ arch === 'arm64' ? 'aarch64-pc-windows-msvc' : arch === 'x64' ? 'x86_64-pc-windows-msvc' : null;
+ if (!target) throw new Error(`[forge] Unsupported Windows atomic rename architecture: ${arch}`);
+ const source = path.join(__dirname, 'native', 'windows-atomic-rename', 'main.rs');
+ const build = fs.mkdtempSync(path.join(os.tmpdir(), 'cindy-atomic-rename-build-'));
+ const output = path.join(build, 'cindy-windows-atomic-rename.exe');
+ try {
+ const userRustc = path.join(os.homedir(), '.cargo', 'bin', 'rustc.exe');
- const result = spawnSync(fs.existsSync(userRustc) ? userRustc : 'rustc', [
- source, '--edition=2021', '-C', 'opt-level=s', '-C', 'panic=abort',
- '--target', target, '-o', output,
- ], { stdio: 'inherit', windowsHide: true });
++ const result = spawnSync(
++ fs.existsSync(userRustc) ? userRustc : 'rustc',
++ [
++ source,
++ '--edition=2021',
++ '-C',
++ 'opt-level=s',
++ '-C',
++ 'panic=abort',
++ '--target',
++ target,
++ '-o',
++ output,
++ ],
++ { stdio: 'inherit', windowsHide: true },
++ );
+ if (result.error || result.status !== 0) {
- throw new Error(`[forge] Windows atomic rename build failed: ${result.error?.message ?? result.status}`);
++ throw new Error(
++ `[forge] Windows atomic rename build failed: ${result.error?.message ?? result.status}`,
++ );
+ }
+ const dest = path.join(__dirname, 'resources', 'tools', 'windows-atomic-rename');
+ fs.mkdirSync(dest, { recursive: true });
+ fs.copyFileSync(output, path.join(dest, 'cindy-windows-atomic-rename.exe'));
+ } finally {
+ fs.rmSync(build, { recursive: true, force: true });
+ }
+}
+
- function buildWindowsInputHelper(kind: 'gamepad' | 'micro', platform: ForgePlatform, arch: ForgeArch): void {
+ function buildWindowsInputHelper(
+ kind: 'gamepad' | 'micro',
+ platform: ForgePlatform,
+ arch: ForgeArch,
+ ): void {
if (process.platform !== 'win32' || platform !== 'win32') return;
- const target = arch === 'arm64' ? 'aarch64-pc-windows-msvc' : arch === 'x64' ? 'x86_64-pc-windows-msvc' : null;
+ const target =
+ arch === 'arm64' ? 'aarch64-pc-windows-msvc' : arch === 'x64' ? 'x86_64-pc-windows-msvc' : null;
if (!target) throw new Error(`[forge] Unsupported Windows gamepad helper architecture: ${arch}`);
const group = kind === 'gamepad' ? 'xbox-gamepad' : 'worklouder';
const source = path.join(__dirname, 'native', group, `windows-${kind}-helper`);
diff --cc package.json
index d62f09216e,d62f09216e..7dff35ee0e
--- a/package.json
+++ b/package.json
@@@ -128,7 -128,7 +128,7 @@@
"licenses:generate": "node scripts/generate-third-party-notices.mjs",
"lint": "pnpm -r lint",
"format": "pnpm -r format",
-- "test:runner": "node --test scripts/__tests__/test-workspaces.test.mjs scripts/__tests__/remote-bundle-inputs.test.mjs scripts/__tests__/test-related.test.mjs scripts/__tests__/desktop-worker-benchmark.test.mjs scripts/__tests__/dev-docs-contract.test.mjs scripts/__tests__/restart-desktop-remote.test.mjs scripts/__tests__/dev-migration-policy.test.mjs scripts/__tests__/ensure-deps.test.mjs scripts/__tests__/client-endpoint-build-env.test.mjs scripts/__tests__/log-upload-build-env.test.mjs scripts/__tests__/desktop-dev-region.test.mjs scripts/__tests__/desktop-dev-node-options.test.mjs scripts/__tests__/endpoint-consistency.test.mjs scripts/__tests__/endpoint-local-file.test.mjs scripts/__tests__/ensure-agent-binaries.test.mjs scripts/__tests__/ensure-android-platform-tools.test.mjs scripts/__tests__/fetch-with-timeout.test.mjs scripts/__tests__/agent-binary-cdn-fallback.test.mjs scripts/__tests__/ensure-binary-fallback.test.mjs scripts/__tests__/verify-sha256.test.mjs scripts/__tests__/codex-package-update-layout.test.mjs scripts/__tests__/pi-update-layout.test.mjs scripts/__tests__/migration-freeze.test.mjs scripts/__tests__/third-party-notices.test.mjs scripts/__tests__/brand-identity-sync.test.mjs scripts/__tests__/check-dco.test.mjs scripts/__tests__/package-args.test.mjs scripts/__tests__/notarize-mac-app.test.mjs scripts/__tests__/glossary-rules.test.mjs scripts/__tests__/design-inventory.test.mjs scripts/__tests__/hardcoded-color-audit.test.mjs",
++ "test:runner": "node --test scripts/__tests__/test-workspaces.test.mjs scripts/__tests__/remote-bundle-inputs.test.mjs scripts/__tests__/test-related.test.mjs scripts/__tests__/desktop-worker-benchmark.test.mjs scripts/__tests__/dev-docs-contract.test.mjs scripts/__tests__/restart-desktop-remote.test.mjs scripts/__tests__/dev-migration-policy.test.mjs scripts/__tests__/ensure-deps.test.mjs scripts/__tests__/client-endpoint-build-env.test.mjs scripts/__tests__/log-upload-build-env.test.mjs scripts/__tests__/desktop-dev-region.test.mjs scripts/__tests__/desktop-dev-node-options.test.mjs scripts/__tests__/endpoint-consistency.test.mjs scripts/__tests__/endpoint-local-file.test.mjs scripts/__tests__/ensure-agent-binaries.test.mjs scripts/__tests__/ensure-android-platform-tools.test.mjs scripts/__tests__/fetch-with-timeout.test.mjs scripts/__tests__/agent-binary-cdn-fallback.test.mjs scripts/__tests__/ensure-binary-fallback.test.mjs scripts/__tests__/verify-sha256.test.mjs scripts/__tests__/codex-package-update-layout.test.mjs scripts/__tests__/pi-update-layout.test.mjs scripts/__tests__/migration-freeze.test.mjs scripts/__tests__/third-party-notices.test.mjs scripts/__tests__/brand-identity-sync.test.mjs scripts/__tests__/check-dco.test.mjs scripts/__tests__/package-args.test.mjs scripts/__tests__/notarize-mac-app.test.mjs scripts/__tests__/glossary-rules.test.mjs scripts/__tests__/design-inventory.test.mjs scripts/__tests__/hardcoded-color-audit.test.mjs && node apps/desktop/scripts/check-windows-atomic-rename.mjs",
"test:workspaces": "node scripts/test-workspaces.mjs",
"test:unit": "pnpm test:runner && node scripts/test-workspaces.mjs --tier unit",
"test:unit:related": "node scripts/test-workspaces.mjs --tier unit --related",