Skip to content

A team of long-lived bots for DeepSeek Harness, with main bots, bot-to-bot messages and group chats.

Fold the import into the start ring as a fourth arc

AdamPlatin123e087635161de
diff --git a/app/src/import-flow.mjs b/app/src/import-flow.mjs
index 45f4ebd9..9672f378 100644
--- a/app/src/import-flow.mjs
+++ b/app/src/import-flow.mjs
@@ -10,6 +10,14 @@ export const SPARE_BYTES = 500e6
const CARD_EVERY_MS = 200
// The rate is not told before the copy has run this long.
const ETA_AFTER_MS = 3000
+// The share of the ring's import arc that the check of the chats fills; the copy fills the rest.
+const CHECK_SHARE = 0.15
+
+/** How far the import arc is filled at a step of the copy (start-window §6). */
+export function arcShare(step, fraction) {
+ const f = Math.max(0, Math.min(1, fraction || 0))
+ return step <= 1 ? CHECK_SHARE * f : step === 2 ? CHECK_SHARE + (1 - CHECK_SHARE) * f : 1
+}
/**
* The model settings an import offers, best first: those of DSH Desktop, then DSH Web, then the
@@ -123,7 +131,7 @@ export class ImportFlow {
kind: 'import', bots: offer.bots, groups: offer.rooms, sessions: offer.sessions, path: offer.from,
names: offer.names.slice(0, 3).join(this.#io.lang === 'en' ? ', ' : '、'),
bare: size === undefined ? 'Bare' : '',
- ...(size === undefined ? {} : { chats: formatBytes(size.chats), work: formatBytes(size.work), total: formatBytes(size.total) }),
+ ...(size === undefined ? {} : { chats: formatBytes(size.chats, this.#io.lang), work: formatBytes(size.work, this.#io.lang), total: formatBytes(size.total, this.#io.lang) }),
model: model?.label ?? '', models: this.#models.length > 1 ? this.#models : [],
options: { ...this.#options },
}
@@ -181,7 +189,8 @@ export class ImportFlow {
if (size === undefined || free === undefined) return undefined
const need = size.total + SPARE_BYTES
if (free >= need) return undefined
- return { need: formatBytes(need), free: formatBytes(free), short: formatBytes(need - free), drive: drive ?? '' }
+ const text = bytes => formatBytes(bytes, this.#io.lang)
+ return { need: text(need), free: text(free), short: text(need - free), drive: drive ?? '' }
}
// The chats are checked while the card is up, unless DSH holds the team: a check of chats that
@@ -234,10 +243,10 @@ export class ImportFlow {
}
const size = copySize(this.#sizes, this.#options)
const total = size?.total ?? 0
- const of = size === undefined ? '…' : formatBytes(total)
+ const of = size === undefined ? '…' : formatBytes(total, io.lang)
const checkedStep = this.#copyCard?.steps?.[0] ?? {}
let eta = null
- this.#setCopy({ step: 2, steps: [checkedStep, { a: formatBytes(0), b: of }, {}], fraction: 0, eta: null })
+ this.#setCopy({ step: 2, steps: [checkedStep, { a: formatBytes(0, io.lang), b: of }, {}], fraction: 0, eta: null })
await io.warmed()
signal.throwIfAborted()
const started = this.#now()
@@ -246,7 +255,7 @@ export class ImportFlow {
onProgress: (bytes) => {
const done = total > 0 ? Math.min(bytes, total) : bytes
eta = etaMinutes(eta, { done, total, elapsedMs: this.#now() - started })
- this.#setCopy({ step: 2, steps: [checkedStep, { a: formatBytes(done), b: of }, {}], fraction: total > 0 ? done / total : 0, eta })
+ this.#setCopy({ step: 2, steps: [checkedStep, { a: formatBytes(done, io.lang), b: of }, {}], fraction: total > 0 ? done / total : 0, eta })
},
})
this.#copyAbort = undefined
@@ -306,7 +315,7 @@ export class ImportFlow {
const { steps, step, fraction } = this.#copyCard
this.#lastStep = step
this.#io.progress?.(Math.min(1, (step - 1 + Math.max(0, Math.min(1, fraction))) / 3))
- this.#io.show({ ...this.#copyCard, kind: this.#confirming ? 'stopCopy' : 'copying', steps: steps.map(entry => ({ ...entry })) })
+ this.#io.show({ ...this.#copyCard, kind: this.#confirming ? 'stopCopy' : 'copying', steps: steps.map(entry => ({ ...entry })), arc: arcShare(step, fraction) })
}
const due = this.#shownAt + CARD_EVERY_MS - this.#now()
if (now || due <= 0 || this.#lastStep !== card.step) {
diff --git a/app/src/main.mjs b/app/src/main.mjs
index 3689bb85..176d3ccf 100644
--- a/app/src/main.mjs
+++ b/app/src/main.mjs
@@ -427,8 +427,8 @@ function tellPlace(dataDir) {
const drive = driveOf(dataDir)
const short = drive !== undefined && free !== undefined && free < SHORT_DRIVE_BYTES
// The page has no words while the start goes well: the line shows only when room runs short.
- startWindow.place(short ? placeOf(dataDir, { free }) : undefined)
- startWindow.hint(short ? { drive, free: formatBytes(free) } : undefined)
+ startWindow.place(short ? placeOf(dataDir, { free, lang: lang() }) : undefined)
+ startWindow.hint(short ? { drive, free: formatBytes(free, lang()) } : undefined)
}
// A later start shows the line again once the drive is down to a fifth of the free space it had
@@ -445,7 +445,7 @@ function tellLowSpace(freeAtStart) {
return
}
const free = freeSpace(places.dataDir)
- if (runningLow(free, freeAtStart)) startWindow.place(placeOf(places.dataDir, { free }))
+ if (runningLow(free, freeAtStart)) startWindow.place(placeOf(places.dataDir, { free, lang: lang() }))
}
// 「换个位置…」 on the start page and 〔重新选〕 on its cards: the system picker, then the root rule
@@ -614,7 +614,7 @@ async function importStep(mine) {
host = warm
let warmStopped = false
const up = warm.start()
- // The engine's arc fills once it is up; the team's waits for the answer.
+ // The engine's arc fills once it is up and the import's has filled; the team's waits for the answer.
up.then(() => { if (mine === attempt && !warmStopped) startWindow.done('engine') }, () => {})
const sizes = await teamSizes(offer.from, offer.team).catch((error) => { console.error(error); return { sessions: 0 } })
let result
@@ -635,6 +635,7 @@ async function importStep(mine) {
warmStopped = true
await warm.stop()
if (host === warm) host = undefined
+ if (mine === attempt) startWindow.engineDown()
},
copy: options => importTeam({ from: offer.from, to: where.dataDir, workspace: where.workspace, dsh: getDshRuntimeVersion(), ...options }),
reasonOf: copyReason,
@@ -658,6 +659,7 @@ async function importStep(mine) {
if (result.outcome === 'gone' || signal.aborted || mine !== attempt) return undefined
importOffer = undefined
saveLocations(where)
+ startWindow.done('import')
if (result.outcome === 'copied') {
const { summary } = result
console.log(`DeepSeek Bot: copied ${String(summary.bots)} Bots and ${String(summary.sessions)} Sessions from ${summary.from}`)
diff --git a/app/src/place.mjs b/app/src/place.mjs
index f6f1caef..b182aae4 100644
--- a/app/src/place.mjs
+++ b/app/src/place.mjs
@@ -29,12 +29,17 @@ export function freeSpace(path) {
}
}
-/** Bytes as the page shows them, in Explorer's units of 1024: whole GB from 10 up, else one decimal. */
-export function formatBytes(bytes) {
+/**
+ * Bytes as the page shows them, in Explorer's units of 1024: whole GB from 10 up, else one
+ * decimal, whole MB under 1 GB, and 「不到 1 MB」 under that (never 「0 MB」).
+ * @param {string} [lang] 'en' or 'zh'
+ */
+export function formatBytes(bytes, lang = 'zh') {
if (typeof bytes !== 'number' || !Number.isFinite(bytes) || bytes < 0) return undefined
const gb = bytes / 2 ** 30
if (gb >= 10) return `${String(Math.floor(gb))} GB`
if (gb >= 1) return `${(Math.floor(gb * 10) / 10).toFixed(1)} GB`
+ if (bytes < 2 ** 20) return lang === 'en' ? 'under 1 MB' : '不到 1 MB'
return `${String(Math.floor(bytes / 2 ** 20))} MB`
}
@@ -64,13 +69,13 @@ export function shortPath(path, home = homedir()) {
/**
* What the start page says about the place of the data: the drive and its free space on
* Windows, the folder elsewhere.
- * @param {{ home?: string, free?: number }} what `free` from freeSpace(); none leaves it out
+ * @param {{ home?: string, free?: number, lang?: string }} what `free` from freeSpace(); none leaves it out
* @returns {{ drive?: string, path?: string, free?: string }}
*/
-export function placeOf(dataDir, { home = homedir(), free } = {}) {
+export function placeOf(dataDir, { home = homedir(), free, lang } = {}) {
const drive = driveOf(dataDir)
const place = drive === undefined ? { path: shortPath(dataDir, home) } : { drive }
- const text = formatBytes(free)
+ const text = formatBytes(free, lang)
return text === undefined ? place : { ...place, free: text }
}
diff --git a/app/src/start-window.mjs b/app/src/start-window.mjs
index fec64184..dc3047a7 100644
--- a/app/src/start-window.mjs
+++ b/app/src/start-window.mjs
@@ -16,6 +16,9 @@ export const SHORT_START_SIZE = { width: 720, height: 500 }
const SHORT_WORK_AREA = 588
export const MAIN_SIZE = { width: 1320, height: 860 }
export const PHASES = ['data', 'engine', 'team']
+// A first start that copies a team from DSH has a stage of its own for the copy (§6).
+export const IMPORT_PHASES = ['data', 'import', 'engine', 'team']
+export const phasesOf = state => (state.explain?.mode === 'import' ? IMPORT_PHASES : PHASES)
export const START_KINDS = ['first', 'later', 'moving']
export const WATCHDOG_MS = 180_000
export const TEAM_VIEW_MS = 20_000
@@ -248,8 +251,9 @@ export function startSnapshot(state, now) {
// Windows draws the caption buttons over the page's band; macOS and Linux a system title bar.
frame: state.frame,
view: state.view,
- phase: PHASES.find(phase => !state.done.includes(phase)) ?? 'team',
- done: PHASES.filter(phase => state.done.includes(phase)),
+ phases: [...phasesOf(state)],
+ phase: phasesOf(state).find(phase => !state.done.includes(phase)) ?? 'team',
+ done: phasesOf(state).filter(phase => state.done.includes(phase)),
clock: { ms: Math.round(clockMs(state.clock, now)), at: now, running: state.clock.running, rate: 1 },
explain: { ...state.explain },
celebrate: state.celebrate,
@@ -555,9 +559,9 @@ export class StartWindow {
this.#viewLate = false
}
- /** The data folder or the engine is ready; the engine also again after a retry. */
+ /** The data folder, the import or the engine is ready; the engine also again after a retry. */
done(phase) {
- if (!this.#open() || !['data', 'engine'].includes(phase)) return
+ if (!this.#open() || !['data', 'import', 'engine'].includes(phase)) return
const again = this.#state.done.includes(phase)
if (again && (phase !== 'engine' || this.#engineUp)) return
if (phase === 'engine') this.#engineUp = true
@@ -567,6 +571,16 @@ export class StartWindow {
this.#update({ ...(again ? {} : { done: [...this.#state.done, phase] }), ...(this.#state.view === 'watchdog' ? { view: 'boot' } : {}) })
}
+ /**
+ * The engine that warmed up while the import card waited has stopped for the copy: its stage
+ * is open again until the engine of the copied team is up.
+ */
+ engineDown() {
+ if (!this.#open() || !this.#state.done.includes('engine')) return
+ this.#engineUp = false
+ this.#update({ done: this.#state.done.filter(phase => phase !== 'engine') })
+ }
+
/** The engine's page started loading in the hidden team window: it has 20 s to call ready(). */
teamLoading() {
if (!this.#open()) return
@@ -604,7 +618,7 @@ export class StartWindow {
this.#readyAt = now
// A team view that loads after its 20 s goes in without a celebration (§7).
const celebrate = this.#state.celebrate && this.#state.view !== 'viewFailed'
- this.#update({ view: 'handoff', done: [...PHASES], celebrate, failure: undefined, landing: this.#landing(report) })
+ this.#update({ view: 'handoff', done: [...phasesOf(this.#state)], celebrate, failure: undefined, landing: this.#landing(report) })
const main = this.#o.mainWindow()
if (main !== undefined && !main.isDestroyed() && !this.#window.isMinimized()) this.#underlay(main)
this.#later('fallback', fallbackMs(this.#state), () => {
diff --git a/app/src/start/start.css b/app/src/start/start.css
index 929aea41..6faea75e 100644
--- a/app/src/start/start.css
+++ b/app/src/start/start.css
@@ -96,6 +96,14 @@ html[data-up] .pond{translate:0 -60px;scale:.62}
.arc[data-state=active] .arc-glow{opacity:1;animation:bt-arc 1.8s cubic-bezier(.4,0,.2,1) infinite}
.arc[data-state=done] .arc-fill{stroke-dashoffset:0}
.arc[data-state=failed] .arc-base{stroke:color-mix(in srgb,var(--bt-danger) 60%,transparent)}
+/* The import's arc (a first start that copies a team, §6) is there only on such a start, and it
+ fills with the copy (--f, from the main process's share); a failed copy keeps what it reached,
+ in red. It lights up once the card has flown into it (data-caught). */
+.ring:not([data-n="4"]) .arc[data-phase=import]{display:none}
+.arc[data-phase=import]:is([data-state=active],[data-state=failed]) .arc-fill{stroke-dashoffset:calc(100 - var(--f,0) * 100);transition-duration:.3s;transition-timing-function:ease-out}
+.arc[data-phase=import][data-state=failed] .arc-fill{stroke:var(--bt-danger)}
+.arc[data-caught] .arc-base{stroke:var(--bt-ink-deepseek);stroke-opacity:.22;animation:bt-catch .42s ease-out}
+@keyframes bt-catch{from{stroke-width:5;stroke-opacity:1}}
html[data-whale=pondering] .arc[data-state=active] .arc-glow{animation-duration:2.6s}
@keyframes bt-arc{from{stroke-dashoffset:23}to{stroke-dashoffset:-101}}
/* The hand-off: the gaps close into one circle, which swells once. */
@@ -113,7 +121,7 @@ html[data-resume] :is(.arc-fill,.ring-full){transition:none}
.props>g{opacity:0;scale:.6;transform-origin:20px 36px;transition:opacity .16s ease-in,scale .16s ease-in}
.props *{transform-box:fill-box}
.props>g{transform-box:view-box}
-.pond:has(.arc:nth-of-type(1)[data-state=active]) [data-p=data],.pond:has(.arc:nth-of-type(2)[data-state=active]) [data-p=engine],.pond:has(.arc:nth-of-type(3)[data-state=active]) [data-p=team]{opacity:1;scale:1;transition:opacity .2s ease-out,scale var(--spring-pop-ms) var(--spring-pop)}
+.pond:has(.arc[data-phase=data][data-state=active]) [data-p=data],.pond:has(.arc[data-phase=import][data-state=active]) [data-p=import],.pond:has(.arc[data-phase=engine][data-state=active]) [data-p=engine],.pond:has(.arc[data-phase=team][data-state=active]) [data-p=team]{opacity:1;scale:1;transition:opacity .2s ease-out,scale var(--spring-pop-ms) var(--spring-pop)}
.folder-back{fill:color-mix(in srgb,var(--bt-ink-deepseek) 40%,transparent)}
.folder-front{fill:var(--bt-ink-deepseek)}
.page rect{fill:var(--bt-card);stroke:var(--bt-line-2);stroke-width:1}
@@ -128,7 +136,13 @@ html[data-resume] :is(.arc-fill,.ring-full){transition:none}
.gear-big{fill:var(--bt-ink-deepseek);animation:bt-turn 2.7s linear infinite}
.gear-small{fill:color-mix(in srgb,var(--bt-ink-deepseek) 55%,transparent);animation:bt-turn 1.8s linear infinite reverse}
[data-p=engine]{animation:bt-pulse 1.35s ease-in-out infinite}
-.pond:not(:has(.arc:nth-of-type(2)[data-state=active])) [data-p=engine]{animation:none}
+.pond:not(:has(.arc[data-phase=engine][data-state=active])) [data-p=engine]{animation:none}
+/* The import: a box is lifted off the old pile and carried onto the new one. */
+.box rect{fill:var(--bt-ink-deepseek)}
+.box path{fill:none;stroke:var(--bt-card);stroke-width:1.2;stroke-linecap:round}
+.box-from rect{fill:color-mix(in srgb,var(--bt-ink-deepseek) 40%,transparent)}
+.box-moving{animation:bt-carry 1.6s cubic-bezier(.4,0,.2,1) infinite}
+@keyframes bt-carry{0%{translate:0 0;opacity:0}12%{translate:0 0;opacity:1}42%{translate:10px -17px}66%,86%{translate:20px -12px;opacity:1}100%{translate:20px -12px;opacity:0}}
@keyframes bt-turn{to{rotate:360deg}}
@keyframes bt-pulse{0%,100%{transform:none}15%{transform:scale(1.07)}35%{transform:none}}
.mate circle{fill:var(--bt-ink-deepseek)}
@@ -138,22 +152,11 @@ html[data-resume] :is(.arc-fill,.ring-full){transition:none}
[data-p=team]>g:nth-child(2) .mate{animation-delay:.2s}
[data-p=team]>g:nth-child(3) .mate{opacity:.75;animation-delay:.4s}
@keyframes bt-mate{0%,40%,100%{transform:none}15%{transform:translateY(-4px) scale(1.05,.95)}}
-html[data-whale=pondering] :is(.page,.mate,[data-p=engine]){animation-duration:2.6s}
+html[data-whale=pondering] :is(.page,.mate,[data-p=engine],.box-moving){animation-duration:2.6s}
html[data-whale=pondering] .gear-big{animation-duration:4s}
html[data-whale=pondering] .gear-small{animation-duration:2.667s}
.track{list-style:none}
-/* step marks of the copying card */
-.mark{position:relative;flex:none;width:16px;height:16px;border-radius:50%;box-sizing:border-box;border:1.5px solid var(--bt-line-2);transition:border-color .12s}
-.mark .dot{position:absolute;left:50%;top:50%;width:6px;height:6px;margin:-3px;border-radius:50%;background:var(--bt-ink);opacity:0;transition:opacity .12s}
-.mark svg{position:absolute;left:-1.5px;top:-1.5px;width:16px;height:16px;opacity:0;overflow:visible}
-.mark circle{stroke:none}
-.mark path{fill:none;stroke:#fff;stroke-width:1.8;stroke-linecap:round;stroke-linejoin:round}
-.check circle{fill:var(--bt-green)}
-[data-state=active]>.mark{border-color:var(--bt-ink)}
-[data-state=active]>.mark .dot{opacity:1}
-[data-state=done]>.mark{border-color:transparent}
-[data-state=done]>.mark .check{opacity:1}
html[data-shimmer] .voice[data-on]>span{color:transparent;background:linear-gradient(90deg,var(--bt-ink) 0 40%,var(--bt-ink-2) 50%,var(--bt-ink) 60% 100%) 0 0/300% 100%;-webkit-background-clip:text;background-clip:text;animation:bt-shimmer 2.2s steps(60) infinite}
@keyframes bt-shimmer{from{background-position:100% 0}to{background-position:0 0}}
@@ -165,6 +168,16 @@ html[data-up] .caption{opacity:0;pointer-events:none}
.caption>*{opacity:0;filter:blur(6px);transition:opacity .16s,filter .16s}
.caption>[data-on]{opacity:1;filter:none;transition:opacity .22s ease-out,filter .22s ease-out}
+/* The copy's stop: a round icon button under the ring, only while the copy runs and no card is
+ up; its confirmation is a card. */
+.stop-copy{position:absolute;z-index:1;left:346px;top:324px;width:28px;height:28px;display:grid;place-items:center;padding:0;border:0;border-radius:50%;background:none;color:var(--bt-ink-2);cursor:pointer;transition:background-color .12s,color .12s,opacity .16s,scale var(--spring-tap-ms) var(--spring-tap)}
+.stop-copy:hover{background:var(--bt-hover);color:var(--bt-ink)}
+.stop-copy:active{scale:.9}
+.stop-copy:focus-visible{outline:2px solid var(--bt-accent);outline-offset:2px}
+.stop-copy svg{width:16px;height:16px;fill:currentColor}
+.stop-copy:not([hidden]){animation:bt-fade-in .22s ease-out}
+html[data-up] .stop-copy{opacity:0;pointer-events:none}
+@keyframes bt-fade-in{from{opacity:0}}
/* sheet: one surface that every card morphs in and out of */
.sheet{position:absolute;left:48px;top:260px;width:624px;height:calc(100% - 304px)}
html[data-sheet=none] .sheet{pointer-events:none}
@@ -186,7 +199,7 @@ html[data-sheet=none] .sheet{pointer-events:none}
.card-title{font-size:15px;line-height:20px;font-weight:600;white-space:nowrap;overflow:hidden;text-overflow:ellipsis}
.card-actions{flex:none;display:flex;flex-wrap:wrap;align-items:center;gap:8px;margin-top:12px}
.card>.card-actions:first-child{margin-top:0}
-.card-actions .foot,.card-actions .eta{margin-left:auto}
+.card-actions .foot,.card-actions .end{margin-left:auto}
.foot{font-size:13px;line-height:18px;color:var(--bt-ink-2)}
.card>.foot,.miss{margin-top:8px}
.miss{font-size:13px;line-height:18px;color:var(--bt-danger)}
@@ -205,15 +218,6 @@ html[data-sheet=none] .sheet{pointer-events:none}
.opts{display:flex;gap:20px;font-size:13px;line-height:18px}
.opts label{display:inline-flex;align-items:center;gap:6px;cursor:pointer}
.opts input{margin:0;width:14px;height:14px;accent-color:var(--bt-accent)}
-.steps{position:relative;list-style:none}
-.steps li{display:flex;align-items:center;gap:10px;height:28px;align-items:flex-start;padding-top:2px;box-sizing:border-box;font-size:13px;line-height:18px;color:var(--bt-ink-2);font-variant-numeric:tabular-nums}
-.steps li .mark{margin-top:1px}
-.steps li[data-state=active]{color:var(--bt-ink)}
-.card[data-confirm] .steps li:not([data-state=active]){display:none}
-.card[data-confirm] .stop,.card:not([data-confirm]) [data-confirm]{display:none}
-.copy-steps{position:relative}
-.copy-steps .bar{position:absolute;left:26px;right:0;top:calc(var(--step,0) * 28px + 22px)}
-.card[data-confirm] .copy-steps .bar{top:22px}
.bar{height:4px;border-radius:2px;background:var(--bt-hover);overflow:hidden}
.bar-fill{display:block;height:100%;background:var(--bt-accent);transform-origin:0 50%;scale:0 1}
.banner{border-radius:12px;background:var(--bt-hover);padding:12px 14px}
@@ -310,7 +314,8 @@ html[data-hidden] *{animation-play-state:paused!important}
:root[data-eyes=happy] .bt-eye-happy{opacity:1}
@media (prefers-reduced-motion:reduce){
:root :is(.whale-x,.whale-gaze,.whale,.whale-move,.whale-loop,#tail,#gaze,#eye-pair,.bt-eye,.bt-eye-happy,.ripple,.stage){animation:none!important;transition:none!important}
-:root :is(.voice,.water,.place,.arc-base,.arc-glow,.ring,.props,.props *){animation:none!important}
+:root :is(.voice,.water,.place,.arc-base,.arc-glow,.ring,.props,.props *,.stop-copy){animation:none!important}
+:root .stop-copy,:root .stop-copy:active{scale:none}
:root .props>g{scale:none!important;transition:opacity .12s!important}
:root :is(.arc-fill,.ring-full){transition-duration:.12s!important}
:root .voice>span{animation:none!important;background:none!important;color:var(--bt-ink)!important}
@@ -319,4 +324,4 @@ html[data-hidden] *{animation-play-state:paused!important}
:root[data-exit~=lane] .lane{opacity:0;transition:opacity .12s}
}
-@media (forced-colors:active){.sheet-edge{background:CanvasText}.sheet-fill{background:Canvas}.btn{border:1px solid ButtonText}.bar-fill{background:Highlight}.water{background:CanvasText}.arc .arc-base{stroke:GrayText!important}.arc-fill,.ring-full,.arc-glow,.plume path{stroke:Highlight}.props :is(.folder-back,.folder-front,.gear,.mate circle){fill:CanvasText}.page rect,.mate rect{fill:Canvas}.drop{forced-color-adjust:none;background:Highlight}}
+@media (forced-colors:active){.sheet-edge{background:CanvasText}.sheet-fill{background:Canvas}.btn{border:1px solid ButtonText}.bar-fill{background:Highlight}.water{background:CanvasText}.arc .arc-base{stroke:GrayText!important}.arc-fill,.ring-full,.arc-glow,.plume path{stroke:Highlight}.props :is(.folder-back,.folder-front,.gear,.mate circle,.box rect){fill:CanvasText}.stop-copy{color:ButtonText}.page rect,.mate rect{fill:Canvas}.drop{forced-color-adjust:none;background:Highlight}}
diff --git a/app/src/start/start.html b/app/src/start/start.html
index 7ed30d4b..880aabea 100644
--- a/app/src/start/start.html
+++ b/app/src/start/start.html
@@ -13,8 +13,8 @@
<div class="band" aria-hidden="true"></div>
<main class="stage">
<div class="pond">
-<svg class="ring" viewBox="0 0 220 220" aria-hidden="true"><g class="arc" data-state="pending"><path class="arc-base" d="M119.24 4.40A106 106 0 0 1 206.07 154.80" pathLength="100"/><path class="arc-fill" d="M119.24 4.40A106 106 0 0 1 206.07 154.80" pathLength="100"/><path class="arc-glow" d="M119.24 4.40A106 106 0 0 1 206.07 154.80" pathLength="100"/></g><g class="arc" data-state="pending"><path class="arc-base" d="M196.83 170.80A106 106 0 0 1 23.17 170.80" pathLength="100"/><path class="arc-fill" d="M196.83 170.80A106 106 0 0 1 23.17 170.80" pathLength="100"/><path class="arc-glow" d="M196.83 170.80A106 106 0 0 1 23.17 170.80" pathLength="100"/></g><g class="arc" data-state="pending"><path class="arc-base" d="M13.93 154.80A106 106 0 0 1 100.76 4.40" pathLength="100"/><path class="arc-fill" d="M13.93 154.80A106 106 0 0 1 100.76 4.40" pathLength="100"/><path class="arc-glow" d="M13.93 154.80A106 106 0 0 1 100.76 4.40" pathLength="100"/></g><circle class="ring-full" cx="110" cy="110" r="106" pathLength="100" transform="rotate(-90 110 110)"/></svg>
-<svg class="props" viewBox="0 0 40 40" aria-hidden="true"><g data-p="data"><path class="folder-back" d="M4 12a2 2 0 0 1 2-2h9l3 3h16a2 2 0 0 1 2 2v19a2 2 0 0 1-2 2H6a2 2 0 0 1-2-2Z"/><g class="page"><rect x="9" y="7" width="22" height="22" rx="1.5"/><path d="M13 13h14M13 17h14M13 21h9"/></g><g class="page"><rect x="9" y="7" width="22" height="22" rx="1.5"/><path d="M13 13h14M13 17h14M13 21h9"/></g><g class="page"><rect x="9" y="7" width="22" height="22" rx="1.5"/><path d="M13 13h14M13 17h14M13 21h9"/></g><path class="folder-front" d="M2.5 19h35l-2.2 15.2a2 2 0 0 1-2 1.8H6.7a2 2 0 0 1-2-1.8Z"/></g><g data-p="engine"><path class="gear gear-big" fill-rule="evenodd" d="M23.25 22.40L25.94 22.85L25.94 25.15L23.25 25.60L22.35 28.07L24.12 30.15L22.64 31.91L20.29 30.53L18.01 31.84L18.03 34.57L15.77 34.97L14.85 32.40L12.27 31.94L10.53 34.05L8.53 32.90L9.49 30.34L7.80 28.33L5.11 28.82L4.33 26.66L6.70 25.31L6.70 22.69L4.33 21.34L5.11 19.18L7.80 19.67L9.49 17.66L8.53 15.10L10.53 13.95L12.27 16.06L14.85 15.60L15.77 13.03L18.03 13.43L18.01 16.16L20.29 17.47L22.64 16.09L24.12 17.85L22.35 19.93ZM18.00 24.00A3 3 0 1 0 12.00 24.00A3 3 0 1 0 18.00 24.00Z"/><path class="gear gear-small" fill-rule="evenodd" d="M23.26 16.79L21.10 16.54L20.93 14.17L23.03 13.61L24.16 11.26L23.29 9.27L25.26 7.93L26.79 9.47L29.40 9.27L30.69 7.52L32.83 8.55L32.26 10.65L33.74 12.81L35.90 13.06L36.07 15.43L33.97 15.99L32.84 18.34L33.71 20.33L31.74 21.67L30.21 20.13L27.60 20.33L26.31 22.08L24.17 21.05L24.74 18.95ZM30.70 14.80A2.2 2.2 0 1 0 26.30 14.80A2.2 2.2 0 1 0 30.70 14.80Z"/></g><g data-p="team"><g transform="translate(8 30)"><g class="mate"><circle cx="0" cy="0" r="7"/><rect x=".8" y="-3.3" width="1.9" height="4.6" rx=".95"/><rect x="3.8" y="-3.7" width="1.6" height="4.3" rx=".8"/></g></g><g transform="translate(20 22)"><g class="mate"><circle cx="0" cy="0" r="7"/><rect x=".8" y="-3.3" width="1.9" height="4.6" rx=".95"/><rect x="3.8" y="-3.7" width="1.6" height="4.3" rx=".8"/></g></g><g transform="translate(32 30)"><g class="mate"><circle cx="0" cy="0" r="7"/><rect x=".8" y="-3.3" width="1.9" height="4.6" rx=".95"/><rect x="3.8" y="-3.7" width="1.6" height="4.3" rx=".8"/></g></g></g></svg>
+<svg class="ring" viewBox="0 0 220 220" aria-hidden="true"><g class="arc" data-phase="data" data-state="pending"><path class="arc-base" d="M119.24 4.40A106 106 0 0 1 206.07 154.80" pathLength="100"/><path class="arc-fill" d="M119.24 4.40A106 106 0 0 1 206.07 154.80" pathLength="100"/><path class="arc-glow" d="M119.24 4.40A106 106 0 0 1 206.07 154.80" pathLength="100"/></g><g class="arc" data-phase="engine" data-state="pending"><path class="arc-base" d="M196.83 170.80A106 106 0 0 1 23.17 170.80" pathLength="100"/><path class="arc-fill" d="M196.83 170.80A106 106 0 0 1 23.17 170.80" pathLength="100"/><path class="arc-glow" d="M196.83 170.80A106 106 0 0 1 23.17 170.80" pathLength="100"/></g><g class="arc" data-phase="team" data-state="pending"><path class="arc-base" d="M13.93 154.80A106 106 0 0 1 100.76 4.40" pathLength="100"/><path class="arc-fill" d="M13.93 154.80A106 106 0 0 1 100.76 4.40" pathLength="100"/><path class="arc-glow" d="M13.93 154.80A106 106 0 0 1 100.76 4.40" pathLength="100"/></g><g class="arc" data-phase="import" data-state="pending"><path class="arc-base" d="M215.60 119.24A106 106 0 0 1 119.24 215.60" pathLength="100"/><path class="arc-fill" d="M215.60 119.24A106 106 0 0 1 119.24 215.60" pathLength="100"/><path class="arc-glow" d="M215.60 119.24A106 106 0 0 1 119.24 215.60" pathLength="100"/></g><circle class="ring-full" cx="110" cy="110" r="106" pathLength="100" transform="rotate(-90 110 110)"/></svg>
+<svg class="props" viewBox="0 0 40 40" aria-hidden="true"><g data-p="data"><path class="folder-back" d="M4 12a2 2 0 0 1 2-2h9l3 3h16a2 2 0 0 1 2 2v19a2 2 0 0 1-2 2H6a2 2 0 0 1-2-2Z"/><g class="page"><rect x="9" y="7" width="22" height="22" rx="1.5"/><path d="M13 13h14M13 17h14M13 21h9"/></g><g class="page"><rect x="9" y="7" width="22" height="22" rx="1.5"/><path d="M13 13h14M13 17h14M13 21h9"/></g><g class="page"><rect x="9" y="7" width="22" height="22" rx="1.5"/><path d="M13 13h14M13 17h14M13 21h9"/></g><path class="folder-front" d="M2.5 19h35l-2.2 15.2a2 2 0 0 1-2 1.8H6.7a2 2 0 0 1-2-1.8Z"/></g><g data-p="import"><g class="box box-from"><rect x="3" y="24" width="13" height="12" rx="2"/><path d="M3 28h13M9.5 24v4"/></g><g class="box"><rect x="23" y="24" width="13" height="12" rx="2"/><path d="M23 28h13M29.5 24v4"/></g><g class="box box-moving"><rect x="3" y="24" width="13" height="12" rx="2"/><path d="M3 28h13M9.5 24v4"/></g></g><g data-p="engine"><path class="gear gear-big" fill-rule="evenodd" d="M23.25 22.40L25.94 22.85L25.94 25.15L23.25 25.60L22.35 28.07L24.12 30.15L22.64 31.91L20.29 30.53L18.01 31.84L18.03 34.57L15.77 34.97L14.85 32.40L12.27 31.94L10.53 34.05L8.53 32.90L9.49 30.34L7.80 28.33L5.11 28.82L4.33 26.66L6.70 25.31L6.70 22.69L4.33 21.34L5.11 19.18L7.80 19.67L9.49 17.66L8.53 15.10L10.53 13.95L12.27 16.06L14.85 15.60L15.77 13.03L18.03 13.43L18.01 16.16L20.29 17.47L22.64 16.09L24.12 17.85L22.35 19.93ZM18.00 24.00A3 3 0 1 0 12.00 24.00A3 3 0 1 0 18.00 24.00Z"/><path class="gear gear-small" fill-rule="evenodd" d="M23.26 16.79L21.10 16.54L20.93 14.17L23.03 13.61L24.16 11.26L23.29 9.27L25.26 7.93L26.79 9.47L29.40 9.27L30.69 7.52L32.83 8.55L32.26 10.65L33.74 12.81L35.90 13.06L36.07 15.43L33.97 15.99L32.84 18.34L33.71 20.33L31.74 21.67L30.21 20.13L27.60 20.33L26.31 22.08L24.17 21.05L24.74 18.95ZM30.70 14.80A2.2 2.2 0 1 0 26.30 14.80A2.2 2.2 0 1 0 30.70 14.80Z"/></g><g data-p="team"><g transform="translate(8 30)"><g class="mate"><circle cx="0" cy="0" r="7"/><rect x=".8" y="-3.3" width="1.9" height="4.6" rx=".95"/><rect x="3.8" y="-3.7" width="1.6" height="4.3" rx=".8"/></g></g><g transform="translate(20 22)"><g class="mate"><circle cx="0" cy="0" r="7"/><rect x=".8" y="-3.3" width="1.9" height="4.6" rx=".95"/><rect x="3.8" y="-3.7" width="1.6" height="4.3" rx=".8"/></g></g><g transform="translate(32 30)"><g class="mate"><circle cx="0" cy="0" r="7"/><rect x=".8" y="-3.3" width="1.9" height="4.6" rx=".95"/><rect x="3.8" y="-3.7" width="1.6" height="4.3" rx=".8"/></g></g></g></svg>
<div class="water" aria-hidden="true"></div>
<div class="lane"><div class="whale-x"><div class="whale-gaze"><div class="whale"><div class="whale-move"><div class="whale-loop">
<!-- whale --><svg class="whale-svg" viewBox="0 0 100 100" aria-hidden="true" focusable="false"><defs><mask id="st-eyes" maskUnits="userSpaceOnUse" x="-100" y="-100" width="300" height="300"><rect x="-100" y="-100" width="300" height="300" fill="#fff"/><g id="gaze" class="bt-gaze"><g id="eye-pair" class="bt-eyes" fill="#000"><g transform="translate(72.5 48.4) rotate(-15.8)"><rect class="bt-eye" x="-4.65" y="-11.5" width="9.3" height="23" rx="4.65"/></g><g transform="translate(85.6 43.4) rotate(-21.2)"><rect class="bt-eye" x="-3.5" y="-11.45" width="7" height="22.9" rx="3.5"/></g><g transform="translate(72.5 48.4) rotate(-15.8)"><path class="bt-eye-happy" opacity="0" d="M-5.766 3.22Q0 -9.66 5.766 3.22" fill="none" stroke="#000" stroke-width="4.65" stroke-linecap="round"/></g><g transform="translate(85.6 43.4) rotate(-21.2)"><path class="bt-eye-happy" opacity="0" d="M-4.34 3.206Q0 -9.617999999999999 4.34 3.206" fill="none" stroke="#000" stroke-width="3.5" stroke-linecap="round"/></g></g></g></mask><clipPath id="st-tail-cut" clipPathUnits="userSpaceOnUse"><path d="M-100 -100H32.45V52.05L36.02 53.85L27.9 61.1L23.35 70.15L23.35 200H-100Z"/></clipPath><clipPath id="st-torso-cut" clipPathUnits="userSpaceOnUse"><path d="M32.45 -100H200V200H-100V70.15H23.35L32.45 52.05Z"/></clipPath><g id="whale-layers" fill-rule="evenodd"><g id="w-body"><path d="M65.3 20.9l5.1 .1 4.8 .9 4.8 1.7 4.3 2.3 3.8 3.1 3 3.4 2.3 3.8 1.6 4.3 .9 4.3 0 4.8-.8 4.8-1.4 4.3-2.3 4.3-3.2 4.3-3.4 3.3-4.3 3.1-7.2 3.5-7.6 1.7-7.2 .1-9.6-1.6-3.3-1-2.9-1.7-8.8-8.9-6-4.7-3.3-.5-7.7 1.1-4.8-.1-4.7-1.2-1.9-1.2-1-1-.5-1.5 .4-1.4 1.1-1.3 1.9-1.3 4.7-1.5 7.7-.6 1.1-.5 .7-1 0-1.4-2.8-7.2-1.2-5.3-.1-4.3 .4-1.4 .9-1.2 1.9-.2 2 1 2.2 2.3 2.2 3.4 3.2 7.6 1.9 9.7 .5-.1 1.1-7.2 1.8-4.8 3.2-5.2 3.9-4.3 4.9-3.9 5.6-2.9 5.8-1.9z" fill="var(--bt-ink-deepseek)"/></g><g id="w-belly"><path d="M93.3 55.8l1-.3 .1 1.2-2.4 5.3-3.4 4.8-3.8 3.8-4.8 3.4-5.7 2.8-4.8 1.5-4.8 .4 20.1-17.4 5.2-3.7z" fill="#fff" fill-opacity="1"/></g><g id="w-shade"><path d="M88.6 29.5l2.4 2.9 1.9 2.8 2.4 6.3 .5 3.3 .1 5.3-1.5 6.6-1.9 4.3-2 3.3-4.8 5.4-5.7 4.3-7.2 3.3-6.2 1.5-6.7 .1-3.3-.2-9.6-1.8-3.3-1.5-2.4-1.9-8.6-8.9-5.3-3.9-3.3-.1-2.9 .2-3.3 .8-5.8 0-4.3-1-2.9-1.9 .6-.6 3.8-1.3 10.5-2.5 4.3 .9 1.4-.1 2.2-1.7 .5-1.4-.3-1.5-1.2-1.4-2.2-1.4-1.2-1.9-.6-12 .4-3.3 .5-.5 2.9 3.8 2.4 4.8 1.9 5.7 .7 5.8 .7 2.8 2.1 2.4 2.7 5.5 3.8 4.3 2.9 2.2 3.3 1 3.4-.4 6.2-3 7.1-4.5 7.3-5.6 6.6-5.9 5.9-6.5 3.7-5.3 1.7-4.2 .1-2.9z" fill="#000" fill-opacity=".14"/></g><g id="w-light"><path d="M55.6 22.8l1.9-.3 1.5 .3 .6 1 .1 .9-2 4.3-3.8 5.3-5.8 6.2-5.4 4.4-4.8 2.3-1.4 0-1.2-.5-.8-1.9 .5-3.3 2.5-4.8 3.3-4.3 2.4-2.4 5.3-3.9zM19.3 28.1l-1.4 2 .3-1.1zM21.7 49.1l.6 .5-.3 .5-.8 0zM35.8 52l1.2-.4 .9 .7 .7 1.6-.4 .9-1.2 .1-2.6-.5zM7.2 52.9l-2.9 2.9 1.2-1.6z" fill="#fff" fill-opacity=".16"/></g></g></defs><g class="bt-b"><g mask="url(#st-eyes)"><g id="tail"><use href="#whale-layers" clip-path="url(#st-tail-cut)"/></g><g id="torso"><use href="#whale-layers" clip-path="url(#st-torso-cut)"/></g></g></g></svg><!-- /whale -->
@@ -22,8 +22,10 @@
<div class="whale-hit" aria-hidden="true"></div>
<div class="fx" aria-hidden="true"><span class="ripple"></span></div>
</div>
+<button class="stop-copy" data-act="stopCopy" hidden><svg viewBox="0 0 16 16" aria-hidden="true"><rect x="5" y="5" width="6" height="6" rx="1.3"/></svg></button>
<ol class="track sr" data-t-label="status.track">
<li class="station" data-phase="data" data-state="pending"><span data-t="status.phase.data"></span> <span class="sr"></span></li>
+<li class="station" data-phase="import" data-state="pending" hidden><span data-t="status.phase.import"></span> <span class="sr"></span></li>
<li class="station" data-phase="engine" data-state="pending"><span data-t="status.phase.engine"></span> <span class="sr"></span></li>
<li class="station" data-phase="team" data-state="pending"><span data-t="status.phase.team"></span> <span class="sr"></span></li>
</ol>
@@ -38,9 +40,9 @@
<section class="card" data-kind="picked" hidden><div class="card-scroll"><h2 class="card-title" data-t="say.picked"></h2><p class="lead" data-t="card.picked.lead"></p></div><div class="card-actions"><button class="btn" data-look="primary" data-act="answer" data-detail="use" data-t="btn.continue"></button><button class="btn" data-look="soft" data-act="pick" data-t="btn.repick"></button><p class="foot" data-t="note.changeLater"></p></div></section>
<section class="card" data-kind="move" hidden><div class="card-scroll"><h2 class="card-title" data-t="say.move"></h2><p class="lead" data-t="card.move.lead"></p></div><div class="card-actions"><button class="btn" data-look="primary" data-act="answer" data-detail="move" data-t="btn.move"></button><button class="btn" data-look="soft" data-act="pick" data-t="btn.repick"></button><button class="btn" data-look="soft" data-act="answer" data-detail="cancel" data-t="btn.cancel"></button></div></section>
<section class="card" data-kind="moveFailed" hidden><div class="card-scroll"><h2 class="card-title" data-t="say.moveFailed"></h2><p class="lead"><span data-why="place" data-t="reason.place.{place}"></span><span data-why="inUse" data-t="card.moveFailed.inUse"></span><span data-why="copy" data-t="card.moveFailed.copy"></span> <span data-t="card.moveFailed.stay"></span></p><div class="card-actions"><button class="btn" data-look="primary" data-act="answer" data-detail="retry" data-why="copy" data-t="btn.retry"></button><button class="btn" data-look="soft" data-act="answer" data-detail="old" data-old data-t="btn.startOld"></button><button class="btn disclose" data-look="link" data-act="toggleDetails" data-why="copy" aria-expanded="false"><span data-t="btn.details"></span><svg viewBox="0 0 16 16" aria-hidden="true"><path d="M4.5 6.2 8 9.7l3.5-3.5"/></svg></button></div><div class="log" hidden><pre></pre></div></div></section>
-<section class="card" data-kind="import" hidden><div class="card-scroll"><h2 class="card-title" data-t="say.import"></h2><p class="lead" data-t="card.import.lead{bare}"></p><p class="small extra-row"><span data-t="card.import.extra{bare}"></span><button class="btn disclose" data-look="link" data-act="toggleMore" aria-expanded="false"><span data-t="btn.more"></span><svg viewBox="0 0 16 16" aria-hidden="true"><path d="M4.5 6.2 8 9.7l3.5-3.5"/></svg></button></p><div class="more" hidden><p class="small ink" data-t="card.import.found"></p><p class="small" data-t="card.import.scope"></p><p class="small ink model-row"><span data-t="card.import.model"></span><button class="btn" data-look="link" data-act="toggleModels" aria-expanded="false" data-t="btn.changeModel"></button></p><ul class="models" hidden></ul><div class="opts"><label><input type="checkbox" data-opt="regen"><span data-t="card.import.optRegen"></span></label><label><input type="checkbox" data-opt="skipWork"><span data-t="card.import.optSkipWork"></span></label></div></div></div><div class="card-actions"><button class="btn" data-look="primary" data-act="answer" data-detail="copy" data-t="btn.copy"></button><button class="btn" data-look="soft" data-act="answer" data-detail="skip" data-t="btn.skipCopy"></button><p class="foot" data-t="note.copyLater"></p></div></section>
+<section class="card" data-kind="import" hidden><div class="card-scroll"><h2 class="card-title" data-t="card.import.line"></h2><div class="more" hidden><p class="small" data-t="card.import.extra{bare}"></p><p class="small ink model-row"><span data-t="card.import.model"></span><button class="btn" data-look="link" data-act="toggleModels" aria-expanded="false" data-t="btn.changeModel"></button></p><ul class="models" hidden></ul><div class="opts"><label><input type="checkbox" data-opt="regen"><span data-t="card.import.optRegen"></span></label><label><input type="checkbox" data-opt="skipWork"><span data-t="card.import.optSkipWork"></span></label></div><p class="small" data-t="note.copyLater"></p></div></div><div class="card-actions"><button class="btn" data-look="primary" data-act="answer" data-detail="copy" data-t="btn.copy"></button><button class="btn" data-look="soft" data-act="answer" data-detail="skip" data-t="btn.skipCopy"></button><button class="btn disclose end" data-look="link" data-act="toggleMore" aria-expanded="false"><span data-t="btn.more"></span><svg viewBox="0 0 16 16" aria-hidden="true"><path d="M4.5 6.2 8 9.7l3.5-3.5"/></svg></button></div></section>
<section class="card" data-kind="importSpace" hidden><div class="card-scroll"><h2 class="card-title" data-t="say.importSpace"></h2><p class="lead" data-t="card.importSpace.lead"></p></div><div class="card-actions"><button class="btn" data-look="primary" data-act="pick" data-t="btn.pickPlace"></button><button class="btn" data-look="soft" data-act="answer" data-detail="skip" data-t="btn.skipCopy"></button></div></section>
-<section class="card" data-kind="copying" hidden><div class="card-scroll"><h2 class="card-title" data-t="say.copying"></h2><div class="copy-steps"><ol class="steps"><li data-step="1"><span class="mark" aria-hidden="true"><span class="dot"></span><svg class="check" viewBox="0 0 16 16"><circle cx="8" cy="8" r="8"/><path d="M4.6 8.3 7 10.6l4.4-4.9"/></svg></span><span data-t="card.copying.step1"></span></li><li data-step="2"><span class="mark" aria-hidden="true"><span class="dot"></span><svg class="check" viewBox="0 0 16 16"><circle cx="8" cy="8" r="8"/><path d="M4.6 8.3 7 10.6l4.4-4.9"/></svg></span><span data-t="card.copying.step2"></span></li><li data-step="3"><span class="mark" aria-hidden="true"><span class="dot"></span><svg class="check" viewBox="0 0 16 16"><circle cx="8" cy="8" r="8"/><path d="M4.6 8.3 7 10.6l4.4-4.9"/></svg></span><span data-t="card.copying.step3"></span></li></ol><div class="bar" aria-hidden="true"><span class="bar-fill"></span></div></div><div class="confirm" hidden><p class="lead" data-t="card.copying.stopConfirm"></p></div></div><div class="card-actions"><span class="eta small"></span><button class="btn stop" data-look="soft" data-act="stopCopy" data-t="btn.stopCopy"></button><button class="btn" data-look="primary" data-act="keepCopying" data-confirm data-t="btn.keepCopying"></button><button class="btn danger" data-look="soft" data-act="stopCopy" data-detail="confirm" data-confirm data-t="btn.stopCopy"></button></div></section>
+<section class="card" data-kind="stopCopy" hidden><div class="card-scroll"><h2 class="card-title" data-t="say.stopCopy"></h2><p class="lead" data-t="card.copying.stopConfirm"></p></div><div class="card-actions"><button class="btn" data-look="primary" data-act="keepCopying" data-t="btn.keepCopying"></button><button class="btn danger" data-look="soft" data-act="stopCopy" data-detail="confirm" data-t="btn.stopCopy"></button></div></section>
<section class="card" data-kind="inUse" hidden><div class="card-scroll"><h2 class="card-title" data-t="say.inUse"></h2><p class="lead" data-t="card.inUse.lead"></p></div><div class="card-actions"><button class="btn" data-look="primary" data-act="answer" data-detail="skip" data-t="btn.skipCopy"></button></div></section>
<section class="card" data-kind="newerUpdating" hidden><div class="card-scroll"><h2 class="card-title" data-t="say.newer"></h2><p class="lead" data-t="card.newerUpdating.lead"></p><p class="small"><span data-t="card.update.slow"></span> <button class="btn" data-look="link" data-act="manualDownload" data-t="btn.manualDownload"></button></p></div><div class="card-actions"><button class="btn" data-look="primary" data-act="answer" data-detail="skip" data-t="btn.skipCopy"></button></div></section>
<section class="card" data-kind="newer" hidden><div class="card-scroll"><h2 class="card-title" data-t="say.newer"></h2><p class="lead" data-t="card.newer.lead"></p></div><div class="card-actions"><button class="btn" data-look="primary" data-act="answer" data-detail="startWithout" data-t="btn.startWithout"></button><p class="foot" data-t="note.copyAgain"></p></div></section>
diff --git a/app/src/start/start.js b/app/src/start/start.js
index 04189d12..bc051141 100644
--- a/app/src/start/start.js
+++ b/app/src/start/start.js
@@ -38,6 +38,7 @@ const sheet = $('.sheet'), edge = $('.sheet-edge'), fill = $('.sheet-fill'), sta
const voiceEl = $('.voice'), voiceText = $('.voice>span')
const captionText = $('.caption-text')
const placeEl = $('.place'), placeText = $('.place-text')
+const stopButton = $('.stop-copy')
const CODE = new Set(['path', 'dataDir', 'workspace'])
let lang = 'zh'
let s = null
@@ -67,6 +68,8 @@ function renderStatic() {
root.lang = lang === 'zh' ? 'zh-CN' : 'en'
for (const el of document.querySelectorAll('.track [data-t], .footrow [data-t], .caption [data-t]')) render(el)
$('.track').setAttribute('aria-label', say('status.track'))
+ stopButton.setAttribute('aria-label', say('btn.stopCopy'))
+ stopButton.title = say('btn.stopCopy')
for (const st of document.querySelectorAll('.station')) st.querySelector('.sr').textContent = say(`status.state.${st.dataset.state}`)
if (s) { fillBlock(shown); placeUI(s.place); timeUI() }
}
@@ -174,7 +177,8 @@ let sheetRun = 0
function blockFor(snap) {
if (snap.view === 'handoff') return shown
if (snap.view === 'failed' || snap.view === 'viewFailed' || snap.view === 'watchdog') return snap.view
- if (snap.view === 'card') return snap.card?.kind === 'stopCopy' ? 'copying' : snap.card?.kind ?? ''
+ // The copy has no card: it is the ring's import arc (start-window §6).
+ if (snap.view === 'card') return snap.card?.kind === 'copying' ? '' : snap.card?.kind ?? ''
return ''
}
// The edge and fill layers are pre-sized to the sheet; only their clip-path moves, so a card
@@ -250,6 +254,7 @@ async function showBlock(name, jump) {
const wasCard = Boolean(shown)
shown = name
if (wasCard) leave(oldEl, jump)
+ if (!name && wasCard && s?.card?.kind === 'copying' && !jump && !reduced()) return flyIn(mine)
const el = blockEl(name)
if (name && el) {
root.dataset.sheet = 'card'
@@ -277,6 +282,62 @@ async function showBlock(name, jump) {
}
}
+// 〔复制过来〕, 〔继续复制〕 or a retry: the card does not fold away. Its surface shrinks to a drop
+// that turns the whale's blue and jumps up into the import's arc, which lights up as it lands and
+// then fills with the copy; the pond comes back down after it (start-window §6). Reduced motion
+// folds the card as usual and turns the arc on at once.
+const FLIGHT_MS = 520
+const ARRIVE = 0.8
+async function flyIn(mine) {
+ let land = () => {}
+ director.flight(new Promise((resolve) => { land = resolve }))
+ try {
+ const box = sheet.getBoundingClientRect()
+ const target = importPoint()
+ const cx = box.width / 2, cy = edgeH / 2
+ // The surface is leaving: a card that comes meanwhile morphs in from nothing.
+ edgeH = 0
+ await sleep(60)
+ if (mine !== sheetRun) return
+ const dot = (r, k) => `inset(${cy - r + k}px ${cx - r + k}px ${box.height - cy - r + k}px ${cx - r + k}px round ${r}px)`
+ const dx = target.x - (box.left + cx), dy = target.y - (box.top + cy)
+ const blue = 'var(--bt-ink-deepseek)'
+ // Shrink and rise, then the hop onto the arc; the arc lights as the drop arrives, under its fade.
+ const flights = [edge, fill].map((layer, k) => {
+ const from = getComputedStyle(layer)
+ const frames = [
+ { clipPath: from.clipPath, translate: '0px 0px', backgroundColor: from.backgroundColor, opacity: 1, easing: 'cubic-bezier(.3,.7,.4,1)' },
+ { clipPath: dot(6, k), translate: `${(dx * 0.25).toFixed(1)}px ${(dy * 0.7).toFixed(1)}px`, backgroundColor: blue, opacity: 1, offset: 0.45, easing: 'cubic-bezier(.4,0,.6,1)' },
+ { clipPath: dot(5, k), translate: `${dx.toFixed(1)}px ${dy.toFixed(1)}px`, backgroundColor: blue, opacity: 1, offset: ARRIVE },
+ { clipPath: dot(3, k), translate: `${dx.toFixed(1)}px ${dy.toFixed(1)}px`, backgroundColor: blue, opacity: 0 },
+ ]
+ for (const a of layer.getAnimations()) a.cancel()
+ return play(layer, frames, { duration: FLIGHT_MS, easing: 'linear' })
+ })
+ setTimeout(() => { if (mine === sheetRun) land() }, FLIGHT_MS * ARRIVE)
+ await Promise.all(flights.map(a => a.done))
+ if (mine !== sheetRun) return
+ land()
+ const bottom = sheet.clientHeight
+ ;[edge, fill].forEach((layer, k) => {
+ layer.style.clipPath = [`inset(0px 0px ${bottom}px 0px round 12px)`, `inset(1px 1px ${bottom + 1}px 1px round 11px)`][k]
+ layer.style.opacity = '0'
+ })
+ for (const a of flights) a.cancel()
+ root.dataset.sheet = 'none'
+ if (document.activeElement?.closest?.('.sheet')) document.activeElement.blur()
+ if (root.hasAttribute('data-up')) shift(false)
+ } finally {
+ land()
+ }
+}
+// The middle of the import's arc, where the page shows it now (the pond may be shrunk).
+function importPoint() {
+ const path = $('.arc[data-phase=import] .arc-base')
+ const p = path.getPointAtLength(path.getTotalLength() / 2)
+ return new DOMPoint(p.x, p.y).matrixTransform(path.getScreenCTM())
+}
+
// What a new card says to a screen reader: its first line and its first visible sentence (the
// 180 s card has only buttons; the whale's line asks its question).
function cardWords(el, name) {
@@ -297,11 +358,10 @@ function fillBlock(name) {
node.hidden = node.dataset.why !== s.card?.why
if (node.hidden && node.dataset.t) { node.textContent = ''; sigs.delete(node) }
}
- for (const node of el.querySelectorAll('[data-t]')) if (!node.closest('.steps, .copied, [data-why][hidden]')) render(node, vars)
+ for (const node of el.querySelectorAll('[data-t]')) if (!node.closest('.copied, [data-why][hidden]')) render(node, vars)
if (name === 'missing') missing(el)
if (name === 'recommend' || name === 'rejected') recommend(el)
if (name === 'import') importCard(el)
- if (name === 'copying') copying(el)
if (name === 'failed') failed(el)
if (name === 'moveFailed') el.querySelector('[data-old]').dataset.look = s.card?.why === 'copy' ? 'soft' : 'primary'
}
@@ -371,32 +431,6 @@ function bar(el, fraction, keep) {
el.style.scale = `${f} 1`
if (!reduced()) play(el, [{ scale: from }, { scale: `${f} 1` }], { ...spring('list'), fill: 'none' })
}
-let copyStep = 0
-function copying(el) {
- const card = s.card
- el.toggleAttribute('data-confirm', card.kind === 'stopCopy')
- el.querySelector('.confirm').hidden = card.kind !== 'stopCopy'
- // Once the team starts, the copy is done and there is nothing left to stop.
- el.querySelector('.btn.stop').hidden = card.step >= 3
- el.style.setProperty('--step', String(Math.max(0, card.step - 1)))
- ;[...el.querySelectorAll('.steps li')].forEach((li, k) => {
- const n = k + 1
- const state = n < card.step ? 'done' : n === card.step ? 'active' : 'pending'
- const was = li.dataset.state
- li.dataset.state = state
- if (state === 'done' && was && was !== 'done') {
- const check = li.querySelector('.check')
- if (reduced()) play(check, [{ opacity: 0 }, { opacity: 1 }], { duration: 120, fill: 'none' })
- else { play(check, [{ transform: 'scale(.4)' }, { transform: 'none' }], { ...spring('pop'), fill: 'none' }); play(check, [{ opacity: 0 }, { opacity: 1 }], { duration: 120, fill: 'none' }) }
- director.nod()
- }
- render(li.querySelector('[data-t]'), card.steps?.[k] ?? {})
- })
- const fillEl = el.querySelector('.copy-steps .bar-fill')
- if (card.step !== copyStep) { copyStep = card.step; bars.set(fillEl, 0); fillEl.style.scale = '0 1' }
- bar(fillEl, card.fraction, true)
- el.querySelector('.eta').textContent = card.eta === null || card.eta === undefined ? '' : card.eta < 1 ? say('card.copying.etaSoon') : say('card.copying.eta', { n: card.eta })
-}
// The recovery card. 〔换个位置…〕 and 〔用新的空白团队开始…〕 show only when the main process can
// carry them out (failure.places).
function failed(el) {
@@ -468,6 +502,7 @@ function apply(next) {
root.dataset.view = next.view
shimmer()
placeUI(next.place)
+ stopButton.hidden = !(next.view === 'card' && next.card?.kind === 'copying' && next.card.step < 3)
const name = blockFor(next)
if (name !== shown) showBlock(name, jump)
else { fillBlock(name); resize() }
diff --git a/app/src/start/text.mjs b/app/src/start/text.mjs
index 97b75da1..daddd54d 100644
--- a/app/src/start/text.mjs
+++ b/app/src/start/text.mjs
@@ -32,11 +32,10 @@ export const TEXT = {
'say.rejected': '这里放不了',
'say.picked': '我多加了一层文件夹',
'say.missing': '数据不在原来的地方了',
- 'say.import': '找到你以前的团队了',
'say.importSpace': '地方不够放',
+ 'say.stopCopy': '停止复制?',
'say.inUse': 'DeepSeek Harness 还在用这个团队',
'say.newer': '这些对话比我新',
- 'say.copying': '正在搬过来',
'say.move': '搬到这个文件夹?',
'say.moveFailed': '没有搬成',
// hint
@@ -50,21 +49,13 @@ export const TEXT = {
'card.moveFailed.inUse': '另一个 DeepSeek Harness 正在使用这份数据。关掉它以后,这里会自动接着搬。',
'card.moveFailed.copy': '数据没有复制完:{reason}。',
'card.moveFailed.stay': '原来的 {dataDir} 没有变化。',
- 'card.import.lead': 'DeepSeek Harness 里有 {bots} 个 Bot 和 {groups} 个群聊(对话 {chats},工作文件 {work})。复制过来?',
'card.import.extra': '复制后会多占 {total},DeepSeek Harness 里的原件不动。',
- 'card.import.leadBare': 'DeepSeek Harness 里有 {bots} 个 Bot 和 {groups} 个群聊。复制过来?',
+ 'card.import.line': '找到你以前的团队了:{bots} 个 Bot、{groups} 个群聊',
'card.import.extraBare': 'DeepSeek Harness 里的原件不动,复制以后两边各用各的。',
- 'card.import.found': '在 {path} 里找到 {bots} 个 Bot({names}等)和 {groups} 个群聊,{sessions} 段对话。',
- 'card.import.scope': '会复制:Bot、群聊、记忆、对话、附件、模型设置和 API Key。不会复制:MCP、技能和 DSH Agent。DeepSeek Harness 里的内容不会改动,复制以后两边各用各的。',
'card.import.model': '模型设置:{model}',
'card.import.optRegen': '不复制可以重新生成的文件夹',
'card.import.optSkipWork': '先不复制工作文件',
'card.importSpace.lead': '空间不够:复制要约 {need},{drive} 盘只剩 {free},还差 {short}。',
- 'card.copying.step1': '检查对话 {a}/{b}',
- 'card.copying.step2': '复制 Bot 和对话 {a} / {b}',
- 'card.copying.step3': '启动团队',
- 'card.copying.eta': '还要大约 {n} 分钟',
- 'card.copying.etaSoon': '不到 1 分钟',
'card.copying.stopConfirm': '停下后不会留下复制了一半的团队,DeepSeek Harness 里的团队不受影响。',
'card.inUse.lead': '请完全退出 DSH Desktop(任务栏右下角的托盘图标也要退出),并关掉 DSH Web,这里会自动继续。',
'card.newerUpdating.lead': 'DeepSeek Bot {version} 能读它们,正在下载({p}%)。装好后会重新打开,再复制团队。',
@@ -140,6 +131,7 @@ export const TEXT = {
// status
'status.track': '启动进度',
'status.phase.data': '准备数据文件夹',
+ 'status.phase.import': '复制以前的团队',
'status.phase.engine': '启动本机引擎',
'status.phase.team': '打开团队',
'status.state.pending': '未开始',
@@ -216,11 +208,10 @@ export const TEXT = {
'say.rejected': 'That place won’t work',
'say.picked': 'I added one more folder',
'say.missing': 'Your data isn’t where it was',
- 'say.import': 'Found your old team',
'say.importSpace': 'Not enough room',
+ 'say.stopCopy': 'Stop copying?',
'say.inUse': 'DeepSeek Harness is still using this team',
'say.newer': 'These chats are newer than me',
- 'say.copying': 'Moving your team in',
'say.move': 'Move the data here?',
'say.moveFailed': 'The data didn’t move',
// hint
@@ -234,21 +225,13 @@ export const TEXT = {
'card.moveFailed.inUse': 'Another DeepSeek Harness is using this data. Once it is closed, the move goes on by itself.',
'card.moveFailed.copy': 'The data wasn’t fully copied: {reason}.',
'card.moveFailed.stay': '{dataDir} is unchanged.',
- 'card.import.lead': 'DeepSeek Harness has {bots|Bot|Bots} and {groups|group chat|group chats} (chats {chats}, work files {work}). Copy them over?',
'card.import.extra': 'The copy takes another {total}; the originals in DeepSeek Harness stay untouched.',
- 'card.import.leadBare': 'DeepSeek Harness has {bots|Bot|Bots} and {groups|group chat|group chats}. Copy them over?',
+ 'card.import.line': 'Found your old team: {bots|Bot|Bots}, {groups|group chat|group chats}',
'card.import.extraBare': 'The originals in DeepSeek Harness stay untouched; after the copy each side goes its own way.',
- 'card.import.found': 'Found {bots|Bot|Bots} ({names} and others), {groups|group chat|group chats} and {sessions|chat|chats} in {path}.',
- 'card.import.scope': 'Copied: Bots, group chats, memory, chats, attachments, model settings and API Keys. Not copied: MCP, skills and DSH Agent. Nothing in DeepSeek Harness changes; after the copy each side goes its own way.',
'card.import.model': 'Model settings: {model}',
'card.import.optRegen': 'Skip folders that can be regenerated',
'card.import.optSkipWork': 'Don’t copy work files yet',
'card.importSpace.lead': 'Not enough space: the copy needs about {need}, drive {drive} has {free} left, {short} short.',
- 'card.copying.step1': 'Checking chats {a}/{b}',
- 'card.copying.step2': 'Copying Bots and chats {a} / {b}',
- 'card.copying.step3': 'Starting the team',
- 'card.copying.eta': 'About {n|minute|minutes} left',
- 'card.copying.etaSoon': 'Less than a minute left',
'card.copying.stopConfirm': 'Stopping leaves no half-copied team, and the team in DeepSeek Harness is not affected.',
'card.inUse.lead': 'Quit DSH Desktop completely (its tray icon at the bottom right of the taskbar too) and close DSH Web; this continues by itself.',
'card.newerUpdating.lead': 'DeepSeek Bot {version} can read them and is downloading ({p}%). After installing it reopens and copies the team.',
@@ -324,6 +307,7 @@ export const TEXT = {
// status
'status.track': 'Start progress',
'status.phase.data': 'Prepare the data folder',
+ 'status.phase.import': 'Copy your old team',
'status.phase.engine': 'Start the local engine',
'status.phase.team': 'Open the team',
'status.state.pending': 'Not started',
diff --git a/app/src/start/whale.js b/app/src/start/whale.js
index b13fd1cd..c080c26d 100644
--- a/app/src/start/whale.js
+++ b/app/src/start/whale.js
@@ -1,5 +1,6 @@
// The whale director: turns start snapshots into whale motion. The whale stays in the middle of
-// a ring of three arcs, one per stage, and the ring is the progress: an arc turns active, then
+// a ring of arcs, one per stage (three; four on a first start that copies a team), and the ring is
+// the progress: an arc turns active, then
// fills as its stage is done, and the ring closes at the hand-off. The director keeps the arcs
// (.arc data-state) and the hidden stage list (.station data-state, aria-current) for the live
// region and screen readers. A click on the whale makes it spout.
@@ -24,6 +25,15 @@ const CLEAR = ['transform', 'scale', 'translate']
const OUT = 'cubic-bezier(.4,0,.2,1)'
const HOP = 'cubic-bezier(.3,.7,.4,1)'
const PHASES = ['data', 'engine', 'team']
+// The path of arc k of n round the whale: from the top, clockwise, 10 degrees between arcs.
+export function arcPath(k, n) {
+ const at = (deg) => {
+ const r = (deg * Math.PI) / 180
+ return `${(110 + 106 * Math.sin(r)).toFixed(2)} ${(110 - 106 * Math.cos(r)).toFixed(2)}`
+ }
+ const span = 360 / n
+ return `M${at(k * span + 5)}A106 106 0 0 1 ${at((k + 1) * span - 5)}`
+}
// An active station and a state loop each hold at least 400 ms; the margin covers the frame
// on which the change is painted.
const HOLD = 420
@@ -97,7 +107,14 @@ export function createDirector({ start, resume, act, label, announce, onCheck, o
const tail = $('#tail'), pair = $('#eye-pair'), lane = $('.lane'), ripple = $('.ripple'), hit = $('.whale-hit')
const eyes = [...document.querySelectorAll('.bt-eye')], happy = [...document.querySelectorAll('.bt-eye-happy')]
const stations = [...document.querySelectorAll('.station')]
- const arcs = [...document.querySelectorAll('.arc')]
+ const ring = $('.ring'), importArc = $('.arc[data-phase=import]')
+ // The stages of this start, in order (the snapshot's phases).
+ let phases = PHASES
+ const last = () => phases.length - 1
+ const stationEl = i => stations.find(st => st.dataset.phase === phases[i])
+ const arcEl = i => document.querySelector(`.arc[data-phase="${phases[i]}"]`)
+ // The import's arc runs while the copy does, its confirmation to stop included.
+ const copying = () => ['copying', 'stopCopy'].includes(want.card)
const first = start === 'first'
// The entrance's clock starts once the window is on screen (`begin`, start.js).
let t0 = performance.now()
@@ -141,10 +158,10 @@ export function createDirector({ start, resume, act, label, announce, onCheck, o
// Each arc carries its stage's state: pending (faint), active (tinted, a light running along
// it), done (drawn in the whale's blue) or failed (red); start.css draws them.
function setStation(i, state) {
- const st = stations[i]
+ const st = stationEl(i)
if (!st || st.dataset.state === state) return
st.dataset.state = state
- arcs[i].dataset.state = state
+ arcEl(i).dataset.state = state
st.querySelector('.sr').textContent = label(`status.state.${state}`)
if (state === 'active') st.setAttribute('aria-current', 'step')
else st.removeAttribute('aria-current')
@@ -153,26 +170,28 @@ export function createDirector({ start, resume, act, label, announce, onCheck, o
if (D.checks > i) return
D.checks = i + 1
setStation(i, 'done')
- announce(label('status.sr.done', { phase: label(`status.phase.${PHASES[i]}`) }))
+ announce(label('status.sr.done', { phase: label(`status.phase.${phases[i]}`) }))
onCheck?.(i)
}
let activeTimer = 0
function armActive() {
clearTimeout(activeTimer)
const i = D.at
- if (D.handed || failure() || i > 2 || D.checks > i || stations[i].dataset.state !== 'pending') return
- if (i < 2 && want.done.includes(PHASES[i])) return
+ if (D.handed || failure() || i > last() || D.checks > i || stationEl(i).dataset.state !== 'pending') return
+ if (i < last() && want.done.includes(phases[i])) return
+ // The import's arc turns active once the copy runs and the card has flown into it.
+ if (phases[i] === 'import' && (!copying() || D.flying)) return
const now = performance.now()
const delay = Math.max(0, (D.since[i] ?? now) + 250 - now, t0 + entranceMs - now)
activeTimer = setTimeout(() => {
- if (D.at !== i || stations[i].dataset.state !== 'pending' || failure() || (i < 2 && want.done.includes(PHASES[i]))) return
+ if (D.at !== i || stationEl(i).dataset.state !== 'pending' || failure() || (i < last() && want.done.includes(phases[i]))) return
showActive(i)
}, instant ? 0 : delay)
}
function showActive(i) {
setStation(i, 'active')
D.activeAt[i] = performance.now()
- announce(label('status.sr.active', { phase: label(`status.phase.${PHASES[i]}`) }))
+ announce(label('status.sr.active', { phase: label(`status.phase.${phases[i]}`) }))
onActive?.(i)
}
@@ -527,11 +546,13 @@ export function createDirector({ start, resume, act, label, announce, onCheck, o
let ran = 0
while (D.at < want.station && want.view !== 'handoff') {
const i = D.at
+ // A copy can be done before the card has landed in its arc: the arc fills after that.
+ if (phases[i] === 'import' && D.flying) return
if (!ran) {
// The data stage is usually done before the page has painted: its arc still turns
// active once the whale has surfaced and holds there, the folder in view, before it
// fills. No loop starts for that short wait: a loop's own hold would add another 400 ms.
- if (i === 0 && !resume && ['boot', 'moving'].includes(want.view) && stations[0].dataset.state === 'pending') {
+ if (i === 0 && !resume && ['boot', 'moving'].includes(want.view) && stationEl(0).dataset.state === 'pending') {
clearTimeout(activeTimer)
showActive(0)
}
@@ -545,16 +566,24 @@ export function createDirector({ start, resume, act, label, announce, onCheck, o
if (!ran || want.view === 'handoff') return
D.loopAt = 0
armActive()
- if (D.at <= 2 && !(D.at < 2 && want.done.includes(PHASES[D.at]))) nod()
+ if (D.at <= last() && !(D.at < last() && want.done.includes(phases[D.at]))) nod()
}
// A failed start turns its stage's arc red; the whale's pose says the rest.
function failStation() {
- const i = want.view === 'viewFailed' ? 2 : Math.min(D.at, Math.max(0, PHASES.indexOf(want.phase)))
+ const i = want.view === 'viewFailed' ? last() : Math.min(D.at, Math.max(0, phases.indexOf(want.phase)))
clearTimeout(activeTimer)
if (D.checks > i) return
D.failed = i
setStation(i, 'failed')
}
+ // A failed copy turns the import's arc red, keeping what it had filled.
+ function failImport() {
+ const i = phases.indexOf('import')
+ if (i < 0 || D.checks > i) return
+ clearTimeout(activeTimer)
+ D.failed = i
+ setStation(i, 'failed')
+ }
async function goDown() {
if (['down', 'lift'].includes(D.pose)) return
stopHop()
@@ -564,8 +593,8 @@ export function createDirector({ start, resume, act, label, announce, onCheck, o
D.pose = 'down'
D.card = ''
D.clockKind = ''
- // A failed import leaves the phases as they were; only a failed start crosses a station.
if (want.view === 'failed' || want.view === 'viewFailed') failStation()
+ else if (want.card === 'importFailed') failImport()
const pose = capture()
stopLoop()
setBase(0.2, 0.6)
@@ -621,7 +650,8 @@ export function createDirector({ start, resume, act, label, announce, onCheck, o
play(move, [{ opacity: 1 }, { opacity: 0 }], { duration: 160 })
await wait(spring('shape').duration)
} else await play(lane, [{ opacity: Number(cs(lane).opacity) }, { opacity: 0 }], { duration: 160 }).done
- for (let i = 0; i < 3; i += 1) setStation(i, 'pending')
+ for (let i = 0; i < phases.length; i += 1) setStation(i, 'pending')
+ importArc?.style.removeProperty('--f')
D.at = 0
D.checks = 0
D.failed = undefined
@@ -701,8 +731,8 @@ export function createDirector({ start, resume, act, label, announce, onCheck, o
clearTimeout(activeTimer)
stopHop()
petEnd()
- for (let i = D.checks; i < 3; i += 1) popCheck(i)
- D.at = 2
+ for (let i = D.checks; i < phases.length; i += 1) popCheck(i)
+ D.at = last()
root.dataset.ring = 'closed'
D.handed = true
D.pose = 'dive'
@@ -901,6 +931,7 @@ export function createDirector({ start, resume, act, label, announce, onCheck, o
if (!failure() && ['down', 'lift', 'redo'].includes(D.pose)) await shakeOff()
await runLegs()
if (want.view === 'handoff') return handoff()
+ if (copying()) armActive()
if (failure()) {
if (D.pose === 'redo') D.pose = 'loop'
await goDown()
@@ -927,14 +958,33 @@ export function createDirector({ start, resume, act, label, announce, onCheck, o
})()
}
+ // A first start learns that it copies a team once its page is up (main.mjs boot): the ring is
+ // drawn again with four arcs, out of sight while the window is not yet shown, else in a fade.
+ function relayout(list) {
+ phases = list
+ for (const st of stations) st.hidden = !list.includes(st.dataset.phase)
+ clearTimeout(activeTimer)
+ for (let i = D.checks; i < list.length; i += 1) setStation(i, 'pending')
+ D.activeAt = D.activeAt.slice(0, D.checks)
+ const swap = () => {
+ ring.dataset.n = String(list.length)
+ list.forEach((phase, k) => { for (const path of arcEl(k).querySelectorAll('path')) path.setAttribute('d', arcPath(k, list.length)) })
+ }
+ if (instant || !D.started || root.hasAttribute('data-held')) { swap(); return }
+ const out = play(ring, [{ opacity: 1 }, { opacity: 0 }], { duration: 120, easing: 'ease-in' })
+ out.done.then(() => { swap(); out.cancel(); play(ring, [{ opacity: 0 }, { opacity: 1 }], { duration: 220, easing: 'ease-out', fill: 'none' }) })
+ }
+ let caughtTimer = 0
+
return {
update(s) {
+ if (Array.isArray(s.phases) && s.phases.join() !== phases.join() && s.phases.every(phase => stations.some(st => st.dataset.phase === phase))) relayout(s.phases)
const done = s.done ?? []
const now = performance.now()
- if (done.includes('data') && !want.done.includes('data')) D.since[1] = now
- if (done.includes('engine') && !want.done.includes('engine')) D.since[2] = now
+ phases.forEach((phase, k) => { if (done.includes(phase) && !want.done.includes(phase)) D.since[k + 1] = now })
let station = 0
- if (done.includes('data')) station = done.includes('engine') ? 2 : 1
+ while (station < last() && done.includes(phases[station])) station += 1
+ if (typeof s.card?.arc === 'number') importArc?.style.setProperty('--f', s.card.arc.toFixed(3))
const next = { station, view: s.view, phase: s.phase, done, card: s.card?.kind ?? '', missed: Boolean(s.card?.missedRetry), celebrate: Boolean(s.celebrate), update: s.update?.state ?? '', landing: s.landing ?? null }
// Stages taken back mean a start in another folder: the whale starts over even when the
// next snapshot, a moment later, has the first stage done again.
@@ -956,6 +1006,24 @@ export function createDirector({ start, resume, act, label, announce, onCheck, o
if (level === 2 || previous === 2) { bump(); kick() }
},
nod,
+ // The card flies into the import's arc (start.js flyIn()): the arc lights up as it lands.
+ flight(landed) {
+ D.flying = true
+ landed.then(() => {
+ D.flying = false
+ // Lit as it lands, even when the copy is done by then: it holds HOLD before it fills.
+ const i = phases.indexOf('import')
+ if (i >= 0 && D.at === i && stationEl(i).dataset.state === 'pending' && !failure() && !D.handed) {
+ clearTimeout(activeTimer)
+ showActive(i)
+ }
+ kick()
+ if (!importArc || reduced()) return
+ clearTimeout(caughtTimer)
+ importArc.setAttribute('data-caught', '')
+ caughtTimer = setTimeout(() => importArc.removeAttribute('data-caught'), 450)
+ })
+ },
// Live switch of reduced motion or of the tier: running one-shots jump to their end.
refresh() {
stopBreath()
diff --git a/app/test/import-flow.test.mjs b/app/test/import-flow.test.mjs
index b85d1703..31aad635 100644
--- a/app/test/import-flow.test.mjs
+++ b/app/test/import-flow.test.mjs
@@ -2,7 +2,7 @@
// and what the copy does with the answers. The disk, the engine and the window are test doubles.
import assert from 'node:assert/strict'
import { test } from 'node:test'
-import { copySize, defaultOptions, etaMinutes, ImportFlow, modelChoices } from '../src/import-flow.mjs'
+import { arcShare, copySize, defaultOptions, etaMinutes, ImportFlow, modelChoices } from '../src/import-flow.mjs'
const GB = 2 ** 30
const tick = () => new Promise((resolve) => { setImmediate(resolve) })
@@ -190,6 +190,19 @@ test('the copying card counts the checked chats, then the bytes, then starts the
assert.equal(copying.at(-1).step, 3)
assert.equal(copying.at(-1).steps[1].b, '4.2 GB')
assert.ok(copying.some(card => card.step === 2), 'the copy shows its own step')
+ // The ring's import arc fills with it and never goes back.
+ const arcs = copying.map(card => card.arc)
+ assert.deepEqual(arcs.slice(1).filter((arc, k) => arc < arcs[k]), [])
+ assert.equal(arcs.at(-1), 1)
+})
+
+test("the check of the chats fills the import arc's first 15 %, the copy the rest", () => {
+ assert.equal(arcShare(1, 0), 0)
+ assert.equal(arcShare(1, 1), 0.15)
+ assert.equal(arcShare(2, 0), 0.15)
+ assert.equal(arcShare(2, 0.5), 0.575)
+ assert.equal(arcShare(2, 2), 1)
+ assert.equal(arcShare(3, 0), 1)
})
test('〔停止复制〕 asks on the card, 〔继续复制〕 goes back, and the confirmed stop leaves no team', async () => {
diff --git a/app/test/main-import.test.mjs b/app/test/main-import.test.mjs
index ae748913..ece49648 100644
--- a/app/test/main-import.test.mjs
+++ b/app/test/main-import.test.mjs
@@ -38,6 +38,8 @@ test('the first start offers the DSH team on the import card, copies it on cards
await import('../src/main.mjs')
await waitFor(() => startState()?.card?.kind === 'import', 'offer the team on the import card')
const offer = startState().card
+ // The copy is a stage of its own on the start page's ring.
+ assert.deepEqual(startState().phases, ['data', 'import', 'engine', 'team'])
assert.deepEqual([offer.bots, offer.groups, offer.sessions, offer.names], [2, 0, 2, 'Chief, Writer'])
assert.equal(offer.path, dsh)
assert.equal(existsSync(join(paths.userData, 'locations.json')), false, 'the places wait for the answer')
@@ -57,6 +59,7 @@ test('the first start offers the DSH team on the import card, copies it on cards
const steps = cards().filter(card => card.kind === 'copying').map(card => card.step)
assert.ok(steps.includes(1) && steps.includes(2) && steps.at(-1) === 3, `the copy shows its three steps (${steps.join(',')})`)
assert.equal(startState().card, undefined, 'the copying card goes once the team\'s engine is up')
+ assert.deepEqual(startState().done, ['data', 'import', 'engine'], 'the import\'s stage is done, and the engine\'s again')
assert.ok(existsSync(join(home, 'DeepSeek Bot', 'draft.md')), 'the work files came along')
assert.equal(existsSync(join(home, 'DeepSeek Bot', 'node_modules')), false, 'the regenerable folders did not')
assert.equal(JSON.parse(readFileSync(join(paths.userData, 'locations.json'), 'utf8')).dataDir, join(home, '.ds-bot'))
diff --git a/app/test/place.test.mjs b/app/test/place.test.mjs
index 6b09b420..7f416a5b 100644
--- a/app/test/place.test.mjs
+++ b/app/test/place.test.mjs
@@ -26,6 +26,11 @@ test('sizes read as Explorer shows them', () => {
assert.equal(formatBytes(10 * 2 ** 30), '10 GB')
assert.equal(formatBytes(1.26 * 2 ** 30), '1.2 GB')
assert.equal(formatBytes(900 * 2 ** 20), '900 MB')
+ // Under 1 MB, never 「0 MB」.
+ assert.equal(formatBytes(2 ** 20), '1 MB')
+ assert.equal(formatBytes(12_000), '不到 1 MB')
+ assert.equal(formatBytes(0), '不到 1 MB')
+ assert.equal(formatBytes(12_000, 'en'), 'under 1 MB')
assert.equal(formatBytes(undefined), undefined)
assert.equal(formatBytes(-1), undefined)
})
diff --git a/app/test/start-page.test.mjs b/app/test/start-page.test.mjs
index 4ad06c26..174ef95c 100644
--- a/app/test/start-page.test.mjs
+++ b/app/test/start-page.test.mjs
@@ -67,18 +67,24 @@ test('the page sends only the acts of the start window', () => {
for (const name of START_ACTS) assert.ok(sent.has(name), `the main process takes ${name}, which the page never sends`)
})
-// The progress is a ring of three arcs round the whale, one per stage: radius 106 round the
-// centre of a 220 box, 120 degrees each from the top, clockwise, 10 degrees apart, with one
-// circle that closes the ring at the hand-off. The rings that the whale left at its stops and
-// the elapsed clock are gone.
-test('the start page draws the progress as a ring of three arcs and a closing circle', () => {
- const arcs = [...html.matchAll(/<g class="arc" data-state="pending">(.*?)<\/g>/gu)].map(match => match[1])
- assert.equal(arcs.length, 3)
+// The progress is a ring of arcs round the whale, one per stage: radius 106 round the centre of
+// a 220 box, from the top, clockwise, 10 degrees apart, with one circle that closes the ring at the
+// hand-off. Three arcs of 120 degrees; a first start that copies a team has a fourth stage, the
+// import, and four arcs of 90 degrees (whale.js arcPath draws them again). The rings that the
+// whale left at its stops and the elapsed clock are gone.
+test('the start page draws the progress as a ring of three or four arcs and a closing circle', () => {
+ const arcs = [...html.matchAll(/<g class="arc" data-phase="(\w+)" data-state="pending">(.*?)<\/g>/gu)]
+ assert.deepEqual(arcs.map(match => match[1]), ['data', 'engine', 'team', 'import'])
const point = (deg) => {
const a = (deg * Math.PI) / 180
return [110 + 106 * Math.cos(a), 110 + 106 * Math.sin(a)]
}
- arcs.forEach((arc, k) => {
+ // The import's arc is the second of four; it is drawn that way from the start, and shows only
+ // on a ring of four (start.css .ring[data-n]).
+ const layout = [[0, 3], [1, 3], [2, 3], [1, 4]]
+ arcs.forEach(([, , arc], k) => {
+ const [at, n] = layout[k]
+ const span = 360 / n
const paths = [...arc.matchAll(/<path class="(arc-[a-z]+)" d="([^"]+)" pathLength="100"\/>/gu)]
assert.deepEqual(paths.map(match => match[1]), ['arc-base', 'arc-fill', 'arc-glow'], `arc ${String(k)}`)
const d = paths[0][2]
@@ -86,9 +92,19 @@ test('the start page draws the progress as a ring of three arcs and a closing ci
const [x0, y0, rx, ry, , large, sweep, x1, y1] = d.match(/-?\d+(?:\.\d+)?/gu).map(Number)
assert.deepEqual([rx, ry, large, sweep], [106, 106, 0, 1], `arc ${String(k)}: not a clockwise arc of radius 106`)
const near = ([px, py], [qx, qy]) => Math.abs(px - qx) < 0.01 && Math.abs(py - qy) < 0.01
- assert.ok(near([x0, y0], point(-90 + k * 120 + 5)), `arc ${String(k)} starts elsewhere`)
- assert.ok(near([x1, y1], point(-90 + (k + 1) * 120 - 5)), `arc ${String(k)} ends elsewhere`)
+ assert.ok(near([x0, y0], point(-90 + at * span + 5)), `arc ${String(k)} starts elsewhere`)
+ assert.ok(near([x1, y1], point(-90 + (at + 1) * span - 5)), `arc ${String(k)} ends elsewhere`)
})
+ assert.match(read('start.css'), /\.ring:not\(\[data-n="4"\]\) \.arc\[data-phase=import\]\{display:none\}/u)
+ // The director draws the same arcs.
+ const source = code['whale.js']
+ const body = source.match(/^export function arcPath\(k, n\) \{$[\s\S]*?^\}$/mu)[0].replace('export ', '')
+ const arcPath = new Function(`${body}\nreturn arcPath`)()
+ assert.equal(arcPath(0, 3), arcs[0][2].match(/d="([^"]+)"/u)[1])
+ assert.equal(arcPath(2, 3), arcs[2][2].match(/d="([^"]+)"/u)[1])
+ assert.equal(arcPath(1, 4), arcs[3][2].match(/d="([^"]+)"/u)[1])
+ // The hidden stage list has the import's stage too, shown only on such a start.
+ assert.match(html, /<li class="station" data-phase="data"[^>]*>.*\r?\n<li class="station" data-phase="import" data-state="pending" hidden>.*\r?\n<li class="station" data-phase="engine"/u)
assert.equal(html.match(/<circle class="ring-full" cx="110" cy="110" r="106" pathLength="100" transform="rotate\(-90 110 110\)"\/>/gu)?.length, 1)
// The ring, the water, the whale and its hit box move as one block when a card comes.
assert.match(html, /<div class="pond">\r?\n<svg class="ring"[\s\S]*?<div class="water"[\s\S]*?<div class="lane">[\s\S]*?<span class="spout"><svg class="plume"[^>]*\shidden>[\s\S]*?<div class="whale-hit"[\s\S]*?<div class="fx" aria-hidden="true"><span class="ripple"><\/span><\/div>\r?\n<\/div>/u)
@@ -140,7 +156,7 @@ test('an empty or hidden arc leaves no dot: no dash touches its path', () => {
test('the first stage is seen active before it fills, even when it was done before the page painted', () => {
const whale = code['whale.js']
const legs = whale.slice(whale.indexOf('async function runLegs()'), whale.indexOf('function failStation()'))
- assert.match(legs, /if \(i === 0 && !resume && \['boot', 'moving'\]\.includes\(want\.view\) && stations\[0\]\.dataset\.state === 'pending'\) \{\s*clearTimeout\(activeTimer\)\s*showActive\(0\)/u)
+ assert.match(legs, /if \(i === 0 && !resume && \['boot', 'moving'\]\.includes\(want\.view\) && stationEl\(0\)\.dataset\.state === 'pending'\) \{\s*clearTimeout\(activeTimer\)\s*showActive\(0\)/u)
assert.match(legs, /await hold\(Math\.max\(D\.activeAt\[i\] \? D\.activeAt\[i\] \+ HOLD : 0/u)
assert.match(whale, /const HOLD = 420\b/u)
// The reconcile waits for the entrance first, so the arc turns active on a whale that has surfaced.
@@ -218,8 +234,7 @@ test('each layer ends its lines as its rule says', () => {
// Not sentences: picker titles, progress lines and labels.
const NOT_SENTENCES = new Set([
'card.update.slow', 'card.update.downloading', 'dialog.pickRoot', 'dialog.pickMove', 'dialog.pickCookies', 'dialog.saveAs', 'dialog.saveLog',
- 'card.copying.step1', 'card.copying.step2', 'card.copying.step3', 'card.copying.eta', 'card.copying.etaSoon',
- 'card.import.model', 'card.import.optRegen', 'card.import.optSkipWork',
+ 'card.import.line', 'card.import.model', 'card.import.optRegen', 'card.import.optSkipWork',
])
for (const key of Object.keys(TEXT.zh)) {
const zh = TEXT.zh[key]
@@ -296,7 +311,7 @@ test('every text key that the page uses exists', () => {
for (const [, prefix] of text.matchAll(/`([\w.]+\.)\$\{/gu)) assert.ok(keys.some(key => key.startsWith(prefix)), `${name}: no text key starts with ${prefix}`)
}
// Keys the page builds from the snapshot's views, the stages and the failure reasons.
- for (const key of ['voice.failed', 'voice.viewFailed', 'voice.watchdog', 'status.phase.data', 'status.phase.engine', 'status.phase.team', 'status.state.pending', 'status.state.active', 'status.state.done', 'status.state.failed']) assert.ok(key in TEXT.zh, key)
+ for (const key of ['voice.failed', 'voice.viewFailed', 'voice.watchdog', 'status.phase.data', 'status.phase.import', 'status.phase.engine', 'status.phase.team', 'status.state.pending', 'status.state.active', 'status.state.done', 'status.state.failed']) assert.ok(key in TEXT.zh, key)
assert.deepEqual(matching('reason.start.{reason}').sort(), ['reason.start.engine', 'reason.start.files', 'reason.start.other', 'reason.start.permission', 'reason.start.space'])
assert.deepEqual(matching('reason.place.{reason}').sort(), ['reason.place.drive', 'reason.place.dsh', 'reason.place.foreign', 'reason.place.nested', 'reason.place.onedrive', 'reason.place.permission', 'reason.place.program', 'reason.place.space', 'reason.place.workspace'])
assert.deepEqual(matching('reason.copy.{reason}').sort(), ['reason.copy.full', 'reason.copy.inUse', 'reason.copy.other', 'reason.copy.permission'])
@@ -331,10 +346,10 @@ test('t fills placeholders and falls back to zh, then to the key', () => {
})
test('t picks the English singular or plural by the value', () => {
- assert.equal(t('en', 'card.import.leadBare', { bots: 1, groups: 6 }), 'DeepSeek Harness has 1 Bot and 6 group chats. Copy them over?')
- assert.equal(t('en', 'card.import.leadBare', { bots: 6, groups: 1 }), 'DeepSeek Harness has 6 Bots and 1 group chat. Copy them over?')
- assert.equal(t('zh', 'card.import.leadBare', { bots: 6, groups: 1 }), 'DeepSeek Harness 里有 6 个 Bot 和 1 个群聊。复制过来?')
- assert.equal(t('en', 'card.import.leadBare', { bots: 1 }), 'DeepSeek Harness has 1 Bot and {groups|group chat|group chats}. Copy them over?')
+ assert.equal(t('en', 'card.import.line', { bots: 1, groups: 6 }), 'Found your old team: 1 Bot, 6 group chats')
+ assert.equal(t('en', 'card.import.line', { bots: 6, groups: 1 }), 'Found your old team: 6 Bots, 1 group chat')
+ assert.equal(t('zh', 'card.import.line', { bots: 4, groups: 0 }), '找到你以前的团队了:4 个 Bot、0 个群聊')
+ assert.equal(t('en', 'card.import.line', { bots: 1 }), 'Found your old team: 1 Bot, {groups|group chat|group chats}')
})
test('langOf gives zh for every Chinese locale and en otherwise', () => {
diff --git a/app/test/start-window.test.mjs b/app/test/start-window.test.mjs
index 0c72959b..758835a1 100644
--- a/app/test/start-window.test.mjs
+++ b/app/test/start-window.test.mjs
@@ -149,7 +149,7 @@ test('the snapshot carries the phase, the stages done and the clock', () => {
const now = 1_700_000_000_000
const booting = startSnapshot(state({ clock: { base: 0, from: now - 6400, running: true } }), now)
assert.deepEqual(booting, {
- v: 1, lang: 'zh', start: 'first', motion: 'normal', frame: 'band', view: 'boot', phase: 'data', done: [],
+ v: 1, lang: 'zh', start: 'first', motion: 'normal', frame: 'band', view: 'boot', phases: ['data', 'engine', 'team'], phase: 'data', done: [],
clock: { ms: 6400, at: now, running: true, rate: 1 },
explain: { mode: 'new', nextStep: true, previewNotice: true }, celebrate: true, shown: false,
})
@@ -433,6 +433,34 @@ test('the 180 s question comes on the start\'s clock while the engine is not up'
assert.equal(s.state().view, 'boot')
})
+// A first start that copies a team has a stage of its own for the copy, between the data and the
+// engine (§6). The engine that warmed up while the card waited stops for the copy: its stage is
+// open again until the copied team's engine is up.
+test("an import is a stage of its own, and the engine's stage waits for the copied team's engine", (t) => {
+ const s = startWindow(t)
+ s.start.open('first')
+ s.start.explain(explainOf())
+ assert.deepEqual(s.state().phases, ['data', 'engine', 'team'])
+ s.start.explain(explainOf({ offered: true }))
+ assert.deepEqual(s.state().phases, ['data', 'import', 'engine', 'team'])
+ s.start.done('data')
+ assert.equal(s.state().phase, 'import')
+ s.start.done('engine')
+ assert.deepEqual(s.state().done, ['data', 'engine'])
+ assert.equal(s.state().phase, 'import')
+ s.start.engineDown()
+ assert.deepEqual(s.state().done, ['data'])
+ s.start.ready()
+ assert.notEqual(s.state().view, 'handoff', 'no hand-off while no engine is up')
+ s.start.done('import')
+ assert.equal(s.state().phase, 'engine')
+ s.start.done('engine')
+ assert.deepEqual(s.state().done, ['data', 'import', 'engine'])
+ s.start.ready()
+ assert.equal(s.state().view, 'handoff')
+ assert.deepEqual(s.state().done, ['data', 'import', 'engine', 'team'])
+})
+
test('a retry after the engine was up guards the new engine, while the whale keeps its stop', (t) => {
const s = startWindow(t)
s.start.open('first')
diff --git a/docs/plans/2026-10-26-start-window.md b/docs/plans/2026-10-26-start-window.md
index 41e49040..417ac932 100644
--- a/docs/plans/2026-10-26-start-window.md
+++ b/docs/plans/2026-10-26-start-window.md
@@ -47,7 +47,7 @@
| 部分 | 没有卡片时 | 有卡片时 | 内容 |
|---|---|---|---|
| 标题带 | y 0–40 | 同左 | 空,可以拖动 |
-| 圆环 | 圆心 (360, 255),半径 106 | 圆心 (360, 150),半径约 66 | 三段弧,一段一个阶段(见下面);2 px 的线,圆头 |
+| 圆环 | 圆心 (360, 255),半径 106 | 圆心 (360, 150),半径约 66 | 三段弧,一段一个阶段;从 DSH 复制团队的首次启动四段(见下面);2 px 的线,圆头 |
| 水道 | x 48–672,y 147–287 | 跟着圆环缩小 | 112 px 的鲸鱼在圆环中间(x 304–416);水线以下的部分被裁掉 |
| 水线 | 圆环的一条弦:y 287,x 260–460 | y 约 170,宽约 124 | 1 px `--bt-line-2`,首尾各 18% 渐隐;涟漪(68 × 12)在它中间 |
| 鲸鱼的话 | y 379–399,居中 | y 226–246,居中,在圆环和卡片之间 | 15/20、600,`--bt-ink`;只有一行,不换行,实在放不下才用省略号;只在第 3 节列的几种时候有字 |
@@ -61,7 +61,13 @@
- 完成:`--bt-ink-deepseek` 的线顺时针把这一段画满,.56 s。
- 失败:这段线变成 60% 的 `--bt-danger`(第 7 节)。
- 交接:段与段之间的空隙接上,合成一整圈(.3 s),整圈鼓起一次(.5 s,最大 1.035 倍,第 8 节)。
-- 道具:鲸鱼面前(x 413–459,底边在水线上)一个 46 px 的小道具,画的是进行中那一段在做的事:「准备数据文件夹」一个文件夹,里面的纸一张接一张翻起来(1.5 s);「启动本机引擎」两个咬合的齿轮反向转(9 齿和 6 齿,2.7 s 和 1.8 s 一圈,所以一直咬着),整组 1.35 s 鼓一下;「打开团队」三个小成员一个接一个跳一下(1.8 s)。只在那段弧进行中时有:出现用 `SPRING_POP` 从 .6 倍弹到原大、淡入 .2 s,离开淡出 .16 s;没进行中就完成的阶段(一般的首次启动里的数据阶段)不出道具。颜色是 `--bt-ink-deepseek` 和它的淡色,纸和成员的眼睛是 `--bt-card`。道具在水塘里,出卡片时跟着缩小上移;失败、卡片等回答(那段弧不是进行中)和交接时没有。
+- 从 DSH 复制团队的首次启动(导入卡,第 6 节)多一个阶段「复制以前的团队」,排在数据文件夹和引擎之间:圆环是四段,各占 90°,段与段之间仍空 10°(每段画出 80°),依次是数据文件夹、复制、引擎、团队。其他启动仍是三段;没有导入的启动多出一段空着的弧只会让人以为少做了一件事。主进程在页面画出来以后才知道要不要导入,所以圆环换成四段时:窗口还没露面就直接换,已经露面就整圈淡出 .12 s、换好再淡入 .22 s。复制这一段:
+ - 卡片答〔复制过来〕以后才进行中(问的时候只是没开始),卡片飞进来落地时亮起(第 6 节)。
+ - 按复制的真实进度画满:检查对话占前 15%,复制 Bot 和对话按字节占其余 85%,每 200 ms 一次,.3 s 跟上,不往回走。
+ - 复制失败:这段线和已经画到的部分变成 `--bt-danger`,重试时回到进行中,从 0 重画。
+ - 〔先不复制〕、复制停下或「先不带团队开始」:这一段直接画满,接着走引擎那一段。
+ - 预热好的引擎为复制停下,引擎那一段回到没开始,等复制好的团队的引擎起来才画满;复制完到引擎起来这段时间是引擎那一段在进行中。
+- 道具:鲸鱼面前(x 413–459,底边在水线上)一个 46 px 的小道具,画的是进行中那一段在做的事:「准备数据文件夹」一个文件夹,里面的纸一张接一张翻起来(1.5 s);「复制以前的团队」一个箱子从左边浅色的旧堆上被拿起,跳一下落到右边的新堆上(1.6 s 一趟);「启动本机引擎」两个咬合的齿轮反向转(9 齿和 6 齿,2.7 s 和 1.8 s 一圈,所以一直咬着),整组 1.35 s 鼓一下;「打开团队」三个小成员一个接一个跳一下(1.8 s)。只在那段弧进行中时有:出现用 `SPRING_POP` 从 .6 倍弹到原大、淡入 .2 s,离开淡出 .16 s;没进行中就完成的阶段(一般的首次启动里的数据阶段)不出道具。颜色是 `--bt-ink-deepseek` 和它的淡色,纸和成员的眼睛是 `--bt-card`。道具在水塘里,出卡片时跟着缩小上移;失败、卡片等回答(那段弧不是进行中)和交接时没有。
- 圆环、水道、水线、鲸鱼的点击区和涟漪是一块,下面叫水塘。没有卡片时,水塘、鲸鱼的话和提示行整组比有卡片时低 45 px,鲸鱼在窗口的视觉中心稍上一点。要出卡片时,整组用 `SPRING_SHAPE` 上移 45 px,水塘在同一个弹簧里以圆心为准缩到 .62 倍、再上移 60 px,圆环落在卡片上面,卡片出现在下面的纸面里;卡片收回后,水塘回到原大,整组回到低处。位置行不动。页面不能滚动(第 11 节)。
- 鲸鱼的话和提示行直接写在 Mica 上。没有卡片时它们在纸面的位置上:纸面空着时点击穿过它。
- 卡片是不透明的 `--bt-card`:1 px `--bt-line` 边,圆角 12,内边距 16 × 20。卡片正文比纸面高时,正文在卡片里滚动,按钮行固定在卡片底部。
@@ -175,7 +181,7 @@
- 出现:鲸鱼的话和提示行淡出 .16 s;整组上移 45 px,水塘在同一个弹簧里缩到 .62 倍、再上移 60 px(第 2 节,首次启动和以后的启动一样);卡片的底色和边线两层从 0 高长到内容的高度(`clip-path`,走 `SPRING_SHAPE`;底色 .22 s 淡入);内容先按最终尺寸排好,晚 70 ms 淡入;焦点移到主按钮。
- 回答后:内容 .16 s 退场(下沉 6 px、缩到 .975、模糊 3px),卡片收回,水塘回到原大,整组回到低处。
- 卡片在时鲸鱼的话空着、提示行隐藏。卡片自己的第一行是鲸鱼说的一句(15/20、600,一行),写在已定的内容上面,内容本身不变:
- - 导入卡:「找到你以前的团队了」。
+ - 导入卡:「找到你以前的团队了:4 个 Bot、0 个群聊」,这一行就是整张卡的话。
- 推荐盘:「C 盘有点挤」(空间不够),「这里不让我放东西」(默认位置不能用)。
- 「会放在…」:「我多加了一层文件夹」。
- 被拒绝的卡:「这里放不了」。
@@ -184,11 +190,11 @@
- 导入时空间不够:「地方不够放」。
- DSH 正在用这个团队:「DeepSeek Harness 还在用这个团队」。
- 更新版本的对话,和它的「正在下载」:「这些对话比我新」。
- - 复制中:标题就是「正在搬过来」。
+ - 复制中没有卡片(圆环上的复制那一段就是进度);停止复制的确认:「停止复制?」。
- 恢复卡、团队界面没有加载出来和复制失败的卡没有这一行,也不说俏皮话(第 7 节)。180 秒的卡也没有,问题由鲸鱼问。
- 鲸鱼跳不跳:
- 应用主动问的卡片(推荐盘、找不到数据文件夹、导入、180 秒),跳两下,最后一跳落地时探身看着卡片,然后停下(第 3 节第二张表)。
- - 用户自己引出的卡片(「其他位置…」选完后的「会放在…」、以后的启动搬数据时的「这里放不了」和「搬到这个文件夹?」、停止复制的确认),不跳,变形开始 70 ms 后探身。
+ - 用户自己引出的卡片(「其他位置…」选完后的「会放在…」、以后的启动搬数据时的「这里放不了」和「搬到这个文件夹?」、停止复制的确认),不跳,变形开始 70 ms 后探身。复制中没有卡片,鲸鱼工作。
- 同一件事又出了新问题(复制时空间不够),跳一下。
- 选位置的卡片只有推荐盘这一种,只在首次启动出现,〔放到 D 盘〕〔仍然放在 C 盘〕都已经试写通过(上手流程第 3 节);以后的启动还会出「找不到数据文件夹」卡:
- 推荐盘:「C 盘只剩 1.2 GB。放到 D 盘(剩 412 GB)?」〔放到 D 盘〕(主按钮,拿到焦点)〔仍然放在 C 盘〕,按钮行末尾一个小链接「其他位置…」。默认位置不能用时,第一句换成原因(「DeepSeek Bot 没有权限在 `C:\Users\<用户名>` 里写文件。」),第二句一样;按钮只有〔放到 D 盘〕(主按钮)和小链接「其他位置…」,没有〔仍然放在 C 盘〕;没有可推荐的盘时只有〔选择其他位置…〕。
@@ -204,18 +210,18 @@
- 卡片还在时引擎起来了:卡片收回,照常画满第二段弧。
- 找不到数据文件夹(多见于以后的启动):文字和按钮按第 3 节已定的,主按钮在前。〔重试〕后还是找不到:按钮下面出现「还是找不到这个文件夹。」(`--bt-danger`,4 秒后淡出)。鲸鱼的眼睛左右看一遍,不跳。
- 导入(第 4 节)都在纸面里,用同一套变形:
- - 导入卡一句话:「DeepSeek Harness 里有 6 个 Bot 和 2 个群聊(对话 1.2 GB,工作文件 3.4 GB)。复制过来?」,下面一行小字「复制后会多占 4.6 GB,DeepSeek Harness 里的原件不动。」,〔复制过来〕(主按钮,拿到焦点)〔先不复制〕,脚注「也可以在 设置 → 通用 → 位置 里复制。」「详细」是和失败页一样的折叠区:找到的名字和段数、会复制什么、「模型设置:DeepSeek API · DeepSeek-V4-Pro 更换」、两个勾选框;展开时卡片的边用 `SPRING_SHAPE` 长高,内容晚 70 ms 淡入。
- - 卡片一出现,引擎就开始预热,没被 DSH 占着时检查对话同时进行,鲸鱼跳两下后停下;预热好了也只算到第二段弧,第三段「打开团队」等回答以后才开始。答〔先不复制〕时鲸鱼点一下头,预热好的引擎接着当正式引擎用,不重启。
+ - 导入卡越短越好:只有一行「找到你以前的团队了:4 个 Bot、0 个群聊」和〔复制过来〕(主按钮,拿到焦点)〔先不复制〕,按钮行末尾一个「详细」。「详细」是和失败页一样的折叠区,展开才有:「复制后会多占 4.6 GB,DeepSeek Harness 里的原件不动。」(不到 1 MB 写「不到 1 MB」,不写「0 MB」)、「模型设置:DeepSeek API · DeepSeek-V4-Pro 更换」、两个勾选框、脚注「也可以在 设置 → 通用 → 位置 里复制。」;展开时卡片的边用 `SPRING_SHAPE` 长高,内容晚 70 ms 淡入。找到的名字、段数和会复制什么不在卡上(名字和段数进门后在「复制好了」卡上)。
+ - 卡片一出现,引擎就开始预热,没被 DSH 占着时检查对话同时进行,鲸鱼跳两下后停下;预热好了也不画满引擎那一段:复制那一段在它前面,还没做;「打开团队」等回答以后才开始。答〔先不复制〕时鲸鱼点一下头,预热好的引擎接着当正式引擎用,不重启。
- 空间不够(只查第一段):「空间不够:复制要约 1.7 GB,C 盘只剩 1.5 GB,还差 0.2 GB。」〔选择其他位置…〕(主按钮)〔先不复制〕
- - 复制中:
- - 卡片标题「正在搬过来」,三步竖着排,各带一个 16 px 的标记(没开始:一圈细线;进行中:`--bt-ink` 圈加 6 px 实心点;完成:`--bt-green` 圆底对勾,`SPRING_POP` 弹出):「检查对话 23/143」→「复制 Bot 和对话 820 MB / 1.2 GB」→「启动团队」。
- - 当前一步下面是 4 px 的真实进度条(`scaleX`,`SPRING_LIST`),不往回走。
- - 剩余时间按整分钟写:「还要大约 2 分钟」「不到 1 分钟」。变动满一分钟才改,不倒数到 0。
- - 任务栏进度显示在启动窗口上。
- - 鲸鱼工作,每完成一步点一下头。
- - 停止复制:确认在卡片里就地展开:「停下后不会留下复制了一半的团队,DeepSeek Harness 里的团队不受影响。」〔继续复制〕(主按钮)〔停止复制〕(危险色文字)。鲸鱼停下。
+ - 复制中:卡片不收回,而是跳上去变成圆环的一段。答〔复制过来〕(或〔继续复制〕、复制失败后的〔重试〕)时:
+ - 卡片的内容照常 .16 s 退场;卡片的底色和边线 60 ms 后开始收:用 `clip-path` 缩成卡片中间一个 12 px 的圆点,同时变成 `--bt-ink-deepseek`,沿一条先上后右的弧线跳到圆环上复制那一段的中点(这时水塘还是缩小上移的样子),落地前淡掉,一共 .52 s:前 45% 缩小上升(`cubic-bezier(.3,.7,.4,1)`),到 80% 跳到位,最后淡掉。
+ - 圆点到位时(.42 s)复制那一段亮起,圆点在它上面淡掉:转为进行中,淡线一下子粗到 5 px 再回到 2 px(.42 s);道具换成搬箱子。然后水塘回到原大,整组回到低处(第 2 节)。
+ - 复制那一段按真实进度画满(第 2 节);没有分步的清单、数字和剩余时间。任务栏进度照旧显示在启动窗口上。
+ - 复制在落地前就做完了(团队很小):那一段照样先亮起,进行中满 420 ms 才画满。
+ - 鲸鱼工作。
+ - 停止复制:复制时圆环正下方有一个 28 px 的圆形图标按钮(一个小方块,`--bt-ink-2`,悬停加底色;读屏和悬停提示是「停止复制」),只在复制进行中、没有卡片时有。点它出一张用户自己引出的卡:「停止复制?」「停下后不会留下复制了一半的团队,DeepSeek Harness 里的团队不受影响。」〔继续复制〕(主按钮)〔停止复制〕(危险色文字)。鲸鱼停下,复制不停,那一段照样往前画。〔继续复制〕:卡片照样跳回圆环;〔停止复制〕:卡片收回,复制那一段画满,用新的空白团队接着启动。
- DSH 正在用这个团队(答〔复制过来〕后):鲸鱼停下,不晃。每 2 秒重查一次,不显示任何东西;锁一放开,卡片直接变成复制中。卡上一个〔先不复制〕(主按钮)。「正在下载」的卡也有〔先不复制〕(主按钮),加「下载太慢?手动下载」;下载失败时〔重试〕〔手动下载〕。
- - 复制失败:鲸鱼用失败的姿势。
+ - 复制失败:鲸鱼用失败的姿势,复制那一段变红(第 2 节),卡上〔重试〕(主按钮)〔先不带团队开始〕和失败页一样的日志按钮。
- 工作文件不经过启动窗口:团队打开后由应用在后台复制,进度在 设置 → 通用 → 位置 和 Main Bot 聊天里的「复制好了」卡上。
### 7. 失败、更新和界面没加载出来
@@ -240,8 +246,8 @@
- 重试或重新开始后第一次成功时庆祝一次,首次启动和以后的启动一样:圆环合上时压扁、「^ ^」眼、喷水,然后跳到 Main Bot 的头像上,没有地方落时潜下去(第 8 节)。
- 团队界面 20 秒没加载出来:
- 主窗口始终不显示。
- - 鲸鱼换成失败的姿势,第三段弧变红,它的话换成「团队界面没有加载出来」,不画叉;卡片里是〔重新载入〕〔复制详细信息〕〔保存日志…〕,没有鲸鱼的第一行。
- - 〔重新载入〕:在隐藏的主窗口里重新载入,第三段弧回到进行中,20 秒重新算。
+ - 鲸鱼换成失败的姿势,「打开团队」那段弧变红,它的话换成「团队界面没有加载出来」,不画叉;卡片里是〔重新载入〕〔复制详细信息〕〔保存日志…〕,没有鲸鱼的第一行。
+ - 〔重新载入〕:在隐藏的主窗口里重新载入,「打开团队」那段弧回到进行中,20 秒重新算。
- `ready()` 晚到了也直接交接,不庆祝。
### 8. 交接
@@ -285,13 +291,13 @@
- 跟随 `prefers-reduced-motion`(Windows 上是 设置 → 辅助功能 → 视觉效果 → 动画效果)。窗口开着时切换,也立刻生效:正在跑的动画直接到终点。
- 鲸鱼一直是静止的画面:没有浮上来、循环、跳、涟漪、尾巴、跟随、抚摸和喷水,也没有第 3 节第二张表的九种动作;阶段完成时鲸鱼不动。点鲸鱼只换成「^ ^」眼。
-- 道具直接出现、淡出,不弹、不动:文件夹的纸不翻,齿轮不转,成员不跳。
+- 道具直接出现、淡出,不弹、不动:文件夹的纸不翻,箱子不搬,齿轮不转,成员不跳。
- 状态只靠眼睛直接切换:平时睁眼,45 秒起眯眼,失败时眼皮变重;点鲸鱼时和庆祝的交接里(就绪到内容淡出)是「^ ^」。
- 圆环不画出来,一开始就在;弧画满、合成一整圈都只用 .12 s,整圈不鼓起;进行中的弧只染淡蓝,没有跑动的光。
-- 鲸鱼的话、复制中的对勾、卡片、提示行和更新条只淡入 .12 s、淡出 .16 s,没有模糊、位移和缩放。卡片高度直接到位(内容先是透明的);整组上移、水塘缩小,回到低处和原大,也都直接到位;没有流光。
-- 沉下去重新开始时,水道淡出 .16 s,三段弧回到没开始,鲸鱼直接回来。
+- 鲸鱼的话、卡片、提示行和更新条只淡入 .12 s、淡出 .16 s,没有模糊、位移和缩放。答〔复制过来〕时卡片不飞,照常收回,复制那一段直接进行中、不加粗;停止复制的按钮直接出现。卡片高度直接到位(内容先是透明的);整组上移、水塘缩小,回到低处和原大,也都直接到位;没有流光。
+- 沉下去重新开始时,水道淡出 .16 s,各段弧回到没开始,鲸鱼直接回来。
- 交接时不长大,鲸鱼不跳:剩下的弧画满、圆环合上,300 ms 时内容淡出 .12 s,420 ms 时发 `handoffShow`,主窗口直接出现在它最后的矩形上(第 8 节)。
-- 信息一样不少:三段弧、道具、鲸鱼的话、提示行、按钮、看不见的阶段列表和朗读都在。
+- 信息一样不少:各段弧、道具、鲸鱼的话、提示行、按钮、看不见的阶段列表和朗读都在。
### 10. 颜色、Mica 和标题带
@@ -406,6 +412,7 @@
- 2026-11-01 不写字,加道具:用户要求「启动窗口轻易不写文字,除非出现空间不足或者报错,后者并提供一键复制/下载日志的选项」,并且「加载的时候应当有相关组件,例如放在鲸鱼面前一个正在翻动的文件夹,脉冲转动的两个齿轮」。所以去掉 45 秒的两句(「有点久,可能是杀毒软件在查新文件」「比平时慢,请再等一会儿」)、搬数据时的「正在搬 DeepSeek Bot 的数据…」和 45 秒的〔打开日志文件夹〕,慢只靠鲸鱼的姿势;位置行在首次启动也只在盘不够时有(推翻 2026-10-31「首次启动照旧显示」那一条,首次启动在盘够时就没有选位置的入口了);出错的每一页都有〔复制详细信息〕和新的〔保存日志…〕(`saveLog`,系统保存框,最后 5000 行),代替〔打开日志文件夹〕(`openLogs` 不再是启动页的动作);鲸鱼面前加每个阶段的道具:翻纸的文件夹、咬合的齿轮、跳的小成员(第 2、3、4、5、6、7、9、11 节)。另外加了开发用的三种进度画法(`DS_BOT_START_PROGRESS`,第 11 节),只为比较,不给用户。依据:启动页和启动窗口的单元测试;无头 Chrome 加替身桥录的整次启动(浅色、深色)和各阶段、失败页、180 秒、盘不够的截图;减少动态效果时道具和三种画法都没有循环动画。还没有在桌面应用里真机跑,〔保存日志…〕也还没有真点过。这次改的是已定的设计,要维护者确认。
- 2026-11-01(待维护者确认):动画只有一个来源。启动窗口的卡片和团队窗口里代替系统对话框的卡片(`app/src/page-card.css`)用同一组颜色和弹簧,都由 `scripts/start-assets.mjs` 从插件的 `themes.js` 和 `motion.js` 生成:卡片出现走 `SPRING_SHAPE`,收起用启动窗口卡片的退场(下沉 6 px、缩到 .975、模糊 3px,.16 s),减少动态效果时只淡入 .12 s、淡出 .16 s(第 9 节)。导入的几张卡(第 6 节)由主进程的 `import-flow.mjs` 发快照,页面照旧只按快照画。
- 2026-11-01 交接的露面:在桌面应用里录了交接(真的 Electron 44、真的 `StartWindow`、替身团队页、ffmpeg 60 帧录屏),看到三个问题:长大用 `cubic-bezier(.2,.7,.2,1)`,前 40% 就走完了大半,窗口很早看着就长完了,鲸鱼落下后在一大块空的深色窗口里等 200 多毫秒;主窗口用 `show()` 露面时 Windows 自己的打开过渡压在启动窗口上,有一两帧整窗发灰、鲸鱼和头像错开成两个,然后深色一下跳成浅色;长大前 160 ms 的等待让鲸鱼停在跳的最高点。改成:主窗口在 `ready()` 时就以不透明度 0 显示在启动窗口下面(打开过渡看不见地走完,也不卡长大的第一步);长大 `handoffShow` + 40 ms 开始,260 ms,缓入缓出;鲸鱼长到位 60 ms 后落下,主进程等 `handoffDone` 才让主窗口变成不透明,再把启动窗口 180 ms 淡出,鲸鱼化进头像。减少动态效果和页面没发 `handoffShow` 时不长大,同样淡出。依据:录屏前后对比(首次启动就绪到主窗口露出 1.24 秒带一帧发灰,变成 1.09 秒开始淡、1.29 秒淡完;以后的启动 0.58 秒开始);启动窗口的单元测试(主窗口在 `ready()` 时透明地显示在下面、等落下或 300 ms、淡出后才给焦点、失败时收回)。Mica 窗口用 `setOpacity` 淡出在 Windows 11 上正常。
+- 2026-11-02 导入并进圆环:用户看了导入的录屏,要求「尽可能减少,导入改为一个进度条点击后向上跳转变形将(3段圆环改为四段圆环」。第 2 节:从 DSH 复制团队的首次启动圆环四段,多出「复制以前的团队」,按复制的真实进度画满,复制时道具是搬箱子,预热的引擎为复制停下时引擎那一段回到没开始;其他启动仍三段。第 6 节:导入卡只剩一行和两个按钮,大小、模型设置、勾选框和脚注收进「详细」,找到的名字、段数、会复制什么去掉;「正在搬过来」的分步卡去掉,〔复制过来〕后卡片缩成一个点跳进复制那一段;停止复制改成圆环下的图标按钮加一张确认卡;复制失败那一段变红。第 9 节:减少动态效果时卡片不飞。不到 1 MB 写「不到 1 MB」。依据:桌面应用里对着替身 DSH 家录的导入(`app/dist-recordings/`,不进仓库)。
## 待定
diff --git a/docs/plans/2026-10-26-windows-onboarding.md b/docs/plans/2026-10-26-windows-onboarding.md
index f26e3a84..811c4731 100644
--- a/docs/plans/2026-10-26-windows-onboarding.md
+++ b/docs/plans/2026-10-26-windows-onboarding.md
@@ -121,9 +121,7 @@ Windows 是桌面应用的主要平台:0.2.0 到 0.2.2 三个版本的安装
条件:`~/.dsh`(或 `DSH_HOME`)里有 Bot 团队,而数据文件夹里还没有。
- 导入卡在启动页上出现。卡片一出现,两件事就在后台开始,不等用户回答:引擎在新数据位置预热(已定的「先在新数据位置启动一次再复制」照旧),先查团队有没有被 DSH 占着(下面的判断规则):没占着才把对话复制进暂存文件夹 `.import-<时间>`(在数据文件夹里,和复制时用的是同一个),锁定版 DSH 以暂存为家读一遍它们;占着就只预热引擎,什么都不复制。复制暂存期间锁出现过或刷新过,这份暂存作废,锁放开后重新复制。这份暂存就是复制时要用的那一份:不再另建 `.import-check-<时间>`,对话只复制一次。暂存的路径记在 `%APPDATA%` 里;导入卡开着时关掉启动窗口、更新重开、被杀掉,下次启动都先删掉它。导入卡开着、第一段还没复制完时,主窗口不加载引擎的页面(插件一收到 `state` 就会建出一个空白团队),第三段弧「打开团队」和 20 秒的界面检查也等用户回答以后才开始。点〔先不复制〕:等检查用的引擎退出后删掉暂存,预热好的引擎接着当正式引擎用,主窗口这时才加载它的页面,一秒都不多等。点〔复制过来〕:预热的引擎拿着团队的锁,先停掉它再接着复制 Bot 和附件,复制完起正式引擎,和今天一样。
-- 卡片的第一句是鲸鱼的话「找到你以前的团队了」,下面只有一句话和两个按钮:「DeepSeek Harness 里有 6 个 Bot 和 2 个群聊(对话 1.2 GB,工作文件 3.4 GB)。复制过来?」〔复制过来〕〔先不复制〕,下面一行小字「复制后会多占 4.6 GB,DeepSeek Harness 里的原件不动。」,脚注「也可以在 设置 → 通用 → 位置 里复制。」按 Enter 就是复制。「详细」展开才有:
- - 「在 `C:\Users\<用户名>\.dsh` 里找到 6 个 Bot(Chief、写手、程序员等)和 2 个群聊,143 段对话。」
- - 「会复制:Bot、群聊、记忆、对话、附件、模型设置和 API Key。不会复制:MCP、技能和 DSH Agent。DeepSeek Harness 里的内容不会改动,复制以后两边各用各的。」
+- 卡片只有一行「找到你以前的团队了:6 个 Bot、2 个群聊」和两个按钮〔复制过来〕〔先不复制〕,按 Enter 就是复制。按钮行末尾的「详细」展开才有([启动窗口](2026-10-26-start-window.md) 第 6 节):「复制后会多占 4.6 GB,DeepSeek Harness 里的原件不动。」(不到 1 MB 写「不到 1 MB」)、脚注「也可以在 设置 → 通用 → 位置 里复制。」,以及:
- 模型设置自动选一份:先选有 key 的,再按 desktop、web、行数最多的顺序。显示提供商和默认模型,旁边有「更换」,可以按同样的格式换另一份。
- 可重新生成的文件夹(`node_modules`、`.venv`、`__pycache__`、`.pnpm-store`、`.next` 等)合计 200 MB 以上时,默认勾选「不复制可以重新生成的文件夹」;「先不复制工作文件」默认不勾。卡片上的「工作文件 3.4 GB」和「多占 4.6 GB」按勾选项算:默认已经扣掉可重新生成的文件夹,改勾选时两个数字跟着变。
- **复制分两段,小的先进去。** 第一段挡着启动:Bot、群聊、记忆、对话、附件、模型设置和 API Key(今天 `importTeam` 里除工作文件以外的全部),复制完就启动团队。第二段在团队打开以后由应用在后台做:旧团队工作文件夹里的文件复制到总工作区,不覆盖已有的文件,跳过勾掉的文件夹。导入后每个 Bot 本来就换到新文件夹的新一段,旧文件夹只当历史读,所以工作文件晚几分钟到不影响干活;Bot 在那之前新建了同名文件,旧文件就跳过,记在导入结果里。工作文件还没到齐时(`bot/work-files.json` 是 `pending`),插件在每个 Bot 的系统提示里加一句:工作文件还在从 `<旧文件夹>` 复制过来,还有 N 个,那里只读,要用旧文件先去那里看;跳过的文件数和第二段没开始的原因也写在「复制好了」卡上,不只在设置里。Bot 和群自己设的文件夹(`workDir`):在 `~/.dsh/bot/workspace` 里面的,改成新总工作区下同样的相对路径(应用的 Bot 不能写 `~/.dsh`);在别处的两边团队会共用,「详细」里列出这些 Bot 和群。
@@ -135,7 +133,7 @@ Windows 是桌面应用的主要平台:0.2.0 到 0.2.2 三个版本的安装
- 工作文件的空间在第二段开始前单独查,要求剩余不少于「要复制的工作文件 + 1 GB」,不够就不开始,只在设置里写「工作文件没有复制:D 盘还差 2.2 GB」〔重试〕,不打断启动;复制中剩余不到 500 MB 就停下,设置里写「工作文件没复制完:D 盘只剩 480 MB」〔继续复制〕。暂存加硬链接落位本来就不多占空间。
- 复制后,设置 → 通用 → 位置 里有一行「DeepSeek Harness 里的原团队还在 `C:\Users\<用户名>\.dsh`(4.6 GB),DeepSeek Bot 不会改动它。」〔打开文件夹〕;要不要删、什么时候删由用户在 DeepSeek Harness 里决定。
- 新用户从不复制任何东西:推荐盘和「其他位置…」只新建空文件夹,重装接着用原处的数据。应用自己的数据搬动时(第 8 节〔移到…〕、恢复页的〔换个位置…〕、以后的启动盘快满时位置行的〔换个位置…〕)旧位置不留副本。
-- 第一段复制时卡片标题是「正在搬过来」,下面是分步进度和数字:「检查对话 23/143」→「复制 Bot 和对话 820 MB / 1.2 GB」→「启动团队」,带剩余时间估计和任务栏进度。〔停止复制〕会就地确认,并说明停下后会留下什么:不留下复制了一半的团队,DSH 里的团队不受影响。
+- 第一段复制时没有卡片:答〔复制过来〕后卡片跳进启动页的圆环,变成多出来的一段「复制以前的团队」,按真实进度画满(检查对话 15%,其余按字节),任务栏进度照旧。圆环下的一个图标按钮是〔停止复制〕,点了出确认卡,说明停下后会留下什么:不留下复制了一半的团队,DSH 里的团队不受影响。
- DSH 正在用这个团队:第一句「DeepSeek Harness 还在用这个团队」,下面「请完全退出 DSH Desktop(任务栏右下角的托盘图标也要退出),并关掉 DSH Web,这里会自动继续。」这张卡在答〔复制过来〕时才出现(卡片一出现就查到被占着时只是不暂存),每 2 秒自动重查,不用点重试,锁一放开就开始暂存和复制;卡上有〔先不复制〕,退不掉 DSH 的人有路可走。判断规则和 ds-bot 的 home-lock 一样:同一台机器上 PID 活着**而且**锁在 60 秒内刷新过(#428 的修法),被系统重用的旧 PID 不再算。
- 有更新版本 DSH 写的对话(下面两张卡的第一句都是「这些对话比我新」):更新器现在随应用一起启动,找到能读的版本时:「DeepSeek Bot 0.2.4 能读它们,正在下载(37%)。装好后会重新打开,再复制团队。」卡上有〔先不复制〕,还有「下载太慢?手动下载」;下载失败时〔重试〕〔手动下载〕(和恢复页的更新条一样)。位置在这之前不保存,重开后会再问导入。没找到时:「这些对话是更新版本的 DeepSeek Harness 写的,DeepSeek Bot 现在读不了。」主按钮是〔先不带团队开始〕(不再是「退出」),脚注「以后可以在 设置 → 通用 → 位置 里复制。」
- 复制失败(失败的卡没有鲸鱼的第一句):「团队没有复制完:{原因}。DeepSeek Harness 里的团队没有变化。」常见原因翻成人话(文件被别的程序占用 / 没有权限读取 / 磁盘满了),其他放进「详细信息」。〔重试〕〔先不带团队开始〕〔复制详细信息〕。失败或停止时删掉 `.import-<时间>` 暂存文件夹。
@@ -503,3 +501,4 @@ Windows 是桌面应用的主要平台:0.2.0 到 0.2.2 三个版本的安装
- 2026-10-31 位置行:维护者要去掉启动页左下角的「社区开源项目,不是 DeepSeek 官方产品」,右下角的位置行首次启动照旧显示、此外只在空间不足时显示,并换个位置。§3 的位置行改到底部正中,〔换个位置…〕改成灰色的小按钮;§8 以后的启动在数据所在的盘只剩开始时的 20% 时也有位置行,按钮当场搬数据,确认和「这里放不了」在卡片上问(维护者看到搬数据被拒绝的系统对话框后:「让我们尽可能避免系统中出现任何这样的默认弹窗」);§4「旧位置不留副本」的列表加上这个入口;「改动的已定设计」加一行,底注那一行和 2026-10-28 那一行跟着改;验收里的〔换个位置…〕改成按钮的写法。「第一次介绍产品的地方都写「不是 DeepSeek 官方产品」」不变:README 和下载区照旧写。细节和依据在 [启动窗口](2026-10-26-start-window.md) 同一天「位置行」那条变更里。
- 2026-11-01 不写字,加道具:用户要求启动窗口「轻易不写文字,除非出现空间不足或者报错,后者并提供一键复制/下载日志的选项」,加载时鲸鱼面前要有在做事的道具(翻动的文件夹、脉冲转动的齿轮)。§3 的字表跟着改:45 秒没有字,180 秒的卡和恢复页、团队界面没加载出来的页上是〔复制详细信息〕〔保存日志…〕,没有〔打开日志文件夹〕;位置行首次启动也只在盘不够时有,推翻 2026-10-31 的「首次启动照旧显示」;圆环那一条加上道具;验收和「改动的已定设计」跟着改。细节和依据见 [启动窗口](2026-10-26-start-window.md) 同一天的变更。这次改的是已定的设计,要维护者确认。
- 2026-11-01(待维护者确认):导入卡接上主进程(`app/src/import-flow.mjs`)。首次启动不再弹找到团队、DSH 正在用、更新版本的对话、选模型设置、复制失败这五种系统对话框:卡片一出现,引擎在新数据位置预热,同时检查对话;〔复制过来〕以后依次是空间不够、DSH 正在用(每 2 秒重查)、复制中的三步(检查对话 a/b → 复制 Bot 和对话 a / b,带整分钟的剩余时间和任务栏进度 → 启动团队)、就地确认的〔停止复制〕、复制失败的〔重试〕;〔先不复制〕直接用预热好的引擎。模型设置按 desktop、web、行数最多的顺序自动选,可以更换;可重新生成的文件夹合计 200 MB 以上时默认不复制。没做的:有能读这些对话的新版本时的「正在下载」卡(只给「先不带团队开始」)、对话只复制一次、工作文件的后台第二段和 设置 → 位置 里的进度,见「改动的已定设计」最后两行。
+- 2026-11-02:导入卡只剩一行和两个按钮,「详细」里是大小、模型设置、勾选框和脚注;复制时没有「正在搬过来」的卡,卡片跳进启动页的圆环,变成第四段「复制以前的团队」(§4,[启动窗口](2026-10-26-start-window.md) 同一天的变更)。依据:用户「尽可能减少,导入改为一个进度条点击后向上跳转变形将(3段圆环改为四段圆环」。
diff --git a/docs/plans/2026-10-29-start-copy.md b/docs/plans/2026-10-29-start-copy.md
index 4fb086b0..63a4c044 100644
--- a/docs/plans/2026-10-29-start-copy.md
+++ b/docs/plans/2026-10-29-start-copy.md
@@ -50,7 +50,7 @@
鲸鱼的话 `voice.*`:`voice.slow45 / watchdog` 不动;`title.moving` → `voice.moving`,`title.failed` → `voice.failed`,`title.viewFailed` → `voice.viewFailed`「团队界面没有加载出来」(去句号),`slow.45.later` → `voice.slowLater`「比平时慢,请再等一会儿」(去句号;以后的启动和搬数据时 45 秒起由鲸鱼说)。启动窗口顺利时不说话([启动窗口](2026-10-26-start-window.md) 第 3 节),所以表里没有问候、各阶段的话和「进去吧」(`voice.hello / helloName / helloBack / data / found / engine / slow10 / team / ready`),`title.later`「正在打开你的团队…」也没有键。
-卡片第一行 `say.*`:`say.space / permission / rejected / picked / missing / import / importSpace / inUse / newer` 不动;`copying.title` → `say.copying`「正在搬过来」。
+卡片第一行 `say.*`:`say.space / permission / rejected / picked / missing / importSpace / inUse / newer` 不动;停止复制的确认 `say.stopCopy`「停止复制?」。导入卡的第一行带数字,是 `card.import.line`「找到你以前的团队了:{bots} 个 Bot、{groups} 个群聊」(不是句子,不加句号);复制中没有卡片,所以没有 `say.copying`。
提示行 `hint.*`:只有 `hint.space`,不动。接模型、预览版说明和重装的三句(`hint.model / preview / reinstall`)没有键:启动页不提前说进门以后的事。
@@ -64,11 +64,9 @@
| `card.missing` | `card.missing.lead` | |
| `card.missing.retryMissed` | `card.missing.retryMissed` | |
| `card.picked` | `card.picked.lead` | 会放在 {path}。(加句号) |
-| `import.lead / extra / found / scope / model` | `card.import.lead / extra / found / scope / model` | |
+| `import.extra / model` | `card.import.extra / model` | 只在「详细」里;`lead / found / scope` 没有了 |
| `import.opt.regen / skipWork` | `card.import.optRegen / optSkipWork` | 勾选框的标签 |
| `import.space` | `card.importSpace.lead` | |
-| `copying.step1 / 2 / 3` | `card.copying.step1 / 2 / 3` | |
-| `eta.minutes`、`eta.lt1` | `card.copying.eta`、`card.copying.etaSoon` | |
| `stop.confirm` | `card.copying.stopConfirm` | |
| `inUse` | `card.inUse.lead` | |
| `newer.updating`、`newer.unreadable` | `card.newerUpdating.lead`、`card.newer.lead` | |
@@ -141,7 +139,7 @@
- 逐键对照中文的意思,不另写一套:位置行写全「Data on drive {drive}, {free} free」(原来只有「Drive C, 412 GB free」)。
- 句首大写;`voice / say / hint / btn / foot / status` 不加句号;`card / reason(整句)/ note / dialog` 以句号或问号结尾;… 和中文同步。
- 名词:chats(不用 conversations)、group chats、attachments、API Key、Settings → General → Location(单数)、team workspace、data folder、local engine。
-- 单复数用 `{n|one|many}`:`card.import.lead`「DeepSeek Harness has {bots|Bot|Bots} and {groups|group chat|group chats} …」、`card.import.found`、`dialog.import.found`、`dialog.import.newer`。
+- 单复数用 `{n|one|many}`:`card.import.line`「Found your old team: {bots|Bot|Bots}, {groups|group chat|group chats}」、`dialog.import.found`、`dialog.import.newer`。
- 「先不复制」是 Don't copy yet,「先不带团队开始」是 Start without the team,「先不重启」Not now(重启框)、「先不下载」Not now(下载框)。
### 5. 测试
@@ -196,3 +194,4 @@
- 2026-10-30:启动窗口的样子换成圆环([启动窗口](2026-10-26-start-window.md) 同一天的变更):鲸鱼的话只剩用户要知道或回答时的几句,表里去掉 14 个键(`voice.hello / helloName / helloBack / data / found / engine / slow10 / team / ready / opening`、`hint.model / preview / reinstall`、`status.elapsed`),`hint.slowLater` 改名 `voice.slowLater`(同一句,以后的启动和搬数据时 45 秒起由鲸鱼说);第 2 节 `voice`、`hint`、`status` 三层的说明、第 3 节的对照和第 4 节单复数的例子跟着改,第 5 节加一条测试。依据:维护者 2026-10-30 转来的讨论(「现在这版有点噪了」)和维护者选定的圆环原型。
- 2026-10-31:启动页的底注去掉([启动窗口](2026-10-26-start-window.md) 同一天的变更),表里去掉 `foot.community`;`foot` 层只剩位置行,第 2、3 节跟着改,「改动的已定设计」加一行。以后的启动搬数据改在卡片上问,加 `say.move`「搬到这个文件夹?」、`card.move.lead`、`reason.place.drive / workspace`(第 3 节对照表加一行,第 2 节 `reason.*` 改成九个原因);按钮用已有的 `btn.move / repick / cancel`。依据:维护者「移除左下角的社区非官方声明」「让我们尽可能避免系统中出现任何这样的默认弹窗」。
- 2026-11-01:启动页轻易不写字([启动窗口](2026-10-26-start-window.md) 同一天的变更),表里去掉 `voice.slow45 / slowLater / moving` 和 `btn.openLogs`,加 `btn.saveLog`「保存日志…」(打开系统保存框,所以以 … 结尾);`voice` 层只剩出错时的三句。第 3 节的旧键对照是当时的记录,不改。
+- 2026-11-02:导入并进圆环([启动窗口](2026-10-26-start-window.md) 同一天的变更):加 `card.import.line`、`say.stopCopy` 和 `status.phase.import`「复制以前的团队」;去掉 `say.import / copying`、`card.import.lead / leadBare / found / scope` 和 `card.copying.step1 / 2 / 3 / eta / etaSoon`。