tinker-agent 1.0.27 → 1.0.29

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "tinker-agent",
-  "version": "1.0.27",
+  "version": "1.0.29",
   "description": "Tinker Agent Runner",
   "bin": {
     "tinker-agent": "./run-tinker-agent.rb"

package/run-tinker-agent.rb

@@ -12,11 +12,18 @@
 #   - tinker.env.rb in project root (gitignored)
 
 require "json"
+require "fileutils"
 
 # Load agent configs
 require_relative "agents"
 
-IMAGE_NAME = "tinker-sandbox"
+def image_name(config)
+  if config["project_id"]
+    "tinker-sandbox-#{config['project_id']}"
+  else
+    "tinker-sandbox"
+  end
+end
 
 AGENT_TYPES = AGENT_CONFIGS.keys.freeze
 
@@ -84,7 +91,7 @@ def check_dockerfile!
   end
 end
 
-def build_docker_image
+def build_docker_image(config)
   check_dockerfile!
 
   user_id = `id -u`.strip
@@ -92,14 +99,42 @@ def build_docker_image
 
   puts "🏗️  Building Docker image..."
 
-  success = system(
-    "docker", "build",
-    "--build-arg", "USER_ID=#{user_id}",
-    "--build-arg", "GROUP_ID=#{group_id}",
-    "-t", IMAGE_NAME,
-    "-f", "Dockerfile.sandbox",
-    "."
-  )
+  # Handle .dockerignore.sandbox
+  dockerignore_sandbox = ".dockerignore.sandbox"
+  dockerignore_original = ".dockerignore"
+  dockerignore_backup = ".dockerignore.bak"
+
+  has_sandbox_ignore = File.exist?(dockerignore_sandbox)
+  has_original_ignore = File.exist?(dockerignore_original)
+
+  if has_sandbox_ignore
+    puts "📦 Swapping .dockerignore with .dockerignore.sandbox..."
+    if has_original_ignore
+      FileUtils.mv(dockerignore_original, dockerignore_backup)
+    end
+    FileUtils.cp(dockerignore_sandbox, dockerignore_original)
+  end
+
+  success = false
+  begin
+    success = system(
+      "docker", "build",
+      "--build-arg", "USER_ID=#{user_id}",
+      "--build-arg", "GROUP_ID=#{group_id}",
+      "-t", image_name(config),
+      "-f", "Dockerfile.sandbox",
+      "."
+    )
+  ensure
+    if has_sandbox_ignore
+      # Restore original state
+      FileUtils.rm(dockerignore_original) if File.exist?(dockerignore_original)
+      if has_original_ignore
+        FileUtils.mv(dockerignore_backup, dockerignore_original)
+      end
+      puts "🧹 Restored original .dockerignore"
+    end
+  end
 
   unless success
     puts "❌ Failed to build Docker image"
@@ -194,7 +229,15 @@ def run_agent(agent_type, config)
   local_setup_script = File.join(File.dirname(__FILE__), "setup-agent.rb")
   
   # Check for local agent-bridge binaries (for development)
-  local_bridge = File.join(Dir.pwd, "bin", "agent-bridge")
+  # Priority: 
+  # 1. Linux binary matching host arch (for proper container execution)
+  # 2. Legacy bin/agent-bridge if it's a binary (not script)
+
+  arch = `uname -m`.strip
+  linux_arch = (arch == "x86_64") ? "amd64" : "arm64"
+  linux_bridge = File.join(Dir.pwd, "tinker-public", "bin", "agent-bridge-linux-#{linux_arch}")
+  
+  local_bridge_default = File.join(Dir.pwd, "bin", "agent-bridge")
   local_tmux = File.join(File.dirname(__FILE__), "bin", "agent-bridge-tmux")
   
   mounts = []
@@ -203,9 +246,18 @@ def run_agent(agent_type, config)
     mounts += ["-v", "#{File.expand_path(local_setup_script)}:/tmp/setup-agent.rb:ro"]
   end
 
-  if File.exist?(local_bridge)
-    puts "🔧 Using local agent-bridge binary"
-    mounts += ["-v", "#{local_bridge}:/tmp/agent-bridge:ro"]
+  if File.exist?(linux_bridge)
+    puts "🔧 Using local linux binary: #{linux_bridge}"
+    mounts += ["-v", "#{linux_bridge}:/tmp/agent-bridge:ro"]
+  elsif File.exist?(local_bridge_default)
+    # Check if it's a binary or script
+    is_script = File.read(local_bridge_default, 4) == "#!/b"
+    if is_script
+       puts "⚠️  bin/agent-bridge is a host wrapper script. Please run 'bin/build-bridge' to generate linux binaries."
+    else
+       puts "🔧 Using local agent-bridge binary"
+       mounts += ["-v", "#{local_bridge_default}:/tmp/agent-bridge:ro"]
+    end
   end
   
   if File.exist?(local_tmux)
@@ -215,9 +267,9 @@ def run_agent(agent_type, config)
   docker_cmd += mounts
 
   if File.exist?(local_setup_script)
-    docker_cmd += [IMAGE_NAME, "ruby", "/tmp/setup-agent.rb"]
+    docker_cmd += [image_name(config), "ruby", "/tmp/setup-agent.rb"]
   else
-    docker_cmd += [IMAGE_NAME]
+    docker_cmd += [image_name(config)]
   end
 
   success = system(*docker_cmd)
@@ -248,7 +300,7 @@ def attach_to_agent(agent_type, config)
 
   if running.empty?
     puts "⚠️  #{agent_type} agent is not running. Auto-starting..."
-    build_docker_image
+    build_docker_image(config)
     run_agent(agent_type, config)
     sleep 3
   end
@@ -312,6 +364,6 @@ if command == "attach"
   attach_to_agent(agent_type, config)
 else
   config = load_config
-  build_docker_image
+  build_docker_image(config)
   run_agent(command, config)
 end