dsh-design-studio 0.10.0 → 0.12.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (98) hide show
  1. package/README.en.md +4 -3
  2. package/README.md +6 -5
  3. package/assets/demo.gif +0 -0
  4. package/assets/hero-sm.jpg +0 -0
  5. package/cordis.patch.yml +5 -0
  6. package/gallery-seed/d/orderg-x__alley-noodles/08e9e40834f9/_shots/menu.jpg +0 -0
  7. package/gallery-seed/d/orderg-x__alley-noodles/08e9e40834f9/app.css +64 -0
  8. package/gallery-seed/d/orderg-x__alley-noodles/08e9e40834f9/cart.html +120 -0
  9. package/gallery-seed/d/orderg-x__alley-noodles/08e9e40834f9/design.json +56 -0
  10. package/gallery-seed/d/orderg-x__alley-noodles/08e9e40834f9/menu.html +200 -0
  11. package/gallery-seed/d/orderg-x__alley-noodles/08e9e40834f9/order.html +135 -0
  12. package/gallery-seed/d/orderg-x__alley-noodles/08e9e40834f9/tokens.css +43 -0
  13. package/gallery-seed/d/orderg-x__autumn-sale/08e9e40834f9/_shots/email.jpg +0 -0
  14. package/gallery-seed/d/orderg-x__autumn-sale/08e9e40834f9/design.json +20 -0
  15. package/gallery-seed/d/orderg-x__autumn-sale/08e9e40834f9/email.html +268 -0
  16. package/gallery-seed/d/orderg-x__little-painter/08e9e40834f9/_shots/courses.jpg +0 -0
  17. package/gallery-seed/d/orderg-x__little-painter/08e9e40834f9/courses.html +364 -0
  18. package/gallery-seed/d/orderg-x__little-painter/08e9e40834f9/design.json +49 -0
  19. package/gallery-seed/d/orderg-x__little-painter/08e9e40834f9/lesson.html +196 -0
  20. package/gallery-seed/d/orderg-x__little-painter/08e9e40834f9/tokens.css +55 -0
  21. package/gallery-seed/d/orderg-x__little-painter/08e9e40834f9/ui.css +255 -0
  22. package/gallery-seed/d/orderg-x__moon-fair/08e9e40834f9/_shots/poster.jpg +0 -0
  23. package/gallery-seed/d/orderg-x__moon-fair/08e9e40834f9/design.json +21 -0
  24. package/gallery-seed/d/orderg-x__moon-fair/08e9e40834f9/poster.html +165 -0
  25. package/gallery-seed/d/orderg-x__moon-fair/08e9e40834f9/tokens.css +35 -0
  26. package/gallery-seed/d/orderg-x__paw-diary/08e9e40834f9/_shots/home.jpg +0 -0
  27. package/gallery-seed/d/orderg-x__paw-diary/08e9e40834f9/app.css +155 -0
  28. package/gallery-seed/d/orderg-x__paw-diary/08e9e40834f9/booking.html +232 -0
  29. package/gallery-seed/d/orderg-x__paw-diary/08e9e40834f9/design.json +57 -0
  30. package/gallery-seed/d/orderg-x__paw-diary/08e9e40834f9/health.html +221 -0
  31. package/gallery-seed/d/orderg-x__paw-diary/08e9e40834f9/home.html +225 -0
  32. package/gallery-seed/d/orderg-x__paw-diary/08e9e40834f9/tokens.css +54 -0
  33. package/gallery-seed/d/orderg-x__pocket-ledger/08e9e40834f9/_shots/overview.jpg +0 -0
  34. package/gallery-seed/d/orderg-x__pocket-ledger/08e9e40834f9/app.css +79 -0
  35. package/gallery-seed/d/orderg-x__pocket-ledger/08e9e40834f9/design.json +51 -0
  36. package/gallery-seed/d/orderg-x__pocket-ledger/08e9e40834f9/entries.html +161 -0
  37. package/gallery-seed/d/orderg-x__pocket-ledger/08e9e40834f9/icons.svg +30 -0
  38. package/gallery-seed/d/orderg-x__pocket-ledger/08e9e40834f9/overview.html +181 -0
  39. package/gallery-seed/d/orderg-x__pocket-ledger/08e9e40834f9/tokens.css +50 -0
  40. package/gallery-seed/d/orderg-x__time-bookshop/08e9e40834f9/_shots/home.jpg +0 -0
  41. package/gallery-seed/d/orderg-x__time-bookshop/08e9e40834f9/book.html +279 -0
  42. package/gallery-seed/d/orderg-x__time-bookshop/08e9e40834f9/design.json +21 -0
  43. package/gallery-seed/d/orderg-x__time-bookshop/08e9e40834f9/home.html +348 -0
  44. package/gallery-seed/d/orderg-x__time-bookshop/08e9e40834f9/style.css +297 -0
  45. package/gallery-seed/d/orderg-x__time-bookshop/08e9e40834f9/tokens.css +49 -0
  46. package/gallery-seed/d/orderg-x__year-review/08e9e40834f9/01-cover.html +133 -0
  47. package/gallery-seed/d/orderg-x__year-review/08e9e40834f9/02-highlights.html +67 -0
  48. package/gallery-seed/d/orderg-x__year-review/08e9e40834f9/03-growth.html +89 -0
  49. package/gallery-seed/d/orderg-x__year-review/08e9e40834f9/04-milestones.html +92 -0
  50. package/gallery-seed/d/orderg-x__year-review/08e9e40834f9/05-next.html +99 -0
  51. package/gallery-seed/d/orderg-x__year-review/08e9e40834f9/06-thanks.html +61 -0
  52. package/gallery-seed/d/orderg-x__year-review/08e9e40834f9/_shots/01-cover.jpg +0 -0
  53. package/gallery-seed/d/orderg-x__year-review/08e9e40834f9/deck.css +67 -0
  54. package/gallery-seed/d/orderg-x__year-review/08e9e40834f9/design.json +25 -0
  55. package/gallery-seed/d/orderg-x__year-review/08e9e40834f9/tokens.css +30 -0
  56. package/gallery-seed/index.json +1 -0
  57. package/gallery-seed/thumbs/orderg-x__alley-noodles.webp +0 -0
  58. package/gallery-seed/thumbs/orderg-x__autumn-sale.webp +0 -0
  59. package/gallery-seed/thumbs/orderg-x__little-painter.webp +0 -0
  60. package/gallery-seed/thumbs/orderg-x__moon-fair.webp +0 -0
  61. package/gallery-seed/thumbs/orderg-x__paw-diary.webp +0 -0
  62. package/gallery-seed/thumbs/orderg-x__pocket-ledger.webp +0 -0
  63. package/gallery-seed/thumbs/orderg-x__time-bookshop.webp +0 -0
  64. package/gallery-seed/thumbs/orderg-x__year-review.webp +0 -0
  65. package/lib/browser.js +23 -9
  66. package/lib/bundle.js +12 -3
  67. package/lib/client.js +3253 -483
  68. package/lib/core.js +231 -7
  69. package/lib/draft-page.js +763 -0
  70. package/lib/draft.js +151 -0
  71. package/lib/gallery/css.js +230 -0
  72. package/lib/gallery/html.js +313 -0
  73. package/lib/gallery/index.js +22 -0
  74. package/lib/gallery/market-routes.js +306 -0
  75. package/lib/gallery/market.js +623 -0
  76. package/lib/gallery/pack.js +311 -0
  77. package/lib/gallery/policy.js +1560 -0
  78. package/lib/gallery/qrfind.js +181 -0
  79. package/lib/gallery/render.js +148 -0
  80. package/lib/gallery/routes.js +360 -0
  81. package/lib/gallery/tar.js +118 -0
  82. package/lib/gallery/use.js +125 -0
  83. package/lib/gallery/zip.js +212 -0
  84. package/lib/handoff.js +190 -36
  85. package/lib/history.js +3 -1
  86. package/lib/index.js +123 -22
  87. package/lib/inspire.js +142 -0
  88. package/lib/offline.js +17 -0
  89. package/lib/picker.js +260 -1
  90. package/lib/serve.js +264 -11
  91. package/lib/tweaks.js +58 -24
  92. package/lib/works.js +238 -0
  93. package/locale/en.json +2 -1
  94. package/locale/offline/en.json +6 -0
  95. package/locale/offline/zh.json +6 -0
  96. package/locale/zh.json +2 -1
  97. package/package.json +9 -2
  98. package/skills/ui-design/SKILL.md +9 -0
package/lib/core.js CHANGED
@@ -10,12 +10,14 @@ import fs from 'node:fs'
10
10
  import os from 'node:os'
11
11
  import path from 'node:path'
12
12
  import { fileURLToPath } from 'node:url'
13
+ import { createJsonStringDecoder } from './draft.js'
13
14
 
14
15
  const HTML_EXT = /\.html?$/i
15
16
  const LOCAL_URL = /^(?:https?:\/\/)?(localhost|127\.0\.0\.1|0\.0\.0\.0|\[::1\]):(\d{2,5})(\/[^\s]*)?$/i
16
17
  // 命令输出里的本机地址(开发服务器启动时会打印)
17
18
  const URL_IN_TEXT = /\bhttps?:\/\/(?:localhost|127\.0\.0\.1|0\.0\.0\.0|\[::1\]):(\d{2,5})(\/[^\s"'`<>)\]]*)?/gi
18
19
  const LIVE_MS = 120000 // 事件时间离现在超过这么久就当是重放历史
20
+ const DRAFT_LIVE_MS = 8000 // 草稿写完这么久以内右侧栏才看到:还放一遍(轮询 0.7 秒一次,放一遍三四秒,留足余量)
19
21
  const CHANGE_LOG = 20 // 记最近几批文件改动(远程看按它补齐两次轮询之间的改动)
20
22
  const DESIGN_SKILL = 'ui-design'
21
23
  const ASK_TOOL = 'ask_user_question' // DSH 的提问卡:模型问了、在等用户回答
@@ -78,9 +80,28 @@ export function listScreens(root) {
78
80
  out.push({ name: d.name, born })
79
81
  }
80
82
  out.sort((a, b) => a.born - b.born || a.name.localeCompare(b.name))
83
+ // 有设计清单(design.json,从设计库来的模板 / 分享过的设计):按清单里的顺序排,清单外的(模型后加的)按创建时间排在后面
84
+ const order = manifestOrder(root)
85
+ if (order.length) {
86
+ const rank = new Map(order.map((f, i) => [f.toLowerCase(), i]))
87
+ const listed = out.filter((x) => rank.has(x.name.toLowerCase())).sort((a, b) => rank.get(a.name.toLowerCase()) - rank.get(b.name.toLowerCase()))
88
+ return [...listed, ...out.filter((x) => !rank.has(x.name.toLowerCase()))].slice(0, MAX_SCREENS).map((x) => x.name)
89
+ }
81
90
  return out.slice(0, MAX_SCREENS).map((x) => x.name)
82
91
  }
83
92
 
93
+ /** design.json 里 screens 的文件名(读不了、写错了都当没有) */
94
+ export function manifestOrder(root) {
95
+ let m
96
+ try {
97
+ const raw = fs.readFileSync(path.join(root, 'design.json'), 'utf8')
98
+ if (raw.length > 256 * 1024) return []
99
+ m = JSON.parse(raw)
100
+ } catch { return [] }
101
+ if (!m || !Array.isArray(m.screens)) return []
102
+ return m.screens.map((s) => (s && typeof s.file === 'string' ? s.file : typeof s === 'string' ? s : '')).filter((f) => f && !/[\\/]/.test(f) && HTML_EXT.test(f)).slice(0, MAX_SCREENS)
103
+ }
104
+
84
105
  /** 开发服务器上要并排看的几个路由 */
85
106
  function normRoutes(list) {
86
107
  if (!Array.isArray(list)) return null
@@ -177,8 +198,10 @@ export function sameTarget(a, b) {
177
198
  }
178
199
 
179
200
  /** 工具参数(JSON 字符串或对象)里的写文件路径;不是写文件返回 '' */
201
+ const WRITE_TOOL = /^(write|edit|multi_?edit|create_file|str_replace\w*)$/i
202
+
180
203
  function writtenPath(name, args) {
181
- if (!/^(write|edit|multi_?edit|create_file|str_replace\w*)$/i.test(String(name || ''))) return ''
204
+ if (!WRITE_TOOL.test(String(name || ''))) return ''
182
205
  let a = args
183
206
  if (typeof a === 'string') {
184
207
  try { a = JSON.parse(a) } catch { return '' }
@@ -525,7 +548,7 @@ export function askOf(data) {
525
548
  /**
526
549
  * @param opts.alive (origin) → 这个预览服务器还开着吗(开的太多时旧的会被关掉;发现没了就重开)
527
550
  */
528
- export function createTracker({ open, skipPorts = () => new Set(), now = Date.now, log = () => {}, store = null, history = null, alive = () => true, autoOpen = () => true }) {
551
+ export function createTracker({ open, drafts = null, skipPorts = () => new Set(), now = Date.now, log = () => {}, store = null, history = null, alive = () => true, autoOpen = () => true, beforeRestore = () => {} }) {
529
552
  const states = new Map() // sessionId → state
530
553
  const cwds = new Map() // sessionId → 最近一次工具的工作目录
531
554
  let saved = {}
@@ -654,6 +677,8 @@ export function createTracker({ open, skipPorts = () => new Set(), now = Date.no
654
677
  if (size !== undefined) st.size = parseSize(size)
655
678
  if (view !== undefined) st.view = view === 'canvas' || view === 'single' ? view : ''
656
679
  if (routes !== undefined) st.routes = normRoutes(routes)
680
+ // 换到别的目录了:正在写的草稿是原来那套的,不再报(不然新设计里同名的那屏会被它挡住)
681
+ if (st.draft && !(target.kind === 'file' && st.draft.root === target.root)) st.draft = null
657
682
  st.target = target
658
683
  st.origin = origin
659
684
  st.url = urlFor(target, origin)
@@ -694,6 +719,7 @@ export function createTracker({ open, skipPorts = () => new Set(), now = Date.no
694
719
  function clear(id) {
695
720
  const st = stateOf(id)
696
721
  st.target = null
722
+ st.draft = null
697
723
  st.url = ''
698
724
  st.label = ''
699
725
  st.source = ''
@@ -724,6 +750,165 @@ export function createTracker({ open, skipPorts = () => new Set(), now = Date.no
724
750
  setTarget(id, target, { source: 'auto' }).catch((e) => log(e))
725
751
  }
726
752
 
753
+ const absOf = (sessionId, p) => path.resolve(cwdOf(sessionId), p.replace(/^~(?=\/|$)/, os.homedir()))
754
+ // 状态条说「正在写 x」的文件:在现在这套设计的文件夹里;还没有设计时,写什么都算(第一屏还在路上)
755
+ const ownsFile = (st, abs) => !st.target || (st.target.kind === 'file' && (abs === st.target.file || abs.startsWith(st.target.root + path.sep)))
756
+
757
+ /**
758
+ * 模型边说边推的流(DSH 的 agent/assistant-stream)。写文件时参数要流好几分钟才到 tool/call,
759
+ * 这里提前从半截参数里认出工具名和文件名,状态条就不会一直「在想」;顺手数一下写了多少行。
760
+ */
761
+ function stream(sessionId, frame) {
762
+ const st = sessionId && frame ? states.get(sessionId) : null
763
+ if (!st || !st.turn) return
764
+ if (frame.type === 'start' || frame.type === 'end') {
765
+ // 这一次说完了:没写完的页面收尾(在看的 iframe 停在写到的地方)
766
+ if (st.parts) for (const part of st.parts.values()) if (part.draft && drafts) drafts.end(part.draft, part.did)
767
+ st.parts = null
768
+ if (frame.type === 'start') {
769
+ st.tool = ''
770
+ st.writing = ''
771
+ st.lines = 0
772
+ // 写完落了地的留着(右侧栏靠它认出「刚才看着写的就是这屏」,单屏好换过去);没写完的作废
773
+ if (st.draft && !(st.draft.file && fs.existsSync(st.draft.file))) st.draft = null
774
+ }
775
+ return
776
+ }
777
+ const c = frame.type === 'chunk' ? frame.chunk : null
778
+ if (!c || c.type !== 'tool-call-delta') return
779
+ const parts = st.parts || (st.parts = new Map())
780
+ let part = parts.get(c.index)
781
+ if (!part) {
782
+ part = { name: '', head: '', tail: '', file: '', lines: 0, last: '', abs: '', dec: null, draft: '', did: 0, prov: '' }
783
+ parts.set(c.index, part)
784
+ if (parts.size > 16) {
785
+ // 挤掉最早的一个:先挑没在写页面的;挤掉的草稿收个尾,别让在看的一直挂着
786
+ let k = null
787
+ for (const [i, p] of parts) if (i !== c.index && !(p.draft && p.dec && !p.dec.done)) { k = i; break }
788
+ if (k === null) for (const i of parts.keys()) if (i !== c.index) { k = i; break }
789
+ const old = parts.get(k)
790
+ if (old && old.draft && drafts) drafts.end(old.draft, old.did) // 只收它自己那份:同一个文件后来又开始重写的不动
791
+ parts.delete(k)
792
+ }
793
+ }
794
+ if (c.name) part.name = String(c.name)
795
+ if (!part.name) return
796
+ st.tool = part.name
797
+ if (!WRITE_TOOL.test(part.name)) return
798
+ const delta = typeof c.argumentsDelta === 'string' ? c.argumentsDelta : ''
799
+ if (part.dec) {
800
+ // 页面正文在流:还原出来的一截直接推给在看的预览
801
+ const was = part.dec.done
802
+ const text = part.dec.push(delta)
803
+ if (text && part.draft && drafts) drafts.push(part.draft, text, part.did)
804
+ if (part.dec.done) {
805
+ if (!was && part.draft && drafts) drafts.end(part.draft, part.did)
806
+ // 有的模型把正文排在文件名前面(DeepSeek V4.1 就这样):正文写完了,接着从后面认文件名
807
+ if (!part.file) {
808
+ part.tail = (part.tail + delta).slice(-16384) // 只留最后一段:文件名在正文后面,前面再大的一块也挤不掉它
809
+ const p = pathIn(part.tail)
810
+ if (p) settle(sessionId, st, part, absOf(sessionId, p))
811
+ }
812
+ }
813
+ } else if (!part.skip && part.head.length < 8192 && part.file !== '-') {
814
+ part.head += delta
815
+ if (!part.file) {
816
+ const p = pathIn(part.head)
817
+ if (p) settle(sessionId, st, part, absOf(sessionId, p))
818
+ }
819
+ // 整页写(write 的 content / create 的 file_text):开一份草稿,边写边给预览
820
+ const body = part.file !== '-' && drafts ? /"(?:content|file_text)"\s*:\s*"/.exec(part.head) : null
821
+ if (body) startBody(sessionId, st, part, part.head.slice(body.index + body[0].length))
822
+ }
823
+ // 参数是 JSON:内容里的换行是两个字 \n;跨块切开的也算上
824
+ const seen = (part.last + delta).match(/\\n/g)
825
+ part.lines += seen ? seen.length : 0
826
+ part.last = delta.slice(-1)
827
+ if (part.file !== '-') {
828
+ if (part.file) st.writing = part.file
829
+ st.lines = part.lines // 文件名还没到(正文在前)也数行:状态条和占位里的鼠标都靠它动
830
+ }
831
+ }
832
+
833
+ const pathIn = (text) => {
834
+ const m = /"(?:file_path|filePath|path)"\s*:\s*"((?:[^"\\]|\\.)*)"/.exec(text)
835
+ if (!m) return ''
836
+ try { return JSON.parse(`"${m[1]}"`) } catch { return m[1] }
837
+ }
838
+
839
+ /** 认出了这次写的是哪个文件:记下;正文在前、草稿先挂在临时名字上的,现在对上真名字(不是一屏就作废) */
840
+ function settle(sessionId, st, part, abs) {
841
+ part.abs = abs
842
+ part.file = ownsFile(st, abs) ? path.basename(abs) : '-'
843
+ if (part.file !== '-') st.lastDir = path.dirname(abs)
844
+ if (!part.draft || !part.prov) return
845
+ const d = st.draft
846
+ const cur = !!d && d.serve === part.draft && !d.file
847
+ if (part.file !== '-' && HTML_EXT.test(abs) && path.dirname(abs) === part.prov && !/^[._]/.test(part.file)) {
848
+ if (cur) d.file = abs
849
+ } else {
850
+ // 不是一屏(子文件夹里的、探针、样式表):作废,临时地址也读不到了(右侧栏已经在看后面那份的也作废)
851
+ if (cur) st.draft = null
852
+ if (drafts) drafts.drop(part.draft, part.did)
853
+ part.draft = ''
854
+ }
855
+ part.prov = ''
856
+ }
857
+
858
+ let provisional = 0
859
+ /**
860
+ * 正文开始流了:要不要开草稿。名字先到的看名字(这套设计第一层的网页);正文先到的看开头像不像网页,
861
+ * 先挂在设计文件夹里一个临时名字上(相对地址照样对得上),名字到了再对上。
862
+ * 还没有设计(第一屏)时先给这个文件夹开预览服务器,草稿从那里看。
863
+ */
864
+ function startBody(sessionId, st, part, rest) {
865
+ const known = !!part.file
866
+ const over = /(?:^|[^\\])(?:\\\\)*"/.test(rest) // 正文已经流完了(碰到没转义的引号):不用再等
867
+ if (!known && rest.length < 64 && !over) return // 正文先到:多攒一点再认是不是网页
868
+ let ok = known ? HTML_EXT.test(part.abs) : /^\s*<(?:!doctype\s+html|html)\b/i.test(rest)
869
+ if (ok && !st.target && !st.design) {
870
+ // 页面开头自己写了设计类型标记(<meta name="dsh-design">):也是在做设计
871
+ if (/<meta[^>]*dsh-design/i.test(rest)) st.design = true
872
+ else if (rest.length <= 3000 && !over) return // 还在开头:等等标记
873
+ else ok = false // 开头这么长还没有标记:不是在做设计(比如写代码的会话写了个网页),不开
874
+ }
875
+ const root = !ok ? '' : st.target && st.target.kind === 'file' ? st.target.root : known ? path.dirname(part.abs) : st.lastDir || ''
876
+ // 只给「一屏」开:设计文件夹第一层的网页,_ / . 开头的是模型的探针、草稿,不算
877
+ if (ok && known && (path.dirname(part.abs) !== root || /^[._]/.test(part.file))) ok = false
878
+ if (ok && !root) ok = false
879
+ if (known && !ok) {
880
+ part.skip = true
881
+ return
882
+ }
883
+ // 正文先到的不开草稿也要跟着还原:好知道正文在哪儿结束,后面才认得出文件名
884
+ part.dec = createJsonStringDecoder()
885
+ part.tail = ''
886
+ let draft = null
887
+ if (ok) {
888
+ const serve = known ? part.abs : path.join(root, `__ddp_draft_${++provisional}__.html`)
889
+ part.draft = serve
890
+ part.prov = known ? '' : root // 挂在临时名字上的:记着它属于哪个文件夹,名字到了自己核对(不管这时右侧栏在看哪份)
891
+ draft = { file: known ? part.abs : '', serve, root, id: drafts.begin(serve), origin: st.target ? st.origin : '' }
892
+ part.did = draft.id // 草稿编号:之后推、收尾、作废都核对它(同一个文件又开始重写时,旧的不碰新的)
893
+ st.draft = draft
894
+ }
895
+ const text = part.dec.push(rest)
896
+ if (draft && text) drafts.push(draft.serve, text, draft.id)
897
+ if (part.dec.done) {
898
+ if (draft) drafts.end(draft.serve, draft.id)
899
+ if (!known) {
900
+ part.tail = rest // 正文里的引号都转义过(\"),认文件名不会认到正文里去
901
+ const p = pathIn(rest)
902
+ if (p) settle(sessionId, st, part, absOf(sessionId, p))
903
+ }
904
+ }
905
+ if (draft && !draft.origin) {
906
+ open({ kind: 'file', file: draft.serve, root }).then((r) => {
907
+ if (st.draft === draft) draft.origin = r.origin
908
+ }, (e) => log(e))
909
+ }
910
+ }
911
+
727
912
  /** 会话事件 → 状态;自动发现只在没有目标、或目标也是自动发现的时候动手 */
728
913
  function observe(sessionId, event) {
729
914
  if (!sessionId || !event) return
@@ -740,12 +925,21 @@ export function createTracker({ open, skipPorts = () => new Set(), now = Date.no
740
925
  case 'turn/start':
741
926
  if (live) {
742
927
  st.turn = true
928
+ st.turnAt = now() // 右侧栏的状态条从这里开始计时
929
+ st.tool = ''
743
930
  keepVersion(st, '')
744
931
  }
745
932
  break
746
933
  case 'turn/end':
747
934
  st.turn = false
935
+ st.turnAt = 0
936
+ st.tool = ''
748
937
  st.writing = ''
938
+ st.lines = 0
939
+ if (st.parts && drafts) for (const part of st.parts.values()) if (part.draft) drafts.end(part.draft, part.did)
940
+ st.parts = null
941
+ // 最后一屏整页一下子到、马上就说完了:落了地的草稿留着(快照里刚写完的几秒还报,右侧栏放完它)
942
+ if (!(st.draft && st.draft.file && fs.existsSync(st.draft.file))) st.draft = null
749
943
  st.asking = false
750
944
  if (live) {
751
945
  keepVersion(st, st.ask)
@@ -759,15 +953,17 @@ export function createTracker({ open, skipPorts = () => new Set(), now = Date.no
759
953
  if (d.name === 'preview_page') st.design = true
760
954
  if (!live) break
761
955
  if (d.name === ASK_TOOL) st.asking = true
956
+ st.tool = String(d.name || '') // 状态条按它说「正在体检」「正在跑命令」…
762
957
  if (d.callId) {
763
958
  st.calls.set(d.callId, { name: d.name, args: argsOf(d.arguments) })
764
959
  if (st.calls.size > 64) st.calls.delete(st.calls.keys().next().value)
765
960
  }
766
961
  const p = writtenPath(d.name, d.arguments)
767
962
  if (!p) break
768
- const abs = path.resolve(cwdOf(sessionId), p.replace(/^~(?=\/|$)/, os.homedir()))
769
- if (st.target && st.target.kind === 'file' && (abs === st.target.file || abs.startsWith(st.target.root + path.sep))) {
963
+ const abs = absOf(sessionId, p)
964
+ if (ownsFile(st, abs)) {
770
965
  st.writing = path.basename(abs)
966
+ st.lastDir = path.dirname(abs) // 下一页要是正文先到,草稿先挂在这个文件夹里
771
967
  }
772
968
  if (HTML_EXT.test(abs) && (!st.target || (st.source === 'auto' && st.target.kind === 'file'))) {
773
969
  st.pendingHtml = abs // 写完(tool/result)再预览,免得打开一个还不存在的文件
@@ -780,6 +976,8 @@ export function createTracker({ open, skipPorts = () => new Set(), now = Date.no
780
976
  if (st.target && saved[sessionId] && saved[sessionId].cwd !== d.meta.cwd) persist(sessionId, st)
781
977
  }
782
978
  st.writing = ''
979
+ st.lines = 0
980
+ st.tool = ''
783
981
  if (!live) break
784
982
  const pending = st.pendingHtml
785
983
  st.pendingHtml = ''
@@ -909,16 +1107,38 @@ export function createTracker({ open, skipPorts = () => new Set(), now = Date.no
909
1107
  function restoreVersion(id, n) {
910
1108
  const st = states.get(id)
911
1109
  if (!history || !st || !st.target || st.target.kind !== 'file') throw new Error('这个预览没有版本记录')
912
- const r = history.restore(st.target.root, n)
1110
+ const root = st.target.root
1111
+ const r = history.restore(root, n, { before: (html) => beforeRestore(root, html) })
913
1112
  st.vrev++
914
1113
  return r
915
1114
  }
916
1115
 
1116
+ /** 正在写的那页:预览服务器上的草稿地址 + 它在设计里的名字(和 screens 的 key 一样) */
1117
+ function draftOf(st) {
1118
+ const d = st ? st.draft : null
1119
+ if (!d || !d.origin) return null
1120
+ const relOf = (f) => path.relative(d.root, f).split(path.sep).join('/')
1121
+ const sv = relOf(d.serve || d.file)
1122
+ if (!sv || sv.startsWith('..')) return null
1123
+ // 就挂在这一屏自己的地址上,带个记号(serve.js 认它):页面里的相对地址照常对得上。
1124
+ // 正文先到的先挂在临时名字上,key 空着(还不知道是哪屏),名字到了再填。
1125
+ // live:还在写、或刚写完(右侧栏这时才看到也值得放一遍:整页一下子到的,预览服务器会一截截放)
1126
+ const rec = drafts && drafts.get(d.serve)
1127
+ const live = !!rec && rec.id === d.id && (!rec.done || Date.now() - (rec.endAt || 0) < DRAFT_LIVE_MS)
1128
+ if (!st.turn && !live) return null // 这一轮说完了:只报刚写完的那份
1129
+ // 页面开头写的设计类型(<meta name="dsh-design" content="miniprogram 390x844">):真文件还没摆出来时,右侧栏靠它套对外框
1130
+ const mt = rec && /<meta\b[^>]*\bname\s*=\s*["']?dsh-design\b[^>]*>/i.exec(rec.text.slice(0, 6000))
1131
+ const mc = mt && /\bcontent\s*=\s*(?:"([^"]*)"|'([^']*)')/i.exec(mt[0])
1132
+ // lump:写完了、而且是整段一下子到的(右侧栏放完这份再换真文件;一路流着写的落地就换)
1133
+ return { key: d.file ? relOf(d.file) : '', url: `${d.origin}/${sv.split('/').map(encodeURIComponent).join('/')}?__ddp_draft=${d.id}`, live, lump: !!(live && rec.done && rec.lump), meta: mc ? (mc[1] ?? mc[2] ?? '').slice(0, 80) : '' }
1134
+ }
1135
+
917
1136
  function snapshot(id) {
918
1137
  const st = states.get(id)
919
1138
  if (!(st && st.target)) restore(id)
920
1139
  else if (st.origin && !alive(st.origin)) revive(id, st)
921
- if (!st || !st.target) return { target: null, rev: st ? st.rev : 0, openRev: st ? st.openRev : 0, turn: st ? st.turn : false, turns: st ? st.turns || 0 : 0, asking: !!(st && st.asking), writing: '', hint: st && st.hint && fs.existsSync(st.hint) ? st.hint : '', loading: restoring.has(id) }
1140
+ const turnFor = st && st.turn && st.turnAt ? Math.max(0, now() - st.turnAt) : 0
1141
+ if (!st || !st.target) return { target: null, rev: st ? st.rev : 0, openRev: st ? st.openRev : 0, turn: st ? st.turn : false, turnFor, tool: (st && st.turn && st.tool) || '', turns: st ? st.turns || 0 : 0, asking: !!(st && st.asking), writing: (st && st.turn && st.writing) || '', lines: (st && st.turn && st.lines) || 0, draft: draftOf(st), hint: st && st.hint && fs.existsSync(st.hint) ? st.hint : '', loading: restoring.has(id) }
922
1142
  const { target, url, label, source, rev, openRev, turn, writing, changedAt, kind, size, view, origin } = st
923
1143
  const file = target.kind === 'file'
924
1144
  return {
@@ -929,9 +1149,13 @@ export function createTracker({ open, skipPorts = () => new Set(), now = Date.no
929
1149
  rev,
930
1150
  openRev,
931
1151
  turn,
1152
+ turnFor,
1153
+ tool: (turn && st.tool) || '',
932
1154
  turns: st.turns || 0,
933
1155
  asking: !!st.asking,
934
1156
  writing,
1157
+ lines: (turn && st.lines) || 0,
1158
+ draft: draftOf(st),
935
1159
  changedAt,
936
1160
  changedFiles: st.changedFiles || [],
937
1161
  changes: st.changes || [],
@@ -949,5 +1173,5 @@ export function createTracker({ open, skipPorts = () => new Set(), now = Date.no
949
1173
  }
950
1174
  }
951
1175
 
952
- return { observe, setTarget, setView, clear, changed, snapshot, cwdOf, stateOf, versions, restoreVersion, editText, editStyle, editDir, keepVersion: (id, label) => keepVersion(stateOf(id), label) }
1176
+ return { observe, stream, setTarget, setView, clear, changed, snapshot, cwdOf, stateOf, versions, restoreVersion, editText, editStyle, editDir, keepVersion: (id, label) => keepVersion(stateOf(id), label) }
953
1177
  }