@michengai/dsh-automation 0.1.26 → 0.1.28

package/lib/index.js

@@ -15,15 +15,42 @@ import { setApprovalPolicy } from "@deepseek-ai/dsh-user-approval";
 import { WorkspaceId } from "@deepseek-ai/dsh-workspace";
 
 // src/run-title.ts
-function formatRunStamp(iso) {
+var RUN_STAMP_OPTIONS = {
+  year: "numeric",
+  month: "2-digit",
+  day: "2-digit",
+  hour: "2-digit",
+  minute: "2-digit",
+  hourCycle: "h23"
+};
+var zonedRunStampFormatters = /* @__PURE__ */ new Map();
+function runStampFormatter(timeZone2) {
+  const cached2 = zonedRunStampFormatters.get(timeZone2);
+  if (cached2 !== void 0) return cached2;
+  const formatter = new Intl.DateTimeFormat("en-CA", { ...RUN_STAMP_OPTIONS, timeZone: timeZone2 });
+  zonedRunStampFormatters.set(timeZone2, formatter);
+  return formatter;
+}
+function formatRunStamp(iso, timeZone2) {
   const value = new Date(iso);
   if (Number.isNaN(value.getTime())) return iso;
-  const date5 = `${value.getFullYear()}-${String(value.getMonth() + 1).padStart(2, "0")}-${String(value.getDate()).padStart(2, "0")}`;
-  const time3 = `${String(value.getHours()).padStart(2, "0")}:${String(value.getMinutes()).padStart(2, "0")}`;
-  return `${date5} ${time3}`;
+  if (timeZone2 === void 0) {
+    const date5 = `${value.getFullYear()}-${String(value.getMonth() + 1).padStart(2, "0")}-${String(value.getDate()).padStart(2, "0")}`;
+    const time3 = `${String(value.getHours()).padStart(2, "0")}:${String(value.getMinutes()).padStart(2, "0")}`;
+    return `${date5} ${time3}`;
+  }
+  try {
+    const parts = runStampFormatter(timeZone2).formatToParts(value);
+    const part = (type) => parts.find((item) => item.type === type)?.value;
+    const [year, month, day, hour, minute] = ["year", "month", "day", "hour", "minute"].map((type) => part(type));
+    if ([year, month, day, hour, minute].some((item) => item === void 0)) return iso;
+    return `${year}-${month}-${day} ${hour}:${minute}`;
+  } catch {
+    return iso;
+  }
 }
-function automationSessionTitle(taskName, iso) {
-  return `${formatRunStamp(iso)} - ${taskName}`;
+function automationSessionTitle(taskName, iso, timeZone2) {
+  return `${formatRunStamp(iso, timeZone2)} - ${taskName}`;
 }
 
 // src/executor.ts
@@ -151,7 +178,11 @@ async function executeAutomationRun(ctx, definition, run, config2) {
     }));
     await handle.agent.whenIdle();
     await workspace.attachSession(sessionId);
-    pinAutomationSessionTitle(ctx, handle.agent.session, automationSessionTitle(definition.name, run.startedAt ?? run.scheduledFor));
+    pinAutomationSessionTitle(ctx, handle.agent.session, automationSessionTitle(
+      definition.name,
+      run.startedAt ?? run.scheduledFor,
+      definition.timeZone
+    ));
     const firstSeq = handle.agent.session.seq;
     handle.agent.followup(createUserMessage({
       content: [{ type: "text", text: run.promptSnapshot }],
@@ -273,7 +304,7 @@ var AUTOMATION_CREATE_DESCRIPTION = [
   "\u4E3A\u5F53\u524D\u5DE5\u4F5C\u533A\u521B\u5EFA\u4E00\u6761\u72EC\u7ACB DSH \u81EA\u52A8\u5316\uFF1B\u6BCF\u6B21\u89E6\u53D1\u5F00\u542F\u5168\u65B0 Session\uFF0C\u4E0D\u7EE7\u627F\u5F53\u524D\u5BF9\u8BDD\u3002",
   '\u5DE5\u4F5C\u65E5\u65E9\u4E0A 8 \u70B9\u793A\u4F8B\uFF1Akind=weekly, weekdays=["MO","TU","WE","TH","FR"], time="08:00", time_zone="Asia/Shanghai"\u3002',
   "\u540C\u65F6\u652F\u6301 hourly(minute)\u3001monthly(month_day + time) \u548C custom(every_days + time)\u3002",
-  "\u5FC5\u987B\u4F7F\u7528\u663E\u5F0F IANA \u65F6\u533A\u3002\u6700\u77ED\u95F4\u9694 5 \u5206\u949F\u3002\u9ED8\u8BA4\u53EA\u8BFB\uFF1B\u53EA\u6709\u9700\u8981\u6539\u6587\u4EF6\u65F6\u624D\u9009 workspace-write\u3002"
+  "\u5FC5\u987B\u4F7F\u7528\u663E\u5F0F IANA \u65F6\u533A\u3002\u6700\u77ED\u95F4\u9694 5 \u5206\u949F\u3002\u9ED8\u8BA4\u6743\u9650\u6765\u81EA Host\uFF1B\u4E0D\u9700\u8981\u5199\u5165\u65F6\u5E94\u663E\u5F0F\u9009\u62E9 read-only\uFF0C\u53EA\u6709\u9700\u8981\u6539\u6587\u4EF6\u65F6\u624D\u9009 workspace-write\u3002"
 ].join("");
 
 // src/service.ts
@@ -21364,6 +21395,29 @@ function normalizeSchedule(schedule) {
   const selected = new Set(schedule.weekdays);
   return { ...schedule, weekdays: WEEKDAY_ORDER.filter((day) => selected.has(day)) };
 }
+function isEqualSchedule(left, right) {
+  const normalizedLeft = normalizeSchedule(left);
+  const normalizedRight = normalizeSchedule(right);
+  if (normalizedLeft.kind !== normalizedRight.kind || normalizedLeft.timeZone !== normalizedRight.timeZone) {
+    return false;
+  }
+  switch (normalizedLeft.kind) {
+    case "once":
+      return normalizedRight.kind === "once" && normalizedLeft.at === normalizedRight.at;
+    case "interval":
+      return normalizedRight.kind === "interval" && normalizedLeft.everyMinutes === normalizedRight.everyMinutes && normalizedLeft.anchor === normalizedRight.anchor;
+    case "hourly":
+      return normalizedRight.kind === "hourly" && normalizedLeft.minute === normalizedRight.minute;
+    case "daily":
+      return normalizedRight.kind === "daily" && normalizedLeft.time === normalizedRight.time;
+    case "weekly":
+      return normalizedRight.kind === "weekly" && normalizedLeft.time === normalizedRight.time && normalizedLeft.weekdays.length === normalizedRight.weekdays.length && normalizedLeft.weekdays.every((day, index) => day === normalizedRight.weekdays[index]);
+    case "monthly":
+      return normalizedRight.kind === "monthly" && normalizedLeft.day === normalizedRight.day && normalizedLeft.time === normalizedRight.time;
+    case "custom":
+      return normalizedRight.kind === "custom" && normalizedLeft.everyDays === normalizedRight.everyDays && normalizedLeft.time === normalizedRight.time;
+  }
+}
 function scheduleToRRule(schedule) {
   const normalized = normalizeSchedule(schedule);
   if (normalized.kind === "once") {
@@ -21968,7 +22022,7 @@ var AutomationService = class _AutomationService {
         normalizedFields = { ...normalizedFields, workspaceId: target.id, cwd: target.path };
       }
       try {
-        const scheduleChanged = fields.schedule !== void 0 && JSON.stringify(normalizeSchedule(fields.schedule)) !== JSON.stringify(current.schedule);
+        const scheduleChanged = fields.schedule !== void 0 && !isEqualSchedule(fields.schedule, current.schedule);
         if (scheduleChanged && fields.schedule?.kind === "once" && nextOccurrence(fields.schedule, now2) === null) {
           throw new AutomationRequestError("\u4E00\u6B21\u6027\u81EA\u52A8\u5316\u5FC5\u987B\u5B89\u6392\u5728\u672A\u6765\u65F6\u95F4\u3002");
         }

package/lib/types/client/runtime.d.ts

@@ -1,5 +1,8 @@
 import type { ClientRpc } from './contracts.js';
 import type { AutomationSnapshot, CreateAutomationInput, MutateRequest } from './protocol.js';
+export declare function snapshotPollIntervalMs(runs: readonly {
+    readonly status: string;
+}[] | undefined): number;
 export declare function isTransportError(error: unknown): boolean;
 export interface AutomationClientState {
     readonly phase: 'idle' | 'loading' | 'ready' | 'error';

package/lib/types/client/schedule-rail-model.d.ts

@@ -43,6 +43,7 @@ export declare function sessionUpdatedAtIso(value: number | string | undefined,
 export declare function groupScheduledSessions(automations: readonly {
     readonly id: string;
     readonly name: string;
+    readonly timeZone?: string;
 }[], runs: readonly ScheduleRunLike[]): ScheduleRailGroup[];
 export interface OverviewAutomationLike {
     readonly id: string;
@@ -59,8 +60,12 @@ export interface TaskOverviewRow {
 }
 /** 任务总览：每个定义一行；最近一次留有会话的运行决定该行是否可点开。 */
 export declare function deriveTaskOverviewRows(automations: readonly OverviewAutomationLike[], runs: readonly ScheduleRunLike[]): TaskOverviewRow[];
-/** 归档中的、以及宿主已经不认识的 Session，都不应再出现在定时页。 */
-export declare function keepScheduledSessionLink(sessionId: string | undefined, archived: ReadonlySet<string>, presentIds?: ReadonlySet<string>): boolean;
+/** 归档立即摘掉。宿主会话簿经常晚于自动化快照，缺席不能当成已删除。 */
+export declare function keepScheduledSessionLink(sessionId: string | undefined, archived: ReadonlySet<string>, _presentIds?: ReadonlySet<string>): boolean;
+/** 当前打开的是定时会话，但快照还没有这条执行记录时，侧栏应立刻再拉一次。 */
+export declare function scheduledSessionNeedsSnapshotRefresh(sessionId: string | null | undefined, runs: readonly {
+    readonly sessionId?: string;
+}[] | undefined): boolean;
 export declare function collectScheduledSessionIds(runs: readonly {
     readonly sessionId?: string | null;
 }[] | undefined): Set<string>;

package/lib/types/recurrence.d.ts

@@ -1,6 +1,8 @@
 import type { AutomationSchedule } from './types.ts';
 export declare function assertValidSchedule(schedule: AutomationSchedule): void;
 export declare function normalizeSchedule(schedule: AutomationSchedule): AutomationSchedule;
+/** 按计划字段比较语义，避免对象字段顺序影响变更判断。 */
+export declare function isEqualSchedule(left: AutomationSchedule, right: AutomationSchedule): boolean;
 export declare function scheduleToRRule(schedule: AutomationSchedule): string;
 export declare function nextOccurrence(schedule: AutomationSchedule, afterExclusive: string): string | null;
 export declare function latestDueOccurrence(schedule: AutomationSchedule, now: string): string | null;

package/lib/types/run-title.d.ts

@@ -1,3 +1,3 @@
 /** 定时执行 Session 的展示标题，Host 与侧栏共用。 */
-export declare function formatRunStamp(iso: string): string;
-export declare function automationSessionTitle(taskName: string, iso: string): string;
+export declare function formatRunStamp(iso: string, timeZone?: string): string;
+export declare function automationSessionTitle(taskName: string, iso: string, timeZone?: string): string;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@michengai/dsh-automation",
-  "version": "0.1.26",
+  "version": "0.1.28",
   "description": "在独立 DSH Session 中按计划执行编码任务，支持 Web 设置页与 Agent 双入口管理。",
   "type": "module",
   "main": "./lib/index.js",