dsh-lcx-codex 0.4.3 → 0.5.0-pre.1

package/lib/web-search-hosted.js

@@ -1,5 +1,5 @@
 import { outputDomains, outputLineRange, parseWebRunOutput } from "./web-run-output.js";
-export const HOSTED_SEARCH_PARAMETERS = { type: "object", properties: { query: { type: "string", description: "Advanced Responses Hosted Web Search query. Use DSH web_search for ordinary searches." }, searchContextSize: { type: "string", enum: ["low", "medium", "high"] }, allowedDomains: { type: "array", items: { type: "string" } }, blockedDomains: { type: "array", items: { type: "string" } }, userLocation: { type: "object", properties: { country: { type: "string" }, city: { type: "string" }, region: { type: "string" }, timezone: { type: "string" } }, additionalProperties: false }, externalWebAccess: { type: "boolean" }, returnTokenBudget: { type: "string", enum: ["default", "unlimited"] }, searchContentTypes: { type: "array", items: { type: "string", enum: ["text", "image"] } }, imageSettings: { type: "object", properties: { maxResults: { type: "integer" }, caption: { type: "boolean" } }, additionalProperties: false } }, required: ["query"], additionalProperties: false };
+export const HOSTED_SEARCH_PARAMETERS = { type: "object", properties: { query: { type: "string", description: "Advanced Responses Hosted Web Search query. Use DSH web_search for ordinary searches." }, searchContextSize: { type: "string", enum: ["low", "medium", "high"] }, allowedDomains: { type: "array", items: { type: "string" }, description: "Optional allow filter. Omit or use [] for no filter; only nonempty lists are sent." }, blockedDomains: { type: "array", items: { type: "string" }, description: "Optional block filter. Omit or use [] for no filter; only nonempty lists are sent." }, userLocation: { type: "object", properties: { country: { type: "string" }, city: { type: "string" }, region: { type: "string" }, timezone: { type: "string" } }, additionalProperties: false }, externalWebAccess: { type: "boolean" }, returnTokenBudget: { type: "string", enum: ["default", "unlimited"] }, searchContentTypes: { type: "array", items: { type: "string", enum: ["text", "image"] }, description: "Optional content types. Omit unless image results are needed; [] means no explicit content-type override." }, imageSettings: { type: "object", description: "Optional image settings. Omit unless searchContentTypes includes image; ignored (after validation) without image search.", properties: { maxResults: { type: "integer" }, caption: { type: "boolean" } }, additionalProperties: false } }, required: ["query"], additionalProperties: false };
 export const HOSTED_SEARCH_OUTPUT = { type: "object", properties: { mode: { type: "string", enum: ["hosted"] }, action: { type: "string" }, emulation: { type: "string", enum: ["native"] }, content: { type: "string" }, sources: { type: "array", items: { type: "object" } }, citations: { type: "array", items: { type: "object" } }, images: { type: "array", items: { type: "object" } }, warnings: { type: "array", items: { type: "string" } }, outputBlocks: { type: "array", items: { type: "object" } }, domains: { type: "array", items: { type: "string" } }, lineRange: { type: "object" }, requestId: { type: "string" }, responseId: { type: "string" }, retrievedAt: { type: "string" }, truncated: { type: "boolean" }, usage: { type: "object", properties: { inputTokens: { type: "number" }, outputTokens: { type: "number" }, totalTokens: { type: "number" }, cachedInputTokens: { type: "number" }, actionCount: { type: "number" }, serverWebSearchCalls: { type: "number" } }, additionalProperties: false } }, required: ["mode", "action", "emulation", "content", "sources", "citations", "images", "warnings", "requestId", "retrievedAt", "truncated"], additionalProperties: false };
 function failure(message, code = "WEB_INVALID_REQUEST") { return Object.assign(new Error(message), { code }); }
 function isRecord(value) { return value !== null && typeof value === "object" && !Array.isArray(value); }
@@ -16,8 +16,10 @@ catch {
 function normalizeDomains(value, field) {
     if (value === undefined)
         return undefined;
-    if (!isStringArray(value) || value.length < 1 || value.length > 100)
-        throw failure(`websearch_gpt_advanced.${field} must contain 1 to 100 domains`);
+    if (!isStringArray(value) || value.length > 100)
+        throw failure(`websearch_gpt_advanced.${field} must contain 0 to 100 domains`);
+    if (value.length === 0)
+        return undefined;
     const result = value.map((item) => {
         const domain = item.trim().toLowerCase();
         if (!domain || domain.length > 253 || domain.includes("/") || domain.includes(":") || domain.endsWith(".") || domain.split(".").length < 2)
@@ -32,7 +34,7 @@ function normalizeLocation(value) {
     if (!isRecord(value))
         throw failure("websearch_gpt_advanced.userLocation must be an object");
     const result = {};
-    if (value.country !== undefined) {
+    if (value.country !== undefined && !(typeof value.country === "string" && !value.country.trim())) {
         if (typeof value.country !== "string" || !/^[a-z]{2}$/iu.test(value.country.trim()))
             throw failure("userLocation.country must be ISO alpha-2");
         result.country = value.country.trim().toUpperCase();
@@ -40,11 +42,13 @@ function normalizeLocation(value) {
     for (const field of ["city", "region"])
         if (value[field] !== undefined) {
             const text = value[field];
-            if (typeof text !== "string" || !text.trim() || text.length > 200)
+            if (typeof text === "string" && !text.trim())
+                continue;
+            if (typeof text !== "string" || text.length > 200)
                 throw failure(`userLocation.${field} is invalid`);
             result[field] = text.trim();
         }
-    if (value.timezone !== undefined) {
+    if (value.timezone !== undefined && !(typeof value.timezone === "string" && !value.timezone.trim())) {
         if (typeof value.timezone !== "string")
             throw failure("userLocation.timezone must be an IANA timezone");
         try {
@@ -55,9 +59,7 @@ function normalizeLocation(value) {
         }
         result.timezone = value.timezone;
     }
-    if (!Object.keys(result).length)
-        throw failure("userLocation is empty");
-    return result;
+    return Object.keys(result).length ? result : undefined;
 }
 export function normalizeHostedSearchArgs(args) {
     if (!isRecord(args) || typeof args.query !== "string" || !args.query.trim())
@@ -79,8 +81,11 @@ export function normalizeHostedSearchArgs(args) {
         result.blockedDomains = blockedDomains;
     if (allowedDomains && blockedDomains && allowedDomains.some((domain) => blockedDomains.includes(domain)))
         throw failure("domain filters conflict");
-    if (args.userLocation !== undefined)
-        result.userLocation = normalizeLocation(args.userLocation);
+    if (args.userLocation !== undefined) {
+        const userLocation = normalizeLocation(args.userLocation);
+        if (userLocation)
+            result.userLocation = userLocation;
+    }
     if (args.externalWebAccess !== undefined) {
         if (typeof args.externalWebAccess !== "boolean")
             throw failure("externalWebAccess must be boolean");
@@ -92,17 +97,23 @@ export function normalizeHostedSearchArgs(args) {
         result.returnTokenBudget = args.returnTokenBudget;
     }
     if (args.searchContentTypes !== undefined) {
-        if (!isStringArray(args.searchContentTypes) || !args.searchContentTypes.length || args.searchContentTypes.length > 2 || args.searchContentTypes.some((value) => value !== "text" && value !== "image"))
+        if (!isStringArray(args.searchContentTypes) || args.searchContentTypes.length > 2 || args.searchContentTypes.some((value) => value !== "text" && value !== "image"))
             throw failure("searchContentTypes is invalid");
-        result.searchContentTypes = [...new Set(args.searchContentTypes)];
+        if (args.searchContentTypes.length)
+            result.searchContentTypes = [...new Set(args.searchContentTypes)];
     }
     if (args.imageSettings !== undefined) {
-        if (!result.searchContentTypes?.includes("image") || !isRecord(args.imageSettings))
-            throw failure("imageSettings requires image search");
+        // Always validated structurally. Without image search the object is inert model padding: it is
+        // dropped entirely, and maxResults 0 is tolerated only there. With image search, 1..100 is strict.
+        const imageSearch = result.searchContentTypes?.includes("image") === true;
+        if (!isRecord(args.imageSettings))
+            throw failure("imageSettings must be an object");
+        if (Object.keys(args.imageSettings).some((key) => key !== "maxResults" && key !== "caption"))
+            throw failure("imageSettings has unsupported fields");
         const imageSettings = {};
         if (args.imageSettings.maxResults !== undefined) {
             const maxResults = args.imageSettings.maxResults;
-            if (!isInteger(maxResults) || maxResults < 1 || maxResults > 100)
+            if (!isInteger(maxResults) || maxResults < (imageSearch ? 1 : 0) || maxResults > 100)
                 throw failure("imageSettings.maxResults is invalid");
             imageSettings.maxResults = maxResults;
         }
@@ -111,7 +122,8 @@ export function normalizeHostedSearchArgs(args) {
                 throw failure("imageSettings.caption must be boolean");
             imageSettings.caption = args.imageSettings.caption;
         }
-        result.imageSettings = imageSettings;
+        if (imageSearch)
+            result.imageSettings = imageSettings;
     }
     return result;
 }

package/lib/web-search-ref-store.js

@@ -27,7 +27,9 @@ function validProvenance(value) {
         (value.artifactFingerprint === undefined || validFingerprint(value.artifactFingerprint));
 }
 function validRef(refId, value) {
-    return isRecord(value) && value.refId === refId && validHttpUrl(value.url) && validProvenance(value.provenance);
+    return isRecord(value) && value.refId === refId &&
+        (value.rawRefId === undefined || (typeof value.rawRefId === "string" && value.rawRefId.length > 0)) &&
+        validHttpUrl(value.url) && validProvenance(value.provenance);
 }
 function validSession(value) {
     return isRecord(value) &&
@@ -88,7 +90,7 @@ function collision(refId) {
     });
 }
 function sameObservation(left, right) {
-    return left.refId === right.refId && left.url === right.url &&
+    return (left.rawRefId ?? left.refId) === (right.rawRefId ?? right.refId) && left.url === right.url &&
         left.provenance.action === right.provenance.action &&
         left.provenance.originKind === right.provenance.originKind &&
         left.provenance.originFingerprint === right.provenance.originFingerprint &&
@@ -99,10 +101,11 @@ export class AlphaRefStore {
     constructor(file) {
         this.store = new JsonStore(file, () => ({ version: VERSION, sessions: {} }), validData, "LCX_ALPHA_REF_STORE_CORRUPT", migrateLegacyData);
     }
-    record(sessionId, routeFingerprint, refs) {
+    record(sessionId, routeFingerprint, refs, allowAliases = false) {
         if (typeof sessionId !== "string" || !sessionId || typeof routeFingerprint !== "string" || !routeFingerprint || !Array.isArray(refs)) {
             throw unavailable("invalid-record");
         }
+        const handles = {};
         this.store.update((current) => {
             const previous = current.sessions[sessionId];
             const sameRoute = previous?.routeFingerprint === routeFingerprint;
@@ -122,12 +125,26 @@ export class AlphaRefStore {
                     ...(value.url ? { url: value.url } : {}),
                     provenance: { ...value.provenance },
                 };
+                const rawHistory = Object.values(nextRefs).filter((ref) => (ref.rawRefId ?? ref.refId) === observation.refId);
+                const latest = rawHistory.at(-1);
+                if (latest && sameObservation(latest, observation)) {
+                    handles[observation.refId] = latest.refId;
+                    continue;
+                }
+                if (accepted && !allowAliases)
+                    throw collision(observation.refId);
                 if (accepted) {
-                    if (!sameObservation(accepted, observation))
-                        throw collision(observation.refId);
+                    const digest = createHash("sha256").update(JSON.stringify([observation, rawHistory.length])).digest("hex");
+                    const handle = `lcx-alpha-${digest}`;
+                    if (nextRefs[handle] && !sameObservation(nextRefs[handle], observation))
+                        throw collision(handle);
+                    nextRefs[handle] = { ...observation, refId: handle, rawRefId: observation.refId };
+                    handles[observation.refId] = handle;
+                    changed = true;
                     continue;
                 }
                 nextRefs[observation.refId] = observation;
+                handles[observation.refId] = observation.refId;
                 changed = true;
             }
             if (!changed && previous)
@@ -141,6 +158,7 @@ export class AlphaRefStore {
                 .slice(0, 256);
             return { version: VERSION, sessions: Object.fromEntries(ordered) };
         });
+        return handles;
     }
     assertUsable(sessionId, routeFingerprint, refId) {
         this.store.refresh();
@@ -150,6 +168,10 @@ export class AlphaRefStore {
         const ref = session?.routeFingerprint === routeFingerprint ? session.refs[refId] : undefined;
         if (!ref)
             throw unavailable(refId);
+        const raw = ref.rawRefId ?? ref.refId;
+        const latest = Object.values(session?.refs ?? {}).filter((other) => (other.rawRefId ?? other.refId) === raw).at(-1);
+        if (latest?.refId !== refId)
+            throw unavailable(refId);
         return structuredClone(ref);
     }
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dsh-lcx-codex",
-  "version": "0.4.3",
+  "version": "0.5.0-pre.1",
   "description": "Model-scoped DSH plugin: GPT Responses lifecycle, Native V2 compaction and Hosted/Alpha Search; Grok native Web/X Search",
   "keywords": [
     "deepseek-harness",
@@ -56,13 +56,14 @@
       "inject": [
         "@deepseek-ai/dsh-client-ui-chat",
         "@deepseek-ai/dsh-client-ui-conversation",
-        "@deepseek-ai/dsh-client-ui-settings-plugins"
+        "@deepseek-ai/dsh-client-ui-plugin-manager",
+        "@deepseek-ai/dsh-client-ui-settings"
       ]
     }
   },
   "devDependencies": {
-    "@deepseek-ai/dsh": "0.1.5-rc.1",
-    "@earendil-works/pi-ai": "0.85.1",
+    "@deepseek-ai/dsh": "0.2.0-rc.2",
+    "@earendil-works/pi-ai": "0.87.1",
     "@deepseek-ai/schemastery": "^3.18.2",
     "@types/node": "^22.20.0",
     "@types/react": "~18.3.1",
@@ -72,30 +73,36 @@
   },
   "peerDependencies": {
     "@deepseek-ai/cordis": "^4.0.2",
-    "@deepseek-ai/dsh-agent": ">=0.1.5-rc.1 <0.1.6",
-    "@deepseek-ai/dsh-attachment": ">=0.1.5-rc.1 <0.1.6",
-    "@deepseek-ai/dsh-client-locale": ">=0.1.5-rc.1 <0.1.6",
-    "@deepseek-ai/dsh-client-modules": ">=0.1.5-rc.1 <0.1.6",
-    "@deepseek-ai/dsh-client-store": ">=0.1.5-rc.1 <0.1.6",
-    "@deepseek-ai/dsh-client-ui-chat": ">=0.1.5-rc.1 <0.1.6",
-    "@deepseek-ai/dsh-client-ui-conversation": ">=0.1.5-rc.1 <0.1.6",
-    "@deepseek-ai/dsh-client-ui-settings-plugins": ">=0.1.5-rc.1 <0.1.6",
-    "@deepseek-ai/dsh-compaction": ">=0.1.5-rc.1 <0.1.6",
-    "@deepseek-ai/dsh-credentials": ">=0.1.5-rc.1 <0.1.6",
-    "@deepseek-ai/dsh-fs": ">=0.1.5-rc.1 <0.1.6",
-    "@deepseek-ai/dsh-llm": ">=0.1.5-rc.1 <0.1.6",
-    "@deepseek-ai/dsh-session": ">=0.1.5-rc.1 <0.1.6",
-    "@deepseek-ai/dsh-settings": ">=0.1.5-rc.1 <0.1.6",
-    "@deepseek-ai/dsh-tool-web": ">=0.1.5-rc.1 <0.1.6",
-    "@deepseek-ai/dsh-tools": ">=0.1.5-rc.1 <0.1.6",
-    "@deepseek-ai/dsh-web": ">=0.1.5-rc.1 <0.1.6",
+    "@deepseek-ai/cordis-plugin-loader": "~1.0.5",
+    "@deepseek-ai/dsh-agent": ">=0.2.0-rc.2 <0.2.1",
+    "@deepseek-ai/dsh-attachment": ">=0.2.0-rc.2 <0.2.1",
+    "@deepseek-ai/dsh-client-locale": ">=0.2.0-rc.2 <0.2.1",
+    "@deepseek-ai/dsh-client-modules": ">=0.2.0-rc.2 <0.2.1",
+    "@deepseek-ai/dsh-client-store": ">=0.2.0-rc.2 <0.2.1",
+    "@deepseek-ai/dsh-client-ui-chat": ">=0.2.0-rc.2 <0.2.1",
+    "@deepseek-ai/dsh-client-ui-conversation": ">=0.2.0-rc.2 <0.2.1",
+    "@deepseek-ai/dsh-client-ui-plugin-manager": ">=0.2.0-rc.2 <0.2.1",
+    "@deepseek-ai/dsh-client-ui-settings": ">=0.2.0-rc.2 <0.2.1",
+    "@deepseek-ai/dsh-compaction": ">=0.2.0-rc.2 <0.2.1",
+    "@deepseek-ai/dsh-credentials": ">=0.2.0-rc.2 <0.2.1",
+    "@deepseek-ai/dsh-fs": ">=0.2.0-rc.2 <0.2.1",
+    "@deepseek-ai/dsh-llm": ">=0.2.0-rc.2 <0.2.1",
+    "@deepseek-ai/dsh-session": ">=0.2.0-rc.2 <0.2.1",
+    "@deepseek-ai/dsh-session-query": ">=0.2.0-rc.2 <0.2.1",
+    "@deepseek-ai/dsh-settings": ">=0.2.0-rc.2 <0.2.1",
+    "@deepseek-ai/dsh-tool-web": ">=0.2.0-rc.2 <0.2.1",
+    "@deepseek-ai/dsh-tools": ">=0.2.0-rc.2 <0.2.1",
+    "@deepseek-ai/dsh-web": ">=0.2.0-rc.2 <0.2.1",
     "@deepseek-ai/schemastery": "^3.18.2",
     "react": "^18.2.0",
-    "@deepseek-ai/dsh-token-meter": ">=0.1.5-rc.1 <0.1.6",
-    "@deepseek-ai/dsh-session-projection": ">=0.1.5-rc.1 <0.1.6",
+    "@deepseek-ai/dsh-token-meter": ">=0.2.0-rc.2 <0.2.1",
+    "@deepseek-ai/dsh-session-projection": ">=0.2.0-rc.2 <0.2.1",
     "zod": "^4.5.4"
   },
   "peerDependenciesMeta": {
+    "@deepseek-ai/cordis-plugin-loader": {
+      "optional": true
+    },
     "@deepseek-ai/dsh-client-locale": {
       "optional": true
     },
@@ -117,7 +124,10 @@
     "@deepseek-ai/dsh-client-ui-conversation": {
       "optional": true
     },
-    "@deepseek-ai/dsh-client-ui-settings-plugins": {
+    "@deepseek-ai/dsh-client-ui-plugin-manager": {
+      "optional": true
+    },
+    "@deepseek-ai/dsh-client-ui-settings": {
       "optional": true
     },
     "@deepseek-ai/dsh-compaction": {
@@ -135,6 +145,9 @@
     "@deepseek-ai/dsh-session": {
       "optional": true
     },
+    "@deepseek-ai/dsh-session-query": {
+      "optional": true
+    },
     "@deepseek-ai/dsh-settings": {
       "optional": true
     },
@@ -166,8 +179,9 @@
   },
   "license": "MIT",
   "lcxCompatibility": {
-    "dshInstallRange": ">=0.1.5-rc.1 <0.1.6",
-    "verifiedDsh": "0.1.5-rc.1",
-    "verifiedHostPi": "0.85.1"
+    "dshInstallRange": ">=0.2.0-rc.2 <0.2.1",
+    "verifiedDsh": "0.2.0-rc.2",
+    "verifiedHostPi": "0.87.1",
+    "verifiedPluginPi": "0.87.1"
   }
 }