Skip to content

Fix prompt delivery and suppress stderr noise #13

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
juhgiyo merged 1 commit into from
Mar 17, 2026
Merged

Fix prompt delivery and suppress stderr noise #13

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
41 changes: 29 additions & 12 deletions gemini/wrapper/main.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -163,20 +163,20 @@ func cmdBuild(args []string) {
os.Exit(1)
}

// Write prompt file (GEMINI.md) into workspace.
// Gemini CLI automatically discovers GEMINI.md as context/system instructions.
promptFile := filepath.Join(ba.AgentWorkspaceDir, "GEMINI.md")
var parts []string
// Build combined prompt from role + memory + task.
// Gemini CLI only auto-discovers GEMINI.md from cwd ancestors, NOT from
// --include-directories. So we prepend role/memory prompts to the -p arg.
var promptParts []string
if ba.RolePrompt != "" {
parts = append(parts, ba.RolePrompt)
promptParts = append(promptParts, ba.RolePrompt)
}
if ba.MemoryPrompt != "" {
parts = append(parts, ba.MemoryPrompt)
promptParts = append(promptParts, ba.MemoryPrompt)
}
if err := os.WriteFile(promptFile, []byte(strings.Join(parts, "\n\n")), 0o644); err != nil {
fmt.Fprintf(os.Stderr, "Failed to write prompt file: %v\n", err)
os.Exit(1)
if ba.Task != "" {
promptParts = append(promptParts, ba.Task)
}
combinedPrompt := strings.Join(promptParts, "\n\n")

// Symlink each subdirectory from each skills-dir into skills/<name>/
for _, skillsDir := range ba.SkillsDirs {
Expand Down Expand Up @@ -241,8 +241,8 @@ func cmdBuild(args []string) {
// Build gemini command
cmd := []string{"gemini"}

if ba.Task != "" {
cmd = append(cmd, "-p", ba.Task)
if combinedPrompt != "" {
cmd = append(cmd, "-p", combinedPrompt)
}

if model, ok := config["model"].(string); ok && model != "" {
Expand All @@ -268,9 +268,12 @@ func cmdBuild(args []string) {
}
}

// Wrap in sh -c to suppress gemini's stderr noise (e.g. "YOLO mode enabled").
shellCmd := shellJoin(cmd) + " 2>/dev/null"

// Output JSON
result := map[string]interface{}{
"cmd": cmd,
"cmd": []string{"sh", "-c", shellCmd},
"cwd": ba.WorkingDir,
}

Expand All @@ -280,3 +283,17 @@ func cmdBuild(args []string) {
os.Exit(1)
}
}

// shellEscape wraps a string in single quotes for sh.
func shellEscape(s string) string {
return "'" + strings.ReplaceAll(s, "'", "'\"'\"'") + "'"
}

// shellJoin quotes and joins args for sh -c.
func shellJoin(args []string) string {
escaped := make([]string, len(args))
for i, a := range args {
escaped[i] = shellEscape(a)
}
return strings.Join(escaped, " ")
}
111 changes: 60 additions & 51 deletions gemini/wrapper/main_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ import (
"encoding/json"
"os"
"path/filepath"
"strings"
"testing"
)

Expand Down Expand Up @@ -96,20 +97,24 @@ func TestCmdBuild_MinimalArgs(t *testing.T) {
t.Fatal("Missing 'cmd' in output")
}

if len(cmd) < 1 || cmd[0] != "gemini" {
t.Errorf("cmd should start with gemini, got %v", cmd[0])
// cmd is now ["sh", "-c", "<shell>"]
if len(cmd) != 3 || cmd[0] != "sh" || cmd[1] != "-c" {
t.Fatalf("cmd should be [sh, -c, <shell>], got %v", cmd)
}
assertContains(t, cmd, "--include-directories")
assertContains(t, cmd, wsDir)

shell := cmd[2].(string)
assertShellContains(t, shell, "'gemini'")
assertShellContains(t, shell, "--include-directories")
assertShellContains(t, shell, wsDir)
assertShellContains(t, shell, "2>/dev/null")

if result["cwd"] != "/project" {
t.Errorf("cwd = %v, want /project", result["cwd"])
}

// Verify GEMINI.md was created
promptFile := filepath.Join(wsDir, "GEMINI.md")
if _, err := os.Stat(promptFile); err != nil {
t.Errorf("GEMINI.md not created: %v", err)
// No -p when no task/prompts provided (minimal args)
if strings.Contains(shell, "'-p'") {
t.Error("shell cmd should NOT contain -p when no task or prompts provided")
}
}

Expand All @@ -131,32 +136,55 @@ func TestCmdBuild_WithTaskAndModel(t *testing.T) {
t.Fatalf("Failed to parse JSON output: %v", err)
}

cmd := result["cmd"].([]interface{})
assertSequence(t, cmd, "-p", "fix the bug")
assertSequence(t, cmd, "-m", "gemini-2.5-pro")
shell := result["cmd"].([]interface{})[2].(string)
assertShellContains(t, shell, "'-p' 'fix the bug'")
assertShellContains(t, shell, "'-m' 'gemini-2.5-pro'")
}

func TestCmdBuild_PromptFile(t *testing.T) {
func TestCmdBuild_PromptsInTask(t *testing.T) {
tmpDir := t.TempDir()
wsDir := filepath.Join(tmpDir, "workspace")

args := []string{
"--agent-workspace-dir", wsDir,
"--role-prompt", "You are a coder",
"--memory-prompt", "Use Go",
"--task", "fix the bug",
}

captureBuildOutput(t, args)
output := captureBuildOutput(t, args)

content, err := os.ReadFile(filepath.Join(wsDir, "GEMINI.md"))
if err != nil {
t.Fatalf("Failed to read GEMINI.md: %v", err)
}
var result map[string]interface{}
json.Unmarshal(output, &result)
shell := result["cmd"].([]interface{})[2].(string)

expected := "You are a coder\n\nUse Go"
if string(content) != expected {
t.Errorf("GEMINI.md = %q, want %q", string(content), expected)
// Role + memory + task should all be combined in -p
assertShellContains(t, shell, "You are a coder")
assertShellContains(t, shell, "Use Go")
assertShellContains(t, shell, "fix the bug")
assertShellContains(t, shell, "'-p'")
}

func TestCmdBuild_PromptsOnly(t *testing.T) {
tmpDir := t.TempDir()
wsDir := filepath.Join(tmpDir, "workspace")

args := []string{
"--agent-workspace-dir", wsDir,
"--role-prompt", "You are a coder",
"--memory-prompt", "Use Go",
}

output := captureBuildOutput(t, args)

var result map[string]interface{}
json.Unmarshal(output, &result)
shell := result["cmd"].([]interface{})[2].(string)

// Role + memory should be in -p even without task
assertShellContains(t, shell, "You are a coder")
assertShellContains(t, shell, "Use Go")
assertShellContains(t, shell, "'-p'")
}

func TestCmdBuild_SkillsSymlinks(t *testing.T) {
Expand Down Expand Up @@ -248,9 +276,8 @@ func TestCmdBuild_SandboxMode(t *testing.T) {

var result map[string]interface{}
json.Unmarshal(output, &result)

cmd := result["cmd"].([]interface{})
assertContains(t, cmd, "--sandbox")
shell := result["cmd"].([]interface{})[2].(string)
assertShellContains(t, shell, "'--sandbox'")
}

func TestCmdBuild_Yolo_Default(t *testing.T) {
Expand All @@ -265,9 +292,8 @@ func TestCmdBuild_Yolo_Default(t *testing.T) {

var result map[string]interface{}
json.Unmarshal(output, &result)

cmd := result["cmd"].([]interface{})
assertContains(t, cmd, "--yolo")
shell := result["cmd"].([]interface{})[2].(string)
assertShellContains(t, shell, "'--yolo'")
}

func TestCmdBuild_Yolo_ExplicitTrue(t *testing.T) {
Expand All @@ -283,9 +309,8 @@ func TestCmdBuild_Yolo_ExplicitTrue(t *testing.T) {

var result map[string]interface{}
json.Unmarshal(output, &result)

cmd := result["cmd"].([]interface{})
assertContains(t, cmd, "--yolo")
shell := result["cmd"].([]interface{})[2].(string)
assertShellContains(t, shell, "'--yolo'")
}

func TestCmdBuild_Yolo_Disabled(t *testing.T) {
Expand All @@ -301,12 +326,9 @@ func TestCmdBuild_Yolo_Disabled(t *testing.T) {

var result map[string]interface{}
json.Unmarshal(output, &result)

cmd := result["cmd"].([]interface{})
for _, v := range cmd {
if v == "--yolo" {
t.Error("cmd should NOT contain --yolo when disabled")
}
shell := result["cmd"].([]interface{})[2].(string)
if strings.Contains(shell, "--yolo") {
t.Error("shell cmd should NOT contain --yolo when disabled")
}
}

Expand Down Expand Up @@ -335,22 +357,9 @@ func captureBuildOutput(t *testing.T, args []string) []byte {
return buf[:n]
}

func assertContains(t *testing.T, slice []interface{}, val string) {
t.Helper()
for _, v := range slice {
if v == val {
return
}
}
t.Errorf("cmd %v does not contain %q", slice, val)
}

func assertSequence(t *testing.T, slice []interface{}, key, val string) {
func assertShellContains(t *testing.T, shell, substr string) {
t.Helper()
for i, v := range slice {
if v == key && i+1 < len(slice) && slice[i+1] == val {
return
}
if !strings.Contains(shell, substr) {
t.Errorf("shell cmd %q does not contain %q", shell, substr)
}
t.Errorf("cmd %v does not contain %q %q in sequence", slice, key, val)
}
Loading