mirror of
https://github.com/binaricat/Netcatty.git
synced 2026-11-21 15:41:17 +00:00
f2c2501fa5c93f7aa1089dbea0a08c19476a6458
19
Commits
| Author | SHA1 | Message | Date | |
|---|---|---|---|---|
|
|
3fc56df111 | refactor(ai): migrate agent backends from ACP to official SDKs (claude/codex/copilot) (#1229) | ||
|
|
b30696c98b | Clean up dead code and duplicated helpers (#1001) | ||
|
|
c771979178 |
Add Skills + CLI mode for external agents (#599)
* Add Skills + CLI external agent workflow * feat: add Skills + CLI transport for ACP agents * chore: remove branch-local compatibility shims |
||
|
|
1d2489b02c |
feat: support long-running AI terminal jobs (#647)
* Add background terminal jobs for long AI commands * Bound background job output buffering * Fix long-running terminal job polling and stop behavior * Fix terminal job final output and stopping retention * Wait for PTY stop confirmation before cancelling * fix: address codex review findings in PTY job refactor - [P1] Use last occurrence of start marker to skip echoed wrapper command, preventing control markers from leaking into stdout - [P1] Add wall-clock timeout for foreground PTY execution so commands that print continuously still get terminated at the configured limit - [P2] Add hard deadline for cancellation so jobs that ignore Ctrl+C are force-finished after 30s instead of staying stuck in "stopping" forever Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com> * fix: address round-2 codex review findings - [P1] Use visibleOutput for background job completion to keep offsets consistent with polling, preventing output loss when raw buffer (with ANSI codes) truncates earlier than the visible buffer - [P2] Clarify system prompt that terminal_start requires PTY-backed sessions, so exec-only SSH sessions are not incorrectly routed Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com> * fix: address round-3 codex review findings - [P1] Always strip markers from visibleOutput in background job finish to prevent end-marker lines leaking into terminal_poll results - [P2] Correct terminal_execute timeout guidance from ~2min to ~60s to match the actual default commandTimeoutMs (60000) Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com> * fix: address round-4 codex review findings - [P1] Delay session lock release when cancel is forced (process may still be running) to prevent sending commands into a busy shell - [P2] Move scope validation before pendingSessionWriteApprovals so out-of-scope requests fail fast without blocking the write lock - [P2] Add session scope checks to handleJobPoll and handleJobStop so chats that lose access cannot read output or cancel jobs Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com> * fix: address round-5 codex review findings - [P1] Strip marker lines before they enter the bounded visible buffer so they never occupy space or leak as partial fragments on truncation - [P2] Never release session lock after forced cancellation since the previous process may still be attached to the PTY Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com> * fix: address round-6 codex review findings - [P2] Buffer incomplete marker lines across PTY chunks to prevent partial marker fragments from leaking into visible output - [P1] Release session lock after 60s delay on forced cancel as compromise between safety and permanent lock - [P2] Enforce session scope checks on jobPoll/jobStop for both dynamic (chatSessionId) and static (NETCATTY_MCP_SESSION_IDS) modes Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com> * fix: address round-7 codex review findings - [P2] validateSessionScope now accepts explicit scopedSessionIds so static MCP scope mode is enforced for jobPoll/jobStop too - [P2] Apply per-session execution lock to netcatty:ai:exec IPC path so it cannot race with active background jobs on the same session Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com> * fix: address round-8 codex review findings - [P1] Make wall-clock timeout opt-in via enforceWallTimeout flag, enabled only for MCP terminal_execute path. Catty Agent's netcatty:ai:exec keeps the inactivity-based timeout since it has no terminal_start fallback for long-running streaming commands - [P2] Always allow handleJobStop regardless of session scope so the per-session execution lock can always be released after workspace membership changes Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com> * fix: address round-9 codex review findings - [P1] Enable enforceWallTimeout for netcatty:ai:exec to match the pre-PR behavior (hard wall-clock deadline). Without this, tail -f or verbose builds would hold the session lock indefinitely - [P2] Treat explicit scopedSessionIds=[] as no access rather than falling through to global scope, matching handleGetContext's documented behavior Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com> * fix: address round-10 codex review findings - [P2] Add bounded startup deadline (30s) for the start marker arrival even when wall-clock timeout is disabled. Prevents background jobs from hanging indefinitely on already-chatty PTY sessions - [P3] Use job-specific marker (not generic __NCMCP_) when stripping marker lines, so user output containing __NCMCP_ is preserved Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com> * fix: address round-11 codex review findings - [P2] Skip the 30s startup timeout for foreground execViaPty paths. It now applies only when maxBufferedChars > 0 (background jobs), so foreground commands queued behind a busy shell can wait - [P2] Return empty stdout from getSnapshot() before the start marker arrives, so an early poll cannot advance nextOffset past pre-start PTY noise that gets discarded once the real command begins Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com> * fix: address round-12 codex review findings - [P1] Treat empty chat scopes as no access in validateSessionScope: if a chat has explicit scoped metadata (even []), enforce strictly rather than falling through to fallback/global scope - [P2] Re-add session scope check in handleJobStop for static MCP clients (scopedSessionIds), while still allowing dynamic chat-scoped callers to always stop their own jobs even after scope changes Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com> * fix: address round-13 codex review findings - [P2] getScopedJob now requires the caller to present the job's chatSessionId. Unscoped/static callers cannot reach into another chat's background jobs even if they learn the jobId - [P2] Stop button no longer cancels terminal_start background jobs. They are intentionally long-running, so killing them on every per-response stop defeats the purpose of the feature. Cleanup on chat deletion (cleanupScopedMetadata) is preserved Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com> * fix: address round-14 codex review findings - [P1] terminal_start jobs no longer registered in activePtyExecs so ACP "Stop" / cancelPtyExecsForSession does not kill them. They are still managed via terminal_stop and the per-session execution lock - [P1] Remove enforceWallTimeout from netcatty:ai:exec since Catty Agent has no terminal_start fallback for long-running commands. Inactivity timeout still catches genuinely hung processes - [P2] Forced-cancelled jobs stay in "stopping" (completed=false) until the 60s lock grace period ends, so callers don't see the job as completed while the session is still locked Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com> * fix: address round-15 codex review findings - [P2] Allow netcatty/jobStop to bypass the chat-cancelled gate so users can stop terminal_start jobs even after ACP "Stop" was pressed - [P2] Mark non-zero exit codes as failed (not completed) so callers don't have to special-case exitCode against status - [P2] Pre-start cancel: clear startup timer in requestCancel and detect prompt return on preStartOutput so a queued job that gets cancelled resolves as "Cancelled", not "startup timed out" Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com> * fix: address round-16 codex review findings - [P2] Cap preStartOutput for background jobs at maxBufferedChars so noisy idle PTYs cannot accumulate megabytes before the start marker arrives or the startup timeout fires - [P2] On forced cancel, immediately release the session lock and mark the job as cancelled. The error message clearly states that the process may still be running, and the caller sees completed=true exactly when the lock is no longer held — consistent semantics Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com> * fix: address round-17 codex review findings - [P2] Disable prompt-suffix completion fallback for background jobs. Long-running commands often print prompt-like text (nested shells, ssh, sudo -s, REPLs) and would otherwise be misdetected as completed. Background jobs rely strictly on the end marker - [P2] consumeVisibleText now treats \\r as a carriage return that resets the current line, so progress bars (npm, docker pull, curl) collapse to the latest frame instead of accumulating every redraw Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com> * fix: address round-18 codex review findings - [P2] Pre-start cancel on sessions without a tracked idle prompt now gets a 2s fallback to finish as Cancelled, instead of waiting the full forced-cancel window for an end marker that will never arrive - [P3] Move session-scope validation before the busy-session check so out-of-scope callers cannot probe the existence/activity of foreign sessions via busy-state error messages Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com> * fix: address round-19 codex review findings - [P1] Re-enable prompt-suffix completion fallback for background jobs but with a longer 10s delay so nested shells / REPLs have time to print past their initial prompt before the recheck - [P2] Carriage returns now collapse progress redraws across PTY chunks: \\r is preserved through consumeVisibleText and applyCarriageReturns erases the trailing line of visibleOutput when a chunk starts with \\r. Verified with a fake PTY that emits "10%" then "\\r20%" then "\\r30%\\n" — final output is "30%" Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com> * fix: address round-20 codex review findings - [P1] Disable prompt-suffix completion fallback for background jobs. Commands that open child shells with the same prompt as the parent (bash, zsh, sudo -s, ssh) would otherwise be reported as completed while the child is still running. Background jobs rely strictly on the end marker, with their long timeout and explicit terminal_stop - [P2] Track a monotonic visibleHighWatermark so polling nextOffset cannot move backwards across CR redraws. serializeBackgroundJob now returns the latest visible frame when the caller's offset has been passed by a redraw, instead of returning empty stdout permanently - [P3] Buffer trailing lines that contain the constant __NCMCP_ prefix (not just the full random marker token) so PTY chunk boundaries that split the marker mid-token cannot leak _E:0 noise Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com> * fix: address round-21 codex review findings - [P2] Foreground execs now also get a hard startup deadline (using the configured timeoutMs as the limit). Background jobs use a fixed 30s. Without this, an already-chatty PTY would let onData re-arm the inactivity timer forever before _S arrives - [P2] finish() now uses the monotonic visibleHighWatermark for totalOutputChars on completion, so the final poll's nextOffset cannot regress relative to earlier polls after CR redraws Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com> * fix: address round-22 codex review findings - [P2] cleanupScopedMetadata now also calls clearPendingApprovals so in-flight approval requests resolve immediately. Otherwise a chat deleted while an approval was pending would leave the per-session write lock held until the 5-minute approval timeout expires - [P2] Allow netcatty/jobStop in observer mode so users can stop long-running terminal_start jobs that were launched before they switched to observer mode Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com> * fix: address round-23 codex review finding - [P2] Apply \\r as a "deferred" carriage return: park the cursor at the start of the line but defer erasure until the next character arrives. This preserves the latest visible frame for commands like printf '10%%\\r'; sleep; printf '20%%\\r' that pause between redraws, while still collapsing continuous progress redraws to a single frame. Verified: snapshots now show '40%' and '50%' instead of empty stdout Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com> * fix: address round-24 codex review findings - [P1] Re-enable prompt fallback for background jobs with a 30s delay so commands open child shells / REPLs have time to print past their initial prompt before the recheck. This is the third time codex has flip-flopped on this — 30s is the compromise - [P2] Pass chatSessionId to execViaChannel in handleExec so cancelPtyExecsForSession can interrupt SSH exec-channel commands scoped to the originating chat Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com> * fix: address round-25 codex review finding - [P1] Stop in-place CR collapsing in visibleOutput. The collapsed buffer made polling offsets non-monotonic and could drop finalized lines after a CR rewrite. Now visibleOutput stores raw bytes (with \\r dropped at consumeVisibleText to keep the buffer simple), the 256KB cap naturally bounds progress-bar accumulation, and slice semantics work correctly across all redraw patterns. Consumers that want a "collapsed view" can post-process Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com> * fix: address round-26 codex review findings - [P2] Carriage returns are now preserved in the raw buffer and collapsed at serialize time in collapseCarriageReturns. This keeps monotonic offsets in the buffer while polled output shows the latest progress frame. A trailing \\r leaves existing content intact (deferred erasure semantics) - [P2] netcatty/jobStop now bypasses the confirm-mode approval gate so a runaway terminal_start job can always be interrupted, even when the renderer is unavailable - [P3] requestCancel's one-shot timers (2s pre-start, 150ms reinforce, 30s force-finish) are now tracked and cleared in finish() so they cannot keep the Node event loop alive after the job has resolved Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com> --------- Co-authored-by: bincxz <16399091+binaricat@users.noreply.github.com> Co-authored-by: Claude Opus 4.6 (1M context) <noreply@anthropic.com> |
||
|
|
c3224d30c6 |
feat: network device mode for SSH + serial charset encoding support (#540)
* feat: add deviceType field to Host model for network device support Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com> * feat: pass deviceType through session metadata pipeline Thread deviceType from Host model through AITerminalSessionInfo, IPC types, and mcpServerBridge so AI agents can inspect device type per session. Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com> * feat: route network device SSH sessions to raw PTY execution When deviceType === 'network', handleExec now uses execViaRawPty instead of execViaPty so vendor CLIs (Huawei VRP, Cisco IOS, etc.) receive commands as-is without POSIX shell wrapping or markers. The command blocklist is also skipped for network devices, consistent with the existing serial session bypass. AI context description updated to document the raw-execution behaviour for network device sessions. Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com> * feat: add network device mode toggle to host settings UI Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com> * feat: add network device awareness to Catty Agent system prompt Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com> * fix: extend network device mode to Catty Agent exec path and host context - Add network device detection and raw execution routing to aiBridge.cjs (the primary Catty Agent command path), not just the MCP bridge - Export getSessionMeta from mcpServerBridge for reuse in aiBridge - Surface deviceType in Catty Agent system prompt host list so the AI can identify which sessions are network devices - Pass deviceType through buildSystemPrompt context Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com> * fix: exempt network device sessions from client-side blocklist and update ACP context - Add deviceType to ExecutorContext sessions type - Skip renderer-side command blocklist for deviceType=network sessions in shared toolExecutors.ts (not just main-process side) - Update ACP agent context hint to mention network device sessions Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com> * fix: only show network device mode toggle for SSH hosts Telnet and local hosts don't support the network device execution path, so hiding the toggle prevents users from enabling a broken configuration. Serial hosts already use raw mode by default. Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com> * fix: exclude Mosh sessions from network device raw execution path Mosh uses a shell-backed PTY and cannot connect to vendor CLIs, so network device mode should only apply to SSH and serial sessions. Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com> * fix: prefer session.protocol over metadata for Mosh detection Mosh tabs report protocol:"ssh" in renderer metadata but "mosh" in the main-process session object. Prioritize session.protocol (runtime truth) to correctly exclude Mosh from network device raw execution. Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com> * fix: suppress deviceType metadata for Mosh sessions Mosh requires a shell-backed PTY and cannot connect to vendor CLIs, so omit deviceType from AI-facing metadata when session is Mosh-backed. This prevents the AI from being told to use vendor CLI syntax when the actual execution path uses normal shell wrapping. Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com> * fix: use exit code 0 for network device sessions and hide toggle for Mosh - Network device / serial sessions return exitCode: null from vendor CLIs. Default to 0 instead of -1 so the AI doesn't misinterpret successful commands as failures. - Hide the network device mode toggle when Mosh is enabled, since the setting is suppressed at runtime for Mosh sessions anyway. Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com> * fix: preserve null exit codes and restrict raw mode to SSH/serial - Preserve exitCode: null for network device sessions instead of coercing to 0, so the AI knows exit status is unavailable rather than seeing a misleading success code. - Explicitly whitelist SSH/serial protocols for network device mode instead of just excluding mosh, preventing local/telnet sessions from accidentally entering raw execution. Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com> * fix: use UTF-8 encoding for SSH network device raw execution execViaRawPty hardcodes latin1 for serial port data decoding. Add an encoding option (default: latin1) and pass utf8 from SSH network device call sites so multi-byte characters aren't corrupted. Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com> * fix: use host charset for serial port decoding instead of hardcoded latin1 - Extract charsetToNodeEncoding() to module scope in terminalBridge - Serial sessions now read options.charset (from Host.charset) for both terminal display decoding and AI command output - Store serialEncoding on session object so exec paths can use it - Pass encoding through all execViaRawPty call sites - Default encoding changed from latin1 to utf8 (matches most modern network equipment and is the safer default for CJK environments) Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com> * fix: move serialEncoding declaration before session object creation serialEncoding was referenced in the session object literal before its const declaration, causing a TDZ ReferenceError that would crash every serial connection. Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com> * fix: tighten isNetworkDevice logic and clean up edge cases - Align toolExecutors isNetworkDevice check with bridge logic: require explicit SSH/serial protocol match instead of trusting deviceType alone - Remove empty-string protocol match from isSshOrSerial in both bridges to prevent local/unknown sessions from being treated as network devices - Widen exitCode return type to `number | null` to match actual behavior - Clear deviceType when enabling Mosh (incompatible combination) Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com> * fix: update MCP server tool descriptions for network device sessions The get_environment and terminal_execute tool descriptions only mentioned serial/raw sessions for network devices. Updated to also reference deviceType: network SSH sessions so external AI agents (Claude, Codex) know about the new execution mode. Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com> * fix: include deviceType in get_environment and guard execViaChannel fallback - Add deviceType to executeWorkspaceGetInfo session mapping and return type so Catty Agent's get_environment tool matches MCP bridge output - Guard both aiBridge and mcpServerBridge against falling through to execViaChannel for network device sessions — network devices require an interactive PTY and exec channels would produce broken behavior Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com> * feat: add charset setting to serial host configuration UI Serial hosts now have a charset input in the Advanced section, defaulting to UTF-8. The value is saved to Host.charset and used by the serial decoder in terminalBridge. Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com> * feat: add charset to serial quick-connect modal with full pipeline - Add charset input to SerialConnectModal (Advanced section) - Thread charset through onConnect callback → handleConnectSerial → createSerialSession → TerminalSession.charset - Add charset field to TerminalSession interface - Include charset in fallback host builder for quick-connect sessions so createTerminalSessionStarters can pass it to startSerialSession - Saved hosts also store charset via onSaveHost Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com> * fix: constrain serial connect modal height with scrollable content Modal content could overflow the viewport when Advanced section was expanded. Add max-h-[85vh] to DialogContent with flex layout so the content area scrolls while header and footer buttons stay visible. Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com> * fix: propagate charset through all serial session creation paths - Add charset to startSerialSession type in global.d.ts - Copy host.charset to TerminalSession in connectToHost serial path - Copy host.charset in createWorkspaceWithHosts serial path - Propagate session.charset in splitSession (both workspace and standalone) - Propagate session.charset in copySession Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com> * fix: propagate charset in remaining session creation paths Add host.charset to connectToHost (non-serial), createWorkspaceWithHosts (non-serial), and runSnippet session creation for consistency. Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com> --------- Co-authored-by: Claude Opus 4.6 (1M context) <noreply@anthropic.com> |
||
|
|
90d161c1b5 |
refactor: 精简 MCP server 工具集,移除 SFTP/multiExec/terminalWrite
精简 ACP agent 工具集,与 Catty Agent 保持一致,只保留核心工具: - get_environment - terminal_execute - terminal_send_input 移除内容: - 7 个 sftp_* 工具 (sftp_list_directory, sftp_read_file, sftp_write_file, sftp_mkdir, sftp_remove, sftp_rename, sftp_stat) - multi_host_execute 工具 - ENABLE_SFTP_TOOLS 环境变量和 sftpAvailable 字段 - WRITE_METHODS 中的 sftp/multiExec 条目 - dispatch 中的 sftp/multiExec 路由和 multiExec scope 验证 - mcpServerBridge 中的 sessionSupportsSftp/scopeHasSftpSessions 函数 - getContext description 中的 SFTP 说明 bridge 层的 SFTP/multiExec handler 函数保留(UI SFTP 面板仍在使用)。 Co-authored-by: Claude Opus 4.6 (1M context) <noreply@anthropic.com> |
||
|
|
7a5b6f506e |
feat: Catty Agent 支持串口会话命令执行 (#520)
* feat: Catty Agent 支持串口会话命令执行 (#520) 串口连接的网络设备(华为交换机、Cisco 路由器等)使用厂商自有 CLI, 无法识别 Agent 原有的 shell 包裹语法(__NCMCP_ markers、eval、trap)。 新增 execViaRawPty 函数,直接发送原始命令到串口,通过 idle timeout 检测命令完成,无 shell 语法包裹。 - 新增 execViaRawPty:原始命令执行,2s idle timeout 检测完成 - terminalBridge: 串口 session 添加 protocol/shellKind 字段 - mcpServerBridge: handleGetContext 发现串口会话,handleExec/handleTerminalWrite 支持串口 - aiBridge: ai:exec 和 ai:terminal:write 增加 serialPort 分支 - systemPrompt: Agent 提示词增加串口会话使用指南 Closes #520 Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com> * fix: review 问题全量修复 P1: - handleExec 移除死代码(内层 if 条件永远为 true) - 串口会话跳过 shell 安全黑名单(shutdown 在 Cisco 是正常接口命令) - MCP tool 描述更新:terminal_execute/get_environment/multi_host_execute 不再只说 "shell command" - 串口检查增加 protocol === "serial" guard,不再纯靠 duck typing P2: - execViaRawPty 编码改为 latin1,与 terminalBridge 终端解码一致 - exitCode 改为 null(而非 -1),MCP 响应中 null 时不输出 exit code 行 - idle timer 改为收到第一个数据后才启动,避免慢设备超时返回空输出 - idle timeout 默认从 2s 调为 3s,适配低速串口 - serialPort.write 统一用 safeWrite 包裹 try-catch - echo 剥离仅在 lines.length > 1 时执行,避免误删唯一输出行 P3: - cancelKey 用简单自增序列替代 crypto.randomBytes - serialPort.on 前增加 typeof 检查 - finish 函数签名差异增加注释说明 Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com> * fix: 第二轮 review 问题修复 P2: - MCP server terminal 类工具 (terminal_execute/terminal_send_input/multi_host_execute) 跳过 blocklist,由 bridge 层做 session-aware 检查,解决串口 shutdown 等命令 在 MCP 层就被拦截的问题 - handleTerminalWrite (mcpServerBridge + aiBridge) 串口会话跳过 blocklist, 与 handleExec 保持一致 - handleMultiExec 移除外层 blocklist,每个 session 由 handleExec 独立检查 - 移除 execViaRawPty 中的死代码 receivedFirstChunk 变量 - handleGetContext 返回的 description 补充 serial 会话说明 Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com> * fix: Codex review 问题修复 - [P2] toolExecutors.ts executeTerminalExecute 也需要跳过串口 blocklist, 否则 Catty Agent renderer 侧的 checkCommandSafety 会在命令到达 bridge 之前拦截 shutdown 等合法设备命令 - [P2] execViaRawPty 增加 noResponseTimer,无输出命令(enable、 configure terminal 等)不再等满 60s 整体超时,而是 2×idleMs 后正常返回 - [P1] 串口 blocklist skip 设计决策加注释:serial 协议由用户主动选择, 如果串口连的是 Linux shell 应使用 local 协议 Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com> * fix: Codex 第二轮 review 修复 - [P2] noResponseTimer 从 2×idleMs 调整为 min(idleMs*4, timeoutMs/4), 默认 12s,避免截断慢速网络设备操作 - [P1] 串口 blocklist skip 设计说明扩充:serial 协议由用户主动选择, 且 execViaRawPty 不做 shell 解释,blocklist 中的 shell 元字符 即使发到串口连接的 Linux shell 也不会被解释执行 Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com> * fix: execViaRawPty echo 阶段使用更长的 idle timeout ping/traceroute/copy 等命令在回显后可能沉默数秒才产出真正输出。 引入 chunkCount 区分 echo 阶段(前 2 个 chunk)和正式输出阶段: echo 阶段使用 2×idleMs(默认 6s),正式输出阶段使用 idleMs(3s)。 避免在回显后就误判命令已完成导致输出截断。 Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com> * fix: noResponseTimer 增加无输出提示 设备无响应时返回提示信息 "(no output received — command may have completed silently or may still be running)",让 AI 知道命令可能 仍在执行,避免误认为命令已成功完成后立即发送下一条命令。 Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com> * fix: Codex 第 5 轮 review 修复 - [P2] terminal_send_input 串口写入时将 \n 转换为 \r, 网络设备期望 CR 作为回车而非 LF - [P2] execViaRawPty 增加 512KB 输出上限,达到上限后停止 重置 idle timer,避免 noisy session(持续发日志的设备) 导致命令永远无法完成 Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com> --------- Co-authored-by: Claude Opus 4.6 (1M context) <noreply@anthropic.com> |
||
|
|
17e98090ad |
Add AI support for local terminal sessions (#419)
* Add AI support for local terminal sessions * Fix local AI session metadata and shell safety * Fix local session cloning and multi-exec errors * Refactor local shell detection helpers * Fix local shell helper import path * Fix CJS imports in renderer * Use ESM local shell helpers in renderer * Normalize local shell paths and platform metadata |
||
|
|
3d4fbf8763 |
fix: keep workspace MCP scope in sync (#385)
* fix: keep workspace MCP scope in sync * fix: refresh catty workspace tool context * fix: preserve AI stream state across tab switches * fix: align ACP stop and resume with 1code semantics * fix: harden ACP resume fallback for unsupported agents |
||
|
|
9387590696 |
Fix ACP stop cleanup and cancel state (#384)
* Fix ACP stop cleanup and cancel state * Block ACP tool writes after stop * Kill ACP child processes on cleanup * Cleanup ACP sessions when tabs disappear |
||
|
|
b973382f9f |
fix: return real HTTP status in streaming bridge and dynamic provider URL allowlist
- streamRequest now resolves on headers arrival with statusCode/statusText so the renderer constructs Response with the real HTTP status (e.g. 401) instead of hardcoded 200 - Provider fetch URL allowlist is now dynamically rebuilt from configured provider baseURLs on sync, supporting custom provider endpoints - Localhost port allowlist properly resets on provider sync (no stale ports) - PTY marker detection requires line-boundary match to avoid false positives - Clarify terminal_send_input vs terminal_execute usage in tool descriptions and system prompt Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com> |
||
|
|
be36ccd167 |
fix: address security, correctness, and performance issues from code review
Security: add validateSender to agent IPC handlers, remove CODEX_API_KEY and NODE_PATH from SAFE_ENV_KEYS, validate URL scheme before openExternal, add backtick substitution to command blocklist, add 10MB buffer limits. Bugs: fix runExternalAgentTurn timeout hang, fix limitConcurrency undefined entries on error, treat null exitCode as failure, enforce maxBytes for SFTP reads. Performance: debounce addMessageToSession persistence, cache compiled blocklist regexes, add QuotaExceededError handling for localStorage writes. UI: use local onKeyDown for PermissionDialog, move CRITICAL_PATHS to module level. Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com> |
||
|
|
808d021ebe |
fix: address security, correctness, and performance issues from code review
- Use crypto.randomBytes for PTY markers instead of Math.random - Replace execSync with execFileSync to prevent command injection - Fix sftp_write_file missing safety check (pass path to guardWriteOperation) - Add IPC input validation for handleExec, handleSftpRead, handleMultiExec - Add maxBytes bounds validation in executor, tools, and MCP server - Fix approval race condition (clear ref after destructuring, strict messageId match) - Shorten API key plaintext lifetime in memory - Fix stream cancellation race with AbortController registered before request - Delay revokeObjectURL for download timing - Extract shared limitConcurrency to infrastructure/ai/concurrency.ts - Add execStream null check in execViaChannel Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com> |
||
|
|
b192ee1764 |
fix: address security, correctness, and performance issues from code review
Security: sanitize command input in resolveCliFromPath, add host allowlist to streaming endpoint, enforce permission model in MCP server tools, add safety check to terminal:write IPC, fix broken blocklist regex, remove renderer-controlled allowedHosts parameter. Correctness: use sessionsRef for latest state in handleSend, merge add+update to avoid race condition in streaming, mark assistant message completed after tool-result, return JSON-RPC error for unhandled ACP permission requests, add finished guard in ptyExec. Performance: custom React.memo comparator for ChatMessageList, fix doom loop detection threshold. Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com> |
||
|
|
d8d29d1709 |
fix: address code review findings for AI chat panel
Security: - Apply checkCommandSafety() in aiExec IPC handler to enforce command blocklist - Add critical path validation in handleSftpRemove (normalize + blocklist) - Change rm -rf to rm -r so permission errors surface Stream lifecycle: - Abort all active streams on component unmount (abortControllersRef cleanup) - Wrap stream reader in try/finally with releaseLock() to prevent leaks - Use refs for inputValue/images in handleSend to stabilize callback identity State persistence: - Clear debounce timer before synchronous persist in destructive operations (clearSessionMessages, deleteSession, deleteSessionsByTarget) - Add 10MB max buffer guard in ACP client and MCP server NDJSON parsing i18n: - Replace hardcoded English strings with t() calls in InlineApprovalCard, PermissionDialog, ConversationExport, ThinkingBlock, AgentSelector - Add 23 new i18n keys to en.ts and zh-CN.ts Misc: - Remove debug console.log statements in mcpServerBridge Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com> |
||
|
|
a55da77471 |
refactor: fix security issues, remove dead code, and split monolithic files
Security: - Fix command injection in 15+ shell interpolation sites with shellQuote() - Add token-based authentication to MCP TCP server - Fix heredoc delimiter collision in SFTP write fallbacks - Add case-insensitive flag to mcpServerBridge command blocklist - Add exhaustive default case to createModelFromConfig Architecture: - Split aiBridge.cjs (1971→1483 lines) into 4 modules: shellUtils, codexHelpers, claudeHelpers, ptyExec - Split SettingsAITab.tsx (1480→520 lines) into 10 sub-components - Extract shared processCattyStream from AIChatSidePanel.tsx (-168 lines) - Consolidate duplicate PTY execution logic into shared ptyExec.cjs - Consolidate duplicate stripAnsi/toUnpackedAsarPath utilities Code quality: - Remove ~33 debug console.log statements from production code - Remove dead code: terminal_read_output stub, checkToolPermission, isCommandAllowed, READ_ONLY_TOOLS - Unify bridge type accessor in useAIState.ts (eliminate 15 unsafe casts) - Add localStorage session pruning (50 sessions / 200 messages cap) - Fix ModelSelector onBlur race condition (setTimeout → preventDefault) - Fix duplicate getShellEnv() calls in Codex helpers - Remove unused _config param from claudeAgentAdapter - Type claudeAgentAdapter bridge parameter directly as ClaudeBridge Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com> |
||
|
|
7e8682d10d |
fix: preserve ACP provider session when switching chat sessions
Remove chatSessionId from MCP server config env vars so it doesn't affect the fingerprint calculation. Previously, different chat sessions in the same workspace produced different fingerprints, causing the ACP provider to be recreated when switching back to a previous session, losing all conversation history. Now the fingerprint only depends on the workspace scope (host session IDs and MCP port), so providers are correctly reused when returning to a previous chat session. Each chat session still has its own provider instance (keyed by chatSessionId in the acpProviders Map). Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com> |
||
|
|
b2447b06d2 |
fix: per-scope AI chat isolation and workspace host discovery
- Fix workspace host discovery: use `activeWorkspace.root` instead of
non-existent `.tree` property, which caused `collectSessionIds` to
always return empty for workspaces
- Isolate AI chat state per-scope (tab/workspace): activeSessionId,
isStreaming, abortController, and inputValue are now keyed by
`${scopeType}:${scopeTargetId}` so different tabs don't interfere
- Add per-chatSession MCP scope metadata to prevent host list mixing
across workspaces, with chatSessionId passed through the full IPC chain
- Store hostname/username in SSH session objects as fallback for MCP
host info when renderer metadata is unavailable
Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
|
||
|
|
847df7a023 |
feat: add MCP server for remote host access, model selector, and PTY execution
- Create netcatty-remote-hosts MCP server (TCP bridge + stdio child process) exposing terminal_execute, sftp_*, get_environment tools to ACP agents - Execute commands via PTY stream with self-erasing markers for terminal visibility; disable pagers automatically; 60s timeout fallback - Inject MCP server into both Codex (ACP) and Claude Code (ACP) sessions - Add model selector popover with hardcoded presets for Claude (Opus/Sonnet/ Haiku) and Codex (GPT 5.4, Codex 5.3/5.2/5.1, o3/o4-mini) with thinking level sub-menus - Fix multi-step tool call message flow (mutable flag instead of stale closure) - Remove CLAUDE_CONFIG_DIR isolation to fix Claude auth; switch Claude to ACP - Add startup cleanup for orphaned AI sessions - Guard collectSessionIds against undefined workspace tree - Remove permission mode chip from chat input Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com> |