@devflow-core/dsh-devflow 0.3.0 → 0.4.0

package/assets/presets/devflow-2/tool-bootstrap.mjs

@@ -5,6 +5,10 @@
  * preset's full DevFlow prompt from agent.cordis.yml) is restored untouched,
  * and the workspace line is only appended when the persona does not already
  * mention a working directory (the DevFlow template resolves {{cwd}} itself).
+ *
+ * Synced with dsh-liangshen 0.3.14: goal whitelist (#578), presentation
+ * broadcasts (#1128), and the snapshotEvents() session-events fallback for
+ * newer DSH releases.
  */
 
 /**
@@ -16,7 +20,8 @@
  * - prompt sections: only the persona section (all other sections,
  *   including plan-mode's `plan:policy`, return after promotion)
  * - runtime contexts: emptied (no sandbox/approval snapshot)
- * - pre-step messages: only explicit user messages pass
+ * - pre-step messages: only whitelisted source kinds pass (direct user
+ *   messages and goal auto-rounds by default)
  *
  * Promotion opens the full tool catalog and restores runtime contexts and all
  * prompt sections. With `anchorGate` the promotion after the first tool call
@@ -82,11 +87,13 @@ const PERSONA_SECTION_NAMES = new Set(['deployment:persona', 'persona'])
  */
 const WORKSPACE_LINE_PREFIX = '\n\nYour working directory is '
 
-/** Message-source kinds the model may see during phase 1. */
-const DEFAULT_MESSAGE_SOURCES = ['user']
-
-/** Message-source kinds delayed after promotion. */
-const DEFAULT_DEFERRED_SOURCES = []
+/**
+ * Message-source kinds the model may see during phase 1. Goal auto-rounds
+ * (source kind `goal`, issue #578) must be here: a filtered-out goal round
+ * never produces a response or tool call, so no promotion branch ever fires
+ * and the goal resume/pause loop deadlocks.
+ */
+const DEFAULT_MESSAGE_SOURCES = ['user', 'goal']
 
 function stringList(value, field, fallback) {
   if (value === undefined) return [...fallback]
@@ -153,12 +160,15 @@ export function hasAnchoredReasoning(content) {
 }
 
 /**
- * Whether one pre-step message is an explicit user message. Only `kind:
- * 'user'` passes; injected kinds and source-less seed messages never pass.
+ * Whether one pre-step message belongs to a whitelisted source kind. The
+ * configured whitelist alone decides; injected kinds and source-less seed
+ * messages never pass unless explicitly named. (Before issue #578 this also
+ * hardcoded `kind === 'user'`, so no whitelist entry could ever admit a
+ * goal auto-round and `/goal` sessions deadlocked in phase 1.)
  */
 function isAllowedMessage(message, allowedSources) {
   const kind = message.source?.kind
-  return kind === 'user' && allowedSources.has(kind)
+  return kind !== undefined && allowedSources.has(kind)
 }
 
 /** Whether one pre-step message belongs to a deferred injection kind. */
@@ -276,7 +286,7 @@ function stateFor(session) {
  * Code Mode presentation is disposed so the next assembly sees the native
  * catalog and the phase-1 filter can narrow it again.
  */
-function resetToControlled(state) {
+function resetToControlled(state, session) {
   if (typeof state.presentationDisposer === 'function') {
     try {
       state.presentationDisposer()
@@ -285,6 +295,10 @@ function resetToControlled(state) {
       // next promotion re-declares Code Mode anyway.
     }
     state.presentationDisposer = undefined
+    const agent = session !== undefined ? agentBySession.get(session) : undefined
+    if (agent?.ctx && typeof agent.ctx.emit === 'function') {
+      agent.ctx.emit('tools/presentation-changed', { mode: 'native', session: session?.id })
+    }
   }
   state.promoted = false
   state.toolCalled = false
@@ -305,13 +319,20 @@ function resetToControlled(state) {
  */
 function applyPresentation(agent, state, policy) {
   if (state.presentationApplied || policy.promotedPresentation !== 'code') return
-  state.presentationApplied = true
-  const tools = agent.ctx.tools
+  const tools = agent?.ctx?.tools
+  // Latch only after the switch really happened: without a tools view there
+  // is nothing to present, and latching early would skip Code Mode forever.
   if (tools === undefined) return
   // The disposer restores the deployment-default (native) presentation; it is
   // kept on the state so a post-compaction reset can release Code Mode and
   // let the phase-1 catalog filter see the native tool list again.
   state.presentationDisposer = tools.presentAs('code')
+  state.presentationApplied = true
+  // #1128: Broadcast presentation switch so external discipline / analysis
+  // plugins decouple presentation mode from tool failure detection.
+  if (typeof agent?.ctx?.emit === 'function') {
+    agent.ctx.emit('tools/presentation-changed', { mode: 'code', session: agent.session?.id })
+  }
 }
 
 /**
@@ -333,7 +354,11 @@ function decidePromotion(state, config) {
 
 /** Scan newly appended session events and update promotion state. */
 function scanEvents(state, session) {
-  const events = session.events
+  const events = Array.isArray(session?.events)
+    ? session.events
+    : typeof session?.snapshotEvents === 'function'
+      ? session.snapshotEvents()
+      : []
   for (; state.next < events.length; state.next += 1) {
     const event = events[state.next]
     if (event === undefined) continue
@@ -343,7 +368,7 @@ function scanEvents(state, session) {
       // past this boundary (the `next` pointer stays, so events before the
       // boundary never re-promote). Handled inside the scan so cold starts
       // reconstruct the same phase from the durable log.
-      resetToControlled(state)
+      resetToControlled(state, session)
     } else if (event.type === 'tool/call') {
       state.toolCalled = true
     } else if (event.type === 'step/start') {
@@ -452,7 +477,7 @@ export function apply(ctx, config) {
   // start reconstructs the same controlled phase from the durable log.
   ctx.on('session/event', (session, event) => {
     if (event.type === 'compaction/end') {
-      resetToControlled(stateFor(session))
+      resetToControlled(stateFor(session), session)
       return
     }
     if (event.type !== 'step/end' && event.type !== 'turn/end') return

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@devflow-core/dsh-devflow",
-  "version": "0.3.0",
+  "version": "0.4.0",
   "description": "DevFlow for DeepSeek Harness: devflow-2 agent preset + skills + commands + verification scripts, synced into ~/.dsh on host startup.",
   "type": "module",
   "engines": {