Revert the manager-side PicoClaw packaging path.

Author: xxx7xxxx

internal/agent/manager_config.go

@@ -4,11 +4,9 @@ import (
 	_ "embed"
 	"encoding/json"
 	"fmt"
-	"io/fs"
 	"net"
 	"os"
 	"path/filepath"
-	"runtime"
 	"strings"
 
 	"csgclaw/internal/config"
@@ -22,24 +20,6 @@ var defaultManagerPicoClawConfig []byte
 //go:embed defaults/manager-security.yml
 var defaultManagerSecurityConfig string
 
-var managerSkillSourceDirResolver = bundledManagerSkillSourceDir
-
-const managerMemoryContents = `# Manager Memory
-
-When an admin asks you to arrange or reuse workers such as ux, dev, and qa:
-
-- Do not do the implementation work yourself.
-- Do not use message for status chatter or request restatement.
-- Use the bundled manager-worker-dispatch workflow directly from ~/.picoclaw/workspace/skills/manager-worker-dispatch.
-- Fast path:
-  1. python scripts/manager_worker_api.py list-workers
-  2. join the chosen workers to the room
-  3. write todo.json under ~/.picoclaw/workspace/projects/<slug>/
-  4. python scripts/manager_worker_api.py start-tracking --room-id <room> --todo-path <todo.json>
-- Only open SKILL.md if the workflow must change or a required command is unclear.
-- After tracking starts, send one concise assignment summary.
-`
-
 func ensureManagerPicoClawConfig(server config.ServerConfig, model config.ModelConfig) (string, error) {
 	return ensureAgentPicoClawConfig(ManagerName, "u-manager", server, model)
 }
@@ -52,9 +32,6 @@ func ensureAgentPicoClawConfig(agentName, botID string, server config.ServerConf
 	if err := os.MkdirAll(filepath.Join(hostRoot, hostPicoClawLogs), 0o755); err != nil {
 		return "", fmt.Errorf("create manager picoclaw logs dir: %w", err)
 	}
-	if err := ensureAgentWorkspace(hostRoot, agentName); err != nil {
-		return "", err
-	}
 
 	data, err := renderAgentPicoClawConfig(botID, server, model)
 	if err != nil {
@@ -247,118 +224,3 @@ func renderManagerSecurityConfig(server config.ServerConfig, model config.ModelC
 	}
 	return content
 }
-
-func ensureAgentWorkspace(hostRoot, agentName string) error {
-	workspaceRoot := filepath.Join(hostRoot, "workspace")
-	for _, dir := range []string{
-		filepath.Join(workspaceRoot, "memory"),
-		filepath.Join(workspaceRoot, "projects"),
-		filepath.Join(workspaceRoot, "sessions"),
-		filepath.Join(workspaceRoot, "state"),
-		filepath.Join(workspaceRoot, "skills"),
-	} {
-		if err := os.MkdirAll(dir, 0o755); err != nil {
-			return fmt.Errorf("create agent workspace dir %q: %w", dir, err)
-		}
-	}
-	if !strings.EqualFold(strings.TrimSpace(agentName), ManagerName) {
-		return nil
-	}
-
-	dstRoot := filepath.Join(workspaceRoot, "skills", "manager-worker-dispatch")
-	srcRoot, err := managerSkillSourceDirResolver()
-	if err != nil {
-		return fmt.Errorf("resolve bundled manager skill: %w", err)
-	}
-	if err := copyDirTree(srcRoot, dstRoot); err != nil {
-		return fmt.Errorf("seed bundled manager skill: %w", err)
-	}
-	memoryPath := filepath.Join(workspaceRoot, "memory", "MEMORY.md")
-	if err := os.WriteFile(memoryPath, []byte(managerMemoryContents), 0o644); err != nil {
-		return fmt.Errorf("write manager memory: %w", err)
-	}
-	return nil
-}
-
-func bundledManagerSkillSourceDir() (string, error) {
-	candidates := make([]string, 0, 4)
-	if wd, err := os.Getwd(); err == nil {
-		candidates = append(candidates, wd)
-	}
-	if exe, err := os.Executable(); err == nil {
-		candidates = append(candidates, filepath.Dir(exe), filepath.Dir(filepath.Dir(exe)))
-	}
-	if _, file, _, ok := runtime.Caller(0); ok {
-		candidates = append(candidates, filepath.Dir(file), filepath.Dir(filepath.Dir(filepath.Dir(file))))
-	}
-
-	for _, base := range candidates {
-		if found := findManagerSkillUnder(base); found != "" {
-			return found, nil
-		}
-	}
-	return "", os.ErrNotExist
-}
-
-func findManagerSkillUnder(base string) string {
-	base = strings.TrimSpace(base)
-	if base == "" {
-		return ""
-	}
-	for current := base; ; current = filepath.Dir(current) {
-		candidate := filepath.Join(current, "skills", "manager-worker-dispatch")
-		if info, err := os.Stat(filepath.Join(candidate, "SKILL.md")); err == nil && !info.IsDir() {
-			return candidate
-		}
-		parent := filepath.Dir(current)
-		if parent == current {
-			return ""
-		}
-	}
-}
-
-func copyDirTree(srcRoot, dstRoot string) error {
-	srcRoot = filepath.Clean(srcRoot)
-	dstRoot = filepath.Clean(dstRoot)
-	if err := os.RemoveAll(dstRoot); err != nil {
-		return err
-	}
-
-	return filepath.WalkDir(srcRoot, func(path string, d fs.DirEntry, walkErr error) error {
-		if walkErr != nil {
-			return walkErr
-		}
-		rel, err := filepath.Rel(srcRoot, path)
-		if err != nil {
-			return err
-		}
-		target := dstRoot
-		if rel != "." {
-			target = filepath.Join(dstRoot, rel)
-		}
-
-		info, err := d.Info()
-		if err != nil {
-			return err
-		}
-		if d.IsDir() {
-			return os.MkdirAll(target, info.Mode().Perm())
-		}
-
-		data, err := os.ReadFile(path)
-		if err != nil {
-			return err
-		}
-		if err := os.MkdirAll(filepath.Dir(target), 0o755); err != nil {
-			return err
-		}
-		mode := info.Mode().Perm()
-		if mode == 0 {
-			mode = 0o644
-		}
-		if err := os.WriteFile(target, data, mode); err != nil {
-			return err
-		}
-		return nil
-	})
-}

internal/agent/manager_config_test.go

@@ -69,20 +69,6 @@ func TestRenderAgentPicoClawConfigUsesBridgeModelEndpoint(t *testing.T) {
 func TestEnsureAgentPicoClawConfigUsesDirectoryMountRoot(t *testing.T) {
 	homeDir := t.TempDir()
 	t.Setenv("HOME", homeDir)
-	managerSkillSourceDirResolver = func() (string, error) {
-		src := filepath.Join(t.TempDir(), "skills", "manager-worker-dispatch")
-		if err := os.MkdirAll(filepath.Join(src, "scripts"), 0o755); err != nil {
-			t.Fatalf("os.MkdirAll(skill source) error = %v", err)
-		}
-		if err := os.WriteFile(filepath.Join(src, "SKILL.md"), []byte("name: test\n"), 0o644); err != nil {
-			t.Fatalf("os.WriteFile(SKILL.md) error = %v", err)
-		}
-		if err := os.WriteFile(filepath.Join(src, "scripts", "manager_worker_api.py"), []byte("print('ok')\n"), 0o755); err != nil {
-			t.Fatalf("os.WriteFile(manager_worker_api.py) error = %v", err)
-		}
-		return src, nil
-	}
-	defer func() { managerSkillSourceDirResolver = bundledManagerSkillSourceDir }()
 
 	root, err := ensureAgentPicoClawConfig("ux", "u-ux", config.ServerConfig{
 		ListenAddr:  "0.0.0.0:18080",
@@ -122,66 +108,6 @@ func TestEnsureAgentPicoClawConfigUsesDirectoryMountRoot(t *testing.T) {
 	}
 }
 
-func TestEnsureAgentPicoClawConfigSeedsManagerSkill(t *testing.T) {
-	homeDir := t.TempDir()
-	t.Setenv("HOME", homeDir)
-
-	src := filepath.Join(t.TempDir(), "skills", "manager-worker-dispatch")
-	for _, dir := range []string{
-		src,
-		filepath.Join(src, "scripts"),
-		filepath.Join(src, "agents"),
-	} {
-		if err := os.MkdirAll(dir, 0o755); err != nil {
-			t.Fatalf("os.MkdirAll(%q) error = %v", dir, err)
-		}
-	}
-	for path, content := range map[string]string{
-		filepath.Join(src, "SKILL.md"):                         "name: manager-worker-dispatch\n",
-		filepath.Join(src, "scripts", "manager_worker_api.py"): "#!/usr/bin/env python\nprint('ok')\n",
-		filepath.Join(src, "agents", "openai.yaml"):            "interface: {}\n",
-	} {
-		mode := os.FileMode(0o644)
-		if strings.HasSuffix(path, ".py") {
-			mode = 0o755
-		}
-		if err := os.WriteFile(path, []byte(content), mode); err != nil {
-			t.Fatalf("os.WriteFile(%q) error = %v", path, err)
-		}
-	}
-
-	managerSkillSourceDirResolver = func() (string, error) { return src, nil }
-	defer func() { managerSkillSourceDirResolver = bundledManagerSkillSourceDir }()
-
-	root, err := ensureAgentPicoClawConfig("manager", "u-manager", config.ServerConfig{
-		ListenAddr:  "0.0.0.0:18080",
-		AccessToken: "shared-token",
-	}, config.ModelConfig{
-		ModelID: "gpt-5.4",
-	})
-	if err != nil {
-		t.Fatalf("ensureAgentPicoClawConfig() error = %v", err)
-	}
-
-	for _, rel := range []string{
-		filepath.Join("workspace", "memory", "MEMORY.md"),
-		filepath.Join("workspace", "skills", "manager-worker-dispatch", "SKILL.md"),
-		filepath.Join("workspace", "skills", "manager-worker-dispatch", "scripts", "manager_worker_api.py"),
-		filepath.Join("workspace", "skills", "manager-worker-dispatch", "agents", "openai.yaml"),
-	} {
-		if _, err := os.Stat(filepath.Join(root, rel)); err != nil {
-			t.Fatalf("os.Stat(%q) error = %v", filepath.Join(root, rel), err)
-		}
-	}
-	data, err := os.ReadFile(filepath.Join(root, "workspace", "memory", "MEMORY.md"))
-	if err != nil {
-		t.Fatalf("os.ReadFile(MEMORY.md) error = %v", err)
-	}
-	if !strings.Contains(string(data), "python scripts/manager_worker_api.py list-workers") {
-		t.Fatalf("MEMORY.md = %q, want dispatch fast path", string(data))
-	}
-}
-
 func TestIPv4FromAddr(t *testing.T) {
 	tests := []struct {
 		name string