merge: resolve conflicts after merging main
Adapt runtime features (usage tracking, ping, heartbeat) to main's multi-workspace architecture. Update frontend imports from @multica/types to @/shared/types after the package consolidation. Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
This commit is contained in:
commit
6ee034c6e9
151 changed files with 3664 additions and 6579 deletions
2
Makefile
2
Makefile
|
|
@ -119,7 +119,7 @@ dev:
|
|||
cd server && go run ./cmd/server
|
||||
|
||||
daemon:
|
||||
cd server && MULTICA_REPOS_ROOT="${MULTICA_REPOS_ROOT:-$(abspath .)}" go run ./cmd/multica daemon
|
||||
cd server && go run ./cmd/multica daemon
|
||||
|
||||
cli:
|
||||
cd server && go run ./cmd/multica $(ARGS)
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue