@dan-ai-studio/dshopencodego 0.1.18 → 0.1.19

package/lib/client.js

@@ -462,7 +462,7 @@ if (!document.querySelector("style[data-plugin-css=" + JSON.stringify(id) + "]")
   style.textContent = ".d7lz0W_root{color:var(--dsw-alias-label-primary);flex-direction:column;gap:1.25rem;display:flex}.d7lz0W_title{margin:0;font-size:1.05rem}.d7lz0W_hint{color:var(--dsw-alias-label-secondary);margin:0;font-size:.8rem}.d7lz0W_warn{color:var(--dsw-alias-state-warn-primary);margin:0;font-size:.8rem}.d7lz0W_ok{color:var(--dsw-alias-state-success-primary);font-size:.8rem}.d7lz0W_block{border:1px solid var(--dsw-alias-border-l1);background:var(--dsw-alias-bg-layer-1);border-radius:.6rem;flex-direction:column;gap:.5rem;padding:.85rem;display:flex}.d7lz0W_row{flex-wrap:wrap;align-items:center;gap:.5rem;display:flex}.d7lz0W_row>strong{margin-right:auto}.d7lz0W_input{border:1px solid var(--dsw-alias-border-l1);background:var(--dsw-alias-bg-base);min-width:10rem;color:var(--dsw-alias-label-primary);font:inherit;border-radius:.35rem;flex:14rem;padding:.35rem .5rem;font-size:.85rem}.d7lz0W_button{border:1px solid var(--dsw-alias-border-l1);background:var(--dsw-alias-bg-layer-2);color:var(--dsw-alias-label-primary);font:inherit;cursor:pointer;border-radius:.35rem;padding:.35rem .7rem;font-size:.8rem}.d7lz0W_button:disabled{color:var(--dsw-alias-state-idle-primary);cursor:default}.d7lz0W_number{border:1px solid var(--dsw-alias-border-l1);background:var(--dsw-alias-bg-base);width:5rem;color:var(--dsw-alias-label-primary);font:inherit;border-radius:.35rem;padding:.25rem .4rem;font-size:.8rem}.d7lz0W_select{border:1px solid var(--dsw-alias-border-l1);background:var(--dsw-alias-bg-base);width:auto;max-width:100%;color:var(--dsw-alias-label-primary);font:inherit;border-radius:.35rem;padding:.25rem .4rem;font-size:.8rem}.d7lz0W_list{flex-direction:column;display:flex}.d7lz0W_item{border-top:1px solid var(--dsw-alias-border-l1);align-items:flex-start;gap:.5rem;padding:.45rem .15rem;display:flex}.d7lz0W_item input[type=checkbox]{accent-color:var(--dsw-alias-brand-primary);margin-top:.15rem}.d7lz0W_itemBody{flex-direction:column;gap:.15rem;min-width:0;display:flex}.d7lz0W_itemMain{flex-wrap:wrap;align-items:baseline;gap:.6rem;display:flex}.d7lz0W_itemMeta{color:var(--dsw-alias-label-secondary);flex-wrap:wrap;gap:.75rem;font-size:.75rem;display:flex}.d7lz0W_itemModalities{color:var(--dsw-alias-label-secondary);font-size:.75rem}.d7lz0W_name{color:var(--dsw-alias-label-primary)}.d7lz0W_mono{color:var(--dsw-alias-label-secondary);font-family:ui-monospace,SFMono-Regular,Menlo,monospace}.d7lz0W_badge{color:var(--dsw-alias-brand-primary)}";
   document.head.appendChild(style);
 }
-var section_default = { "ok": "d7lz0W_ok", "itemModalities": "d7lz0W_itemModalities", "number": "d7lz0W_number", "hint": "d7lz0W_hint", "item": "d7lz0W_item", "block": "d7lz0W_block", "name": "d7lz0W_name", "warn": "d7lz0W_warn", "itemMain": "d7lz0W_itemMain", "badge": "d7lz0W_badge", "button": "d7lz0W_button", "input": "d7lz0W_input", "row": "d7lz0W_row", "select": "d7lz0W_select", "title": "d7lz0W_title", "list": "d7lz0W_list", "root": "d7lz0W_root", "itemMeta": "d7lz0W_itemMeta", "itemBody": "d7lz0W_itemBody", "mono": "d7lz0W_mono" };
+var section_default = { "row": "d7lz0W_row", "itemModalities": "d7lz0W_itemModalities", "input": "d7lz0W_input", "button": "d7lz0W_button", "list": "d7lz0W_list", "root": "d7lz0W_root", "item": "d7lz0W_item", "title": "d7lz0W_title", "itemMeta": "d7lz0W_itemMeta", "itemBody": "d7lz0W_itemBody", "itemMain": "d7lz0W_itemMain", "badge": "d7lz0W_badge", "ok": "d7lz0W_ok", "number": "d7lz0W_number", "name": "d7lz0W_name", "mono": "d7lz0W_mono", "select": "d7lz0W_select", "hint": "d7lz0W_hint", "block": "d7lz0W_block", "warn": "d7lz0W_warn" };
 
 // src/client/Section.tsx
 var import_jsx_runtime = require("react/jsx-runtime");
@@ -963,7 +963,7 @@ if (!document.querySelector("style[data-plugin-css=" + JSON.stringify(id2) + "]"
   style.textContent = ".mMNkkW_root{align-items:center;display:inline-flex;position:relative}.mMNkkW_trigger{border:1px solid var(--dsw-alias-border-l1);background:var(--dsw-alias-bg-layer-1);color:var(--dsw-alias-label-secondary);font:inherit;cursor:pointer;white-space:nowrap;border-radius:999px;padding:.35rem .6rem;font-size:.8rem;line-height:1}.mMNkkW_trigger:hover{color:var(--dsw-alias-label-primary);border-color:var(--dsw-alias-border-l2)}.mMNkkW_panel{z-index:20;border:1px solid var(--dsw-alias-border-l1);background:var(--dsw-alias-bg-overlay);width:18rem;color:var(--dsw-alias-label-primary);border-radius:.6rem;flex-direction:column;gap:.6rem;padding:.75rem .85rem;display:flex;position:absolute;bottom:calc(100% + .5rem);right:0;box-shadow:0 8px 24px #0000002e}.mMNkkW_window{flex-direction:column;gap:.25rem;display:flex}.mMNkkW_row{justify-content:space-between;gap:.5rem;font-size:.85rem;display:flex}.mMNkkW_hint{color:var(--dsw-alias-label-secondary);margin:0;font-size:.75rem}.mMNkkW_progress{width:100%;height:.35rem;accent-color:var(--dsw-alias-brand-primary)}.mMNkkW_limited{color:var(--dsw-alias-state-warn-primary);font-size:.75rem}.mMNkkW_warning{border:1px solid var(--dsw-alias-state-warn-primary);color:var(--dsw-alias-label-primary);border-radius:.4rem;padding:.4rem .5rem;font-size:.75rem}.mMNkkW_retry{border:1px solid var(--dsw-alias-border-l1);background:var(--dsw-alias-bg-layer-1);color:var(--dsw-alias-label-primary);font:inherit;cursor:pointer;border-radius:.35rem;align-self:flex-start;padding:.25rem .5rem;font-size:.75rem}.mMNkkW_local{border-top:1px solid var(--dsw-alias-border-l1);flex-direction:column;gap:.2rem;padding-top:.5rem;display:flex}";
   document.head.appendChild(style);
 }
-var pill_default = { "hint": "mMNkkW_hint", "warning": "mMNkkW_warning", "trigger": "mMNkkW_trigger", "row": "mMNkkW_row", "retry": "mMNkkW_retry", "root": "mMNkkW_root", "panel": "mMNkkW_panel", "local": "mMNkkW_local", "window": "mMNkkW_window", "limited": "mMNkkW_limited", "progress": "mMNkkW_progress" };
+var pill_default = { "local": "mMNkkW_local", "row": "mMNkkW_row", "retry": "mMNkkW_retry", "panel": "mMNkkW_panel", "warning": "mMNkkW_warning", "window": "mMNkkW_window", "hint": "mMNkkW_hint", "root": "mMNkkW_root", "progress": "mMNkkW_progress", "limited": "mMNkkW_limited", "trigger": "mMNkkW_trigger" };
 
 // src/client/UsagePill.tsx
 var import_jsx_runtime2 = require("react/jsx-runtime");

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dan-ai-studio/dshopencodego",
-  "version": "0.1.18",
+  "version": "0.1.19",
   "description": "OpenCode Go provider for DeepSeek Harness: live gateway catalog, per-conversation session header, usage",
   "type": "module",
   "license": "MIT",
@@ -31,6 +31,7 @@
   },
   "files": [
     "lib",
+    "scripts/patch-pi-ai.mjs",
     "cordis.patch.yml",
     "README.md",
     "README.en.md",

package/scripts/patch-pi-ai.mjs

@@ -0,0 +1,115 @@
+/**
+ * Port of DSH's `patches/@earendil-works__pi-ai@0.87.1.patch` for npm installs.
+ *
+ * Upstream re-parses the whole accumulated tool-call argument JSON on every
+ * stream delta (`O(n^2)` on multi-megabyte arguments and stalls the event
+ * loop). DSH removes those per-delta parses via pnpm `patchedDependencies`;
+ * this package is npm-installed, so the same removals are applied here,
+ * idempotently, to the installed copy.
+ *
+ * Only the per-delta occurrences are removed — each is anchored on its
+ * distinctive preceding accumulation line, exactly matching the upstream
+ * hunks. The final parses (toolcall_end / done handlers, which strip the
+ * scratch buffers so replay carries parsed arguments) are kept.
+ *
+ * The adapter only reads delta strings plus the finalized arguments (see
+ * `src/conversion/stream.ts`), so dropping the intermediate `arguments`
+ * assignments changes no wire behaviour — until `toolcall_end` the partials
+ * stay `{}`, exactly like the patched DSH runtime.
+ *
+ * Best-effort: a missing tree or a newer pi-ai that already dropped the lines
+ * only warns; it never fails the install.
+ */
+import { existsSync, readFileSync, writeFileSync } from 'node:fs'
+import { dirname, resolve } from 'node:path'
+import { createRequire } from 'node:module'
+import { fileURLToPath } from 'node:url'
+
+const require = createRequire(import.meta.url)
+
+/** Locate the installed pi-ai root without crossing its `exports` map. */
+function findPiRoot() {
+  try {
+    const main = require.resolve('@earendil-works/pi-ai')
+    if (basenameIsDist(dirname(main))) return dirname(dirname(main))
+  } catch {
+    // Fall through to the layout probe below.
+  }
+  const probe = resolve(dirname(fileURLToPath(import.meta.url)), '..', 'node_modules', '@earendil-works', 'pi-ai')
+  return existsSync(`${probe}/package.json`) ? probe : undefined
+}
+
+/** True when `dir` is the package's `dist` directory. */
+function basenameIsDist(dir) {
+  return dir.endsWith('/dist') || dir.endsWith('\\dist')
+}
+
+/**
+ * One hunk: `before` (kept) immediately followed by `removed`.
+ * Whitespace between them is flexible; nothing else is touched.
+ */
+const HUNKS = [
+  ['dist/api/anthropic-messages.js',
+    'block.partialJson += event.delta.partial_json;',
+    'block.arguments = parseStreamingJson(block.partialJson);'],
+  ['dist/api/bedrock-converse-stream.js',
+    'block.partialJson = (block.partialJson || "") + (delta.toolUse.input || "");',
+    'block.arguments = parseStreamingJson(block.partialJson);'],
+  ['dist/api/mistral-conversations.js',
+    'block.partialArgs = (block.partialArgs || "") + argsDelta;',
+    'block.arguments = parseStreamingJson(block.partialArgs);'],
+  ['dist/api/openai-completions.js',
+    'block.partialArgs = (block.partialArgs ?? "") + toolCall.function.arguments;',
+    'block.arguments = parseStreamingJson(block.partialArgs);'],
+  ['dist/api/openai-responses-shared.js',
+    'slot.block.partialJson += event.delta;',
+    'slot.block.arguments = parseStreamingJson(slot.block.partialJson);'],
+]
+
+const escapeRegExp = text => text.replace(/[.*+?^${}()|[\]\\]/g, '\\$&')
+
+const piRoot = findPiRoot()
+if (piRoot === undefined) {
+  console.warn('[dshopencodego] patch-pi-ai: pi-ai not installed, skipping')
+  process.exit(0)
+}
+
+let version = 'unknown'
+try {
+  version = JSON.parse(readFileSync(`${piRoot}/package.json`, 'utf8')).version ?? 'unknown'
+} catch (error) {
+  console.warn(`[dshopencodego] patch-pi-ai: cannot read pi-ai version, skipping (${String(error)})`)
+  process.exit(0)
+}
+if (version !== '0.87.1') {
+  console.warn(`[dshopencodego] patch-pi-ai: pi-ai ${version} is not 0.87.1, skipping (re-check upstream pi#9265)`)
+  process.exit(0)
+}
+
+let patched = 0
+let files = 0
+for (const [rel, before, removed] of HUNKS) {
+  const path = `${piRoot}/${rel}`
+  if (!existsSync(path)) continue
+  files += 1
+  const pattern = new RegExp(`(${escapeRegExp(before)}\\n)(\\s*${escapeRegExp(removed)}\\n)`)
+  const text = readFileSync(path, 'utf8')
+  if (!pattern.test(text)) continue
+  writeFileSync(path, text.replace(pattern, '$1'))
+  patched += 1
+}
+
+// pi-messages.js spans the delta assignment over two lines.
+{
+  const path = `${piRoot}/dist/api/pi-messages.js`
+  if (existsSync(path)) {
+    files += 1
+    const pattern = /partial\.content\[event\.contentIndex\]\.arguments =\s*\n?\s*parseStreamingJson\(json\);\n/
+    const text = readFileSync(path, 'utf8')
+    if (pattern.test(text)) {
+      writeFileSync(path, text.replace(pattern, ''))
+      patched += 1
+    }
+  }
+}
+console.log(`[dshopencodego] patch-pi-ai: ${patched} hunks applied across ${files} files (idempotent)`)