Feat v0.6.17 bugfixes (#52)
Some checks failed
CI/CD / detect-changes (push) Successful in 16s
CI/CD / test-frontend (push) Successful in 6s
CI/CD / test-go-pg (push) Failing after 2m54s
CI/CD / test-sqlite (push) Failing after 3m7s
CI/CD / build-and-deploy (push) Has been skipped

Co-authored-by: Jeffrey Smith <jasafpro@gmail.com>
Co-committed-by: Jeffrey Smith <jasafpro@gmail.com>
This commit was merged in pull request #52.
This commit is contained in:
2026-04-01 16:36:43 +00:00
committed by xcaliber
parent ff19a1b4d3
commit e7d1b53ebf
12 changed files with 111 additions and 30 deletions

View File

@@ -747,6 +747,10 @@ func (h *PackageHandler) ListEnabledSurfaces(c *gin.Context) {
if p.Type != "surface" && p.Type != "full" {
continue
}
// Welcome is a fallback surface, not a navigable destination
if p.ID == "welcome" {
continue
}
route, _ := p.Manifest["route"].(string)
icon, _ := p.Manifest["icon"].(string)
enabled = append(enabled, navSurface{

View File

@@ -22,18 +22,12 @@ import (
"armature/triggers"
)
// defaultBundledPackages is the curated set of packages installed by default.
// Other packages still ship in the Docker image but require BUNDLED_PACKAGES
// to be set explicitly (or "*" for all).
//
// Recommended production override: BUNDLED_PACKAGES=notes,chat,chat-core,mermaid-renderer,schedules
var defaultBundledPackages = map[string]bool{
"notes": true,
"chat": true,
"chat-core": true,
"mermaid-renderer": true,
"schedules": true,
}
// defaultBundledPackages is empty — fresh installs start bare.
// Use BUNDLED_PACKAGES env var to control what gets installed per environment:
// dev: BUNDLED_PACKAGES=*
// test: BUNDLED_PACKAGES=notes,chat,chat-core
// prod: BUNDLED_PACKAGES=notes,chat,chat-core,mermaid-renderer,schedules
var defaultBundledPackages = map[string]bool{}
// InstallBundledPackages scans bundledDir for .pkg archives and installs
// any that don't already exist in the database. Called once at startup
@@ -74,7 +68,8 @@ func InstallBundledPackages(bundledDir, packagesDir, allowlist string, stores st
}
// Check allowlist by filename (strip .pkg extension = package ID)
if len(allowed) > 0 {
// nil = install all ("*"), empty map = install nothing (empty default set)
if allowed != nil {
pkgName := strings.TrimSuffix(entry.Name(), ".pkg")
if !allowed[pkgName] {
filtered++

View File

@@ -494,6 +494,10 @@ func (e *Engine) RegisterPageRoutes(base *gin.RouterGroup, mw PageRouteMiddlewar
continue
}
handler := e.RenderSurface(s.ID)
// Welcome auto-redirects to / when extension surfaces exist
if s.ID == "welcome" {
handler = e.welcomeRedirectIfSurfaces(handler)
}
registerRoutes(group, s, handler)
}

View File

@@ -176,6 +176,28 @@ func (e *Engine) surfacePath(ctx context.Context, id string) string {
return "/s/" + id
}
// welcomeRedirectIfSurfaces wraps a welcome surface handler so that
// /welcome auto-redirects to / when any extension surface is installed.
// This means the welcome page only renders for truly empty deployments.
func (e *Engine) welcomeRedirectIfSurfaces(inner gin.HandlerFunc) gin.HandlerFunc {
return func(c *gin.Context) {
if e.stores.Packages != nil {
if pkgs, err := e.stores.Packages.List(c.Request.Context()); err == nil {
for _, p := range pkgs {
if p.Source == "core" || !p.Enabled {
continue
}
if p.Type == "surface" || p.Type == "full" {
c.Redirect(http.StatusTemporaryRedirect, e.cfg.BasePath+"/")
return
}
}
}
}
inner(c)
}
}
// disabledRedirect returns a handler that redirects to /.
// The DefaultSurfaceRedirect handler will resolve to the appropriate surface.
func (e *Engine) disabledRedirect() gin.HandlerFunc {