dsh-harmonyos-hiboard 0.8.0 → 0.9.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dsh-harmonyos-hiboard",
-  "version": "0.8.0",
+  "version": "0.9.0",
   "description": "把DSH的任务结果，以服务卡片形式推送到华为鸿蒙负一屏 ｜ Push DSH task results to the Huawei HarmonyOS assistant-today screen as service cards.",
   "author": "Jim Chen",
   "license": "MIT",

package/src/lib/client.js

@@ -95,12 +95,19 @@ window.__ModuleLoader__.load({
         guardBudget: function (g) {
           return '重试预算：确定未送达 ' + g.retryCount + ' 次 / 可能已送达 ' + g.ambiguousRetryCount + ' 次　·　schedule_id 兜底：' + g.defaultScheduleId;
         },
-        ruleTitle: '常驻推送规则',
+        ruleTitle: '每轮对话推送',
         ruleOn: '已启用',
         ruleOff: '未启用',
         ruleHint: '保存授权码时，会自动把「每轮都要推送」写进全局指令文件 AGENTS.md（带标记、可随时移除），新会话即生效。',
         ruleCustom: '检测到你已手写过推送规则 —— 插件不会改动你的 AGENTS.md。',
         ruleBlockPresent: 'AGENTS.md 里已有本插件维护的规则段（带标记；关掉即可移除）。',
+        sourceTitle: '推送源名称',
+        sourceCurrent: function (v) {
+          return '当前生效：' + v;
+        },
+        sourcePlaceholder: 'DeepSeek Harness',
+        sourceHint: '负一屏卡片上显示的「来源 / AI 工具名」。改这里，本机所有推送（含启动卡片）会一起改用同一个名称。输入框留空并保存即恢复默认。',
+        sourceReset: '恢复默认',
         debugTitle: '兜底战绩',
         debugSummary: function (c) {
           return '已救回 ' + (c.retryOk + c.rescueOk) + ' 次（重试 ' + c.retryOk + ' · 补推 ' + c.rescueOk + '）';
@@ -144,12 +151,19 @@ window.__ModuleLoader__.load({
         guardBudget: function (g) {
           return 'Retry budget: definitely-undelivered ' + g.retryCount + ' / possibly-delivered ' + g.ambiguousRetryCount + '　·　schedule_id fallback: ' + g.defaultScheduleId;
         },
-        ruleTitle: 'Always-push rule',
+        ruleTitle: 'Push every turn',
         ruleOn: 'enabled',
         ruleOff: 'disabled',
         ruleHint: 'Saving the authCode also writes an "every turn must push" rule into your global instruction file AGENTS.md (marker-delimited, removable); new sessions pick it up.',
         ruleCustom: 'You already wrote a push rule by hand, so this plugin leaves AGENTS.md untouched.',
         ruleBlockPresent: "AGENTS.md already carries this plugin's rule block (marker-delimited; switch this off to remove it).",
+        sourceTitle: 'Push source name',
+        sourceCurrent: function (v) {
+          return 'Currently: ' + v;
+        },
+        sourcePlaceholder: 'DeepSeek Harness',
+        sourceHint: 'The brand / AI tool name shown on the card. Changing it moves every push on this machine (including the startup card) to the same name. Save an empty value to restore the default.',
+        sourceReset: 'Reset',
         debugTitle: 'Rescues so far',
         debugSummary: function (c) {
           return 'Saved ' + (c.retryOk + c.rescueOk) + ' (retries ' + c.retryOk + ', pushes ' + c.rescueOk + ')';
@@ -300,6 +314,26 @@ window.__ModuleLoader__.load({
             setNote((data.notes && data.notes[0]) || '');
           });
         };
+        var sourceState = useState('');
+        var sourceDraft = sourceState[0];
+        var setSourceDraft = sourceState[1];
+        var onSaveSource = function () {
+          setBusy('source');
+          setNote('');
+          post({ source: sourceDraft }).then(function (data) {
+            setBusy('');
+            if (data && data.notes && data.notes[0]) setNote(data.notes[0]);
+          });
+        };
+        var onResetSource = function () {
+          setSourceDraft('');
+          setBusy('source');
+          setNote('');
+          post({ source: '' }).then(function (data) {
+            setBusy('');
+            if (data && data.notes && data.notes[0]) setNote(data.notes[0]);
+          });
+        };
         var onToggleRule = function (next) {
           setBusy('rule');
           setNote('');
@@ -344,7 +378,7 @@ window.__ModuleLoader__.load({
           disabled: busy === 'auth',
           onChange: function (event) { setDraft(event.target.value); },
           onKeyDown: function (event) { if (event.key === 'Enter') onSave(); },
-          style: { flex: '1 1 220px', minWidth: '0' }
+          style: { flex: '1 1 300px', minWidth: '300px' }
         });
 
         var preview = null;
@@ -446,6 +480,60 @@ window.__ModuleLoader__.load({
               )
             : null,
 
+          // ---- 每轮对话推送（保存授权码时自动写进全局指令文件）----
+          h(
+            'div',
+            { style: { marginTop: '14px', paddingTop: '12px', borderTop: '1px solid ' + V.border } },
+            row([
+              h('span', { style: { fontWeight: 600 } }, t.ruleTitle),
+              h('span', { style: { color: V.sub } }, rule && rule.enabled ? t.ruleOn : t.ruleOff),
+              h(Switch, {
+                checked: Boolean(rule && rule.enabled),
+                onChange: onToggleRule,
+                label: t.ruleTitle,
+                disabled: busy === 'rule' || !rule
+              })
+            ]),
+            muted(
+              rule && rule.customRule ? t.ruleCustom : rule && rule.block ? t.ruleBlockPresent : t.ruleHint,
+              { marginTop: '6px' }
+            )
+          ),
+
+          // ---- 推送源名称：改一处，本机所有推送一起改 ----
+          h(
+            'div',
+            { style: { marginTop: '14px', paddingTop: '12px', borderTop: '1px solid ' + V.border } },
+            row([
+              h('span', { style: { fontWeight: 600 } }, t.sourceTitle),
+              h(
+                'span',
+                { style: { color: V.sub } },
+                t.sourceCurrent(String((summary.data && summary.data.source) || t.sourcePlaceholder))
+              )
+            ]),
+            h(
+              'div',
+              { style: { display: 'flex', gap: '8px', flexWrap: 'wrap', alignItems: 'center', marginTop: '6px' } },
+              [
+                h(Input, {
+                  type: 'text',
+                  value: sourceDraft,
+                  placeholder: t.sourcePlaceholder,
+                  spellCheck: false,
+                  autoComplete: 'off',
+                  disabled: busy === 'source',
+                  onChange: function (event) { setSourceDraft(event.target.value); },
+                  onKeyDown: function (event) { if (event.key === 'Enter') onSaveSource(); },
+                  style: { flex: '1 1 300px', minWidth: '300px' }
+                }),
+                h(Button, { variant: 'primary', size: 'sm', onClick: onSaveSource, disabled: busy === 'source' }, t.save),
+                h(Button, { variant: 'ghost', size: 'sm', onClick: onResetSource, disabled: busy === 'source' }, t.sourceReset)
+              ]
+            ),
+            muted(t.sourceHint, { marginTop: '6px' })
+          ),
+
           // ---- 推送兜底 + 调试图 ----
           h(
             'div',
@@ -483,26 +571,6 @@ window.__ModuleLoader__.load({
               showDebug ? h('div', { style: { marginTop: '4px' } }, debugBody) : null
             )
           ),
-
-          // ---- 常驻推送规则：保存授权码时自动写进全局指令文件 ----
-          h(
-            'div',
-            { style: { marginTop: '14px', paddingTop: '12px', borderTop: '1px solid ' + V.border } },
-            row([
-              h('span', { style: { fontWeight: 600 } }, t.ruleTitle),
-              h('span', { style: { color: V.sub } }, rule && rule.enabled ? t.ruleOn : t.ruleOff),
-              h(Switch, {
-                checked: Boolean(rule && rule.enabled),
-                onChange: onToggleRule,
-                label: t.ruleTitle,
-                disabled: busy === 'rule' || !rule
-              })
-            ]),
-            muted(
-              rule && rule.customRule ? t.ruleCustom : rule && rule.block ? t.ruleBlockPresent : t.ruleHint,
-              { marginTop: '6px' }
-            )
-          )
         );
       };
     }

package/src/lib/index.js

@@ -61,7 +61,19 @@ const DEFAULT_RESULT = "任务已完成";
  * name); the platform accepts other values, but rendering is platform-defined,
  * so check a real card after changing it.
  */
-const WIRE_SOURCE = "OpenClaw";
+/**
+ * The HIBoard contract brands cards by this value — the phone renders it as the
+ * card's brand / tool name. It defaults to `"DeepSeek Harness"` (this project's
+ * branding; the official today-task skill and hwpush send `"OpenClaw"` for the
+ * same field, and the platform accepts either — rendering of a custom value is
+ * platform-defined, so look at a real card after changing it).
+ *
+ * Overridable via the `source` config option, which the settings card exposes as
+ * 「推送源名称」. Other local pushers (e.g. the startup/token card in
+ * `dsh-token-broadcast`) read this same value from the plugin's config file, so
+ * one edit moves the whole machine to one brand.
+ */
+const WIRE_SOURCE = "DeepSeek Harness";
 
 /** Environment fallback for the authCode. */
 const AUTH_CODE_ENV = "DSH_HIBOARD_AUTH_CODE";
@@ -454,7 +466,7 @@ function hiboardVerifyTool({ resolveAuthCode, settings }) {
  * 不继承 dsh Connection 的登录认证，本插件也不自己做 Host / Origin 策略。
  * 部署时鉴权必须同时覆盖本路由与 dsh 本身；不想暴露就把 settingsCard 设为 false。
  */
-function buildConfigRoute({ authCodeInfo, settings, storeFile }) {
+function buildConfigRoute({ authCodeInfo, settings, storeFile, selfcheckReport }) {
 	const SOURCE_LABEL = {
 		settings: "设置页（本插件配置）",
 		entry: "profile 补丁层 hiboard-push.config.authCode",
@@ -557,6 +569,10 @@ function buildConfigRoute({ authCodeInfo, settings, storeFile }) {
 				defaultScheduleId: s.defaultScheduleId
 			},
 			endpoint: s.pushServiceUrl,
+			// 推送源名称：卡片上显示的"来源 / AI 工具名"
+			source: s.source,
+			// 自检工具是否真的注册上了（失败会被回显，不再静默）
+			selfcheck: selfcheckReport(),
 			storeFile,
 			// 调试图：兜底到底把多少次「原本失败的推送」救了回来
 			audit: auditSummary(),
@@ -639,6 +655,13 @@ function buildConfigRoute({ authCodeInfo, settings, storeFile }) {
 					const text = String(body.defaultScheduleId ?? "").trim();
 					patch.defaultScheduleId = text || null;
 				}
+				// ---- 推送源名称（source）：卡片上显示的"来源 / AI 工具名" ----
+				// 空串 → 清除覆盖，回退到默认 "DeepSeek Harness"
+				if (Object.prototype.hasOwnProperty.call(body, "source")) {
+					const text = String(body.source ?? "").trim();
+					patch.source = text || null;
+					notes.push(text ? `推送源名称已改为「${text}」，本机所有推送都会用它。` : "已恢复默认推送源名称（DeepSeek Harness）。");
+				}
 
 				if (Object.keys(patch).length === 0) {
 					send(400, { error: "没有可保存的字段" });
@@ -730,8 +753,13 @@ function apply(ctx, rawConfig) {
 	ctx.tools.register(hiboardPushTool({ resolveAuthCode, settings }));
 	ctx.tools.register(hiboardVerifyTool({ resolveAuthCode, settings }));
 
+	/** 自检工具的注册结果，由兜底回调写入（见下面的 selfcheckReport）。 */
+	let selfcheckStatus = { ok: null, error: "" };
+
 	// ---- 推送兜底（原 dsh-push-guard，现并入本包）：默认开启，可实时关闭 ----
 	applyPushGuard(ctx, {
+		// 注册成败都要回显：失败原本只写了一条**看不见的** warn
+		onSelfcheckRegister: (result) => { selfcheckStatus = result; },
 		// 静态值：只有把 guardEnabled:false 写死在配置里，才会整个不加载
 		enabled: entry.guardEnabled !== false,
 		// 实时值：每次判定都重新读，设置页一关就立即停
@@ -745,6 +773,8 @@ function apply(ctx, rawConfig) {
 		// 让兜底走"实时解析"而不是把挂载时的值钉死，
 		// 否则设置页里新存的授权码要等重启才对兜底生效。
 		resolveAuthCode,
+		// 同理实时解析：设置页改了「推送源名称」，兜底补推的卡片也要立刻跟着变
+		resolveSource: () => settings().source,
 		pushServiceUrl: settings().pushServiceUrl,
 		maxContentLength: settings().maxContentLength,
 		defaultResult: settings().defaultResult,
@@ -754,12 +784,23 @@ function apply(ctx, rawConfig) {
 		source: settings().source
 	});
 
+	/**
+	 * 自检工具的注册状态（**回显给设置页**）。
+	 * `registered` 取实时查询 —— 即便注册被延迟或撤下也能如实反映；
+	 * `error` 是注册时捕获到的原因。没有它，注册失败就只剩一条无处可见的 warn：
+	 * 本机 `~/.dsh/logs` 下没有该进程的日志文件（2026-10-13 验收报告第 5 节）。
+	 */
+	const selfcheckReport = () => ({
+		registered: Boolean(ctx.tools?.get?.("hiboard_push_selfcheck")),
+		error: selfcheckStatus.error || ""
+	});
+
 	// ---- 设置页路由 ----
 	// webServer 只在 web profile 存在，而 cordis 没有"可选注入"的写法，
 	// 所以走一次 scoped inject：服务不在时闭包根本不执行，插件照常加载。
 	if (settings().settingsCard && typeof ctx.inject === "function") {
 		ctx.inject(["webServer"], (scope) => {
-			const route = buildConfigRoute({ authCodeInfo, settings, storeFile });
+			const route = buildConfigRoute({ authCodeInfo, settings, storeFile, selfcheckReport });
 			// 挂在 effect 上：插件被关掉时路由一起撤下，否则它会继续为一个
 			// 已关闭的插件读写配置（modsearch 踩过这个坑，见其 dsh/index.js 注释）。
 			scope.effect(() => scope.webServer.register(route), "hiboard-push: settings route");

package/src/lib/push-guard.js

@@ -83,7 +83,7 @@ const DEFAULTS = {
 	retryCount: 3,
 	ambiguousRetryCount: 1,
 	defaultResult: "任务已完成",
-	source: "OpenClaw",
+	source: "DeepSeek Harness",
 	defaultScheduleId: "dsh_worklog",
 	stateDir: "",
 	minPromiseLength: 120,
@@ -123,7 +123,8 @@ export const Config = z.object({
 	defaultResult: z.string().default(DEFAULTS.defaultResult),
 	/**
 	 * 卡片 `source` 字段 —— 就是负一屏上那个**来源 / AI 工具名**的品牌化渲染值。
-	 * 默认 `"OpenClaw"`：与官方 `today-task` skill、`hwpush` 以及本插件历史行为一致。
+	 * 默认 `"DeepSeek Harness"`（本项目品牌）。官方 `today-task` skill 与 `hwpush` 在同一
+	 * 字段上发的是 `"OpenClaw"`，平台两者都接受。可在设置卡片「推送源名称」里改。
 	 * 实测平台**接受**任意值（自定义值同样返回 `0000000000`），但渲染样式由平台决定，
 	 * 换值后请先在真机上看一眼卡片再长期使用。
 	 */
@@ -488,7 +489,13 @@ export function apply(ctx, config) {
 		).trim();
 	const pushUrl = String(settings.pushServiceUrl || DEFAULTS.pushServiceUrl);
 	const maxLen = Number(settings.maxContentLength) > 0 ? Number(settings.maxContentLength) : DEFAULTS.maxContentLength;
-	const cardSource = String(settings.source ?? "").trim() || DEFAULTS.source;
+	/**
+	 * 卡片来源（负一屏上的"来源 / AI 工具名"）**实时解析**：设置页改一次，
+	 * 之后**所有**卡片（含兜底补推的那张）都用新值，而不是钉在挂载那一刻。
+	 */
+	const resolveCardSource = () =>
+		String((typeof settings.resolveSource === "function" ? settings.resolveSource() : settings.source) ?? "").trim() ||
+		DEFAULTS.source;
 	const retryBudget = Math.max(0, Number(settings.retryCount) >= 0 ? Number(settings.retryCount) : DEFAULTS.retryCount);
 	const ambiguousBudget = Math.max(0, Number(settings.ambiguousRetryCount) >= 0 ? Number(settings.ambiguousRetryCount) : DEFAULTS.ambiguousRetryCount);
 	const stateDir = String(settings.stateDir || "").trim() || join(homedir(), ".dsh", "lan", "push-guard");
@@ -514,7 +521,7 @@ export function apply(ctx, config) {
 		retryEnabled: settings.retryEnabled !== false,
 		retryCount: retryBudget,
 		ambiguousRetryCount: ambiguousBudget,
-		source: cardSource,
+		source: resolveCardSource(),
 		defaultScheduleId: String(settings.defaultScheduleId || DEFAULTS.defaultScheduleId),
 		stateDir
 	};
@@ -522,7 +529,7 @@ export function apply(ctx, config) {
 	ctx.logger?.info?.(
 		"[push-guard] 启动自检：authCode=%s；L1 抢救=%s，L2 承诺兜底=%s，L3 重试=%s（确定未送达 %d 次 / 可能已送达 %d 次）；卡片来源=%s；schedule_id 兜底=%s；状态目录=%s",
 		startup.authCode, startup.rescueEnabled, startup.promiseRescueEnabled, startup.retryEnabled,
-		retryBudget, ambiguousBudget, cardSource, startup.defaultScheduleId, stateDir
+		retryBudget, ambiguousBudget, resolveCardSource(), startup.defaultScheduleId, stateDir
 	);
 	if (startup.authCode === "MISSING") {
 		ctx.logger?.warn?.("[push-guard] ⚠️ 未配置 authCode，任何兜底推送都会失败（请检查 hiboard-push / push-guard 配置）");
@@ -618,7 +625,7 @@ export function apply(ctx, config) {
 						// 兜底卡片同样必须是"能点开"的：schedule_id 为空时用默认分组
 						defaultScheduleId: String(settings.defaultScheduleId || DEFAULTS.defaultScheduleId),
 						// 兜底卡片与正常卡片用同一个来源名（负一屏上显示的 AI 工具名）
-						source: cardSource,
+						source: resolveCardSource(),
 						stateDir,
 						audit
 					});
@@ -776,16 +783,26 @@ export function apply(ctx, config) {
 					schema: {
 						type: "object",
 						additionalProperties: false,
+						// ⚠️ `required` 必须写在**对象层**，不能写进每个属性节点。
+						// 本工具没有走 defineTool()（那个会把 DSL 编译掉），而是把裸对象直接
+						// 交给 ctx.tools.register()，于是要过 dsh-tools 的
+						// assertSupportedJsonSchema —— 它只允许 required 出现在 type:"object" 上。
+						// 写成属性级 `required: true` 会抛 JsonSchemaError，而被下面的 catch 吞掉，
+						// 表现为"自检工具根本不存在"且毫无提示（2026-10-13 验收实测）。
+						required: [
+							"guardActive", "hooked", "authCode", "source", "retryBudget",
+							"endpoint", "endpointReachable", "lastState", "auditTail"
+						],
 						properties: {
-							guardActive: { type: "boolean", required: true },
-							hooked: { type: "boolean", required: true },
-							authCode: { type: "string", required: true },
-							source: { type: "string", required: true },
-							retryBudget: { type: "string", required: true },
-							endpoint: { type: "string", required: true },
-							endpointReachable: { type: "boolean", required: true },
-							lastState: { type: "string", required: true },
-							auditTail: { type: "string", required: true }
+							guardActive: { type: "boolean" },
+							hooked: { type: "boolean" },
+							authCode: { type: "string" },
+							source: { type: "string" },
+							retryBudget: { type: "string" },
+							endpoint: { type: "string" },
+							endpointReachable: { type: "boolean" },
+							lastState: { type: "string" },
+							auditTail: { type: "string" }
 						}
 					},
 					render(_args, value) {
@@ -832,7 +849,7 @@ export function apply(ctx, config) {
 						guardActive: !guardOff(),
 						hooked,
 						authCode: resolveAuthCode() ? "已配置" : "未配置（推送会失败）",
-						source: cardSource,
+						source: resolveCardSource(),
 						retryBudget: `确定未送达 ${retryBudget} 次 / 可能已送达 ${ambiguousBudget} 次`,
 						endpoint: pushUrl,
 						endpointReachable: reachable,
@@ -841,10 +858,24 @@ export function apply(ctx, config) {
 					};
 				}
 			});
+			try {
+				settings.onSelfcheckRegister?.({ ok: true, error: "" });
+			} catch {
+				/* 上报失败不影响工具本身 */
+			}
 			return () => off();
 		}, "push-guard: self-check tool");
 	} catch (error) {
-		ctx.logger?.warn?.("[push-guard] 注册自检工具失败（已忽略）：%s", error?.message ?? String(error));
+		const message = String(error?.message ?? error);
+		ctx.logger?.warn?.("[push-guard] 注册自检工具失败：%s", message);
+		// **不再静默**：把失败回显给宿主，设置页会在 /hiboard-push/config 里报
+		// selfcheck.registered=false。本机 ~/.dsh/logs 下没有该进程的日志文件，warn
+		// 是无处可见的 —— 2026-10-13 的验收就是因为这一点完全无感（报告第 5 节）。
+		try {
+			settings.onSelfcheckRegister?.({ ok: false, error: message });
+		} catch {
+			/* 上报失败不该影响其它功能 */
+		}
 	}
 }