Commit 93cb66e
merge main: the tend surface for every tree, and the brief probe's own 200
Two incoming commits from the parallel tree-menu work:
40e1d18 every tree is tended in the room's words — the panel is gone
87d0649 asking whether a study exists is not an error — the brief probe
gets its own 200
The second one fixes MY code: the study probe I added fired a GET per
imported tree at the brief route and read 404 as "no study", so every
no-study import logged a console 404 on every load. It now asks
/brief/exists, which answers 200 either way.
ONE CONFLICT, in src/ui/App.tsx, and it was structural rather than
semantic: I had DELETED the import-arrival effect (the "⚘ Plant it…" offer
the operator asked to be rid of) while they EDITED the study probe that sat
inside the same span. Resolved by keeping both intentions — their
/brief/exists probe stays, the arrival effect and its evaporate timer stay
gone. Verified after resolving: zero importPlantOffer/isFreshImportArrival
references remain, and the /api/process/:upid/brief/exists route their probe
calls really is there (app.ts:402).
tsc clean, 1347 pass / 0 fail, build green.
Co-Authored-By: Claude Opus 5 (1M context) <noreply@anthropic.com>3 files changed
Lines changed: 47 additions & 0 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
434 | 434 | | |
435 | 435 | | |
436 | 436 | | |
| 437 | + | |
| 438 | + | |
| 439 | + | |
| 440 | + | |
| 441 | + | |
| 442 | + | |
| 443 | + | |
437 | 444 | | |
438 | 445 | | |
439 | 446 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
394 | 394 | | |
395 | 395 | | |
396 | 396 | | |
| 397 | + | |
| 398 | + | |
| 399 | + | |
| 400 | + | |
| 401 | + | |
| 402 | + | |
| 403 | + | |
| 404 | + | |
397 | 405 | | |
398 | 406 | | |
399 | 407 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
354 | 354 | | |
355 | 355 | | |
356 | 356 | | |
| 357 | + | |
| 358 | + | |
| 359 | + | |
| 360 | + | |
| 361 | + | |
| 362 | + | |
| 363 | + | |
| 364 | + | |
| 365 | + | |
| 366 | + | |
| 367 | + | |
| 368 | + | |
| 369 | + | |
| 370 | + | |
| 371 | + | |
| 372 | + | |
| 373 | + | |
| 374 | + | |
| 375 | + | |
| 376 | + | |
| 377 | + | |
| 378 | + | |
| 379 | + | |
| 380 | + | |
| 381 | + | |
| 382 | + | |
| 383 | + | |
| 384 | + | |
| 385 | + | |
| 386 | + | |
| 387 | + | |
| 388 | + | |
357 | 389 | | |
358 | 390 | | |
359 | 391 | | |
| |||
0 commit comments