dsh-plugin-container 0.2.0 → 0.3.0

package/README.md

@@ -1,342 +1,81 @@
-# DSH 容器左边栏插件（Docker + Apple container）
+# DSH 容器
 
-在 DeepSeek Harness 左侧栏加入 **容器** 工作台，面板右上角始终显示 **Docker** / **Apple container** 两个 provider 按钮，点击即可切换：
+DSH 左栏容器面板：管理 macOS 上的 Docker（colima / Docker Desktop / OrbStack / remote context）和 Apple `container`。
 
-- **Docker**：macOS 上的 Docker CLI / context，兼容 Docker Desktop、colima、OrbStack、Rancher Desktop、Podman 等提供 Docker context 或 socket 的运行时。
-- **Apple container**：macOS 26 / Apple silicon 原生 `container` CLI（Containerization 框架）。它不是 Docker：没有 Docker daemon/socket/context，每个容器一个轻量 VM，镜像/卷/网络独立，不支持 Compose。
-
-![Docker 概览](docs/docker-overview.png)
-
-![Provider switch](docs/provider-switch.png)
-
-![Apple container 概览](docs/apple-container.png)
-
-当前机器验证环境：
-
-- macOS 26.5.1，arm64
-- Docker CLI 28.2.2，colima context 正常
-- Apple `container` CLI 1.0.0（`/opt/homebrew/bin/container`）
-- Docker / Apple 两个 provider 均已通过 Playwright UI 冒烟
-- Apple 系统服务是否运行以面板状态为准；未启动时点击“启动运行时”
+![概览](docs/docker-overview.png)
 
 ## 功能
 
-### Docker provider
-
-- 自动识别 colima、Docker Desktop、OrbStack、远程 context。
-- 概览、容器（搜索/筛选/启动/停止/重启/日志/Inspect/删除）、镜像（拉取/Inspect/删除/架构）、卷、网络、Compose（只读）。
-- **镜像架构**：列表新增“架构”列；Docker 通过 `image inspect` 补齐，Apple 从 OCI variants 读取，显示如 `linux/arm64/v8`。
-- **启动新容器**：镜像下拉选择本地镜像/自定义镜像，名称、命令、端口、环境变量，后台运行；启动后立即可 Attach。
-- **从镜像启动**：镜像页每行的播放按钮会用该镜像预填并打开启动容器表单。
-- **Attach 终端**：基于 DSH PTY 的 `docker attach`，可以输入命令、Ctrl+C、粘贴，关闭对话框结束会话。
-- 运行时启停/重启：colima 完整支持；Docker Desktop / OrbStack best-effort。
-- 内置命令终端：选择 context、工作目录，实时输出，取消/超时/输出截断提示，危险命令确认。
-
-### Apple container provider
-
-- `container system status/version` 状态；`container system start/stop` 生命周期。
-- 容器、镜像、卷、网络、磁盘（`container system df`）列表和 Inspect。
-- 容器 start/stop/delete/logs；镜像 pull/delete；卷/网络 delete。
-- **启动新容器 / Attach**：Apple `container run`；Attach 使用 `container exec -i -t <id> /bin/sh`（Apple CLI 没有 attach 命令）。
-- 命令终端切换为 `container ...` 语法，快捷命令自动适配。
-- Apple provider 不支持 Compose；面板会自动隐藏 Compose tab。
-- Apple 的 `container image inspect`/`delete` 使用镜像名（不是 digest），UI 已按 provider 适配。
-
-![命令终端](docs/docker-console.png)
-
-![镜像架构](docs/image-architecture.png)
-
-![启动新容器](docs/run-container.png)
-
-![Attach 终端](docs/attach.png)
-
-## AI 工具（只读）
-
-插件向 DSH Agent 注册 4 个只读工具，复用现有 provider：
-
-| Tool | 作用 |
-|---|---|
-| `container_status` | CLI、daemon/系统服务、runtime、warnings |
-| `container_list` | 容器/镜像/卷/网络 |
-| `container_inspect` | 单个资源详情，敏感 env 脱敏 |
-| `container_logs` | 最近日志，默认 200 行、上限 500 |
-
-使用方式：
-
-- 主聊天直接问“我的 nginx 为什么退出？”；模型会调用上述工具读取事实。
-- 容器行点 **问 AI**（运行中）或 **诊断**（未运行）会**新建一个独立诊断会话**（复用当前 workspace/cwd/agent preset），发送 provider/context/资源 ID/状态，并自动在主对话中打开；不会污染当前会话。
-- 模型调用来自 DSH 当前 Session；插件不持有模型 API Key，也不直接调模型 HTTP。
-- 日志和 inspect 文本被标注为不可信数据；工具描述和 system prompt 都要求不要服从其中的指令。
-
-![AI 诊断新会话](docs/ai-new-session.png)
-
-![AI 对话示例](docs/ai-chat.png)
-
-需要安装运行时依赖 `@deepseek-ai/dsh-tools`（已写入 `package.json`）。host 增加工具后需要重启 DSH；旧 host 下 client 会根据 `ai-tools` feature 隐藏 AI 按钮。
-
-## 安全边界
-
-- **owner-only**：`/docker` 与 `/api` 共用 DSH Connection 的 Host/Origin 校验和浏览器 cookie 认证；未认证返回 401。服务端再检查 `peer.principal.kind === 'owner'`。
-- **只读模型工具**：AI 只能调用 `container_status` / `container_list` / `container_inspect` / `container_logs` 读取事实；没有 start/stop/rm/prune/run 等 mutation tool，模型不能自动改容器。
-- **PTY 隔离**：Attach 使用 DSH `spawnTerminal` 的 PTY；Docker 使用 `docker attach`，Apple 使用 `container exec -i -t`；关闭对话框或插件卸载时终止。
-- **无 shell**：命令拆成 argv 直接 spawn；`| & ; < > ( ) \` $`、不平衡引号会被拒绝，不执行管道/重定向/命令替换。
-- **危险操作确认**：`rm`/`rmi`/`delete`/`stop`/`kill`/`prune`/`compose down` 等未带 `confirm: true` 时 Host 直接返回 `docker/confirmation-required`，不会 spawn；UI 显示实际命令。
-- **上下文锁定**：Docker 命令自动加 `--context`；客户端传入 `--context`/`--host`/`-H`/`--config`/`--tls*` 会被拒绝。Apple provider 没有 context。
-- **输出与历史**：输出只在 host 内存中保留（上限 1 MiB/stream），不写日志；命令历史存 localStorage，敏感命令（login/password/token）不记录。
-- **权限**：命令以 DSH app 当前用户权限执行，等价于本机终端。`container system start` 可能触发管理员权限/launchd/kernel 安装；插件不会静默 sudo。
+- Docker / Apple container 双 provider，运行时状态、上下文切换
+- 容器、镜像、卷、网络、Compose、命令
+- 容器启动/停止/重启/删除，镜像 pull/inspect/delete
+- 查看日志、inspect、实时 follow
+- **Attach**：Docker `docker attach`；Apple `container exec`
+- **Exec**：进入容器内部 shell（`docker exec -it <id> /bin/sh`）
+- 镜像架构列（arm64/amd64）
+- 只读 AI 工具：`container_status`、`container_list`、`container_inspect`、`container_logs`
+- AI 诊断会新建独立会话，不污染当前对话
 
-## 安装与生效
+## 要求
 
-插件以 DSH bundle 包发布，安装时会自动写入 `dependencies` 和 `dsh.profile.bundles`，**不需要手改 profile 的 `cordis.patch.yml`**。
+- macOS
+- DSH 0.2.x
+- Docker CLI；或安装 [Apple container](https://github.com/apple/container)
+- 网络代理按本机环境配置
 
-本地 tarball：
-
-```bash
-dsh plugin --profile desktop add /path/to/dsh-plugin-container-0.2.0.tgz
-```
-
-发布到 npm 后：
+## 安装
 
 ```bash
 dsh plugin --profile desktop add dsh-plugin-container
 ```
 
-安装后 profile 会变成：
-
-```json
-"dependencies": {
-  "dsh-plugin-container": "file:/path/to/dsh-plugin-container-0.2.0.tgz"
-},
-"dsh": {
-  "profile": {
-    "bundles": [
-      "@deepseek-ai/dsh-base",
-      "@deepseek-ai/dsh-web-app",
-      "dsh-plugin-container"
-    ]
-  }
-}
-```
-
-包内的 `cordis.patch.yml` 会被 DSH 自动应用：
-
-```yaml
-- insert:
-    - id: docker-sidebar
-      name: dsh-plugin-container
-```
-
-本机安装后的效果：
-
-![本地包安装](docs/package-install.png)
+重启 DSH。安装器会自动写入 `dsh.profile.bundles`，**不需要手改 `cordis.patch.yml`**。
 
-**host 侧代码更新后必须退出并重开 DSH 一次**；client bundle 改动由 `client-hmr` 热替换。bundle 变化需要重启 host。
-
-如果右上角只看到 Docker / Apple container 但没有“启动容器”和 Attach 按钮，说明当前 host 还是旧进程：client 会显示“重启 DSH 以启用启动容器 / Attach”，退出并重开 DSH 即可。
-
-### 源码开发安装
-
-仍可用绝对路径方式开发：
+本地开发版：
 
 ```bash
 node scripts/install-profile.mjs --home "$HOME/.dsh" --profile desktop
 ```
 
-它会写入带标记的 Loader row，指向当前工作区的 `index.js`，适合改 host 代码时热重载。源码模式不要和 bundle 包同时启用，否则会加载两份插件。
+源码路径模式与 npm 包模式不要同时启用。
 
-### 手动安装（源码模式）
+## 使用
 
-直接编辑 patch 文件：
+1. 左栏打开 **容器**
+2. 顶部切换 Docker / Apple container
+3. 容器行操作：
+   - 启动 / 停止 / 重启 / 删除
+   - 日志 / Follow / Inspect
+   - Attach：接管容器主进程
+   - Exec：在容器内开一个新 shell
+   - 问 AI / 诊断：新建独立 DSH 会话，调用只读容器工具
+4. 镜像 tab 可查看架构，或直接用镜像启动容器
 
-```yaml
-# >>> dsh-plugin-container >>>
-- insert:
-    - id: docker-sidebar
-      name: '/Users/zaynfang/Codes/dsh/docker/index.js'
-# <<< dsh-plugin-container <<<
-```
-
-### 卸载
+## 安全
 
-```bash
-dsh plugin --profile desktop remove dsh-plugin-container
-```
-
-再从 `dsh.profile.bundles` 中确认已移除；重启 DSH。源码方式则运行：
-
-```bash
-node scripts/install-profile.mjs --remove --home "$HOME/.dsh" --profile desktop
-```
-
-## 配置
-
-Loader row 可带可选 `config`：
-
-```yaml
-- insert:
-    - id: docker-sidebar
-      name: '/Users/zaynfang/Codes/dsh/docker/index.js'
-      config:
-        dockerPath: /opt/homebrew/bin/docker       # 显式配置后不回退自动探测
-        colimaPath: /opt/homebrew/bin/colima
-        containerPath: /opt/homebrew/bin/container # Apple container CLI
-        defaultTimeoutMs: 120000
-        maxOutputBytes: 1048576
-        maxConcurrentRuns: 4
-        enableRuntimeControl: true
-```
-
-不配置时：
-
-- `docker` 依次探测 `/opt/homebrew/bin/docker`、`/usr/local/bin/docker`、`~/.docker/bin/docker`、Docker.app 内置路径，再走 PATH。
-- `colima` 依次探测 `/opt/homebrew/bin/colima`、`/usr/local/bin/colima`、`~/go/bin/colima`，再走 PATH。
-- `container` 依次探测 `/usr/local/bin/container`、`/opt/homebrew/bin/container`、`~/.local/bin/container`，再走 PATH。
-- 运行时启停只在 macOS 且 `enableRuntimeControl !== false` 时可用。
-
-## macOS 运行时说明
-
-Docker 兼容运行时包括 Docker Desktop、Colima、OrbStack、Rancher Desktop、Podman machine，以及 Lima/UTM/Parallels/VMware 里自建的 Docker；它们通常通过 Docker CLI/context 工作，因此由 **Docker provider** 统一管理（具体 context 由各运行时提供）。
-
-Apple `container` 是独立平台：
-
-- 仅 macOS 26 + Apple silicon。
-- 每个容器一个轻量 VM，没有共享 Docker daemon。
-- 安装：从 [apple/container releases](https://github.com/apple/container/releases) 安装，或使用 Homebrew；然后 `container system start`。
-- `container system status` 在部分安装上会显示 `unregistered`，但 apiserver 实际可达；插件会用 `container ls` 做健康探测兜底。
-- 系统服务启动可能需要管理员权限/launchd/kernel；插件使用 `--disable-kernel-install` 避免交互式挂起，失败时提示在终端执行 `container system start`。
-- 不支持 Compose；镜像/卷/网络与 Docker 不共享；不支持一键 restart（需先 stop 再 start）。
-
-## 工作原理
-
-```text
-左栏 sidebar.panellist  +  main keyed panel "docker"
-        │
-        ▼
-Browser  ctx.connection.rpc.call('/docker', method, { provider, ... })
-        │
-        ▼
-Host     ctx.webServer prefix route /docker
-         ctx.connection.admit(req)
-         DockerService (router)
-           ├─ Docker provider → docker CLI + context + JobManager(idPrefix=docker)
-           └─ Apple provider  → container CLI + JobManager(idPrefix=apple)
-        │
-        ▼
-ctx.subprocess.spawn(argv)   ← 无 shell，provider 决定 CLI 语法
-```
-
-- `providers` 返回可用 provider 和默认 provider。
-- `status/list/inspect/run/action/runtimeAction` 都接受 `provider`；不传默认 Docker。
-- `poll/cancel` 按 run id 前缀（`docker_` / `apple_`）路由，切换 provider 时也能取消旧 run。
-- 语义化 `action`（container start/stop/delete/logs、image pull/delete、volume/network delete）由 host 映射成对应 CLI，UI 不拼 Docker/Apple 语法。
-
-### RPC 方法
-
-| method | 说明 |
-|---|---|
-| `providers` | 可用 provider、版本、运行状态 |
-| `status` | CLI、daemon/system、context/runtime、资源计数 |
-| `list` | containers / images / volumes / networks / compose(Docker) / disk |
-| `inspect` | container / image / volume / network |
-| `action` | 语义化快捷操作（含启动新容器） |
-| `attach` | 启动 Docker attach / Apple exec PTY 会话 |
-| `attachPoll` / `attachInput` / `attachResize` / `attachClose` | Attach 输出、输入、尺寸、关闭 |
-| `run` | 启动自由命令作业 |
-| `poll` / `cancel` | 增量输出 / 取消 |
-| `runtimeAction` | Docker 运行时或 Apple system start/stop |
-
-## 发布到 npm
-
-```bash
-npm login
-npm publish --access public
-```
-
-发布后安装：
-
-```bash
-dsh plugin --profile desktop add dsh-plugin-container
-```
-
-当前包声明了 `dsh.bundle.patch`，安装器会自动写入 `dependencies` 和 `dsh.profile.bundles`，不需要手改 `cordis.patch.yml`。
+- 所有 Docker/Apple 命令以当前用户权限执行
+- 无 shell 拼接；命令拆成 argv 直接 spawn
+- 删除、stop、prune 等危险操作需要确认
+- AI 工具只读，不提供 start/stop/rm/prune tool
+- 日志和 inspect 被标记为不可信数据，不能作为指令执行
 
 ## 开发
 
-构建期依赖只有 esbuild；`lib/client.js` 已提交，运行不需要 `npm install`。
-
-本机网络走 SOCKS5 8119（8119 不是 HTTP proxy）：
-
 ```bash
-env -u http_proxy -u https_proxy -u ALL_PROXY -u all_proxy -u NODE_USE_ENV_PROXY \
-  ALL_PROXY=socks5h://127.0.0.1:8119 \
-  npm_config_proxy=socks5h://127.0.0.1:8119 \
-  npm_config_https_proxy=socks5h://127.0.0.1:8119 \
-  NO_PROXY=127.0.0.1,localhost,::1 \
-  npm install --no-audit --no-fund
+npm install
+npm run build     # src/client -> lib/client.js
+npm test          # 46 tests
+npm pack          # 发布前检查
 ```
 
-```bash
-npm run build            # src/client/index.jsx -> lib/client.js
-node --check lib/client.js
-npm test                 # 45 个 node:test 单测
-```
-
-修改 client 后重新 build；`client-hmr` 会热替换。修改 `index.js` 或 `src/host/*` 后重启 DSH。
-
-### UI 冒烟
-
-```bash
-PLAYWRIGHT_CHROMIUM_EXECUTABLE="/Users/zaynfang/Library/Caches/ms-playwright/chromium-1208/chrome-mac-arm64/Google Chrome for Testing.app/Contents/MacOS/Google Chrome for Testing" \
-  node scripts/ui-smoke.mjs "http://127.0.0.1:<port>/?token=..."
-```
-
-冒烟覆盖：
-
-- Docker provider：状态、容器/镜像/卷/网络/Compose、`docker ps -a`、`docker events` 取消、危险命令确认、Inspect。
-- 切换到 Apple provider：provider 选择器、Apple 运行状态、Compose 隐藏、`container ls -a`。
-- 不删除资源、不停止运行时；截图写入 `docs/`。
-
-## 文件结构
+主要结构：
 
 ```text
-index.js                     Host 入口 / /docker 认证路由
-cordis.patch.yml             bundle 安装时自动插入的 Loader row
-lib/client.js                构建产物
-src/host/service.js          provider 路由 + Docker provider
-src/host/apple.js            Apple container provider
-src/host/apple-cli.js        container CLI 探测/执行
-src/host/attach.js           PTY attach 会话管理
-src/host/tools.js            只读 Agent Tools
-src/host/docker-cli.js       Docker CLI
-src/host/runtime.js          colima/Docker Desktop/OrbStack/remote
-src/host/jobs.js             命令作业（docker_/apple_ 前缀）
-src/host/parsers.js          Docker / Apple JSON 归一化
-src/client/                  provider 切换、页面、tabs、i18n、styles
-src/client/attach.jsx        Attach 终端模态
-src/client/run-container.jsx 启动新容器表单
-scripts/build-client.mjs
-scripts/install-profile.mjs
-scripts/ui-smoke.mjs
-test/*.test.mjs
-docs/*.png
+index.js                 Host 入口
+cordis.patch.yml         bundle 安装 patch
+src/host/service.js      provider 路由 + Docker
+src/host/apple.js        Apple container
+src/host/attach.js       Attach/Exec PTY
+src/host/tools.js        只读 Agent Tools
+src/client/              页面、tabs、i18n、styles
 ```
-
-## 限制
-
-- Docker `attach` 需要容器有 TTY；“启动容器”表单默认使用 `-dit`，已有容器若创建时没有 TTY，`docker attach` 可能无法交互，请改用日志或重新创建容器。
-- Apple container 没有 `attach` 命令；面板使用 `container exec -i -t <id> /bin/sh`，镜像内必须存在 `/bin/sh`。
-- Attach 依赖 DSH 的 PTY（`spawnTerminal`）；若部署环境禁用 PTY，会返回明确的 `attach-unsupported` 错误。
-- Attach 是单终端文本视图，不包含完整 xterm 能力（鼠标、复杂 TUI、图片协议可能不完整）。
-- 启动新容器固定后台运行（`-d`）；交互式前台运行请使用命令终端。
-- Apple provider 仍然不支持 Compose。
-- host 新增 Attach/启动新容器后需要再重启 DSH 一次；旧 host 下 client 会显示“重启 DSH 以启用启动容器 / Attach”，不会出现无效按钮。
-
-## 故障排查
-
-- **左栏没有“容器”**：确认 patch 块存在；刷新 GUI；host 代码更新后退出并重开 DSH。
-- **只有 Docker，没有 Apple container 选项**：确认 `container` CLI 可执行（`container --version`）；刷新；host 需要新版本。
-- **Apple 服务显示未启动**：点击“启动运行时”，或终端执行 `container system start`。首次可能需要管理员权限/kernel。
-- **Apple 启动卡住/失败**：查看命令终端里的 `container system start` 输出；`--disable-kernel-install` 下缺 kernel 会失败，需先在终端启动一次。
-- **Apple 镜像 Inspect 失败**：请使用镜像名（UI 已自动这样做），不要用 digest。
-- **Docker Desktop 停止失败**：macOS Automation 权限可能拦截 `osascript`；从菜单栏退出或授予权限。
-- **patch 损坏**：用 `cordis.patch.yml.docker.bak` 恢复，或 `install-profile.mjs --remove` 后重试。

package/lib/client.js

@@ -48,7 +48,7 @@ var DockerApiError = class extends Error {
   }
 };
 function isAbortError(error) {
-  return error instanceof DOMException && error.name === "AbortError" || error?.name === "AbortError";
+  return error instanceof DOMException && error.name === "AbortError" || error?.name === "AbortError" || error?.code === "docker/cancelled";
 }
 function isResult(value) {
   return typeof value === "object" && value !== null && typeof value.ok === "boolean";
@@ -218,6 +218,11 @@ var IconSparkles = (props) => /* @__PURE__ */ (0, import_jsx_runtime.jsxs)(Svg,
   /* @__PURE__ */ (0, import_jsx_runtime.jsx)("path", { d: "M18 14l.7 1.8 1.8.7-1.8.7L18 19l-.7-1.8-1.8-.7 1.8-.7L18 14Z" }),
   /* @__PURE__ */ (0, import_jsx_runtime.jsx)("path", { d: "M6 15l.6 1.4L8 17l-1.4.6L6 19l-.6-1.4L4 17l1.4-.6L6 15Z" })
 ] });
+var IconExec = (props) => /* @__PURE__ */ (0, import_jsx_runtime.jsxs)(Svg, { ...props, children: [
+  /* @__PURE__ */ (0, import_jsx_runtime.jsx)("rect", { x: "3.5", y: "4.5", width: "17", height: "15", rx: "2" }),
+  /* @__PURE__ */ (0, import_jsx_runtime.jsx)("path", { d: "m7.2 9.2 3 2.8-3 2.8M12.5 15h4" }),
+  /* @__PURE__ */ (0, import_jsx_runtime.jsx)("path", { d: "M17 9.2h.01" })
+] });
 var IconAttach = (props) => /* @__PURE__ */ (0, import_jsx_runtime.jsxs)(Svg, { ...props, children: [
   /* @__PURE__ */ (0, import_jsx_runtime.jsx)("path", { d: "M9.5 14.5 14.5 9.5" }),
   /* @__PURE__ */ (0, import_jsx_runtime.jsx)("path", { d: "M11 7.5 12.6 5.9a3.2 3.2 0 0 1 4.5 4.5L15.4 12" }),
@@ -311,6 +316,8 @@ var zh = {
   restartFeatures: "\u91CD\u542F DSH \u4EE5\u542F\u7528\u542F\u52A8\u5BB9\u5668 / Attach",
   restartForArchitecture: "\u91CD\u542F DSH \u4EE5\u663E\u793A\u955C\u50CF\u67B6\u6784",
   attach: "Attach",
+  exec: "Exec",
+  execTitle: "Exec \u7EC8\u7AEF",
   askAi: "\u95EE AI",
   diagnose: "\u8BCA\u65AD",
   askAiSent: "\u5DF2\u53D1\u9001\u5230 AI \u4F1A\u8BDD",
@@ -325,6 +332,7 @@ var zh = {
   attachHint: "\u5DF2\u8FDE\u63A5\u3002\u70B9\u51FB\u7EC8\u7AEF\u540E\u8F93\u5165\uFF1BCtrl+C \u4E2D\u65AD\uFF0C\u5173\u95ED\u7A97\u53E3\u7ED3\u675F\u4F1A\u8BDD\u3002",
   attachInputHint: "\u70B9\u51FB\u7EC8\u7AEF\u8F93\u5165 \xB7 Ctrl+C \u4E2D\u65AD",
   attachClose: "\u7ED3\u675F Attach",
+  execClose: "\u7ED3\u675F Exec",
   attachNotRunning: "\u5BB9\u5668\u672A\u8FD0\u884C\uFF0C\u65E0\u6CD5 attach",
   followLogs: "\u6301\u7EED\u65E5\u5FD7",
   inspect: "\u68C0\u67E5",
@@ -553,6 +561,8 @@ var en = {
   restartFeatures: "Restart DSH to enable Start container / Attach",
   restartForArchitecture: "Restart DSH to show image architecture",
   attach: "Attach",
+  exec: "Exec",
+  execTitle: "Exec terminal",
   askAi: "Ask AI",
   diagnose: "Diagnose",
   askAiSent: "Sent to the AI conversation",
@@ -567,6 +577,7 @@ var en = {
   attachHint: "Connected. Click the terminal and type; Ctrl+C interrupts. Closing the dialog ends the session.",
   attachInputHint: "Click terminal to type \xB7 Ctrl+C interrupts",
   attachClose: "End attach",
+  execClose: "End exec",
   attachNotRunning: "Container is not running; attach is unavailable",
   followLogs: "Follow logs",
   inspect: "Inspect",
@@ -748,17 +759,36 @@ function Button({ variant = "ghost", size = "md", className, type = "button", ch
   );
 }
 function IconButton({ label, size = "md", className, children, ...rest }) {
-  return /* @__PURE__ */ (0, import_jsx_runtime2.jsx)(
-    "button",
-    {
-      type: "button",
-      "aria-label": label,
-      title: label,
-      className: cx("dsh-docker-icon-btn", size === "sm" && "dsh-docker-sm", className),
-      ...rest,
-      children
-    }
-  );
+  const [tip, setTip] = (0, import_react2.useState)(null);
+  const ref = (0, import_react2.useRef)(null);
+  const showTip = () => {
+    const rect = ref.current?.getBoundingClientRect();
+    if (rect === void 0) return;
+    const left = Math.min(Math.max(rect.left + rect.width / 2, 16), window.innerWidth - 16);
+    setTip({ left, top: Math.max(rect.top - 7, 8) });
+  };
+  const hideTip = () => setTip(null);
+  return /* @__PURE__ */ (0, import_jsx_runtime2.jsxs)(import_jsx_runtime2.Fragment, { children: [
+    /* @__PURE__ */ (0, import_jsx_runtime2.jsx)(
+      "button",
+      {
+        type: "button",
+        ref,
+        "aria-label": label,
+        className: cx("dsh-docker-icon-btn", size === "sm" && "dsh-docker-sm", className),
+        onMouseEnter: showTip,
+        onMouseLeave: hideTip,
+        onFocus: showTip,
+        onBlur: hideTip,
+        ...rest,
+        children
+      }
+    ),
+    tip !== null && (0, import_react_dom.createPortal)(
+      /* @__PURE__ */ (0, import_jsx_runtime2.jsx)("span", { className: "dsh-docker-tooltip", style: { left: tip.left, top: tip.top }, role: "tooltip", children: label }),
+      document.body
+    )
+  ] });
 }
 function Spinner({ size = 16, className }) {
   return /* @__PURE__ */ (0, import_jsx_runtime2.jsx)(IconSpinner, { size, className });
@@ -994,7 +1024,7 @@ function keyBytes(event) {
   if (event.key.length === 1) return event.key;
   return null;
 }
-function AttachDialog({ open, t, session, output, loading, error, onInput, onClose }) {
+function AttachDialog({ open, t, mode = "attach", session, output, loading, error, onInput, onClose }) {
   const screenRef = (0, import_react3.useRef)(null);
   const preRef = (0, import_react3.useRef)(null);
   const [stick, setStick] = (0, import_react3.useState)(true);
@@ -1010,12 +1040,13 @@ function AttachDialog({ open, t, session, output, loading, error, onInput, onClo
     if (element !== null) element.scrollTop = element.scrollHeight;
   }, [output, stick]);
   const running = session?.status === "running";
+  const title = (session?.mode ?? mode) === "exec" ? t("execTitle") : t("attachTitle");
   const shown = cleanTerminal(output);
   return /* @__PURE__ */ (0, import_jsx_runtime3.jsxs)(
     Modal,
     {
       open,
-      title: `${t("attachTitle")} \xB7 ${session?.containerName ?? ""}`,
+      title: `${title} \xB7 ${session?.containerName ?? ""}`,
       subtitle: session?.command ?? void 0,
       wide: true,
       onClose,
@@ -1029,7 +1060,7 @@ function AttachDialog({ open, t, session, output, loading, error, onInput, onClo
           session.exitCode
         ] }),
         /* @__PURE__ */ (0, import_jsx_runtime3.jsx)(CopyButton, { text: shown, label: t("copy"), copiedLabel: t("copied") }),
-        /* @__PURE__ */ (0, import_jsx_runtime3.jsx)(Button, { size: "sm", onClick: onClose, children: t("attachClose") })
+        /* @__PURE__ */ (0, import_jsx_runtime3.jsx)(Button, { size: "sm", onClick: onClose, children: t((session?.mode ?? mode) === "exec" ? "execClose" : "attachClose") })
       ] }),
       children: [
         /* @__PURE__ */ (0, import_jsx_runtime3.jsxs)("div", { className: "dsh-docker-attach-status", children: [
@@ -1050,7 +1081,7 @@ function AttachDialog({ open, t, session, output, loading, error, onInput, onClo
             className: "dsh-docker-attach-screen",
             tabIndex: 0,
             role: "textbox",
-            "aria-label": t("attachTitle"),
+            "aria-label": title,
             onKeyDown: (event) => {
               if (!running || loading) return;
               const data = keyBytes(event);
@@ -1817,6 +1848,7 @@ function ContainersTab({ t, api, provider, context, status, refreshToken, featur
               children: /* @__PURE__ */ (0, import_jsx_runtime7.jsx)(IconSparkles, { size: 14 })
             }
           ),
+          features.includes("exec") && item.state === "running" && /* @__PURE__ */ (0, import_jsx_runtime7.jsx)(IconButton, { size: "sm", label: t("exec"), onClick: () => onAttach(item, "exec"), children: /* @__PURE__ */ (0, import_jsx_runtime7.jsx)(IconExec, { size: 14 }) }),
           features.includes("attach") && item.state === "running" && /* @__PURE__ */ (0, import_jsx_runtime7.jsx)(IconButton, { size: "sm", label: t("attach"), onClick: () => onAttach(item), children: /* @__PURE__ */ (0, import_jsx_runtime7.jsx)(IconAttach, { size: 14 }) }),
           /* @__PURE__ */ (0, import_jsx_runtime7.jsx)(IconButton, { size: "sm", label: t("logs"), onClick: () => act("logs", item, true), children: /* @__PURE__ */ (0, import_jsx_runtime7.jsx)(IconTerminal, { size: 14 }) }),
           /* @__PURE__ */ (0, import_jsx_runtime7.jsx)(IconButton, { size: "sm", label: t("followLogs"), onClick: () => act("logs", item, true, true), children: /* @__PURE__ */ (0, import_jsx_runtime7.jsx)(IconTerminal, { size: 14, style: { transform: "scaleX(-1)" } }) }),
@@ -2304,7 +2336,7 @@ function DockerPage(props) {
   const [runtimeBusy, setRuntimeBusy] = (0, import_react13.useState)(null);
   const [inspect, setInspect] = (0, import_react13.useState)({ open: false, loading: false, kind: null, id: null, value: null, raw: "", error: null });
   const [confirm, setConfirm] = (0, import_react13.useState)(null);
-  const [attach, setAttach] = (0, import_react13.useState)({ open: false, loading: false, session: null, output: "", error: null });
+  const [attach, setAttach] = (0, import_react13.useState)({ open: false, loading: false, mode: "attach", session: null, output: "", error: null });
   const [runDialog, setRunDialog] = (0, import_react13.useState)({ open: false, image: "" });
   const attachRef = (0, import_react13.useRef)(null);
   const attachRequest = (0, import_react13.useRef)(0);
@@ -2383,6 +2415,19 @@ function DockerPage(props) {
     setRefreshToken((value) => value + 1);
     statusState.refresh();
   }, [statusState.refresh]);
+  const lastRun = (0, import_react13.useRef)(null);
+  (0, import_react13.useEffect)(() => {
+    const run = runState.run;
+    if (run === null || run === void 0) {
+      lastRun.current = null;
+      return;
+    }
+    if (run.status === "running" || run.status === "cancelling") return;
+    const signature = `${run.id ?? ""}:${run.status}`;
+    if (lastRun.current === signature) return;
+    lastRun.current = signature;
+    refreshAll();
+  }, [refreshAll, runState.run?.id, runState.run?.status]);
   const confirmThen = (0, import_react13.useCallback)((config, execute) => {
     setConfirm({
       ...config,
@@ -2481,11 +2526,11 @@ function DockerPage(props) {
     attachRequest.current += 1;
     const session = attachRef.current;
     attachRef.current = null;
-    setAttach({ open: false, loading: false, session: null, output: "", error: null });
+    setAttach({ open: false, loading: false, mode: "attach", session: null, output: "", error: null });
     if (session !== null && session?.id !== void 0) api.call("attachClose", { attachId: session.id }).catch(() => {
     });
   }, [api]);
-  const openAttach = (0, import_react13.useCallback)(async (container) => {
+  const openAttach = (0, import_react13.useCallback)(async (container, mode = "attach") => {
     if (container?.state !== "running") {
       notify("info", t("attachNotRunning"));
       return;
@@ -2497,13 +2542,14 @@ function DockerPage(props) {
       api.call("attachClose", { attachId: previous.id }).catch(() => {
       });
     }
-    setAttach({ open: true, loading: true, session: null, output: "", error: null });
+    setAttach({ open: true, loading: true, mode, session: null, output: "", error: null });
     try {
       const value = await api.call("attach", {
         provider,
         context: selectedContext ?? void 0,
         id: container.id,
         name: container.name || container.id,
+        mode,
         cols: 120,
         rows: 30
       });
@@ -2513,10 +2559,10 @@ function DockerPage(props) {
         return;
       }
       attachRef.current = value.session;
-      setAttach({ open: true, loading: false, session: value.session, output: "", error: null });
+      setAttach({ open: true, loading: false, mode, session: value.session, output: "", error: null });
     } catch (error) {
       if (request !== attachRequest.current) return;
-      setAttach({ open: true, loading: false, session: null, output: "", error });
+      setAttach({ open: true, loading: false, mode, session: null, output: "", error });
     }
   }, [api, notify, provider, selectedContext, t]);
   const attachInput = (0, import_react13.useCallback)(async (data) => {
@@ -2594,6 +2640,10 @@ function DockerPage(props) {
   }, [canAskAI, notify, provider, selectedContext, startDiagnosis, t]);
   const openRun = (0, import_react13.useCallback)((image = "") => setRunDialog({ open: true, image }), []);
   const closeRun = (0, import_react13.useCallback)(() => setRunDialog({ open: false, image: "" }), []);
+  const scheduleListRefresh = (0, import_react13.useCallback)(() => {
+    window.setTimeout(() => refreshAll(), 900);
+    window.setTimeout(() => refreshAll(), 2600);
+  }, [refreshAll]);
   const runAction = (0, import_react13.useCallback)(async (input, { focusConsole = false } = {}) => {
     if (runs.active) {
       notify("info", t("commandRunning"));
@@ -2604,6 +2654,7 @@ function DockerPage(props) {
     try {
       const run = await runs.startAction(payload);
       if (run !== null && input.kind === "container" && input.action === "run") notify("success", t("runStarted"));
+      if (run !== null) scheduleListRefresh();
       return run;
     } catch (error) {
       if (error instanceof DockerApiError && error.code === "docker/confirmation-required") {
@@ -2617,6 +2668,7 @@ function DockerPage(props) {
           },
           async () => {
             await runs.startAction({ ...payload, confirm: true });
+            scheduleListRefresh();
           }
         );
         return null;
@@ -2624,7 +2676,7 @@ function DockerPage(props) {
       notify("error", errorMessage(error));
       return null;
     }
-  }, [actions, confirmThen, notify, provider, runs, t]);
+  }, [actions, confirmThen, notify, provider, runs, scheduleListRefresh, t]);
   const openTab = (0, import_react13.useCallback)((next) => actions.setTab(next), [actions]);
   const tabProps = {
     t,
@@ -2798,6 +2850,7 @@ ${t("statusErrorHint")}`,
       AttachDialog,
       {
         open: attach.open,
+        mode: attach.mode,
         t,
         session: attach.session,
         output: attach.output,
@@ -3160,6 +3213,7 @@ var CSS = `
 .dsh-docker-btn.dsh-docker-sm { height: 26px; padding: 0 9px; font-size: 12px; border-radius: 6px; }
 .dsh-docker-btn.dsh-docker-lg { height: 34px; padding: 0 14px; font-size: 13px; }
 .dsh-docker-icon-btn {
+  position: relative;
   appearance: none; border: .5px solid transparent; background: transparent; cursor: pointer;
   width: 30px; height: 30px; border-radius: 7px; padding: 0;
   display: inline-grid; place-items: center;
@@ -3170,6 +3224,13 @@ var CSS = `
 .dsh-docker-icon-btn[disabled] { opacity: .4; cursor: not-allowed; }
 .dsh-docker-icon-btn.dsh-docker-sm { width: 26px; height: 26px; }
 
+.dsh-docker-tooltip {
+  position: fixed; z-index: 10000; transform: translate(-50%, -100%);
+  padding: 5px 8px; border-radius: 6px; pointer-events: none; white-space: nowrap;
+  color: var(--dsw-alias-label-primary, #fff); background: var(--dsw-alias-bg-inverse, #23252b);
+  font-size: 11px; line-height: 1.2; box-shadow: 0 4px 14px rgba(0,0,0,.18);
+}
+
 .dsh-docker-select, .dsh-docker-input {
   appearance: none; -webkit-appearance: none;
   height: 30px; min-width: 0; padding: 0 9px; border-radius: 7px;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dsh-plugin-container",
-  "version": "0.2.0",
+  "version": "0.3.0",
   "private": false,
   "description": "DSH sidebar container panel for macOS Docker runtimes and Apple container",
   "type": "module",

package/src/client/api.js

@@ -20,7 +20,11 @@ export class DockerApiError extends Error {
 
 /** @param {unknown} error */
 export function isAbortError(error) {
-  return error instanceof DOMException && error.name === 'AbortError' || error?.name === 'AbortError'
+  return (
+    (error instanceof DOMException && error.name === 'AbortError') ||
+    error?.name === 'AbortError' ||
+    error?.code === 'docker/cancelled'
+  )
 }
 
 /** @param {unknown} value */

package/src/client/attach.jsx

@@ -45,7 +45,7 @@ function keyBytes(event) {
   return null
 }
 
-export default function AttachDialog({ open, t, session, output, loading, error, onInput, onClose }) {
+export default function AttachDialog({ open, t, mode = 'attach', session, output, loading, error, onInput, onClose }) {
   const screenRef = useRef(null)
   const preRef = useRef(null)
   const [stick, setStick] = useState(true)
@@ -64,11 +64,12 @@ export default function AttachDialog({ open, t, session, output, loading, error,
   }, [output, stick])
 
   const running = session?.status === 'running'
+  const title = (session?.mode ?? mode) === 'exec' ? t('execTitle') : t('attachTitle')
   const shown = cleanTerminal(output)
   return (
     <Modal
       open={open}
-      title={`${t('attachTitle')} · ${session?.containerName ?? ''}`}
+      title={`${title} · ${session?.containerName ?? ''}`}
       subtitle={session?.command ?? undefined}
       wide
       onClose={onClose}
@@ -79,7 +80,7 @@ export default function AttachDialog({ open, t, session, output, loading, error,
           <span style={{ flex: 1 }} />
           {session?.exitCode !== null && session?.exitCode !== undefined && <span className="dsh-docker-muted">{t('exitCode')}: {session.exitCode}</span>}
           <CopyButton text={shown} label={t('copy')} copiedLabel={t('copied')} />
-          <Button size="sm" onClick={onClose}>{t('attachClose')}</Button>
+          <Button size="sm" onClick={onClose}>{t((session?.mode ?? mode) === 'exec' ? 'execClose' : 'attachClose')}</Button>
         </>
       }
     >
@@ -95,7 +96,7 @@ export default function AttachDialog({ open, t, session, output, loading, error,
         className="dsh-docker-attach-screen"
         tabIndex={0}
         role="textbox"
-        aria-label={t('attachTitle')}
+        aria-label={title}
         onKeyDown={(event) => {
           if (!running || loading) return
           const data = keyBytes(event)

package/src/client/components.jsx

@@ -1,5 +1,5 @@
 /** Small presentational building blocks shared by the Docker tabs. */
-import { useEffect, useState } from 'react'
+import { useEffect, useRef, useState } from 'react'
 import { createPortal } from 'react-dom'
 
 import { IconAlert, IconCheck, IconCopy, IconSearch, IconSpinner, IconX } from './icons.jsx'
@@ -30,16 +30,35 @@ export function Button({ variant = 'ghost', size = 'md', className, type = 'butt
 }
 
 export function IconButton({ label, size = 'md', className, children, ...rest }) {
+  const [tip, setTip] = useState(null)
+  const ref = useRef(null)
+  const showTip = () => {
+    const rect = ref.current?.getBoundingClientRect()
+    if (rect === undefined) return
+    const left = Math.min(Math.max(rect.left + rect.width / 2, 16), window.innerWidth - 16)
+    setTip({ left, top: Math.max(rect.top - 7, 8) })
+  }
+  const hideTip = () => setTip(null)
   return (
-    <button
-      type="button"
-      aria-label={label}
-      title={label}
-      className={cx('dsh-docker-icon-btn', size === 'sm' && 'dsh-docker-sm', className)}
-      {...rest}
-    >
-      {children}
-    </button>
+    <>
+      <button
+        type="button"
+        ref={ref}
+        aria-label={label}
+        className={cx('dsh-docker-icon-btn', size === 'sm' && 'dsh-docker-sm', className)}
+        onMouseEnter={showTip}
+        onMouseLeave={hideTip}
+        onFocus={showTip}
+        onBlur={hideTip}
+        {...rest}
+      >
+        {children}
+      </button>
+      {tip !== null && createPortal(
+        <span className="dsh-docker-tooltip" style={{ left: tip.left, top: tip.top }} role="tooltip">{label}</span>,
+        document.body,
+      )}
+    </>
   )
 }
 

package/src/client/i18n.js

@@ -91,6 +91,8 @@ export const zh = {
   restartFeatures: '重启 DSH 以启用启动容器 / Attach',
   restartForArchitecture: '重启 DSH 以显示镜像架构',
   attach: 'Attach',
+  exec: 'Exec',
+  execTitle: 'Exec 终端',
   askAi: '问 AI',
   diagnose: '诊断',
   askAiSent: '已发送到 AI 会话',
@@ -105,6 +107,7 @@ export const zh = {
   attachHint: '已连接。点击终端后输入；Ctrl+C 中断，关闭窗口结束会话。',
   attachInputHint: '点击终端输入 · Ctrl+C 中断',
   attachClose: '结束 Attach',
+  execClose: '结束 Exec',
   attachNotRunning: '容器未运行，无法 attach',
   followLogs: '持续日志',
   inspect: '检查',
@@ -334,6 +337,8 @@ export const en = {
   restartFeatures: 'Restart DSH to enable Start container / Attach',
   restartForArchitecture: 'Restart DSH to show image architecture',
   attach: 'Attach',
+  exec: 'Exec',
+  execTitle: 'Exec terminal',
   askAi: 'Ask AI',
   diagnose: 'Diagnose',
   askAiSent: 'Sent to the AI conversation',
@@ -348,6 +353,7 @@ export const en = {
   attachHint: 'Connected. Click the terminal and type; Ctrl+C interrupts. Closing the dialog ends the session.',
   attachInputHint: 'Click terminal to type · Ctrl+C interrupts',
   attachClose: 'End attach',
+  execClose: 'End exec',
   attachNotRunning: 'Container is not running; attach is unavailable',
   followLogs: 'Follow logs',
   inspect: 'Inspect',

package/src/client/icons.jsx

@@ -206,6 +206,14 @@ export const IconSparkles = (props) => (
   </Svg>
 )
 
+export const IconExec = (props) => (
+  <Svg {...props}>
+    <rect x="3.5" y="4.5" width="17" height="15" rx="2" />
+    <path d="m7.2 9.2 3 2.8-3 2.8M12.5 15h4" />
+    <path d="M17 9.2h.01" />
+  </Svg>
+)
+
 export const IconAttach = (props) => (
   <Svg {...props}>
     <path d="M9.5 14.5 14.5 9.5" />

package/src/client/page.jsx

@@ -97,7 +97,7 @@ export default function DockerPage(props) {
   const [runtimeBusy, setRuntimeBusy] = useState(null)
   const [inspect, setInspect] = useState({ open: false, loading: false, kind: null, id: null, value: null, raw: '', error: null })
   const [confirm, setConfirm] = useState(null)
-  const [attach, setAttach] = useState({ open: false, loading: false, session: null, output: '', error: null })
+  const [attach, setAttach] = useState({ open: false, loading: false, mode: 'attach', session: null, output: '', error: null })
   const [runDialog, setRunDialog] = useState({ open: false, image: '' })
   const attachRef = useRef(null)
   const attachRequest = useRef(0)
@@ -186,6 +186,22 @@ export default function DockerPage(props) {
     statusState.refresh()
   }, [statusState.refresh])
 
+  // Some very short actions finish before the controller's callback is observed;
+  // refresh on every terminal run transition so the list/count cannot stay stale.
+  const lastRun = useRef(null)
+  useEffect(() => {
+    const run = runState.run
+    if (run === null || run === undefined) {
+      lastRun.current = null
+      return
+    }
+    if (run.status === 'running' || run.status === 'cancelling') return
+    const signature = `${run.id ?? ''}:${run.status}`
+    if (lastRun.current === signature) return
+    lastRun.current = signature
+    refreshAll()
+  }, [refreshAll, runState.run?.id, runState.run?.status])
+
   const confirmThen = useCallback((config, execute) => {
     setConfirm({
       ...config,
@@ -288,11 +304,11 @@ export default function DockerPage(props) {
     attachRequest.current += 1
     const session = attachRef.current
     attachRef.current = null
-    setAttach({ open: false, loading: false, session: null, output: '', error: null })
+    setAttach({ open: false, loading: false, mode: 'attach', session: null, output: '', error: null })
     if (session !== null && session?.id !== undefined) api.call('attachClose', { attachId: session.id }).catch(() => {})
   }, [api])
 
-  const openAttach = useCallback(async (container) => {
+  const openAttach = useCallback(async (container, mode = 'attach') => {
     if (container?.state !== 'running') {
       notify('info', t('attachNotRunning'))
       return
@@ -303,13 +319,14 @@ export default function DockerPage(props) {
       attachRef.current = null
       api.call('attachClose', { attachId: previous.id }).catch(() => {})
     }
-    setAttach({ open: true, loading: true, session: null, output: '', error: null })
+    setAttach({ open: true, loading: true, mode, session: null, output: '', error: null })
     try {
       const value = await api.call('attach', {
         provider,
         context: selectedContext ?? undefined,
         id: container.id,
         name: container.name || container.id,
+        mode,
         cols: 120,
         rows: 30,
       })
@@ -318,10 +335,10 @@ export default function DockerPage(props) {
         return
       }
       attachRef.current = value.session
-      setAttach({ open: true, loading: false, session: value.session, output: '', error: null })
+      setAttach({ open: true, loading: false, mode, session: value.session, output: '', error: null })
     } catch (error) {
       if (request !== attachRequest.current) return
-      setAttach({ open: true, loading: false, session: null, output: '', error })
+      setAttach({ open: true, loading: false, mode, session: null, output: '', error })
     }
   }, [api, notify, provider, selectedContext, t])
 
@@ -406,6 +423,13 @@ export default function DockerPage(props) {
   const openRun = useCallback((image = '') => setRunDialog({ open: true, image }), [])
   const closeRun = useCallback(() => setRunDialog({ open: false, image: '' }), [])
 
+  const scheduleListRefresh = useCallback(() => {
+    // The job may finish before the run poll is observed by this page; a short
+    // second timer makes stop/delete reliably drop out of the list.
+    window.setTimeout(() => refreshAll(), 900)
+    window.setTimeout(() => refreshAll(), 2600)
+  }, [refreshAll])
+
   const runAction = useCallback(async (input, { focusConsole = false } = {}) => {
     if (runs.active) {
       notify('info', t('commandRunning'))
@@ -416,6 +440,7 @@ export default function DockerPage(props) {
     try {
       const run = await runs.startAction(payload)
       if (run !== null && input.kind === 'container' && input.action === 'run') notify('success', t('runStarted'))
+      if (run !== null) scheduleListRefresh()
       return run
     } catch (error) {
       if (error instanceof DockerApiError && error.code === 'docker/confirmation-required') {
@@ -429,6 +454,7 @@ export default function DockerPage(props) {
           },
           async () => {
             await runs.startAction({ ...payload, confirm: true })
+            scheduleListRefresh()
           },
         )
         return null
@@ -436,7 +462,7 @@ export default function DockerPage(props) {
       notify('error', errorMessage(error))
       return null
     }
-  }, [actions, confirmThen, notify, provider, runs, t])
+  }, [actions, confirmThen, notify, provider, runs, scheduleListRefresh, t])
 
   const openTab = useCallback((next) => actions.setTab(next), [actions])
 
@@ -631,6 +657,7 @@ export default function DockerPage(props) {
 
         <AttachDialog
           open={attach.open}
+          mode={attach.mode}
           t={t}
           session={attach.session}
           output={attach.output}

package/src/client/styles.js

@@ -89,6 +89,7 @@ const CSS = `
 .dsh-docker-btn.dsh-docker-sm { height: 26px; padding: 0 9px; font-size: 12px; border-radius: 6px; }
 .dsh-docker-btn.dsh-docker-lg { height: 34px; padding: 0 14px; font-size: 13px; }
 .dsh-docker-icon-btn {
+  position: relative;
   appearance: none; border: .5px solid transparent; background: transparent; cursor: pointer;
   width: 30px; height: 30px; border-radius: 7px; padding: 0;
   display: inline-grid; place-items: center;
@@ -99,6 +100,13 @@ const CSS = `
 .dsh-docker-icon-btn[disabled] { opacity: .4; cursor: not-allowed; }
 .dsh-docker-icon-btn.dsh-docker-sm { width: 26px; height: 26px; }
 
+.dsh-docker-tooltip {
+  position: fixed; z-index: 10000; transform: translate(-50%, -100%);
+  padding: 5px 8px; border-radius: 6px; pointer-events: none; white-space: nowrap;
+  color: var(--dsw-alias-label-primary, #fff); background: var(--dsw-alias-bg-inverse, #23252b);
+  font-size: 11px; line-height: 1.2; box-shadow: 0 4px 14px rgba(0,0,0,.18);
+}
+
 .dsh-docker-select, .dsh-docker-input {
   appearance: none; -webkit-appearance: none;
   height: 30px; min-width: 0; padding: 0 9px; border-radius: 7px;

package/src/client/tabs/containers.jsx

@@ -12,7 +12,7 @@ import {
   StateLabel,
 } from '../components.jsx'
 import { useDockerList } from '../hooks.js'
-import { IconAlert, IconAttach, IconBox, IconInfo, IconPlay, IconRestart, IconSparkles, IconStop, IconTerminal, IconTrash } from '../icons.jsx'
+import { IconAlert, IconAttach, IconBox, IconExec, IconInfo, IconPlay, IconRestart, IconSparkles, IconStop, IconTerminal, IconTrash } from '../icons.jsx'
 
 export default function ContainersTab({ t, api, provider, context, status, refreshToken, features, onAction, onAttach, onRunContainer, onAskAI, canAskAI, onInspect }) {
   const [all, setAll] = useState(true)
@@ -112,6 +112,11 @@ export default function ContainersTab({ t, api, provider, context, status, refre
                             <IconSparkles size={14} />
                           </IconButton>
                         )}
+                        {features.includes('exec') && item.state === 'running' && (
+                          <IconButton size="sm" label={t('exec')} onClick={() => onAttach(item, 'exec')}>
+                            <IconExec size={14} />
+                          </IconButton>
+                        )}
                         {features.includes('attach') && item.state === 'running' && (
                           <IconButton size="sm" label={t('attach')} onClick={() => onAttach(item)}>
                             <IconAttach size={14} />

package/src/host/attach.js

@@ -53,6 +53,7 @@ export class AttachManager {
    *   containerId: string,
    *   containerName?: string,
    *   command: string,
+   *   mode?: 'attach' | 'exec',
    *   cols?: number,
    *   rows?: number,
    *   signal?: AbortSignal,
@@ -95,6 +96,7 @@ export class AttachManager {
       containerId: input.containerId,
       containerName: input.containerName ?? input.containerId,
       command: input.command,
+      mode: input.mode === 'exec' ? 'exec' : 'attach',
       cols,
       rows,
       status: 'running',
@@ -146,6 +148,7 @@ export class AttachManager {
       containerId: session.containerId,
       containerName: session.containerName,
       command: session.command,
+      mode: session.mode,
       cols: session.cols,
       rows: session.rows,
       status: session.status,

package/src/host/service.js

@@ -256,7 +256,7 @@ export class DockerService {
     }
     providers.push(await this.apple.info(signal))
     const defaultProvider = providers.find((provider) => provider.id === 'docker' && provider.available)?.id ?? providers.find((provider) => provider.available)?.id ?? 'docker'
-    const features = ['attach', 'run', 'image-architecture']
+    const features = ['attach', 'exec', 'run', 'image-architecture']
     if (this.toolsEnabled) features.push('ai-tools')
     return { providers, defaultProvider, features }
   }
@@ -645,6 +645,7 @@ export class DockerService {
   async attachStart(provider, payload, signal) {
     const id = safeIdentifier(payload.id)
     const name = optionalString(payload.name, 'name') ?? id
+    const mode = payload.mode === 'exec' ? 'exec' : 'attach'
     const cols = optionalInteger(payload.cols, 'cols', { min: 20, max: 300 }) ?? 120
     const rows = optionalInteger(payload.rows, 'rows', { min: 5, max: 120 }) ?? 30
     if (provider === 'apple-container') {
@@ -657,7 +658,7 @@ export class DockerService {
       } catch (error) {
         throw new CommandError(`无法读取 Apple container 状态: ${messageOf(error)}`, 'container/exec-failed')
       }
-      if (!running) throw new CommandError('容器未运行，无法 attach/exec', 'container/not-running')
+      if (!running) throw new CommandError(`容器未运行，无法 ${mode}`, 'container/not-running')
       const argv = [path, 'exec', '-i', '-t', id, '/bin/sh']
       return {
         session: await this.attach.start({
@@ -668,6 +669,7 @@ export class DockerService {
           containerId: id,
           containerName: name,
           command: `container exec -i -t ${id} /bin/sh`,
+          mode,
           cols,
           rows,
           signal,
@@ -682,16 +684,18 @@ export class DockerService {
       signal,
       timeoutMs: 15_000,
     })
-    if (running.stdout.trim() !== 'true') throw new CommandError('容器未运行，无法 attach', 'docker/not-running')
+    if (running.stdout.trim() !== 'true') throw new CommandError(`容器未运行，无法 ${mode}`, 'docker/not-running')
+    const subargv = mode === 'exec' ? ['exec', '-i', '-t', id, '/bin/sh'] : ['attach', id]
     return {
       session: await this.attach.start({
-        argv: this.cli.argvFor(['attach', id], { context }),
+        argv: this.cli.argvFor(subargv, { context }),
         cwd: this.home,
         env: this.cli.childEnv(),
         provider: 'docker',
         containerId: id,
         containerName: name,
-        command: describeCommand(['attach', id], context),
+        command: describeCommand(subargv, context),
+        mode,
         cols,
         rows,
         signal,