Commit Graph
1469 Commits
Author SHA1 Message Date
bincxz 1b188c8aad fix(sftp): clarify folder conflict choices 2026-08-24 22:59:00 +08:00
陈大猫 eaacd01055 Merge pull request #3120 from Sammsai/main
feat(notes): add source mode, formulas, outline, and export tools
2026-08-24 22:51:55 +08:00
bincxz 0fd7bed991 feat(notes): polish editor workflow and presentation 2026-08-24 18:32:56 +08:00
bincxz af1b624747 fix(ai): restore New Chat in persisted workspaces 2026-08-24 15:22:57 +08:00
bincxz 2e51ff8b54 fix: route reassigned shortcut from editor 2026-08-23 23:11:59 +08:00
bincxz 88387b9c2b fix: respect close-tab binding in editor 2026-08-23 22:56:36 +08:00
bincxz 4ff20453f2 fix: preserve Cmd+W focus and settings behavior 2026-08-23 22:51:42 +08:00
bincxz 13b1bf506e fix: honor disabled close-tab shortcut on macOS 2026-08-23 22:42:29 +08:00
Sammsai 140d78ae9e 多语言支持 2026-08-23 13:02:05 +08:00
bincxz b11eaa172f fix: disable reconnect menus during preparation 2026-08-23 00:52:39 +08:00
bincxz 82e2f7287d fix: keep reconnect notice stable 2026-08-22 23:50:51 +08:00
bincxz dd30ff0e20 merge: sync main and keep manual reconnect non-blocking 2026-08-22 23:40:05 +08:00
Sammsai dc6d1d9b60 笔记模块工具栏中增加了代码字号配置功能 2026-08-22 20:37:32 +08:00
陈大猫 e4c1ab2a8f Merge pull request #3094 from binaricat/codex/issue-3092-sftp-folder-conflict
fix(sftp): make folder conflict merge the safe default
2026-08-22 15:45:15 +08:00
Sammsai 29c90f1974 1 2026-08-22 15:30:45 +08:00
bincxz 08b9027ef1 fix: separate focus and pane magnification actions 2026-08-22 14:49:29 +08:00
Sammsai acfc581719 1 2026-08-22 12:28:01 +08:00
bincxz 486a8d20e1 Merge remote-tracking branch 'origin/main' into codex/issue-3081-focus-side-panel
# Conflicts:
#	application/i18n/locales/zh-TW/vault.ts
2026-08-22 11:51:53 +08:00
LaiYueJi 8988ebe903 fix(i18n): restore zh-TW key parity and use Taiwan terminology
zh-TW was missing 78 keys. I18nProvider resolves a missing zh-TW key
through the base "zh" language, and that lookup matches zh-CN first in
MESSAGES_BY_LOCALE, so Traditional Chinese users saw Simplified Chinese
for the whole App Lock surface rather than an English fallback.

- add the 78 missing keys: appLock.*, settings.appLock.*, topTabs.lockApp,
  dialog.createWorkspace.title, field.selectHosts, placeholder.searchHosts
- fix Simplified leftovers: 云端 -> 雲端, 筆記本里 -> 筆記本裡, 賬密 -> 帳密
- switch mainland wording to Taiwan usage: 分組 -> 群組, 標籤頁 -> 分頁,
  身份 -> 身分, 新建 -> 新增, 地址 -> 位址, 重置 -> 重設, 快捷鍵 -> 快速鍵,
  生成 -> 產生, 審批/批准 -> 核准, 波特率 -> 鮑率, 停止位 -> 停止位元,
  拖拽 -> 拖曳, 響應 -> 回應, 字號 -> 字型大小, 重啟 -> 重新啟動

zh-TW now covers every key present in en and zh-CN.
2026-08-21 23:02:42 +08:00
bincxz 8191f0b67b fix: keep focus inside the magnified pane 2026-08-21 17:23:44 +08:00
bincxz 2897a18f1e feat: magnify the active split pane 2026-08-21 17:15:25 +08:00
bincxz 79aafcdb1a feat(ai): make response wait configurable 2026-08-21 15:39:01 +08:00
Sammsai 3632b42e8e 修复界面无显示 2026-08-21 08:18:01 +08:00
bincxz ad1c5c9a3a fix(sftp): fail closed on unknown folder targets 2026-08-20 16:41:50 +08:00
bincxz a6180c7db1 fix: sync disconnect notice preference 2026-08-20 16:21:40 +08:00
bincxz 5245ebbaa0 fix(sftp): open filter with search shortcut 2026-08-20 16:08:41 +08:00
bincxz e9f2a7c883 fix(sftp): align folder conflict actions 2026-08-20 16:07:32 +08:00
bincxz d7d711e1e3 fix: add non-blocking disconnect notices 2026-08-20 16:00:59 +08:00
bincxz a8e5b4992c fix(sftp): make folder conflict merge the safe default 2026-08-20 15:50:16 +08:00
bincxz 71f6f51707 Merge remote-tracking branch 'origin/main' into feat/ai-sidebar-provider-model-thinking
# Conflicts:
#	components/settings/tabs/ai/ProviderConfigForm.tsx
2026-08-20 11:53:43 +08:00
bincxz 0288d1610a fix(ai): skip no-op AI config updates and simplify permission picker
Avoid rewriting thinking/provider maps when values are unchanged so
mounted AI panels do not re-render. Put permission title and short
description on one line and drop the Cursor CLI parenthetical.
2026-08-20 11:52:29 +08:00
bincxz b7b35afa24 fix(ai): persist explicit Off and omit unset thinking options
Codex P2: missing agentThinkingMap was treated as Off, so GPT-5.1+
got reasoningEffort=none and Gemini 2.5 Flash got thinkingBudget=0
without a user choice. Store Off as an explicit value and leave an
absent preference unset so the provider default is used.
2026-08-19 23:34:28 +08:00
bincxz 10ca915370 fix(ai): include Catty thinking map in settings sync
Codex P2: agentThinkingMap was persisted locally but omitted from
collect/apply sync, so backups and other devices restored provider
and model without the chosen reasoning level.
2026-08-19 23:18:50 +08:00
bincxz 77cb55315a fix(ai): keep Ollama Cloud API keys and append /v1
The Ollama preset always rewrote OpenAI-compat keys to the literal
"ollama" dummy. That is correct for local servers with no key, but it
replaced the IPC placeholder used for Cloud, so chat sent
Authorization: Bearer ollama and 401ed. Only fill the dummy when no key
is configured, and normalize a bare ollama.com origin to /v1.
2026-08-19 20:45:58 +08:00
bincxz 4acf254f72 feat(ai): unify sidebar provider, model, and thinking pickers
Give Catty a two-column provider/model menu in the composer, add search
plus recent/pinned models, and move thinking effort onto its own chip
so Claude, Codex, Grok, and Catty share the same compact controls.

Closes #2137
Closes #2637
Closes #1884
2026-08-19 17:23:06 +08:00
bincxz fdecf652bf feat(ai): add optional OpenAI Responses API format
Closes #3078

OpenAI-compatible providers always used Chat Completions. Some
relays cache poorly on that path. Add a per-provider Responses
opt-in so Catty can call /v1/responses while keeping Chat
Completions as the default.
2026-08-19 16:10:20 +08:00
bincxz 7b8c944510 feat(sftp): show owner column in the file list
Surface the remote file owner in the SFTP list and tree, using the
existing toggleable column menu. Parse the username from SFTP longname
or ls output, then fall back to uid when a name is unavailable.

Closes #3073
2026-08-19 14:39:17 +08:00
bincxz 2c009b3ba4 fix(app-lock): skip tray hide lock when timeout is never
Closes #3072

Close-to-tray and app-hide always requested a background lock whenever
app lock was enabled. "Never lock automatically" only disabled the idle
timer, so clicking X on Windows still asked for the password on reopen.

Honor timeoutMinutes === 0 for background locks. Startup and manual
locks still apply. Setting copy now says Never skips both.
2026-08-19 14:14:13 +08:00
bincxz e6c46f8198 fix(app-lock): defer protected actions until unlock 2026-08-18 20:45:29 +08:00
bincxz 8eaab92d31 feat(app-lock): prioritize system unlock flow 2026-08-18 20:22:34 +08:00
bincxz 370b57fa67 style(app-lock): simplify password field 2026-08-18 19:43:54 +08:00
bincxz 0ac30b5049 fix(app-lock): harden lock boundaries 2026-08-18 17:24:46 +08:00
bincxzandCursor d422a27715 Merge origin/main into feature/app-lock-screen
Reconcile the app-lock feature with main's refactored renderer
architecture (publishers/hosts/AppShell) and main-process changes:

- index.tsx/App.tsx: AppLockGate keeps ownership of useSettingsState and
  useAppLockState; new AppLockRuntimePublisher publishes the runtime via
  appRuntimeBridge; SettingsPublisher now binds the gate-owned settings.
- AppSideEffects: defer deep links, tray port-forward toggles, global
  hotkeys and window close commands while locked; flush on unlock.
- main.cjs: keep fresh-session re-lock before main's reusable-window
  fast path; before-quit guard delegates to handleBeforeQuit with main's
  async plugin-shutdown commitQuit and pending-update cancellation.
- globalShortcutBridge: keep locked-state tray redaction on top of
  main's deferred tray panel show logic.
- preload: adopt main's lastPayload replay for terminal popup config
  (superset of the gate-delay replay fix).
- vite config: keep dev CSP plugin, adopt main's warn-only stale
  optimize-dep handling; electron-builder: keep Windows Hello helper
  extraResource with main's CLI-controlled arch targets.

Co-authored-by: Cursor <cursoragent@cursor.com>
2026-08-18 16:30:30 +08:00
陈大猫 1deea15e0f Merge pull request #3048 from binaricat/fix/3046-focus-hidden-pane-full-size
fix(terminal): keep hidden focus-mode panes full-size to stop \r progress spam
2026-08-18 14:48:30 +08:00
bincxzandCursor d920d076d4 fix(workspace): hand focus to a remaining session when closing the focused pane
closeSessionWorkspaceLayoutState pruned the workspace tree but left
focusedSessionId pointing at the closed session. In a focus-mode workspace no
pane then qualified as visible, so the continuously rendered hidden panes all
painted on top of each other (reported in #3046 follow-up). Reassign focus to
a remaining session and drop closed ids from focusSessionOrder, matching the
detach path.

Co-authored-by: Cursor <cursoragent@cursor.com>
2026-08-18 14:34:23 +08:00
陈大猫andCursor b7325218fb feat(ssh): accept PuTTY-style CLI args from bastion hosts (#3044)
* feat(ssh): accept PuTTY-style CLI args from bastion hosts

Reuse the existing ssh:// and telnet:// deep-link path so PAM products that launch putty.exe -ssh user@host -P port -pw password can point at Netcatty instead.

Co-authored-by: Cursor <cursoragent@cursor.com>

* fix(ssh): consume operands of ignored PuTTY flags

Unknown value-taking options such as -m and -D were skipped while their next token was treated as a host or port, which could connect the supplied password to the wrong endpoint.

Co-authored-by: Cursor <cursoragent@cursor.com>

* fix(ssh): reject unsupported PuTTY protocols and unknown flags

-raw/-rlogin/-serial must not fall through to SSH with the supplied password, and valueless switches such as -batch must not consume the following host. Unknown dash flags are now rejected instead of guessed.

Co-authored-by: Cursor <cursoragent@cursor.com>

* fix(ssh): reject missing or empty PuTTY option operands

An empty or trailing -pw was turned into ssh://user:@host, which the deep-link path treats as no password and can then authenticate with a saved vault credential.

Co-authored-by: Cursor <cursoragent@cursor.com>

* fix(ssh): reject unsupported -pwfile, -i, and -hostkey launches

Those options request credentials or a host-key pin this pipeline cannot honor, so connecting with -pw or a vault match would silently change the authentication the caller asked for.

Co-authored-by: Cursor <cursoragent@cursor.com>

* fix(ssh): keep .app/.exe hosts and reject -loghost

Suffix filtering now only covers the Electron script argument, so destinations like prod.app are not dropped. -loghost is rejected because this pipeline cannot honor the logical host-key identity.

Co-authored-by: Cursor <cursoragent@cursor.com>

* fix(ssh): keep packaged argv[1] hosts like prod.js

Suffix filtering now applies only after an Electron binary, so a packaged launch can still use a first-position hostname that looks like a script.

Co-authored-by: Cursor <cursoragent@cursor.com>

---------

Co-authored-by: Cursor <cursoragent@cursor.com>
2026-08-18 13:35:27 +08:00
陈大猫andCursor 074acc3bed feat(sftp): add right-click extract for archives (#3042)
* feat(sftp): add right-click extract for archives

Let SFTP list and tree views unpack zip/tar/gz archives in place via remote SSH exec (or local tar/unzip), so users do not need to switch to another file manager.

Co-authored-by: Cursor <cursoragent@cursor.com>

* fix(sftp): keep extract from clobbering files or dying on unzip output

Write gzip/bzip2/xz results to a staging path and replace the destination only after a zero exit. Drain unzip progress instead of treating routine stdout as a hard failure.

Co-authored-by: Cursor <cursoragent@cursor.com>

* fix(sftp): quote extract cleanup trap and use unique staging files

Remote gzip/bzip2/xz nested a quoted path inside trap, so names with spaces failed before decode. Staging now exclusively creates a unique sibling, and local .gz uses Node zlib.

Co-authored-by: Cursor <cursoragent@cursor.com>

* fix(sftp): refuse single-file extract onto an existing directory

Remote mv would otherwise drop the staging file inside that directory and still report success.

Co-authored-by: Cursor <cursoragent@cursor.com>

* fix(sftp): restore the previous file if Windows extract replace fails

Rename the destination aside before publishing the staging file, instead of deleting it first.

Co-authored-by: Cursor <cursoragent@cursor.com>

---------

Co-authored-by: Cursor <cursoragent@cursor.com>
2026-08-18 12:00:16 +08:00
bincxz 3f919955fa fix(terminal): honor OSC notify policy while hibernated
Address Codex review on #3037. Disabled mode no longer marks tab
activity. Hidden hibernated sessions now scan incoming chunks for
OSC 9/777/99 so Codex can still raise a toast before the tab wakes.
2026-08-18 09:53:42 +08:00
bincxz 2a52837657 feat(terminal): show desktop notifications for OSC 9/777/99
Closes #3019

Codex and other agents emit OSC 9 when a turn completes or approval
is needed, but Netcatty ignored those sequences. Register OSC 9, 777
notify, and kitty OSC 99 handlers, map them to Electron notifications,
and reuse tray focus so a click jumps back to the emitting session.
Ignore ConEmu OSC 9;n progress sequences so they do not become toasts.
2026-08-18 09:28:11 +08:00
bincxz 0222736349 fix(snippets): ignore disabled app shortcuts in shortkey conflicts
When the keyboard shortcut scheme is off, snippet recording still
treated default Mac and PC bindings as occupied. Conflict checks now
use only bindings that can actually fire, and the error names the
conflicting action.

Closes #3025
2026-08-17 17:55:06 +08:00