dsh-as-aistudio 0.2.2 → 0.2.5

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dsh-as-aistudio",
-  "version": "0.2.2",
+  "version": "0.2.5",
   "description": "Google-AI-Studio-style turn controls for DeepSeek Harness, in one install: edit a prompt and re-run it, re-run a reply in place, delete a turn from the model context, and render sent prompts as Markdown. Self-contained: the plugin list shows this one row; the four components are dependencies mounted by it. Each still installs alone and works alone.",
   "type": "module",
   "main": "src/index.js",
@@ -41,13 +41,15 @@
     "vendor": "node tools/vendor.mjs",
     "build": "node tools/vendor.mjs && node tools/build.mjs",
     "test": "node --test test/*.test.js",
-    "check": "npm run build && npm test",
+    "check": "npm run verify:manifest && npm run build && npm test",
+    "bump": "node tools/bump.mjs",
     "verify:vendor": "node tools/vendor.mjs --check",
-    "verify:build": "node tools/build.mjs --check"
+    "verify:build": "node tools/build.mjs --check",
+    "verify:manifest": "node tools/verify-manifest.mjs"
   },
   "dependencies": {
-    "dsh-delete-turn": "^0.1.7",
-    "dsh-edit-turn": "^0.2.25",
+    "dsh-delete-turn": "^0.1.8",
+    "dsh-edit-turn": "^0.2.16",
     "dsh-markdown-bubble": "^0.1.4",
     "dsh-rerun-turn": "^0.1.24"
   },
@@ -71,7 +73,7 @@
     "compatibility": {
       "dshReleases": {
         "0.1.6-alpha.2": "compatible",
-        "0.2.2-rc.1": "compatible"
+        "0.2.0-rc.2": "compatible"
       }
     }
   }

package/src/client.js

@@ -32,7 +32,7 @@ window.__ModuleLoader__.load({
     const RERUN_PREFIX = '/dsh-rerun-turn'
 
     /** Keep in sync with package.json and lib/index.js. */
-    const PLUGIN_VERSION = '0.2.15'
+    const PLUGIN_VERSION = '0.2.16'
 
     // --- copy -----------------------------------------------------------------
 
@@ -3131,6 +3131,8 @@ window.__ModuleLoader__.load({
         this.animateOnce = false
         this.view = Object.freeze({
           hidden: new Map(),
+          // replacement seq -> the seq it was recorded as shadowing. See hiddenViaOf.
+          hiddenVia: new Map(),
           surface: new Set(),
           replyTurns: new Set(),
           edits: new Map(),
@@ -3195,6 +3197,7 @@ window.__ModuleLoader__.load({
             for (const item of Array.isArray(data.hidden) ? data.hidden : []) {
               if (item && typeof item.seq === 'number') hidden.set(item.seq, typeof item.mode === 'string' ? item.mode : 'message')
             }
+            const hiddenVia = hiddenViaOf(data.hidden)
             const surface = new Set()
             for (const seq of Array.isArray(data.surface) ? data.surface : []) surface.add(seq)
             const replyTurns = new Set()
@@ -3208,7 +3211,7 @@ window.__ModuleLoader__.load({
               if (typeof turn === 'number') markerTurns.add(turn)
             }
             const surfaceThrough = typeof data.lastSeq === 'number' ? data.lastSeq : -1
-            this.publish({ hidden, surface, replyTurns, edits, markerTurns, surfaceReady: true, surfaceThrough, loaded: true, loadError: false })
+            this.publish({ hidden, hiddenVia, surface, replyTurns, edits, markerTurns, surfaceReady: true, surfaceThrough, loaded: true, loadError: false })
           })
           .catch(() => {
             this.publish({ loadError: true })
@@ -3260,8 +3263,10 @@ window.__ModuleLoader__.load({
           for (const item of Array.isArray(data.hidden) ? data.hidden : []) {
             if (item && typeof item.seq === 'number') hidden.set(item.seq, typeof item.mode === 'string' ? item.mode : target.mode)
           }
+          const hiddenVia = new Map(this.view.hiddenVia)
+          for (const [via, seq] of hiddenViaOf(data.hidden)) hiddenVia.set(via, seq)
           this.animateOnce = true
-          this.publish({ pending: false, dialog: null, hidden, loaded: true, loadError: false })
+          this.publish({ pending: false, dialog: null, hidden, hiddenVia, loaded: true, loadError: false })
         } catch {
           this.publish({ pending: false, failure: 'generic' })
         }
@@ -3419,9 +3424,27 @@ window.__ModuleLoader__.load({
       return seq === target.seq ? target : { ...target, seq }
     }
 
-    function isRowHidden(hidden, seqs) {
+    // Index a deletion by the REPLACEMENT it landed, not only by the seq it
+    // shadowed. A deleted message leaves a carrier standing in its row, and the
+    // transcript row names the live node (the carrier), so a row checked against
+    // 'hidden' alone never matches: the deletion succeeds, the model context
+    // loses the message, and the row is simply never hidden - an empty bubble
+    // left behind. The link is already on every hidden entry ('replacement'), so
+    // it is indexed here rather than derived from 'edits': that chain
+    // deliberately excludes this plugin's own carriers (they rewrite context,
+    // not content) and so cannot bridge the gap.
+    function hiddenViaOf(items) {
+      const via = new Map()
+      for (const item of Array.isArray(items) ? items : []) {
+        if (item && typeof item.seq === 'number' && typeof item.replacement === 'number') via.set(item.replacement, item.seq)
+      }
+      return via
+    }
+
+    function isRowHidden(hidden, hiddenVia, seqs) {
       for (const seq of seqs) {
         if (hidden.has(seq)) return true
+        if (hiddenVia !== undefined && hiddenVia.has(seq)) return true
       }
       return false
     }
@@ -3684,13 +3707,13 @@ window.__ModuleLoader__.load({
           const anchor = anchorKey === undefined ? undefined : snapshot.nodes.get(anchorKey)
           if (anchor !== undefined) {
             const seqs = expandSeqs(seqsFor(anchor), view.edits)
-            setRowHidden(row, isRowHidden(view.hidden, seqs), animate)
+            setRowHidden(row, isRowHidden(view.hidden, view.hiddenVia, seqs), animate)
           }
           continue
         }
         const seqs = expandSeqs(seqsFor(node), view.edits)
         for (const seq of seqs) if (typeof seq === 'number' && seq > maxSeq) maxSeq = seq
-        const hidden = isRowHidden(view.hidden, seqs)
+        const hidden = isRowHidden(view.hidden, view.hiddenVia, seqs)
         setRowHidden(row, hidden, animate)
         const target = hidden ? null : liveTarget(targetFor(node), view.edits)
         const covered = target !== null || slotCoversRow(node)
@@ -4795,7 +4818,7 @@ window.__ModuleLoader__.load({
     const NS = 'dsh-as-aistudio'
 
     /** Keep in sync with package.json and src/components.js. */
-    const PLUGIN_VERSION = '0.2.2'
+    const PLUGIN_VERSION = '0.2.5'
 
     /** Presence marker the live verifier reads. */
     const DEBUG_KEY = '__DSH_AS_AISTUDIO__'

package/src/components.js

@@ -19,7 +19,7 @@
 export const STUDIO_ID = 'dsh-as-aistudio'
 
 /** Keep in sync with package.json and src/client.js. */
-export const STUDIO_VERSION = '0.2.2'
+export const STUDIO_VERSION = '0.2.5'
 
 /**
  * The AI Studio action strip this studio composes, in the order the user meets

package/src/studio.js

@@ -49,7 +49,7 @@ window.__ModuleLoader__.load({
     const NS = 'dsh-as-aistudio'
 
     /** Keep in sync with package.json and src/components.js. */
-    const PLUGIN_VERSION = '0.2.2'
+    const PLUGIN_VERSION = '0.2.5'
 
     /** Presence marker the live verifier reads. */
     const DEBUG_KEY = '__DSH_AS_AISTUDIO__'

package/src/vendor/dsh-delete-turn.js

@@ -1,6 +1,6 @@
 // dsh-delete-turn browser half, VENDORED by tools/vendor.mjs - DO NOT EDIT.
 //
-// Source: ../dsh-delete-turn/src/client.js  (v0.1.7, sha256 516518d8b6b8e5e4)
+// Source: ../dsh-delete-turn/src/client.js  (v0.1.8, sha256 09de24fd97ecd4ec)
 // Regenerate with `npm run vendor`; test/vendor-sync.test.js fails when this is stale.
 //
 // The component registers its factory with the host module loader; inside this
@@ -154,6 +154,8 @@ export default (require) => {
         this.animateOnce = false
         this.view = Object.freeze({
           hidden: new Map(),
+          // replacement seq -> the seq it was recorded as shadowing. See hiddenViaOf.
+          hiddenVia: new Map(),
           surface: new Set(),
           replyTurns: new Set(),
           edits: new Map(),
@@ -218,6 +220,7 @@ export default (require) => {
             for (const item of Array.isArray(data.hidden) ? data.hidden : []) {
               if (item && typeof item.seq === 'number') hidden.set(item.seq, typeof item.mode === 'string' ? item.mode : 'message')
             }
+            const hiddenVia = hiddenViaOf(data.hidden)
             const surface = new Set()
             for (const seq of Array.isArray(data.surface) ? data.surface : []) surface.add(seq)
             const replyTurns = new Set()
@@ -231,7 +234,7 @@ export default (require) => {
               if (typeof turn === 'number') markerTurns.add(turn)
             }
             const surfaceThrough = typeof data.lastSeq === 'number' ? data.lastSeq : -1
-            this.publish({ hidden, surface, replyTurns, edits, markerTurns, surfaceReady: true, surfaceThrough, loaded: true, loadError: false })
+            this.publish({ hidden, hiddenVia, surface, replyTurns, edits, markerTurns, surfaceReady: true, surfaceThrough, loaded: true, loadError: false })
           })
           .catch(() => {
             this.publish({ loadError: true })
@@ -283,8 +286,10 @@ export default (require) => {
           for (const item of Array.isArray(data.hidden) ? data.hidden : []) {
             if (item && typeof item.seq === 'number') hidden.set(item.seq, typeof item.mode === 'string' ? item.mode : target.mode)
           }
+          const hiddenVia = new Map(this.view.hiddenVia)
+          for (const [via, seq] of hiddenViaOf(data.hidden)) hiddenVia.set(via, seq)
           this.animateOnce = true
-          this.publish({ pending: false, dialog: null, hidden, loaded: true, loadError: false })
+          this.publish({ pending: false, dialog: null, hidden, hiddenVia, loaded: true, loadError: false })
         } catch {
           this.publish({ pending: false, failure: 'generic' })
         }
@@ -442,9 +447,27 @@ export default (require) => {
       return seq === target.seq ? target : { ...target, seq }
     }
 
-    function isRowHidden(hidden, seqs) {
+    // Index a deletion by the REPLACEMENT it landed, not only by the seq it
+    // shadowed. A deleted message leaves a carrier standing in its row, and the
+    // transcript row names the live node (the carrier), so a row checked against
+    // 'hidden' alone never matches: the deletion succeeds, the model context
+    // loses the message, and the row is simply never hidden - an empty bubble
+    // left behind. The link is already on every hidden entry ('replacement'), so
+    // it is indexed here rather than derived from 'edits': that chain
+    // deliberately excludes this plugin's own carriers (they rewrite context,
+    // not content) and so cannot bridge the gap.
+    function hiddenViaOf(items) {
+      const via = new Map()
+      for (const item of Array.isArray(items) ? items : []) {
+        if (item && typeof item.seq === 'number' && typeof item.replacement === 'number') via.set(item.replacement, item.seq)
+      }
+      return via
+    }
+
+    function isRowHidden(hidden, hiddenVia, seqs) {
       for (const seq of seqs) {
         if (hidden.has(seq)) return true
+        if (hiddenVia !== undefined && hiddenVia.has(seq)) return true
       }
       return false
     }
@@ -707,13 +730,13 @@ export default (require) => {
           const anchor = anchorKey === undefined ? undefined : snapshot.nodes.get(anchorKey)
           if (anchor !== undefined) {
             const seqs = expandSeqs(seqsFor(anchor), view.edits)
-            setRowHidden(row, isRowHidden(view.hidden, seqs), animate)
+            setRowHidden(row, isRowHidden(view.hidden, view.hiddenVia, seqs), animate)
           }
           continue
         }
         const seqs = expandSeqs(seqsFor(node), view.edits)
         for (const seq of seqs) if (typeof seq === 'number' && seq > maxSeq) maxSeq = seq
-        const hidden = isRowHidden(view.hidden, seqs)
+        const hidden = isRowHidden(view.hidden, view.hiddenVia, seqs)
         setRowHidden(row, hidden, animate)
         const target = hidden ? null : liveTarget(targetFor(node), view.edits)
         const covered = target !== null || slotCoversRow(node)

package/src/vendor/dsh-edit-turn.js

@@ -1,6 +1,6 @@
 // dsh-edit-turn browser half, VENDORED by tools/vendor.mjs - DO NOT EDIT.
 //
-// Source: ../dsh-edit-turn/lib/client.js  (v0.2.15, sha256 805626f0a2ff50d3)
+// Source: ../dsh-edit-turn/lib/client.js  (v0.2.16, sha256 3ccc92a337c0541e)
 // Regenerate with `npm run vendor`; test/vendor-sync.test.js fails when this is stale.
 //
 // The component registers its factory with the host module loader; inside this
@@ -24,7 +24,7 @@ export default (require) => {
     const RERUN_PREFIX = '/dsh-rerun-turn'
 
     /** Keep in sync with package.json and lib/index.js. */
-    const PLUGIN_VERSION = '0.2.15'
+    const PLUGIN_VERSION = '0.2.16'
 
     // --- copy -----------------------------------------------------------------
 

package/tools/bump.mjs

@@ -0,0 +1,82 @@
+// Bump this package's version in the three places that legitimately carry it -
+// and assert that NOTHING ELSE in those files changed.
+//
+// The rule this tool exists to enforce. Do not bump with a blind replace:
+//
+//     s.split('0.2.1').join('0.2.2')        // WRONG
+//
+// That also rewrites every other string containing the old version. '^0.2.15'
+// contains '0.2.1', so a dependency range silently became '^0.2.25' - a version
+// that has never existed - and the package shipped unable to install at all.
+// It also rewrote a DSH release key ('0.2.0-rc.1' -> '0.2.1-rc.1'), which has
+// nothing to do with this package's version.
+//
+//   node tools/bump.mjs 0.2.3        # write
+//   node tools/bump.mjs --check      # verify the three sites agree, write nothing
+import { readFileSync, writeFileSync } from 'node:fs'
+import { dirname, join } from 'node:path'
+import { fileURLToPath } from 'node:url'
+
+const root = join(dirname(fileURLToPath(import.meta.url)), '..')
+
+/** file, the one regex that matches its version literal, and a human name. */
+const SITES = [
+  { file: 'package.json', pattern: /(^\s*"version":\s*")([^"]+)(")/m, label: 'package.json version' },
+  { file: 'src/components.js', pattern: /(export const STUDIO_VERSION = ')([^']+)(')/, label: 'STUDIO_VERSION' },
+  { file: 'src/studio.js', pattern: /(const PLUGIN_VERSION = ')([^']+)(')/, label: 'PLUGIN_VERSION' },
+]
+
+function currentOf(site) {
+  const text = readFileSync(join(root, site.file), 'utf8')
+  const match = site.pattern.exec(text)
+  if (match === null) throw new Error(site.label + ': the version literal is not in ' + site.file)
+  return match[2]
+}
+
+const versions = SITES.map((site) => ({ ...site, current: currentOf(site) }))
+const distinct = [...new Set(versions.map((v) => v.current))]
+
+if (process.argv.includes('--check')) {
+  if (distinct.length !== 1) {
+    console.error('the three version sites disagree: ' + versions.map((v) => v.label + '=' + v.current).join(', '))
+    process.exit(1)
+  }
+  console.log('the version is one number in three places: ' + distinct[0])
+  process.exit(0)
+}
+
+const next = process.argv[2]
+if (!/^[0-9]+\.[0-9]+\.[0-9]+(-[0-9A-Za-z.-]+)?$/.test(next || '')) {
+  console.error('usage: node tools/bump.mjs <semver>   (for example 0.2.3)')
+  process.exit(2)
+}
+if (distinct.length !== 1) {
+  console.error('refusing to bump: the three sites already disagree (' + distinct.join(', ') + '); fix them first')
+  process.exit(2)
+}
+const from = distinct[0]
+if (from === next) {
+  console.error('already at ' + next)
+  process.exit(2)
+}
+
+for (const site of versions) {
+  const path = join(root, site.file)
+  const before = readFileSync(path, 'utf8')
+  const after = before.replace(site.pattern, (_m, head, _old, tail) => head + next + tail)
+  if (before === after) throw new Error(site.label + ': nothing changed in ' + site.file)
+  // The whole point: exactly one line may differ, and it must be the version line.
+  const beforeLines = before.split('\n')
+  const afterLines = after.split('\n')
+  if (beforeLines.length !== afterLines.length) throw new Error(site.file + ': the line count changed')
+  const changed = beforeLines.map((line, index) => (line === afterLines[index] ? null : index)).filter((index) => index !== null)
+  if (changed.length !== 1) {
+    throw new Error(site.file + ': expected exactly 1 changed line, got ' + changed.length + '; refusing to write')
+  }
+  writeFileSync(path, after)
+  console.log('  ' + site.file + ':' + (changed[0] + 1) + '  ' + site.label + '  ' + from + ' -> ' + next)
+}
+
+console.log('')
+console.log('bumped ' + from + ' -> ' + next + ' in ' + versions.length + ' places, nothing else touched.')
+console.log('Now: node tools/verify-manifest.mjs, npm run build, npm test.')

package/tools/verify-manifest.mjs

@@ -0,0 +1,77 @@
+// Gate the manifest against the registry before publishing.
+//
+// This is the check whose absence shipped a broken release: dsh-as-aistudio@0.2.2
+// declared 'dsh-edit-turn': '^0.2.25'. No such version exists (the latest is
+// 0.2.15), so `pnpm add dsh-as-aistudio@0.2.2` failed with
+// ERR_PNPM_NO_MATCHING_VERSION and the package could not be installed at all -
+// while every test that exercised the bundle inside it passed, because unpacking
+// a tarball never resolves its dependencies.
+//
+//   node tools/verify-manifest.mjs        # exit 1 on any unresolvable range
+import { execFileSync } from 'node:child_process'
+import { readFileSync } from 'node:fs'
+import { dirname, join } from 'node:path'
+import { fileURLToPath } from 'node:url'
+
+const root = join(dirname(fileURLToPath(import.meta.url)), '..')
+const manifest = JSON.parse(readFileSync(join(root, 'package.json'), 'utf8'))
+let failed = 0
+
+// 1. every dependency range must resolve to a published version
+const deps = Object.entries(manifest.dependencies || {})
+if (deps.length === 0) {
+  console.error('no dependencies declared; that is not the shape of this package')
+  failed += 1
+}
+for (const [name, range] of deps) {
+  let resolved = ''
+  try {
+    resolved = execFileSync('npm', ['view', name + '@' + range, 'version'], { encoding: 'utf8', stdio: ['ignore', 'pipe', 'ignore'] }).trim().split('\n').pop().trim()
+  } catch (error) {
+    resolved = ''
+  }
+  if (resolved === '') {
+    console.error('  UNRESOLVABLE  ' + name + '@' + range + '  <- no published version satisfies this')
+    failed += 1
+  } else {
+    console.log('  ok            ' + name + '@' + range + ' -> ' + resolved)
+  }
+}
+
+// 2. the version must be one number in the three places that carry it
+const sites = [
+  ['package.json', /(^\s*"version":\s*")([^"]+)(")/m],
+  ['src/components.js', /(export const STUDIO_VERSION = ')([^']+)(')/],
+  ['src/studio.js', /(const PLUGIN_VERSION = ')([^']+)(')/],
+]
+const found = sites.map(([file, pattern]) => {
+  const match = pattern.exec(readFileSync(join(root, file), 'utf8'))
+  return { file, version: match === null ? null : match[2] }
+})
+const distinct = [...new Set(found.map((s) => s.version))]
+if (distinct.length !== 1 || distinct[0] === null) {
+  console.error('  VERSION DRIFT ' + found.map((s) => s.file + '=' + s.version).join(', '))
+  failed += 1
+} else {
+  console.log('  ok            version ' + distinct[0] + ' in all three places')
+}
+
+// 3. DSH compatibility keys must look like DSH releases, not like this package
+const releases = Object.keys(manifest.dsh?.compatibility?.dshReleases || {})
+if (releases.length === 0) {
+  console.error('  NO DSH RELEASES declared in dsh.compatibility.dshReleases')
+  failed += 1
+}
+for (const release of releases) {
+  if (!/^0\.[0-9]+\.[0-9]+(-[0-9A-Za-z.-]+)?$/.test(release)) {
+    console.error('  BAD DSH KEY   ' + release + ' does not look like a DSH release')
+    failed += 1
+  }
+}
+
+console.log('')
+if (failed > 0) {
+  console.error(failed + ' manifest problem(s); do not publish')
+  process.exit(1)
+}
+console.log('manifest ok: ' + deps.length + ' dependency ranges resolve, version ' + distinct[0] + ' consistent')