cli-mergeguard 7.0.32 → 7.0.34

package/broker.mjs

@@ -25,6 +25,19 @@ const EVALUATION_SCHEMA = 'skill-automatic-evaluation/1.0'
 const IDENTIFIER_PATTERN = /^[A-Za-z0-9][A-Za-z0-9._:-]{0,127}$/
 const REQUEST_SCHEMA_PATTERN = /^([A-Za-z0-9.-]+\.skill)\.request\/([0-9]+\.[0-9]+)$/
 const TRANSPORT_ERROR_CODE_PATTERN = /^[A-Z][A-Z0-9_]{1,63}$/
+const NETWORK_TRANSPORT_ERROR = 'NETWORK_TRANSPORT'
+const SKILL_INVOCATION_ERROR = 'SKILL_INVOCATION_FAILED'
+
+class OfficialSkillInvocationError extends Error {
+  constructor(context, operation, transportCode) {
+    super(`${context.displayName} ${operation} invocation failed: network transport ${transportCode}`)
+    this.name = 'OfficialSkillInvocationError'
+    this.code = NETWORK_TRANSPORT_ERROR
+    this.operation = operation
+    this.retryable = false
+    this.transportCode = transportCode
+  }
+}
 
 function asObject(value, label) {
   if (!value || typeof value !== 'object' || Array.isArray(value)) {
@@ -237,6 +250,29 @@ export function transportFailureCode(error) {
   return 'UNKNOWN_TRANSPORT_ERROR'
 }
 
+export function officialSkillFailureResponse(error) {
+  if (error instanceof OfficialSkillInvocationError) {
+    return {
+      ok: false,
+      error: {
+        code: error.code,
+        message: error.message,
+        operation: error.operation,
+        retryable: error.retryable,
+        transportCode: error.transportCode,
+      },
+    }
+  }
+  return {
+    ok: false,
+    error: {
+      code: SKILL_INVOCATION_ERROR,
+      message: error instanceof Error ? error.message : 'Skill invocation failed',
+      retryable: false,
+    },
+  }
+}
+
 export async function invokeOfficialSkill(context, operation, input, dependencies) {
   const environment = asObject(dependencies.environment, 'broker environment')
   if (typeof dependencies.request !== 'function') {
@@ -253,9 +289,7 @@ export async function invokeOfficialSkill(context, operation, input, dependencie
       signal: AbortSignal.timeout(CALL_TIMEOUT_MS),
     })
   } catch (error) {
-    throw new Error(
-      `${context.displayName} ${operation} invocation failed: network transport ${transportFailureCode(error)}`,
-    )
+    throw new OfficialSkillInvocationError(context, operation, transportFailureCode(error))
   }
   const payload = await responsePayload(response, `${context.displayName} ${operation} response`)
   if (!response.ok || payload.ok !== true) {

package/installer.mjs

@@ -13,6 +13,7 @@ import {
   brokerCommandInput,
   invokeCommandInput,
   invokeOfficialSkill,
+  officialSkillFailureResponse,
 } from './broker.mjs'
 
 export {
@@ -25,6 +26,7 @@ export {
   callOfficialSkill,
   invokeCommandInput,
   invokeOfficialSkill,
+  officialSkillFailureResponse,
 } from './broker.mjs'
 
 const INSTALL_META = 'install-meta.json'
@@ -184,11 +186,19 @@ async function readBrokerSource(input) {
 }
 
 async function runBrokerInvocation(context, commandInput) {
-  const invocation = await invokeOfficialSkill(
-    context, commandInput.operation, commandInput.input, brokerDependencies(),
-  )
-  console.log(JSON.stringify(invocation))
-  return invocation
+  try {
+    const invocation = await invokeOfficialSkill(
+      context, commandInput.operation, commandInput.input, brokerDependencies(),
+    )
+    console.log(JSON.stringify(invocation))
+    return invocation
+  } catch (error) {
+    const response = officialSkillFailureResponse(error)
+    console.log(JSON.stringify({ response }))
+    console.error(response.error.message)
+    process.exitCode = 1
+    return null
+  }
 }
 
 export async function runIntakeHandshake(context, spec) {

package/package.json

@@ -18,5 +18,5 @@
     "url": "https://github.com/88208555/MergeGuard-clitax.git"
   },
   "type": "module",
-  "version": "7.0.32"
+  "version": "7.0.34"
 }

package/skill/SKILL.md

@@ -5,7 +5,7 @@ description: '智能合并守卫：快照分支+预演+验证式合并+规则衰
 
 # MergeGuard
 
-Package version: v7.0.32
+Package version: v7.0.34
 
 当前实现是“规则编译与守门协议”，不是可直接操作 git 的合并器。任何仓库写入、快照、合并或回滚都必须交给真实 local runner；远程纯运行时一律 fail-closed。
 

package/skill/skill.json

@@ -5,6 +5,6 @@
   "method": "POST",
   "name": "mergeguard",
   "type": "Skill",
-  "version": "v7.0.32",
+  "version": "v7.0.34",
   "schemaVersion": "mergeguard.skill.request/1.0"
 }