dsh-agentic-pet 0.4.3 → 0.4.5

package/lib/tools.js

@@ -1,7 +1,7 @@
-import { a as logStamp, o as registerPetTools, r as petHome, t as createUnregisteredPetHttp } from "./service-BjTawwUn.js";
+import { a as logStamp, o as registerPetTools, r as petHome, t as createUnregisteredPetHttp } from "./service-R8qwDx1Q.js";
 import { appendFile } from "node:fs/promises";
 import { join } from "node:path";
-//#region lib/types/tools.js
+// lib/types/tools.js
 /**
 * The pet model-expression tools as an ordinary agent-plane plugin row. The
 * pet preset composes this row, so sessions mounting other presets never see
@@ -21,7 +21,8 @@ const trace = (line) => {
 	appendFile(join(petHome(), "whale598", "pet-driver.log"), `${logStamp()} pet-tools ${line}\n`, "utf8").catch(() => {});
 };
 /**
-* Register the five pet tools for sessions mounted with the pet preset.
+* Register the pet tools (say/do/digest/interactions/affection/state/schedule_wake/
+* cancel_wake) for sessions mounted with the pet preset.
 *
 * The service instance is assembled HERE, not read from the main entry (a
 * Cordis service registered on the main row's fiber context is invisible to
@@ -37,5 +38,4 @@ var PetTools = class {
 		trace("registerPetTools returned");
 	}
 };
-//#endregion
 export { PetTools as default };

package/lib/types/actions.d.ts

@@ -39,4 +39,3 @@ export declare function resolveActionRequest(requested: string, catalog: readonl
 /** The error-message menu: long catalogs are previewed, with a pointer to
  * pet_state {actions:true} for the full list. */
 export declare function formatAvailableActions(available: readonly string[], cap?: number): string;
-//# sourceMappingURL=actions.d.ts.map

package/lib/types/driver.d.ts

@@ -54,4 +54,3 @@ export declare function installPetDriver(ctx: Context, home: string, pet: PetSer
  * @param home - the dsh home holding the pet control manifest.
  */
 export declare function registerPetTools(ctx: Context, home: string, pet: PetService): void;
-//# sourceMappingURL=driver.d.ts.map

package/lib/types/index.d.ts

@@ -61,4 +61,3 @@ export declare function servePetStatic(request: Request, distRoot: string, distI
  * @param ctx - plugin context carrying the webServer and connection services.
  */
 export declare function apply(ctx: Context): void;
-//# sourceMappingURL=index.d.ts.map

package/lib/types/inner-voice.d.ts

@@ -17,6 +17,20 @@ export interface InnerVoiceStore {
      * ids colliding with archived ones (born dead). */
     readonly generations: Record<string, number>;
 }
+/** 自主唤醒的忙时策略：'fire'（到点必醒，默认）| 'defer'（忙时顺延重试）。 */
+export type SelfWakeBusyPolicy = 'fire' | 'defer';
+/** ONE model-authored wake plan (pet_schedule_wake): a one-shot self alarm.
+ * `at` is an ABSOLUTE epoch-ms stamp — sleep/reboot can then tell "expired"
+ * and the catch-up fires once, merged, never one wake per missed plan (a
+ * relative delay would drift under sleep). The driver keeps a SET of these
+ * per pet: the model may stack plans, and neither the world clock nor a
+ * user-initiated wake ever cancels them — a plan is consumed only when DUE. */
+export interface WakePlan {
+    id: string;
+    at: number;
+    intent: string;
+    createdAt: number;
+}
 /** The `innerVoice` half of pet-settings.json, defaults folded in and clamped. */
 export interface InnerVoiceConfig {
     enabled: boolean;
@@ -33,6 +47,10 @@ export interface InnerVoiceConfig {
      * the probability gate alone decides). Legacy minute-keyed settings fold
      * in ×60. */
     touchReplyCooldownSeconds: number;
+    /** 自主唤醒（pet_schedule_wake 计划）到点遇用户主会话忙时的策略：
+     * 'fire' = 到点必醒（计划是模型自己的决定，不带礼貌门）；'defer' =
+     * 忙时顺延——计划放回待执行集，下一个扫描拍重试，永不丢弃。 */
+    selfWakeBusyPolicy: SelfWakeBusyPolicy;
     /** Manually bound sessions (petId → sessionId): the user's own
      * conversations the inner voice should live in — highest priority, used
      * as-is (no creation, no rename, never auto-retired). Empty = automatic
@@ -44,6 +62,38 @@ export declare const VOICE_SESSION_PREFIX = "whale598-";
  * folds to its default (defensive parse, `readAutonomy` precedent). */
 export declare function readInnerVoiceConfig(home: string): Promise<InnerVoiceConfig>;
 export declare function innerVoiceStorePath(home: string): string;
+export declare function wakePlansStorePath(home: string): string;
+/** Load every pet's pending wake plans: current → legacy → {} (callers'
+ * defensive checks treat {} exactly like a missing file). */
+export declare function loadWakePlans(home: string): Promise<Record<string, WakePlan[]>>;
+export declare function saveWakePlans(home: string, plans: Record<string, WakePlan[]>): Promise<void>;
+/** Upsert by id: re-scheduling with a known id REPLACES the old plan —
+ * "能定、能改、能撤" 的改。 */
+export declare function upsertPlan(list: WakePlan[], plan: WakePlan): WakePlan[];
+/** Remove one plan by id (or ALL when id is undefined). Returns the removed
+ * plans so the caller can report them; an empty removal is the unknown-id
+ * case the caller turns into a self-correcting error. */
+export declare function cancelPlans(list: WakePlan[], id?: string): {
+    next: WakePlan[];
+    removed: WakePlan[];
+};
+/** Consume every DUE plan (at <= now): they leave the pending set for good —
+ * a consumed plan must produce a wake, never a silent drop. Future plans
+ * survive untouched (被打断不碰 plans). */
+export declare function takeDuePlans(list: WakePlan[], now: number): {
+    next: WakePlan[];
+    due: WakePlan[];
+};
+/** The ±60s merge window: a plan due around NOW folds into a user-initiated
+ * turn instead of firing its own wake a minute later (同一分钟不醒两次). */
+export declare function takeNearDuePlan(list: WakePlan[], now: number, windowMs?: number): {
+    next: WakePlan[];
+    plan: WakePlan | undefined;
+};
+/** Plans among `due` that went stale BEFORE the driver came up (at < bootAt):
+ * the catch-up wake says 「错过了 N 个计划」 and lists them together instead
+ * of bombing one wake per missed plan. */
+export declare function missedPlans(due: WakePlan[], bootAt: number): WakePlan[];
 export declare function loadInnerVoiceStore(home: string): Promise<InnerVoiceStore>;
 export declare function saveInnerVoiceStore(home: string, store: InnerVoiceStore): Promise<void>;
 export declare function voiceSessionIdFor(petId: string): string;
@@ -98,20 +148,49 @@ export interface WakePromptFacts {
     /** Minutes since the bound session last showed activity; undefined = none recorded. */
     minutesSinceUserActivity: number | undefined;
     userActive: boolean;
+    /** 唤醒源：'world' = 世界时钟（环境节拍，程序周期）；'self' = 模型自己定的
+     * 计划到点；'world+self' = 两者同拍合并。缺省按 'world'（旧调用点）。 */
+    source?: 'world' | 'self' | 'world+self';
+    /** 本次已消费的到期计划 intent（self / world+self 时非空）。 */
+    dueIntents?: Array<string>;
+    /** 到期计划中离线期间错过的条数（补醒时 >0 → 「错过了 N 个计划」）。 */
+    missedCount?: number;
+    /** 计划定下时就已经过期（pet_schedule_wake 收到过去的时间戳，立即补醒一次）。 */
+    overdue?: boolean;
+    /** 未到期的待执行计划（最近 ≤5 条）：世界时钟唤醒也告知模型自己的作息，
+     * 继续、改时间或取消由模型决定。 */
+    pendingPlans?: Array<{
+        at: number;
+        intent: string;
+    }>;
 }
+/** Local HH:mm for plan times: the model's clock talk is the USER's wall
+ * clock (logStamp precedent), and plans are compared against it. */
+export declare const wakePlanClock: (at: number) => string;
 /** The wake prompt. Time context is injected by the preset's time-context
- * row; the leading tag doubles as the durable trigger marker in the log. */
+ * row; the leading tag doubles as the durable trigger marker in the log —
+ * and now names the SOURCE: [世界时钟] (the environment's tick), [自主唤醒]
+ * (the model's own schedule, with the original intent), or the merged form. */
 export declare function buildWakePrompt(facts: WakePromptFacts): string;
+/** A self-scheduled plan folded into a USER-initiated turn (chat 上行 / touch
+ * 回应)：the plan sat within the ±60s merge window, so both wake in one —
+ * the tag names the union ([用户+自主唤醒]) and the intent rides along. */
+export interface MergedWakePlan {
+    at: number;
+    intent: string;
+}
 export interface TouchPromptFacts {
     part: string;
     /** Touches on this pet today, from the ledger's recent window. */
     touchesToday: number;
     affection: number;
+    /** ±60s 内到期的自主计划：合并进这次回应，计划标记为已消费。 */
+    mergedPlan?: MergedWakePlan;
 }
 export declare function buildTouchPrompt(facts: TouchPromptFacts): string;
 /** The chat上行 prompt (§6 2026-10-31 revision): the user typed at the
  * pet's surface. The text rides verbatim — the pet answers through pet_say
  * (and may pet_do); it is a conversation turn, not a touch reaction. Length
- * clamps to the contract's 2000-character ceiling. */
-export declare function buildChatPrompt(text: string): string;
-//# sourceMappingURL=inner-voice.d.ts.map
+ * clamps to the contract's 2000-character ceiling. A plan inside the ±60s
+ * merge window folds in: the tag becomes the union and the intent rides. */
+export declare function buildChatPrompt(text: string, mergedPlan?: MergedWakePlan): string;

package/lib/types/petdata.d.ts

@@ -56,4 +56,3 @@ export declare function readGlobalJson(home: string, name: string): Promise<Reco
 /** Write a global state file (current location only; pretty-printed — these
  * files are user-inspectable and hand-editable). */
 export declare function writeGlobalJson(home: string, name: string, obj: Record<string, unknown>): Promise<void>;
-//# sourceMappingURL=petdata.d.ts.map

package/lib/types/registry.d.ts

@@ -52,4 +52,3 @@ export declare function routePet(pets: PetEntry[], boundPetId: string | undefine
  * deployment would fall back to the web card alone for the rest of the
  * session. */
 export declare function notifyPets(pets: PetEntry[]): PetEntry[];
-//# sourceMappingURL=registry.d.ts.map

package/lib/types/service.d.ts

@@ -156,4 +156,3 @@ export declare function createUnregisteredPetHttp(home?: string): PetService;
  * plugins can still `inject: ['petService']`.
  */
 export declare function installPetService(ctx: Context, home: string): PetHttpService;
-//# sourceMappingURL=service.d.ts.map

package/lib/types/settings-page.d.ts

@@ -19,4 +19,3 @@ import type { PetService } from './service.ts';
  * @param home - the dsh home holding the settings/ledger/manifest files.
  */
 export declare function installSettingsPage(ctx: Context, home: string, pet: PetService): void;
-//# sourceMappingURL=settings-page.d.ts.map

package/lib/types/tools.d.ts

@@ -13,7 +13,8 @@
  */
 import type { Context } from '@deepseek-ai/cordis';
 /**
- * Register the five pet tools for sessions mounted with the pet preset.
+ * Register the pet tools (say/do/digest/interactions/affection/state/schedule_wake/
+ * cancel_wake) for sessions mounted with the pet preset.
  *
  * The service instance is assembled HERE, not read from the main entry (a
  * Cordis service registered on the main row's fiber context is invisible to
@@ -26,4 +27,3 @@ export default class PetTools {
     static inject: string[];
     constructor(ctx: Context);
 }
-//# sourceMappingURL=tools.d.ts.map

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "dsh-agentic-pet",
   "description": "The pet-surface bundle: serves the desktop pet renderer over the web composition, turning dsh into a surface the desktop pet attaches to as an authenticated client",
-  "version": "0.4.3",
+  "version": "0.4.5",
   "publishConfig": {
     "access": "public"
   },

package/presets/pet-inner-voice.patch.yml

@@ -30,6 +30,7 @@
                 - 回复正文不是表达通道，用户看不见正文；所有想说的都放进 pet_say。
                 - 不要提问、不要等待回应、不要调用本会话工具清单以外的能力（这里也没有工作类工具）。
                 - 表达要贴合此刻与记忆：时间、天气般的日常、最近被摸过的记忆、好感与心情——像桌面上的一个活物，不像一个助手。
+                - 你有自己的作息：pet_schedule_wake 定一个一次性的唤醒点，到点你会带着当初的打算醒来（同名重订即改期），pet_cancel_wake 撤销；世界时钟仍会照常轻拍你，两者互不干扰、各醒各的。待执行的计划列在 pet_state 的 wakePlans 里。
           - id: pet-tools
             name: 'dsh-agentic-pet/tools'
           - id: time-context