thincoder 0.12.60 → 0.12.61

package/src/cli/distill-command.mjs

@@ -1,4 +1,4 @@
-import { join } from "node:path"
+import { isAbsolute, join } from "node:path"
 import { loadConfig, configPath } from "../config.mjs"
 import { createMemory } from "../memory.mjs"
 import { teamConfig, gitAuthor } from "./make-agent.mjs"
@@ -64,7 +64,7 @@ export async function distillCommand(args, exitSoon) {
   }
 
   const opts = {
-    projectDir: config.memory.projectDir ? join(process.cwd(), config.memory.projectDir) : null,
+    projectDir: config.memory.projectDir ? (isAbsolute(config.memory.projectDir) ? config.memory.projectDir : join(process.cwd(), config.memory.projectDir)) : null,
     team,
     author: gitAuthor(),
   }

package/src/cli/make-agent.mjs

@@ -1,5 +1,5 @@
 import { execSync } from "node:child_process"
-import { join } from "node:path"
+import { isAbsolute, join } from "node:path"
 import { createAgent } from "../agent.mjs"
 import { loadConfig, configDir } from "../config.mjs"
 import { createMemory, memoryTools, syncDir, codeSearchTool, docSearchTool } from "../memory.mjs"
@@ -10,8 +10,18 @@ import { discoverRules } from "../rules.mjs"
 // R10 L2（MULTI-INSTANCE-COLLAB §2a.4 D-L2b）：peer_instances 只读工具——挂感知模块导出
 import { peerInstancesTool } from "../peer-instances.mjs"
 
+/** 第 27 批 §12.3⑤（R-A1.1）：装配期工具剔除——按 `name` 过滤的纯函数（机验锚）。
+ *  恒等语义：空列表 / 零命中 → 原数组原样返回（零意外剔除——T15）。
+ *  ACP 通道经 `assembleAgent({ excludeTools })` 传入（acp.mjs `ACP_EXCLUDED_TOOLS`）。 */
+export function applyToolExclusions(tools, excludeTools = []) {
+  const excluded = new Set(excludeTools ?? [])
+  if (excluded.size === 0) return tools
+  const kept = tools.filter((t) => !excluded.has(t?.name))
+  return kept.length === tools.length ? tools : kept
+}
+
 /** Assemble an agent with memory, MCP tools, and code/doc indices attached (sync all layers, then return) */
-export async function assembleAgent() {
+export async function assembleAgent({ excludeTools = [] } = {}) {
   const config = loadConfig()
   const provider = config.provider
   const providers = config.providersList
@@ -20,7 +30,7 @@ export async function assembleAgent() {
   const { injectProxy } = await import("../proxy.mjs")
   injectProxy(providers, config)
   // config.provider 是 loadConfig 里的独立拷贝，同步注入结果
-  provider.proxyUri = providers.find((p) => p.name === config.activeProvider)?.proxyUri
+  if (provider?.name) provider.proxyUri = providers.find((p) => p.name === provider.name)?.proxyUri
 
   const memory = createMemory({ dbPath: config.memory.dbPath })
   // Vector retrieval: enabled if embedding is configured (lazy vector generation, computed on first search)
@@ -41,7 +51,7 @@ export async function assembleAgent() {
   memory.codeOrigin = cwd
   // Project layer: sync .thincoder/memory/ dir to index on startup (sync if present, skip otherwise)
   if (config.memory.projectDir) {
-    memory.projectOrigin = join(cwd, config.memory.projectDir)
+    memory.projectOrigin = isAbsolute(config.memory.projectDir) ? config.memory.projectDir : join(cwd, config.memory.projectDir)
     await syncDir(memory, { layer: "project", dir: memory.projectOrigin })
   }
   // Team layer (optional): auto-clone on first use; startup only indexes local dir, remote pull via explicit thincoder sync
@@ -101,18 +111,24 @@ export async function assembleAgent() {
 
   const agent = createAgent({
     provider,
-    tools: [...baseTools, ...mcpTools],
+    tools: applyToolExclusions([...baseTools, ...mcpTools], excludeTools),
     config,
     cwd,
     memory,
   })
   agent.providers = providers
-  agent.activeProvider = config.activeProvider
-  agent.activeModel = config.activeModel ?? null
+  // MODEL-MERGE-SESSION：config 无 active*——会话运行时起点 = defaultModel 复合解析
+  // （provider 对象带解析后 model——API/spec 消费点零改）；无效 → {} + 原因走 D-S1 标记
+  agent.activeProvider = provider.name ?? ""
+  agent.activeModel = provider.model ?? null
   agent._mcpWarnings = mcpWarnings
   // SESSION.md §8 D-S1：assembleAgent 后唯一校验点（TUI/chat 两路径同源）——不抛错不退出，
   // 标记由调用侧消费（TUI 弹重选 / headless 报错）。空 provider 由 TUI 路径在 startTUI 前清空。
   validateProvider(agent)
+  // defaultModel 无效/未设的具体原因覆盖通用判据文案（providers 存在时更有指导性）
+  if (agent._providerInvalid && config.providerInvalidReason) {
+    agent._providerInvalidReason = config.providerInvalidReason
+  }
   return agent
 }
 

package/src/cli/memory-command.mjs

@@ -1,4 +1,4 @@
-import { join } from "node:path"
+import { isAbsolute, join } from "node:path"
 import { loadConfig } from "../config.mjs"
 import { teamConfig } from "./make-agent.mjs"
 import { put, search, list } from "../memory/core.mjs"
@@ -67,7 +67,7 @@ export async function memoryCommand(memory, args, opts = {}) {
 function cliDirs() {
   const config = loadConfig()
   const dirs = { project: null, team: null }
-  if (config.memory?.projectDir) dirs.project = join(process.cwd(), config.memory.projectDir)
+  if (config.memory?.projectDir) dirs.project = isAbsolute(config.memory.projectDir) ? config.memory.projectDir : join(process.cwd(), config.memory.projectDir)
   const team = teamConfig(config)
   if (team) dirs.team = team.dir
   return dirs

package/src/cli/setup-wizard.mjs

@@ -1,5 +1,6 @@
 import { createInterface } from "node:readline"
 import { configPath, writeConfigAtomic, PROVIDER_PRESETS } from "../config.mjs"
+import { probeChannelModels } from "../tui/model-catalog.mjs"
 
 /** First-time setup (TTY chat / distill): ask a few questions to configure a provider, save to disk, return runtime provider. Cancel returns null. */
 export async function setupWizard() {
@@ -28,7 +29,7 @@ export async function setupWizard() {
     presets.forEach(([n, p], i) => console.error(`  ${i + 1}. ${n.padEnd(10)} ${p.desc}`))
     console.error(`  ${presets.length + 1}. Custom endpoint`)
     const choice = Number((await ask(`Pick [1-${presets.length + 1}]: `)).trim())
-    let name, baseURL, model
+    let name, baseURL, model, presetFields = null
     if (choice === presets.length + 1) {
       name = (await ask("Name (e.g. my-openai): ")).trim()
       baseURL = (await ask("baseURL (e.g. https://api.openai.com/v1): ")).trim().replace(/\/+$/, "")
@@ -38,9 +39,11 @@ export async function setupWizard() {
         return null
       }
     } else if (choice >= 1 && choice <= presets.length) {
+      // 预设全量字段随行（format/thinking/maxTokens…）——探针分派与落盘同源（M9 需要 format）
+      presetFields = presets[choice - 1][1]
       name = presets[choice - 1][0]
-      baseURL = presets[choice - 1][1].baseURL
-      model = presets[choice - 1][1].model
+      baseURL = presetFields.baseURL
+      model = presetFields.model
     } else {
       console.error("Invalid choice — cancelled")
       return null
@@ -51,25 +54,42 @@ export async function setupWizard() {
       return null
     }
     const embedKey = (await ask("Optional: embedding API key (SiliconFlow, for vector search; press Enter to skip): ")).trim()
+    // M9 配置阶段准入（加渠道 = 配置写入面）：探一次 `/models`——探通/探不通都不阻断保存，
+    // 仅明示结果（失败文案 = M8 消息本体；无绕过指引）。
+    // 探针输入带预设扩展字段（format 决定 M1 分派——claude/gemini 预设必须走自己的拉取分支）。
+    const probe = await probeChannelModels(presetFields ? { ...presetFields, name, apiKey } : { name, baseURL, apiKey })
+    console.error(probe.ok
+      ? `✓ ${name}: /models 可用（${probe.list.length} 个模型可候选）`
+      : `⚠ ${probe.message}`)
     // D-F5b：磁盘新鲜读 → mutate → mtime 门控写（writeConfigAtomic 收口）；冲突 = 放弃
     // + 提示重试（首配场景另有实例同时写盘——极低概率；不自动合并——决策点① A）
+    // MODEL-SELECTION v2：渠道默认模型 = 单值 `model` + defaultModel 顶层复合；
+    // 预设扩展字段（format/thinking/maxTokens…）随行落盘——与 TUI wizard 近似同构（探针/聊天字段同源），
+    // 但 `thinking` 复制语义不同：本文件用 `!== undefined` → kimi/kimi-code 预设的 `thinking: null`
+    // **被落盘**；TUI 路径用真值过滤（model-picker.mjs / wizard.mjs）不落该键。
+    // `thinking: null`（NF1 = 显式 off）落盘差异已登记待口径统一（父侧）。
     const r = writeConfigAtomic(configPath, (raw) => {
       const providers = raw.providers?.length ? raw.providers : []
       const existing = providers.find((p) => p.name === name)
-      if (existing) Object.assign(existing, { baseURL, model, apiKey })
-      else providers.push({ name, baseURL, model, apiKey })
+      const rec = { name, baseURL, model, apiKey }
+      for (const k of ["format", "thinking", "reasoningEffort", "maxTokens", "chatPath"]) {
+        if (presetFields?.[k] !== undefined) rec[k] = presetFields[k]
+      }
+      if (existing) Object.assign(existing, rec) // 渠道老字段（models 候选清单）由 config-migrate 在下次 load 统一清理
+      else providers.push(rec)
       raw.providers = providers
-      raw.activeProvider = name
-      delete raw.activeModel  // reset to default model
+      raw.defaultModel = `${name}:${model}`
+      delete raw.activeProvider
+      delete raw.activeModel
       if (embedKey) raw.embedding = { ...(raw.embedding ?? {}), apiKey: embedKey }
     })
     if (!r.ok) {
       console.error("config changed on disk concurrently — retry")
       return null
     }
-    console.error(`Configured: ${name} / ${model} (saved to ${configPath})`)
+    console.error(`Configured: ${name} / ${model} (defaultModel = ${name}:${model} — saved to ${configPath})`)
     console.error(embedKey ? "Vector search enabled\n" : "(No embedding key configured: memory search will use text-only FTS. Add embedding.apiKey to config.json to enable vector search later.)\n")
-    return { name, baseURL, model, apiKey }
+    return { name, baseURL, model, apiKey, defaultModel: `${name}:${model}` }
   } finally {
     rl.close()
   }

package/src/completions.mjs

@@ -0,0 +1,114 @@
+/**
+ * completions.mjs — `thincoder completion <shell>` shell 补全脚本发射（bash/zsh/fish）。
+ * bin/thincoder.mjs case "completion" 直写段拆分（2026-09-08——500 行硬限触碰执行：
+ * 段逐字迁出，脚本字节与既有输出一致）。
+ */
+export function printCompletion(shell) {
+    if (shell === "bash") {
+      process.stdout.write(`_thincoder() {
+  local cur prev words cword
+  _init_completion 2>/dev/null || { COMPREPLY=(); return; }
+  cur="\${COMP_WORDS[COMP_CWORD]}"
+  prev="\${COMP_WORDS[COMP_CWORD-1]}"
+  case "\${COMP_WORDS[1]}" in
+    chat)    COMPREPLY=( \\$(compgen -W "--auto" -- "\\$cur") ) ;;
+    memory)
+      case "\\$prev" in
+        memory) COMPREPLY=( \\$(compgen -W "list search put remove" -- "\\$cur") ) ;;
+        list)   COMPREPLY=( \\$(compgen -W "--type=rule --type=knowledge --type=decision --type=pattern" -- "\\$cur") ) ;;
+        put)    COMPREPLY=( \\$(compgen -W "--type= --title= --content= --tags=" -- "\\$cur") ) ;;
+      esac ;;
+    distill) COMPREPLY=( \\$(compgen -W "--yes --layer=" -- "\\$cur") ) ;;
+    completion) COMPREPLY=( \\$(compgen -W "bash zsh fish" -- "\\$cur") ) ;;
+    *)
+      COMPREPLY=( \\$(compgen -W "chat acp memory sync reindex distill upgrade completion session -v --version -h --help" -- "\\$cur") ) ;;
+  esac
+}
+complete -F _thincoder thincoder
+`)
+    } else if (shell === "zsh") {
+      process.stdout.write(`#compdef thincoder
+
+_thincoder() {
+  local context state state_descr line
+  typeset -A opt_args
+  _arguments -C \\
+    '1: :->cmd' \\
+    '*:: :->args'
+
+  case "\\$state" in
+    cmd)
+      _values 'command' \\
+        'chat[One-shot agent run with tools]' \\
+        'acp[Agent Client Protocol server for IDEs]' \\
+        'memory[Manage long-term memory]' \\
+        'sync[Sync team memory repo]' \\
+        'reindex[Rebuild local index from markdown]' \\
+        'distill[Extract knowledge from session transcript]' \\
+        'upgrade[Update to latest version from npm]' \\
+        'completion[Generate shell completion script]' \\
+        'session[Session dir GC: session gc --dry-run|--confirm]'
+      ;;
+    args)
+      case "\\$words[1]" in
+        chat)    _arguments '--auto[Auto-approve all tool calls]' ;;
+        memory)
+          case "\\$words[2]" in
+            list) _arguments '--type=[Filter by type]' ;;
+            put)  _arguments '--type=[Entry type]' '--title=[Title]' '--content=[Content]' '--tags=[Space-separated tags]' ;;
+          esac ;;
+        distill) _arguments '--yes[Skip confirmation]' '--layer=[Layer filter]' ;;
+        completion) _values 'shell' 'bash' 'zsh' 'fish' ;;
+      esac ;;
+  esac
+}
+_thincoder
+`)
+    } else if (shell === "fish") {
+      process.stdout.write(`# thincoder completions for fish shell
+complete -c thincoder -f
+
+# Subcommands
+complete -c thincoder -a chat     -d 'One-shot agent run with tools'
+complete -c thincoder -a memory   -d 'Manage long-term memory'
+complete -c thincoder -a sync     -d 'Sync team memory repo'
+complete -c thincoder -a reindex  -d 'Rebuild local index from markdown'
+complete -c thincoder -a distill  -d 'Extract knowledge from session'
+complete -c thincoder -a upgrade  -d 'Update to latest version'
+complete -c thincoder -a completion -d 'Shell completion'
+complete -c thincoder -a session -d 'Session dir GC (session gc --dry-run|--confirm)'
+complete -c thincoder -a acp -d 'Agent Client Protocol server for IDEs'
+
+# Flags
+complete -c thincoder -s v -l version -d 'Print version'
+complete -c thincoder -s h -l help    -d 'Print help'
+
+# chat flags
+complete -c thincoder -n '__fish_seen_subcommand_from chat' -l auto -d 'Auto-approve tool calls'
+
+# memory subcommands
+complete -c thincoder -n '__fish_seen_subcommand_from memory' -a list   -d 'List entries'
+complete -c thincoder -n '__fish_seen_subcommand_from memory' -a search -d 'Search memory'
+complete -c thincoder -n '__fish_seen_subcommand_from memory' -a put    -d 'Add entry'
+complete -c thincoder -n '__fish_seen_subcommand_from memory' -a remove -d 'Remove entry'
+
+# memory list flags
+complete -c thincoder -n '__fish_seen_subcommand_from memory; and __fish_seen_subcommand_from list' -l type -d 'Filter by type' -xa 'rule knowledge decision pattern'
+
+# memory put flags
+complete -c thincoder -n '__fish_seen_subcommand_from memory; and __fish_seen_subcommand_from put' -l type    -d 'Entry type'
+complete -c thincoder -n '__fish_seen_subcommand_from memory; and __fish_seen_subcommand_from put' -l title   -d 'Title'
+complete -c thincoder -n '__fish_seen_subcommand_from memory; and __fish_seen_subcommand_from put' -l content -d 'Content'
+complete -c thincoder -n '__fish_seen_subcommand_from memory; and __fish_seen_subcommand_from put' -l tags    -d 'Space-separated tags'
+
+# distill flags
+complete -c thincoder -n '__fish_seen_subcommand_from distill' -l yes   -d 'Skip confirmation'
+complete -c thincoder -n '__fish_seen_subcommand_from distill' -l layer -d 'Layer filter'
+
+# completion shells
+complete -c thincoder -n '__fish_seen_subcommand_from completion' -a bash -d 'Bash completions'
+complete -c thincoder -n '__fish_seen_subcommand_from completion' -a zsh  -d 'Zsh completions'
+complete -c thincoder -n '__fish_seen_subcommand_from completion' -a fish -d 'Fish completions'
+`)
+    }
+}

package/src/config-migrate.mjs

@@ -0,0 +1,70 @@
+/**
+ * config-migrate.mjs — model-schema legacy-shape migration core (MODEL-SELECTION v2, §16.2 M7).
+ * Split out of config.mjs (500-line hard limit). Pure function, zero imports — the
+ * write-back orchestration (writeConfigAtomic / persistRaw, failure tolerance) stays in
+ * the caller (CLI: config.mjs loadConfig; VSC: config-io.mjs loadRaw — same rule, 双端各自
+ * 独立实现——不做同步依赖).
+ *
+ * 目标形态 C：每渠道恰好一个默认模型（`providers[].model` 单值）+ 顶层 `defaultModel` 复合。
+ * 老形态迁移（v2）：
+ * - A：`providers[].model` + `activeProvider/activeModel` → `p.model` **保留**（不再搬入 models）；
+ *   `activeProvider/activeModel` → `defaultModel` 复合（`activeModel` 优先；AP 不存在/AM 空 → 首渠道回退）
+ * - B：`providers[].models[]` → `p.model = defaultModel 属本渠道的模型段 ?? 现有 p.model（非空字符串）
+ *   ?? models[] 首个非空字符串`，然后 `delete p.models`
+ * - 混合/垃圾：非数组 `p.models` / 非字符串（空串）`p.model` → 删除（清理）
+ * - 顺序：先构造/读取有效 `defaultModel` 值（含老 active* 转换），再按它给各渠道播种 `p.model`
+ * - 幂等：无老字段（无 `models` / 无 active* / 无垃圾值）→ 返回 false 不动；slot 旧字段
+ *   （会话文件内）不迁移——读侧容忍
+ * - 空结果合法：渠道无模型来源 → `p.model` 不设（模型选择经 `/models` 拉取候选——M8/M9）
+ */
+export function migrateLegacyModelFields(raw) {
+  if (!raw || typeof raw !== "object") return false
+  const providers = Array.isArray(raw.providers) ? raw.providers : []
+  let changed = false
+
+  // ── ① 有效 defaultModel 值（含老 active* 转换）──
+  if (raw.activeProvider !== undefined || raw.activeModel !== undefined) {
+    const rawAP = typeof raw.activeProvider === "string" && raw.activeProvider.trim() ? raw.activeProvider : ""
+    const rawAM = typeof raw.activeModel === "string" && raw.activeModel.trim() ? raw.activeModel : ""
+    const ap = rawAP ? providers.find((p) => p?.name === rawAP) : null
+    if (ap && rawAM) {
+      if (raw.defaultModel == null) { raw.defaultModel = `${rawAP}:${rawAM}`; changed = true }
+    } else {
+      // AP 已不存在 / AM 无法归属 → 首渠道回退（该渠道有模型来源才可用——迁移产物必可用）
+      const first = providers.find((p) => seedModel(p) != null)
+      if (first && raw.defaultModel == null) { raw.defaultModel = `${first.name}:${seedModel(first)}`; changed = true }
+    }
+    delete raw.activeProvider
+    delete raw.activeModel
+    changed = true
+  }
+
+  // ── ② 渠道播种单值 `p.model` + 清 models ──
+  const dm = typeof raw.defaultModel === "string" && raw.defaultModel.trim() ? raw.defaultModel : null
+  const dmSep = dm ? dm.indexOf(":") : -1
+  const dmProvider = dmSep > 0 ? dm.slice(0, dmSep) : null
+  const dmModel = dmSep > 0 && dmSep < dm.length - 1 ? dm.slice(dmSep + 1) : null
+  for (const p of providers) {
+    if (!p || typeof p !== "object") continue
+    if (Array.isArray(p.models)) {
+      const next = (p.name === dmProvider && dmModel)
+        ? dmModel
+        : (typeof p.model === "string" && p.model.trim() ? p.model : seedModel(p))
+      if (next == null) delete p.model
+      else p.model = next
+      delete p.models
+      changed = true
+      continue
+    }
+    if (p.models !== undefined) { delete p.models; changed = true } // 非数组 models —— 垃圾清理
+    if (p.model !== undefined && !(typeof p.model === "string" && p.model.trim())) { delete p.model; changed = true }
+  }
+  return changed
+}
+
+/** 渠道级模型来源读数（迁移用）：现有 `p.model`（非空字符串优先）或 `models[]` 首个非空字符串。 */
+function seedModel(p) {
+  if (typeof p?.model === "string" && p.model.trim()) return p.model
+  const models = Array.isArray(p?.models) ? p.models : []
+  return models.find((m) => typeof m === "string" && m.trim()) ?? null
+}