dsh-vscode-mode 0.12.0 → 0.13.1

package/src/shared/keybindings.ts

@@ -165,8 +165,9 @@ export function chordToBinding(chord: string): OfficialBinding | null {
 }
 
 /**
- * 官方绑定 → 插件显示键位弦（primary 显示为 Ctrl，与历史 tooltip 文案保持一致）。
- * @author ddj 2026年10月
+ * 官方绑定 → 可读键位弦，保留规范化后的 Control/Meta 物理区别。
+ * 官方目录展示优先使用官方 keys；此函数仅作为缺少展示字段时的回落。
+ * @author ddj 2026年09月28号
  * @param binding 官方绑定
  * @returns 插件弦（不可表示 → null）
  */
@@ -181,7 +182,8 @@ export function bindingToChord(binding: OfficialBinding): string | null {
     suffix = '+' + secondKey
   }
   const parts: string[] = []
-  if (binding.modifiers.includes('primary')) parts.push('Ctrl')
+  if (binding.modifiers.includes('primary') || binding.modifiers.includes('control')) parts.push('Ctrl')
+  if (binding.modifiers.includes('meta')) parts.push('Meta')
   if (binding.modifiers.includes('shift')) parts.push('Shift')
   if (binding.modifiers.includes('alt')) parts.push('Alt')
   return [...parts, key + suffix].join('+')
@@ -217,12 +219,13 @@ export const SHORTCUT_PROFILES: Record<string, ShortcutProfiles> = {
     'web:macos': bind('KeyP', ['primary', 'alt', 'shift']),
     'web:windows': bind('KeyP', ['primary', 'alt', 'shift']),
   },
+  // 官方 session.fork 占用两种 Web primary+shift+F；加 Alt 避开联合目录冲突。
   'edrv.searchInFiles': {
     'desktop:macos': bind('KeyF', ['primary', 'shift']),
     'desktop:windows': bind('KeyF', ['primary', 'shift']),
     'desktop:linux': bind('KeyF', ['primary', 'shift']),
-    'web:macos': bind('KeyF', ['primary', 'shift']),
-    'web:windows': bind('KeyF', ['primary', 'shift']),
+    'web:macos': bind('KeyF', ['primary', 'alt', 'shift']),
+    'web:windows': bind('KeyF', ['primary', 'alt', 'shift']),
   },
   // Ctrl+Shift+V（primary+KeyV）在 linux 为保留键（官方 bindingIssue 不豁免 shift），desktop:linux 不声明
   'edrv.toggleMarkdownPreview': {

package/src/shared/mcp.ts

@@ -1,7 +1,7 @@
 /** dsh-vscode-mode MCP 管理共享数据契约。作者 ddj 2026年08月22号 */
 
 export type MpcTransport = 'stdio' | 'streamable-http'
-export type MpcStatus = 'connected' | 'connecting' | 'error' | 'disabled'
+export type MpcStatus = 'connected' | 'connecting' | 'error' | 'disabled' | 'configured' | 'unverified'
 
 export interface MpcTool {
   name: string
@@ -18,6 +18,7 @@ export interface MpcConfig {
   url?: string
   headers?: Record<string, string>
   toolCallTimeoutMs?: number
+  maxInstructionBytes?: number
   failOnStartupError?: boolean
   reconnect?: Record<string, unknown>
 }
@@ -29,6 +30,8 @@ export interface MpcServer {
   transport: MpcTransport
   config: MpcConfig
   status: MpcStatus
+  /** Mounted official plugin fibers, not verified live connections. */
+  instanceCount?: number
   toolCount: number
   tools: MpcTool[]
   error?: string

package/src/shared/rpc.ts

@@ -22,6 +22,7 @@ import type { AiConfigPatch, AiConfigView, AiDirectoryView, AiInlineRequest, AiI
 import type { SvnAction, SvnAiPlan, SvnChangeEntry, SvnConflictArtifact, SvnDiffRevResult, SvnIgnoreItem, SvnLogEntry, SvnRemoteOutdatedEntry, SvnStatusPayload, SvnSumEntry, SvnUpdatePoll, SvnUpdateResult, SvnUpdateState } from './svn.js'
 import type { DapAction, DapAdapterInfo, DapBreakpointAck, DapBreakpointInput, DapConfigSnippet, DapConfigSource, DapDebugConfig, DapFrameView, DapPhase, DapPollResult, DapProcessInfo, DapScopeView, DapVariableView } from './dap.js'
 import { DAP_ACTIONS } from './dap.js'
+import { appUrl } from './appUrl.js'
 import type { LoggerLevel } from './logger.js'
 
 /** webServer 精确路由。 */
@@ -133,7 +134,7 @@ export async function readBinaryPreview(
  */
 async function tryBinaryRead(args: RpcRequestMap['edrv.readBinary']): Promise<PreviewRead | null> {
   try {
-    const res = await fetch(RPC_PATH, {
+    const res = await fetch(appUrl(RPC_PATH), {
       method: 'POST',
       headers: { 'content-type': 'application/json' },
       body: JSON.stringify({ method: 'edrv.readBinary', args }),
@@ -382,7 +383,8 @@ export interface RpcRequestMap {
   'edrv.unity.install': { path: string }
   'edrv.externalStat': { path: string }
   'edrv.external.handoff': { paths: string[]; line?: number; column?: number }
-  'edrv.external.pending': {}
+  'edrv.external.pending': { clientId: string; busy?: boolean }
+  'edrv.external.ack': { token: string; clientId: string; leaseId: string; success: boolean; error?: string }
   'edrv.external.pendingState': { token: string; take?: boolean }
   'vscode.devFormGet': {}
   'vscode.devFormSet': { enabled: boolean; path?: string }
@@ -535,8 +537,9 @@ export interface RpcOkMap {
   'edrv.unity.install': { project: UnityProjectEntry }
   'edrv.externalStat': { kind: 'file' | 'directory' | 'missing' }
   'edrv.external.handoff': { clients: number; token: string }
-  'edrv.external.pending': { open: { paths: string[]; line?: number; column?: number } | null }
-  'edrv.external.pendingState': { delivered: boolean }
+  'edrv.external.pending': { open: { paths: string[]; line?: number; column?: number; token: string; leaseId: string } | null }
+  'edrv.external.ack': { accepted: boolean }
+  'edrv.external.pendingState': { delivered: boolean; completed?: boolean; error?: string }
   'vscode.devFormGet': { devForm: DevFormInfo }
   'vscode.devFormSet': { devForm: DevFormInfo; restart: boolean }
   'compat': { report: CompatReport }

package/src/shared/svn.ts

@@ -799,18 +799,15 @@ export function ignoreItemsOf(paths: readonly string[]): SvnIgnoreItem[] {
   return [...byDir.entries()].map(([dir, names]) => ({ dir, names }))
 }
 
-/** 深度分析投递口地址（host RPC 本地免鉴权；agent 用 shell 直接 POST）。 */
-const AGENT_SUBMIT_URL = 'http://127.0.0.1:3080/edrv/rpc'
-
 /**
  * 会话 agent 深度分析任务文本（混合通道 02-deep-session-prompt 修正版）。
  * 在**独立新会话**草稿箱填入后由用户发送；agent 自跑只读 `svn status` 取清单
  * （prompt 定长瘦身，不随变更数膨胀），借 codegraph/读文件/sub agent 深度分析，
- * 产出方案经免鉴权 RPC `svn.aiPlanSubmit` 投递回面板收件箱——确认与执行仍全部
+ * 产出方案经当前会话的 svn_plan_submit 工具投递回面板收件箱，确认与执行仍全部
  * 走面板（agent 禁写、只读放行）。
- * @author ddj 2026年09月23号
+ * @author ddj 2026年09月28号
  * @param wcRoot 工作副本根（取数指引内嵌）
- * @param sessionId 会话 id（投递命令内嵌；host 按它解析工作副本）
+ * @param sessionId 分析会话 id（仅作说明，不参与工具授权）
  * @returns 任务文本（定长 ~1KB：取数指引/分析要求/投递命令/硬约束）
  */
 export function buildAgentPrompt(wcRoot: string, sessionId: string): string {
@@ -838,8 +835,9 @@ export function buildAgentPrompt(wcRoot: string, sessionId: string): string {
     '3. 组名用简短英文、不以 - 开头；',
     '4. 只使用 `svn status` 实际返回的路径，绝不虚构或改写路径。',
     '',
-    '分析完成后，用 shell 执行下面的命令把方案投递回面板（把 <PLAN_JSON> 替换为方案 JSON）：',
-    'Invoke-RestMethod -Uri ' + AGENT_SUBMIT_URL + ' -Method Post -ContentType \'application/json\' -Body (@{ method = \'svn.aiPlanSubmit\'; args = @{ sessionId = \'' + sessionId + '\'; plan = <PLAN_JSON> } } | ConvertTo-Json -Depth 8)',
+    '分析完成后，调用 svn_plan_submit 工具，把方案 JSON 作为 plan 参数投递回面板。',
+    '工具只接收 { "plan": <PLAN_JSON> }，自动使用当前执行会话；不要传入其他 sessionId。',
+    '当前分析会话：' + sessionId + '。工具仅保存待审方案，不执行方案中的文件操作。',
     '',
     '投递成功会返回 { ok, accepted, dropped }；随后我会在面板弹窗中确认执行，你无需再做任何操作。',
   ].join('\n')

package/src/svnPlanTool.ts

@@ -0,0 +1,51 @@
+/** Session-bound SVN analysis result delivery. @author ddj 2026年09月28号 */
+import { loadHostModule } from './hostImport.js'
+import type { Ctx } from './store.js'
+import type { RpcHandler, RpcResult } from './shared/rpc.js'
+
+interface PlanArgs { plan: unknown }
+interface PlanExec { agent?: { session?: { id?: string } }; signal?: AbortSignal }
+type Submit = RpcHandler<'svn.aiPlanSubmit'>
+
+/**
+ * Build a result-only tool that derives ownership from the executing session.
+ * It cannot revert, commit, ignore, or select another session.
+ * @author ddj 2026年09月28号
+ * @param submit Existing validated plan inbox handler.
+ * @returns Definition options for the running Host's defineTool API.
+ */
+export function planToolOptions(submit: Submit) {
+  /** @author ddj 2026年09月28号 @param args Model plan. @param exec Owning execution context. @returns Validated inbox result. */
+  async function execute(args: PlanArgs, exec: PlanExec): Promise<RpcResult<'svn.aiPlanSubmit'>> {
+    const sessionId = exec.agent?.session?.id
+    if (!sessionId) return { ok: false, error: 'SVN 方案投递需要所属会话' }
+    if (exec.signal?.aborted) return { ok: false, error: 'SVN 方案投递已取消' }
+    return submit({ sessionId, plan: args.plan })
+  }
+  /** @author ddj 2026年09月28号 @param _args Request. @param result Inbox result. @returns Model-visible result. */
+  function render(_args: PlanArgs, result: RpcResult<'svn.aiPlanSubmit'>) {
+    return [{ type: 'text', text: JSON.stringify(result) }]
+  }
+  return {
+    name: 'svn_plan_submit',
+    description: 'Submit an SVN change-analysis plan to the current workspace review inbox. This only records the proposal; the user must confirm changes in VSCodeMode. It does not modify or commit files.',
+    parameters: { plan: { type: 'json', required: true, description: 'Analysis proposal with groups, reverts and ignores arrays, using paths from the current SVN working-copy status.' } },
+    output: { schema: { type: 'json' }, render },
+    isConcurrencySafe: false,
+    execute,
+  }
+}
+
+/**
+ * Register the SVN submission tool using the running Host API and lifecycle owner.
+ * @author ddj 2026年09月28号
+ * @param ctx Host plugin context owning the registration.
+ * @param submit Validated SVN inbox handler.
+ */
+export async function installPlanTool(ctx: Ctx, submit: Submit): Promise<void> {
+  const module = await loadHostModule('@deepseek-ai/dsh-tools') as { defineTool: (options: unknown) => unknown }
+  const definition = module.defineTool(planToolOptions(submit))
+  /** @author ddj 2026年09月28号 @returns Registration disposer owned by this plugin. */
+  function install(): () => void { return ctx.get('tools').register(definition) }
+  ctx.effect(install, 'vscode-mode:svn-plan-submit')
+}

package/src/unityBridge.ts

@@ -7,10 +7,14 @@
  * package.json name 不是本包 → 拒绝覆盖。纯路径构造与项目特征判定可单测。
  * 作者 ddj 2026-09-07
  */
-import { cp, mkdir, readFile, readdir, rm, writeFile } from 'node:fs/promises'
+import { cp, mkdir, readFile, readdir, rm, writeFile, rename } from 'node:fs/promises'
 import { basename, dirname, join, sep } from 'node:path'
 import { fileURLToPath } from 'node:url'
 import { dshHome, PLUGIN_ID } from './paths.js'
+import { randomUUID } from 'node:crypto'
+import { ensureOpenBridge } from './openBridge.js'
+import { checkOpenPath } from './openInbox.js'
+import type { Ctx } from './store.js'
 import { UNITY_PACKAGE_NAME } from './shared/integration.js'
 import type { UnityListPayload, UnityProjectEntry } from './shared/integration.js'
 
@@ -21,6 +25,8 @@ const PROJECTS_FILE = 'unity-projects.json'
 /** 包源目录相对插件包根的位置。 */
 const UNITY_DIR_NAME = 'unity'
 
+export interface UnityBridgeOpts { ctx: Ctx; baseUrl: string }
+
 /**
  * 包源目录（随插件包分发的 unity/com.dsh.editor 绝对路径）。
  * @author ddj 2026年09月07号
@@ -192,15 +198,17 @@ export async function unityRemove(rawPath: string, home = dshHome()): Promise<vo
  * @param moduleUrl 模块 URL（测试注入）
  * @returns 安装后项目状态
  */
-export async function unityInstall(rawPath: string, moduleUrl: string = import.meta.url): Promise<UnityProjectEntry> {
+export async function unityInstall(rawPath: string, moduleUrl: string = import.meta.url, bridge?: UnityBridgeOpts): Promise<UnityProjectEntry> {
   const root = normalizeUnityRoot(rawPath)
   const source = unitySourceDir(moduleUrl)
   const target = unityTargetOf(root)
   await validateInstallTarget(root, source, target)
+  const bridgeConfigPath = bridge ? await ensureOpenBridge(bridge.ctx, bridge.baseUrl) : undefined
   await rm(target, { recursive: true, force: true })
   await mkdir(join(target, '..'), { recursive: true })
   await cp(source, target, { recursive: true })
-  return unityEntryOf(root, moduleUrl)
+  if (bridgeConfigPath) await writeUnityHint(root, bridgeConfigPath)
+  return { ...(await unityEntryOf(root, moduleUrl)), bridgeConfigPath }
 }
 
 /**
@@ -232,3 +240,18 @@ async function validateInstallTarget(root: string, source: string, target: strin
   } catch { /* 解析失败按未知包处理 */ }
   if (name !== UNITY_PACKAGE_NAME) throw new Error('目标目录已存在且不是 DSH 包，拒绝覆盖：' + target)
 }
+
+/** @private @author ddj 2026年09月28号
+ * Bind a project's machine-local configuration to its selected profile bridge.
+ * @param root Validated Unity project root.
+ * @param configPath Absolute profile bridge INI path.
+ */
+async function writeUnityHint(root: string, configPath: string): Promise<void> {
+  const dir = join(root, 'UserSettings')
+  await mkdir(dir, { recursive: true })
+  await checkOpenPath(dir)
+  const target = join(dir, 'dsh-editor.ini')
+  const temporary = target + '.' + randomUUID() + '.tmp'
+  await writeFile(temporary, '[dsh]\nconfig=' + configPath + '\n', { flag: 'wx', mode: 0o600 })
+  try { await rename(temporary, target) } finally { await rm(temporary, { force: true }) }
+}