@rezti/dsh-rez-suite 0.1.35 → 0.1.37

package/lib/index.js

@@ -2864,21 +2864,23 @@ function isLegalAssistantRoom(hint) {
 	return roomFolderFromPath(hint) === LEGAL_ROOM_FOLDER;
 }
 function isQccToolName(name) {
-	return name.startsWith("mcp__qcc-") || name.startsWith("mcp__qcc__");
+	return /^mcp__qcc(?:-|__|_)/.test(name);
 }
-/** Session cwd from a tool execution. Missing / unknown shapes → undefined. */
-function cwdFromExecution(execution) {
-	const agent = execution.agent;
-	if (typeof agent !== "object" || agent === null) return void 0;
-	const record = agent;
+function readCwdFromObject(value) {
+	if (typeof value !== "object" || value === null) return void 0;
+	const record = value;
 	const session = record.session;
 	const header = typeof session === "object" && session !== null ? session.header : void 0;
 	const candidates = [
-		typeof header === "object" && header !== null ? header.cwd : void 0,
+		record.cwd,
 		typeof session === "object" && session !== null ? session.cwd : void 0,
-		record.cwd
+		typeof header === "object" && header !== null ? header.cwd : void 0
 	];
-	for (const value of candidates) if (typeof value === "string" && value.trim().length > 0) return value;
+	for (const item of candidates) if (typeof item === "string" && item.trim().length > 0) return item;
+}
+/** Session cwd from a tool execution. Missing / unknown shapes → undefined. */
+function cwdFromExecution(execution) {
+	return readCwdFromObject(execution) ?? readCwdFromObject(execution.session) ?? readCwdFromObject(execution.agent);
 }
 /**
 * Official `ctx.tools.guard` reason. Only Qichacha tools are gated.
@@ -2919,9 +2921,14 @@ function mcpToolPrefix(server) {
 }
 /** Count tools whose public name belongs to one composed MCP server. */
 function countMcpTools(toolNames, server) {
-	const prefix = mcpToolPrefix(server);
 	let count = 0;
-	for (const name of toolNames) if (name.startsWith(prefix)) count += 1;
+	for (const name of toolNames) {
+		if (server === "qcc") {
+			if (isQccToolName(name)) count += 1;
+			continue;
+		}
+		if (name.startsWith(mcpToolPrefix(server))) count += 1;
+	}
 	return count;
 }
 function listRegisteredToolNames(tools) {

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@rezti/dsh-rez-suite",
   "description": "ReZ-TI one-package install for DeepSeek Harness. Update with: dsh plugin --profile web update @rezti/dsh-rez-suite",
-  "version": "0.1.35",
+  "version": "0.1.37",
   "type": "module",
   "engines": {
     "node": "^22.19.0 || >=24.0.0"

package/src/observe-mcp.ts

@@ -8,7 +8,7 @@
 
 import { lastMcpStartError, REZ_CREDENTIAL_REFS, secretConfigured, type RezSystem } from '@rezti/dsh-rez-sso'
 import type { RezConfig, RezServerStatus, RezTestResult } from './protocol.ts'
-import { isLegalAssistantRoom, QCC_STATUS_ROOM_OFF } from './rooms.ts'
+import { isLegalAssistantRoom, isQccToolName, QCC_STATUS_ROOM_OFF } from './rooms.ts'
 
 export const COMPOSED_SERVERS = ['odoo', 'nextcloud', 'wechat', 'homeassistant', 'tapd', 'gsc', 'qcc', 'tianyancha'] as const
 
@@ -21,10 +21,13 @@ export function mcpToolPrefix(server: string): string {
 
 /** Count tools whose public name belongs to one composed MCP server. */
 export function countMcpTools(toolNames: readonly string[], server: string): number {
-  const prefix = mcpToolPrefix(server)
   let count = 0
   for (const name of toolNames) {
-    if (name.startsWith(prefix)) count += 1
+    if (server === 'qcc') {
+      if (isQccToolName(name)) count += 1
+      continue
+    }
+    if (name.startsWith(mcpToolPrefix(server))) count += 1
   }
   return count
 }

package/src/rooms.ts

@@ -25,29 +25,36 @@ export function isLegalAssistantRoom(hint: string | undefined): boolean {
 }
 
 export function isQccToolName(name: string): boolean {
-  return name.startsWith('mcp__qcc-') || name.startsWith('mcp__qcc__')
+  return /^mcp__qcc(?:-|__|_)/.test(name)
 }
 
-/** Session cwd from a tool execution. Missing / unknown shapes → undefined. */
-export function cwdFromExecution(execution: { agent?: unknown }): string | undefined {
-  const agent = execution.agent
-  if (typeof agent !== 'object' || agent === null) return undefined
-  const record = agent as Record<string, unknown>
+function readCwdFromObject(value: unknown): string | undefined {
+  if (typeof value !== 'object' || value === null) return undefined
+  const record = value as Record<string, unknown>
   const session = record.session
   const header = typeof session === 'object' && session !== null
     ? (session as Record<string, unknown>).header
     : undefined
   const candidates = [
-    typeof header === 'object' && header !== null ? (header as Record<string, unknown>).cwd : undefined,
-    typeof session === 'object' && session !== null ? (session as Record<string, unknown>).cwd : undefined,
     record.cwd,
+    typeof session === 'object' && session !== null ? (session as Record<string, unknown>).cwd : undefined,
+    typeof header === 'object' && header !== null ? (header as Record<string, unknown>).cwd : undefined,
   ]
-  for (const value of candidates) {
-    if (typeof value === 'string' && value.trim().length > 0) return value
+  for (const item of candidates) {
+    if (typeof item === 'string' && item.trim().length > 0) return item
   }
   return undefined
 }
 
+/** Session cwd from a tool execution. Missing / unknown shapes → undefined. */
+export function cwdFromExecution(execution: { agent?: unknown; session?: unknown; cwd?: unknown }): string | undefined {
+  return (
+    readCwdFromObject(execution)
+    ?? readCwdFromObject(execution.session)
+    ?? readCwdFromObject(execution.agent)
+  )
+}
+
 /**
  * Official `ctx.tools.guard` reason. Only Qichacha tools are gated.
  * Must never throw: this guard is global and a throw would block WeChat turns.