@lkangd/cc-settings-preset 1.0.6 → 1.0.8

package/README.md

@@ -14,8 +14,11 @@
 
 <p align="center">
   <a href="https://www.npmjs.com/package/@lkangd/cc-settings-preset"><img src="https://img.shields.io/npm/v/@lkangd/cc-settings-preset?style=flat-square" alt="npm version" /></a>
+  <a href="https://www.npmjs.com/package/@lkangd/cc-settings-preset"><img src="https://img.shields.io/npm/dm/@lkangd/cc-settings-preset?style=flat-square&color=cb3837&label=downloads" alt="npm downloads per month" /></a>
+  <a href="https://www.npmjs.com/package/@lkangd/cc-settings-preset"><img src="https://img.shields.io/npm/dt/@lkangd/cc-settings-preset?style=flat-square&label=total" alt="npm total downloads" /></a>
   <a href="https://github.com/lkangd/cc-settings-preset/blob/main/LICENSE"><img src="https://img.shields.io/github/license/lkangd/cc-settings-preset?style=flat-square" alt="license" /></a>
   <a href="https://nodejs.org/"><img src="https://img.shields.io/node/v/@lkangd/cc-settings-preset?style=flat-square" alt="node version" /></a>
+  <a href="https://github.com/lkangd/cc-settings-preset/commits/main"><img src="https://img.shields.io/github/last-commit/lkangd/cc-settings-preset?style=flat-square" alt="last commit" /></a>
   <a href="https://github.com/lkangd/cc-settings-preset"><img src="https://img.shields.io/github/stars/lkangd/cc-settings-preset?style=flat-square" alt="stars" /></a>
   <a href="https://github.com/lkangd/cc-settings-preset/issues"><img src="https://img.shields.io/github/issues/lkangd/cc-settings-preset?style=flat-square" alt="issues" /></a>
 </p>
@@ -29,7 +32,7 @@
 </p>
 
 <p align="center">
-  <em>Interactive flow: pick a global base preset (left), preview its JSON (right), then tune plugins / skills / MCP per launch before starting Claude Code.</em>
+  <em>Interactive flow: pick a global base preset (left), preview its settings as YAML or JSON (right), then tune plugins / skills / MCP per launch before starting Claude Code.</em>
 </p>
 
 **English** | [简体中文](README.zh-hans.md)
@@ -68,6 +71,12 @@ ccsp
 # Forward Claude Code args (ccsp owns --settings)
 ccsp claude --help
 ccsp claude -p "review this PR"
+
+# Resume the last session in this project with its original preset/launch config
+ccsp --continue
+
+# Resume a specific session by id, reusing the preset/launch config it was launched with
+ccsp --resume 99580820-9437-475c-883c-399bcfba3c47
 ```
 
 **First-time workflow:**
@@ -188,7 +197,7 @@ claude --settings <temp-file> [your other args]
                                       │
                                       ▼
 ┌─────────────────────────────────────────────────────────────────────────┐
-│ ⑤ Write .claude/.ccsp/tmp/*.json (gitignored; keep at most 20 files)   │
+│ ⑤ Write .claude/.ccsp/tmp/*.json (gitignored; keep at most 50 files)   │
 └─────────────────────────────────────────────────────────────────────────┘
                                       │
                                       ▼
@@ -214,8 +223,17 @@ claude --settings <temp-file> [your other args]
 - **Two-layer split** — global “base environment” vs project “launch delta” for multi-repo work.
 - **Visual toggles** — terminal TUI to browse JSON and flip plugins / skills / MCP.
 - **Remembers last choice** — per project directory for base and launch presets.
+- **Resumable sessions** — every launch is bound to its preset/launch config; `ccsp --continue` and `ccsp --resume <id>` restore the original config and resume the matching Claude session in one shot.
 - **Safer defaults** — `.claude/.ccsp/` gets a `.gitignore` that ignores everything on init.
 
+### Session resume
+
+After Claude exits, CCSP records the **real** Claude session id (discovered by diffing `~/.claude/projects/<encoded-cwd>/` against a pre-launch snapshot — `--session-id` is unreliable in interactive mode, so we don't pin it) and binds it to the launch config used. Stored under `.claude/.ccsp/sessions.json` (capped at 50, pruned by last-used time):
+
+- `ccsp --resume <uuid>` — re-finalize that session's stored config and run `claude --resume <uuid>` in one step.
+- `ccsp --continue` — pick the **most recently exited** ccsp session in this project and resume it deterministically by id. Concretely: launch A, then B, exit A first, run `ccsp --continue` — you get A back with A's original preset/launch config (not B's).
+- If the stored binding points at a Claude session that no longer exists, CCSP discards it and falls back to interactive preset selection.
+
 ### Limitations (read before assuming)
 
 | Cannot / caveat | Explanation |
@@ -227,8 +245,9 @@ claude --settings <temp-file> [your other args]
 | **No “add MCP server” in UI** | Can **deny** discovered MCPs via `deniedMcpServers`; cannot create new server entries. |
 | **No headless / CI mode** | Main flow is Ink TUI; `create` / `manage` are interactive unless you edit JSON yourself. |
 | **Derived presets** | Schema supports `derived` type; CLI does not expose full create/manage flow yet. |
-| **Project store is local by default** | `launch-presets` and `tmp` under `.claude/.ccsp/` are not in Git unless you opt in. |
-| **Temp file cap** | Oldest files in `tmp` are pruned when count exceeds 20. |
+| **Project store is local by default** | `launch-presets`, `tmp`, and `sessions.json` under `.claude/.ccsp/` are not in Git unless you opt in. |
+| **Temp file cap** | Oldest temp settings in `tmp/` are pruned past 50 by last-used time; statusline scripts are cleaned every exit. |
+| **Resume only sees ccsp launches** | `ccsp --continue` / `--resume` only know about sessions started through ccsp on the new code path; sessions started directly with `claude` aren't bound and won't appear. |
 
 ---
 
@@ -238,18 +257,33 @@ claude --settings <temp-file> [your other args]
 |---------|-------------|
 | `ccsp` | Default: pick base preset → configure launch layer → start `claude` |
 | `ccsp claude [args...]` | Same, forwarding `args` to `claude` (without `--settings`) |
+| `ccsp --continue` | Resume the most recently exited ccsp session in this project with its original preset / launch config |
+| `ccsp --resume <uuid>` | Resume a specific session by id, reusing the preset / launch config it was launched with (falls back to interactive if the binding is unknown) |
 | `ccsp create` | Interactively create a global base preset |
 | `ccsp manage` | Manage global base presets (preview / rename / delete / create / launch) |
 | `ccsp manage --project` | Manage launch presets for the current project |
+| `ccsp config` | Configure ccsp preferences (env-only preview, statusline) |
 
 ### TUI shortcuts
 
-**Base preset selection:** `j`/`k` or arrows to move, `Enter` to confirm, `q` to quit.
+**Base preset selection:** `j`/`k` or arrows to move, `f` toggle between env-only and full settings preview, `Enter` to confirm, `q` to quit.
 
 **Global manage (`ccsp manage`):** `l` launch, `r` rename, `d` delete, `c` create, `o` reveal in Finder, `q` quit.
 
 **Project launch layer:** switch between presets and plugin / skill / MCP columns; save as launch preset. `Ctrl+L` refreshes the UI.
 
+**Config (`ccsp config`):** `j`/`k` or arrows to move, `space`/`Enter` toggle the focused option, `q` quit.
+
+### Preferences (`ccsp config`)
+
+`ccsp config` opens a two-column view (options on the left, the focused option's description on the right) for global, per-user preferences stored in `~/.ccsp/config.json`. Both default to **enabled**:
+
+| Option | Default | Effect |
+|--------|---------|--------|
+| **Global preset env-only** | enabled | The base preset selection screen previews only the `env` field of the selected preset by default. Press `f` on that screen to toggle between the env-only view and the full settings view. When disabled, the full settings are shown by default. |
+| **Show statusline** | enabled | ccsp injects a statusline at the bottom of Claude Code showing the active preset and toggle summary (`CCSP: <base>/<launch> | plugins(…) | skills(…) | MCPs(…)`). When disabled, the statusline is not injected and no statusline scripts are generated. |
+| **Settings preview format** | `yaml` | How the selected preset settings are rendered on the right of the preset selection (`ccsp`) and manage (`ccsp manage`) screens — `yaml` or `json`. Both are syntax-highlighted. |
+
 ---
 
 ## Directory Layout
@@ -259,6 +293,7 @@ claude --settings <temp-file> [your other args]
 ├── index.json                 # global base preset index
 ├── settings/
 │   └── <name>-settings.json   # base preset body
+├── config.json                # user preferences (env-only preview, statusline)
 └── last-settings.json         # last base preset name per project cwd
 
 <project>/.claude/.ccsp/       # entire dir gitignored by default
@@ -266,7 +301,8 @@ claude --settings <temp-file> [your other args]
 │   ├── index.json
 │   └── <name>-launch.json     # launch-layer overrides only
 ├── tmp/
-│   └── <timestamp>-settings.json
+│   └── <stem>-settings.json   # finalized launch config (max 50, pruned by use time)
+├── sessions.json              # sessionId → launch config binding, for --continue / --resume
 └── last-used.json             # last launch preset used
 ```
 

package/README.zh-hans.md

@@ -14,8 +14,11 @@
 
 <p align="center">
   <a href="https://www.npmjs.com/package/@lkangd/cc-settings-preset"><img src="https://img.shields.io/npm/v/@lkangd/cc-settings-preset?style=flat-square" alt="npm version" /></a>
+  <a href="https://www.npmjs.com/package/@lkangd/cc-settings-preset"><img src="https://img.shields.io/npm/dm/@lkangd/cc-settings-preset?style=flat-square&color=cb3837&label=downloads" alt="npm 月下载量" /></a>
+  <a href="https://www.npmjs.com/package/@lkangd/cc-settings-preset"><img src="https://img.shields.io/npm/dt/@lkangd/cc-settings-preset?style=flat-square&label=total" alt="npm 总下载量" /></a>
   <a href="https://github.com/lkangd/cc-settings-preset/blob/main/LICENSE"><img src="https://img.shields.io/github/license/lkangd/cc-settings-preset?style=flat-square" alt="license" /></a>
   <a href="https://nodejs.org/"><img src="https://img.shields.io/node/v/@lkangd/cc-settings-preset?style=flat-square" alt="node version" /></a>
+  <a href="https://github.com/lkangd/cc-settings-preset/commits/main"><img src="https://img.shields.io/github/last-commit/lkangd/cc-settings-preset?style=flat-square" alt="最近提交" /></a>
   <a href="https://github.com/lkangd/cc-settings-preset"><img src="https://img.shields.io/github/stars/lkangd/cc-settings-preset?style=flat-square" alt="stars" /></a>
   <a href="https://github.com/lkangd/cc-settings-preset/issues"><img src="https://img.shields.io/github/issues/lkangd/cc-settings-preset?style=flat-square" alt="issues" /></a>
 </p>
@@ -29,7 +32,7 @@
 </p>
 
 <p align="center">
-  <em>典型流程：先选全局基础预设（左）并预览 JSON（右），再在项目启动层切换插件 / Skill / MCP，最后启动 Claude Code。</em>
+  <em>典型流程：先选全局基础预设（左）并以 YAML 或 JSON 预览其配置（右），再在项目启动层切换插件 / Skill / MCP，最后启动 Claude Code。</em>
 </p>
 
 [English](README.md) | **简体中文**
@@ -68,6 +71,12 @@ ccsp
 # 透传 Claude Code 参数（ccsp 会接管 --settings）
 ccsp claude --help
 ccsp claude -p "review this PR"
+
+# 恢复本项目最近退出的会话，并复用其原始预设 / 启动配置
+ccsp --continue
+
+# 按 session id 精确恢复某个会话，复用启动时所用的预设 / 启动配置
+ccsp --resume 99580820-9437-475c-883c-399bcfba3c47
 ```
 
 **首次使用建议：**
@@ -118,7 +127,7 @@ claude --settings ~/.claude/my-api-1.json -- ...
 
 ### 5. 配置管理与预览
 
-- `ccsp manage`：浏览、重命名、删除全局基础预设，预览 JSON 树，并可直接从管理界面启动。
+- `ccsp manage`：浏览、重命名、删除全局基础预设，预览配置（YAML / JSON），并可直接从管理界面启动。
 - `ccsp manage --project`：管理当前仓库下的启动预设（创建 / 保存 / 重命名 / 删除 / 启动）。
 
 ---
@@ -188,7 +197,7 @@ claude --settings <临时文件> [你传入的其它参数]
                                       │
                                       ▼
 ┌─────────────────────────────────────────────────────────────────────────┐
-│ ⑤ 写入 .claude/.ccsp/tmp/*.json（目录默认 gitignore，最多保留 20 份）        │
+│ ⑤ 写入 .claude/.ccsp/tmp/*.json（目录默认 gitignore，最多保留 50 份）        │
 └─────────────────────────────────────────────────────────────────────────┘
                                       │
                                       ▼
@@ -214,8 +223,17 @@ claude --settings <临时文件> [你传入的其它参数]
 - **两层分离**：全局「基础环境」与项目「启动差异」解耦，适合多仓库并行开发。
 - **可视化开关**：在终端 TUI 中浏览 JSON、切换插件 / Skill / MCP，比手改数组更不易出错。
 - **记忆上次选择**：按项目目录记住上次使用的基础预设与启动预设。
+- **可恢复会话**：每次启动都会把会话与所用预设 / 启动配置绑定，`ccsp --continue` 与 `ccsp --resume <id>` 可一键恢复原配置并续上对应 Claude 会话。
 - **安全默认值**：`.claude/.ccsp/` 初始化时写入 `.gitignore`（忽略全部），降低临时文件与本地预设误提交概率。
 
+### 会话恢复（Session Resume）
+
+Claude 退出后，CCSP 会**主动发现** Claude 真实分配的 session id（启动前对 `~/.claude/projects/<编码后的 cwd>/` 做快照，退出时做 diff——`--session-id` 在交互模式下并不可靠，所以我们不直接 pin），并把它和本次启动配置绑定，存入 `.claude/.ccsp/sessions.json`（最多 50 条，按 lastUsedAt 淘汰）：
+
+- `ccsp --resume <uuid>`：用绑定里的输入重新 finalize 启动配置，并以 `claude --resume <uuid>` 一步启动。
+- `ccsp --continue`：选取本项目里**最近退出**的 ccsp 会话，按其 id 确定性地恢复。具体例子：先启 A 再启 B，先退出 A，再 `ccsp --continue`，恢复的是 A（带 A 当时的预设 / 启动配置），不是 B。
+- 若绑定对应的 Claude 会话已不存在（如旧版本残留），CCSP 会丢弃该绑定并回退到交互式选择。
+
 ### 局限与误解澄清（请务必阅读）
 
 | 不能做到 / 需注意 | 说明 |
@@ -227,8 +245,9 @@ claude --settings <临时文件> [你传入的其它参数]
 | **不能通过 UI 新增 MCP Server** | 仅支持基于已发现 MCP 的**禁用**（`deniedMcpServers`），不能创建新 server 配置。 |
 | **无无头 / CI 模式** | 主流程为 Ink 交互界面；`create` / `manage` 亦为 TUI，不适合纯脚本无人值守选型（除非自行读写 JSON）。 |
 | **Derived 预设** | 数据模型支持 `derived` 类型，但当前 CLI 未暴露创建/管理衍生预设的完整流程。 |
-| **项目存储默认本地** | `launch-presets` 与 `tmp` 在 `.claude/.ccsp/` 下，默认不进 Git；团队共享需另行约定导出方式。 |
-| **临时文件有上限** | `tmp` 目录超过 20 个 settings 文件时会删除最旧的。 |
+| **项目存储默认本地** | `launch-presets`、`tmp` 与 `sessions.json` 都在 `.claude/.ccsp/` 下，默认不进 Git；团队共享需另行约定导出方式。 |
+| **临时文件有上限** | `tmp` 中的 settings 文件按 lastUsedAt 淘汰，最多保留 50 份；statusline 脚本每次退出都会清理。 |
+| **Resume 只覆盖 ccsp 启动的会话** | `ccsp --continue` / `--resume` 只能看到通过新版 ccsp 启动并记录过绑定的会话；直接用 `claude` 启动的会话不在范围内。 |
 
 ---
 
@@ -238,18 +257,33 @@ claude --settings <临时文件> [你传入的其它参数]
 |------|------|
 | `ccsp` | 默认流程：选基础预设 → 配置启动层 → 启动 `claude` |
 | `ccsp claude [args...]` | 同上，并将 `args` 传给 `claude`（不含 `--settings`） |
+| `ccsp --continue` | 恢复本项目最近退出的 ccsp 会话，复用原始预设 / 启动配置 |
+| `ccsp --resume <uuid>` | 按 session id 精确恢复某个会话，复用启动时所用的预设 / 启动配置（未知绑定时回退到交互式选择） |
 | `ccsp create` | 交互式创建全局基础预设 |
 | `ccsp manage` | 管理全局基础预设（预览 / 重命名 / 删除 / 新建 / 启动） |
 | `ccsp manage --project` | 管理当前项目的启动预设 |
+| `ccsp config` | 配置 ccsp 偏好（仅 env 预览、statusline） |
 
 ### 常用快捷键（TUI）
 
-**选择基础预设：** `j`/`k` 或方向键移动，`Enter` 确认，`q` 退出。
+**选择基础预设：** `j`/`k` 或方向键移动，`f` 在「仅 env」与「完整配置」预览间切换，`Enter` 确认，`q` 退出。
 
 **管理全局预设（`ccsp manage`）：** `l` 启动，`r` 重命名，`d` 删除，`c` 新建，`o` 在 Finder 中打开文件，`q` 退出。
 
 **项目启动层：** 在预设与插件 / Skill / MCP 列间切换并开关；支持保存为启动预设。终端内 `Ctrl+L` 可刷新界面。
 
+**配置（`ccsp config`）：** `j`/`k` 或方向键移动，`space`/`Enter` 切换当前选项，`q` 退出。
+
+### 偏好设置（`ccsp config`）
+
+`ccsp config` 打开左右两栏视图（左侧为选项，右侧为当前聚焦选项的说明），用于管理存放在 `~/.ccsp/config.json` 的全局（按用户）偏好。两项默认均为 **开启**：
+
+| 选项 | 默认 | 作用 |
+|------|------|------|
+| **Global preset env-only** | 开启 | 基础预设选择页默认只预览所选预设的 `env` 字段。在该页面按 `f` 可在「仅 env」与「完整配置」视图间切换；关闭后默认展示完整配置。 |
+| **Show statusline** | 开启 | 在 Claude Code 底部注入 ccsp statusline，显示当前预设与开关概览（`CCSP: <base>/<launch> \| plugins(…) \| skills(…) \| MCPs(…)`）。关闭后不再注入，也不会生成任何 statusline 脚本。 |
+| **Settings preview format** | `yaml` | 基础预设选择页（`ccsp`）与管理页（`ccsp manage`）右侧预览所选预设配置的渲染格式 —— `yaml` 或 `json`，两者都带语法高亮。 |
+
 ---
 
 ## 目录结构
@@ -259,6 +293,7 @@ claude --settings <临时文件> [你传入的其它参数]
 ├── index.json                 # 全局基础预设索引
 ├── settings/
 │   └── <name>-settings.json   # 基础预设内容
+├── config.json                # 用户偏好（仅 env 预览、statusline）
 └── last-settings.json         # 各项目 cwd 上次使用的基础预设名
 
 <项目>/.claude/.ccsp/          # 默认整目录 gitignore
@@ -266,7 +301,8 @@ claude --settings <临时文件> [你传入的其它参数]
 │   ├── index.json
 │   └── <name>-launch.json     # 仅含启动层覆盖字段
 ├── tmp/
-│   └── <timestamp>-settings.json
+│   └── <stem>-settings.json   # 本次启动的最终配置（最多 50 份，按使用时间淘汰）
+├── sessions.json              # sessionId → 启动配置 的绑定，供 --continue / --resume
 └── last-used.json             # 上次使用的启动预设
 ```
 

package/dist/cli.js

@@ -5,12 +5,14 @@ import React from 'react';
 import { Command } from 'commander';
 import { render, Text } from 'ink';
 import figlet from 'figlet';
-import { sanitizeClaudeArgs } from './core/args.js';
+import { randomUUID } from 'node:crypto';
+import { isUuid, resolveSessionLaunch, sanitizeClaudeArgs } from './core/args.js';
 import { CliError } from './core/errors.js';
 import { readJsonFile } from './core/json.js';
 import { createPathContext, resolveGlobalRoot, resolveUserClaudeSettingsPath } from './core/paths.js';
 import { parseSettings } from './core/schema.js';
 import { spawnClaude } from './core/spawn.js';
+import { ConfigApp } from './ink/config-app.js';
 import { CreateApp } from './ink/create-app.js';
 import { GlobalShortcutHandler } from './ink/components/global-shortcut-handler.js';
 import { InkResizeProvider } from './ink/components/resize-context.js';
@@ -20,7 +22,9 @@ import { ProjectLaunchApp } from './ink/project-launch-app.js';
 import { ProjectManageApp } from './ink/project-manage-app.js';
 import { SettingsSelectApp } from './ink/settings-select-app.js';
 import { applyPluginOverrides, pluginStatesToEnabledPlugins, resolvePluginStates } from './services/plugin-service.js';
+import { createCcspConfigService } from './services/ccsp-config-service.js';
 import { createGlobalLastSettingsService } from './services/global-last-settings-service.js';
+import { createClaudeSessionService } from './services/claude-session-service.js';
 import { createLaunchPresetService } from './services/launch-preset-service.js';
 import { applyDeniedMcpServers, applyPluginMcpAvailability, discoverMcpStates, mcpStatesToDeniedServers, resolveDeniedMcpServers } from './services/mcp-service.js';
 import { createClaudeLoginService } from './services/claude-login-service.js';
@@ -35,7 +39,9 @@ const globalRoot = resolveGlobalRoot(context.homeDir);
 const presetService = createPresetService(globalRoot);
 const settingsSourceService = createSettingsSourceService(context);
 const globalLastSettingsService = createGlobalLastSettingsService(context.homeDir);
+const ccspConfigService = createCcspConfigService(globalRoot);
 const launchPresetService = createLaunchPresetService(context.cwd);
+const claudeSessionService = createClaudeSessionService(context.homeDir, context.cwd);
 const claudeLoginService = createClaudeLoginService(context);
 async function buildClaudeOfficialPresetItem() {
     if (!(await claudeLoginService.isLoggedIn()))
@@ -67,6 +73,13 @@ export function createProgram() {
         }
         await manageInteractive();
     });
+    program
+        .command('config')
+        .description('Configure ccsp preferences')
+        .action(async () => {
+        printBanner();
+        await configInteractive();
+    });
     return program;
 }
 function stripAnsi(value) {
@@ -171,11 +184,27 @@ async function renderCreateApp() {
     await waitForInkAppExit(app, createNode, process.stdout, state, onShortcut);
     return result;
 }
-async function renderSettingsSelectApp(items, initialName) {
+async function configInteractive() {
+    const initialConfig = await ccspConfigService.read();
+    const createNode = () => h(ConfigApp, {
+        initialConfig,
+        onChange: (config) => {
+            void ccspConfigService.write(config);
+        }
+    });
+    const state = { resizeVersion: 0 };
+    let app;
+    const onShortcut = (input, key) => {
+        createGlobalShortcutHandler(app, createNode, process.stdout, state, onShortcut)(input, key);
+    };
+    app = render(wrapInkNode(createNode, state.resizeVersion, onShortcut));
+    await waitForInkAppExit(app, createNode, process.stdout, state, onShortcut);
+}
+async function renderSettingsSelectApp(items, options = {}) {
     let result;
     const createNode = () => h(SettingsSelectApp, {
         items,
-        ...(initialName ? { initialName } : {}),
+        ...options,
         onSubmit: (value) => {
             result = value;
         }
@@ -212,13 +241,18 @@ async function resolveProjectManageBaseSettings() {
         temporary: true
     };
 }
-async function resolveInteractiveBaseSettings() {
+async function resolveInteractiveBaseSettings(config) {
     const officialItem = await buildClaudeOfficialPresetItem();
     const presetItems = [...(officialItem ? [officialItem] : []), ...(await buildGlobalSettingsPresetItems())];
     if (presetItems.length > 0) {
         const rememberedName = await globalLastSettingsService.readLastUsed(context.cwd);
         const initialName = rememberedName && presetItems.some(preset => preset.name === rememberedName) ? rememberedName : undefined;
-        const selected = await renderSettingsSelectApp(presetItems, initialName);
+        const { globalPresetEnvOnly, settingsDisplayFormat } = config ?? await ccspConfigService.read();
+        const selected = await renderSettingsSelectApp(presetItems, {
+            ...(initialName ? { initialName } : {}),
+            initialEnvOnly: globalPresetEnvOnly,
+            displayFormat: settingsDisplayFormat,
+        });
         if (selected)
             await globalLastSettingsService.writeLastUsed(context.cwd, selected.name);
         return selected;
@@ -364,10 +398,11 @@ function launchResultToSettings(result) {
         deniedMcpServers: mcpStatesToDeniedServers(result.toggles.mcps)
     };
 }
-async function renderManageApp(items) {
+async function renderManageApp(items, settingsDisplayFormat) {
     let result;
     const createNode = () => h(ManageApp, {
         items,
+        displayFormat: settingsDisplayFormat,
         onSubmit: (value) => {
             result = value;
         },
@@ -401,18 +436,36 @@ async function createPresetInteractive() {
     return presetService.createBasePreset(selection.name, settings);
 }
 async function launchClaudeWithFinalizedSettings(input) {
-    const launchDate = new Date();
+    const session = resolveSessionLaunch(input.args);
+    const stem = randomUUID();
     const claudeSources = await settingsSourceService.discoverSettingsSources();
+    const statusLineEnabled = input.statusLineEnabled ?? (await ccspConfigService.read()).statusLineEnabled;
     const settingsPath = await launchPresetService.writeTempSettings(await finalizeLaunchSettings(input.baseSettings, input.launchSettings, {
         globalName: input.globalName,
         projectPresetName: input.projectPresetName,
         toggles: input.toggles,
         context,
         claudeSources,
-        date: launchDate,
-    }), launchDate);
+        stem,
+        statusLineEnabled,
+    }), stem);
+    const bindingInput = {
+        globalName: input.globalName,
+        projectPresetName: input.projectPresetName,
+        baseSettings: input.baseSettings,
+        launchSettings: input.launchSettings,
+        toggles: input.toggles,
+    };
+    // When we already know the session id (explicit --session-id / --resume <uuid>),
+    // record the binding upfront so the config is recoverable even if Claude is
+    // killed before exit. Otherwise snapshot Claude's project dir and discover
+    // the id post-spawn by diffing.
+    const sessionSnapshot = session.sessionId ? undefined : await claudeSessionService.snapshot();
+    if (session.sessionId) {
+        await launchPresetService.writeSessionBinding({ sessionId: session.sessionId, ...bindingInput });
+    }
     try {
-        process.exitCode = await spawnClaude(settingsPath, input.args);
+        process.exitCode = await spawnClaude(settingsPath, session.args);
     }
     catch (error) {
         if (error instanceof CliError) {
@@ -421,10 +474,17 @@ async function launchClaudeWithFinalizedSettings(input) {
         throw error;
     }
     finally {
-        await launchPresetService.cleanupTempLaunchArtifacts(settingsPath);
+        await launchPresetService.cleanupTempScripts(stem);
+        const sessionId = session.sessionId ?? (sessionSnapshot && (await claudeSessionService.findNewSessionId(sessionSnapshot)));
+        if (sessionId) {
+            if (!session.sessionId) {
+                await launchPresetService.writeSessionBinding({ sessionId, ...bindingInput });
+            }
+            await launchPresetService.recordSessionExit(sessionId);
+        }
     }
 }
-async function launchWithSelectedSettings(selectedSettings, rawClaudeArgs) {
+async function launchWithSelectedSettings(selectedSettings, rawClaudeArgs, config) {
     const sanitized = sanitizeClaudeArgs(rawClaudeArgs);
     if (sanitized.removedSettings) {
         process.stderr.write('\x1b[31mWarning: ccsp ignores passthrough --settings because it manages that flag.\x1b[0m\n');
@@ -453,29 +513,96 @@ async function launchWithSelectedSettings(selectedSettings, rawClaudeArgs) {
         toggles: launchResult.toggles,
         launchSettings,
         args: sanitized.args,
+        ...(config ? { statusLineEnabled: config.statusLineEnabled } : {}),
     });
     return 'done';
 }
-async function runInteractive(rawClaudeArgs) {
+async function runInteractive(rawClaudeArgs, fallbackMode) {
     printBanner();
+    const config = await ccspConfigService.read();
     while (true) {
-        const selectedSettings = await resolveInteractiveBaseSettings();
+        const selectedSettings = await resolveInteractiveBaseSettings(config);
         if (!selectedSettings)
             return;
-        const outcome = await launchWithSelectedSettings(selectedSettings, rawClaudeArgs);
+        const launchArgs = fallbackMode === 'resume'
+            ? ['--resume', ...rawClaudeArgs]
+            : fallbackMode === 'continue'
+                ? rawClaudeArgs
+                : rawClaudeArgs;
+        const outcome = await launchWithSelectedSettings(selectedSettings, launchArgs, config);
         if (outcome !== 'back')
             return;
         printBanner();
     }
 }
+async function launchFromBinding(binding, extraArgs) {
+    const sanitized = sanitizeClaudeArgs(extraArgs);
+    if (sanitized.removedSettings) {
+        process.stderr.write('\x1b[31mWarning: ccsp ignores passthrough --settings because it manages that flag.\x1b[0m\n');
+    }
+    process.stderr.write(`\x1b[2mResuming ${binding.globalName}/${binding.projectPresetName} (session ${binding.sessionId})\x1b[0m\n`);
+    const filteredArgs = sanitized.args.filter((arg, index, args) => arg !== '--continue' &&
+        arg !== '-c' &&
+        !arg.startsWith('--continue=') &&
+        !arg.startsWith('--resume=') &&
+        arg !== '-r' &&
+        !(arg === '--resume') &&
+        !(arg === '--session-id') &&
+        !arg.startsWith('--session-id=') &&
+        !((args[index - 1] === '--resume' || args[index - 1] === '-r' || args[index - 1] === '--session-id') &&
+            !arg.startsWith('-')));
+    await launchClaudeWithFinalizedSettings({
+        baseSettings: binding.baseSettings,
+        globalName: binding.globalName,
+        projectPresetName: binding.projectPresetName,
+        toggles: binding.toggles,
+        launchSettings: binding.launchSettings,
+        args: ['--resume', binding.sessionId, ...filteredArgs],
+    });
+}
+async function resolveLiveBinding(binding) {
+    if (!binding)
+        return undefined;
+    if (await claudeSessionService.hasSession(binding.sessionId))
+        return binding;
+    process.stderr.write(`\x1b[2mDiscarding stale binding (no Claude session for ${binding.sessionId}).\x1b[0m\n`);
+    await launchPresetService.deleteSessionBinding(binding.sessionId);
+    return undefined;
+}
+async function runResume(sessionId, extraArgs) {
+    const binding = await resolveLiveBinding(await launchPresetService.readSessionBinding(sessionId));
+    if (binding) {
+        await launchFromBinding(binding, extraArgs);
+        return;
+    }
+    process.stderr.write(`\x1b[2mNo saved ccsp launch config for session ${sessionId}; pick a preset to resume with.\x1b[0m\n`);
+    await runInteractive([sessionId, ...extraArgs], 'resume');
+}
+async function runContinue(extraArgs) {
+    // Walk newest-exited bindings until one points at a live Claude session.
+    // resolveLiveBinding prunes stale entries, so each loop iteration makes progress.
+    while (true) {
+        const candidate = await launchPresetService.findLatestExitedSession();
+        if (!candidate)
+            break;
+        const live = await resolveLiveBinding(candidate);
+        if (live) {
+            await launchFromBinding(live, extraArgs);
+            return;
+        }
+    }
+    process.stderr.write('\x1b[2mNo saved ccsp session to continue; pick a preset.\x1b[0m\n');
+    await runInteractive(extraArgs);
+}
 async function manageInteractive() {
+    const config = await ccspConfigService.read();
     while (true) {
         const items = await buildGlobalSettingsPresetItems();
-        const selection = await renderManageApp(items);
+        const selection = await renderManageApp(items, config.settingsDisplayFormat);
         if (!selection || selection.type === 'exit')
             return;
         if (selection.type === 'launch') {
-            const outcome = await launchWithSelectedSettings(selection.item, []);
+            const outcome = await launchWithSelectedSettings(selection.item, [], config);
             if (outcome === 'back')
                 continue;
             return;
@@ -553,8 +680,49 @@ export async function main(argv = process.argv) {
         await runInteractive([]);
         return;
     }
+    if (args[0] === '--continue' || args[0] === '-c') {
+        await runContinue(args.slice(1));
+        return;
+    }
+    if (args[0] === '--resume' || args[0] === '-r') {
+        const id = args[1];
+        if (id && isUuid(id)) {
+            await runResume(id, args.slice(2));
+            return;
+        }
+        await runInteractive(args);
+        return;
+    }
+    if (args[0]?.startsWith('--resume=')) {
+        const id = args[0].slice('--resume='.length);
+        if (isUuid(id)) {
+            await runResume(id, args.slice(1));
+            return;
+        }
+        await runInteractive(args);
+        return;
+    }
     if (args[0] === 'claude') {
-        await runInteractive(args.slice(1));
+        const claudeArgs = args.slice(1);
+        if (claudeArgs[0] === '--continue' || claudeArgs[0] === '-c') {
+            await runContinue(claudeArgs.slice(1));
+            return;
+        }
+        if (claudeArgs[0] === '--resume' || claudeArgs[0] === '-r') {
+            const id = claudeArgs[1];
+            if (id && isUuid(id)) {
+                await runResume(id, claudeArgs.slice(2));
+                return;
+            }
+        }
+        if (claudeArgs[0]?.startsWith('--resume=')) {
+            const id = claudeArgs[0].slice('--resume='.length);
+            if (isUuid(id)) {
+                await runResume(id, claudeArgs.slice(1));
+                return;
+            }
+        }
+        await runInteractive(claudeArgs);
         return;
     }
     await createProgram().parseAsync(argv);