Repository navigation
Commit c2d5ec5
committed
merge: origin/main into feat/agent-mcp-wave-phase-3
Resolves conflicts from #158 (knip integration):
- packages/hub/package.json: keep our @standard-schema/spec addition,
take main's removal of the (knip-flagged unused) birpc dependency
- pnpm-lock.yaml: regenerated via `pnpm install --lockfile-only`
Also fixes two knip findings the merge exposed in this branch's own
new surface (unchecked by knip before it landed on main):
- instance-registry.ts: DEVFRAME_INSTANCES_DIR_ENV /
DEVFRAME_DISABLE_INSTANCE_REGISTRY_ENV / resolveInstancesDir /
probeDevframeInstance drop `export` — module-internal per the
barrel's existing "read/probe/prune helpers stay internal" comment,
nothing outside the file used them
- packages/next: DevframeNextHostMcpOptions (the `mountMcp` options
type) now re-exported from the package barrel, alongside its sibling
option types — a real gap, not a knip false positive60 files changed
Lines changed: 783 additions & 705 deletions
File tree
- .github/workflows
- design
- examples
- files-inspector/tests
- json-render
- next-devframe-hub/src/client
- next-runtime-snapshot
- src/client
- app/components
- tests
- streaming-chat
- tests
- packages
- devframe/src
- client
- cli
- node
- rpc
- hub
- json-render-ui/src/components
- next/src
- plugins
- a11y
- src
- inject
- spa/lib
- tests
- assets
- src/spa/app
- components
- composables
- code-server
- test
- data-inspector
- src
- node
- spa/composables
- git
- src
- client
- components/ui
- lib
- rpc
- functions
- inspect
- src/spa/utils
- messages/src/client/composables
- og
- src/spa/app
- components
- utils
- test
- terminals
- src
- node
- rpc
- storybook/src
- tests/__snapshots__/tsnapi/@devframes/next
Some content is hidden
Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
12 | 12 | | |
13 | 13 | | |
14 | 14 | | |
| 15 | + | |
| 16 | + | |
15 | 17 | | |
16 | 18 | | |
17 | 19 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
23 | 23 | | |
24 | 24 | | |
25 | 25 | | |
| 26 | + | |
| 27 | + | |
| 28 | + | |
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
24 | 24 | | |
25 | 25 | | |
26 | 26 | | |
| 27 | + | |
27 | 28 | | |
28 | 29 | | |
29 | 30 | | |
| |||
33 | 34 | | |
34 | 35 | | |
35 | 36 | | |
| 37 | + | |
| 38 | + | |
36 | 39 | | |
37 | 40 | | |
38 | 41 | | |
| |||
145 | 148 | | |
146 | 149 | | |
147 | 150 | | |
148 | | - | |
| 151 | + | |
149 | 152 | | |
150 | 153 | | |
151 | 154 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
30 | 30 | | |
31 | 31 | | |
32 | 32 | | |
| 33 | + | |
| 34 | + | |
| 35 | + | |
| 36 | + | |
33 | 37 | | |
34 | 38 | | |
35 | 39 | | |
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
49 | 49 | | |
50 | 50 | | |
51 | 51 | | |
52 | | - | |
53 | | - | |
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
19 | 19 | | |
20 | 20 | | |
21 | 21 | | |
22 | | - | |
| 22 | + | |
23 | 23 | | |
24 | 24 | | |
25 | 25 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
23 | 23 | | |
24 | 24 | | |
25 | 25 | | |
26 | | - | |
27 | | - | |
28 | | - | |
29 | 26 | | |
30 | 27 | | |
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
1 | | - | |
2 | 1 | | |
3 | 2 | | |
4 | 3 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
25 | 25 | | |
26 | 26 | | |
27 | 27 | | |
28 | | - | |
| 28 | + | |
| 29 | + | |
29 | 30 | | |
30 | 31 | | |
31 | 32 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
9 | 9 | | |
10 | 10 | | |
11 | 11 | | |
12 | | - | |
| 12 | + | |
13 | 13 | | |
14 | 14 | | |
15 | 15 | | |
| |||
0 commit comments