nexforge-cli 0.2.15__tar.gz → 0.2.16__tar.gz

{nexforge_cli-0.2.15 → nexforge_cli-0.2.16}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.5
 Name: nexforge-cli
-Version: 0.2.15
+Version: 0.2.16
 Summary: NexForgeCLI — 一个面向 DeepSeek V4 的终端智能体(TUI + CLI 双模式)
 Project-URL: Homepage, https://gitee.com/Lighthorn/nexforgecli
 Author: NexForge
@@ -51,7 +51,7 @@ Description-Content-Type: text/markdown
 
 NexForgeCLI 是一个运行在终端里的智能体助手，既支持 DeepSeek/千问等多模型，也是**插件宿主**（plugins 目录即插即用）。既能作为全屏 TUI 交互式对话/编码，也能作为 one-shot 命令行工具嵌进脚本和管道。
 
-> 当前版本:**v0.2.15** · PyPI: `pip install nexforge-cli`
+> 当前版本:**v0.2.16** · PyPI: `pip install nexforge-cli`
 
 ---
 

{nexforge_cli-0.2.15 → nexforge_cli-0.2.16}/README.md

@@ -8,7 +8,7 @@
 
 NexForgeCLI 是一个运行在终端里的智能体助手，既支持 DeepSeek/千问等多模型，也是**插件宿主**（plugins 目录即插即用）。既能作为全屏 TUI 交互式对话/编码，也能作为 one-shot 命令行工具嵌进脚本和管道。
 
-> 当前版本:**v0.2.15** · PyPI: `pip install nexforge-cli`
+> 当前版本:**v0.2.16** · PyPI: `pip install nexforge-cli`
 
 ---
 

{nexforge_cli-0.2.15 → nexforge_cli-0.2.16}/manual/01-/345/256/211/350/243/205/344/270/216/351/205/215/347/275/256.md

@@ -1,6 +1,6 @@
 # 安装与配置
 
-> NexForgeCLI v0.2.15
+> NexForgeCLI v0.2.16
 
 ## 环境要求
 

{nexforge_cli-0.2.15 → nexforge_cli-0.2.16}/manual/03-/346/250/241/345/236/213/351/205/215/347/275/256.md

@@ -4,7 +4,7 @@ NexForgeCLI 支持多模型：
 
 | 模型 | 支持方式 | 说明 |
 |------|----------|------|
-| **DeepSeek V4** | 内置 | flash/pro 双档位 + auto 自动路由，无需额外配置 |
+| **DeepSeek V4** | 内置(models.toml 可扩展) | flash/pro/auto 档位开箱可用；也可在 models.toml 挂独立模型(如实验版) |
 | **千问(qianwen)** | 专用底座 | 思考链流式显示 / enable_thinking 开关 / 多模态贴图直发(与 DeepSeek 平级) |
 | **OpenAI 兼容** | models.toml | Kimi/GPT/通义千问/智谱等一切 OpenAI 兼容接口 |
 | **Anthropic** | models.toml | Claude 系列(需安装额外依赖) |
@@ -34,6 +34,19 @@ auto 模式下的升级触发条件：
 - 默认开启，实时显示 AI 的推理过程(可折叠面板)
 - `/think off` 关闭思考(速度更快、费用更低)
 
+**挂独立模型**：DeepSeek 的 flash/pro 是内置档位，若想使用内置档位之外的模型(如限时实验版 `deepseek-v4.1-flash-expires-on-0910`)，可在 `~/.nexforge/models.toml` 加一个 `type = "deepseek"` 的 provider：
+
+```toml
+[[provider]]
+name = "deepseek-exp"
+type = "deepseek"
+base_url = "https://api.deepseek.com"
+models = ["deepseek-v4.1-flash-expires-on-0910"]
+default_model = "deepseek-v4.1-flash-expires-on-0910"
+```
+
+provider 的模型解析优先级：显式 `/model <名>` > `default_model` > `models` 第一个 > 内置 flash/pro。未配置 api_key 时自动回退全局 Key(`auth.toml`)。重启后在 F6 侧边栏点选即可切换。
+
 ## 千问（qianwen 专用底座）
 
 千问AI平台(platform.qianwenai.com / 阿里云百炼)有专用 provider，深度匹配千问特性：

{nexforge_cli-0.2.15 → nexforge_cli-0.2.16}/manual/README.md

@@ -1,4 +1,4 @@
-# NexForgeCLI 用户手册 · v0.2.15
+# NexForgeCLI 用户手册 · v0.2.16
 
 ## 这是什么
 

{nexforge_cli-0.2.15 → nexforge_cli-0.2.16}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "hatchling.build"
 
 [project]
 name = "nexforge-cli"
-version = "0.2.15"
+version = "0.2.16"
 description = "NexForgeCLI — 一个面向 DeepSeek V4 的终端智能体(TUI + CLI 双模式)"
 readme = "README.md"
 requires-python = ">=3.11"

{nexforge_cli-0.2.15 → nexforge_cli-0.2.16}/src/nexforge/__init__.py

@@ -3,5 +3,5 @@
 TUI(全屏交互)+ CLI(one-shot / 管道)双模式。
 """
 
-__version__ = "0.2.15"
+__version__ = "0.2.16"
 __all__ = ["__version__"]

{nexforge_cli-0.2.15 → nexforge_cli-0.2.16}/src/nexforge/core/goal_manager.py

@@ -9,6 +9,13 @@ from datetime import datetime, timezone
 
 DEFAULT_MAX_ROUNDS = 100
 
+# 目标/计划注入总监与开发者上下文的截断上限(字符)。
+# 目标必须完整传递: 长目标下截断会丢失后半部分(任务边界/次要目标/灵活处理等),
+# 导致总监/开发者做出错误判断(历史 bug: [:200]/[:300] 截断致目标信息丢失)。
+# 计划是中间产物(总监会重新生成), 可适当截断以控制 token。
+GOAL_CTX_LIMIT = 4000
+PLAN_CTX_LIMIT = 2000
+
 DIRECTOR_PROMPT = """[总监模式]
 你是项目总监,负责对整个开发周期做全局把控、目标分解和质量评审。
 

{nexforge_cli-0.2.15 → nexforge_cli-0.2.16}/src/nexforge/features/mode_features.py

@@ -9,6 +9,7 @@ from nexforge.features.base import Feature
 from nexforge.config import save_config
 from nexforge.i18n import t
 from nexforge.core.context import get_project_root
+from nexforge.core.goal_manager import GOAL_CTX_LIMIT, PLAN_CTX_LIMIT
 from nexforge.core.memory_engine import MemoryEngine, _MARKER_OPS, _MARKER_GOAL, clear_messages_by_marker, has_marker
 
 if TYPE_CHECKING:
@@ -106,6 +107,7 @@ class GoalModeFeature:
         if gm.rounds_dir.exists():
             shutil.rmtree(gm.rounds_dir, ignore_errors=True)
         gm.rounds_dir.mkdir(parents=True, exist_ok=True)
+        self._stop_director = False  # 复位停止标志, 防残留导致恢复的循环立即退出
         self._turn_count = 1
         # 清理残留状态(防上次崩溃遗留 dev_done_flag 导致重复验收)
         self._dev_done_flag = False
@@ -246,14 +248,19 @@ class GoalModeFeature:
         from nexforge.core.goal_manager import GoalManager
         gm = GoalManager(get_project_root())
         goal = gm.read_goal()
-        gm.set_goal(goal + "\n\n[用户补充意见]\n" + feedback[:500])
+        gm.set_goal(goal + "\n\n[用户补充意见]\n" + feedback[:2000])
         self._awaiting_plan_confirm = False
         self._turn_count = 0  # 让重新规划回复再次作为 turn=1(方案轮)
         s._note(t("note.goal_plan_amended"), scroll=True)
+        # 修复: 用户反馈必须完整传给总监, 不能依赖 read_goal()[:300] 截断。
+        # 旧实现把反馈追加到 goal 文件末尾后, 仅取前 300 字符作为 prompt,
+        # 而反馈永远位于 300 字符之后 → 总监收不到修改意见
+        # (表现为"传输截断/未检测到新的修改意见正文")。
         s._run_agent(
             "[项目总监] 用户对初步方案提出了修改意见, 请结合意见重新规划方案。"
             "注意: 先输出规划方案, 不要发布执行指令, 等待用户确认后再动工。\n"
-            "目标:" + gm.read_goal()[:300]
+            "【原始目标】\n" + goal +
+            "\n\n【用户本次修改意见】\n" + feedback[:2000]
         )
 
     def _fed_members_prompt(self) -> str:
@@ -348,8 +355,8 @@ class GoalModeFeature:
         from nexforge.core.goal_manager import GoalManager
         s = self.screen
         gm = GoalManager(get_project_root())
-        goal = gm.read_goal()[:300]
-        plan = gm.read_plan()[:300]
+        goal = gm.read_goal()[:GOAL_CTX_LIMIT]
+        plan = gm.read_plan()[:PLAN_CTX_LIMIT]
         fed_members = self._fed_members_prompt()  # 联结体成员(跨项目编排)
         ctx = (
             "[项目总监] 首次目标分解。\n"
@@ -387,13 +394,13 @@ class GoalModeFeature:
         max_r = s.config.ui.max_rounds
         cycle_n = self._turn_count - 1
         report = (report or self._dev_report)[:2000]
-        goal = gm.read_goal()[:300]
-        plan = gm.read_plan()[:300]
+        goal = gm.read_goal()[:GOAL_CTX_LIMIT]
+        plan = gm.read_plan()[:PLAN_CTX_LIMIT]
         fed_members = self._fed_members_prompt()
         ctx = (
             "[项目总监复盘] 第" + str(cycle_n) + "/" + str(max_r) + "轮。\n"
             "目标:" + goal + "\n"
-            "计划:" + plan[:500] + "\n"
+            "计划:" + plan + "\n"
             "开发者报告:" + report + "\n\n"
             "请按审核框架复盘:\n"
             "1. 本轮完成了多少?(核心/重要/次要)\n"
@@ -435,7 +442,7 @@ class GoalModeFeature:
         from nexforge.core.goal_manager import GoalManager
         s = self.screen
         gm = GoalManager(get_project_root())
-        goal = gm.read_goal()[:300]
+        goal = gm.read_goal()[:GOAL_CTX_LIMIT]
         dev_status = "开发者正在执行中" if self._dev_busy else "开发者空闲, 等待下一任务"
         ctx = (
             "[项目总监] 用户在工作进行中与你沟通(下栏沟通区)。\n"
@@ -461,15 +468,15 @@ class GoalModeFeature:
         s = self.screen
         gm = GoalManager(get_project_root())
         max_r = s.config.ui.max_rounds
-        goal = gm.read_goal()[:300]
-        plan = gm.read_plan()[:300]
+        goal = gm.read_goal()[:GOAL_CTX_LIMIT]
+        plan = gm.read_plan()[:PLAN_CTX_LIMIT]
         s.call_later(s._mount, DirectorNote(
             t("note.dev_round", n=str(round_n), mx=str(max_r))
         ), dev=True)
         msg = (
             "[开发者] 第" + str(round_n) + "/" + str(max_r) + "轮。\n"
             "目标:" + goal + "\n"
-            "计划:" + plan[:500] + "\n"
+            "计划:" + plan + "\n"
             "总监指令:" + instruction[:2000] + "\n\n"
             "请按指令执行。完成后提交执行报告。"
             "若遇到不可逾越的障碍,在报告开头标注 [BLOCKED]。"
@@ -502,6 +509,35 @@ class GoalModeFeature:
             self._resume_director_loop()
         self._wake_event.set()
 
+    def reset_for_session_change(self) -> None:
+        """会话切换/新建时完整重置目标模式运行状态(不关闭 goal_mode 开关)。
+
+        目标文件(goal/plan/rounds)是项目级跨会话共享,但总监循环是内存态。
+        切换会话时旧循环被 cancel, 若运行状态(_turn_count/_dev_done_flag/
+        _stop_director 等)残留, 新会话输入会走错分支:
+        - _turn_count 残留 → 方案生成后 on_turn_done 跳过 turn=1 分支,
+          方案不落盘、不进入待确认, 总监循环无法启动
+        - 旧目标文件残留 → 新会话输入被误判为"旧目标插话"入队, 循环又没恢复
+        结果都表现为"AI 回复一段就停, 必须反复输入才能继续"。
+        这里清零运行状态 + 清理目标文件, 让切换后输入作为全新目标进入正常流程。
+        """
+        self._stop_director = False  # 关键: 复位停止标志, 否则恢复的循环立即退出
+        self._awaiting_plan_confirm = False
+        self._director_busy = False
+        self._turn_count = 0  # 关键: 复位轮次, 否则方案生成后 on_turn_done 走错分支
+        self._user_inbox.clear()
+        self._dev_busy = False
+        self._dev_done_flag = False
+        self._dev_report = ""
+        self._director_loop_task = None
+        self._wake_event.clear()
+        # 清理目标文件, 防旧目标残留被误判为插话
+        try:
+            from nexforge.core.goal_manager import GoalManager
+            GoalManager(get_project_root()).cleanup()
+        except Exception:
+            pass
+
     def _stop_director_loop(self) -> None:
         """停止总监循环。"""
         self._stop_director = True

{nexforge_cli-0.2.15 → nexforge_cli-0.2.16}/src/nexforge/features/session_feature.py

@@ -109,7 +109,17 @@ class SessionFeature:
         s._director_session_id = ""
         s.session = Session()
         s.session.messages = list(msgs)
-        if not msgs or msgs[0].get("role") != "system":
+        # 系统提示判断: 摘要 system 消息(历史压缩)不算完整系统提示,
+        # 必须注入 DEFAULT_SYSTEM(否则 AI 缺失行为规范, 只回复一段就停)。
+        # 与 _auto_resume 保持一致 —— 原判断只看首条 role, 而压缩过的会话
+        # 首条是 "[历史摘要" system 消息(save_session 只回显摘要 system),
+        # 会误判为已有 system 而漏注入 DEFAULT_SYSTEM。
+        has_full_sys = any(
+            m.get("role") == "system"
+            and str(m.get("content", "")).startswith("【推理要求】")
+            for m in s.session.messages
+        )
+        if not has_full_sys:
             s.session.messages.insert(0, {"role": "system", "content": DEFAULT_SYSTEM})
         s._session_id = info.id
         s._session_name = info.name
@@ -145,11 +155,20 @@ class SessionFeature:
     # ---- 自动保存 ----
 
     def _reset_goal_confirm(self) -> None:
-        """切换/新建会话时重置目标模式方案确认状态(防残留误路由)。"""
+        """切换/新建会话时完整重置目标模式运行状态(防残留误路由)。
+
+        修复: 之前只重置 _awaiting_plan_confirm, 而 _turn_count/_dev_done_flag/
+        _stop_director 等运行状态与旧目标文件(项目级)残留, 导致切换会话后
+        总监循环无法正确恢复, 表现为"AI 回复一段就停, 必须反复输入才能继续"。
+        """
         try:
             gf = next((f for f in self.screen._features._features
                        if getattr(f, 'name', '') == 'goal_mode'), None)
-            if gf is not None:
+            if gf is None:
+                return
+            if hasattr(gf, 'reset_for_session_change'):
+                gf.reset_for_session_change()
+            else:
                 gf._awaiting_plan_confirm = False
         except Exception:
             pass

{nexforge_cli-0.2.15 → nexforge_cli-0.2.16}/src/nexforge/provider/deepseek.py

@@ -50,6 +50,7 @@ class DeepSeekProvider(BaseProvider):
         api_key: str | None = None,
     ):
         self.config = config
+        self.pdef = pdef
         key = api_key or config.resolve_api_key()
         if not key:
             raise ProviderError(
@@ -68,6 +69,7 @@ class DeepSeekProvider(BaseProvider):
         """用明确 key 创建 Provider(跳过 resolve_api_key 链)。"""
         inst = cls.__new__(cls)
         inst.config = config
+        inst.pdef = None
         inst._client = AsyncOpenAI(
             api_key=api_key,
             base_url=config.provider.base_url,
@@ -81,12 +83,27 @@ class DeepSeekProvider(BaseProvider):
 
     # ── 多模态(视觉模型) ────────────────────────────────────
 
+    def _resolve_model(self, tier: Tier | None, model: str | None = None) -> str:
+        """解析实际使用的模型名。
+
+        优先级: 显式传入 model > pdef.default_model > pdef.models[0] > 内置 tier 映射。
+        支持 models.toml 里以 type="deepseek" 注册独立模型(如实验版 flash 变体),
+        不再被内置 config.models.flash/pro 写死。
+        """
+        if model:
+            return model
+        if self.pdef and self.pdef.default_model:
+            return self.pdef.default_model
+        if self.pdef and self.pdef.models:
+            return self.pdef.models[0]
+        return self.config.model_id(tier)
+
     @property
     def current_model(self) -> str:
         """当前使用的模型名(最近一次调用或默认档位)。"""
         if getattr(self, "_last_model", ""):
             return self._last_model
-        return self.config.model_id(self.config.models.default_tier)
+        return self._resolve_model(self.config.models.default_tier)
 
     def supports_model_multimodal(self, model: str = "") -> bool:
         """视觉模型(模型名含 vision)支持图片输入。"""
@@ -157,6 +174,7 @@ class DeepSeekProvider(BaseProvider):
         tier: Tier | None,
         thinking: bool | None,
         effort: Effort | None,
+        model: str | None = None,
     ) -> dict:
         cfg = self.config
         think = cfg.models.thinking if thinking is None else thinking
@@ -169,7 +187,7 @@ class DeepSeekProvider(BaseProvider):
             extra_body["reasoning_effort"] = eff
 
         kwargs: dict[str, Any] = {
-            "model": cfg.model_id(tier),
+            "model": self._resolve_model(tier, model),
             "messages": messages,
             "stream": True,
             "stream_options": {"include_usage": True},
@@ -215,14 +233,14 @@ class DeepSeekProvider(BaseProvider):
         thinking: bool | None = kwargs.get("thinking")
         effort: Effort | None = kwargs.get("effort")
         resolved_tier: Tier = tier or self.config.models.default_tier
-        model_id = model or self.config.model_id(tier)
+        model_id = self._resolve_model(tier, model)
         self._last_model = model_id  # 供 current_model / 多模态判断
         # 视觉模型: 强制 thinking off(exp 模型未确认支持思考模式, 避免 400)
         if "vision" in model_id.lower() and thinking is not False:
             thinking = False
         # 多模态: 把 [图片附件: 路径] 展开为 base64 image_url
         messages = self._expand_image_attachments(messages, model_id)
-        bkwargs = self._build_kwargs(messages, tools, tier, thinking, effort)
+        bkwargs = self._build_kwargs(messages, tools, tier, thinking, effort, model_id)
 
         content = ""
         reasoning = ""

{nexforge_cli-0.2.15 → nexforge_cli-0.2.16}/src/nexforge/ui/screens/chat.py

@@ -313,7 +313,7 @@ class ChatScreen(ChatActionsMixin, Screen):
             # 注入目标场景记忆
             self._get_feature("goal_mode")._inject_goal_memory()
             self._note(t("note.goal_started"), scroll=True)
-            from nexforge.core.goal_manager import GoalManager
+            from nexforge.core.goal_manager import GoalManager, GOAL_CTX_LIMIT
             from pathlib import Path
             gm = GoalManager(Path.cwd())
             gm.set_goal(goal)
@@ -321,7 +321,7 @@ class ChatScreen(ChatActionsMixin, Screen):
             self._run_agent(
                 "[项目总监] 请针对以下目标规划初步方案(技术路线/任务拆解/实施顺序)。"
                 "注意: 先输出规划方案, 不要发布执行指令, 等待用户确认后再动工。\n"
-                "目标: " + goal[:200]
+                "目标: " + goal[:GOAL_CTX_LIMIT]
             )
             return
         if self.agent is None:
@@ -340,7 +340,7 @@ class ChatScreen(ChatActionsMixin, Screen):
         # (修复: F8 开启目标模式后用户直接输入, 原先走普通对话导致上栏工作区空;
         #  现在自动把输入当作目标, 触发总监编排, 让上栏工作区真正运转起来)
         if self.config.ui.goal_mode:
-            from nexforge.core.goal_manager import GoalManager
+            from nexforge.core.goal_manager import GoalManager, GOAL_CTX_LIMIT
             from nexforge.core.context import get_project_root
             gm = GoalManager(get_project_root())
             if not gm.read_goal().strip():
@@ -353,7 +353,7 @@ class ChatScreen(ChatActionsMixin, Screen):
                 self._run_agent(
                     "[项目总监] 请针对以下目标规划初步方案(技术路线/任务拆解/实施顺序)。"
                     "注意: 先输出规划方案, 不要发布执行指令, 等待用户确认后再动工。\n"
-                    "目标: " + text[:200]
+                    "目标: " + text[:GOAL_CTX_LIMIT]
                 )
                 return
             # 已有目标 → 用户插话 → 入队(软打断: 总监响应用户, 不打断开发者)
@@ -410,8 +410,14 @@ class ChatScreen(ChatActionsMixin, Screen):
 
     @staticmethod
     def _is_goal_confirm(text: str) -> bool:
-        """判断用户输入是否为方案确认(短文本 + 确认关键词)。"""
+        """判断用户输入是否为方案确认(短文本 + 确认关键词)。
+
+        疑问句(含"吗/?"等)不可能是确认——用户讨论方案时输入"可以改吗"等
+        短疑问句应走修改意见(amend_plan), 不能被误判为确认而忽略意见。
+        """
         t = text.strip().lower().rstrip("。！!.,， ")
+        if any(q in t for q in ("吗", "?", "？", "是不是", "能否", "可不可以", "行不行")):
+            return False
         exact = {"确认", "确定", "开始", "执行", "没问题", "可以", "同意", "ok", "yes", "go", "start", "继续"}
         if t in exact:
             return True

nexforge_cli-0.2.16/tests/test_deepseek_provider.py

@@ -0,0 +1,54 @@
+# -*- coding: utf-8 -*-
+"""DeepSeek provider 独立模型解析测试(不触网)。
+
+验证 models.toml 里 type="deepseek" 注册独立模型时,
+模型名解析优先级: 显式 model > pdef.default_model > pdef.models[0] > 内置 tier。
+"""
+from __future__ import annotations
+
+from nexforge.config import NexForgeConfig, ProviderDef
+from nexforge.provider.deepseek import DeepSeekProvider
+
+
+def _bare(cfg, pdef=None):
+    """绕过 __init__ 的网络客户端, 只构造被测对象。"""
+    p = DeepSeekProvider.__new__(DeepSeekProvider)
+    p.config = cfg
+    p.pdef = pdef
+    return p
+
+
+def test_resolve_model_builtin_fallback():
+    """无 pdef(内置兼容模式) → 用内置 tier 映射, 行为不变。"""
+    cfg = NexForgeConfig()
+    p = _bare(cfg, None)
+    assert p._resolve_model("flash") == cfg.model_id("flash") == "deepseek-v4-flash"
+    assert p._resolve_model("pro") == cfg.model_id("pro") == "deepseek-v4-pro"
+
+
+def test_resolve_model_uses_pdef_default_model():
+    """有 pdef.default_model → 优先用独立模型(核心修复)。"""
+    cfg = NexForgeConfig()
+    pdef = ProviderDef(
+        type="deepseek",
+        models=["deepseek-v4.1-flash-expires-on-0910"],
+        default_model="deepseek-v4.1-flash-expires-on-0910",
+    )
+    p = _bare(cfg, pdef)
+    assert p._resolve_model("flash") == "deepseek-v4.1-flash-expires-on-0910"
+
+
+def test_resolve_model_falls_back_to_models_first():
+    """有 pdef 但无 default_model → 用 models[0]。"""
+    cfg = NexForgeConfig()
+    pdef = ProviderDef(type="deepseek", models=["custom-flash"])
+    p = _bare(cfg, pdef)
+    assert p._resolve_model("flash") == "custom-flash"
+
+
+def test_resolve_model_explicit_model_wins():
+    """显式传入 model 优先级最高。"""
+    cfg = NexForgeConfig()
+    pdef = ProviderDef(type="deepseek", models=["m1"], default_model="m1")
+    p = _bare(cfg, pdef)
+    assert p._resolve_model("flash", model="explicit-model") == "explicit-model"

{nexforge_cli-0.2.15 → nexforge_cli-0.2.16}/tests/test_director_loop.py

@@ -78,6 +78,28 @@ def loop_env(tmp_path, monkeypatch):
     return tmp_path, mf, gm
 
 
+def test_dispatch_dev_keeps_long_goal(loop_env):
+    """长目标下, 开发者指令中的目标/计划必须完整传递, 不能被 [:300] 截断。
+
+    回归: 旧代码 goal = read_goal()[:300] / plan = read_plan()[:300],
+    长目标(>300字符)的后半部分(任务边界/次要目标等)在总监分解/开发者执行阶段丢失。
+    """
+    tmp_path, mf, gm = loop_env
+    long_goal = "构建Unity角色生成系统: " + "详细需求描述" * 60   # > 300 字符
+    long_plan = "计划步骤: " + "分阶段实施说明" * 60               # > 300 字符
+    gm.set_goal(long_goal)
+    gm.set_plan(long_plan)
+    screen = LoopScreen([])
+    feat = mf.GoalModeFeature()
+    feat.register(screen)
+    screen._feat = feat
+    feat._dispatch_dev("开始编码", 1)
+    assert screen.agents, "应派发开发者任务"
+    text = screen.agents[0][0]
+    assert long_goal in text, "开发者指令应包含完整目标, 不能被截断"
+    assert long_plan in text, "开发者指令应包含完整计划, 不能被截断"
+
+
 @pytest.mark.asyncio
 async def test_director_loop_full_flow(loop_env):
     """完整循环: 初始分解 → 派发开发者 → 完成 → 验收 → GOAL_ACHIEVED 停止。"""

{nexforge_cli-0.2.15 → nexforge_cli-0.2.16}/tests/test_goal_confirm.py

@@ -116,6 +116,22 @@ def test_amend_replans(screen):
     assert "用户补充意见" in gm.read_goal(), "意见应追加到目标"
 
 
+def test_amend_plan_keeps_feedback_not_truncated(screen):
+    """长目标下, 用户修改意见必须完整传给总监, 不能被 read_goal()[:300] 截断。
+
+    回归: 旧实现把反馈追加到 goal 文件末尾后, 仅取前 300 字符作为 prompt,
+    而反馈位于 300 字符之后 → 总监收不到意见(表现为"截断/未检测到意见")。
+    """
+    s, feat, gm = screen
+    long_goal = "构建一个Unity角色生成系统, 包含以下详细需求: " + "需求细节" * 80  # >300 字符
+    gm.set_goal(long_goal)
+    feat.on_turn_done("方案: 编译优化")
+    feedback = "角色默认角度改为3个: 正面/侧面/表情特写; 场景设定图按剧本级主要场景各一张"
+    feat.amend_plan(feedback)
+    assert s.agents, "应触发重新规划"
+    assert feedback in s.agents[0], "用户反馈必须完整出现在总监 prompt 中, 不能被截断"
+
+
 def test_toggle_resets_confirm(screen):
     s, feat, _ = screen
     feat.on_turn_done("方案: v1")
@@ -140,7 +156,8 @@ def test_session_switch_resets_confirm(screen):
 def test_confirm_word_detection():
     true_cases = ["确认", "确定", "开始", "没问题", "方案可以", "ok", "OK", "yes",
                   "确认,开始吧", "继续", "可以"]
-    false_cases = ["不要微服务", "换个思路", "这个方案不行", "补充一点: 用缓存"]
+    false_cases = ["不要微服务", "换个思路", "这个方案不行", "补充一点: 用缓存",
+                   "可以改吗", "确定吗", "可以吗", "开始了吗", "是不是要加缓存?"]
     for t in true_cases:
         assert ChatScreen._is_goal_confirm(t), f"{t!r} 应判为确认"
     for t in false_cases:
@@ -155,3 +172,59 @@ def test_empty_plan_no_director(screen):
     feat.confirm_plan()
     assert len(s.director_started) == n, "空方案不应启动总监"
     assert not feat._awaiting_plan_confirm
+
+
+def test_reset_for_session_change_full(screen):
+    """会话切换重置应清零所有运行状态 + 清理目标文件。"""
+    s, feat, gm = screen
+    # 模拟切换前"运行中"的脏状态
+    feat._turn_count = 5
+    feat._stop_director = True
+    feat._dev_done_flag = True
+    feat._dev_busy = True
+    feat._dev_report = "旧报告"
+    feat._user_inbox.append("插话")
+    feat._awaiting_plan_confirm = True
+    feat._director_busy = True
+    feat.reset_for_session_change()
+    assert feat._turn_count == 0
+    assert feat._stop_director is False, "停止标志必须复位,否则恢复的循环立即退出"
+    assert feat._dev_done_flag is False
+    assert feat._dev_busy is False
+    assert feat._dev_report == ""
+    assert feat._user_inbox == []
+    assert feat._awaiting_plan_confirm is False
+    assert feat._director_busy is False
+    # 旧目标文件被清理
+    assert not gm.goal_path.exists(), "旧目标应清理,防被误判为插话"
+    assert not gm.plan_path.exists()
+
+
+def test_session_switch_full_reset(screen):
+    """SessionFeature._reset_goal_confirm 应走完整重置(非只清 confirm 标志)。"""
+    s, feat, gm = screen
+    from nexforge.features.session_feature import SessionFeature
+    sf = SessionFeature()
+    sf.register(s)
+    feat._turn_count = 3
+    feat._stop_director = True
+    gm.set_plan("旧方案")
+    sf._reset_goal_confirm()
+    assert feat._turn_count == 0
+    assert feat._stop_director is False
+    assert not gm.goal_path.exists()
+    assert not gm.plan_path.exists()
+
+
+def test_reset_then_plan_flows_to_confirm(screen):
+    """修复核心: 残留 _turn_count 会导致方案生成后跳过 turn=1,方案不落盘。
+
+    复位后 on_turn_done 应正确走 turn=1 分支(落盘方案 + 进入待确认)。
+    """
+    s, feat, gm = screen
+    feat._turn_count = 5  # 模拟切换会话残留
+    feat.reset_for_session_change()
+    feat.on_turn_done("新方案: 1. 缓存 2. 并行")
+    assert feat._awaiting_plan_confirm, "复位后新方案应进入待确认(而非卡死)"
+    assert gm.read_plan(), "方案应落盘"
+    assert not s.director_started, "方案阶段不应启动总监"