dsh-ptc-plus 0.2.3 → 0.3.1

package/internal/cell-analysis.js

@@ -50,10 +50,12 @@ function addPatternBindings(pattern, names) {
   walkPattern(pattern, node => names.add(node.name))
 }
 
-function addPatternDeclarations(pattern, declarations) {
+function addPatternDeclarations(pattern, declarations, kind = 'variable', definitionSpan = undefined) {
   bindingNodes(pattern).forEach(node => declarations.push({
     name: node.name,
+    kind,
     span: declarationSpan(node),
+    definitionSpan,
   }))
 }
 
@@ -65,12 +67,17 @@ function topLevelDeclarations(body) {
   const declarations = []
   for (const statement of body) {
     if (statement.type === 'VariableDeclaration') {
-      for (const declaration of statement.declarations) addPatternDeclarations(declaration.id, declarations)
+      const definitionSpan = declarationSpan(statement)
+      for (const declaration of statement.declarations) {
+        addPatternDeclarations(declaration.id, declarations, 'variable', definitionSpan)
+      }
     } else if ((statement.type === 'FunctionDeclaration' || statement.type === 'ClassDeclaration')
       && statement.id !== null) {
       declarations.push({
         name: statement.id.name,
+        kind: statement.type === 'ClassDeclaration' ? 'class' : 'function',
         span: declarationSpan(statement.id),
+        definitionSpan: declarationSpan(statement),
       })
     }
   }
@@ -395,9 +402,19 @@ export function prepareProgram(program, knownBindings, looseTopLevelRedeclaratio
     }
   }
   const importedNames = new Set(moduleRewrite.imports.keys())
+  const originalDeclarationNames = new Set(moduleRewrite.exportDeclarations.map(declaration => declaration.name))
   const declarations = [
     ...moduleRewrite.importDeclarations,
-    ...generatedDeclarations.filter(declaration => !moduleRewrite.generatedNamespaces.has(declaration.name)),
+    ...moduleRewrite.exportDeclarations,
+    ...generatedDeclarations
+      .filter(declaration => !moduleRewrite.generatedNamespaces.has(declaration.name)
+        && !originalDeclarationNames.has(declaration.name))
+      .map(declaration => ({
+        ...declaration,
+        ...(declaration.definitionSpan === undefined ? {} : {
+          definitionSpan: mapSourceSpan(declaration.definitionSpan, code, program, sourceMap),
+        }),
+      })),
   ]
   const normalizeClassification = classification => {
     const imports = new Map(moduleRewrite.imports)

package/internal/cell-rewriter.js

@@ -183,6 +183,7 @@ function importEdits(
     if (imported !== undefined && !requiredExports.includes(imported)) requiredExports.push(imported)
     importDeclarations.push({
       name: localName(specifier),
+      kind: 'import',
       span: {
         line: specifier.local.loc.start.line,
         column: specifier.local.loc.start.column + 1,
@@ -191,6 +192,14 @@ function importEdits(
           column: specifier.local.loc.end.column + 1,
         },
       },
+      definitionSpan: {
+        line: node.loc.start.line,
+        column: node.loc.start.column + 1,
+        end: {
+          line: node.loc.end.line,
+          column: node.loc.end.column + 1,
+        },
+      },
       original: true,
     })
   }
@@ -420,7 +429,7 @@ function exportAllEdits(node, code, edits, rewrites, moduleLoads) {
   rewrites.push(record('export', `converted the re-export of ${JSON.stringify(source)} into a side-effect import`, node, source))
 }
 
-function exportDefaultEdits(node, code, edits, rewrites, defaultNameAvailable) {
+function exportDefaultEdits(node, code, edits, rewrites, defaultNameAvailable, exportDeclarations) {
   const declaration = node.declaration
   if (declaration.type === 'TSInterfaceDeclaration') {
     editNode(edits, node, code)
@@ -438,6 +447,29 @@ function exportDefaultEdits(node, code, edits, rewrites, defaultNameAvailable) {
       { line: node.loc.start.line, column: node.loc.start.column + 1 },
     )
   }
+  exportDeclarations.push({
+    name: '__default',
+    kind: declaration.type === 'FunctionDeclaration'
+      ? 'function'
+      : declaration.type === 'ClassDeclaration' ? 'class' : 'variable',
+    span: {
+      line: node.loc.start.line,
+      column: node.loc.start.column + 1,
+      end: {
+        line: node.loc.end.line,
+        column: node.loc.end.column + 1,
+      },
+    },
+    definitionSpan: {
+      line: node.loc.start.line,
+      column: node.loc.start.column + 1,
+      end: {
+        line: node.loc.end.line,
+        column: node.loc.end.column + 1,
+      },
+    },
+    original: true,
+  })
   const rewrite = record('export', 'converted the default export into a local __default binding', node)
   if (declaration.type === 'FunctionDeclaration' && declaration.id !== null) {
     const prefix = code.slice(node.start, declaration.start)
@@ -464,6 +496,7 @@ export function rewriteModuleImportsExports(program, enabled, existingImports =
   const rewrites = []
   const imports = new Map(existingImports)
   const importDeclarations = []
+  const exportDeclarations = []
   const moduleLoads = []
   const importNamespaces = new Set(existingNamespaces)
   const allocateName = createGeneratedNameAllocator(tree, [...unavailableNames, ...importNamespaces])
@@ -499,7 +532,7 @@ export function rewriteModuleImportsExports(program, enabled, existingImports =
       exportAllEdits(node, program, edits, rewrites, moduleLoads)
     }
     else if (node.type === 'ExportDefaultDeclaration' && enabled.autoStripExports) {
-      exportDefaultEdits(node, program, edits, rewrites, defaultNameAvailable)
+      exportDefaultEdits(node, program, edits, rewrites, defaultNameAvailable, exportDeclarations)
     }
   }
   assertNoDynamicImportResolution(tree, imports)
@@ -514,6 +547,7 @@ export function rewriteModuleImportsExports(program, enabled, existingImports =
     importNamespaces,
     generatedNamespaces,
     importDeclarations,
+    exportDeclarations,
     moduleLoads,
     rewrites: rewrites.map(({ at: _at, ...rest }) => rest),
   }

package/internal/config-spec.js

@@ -4,21 +4,111 @@ export const MAX_TIMER_DELAY_MS = 2_147_483_647
 /** Stable settings namespace used by both Host and browser halves. */
 export const SETTINGS_NAMESPACE = 'ptc-plus'
 
-/** Ordered field definitions for the plugin configuration card. */
+/**
+ * Ordered field definitions for the plugin configuration card. `label` and
+ * `description` are the canonical Host schema copy; `labelEn` and
+ * `descriptionEn` carry the English settings-card copy. A field's description
+ * exists in both locales or in neither.
+ */
 export const CONFIG_FIELDS = Object.freeze([
   {
     key: 'enabled',
     type: 'boolean',
     default: true,
     label: '启用 PTC Plus',
+    labelEn: 'Enable PTC Plus',
     description: '',
+    descriptionEn: '',
+  },
+  {
+    key: 'enhancedToolView',
+    type: 'boolean',
+    default: true,
+    label: '使用 PTC Plus 增强工具卡片',
+    labelEn: 'Use enhanced PTC Plus tool cards',
+    description: '开启时使用增强工具卡片；关闭后使用 DSH 原生工具卡片。',
+    descriptionEn: 'Uses enhanced tool cards when enabled and DSH native tool cards when disabled.',
+  },
+  {
+    key: 'autoDescribeRunCode',
+    type: 'boolean',
+    default: true,
+    label: '允许执行缺少摘要的 run_code',
+    labelEn: 'Allow run_code execution without a summary',
+    description: '允许 run_code 缺少外层 description；关闭后恢复 DSH 校验。模型请求和原始调用参数保持不变。',
+    descriptionEn: 'Allows run_code to omit its outer description; disabling restores DSH validation. Model requests and original call arguments remain unchanged.',
+  },
+  {
+    key: 'canonicalizeToolCalls',
+    type: 'boolean',
+    default: true,
+    label: '修复可识别的顶层 native 工具误调用',
+    labelEn: 'Repair recognizable top-level native tool mis-calls',
+    description: '仅当当前 schema 能唯一确认目标工具且参数有效时，才把顶层 native 工具误调用修复为对应的 run_code 调用。',
+    descriptionEn: 'Repairs a top-level native tool mis-call as the corresponding run_code call only when the current schema uniquely identifies the tool and validates its arguments.',
   },
   {
     key: 'cordisToolsEnabled',
     type: 'boolean',
     default: false,
-    label: '在 PTC 模式中启用 Cordis 工具',
-    description: '即时为 PTC agent 加入或移除官方 Cordis 工具。',
+    label: '在 PTC 模式中启用官方 Cordis 工具',
+    labelEn: 'Enable official Cordis tools in PTC mode',
+    description: '开启后，PTC agent 可使用官方 Cordis 工具、配套指引和开发 Skill；关闭后移除这些能力。Cordis 工具以 DSH 进程权限运行。',
+    descriptionEn: 'When enabled, PTC agents can use the official Cordis tools, guidance, and development Skill; disabling removes them. Cordis tools run with the DSH process permissions.',
+  },
+  {
+    key: 'looseTopLevelRedeclarations',
+    type: 'boolean',
+    default: true,
+    label: '允许顶层变量重声明',
+    labelEn: 'Allow top-level variable redeclarations',
+    description: '允许顶层 const 或 let 声明替换已有变量；关闭后，重声明会在执行前被拒绝。',
+    descriptionEn: 'Allows top-level const or let declarations to replace existing variables; disabling rejects redeclarations before execution.',
+  },
+  {
+    key: 'autoRewriteImports',
+    type: 'boolean',
+    default: true,
+    label: '支持静态 import 声明',
+    labelEn: 'Support static import declarations',
+    description: '允许在 run_code 中使用静态 import，并保留模块解析和只读 binding 语义。',
+    descriptionEn: 'Allows static import declarations in run_code while preserving module resolution and read-only binding semantics.',
+  },
+  {
+    key: 'autoStripExports',
+    type: 'boolean',
+    default: true,
+    label: '支持顶层 export 修饰符',
+    labelEn: 'Support top-level export modifiers',
+    description: '允许在 run_code 中使用顶层 export，并保留对应的本地声明或模块副作用。',
+    descriptionEn: 'Allows top-level export syntax in run_code while preserving the corresponding local declaration or module side effect.',
+  },
+  {
+    key: 'autoSplitRedeclarations',
+    type: 'boolean',
+    default: true,
+    label: '支持混合解构重声明',
+    labelEn: 'Support mixed destructuring redeclarations',
+    description: '允许顶层解构声明同时包含新变量和已有变量。',
+    descriptionEn: 'Allows top-level destructuring declarations to contain both new and existing variables.',
+  },
+  {
+    key: 'durableReplay',
+    type: 'boolean',
+    default: true,
+    label: '启用持久 REPL 恢复',
+    labelEn: 'Enable durable REPL recovery',
+    description: 'worker 重启后从 session journal 重建可恢复的 REPL 状态。',
+    descriptionEn: 'Rebuilds recoverable REPL state from the session journal after a worker restart.',
+  },
+  {
+    key: 'tipsEnabled',
+    type: 'boolean',
+    default: true,
+    label: '启用失败恢复提示',
+    labelEn: 'Enable failure recovery tips',
+    description: '在符合条件的失败后显示有冷却间隔的恢复提示。',
+    descriptionEn: 'Shows recovery tips with a cooldown after qualifying failures.',
   },
   {
     key: 'computeMs',
@@ -26,8 +116,10 @@ export const CONFIG_FIELDS = Object.freeze([
     default: 60_000,
     min: 1,
     max: Number.MAX_SAFE_INTEGER,
-    label: '单 cell 最大 CPU 时间 (ms)',
-    description: '同步计算超过该预算的 cell 会被中断。',
+    label: '单 cell CPU 时间上限 (ms)',
+    labelEn: 'CPU time limit per cell (ms)',
+    description: '同步计算超过该上限时中断当前 cell。',
+    descriptionEn: 'Interrupts the current cell when synchronous computation exceeds this limit.',
   },
   {
     key: 'maxWallMs',
@@ -35,26 +127,43 @@ export const CONFIG_FIELDS = Object.freeze([
     default: 600_000,
     min: 1,
     max: MAX_TIMER_DELAY_MS,
-    label: '单 cell 最大墙钟时间 (ms)',
-    description: '完整 cell 执行（含异步等待）的最长耗时。',
+    label: '单 cell 总耗时上限 (ms)',
+    labelEn: 'Elapsed time limit per cell (ms)',
+    description: '限制完整 cell 执行的耗时，包括异步等待。',
+    descriptionEn: 'Limits the complete cell execution time, including asynchronous waits.',
   },
   {
-    key: 'maxOutputBytes',
+    key: 'maxOldGenerationSizeMb',
     type: 'integer',
-    default: 64 * 1024 * 1024,
+    default: 512,
     min: 1,
     max: Number.MAX_SAFE_INTEGER,
-    label: '最大输出字节',
-    description: '限制单个 cell 的输出和结果数据总大小。',
+    label: '每个 worker 旧生代内存上限 (MiB)',
+    labelEn: 'Old-generation memory limit per worker (MiB)',
+    description: '限制每个 worker 的 V8 旧生代；活动 worker 存在时不能修改。',
+    descriptionEn: 'Limits the V8 old generation for each worker; this setting cannot change while a worker is active.',
   },
   {
-    key: 'maxOldGenerationSizeMb',
+    key: 'maxNestedRunCodeDepth',
     type: 'integer',
-    default: 512,
+    default: 8,
+    min: 1,
+    max: Number.MAX_SAFE_INTEGER,
+    label: 'code.run 嵌套层数上限',
+    labelEn: 'code.run nesting depth limit',
+    description: '限制单个顶层 cell 中 code.run 的最大嵌套层数。',
+    descriptionEn: 'Limits the maximum code.run nesting depth within one top-level cell.',
+  },
+  {
+    key: 'maxOutputBytes',
+    type: 'integer',
+    default: 64 * 1024 * 1024,
     min: 1,
     max: Number.MAX_SAFE_INTEGER,
-    label: 'worker 旧生代内存上限 (MiB)',
-    description: '每个 worker 的 V8 旧生代上限；活动 worker 存在时修改会被拒绝。',
+    label: '单 cell 输出上限 (bytes)',
+    labelEn: 'Output limit per cell (bytes)',
+    description: '限制单个 cell 的日志和返回结果的合计大小。',
+    descriptionEn: 'Limits the combined size of one cell\'s logs and returned result.',
   },
   {
     key: 'maxValueNodes',
@@ -62,8 +171,10 @@ export const CONFIG_FIELDS = Object.freeze([
     default: 100_000,
     min: 1,
     max: Number.MAX_SAFE_INTEGER,
-    label: 'Value Graph 最大节点数',
-    description: '限制单次返回值的节点数。',
+    label: '返回值节点数上限',
+    labelEn: 'Returned-value node limit',
+    description: '限制单次返回值的 Value Graph 节点数。',
+    descriptionEn: 'Limits the Value Graph node count for one returned value.',
   },
   {
     key: 'maxValueEdges',
@@ -71,8 +182,10 @@ export const CONFIG_FIELDS = Object.freeze([
     default: 1_000_000,
     min: 1,
     max: Number.MAX_SAFE_INTEGER,
-    label: 'Value Graph 最大边数',
-    description: '限制单次返回值的引用关系数。',
+    label: '返回值引用边数上限',
+    labelEn: 'Returned-value reference-edge limit',
+    description: '限制单次返回值的 Value Graph 引用边数。',
+    descriptionEn: 'Limits the Value Graph reference-edge count for one returned value.',
   },
   {
     key: 'maxValueArrayLength',
@@ -80,8 +193,10 @@ export const CONFIG_FIELDS = Object.freeze([
     default: 1_000_000,
     min: 1,
     max: Number.MAX_SAFE_INTEGER,
-    label: '数组最大声明长度',
-    description: '限制返回数组的最大长度。',
+    label: '返回数组长度上限',
+    labelEn: 'Returned-array length limit',
+    description: '限制返回数组的最大声明长度。',
+    descriptionEn: 'Limits the maximum declared length of a returned array.',
   },
   {
     key: 'maxValueBigIntDigits',
@@ -89,66 +204,10 @@ export const CONFIG_FIELDS = Object.freeze([
     default: 100_000,
     min: 1,
     max: Number.MAX_SAFE_INTEGER,
-    label: 'BigInt 最大十进制位数',
+    label: '返回值 BigInt 十进制位数上限',
+    labelEn: 'Returned-value BigInt decimal-digit limit',
     description: '限制返回值中 BigInt 的十进制位数。',
-  },
-  {
-    key: 'maxNestedRunCodeDepth',
-    type: 'integer',
-    default: 8,
-    min: 1,
-    max: Number.MAX_SAFE_INTEGER,
-    label: 'code.run 最大递归深度',
-    description: '限制 code.run 的嵌套层数。',
-  },
-  {
-    key: 'canonicalizeToolCalls',
-    type: 'boolean',
-    default: true,
-    label: '规范顶层 native 误调',
-    description: '修正可以明确识别的顶层 native 误调。',
-  },
-  {
-    key: 'looseTopLevelRedeclarations',
-    type: 'boolean',
-    default: true,
-    label: '宽松顶层重声明',
-    description: '允许顶层 const/let 重声明已有变量。',
-  },
-  {
-    key: 'durableReplay',
-    type: 'boolean',
-    default: true,
-    label: '持久重放',
-    description: 'worker 重启后恢复可以重建的 REPL 状态。',
-  },
-  {
-    key: 'autoRewriteImports',
-    type: 'boolean',
-    default: true,
-    label: '自动改写 import',
-    description: '允许在 run_code 中使用静态 import。',
-  },
-  {
-    key: 'autoStripExports',
-    type: 'boolean',
-    default: true,
-    label: '自动剥离 export',
-    description: '允许在 run_code 中使用顶层 export。',
-  },
-  {
-    key: 'autoSplitRedeclarations',
-    type: 'boolean',
-    default: true,
-    label: '自动拆分混合重声明',
-    description: '允许顶层解构声明同时包含新旧变量。',
-  },
-  {
-    key: 'tipsEnabled',
-    type: 'boolean',
-    default: true,
-    label: '启用恢复提示',
-    description: '在符合条件的失败后显示恢复提示。',
+    descriptionEn: 'Limits the decimal-digit count of BigInt values in one returned value.',
   },
   {
     key: 'tipCooldownMessages',
@@ -156,8 +215,10 @@ export const CONFIG_FIELDS = Object.freeze([
     default: 3,
     min: 1,
     max: Number.MAX_SAFE_INTEGER,
-    label: '恢复提示冷却步数',
+    label: '同类恢复提示间隔 (messages)',
+    labelEn: 'Same-kind recovery tip interval (messages)',
     description: '同类恢复提示之间的最小间隔。',
+    descriptionEn: 'The minimum gap between recovery tips of the same kind.',
   },
   {
     key: 'tipEscalationFailures',
@@ -165,8 +226,57 @@ export const CONFIG_FIELDS = Object.freeze([
     default: 2,
     min: 1,
     max: Number.MAX_SAFE_INTEGER,
-    label: '恢复提示升级失败次数',
+    label: '详细恢复提示阈值 (failures)',
+    labelEn: 'Detailed recovery tip threshold (failures)',
     description: '连续失败达到此次数后显示更详细的恢复提示。',
+    descriptionEn: 'After this many consecutive failures, a more detailed recovery tip is shown.',
+  },
+])
+
+/** Presentation groups keep high-attention decisions separate from advanced policy and limits. */
+export const CONFIG_GROUPS = Object.freeze([
+  {
+    key: 'core',
+    label: '常用与兼容性',
+    labelEn: 'Common and compatibility',
+    fields: Object.freeze(['enabled', 'enhancedToolView', 'autoDescribeRunCode', 'canonicalizeToolCalls']),
+  },
+  {
+    key: 'optional',
+    label: '可选能力',
+    labelEn: 'Optional capabilities',
+    fields: Object.freeze(['cordisToolsEnabled']),
+  },
+  {
+    key: 'advanced',
+    label: '高级行为',
+    labelEn: 'Advanced behavior',
+    fields: Object.freeze([
+      'looseTopLevelRedeclarations',
+      'autoRewriteImports',
+      'autoStripExports',
+      'autoSplitRedeclarations',
+      'durableReplay',
+      'tipsEnabled',
+    ]),
+  },
+  {
+    key: 'limits',
+    label: '资源限制',
+    labelEn: 'Resource limits',
+    fields: Object.freeze([
+      'computeMs',
+      'maxWallMs',
+      'maxOldGenerationSizeMb',
+      'maxNestedRunCodeDepth',
+      'maxOutputBytes',
+      'maxValueNodes',
+      'maxValueEdges',
+      'maxValueArrayLength',
+      'maxValueBigIntDigits',
+      'tipCooldownMessages',
+      'tipEscalationFailures',
+    ]),
   },
 ])