@shgroup/dsh-serenity-hooks 1.79.2 → 1.79.3

package/dsh.plugin.json

@@ -1,6 +1,6 @@
 {
   "id": "dsh-serenity-hooks",
-  "version": "1.79.2",
+  "version": "1.79.3",
   "main": "lib/index.js",
   "description": "宁静号 ACC harness（Native Cordis 插件）：给 DSH 装一个「AI 工作区」——14 个工具（container_fs/cognitive_trajectory/dashboard/container_git/msm/praxis/ontology/serenity-skill-creator/cheap-worker/localstore/container_admin；另三个 im-bridge/acc-diag/diagram 按配置条件出现）+ 机械约束（安全模式/工作区围墙/密钥守卫）+ 认知轨迹日志与原地重建 + 网页登录入口/IM 桥/认知轨迹唤醒注册表。轨迹声明 = 轨迹目录下的 trajectory.json（约束面 + 旧标识 uid + CRO 机器绑定 cro.host；旧名 trajectory-constraint.json / skiff.json 仍在读取族里）；轨迹提示词 = 轨迹目录下的 PROMPT.md（一条轨迹「是谁、按什么章程工作」，所有轨迹通用，追加在容器层与质量层之后，不替换它们）。适配 DSH 0.1.7-rc.1 / 0.2.0-rc.1 / 0.2.1-rc.1（三档，deepseek-ai/deepseek-harness）。",
   "engines": {

package/lib/{ccc-roots-D3ty1C8P.js → ccc-roots-DAwz9Li1.js}

@@ -227,7 +227,7 @@ async function listCccs(ctx, opts = {}) {
 	if (typeof defaultRoot === "string" && defaultRoot !== "" && !c.roots.includes(defaultRoot)) c.roots.unshift(defaultRoot);
 	let rolesOf = null;
 	if (opts.withRoles === true) {
-		const { listTrajectoryConstraints } = await import("./profile-C7BuyZK7.js").then((n) => n.i);
+		const { listTrajectoryConstraints } = await import("./profile-5TQ_C1xi.js").then((n) => n.i);
 		rolesOf = (root) => {
 			try {
 				return listTrajectoryConstraints(root).map((p) => p.code);

package/lib/index.js

@@ -1,12 +1,12 @@
 import { i as __toESM, n as __exportAll } from "./rolldown-runtime-B4iAMlE-.js";
-import { c as hostInjected, d as hostSessions, f as hostSettings, h as hostWebServer, i as cccRootForExec, l as hostLlm, m as hostWeb, n as agentCwdFor, o as listCccs, p as hostSubagents, r as cccRootForCwd, s as hostAgents, t as NO_CCC_FROM_AGENT_CWD, u as hostService } from "./ccc-roots-D3ty1C8P.js";
+import { c as hostInjected, d as hostSessions, f as hostSettings, h as hostWebServer, i as cccRootForExec, l as hostLlm, m as hostWeb, n as agentCwdFor, o as listCccs, p as hostSubagents, r as cccRootForCwd, s as hostAgents, t as NO_CCC_FROM_AGENT_CWD, u as hostService } from "./ccc-roots-DAwz9Li1.js";
 import { _ as resolveInside, a as findSerenityRoot$1, c as matchBlacklist, d as readCccName$1, f as readCheapWorkerConfig, h as readSafeModeHiddenTools, i as findGitRoot, l as pathInside, m as readExclusiveTools, n as SAFE_MODE_MARKER, o as isSafeModeOn, r as classifyPath, s as loadSerenityConfig, t as DEFAULT_SERENITY_CONFIG_PATHS, u as readBlacklist } from "./ccc-CyYJL4F2.js";
-import { A as sessionEvents, B as isoLocal, C as listSessions, E as parseTrajectoryCode, F as trajectoryDescOf, H as localHuman, I as useSession, L as TRAJECTORY_FILENAME, M as setActiveSessionInfo, N as showSession, O as readTrajectoryUid, P as summarize, R as TRAJECTORY_LEGACY_FILENAMES, S as listActiveTrajectories, T as parseSessionContextFromEvents, U as localIdStamp, V as localFileStamp, _ as createSession, a as readTrajectoryConstraintAt, b as getActiveSessionInfo, c as trajectoryConstraintForSession, f as COGNITIVE_TRAJECTORY_ACTIONS, g as clearActiveSessionInfo, h as archiveSession, j as sessionsRoot, k as resolveSessionByTitle, m as UID_FILENAME, n as isTrajectoryConstrained, o as readTrajectoryConstraintByCode, r as listTrajectoryConstraints, s as replacesDefaultIdentity, t as TRAJECTORY_CONSTRAINT_FILENAME, v as extractSessionMdPathFromText, w as namingTitleFor, y as findSession, z as readTrajectoryFile } from "./profile-C7BuyZK7.js";
+import { A as sessionEvents, B as isoLocal, C as listSessions, E as parseTrajectoryCode, F as trajectoryDescOf, H as localHuman, I as useSession, L as TRAJECTORY_FILENAME, M as setActiveSessionInfo, N as showSession, O as readTrajectoryUid, P as summarize, R as TRAJECTORY_LEGACY_FILENAMES, S as listActiveTrajectories, T as parseSessionContextFromEvents, U as localIdStamp, V as localFileStamp, _ as createSession, a as readTrajectoryConstraintAt, b as getActiveSessionInfo, c as trajectoryConstraintForSession, f as COGNITIVE_TRAJECTORY_ACTIONS, g as clearActiveSessionInfo, h as archiveSession, j as sessionsRoot, k as resolveSessionByTitle, m as UID_FILENAME, n as isTrajectoryConstrained, o as readTrajectoryConstraintByCode, r as listTrajectoryConstraints, s as replacesDefaultIdentity, t as TRAJECTORY_CONSTRAINT_FILENAME, v as extractSessionMdPathFromText, w as namingTitleFor, y as findSession, z as readTrajectoryFile } from "./profile-5TQ_C1xi.js";
 import { n as checkLocalstoreGitCompliance, o as readStore, s as runLocalStore, t as LOCALSTORE_SCOPES } from "./service-DDmHSglV.js";
-import { _ as ACC_VERSION, a as listBoundSessionIds, d as constraintCognitiveTrajectory, f as constraintSystemPromptSource, g as resolveConstraintSystemPrompt, h as profileToolWhitelist, i as carrierState, l as TRAJECTORY_CONSTRAINT_HINT, n as PLUGIN_SOURCE, o as readLastBound, r as appendBound, s as resolveSessionCognitiveTrajectoryLabel, t as ACC_MESSAGE_KIND, v as findPackageRoot } from "./message-source-BJO5q-rD.js";
-import { A as buildResourceIndex, C as verifyPassword, D as recordToolUsage, E as verifyTotpCode, F as hasTrajectoryPrompt, M as isSafeSkillName, N as truncateContent, O as REFERENCE_DIR, P as TRAJECTORY_PROMPT_FILENAME, S as toWire, T as MECHANISM_PORTS, _ as registerEntrySkillSectionGlobal, a as trajectoryConstraintFor, b as projectKnownWorkspaces, c as trajectoryWorkspaceMdPath, d as CHEAP_WORKER_GUIDE, f as providerAvailabilityError, g as registerEntrySkillSection, h as registerCognitiveTrajectorySkillSection, i as getTrajectoryAgent, j as buildResourceNameSuffix, k as SKILL_ONTOLOGY_FILE, l as unregisterTrajectorySession, m as splitModel, n as createTrajectoryAgent, o as trajectoryConstraintMsmGate, p as requireWhitelistedModel, r as ensureWorkspacePromptSection, s as trajectoryConstraintParticipates, t as askTrajectory, u as workspaceCognitiveTrajectoryLine, v as applyWirePatch, w as FACE_PORTS, x as readAdvancedSettings, y as migrateLegacyLocalstore } from "./session-B4eZD3Hv.js";
+import { _ as ACC_VERSION, a as listBoundSessionIds, d as constraintCognitiveTrajectory, f as constraintSystemPromptSource, g as resolveConstraintSystemPrompt, h as profileToolWhitelist, i as carrierState, l as TRAJECTORY_CONSTRAINT_HINT, n as PLUGIN_SOURCE, o as readLastBound, r as appendBound, s as resolveSessionCognitiveTrajectoryLabel, t as ACC_MESSAGE_KIND, v as findPackageRoot } from "./message-source-DK2CnXlh.js";
+import { A as buildResourceIndex, C as verifyPassword, D as recordToolUsage, E as verifyTotpCode, F as hasTrajectoryPrompt, M as isSafeSkillName, N as truncateContent, O as REFERENCE_DIR, P as TRAJECTORY_PROMPT_FILENAME, S as toWire, T as MECHANISM_PORTS, _ as registerEntrySkillSectionGlobal, a as trajectoryConstraintFor, b as projectKnownWorkspaces, c as trajectoryWorkspaceMdPath, d as CHEAP_WORKER_GUIDE, f as providerAvailabilityError, g as registerEntrySkillSection, h as registerCognitiveTrajectorySkillSection, i as getTrajectoryAgent, j as buildResourceNameSuffix, k as SKILL_ONTOLOGY_FILE, l as unregisterTrajectorySession, m as splitModel, n as createTrajectoryAgent, o as trajectoryConstraintMsmGate, p as requireWhitelistedModel, r as ensureWorkspacePromptSection, s as trajectoryConstraintParticipates, t as askTrajectory, u as workspaceCognitiveTrajectoryLine, v as applyWirePatch, w as FACE_PORTS, x as readAdvancedSettings, y as migrateLegacyLocalstore } from "./session-BYC1uWi0.js";
 import { n as hasSessionLogById, r as sessionsRootDir } from "./cleanup-C-92qnDs.js";
-import { n as readSimpleSettings, r as registerSettingsSection } from "./settings-Bb4OnEdI.js";
+import { n as readSimpleSettings, r as registerSettingsSection } from "./settings-B-vn8j4g.js";
 import { REGISTERED_TOOLS } from "./invariant.js";
 import { a as readFeishuCredential, d as weixinSessionIdForTrajectory, i as matchWeixinRoute, l as sanitizeFileName$1, n as extractWeixinText, o as readWeixinCredential, r as hasVoiceItem, s as readWeixinSettings, t as extractWeixinMedia, u as weixinInboundDir } from "./route-Dr0SFD8A.js";
 import { c as sendTextMessage, i as getUpdates, l as sendTyping, n as downloadMedia, o as markdownToPlainText, r as getConfig, s as sendFileMessage, t as TypingStatus, u as sniffImageExt } from "./ilink-BMk2w2KY.js";
@@ -819,6 +819,7 @@ function runGit(root, args) {
 			if (!scoped && !hasChanges(root)) return "(nothing to commit — working tree clean)";
 			const addR = git(root, scoped ? [
 				"add",
+				"-A",
 				"--",
 				...paths
 			] : ["add", "-A"]);
@@ -14077,7 +14078,7 @@ function registerStatusApi(ctx, opts = {}) {
 						});
 					}
 					const { saveWeixinRoutes } = await import("./route-Dr0SFD8A.js").then((n) => n.c);
-					const { findDirNameByCode } = await import("./profile-C7BuyZK7.js").then((n) => n.i);
+					const { findDirNameByCode } = await import("./profile-5TQ_C1xi.js").then((n) => n.i);
 					for (const r of routes) if (findDirNameByCode(root, r.trajectory) === null) {
 						sendJson$2(res, 400, { error: `unknown trajectory: ${r.trajectory} (no such trajectory code in ${root})` });
 						return;
@@ -19074,7 +19075,7 @@ const MEDIA_MAX_BYTES = 20971520;
 */
 async function resolveCccRootByAlias(ctx, alias) {
 	try {
-		const { listCccs } = await import("./ccc-roots-D3ty1C8P.js").then((n) => n.a);
+		const { listCccs } = await import("./ccc-roots-DAwz9Li1.js").then((n) => n.a);
 		const entries = await listCccs(ctx);
 		const byName = entries.find((e) => e.name === alias);
 		if (byName) return byName.root;
@@ -19142,7 +19143,7 @@ async function resolveInboundTarget(ctx, input) {
 		});
 		return null;
 	}
-	const { findDirNameByCode } = await import("./profile-C7BuyZK7.js").then((n) => n.i);
+	const { findDirNameByCode } = await import("./profile-5TQ_C1xi.js").then((n) => n.i);
 	if (findDirNameByCode(root, target.role) === null) {
 		const detail = `目标 CCC "${target.ccc}" 内没有编码为 "${target.role}" 的认知轨迹`;
 		console.error(`[serenity-hooks] ✗ human-channel: ${detail}（account=${input.account} user=${input.user}）—— 该消息**未投递**，请改订阅表里的目标编码`);
@@ -19982,7 +19983,7 @@ function syncHumanChannel(ctx) {
 	(async () => {
 		try {
 			stopMachineLoops();
-			const { listCccs } = await import("./ccc-roots-D3ty1C8P.js").then((n) => n.a);
+			const { listCccs } = await import("./ccc-roots-DAwz9Li1.js").then((n) => n.a);
 			for (const entry of await listCccs(ctx)) syncCccBridge(ctx, entry.root);
 		} catch {}
 	})();
@@ -20246,7 +20247,7 @@ function matchCcc(input, candidates) {
 }
 /** 组装候选列表（`ccc-roots.listCccs` 投影 + `.serenity` 名；动态 import 保持本模块静态依赖轻量） */
 async function collectCandidates(ctx) {
-	const { listCccs } = await import("./ccc-roots-D3ty1C8P.js").then((n) => n.a);
+	const { listCccs } = await import("./ccc-roots-DAwz9Li1.js").then((n) => n.a);
 	const entries = await listCccs(ctx, { defaultRoot: process.cwd() });
 	const seen = /* @__PURE__ */ new Set();
 	const out = [];

package/lib/{message-source-BJO5q-rD.js → message-source-DK2CnXlh.js}

@@ -1,6 +1,6 @@
-import { r as cccRootForCwd } from "./ccc-roots-D3ty1C8P.js";
+import { r as cccRootForCwd } from "./ccc-roots-DAwz9Li1.js";
 import { _ as resolveInside, g as readUtf8 } from "./ccc-CyYJL4F2.js";
-import { A as sessionEvents, E as parseTrajectoryCode, b as getActiveSessionInfo, j as sessionsRoot, x as getLastActiveSessionInfo } from "./profile-C7BuyZK7.js";
+import { A as sessionEvents, E as parseTrajectoryCode, b as getActiveSessionInfo, j as sessionsRoot, x as getLastActiveSessionInfo } from "./profile-5TQ_C1xi.js";
 import { dirname, join } from "node:path";
 import { existsSync, mkdirSync, readFileSync, readdirSync, renameSync, statSync, writeFileSync } from "node:fs";
 import { fileURLToPath } from "node:url";

package/lib/{profile-C7BuyZK7.js → profile-5TQ_C1xi.js}

@@ -271,6 +271,32 @@ const ARCHIVED_DIR = "_archived";
 function sessionsRoot(root) {
 	return join(root, "AGENT_SESSIONS");
 }
+/** 归档区绝对路径（`<CCC>/AGENT_SESSIONS/_archived`） */
+function archivedSessionsDir(sessionsDir) {
+	return join(sessionsDir, ARCHIVED_DIR);
+}
+/**
+* **编码是否已被占用**（活跃区 ＋ 归档区，**全仓**）。
+*
+* 🔴 为什么必须扫归档区（2026-10-20，S222 报告 / owner 转 S142 处置）：
+* 编码是**终身身份**（AXIOM 3），而归档只改位置、不改身份 ⇒
+* 若分配器只看活跃区，归档过的码会被**重新发出**，于是同一个身份挂在两个载体上
+* （实测：`S222` 活跃＋归档并存；更早 `S140` 被两条轨迹共用，08-27 就登记过、一直没判据）。
+* 一个可复用的身份码会让历史 `send-now` / 唤醒条目 / 文档引用**静默指向另一个对象**。
+*
+* ⚠️ 与 `readAllSessions` 的分工：那个函数回答"**眼下有哪些活跃轨迹**"（该跳 `_` 前缀），
+*    本函数回答"**这个码有没有人用过**"（必须看全仓）。**两个问题，两个扫描域** ——
+*    把它们合并成一个才是错的。
+*
+* @returns 撞车时返回**占用者的完整路径**（活跃区优先说明）；无冲突 ⇒ `null`
+*/
+function findCodeCollision(sessionsDir, code) {
+	for (const dir of [sessionsDir, archivedSessionsDir(sessionsDir)]) {
+		const hit = readAllSessions(dir).find((s) => parseTrajectoryCode(s.dirName) === code);
+		if (hit) return hit.path;
+	}
+	return null;
+}
 /**
 * 解析 SESSION.md 存在性。
 *
@@ -572,10 +598,14 @@ function createSession(opts) {
 	if (desc.length > 200) throw new Error(`description too long: ${desc.length} chars (max 200)`);
 	const sessions = readAllSessions(sessionsDir);
 	let code;
-	if (requestedId !== void 0 && requestedId !== "") code = requestedId;
-	else {
+	if (requestedId !== void 0 && requestedId !== "") {
+		code = requestedId;
+		const dup = findCodeCollision(sessionsDir, code);
+		if (dup !== null) throw new Error(`编码「${code}」已被占用：${dup}\n认知轨迹的编码是**终身身份**（AXIOM 3：identity = 编码），归档不会释放它 —— 归档只改位置，不改身份。
+⇒ 换一个编码（\`create --id <新码>\`），或用 \`create\` 的自动分配（会跳过全部已用码）。`);
+	} else {
 		let maxId = 0;
-		for (const s of sessions) {
+		for (const s of [...sessions, ...readAllSessions(archivedSessionsDir(sessionsDir))]) {
 			const m = parseTrajectoryCode(s.dirName)?.match(/^S(\d{3,})$/);
 			if (m) {
 				const num = parseInt(m[1], 10);

package/lib/{session-B4eZD3Hv.js → session-BYC1uWi0.js}

@@ -1,8 +1,8 @@
-import { n as agentCwdFor, r as cccRootForCwd, s as hostAgents } from "./ccc-roots-D3ty1C8P.js";
+import { n as agentCwdFor, r as cccRootForCwd, s as hostAgents } from "./ccc-roots-DAwz9Li1.js";
 import { g as readUtf8, o as isSafeModeOn, p as readCognitiveTrajectorySkills, u as readBlacklist } from "./ccc-CyYJL4F2.js";
-import { B as isoLocal, D as readActiveSessionMd, a as readTrajectoryConstraintAt, c as trajectoryConstraintForSession, d as unregisterTrajectorySession$1, j as sessionsRoot, l as registerTrajectorySession$1, p as DEFAULT_SESSION_SCOPE, u as trajectoryDirNameForSession } from "./profile-C7BuyZK7.js";
+import { B as isoLocal, D as readActiveSessionMd, a as readTrajectoryConstraintAt, c as trajectoryConstraintForSession, d as unregisterTrajectorySession$1, j as sessionsRoot, l as registerTrajectorySession$1, p as DEFAULT_SESSION_SCOPE, u as trajectoryDirNameForSession } from "./profile-5TQ_C1xi.js";
 import { a as readGitTrack, i as localstorePath } from "./service-DDmHSglV.js";
-import { _ as ACC_VERSION, d as constraintCognitiveTrajectory, m as profileMsmWhitelist, n as PLUGIN_SOURCE, o as readLastBound, p as createProfilePromptReader, u as buildTrajectoryBasePrompt } from "./message-source-BJO5q-rD.js";
+import { _ as ACC_VERSION, d as constraintCognitiveTrajectory, m as profileMsmWhitelist, n as PLUGIN_SOURCE, o as readLastBound, p as createProfilePromptReader, u as buildTrajectoryBasePrompt } from "./message-source-DK2CnXlh.js";
 import { basename, dirname, join, resolve } from "node:path";
 import { chmodSync, existsSync, mkdirSync, readFileSync, readdirSync, renameSync, statSync, writeFileSync } from "node:fs";
 import { createUserMessage } from "@deepseek-ai/dsh-llm";

package/lib/{settings-Bb4OnEdI.js → settings-B-vn8j4g.js}

@@ -1,4 +1,4 @@
-import { f as hostSettings } from "./ccc-roots-D3ty1C8P.js";
+import { f as hostSettings } from "./ccc-roots-DAwz9Li1.js";
 //#region src/surface/settings.ts
 /**
 * 设置面板命名空间 = **profile 条目 id**（v0.1.7 起；与旧 `settings.yaml` 段名逐字相同）。

package/lib/trajectory/core.d.ts

@@ -79,6 +79,24 @@ export declare function sessionEvents<T = unknown>(session: unknown): readonly T
 /** 归档区目录名（`_` 前缀 ⇒ 不是轨迹，见 readAllSessions 的跳过判据） */
 export declare const ARCHIVED_DIR = "_archived";
 export declare function sessionsRoot(root: string): string;
+/** 归档区绝对路径（`<CCC>/AGENT_SESSIONS/_archived`） */
+export declare function archivedSessionsDir(sessionsDir: string): string;
+/**
+ * **编码是否已被占用**（活跃区 ＋ 归档区，**全仓**）。
+ *
+ * 🔴 为什么必须扫归档区（2026-10-20，S222 报告 / owner 转 S142 处置）：
+ * 编码是**终身身份**（AXIOM 3），而归档只改位置、不改身份 ⇒
+ * 若分配器只看活跃区，归档过的码会被**重新发出**，于是同一个身份挂在两个载体上
+ * （实测：`S222` 活跃＋归档并存；更早 `S140` 被两条轨迹共用，08-27 就登记过、一直没判据）。
+ * 一个可复用的身份码会让历史 `send-now` / 唤醒条目 / 文档引用**静默指向另一个对象**。
+ *
+ * ⚠️ 与 `readAllSessions` 的分工：那个函数回答"**眼下有哪些活跃轨迹**"（该跳 `_` 前缀），
+ *    本函数回答"**这个码有没有人用过**"（必须看全仓）。**两个问题，两个扫描域** ——
+ *    把它们合并成一个才是错的。
+ *
+ * @returns 撞车时返回**占用者的完整路径**（活跃区优先说明）；无冲突 ⇒ `null`
+ */
+export declare function findCodeCollision(sessionsDir: string, code: string): string | null;
 /**
  * 轨迹的**存在形态**（🔴 **2026-10-18 起不再是"生命周期"**）。
  *

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@shgroup/dsh-serenity-hooks",
-  "version": "1.79.2",
+  "version": "1.79.3",
   "description": "宁静号 ACC harness（Native Cordis 插件）——给 DeepSeek Harness 装一个「AI 工作区」：14 个工具（container_fs/cognitive_trajectory/dashboard/container_git/msm/praxis/ontology/serenity-skill-creator/cheap-worker/localstore/container_admin；另三个 im-bridge/acc-diag/diagram 按配置条件出现）+ 机械约束（安全模式/工作区围墙/密钥守卫/对外输出守卫）+ 认知轨迹日志与原地重建 + 网页登录入口/IM 桥/认知轨迹唤醒注册表。轨迹声明 = 轨迹目录下的 trajectory.json（约束面 + 旧标识 uid + CRO 机器绑定 cro.host；旧名 trajectory-constraint.json / skiff.json 仍在读取族里）；轨迹提示词 = 轨迹目录下的 PROMPT.md（一条轨迹「是谁、按什么章程工作」，所有轨迹通用，追加在容器层与质量层之后，不替换它们）。适配 DSH 0.1.7-rc.1 / 0.2.0-rc.1 / 0.2.1-rc.1（三档）。",
   "license": "MIT",
   "repository": {