Skip to content

fix(upstream): 審視上游至 577e2df,移植定價、專案目錄解碼、續接與 keeper 修正 - #32

Merged
SanHsien merged 5 commits into
mainfrom
fleet/maint-20261024
Oct 24, 2026
Merged

SanHsien merged 5 commits into
mainfrom
fleet/maint-20261024

Conversation

@SanHsien

Copy link
Copy Markdown
Owner

處理 #26。404 本身已由 #30 修掉(sync point 少了後 33 碼);這個 PR 做的是 #26 真正要求的事:審視累積的 367 筆上游 commit、PR #157–#261、Issue #202。

採用(手工移植,上游已把根目錄模組搬進套件,diff 對不上)

  • 離線價格:gpt-6.1-sol、Haiku 5.5、Sonnet 5.5 快取讀取價、Grok xai/ 鍵
  • Claude 專案目錄解碼(含 -、.、非 ASCII、emoji、超長截斷)
  • 續接 hook 不把鄰居視窗仍在跑的 session 交給新視窗(hook 1.8 → 1.9)
  • keeper 背景 ping 不跑使用者 hook、不進 /resume
  • 「結束」鈕缺字方框(U+23FB)
  • WebView2 設定檔固定在 ~/.agentdeck/webview(新 win_webview.py,因 wintray.py 已在行數上限)

未採用/後續

逐筆理由與觸發條件在 docs/UPSTREAM.md 新增的 2026-10-24 段。需維護者決定的一項:Antigravity 額度改打正式主機 cloudcode-pa(本 fork providers/agy_quota_probe.py:48 仍是 daily 主機,Gemini 群組很可能缺),涉及把 OAuth token 送往另一個端點與 SECURITY*.md 的端點聲明,故未擅自改。

驗證

  • pwsh tools/dev_check.ps1:1701 passed、8 skipped,全部閘門通過
  • tools/check_upstream_updates.py 對真實上游:has_updates=False,PR 軸通過 #261、issue 軸通過 #202
  • 需 Windows 實機 smoke:結束鈕/系統匣選單無方框;同專案開兩個 Claude Code 視窗,新視窗不被交接鄰居的工作

🤖 Generated with Claude Code

Copilot AI balanced review requested due to automatic review settings October 24, 2026 13:48
@chatgpt-codex-connector

chatgpt-codex-connector Bot commented Oct 24, 2026 •

Copy link
Copy Markdown

Codex Review Summary

This comment shows the latest Codex review activity on this pull request.

Review Status Commit Review trigger
📝 Code Review ✅ Completed 2026-10-24T14:13:20.124615Z 3c27367 New commits
ℹ️ About Codex in GitHub

Your team has set up Codex to review pull requests in this repo. Reviews are triggered when you

  • Open a pull request for review
  • Mark a draft as ready
  • Comment "@codex review" or "@codex security review".

Codex reacts with 👀 while any review is running, comments if it has suggestions, and reacts with 👍 once all reviews finish with no findings.

Copilot AI left a comment

Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Copilot was unable to review this pull request because the user who requested the review has insufficient remaining quota.

@chatgpt-codex-connector chatgpt-codex-connector Bot left a comment

Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

💡 Codex Review

Here are some automated review suggestions for this pull request.

Reviewed commit: a0355bf222

ℹ️ About Codex in GitHub

Your team has set up Codex to review pull requests in this repo. Reviews are triggered when you

  • Open a pull request for review
  • Mark a draft as ready
  • Comment "@codex review".

If Codex has suggestions, it will comment; otherwise it will react with 👍.

Codex can also answer questions or update the PR. Try commenting "@codex address that feedback".

Comment thread project_resolver.py
return None
for entry in entries:
name = _encode(entry.name)
last = encoded == name or (truncated and name.startswith(encoded))

Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

P2 Badge Disambiguate truncated paths before accepting a project directory

When project paths share their first 200 encoded characters, this prefix match returns the first alphabetically sorted directory for all of them because the distinguishing hash was discarded. It also accepts an ancestor as the project when truncation occurs before the final path component: a 210-character parent containing actual-project resolves to the parent's name instead. These incorrect names are then cached and used by history and persona loading for records without cwd, merging or misattributing projects that previously retained distinct encoded fallback names. Validate the complete candidate against the hash, or retain the encoded fallback when the prefix cannot uniquely identify the actual project.

Useful? React with 👍 / 👎.

SanHsien and others added 2 commits October 24, 2026 22:11
Co-Authored-By: Claude Sonnet 5.5 <noreply@anthropic.com>
@SanHsien
SanHsien merged commit 52ec1b5 into main Oct 24, 2026
4 checks passed
@SanHsien
SanHsien deleted the fleet/maint-20261024 branch October 24, 2026 17:55
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants