@linxin666/dsh-pet 0.1.12 → 0.1.14

package/src/client/settings-card.module.css

@@ -1,71 +1,83 @@
+/* Plugin settings card chrome + staged form fields.
+ * Aligned with the official ui-settings-plugins PluginCard / fields CSS:
+ * same semantic tokens, radius, typography and states so family cards read
+ * as siblings of the built-in Shell / Agent loop / Web search cards. */
+
 .card {
-  list-style: none;
   border: 1px solid var(--dsw-alias-border-l2);
-  border-radius: 8px;
   background: var(--dsw-alias-bg-layer-3);
-  overflow: hidden;
+  border-radius: 12px;
+  list-style: none;
   transition: border-color 0.16s, background 0.16s;
 }
 
+.card:hover {
+  border-color: var(--dsw-alias-label-dimmed);
+}
+
 .cardOpen {
   background: var(--dsw-alias-bg-layer-2);
   border-color: var(--dsw-alias-label-dimmed);
 }
 
 .header {
-  display: flex;
-  align-items: center;
-  gap: 8px;
+  appearance: none;
   width: 100%;
-  padding: 10px 14px;
-  border: 0;
-  background: transparent;
-  cursor: pointer;
-  text-align: left;
   font: inherit;
-  transition: background 120ms ease;
-}
-
-.header:hover {
-  background: var(--dsw-alias-interactive-bg-hover);
-}
-
-.header:active {
-  background: var(--dsw-alias-interactive-bg-hover-solid);
+  color: inherit;
+  text-align: left;
+  cursor: pointer;
+  background: transparent;
+  border: 0;
+  border-radius: 12px;
+  align-items: center;
+  gap: 12px;
+  padding: 14px 16px;
+  display: flex;
 }
 
 .header:focus-visible {
-  outline: none;
-  /* Inset ring so it is not clipped by the card's overflow:hidden. */
-  box-shadow: inset 0 0 0 2px var(--dsw-alias-button-info-fill);
+  outline: 2px solid var(--dsw-alias-brand-primary);
+  outline-offset: -2px;
 }
 
 .headText {
-  display: flex;
   flex-direction: column;
-  gap: 2px;
   flex: 1;
+  gap: 4px;
   min-width: 0;
+  display: flex;
 }
 
 .name {
-  font-weight: 600;
   color: var(--dsw-alias-label-primary);
+  font-size: 15px;
+  font-weight: 600;
+  line-height: 1.4;
 }
 
 .description {
-  font-size: 12px;
   color: var(--dsw-alias-label-tertiary);
+  font-size: 13px;
+  line-height: 1.5;
 }
 
 .pending {
-  font-size: 12px;
-  color: var(--dsw-alias-state-warn-primary);
+  white-space: nowrap;
+  background: var(--dsw-alias-bg-module-platform);
+  color: var(--dsw-alias-label-secondary);
+  border-radius: 999px;
+  flex: none;
+  padding: 1px 8px;
+  font-size: 11px;
+  font-weight: 500;
+  line-height: 17px;
 }
 
 .chevron {
-  transition: transform 120ms ease;
   color: var(--dsw-alias-label-tertiary);
+  flex: none;
+  transition: transform 0.16s;
 }
 
 .chevronOpen {
@@ -73,53 +85,59 @@
 }
 
 .body {
-  padding: 0 14px 14px;
-  display: flex;
-  flex-direction: column;
-  gap: 14px;
+  border-top: 1px solid var(--dsw-alias-border-l2);
+  margin: 0 16px;
+  padding-bottom: 8px;
 }
 
 .readOnly {
-  margin: 0;
-  font-size: 12px;
   color: var(--dsw-alias-label-tertiary);
+  margin: 12px 0 0;
+  font-size: 12px;
+  line-height: 1.5;
 }
 
 .notExposed {
-  margin: 0;
+  color: var(--dsw-alias-state-warn-primary);
+  margin: 12px 0 0;
   font-size: 12px;
   line-height: 1.5;
-  color: var(--dsw-alias-state-warn-primary);
 }
 
 .footer {
-  display: flex;
-  align-items: center;
+  border-top: 1px solid var(--dsw-alias-border-l2);
   justify-content: flex-end;
+  align-items: center;
   gap: 8px;
+  padding: 12px 0 4px;
+  display: flex;
 }
 
 .failed {
-  margin: 0 auto 0 0;
+  min-width: 0;
+  color: var(--dsw-alias-label-error);
+  flex: 1;
+  margin: 0;
   font-size: 12px;
-  color: var(--dsw-alias-state-error-primary);
+  line-height: 1.5;
 }
 
 .discard,
 .save {
-  padding: 5px 12px;
-  border-radius: 6px;
+  appearance: none;
   font: inherit;
-  font-size: 13px;
   cursor: pointer;
-  transition: color 120ms ease, border-color 120ms ease,
-    background 120ms ease, box-shadow 120ms ease;
+  border: 1px solid transparent;
+  border-radius: 8px;
+  padding: 5px 14px;
+  font-size: 13px;
+  line-height: 1.5;
 }
 
 .discard {
-  border: 1px solid var(--dsw-alias-border-l2);
-  background: transparent;
+  border-color: var(--dsw-alias-border-l2);
   color: var(--dsw-alias-label-secondary);
+  background: transparent;
 }
 
 .discard:hover:not(:disabled) {
@@ -127,156 +145,152 @@
   border-color: var(--dsw-alias-label-dimmed);
 }
 
-.discard:active:not(:disabled) {
-  background: var(--dsw-alias-interactive-bg-hover);
-}
-
 .save {
-  border: 1px solid var(--dsw-alias-button-info-fill);
-  background: var(--dsw-alias-button-info-fill);
-  color: var(--dsw-alias-label-primary-foreground);
-}
-
-.save:hover:not(:disabled) {
-  border-color: var(--dsw-alias-button-info-hover);
-  background: var(--dsw-alias-button-info-hover);
-}
-
-.save:active:not(:disabled) {
-  filter: brightness(0.94);
-}
-
-.discard:focus-visible:not(:disabled),
-.save:focus-visible:not(:disabled) {
-  outline: none;
-  box-shadow: 0 0 0 2px var(--dsw-alias-button-info-fill);
+  background: var(--dsw-alias-label-primary);
+  color: var(--dsw-alias-bg-layer-3);
 }
 
 .discard:disabled,
 .save:disabled {
-  opacity: 0.5;
+  opacity: 0.4;
   cursor: default;
 }
 
+.discard:focus-visible,
+.save:focus-visible {
+  outline: 2px solid var(--dsw-alias-brand-primary);
+  outline-offset: 1px;
+}
+
 .field {
-  display: flex;
   flex-direction: column;
-  gap: 4px;
+  gap: 6px;
+  padding: 12px 0;
+  display: flex;
+}
+
+.field + .field {
+  border-top: 1px solid var(--dsw-alias-border-l2);
 }
 
 .head {
-  display: flex;
   align-items: center;
   gap: 8px;
+  display: flex;
 }
 
 .label {
+  min-width: 0;
+  color: var(--dsw-alias-label-primary);
+  flex: 1;
   font-size: 13px;
   font-weight: 500;
-  color: var(--dsw-alias-label-primary);
+  line-height: 1.5;
 }
 
 .badges {
-  display: flex;
   align-items: center;
-  gap: 6px;
+  gap: 8px;
+  display: inline-flex;
 }
 
 .badge {
-  font-size: 11px;
-  padding: 1px 6px;
+  white-space: nowrap;
+  background: var(--dsw-alias-bg-module-platform);
+  color: var(--dsw-alias-label-secondary);
   border-radius: 999px;
-  background: var(--dsw-alias-interactive-bg-hover-accent);
-  color: var(--dsw-alias-state-business-primary);
+  padding: 1px 8px;
+  font-size: 11px;
+  font-weight: 500;
+  line-height: 17px;
 }
 
 .reset {
-  font-size: 11px;
-  border: 0;
-  background: transparent;
-  color: var(--dsw-alias-state-business-primary);
+  font: inherit;
+  color: var(--dsw-alias-label-secondary);
   cursor: pointer;
+  background: transparent;
+  border: none;
   padding: 0;
-  border-radius: 3px;
-  transition: color 120ms ease, box-shadow 120ms ease;
+  font-size: 12px;
+  line-height: 1.5;
 }
 
 .reset:hover:not(:disabled) {
-  color: var(--dsw-alias-label-primary-bluish);
-  text-decoration: underline;
-}
-
-.reset:active:not(:disabled) {
-  color: var(--dsw-alias-state-business-primary);
-}
-
-.reset:focus-visible:not(:disabled) {
-  outline: none;
-  box-shadow: 0 0 0 2px var(--dsw-alias-button-info-fill);
+  color: var(--dsw-alias-label-primary);
 }
 
 .reset:disabled {
-  opacity: 0.5;
   cursor: default;
 }
 
+.reset:focus-visible {
+  outline: 2px solid var(--dsw-alias-brand-primary);
+  outline-offset: 2px;
+}
+
 .input,
 .select {
-  padding: 6px 8px;
   border: 1px solid var(--dsw-alias-border-l2);
-  border-radius: 6px;
+  background: var(--dsw-alias-bg-layer-3);
+  height: 34px;
   font: inherit;
-  font-size: 13px;
   color: var(--dsw-alias-label-primary);
-  background: var(--dsw-specific-input-major);
+  border-radius: 8px;
+  padding: 0 12px;
+  font-size: 13px;
+  line-height: 1.5;
 }
 
-.inputInvalid {
-  padding: 6px 8px;
-  border: 1px solid var(--dsw-alias-state-error-primary);
-  border-radius: 6px;
-  font: inherit;
-  font-size: 13px;
-  color: var(--dsw-alias-label-primary);
+.input:focus-visible,
+.select:focus-visible {
+  border-color: var(--dsw-alias-brand-primary);
+  outline: none;
 }
 
 .input:disabled,
 .select:disabled {
-  opacity: 0.6;
+  color: var(--dsw-alias-label-tertiary);
+  cursor: default;
 }
 
-.input:focus,
-.select:focus {
-  outline: none;
-  border-color: var(--dsw-alias-button-info-fill);
-  box-shadow: 0 0 0 2px var(--dsw-alias-button-info-fill);
+.inputInvalid {
+  border: 1px solid var(--dsw-alias-label-error);
+  background: var(--dsw-alias-bg-layer-3);
+  height: 34px;
+  font: inherit;
+  color: var(--dsw-alias-label-primary);
+  border-radius: 8px;
+  padding: 0 12px;
+  font-size: 13px;
+  line-height: 1.5;
 }
 
-.inputInvalid:focus {
-  outline: none;
-  box-shadow: 0 0 0 2px var(--dsw-alias-state-error-primary);
+.inputInvalid:focus-visible {
+  outline: 2px solid var(--dsw-alias-label-error);
+  outline-offset: 1px;
+  border-color: var(--dsw-alias-label-error);
 }
 
-.hint {
+.invalid {
+  color: var(--dsw-alias-label-error);
   margin: 0;
   font-size: 12px;
-  color: var(--dsw-alias-label-secondary);
+  line-height: 1.5;
 }
 
-.invalid {
+.hint {
+  color: var(--dsw-alias-label-tertiary);
   margin: 0;
   font-size: 12px;
-  color: var(--dsw-alias-state-error-primary);
+  line-height: 1.5;
 }
 
-/* Reduced motion: drop the card/button transitions. Token colors and the
-   focus rings stay, so interactive states remain visible without motion. */
 @media (prefers-reduced-motion: reduce) {
   .card,
   .header,
   .chevron,
   .chevronOpen,
-  .reset,
   .discard,
   .save {
     transition: none;

package/src/service.ts

@@ -1,10 +1,9 @@
 /**
  * Pet host service — the `pet.*` RPC domain. Owns the state machine wiring
- * (maps core rc.6 session events — turn/step/tool boundaries — and the
- * session lifecycle onto the pet phases), the affinity ledger, and the
- * persisted display config. The API gateway maps this service's methods onto
- * `pet.state` / `pet.interact` / `pet.setVisible` / `pet.setConfig`
- * for browser consumers.
+ * (projects official session events and accepts legacy `activity/status`), the
+ * affinity ledger, and the persisted display config. The API gateway maps
+ * this service's methods onto `pet.state` / `pet.interact` /
+ * `pet.setVisible` / `pet.setConfig` for browser consumers.
  * @module @linxin666/dsh-pet/service
  */
 
@@ -40,6 +39,7 @@ import {
   defaultPetStateConfig,
   PetStateMachine,
   type PetStateConfig,
+  type PetStateInput,
   type PetStateSnapshot,
 } from './state.ts'
 
@@ -128,6 +128,119 @@ declare module '@deepseek-ai/cordis' {
   }
 }
 
+/** Runtime shape of the optional legacy activity event. */
+interface ActivityStatusEventLike {
+  phase?: string
+  line?: string
+  phrase?: string
+}
+
+/** Per-session facts needed to project the official event stream. */
+interface SessionActivityRuntime {
+  activeTools: Set<string>
+  officialEventsSeen: boolean
+  stepHadFailure: boolean
+}
+
+/** One official event projection, optionally carrying a completed turn reward. */
+interface PetActivityTransition {
+  input: PetStateInput
+  completedTurn?: number
+}
+
+/** Keep tool names readable inside the compact status bubble. */
+function displayToolName(name: string): string {
+  const compact = name.replace(/\s+/g, ' ').trim() || '工具'
+  return compact.length <= 24 ? compact : `${compact.slice(0, 21)}...`
+}
+
+/** Whether a legacy phase is part of the pet's supported vocabulary. */
+function isActivityPhase(phase: string): phase is PetStateInput['phase'] {
+  return ['idle', 'waiting', 'thinking', 'tool', 'review', 'done', 'failed'].includes(phase)
+}
+
+/**
+ * Project the durable DSH session vocabulary into the pet's visual phases.
+ * Unknown and log-only events do not disturb the last meaningful activity.
+ */
+function projectOfficialEvent(
+  event: SessionEvent,
+  runtime: SessionActivityRuntime,
+): PetActivityTransition | undefined {
+  switch (event.type) {
+    case 'turn/start':
+      runtime.activeTools.clear()
+      runtime.stepHadFailure = false
+      return { input: { phase: 'waiting', line: '准备开始' } }
+    case 'step/start':
+      runtime.activeTools.clear()
+      runtime.stepHadFailure = false
+      return { input: { phase: 'waiting', line: '等待模型响应' } }
+    case 'assistant/chunk': {
+      const { chunk } = event.data
+      if (chunk.type === 'reasoning-delta' && chunk.text.length > 0) {
+        return { input: { phase: 'thinking', line: '正在思考' } }
+      }
+      if (chunk.type === 'text-delta' && chunk.text.length > 0) {
+        return { input: { phase: 'review', line: '整理回复中' } }
+      }
+      return undefined
+    }
+    case 'assistant/message':
+      return { input: { phase: 'review', line: '整理回复中' } }
+    case 'tool/call':
+      runtime.activeTools.add(String(event.data.callId))
+      return {
+        input: {
+          phase: 'tool',
+          line: `正在使用 ${displayToolName(event.data.name)}`,
+        },
+      }
+    case 'tool/result': {
+      const block = event.data.message.content[0]
+      runtime.activeTools.delete(String(event.data.message.source.callId))
+      runtime.stepHadFailure ||= event.data.error !== undefined || block.isError === true
+      if (runtime.activeTools.size > 0) {
+        return {
+          input: {
+            phase: 'tool',
+            line: `还有 ${runtime.activeTools.size} 个工具运行中`,
+          },
+        }
+      }
+      return runtime.stepHadFailure
+        ? { input: { phase: 'failed', line: '工具执行失败' } }
+        : { input: { phase: 'thinking', line: '处理工具结果' } }
+    }
+    case 'turn/end': {
+      runtime.activeTools.clear()
+      switch (event.data.reason.kind) {
+        case 'completed':
+          return {
+            input: { phase: 'done', line: '完成啦' },
+            completedTurn: event.data.turn,
+          }
+        case 'error':
+          return { input: { phase: 'failed', line: '执行失败' } }
+        case 'max-tokens':
+          return { input: { phase: 'failed', line: '达到输出上限' } }
+        case 'interrupted':
+          return { input: { phase: 'failed', line: '执行意外中断' } }
+        case 'blocked':
+          return { input: { phase: 'waiting', line: '等待继续' } }
+        case 'aborted':
+          return { input: { phase: 'idle', line: '已停止' } }
+        default:
+          // TurnEndReasonMap is merge-extensible; a newer ending must not
+          // leave the pet showing stale in-progress work.
+          return { input: { phase: 'idle' } }
+      }
+    }
+    default:
+      return undefined
+  }
+}
+
 /**
  * Cordis service exposing the pet RPC domain. Lazy: nothing is scanned or
  * written until a query or interaction arrives; event listeners update only
@@ -146,6 +259,10 @@ export class PetService extends Service {
   private rewardedTurns = new Map<string, number>()
   private enabled: boolean
   private disposeActivity: (() => void) | undefined
+  /** Session whose most recent meaningful event currently drives the global pet. */
+  private displaySession: Session | undefined
+  private readonly sessionActivity = new WeakMap<Session, SessionActivityRuntime>()
+  private lastLegacyTurnRewardAt = 0
 
   constructor(ctx: Context, config: PetConfig = {}) {
     super(ctx, 'pet')
@@ -197,37 +314,38 @@ export class PetService extends Service {
     this.disposeActivity = (() => {
       const disposers = [
         this.ctx.on('session/event', (session: Session, event: SessionEvent) => {
-          // rc.6 publishes no 'activity/status' event (the working-activity
-          // tracker is gone), so the pet derives its phases from the core
-          // session vocabulary instead.
-          switch (event.type) {
-            case 'turn/start':
-              this.machine.onSessionActive()
-              break
-            case 'step/start':
-              this.machine.onSessionActive()
-              this.machine.onActivityStatus({ phase: 'thinking' })
-              break
-            case 'tool/call':
-              this.machine.onSessionActive()
-              this.machine.onActivityStatus({ phase: 'tool', line: 'tool: ' + event.data.name })
-              break
-            case 'turn/end':
-              this.machine.onSessionActive()
-              if (event.data.reason.kind === 'completed') {
-                this.machine.onActivityStatus({ phase: 'done' })
-                this.rewardTurn(String(session.id), event.data.turn)
-              } else {
-                // Aborted / failed turns clear the working pose instead of
-                // freezing the pet on its last phase.
-                this.machine.onActivityStatus({ phase: 'idle' })
-              }
-              break
-            default:
-              break
+          const runtime = this.activityRuntime(session)
+          // `activity/status` is an optional compatibility input. It is not
+          // declared as a durable event type by this package because current
+          // Harness installations publish the official session vocabulary.
+          if ((event.type as string) === 'activity/status') {
+            const payload = ((event as unknown as { data?: unknown }).data ?? {}) as ActivityStatusEventLike
+            if (typeof payload.phase !== 'string' || !isActivityPhase(payload.phase)) return
+            this.applyActivity(session, {
+              phase: payload.phase,
+              ...(typeof payload.line === 'string' ? { line: payload.line } : {}),
+              ...(typeof payload.phrase === 'string' ? { phrase: payload.phrase } : {}),
+            })
+            // On a legacy-only stream the compatibility event owns turn
+            // rewards. Once any official activity is observed, turn/end owns
+            // them and a derived legacy `done` cannot double-count.
+            if (payload.phase === 'done' && !runtime.officialEventsSeen) {
+              this.rewardLegacyTurn()
+            }
+            return
+          }
+
+          const transition = projectOfficialEvent(event, runtime)
+          if (transition === undefined) return
+          runtime.officialEventsSeen = true
+          this.applyActivity(session, transition.input)
+          if (transition.completedTurn !== undefined) {
+            this.rewardTurn(String(session.id), transition.completedTurn)
           }
         }),
-        this.ctx.on('session/disposed', () => {
+        this.ctx.on('session/disposed', (session: Session) => {
+          if (session !== this.displaySession) return
+          this.displaySession = undefined
           this.machine.onSessionDisposed()
         }),
       ]
@@ -235,6 +353,27 @@ export class PetService extends Service {
     })()
   }
 
+  /** Return the projection state associated with one live session. */
+  private activityRuntime(session: Session): SessionActivityRuntime {
+    let runtime = this.sessionActivity.get(session)
+    if (runtime === undefined) {
+      runtime = {
+        activeTools: new Set(),
+        officialEventsSeen: false,
+        stepHadFailure: false,
+      }
+      this.sessionActivity.set(session, runtime)
+    }
+    return runtime
+  }
+
+  /** Commit one activity as the host-global pet's most recent display state. */
+  private applyActivity(session: Session, input: PetStateInput): void {
+    this.displaySession = session
+    this.machine.onActivityStatus(input)
+    this.machine.onSessionActive()
+  }
+
   /** RPC: pet or feed the pet. */
   async interact(kind: PetInteraction): Promise<PetInteractResult> {
     const nowMs = Date.now()
@@ -334,6 +473,20 @@ export class PetService extends Service {
     const last = this.rewardedTurns.get(sessionId) ?? 0
     if (turn <= last) return
     this.rewardedTurns.set(sessionId, turn)
+    this.applyTurnReward()
+  }
+
+  /** Preserve turn rewards for installations that only emit legacy activity. */
+  private rewardLegacyTurn(): void {
+    const nowMs = Date.now()
+    // A legacy `done` snapshot may repeat during the celebration window.
+    if (nowMs - this.lastLegacyTurnRewardAt < 5_000) return
+    this.lastLegacyTurnRewardAt = nowMs
+    this.applyTurnReward()
+  }
+
+  /** Persist one accepted completed-turn reward. */
+  private applyTurnReward(): void {
     this.persist = { ...this.persist, affinity: applyTurnReward(this.persist.affinity, this.affinityConfig) }
     this.flush()
   }