Improve OpenClaw DX context and workspace behavior

Author: andyrewlee

README.md

@@ -59,6 +59,10 @@ Then run `amux` to open the dashboard.
 
 Each workspace tracks a repo checkout and its metadata. For local workflows, workspaces are typically backed by git worktrees on their own branches so agents work in isolation and you can merge changes back when done.
 
+Workspace scope terminology:
+- **Project workspace**: created directly for a project (`amux workspace create <name> --project <repo>`). By default, it starts from the project's default branch.
+- **Nested workspace**: created from an existing workspace context (OpenClaw DX: `workspace create --scope nested --from-workspace <id>`). It remains isolated, and also starts from the project's default branch.
+
 ## Architecture quick tour
 
 Start with `internal/app/ARCHITECTURE.md` for lifecycle, PTY flow, tmux tagging, and persistence invariants. Message boundaries and command discipline are documented in `internal/app/MESSAGE_FLOW.md`.

internal/cli/openclaw_dogfood_script_test.go

@@ -0,0 +1,23 @@
+package cli
+
+import (
+	"os/exec"
+	"path/filepath"
+	"strings"
+	"testing"
+)
+
+func TestOpenClawDogfoodScript_MissingFlagValueFailsClearly(t *testing.T) {
+	requireBinary(t, "bash")
+
+	scriptPath := filepath.Join("..", "..", "skills", "amux", "scripts", "openclaw-dogfood.sh")
+	cmd := exec.Command(scriptPath, "--repo")
+	out, err := cmd.CombinedOutput()
+	if err == nil {
+		t.Fatalf("expected non-zero exit for missing flag value")
+	}
+	text := string(out)
+	if !strings.Contains(text, "missing value for --repo") {
+		t.Fatalf("output = %q, want missing flag guidance", text)
+	}
+}

internal/cli/openclaw_dx_script_assistants_git_test.go

@@ -60,8 +60,8 @@ echo ready
 	if got, _ := payload["command"].(string); got != "assistants" {
 		t.Fatalf("command = %q, want %q", got, "assistants")
 	}
-	if got, _ := payload["status"].(string); got != "attention" {
-		t.Fatalf("status = %q, want %q", got, "attention")
+	if got, _ := payload["status"].(string); got == "needs_input" {
+		t.Fatalf("status = %q, want non-blocking status when at least one assistant is ready", got)
 	}
 	data, ok := payload["data"].(map[string]any)
 	if !ok {
@@ -157,6 +157,10 @@ if [[ "$assistant" == "aa-pass" ]]; then
   printf '%s' '{"ok":true,"status":"idle","overall_status":"completed","summary":"READY: codex objective identified."}'
   exit 0
 fi
+if [[ "$assistant" == "codex" ]]; then
+  printf '%s' '{"ok":true,"status":"idle","overall_status":"completed","summary":"READY: codex objective identified."}'
+  exit 0
+fi
 printf '%s' '{"ok":true,"status":"needs_input","overall_status":"needs_input","summary":"Needs local permission confirmation."}'
 `)
 
@@ -175,8 +179,8 @@ printf '%s' '{"ok":true,"status":"needs_input","overall_status":"needs_input","s
 	if got, _ := payload["command"].(string); got != "assistants" {
 		t.Fatalf("command = %q, want %q", got, "assistants")
 	}
-	if got, _ := payload["status"].(string); got != "needs_input" {
-		t.Fatalf("status = %q, want %q", got, "needs_input")
+	if got, _ := payload["status"].(string); got == "needs_input" {
+		t.Fatalf("status = %q, want non-blocking status when at least one probe passed", got)
 	}
 	data, ok := payload["data"].(map[string]any)
 	if !ok {
@@ -191,6 +195,9 @@ printf '%s' '{"ok":true,"status":"needs_input","overall_status":"needs_input","s
 	if got, _ := data["probe_needs_input"].(float64); got != 1 {
 		t.Fatalf("probe_needs_input = %v, want 1", got)
 	}
+	if got, _ := data["workspace_label"].(string); got != "ws-1 (demo) [project workspace]" {
+		t.Fatalf("workspace_label = %q, want %q", got, "ws-1 (demo) [project workspace]")
+	}
 	probes, ok := data["probes"].([]any)
 	if !ok || len(probes) != 2 {
 		t.Fatalf("probes = %#v, want len=2", data["probes"])
@@ -202,51 +209,58 @@ printf '%s' '{"ok":true,"status":"needs_input","overall_status":"needs_input","s
 		if !ok {
 			continue
 		}
-		assistant, _ := probe["assistant"].(string)
 		result, _ := probe["result"].(string)
-		if assistant == "aa-pass" && result == "passed" {
+		if result == "passed" {
 			sawPassed = true
 		}
-		if assistant == "ab-needs" && result == "needs_input" {
+		if result == "needs_input" {
 			sawNeedsInput = true
 		}
 	}
 	if !sawPassed || !sawNeedsInput {
 		t.Fatalf("probe results missing expected entries: %#v", probes)
 	}
+
+	channel, ok := payload["channel"].(map[string]any)
+	if !ok {
+		t.Fatalf("channel missing or wrong type: %T", payload["channel"])
+	}
+	message, _ := channel["message"].(string)
+	if !strings.Contains(message, "Workspace: ws-1 (demo) [project workspace]") {
+		t.Fatalf("channel.message = %q, want workspace label", message)
+	}
+
+	quickActions, ok := payload["quick_actions"].([]any)
+	if !ok || len(quickActions) == 0 {
+		t.Fatalf("quick_actions missing or empty: %#v", payload["quick_actions"])
+	}
+	var sawReview bool
+	for _, raw := range quickActions {
+		action, ok := raw.(map[string]any)
+		if !ok {
+			continue
+		}
+		id, _ := action["id"].(string)
+		cmd, _ := action["command"].(string)
+		if id == "review" && strings.Contains(cmd, "review --workspace ws-1 --assistant codex") {
+			sawReview = true
+		}
+	}
+	if !sawReview {
+		t.Fatalf("expected workspace-specific review quick action in %#v", quickActions)
+	}
 }
 
-func TestOpenClawDXGitShip_CommitsWorkspaceChanges(t *testing.T) {
+func TestOpenClawDXAssistants_ProbePrioritizesCodexUnderLimit(t *testing.T) {
 	requireBinary(t, "jq")
 	requireBinary(t, "bash")
-	requireBinary(t, "git")
 
 	scriptPath := filepath.Join("..", "..", "skills", "amux", "scripts", "openclaw-dx.sh")
 	fakeBinDir := t.TempDir()
 	fakeAmuxPath := filepath.Join(fakeBinDir, "amux")
-
-	repoDir := t.TempDir()
-	if out, err := exec.Command("git", "-C", repoDir, "init", "-b", "main").CombinedOutput(); err != nil {
-		t.Fatalf("git init: %v\n%s", err, string(out))
-	}
-	if out, err := exec.Command("git", "-C", repoDir, "config", "user.email", "dx@example.com").CombinedOutput(); err != nil {
-		t.Fatalf("git config email: %v\n%s", err, string(out))
-	}
-	if out, err := exec.Command("git", "-C", repoDir, "config", "user.name", "DX Bot").CombinedOutput(); err != nil {
-		t.Fatalf("git config name: %v\n%s", err, string(out))
-	}
-	if err := os.WriteFile(filepath.Join(repoDir, "README.md"), []byte("hello\n"), 0o644); err != nil {
-		t.Fatalf("write README: %v", err)
-	}
-	if out, err := exec.Command("git", "-C", repoDir, "add", "README.md").CombinedOutput(); err != nil {
-		t.Fatalf("git add: %v\n%s", err, string(out))
-	}
-	if out, err := exec.Command("git", "-C", repoDir, "commit", "-m", "initial").CombinedOutput(); err != nil {
-		t.Fatalf("git commit initial: %v\n%s", err, string(out))
-	}
-	if err := os.WriteFile(filepath.Join(repoDir, "README.md"), []byte("hello\nworld\n"), 0o644); err != nil {
-		t.Fatalf("modify README: %v", err)
-	}
+	fakeTurnPath := filepath.Join(fakeBinDir, "fake-turn.sh")
+	codexPath := filepath.Join(fakeBinDir, "codex")
+	ampPath := filepath.Join(fakeBinDir, "amp")
 
 	writeExecutable(t, fakeAmuxPath, `#!/usr/bin/env bash
 set -euo pipefail
@@ -255,53 +269,67 @@ if [[ "${1:-}" == "--json" ]]; then
 fi
 case "${1:-} ${2:-}" in
   "workspace list")
-    printf '%s' "${FAKE_WORKSPACE_LIST_JSON:?missing FAKE_WORKSPACE_LIST_JSON}"
+    printf '%s' '{"ok":true,"data":[{"id":"ws-1","name":"demo","repo":"/tmp/demo","assistant":"codex"}],"error":null}'
     ;;
   *)
-    printf '{"ok":false,"error":{"code":"unexpected","message":"unexpected args: %s"}}' "$*"
+    printf '%s' '{"ok":true,"data":{},"error":null}'
     ;;
 esac
+`)
+	writeExecutable(t, codexPath, "#!/usr/bin/env bash\nset -euo pipefail\necho codex\n")
+	writeExecutable(t, ampPath, "#!/usr/bin/env bash\nset -euo pipefail\necho amp\n")
+
+	writeExecutable(t, fakeTurnPath, `#!/usr/bin/env bash
+set -euo pipefail
+assistant=""
+for ((i=1; i<=$#; i++)); do
+  if [[ "${!i}" == "--assistant" ]]; then
+    next=$((i+1))
+    assistant="${!next}"
+  fi
+done
+if [[ "$assistant" == "codex" ]]; then
+  printf '%s' '{"ok":true,"status":"idle","overall_status":"completed","summary":"READY: codex can run non-interactive."}'
+  exit 0
+fi
+printf '%s' '{"ok":true,"status":"needs_input","overall_status":"needs_input","summary":"Needs local permission confirmation."}'
 `)
 
-	workspaceListJSON := `{"ok":true,"data":[{"id":"ws-1","name":"demo","repo":"` + repoDir + `","root":"` + repoDir + `"}],"error":null}`
 	env := os.Environ()
 	env = withEnv(env, "PATH", fakeBinDir+":"+os.Getenv("PATH"))
-	env = withEnv(env, "FAKE_WORKSPACE_LIST_JSON", workspaceListJSON)
+	env = withEnv(env, "OPENCLAW_DX_TURN_SCRIPT", fakeTurnPath)
 
 	payload := runScriptJSON(t, scriptPath, env,
-		"git", "ship",
+		"assistants",
 		"--workspace", "ws-1",
-		"--message", "feat: update readme",
+		"--probe",
+		"--limit", "1",
 	)
 
-	if got, _ := payload["command"].(string); got != "git.ship" {
-		t.Fatalf("command = %q, want %q", got, "git.ship")
-	}
-	if got, _ := payload["status"].(string); got != "ok" {
-		t.Fatalf("status = %q, want %q", got, "ok")
-	}
 	data, ok := payload["data"].(map[string]any)
 	if !ok {
 		t.Fatalf("data missing or wrong type: %T", payload["data"])
 	}
-	commitHash, _ := data["commit_hash"].(string)
-	if strings.TrimSpace(commitHash) == "" {
-		t.Fatalf("commit_hash is empty: %#v", data)
+	if got, _ := data["probe_count"].(float64); got != 1 {
+		t.Fatalf("probe_count = %v, want 1", got)
 	}
-	if pushed, _ := data["pushed"].(bool); pushed {
-		t.Fatalf("pushed = true, expected false in local-only test")
+	if got, _ := data["probe_passed"].(float64); got != 1 {
+		t.Fatalf("probe_passed = %v, want 1", got)
 	}
-
-	logOut, err := exec.Command("git", "-C", repoDir, "log", "-1", "--pretty=%s").CombinedOutput()
-	if err != nil {
-		t.Fatalf("git log: %v\n%s", err, string(logOut))
+	probes, ok := data["probes"].([]any)
+	if !ok || len(probes) != 1 {
+		t.Fatalf("probes = %#v, want len=1", data["probes"])
 	}
-	if got := strings.TrimSpace(string(logOut)); got != "feat: update readme" {
-		t.Fatalf("last commit message = %q, want %q", got, "feat: update readme")
+	firstProbe, ok := probes[0].(map[string]any)
+	if !ok {
+		t.Fatalf("probe[0] wrong type: %T", probes[0])
+	}
+	if got, _ := firstProbe["assistant"].(string); got != "codex" {
+		t.Fatalf("first probed assistant = %q, want codex", got)
 	}
 }
 
-func TestOpenClawDXGitShip_NoChangesButAheadSuggestsPush(t *testing.T) {
+func TestOpenClawDXGitShip_CommitsWorkspaceChanges(t *testing.T) {
 	requireBinary(t, "jq")
 	requireBinary(t, "bash")
 	requireBinary(t, "git")
@@ -320,15 +348,6 @@ func TestOpenClawDXGitShip_NoChangesButAheadSuggestsPush(t *testing.T) {
 	if out, err := exec.Command("git", "-C", repoDir, "config", "user.name", "DX Bot").CombinedOutput(); err != nil {
 		t.Fatalf("git config name: %v\n%s", err, string(out))
 	}
-
-	remoteDir := filepath.Join(t.TempDir(), "remote.git")
-	if out, err := exec.Command("git", "init", "--bare", remoteDir).CombinedOutput(); err != nil {
-		t.Fatalf("git init bare: %v\n%s", err, string(out))
-	}
-	if out, err := exec.Command("git", "-C", repoDir, "remote", "add", "origin", remoteDir).CombinedOutput(); err != nil {
-		t.Fatalf("git remote add: %v\n%s", err, string(out))
-	}
-
 	if err := os.WriteFile(filepath.Join(repoDir, "README.md"), []byte("hello\n"), 0o644); err != nil {
 		t.Fatalf("write README: %v", err)
 	}
@@ -338,19 +357,9 @@ func TestOpenClawDXGitShip_NoChangesButAheadSuggestsPush(t *testing.T) {
 	if out, err := exec.Command("git", "-C", repoDir, "commit", "-m", "initial").CombinedOutput(); err != nil {
 		t.Fatalf("git commit initial: %v\n%s", err, string(out))
 	}
-	if out, err := exec.Command("git", "-C", repoDir, "push", "-u", "origin", "HEAD").CombinedOutput(); err != nil {
-		t.Fatalf("git push initial: %v\n%s", err, string(out))
-	}
-
 	if err := os.WriteFile(filepath.Join(repoDir, "README.md"), []byte("hello\nworld\n"), 0o644); err != nil {
 		t.Fatalf("modify README: %v", err)
 	}
-	if out, err := exec.Command("git", "-C", repoDir, "add", "README.md").CombinedOutput(); err != nil {
-		t.Fatalf("git add second: %v\n%s", err, string(out))
-	}
-	if out, err := exec.Command("git", "-C", repoDir, "commit", "-m", "second").CombinedOutput(); err != nil {
-		t.Fatalf("git commit second: %v\n%s", err, string(out))
-	}
 
 	writeExecutable(t, fakeAmuxPath, `#!/usr/bin/env bash
 set -euo pipefail
@@ -375,36 +384,40 @@ esac
 	payload := runScriptJSON(t, scriptPath, env,
 		"git", "ship",
 		"--workspace", "ws-1",
+		"--message", "feat: update readme",
 	)
 
-	if got, _ := payload["status"].(string); got != "attention" {
-		t.Fatalf("status = %q, want %q", got, "attention")
+	if got, _ := payload["command"].(string); got != "git.ship" {
+		t.Fatalf("command = %q, want %q", got, "git.ship")
 	}
-	summary, _ := payload["summary"].(string)
-	if !strings.Contains(summary, "ready to push") {
-		t.Fatalf("summary = %q, want push-ready guidance", summary)
+	if got, _ := payload["status"].(string); got != "ok" {
+		t.Fatalf("status = %q, want %q", got, "ok")
 	}
-	suggested, _ := payload["suggested_command"].(string)
-	if !strings.Contains(suggested, "git ship --workspace ws-1 --push") {
-		t.Fatalf("suggested_command = %q, want push command", suggested)
+	channel, ok := payload["channel"].(map[string]any)
+	if !ok {
+		t.Fatalf("channel missing or wrong type: %T", payload["channel"])
 	}
-	quickActions, ok := payload["quick_actions"].([]any)
-	if !ok || len(quickActions) == 0 {
-		t.Fatalf("quick_actions missing or empty: %#v", payload["quick_actions"])
+	message, _ := channel["message"].(string)
+	if !strings.Contains(message, "Workspace: ws-1 (demo) [project workspace]") {
+		t.Fatalf("channel.message = %q, want workspace context label", message)
 	}
-	var sawPush bool
-	for _, raw := range quickActions {
-		action, ok := raw.(map[string]any)
-		if !ok {
-			continue
-		}
-		id, _ := action["id"].(string)
-		if id == "push" {
-			sawPush = true
-			break
-		}
+	data, ok := payload["data"].(map[string]any)
+	if !ok {
+		t.Fatalf("data missing or wrong type: %T", payload["data"])
 	}
-	if !sawPush {
-		t.Fatalf("expected push quick action in %#v", quickActions)
+	commitHash, _ := data["commit_hash"].(string)
+	if strings.TrimSpace(commitHash) == "" {
+		t.Fatalf("commit_hash is empty: %#v", data)
+	}
+	if pushed, _ := data["pushed"].(bool); pushed {
+		t.Fatalf("pushed = true, expected false in local-only test")
+	}
+
+	logOut, err := exec.Command("git", "-C", repoDir, "log", "-1", "--pretty=%s").CombinedOutput()
+	if err != nil {
+		t.Fatalf("git log: %v\n%s", err, string(logOut))
+	}
+	if got := strings.TrimSpace(string(logOut)); got != "feat: update readme" {
+		t.Fatalf("last commit message = %q, want %q", got, "feat: update readme")
 	}
 }