@armadra/agent 0.3.0 → 0.5.0

package/dist/cli/startup-screen.d.ts

@@ -6,10 +6,39 @@
  * - normal：标题行 + 模型 / 信任 / 已加载资源清单 / 警告数
  * - header：只有标题行（版本与按键提示）
  * - silent：不输出
+ *
+ * 交互模式（终端界面视觉设计 v1 §3.1）用结构化的 `startupInfo()` 自己排版（框 / 无框两态）；
+ * `buildStartupScreen` 的纯文本行保留给 line 模式与测试。
  */
+import type { PermissionMode } from "../permissions/types.js";
 import type { Runtime } from "./runtime.js";
 export type StartupScreenLevel = "normal" | "header" | "silent";
 export declare function startupScreenLevel(runtime: Pick<Runtime, "config">): StartupScreenLevel;
 export declare function headerLine(): string;
 export type StartupScreenRuntime = Pick<Runtime, "config" | "trust" | "resources" | "model" | "thinkingLevel" | "hooks" | "host" | "paths" | "warnings">;
 export declare function buildStartupScreen(runtime: StartupScreenRuntime, level?: StartupScreenLevel): string[];
+/** 交互模式启动头的结构化字段（§3.1）。 */
+export interface StartupInfo {
+    version: string;
+    /** `provider/id[@渠道]`。 */
+    model: string;
+    thinking: string;
+    /** 会话目录（家目录缩写为 `~`）。 */
+    cwd: string;
+    trusted: boolean;
+    /** 信任来源的短名（trust.json / 命令行 / 本次确认 / profile / 缺省）。 */
+    trustSource: string;
+    permissionMode: PermissionMode;
+    preset: string;
+    codemode: "off" | "on" | "only";
+    /** 上下文文件的文件名（外层在前）。 */
+    contextFiles: string[];
+    skills: number;
+    prompts: number;
+    hooks: number;
+    host?: string;
+    warnings: number;
+}
+/** 家目录前缀缩写为 `~`（`/` 与 `\` 两种分隔都认，余下部分原样保留）。 */
+export declare function tildePath(path: string, home: string | undefined): string;
+export declare function startupInfo(runtime: StartupScreenRuntime & Pick<Runtime, "session">, home?: string): StartupInfo;

package/dist/cli/startup-screen.js

@@ -6,7 +6,14 @@
  * - normal：标题行 + 模型 / 信任 / 已加载资源清单 / 警告数
  * - header：只有标题行（版本与按键提示）
  * - silent：不输出
+ *
+ * 交互模式（终端界面视觉设计 v1 §3.1）用结构化的 `startupInfo()` 自己排版（框 / 无框两态）；
+ * `buildStartupScreen` 的纯文本行保留给 line 模式与测试。
  */
+import { isBuiltinSkill } from "../skills/builtin.js";
+import { basename } from "node:path";
+import { formatModelRef } from "../ai/providers/channels.js";
+import { effectiveCodemodeMode } from "../tools/presets.js";
 import { AMA_VERSION } from "../version.js";
 export function startupScreenLevel(runtime) {
     return runtime.config.ui?.quietStartup ?? "normal";
@@ -39,8 +46,9 @@ export function buildStartupScreen(runtime, level = startupScreenLevel(runtime))
     if (resources.contextFiles.length > 0) {
         lines.push(`上下文：${resources.contextFiles.map((f) => f.path).join(", ")}`);
     }
-    if (resources.skills.length > 0) {
-        lines.push(`Skill：${resources.skills.map((s) => s.name).join(", ")}`);
+    const skills = resources.skills.filter((s) => !isBuiltinSkill(s));
+    if (skills.length > 0) {
+        lines.push(`Skill：${skills.map((s) => s.name).join(", ")}`);
     }
     if (resources.prompts.length > 0) {
         lines.push(`提示模板：${resources.prompts.map((p) => `/${p.name}`).join(" ")}`);
@@ -54,3 +62,44 @@ export function buildStartupScreen(runtime, level = startupScreenLevel(runtime))
         lines.push(`警告：${runtime.warnings.length} 条（ama doctor 查看）`);
     return lines;
 }
+const TRUST_SOURCE = {
+    flag: "命令行",
+    "trust-file": "trust.json",
+    prompt: "本次确认",
+    profile: "profile",
+    default: "缺省",
+};
+/** 家目录前缀缩写为 `~`（`/` 与 `\` 两种分隔都认，余下部分原样保留）。 */
+export function tildePath(path, home) {
+    if (home === undefined || home === "")
+        return path;
+    const trimmed = /[\\/]$/.test(home) ? home.slice(0, -1) : home;
+    if (path === trimmed)
+        return "~";
+    const next = path[trimmed.length];
+    return path.startsWith(trimmed) && (next === "/" || next === "\\")
+        ? `~${path.slice(trimmed.length)}`
+        : path;
+}
+export function startupInfo(runtime, home) {
+    const { resources } = runtime;
+    const info = {
+        version: AMA_VERSION,
+        model: formatModelRef(runtime.model),
+        thinking: runtime.thinkingLevel,
+        cwd: tildePath(runtime.paths.cwd, home),
+        trusted: runtime.trust.trusted,
+        trustSource: TRUST_SOURCE[runtime.trust.source],
+        permissionMode: runtime.session.state.permissionMode,
+        preset: runtime.config.tools?.preset ?? "default",
+        codemode: effectiveCodemodeMode(runtime.config),
+        contextFiles: resources.contextFiles.map((f) => basename(f.path)),
+        skills: resources.skills.filter((s) => !isBuiltinSkill(s)).length,
+        prompts: resources.prompts.length,
+        hooks: runtime.hooks.list().length,
+        warnings: runtime.warnings.length,
+    };
+    if (runtime.host !== undefined)
+        info.host = runtime.host.adapter.id;
+    return info;
+}

package/dist/cli/startup-steps.d.ts

@@ -26,7 +26,7 @@ export interface ModelChoice {
     provider: ProviderData;
 }
 /** 第 11 步：解析模型与 key。 */
-export declare function resolveModel(args: ParsedArgs, registry: ProviderRegistryApi, manager: SessionManagerApi, defaultModel: string | undefined, deps: RuntimeDeps, interactive: boolean): Promise<ModelChoice>;
+export declare function resolveModel(args: ParsedArgs, registry: ProviderRegistryApi, manager: SessionManagerApi, defaultModel: string | undefined, deps: RuntimeDeps, interactive: boolean, env?: Readonly<Record<string, string | undefined>>): Promise<ModelChoice>;
 export declare function thinkingOf(args: ParsedArgs, manager: SessionManagerApi, fallback: ModelThinkingLevel | undefined): ModelThinkingLevel;
 /** 第 12 步之后：`--tools` / `--exclude-tools`（宿主工具注册后再校验，宿主工具名也可用）。 */
 export declare function applyToolFilters(args: ParsedArgs, runtimeTools: Runtime["tools"]): void;

package/dist/cli/startup-steps.js

@@ -2,12 +2,14 @@
  * 启动序列的单步辅助（设计 §11.1）：错误映射、模式判定、profile 合并、会话请求、
  * 模型与思考级别解析、工具过滤、指令文件。[B5] 由 cli/bootstrap.ts 编排。
  */
+import { describeLookupFailure } from "../ai/providers/suggest.js";
 import { formatModelRef } from "../ai/providers/channels.js";
 import { statSync } from "node:fs";
 import { isAbsolute, resolve } from "node:path";
 import { AmaError, StartupError, isAmaError } from "../errors.js";
 import { UsageError } from "./args.js";
-import { pickDefaultModel } from "./default-model.js";
+import { noModelGuidance, pickDefaultModel } from "./default-model.js";
+import { hideFakeProvider } from "./fake-visibility.js";
 import { ExitCode } from "./exit-codes.js";
 /** 把非 StartupError 包成指定退出码；StartupError / UsageError 原样透传。 */
 export async function step(exitCode, label, fn) {
@@ -43,7 +45,9 @@ export function toStartupError(error, exitCode, label) {
 }
 /** 第 4 步。 */
 export function decideMode(args, io) {
-    if (args.mode === "rpc")
+    // [W5-EG] --mode acp 与 rpc 同一装配（宿主看到的 mode 也是 rpc）；ACP 服务端由调用方
+    // （runCli 或 SDK 自己的 runAcpMode）接在 Runtime 上
+    if (args.mode === "rpc" || args.mode === "acp")
         return "rpc";
     if (args.print)
         return "print";
@@ -64,9 +68,15 @@ export function applyProfile(args, profile) {
         merged.trust = true;
     merged.instructions = [...profile.instructions, ...args.instructions];
     merged.skillDirs = [...args.skillDirs, ...profile.skillDirs];
+    // [W5-C0] 子 Agent 目录：--agent-dir 在前、profile agentDirs 在后（W5-G 接入发现）
+    const agentDirs = [...(args.agentDirs ?? []), ...(profile.agentDirs ?? [])];
+    if (agentDirs.length > 0)
+        merged.agentDirs = agentDirs;
     return merged;
 }
 export function sessionRequestOf(args) {
+    if (args.noSession)
+        return { kind: "memory" };
     if (args.continue)
         return { kind: "continue" };
     if (args.resume)
@@ -80,7 +90,7 @@ export function sessionRequestOf(args) {
 export function sourceOf(request, manager) {
     if (request.kind === "fork")
         return "fork";
-    if (request.kind === "new")
+    if (request.kind === "new" || request.kind === "memory")
         return "startup";
     return manager.entries().length > 0 ? "resume" : "startup";
 }
@@ -94,7 +104,7 @@ export function lastEntry(manager, predicate) {
     return undefined;
 }
 /** 第 11 步：解析模型与 key。 */
-export async function resolveModel(args, registry, manager, defaultModel, deps, interactive) {
+export async function resolveModel(args, registry, manager, defaultModel, deps, interactive, env = {}) {
     if (args.provider !== undefined && args.model === undefined) {
         throw new UsageError(`--provider ${args.provider} 需要同时给出 --model（不回退到该供应商的缺省模型）`);
     }
@@ -102,13 +112,8 @@ export async function resolveModel(args, registry, manager, defaultModel, deps,
         const found = registry.findModel(ref);
         if (found.ok)
             return { model: found.model, provider: found.provider };
-        const hint = found.candidates.length > 0 ? `；候选：${found.candidates.slice(0, 20).join(", ")}` : "";
-        const what = found.reason === "provider_not_found"
-            ? "供应商不存在"
-            : found.reason === "ambiguous"
-                ? "模型名有歧义"
-                : "模型不存在";
-        throw new StartupError("model_not_found", `${label}${what}：${ref}${hint}`, ExitCode.NoModel);
+        const code = found.reason === "provider_not_found" ? "provider_not_found" : "model_not_found";
+        throw new StartupError(code, `${label}${describeLookupFailure(ref, found)}`, ExitCode.NoModel);
     };
     let choice;
     if (args.model !== undefined) {
@@ -137,13 +142,16 @@ export async function resolveModel(args, registry, manager, defaultModel, deps,
         }
     }
     const pick = async (reason) => {
-        const picked = interactive ? await deps.ui?.pickModel?.(registry, reason) : undefined;
+        // 选择器不列测试供应商 fake（AMA_SHOW_FAKE=1 或 AMA_FAKE_SCRIPT 时照列）
+        const picked = interactive
+            ? await deps.ui?.pickModel?.(hideFakeProvider(registry, env), reason)
+            : undefined;
         if (picked === undefined)
             throw new StartupError("no_api_key", reason, ExitCode.NoModel);
         return lookup(picked, "");
     };
     if (choice === undefined) {
-        return pick("没有可用模型：用 `ama auth set <provider>` 保存 key，或设置对应环境变量，或 --model 指定");
+        return pick(noModelGuidance(registry));
     }
     if (choice.provider.requiresApiKey) {
         const key = await registry.resolveApiKey(choice.provider.id);

package/dist/cli/subcommands/config.d.ts

@@ -3,16 +3,20 @@
  * 每一项标出来自哪一层（default / user / profile / project），并给出将使用的模型与原因
  * （`config.defaultModel` 或零配置选择）。只读；config 里的字面量 apiKey 只显示种类。[B6]
  *
+ * 缺省值来自 config/key-docs.ts 的 DISPLAY_DEFAULTS（含 DEFAULT_CONFIG 不写的 cache / codemode 等段），
+ * `codemode.mode` 不写时显示跟随预设的结果与原因；`--tools-preset` / `--codemode` 作为 cli 层叠加；
+ * 预设写的是旧名（codemode）时显示规范名并提示。
+ *
  * [W3-B12] 「供应商」节：config 里出现的供应商与 baseUrl 来自环境变量（`OPENAI_BASE_URL` /
  * `ANTHROPIC_BASE_URL`）的内置供应商，列出协议、生效 baseUrl 与来源、config 里每个模型的协议
  * （模型级 `api` 生效后的值）。
  */
-import type { AmaConfig } from "../../config/types.js";
+import { type AmaConfig, type CodemodeMode } from "../../config/types.js";
 import type { Api, ProviderRegistryApi } from "../../ai/types.js";
 import type { CliIo, RuntimeDeps } from "../deps.js";
-export declare const CONFIG_USAGE = "\u7528\u6CD5\uFF1Aama config show [--json] [--profile <\u6587\u4EF6>] [--auth-file <\u6587\u4EF6>]\n      ama config path    \u914D\u7F6E\u76EE\u5F55\u3001\u6570\u636E\u76EE\u5F55\u4E0E\u5404\u6587\u4EF6\u8DEF\u5F84\n      ama config edit    \u7528 $VISUAL / $EDITOR \u6253\u5F00 config.json\uFF08\u6CA1\u6709\u7F16\u8F91\u5668\u65F6\u6253\u5370\u8DEF\u5F84\uFF09\n";
+export declare const CONFIG_USAGE = "\u7528\u6CD5\uFF1Aama config show [--json] [--profile <\u6587\u4EF6>] [--auth-file <\u6587\u4EF6>]\n                        [--tools-preset <\u540D>] [--codemode off|on|only]\n      ama config path    \u914D\u7F6E\u76EE\u5F55\u3001\u6570\u636E\u76EE\u5F55\u4E0E\u5404\u6587\u4EF6\u8DEF\u5F84\n      ama config edit    \u7528 $VISUAL / $EDITOR \u6253\u5F00 config.json\uFF08\u6CA1\u6709\u7F16\u8F91\u5668\u65F6\u6253\u5370\u8DEF\u5F84\uFF09\n";
 type Layer = {
-    name: "default" | "user" | "profile" | "project";
+    name: "default" | "user" | "profile" | "project" | "cli";
     label: string;
     value: unknown;
 };
@@ -49,5 +53,20 @@ export interface ProviderDescription {
 export declare function describeProviders(config: AmaConfig, registry: ProviderRegistryApi | undefined): ProviderDescription[];
 /** 每个生效叶子的来源：累加型列表列出所有贡献层，其余取最后设置它的层。 */
 export declare function sourcesOf(effective: AmaConfig, layers: readonly Layer[]): Map<string, string>;
+export interface CodemodeDescription {
+    mode: CodemodeMode;
+    /** config：显式 codemode.mode；preset：跟随预设。 */
+    source: "config" | "preset";
+    /** 人读原因。 */
+    reason: string;
+    strict: boolean;
+    /** 生效模式不是 off 但 codemode 工具不可用（requireStrict）时的说明。 */
+    unavailable?: string;
+}
+/**
+ * codemode 生效模式与原因（跟随预设时写明预设与网络由谁隔离）。传 `nodeVersion` 是假设性计算（不探测
+ * 操作系统沙箱）；不传按配置的 `sandbox.enabled` 用运行时能力。
+ */
+export declare function describeCodemode(config: AmaConfig, nodeVersion?: string): CodemodeDescription;
 export declare function runConfig(argv: readonly string[], io: CliIo, deps: Pick<RuntimeDeps, "providers"> | undefined): Promise<number>;
 export {};

package/dist/cli/subcommands/config.js

@@ -3,13 +3,18 @@
  * 每一项标出来自哪一层（default / user / profile / project），并给出将使用的模型与原因
  * （`config.defaultModel` 或零配置选择）。只读；config 里的字面量 apiKey 只显示种类。[B6]
  *
+ * 缺省值来自 config/key-docs.ts 的 DISPLAY_DEFAULTS（含 DEFAULT_CONFIG 不写的 cache / codemode 等段），
+ * `codemode.mode` 不写时显示跟随预设的结果与原因；`--tools-preset` / `--codemode` 作为 cli 层叠加；
+ * 预设写的是旧名（codemode）时显示规范名并提示。
+ *
  * [W3-B12] 「供应商」节：config 里出现的供应商与 baseUrl 来自环境变量（`OPENAI_BASE_URL` /
  * `ANTHROPIC_BASE_URL`）的内置供应商，列出协议、生效 baseUrl 与来源、config 里每个模型的协议
  * （模型级 `api` 生效后的值）。
  */
 import { metadataOf, modelFlags, sourcesLine } from "./model-meta.js";
 import { loadConfigFile } from "../../config/load.js";
-import { DEFAULT_CONFIG, PROFILE_DEFAULTS, mergeProjectAndCli } from "../../config/merge.js";
+import { PROFILE_DEFAULTS, cliOverridesToConfig, mergeConfig, mergeProjectAndCli, } from "../../config/merge.js";
+import { DISPLAY_DEFAULTS } from "../../config/key-docs.js";
 import { AUTH_FILE, CONFIG_FILE, HOOKS_FILE, projectFile, resolveConfigDir, resolveDataDir, } from "../../config/paths.js";
 import { spawnSync } from "node:child_process";
 import { existsSync } from "node:fs";
@@ -17,15 +22,20 @@ import { join } from "node:path";
 import { modelsDevCachePath } from "../../ai/providers/models-dev-cache.js";
 import { initConfigDir } from "../../config/init.js";
 import { CONFIG_SCHEMA_FILE } from "../../config/json-schema.js";
+import { CODEMODE_MODES, TOOLS_PRESET_ALIASES, TOOLS_PRESET_INPUTS, canonicalPreset, } from "../../config/types.js";
+import { codemodeAvailability, detectSandboxCapability, sandboxCapabilityFor, } from "../../codemode/capability.js";
 import { baseUrlEnvOf } from "../../ai/providers/registry.js";
 import { classifyKeyValue } from "../../config/auth-file.js";
-import { effectiveCodemodeMode, resolvePreset } from "../../tools/presets.js";
+import { CODEMODE_TOOL, resolveCodemodeMode, resolvePreset } from "../../tools/presets.js";
 import { builtinTools } from "../../tools/registry.js";
 import { parseSubArgs, UsageError } from "../args.js";
-import { pickDefaultModel } from "../default-model.js";
+import { noModelGuidance, pickDefaultModel } from "../default-model.js";
 import { ExitCode } from "../exit-codes.js";
 import { buildRegistry, loadUserLevel } from "./context.js";
+import { osSandboxStatus } from "../../sandbox/detect.js";
+import { resolveBashSandbox } from "../../sandbox/bash.js";
 export const CONFIG_USAGE = `用法：ama config show [--json] [--profile <文件>] [--auth-file <文件>]
+                        [--tools-preset <名>] [--codemode off|on|only]
       ama config path    配置目录、数据目录与各文件路径
       ama config edit    用 $VISUAL / $EDITOR 打开 config.json（没有编辑器时打印路径）
 `;
@@ -105,13 +115,16 @@ export async function describeModel(config, registry) {
         return { ref: undefined, reason: "注册表未装配" };
     const picked = await pickDefaultModel(registry);
     if (picked === undefined)
-        return { ref: undefined, reason: "没有可用模型：ama auth set <provider> 或设置对应环境变量" };
+        return { ref: undefined, reason: noModelGuidance(registry) };
     const ref = `${picked.provider.id}/${picked.model.id}`;
     if (picked.via === "local")
-        return { ref, reason: `零配置：本地 ${picked.provider.id} 可达` };
+        return { ref, reason: `零配置：本地 ${picked.provider.id} 可达；${picked.rule}` };
     const key = await registry.resolveApiKey(picked.provider.id);
     const origin = key.origin !== undefined ? ` ${key.origin}` : "";
-    return { ref, reason: `零配置：${picked.provider.id} 有 key（${key.source}${origin}）` };
+    return {
+        ref,
+        reason: `零配置：${picked.provider.id} 有 key（${key.source}${origin}）；${picked.rule}`,
+    };
 }
 /** config 里出现的供应商 + baseUrl 来自环境变量的内置供应商。 */
 export function describeProviders(config, registry) {
@@ -171,8 +184,8 @@ function providerLines(providers) {
     }
     return lines;
 }
-function layersOf(level, project, effective) {
-    const layers = [{ name: "default", label: "内置缺省", value: DEFAULT_CONFIG }];
+function layersOf(level, project, effective, cli) {
+    const layers = [{ name: "default", label: "内置缺省", value: DISPLAY_DEFAULTS }];
     const user = loadConfigFile("config", level.userConfigPath)?.value;
     if (user !== undefined)
         layers.push({ name: "user", label: level.userConfigPath, value: user });
@@ -195,6 +208,8 @@ function layersOf(level, project, effective) {
         }
         layers.push({ name: "project", label: ".ama/config.json", value: unflatten(accepted) });
     }
+    if (cli !== undefined && Object.keys(cli).length > 0)
+        layers.push({ name: "cli", label: "命令行", value: cli });
     return layers;
 }
 function unflatten(flat) {
@@ -221,8 +236,53 @@ export function sourcesOf(effective, layers) {
     }
     return sources;
 }
+/**
+ * codemode 生效模式与原因（跟随预设时写明预设与网络由谁隔离）。传 `nodeVersion` 是假设性计算（不探测
+ * 操作系统沙箱）；不传按配置的 `sandbox.enabled` 用运行时能力。
+ */
+export function describeCodemode(config, nodeVersion) {
+    const capability = nodeVersion === undefined ? sandboxCapabilityFor(config) : detectSandboxCapability(nodeVersion);
+    const resolved = resolveCodemodeMode(config, capability.strict);
+    const sandbox = capability.nodeMajor >= 25
+        ? `Node ${capability.nodeMajor} 网络已隔离`
+        : capability.strict
+            ? `Node ${capability.nodeMajor} 网络由操作系统沙箱 ${capability.os.kind} 隔离`
+            : `Node ${capability.nodeMajor} < 25 网络未隔离`;
+    const reason = resolved.source === "config"
+        ? `codemode.mode 显式设置（${sandbox}）`
+        : `跟随预设 ${resolved.preset}（${sandbox}）`;
+    const out = {
+        mode: resolved.mode,
+        source: resolved.source,
+        reason,
+        strict: capability.strict,
+    };
+    if (resolved.mode !== "off") {
+        const availability = codemodeAvailability(config.codemode?.requireStrict, capability);
+        if (!availability.available)
+            out.unavailable = availability.warning;
+    }
+    return out;
+}
+/** 各层里把 tools.preset 写成旧名（别名）的：`user（写的是旧名 codemode）`。 */
+function presetAliasNotes(layers) {
+    const notes = [];
+    for (const layer of layers) {
+        const preset = layer.value?.tools?.preset;
+        if (preset !== undefined && Object.hasOwn(TOOLS_PRESET_ALIASES, preset))
+            notes.push(`${layer.name}（${layer.label}）的 tools.preset 写的是旧名 ${preset}，规范名 ${canonicalPreset(preset)}`);
+    }
+    return notes;
+}
+function choice(name, value, all) {
+    if (value === undefined)
+        return undefined;
+    if (all.includes(value))
+        return value;
+    throw new UsageError(`--${name} 的取值应为 ${all.join(" | ")}（收到 ${value}）`);
+}
 export async function runConfig(argv, io, deps) {
-    const { positionals, values, flags } = parseSubArgs(argv, ["profile", "auth-file"], ["json"]);
+    const { positionals, values, flags } = parseSubArgs(argv, ["profile", "auth-file", "tools-preset", "codemode"], ["json"]);
     const action = positionals[0] ?? "show";
     if (flags.has("help")) {
         io.stdout(CONFIG_USAGE);
@@ -234,42 +294,80 @@ export async function runConfig(argv, io, deps) {
         return editConfig(io);
     if (action !== "show")
         throw new UsageError(`未知的 config 子命令：${action}`);
+    const cli = {};
+    const presetFlag = choice("tools-preset", values.get("tools-preset"), TOOLS_PRESET_INPUTS);
+    if (presetFlag !== undefined)
+        cli.toolsPreset = presetFlag;
+    const codemodeFlag = choice("codemode", values.get("codemode"), CODEMODE_MODES);
+    if (codemodeFlag !== undefined)
+        cli.codemode = codemodeFlag;
     const level = loadUserLevel(io, {
         profile: values.get("profile"),
         authFile: values.get("auth-file"),
     });
     const project = loadConfigFile("config", projectFile(io.cwd, CONFIG_FILE))?.value;
-    const merged = mergeProjectAndCli(level.merged, project, undefined);
+    const merged = mergeProjectAndCli(level.merged, project, cli);
     const config = merged.config;
-    const layers = layersOf(level, project, config);
-    const sources = sourcesOf(config, layers);
+    const layers = layersOf(level, project, config, cliOverridesToConfig(cli));
+    // 展示：生效配置补上 DEFAULT_CONFIG 不写的缺省（cache、codemode.inlineBudget 等），来源 default
+    const shown = mergeConfig(DISPLAY_DEFAULTS, config);
+    const sources = sourcesOf(shown, layers);
     const registry = deps === undefined ? undefined : await buildRegistry(level, io, deps);
     const model = await describeModel(config, registry);
     const providers = describeProviders(config, registry);
+    const codemode = describeCodemode(config);
+    const bashSandbox = resolveBashSandbox(config.sandbox, {
+        status: osSandboxStatus(config.sandbox?.enabled ?? "auto"),
+    });
     const builtin = new Set(builtinTools().map((tool) => tool.name));
-    const preset = resolvePreset({ config, available: (name) => builtin.has(name) });
+    if (codemode.mode !== "off" && codemode.unavailable === undefined)
+        builtin.add(CODEMODE_TOOL);
+    const preset = resolvePreset({
+        config,
+        available: (name) => builtin.has(name),
+        strict: codemode.strict,
+    });
+    const notes = presetAliasNotes(layers);
     const warnings = [...level.warnings, ...merged.warnings];
+    const rows = [...flatten(shown)].map(([path, value]) => ({
+        path,
+        value,
+        source: sources.get(path) ?? "default",
+    }));
+    if (config.codemode?.mode === undefined)
+        rows.push({
+            path: "codemode.mode",
+            value: codemode.mode,
+            source: `default（${codemode.reason}）`,
+        });
+    rows.sort((a, b) => (a.path < b.path ? -1 : a.path > b.path ? 1 : 0));
     if (flags.has("json")) {
-        const entries = [...flatten(config)].map(([path, value]) => ({
+        const entries = rows.map(({ path, value, source }) => ({
             path,
             value: path.endsWith(".apiKey") ? display(path, value) : value,
-            source: sources.get(path),
+            source,
         }));
-        io.stdout(`${JSON.stringify({ model, providers, tools: preset.builtin, codemode: effectiveCodemodeMode(config), entries, layers: layers.map((l) => ({ name: l.name, file: l.label })), warnings }, null, 2)}\n`);
+        io.stdout(`${JSON.stringify({ model, providers, tools: preset.builtin, preset: preset.preset, codemode, bashSandbox: { active: bashSandbox.active, detail: bashSandbox.detail }, entries, layers: layers.map((l) => ({ name: l.name, file: l.label })), notes, warnings }, null, 2)}\n`);
         return ExitCode.Ok;
     }
-    const lines = ["生效配置（来源：default 内置 ← user ← profile ← project 只能收紧）"];
+    const lines = ["生效配置（来源：default 内置 ← user ← profile ← project 只能收紧 ← cli）"];
     for (const layer of layers.slice(1))
         lines.push(`  ${layer.name}：${layer.label}`);
     lines.push("");
-    const rows = [...flatten(config)].map(([path, value]) => [`${path} = ${display(path, value)}`, sources.get(path) ?? "default"]);
-    const width = Math.min(60, Math.max(...rows.map(([text]) => text.length)));
-    for (const [text, source] of rows)
-        lines.push(`  ${text.padEnd(width)}  ${source}`);
+    const texts = rows.map((row) => [`${row.path} = ${display(row.path, row.value)}`, row.source]);
+    const width = Math.min(60, Math.max(...texts.map(([text]) => (text ?? "").length)));
+    for (const [text, source] of texts)
+        lines.push(`  ${(text ?? "").padEnd(width)}  ${source}`);
     lines.push(...providerLines(providers));
     lines.push("");
     lines.push(`模型：${model.ref ?? "（无）"}  ${model.reason}`);
     lines.push(`工具：${preset.builtin.join(", ")}（预设 ${preset.preset}，codemode ${preset.codemode}）`);
+    lines.push(`codemode：${codemode.mode}  ${codemode.reason}`);
+    if (codemode.unavailable !== undefined)
+        lines.push(`  ${codemode.unavailable}`);
+    lines.push(`bash 沙箱：${bashSandbox.detail}`);
+    for (const note of notes)
+        lines.push(`提示：${note}`);
     for (const warning of [...warnings, ...preset.warnings])
         lines.push(`警告：${warning}`);
     io.stdout(`${lines.join("\n")}\n`);

package/dist/cli/subcommands/context.js

@@ -7,6 +7,7 @@ import { loadConfigFile } from "../../config/load.js";
 import { mergeBaseLayers } from "../../config/merge.js";
 import { CONFIG_FILE, resolveConfigDir, resolveDataDir, userFile } from "../../config/paths.js";
 import { loadProfile } from "../../config/profile.js";
+import { hideFakeProvider } from "../fake-visibility.js";
 export function loadUserLevel(io, options = {}) {
     const configDir = resolveConfigDir({ env: io.env });
     const dataDir = resolveDataDir({ env: io.env });
@@ -32,11 +33,13 @@ export function loadUserLevel(io, options = {}) {
     return result;
 }
 export async function buildRegistry(level, io, deps) {
-    return deps.providers.create({
+    // 列表类子命令（doctor / models list / providers list / config show）缺省不列 fake
+    const registry = await deps.providers.create({
         config: level.merged.config,
         cwd: io.cwd,
         authFile: level.authFile,
         authEnv: level.profile?.authEnv ?? true,
         dataDir: level.dataDir,
     });
+    return hideFakeProvider(registry, io.env);
 }

package/dist/cli/subcommands/doctor.js

@@ -7,6 +7,9 @@
  * [W3-B12] baseUrl 来自 `OPENAI_BASE_URL` / `ANTHROPIC_BASE_URL` 时在 key 行后标出变量与地址。
  */
 import { existsSync } from "node:fs";
+import { blobUsage, fileHistoryDir } from "../../checkpoints/blobs.js";
+import { shadowUsage } from "../../checkpoints/shadow-git.js";
+import { formatBytes } from "../../checkpoints/gc.js";
 import { baseUrlEnvOf } from "../../ai/providers/registry.js";
 import { classifyKeyValue, isModeTooOpen, fileMode, readAuthFile } from "../../config/auth-file.js";
 import { findContextFiles } from "../../config/context-files.js";
@@ -15,10 +18,13 @@ import { mergeProjectAndCli } from "../../config/merge.js";
 import { CONFIG_FILE, HOOKS_FILE, projectFile, userFile } from "../../config/paths.js";
 import { findTrustEntry, readTrustFile, trustGatedResources } from "../../config/trust.js";
 import { loadHookConfigs } from "../../hooks/config.js";
+import { osSandboxStatus } from "../../sandbox/detect.js";
+import { resolveBashSandbox } from "../../sandbox/bash.js";
 import { AMA_VERSION } from "../../version.js";
 import { parseSubArgs } from "../args.js";
 import { ExitCode } from "../exit-codes.js";
-import { describeModel } from "./config.js";
+import { describeProxy, inspectProxy } from "../proxy.js";
+import { describeCodemode, describeModel } from "./config.js";
 import { buildRegistry, loadUserLevel } from "./context.js";
 export const DOCTOR_USAGE = `用法：ama doctor [--profile <文件>] [--auth-file <文件>] [--trust | --no-trust]
 `;
@@ -184,6 +190,23 @@ function terminalSection(report, io) {
     const tui = io.stdinIsTTY && io.stdoutIsTTY && env["TERM"] !== "dumb";
     report.item(`缺省界面：${tui ? "终端界面" : "行式（--no-tui 等价）"}`);
 }
+function proxySection(report, io) {
+    report.section("代理");
+    for (const line of describeProxy(inspectProxy(io.env)))
+        report.item(line);
+}
+/** 检查点备份占用（docs/rewind-plan.md §1.4）。 */
+async function fileHistoryLine(report, dataDir) {
+    try {
+        const usage = await blobUsage(dataDir);
+        const shadow = await shadowUsage(dataDir);
+        const shadowText = shadow.repos === 0 ? "" : `；影子仓库 ${shadow.repos} 个，${formatBytes(shadow.bytes)}`;
+        report.item(`file-history：${usage.blobs} 个备份，${formatBytes(usage.bytes)}${shadowText}（${fileHistoryDir(dataDir)}；ama sessions prune 清理）`);
+    }
+    catch (error) {
+        report.item(`file-history：读取失败（${error.message}）`);
+    }
+}
 export async function runDoctor(argv, io, deps) {
     const { values, flags } = parseSubArgs(argv, ["profile", "auth-file"], ["trust", "no-trust"]);
     if (flags.has("help")) {
@@ -207,6 +230,7 @@ export async function runDoctor(argv, io, deps) {
     report.section("目录");
     report.item(`配置目录：${level.configDir}`);
     report.item(`数据目录：${level.dataDir}${existsSync(level.dataDir) ? "" : "（尚未创建）"}`);
+    await fileHistoryLine(report, level.dataDir);
     report.section("配置层级（缺省 ← 用户级 ← profile ← 项目级（只能收紧）← 命令行）");
     report.item("缺省：内置");
     probeLine(report, "用户级", "config", level.userConfigPath);
@@ -223,6 +247,13 @@ export async function runDoctor(argv, io, deps) {
         for (const warning of merged.warnings)
             report.item(`  收紧：${warning}`);
         report.item(`有效权限模式：${merged.config.permission?.mode ?? "default"}`);
+        const codemode = describeCodemode(merged.config);
+        report.item(`codemode：${codemode.mode}（${codemode.reason}）`);
+        if (codemode.unavailable !== undefined)
+            report.item(`  ${codemode.unavailable}`);
+        const os = osSandboxStatus(merged.config.sandbox?.enabled ?? "auto");
+        report.item(`操作系统沙箱：${os.kind === "none" ? "无" : os.kind}（${os.detail}${os.kind !== "none" && !os.restrictsWrites ? "；只隔离网络" : ""}）`);
+        report.item(`bash 沙箱：${resolveBashSandbox(merged.config.sandbox, { status: os }).detail}`);
     }
     catch {
         // probeLine 已报告
@@ -240,6 +271,7 @@ export async function runDoctor(argv, io, deps) {
     await keySection(report, io, level, deps);
     hookSection(report, io, level, trusted);
     report.item(`用户级 hooks.json：${userFile(level, HOOKS_FILE)}`);
+    proxySection(report, io);
     terminalSection(report, io);
     io.stdout(report.text());
     return report.problems > 0 ? ExitCode.Config : ExitCode.Ok;

package/dist/cli/subcommands/init.js

@@ -1,7 +1,7 @@
 /**
  * `ama init [--force]`（docs/providers.md「配置目录」）：建配置目录与缺省文件，逐个报告状态。
  */
-import { describeInit, initConfigDir } from "../../config/init.js";
+import { INIT_NEXT_STEPS, describeInit, initConfigDir } from "../../config/init.js";
 import { resolveConfigDir } from "../../config/paths.js";
 import { parseSubArgs, UsageError } from "../args.js";
 import { ExitCode } from "../exit-codes.js";
@@ -18,5 +18,6 @@ export function runInit(argv, io) {
         throw new UsageError(`多余的参数：${positionals.join(" ")}`);
     const result = initConfigDir(resolveConfigDir({ env: io.env }), { force: flags.has("force") });
     io.stdout(describeInit(result));
+    io.stdout(`\n${INIT_NEXT_STEPS.join("\n")}\n`);
     return ExitCode.Ok;
 }