merge - #2060
merge#2060PinableAgents wants to merge 32 commits into
Conversation
增加工作区查询、分页预算、Worker 调度和项目状态隔离，重设计分析导航与图谱工具栏。 支持节点拖动、流向示意、曲线与直线切换及聚焦紧凑排列，补充回归测试和规模基准记录。
# Conflicts: # __tests__/ui-map-model.test.ts # docs/design/codegraph-ui-design-spec.md # src/ui-server/api/map.ts # ui/src/App.svelte # ui/src/components/TopBar.svelte # ui/src/components/map/MapSidePanel.svelte # ui/src/components/map/ModuleNode.svelte # ui/src/views/MapView.svelte # ui/src/views/StepsView.svelte
Resolve the README delete/edit conflict without dropping Pinable workspace instructions. The integration commit will relocate fork-specific documentation to FORK.md and restore README.md to the upstream blob.
…ure syncs Preserve Pinable main and upstream ancestry. Resolve the README delete/edit conflict by keeping the upstream README blob and moving workspace guidance to FORK.md. Retain all fork UI/workspace code and the non-conflicting upstream indexing, resolution, daemon, telemetry and native-kernel fixes. Add a pinned upstream manifest, safe uncommitted-merge helper, 14 tested Git fixtures, and read-only build/test CI. No squash, rebase, force push, publishing or branch-protection changes.
…e coverage The first full sync validation passed 4,678 tests but exposed two existing fork regressions: a stale Polyline/worker mock for the now-Cubic G6 runtime, and nine legend descriptions with only partial Chinese substitutions. Use the existing graphText bilingual seam for the missing descriptions. Keep the original English copy and add mounted zh/en/zh regression tests. Replace obsolete worker assertions with queued/in-flight generation and disposal checks against the current rendering pipeline. Do not skip tests or alter production G6 behavior.
Sync colbymchenry/codegraph through ba3c21e while preserving Pinable customizations and real upstream ancestry. Resolve README ownership conflict via FORK.md; add safe sync tooling and read-only CI. Fix existing G6 test and legend localization regressions. Validated on PR head 502167d: 14 sync checks, build + UI package build, 4,686 full-suite tests (192 existing conditional skips), and 59 native-kernel regressions. CI run 35496137788 succeeded.
…sktop Add an independent runtime workflow, native launchers, SHA256 manifests and extracted-package smoke tests. Reuse existing full quality gates at the packaged source revision. Preserve upstream packaging and consumer-owned Desktop locks; publish only explicit Pinable prereleases.
Keep real MCP shutdown and Unicode-path tests; add actual file-watch event checks and prevent a runtime downgrade below the libuv fix. Atomically reserve release tags at the validated source SHA and never overwrite existing assets. Clarify inner archive versus Actions ZIP for Desktop consumers.
…oke tests Generate distinct writes after yielding to native watcher setup within the unchanged ten-second deadline. A real matching file event is still mandatory; errors and missing events still fail. Add eight probe lifecycle tests, including a real Unicode/spaces directory test, to the prepare job.
feat: 为 Pinable Desktop 交付六平台 CodeGraph 运行时
…rsions Merge colbymchenry/codegraph main at e63fe2e. Conflicting hunks prefer upstream; non-conflicting fork changes remain. Preserve both parents and update the upstream manifest. No release or force push.
|
Resolved the merge conflicts by merging the PR's upstream base At the author's explicit request, conflicting hunks use the upstream versions (
This is a real two-parent merge of the original fork head Validation of the exact resolved source commit: https://github.com/PinableAgents/codegraph/actions/runs/36369954090
The validation run checks out the original fork head and creates/tests the two-parent resolved commit; its workflow-event SHA belongs to the isolated helper branch. The audit artifact records the exact tested source SHA above. This does not claim a new six-platform runtime release or full Desktop installer validation. GitHub now reports |
…0 merge Build on the concurrent upstream merge without rewriting it. Reconcile the legacy Pinable v10 schema with upstream synthesis migrations at v12, retain cursor indexes and both UI test suites, and keep batched trail queries scoped to the originating project. Add real SQLite upgrade/idempotency and adapter-switch regressions.
|
The source branch was concurrently updated by An additive follow-up based on the new source main is validating in PinableAgents#4. It adds an idempotent v12 repair, preserves the legacy migration history and data, retains both sides' UI regression tests, and fixes project isolation across batched trail-name requests. It does not rewrite the concurrent merge or alter upstream workflows/release settings. Current candidate CI: https://github.com/PinableAgents/codegraph/actions/runs/36370754694 . Application/UI-library and native-kernel builds have passed, and the 79 native-kernel regression tests have passed. The complete engine/UI suite is still running; a completed result is not yet claimed. |
The proxy answers initialize before the daemon socket is listening, and daemon.pid is created before listen. Synchronize on the existing attachment signal rather than a guessed sleep. Preserve the real socket test, 1500ms shutdown bound, writer-lock assertion and platform conditions. Verified with 20 repetitions.
#4) Preserve the concurrent upstream merge and both histories. Repair the Pinable/upstream migration-v10 collision through additive v12, retain cursor and synthesis behavior, restore both UI regression suites, and bind batched node-reference queries to the initiating project adapter. Fix an observed upstream raw-socket test readiness race by waiting for actual daemon attachment, retaining shutdown deadlines and all assertions. Verified on the exact PR merge result: npm ci, application/UI and UI-library builds; 5198 engine/UI tests passed, 0 failed, 264 existing conditional skips; native Rust kernel build and 79 native regressions passed; 14 sync-tool tests passed. Focused conflict regressions 77/77 and 20 consecutive real-process socket tests passed. No forced ref updates, release/deployment, protection changes or new test skips.
|
Conflict/compatibility repair is now merged into this PR's source main as e78f65f, via PinableAgents#4 . The source retains upstream e63fe2e and both histories; GitHub reports this PR as mergeable. The repaired tree adds legacy Pinable-v10 database compatibility at migration v12, preserves the original migration history/data and cursor indexes, retains both sides' UI regression suites, and keeps all trail-name batches on their originating project adapter. A separate three-line test fix waits for actual daemon attachment before opening a raw socket; all production MCP behavior, shutdown timing and assertions are unchanged. Final verification of the exact code tree (the actual fork PR merge result):
Full current-tree CI: https://github.com/PinableAgents/codegraph/actions/runs/36371792205 The attempted upstream merge was bound to source e78f65f and returned 403: Resource not accessible by integration. This PR has therefore NOT been merged upstream by this connection. A target-repository maintainer needs to review and perform the final merge under the repository's checks/protection rules. Please retain merge ancestry rather than squash/rebase. No releases, deployment, protection changes or forced updates were performed. |
This branch has not been deployed
2 participants
No description provided.