workspaces 0.1.6 → 0.1.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8817ac7615085c4aef7e23b75b8034ac494ad7c2c61b9f53dd14fc79232350cd
-  data.tar.gz: f670f3dbe8ad41cbcc46e29833bd0be27dcd04fcbe48465a78e80a756fc95764
+  metadata.gz: 9d9d7e03d386bd8949baf124281f3ac26eb2b49f7fb109a97a8f0a4fb16263fa
+  data.tar.gz: 76ab8e2adfeb5a5daea4526a41d6d33991076000bd4bed0f621df6355511341a
 SHA512:
-  metadata.gz: e672a1e9ca5e3186364077718a1ff69851435de0a69e0deadcdeae1ab5715cc8a5acf4e42b17bc8f2639f58a6d6dcb907d10380cda72b59bbebf29d536846de8
-  data.tar.gz: dac093c4058c50a6a8abb863bf61156a88f760768ea5709995ffc800d4654b380305fffc09d3bb6466d19f4ca1ac9a0a85f47a09043c3f9902a66e40012db8b3
+  metadata.gz: 7d5c69e3d6c6201d08b3bd70d100b8adaf1eb53f3aba93ab91ae3656ab67d6350239dff291fa706f67b7350e7296656ddb4f82b57b6fb9aa4469b5d3a45fdbb9
+  data.tar.gz: aba50059b56131d6f949f9badc2327fe5a3f4d05e384452299e2e2afc45b7c24be7a93cf7d76a9c2bf5b96d1bb3a71938a3cbe3d74451a28e718430ba1784a20

data/README.md

@@ -121,6 +121,24 @@ and defining them requires no JavaScript edits. Preset keys must be declared in
 `default_editable_env`; recipes reject undeclared keys and secret-like values.
 Hidden environment values are never exposed in the editor or preset choices.
 
+Use `create --branch main --preset Demo` to save a preset for a new, still-idle
+workspace. `start ID --preset Demo` applies it before preparing a stopped
+workspace; `restart ID --preset 'Demo off'` switches a running workspace and
+restarts its server. `prepare ID --preset Demo` switches and rebuilds. An
+unknown name is rejected without changing saved settings. Selecting a preset
+replaces the editable settings (including custom editor lines) but preserves
+hidden legacy overrides. A running workspace requires `restart --preset` or
+`prepare --preset`, not `start --preset`.
+
+For one-off non-secret tweaks, add repeatable `--set NAME=VALUE` and
+`--unset NAME` flags to `create`, `start`, `prepare`, or `restart`. For example,
+`restart ID --preset Demo --set DEMO_FEATURE=on` applies the preset first,
+then the individual changes, and restarts. Without `--preset`, these flags
+patch current editable settings. Names reserved for the runner and names
+suggesting secrets are rejected; values on the command line may be visible
+in process listings and shell history. Use a secret store, not `--set`, for
+credentials.
+
 The front door is not an authentication boundary. Its host and same-origin checks
 protect routing and POST actions, but a publicly reachable instance still needs
 access control such as VPN or SSO. Do not expose workspace backend ports directly.

data/lib/workspaces/cli.rb

@@ -49,6 +49,28 @@ module Workspaces
       options = {}
       OptionParser.new do |parser|
         parse_common_options(parser, options)
+        parser.on('--preset NAME') { |value| options[:preset] = value } if %w(create start prepare restart).include?(command)
+        if %w(create start prepare restart).include?(command)
+          parser.on('--set NAME=VALUE') do |value|
+            name, separator, setting = value.partition('=')
+            raise OptionParser::InvalidArgument, '--set requires NAME=VALUE' if separator.empty?
+            EnvironmentOverrides.validate_name!(name)
+            EnvironmentOverrides.validate_value!(setting)
+            if name.match?(/(?:SECRET|TOKEN|PASSWORD|API_KEY|PRIVATE_KEY|CREDENTIAL)/i)
+              raise OptionParser::InvalidArgument, 'Secret-like names cannot be set on the command line'
+            end
+            options[:set] ||= {}
+            raise OptionParser::InvalidArgument, 'duplicate --set name' if options[:set].key?(name)
+            options[:set][name] = setting
+          end
+          parser.on('--unset NAME') do |value|
+            EnvironmentOverrides.validate_name!(value)
+            if value.match?(/(?:SECRET|TOKEN|PASSWORD|API_KEY|PRIVATE_KEY|CREDENTIAL)/i)
+              raise OptionParser::InvalidArgument, 'Secret-like names cannot be unset on the command line'
+            end
+            (options[:unset] ||= []) << value
+          end
+        end
         parse_tls_options(parser, options) if command == 'serve'
       end.parse!(argv)
       options
@@ -102,7 +124,8 @@ module Workspaces
     end
 
     def create(_id, options)
-      emit(registry.create(**options.slice(:branch, :pr, :new_branch, :from)).describe, options)
+      emit(registry.create(**options.slice(:branch, :pr, :new_branch, :from, :preset),
+                           set: options.fetch(:set, {}), unset: options.fetch(:unset, [])).describe, options)
     end
 
     def list(_id, options)
@@ -114,14 +137,16 @@ module Workspaces
     end
 
     def lifecycle(id, options)
-      action = proc { run_lifecycle(options.fetch(:command), id) }
+      action = proc { run_lifecycle(options.fetch(:command), id, preset: options[:preset],
+                                    set: options.fetch(:set, {}), unset: options.fetch(:unset, [])) }
       result = options[:json] ? with_stdout_on_stderr(&action) : action.call
       emit(result, options)
       raise ArgumentError, result['last_error'] if result['status'] == 'error'
     end
 
-    def run_lifecycle(command, id)
-      started = command == 'restart' ? coordinator.restart(id) : coordinator.start(id, force: command == 'prepare')
+    def run_lifecycle(command, id, preset: nil, set: {}, unset: [])
+      started = command == 'restart' ? coordinator.restart(id, preset: preset, set: set, unset: unset) :
+        coordinator.start(id, force: command == 'prepare', preset: preset, set: set, unset: unset)
       if !started && coordinator.snapshot(id)['active']
         raise ArgumentError, 'Workspace is busy; inspect it with show --json'
       end
@@ -171,8 +196,8 @@ module Workspaces
     end
 
     def usage
-      'Usage: bin/workspaces serve | create (--branch REF | --pr NUMBER | --new-branch NAME [--from REF]) [--json] | ' \
-        'list [--pr NUMBER] [--json] | show/start/prepare/restart/stop ID [--json] | ' \
+      'Usage: bin/workspaces serve | create (--branch REF | --pr NUMBER | --new-branch NAME [--from REF]) [--preset NAME] [--set NAME=VALUE] [--unset NAME] [--json] | ' \
+        'list [--pr NUMBER] [--json] | show/start/prepare/restart ID [--preset NAME] [--set NAME=VALUE] [--unset NAME] [--json] | stop ID | ' \
         'exec ID -- COMMAND... | remove ID [--force]'
     end
 

data/lib/workspaces/coordinator.rb

@@ -18,12 +18,12 @@ module Workspaces
       @workers_mutex = Mutex.new
     end
 
-    def start(id, force: false)
-      launch(id, restart: false, force: force)
+    def start(id, force: false, preset: nil, set: {}, unset: [])
+      launch(id, restart: false, force: force, prelaunch: settings_update(id, preset, set, unset))
     end
 
-    def restart(id)
-      launch(id, restart: true, force: true)
+    def restart(id, preset: nil, set: {}, unset: [])
+      launch(id, restart: true, force: true, prelaunch: settings_update(id, preset, set, unset))
     end
 
     def update_environment(id, set:, remove:)
@@ -73,6 +73,14 @@ module Workspaces
 
     private
 
+    def settings_update(id, preset, set, unset)
+      return if !preset && set.empty? && unset.empty?
+
+      lambda do |_workspace|
+        EnvironmentOverrides.new(id).apply_settings(preset: preset, set: set, unset: unset)
+      end
+    end
+
     def resolve_status(id, status, busy)
       return busy ? status : 'interrupted' if ACTIVE.include?(status)
       return status if status == 'error'
@@ -107,6 +115,9 @@ module Workspaces
       lock = acquire_lock(id)
       return false unless lock
 
+      if prelaunch && !restart && !force && Backend.new(id).running?
+        raise ArgumentError, 'Workspace is running; use restart --preset to change its environment'
+      end
       return false if backend_already_running?(id, force, lock)
       prelaunch&.call(workspace)
       publish_starting(id, restart)

data/lib/workspaces/environment_overrides.rb

@@ -75,6 +75,33 @@ module Workspaces
       load
     end
 
+    def apply_preset(name, recipe: Recipe.new)
+      apply_settings(preset: name, recipe: recipe)
+    end
+
+    def self.settings_for(recipe:, preset: nil, set: {}, unset: [], current: nil)
+      defaults = recipe.default_editable_env
+      preset_values = recipe.environment_presets.fetch(preset) { raise Invalid, "Unknown environment preset: #{preset}" } if preset
+      values = preset ? defaults.merge(preset_values) : (current || defaults).dup
+      validate_entries!(set)
+      unset.each { |name| validate_name!(name) }
+      raise Invalid, 'Cannot set and unset the same name' unless (set.keys & unset).empty?
+      names = set.keys + unset
+      if names.any? { |name| name.match?(/(?:SECRET|TOKEN|PASSWORD|API_KEY|PRIVATE_KEY|CREDENTIAL)/i) }
+        raise Invalid, 'Secret-like environment names cannot be stored in the visible editor'
+      end
+      values.merge!(set)
+      unset.each { |name| values.delete(name) }
+      validate_entries!(values)
+      values
+    end
+
+    def apply_settings(preset: nil, set: {}, unset: [], recipe: Recipe.new)
+      current = preset ? nil : editable_values(recipe.default_editable_env)
+      values = self.class.settings_for(recipe: recipe, preset: preset, set: set, unset: unset, current: current)
+      replace_editable(values.sort.map { |key, value| "#{key}=#{value}" }.join("\n"), defaults: recipe.default_editable_env)
+    end
+
     def apply_patch(set:, remove:)
       validate_patch!(set, remove)
       updated = load_file(file_path).merge(set)

data/lib/workspaces/registry.rb

@@ -1,6 +1,8 @@
 require_relative 'worktree'
 require_relative 'state_store'
 require_relative 'backend'
+require_relative 'recipe'
+require_relative 'environment_overrides'
 
 module Workspaces
   class Registry
@@ -17,9 +19,12 @@ module Workspaces
       end
     end
 
-    def create(**options)
+    def create(preset: nil, set: {}, unset: [], **options)
+      recipe = Recipe.new if preset || !set.empty? || !unset.empty?
+      EnvironmentOverrides.settings_for(recipe: recipe, preset: preset, set: set, unset: unset) if recipe
       workspace = Worktree.create(**options)
       StateStore.new(Config.state_file).set(workspace.id, 'status' => 'idle', 'related_pr' => workspace.related_pr)
+      EnvironmentOverrides.new(workspace.id).apply_settings(preset: preset, set: set, unset: unset, recipe: recipe) if recipe
       workspace
     end
 

data/lib/workspaces/version.rb

@@ -1,3 +1,3 @@
 module Workspaces
-  VERSION = '0.1.6'
+  VERSION = '0.1.7'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: workspaces
 version: !ruby/object:Gem::Version
-  version: 0.1.6
+  version: 0.1.7
 platform: ruby
 authors:
 - Workspaces contributors
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2026-10-06 00:00:00.000000000 Z
+date: 2026-10-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack