dsh-mnemon 0.5.38 → 0.5.39

package/bin/repair-legacy-session.mjs

@@ -614,6 +614,89 @@ function encodeFrames(text) {
   return Buffer.concat([text.slice(0, end), text.slice(end)].filter(Boolean).map(part => zlib.zstdCompressSync(part, options)))
 }
 
+async function writeRepairCopy(input, output, result) {
+  if (resolve(input) === resolve(output)) throw new Error('Output must be a new copy; the input cannot be overwritten.')
+  const temporary = await mkdtemp(join(dirname(resolve(output)), '.mnemon-repair-'))
+  try {
+    const path = join(temporary, 'session')
+    const file = await open(path, 'wx', 0o600)
+    try { await file.writeFile(result); await file.sync() } finally { await file.close() }
+    // Publish exclusively, including when output is a symlink or hard link.
+    await link(path, output)
+  } finally { await rm(temporary, { recursive: true, force: true }) }
+}
+
+/** Preserve the complete audit payload and all offsets; never truncate history. */
+async function repairIdleProbeSession(entries, original, compressed, input, output) {
+  const header = entries[0].row
+  assertUniqueJson(entries[0].line, header)
+  if (header.type !== 'session' || header.version !== 4 || header.isSeeded !== false || header.delegationDepth !== 0 ||
+      header.parentSession !== undefined || header.origin !== undefined) throw new Error('Idle probe recovery requires an unseeded v4 root Session.')
+  const uuid = /^[0-9a-f]{8}-[0-9a-f]{4}-4[0-9a-f]{3}-[89ab][0-9a-f]{3}-[0-9a-f]{12}$/u
+  const recovered = new Set()
+  const pending = new Map()
+  const roots = new Set()
+  let openTurn
+  let completed = false
+  const refuse = () => { throw new Error('Unrecognized or incomplete out-of-turn PTC audit; no output written.') }
+  for (const entry of entries.slice(1)) {
+    const row = entry.row
+    if (row.type === 'turn/start' || row.type === 'turn/end') {
+      assertUniqueJson(entry.line, row)
+      if (pending.size || !count(row.data?.turn)) refuse()
+      if (row.type === 'turn/start') {
+        if (openTurn !== undefined) refuse()
+        openTurn = row.data.turn
+      } else {
+        if (openTurn !== row.data.turn) refuse()
+        openTurn = undefined
+        completed = true
+      }
+    }
+    if (!['tool/ptc-dispatch-start', 'tool/ptc-dispatch'].includes(row.type) || openTurn !== undefined) continue
+    assertUniqueJson(entry.line, row)
+    const data = row.data
+    const start = row.type === 'tool/ptc-dispatch-start'
+    if (!completed || !exactKeys(row, ['type', 'seq', 'time', 'data']) || !count(row.seq) || !integer(row.time) ||
+        !exactKeys(data, ['rootCallId', 'parentCallId', 'subCallId', 'name', 'arguments', ...(start ? [] : ['isError', 'content'])], start ? [] : ['error', 'meta']) ||
+        !uuid.test(data.rootCallId) || data.parentCallId !== data.rootCallId || data.subCallId !== `${data.rootCallId}:ptc:1` ||
+        data.name !== 'mnemon_subagent_result' || !exactKeys(data.arguments, ['requestId', 'result']) ||
+        !uuid.test(data.arguments.requestId) || !exactKeys(data.arguments.result, [])) refuse()
+    if (start) {
+      if (roots.has(data.rootCallId)) refuse()
+      roots.add(data.rootCallId)
+      pending.set(data.rootCallId, entry)
+    } else {
+      const previous = pending.get(data.rootCallId)
+      if (!previous || !isDeepStrictEqual(previous.row.data.arguments, data.arguments) || previous.row.seq >= row.seq ||
+          typeof data.isError !== 'boolean' || !Array.isArray(data.content) ||
+          !data.isError && !isDeepStrictEqual(data.content, [{ type: 'text', text: 'Mnemon subagent result recorded.' }])) refuse()
+      pending.delete(data.rootCallId)
+      recovered.add(previous)
+      recovered.add(entry)
+    }
+  }
+  if (pending.size) refuse()
+  const changedSeqs = new Set([...recovered].map(entry => entry.row.seq))
+  for (const { row } of entries.slice(1)) {
+    for (const range of row.sourceEventSeqs ?? []) {
+      if (typeof range === 'number' ? changedSeqs.has(range) : Array.isArray(range) && [...changedSeqs].some(seq => seq >= range[0] && seq <= range[1])) refuse()
+    }
+  }
+  const text = entries.map(entry => recovered.has(entry)
+    ? JSON.stringify({ type: 'dsh-mnemon/recovered-idle-probe', seq: entry.row.seq, time: entry.row.time, ignorable: true,
+      data: { originalType: entry.row.type, originalData: entry.row.data } }) + '\n'
+    : entry.line).join('')
+  const plain = Buffer.from(text)
+  if (plain.length > maximumBytes) throw new Error('Repaired Session exceeds the 128 MiB repair limit; no output written.')
+  const result = recovered.size === 0 ? original : compressed ? encodeFrames(text) : plain
+  if (result.length > maximumBytes) throw new Error('Repaired Session exceeds the 128 MiB repair limit; no output written.')
+  if (output !== undefined) await writeRepairCopy(input, output, result)
+  return { mode: output === undefined ? 'preview' : 'copy', format: 4, encoding: compressed ? 'zstd' : 'jsonl',
+    recoveredIdleProbeEvents: recovered.size, inputSha256: sha256(original), outputSha256: sha256(result),
+    originalPreserved: true, migrationValidated: false, blockers: [] }
+}
+
 export async function repairLegacySession(input, output) {
   const original = await readBounded(input)
   const compressed = original.subarray(0, 4).equals(Buffer.from([0x28, 0xb5, 0x2f, 0xfd]))
@@ -627,6 +710,7 @@ export async function repairLegacySession(input, output) {
   const entries = lines.map((line, index) => {
     try { return { line, index, row: JSON.parse(line) } } catch { throw new Error(`Invalid JSON at line ${index + 1}; no output written.`) }
   })
+  if (entries[0]?.row?.version === 4) return repairIdleProbeSession(entries, original, compressed, input, output)
   const recovery = recoverRecordedToolIdentities(entries)
   let changes = 0
   let descriptors = 0
@@ -681,15 +765,7 @@ export async function repairLegacySession(input, output) {
   if (result.length > maximumBytes) throw new Error('Repaired Session exceeds the 128 MiB repair limit; no output written.')
   const blockers = diagnostics.report()
   if (output !== undefined && blockers.length === 0) {
-    if (resolve(input) === resolve(output)) throw new Error('Output must be a new copy; the input cannot be overwritten.')
-    const temporary = await mkdtemp(join(dirname(resolve(output)), '.mnemon-repair-'))
-    try {
-      const path = join(temporary, 'session')
-      const file = await open(path, 'wx', 0o600)
-      try { await file.writeFile(result); await file.sync() } finally { await file.close() }
-      // Publish exclusively, including when output is a symlink or hard link.
-      await link(path, output)
-    } finally { await rm(temporary, { recursive: true, force: true }) }
+    await writeRepairCopy(input, output, result)
   }
   return {
     mode: output === undefined ? 'preview' : blockers.length === 0 ? 'copy' : 'refused',
@@ -712,7 +788,7 @@ export async function repairLegacySession(input, output) {
 }
 
 async function main(args) {
-  const usage = 'Usage: dsh-mnemon-repair-session --input FILE [--output NEW_FILE]\nWithout --output, preview the three known Mnemon v0 summary repairs, exact compatible v2 subagent descriptors, packed deltas with empty IDs/names, property-preserving null-to-empty delta names and proven DeepSeek chains with a previously recorded provider ID. Unsupported descriptor/tool shapes are reported with exit status 1 and prevent output. DSH must still validate the repaired copy. Stop DSH and work on a backup copy. The input and existing output files are never overwritten.'
+  const usage = 'Usage: dsh-mnemon-repair-session --input FILE [--output NEW_FILE]\nWithout --output, preview recognized v4 idle-review probe audit recovery or the three known Mnemon v0 summary repairs, exact compatible v2 subagent descriptors, packed deltas with empty IDs/names, property-preserving null-to-empty delta names and proven DeepSeek chains with a previously recorded provider ID. Unsupported descriptor/tool shapes are reported with exit status 1 and prevent output. DSH must still validate the repaired copy. Stop DSH and work on a backup copy. The input and existing output files are never overwritten.'
   if (args.length === 1 && args[0] === '--help') { console.log(usage); return }
   const options = new Map()
   for (let index = 0; index < args.length; index += 2) {

package/lib/bundle.js

@@ -1,4 +1,4 @@
-import { t as prepareStarterResolution } from "./starter-resolution-XVFzvnV0.js";
+import { t as prepareStarterResolution } from "./starter-resolution-C3yJawlA.js";
 //#region src/bundle.ts
 const groupKey = Symbol.for("cordis.group");
 const init = Symbol.for("cordis.init");

package/lib/client.js

@@ -316,6 +316,7 @@ window.__ModuleLoader__.load({
 			evolution: false,
 			allowCreate: true,
 			allowUpdate: true,
+			targetScope: "user",
 			autoBacktest: true,
 			hints: true,
 			sidebar: false,
@@ -3054,7 +3055,7 @@ window.__ModuleLoader__.load({
 			"config.syncAuthorDefault": "默认",
 			"config.syncAuthorMachine": "本机 Git",
 			"config.syncAuthorCustom": "自定义",
-			"config.syncAuthorDefaultNote": "以 {identity} 提交",
+			"config.syncAuthorDefaultNote": "优先使用本机 Git 身份；没有配置时以 {identity} 提交",
 			"config.syncAuthorMachineNote": "使用这台电脑的 Git 身份；没有配置时用默认身份",
 			"config.syncAuthorName": "姓名",
 			"config.syncAuthorEmail": "邮箱",
@@ -3130,6 +3131,11 @@ window.__ModuleLoader__.load({
 			"skills.allowCreateHint": "允许复盘提出新技能；已有建议仍可手动处理",
 			"skills.allowUpdate": "改进已有技能",
 			"skills.allowUpdateHint": "允许复盘提出已有技能的改进；两类建议均关闭时暂停复盘",
+			"skills.targetScope": "新技能写入位置",
+			"skills.targetScopeHint": "默认写入用户技能；跟随存储范围时，workspace / workspaces 写入项目，其余写入用户。已有建议和草案保留目标，改进写回原技能；采纳时可手动选择。",
+			"skills.targetScope.user": "用户",
+			"skills.targetScope.project": "项目",
+			"skills.targetScope.storage": "跟随存储范围",
 			"skills.evolutionHint": "后台复盘并建议改进技能；会创建落盘的任务及子代理会话，Mnemon 不自动删除这些记录",
 			"skills.autoBacktest": "草案自动回测",
 			"skills.autoBacktestHint": "草案写好后，用测试用例与当前版本对比",
@@ -3864,7 +3870,7 @@ window.__ModuleLoader__.load({
 			"config.syncAuthorDefault": "Default",
 			"config.syncAuthorMachine": "This computer's Git",
 			"config.syncAuthorCustom": "Custom",
-			"config.syncAuthorDefaultNote": "Commits as {identity}",
+			"config.syncAuthorDefaultNote": "Uses this computer's Git identity; falls back to {identity} when unconfigured",
 			"config.syncAuthorMachineNote": "Uses this computer's Git identity, else the default one",
 			"config.syncAuthorName": "Name",
 			"config.syncAuthorEmail": "Email",
@@ -3940,6 +3946,11 @@ window.__ModuleLoader__.load({
 			"skills.allowCreateHint": "Allow reviews to propose new skills; existing suggestions can still be handled manually",
 			"skills.allowUpdate": "Suggest skill improvements",
 			"skills.allowUpdateHint": "Allow reviews to improve existing skills; reviews pause when both suggestion types are off",
+			"skills.targetScope": "New skill destination",
+			"skills.targetScopeHint": "Defaults to user skills. Follow storage uses the project for workspace / workspaces, otherwise the user. Existing proposals keep their destination; improvements keep their original file. You can choose again at adoption.",
+			"skills.targetScope.user": "User",
+			"skills.targetScope.project": "Project",
+			"skills.targetScope.storage": "Follow storage",
 			"skills.evolutionHint": "Review conversations and suggest skills. Task and subagent sessions are saved locally; Mnemon does not automatically delete them.",
 			"skills.autoBacktest": "Backtest drafts",
 			"skills.autoBacktestHint": "Compare a new draft with the current version on its test cases",
@@ -8519,8 +8530,8 @@ window.__ModuleLoader__.load({
 		/**
 		* What this computer is called, where on the branch the memory goes and whose name
 		* its commits carry. Each field shows the value in use; the computer's name is the
-		* host name or a typed one, and the author an explicit choice between the channel's
-		* own identity, this computer's Git identity, and a typed one.
+		* host name or a typed one. The default author follows this computer's Git
+		* identity with a placeholder fallback; a custom author overrides it.
 		*/
 		function AdvancedSettings({ client, status, disabled, t, onSaved }) {
 			const [open, setOpen] = (0, react.useState)(false);
@@ -12028,8 +12039,8 @@ window.__ModuleLoader__.load({
 		}
 		/**
 		* 技能管理's settings on its page under Plugins. Switches apply at once; the
-		* review parameters wait, folded, for their own Apply. Evolution's own
-		* switches show only while it is on.
+		* destination and folded review parameters wait for their own Apply. The
+		* destination also applies to manual drafts while evolution is off.
 		*/
 		function SkillsSettings(props) {
 			const { scope, page, t } = props;
@@ -12044,6 +12055,9 @@ window.__ModuleLoader__.load({
 			const autoBacktest = useLive(saved.autoBacktest, write("autoBacktest"));
 			const hints = useLive(saved.hints, write("hints"));
 			const sidebar = useLive(saved.sidebar, write("sidebar"));
+			const destination = useStaged({ targetScope: saved.targetScope }, async (draft) => {
+				await scope.mutate([set("targetScope", draft.targetScope)]);
+			});
 			const parameters = useStaged(parametersOf(saved), async (draft) => {
 				const changed = PARAMETERS.filter((field) => parameterValue(field, draft[field.key]) !== saved[field.key]);
 				if (changed.length > 0) await scope.mutate(changed.map((field) => set(field.key, parameterValue(field, draft[field.key]))));
@@ -12080,6 +12094,35 @@ window.__ModuleLoader__.load({
 							disabled,
 							onChange: allowUpdate.set
 						}),
+						/* @__PURE__ */ (0, react_jsx_runtime.jsx)(SelectRow, {
+							id: "mnemon-skills-target",
+							label: t("skills.targetScope"),
+							hint: t("skills.targetScopeHint"),
+							value: destination.draft.targetScope,
+							options: [
+								"user",
+								"project",
+								"storage"
+							].map((value) => ({
+								value,
+								label: t(`skills.targetScope.${value}`)
+							})),
+							disabled: disabled || destination.saving,
+							onChange: (targetScope) => destination.edit({ targetScope })
+						}),
+						/* @__PURE__ */ (0, react_jsx_runtime.jsx)(PanelActions, {
+							dirty: destination.dirty,
+							saving: destination.saving,
+							applied: destination.applied,
+							failed: destination.failed,
+							disabled,
+							invalid: null,
+							t,
+							onDiscard: destination.discard,
+							onApply: () => {
+								destination.apply();
+							}
+						}),
 						evolution.value && /* @__PURE__ */ (0, react_jsx_runtime.jsx)(ToggleRow, {
 							id: "mnemon-skills-backtest",
 							label: t("skills.autoBacktest"),