dsh-side-chat-plus 0.3.2 → 0.3.4

package/src/index.ts

@@ -181,12 +181,24 @@ function openTurnStart(events: readonly SideSessionEvent[]): number | undefined
   return lastStart
 }
 
+/**
+ * Read a session's event log across DSH versions: 0.1.5+ exposes
+ * `snapshotEvents()`; 0.1.2-era sessions carried a plain `events` getter.
+ */
+function sessionEvents(session: SideSession): readonly SideSessionEvent[] {
+  if (typeof session.snapshotEvents === 'function') {
+    return session.snapshotEvents()
+  }
+  return session.events ?? []
+}
+
 /** Schemastery schema for the user-facing preferences (validated by the settings service). */
 const PrefsSchema: z<SubchatPrefs> = z.object({
   lookupDefault: z.boolean().default(SUBCHAT_PREFS_DEFAULTS.lookupDefault),
   sendImmediately: z.boolean().default(SUBCHAT_PREFS_DEFAULTS.sendImmediately),
   defaultPrompt: z.string().default(SUBCHAT_PREFS_DEFAULTS.defaultPrompt),
   bringMode: z.union(['draft', 'context']).default(SUBCHAT_PREFS_DEFAULTS.bringMode),
+  panelHome: z.union(['floating', 'sidebar-right']).default(SUBCHAT_PREFS_DEFAULTS.panelHome),
 })
 
 /** Live settings face (bound when the settings service is mounted). */
@@ -311,7 +323,7 @@ function buildApi(ctx: Context, sideChats: Map<string, SidechatRecord>, getSetti
     const childId = requireString(payload, 'childId')
     const line = requireString(payload, 'line')
     const child = childOf(childId)
-    const result = await ctx.commands.execute(child, line, new AbortController().signal)
+    const result = await ctx.commands.execute(child, line, [], new AbortController().signal)
     return { executed: result !== undefined }
   }
 
@@ -319,7 +331,7 @@ function buildApi(ctx: Context, sideChats: Map<string, SidechatRecord>, getSetti
   const state = (payload: unknown): { plan: { active: boolean; pending: boolean }; goal: { id: string; objective: string } | null } => {
     const childId = requireString(payload, 'childId')
     const child = childOf(childId)
-    const events = child.session.events ?? []
+    const events = sessionEvents(child.session)
     // Plan fold mirrors dsh-plan-mode's `plan` projection.
     let planActive = false
     let planWanted: boolean | null = null
@@ -431,7 +443,7 @@ function buildApi(ctx: Context, sideChats: Map<string, SidechatRecord>, getSetti
       // Client-supplied preset wins; otherwise inherit the launching
       // conversation's permission preset (skip custom).
       const explicitPreset = typeof record.preset === 'string' && record.preset !== '' ? record.preset : undefined
-      const parentPreset = ctx.permissionPresets.current(parent.session.events ?? [])
+      const parentPreset = ctx.permissionPresets.current(parent.session)
       const preset = explicitPreset ?? parentPreset
       if (preset !== 'custom') {
         ctx.permissionPresets.set(handle.agent.session, preset)
@@ -472,14 +484,22 @@ function buildApi(ctx: Context, sideChats: Map<string, SidechatRecord>, getSetti
     const items: Array<{ childId: string; running: boolean; runningSince?: number }> = []
     for (const record of sideChats.values()) {
       if (record.parentSessionId !== parentSessionId) continue
-      // "Running" is decided by an open turn in the session log — the same
-      // signal the main conversation uses — instead of the agent status getter,
-      // so a turn that already settled can never leave the panel stuck on
-      // "thinking".
-      const runningSince = openTurnStart(record.handle.agent.session.events ?? [])
+      const agent = record.handle.agent
+      // "Running" follows the agent's live lifecycle status — the dominant
+      // signal the main conversation uses — so the composer flips to the stop
+      // button the moment the driver wakes for thinking/streaming, instead of
+      // waiting for a durable turn/start to land in the log. A settled driver
+      // is always 'idle' again, so a finished turn can never leave the panel
+      // stuck on "thinking". Hosts that do not surface the status getter fall
+      // back to the open-turn event scan.
+      const status = (agent as { status?: string }).status
+      const statusRunning = status === 'running'
+      const eventRunningSince = openTurnStart(sessionEvents(agent.session))
+      const running = statusRunning || (status === undefined && eventRunningSince !== undefined)
+      const runningSince = running ? (eventRunningSince ?? Date.now()) : undefined
       items.push({
         childId: record.childId,
-        running: runningSince !== undefined,
+        running,
         ...(runningSince !== undefined ? { runningSince } : {}),
       })
     }

package/src/settings-shared.ts

@@ -12,6 +12,9 @@ export const SUBCHAT_PREFS_NS = 'dsh-side-chat'
 /** How a brought-back reply lands in the main conversation. */
 export type BringMode = 'draft' | 'context'
 
+/** Where the side-chat panel lives when a side chat is open. */
+export type PanelHome = 'floating' | 'sidebar-right'
+
 /** User-facing side-chat preferences. */
 export interface SubchatPrefs {
   /** Whether the "look up workspace / parent when needed" switch defaults on. */
@@ -22,6 +25,8 @@ export interface SubchatPrefs {
   defaultPrompt: string
   /** How brought-back content lands: into the composer draft, or as a collapsed context row. */
   bringMode: BringMode
+  /** Which container hosts the panel: the classic floating right-edge panel, or the new built-in right sidebar. */
+  panelHome: PanelHome
 }
 
 /** Fallback prefs used whenever the settings document is unreachable or malformed. */
@@ -30,4 +35,5 @@ export const SUBCHAT_PREFS_DEFAULTS: SubchatPrefs = {
   sendImmediately: true,
   defaultPrompt: '',
   bringMode: 'draft',
+  panelHome: 'sidebar-right',
 }