dsh-automations 0.1.0 → 0.2.0

package/CHANGELOG.md

@@ -1,5 +1,12 @@
 # Changelog
 
+## 0.2.0 — 2026-11-06
+
+- 面板拆成「规则 / 运行」两个 tab：规则页只放规则卡片与模板，运行页展示完整运行历史（含触发类型、退出码、可展开输出），tab 选择记在 `localStorage`。
+- shell 动作的工作目录有了默认值：规则里留空时使用 `defaultCwd` 配置，未配置则用**用户主目录**（不再落到宿主进程目录）。新建规则时表单会**预填**这个默认路径。
+- 新增配置项 `defaultCwd`。
+- 自检增至 14 项（默认工作目录、面板视图的 `defaultCwd`）。
+
 ## 0.1.0 — 2026-11-06
 
 首个版本。
@@ -12,3 +19,4 @@
 - 同一 turn 的多条 `user/message` 事件按 turn 去重，一条用户消息只触发一次。
 - 中性命令串行执行队列（上限 200），触发侧 cooldown。
 - 12 项离线自检（`node test/selftest.mjs`）。
+

package/README.md

@@ -41,7 +41,7 @@
 
 | 类型 | 做什么 | 说明 |
 |---|---|---|
-| `shell` | 起一个**非交互**子进程 | `command`、`cwd`、`shell`（`auto`/`powershell`/`cmd`/`bash`）、`timeoutMs`。捕获 stdout+stderr 尾部与退出码；超时会杀掉整个进程树 |
+| `shell` | 起一个**非交互**子进程 | `command`、`cwd`、`shell`（`auto`/`powershell`/`cmd`/`bash`）、`timeoutMs`。捕获 stdout+stderr 尾部与退出码；超时会杀掉整个进程树。**`cwd` 留空 = `defaultCwd`（默认用户主目录）** |
 | `http` | 发一个 HTTP 请求 | `url`、`method`、`headers`（JSON 对象字符串）、`body`、`timeoutMs`。适合 webhook、飞书机器人、本地探活 |
 | `log` | 只写一条运行记录 | 无副作用，用来验证「时机到底有没有命中」 |
 
@@ -62,10 +62,12 @@ DSH_AUTOMATION_CONTEXT     一行 JSON（kind/sessionId/tool/source/at）
 
 ## 3. 面板
 
-- 左栏图标 → 主区页面：统计条、规则卡片（启停 / 运行 / 编辑 / 删除）、最近运行（点开看输出）。
-- 「新建规则」用同一份 **catalog** 动态生成表单：选触发时机后只出现相关字段，换动作同理。
+- 左栏图标 → 主区页面：统计条 + **「规则 / 运行」两个 tab**。
+- **规则** tab：规则卡片（启停 / 运行 / 编辑 / 删除）；空面板时给三个模板（启动写日志、每天 08:30 探活、会话空闲记录）。
+- **运行** tab：完整运行历史（时间 / 规则 / 触发类型 / 状态 / 耗时），点一行展开输出，展开头部带触发与退出码。
+- tab 选择记在 `localStorage`，刷新后停在上次那个 tab。
+- 「新建规则」用同一份 **catalog** 动态生成表单：选触发时机后只出现相关字段，换动作同理；shell 规则的**工作目录会预填默认路径**（见下节）。
 - 「试运行」不保存也能执行一次，便于调命令。
-- 首次使用提供三个模板：启动写日志、每天 08:30 探活、会话空闲记录。
 
 界面文案跟随 DSH 的语言（中文 / English）。
 
@@ -104,6 +106,7 @@ $DSH_HOME/storages/dsh-automations/
     maxRunHistory: 200
     maxOutputChars: 8000
     defaultTimeoutMs: 120000
+    defaultCwd: ""            # shell 规则的默认工作目录；空 = 用户主目录
     startupDelayMs: 2000
     tickSeconds: 15
     promptEnabled: true

package/lib/actions.js

@@ -7,6 +7,7 @@
  */
 
 import { spawn, spawnSync } from "node:child_process";
+import { homedir } from "node:os";
 
 import { tailText } from "./util.js";
 
@@ -96,7 +97,7 @@ export function shellInvocation(action) {
  *
  * @param {object} action - normalized shell action.
  * @param {object} context - trigger context.
- * @param {{timeoutMs: number, maxOutputChars: number}} limits - resolved limits.
+ * @param {{timeoutMs: number, maxOutputChars: number, defaultCwd: string}} limits - resolved limits.
  * @returns {Promise<ActionOutcome>}
  */
 function runShell(action, context, limits) {
@@ -127,7 +128,7 @@ function runShell(action, context, limits) {
 
 		try {
 			child = spawn(file, args, {
-				cwd: typeof action.cwd === "string" && action.cwd.trim() !== "" ? action.cwd : process.cwd(),
+				cwd: typeof action.cwd === "string" && action.cwd.trim() !== "" ? action.cwd : limits.defaultCwd,
 				env: childEnv(context),
 				windowsHide: true,
 				windowsVerbatimArguments: verbatim,
@@ -220,7 +221,11 @@ export function createActions({ settings }) {
 		 * @returns {Promise<ActionOutcome & {durationMs: number}>}
 		 */
 		async run(action, context) {
-			const limits = { timeoutMs: settings.defaultTimeoutMs, maxOutputChars: settings.maxOutputChars };
+			const limits = {
+				timeoutMs: settings.defaultTimeoutMs,
+				maxOutputChars: settings.maxOutputChars,
+				defaultCwd: settings.defaultCwd !== "" ? settings.defaultCwd : homedir(),
+			};
 			const started = Date.now();
 			if (action.type === "shell") return runShell(action, context, limits);
 			if (action.type === "http") return runHttp(action, limits);

package/lib/client.js

@@ -102,6 +102,15 @@ window.__ModuleLoader__.load({
 			".dsha_stat span{font-size:11.5px;color:var(--dsw-alias-label-secondary,#8a8f98)}",
 			".dsha_section{margin-top:22px}",
 			".dsha_h2{display:flex;align-items:center;gap:8px;margin:0 0 10px;font-size:12.5px;font-weight:600;color:var(--dsw-alias-label-secondary,#8a8f98);text-transform:none}",
+			".dsha_tabs{display:flex;gap:4px;border-bottom:1px solid var(--dsw-alias-border-l1,rgba(127,127,127,.22));margin:0 0 16px}",
+			".dsha_tab{appearance:none;display:inline-flex;align-items:center;gap:6px;border:none;border-bottom:2px solid transparent;background:transparent;color:var(--dsw-alias-label-secondary,#8a8f98);font:inherit;font-size:13px;padding:7px 10px;margin-bottom:-1px;cursor:pointer}",
+			".dsha_tab:hover{color:var(--dsw-alias-label-primary,#e6e8ee)}",
+			".dsha_tab:focus-visible{outline:2px solid var(--dsw-alias-brand-primary,#5b8def);outline-offset:-2px}",
+			".dsha_tab[aria-selected=true]{color:var(--dsw-alias-label-primary,#e6e8ee);border-bottom-color:var(--dsw-alias-brand-primary,#5b8def)}",
+			".dsha_tab .dsha_badge{font-size:10px;padding:0 6px}",
+			".dsha_runrow .dsha_badge{flex:none;max-width:150px;overflow:hidden;text-overflow:ellipsis;white-space:nowrap}",
+			".dsha_runmeta{padding:6px 11px;border-top:1px solid var(--dsw-alias-border-l1,rgba(127,127,127,.18));font-size:11.5px;color:var(--dsw-alias-label-secondary,#8a8f98);white-space:nowrap;overflow:hidden;text-overflow:ellipsis}",
+			".dsha_runbox .dsha_pre{border-top:none}",
 			".dsha_card{display:flex;align-items:flex-start;gap:12px;box-sizing:border-box;border:1px solid var(--dsw-alias-border-l1,rgba(127,127,127,.22));border-radius:10px;background:var(--dsw-alias-bg-layer-1,rgba(127,127,127,.05));padding:12px 14px;margin-bottom:8px}",
 			".dsha_card[data-off=true]{opacity:.55}",
 			".dsha_glyph{flex:none;width:30px;height:30px;border-radius:8px;display:flex;align-items:center;justify-content:center;background:var(--dsw-alias-bg-layer-2,rgba(127,127,127,.14));color:var(--dsw-alias-brand-primary,#5b8def)}",
@@ -130,7 +139,7 @@ window.__ModuleLoader__.load({
 			".dsha_runrow{display:flex;align-items:center;gap:10px;padding:7px 11px;font-size:12px;cursor:pointer}",
 			".dsha_runrow:hover{background:var(--dsw-alias-bg-layer-2,rgba(127,127,127,.08))}",
 			".dsha_runat{flex:none;width:112px;color:var(--dsw-alias-label-secondary,#8a8f98);font-variant-numeric:tabular-nums}",
-			".dsha_runname{flex:1 1 auto;min-width:0;overflow:hidden;text-overflow:ellipsis;white-space:nowrap}",
+			".dsha_runname{flex:0 1 auto;max-width:45%;min-width:0;overflow:hidden;text-overflow:ellipsis;white-space:nowrap}",
 			".dsha_runstatus{flex:none;width:56px;font-size:11.5px}",
 			".dsha_runstatus[data-status=ok]{color:var(--dsw-alias-state-success-primary,#34a853)}",
 			".dsha_runstatus[data-status=error]{color:var(--dsw-alias-state-error-primary,#e5534b)}",
@@ -623,8 +632,25 @@ window.__ModuleLoader__.load({
 			const [busyId, setBusyId] = useState("");
 			const [toast, setToast] = useState(null);
 			const [openRun, setOpenRun] = useState("");
+			const [tab, setTab] = useState(() => {
+				try {
+					return window.localStorage.getItem("dsha.tab") === "runs" ? "runs" : "rules";
+				} catch {
+					return "rules";
+				}
+			});
 			const toastTimer = useRef(null);
 
+			/** @param {"rules"|"runs"} next - tab to activate. */
+			const switchTab = useCallback((next) => {
+				setTab(next);
+				try {
+					window.localStorage.setItem("dsha.tab", next);
+				} catch {
+					/* storage may be unavailable */
+				}
+			}, []);
+
 			/** @param {string} message - toast text. @param {string} [kind] - error|info. */
 			const notify = useCallback((message, kind = "info") => {
 				setToast({ message, kind });
@@ -654,11 +680,20 @@ window.__ModuleLoader__.load({
 				return () => window.clearInterval(timer);
 			}, [refresh]);
 
+			const defaultCwd = typeof view?.defaultCwd === "string" ? view.defaultCwd : "";
+
 			const openEditor = useCallback((rule) => {
-				setDraft(rule === null || rule === undefined ? emptyDraft() : draftFromRule(rule));
+				let next;
+				if (rule === null || rule === undefined) {
+					next = emptyDraft();
+					if (defaultCwd !== "") next = { ...next, action: { ...next.action, cwd: defaultCwd } };
+				} else {
+					next = draftFromRule(rule);
+				}
+				setDraft(next);
 				setModalError("");
 				setTestResult(null);
-			}, []);
+			}, [defaultCwd]);
 
 			const saveDraft = useCallback(async () => {
 				if (draft === null) return;
@@ -730,6 +765,11 @@ window.__ModuleLoader__.load({
 			const runs = view?.runs ?? [];
 			const stats = view?.stats ?? { total: 0, enabled: 0, runsToday: 0, lastRunAt: null, busy: 0 };
 			const catalog = view?.catalog ?? { triggers: [], actions: [] };
+			/** @param {string} type - trigger type. @returns {string} localised trigger name. */
+			const triggerNameOf = (type) => {
+				const spec = (catalog.triggers ?? []).find((entry) => entry.type === type);
+				return spec ? catalogLabel(spec) : String(type ?? "");
+			};
 
 			const templates = useMemo(() => [
 				{
@@ -794,7 +834,7 @@ window.__ModuleLoader__.load({
 							h("h1", { className: "dsha_h1" }, T("生命周期自动化", "Automations")),
 							h("p", { className: "dsha_sub" }, T("在 DSH 生命周期与时机点自动执行命令、HTTP 请求或记录。", "Run a command, HTTP request or log line at DSH lifecycle moments.")),
 						),
-						h("button", { type: "button", className: "dsha_btn primary", onClick: () => openEditor(null) }, T("＋ 新建规则", "+ New rule")),
+						h("button", { type: "button", className: "dsha_btn primary", onClick: () => { switchTab("rules"); openEditor(null); } }, T("＋ 新建规则", "+ New rule")),
 					),
 					loadError ? h("div", { className: "dsha_err", role: "alert" }, loadError) : null,
 
@@ -809,43 +849,59 @@ window.__ModuleLoader__.load({
 
 					h(
 						"div",
-						{ className: "dsha_section" },
-						h("h2", { className: "dsha_h2" }, T("规则", "Rules"), h("span", { className: "dsha_badge" }, String(rules.length))),
-						rules.length === 0
-							? h("div", { className: "dsha_empty" },
-								h("div", null, T("还没有自动化规则。从一个模板开始：", "No automations yet. Start from a template:")),
-								h("div", { className: "dsha_tpls" },
-									templates.map((template) => h("button", { key: template.key, type: "button", className: "dsha_tpl", onClick: () => setDraft(template.build()) },
-										h("b", null, template.title),
-										h("span", null, template.desc),
-									)),
-								),
-							)
-							: rules.map((rule) => h(RuleCard, { key: rule.id, rule, catalog, busyId, onRun: runRule, onEdit: openEditor, onDelete: deleteRule, onToggle: toggleRule })),
+						{ className: "dsha_tabs", role: "tablist" },
+						h("button", { type: "button", className: "dsha_tab", role: "tab", "aria-selected": tab === "rules", onClick: () => switchTab("rules") },
+							T("规则", "Rules"), h("span", { className: "dsha_badge" }, String(rules.length))),
+						h("button", { type: "button", className: "dsha_tab", role: "tab", "aria-selected": tab === "runs", onClick: () => switchTab("runs") },
+							T("运行", "Runs"), h("span", { className: "dsha_badge" }, String(runs.length))),
 					),
 
-					h(
-						"div",
-						{ className: "dsha_section" },
-						h("h2", { className: "dsha_h2" }, T("最近运行", "Recent runs"), h("span", { className: "dsha_badge" }, String(runs.length))),
-						runs.length === 0
-							? h("div", { className: "dsha_empty" }, T("还没有运行记录。点规则上的「运行」可以试一次。", "No runs yet. Use “Run” on a rule to try one."))
-							: h("div", { className: "dsha_runs" },
-								runs.slice(0, 12).map((run) => h(
-									"div",
-									{ key: run.id, className: "dsha_runbox" },
-									h("div", { className: "dsha_runrow", role: "button", tabIndex: 0, onClick: () => setOpenRun(openRun === run.id ? "" : run.id), onKeyDown: (event) => { if (event.key === "Enter") setOpenRun(openRun === run.id ? "" : run.id); } },
-										h("span", { className: "dsha_runat" }, fmtClock(run.at)),
-										h("span", { className: "dsha_runname", title: run.ruleName }, run.ruleName),
-										h("span", { className: "dsha_runstatus", "data-status": run.status }, statusLabel(run.status)),
-										h("span", { className: "dsha_rundur" }, fmtDuration(run.durationMs)),
+					tab === "rules"
+						? h(
+							"div",
+							{ className: "dsha_section", role: "tabpanel" },
+							rules.length === 0
+								? h("div", { className: "dsha_empty" },
+									h("div", null, T("还没有自动化规则。从一个模板开始：", "No automations yet. Start from a template:")),
+									h("div", { className: "dsha_tpls" },
+										templates.map((template) => h("button", { key: template.key, type: "button", className: "dsha_tpl", onClick: () => setDraft(template.build()) },
+											h("b", null, template.title),
+											h("span", null, template.desc),
+										)),
 									),
-									openRun === run.id
-										? h("pre", { className: "dsha_pre" }, run.output || run.error || T("（无输出）", "(no output)"))
-										: null,
-								)),
-							),
-					),
+								)
+								: rules.map((rule) => h(RuleCard, { key: rule.id, rule, catalog, busyId, onRun: runRule, onEdit: openEditor, onDelete: deleteRule, onToggle: toggleRule })),
+						)
+						: h(
+							"div",
+							{ className: "dsha_section", role: "tabpanel" },
+							runs.length === 0
+								? h("div", { className: "dsha_empty" }, T("还没有运行记录。去「规则」页点一次「运行」试试。", "No runs yet. Use “Run” on a rule to try one."))
+								: h("div", { className: "dsha_runs" },
+									runs.map((run) => h(
+										"div",
+										{ key: run.id, className: "dsha_runbox" },
+										h("div", { className: "dsha_runrow", role: "button", tabIndex: 0, onClick: () => setOpenRun(openRun === run.id ? "" : run.id), onKeyDown: (event) => { if (event.key === "Enter") setOpenRun(openRun === run.id ? "" : run.id); } },
+											h("span", { className: "dsha_runat" }, fmtClock(run.at)),
+											h("span", { className: "dsha_runname", title: run.ruleName }, run.ruleName),
+											h("span", { className: "dsha_badge" }, triggerNameOf(run.trigger)),
+											h("span", { className: "dsha_grow" }),
+											h("span", { className: "dsha_runstatus", "data-status": run.status }, statusLabel(run.status)),
+											h("span", { className: "dsha_rundur" }, fmtDuration(run.durationMs)),
+										),
+										openRun === run.id
+											? h(React.Fragment, null,
+												h("div", { className: "dsha_runmeta" },
+													T("触发：", "Trigger: ") + triggerNameOf(run.trigger)
+													+ T(" · 退出码 ", " · exit ") + (run.exitCode ?? "-")
+													+ (run.error ? " · " + run.error : ""),
+												),
+												h("pre", { className: "dsha_pre" }, run.output || T("（无输出）", "(no output)")),
+											)
+											: null,
+									)),
+								),
+						),
 
 					h("p", { className: "dsha_sub", style: { marginTop: 22, fontSize: 11.5 } },
 						T("规则保存在 ", "Rules live in ") + (view.stateDir ?? "") + T("；宿主启动于 ", "; host booted ") + fmtClock(view.bootedAt) + T("。", "."),

package/lib/config.js

@@ -30,6 +30,8 @@ export const Config = schema === undefined ? undefined : schema.object({
 	maxOutputChars: schema.natural().default(DEFAULTS.maxOutputChars),
 	/** Default per-run timeout when the action does not set one. */
 	defaultTimeoutMs: schema.natural().default(DEFAULTS.defaultTimeoutMs),
+	/** Working directory for shell actions whose rule leaves `cwd` empty; empty = user home. */
+	defaultCwd: schema.string().default(DEFAULTS.defaultCwd),
 	/** Grace period after host boot before `startup` rules run. */
 	startupDelayMs: schema.natural().default(DEFAULTS.startupDelayMs),
 	/** Resolution of the daily / interval scheduler, in seconds. */

package/lib/http.js

@@ -9,6 +9,8 @@
  * @module dsh-automations/http
  */
 
+import { homedir } from "node:os";
+
 import { ACTION_CATALOG, normalizeRule, RuleError, summarizeAction, summarizeTrigger, TRIGGER_CATALOG } from "./model.js";
 import { localDay } from "./util.js";
 import { VERSION } from "./version.js";
@@ -48,10 +50,10 @@ async function readJsonBody(request) {
 /**
  * Build the panel view.
  *
- * @param {{store: object, engine: {busy: Function}, hub: {bootedAt: string}}} parts - live pieces.
+ * @param {{store: object, engine: {busy: Function}, hub: {bootedAt: string}, settings: object}} parts - live pieces.
  * @returns {object}
  */
-export function buildView({ store, engine, hub }) {
+export function buildView({ store, engine, hub, settings }) {
 	const rules = store.list().map((rule) => ({
 		...rule,
 		triggerSummary: summarizeTrigger(rule.trigger, "zh"),
@@ -66,6 +68,8 @@ export function buildView({ store, engine, hub }) {
 		now: new Date().toISOString(),
 		bootedAt: hub.bootedAt,
 		stateDir: store.dir,
+		/** Prefill for a new shell rule's working directory. */
+		defaultCwd: settings?.defaultCwd !== undefined && settings.defaultCwd !== "" ? settings.defaultCwd : homedir(),
 		rules,
 		runs,
 		stats: {
@@ -85,10 +89,10 @@ export function buildView({ store, engine, hub }) {
 /**
  * Register every route on the authenticated API bridge.
  *
- * @param {{ctx: object, store: object, engine: object, hub: object, log: object}} options
+ * @param {{ctx: object, store: object, engine: object, hub: object, settings: object, log: object}} options
  * @returns {() => void} disposer for all routes.
  */
-export function registerRoutes({ ctx, store, engine, hub, log }) {
+export function registerRoutes({ ctx, store, engine, hub, settings, log }) {
 	const bridge = ctx.get("connection")?.fetch;
 	if (bridge === undefined || typeof bridge.register !== "function") {
 		log?.warn?.("[dsh-automations] connection.fetch unavailable; panel API disabled");
@@ -125,7 +129,7 @@ export function registerRoutes({ ctx, store, engine, hub, log }) {
 		if (typeof dispose === "function") disposers.push(dispose);
 	};
 
-	const view = () => buildView({ store, engine, hub });
+	const view = () => buildView({ store, engine, hub, settings });
 
 	route(`${BASE}/state`, ["GET"], async () => ({ body: view() }));
 

package/lib/index.js

@@ -94,7 +94,7 @@ export function apply(ctx, config) {
 	// The panel API needs the authenticated connection bridge; mounting the
 	// route plugin lazily keeps headless compositions (no bridge) loadable.
 	ctx.inject(["connection"], (routeCtx) => {
-		routeCtx.effect(() => registerRoutes({ ctx: routeCtx, store, engine, hub, log }), "dsh-automations: panel api");
+		routeCtx.effect(() => registerRoutes({ ctx: routeCtx, store, engine, hub, settings, log }), "dsh-automations: panel api");
 	});
 
 	if (settings.promptEnabled) {

package/lib/model.js

@@ -157,7 +157,7 @@ export const ACTION_CATALOG = [
 		hintEn: "Spawn a non-interactive local process and capture output/exit code",
 		fields: [
 			{ key: "command", label: "命令", labelEn: "Command", type: "textarea", default: "", placeholder: "Get-Date | Out-File $env:USERPROFILE\\boot.log -Append", required: true },
-			{ key: "cwd", label: "工作目录（可空）", labelEn: "Working directory (optional)", type: "text", default: "" },
+			{ key: "cwd", label: "工作目录（可空）", labelEn: "Working directory (optional)", type: "text", default: "", hint: "留空 = 用户主目录；新建规则时会预填默认值", hintEn: "Empty = user home directory; new rules prefill the default" },
 			{
 				key: "shell",
 				label: "解释器",

package/lib/settings.js

@@ -13,6 +13,8 @@ export const DEFAULTS = Object.freeze({
 	maxRunHistory: 200,
 	maxOutputChars: 8000,
 	defaultTimeoutMs: 120000,
+	/** Working directory for shell actions whose rule leaves `cwd` empty; "" = user home. */
+	defaultCwd: "",
 	startupDelayMs: 2000,
 	tickSeconds: 15,
 	promptEnabled: true,
@@ -46,6 +48,7 @@ export function resolveConfig(raw) {
 		maxRunHistory: positiveInteger(config.maxRunHistory, DEFAULTS.maxRunHistory),
 		maxOutputChars: positiveInteger(config.maxOutputChars, DEFAULTS.maxOutputChars),
 		defaultTimeoutMs: positiveInteger(config.defaultTimeoutMs, DEFAULTS.defaultTimeoutMs),
+		defaultCwd: typeof config.defaultCwd === "string" ? config.defaultCwd.trim() : "",
 		startupDelayMs: Number.isSafeInteger(startupDelay) && startupDelay >= 0 ? startupDelay : DEFAULTS.startupDelayMs,
 		tickSeconds: positiveInteger(config.tickSeconds, DEFAULTS.tickSeconds),
 		promptEnabled: config.promptEnabled !== false,

package/lib/version.js

@@ -5,4 +5,4 @@
  * @module dsh-automations/version
  */
 
-export const VERSION = "0.1.0";
+export const VERSION = "0.2.0";

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dsh-automations",
-  "version": "0.1.0",
+  "version": "0.2.0",
   "description": "Lifecycle and event driven automations for DeepSeek Harness: run a command, an HTTP request or a log entry when DSH boots, a session starts, ends or goes idle, a message arrives, a tool finishes, or on a daily/interval schedule.",
   "type": "module",
   "license": "MIT",