Self-hosted workflows for coding-agent delivery. Orchestrate CodeBuddy, Codex and Claude Code with scripts and human approval gates. Includes Local workflows for coding assistants.
JavaScript agent-orchestrationagentic-workflowai-agentsai-codingclaude-codecode-reviewcodebuddycodexcoding-agentscursordeveloper-toolshuman-on-the-loopllmmcpmulti-agentsdlcself-hostedsopworkflow-automationworkflow-engine
【架构优化】从 EnsureToolchainCLI 中拆出包暂存复制 installToolchainPackage 与启动器软链 linkToolchainLaunchers (#778)
fx-kurumib215f23c4d0c
diff --git a/internal/runtime/toolchain.go b/internal/runtime/toolchain.goindex fa71b270..5a844e0b 100644--- a/internal/runtime/toolchain.go+++ b/internal/runtime/toolchain.go@@ -210,6 +210,16 @@ func EnsureToolchainCLI(dir, binary string) error {if fileIsExecutable(launcher) {return nil}+ if err := installToolchainPackage(dir, binary, pkg); err != nil {+ return err+ }+ return linkToolchainLaunchers(dir, pkg)+}++// installToolchainPackage copies npm package pkg from the platform image into+// the toolchain at dir through a stage directory, replacing any earlier copy.+// binary only names the CLI in the copy error.+func installToolchainPackage(dir, binary, pkg string) error {modules := filepath.Join(dir, "lib", "node_modules")dest := filepath.Join(modules, filepath.FromSlash(pkg))if err := os.MkdirAll(filepath.Dir(dest), 0o755); err != nil {@@ -229,9 +239,13 @@ func EnsureToolchainCLI(dir, binary string) error {if err := os.RemoveAll(dest); err != nil {return err}- if err := os.Rename(filepath.Join(stage, filepath.Base(dest)), dest); err != nil {- return err- }+ return os.Rename(filepath.Join(stage, filepath.Base(dest)), dest)+}++// linkToolchainLaunchers links, under dir/bin, every launcher in the platform+// image bin that points into package pkg, replacing whatever was there.+func linkToolchainLaunchers(dir, pkg string) error {+ prefixBin := filepath.Join(toolchainNodePrefix, "bin")entries, err := os.ReadDir(prefixBin)if err != nil {return errdiff --git a/internal/runtime/toolchain_cli_install_guard_test.go b/internal/runtime/toolchain_cli_install_guard_test.gonew file mode 100644index 00000000..31cc6b17--- /dev/null+++ b/internal/runtime/toolchain_cli_install_guard_test.go@@ -0,0 +1,71 @@+//go:build !windows++package runtime++import (+ "os"+ "path/filepath"+ "testing"+)++// Launchers of other packages and plain files that sort before the requested+// launcher are skipped, not taken as the end of the scan.+func TestLinkToolchainLaunchersSkipsEarlierUnrelatedEntries(t *testing.T) {+ prefix := writeToolchainFixture(t)+ useToolchainFixture(t, prefix, t.TempDir())+ if err := os.Symlink("../lib/node_modules/otherpkg/bin/other.js", filepath.Join(prefix, "bin", "aaa-other")); err != nil {+ t.Fatal(err)+ }+ if err := os.WriteFile(filepath.Join(prefix, "bin", "aab-plain"), []byte("#!/bin/sh\n"), 0o755); err != nil {+ t.Fatal(err)+ }+ dir := t.TempDir()+ if err := os.MkdirAll(filepath.Join(dir, "bin"), 0o755); err != nil {+ t.Fatal(err)+ }++ if err := linkToolchainLaunchers(dir, "fakepkg"); err != nil {+ t.Fatalf("linkToolchainLaunchers() = %v", err)+ }+ if link, err := os.Readlink(filepath.Join(dir, "bin", "fakecli")); err != nil || link != "../lib/node_modules/fakepkg/bin/fake.js" {+ t.Fatalf("launcher fakecli = %q, %v; want the fakepkg link", link, err)+ }+ for _, name := range []string{"aaa-other", "aab-plain"} {+ if _, err := os.Lstat(filepath.Join(dir, "bin", name)); !os.IsNotExist(err) {+ t.Errorf("unrelated entry %s linked: %v", name, err)+ }+ }+}++// A launcher that cannot be linked is reported, not silently dropped.+func TestLinkToolchainLaunchersReportsLinkFailure(t *testing.T) {+ prefix := writeToolchainFixture(t)+ useToolchainFixture(t, prefix, t.TempDir())+ // dir/bin does not exist, so the symlink cannot be created.+ dir := t.TempDir()+ if err := linkToolchainLaunchers(dir, "fakepkg"); err == nil {+ t.Fatal("linkToolchainLaunchers() = nil, want the symlink error")+ }+}++// EnsureToolchainCLI surfaces a launcher link failure to its caller instead of+// reporting the CLI as installed.+func TestEnsureToolchainCLIReportsLauncherLinkFailure(t *testing.T) {+ prefix := writeToolchainFixture(t)+ useToolchainFixture(t, prefix, t.TempDir())+ if err := os.Symlink("../lib/node_modules/fakepkg/bin/fake.js", filepath.Join(prefix, "bin", "fakecli-alt")); err != nil {+ t.Fatal(err)+ }+ dir, err := RuntimeToolchainDir()+ if err != nil || dir == "" {+ t.Fatalf("RuntimeToolchainDir() = (%q, %v)", dir, err)+ }+ // A non-empty directory at the second launcher path can be neither removed+ // nor replaced by a symlink.+ if err := os.MkdirAll(filepath.Join(dir, "bin", "fakecli-alt", "busy"), 0o755); err != nil {+ t.Fatal(err)+ }+ if err := EnsureToolchainCLI(dir, "fakecli"); err == nil {+ t.Fatal("EnsureToolchainCLI() = nil, want the launcher link error")+ }+}diff --git a/internal/runtime/toolchain_cli_install_test.go b/internal/runtime/toolchain_cli_install_test.gonew file mode 100644index 00000000..c35da86e--- /dev/null+++ b/internal/runtime/toolchain_cli_install_test.go@@ -0,0 +1,102 @@+package runtime++import (+ "os"+ "path/filepath"+ "strings"+ "testing"+)++// linkToolchainLaunchers links only launchers of the requested package and+// replaces a stale file already sitting at a launcher path.+func TestLinkToolchainLaunchersLinksOnlyThatPackage(t *testing.T) {+ prefix := writeToolchainFixture(t)+ useToolchainFixture(t, prefix, t.TempDir())+ // A second launcher for fakepkg and a plain (non-symlink) file in bin.+ if err := os.Symlink("../lib/node_modules/fakepkg/bin/fake.js", filepath.Join(prefix, "bin", "fakecli-alt")); err != nil {+ t.Fatal(err)+ }+ if err := os.WriteFile(filepath.Join(prefix, "bin", "plain"), []byte("#!/bin/sh\n"), 0o755); err != nil {+ t.Fatal(err)+ }+ dir := t.TempDir()+ if err := os.MkdirAll(filepath.Join(dir, "bin"), 0o755); err != nil {+ t.Fatal(err)+ }+ stale := filepath.Join(dir, "bin", "fakecli")+ if err := os.WriteFile(stale, []byte("stale"), 0o644); err != nil {+ t.Fatal(err)+ }++ if err := linkToolchainLaunchers(dir, "fakepkg"); err != nil {+ t.Fatalf("linkToolchainLaunchers() = %v", err)+ }+ for _, name := range []string{"fakecli", "fakecli-alt"} {+ link, err := os.Readlink(filepath.Join(dir, "bin", name))+ if err != nil || link != "../lib/node_modules/fakepkg/bin/fake.js" {+ t.Errorf("launcher %s = %q, %v; want the fakepkg link", name, link, err)+ }+ }+ for _, name := range []string{"npm", "npx", "node", "plain"} {+ if _, err := os.Lstat(filepath.Join(dir, "bin", name)); !os.IsNotExist(err) {+ t.Errorf("unrelated entry %s linked: %v", name, err)+ }+ }+}++func TestLinkToolchainLaunchersReportsMissingPrefixBin(t *testing.T) {+ prefix := writeToolchainFixture(t)+ useToolchainFixture(t, prefix, t.TempDir())+ if err := os.RemoveAll(filepath.Join(prefix, "bin")); err != nil {+ t.Fatal(err)+ }+ if err := linkToolchainLaunchers(t.TempDir(), "fakepkg"); err == nil {+ t.Fatal("linkToolchainLaunchers() = nil, want the read error")+ }+}++// installToolchainPackage replaces an earlier copy and leaves no stage behind.+func TestInstallToolchainPackageReplacesEarlierCopy(t *testing.T) {+ prefix := writeToolchainFixture(t)+ useToolchainFixture(t, prefix, t.TempDir())+ dir := t.TempDir()+ dest := filepath.Join(dir, "lib", "node_modules", "fakepkg")+ if err := os.MkdirAll(dest, 0o755); err != nil {+ t.Fatal(err)+ }+ old := filepath.Join(dest, "old")+ if err := os.WriteFile(old, nil, 0o644); err != nil {+ t.Fatal(err)+ }++ if err := installToolchainPackage(dir, "fakecli", "fakepkg"); err != nil {+ t.Fatalf("installToolchainPackage() = %v", err)+ }+ if !fileIsExecutable(filepath.Join(dest, "bin", "fake.js")) {+ t.Fatal("package not copied into the toolchain")+ }+ if _, err := os.Stat(old); !os.IsNotExist(err) {+ t.Fatalf("earlier copy kept: %v", err)+ }+ stages, err := filepath.Glob(filepath.Join(dir, "lib", "node_modules", ".stage-*"))+ if err != nil || len(stages) != 0 {+ t.Fatalf("leftover stages %v (%v)", stages, err)+ }+ if _, err := os.Lstat(filepath.Join(dir, "bin")); !os.IsNotExist(err) {+ t.Fatalf("install touched launchers: %v", err)+ }+}++func TestInstallToolchainPackageNamesBinaryInCopyError(t *testing.T) {+ prefix := writeToolchainFixture(t)+ useToolchainFixture(t, prefix, t.TempDir())+ dir := t.TempDir()+ err := installToolchainPackage(dir, "gonecli", "@scope/gone")+ if err == nil || !strings.Contains(err.Error(), "复制 gonecli 失败") {+ t.Fatalf("installToolchainPackage() = %v, want the copy error", err)+ }+ stages, globErr := filepath.Glob(filepath.Join(dir, "lib", "node_modules", "@scope", ".stage-*"))+ if globErr != nil || len(stages) != 0 {+ t.Fatalf("leftover stages %v (%v)", stages, globErr)+ }+}