dsh-remote 0.8.67 → 0.8.70

package/lib/instructions-dynamic.js

@@ -30,6 +30,7 @@
 
 import { statSync, mkdirSync, writeFileSync, utimesSync } from 'node:fs'
 import { createHash, randomUUID } from 'node:crypto'
+import { createRequire } from 'node:module'
 import path from 'node:path'
 import { joinRemotePath, relPathUnder } from './paths.js'
 import { INSTRUCTION_MAX_BYTES } from './instructions.js'
@@ -39,6 +40,77 @@ import { INSTRUCTION_MAX_BYTES } from './instructions.js'
  *  reconcile only claims messages carrying its own kind. */
 export const REMOTE_INSTRUCTIONS_KIND = 'dsh-remote-instructions'
 
+/**
+ * The user-message factory hanging off the `llm` service, when that service
+ * actually exposes one.
+ *
+ * DSH 0.2.1 keeps `createUserMessage` as a module export of
+ * `@deepseek-ai/dsh-llm`, not a method of the `LlmRuntime` service. Probing
+ * `ctx.get('llm')` therefore returns null on current Desktop builds, and the
+ * caller must fall through to {@link loadBundledUserMessageFactory}.
+ *
+ * @param {object|null|undefined} llm - `ctx.get('llm')`, or a test double.
+ * @returns {Function|null}
+ */
+export function pickUserMessageFactory(llm) {
+  if (llm && typeof llm.createUserMessage === 'function') {
+    return (input) => llm.createUserMessage(input)
+  }
+  const nested = llm && llm.default
+  if (nested && typeof nested.createUserMessage === 'function') {
+    return (input) => nested.createUserMessage(input)
+  }
+  return null
+}
+
+/** Module-level `createUserMessage` from the harness's dsh-llm, if resolvable. */
+let bundledUserMessageFactory
+/**
+ * Load `@deepseek-ai/dsh-llm`'s `createUserMessage`.
+ *
+ * The package is not a declared dependency of this plugin (the compatibility
+ * gate would then have to peer-range it). Inside a DSH profile it is a sibling
+ * in `node_modules`, and Node walks up from this file to find it. A missing
+ * package returns null so the built-in identified message is used instead.
+ *
+ * @returns {Function|null}
+ */
+export function loadBundledUserMessageFactory() {
+  if (bundledUserMessageFactory !== undefined) return bundledUserMessageFactory
+  try {
+    const req = createRequire(import.meta.url)
+    const mod = req('@deepseek-ai/dsh-llm')
+    bundledUserMessageFactory = mod && typeof mod.createUserMessage === 'function'
+      ? mod.createUserMessage
+      : null
+  } catch {
+    bundledUserMessageFactory = null
+  }
+  return bundledUserMessageFactory
+}
+
+/**
+ * Guarantee the session-restore invariant: `message.id` is a non-empty string.
+ *
+ * DSH 0.2.1 (`dsh-session` `assertMessageEventShape`) rejects the whole log
+ * with "lacks an identified message" when any user message has no id. A
+ * factory that already stamped one is returned unchanged.
+ *
+ * @param {object|null} message - a factory result, or null to use `fallback`.
+ * @param {object} fallback - `{ role, content, source }` used when `message` is empty.
+ * @returns {object}
+ */
+export function ensureMessageId(message, fallback) {
+  const base = message && typeof message === 'object' ? message : fallback
+  if (typeof base.id === 'string' && base.id !== '') return base
+  return {
+    ...fallback,
+    ...base,
+    role: base.role || fallback.role,
+    id: randomUUID(),
+  }
+}
+
 /** Total byte budget for one injected batch (the core's own budget is similar). */
 export const INSTRUCTION_MESSAGE_MAX_BYTES = 16 * 1024
 
@@ -332,11 +404,12 @@ export function buildInstructionMessage(items, removed, opts = {}) {
   ].join('\n')
   const source = { kind: REMOTE_INSTRUCTIONS_KIND, form: 'instructions', changes: sent.map((rel) => ({ path: rel, change: 'changed' })) }
   const content = [{ type: 'text', text }]
-  // The fallback object MUST carry an id. The core validates every stored message
-  // on session restore (`assertMessageEventShape`: `message.id` must be a non-empty
-  // string) and REJECTS THE WHOLE LOG on the first offender — one of these objects
-  // without an id made a 130+-turn session fail to reopen ("历史加载失败").
-  // `randomUUID` matches the factory's own identity source
-  // (@deepseek-ai/dsh-llm createMessage → brandString(randomUUID())).
-  return factory ? factory({ content, source }) : { id: randomUUID(), role: 'user', content, source }
+  const fallback = { role: 'user', content, source }
+  let built = null
+  if (factory) {
+    try { built = factory({ content, source }) } catch { built = null }
+  }
+  // Session restore requires message.id (issue #75). A factory that throws or
+  // omits id must not store a bare object — that rejects the whole log.
+  return ensureMessageId(built, fallback)
 }