dsh-embedded-workbench 0.8.10 → 0.8.12

package/lib/index.js

@@ -1,43 +1,45 @@
-/**
- * embedded-workbench — DeepSeek Harness native plugin for the Embedded
- * Workbench toolbox. Injects the session-start gate text (1% Rule, Red
- * Flags, Plan Verification Gate, skills roster) into the first model step
- * of every agent session, mirroring the SessionStart hook the Claude Code
- * plugin installs. The 8 skills ship in this package's `skills/` directory
- * and are registered at apply time into dsh's `ctx.skills` registry through
- * the standard filesystem provider, so they appear in every session catalog
- * without a manual copy step.
- *
- * Injection listens on agent/pre-step and appends the gate to the FIRST
- * model step that runs, once per session (guarded by the session's durable
- * history). Session-start inbox injection was dropped: a blank-session preset
- * switch (agentPreset.select -> recompose) can clear the inbox before the
- * first step, losing the gate for the whole session. The pre-step decision is
- * the durable path - anchored/bootstrap presets that strip first-step injected
- * reminders (skill catalog, AGENTS.md, gate plugins) simply defer this message
- * to the first step after their promotion, and the history guard re-injects it
- * there. The default gate text is the dsh-native adaptation of
- * `hooks/session-start-content.md`: behavior rules
- * (1% Rule / Red Flags / Plan Verification Gate) stay in sync, while
- * presentation is adapted to dsh's native skill catalog — no roster table
- * (the model sees skills in its catalog) and no install instructions (those
- * live in `.dsh/INSTALL.md`). Deployments override via Config.
- *
- * @module embedded-workbench-dsh
- */
-import { fileURLToPath } from 'node:url';
-import z from '@deepseek-ai/schemastery';
-import { createUserMessage } from '@deepseek-ai/dsh-llm';
-import { FileSystemSkillProvider } from '@deepseek-ai/dsh-skill-filesystem';
-export const name = 'embedded-workbench';
-// Skills are contributed through the registry service, which dsh-base always
-// mounts before bundle rows such as this one apply.
-export const inject = ['skills'];
-// Absolute path of the package's shipped skills directory. `lib/index.js`
-// lives one level below the package root, so `../skills` from the module URL
-// lands on `<package>/skills` regardless of where the package was installed.
-const SKILLS_DIR = fileURLToPath(new URL('../skills', import.meta.url));
-const GATE_PLUGIN_ID = 'embedded-workbench';
+/**
+ * embedded-workbench — DeepSeek Harness native plugin for the Embedded
+ * Workbench toolbox. Injects the session-start gate text (1% Rule, Red
+ * Flags, Plan Verification Gate, skills roster) into the first model step
+ * of every agent session, mirroring the SessionStart hook the Claude Code
+ * plugin installs. The 8 skills ship in this package's `skills/` directory
+ * and are registered at apply time into dsh's `ctx.skills` registry through
+ * the standard filesystem provider, so they appear in every session catalog
+ * without a manual copy step.
+ *
+ * Injection listens on agent/pre-step and appends the gate to the FIRST
+ * model step that runs, once per session (guarded by the session's durable
+ * history). Session-start inbox injection was dropped: a blank-session preset
+ * switch (agentPreset.select -> recompose) can clear the inbox before the
+ * first step, losing the gate for the whole session. The pre-step decision is
+ * the durable path - anchored/bootstrap presets that strip first-step injected
+ * reminders (skill catalog, AGENTS.md, gate plugins) simply defer this message
+ * to the first step after their promotion, and the history guard re-injects it
+ * there. The default gate text is the dsh-native adaptation of
+ * `hooks/session-start-content.md`: behavior rules
+ * (1% Rule / Red Flags / Plan Verification Gate) stay in sync, while
+ * presentation is adapted to dsh's native skill catalog — no roster table
+ * (the model sees skills in its catalog) and no install instructions (those
+ * live in `.dsh/INSTALL.md`). Deployments override via Config.
+ *
+ * @module embedded-workbench-dsh
+ */
+import { fileURLToPath } from 'node:url';
+import z from '@deepseek-ai/schemastery';
+import { createUserMessage } from '@deepseek-ai/dsh-llm';
+import { FileSystemSkillProvider } from '@deepseek-ai/dsh-skill-filesystem';
+export const name = 'embedded-workbench';
+// Skills are contributed through the registry service, which dsh-base always
+// mounts before bundle rows such as this one apply.
+export const inject = ['skills'];
+// Absolute path of the package's shipped skills directory. `lib/index.js`
+// lives one level below the package root, so `../skills` from the module URL
+// lands on `<package>/skills` regardless of where the package was installed.
+const SKILLS_DIR = fileURLToPath(new URL('../skills', import.meta.url));
+const GATE_PLUGIN_ID = 'embedded-workbench';
+/** Producer-owned message source kind declared in `MessageSourceMap` above. */
+const GATE_SOURCE_KIND = 'plugin:embedded-workbench';
 const DEFAULT_GATE_CONTENT = `<EXTREMELY_IMPORTANT>
 Plugin embedded-workbench is active. You have embedded C/C++ firmware development skills — names and "Use when" triggers are in your skill catalog; load them with the skill tool. No custom agents in dsh: use the native subagent tooling for parallel work.
 
@@ -62,147 +64,152 @@ Plugin embedded-workbench is active. You have embedded C/C++ firmware developmen
 To load workflows and engineering policies: load the embedded-workbench skill.
 
 **Proactive features**: When you see state machines, protocol refactoring, behavioral claims ("always"/"never"), or multi-module tasks — suggest verification (logicprobe, or the built-in fact-check fallback if logicprobe is not installed), adversarial probing, or parallel subagents BEFORE the user asks. Most users do not know these exist.
-</EXTREMELY_IMPORTANT>`;
-export const Config = z.object({
-    enabled: z.boolean().default(true),
-    gateContent: z.string().default(DEFAULT_GATE_CONTENT),
-});
-function gateMessage(text) {
-    return createUserMessage({
-        content: [{ type: 'text', text }],
-        // `form` omitted — an undeclared context is the documented default.
-        source: { kind: 'plugin', plugin: GATE_PLUGIN_ID },
-    });
-}
-function readSessionEvents(session) {
-    const source = session;
-    if (typeof source.snapshotEvents === 'function') {
-        const snapshot = source.snapshotEvents();
-        if (Array.isArray(snapshot))
-            return snapshot;
-    }
-    if (Array.isArray(source.events))
-        return source.events;
-    return [];
-}
-/**
- * Model-visible catalog entry (cordis_inspect_list / cordis_inspect_query):
- * lets the model read this plugin's runtime status without guessing. Mirrors
- * the registration pattern of the official dsh-tool-cordis host providers.
- */
-function inspectProvider(config) {
-    return {
-        manifest: {
-            id: 'embedded-workbench',
-            description: 'Session-start gate injection for the Embedded Workbench toolbox — folds the 1% Rule / Red Flags / Plan Verification Gate text into the first model step of every agent session.',
-            methods: [
-                {
-                    name: 'status',
-                    description: 'Read whether the gate injection is active and how large the injected gate text is.',
-                    inputSchema: {
-                        type: 'object',
-                        properties: {},
-                        additionalProperties: false,
-                    },
-                    outputSchema: {
-                        type: 'object',
-                        description: 'Gate-injection plugin status.',
-                        properties: {
-                            enabled: { type: 'boolean', description: 'Whether the gate folds into the first model step.' },
-                            gateContentLength: { type: 'integer', description: 'Length in characters of the injected gate text.' },
-                        },
-                        required: ['enabled', 'gateContentLength'],
-                        additionalProperties: false,
-                    },
-                },
-            ],
-        },
-        query: async (method) => {
-            if (method === 'status') {
-                return {
-                    enabled: config.enabled,
-                    gateContentLength: config.gateContent.length,
-                };
-            }
-            return null;
-        },
-    };
-}
-export function apply(ctx, config) {
-    // Catalog visibility is optional: register only when the inspect registry
-    // service is mounted, so headless assemblies without it keep the gate
-    // injection working. The registry may be provided AFTER this row applies
-    // (base-bundle rows can mount later), so registration is retried on the
-    // first agent/session-start — by then the app is fully booted.
-    let providerRegistered = false;
-    const registerProvider = () => {
-        if (providerRegistered)
-            return;
-        const inspect = ctx.get('cordisInspect');
-        if (inspect === undefined)
-            return;
-        try {
-            ctx.effect(() => inspect.register(inspectProvider(config)), 'embedded-workbench: inspect provider');
-            providerRegistered = true;
-        }
-        catch (err) {
-            console.warn('[embedded-workbench] inspect provider registration failed', err);
-        }
-    };
-    registerProvider();
-    // Ship the bundled skills through the registry: reuse the standard
-    // filesystem provider over this package's own `skills/` directory, so
-    // catalog discovery, frontmatter parsing, and SKILL.md loading behave
-    // exactly like project/user skills while the plugin stays self-contained.
-    // Registration lands in the global registry layer (this row mounts at the
-    // profile root), so every agent preset sees the skills. `registerProvider`
-    // returns the effect disposer; its teardown unregisters and invalidates.
-    ctx.skills.registerProvider((control) => {
-        return new FileSystemSkillProvider(ctx, control, {
-            providerName: 'embedded-workbench',
-            includeDefaultRoots: false,
-            customSkillDirs: [SKILLS_DIR],
-        });
-    });
-    if (!config.enabled)
-        return;
-    // Inject the gate once per session on the FIRST model step that runs,
-    // instead of at session-start: session-start injection lands in the agent's
-    // inbox, which a blank-session preset switch (agentPreset.select ->
-    // recompose) can clear before the first step - the gate would then be lost
-    // for the whole session. The pre-step decision is the durable path a
-    // first-step injection takes: the gate is appended to the first step's
-    // decision and enters session history there, so every later step (and a
-    // resume) skips it. Anchored/bootstrap presets that strip first-step
-    // injected reminders (skill catalog, AGENTS.md, gate plugins) simply defer
-    // this message to the first step after their promotion - the history guard
-    // re-injects it there, so the gate still lands exactly once per session.
-    ctx.on('agent/pre-step', async ({ agent }, next) => {
-        const decision = await next();
-        if (decision.kind === 'reject')
-            return decision;
-        registerProvider();
-        if (gateInHistory(agent.session))
-            return decision;
-        return {
-            kind: 'enter',
-            messages: [...decision.messages, gateMessage(config.gateContent)],
-        };
-    });
-}
-/**
- * Whether the gate already entered this session's durable history. The
- * pre-step listener re-appends the gate until it does; once a step committed
- * it, every later step (and a resume of a session that kept it) skips the
- * injection. A session whose gate was dropped before any step ran (e.g. an
- * inbox cleared by a blank-session preset switch) simply re-injects on the
- * first step that runs.
- */
-function gateInHistory(session) {
-    return readSessionEvents(session).some((event) => {
-        if (event.type !== 'user/message')
-            return false;
-        const source = event.data?.source;
-        return source?.kind === 'plugin' && source.plugin === GATE_PLUGIN_ID;
-    });
-}
+</EXTREMELY_IMPORTANT>`;
+export const Config = z.object({
+    enabled: z.boolean().default(true),
+    gateContent: z.string().default(DEFAULT_GATE_CONTENT),
+});
+function gateMessage(text) {
+    return createUserMessage({
+        content: [{ type: 'text', text }],
+        // `form` omitted — an undeclared context is the documented default.
+        source: { kind: GATE_SOURCE_KIND },
+    });
+}
+function readSessionEvents(session) {
+    const source = session;
+    if (typeof source.snapshotEvents === 'function') {
+        const snapshot = source.snapshotEvents();
+        if (Array.isArray(snapshot))
+            return snapshot;
+    }
+    if (Array.isArray(source.events))
+        return source.events;
+    return [];
+}
+/**
+ * Model-visible catalog entry (cordis_inspect_list / cordis_inspect_query):
+ * lets the model read this plugin's runtime status without guessing. Mirrors
+ * the registration pattern of the official dsh-tool-cordis host providers.
+ */
+function inspectProvider(config) {
+    return {
+        manifest: {
+            id: 'embedded-workbench',
+            description: 'Session-start gate injection for the Embedded Workbench toolbox — folds the 1% Rule / Red Flags / Plan Verification Gate text into the first model step of every agent session.',
+            methods: [
+                {
+                    name: 'status',
+                    description: 'Read whether the gate injection is active and how large the injected gate text is.',
+                    inputSchema: {
+                        type: 'object',
+                        properties: {},
+                        additionalProperties: false,
+                    },
+                    outputSchema: {
+                        type: 'object',
+                        description: 'Gate-injection plugin status.',
+                        properties: {
+                            enabled: { type: 'boolean', description: 'Whether the gate folds into the first model step.' },
+                            gateContentLength: { type: 'integer', description: 'Length in characters of the injected gate text.' },
+                        },
+                        required: ['enabled', 'gateContentLength'],
+                        additionalProperties: false,
+                    },
+                },
+            ],
+        },
+        query: async (method) => {
+            if (method === 'status') {
+                return {
+                    enabled: config.enabled,
+                    gateContentLength: config.gateContent.length,
+                };
+            }
+            return null;
+        },
+    };
+}
+export function apply(ctx, config) {
+    // Catalog visibility is optional: register only when the inspect registry
+    // service is mounted, so headless assemblies without it keep the gate
+    // injection working. The registry may be provided AFTER this row applies
+    // (base-bundle rows can mount later), so registration is retried on the
+    // first agent/session-start — by then the app is fully booted.
+    let providerRegistered = false;
+    const registerProvider = () => {
+        if (providerRegistered)
+            return;
+        const inspect = ctx.get('cordisInspect');
+        if (inspect === undefined)
+            return;
+        try {
+            ctx.effect(() => inspect.register(inspectProvider(config)), 'embedded-workbench: inspect provider');
+            providerRegistered = true;
+        }
+        catch (err) {
+            console.warn('[embedded-workbench] inspect provider registration failed', err);
+        }
+    };
+    registerProvider();
+    // Ship the bundled skills through the registry: reuse the standard
+    // filesystem provider over this package's own `skills/` directory, so
+    // catalog discovery, frontmatter parsing, and SKILL.md loading behave
+    // exactly like project/user skills while the plugin stays self-contained.
+    // Registration lands in the global registry layer (this row mounts at the
+    // profile root), so every agent preset sees the skills. `registerProvider`
+    // returns the effect disposer; its teardown unregisters and invalidates.
+    ctx.skills.registerProvider((control) => {
+        return new FileSystemSkillProvider(ctx, control, {
+            providerName: 'embedded-workbench',
+            includeDefaultRoots: false,
+            customSkillDirs: [SKILLS_DIR],
+        });
+    });
+    if (!config.enabled)
+        return;
+    // Inject the gate once per session on the FIRST model step that runs,
+    // instead of at session-start: session-start injection lands in the agent's
+    // inbox, which a blank-session preset switch (agentPreset.select ->
+    // recompose) can clear before the first step - the gate would then be lost
+    // for the whole session. The pre-step decision is the durable path a
+    // first-step injection takes: the gate is appended to the first step's
+    // decision and enters session history there, so every later step (and a
+    // resume) skips it. Anchored/bootstrap presets that strip first-step
+    // injected reminders (skill catalog, AGENTS.md, gate plugins) simply defer
+    // this message to the first step after their promotion - the history guard
+    // re-injects it there, so the gate still lands exactly once per session.
+    ctx.on('agent/pre-step', async ({ agent }, next) => {
+        const decision = await next();
+        if (decision.kind === 'reject')
+            return decision;
+        registerProvider();
+        if (gateInHistory(agent.session))
+            return decision;
+        return {
+            kind: 'enter',
+            messages: [...decision.messages, gateMessage(config.gateContent)],
+        };
+    });
+}
+/**
+ * Whether the gate already entered this session's durable history. The
+ * pre-step listener re-appends the gate until it does; once a step committed
+ * it, every later step (and a resume of a session that kept it) skips the
+ * injection. A session whose gate was dropped before any step ran (e.g. an
+ * inbox cleared by a blank-session preset switch) simply re-injects on the
+ * first step that runs.
+ */
+function gateInHistory(session) {
+    return readSessionEvents(session).some((event) => {
+        if (event.type !== 'user/message')
+            return false;
+        const source = event.data?.source;
+        if (source === undefined)
+            return false;
+        // The v4 producer-owned kind, plus the pre-v4 wrapper this bundle wrote
+        // before DSH 0.1.7-alpha.1 retired it.
+        return source.kind === GATE_SOURCE_KIND
+            || (source.kind === 'plugin' && source.plugin === GATE_PLUGIN_ID);
+    });
+}

package/lib/types/index.d.ts

@@ -1,43 +1,51 @@
-/**
- * embedded-workbench — DeepSeek Harness native plugin for the Embedded
- * Workbench toolbox. Injects the session-start gate text (1% Rule, Red
- * Flags, Plan Verification Gate, skills roster) into the first model step
- * of every agent session, mirroring the SessionStart hook the Claude Code
- * plugin installs. The 8 skills ship in this package's `skills/` directory
- * and are registered at apply time into dsh's `ctx.skills` registry through
- * the standard filesystem provider, so they appear in every session catalog
- * without a manual copy step.
- *
- * Injection listens on agent/pre-step and appends the gate to the FIRST
- * model step that runs, once per session (guarded by the session's durable
- * history). Session-start inbox injection was dropped: a blank-session preset
- * switch (agentPreset.select -> recompose) can clear the inbox before the
- * first step, losing the gate for the whole session. The pre-step decision is
- * the durable path - anchored/bootstrap presets that strip first-step injected
- * reminders (skill catalog, AGENTS.md, gate plugins) simply defer this message
- * to the first step after their promotion, and the history guard re-injects it
- * there. The default gate text is the dsh-native adaptation of
- * `hooks/session-start-content.md`: behavior rules
- * (1% Rule / Red Flags / Plan Verification Gate) stay in sync, while
- * presentation is adapted to dsh's native skill catalog — no roster table
- * (the model sees skills in its catalog) and no install instructions (those
- * live in `.dsh/INSTALL.md`). Deployments override via Config.
- *
- * @module embedded-workbench-dsh
- */
-import type { Context } from '@deepseek-ai/cordis';
-import z from '@deepseek-ai/schemastery';
-export declare const name = "embedded-workbench";
-export declare const inject: string[];
-export interface Config {
-    enabled: boolean;
-    gateContent: string;
-}
-export declare const Config: z<Schemastery.ObjectS<{
-    enabled: z<boolean, boolean>;
-    gateContent: z<string, string>;
-}>, Schemastery.ObjectT<{
-    enabled: z<boolean, boolean>;
-    gateContent: z<string, string>;
-}>>;
-export declare function apply(ctx: Context, config: Config): void;
+/**
+ * embedded-workbench — DeepSeek Harness native plugin for the Embedded
+ * Workbench toolbox. Injects the session-start gate text (1% Rule, Red
+ * Flags, Plan Verification Gate, skills roster) into the first model step
+ * of every agent session, mirroring the SessionStart hook the Claude Code
+ * plugin installs. The 8 skills ship in this package's `skills/` directory
+ * and are registered at apply time into dsh's `ctx.skills` registry through
+ * the standard filesystem provider, so they appear in every session catalog
+ * without a manual copy step.
+ *
+ * Injection listens on agent/pre-step and appends the gate to the FIRST
+ * model step that runs, once per session (guarded by the session's durable
+ * history). Session-start inbox injection was dropped: a blank-session preset
+ * switch (agentPreset.select -> recompose) can clear the inbox before the
+ * first step, losing the gate for the whole session. The pre-step decision is
+ * the durable path - anchored/bootstrap presets that strip first-step injected
+ * reminders (skill catalog, AGENTS.md, gate plugins) simply defer this message
+ * to the first step after their promotion, and the history guard re-injects it
+ * there. The default gate text is the dsh-native adaptation of
+ * `hooks/session-start-content.md`: behavior rules
+ * (1% Rule / Red Flags / Plan Verification Gate) stay in sync, while
+ * presentation is adapted to dsh's native skill catalog — no roster table
+ * (the model sees skills in its catalog) and no install instructions (those
+ * live in `.dsh/INSTALL.md`). Deployments override via Config.
+ *
+ * @module embedded-workbench-dsh
+ */
+import type { Context } from '@deepseek-ai/cordis';
+import z from '@deepseek-ai/schemastery';
+import type { ContextFormed } from '@deepseek-ai/dsh-llm';
+declare module '@deepseek-ai/dsh-llm' {
+    interface MessageSourceMap {
+        'plugin:embedded-workbench': {
+            kind: 'plugin:embedded-workbench';
+        } & ContextFormed;
+    }
+}
+export declare const name = "embedded-workbench";
+export declare const inject: string[];
+export interface Config {
+    enabled: boolean;
+    gateContent: string;
+}
+export declare const Config: z<Schemastery.ObjectS<{
+    enabled: z<boolean, boolean>;
+    gateContent: z<string, string>;
+}>, Schemastery.ObjectT<{
+    enabled: z<boolean, boolean>;
+    gateContent: z<string, string>;
+}>>;
+export declare function apply(ctx: Context, config: Config): void;

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "dsh-embedded-workbench",
-    "version": "0.8.10",
+    "version": "0.8.12",
     "description": "Embedded C/C++ firmware development toolbox — 4 agents, 8 skills covering FreeRTOS, ISR, NVM storage, Keil MDK, ARMCLANG, HardFault, state machines, architecture, LVGL patterns, and claim fact-checking. Ships a native DeepSeek Harness (dsh) bundle that injects the session-start gate into the first model step.",
     "type": "module",
     "main": "lib/index.js",
@@ -32,7 +32,7 @@
             "patch": "./cordis.patch.yml"
         },
         "compatibility": {
-            "dsh": "^0.1.0-rc.7 || ^0.1.1-rc.1 || ^0.1.2-alpha.2 || ^0.1.2-alpha.3 || ^0.1.2-alpha.4 || ^0.1.2-alpha.5 || ^0.1.2-rc.1 || ^0.1.3-alpha.1 || ^0.1.3-alpha.2 || ^0.1.5-alpha.1 || ^0.1.5-rc.1 || ^0.1.5-alpha.2 || ^0.1.5-rc.2 || ^0.1.6-alpha.1",
+            "dsh": "^0.1.0-rc.7 || ^0.1.1-rc.1 || ^0.1.2-alpha.2 || ^0.1.2-alpha.3 || ^0.1.2-alpha.4 || ^0.1.2-alpha.5 || ^0.1.2-rc.1 || ^0.1.3-alpha.1 || ^0.1.3-alpha.2 || ^0.1.5-alpha.1 || ^0.1.5-rc.1 || ^0.1.5-alpha.2 || ^0.1.5-rc.2 || ^0.1.6-alpha.1 || ^0.1.6-alpha.2 || ^0.1.7-alpha.1",
             "dshReleases": {
                 "0.1.0-rc.7": "compatible",
                 "0.1.0-rc.8": "compatible",
@@ -49,7 +49,9 @@
                 "0.1.5-alpha.2": "compatible",
                 "0.1.5-rc.1": "compatible",
                 "0.1.5-rc.2": "compatible",
-                "0.1.6-alpha.1": "compatible"
+                "0.1.6-alpha.1": "compatible",
+                "0.1.6-alpha.2": "compatible",
+                "0.1.7-alpha.1": "compatible"
             },
             "profiles": [
                 "headless"
@@ -80,7 +82,7 @@
         "@deepseek-ai/dsh-skill": "^0.1.0-rc.8",
         "@deepseek-ai/dsh-skill-filesystem": "^0.1.0-rc.8",
         "@deepseek-ai/dsh-timeout": "^0.0.1-rc.1",
-        "@types/node": "^26.5.0",
+        "@types/node": "^26.6.1",
         "@deepseek-ai/schemastery": "^3.18.2",
         "typescript": "^7.0.2"
     },

package/src/index.ts

@@ -30,10 +30,23 @@ import { fileURLToPath } from 'node:url'
 import type { Context } from '@deepseek-ai/cordis'
 import z from '@deepseek-ai/schemastery'
 import { createUserMessage } from '@deepseek-ai/dsh-llm'
+import type { ContextFormed } from '@deepseek-ai/dsh-llm'
 import type { Session, UserMessage } from '@deepseek-ai/dsh-session'
 import type { HostCordisInspectProviderRegistration } from '@deepseek-ai/dsh-cordis-host-runner'
 import { FileSystemSkillProvider } from '@deepseek-ai/dsh-skill-filesystem'
 
+// DSH 0.1.7-alpha.1 (session format v4) retires the shared
+// `{ kind: 'plugin', plugin }` wrapper: native admission rejects it in every
+// declared durable message slot, and the official v3-to-v4 migration rewrites
+// those historical rows to `plugin:<name>`. Declaring the producer-owned kind
+// here keeps the write path and the history guard on one identity, and still
+// compiles against the earlier releases that only declare `plugin`.
+declare module '@deepseek-ai/dsh-llm' {
+  interface MessageSourceMap {
+    'plugin:embedded-workbench': { kind: 'plugin:embedded-workbench' } & ContextFormed
+  }
+}
+
 export const name = 'embedded-workbench'
 
 // Skills are contributed through the registry service, which dsh-base always
@@ -47,6 +60,9 @@ const SKILLS_DIR = fileURLToPath(new URL('../skills', import.meta.url))
 
 const GATE_PLUGIN_ID = 'embedded-workbench'
 
+/** Producer-owned message source kind declared in `MessageSourceMap` above. */
+const GATE_SOURCE_KIND: 'plugin:embedded-workbench' = 'plugin:embedded-workbench'
+
 const DEFAULT_GATE_CONTENT = `<EXTREMELY_IMPORTANT>
 Plugin embedded-workbench is active. You have embedded C/C++ firmware development skills — names and "Use when" triggers are in your skill catalog; load them with the skill tool. No custom agents in dsh: use the native subagent tooling for parallel work.
 
@@ -87,7 +103,7 @@ function gateMessage(text: string): UserMessage {
   return createUserMessage({
     content: [{ type: 'text', text }],
     // `form` omitted — an undeclared context is the documented default.
-    source: { kind: 'plugin', plugin: GATE_PLUGIN_ID },
+    source: { kind: GATE_SOURCE_KIND },
   })
 }
 
@@ -231,6 +247,10 @@ function gateInHistory(session: Session): boolean {
   return readSessionEvents(session).some((event) => {
     if (event.type !== 'user/message') return false
     const source = event.data?.source as { kind?: string; plugin?: string } | undefined
-    return source?.kind === 'plugin' && source.plugin === GATE_PLUGIN_ID
+    if (source === undefined) return false
+    // The v4 producer-owned kind, plus the pre-v4 wrapper this bundle wrote
+    // before DSH 0.1.7-alpha.1 retired it.
+    return source.kind === GATE_SOURCE_KIND
+      || (source.kind === 'plugin' && source.plugin === GATE_PLUGIN_ID)
   })
 }