aigency 0.3.0 → 0.4.0

data/lib/aigency/tempdir.rb

@@ -0,0 +1,19 @@
+# frozen_string_literal: true
+
+require 'tmpdir'
+require 'fileutils'
+
+module Aigency
+  module Tempdir
+    require 'aigency/tempdir/helpers'
+    require 'aigency/tempdir/list'
+    require 'aigency/tempdir/read'
+    require 'aigency/tempdir/write'
+    require 'aigency/tempdir/size'
+
+    PATH = Dir.mktmpdir
+    TOOLS = [List, Read, Write, Size]
+
+    at_exit { FileUtils.rm_rf PATH }
+  end
+end

data/lib/aigency/tool.rb

@@ -5,5 +5,10 @@ module Aigency
   #
   class Tool < RubyLLM::Tool
     include Usability
+
+    # class << self
+    #   alias desc description
+    #   alias params parameters
+    # end
   end
 end

data/lib/aigency/usability.rb

@@ -2,6 +2,7 @@
 
 module Aigency
   module Usability
+    # @return [Aigent]
     attr_reader :aigent
 
     def initialize(aigent)

data/lib/aigency/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Aigency
-  VERSION = '0.3.0'
+  VERSION = '0.4.0'
 end

data/lib/aigency/workspace/cat.rb

@@ -2,8 +2,8 @@
 
 module Aigency
   module Workspace
-    class Cat < Shell
-      desc 'Run the `cat` shell command in your workspace'
+    class Cat < Cmd
+      description 'Run the `cat` shell command in your workspace'
 
       def command = 'cat'
     end

data/lib/aigency/workspace/{shell.rb → cmd.rb}

@@ -4,7 +4,7 @@ require 'open3'
 
 module Aigency
   module Workspace
-    class Shell < Tool
+    class Cmd < Tool
       include Helpers
 
       # @abstract
@@ -34,7 +34,7 @@ module Aigency
       end
 
       def self.inherited other
-        other.params do
+        other.parameters do
           string :directory, description: "The working directory relative to workspace", required: false
           array :arguments, of: :string, description: "Command arguments", required: false
         end

data/lib/aigency/workspace/copy_tempdir_file.rb

@@ -0,0 +1,28 @@
+# frozen_string_literal: true
+
+require 'fileutils'
+
+module Aigency
+  module Workspace
+    class CopyTempdirFile < Tool
+      include Tempdir::Helpers
+      include Workspace::Helpers
+
+      description 'Copy a file from tempdir to workspace'
+
+      parameters do
+        string :tempdir_source, description: "A source filename in tempdir", required: true
+        string :workspace_dest, description: "A destination filename in workspace", required: true
+      end
+
+      def execute(tempdir_source:, workspace_dest:)
+        aigent.log.puts "[Workspace::CopyTempdirFile] #{tempdir_source.inspect} #{workspace_dest.inspect}"
+        abs_tempdir = expand_in_tempdir(tempdir_source)
+        abs_workspace = expand_in_workspace(workspace_dest)
+        FileUtils.copy_file abs_tempdir, abs_workspace
+      rescue StandardError => e
+        { success: false, error: "[#{e.class}] #{e.message}"}
+      end
+    end
+  end
+end

data/lib/aigency/workspace/cp.rb

@@ -2,8 +2,8 @@
 
 module Aigency
   module Workspace
-    class Cp < Shell
-      desc 'Run the `cp` shell command in your workspace'
+    class Cp < Cmd
+      description 'Run the `cp` shell command in your workspace'
 
       def command = 'cp'
     end

data/lib/aigency/workspace/diff.rb

@@ -2,8 +2,8 @@
 
 module Aigency
   module Workspace
-    class Diff < Shell
-      desc 'Run the `diff` shell command in your workspace'
+    class Diff < Cmd
+      description 'Run the `diff` shell command in your workspace'
 
       def command = 'diff'
     end

data/lib/aigency/workspace/grep.rb

@@ -2,8 +2,8 @@
 
 module Aigency
   module Workspace
-    class Grep < Shell
-      desc 'Run the `grep` shell command in your workspace'
+    class Grep < Cmd
+      description 'Run the `grep` shell command in your workspace'
 
       def command = 'grep'
 

data/lib/aigency/workspace/head.rb

@@ -2,8 +2,8 @@
 
 module Aigency
   module Workspace
-    class Head < Shell
-      desc 'Run the `head` shell command in your workspace'
+    class Head < Cmd
+      description 'Run the `head` shell command in your workspace'
 
       def command = 'head'
     end

data/lib/aigency/workspace/ls.rb

@@ -2,8 +2,8 @@
 
 module Aigency
   module Workspace
-    class Ls < Shell
-      desc 'Run the `ls` shell command in your workspace'
+    class Ls < Cmd
+      description 'Run the `ls` shell command in your workspace'
 
       def command = 'ls'
     end

data/lib/aigency/workspace/mkdir.rb

@@ -2,8 +2,8 @@
 
 module Aigency
   module Workspace
-    class Mkdir < Shell
-      desc 'Run the `mkdir` shell command in your workspace'
+    class Mkdir < Cmd
+      description 'Run the `mkdir` shell command in your workspace'
 
       def command = 'mkdir'
     end

data/lib/aigency/workspace/mv.rb

@@ -2,8 +2,8 @@
 
 module Aigency
   module Workspace
-    class Mv < Shell
-      desc 'Run the `mv` shell command in your workspace'
+    class Mv < Cmd
+      description 'Run the `mv` shell command in your workspace'
 
       def command = 'mv'
     end

data/lib/aigency/workspace/rm.rb

@@ -2,8 +2,8 @@
 
 module Aigency
   module Workspace
-    class Rm < Shell
-      desc 'Run the `rm` shell command in your workspace'
+    class Rm < Cmd
+      description 'Run the `rm` shell command in your workspace'
 
       def command = 'rm'
     end

data/lib/aigency/workspace/tail.rb

@@ -2,8 +2,8 @@
 
 module Aigency
   module Workspace
-    class Tail < Shell
-      desc 'Run the `tail` shell command in your workspace'
+    class Tail < Cmd
+      description 'Run the `tail` shell command in your workspace'
 
       def command = 'tail'
     end

data/lib/aigency/workspace/wc.rb

@@ -2,8 +2,8 @@
 
 module Aigency
   module Workspace
-    class Wc < Shell
-      desc 'Run the `wc` shell command in your workspace'
+    class Wc < Cmd
+      description 'Run the `wc` shell command in your workspace'
 
       def command = 'wc'
 

data/lib/aigency/workspace/write.rb

@@ -10,9 +10,9 @@ module Aigency
     class Write < Tool
       include Helpers
 
-      desc 'Write or append to a file in the workspace'
+      description 'Write or append to a file in the workspace'
 
-      params do
+      parameters do
         string :filename, description: "The filename relative to the workspace", required: true
         string :content, description: "The data to write to the file", required: true
         string :append, description: "Append if true or overwrite if false", required: true

data/lib/aigency/workspace.rb

@@ -2,10 +2,8 @@
 
 module Aigency
   module Workspace
-    class PathError < ArgumentError; end
-
     require 'aigency/workspace/helpers'
-    require 'aigency/workspace/shell'
+    require 'aigency/workspace/cmd'
     require 'aigency/workspace/cat'
     require 'aigency/workspace/cp'
     require 'aigency/workspace/diff'
@@ -16,11 +14,12 @@ module Aigency
     require 'aigency/workspace/rm'
     require 'aigency/workspace/wc'
     require 'aigency/workspace/write'
+    require 'aigency/workspace/copy_tempdir_file'
 
     Plugin.register Plugin.new(
       'workspace',
       directories: ['data/workspace'],
-      tools: [Cat, Cp, Diff, Grep, Ls, Mkdir, Mv, Rm, Wc, Write],
+      tools: [Cat, Cp, Diff, Grep, Ls, Mkdir, Mv, Rm, Wc, Write, CopyTempdirFile],
       config: <<~FILE
         prompt: "The workspace tools provide access to a readable and writeable directory."
       FILE

data/lib/aigency.rb

@@ -2,21 +2,23 @@
 
 require 'ruby_llm'
 
-# Core
-require 'aigency/version'
-require 'aigency/usability'
-require 'aigency/tool'
-require 'aigency/aigent'
-require 'aigency/plugin'
-require 'aigency/shell'
-
-# Extensions
-require 'aigency/workspace'
-require 'aigency/sandbox'
-
 module Aigency
+  class PathError < ArgumentError; end
+
   GEM_PATH = File.absolute_path(File.join(__dir__, '..'))
 
-  class Error < StandardError; end
-  # Your code goes here...
+  # Core
+  require 'aigency/version'
+  require 'aigency/usability'
+  require 'aigency/tool'
+  require 'aigency/delegator'
+  require 'aigency/plugin'
+  require 'aigency/aigent'
+  require 'aigency/shell'
+  require 'aigency/rake'
+
+  # Plugins and Tools
+  require 'aigency/sandbox'
+  require 'aigency/tempdir'
+  require 'aigency/workspace'
 end

data/scaffold/{Rakefile → aigent/aigent.rake}

@@ -1,7 +1,4 @@
-require "bundler/setup"
-require 'yaml'
-require 'dotenv/load'
-require 'aigency'
+# frozen_string_literal: true
 
 desc "Run a prompt from a file"
 task :load, [:filename] do |_, args|
@@ -17,12 +14,6 @@ task :load, [:filename] do |_, args|
   end
 end
 
-desc "Talk to the aigent"
-task :say, [:text] do |_, args|
-  aigent = Aigency::Aigent.new('.')
-  aigent.stream args[:text]
-end
-
 desc "Set up aigent plugins"
 task :setup do
   aigent = Aigency::Aigent.new('.')

data/scaffold/{.gitignore → enlist/.gitignore}

@@ -1 +1,2 @@
 data
+.env

data/scaffold/{README.md → enlist/README.md}

@@ -38,7 +38,7 @@ The `workspace` plugin gives your aigent a directory where it can manage its own
 
 The `sandbox` plugin provides a container where the aigent can not only manage files, but also run commands and scripts.
 
-The `workspace` plugin is sufficient for many aigents. Switch to `sandbox` if you need your aigent to perform complex tasks.
+The `workspace` plugin is sufficient for many aigents. Switch to `sandbox` if you need your aigent to perform software development or other complex tasks.
 
 ### 5. Run setup
 
@@ -50,10 +50,10 @@ rake setup
 
 ### Interactive Mode
 
-Talk to your aigent using the Rake task:
+Talk to your aigent using the `say` command:
 
 ```bash
-rake say["How many fibers are intertwined in a shredded wheat biscuit?"]
+bin/aigent say "How many fibers are intertwined in a shredded wheat biscuit?"
 ```
 
 ### Scheduling Tasks
@@ -84,3 +84,7 @@ If you enable the `sandbox` plugin, you'll need to start the container:
 ```bash
 docker compose up -d
 ```
+
+The sandbox app is initialized with an egress that only allows network access to domains that are whitelisted in `squid.conf`. See the `http_targets` and `ssh_targets` ACLs.
+
+Manage the sandbox user's SSH configuration in `data/sandbox_ssh`.

data/scaffold/enlist/Rakefile

@@ -0,0 +1,9 @@
+require "bundler/setup"
+require 'dotenv/load'
+Bundler.require(:default)
+
+Aigency::Rake.define('.')
+
+# Run `rake --tasks` for a list of tasks provided by aigent plugins.
+
+# Custom rake tasks can be added below.

data/scaffold/enlist/bin/aigent

@@ -0,0 +1,11 @@
+#!/usr/bin/env ruby
+# frozen_string_literal: true
+
+# turn off warning diagnostics from Ruby
+$VERBOSE=nil
+
+require "bundler/setup"
+require 'dotenv/load'
+Bundler.require(:default)
+
+Aigency::Aigent::Shell.start(ARGV)

data/scaffold/{config → enlist/config}/schedule.rb

@@ -19,6 +19,11 @@
 
 # Learn more: http://github.com/javan/whenever
 
+job_type :rake, "cd :path && :environment_variable=:environment :bundle_command rake :task :output"
+
+set :output, File.join(Dir.pwd, 'data', 'log', 'cron.log')
+
+# Example job: run a prompt from a file named `DAILY.md` once a day
 # every 1.day do
 #   rake "load[DAILY.md]"
 # end

data/scaffold/sandbox/Dockerfile

@@ -0,0 +1,37 @@
+FROM alpine:latest
+
+RUN apk update && apk upgrade && apk add --no-cache \
+      autoconf \
+      bash \
+      bison \
+      build-base \
+      curl \
+      git \
+      libffi-dev \
+      linux-headers \
+      mise \
+      musl-dev \
+      netcat-openbsd \
+      nodejs \
+      openssh \
+      openssl \
+      openssl-dev \
+      perl \
+      pkgconf \
+      python3 \
+      tzdata \
+      xz \
+      yaml-dev \
+      zlib-dev
+
+RUN adduser -D -h /sandbox user \
+    && mkdir -p /opt/mise \
+    && chown -R user:user /opt/mise
+USER user
+ENV MISE_DATA_DIR=/opt/mise \
+    MISE_CONFIG_DIR=/opt/mise/config \
+    MISE_TRUSTED_CONFIG_PATHS=/sandbox \
+    PATH=/opt/mise/shims:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin
+RUN mise use -g ruby@3.4 && mise install --yes
+
+CMD ["sleep", "infinity"]

data/scaffold/sandbox/docker-compose.yml

@@ -0,0 +1,37 @@
+services:
+  app:
+    build:
+      context: .
+      dockerfile: ./sandbox/Dockerfile
+    networks: [sandbox]
+    restart: unless-stopped
+    depends_on:
+      - egress
+    volumes:
+      - ./data/sandbox:/sandbox
+      - ./data/sandbox_ssh:/sandbox/.ssh
+    working_dir: /sandbox
+    environment:
+      - http_proxy=http://egress:3128
+      - https_proxy=http://egress:3128
+      - HTTP_PROXY=http://egress:3128
+      - HTTPS_PROXY=http://egress:3128
+      - no_proxy=localhost,127.0.0.1,::1
+      - NO_PROXY=localhost,127.0.0.1,::1
+    command: ["sleep", "infinity"]
+
+  egress:
+    image: ubuntu/squid
+    networks: [sandbox, outside]
+    volumes:
+      - ./sandbox/squid.conf:/etc/squid/squid.conf:ro
+
+networks:
+   sandbox:
+     internal: true
+     driver: bridge
+     driver_opts:
+       com.docker.network.bridge.gateway_mode_ipv4: isolated
+       com.docker.network.bridge.gateway_mode_ipv6: isolated
+   outside:
+     driver: bridge

data/{lib/aigency/sandbox/squid.conf.tpl → scaffold/sandbox/squid.conf}

@@ -11,10 +11,12 @@ forwarded_for off                    # don't leak the container's IP downstream
 
 acl SSL_ports  port 443
 acl Safe_ports port 80 443
-acl http_targets dstdomain example.com
+acl http_targets dstdomain \
+  www.example.com
 
 acl SSH_ports port 22
-acl ssh_targets dstdomain example.com
+acl ssh_targets dstdomain \
+  ssh.example.com
 
 http_access allow CONNECT ssh_targets SSH_ports
 http_access deny !Safe_ports

data/scaffold/sandbox/ssh_config

@@ -0,0 +1,2 @@
+Host *
+    ProxyCommand nc -X connect -x egress:3128 %h %p

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: aigency
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.4.0
 platform: ruby
 authors:
 - Fred Snyder
@@ -23,6 +23,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '3.2'
+- !ruby/object:Gem::Dependency
+  name: faraday
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.15'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.15'
 - !ruby/object:Gem::Dependency
   name: fileutils
   requirement: !ruby/object:Gem::Requirement
@@ -43,14 +57,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.15'
+        version: '2.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.15'
+        version: '2.1'
 - !ruby/object:Gem::Dependency
   name: thor
   requirement: !ruby/object:Gem::Requirement
@@ -120,18 +134,28 @@ files:
 - exe/aigency
 - lib/aigency.rb
 - lib/aigency/aigent.rb
+- lib/aigency/aigent/current_time.rb
+- lib/aigency/aigent/shell.rb
+- lib/aigency/delegator.rb
 - lib/aigency/plugin.rb
+- lib/aigency/plugin/shell.rb
+- lib/aigency/rake.rb
 - lib/aigency/sandbox.rb
-- lib/aigency/sandbox/Dockerfile.tpl
-- lib/aigency/sandbox/docker-compose.yml.tpl
 - lib/aigency/sandbox/exec.rb
-- lib/aigency/sandbox/squid.conf.tpl
 - lib/aigency/shell.rb
+- lib/aigency/tempdir.rb
+- lib/aigency/tempdir/helpers.rb
+- lib/aigency/tempdir/list.rb
+- lib/aigency/tempdir/read.rb
+- lib/aigency/tempdir/size.rb
+- lib/aigency/tempdir/write.rb
 - lib/aigency/tool.rb
 - lib/aigency/usability.rb
 - lib/aigency/version.rb
 - lib/aigency/workspace.rb
 - lib/aigency/workspace/cat.rb
+- lib/aigency/workspace/cmd.rb
+- lib/aigency/workspace/copy_tempdir_file.rb
 - lib/aigency/workspace/cp.rb
 - lib/aigency/workspace/diff.rb
 - lib/aigency/workspace/grep.rb
@@ -141,18 +165,22 @@ files:
 - lib/aigency/workspace/mkdir.rb
 - lib/aigency/workspace/mv.rb
 - lib/aigency/workspace/rm.rb
-- lib/aigency/workspace/shell.rb
 - lib/aigency/workspace/tail.rb
 - lib/aigency/workspace/wc.rb
 - lib/aigency/workspace/write.rb
-- scaffold/.env.example
-- scaffold/.gitignore
-- scaffold/Gemfile
-- scaffold/IDENTITY.md
-- scaffold/README.md
-- scaffold/Rakefile
-- scaffold/config/aigent.yml
-- scaffold/config/schedule.rb
+- scaffold/aigent/aigent.rake
+- scaffold/enlist/.env.example
+- scaffold/enlist/.gitignore
+- scaffold/enlist/Gemfile
+- scaffold/enlist/IDENTITY.md
+- scaffold/enlist/README.md
+- scaffold/enlist/Rakefile
+- scaffold/enlist/bin/aigent
+- scaffold/enlist/config/schedule.rb
+- scaffold/sandbox/Dockerfile
+- scaffold/sandbox/docker-compose.yml
+- scaffold/sandbox/squid.conf
+- scaffold/sandbox/ssh_config
 - sig/aigency.rbs
 licenses: []
 metadata: {}

data/lib/aigency/sandbox/Dockerfile.tpl

@@ -1,13 +0,0 @@
-FROM alpine:latest
-
-RUN apk add --no-cache \
-      build-base \
-      musl-dev \
-      linux-headers \
-      git \
-      curl
-
-RUN adduser -D -h /sandbox user
-USER user
-
-CMD ["sleep", "infinity"]

data/lib/aigency/sandbox/docker-compose.yml.tpl

@@ -1,26 +0,0 @@
-services:
-  app:
-    build:
-      context: .
-      dockerfile: Dockerfile
-    volumes:
-      - ./data/sandbox:/sandbox
-      - ./data/sandbox_ssh:/sandbox/.ssh:ro
-    working_dir: /sandbox
-    command: ["sleep", "infinity"]
-
-  egress:
-    image: ubuntu/squid
-    networks: [sandbox, outside]
-    volumes:
-      - ./squid.conf:/etc/squid/squid.conf:ro
-
-networks:
-   sandbox:
-     internal: true
-     driver: bridge
-     driver_opts:
-       com.docker.network.bridge.gateway_mode_ipv4: isolated
-       com.docker.network.bridge.gateway_mode_ipv6: isolated
-   outside:
-     driver: bridge

data/scaffold/config/aigent.yml

@@ -1,9 +0,0 @@
-name: Aigent
-openai_api_base: ${OPENAI_API_BASE}
-openai_api_key: ${OPENAI_API_KEY}
-# max_tokens: 65536
-plugins:
-  # You should only need either a workspace or a sandbox, not both. If you
-  # enable one, it's recommended that you disable the other.
-  # - sandbox
-  - workspace