tloop-cli 0.4.0__tar.gz → 0.5.0__tar.gz

{tloop_cli-0.4.0/src/tloop_cli.egg-info → tloop_cli-0.5.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: tloop-cli
-Version: 0.4.0
+Version: 0.5.0
 Summary: Automated Claude Code task runner
 License-Expression: MIT
 Requires-Python: >=3.9
@@ -16,8 +16,8 @@ Dynamic: license-file
 ## 安装
 
 ```bash
-pip install t-loop            # 从 PyPI 安装
-pip install -e .              # 本地开发安装
+pip install tloop-cli           # 从 PyPI 安装
+pip install -e .                # 本地开发安装
 ```
 
 需要 Python >=3.9，唯一外部依赖：`pyyaml`。

{tloop_cli-0.4.0 → tloop_cli-0.5.0}/README.md

@@ -5,8 +5,8 @@
 ## 安装
 
 ```bash
-pip install t-loop            # 从 PyPI 安装
-pip install -e .              # 本地开发安装
+pip install tloop-cli           # 从 PyPI 安装
+pip install -e .                # 本地开发安装
 ```
 
 需要 Python >=3.9，唯一外部依赖：`pyyaml`。

{tloop_cli-0.4.0 → tloop_cli-0.5.0}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "tloop-cli"
-version = "0.4.0"
+version = "0.5.0"
 description = "Automated Claude Code task runner"
 readme = "README.md"
 requires-python = ">=3.9"

tloop_cli-0.5.0/src/cmd_edit.py

@@ -0,0 +1,108 @@
+"""tloop edit — open ~/.tloop/tasks.yaml in editor."""
+
+import argparse
+import json
+import os
+import shutil
+import subprocess
+
+import config
+
+KNOWN_EDITORS = {
+    "code": ("Visual Studio Code", "code"),
+    "vim": ("Vim", "vim"),
+    "nano": ("Nano", "nano"),
+}
+
+EDIT_HELP = """\
+Open ~/.tloop/tasks.yaml in your editor.
+
+On first run, you will be prompted to choose an editor (VS Code, Vim, Nano,
+or a custom command). The choice is saved to ~/.tloop/settings.json.
+Override anytime with: tloop edit --editor <command>
+
+Task file format (~/.tloop/tasks.yaml):
+
+  tasks:
+    - name: My task
+      dir: ~/projects/my-project
+      prompt: |
+        Describe what Claude should do.
+      # OR:
+      prompt_file: ./prompts/my-task.md
+      branch: true           # true=auto, "custom/name", false=skip
+
+  Each task runs in the specified directory. Completed tasks are
+  archived to ~/.tloop/archive/ after each run cycle.
+"""
+
+
+def _load_settings():
+    if config.SETTINGS_FILE.exists():
+        try:
+            return json.loads(config.SETTINGS_FILE.read_text())
+        except (json.JSONDecodeError, OSError):
+            pass
+    return {}
+
+
+def _save_settings(settings):
+    config.TLOOP_HOME.mkdir(exist_ok=True)
+    config.SETTINGS_FILE.write_text(json.dumps(settings, indent=2) + "\n")
+
+
+def _prompt_editor():
+    options = []
+    for key, (label, cmd) in KNOWN_EDITORS.items():
+        if shutil.which(cmd):
+            options.append((key, label, cmd))
+
+    print(f"{config.BOLD}Choose your editor for tasks.yaml:{config.RESET}\n")
+    for i, (key, label, _) in enumerate(options, 1):
+        print(f"  {i}) {label}")
+    print(f"  {len(options) + 1}) Other (enter command manually)")
+    print()
+
+    while True:
+        choice = input(f"Enter number [1-{len(options) + 1}]: ").strip()
+        if choice.isdigit():
+            idx = int(choice)
+            if 1 <= idx <= len(options):
+                return options[idx - 1][2]
+            if idx == len(options) + 1:
+                cmd = input("Enter editor command: ").strip()
+                if cmd:
+                    return cmd
+        print("Invalid choice, try again.")
+
+
+def _resolve_editor(cli_editor=None):
+    if cli_editor:
+        return cli_editor
+    settings = _load_settings()
+    if "editor" in settings:
+        return settings["editor"]
+    editor = _prompt_editor()
+    _save_settings({"editor": editor})
+    print(f"{config.GREEN}Editor saved. Change anytime with: tloop edit --editor <command>{config.RESET}\n")
+    return editor
+
+
+def add_parser(subparsers):
+    p = subparsers.add_parser(
+        "edit",
+        help="Open ~/.tloop/tasks.yaml in editor",
+        description=EDIT_HELP,
+        formatter_class=argparse.RawDescriptionHelpFormatter,
+    )
+    p.add_argument("--editor", help="Override editor command for this session")
+    p.set_defaults(func=handle)
+
+
+def handle(args):
+    config.TLOOP_HOME.mkdir(exist_ok=True)
+    if not config.TASKS_FILE.exists():
+        config.TASKS_FILE.write_text(config.SAMPLE_TASKS_YAML)
+
+    editor = _resolve_editor(getattr(args, "editor", None))
+    subprocess.run([editor, str(config.TASKS_FILE)])

{tloop_cli-0.4.0 → tloop_cli-0.5.0}/src/cmd_run.py

@@ -24,7 +24,6 @@ def handle(args):
 
     cfg = load_config()
     tasks = cfg.get("tasks", [])
-    defaults = cfg.get("defaults", {})
 
     if not tasks:
         print("No tasks defined in tasks.yaml")
@@ -71,7 +70,7 @@ def handle(args):
                 continue
 
         ran_any = True
-        success = run_task(tasks[i], i, state, defaults)
+        success = run_task(tasks[i], i, state)
         if not success and not args.continue_on_fail:
             print(f"\n{config.YELLOW}Stopped. Use -c to continue after failures.{config.RESET}")
             break

{tloop_cli-0.4.0 → tloop_cli-0.5.0}/src/config.py

@@ -8,6 +8,7 @@ import yaml
 TLOOP_HOME = Path.home() / ".tloop"
 TASKS_FILE = TLOOP_HOME / "tasks.yaml"
 STATE_FILE = TLOOP_HOME / "state.json"
+SETTINGS_FILE = TLOOP_HOME / "settings.json"
 LOGS_DIR = TLOOP_HOME / "logs"
 ARCHIVE_DIR = TLOOP_HOME / "archive"
 
@@ -18,34 +19,7 @@ CYAN = "\033[96m"
 BOLD = "\033[1m"
 RESET = "\033[0m"
 
-SAMPLE_TASKS_YAML = """\
-# t-loop tasks.yaml
-# Define your Claude Code automation tasks here.
-#
-# Location: ~/.tloop/tasks.yaml
-#
-# Each task runs "cybervisor run <prompt>" in the specified directory.
-# Completed tasks are automatically archived after each run cycle.
-# View archives with: tloop archive
-#
-# prompt_file paths resolve in this order:
-#   1. Absolute path (after ~ expansion)
-#   2. Relative to ~/.tloop/
-#   3. Relative to the task's dir
-
-defaults:
-  # model: opus
-
-tasks: []
-  # - name: My first task
-  #   dir: ~/projects/my-project
-  #   prompt: |
-  #     Describe what Claude should do here.
-  #
-  # - name: Task with prompt file
-  #   dir: ~/projects/my-project
-  #   prompt_file: ./prompts/my-task.md
-"""
+SAMPLE_TASKS_YAML = "# Run 'tloop edit --help' for details on how to write this file.\ntasks: []\n"
 
 
 def ensure_tloop_home():

{tloop_cli-0.4.0 → tloop_cli-0.5.0}/src/runner/__init__.py

@@ -5,6 +5,6 @@ from abc import ABC, abstractmethod
 
 class Runner(ABC):
     @abstractmethod
-    def run(self, prompt, cwd, model=None, log_file=None):
+    def run(self, prompt, cwd, log_file=None):
         """Run a task. Returns exit code (0=success)."""
         ...

tloop_cli-0.5.0/src/runner/cybervisor.py

@@ -0,0 +1,35 @@
+"""Cybervisor runner backend."""
+
+import subprocess
+
+from runner import Runner
+
+
+class CybervisorRunner(Runner):
+    def run(self, prompt, cwd, log_file=None, prompt_file=None):
+        cmd = ["cybervisor", "run"]
+
+        with open(log_file, "a") if log_file else open("/dev/null", "a") as log:
+            stdin_fh = open(prompt_file, "r") if prompt_file else None
+            try:
+                process = subprocess.Popen(
+                    cmd,
+                    cwd=cwd,
+                    stdin=stdin_fh if stdin_fh else subprocess.PIPE,
+                    stdout=subprocess.PIPE,
+                    stderr=subprocess.STDOUT,
+                    text=True,
+                )
+                if not stdin_fh:
+                    process.stdin.write(prompt)
+                    process.stdin.close()
+                for line in process.stdout:
+                    print(line, end="")
+                    log.write(line)
+                log.flush()
+                process.wait()
+            finally:
+                if stdin_fh:
+                    stdin_fh.close()
+
+        return process.returncode

{tloop_cli-0.4.0 → tloop_cli-0.5.0}/src/task.py

@@ -28,12 +28,11 @@ def resolve_prompt_file(prompt_file, dir_path):
     return Path(prompt_file)
 
 
-def run_task(task, index, state, defaults):
+def run_task(task, index, state):
     name = task.get("name", f"Task {index + 1}")
-    dir_path = expand_dir(task.get("dir", defaults.get("dir", ".")))
+    dir_path = expand_dir(task.get("dir", "."))
     prompt = task.get("prompt", "")
     prompt_file = task.get("prompt_file")
-    model = task.get("model", defaults.get("model"))
     branch_config = task.get("branch", True)
 
     if not os.path.isdir(dir_path):
@@ -46,10 +45,11 @@ def run_task(task, index, state, defaults):
         save_state(state)
         return False
 
+    resolved_pf = None
     if prompt_file:
-        pf = resolve_prompt_file(prompt_file, dir_path)
-        if pf.exists():
-            prompt = pf.read_text()
+        resolved_pf = resolve_prompt_file(prompt_file, dir_path)
+        if resolved_pf.exists():
+            prompt = resolved_pf.read_text()
         else:
             print(f"{config.RED}  Prompt file not found: {prompt_file}{config.RESET}")
             return False
@@ -100,12 +100,12 @@ def run_task(task, index, state, defaults):
     try:
         with open(log_file, "a") as log:
             log.write(f"Started: {started}\n")
-            log.write(f"Command: cybervisor run <prompt>\n")
+            log.write(f"Command: cybervisor run < {'<prompt_file>' if resolved_pf else '<prompt>'}\n")
             log.write("-" * 60 + "\n\n")
             log.flush()
 
         runner = CybervisorRunner()
-        returncode = runner.run(prompt, dir_path, model=model, log_file=log_file)
+        returncode = runner.run(prompt, dir_path, log_file=log_file, prompt_file=resolved_pf)
 
         if returncode == 0:
             state["tasks"][str(index)] = {

{tloop_cli-0.4.0 → tloop_cli-0.5.0/src/tloop_cli.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: tloop-cli
-Version: 0.4.0
+Version: 0.5.0
 Summary: Automated Claude Code task runner
 License-Expression: MIT
 Requires-Python: >=3.9
@@ -16,8 +16,8 @@ Dynamic: license-file
 ## 安装
 
 ```bash
-pip install t-loop            # 从 PyPI 安装
-pip install -e .              # 本地开发安装
+pip install tloop-cli           # 从 PyPI 安装
+pip install -e .                # 本地开发安装
 ```
 
 需要 Python >=3.9，唯一外部依赖：`pyyaml`。

{tloop_cli-0.4.0 → tloop_cli-0.5.0}/test/test_cli.py

@@ -15,6 +15,7 @@ import config
 import state as state_mod
 import task as task_mod
 import cmd_run
+import cmd_edit
 
 
 def _init_git_repo(tmpdir):
@@ -44,6 +45,7 @@ def _setup_home(tmp_path):
         patch.object(config, "TLOOP_HOME", home),
         patch.object(config, "TASKS_FILE", home / "tasks.yaml"),
         patch.object(config, "STATE_FILE", home / "state.json"),
+        patch.object(config, "SETTINGS_FILE", home / "settings.json"),
         patch.object(config, "LOGS_DIR", home / "logs"),
         patch.object(config, "ARCHIVE_DIR", home / "archive"),
     ]
@@ -60,6 +62,7 @@ class EnsureTloopHomeTests(unittest.TestCase):
             patch.object(config, "TLOOP_HOME", self.home),
             patch.object(config, "TASKS_FILE", self.home / "tasks.yaml"),
             patch.object(config, "STATE_FILE", self.home / "state.json"),
+            patch.object(config, "SETTINGS_FILE", self.home / "settings.json"),
             patch.object(config, "LOGS_DIR", self.home / "logs"),
             patch.object(config, "ARCHIVE_DIR", self.home / "archive"),
         ]
@@ -86,7 +89,7 @@ class EnsureTloopHomeTests(unittest.TestCase):
         self.assertTrue(tasks_file.exists())
         content = tasks_file.read_text()
         self.assertIn("tasks:", content)
-        self.assertIn("defaults:", content)
+        self.assertTrue(content.startswith("# Run 'tloop edit --help'"))
 
     def test_idempotent_no_exit_when_tasks_exist(self):
         self.home.mkdir(parents=True, exist_ok=True)
@@ -765,7 +768,7 @@ class RunTaskGitIntegrationTests(unittest.TestCase):
             "prompt": "do something",
             "branch": "feat/test",
         }
-        result = task_mod.run_task(task, 0, state, {})
+        result = task_mod.run_task(task, 0, state)
         self.assertTrue(result)
         mock_clean.assert_called_once()
         mock_branch.assert_called_once_with(self.tmpdir, "feat/test")
@@ -778,7 +781,7 @@ class RunTaskGitIntegrationTests(unittest.TestCase):
             "dir": self.tmpdir,
             "prompt": "do something",
         }
-        result = task_mod.run_task(task, 0, state, {})
+        result = task_mod.run_task(task, 0, state)
         self.assertFalse(result)
         self.assertEqual(state["tasks"]["0"]["status"], "failed")
         self.assertIn("auto-commit", state["tasks"]["0"]["error"])
@@ -793,7 +796,7 @@ class RunTaskGitIntegrationTests(unittest.TestCase):
             "prompt": "do something",
             "branch": True,
         }
-        result = task_mod.run_task(task, 0, state, {})
+        result = task_mod.run_task(task, 0, state)
         self.assertFalse(result)
         self.assertEqual(state["tasks"]["0"]["status"], "failed")
         self.assertIn("branch", state["tasks"]["0"]["error"])
@@ -806,10 +809,63 @@ class RunTaskGitIntegrationTests(unittest.TestCase):
             "dir": self.tmpdir,
             "prompt": "do something",
         }
-        task_mod.run_task(task, 0, state, {})
+        task_mod.run_task(task, 0, state)
         self.assertNotEqual(state["tasks"]["0"]["status"], "running")
         self.assertEqual(state["tasks"]["0"]["status"], "failed")
 
 
+class EditorSelectionTests(unittest.TestCase):
+    """Tests for editor selection and persistence in cmd_edit."""
+
+    def setUp(self):
+        self.tmpdir = tempfile.mkdtemp()
+        self.home = Path(self.tmpdir) / "tloop"
+        self.home.mkdir(parents=True)
+        self.patches = [
+            patch.object(config, "TLOOP_HOME", self.home),
+            patch.object(config, "SETTINGS_FILE", self.home / "settings.json"),
+        ]
+        for p in self.patches:
+            p.start()
+
+    def tearDown(self):
+        for p in self.patches:
+            p.stop()
+
+    def test_cli_editor_overrides_settings(self):
+        cmd_edit._save_settings({"editor": "vim"})
+        result = cmd_edit._resolve_editor("code")
+        self.assertEqual(result, "code")
+
+    def test_saved_editor_used_when_no_cli_override(self):
+        cmd_edit._save_settings({"editor": "code"})
+        result = cmd_edit._resolve_editor()
+        self.assertEqual(result, "code")
+
+    def test_prompt_on_first_run(self):
+        with patch("builtins.input", side_effect=["1"]):
+            with patch.object(cmd_edit, "KNOWN_EDITORS", {"code": ("VS Code", "code")}):
+                with patch("shutil.which", return_value="/usr/local/bin/code"):
+                    result = cmd_edit._resolve_editor()
+        self.assertEqual(result, "code")
+        settings = json.loads((self.home / "settings.json").read_text())
+        self.assertEqual(settings["editor"], "code")
+
+    def test_custom_editor_via_prompt(self):
+        with patch("builtins.input", side_effect=["2", "subl"]):
+            with patch.object(cmd_edit, "KNOWN_EDITORS", {"code": ("VS Code", "code")}):
+                with patch("shutil.which", return_value="/usr/local/bin/code"):
+                    result = cmd_edit._resolve_editor()
+        self.assertEqual(result, "subl")
+
+    def test_corrupt_settings_file_triggers_prompt(self):
+        (self.home / "settings.json").write_text("not json")
+        with patch("builtins.input", side_effect=["1"]):
+            with patch.object(cmd_edit, "KNOWN_EDITORS", {"code": ("VS Code", "code")}):
+                with patch("shutil.which", return_value="/usr/local/bin/code"):
+                    result = cmd_edit._resolve_editor()
+        self.assertEqual(result, "code")
+
+
 if __name__ == "__main__":
     unittest.main()

tloop_cli-0.4.0/src/cmd_edit.py

@@ -1,45 +0,0 @@
-"""tloop edit — open ~/.tloop/tasks.yaml in editor."""
-
-import argparse
-import os
-import subprocess
-
-import config
-
-
-EDIT_HELP = """\
-Open ~/.tloop/tasks.yaml in your editor ($EDITOR, defaults to vi).
-
-Task file format (~/.tloop/tasks.yaml):
-
-  defaults:
-    model: opus              # optional default model
-
-  tasks:
-    - name: My task
-      dir: ~/projects/my-project
-      prompt: |
-        Describe what Claude should do.
-      # OR:
-      prompt_file: ./prompts/my-task.md
-      model: opus            # optional override
-      branch: true           # true=auto, "custom/name", false=skip
-
-  Each task runs in the specified directory. Completed tasks are
-  archived to ~/.tloop/archive/ after each run cycle.
-"""
-
-
-def add_parser(subparsers):
-    p = subparsers.add_parser(
-        "edit",
-        help="Open ~/.tloop/tasks.yaml in editor",
-        description=EDIT_HELP,
-        formatter_class=argparse.RawDescriptionHelpFormatter,
-    )
-    p.set_defaults(func=handle)
-
-
-def handle(args):
-    editor = os.environ.get("EDITOR", "vi")
-    subprocess.run([editor, str(config.TASKS_FILE)])

tloop_cli-0.4.0/src/runner/cybervisor.py

@@ -1,28 +0,0 @@
-"""Cybervisor runner backend."""
-
-import subprocess
-
-from runner import Runner
-
-
-class CybervisorRunner(Runner):
-    def run(self, prompt, cwd, model=None, log_file=None):
-        cmd = ["cybervisor", "run", prompt]
-        if model:
-            cmd.extend(["--model", model])
-
-        with open(log_file, "a") if log_file else open("/dev/null", "a") as log:
-            process = subprocess.Popen(
-                cmd,
-                cwd=cwd,
-                stdout=subprocess.PIPE,
-                stderr=subprocess.STDOUT,
-                text=True,
-            )
-            for line in process.stdout:
-                print(line, end="")
-                log.write(line)
-            log.flush()
-            process.wait()
-
-        return process.returncode