@dsh-enhanced/coding-subscription-provider 0.1.1 → 0.1.3

package/lib/prompt.js

@@ -23,13 +23,43 @@ function serializeBlock(block) {
 function serializeMessage(message) {
     return { role: message.role, content: message.content.map(serializeBlock) };
 }
+function skillCatalogSource(message) {
+    const source = message.source;
+    if (source.kind !== 'skill-catalog' || source.form !== 'catalog' || !Array.isArray(source.entries))
+        return undefined;
+    for (const entry of source.entries) {
+        if (entry === null || typeof entry !== 'object' || Array.isArray(entry))
+            return undefined;
+        const fields = entry;
+        if (typeof fields.name !== 'string' || fields.name.length === 0 || typeof fields.description !== 'string')
+            return undefined;
+    }
+    return source;
+}
+/**
+ * A skill-catalog update is a complete replacement, but durable history retains the catalogs it
+ * supersedes. Compatibility providers do not serialize message sources, so remove only the older
+ * catalogs when the newest catalog explicitly carries the replacement marker.
+ */
+function effectiveMessages(messages) {
+    let newestCatalog = -1;
+    for (let index = messages.length - 1; index >= 0; index -= 1) {
+        if (skillCatalogSource(messages[index]) !== undefined) {
+            newestCatalog = index;
+            break;
+        }
+    }
+    if (newestCatalog < 0 || skillCatalogSource(messages[newestCatalog])?.update !== true)
+        return messages;
+    return messages.filter((message, index) => index === newestCatalog || skillCatalogSource(message) === undefined);
+}
 /** Serialize one provider-neutral DSH call into a stateless coding-agent task. */
 export function buildPrompt(options, maxPromptBytes) {
     const request = {
         protocol: 'dsh-coding-subscription-provider/v1',
         instruction: 'Continue the conversation as the assistant. Return only the next assistant response. Do not modify files or execute commands.',
         system: options.system ?? null,
-        conversation: options.messages.map(serializeMessage),
+        conversation: effectiveMessages(options.messages).map(serializeMessage),
         constraints: {
             tools: 'DSH tool schemas are not delegated through this compatibility adapter.',
             stop: options.stop ?? null,
@@ -42,7 +72,8 @@ export function buildPrompt(options, maxPromptBytes) {
     const prompt = `Act as a text model backend for DeepSeek Harness. The JSON request follows.\n${JSON.stringify(request)}`;
     const size = Buffer.byteLength(prompt, 'utf8');
     if (size > maxPromptBytes) {
-        throw new Error(`serialized DSH request is ${size} bytes; configured limit is ${maxPromptBytes}`);
+        throw new Error(`serialized DSH request is ${size} bytes; configured limit is ${maxPromptBytes}. `
+            + 'Raise `maxPromptBytes` for this plugin if the request is legitimately this large.', { cause: 'prompt-limit' });
     }
     return prompt;
 }

package/lib/prompt.js.map

@@ -1 +1 @@
-{"version":3,"file":"prompt.js","sourceRoot":"","sources":["../src/prompt.ts"],"names":[],"mappings":"AAkBA,SAAS,cAAc,CAAC,KAAmB;IACzC,QAAQ,KAAK,CAAC,IAAI,EAAE,CAAC;QACnB,KAAK,MAAM;YACT,OAAO,EAAE,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,KAAK,CAAC,IAAI,EAAE,CAAA;QAC3C,KAAK,WAAW;YACd,6EAA6E;YAC7E,OAAO,EAAE,IAAI,EAAE,mBAAmB,EAAE,CAAA;QACtC,KAAK,WAAW;YACd,OAAO,EAAE,IAAI,EAAE,WAAW,EAAE,EAAE,EAAE,KAAK,CAAC,EAAE,EAAE,IAAI,EAAE,KAAK,CAAC,IAAI,EAAE,SAAS,EAAE,KAAK,CAAC,SAAS,EAAE,CAAA;QAC1F,KAAK,aAAa;YAChB,OAAO;gBACL,IAAI,EAAE,aAAa;gBACnB,UAAU,EAAE,KAAK,CAAC,UAAU;gBAC5B,GAAG,CAAC,KAAK,CAAC,OAAO,KAAK,SAAS,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,EAAE,OAAO,EAAE,KAAK,CAAC,OAAO,EAAE,CAAC;gBAClE,OAAO,EAAE,KAAK,CAAC,OAAO,CAAC,GAAG,CAAC,cAAc,CAAC;aAC3C,CAAA;QACH,KAAK,OAAO;YACV,MAAM,IAAI,KAAK,CAAC,uEAAuE,CAAC,CAAA;QAC1F;YACE,OAAO,EAAE,IAAI,EAAE,eAAe,MAAM,CAAE,KAA4B,CAAC,IAAI,CAAC,EAAE,EAAE,CAAA;IAChF,CAAC;AACH,CAAC;AAED,SAAS,gBAAgB,CAAC,OAAgB;IACxC,OAAO,EAAE,IAAI,EAAE,OAAO,CAAC,IAAI,EAAE,OAAO,EAAE,OAAO,CAAC,OAAO,CAAC,GAAG,CAAC,cAAc,CAAC,EAAE,CAAA;AAC7E,CAAC;AAED,kFAAkF;AAClF,MAAM,UAAU,WAAW,CAAC,OAAwB,EAAE,cAAsB;IAC1E,MAAM,OAAO,GAAG;QACd,QAAQ,EAAE,qCAAqC;QAC/C,WAAW,EAAE,+HAA+H;QAC5I,MAAM,EAAE,OAAO,CAAC,MAAM,IAAI,IAAI;QAC9B,YAAY,EAAE,OAAO,CAAC,QAAQ,CAAC,GAAG,CAAC,gBAAgB,CAAC;QACpD,WAAW,EAAE;YACX,KAAK,EAAE,wEAAwE;YAC/E,IAAI,EAAE,OAAO,CAAC,IAAI,IAAI,IAAI;YAC1B,SAAS,EAAE,OAAO,CAAC,SAAS,IAAI,IAAI;YACpC,WAAW,EAAE,OAAO,CAAC,WAAW,IAAI,IAAI;YACxC,eAAe,EAAE,OAAO,CAAC,eAAe,IAAI,IAAI;YAChD,OAAO,EAAE,OAAO,CAAC,OAAO,IAAI,IAAI;SACjC;KACF,CAAA;IACD,MAAM,MAAM,GAAG,gFAAgF,IAAI,CAAC,SAAS,CAAC,OAAO,CAAC,EAAE,CAAA;IACxH,MAAM,IAAI,GAAG,MAAM,CAAC,UAAU,CAAC,MAAM,EAAE,MAAM,CAAC,CAAA;IAC9C,IAAI,IAAI,GAAG,cAAc,EAAE,CAAC;QAC1B,MAAM,IAAI,KAAK,CAAC,6BAA6B,IAAI,+BAA+B,cAAc,EAAE,CAAC,CAAA;IACnG,CAAC;IACD,OAAO,MAAM,CAAA;AACf,CAAC"}
+{"version":3,"file":"prompt.js","sourceRoot":"","sources":["../src/prompt.ts"],"names":[],"mappings":"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"}

package/lib/session-cwd.d.ts

@@ -0,0 +1,24 @@
+import { type GenerateOptions } from '@deepseek-ai/dsh-llm';
+export interface LiveSessionCwd {
+    readonly id: NonNullable<GenerateOptions['sessionId']>;
+    readonly header: {
+        readonly cwd?: string;
+    };
+}
+export interface LiveSessionLookup {
+    get(id: NonNullable<GenerateOptions['sessionId']>): LiveSessionCwd | undefined;
+}
+export declare class TrustedSessionCwdError extends Error {
+    constructor();
+}
+/**
+ * Resolves the only cwd a local coding process may receive for this request.
+ * The marker is process-local and the session lookup is live, so copied request
+ * fields or a persisted/stale session id cannot select an arbitrary directory.
+ */
+export declare function resolveTrustedSessionCwd(input: {
+    request: GenerateOptions;
+    configuredCwd: string;
+    sessions: LiveSessionLookup | undefined;
+}): string;
+//# sourceMappingURL=session-cwd.d.ts.map

package/lib/session-cwd.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"session-cwd.d.ts","sourceRoot":"","sources":["../src/session-cwd.ts"],"names":[],"mappings":"AAEA,OAAO,EAAsB,KAAK,eAAe,EAAE,MAAM,sBAAsB,CAAA;AAE/E,MAAM,WAAW,cAAc;IAC7B,QAAQ,CAAC,EAAE,EAAE,WAAW,CAAC,eAAe,CAAC,WAAW,CAAC,CAAC,CAAA;IACtD,QAAQ,CAAC,MAAM,EAAE;QAAE,QAAQ,CAAC,GAAG,CAAC,EAAE,MAAM,CAAA;KAAE,CAAA;CAC3C;AAED,MAAM,WAAW,iBAAiB;IAChC,GAAG,CAAC,EAAE,EAAE,WAAW,CAAC,eAAe,CAAC,WAAW,CAAC,CAAC,GAAG,cAAc,GAAG,SAAS,CAAA;CAC/E;AAED,qBAAa,sBAAuB,SAAQ,KAAK;;CAIhD;AAWD;;;;GAIG;AACH,wBAAgB,wBAAwB,CAAC,KAAK,EAAE;IAC9C,OAAO,EAAE,eAAe,CAAA;IACxB,aAAa,EAAE,MAAM,CAAA;IACrB,QAAQ,EAAE,iBAAiB,GAAG,SAAS,CAAA;CACxC,GAAG,MAAM,CAaT"}

package/lib/session-cwd.js

@@ -0,0 +1,39 @@
+import { realpathSync } from 'node:fs';
+import { isAbsolute } from 'node:path';
+import { isAgentLoopRequest } from '@deepseek-ai/dsh-llm';
+export class TrustedSessionCwdError extends Error {
+    constructor() {
+        super('local provider requires a matching live loop session and canonical cwd');
+    }
+}
+function canonicalDirectory(path) {
+    if (!isAbsolute(path))
+        throw new TrustedSessionCwdError();
+    try {
+        return realpathSync.native(path);
+    }
+    catch {
+        throw new TrustedSessionCwdError();
+    }
+}
+/**
+ * Resolves the only cwd a local coding process may receive for this request.
+ * The marker is process-local and the session lookup is live, so copied request
+ * fields or a persisted/stale session id cannot select an arbitrary directory.
+ */
+export function resolveTrustedSessionCwd(input) {
+    const sessionId = input.request.sessionId;
+    if (sessionId === undefined || !Object.isFrozen(input.request) || !isAgentLoopRequest(input.request)) {
+        throw new TrustedSessionCwdError();
+    }
+    const session = input.sessions?.get(sessionId);
+    if (session === undefined || session.id !== sessionId || typeof session.header.cwd !== 'string') {
+        throw new TrustedSessionCwdError();
+    }
+    const configuredCwd = canonicalDirectory(input.configuredCwd);
+    const sessionCwd = canonicalDirectory(session.header.cwd);
+    if (configuredCwd !== sessionCwd)
+        throw new TrustedSessionCwdError();
+    return sessionCwd;
+}
+//# sourceMappingURL=session-cwd.js.map

package/lib/session-cwd.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"session-cwd.js","sourceRoot":"","sources":["../src/session-cwd.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,SAAS,CAAA;AACtC,OAAO,EAAE,UAAU,EAAE,MAAM,WAAW,CAAA;AACtC,OAAO,EAAE,kBAAkB,EAAwB,MAAM,sBAAsB,CAAA;AAW/E,MAAM,OAAO,sBAAuB,SAAQ,KAAK;IAC/C;QACE,KAAK,CAAC,wEAAwE,CAAC,CAAA;IACjF,CAAC;CACF;AAED,SAAS,kBAAkB,CAAC,IAAY;IACtC,IAAI,CAAC,UAAU,CAAC,IAAI,CAAC;QAAE,MAAM,IAAI,sBAAsB,EAAE,CAAA;IACzD,IAAI,CAAC;QACH,OAAO,YAAY,CAAC,MAAM,CAAC,IAAI,CAAC,CAAA;IAClC,CAAC;IAAC,MAAM,CAAC;QACP,MAAM,IAAI,sBAAsB,EAAE,CAAA;IACpC,CAAC;AACH,CAAC;AAED;;;;GAIG;AACH,MAAM,UAAU,wBAAwB,CAAC,KAIxC;IACC,MAAM,SAAS,GAAG,KAAK,CAAC,OAAO,CAAC,SAAS,CAAA;IACzC,IAAI,SAAS,KAAK,SAAS,IAAI,CAAC,MAAM,CAAC,QAAQ,CAAC,KAAK,CAAC,OAAO,CAAC,IAAI,CAAC,kBAAkB,CAAC,KAAK,CAAC,OAAO,CAAC,EAAE,CAAC;QACrG,MAAM,IAAI,sBAAsB,EAAE,CAAA;IACpC,CAAC;IACD,MAAM,OAAO,GAAG,KAAK,CAAC,QAAQ,EAAE,GAAG,CAAC,SAAS,CAAC,CAAA;IAC9C,IAAI,OAAO,KAAK,SAAS,IAAI,OAAO,CAAC,EAAE,KAAK,SAAS,IAAI,OAAO,OAAO,CAAC,MAAM,CAAC,GAAG,KAAK,QAAQ,EAAE,CAAC;QAChG,MAAM,IAAI,sBAAsB,EAAE,CAAA;IACpC,CAAC;IACD,MAAM,aAAa,GAAG,kBAAkB,CAAC,KAAK,CAAC,aAAa,CAAC,CAAA;IAC7D,MAAM,UAAU,GAAG,kBAAkB,CAAC,OAAO,CAAC,MAAM,CAAC,GAAG,CAAC,CAAA;IACzD,IAAI,aAAa,KAAK,UAAU;QAAE,MAAM,IAAI,sBAAsB,EAAE,CAAA;IACpE,OAAO,UAAU,CAAA;AACnB,CAAC"}

package/lib/version.d.ts

@@ -1,2 +1,2 @@
-export declare const version = "0.1.1";
+export declare const version = "0.1.3";
 //# sourceMappingURL=version.d.ts.map

package/lib/version.js

@@ -1,2 +1,2 @@
-export const version = '0.1.1';
+export const version = '0.1.3';
 //# sourceMappingURL=version.js.map

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dsh-enhanced/coding-subscription-provider",
-  "version": "0.1.1",
+  "version": "0.1.3",
   "description": "Use locally authenticated coding subscriptions as DeepSeek Harness model providers.",
   "license": "MIT",
   "type": "module",
@@ -47,15 +47,25 @@
     }
   },
   "dependencies": {
-    "@deepseek-ai/schemastery": "3.18.1"
+    "@deepseek-ai/schemastery": "3.18.1",
+    "@dsh-enhanced/llm-route-capabilities": "0.1.3"
   },
   "peerDependencies": {
     "@deepseek-ai/cordis": "^4.0.1",
-    "@deepseek-ai/dsh-llm": ">=0.1.0-rc.6 <0.2.0"
+    "@deepseek-ai/dsh-attachment": ">=0.1.0-rc.8 <0.2.0",
+    "@deepseek-ai/dsh-llm": ">=0.1.0-rc.8 <0.2.0",
+    "@deepseek-ai/dsh-session": ">=0.1.0-rc.8 <0.2.0"
+  },
+  "peerDependenciesMeta": {
+    "@deepseek-ai/dsh-attachment": {
+      "optional": true
+    }
   },
   "devDependencies": {
     "@deepseek-ai/cordis": "4.0.1",
-    "@deepseek-ai/dsh-llm": "0.1.0-rc.6",
+    "@deepseek-ai/dsh-attachment": "0.1.0-rc.8",
+    "@deepseek-ai/dsh-llm": "0.1.0-rc.8",
+    "@deepseek-ai/dsh-session": "0.1.0-rc.8",
     "@types/node": "22.20.0",
     "typescript": "6.0.3",
     "vitest": "4.1.8"