mixhub-cli 0.2.1__tar.gz → 0.2.2__tar.gz

{mixhub_cli-0.2.1 → mixhub_cli-0.2.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.5
 Name: mixhub-cli
-Version: 0.2.1
+Version: 0.2.2
 Summary: A terminal sidebar for your Claude Code, Codex, Gemini and OpenCode sessions.
 Project-URL: Homepage, https://github.com/ShinoKana/mixhub
 Project-URL: Repository, https://github.com/ShinoKana/mixhub.git
@@ -64,17 +64,19 @@ What it doesn't do: it doesn't create worktrees or touch git, doesn't patch the
 
 ## Similar tools
 
-| | Agents | Runs in | Git worktrees | Per-session status | Sessions started elsewhere |
-| :--- | :--- | :--- | :--- | :--- | :--- |
-| MixHub | Claude Code, Codex, Gemini, OpenCode | any terminal (needs tmux) | no | from session files | listed |
-| [Claude Code Agent View](https://code.claude.com/docs/en/agent-view) | Claude Code | the `claude` CLI | background sessions by default | yes | only after `/bg` or `claude --bg` |
-| [cmux](https://github.com/manaflow-ai/cmux) | Claude Code, Codex, OpenCode, Gemini, Amp and more | its own macOS app | no | notifications via hooks / OSC | not documented |
-| [claude-squad](https://github.com/smtg-ai/claude-squad) | Claude Code, Codex, Gemini, Aider | any terminal (needs tmux) | one per session | not documented | no, manages its own |
-| [ccmanager](https://github.com/kbwo/ccmanager) | Claude Code, Codex, Gemini, OpenCode and more | any terminal | yes, managed in the app | busy / waiting / idle | not documented |
-| [agent-deck](https://github.com/asheshgoplani/agent-deck) | Claude Code, Codex, Gemini, OpenCode and more | any terminal (tmux) | optional | running / waiting / idle | its own tmux sessions |
-| [tmux-agent-status](https://github.com/samleeney/tmux-agent-status) | Claude Code, Codex, Devin | inside your tmux | no | via agent hooks | inside tmux |
+| | Other agents | Runs in | Status | Outside sessions |
+| :--- | :--- | :--- | :--- | :--- |
+| MixHub | Codex, Gemini, OpenCode | tmux | session files | listed |
+| [Agent View](https://code.claude.com/docs/en/agent-view) | none | `claude` CLI | yes | after `/bg` |
+| [cmux](https://github.com/manaflow-ai/cmux) | Codex, Gemini, OpenCode, … | macOS app | hooks / OSC | – |
+| [claude-squad](https://github.com/smtg-ai/claude-squad) | Codex, Gemini, Aider | tmux | – | no |
+| [ccmanager](https://github.com/kbwo/ccmanager) | Codex, Gemini, OpenCode, … | any terminal | yes | – |
+| [agent-deck](https://github.com/asheshgoplani/agent-deck) | Codex, Gemini, OpenCode, … | tmux | yes | no |
+| [tmux-agent-status](https://github.com/samleeney/tmux-agent-status) | Codex, Devin | your tmux | hooks | if in tmux |
 
-If you only use Claude Code, Agent View is built in. If you want a worktree per task, claude-squad and ccmanager do that and MixHub doesn't.
+– means the project's docs don't say.
+
+If you only use Claude Code, Agent View is built in. If you want a git worktree per task, claude-squad and ccmanager make one for you (agent-deck optionally); MixHub doesn't touch git.
 
 ## Install
 
@@ -123,7 +125,7 @@ mixhub update --check  # only say whether a newer version exists
 | Codex | `~/.codex/sessions/` rollouts + state DB | `codex resume <id>` |
 | OpenCode | `opencode.db` (read-only) | `opencode -s <id>` |
 
-`✎ New session` can also start Claude Code with another model behind it (DeepSeek, Kimi, Qwen and GLM presets); the badge shows which model a session uses.
+`✎ New session` opens the new session in the working directory of the session selected in the sidebar, so to start in a project folder, click one of that folder's sessions first. With nothing selected, including the `LAUNCH` buttons on Home, it uses the folder you ran `mixhub` from. It can also start Claude Code with another model behind it (DeepSeek, Kimi, Qwen and GLM presets); the badge shows which model a session uses.
 
 ## The workspace
 
@@ -131,7 +133,7 @@ mixhub update --check  # only say whether a newer version exists
 
 **Right pane.** Clicking a session that is running in MixHub switches to its live CLI window. Clicking any other session shows a read-only transcript preview with a turn minimap; `[ Resume ↵ ]` starts the CLI in place, and `[ Go to Tab ]` jumps to a session that is running in another Terminal tab. Each live window has a two-row header with the working directory, session id and title.
 
-**Home.** With nothing selected, the right pane holds a plain login shell under the preview, for quick commands without leaving the workspace. Clear it the usual way (`clear` or Ctrl+L).
+**Home.** With nothing selected, the right pane holds a plain login shell under the preview, for quick commands without leaving the workspace. Clear it the usual way (`clear` or Ctrl+L). An agent started there (`claude`, `codex`, `opencode`, `agy`) moves to its own window in `Active`, the same as `✎ New session`, and Home gets a fresh shell; one-shot runs like `claude -p` stay in the shell.
 
 **Footer.** Used `5h` and weekly quota with reset times for each agent that has at least one session on this machine, plus CPU and memory. Codex quota comes from its own session files. For exact Claude Code and Gemini (AGY) numbers, point their status line at MixHub, which records the quota each agent reports and prints a short status line back:
 
@@ -265,7 +267,7 @@ Everything works without configuration. Optional settings live in a JSON file na
 | `MIXHUB_NO_OPEN=1` | `mixhub web` starts the daemon without opening a browser |
 | `MIXHUB_NO_UPDATE_CHECK=1` | No daily update check |
 
-`host_label` is the machine name shown in the web workbench (the hostname by default). `dispatch_scripts` names your own wrapper scripts that start agents headlessly, so their sessions are not mistaken for interactive ones. Prompts that your own automation sends can be hidden from the list with `data/local_rules.json` (`automated_prefixes`, `automated_substrings`). Notes your own tools type into an agent on another agent's behalf go in `relayed_prefixes`: they never count as you having used a session, but don't hide one either.
+`host_label` is the machine name shown in the web workbench (the hostname by default). `dispatch_scripts` names your own wrapper scripts that start agents headlessly, so their sessions are not mistaken for interactive ones. Sessions another agent started are hidden by what their CLI records (subagents, headless runs, Codex tasks whose `originator` is Claude Code). For older sessions without such a record, prompts that your own automation sends can be hidden with `data/local_rules.json` (`automated_prefixes`, `automated_substrings`, and `codex_automated_prefixes` for Codex only); `mixhub doctor --hidden` lists every session a text rule hides. Notes your own tools type into an agent on another agent's behalf go in `relayed_prefixes`: they never count as you having used a session, but don't hide one either.
 
 ## Architecture
 

{mixhub_cli-0.2.1 → mixhub_cli-0.2.2}/README.md

@@ -37,17 +37,19 @@ What it doesn't do: it doesn't create worktrees or touch git, doesn't patch the
 
 ## Similar tools
 
-| | Agents | Runs in | Git worktrees | Per-session status | Sessions started elsewhere |
-| :--- | :--- | :--- | :--- | :--- | :--- |
-| MixHub | Claude Code, Codex, Gemini, OpenCode | any terminal (needs tmux) | no | from session files | listed |
-| [Claude Code Agent View](https://code.claude.com/docs/en/agent-view) | Claude Code | the `claude` CLI | background sessions by default | yes | only after `/bg` or `claude --bg` |
-| [cmux](https://github.com/manaflow-ai/cmux) | Claude Code, Codex, OpenCode, Gemini, Amp and more | its own macOS app | no | notifications via hooks / OSC | not documented |
-| [claude-squad](https://github.com/smtg-ai/claude-squad) | Claude Code, Codex, Gemini, Aider | any terminal (needs tmux) | one per session | not documented | no, manages its own |
-| [ccmanager](https://github.com/kbwo/ccmanager) | Claude Code, Codex, Gemini, OpenCode and more | any terminal | yes, managed in the app | busy / waiting / idle | not documented |
-| [agent-deck](https://github.com/asheshgoplani/agent-deck) | Claude Code, Codex, Gemini, OpenCode and more | any terminal (tmux) | optional | running / waiting / idle | its own tmux sessions |
-| [tmux-agent-status](https://github.com/samleeney/tmux-agent-status) | Claude Code, Codex, Devin | inside your tmux | no | via agent hooks | inside tmux |
-
-If you only use Claude Code, Agent View is built in. If you want a worktree per task, claude-squad and ccmanager do that and MixHub doesn't.
+| | Other agents | Runs in | Status | Outside sessions |
+| :--- | :--- | :--- | :--- | :--- |
+| MixHub | Codex, Gemini, OpenCode | tmux | session files | listed |
+| [Agent View](https://code.claude.com/docs/en/agent-view) | none | `claude` CLI | yes | after `/bg` |
+| [cmux](https://github.com/manaflow-ai/cmux) | Codex, Gemini, OpenCode, … | macOS app | hooks / OSC | – |
+| [claude-squad](https://github.com/smtg-ai/claude-squad) | Codex, Gemini, Aider | tmux | – | no |
+| [ccmanager](https://github.com/kbwo/ccmanager) | Codex, Gemini, OpenCode, … | any terminal | yes | – |
+| [agent-deck](https://github.com/asheshgoplani/agent-deck) | Codex, Gemini, OpenCode, … | tmux | yes | no |
+| [tmux-agent-status](https://github.com/samleeney/tmux-agent-status) | Codex, Devin | your tmux | hooks | if in tmux |
+
+– means the project's docs don't say.
+
+If you only use Claude Code, Agent View is built in. If you want a git worktree per task, claude-squad and ccmanager make one for you (agent-deck optionally); MixHub doesn't touch git.
 
 ## Install
 
@@ -96,7 +98,7 @@ mixhub update --check  # only say whether a newer version exists
 | Codex | `~/.codex/sessions/` rollouts + state DB | `codex resume <id>` |
 | OpenCode | `opencode.db` (read-only) | `opencode -s <id>` |
 
-`✎ New session` can also start Claude Code with another model behind it (DeepSeek, Kimi, Qwen and GLM presets); the badge shows which model a session uses.
+`✎ New session` opens the new session in the working directory of the session selected in the sidebar, so to start in a project folder, click one of that folder's sessions first. With nothing selected, including the `LAUNCH` buttons on Home, it uses the folder you ran `mixhub` from. It can also start Claude Code with another model behind it (DeepSeek, Kimi, Qwen and GLM presets); the badge shows which model a session uses.
 
 ## The workspace
 
@@ -104,7 +106,7 @@ mixhub update --check  # only say whether a newer version exists
 
 **Right pane.** Clicking a session that is running in MixHub switches to its live CLI window. Clicking any other session shows a read-only transcript preview with a turn minimap; `[ Resume ↵ ]` starts the CLI in place, and `[ Go to Tab ]` jumps to a session that is running in another Terminal tab. Each live window has a two-row header with the working directory, session id and title.
 
-**Home.** With nothing selected, the right pane holds a plain login shell under the preview, for quick commands without leaving the workspace. Clear it the usual way (`clear` or Ctrl+L).
+**Home.** With nothing selected, the right pane holds a plain login shell under the preview, for quick commands without leaving the workspace. Clear it the usual way (`clear` or Ctrl+L). An agent started there (`claude`, `codex`, `opencode`, `agy`) moves to its own window in `Active`, the same as `✎ New session`, and Home gets a fresh shell; one-shot runs like `claude -p` stay in the shell.
 
 **Footer.** Used `5h` and weekly quota with reset times for each agent that has at least one session on this machine, plus CPU and memory. Codex quota comes from its own session files. For exact Claude Code and Gemini (AGY) numbers, point their status line at MixHub, which records the quota each agent reports and prints a short status line back:
 
@@ -238,7 +240,7 @@ Everything works without configuration. Optional settings live in a JSON file na
 | `MIXHUB_NO_OPEN=1` | `mixhub web` starts the daemon without opening a browser |
 | `MIXHUB_NO_UPDATE_CHECK=1` | No daily update check |
 
-`host_label` is the machine name shown in the web workbench (the hostname by default). `dispatch_scripts` names your own wrapper scripts that start agents headlessly, so their sessions are not mistaken for interactive ones. Prompts that your own automation sends can be hidden from the list with `data/local_rules.json` (`automated_prefixes`, `automated_substrings`). Notes your own tools type into an agent on another agent's behalf go in `relayed_prefixes`: they never count as you having used a session, but don't hide one either.
+`host_label` is the machine name shown in the web workbench (the hostname by default). `dispatch_scripts` names your own wrapper scripts that start agents headlessly, so their sessions are not mistaken for interactive ones. Sessions another agent started are hidden by what their CLI records (subagents, headless runs, Codex tasks whose `originator` is Claude Code). For older sessions without such a record, prompts that your own automation sends can be hidden with `data/local_rules.json` (`automated_prefixes`, `automated_substrings`, and `codex_automated_prefixes` for Codex only); `mixhub doctor --hidden` lists every session a text rule hides. Notes your own tools type into an agent on another agent's behalf go in `relayed_prefixes`: they never count as you having used a session, but don't hide one either.
 
 ## Architecture
 

{mixhub_cli-0.2.1 → mixhub_cli-0.2.2}/mixhub/__init__.py

@@ -7,6 +7,6 @@ The README's Architecture section maps the subpackages (`hub`, `providers`, `tui
 """
 from __future__ import annotations
 
-__version__ = "0.2.1"
+__version__ = "0.2.2"
 
 __all__ = ["__version__"]

{mixhub_cli-0.2.1 → mixhub_cli-0.2.2}/mixhub/cli/main.py

@@ -30,7 +30,9 @@ USAGE = """Usage: mixhub [command]
   mixhub web             open the web workbench (starts the local daemon)
   mixhub start|stop|status
                          control the web daemon without opening a browser
-  mixhub doctor          check agents, tmux, channels and terminal settings
+  mixhub doctor [--hidden]
+                         check agents, tmux, channels and terminal settings;
+                         --hidden lists sessions hidden only by a text rule
   mixhub handoff SESSION_ID --to claude|codex|agy [--mode delegate|review] [--dry-run]
                          hand a session over to another agent
   mixhub notify ...      send a notification through the configured channels

mixhub_cli-0.2.2/mixhub/core/cli_version.py

@@ -0,0 +1,75 @@
+#!/usr/bin/env python3
+"""`mixhub.core.cli_version`: Installed Claude Code version against the version a live session started with.
+
+Only a hint: a session on an older build keeps running it until it is restarted, and MixHub never restarts one
+itself (a restart drops Remote Control, and Claude Code refuses `/restart` after a `cd`).
+"""
+from __future__ import annotations
+
+import glob
+import json
+import os
+import re
+import shutil
+import time
+
+_VERSION_RE = re.compile(r"^\d+(\.\d+)+$")
+_CACHE_SEC = 30.0
+_installed_cache: dict[str, tuple[float, str]] = {}
+_running_cache: dict[str, tuple[float, dict[str, str]]] = {}
+
+
+def installed_claude_version() -> str:
+    """Version of the `claude` on PATH, read from the native installer's `versions/<x.y.z>` symlink target.
+    Empty when it can't be told without running the binary (npm installs, wrappers)."""
+    now = time.monotonic()
+    hit = _installed_cache.get("claude")
+    if hit and now - hit[0] < _CACHE_SEC:
+        return hit[1]
+    ver = ""
+    path = shutil.which("claude")
+    if path:
+        name = os.path.basename(os.path.realpath(path))
+        if _VERSION_RE.match(name):
+            ver = name
+    _installed_cache["claude"] = (now, ver)
+    return ver
+
+
+def running_claude_versions() -> dict[str, str]:
+    """`{sessionId: version}` from the live processes' `~/.claude/sessions/<pid>.json`, for a `--header` pane that
+    has no discovery of its own."""
+    now = time.monotonic()
+    hit = _running_cache.get("claude")
+    if hit and now - hit[0] < _CACHE_SEC:
+        return hit[1]
+    found: dict[str, str] = {}
+    for fp in glob.glob(os.path.join(os.path.expanduser("~"), ".claude", "sessions", "*.json")):
+        try:
+            with open(fp, encoding="utf-8") as f:
+                info = json.load(f)
+            pid, sid, ver = int(info["pid"]), str(info["sessionId"]), str(info.get("version") or "")
+            os.kill(pid, 0)
+        except (OSError, ValueError, KeyError, TypeError):
+            continue
+        if ver:
+            found[sid] = ver
+    _running_cache["claude"] = (now, found)
+    return found
+
+
+def _as_tuple(ver: str) -> tuple[int, ...]:
+    return tuple(int(x) for x in ver.split("."))
+
+
+def old_version_hint(s: dict) -> str:
+    """`old 2.1.316 · 2.1.318 installed` for a Claude session started on an older build, else empty."""
+    if not s or s.get("tool") != "claude":
+        return ""
+    running = str(s.get("cliVersion") or running_claude_versions().get(str(s.get("id") or ""), ""))
+    if not _VERSION_RE.match(running):
+        return ""
+    installed = installed_claude_version()
+    if not installed or _as_tuple(running) >= _as_tuple(installed):
+        return ""
+    return f"old {running} · {installed} installed"

{mixhub_cli-0.2.1 → mixhub_cli-0.2.2}/mixhub/hub/discovery.py

@@ -31,9 +31,9 @@ from mixhub.hub.schema import claude_is_headless_marker, codex_state_db_candidat
 from mixhub.hub.session_filters import (
     _load_local_rules,
     _LOCAL_RULES_CACHE,
+    codex_automation_reason,
     is_automated_or_subagent_text,
     is_users_own_prompt,
-    is_codex_automated,
     is_temp_session,
 )
 from mixhub.hub.shell import resume_command
@@ -46,6 +46,21 @@ from mixhub.proc.identity import get_boot_id
 from mixhub.proc.tree import has_agent_ancestor
 
 
+def settle_parked_status(value: dict, jobs_dir: str) -> dict:
+    """
+    A Claude session that parked its turn into a background job (`parkedJobId`) keeps the `busy` it had at that
+    moment in its pid file. The work runs in the job, so the session is busy only while the job is still working.
+    """
+    job_id = str(value.get("parkedJobId") or "")
+    if job_id and value.get("status") == "busy":
+        job = read_json(os.path.join(jobs_dir, job_id, "state.json"), {})
+        if not isinstance(job, dict) or job.get("state") != "working":
+            value["status"] = "idle"
+            # Its transcript also stops mid-turn at the hand-off, which would otherwise still read as working
+            value["_parkedDone"] = True
+    return value
+
+
 class DiscoveryMixin:
     """Discover sessions from every provider store and merge them with live processes and hub state."""
 
@@ -298,7 +313,7 @@ class DiscoveryMixin:
                         value["_mtime"] = os.stat(path).st_mtime
                     except OSError:
                         value["_mtime"] = 0
-                    pid_states[int(value["pid"])] = value
+                    pid_states[int(value["pid"])] = settle_parked_status(value, self.path(".claude/jobs"))
             self.sessions.close()
             self.sessions = sessions = SessionIndex()
 
@@ -548,7 +563,7 @@ class DiscoveryMixin:
             # archived_sessions/ only resolves rows whose recorded rollout_path moved; it never adds new rows.
             codex_session_files, codex_disk_paths = self._discover_codex_rollouts()
             codex_disk_paths_set = set(codex_session_files) | set(codex_disk_paths.values())
-            codex_columns = ["id", "title", "cwd", "first_user_message", "updated_at", "created_at", "model", "reasoning_effort", "rollout_path", "agent_role", "source"]
+            codex_columns = ["id", "title", "cwd", "first_user_message", "updated_at", "created_at", "model", "reasoning_effort", "rollout_path", "agent_role", "source", "originator"]
             known_codex_paths = set()
             # Follow Codex's state DB schema bumps (state_5 -> state_6 ...): newest file that actually
             # has a `threads` table wins; otherwise fall back to older candidates.
@@ -572,18 +587,20 @@ class DiscoveryMixin:
                     len(raw_first),
                     raw_first[:128],
                     csrc,
+                    row.get("originator"),
                     row.get("agent_role"),
                     rules_mtime,
                 )
                 cmemo = self._codex_row_memo.get(rid)
                 if cmemo is not None and cmemo[0] == codex_sig:
-                    parsed_title, parsed_first, row_is_auto, row_up_ts = cmemo[1]
+                    parsed_title, parsed_first, row_auto_by, row_up_ts = cmemo[1]
                 else:
                     parsed_title = snippet(raw_title, 200)
                     parsed_first = snippet(clean_prompt(raw_first, "codex"))
-                    row_is_auto = bool(is_codex_automated(csrc, raw_title, raw_first) or row.get("agent_role"))
+                    row_auto_by = "source" if row.get("agent_role") else codex_automation_reason(csrc, raw_title, raw_first, row.get("originator"))
                     row_up_ts = stamp(row.get("updated_at"))
-                    self._codex_row_memo[rid] = (codex_sig, (parsed_title, parsed_first, row_is_auto, row_up_ts))
+                    self._codex_row_memo[rid] = (codex_sig, (parsed_title, parsed_first, row_auto_by, row_up_ts))
+                row_is_auto = bool(row_auto_by)
                 path = row.get("rollout_path")
                 resolved_path = None
                 if path:
@@ -604,6 +621,8 @@ class DiscoveryMixin:
                     "firstPrompt": parsed_first,
                     "model": row.get("model"), "reasoningEffort": row.get("reasoning_effort"),
                     "automated": is_auto})
+                if row_auto_by:
+                    s["automatedBy"] = row_auto_by
                 if resolved_path:
                     s["path"] = resolved_path
                     known_codex_paths.add(resolved_path)
@@ -853,9 +872,13 @@ class DiscoveryMixin:
                 s.update(isLive=True, synthetic=synthetic)
                 s["cwd"] = info.get("cwd") or opened.get("cwd") or s["cwd"]
                 s["status"] = info.get("status") or s.get("status", "unknown")
+                if info.get("_parkedDone"):
+                    s["parkedDone"] = True
                 if tool == "claude" and info:
                     lock_ts = max(float(info.get("_mtime") or 0), stamp(info.get("updatedAt")), stamp(info.get("startedAt")))
                     s["lockMtime"] = lock_ts
+                    if info.get("version"):
+                        s["cliVersion"] = str(info["version"])
                     if lock_ts > 0 and not s.get("updatedAt"):
                         s["updatedAt"] = lock_ts
                 elif tool in active_locks and sid in active_locks[tool]:
@@ -952,6 +975,8 @@ class DiscoveryMixin:
                         s["isLive"] = True
                         lock_ts = max(float(info.get("_mtime") or 0), stamp(info.get("updatedAt")), stamp(info.get("startedAt")))
                         s["lockMtime"] = lock_ts
+                        if info.get("version"):
+                            s["cliVersion"] = str(info["version"])
                         if lock_ts > 0 and not s.get("updatedAt"):
                             s["updatedAt"] = lock_ts
                         if not any(pr.get("pid") == pid for pr in s["processes"]):
@@ -1060,6 +1085,8 @@ class DiscoveryMixin:
                     not_idle = bool(s.get("notFullyIdle") and not s.get("killed") and age < 1800)
                     if raw_status in ("working", "running", "busy") or ("running" in raw_status and age < 1800) or not_idle:
                         s["agentState"] = "working"
+                    elif s.get("parkedDone"):
+                        s["agentState"] = "done_idle"
                     elif not has_procs:
                         s["agentState"] = "done_idle"
                         if tstat in ("ball_in_model", "unclosed_tool"):
@@ -1174,10 +1201,9 @@ class DiscoveryMixin:
                             exit_rc = int(exit_info.get("rc", 0))
                         except (TypeError, ValueError, AttributeError):
                             exit_rc = 0
-                        signal_exit = exit_rc < 0 or exit_rc >= 128 or bool(
-                            isinstance(exit_info, dict) and exit_info.get("signal_exit")
-                        )
-                        if not signal_exit and exit_ts > 0.0 and exit_ts >= sess_ts - 5.0:
+                        # Only rc 0 is the user leaving (`/exit`); a signal or a CLI that failed to start is not
+                        user_exit = exit_rc == 0 and not (isinstance(exit_info, dict) and exit_info.get("signal_exit"))
+                        if user_exit and exit_ts > 0.0 and exit_ts >= sess_ts - 5.0:
                             s["isLive"] = False
                             s["inWorkingSet"] = False
                             s["agentState"] = "dormant"
@@ -1187,7 +1213,12 @@ class DiscoveryMixin:
                                 wset_dirty = True
                                 wset_removed.append((key, f"exited rc={exit_rc}"))
                             continue
-                if s.get("isLive"):
+                if s.get("isLive") and not s.get("processes") and not s.get("resident") \
+                        and not int(s.get("activeSubagents") or 0) and key not in wset and s["id"] not in wset:
+                    # Live by a Codex / AGY lock alone, with no interactive process: a one-shot run another agent
+                    # started (`agy -p`, a Codex task). It shows in `Recent` and never enters `Active`.
+                    s["inWorkingSet"] = False
+                elif s.get("isLive"):
                     s["inWorkingSet"] = True
                     if key not in wset:
                         wset.add(key)

{mixhub_cli-0.2.1 → mixhub_cli-0.2.2}/mixhub/hub/send.py

@@ -7,6 +7,8 @@ from __future__ import annotations
 
 import subprocess
 
+from mixhub.hub.shell import resume_cwd
+
 
 def find_controlled_tmux_pane(session: dict, tmux_lister=None) -> str:
     """
@@ -73,7 +75,7 @@ def send_to_session(
     resolved_tool = session["tool"]
     resolved_id = session["id"]
     skey = f"{resolved_tool}:{resolved_id}"
-    cwd = session.get("cwd") or home
+    cwd = resume_cwd(session) if session.get("path") else (session.get("cwd") or home)
 
     clean_files = [str(p).strip() for p in (attachments or []) if str(p).strip()]
     prompt_parts = [str(text or "").strip()] if str(text or "").strip() else []

{mixhub_cli-0.2.1 → mixhub_cli-0.2.2}/mixhub/hub/session_filters.py

@@ -13,31 +13,36 @@ from mixhub.hub.titles import FALLBACK_TITLE_RE
 from mixhub.hub.util import read_json
 
 
-CODEX_AUTO_PREFIXES = (
-    "Read-only ", "READ FIRST", "Read the following key files", "Read " + os.path.expanduser("~") + "/",
-    "Repository: ", "Adversarial second opinion", "Second opinion on what a trading bot",
-    "Use image_gen to generate", "请先用 view_image 读取", "请用 image_gen 生成",
-    "Create a self-contained HTML", "读取以下文件并完成中文文案重写任务",
-    "# Files mentioned by the user:\n\n## Photo 1.jpg: /tmp/codex-remote-attachments/",
-)
-
-
-def is_codex_automated(source=None, title="", first_msg=""):
+def codex_automation_reason(source=None, title="", first_msg="", originator=None) -> str:
+    """
+    Why a Codex thread counts as automated, or "" when it doesn't. What Codex recorded about who started the thread
+    decides first (`originator`, `source`); text rules only cover threads older than those fields.
+    """
+    # A task Claude Code dispatched to Codex (codex-companion); its result goes back to that Claude session
+    if originator == "Claude Code":
+        return "originator"
     if isinstance(source, dict) or (isinstance(source, str) and (source == "exec" or source.startswith("{"))):
-        return True
+        return "source"
     t = (title or "").strip()
     m = (first_msg or "").strip()
-    if "<task>" in m or "<task>" in t or t.startswith("Codex Companion Task:"):
-        return True
-    if m.startswith("## Referenced ChatGPT conversation:") or t.startswith("## Referenced ChatGPT conversation:"):
-        return True
-    if m in ("--help", "exit", "usage") or t in ("--help", "exit", "usage"):
-        return True
-    if m.startswith(CODEX_AUTO_PREFIXES):
-        return True
-    if is_automated_or_subagent_text(t) or is_automated_or_subagent_text(m):
-        return True
-    return False
+    if "<task>" in m or "<task>" in t:
+        return "text:<task>"
+    for prefix in ("Codex Companion Task:", "## Referenced ChatGPT conversation:"):
+        if m.startswith(prefix) or t.startswith(prefix):
+            return "text:" + prefix
+    for word in ("--help", "exit", "usage"):
+        if word in (m, t):
+            return "text:" + word
+    low = m.casefold()
+    for prefix in _load_local_rules().get("codex_automated_prefixes") or ():
+        if low.startswith(prefix.casefold()):
+            return "text:" + prefix
+    rule = automated_text_rule(t) or automated_text_rule(m)
+    return "text:" + rule if rule else ""
+
+
+def is_codex_automated(source=None, title="", first_msg="", originator=None):
+    return bool(codex_automation_reason(source, title, first_msg, originator))
 
 
 _DISCOVER_GEN: int = 0
@@ -113,7 +118,7 @@ def _load_local_rules() -> dict:
     if not isinstance(raw, dict):
         raw = {}
     data = {}
-    for key in ("automated_prefixes", "automated_substrings", "relayed_prefixes"):
+    for key in ("automated_prefixes", "automated_substrings", "relayed_prefixes", "codex_automated_prefixes"):
         vals = raw.get(key)
         data[key] = [str(v) for v in vals if isinstance(v, str) and v.strip()] if isinstance(vals, list) else []
     patterns = prefs.get("ignore_prompt_patterns")
@@ -135,24 +140,35 @@ def _load_local_rules() -> dict:
     return data
 
 
-def is_automated_or_subagent_text(text: str) -> bool:
+def automated_text_rule(text: str) -> str:
+    """The built-in or local rule that marks `text` as automation, or "" when none does."""
     if not text:
-        return False
+        return ""
     s = str(text).strip()
     if not s:
-        return False
-    if s.startswith(_BUILTIN_AUTOMATED_PREFIXES) or any(m in s for m in _BUILTIN_AUTOMATED_SUBSTRINGS):
-        return True
+        return ""
+    for p in _BUILTIN_AUTOMATED_PREFIXES:
+        if s.startswith(p):
+            return p
+    for m in _BUILTIN_AUTOMATED_SUBSTRINGS:
+        if m in s:
+            return m
     low = s.casefold()
     rules = _load_local_rules()
     # Local rules match case-insensitively (casefold) so user-supplied patterns need not mirror exact casing.
     prefixes = _LOCAL_RULES_CACHE.get("folded_prefixes") or tuple(p.casefold() for p in (rules.get("automated_prefixes") or []))
-    if prefixes and low.startswith(prefixes):
-        return True
+    for p in prefixes:
+        if low.startswith(p):
+            return p
     substrings = _LOCAL_RULES_CACHE.get("folded_substrings") or tuple(m.casefold() for m in (rules.get("automated_substrings") or []))
-    if substrings and any(m in low for m in substrings):
-        return True
-    return False
+    for m in substrings:
+        if m in low:
+            return "has:" + m
+    return ""
+
+
+def is_automated_or_subagent_text(text: str) -> bool:
+    return bool(automated_text_rule(text))
 
 
 def is_users_own_prompt(text: str) -> bool:

mixhub_cli-0.2.2/mixhub/hub/shell.py

@@ -0,0 +1,85 @@
+"""Subprocess runner and Terminal helpers: `run`, AppleScript quoting, the Terminal focus script, resume commands."""
+from __future__ import annotations
+
+import json
+import os
+import re
+import shlex
+import subprocess
+
+from mixhub.proc.identity import PS_ENV
+
+
+def run(args, timeout=5):
+    env = {**os.environ, **PS_ENV} if (args and os.path.basename(str(args[0])) == "ps") else None
+    result = subprocess.run(args, capture_output=True, text=True, timeout=timeout, env=env)
+    if result.returncode:
+        raise RuntimeError(result.stderr.strip()[:400] or "Command failed: " + args[0])
+    return result.stdout
+
+
+_DEFAULT_RUN = run
+
+
+def apple_string(text):
+    return '"' + text.replace("\\", "\\\\").replace('"', '\\"').replace("\r", "\\r").replace("\n", "\\n") + '"'
+
+
+def focus_script(tty):
+    return '''tell application "Terminal"
+repeat with w in windows
+repeat with t in tabs of w
+if tty of t is %s then
+set selected tab of w to t
+set index of w to 1
+activate
+return "focused"
+end if
+end repeat
+end repeat
+error "No Terminal tab matches this tty"
+end tell''' % apple_string("/dev/" + tty.removeprefix("/dev/"))
+
+
+def _claude_project_dir_name(cwd: str) -> str:
+    return re.sub(r"[^A-Za-z0-9]", "-", cwd)
+
+
+def resume_cwd(session: dict) -> str:
+    """
+    Folder to resume `session` from. Claude Code looks a transcript up by the folder it runs in, so a session whose
+    cwd moved after it started (`cd` inside it) resumes from a folder its transcript belongs to: the session's own
+    cwd when that matches, else the first cwd its transcript records that does. Other tools use the session's cwd.
+    """
+    home = os.path.expanduser("~")
+    cwd = session.get("cwd") or home
+    path = str(session.get("path") or "")
+    if session.get("tool") != "claude" or not path:
+        return cwd
+    want = os.path.basename(os.path.dirname(path))
+    if _claude_project_dir_name(cwd) == want:
+        return cwd
+    try:
+        with open(path, "r", encoding="utf-8", errors="ignore") as f:
+            for _, line in zip(range(2000), f):
+                if '"cwd"' not in line:
+                    continue
+                try:
+                    cand = json.loads(line).get("cwd")
+                except ValueError:
+                    continue
+                if isinstance(cand, str) and _claude_project_dir_name(cand) == want and os.path.isdir(cand):
+                    return cand
+    except OSError:
+        pass
+    return home if _claude_project_dir_name(home) == want else cwd
+
+
+def resume_command(session):
+    tool, sid = session["tool"], session["id"]
+    if session.get("synthetic"):
+        suffix = tool
+    else:
+        suffix = {"claude": "claude --resume ", "agy": "agy --conversation ", "codex": "codex resume ",
+                  "opencode": "opencode -s "}[tool] + shlex.quote(sid)
+    return "cd " + shlex.quote(resume_cwd(session)) + " && " + suffix

{mixhub_cli-0.2.1 → mixhub_cli-0.2.2}/mixhub/hub/summary.py

@@ -17,7 +17,7 @@ from mixhub.hub.constants import (
 )
 from mixhub.hub.opencode import opencode_entries
 from mixhub.hub.schema import claude_is_headless_marker, claude_is_synthetic_user, PROVIDER_SCHEMA_ADAPTERS
-from mixhub.hub.session_filters import is_automated_or_subagent_text, is_codex_automated
+from mixhub.hub.session_filters import codex_automation_reason, is_automated_or_subagent_text
 from mixhub.hub.text import clean_prompt, snippet
 from mixhub.hub.titles import (
     _is_generic_placeholder_title,
@@ -266,8 +266,10 @@ class TranscriptMixin:
             if row.get("type") == "session_meta":
                 meta = row.get("payload") or {}
                 result.update({k: meta[k] for k in ("id", "cwd") if meta.get(k)})
-                if is_codex_automated(meta.get("source")):
+                auto_by = codex_automation_reason(meta.get("source"), originator=meta.get("originator"))
+                if auto_by:
                     result["automated"] = True
+                    result["automatedBy"] = auto_by
             if row.get("lastPrompt"):
                 result["lastPrompt"] = snippet(clean_prompt(row["lastPrompt"], tool), 220)
         if has_sdk_cli and not has_human_turn:
@@ -302,8 +304,11 @@ class TranscriptMixin:
             result["messageCount"] += 1
             if entry["role"] == "user" and not entry.get("synthetic"):
                 prompt = snippet(entry["text"])
-                if tool == "codex" and not result["firstPrompt"] and is_codex_automated(None, "", entry["text"]):
-                    result["automated"] = True
+                if tool == "codex" and not result["firstPrompt"]:
+                    auto_by = codex_automation_reason(None, "", entry["text"])
+                    if auto_by:
+                        result["automated"] = True
+                        result.setdefault("automatedBy", auto_by)
                 result["firstPrompt"] = result["firstPrompt"] or prompt
                 if not substantive_prompt and not _is_generic_placeholder_title(prompt) and len(prompt.strip()) >= 4:
                     substantive_prompt = prompt