Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
16 commits
Select commit Hold shift + click to select a range
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ dependencies = [
"httpx>=0.28",
"fastapi>=0.135",
"uvicorn>=0.44",
"claude-agent-sdk>=0.1.72",
"claude-agent-sdk>=0.1.77",
"Pillow>=10.0",
# Federation crypto (sealed_box_v1): X25519, Ed25519, HKDF, XChaCha20-Poly1305.
"cryptography>=41.0",
Expand All @@ -54,7 +54,7 @@ calendar = [
"cryptography>=41.0",
]
web = ["camoufox>=0.4", "markdownify>=1.0", "beautifulsoup4>=4.12"]
voice = ["twilio>=9.0", "anthropic>=0.96"]
voice = ["twilio>=9.0", "anthropic>=0.98"]
local-embeddings = ["sentence-transformers>=2.0"]
all = [
"pinky-ai[telegram,discord,slack,google,calendar,voice]",
Expand Down
659 changes: 659 additions & 0 deletions specs/opencode-session-integration.md

Large diffs are not rendered by default.

62 changes: 49 additions & 13 deletions src/pinky_daemon/agent_registry.py
Original file line number Diff line number Diff line change
Expand Up @@ -185,6 +185,7 @@ class Agent:
working_status: str = "idle" # idle, working, offline
working_status_updated_at: float = 0.0 # When working_status last changed
last_seen_at: float = 0.0 # Server-side presence: updated on delivery/turn completion
runtime: str = "claude_sdk" # Agent runtime: claude_sdk, codex_cli, opencode
provider_url: str = "" # e.g. "http://localhost:11434" for Ollama, empty = Anthropic default
provider_key: str = "" # API key override, empty = use ANTHROPIC_API_KEY env var
provider_model: str = "" # model name override (e.g. "llama3.2"), empty = use agent.model
Expand Down Expand Up @@ -243,6 +244,7 @@ def to_dict(self) -> dict:
"working_status": self.working_status,
"working_status_updated_at": self.working_status_updated_at,
"last_seen_at": self.last_seen_at,
"runtime": self.runtime,
"provider_url": self.provider_url,
"provider_key": self.provider_key,
"provider_model": self.provider_model,
Expand Down Expand Up @@ -475,6 +477,7 @@ def _init_tables(self) -> None:
heartbeat_interval INTEGER NOT NULL DEFAULT 0,
plain_text_fallback INTEGER NOT NULL DEFAULT 0,
role TEXT NOT NULL DEFAULT '',
runtime TEXT NOT NULL DEFAULT 'claude_sdk',
created_at REAL NOT NULL,
updated_at REAL NOT NULL
);
Expand Down Expand Up @@ -729,11 +732,14 @@ def _migrate(self) -> None:
("thinking_effort", "TEXT NOT NULL DEFAULT 'medium'"),
("watchdog_config", "TEXT NOT NULL DEFAULT '{}'"),
("last_seen_at", "REAL NOT NULL DEFAULT 0"),
("runtime", "TEXT NOT NULL DEFAULT 'claude_sdk'"),
]
for col, typedef in migrations:
if col not in existing:
self._db.execute(f"ALTER TABLE agents ADD COLUMN {col} {typedef}")
_log(f"agent_registry: migrated β€” added column {col}")
self._db.commit()
self._backfill_runtime_from_provider_url()

# Migrate agent_schedules table
sched_existing = {
Expand Down Expand Up @@ -804,6 +810,25 @@ def _migrate(self) -> None:
# Seed default models
self._seed_models()

def _backfill_runtime_from_provider_url(self) -> None:
"""One-shot migration from legacy provider_url runtime selection."""
marker = "migration:agents_runtime_codex_cli_backfill"
if self.get_setting(marker) == "1":
return

cursor = self._db.execute(
"UPDATE agents SET runtime='codex_cli' "
"WHERE provider_url='codex_cli' AND runtime='claude_sdk'"
)
self._db.execute(
"INSERT INTO system_settings (key, value) VALUES (?, '1') "
"ON CONFLICT(key) DO UPDATE SET value='1'",
(marker,),
)
self._db.commit()
if cursor.rowcount:
_log(f"agent_registry: backfilled runtime=codex_cli for {cursor.rowcount} agent(s)")

# ── Workspace Init ─────────────────────────────────────

@staticmethod
Expand Down Expand Up @@ -932,7 +957,7 @@ def register(self, name: str, **kwargs) -> Agent:
"clock_aligned", "auto_sleep_hours", "plain_text_fallback", "voice_config", "role",
"dream_enabled", "dream_schedule", "dream_timezone", "dream_model", "dream_notify",
"librarian_enabled", "librarian_schedule",
"provider_url", "provider_key", "provider_model", "provider_ref",
"runtime", "provider_url", "provider_key", "provider_model", "provider_ref",
"thinking_effort"):
if key in kwargs:
updates[key] = kwargs[key]
Expand Down Expand Up @@ -1014,6 +1039,12 @@ def register(self, name: str, **kwargs) -> Agent:
dream_notify=kwargs.get("dream_notify", True),
librarian_enabled=kwargs.get("librarian_enabled", False),
librarian_schedule=kwargs.get("librarian_schedule", "0 4 * * *"),
runtime=kwargs.get("runtime", "claude_sdk"),
provider_url=kwargs.get("provider_url", ""),
provider_key=kwargs.get("provider_key", ""),
provider_model=kwargs.get("provider_model", ""),
provider_ref=kwargs.get("provider_ref", ""),
thinking_effort=kwargs.get("thinking_effort", "medium"),
watchdog_config=kwargs.get("watchdog_config", {}),
created_at=now,
updated_at=now,
Expand All @@ -1027,9 +1058,11 @@ def register(self, name: str, **kwargs) -> Agent:
max_sessions, enabled, auto_start, heartbeat_interval, plain_text_fallback,
wake_interval, clock_aligned, auto_sleep_hours, voice_config, role,
dream_enabled, dream_schedule, dream_timezone, dream_model, dream_notify,
librarian_enabled, librarian_schedule, watchdog_config,
librarian_enabled, librarian_schedule,
runtime, provider_url, provider_key, provider_model, provider_ref,
thinking_effort, watchdog_config,
created_at, updated_at)
VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)""",
VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)""",
(agent.name, agent.display_name, agent.model, agent.soul,
agent.users, agent.boundaries,
agent.system_prompt, agent.working_dir, agent.permission_mode,
Expand All @@ -1042,7 +1075,9 @@ def register(self, name: str, **kwargs) -> Agent:
json.dumps(agent.voice_config), agent.role,
int(agent.dream_enabled), agent.dream_schedule, agent.dream_timezone, agent.dream_model, int(agent.dream_notify),
int(agent.librarian_enabled), agent.librarian_schedule,
json.dumps(agent.watchdog_config),
agent.runtime, agent.provider_url, agent.provider_key,
agent.provider_model, agent.provider_ref,
agent.thinking_effort, json.dumps(agent.watchdog_config),
agent.created_at, agent.updated_at),
)
self._db.commit()
Expand All @@ -1060,7 +1095,7 @@ def register(self, name: str, **kwargs) -> Agent:
"dream_enabled, dream_schedule, dream_timezone, dream_model, dream_notify, "
"librarian_enabled, librarian_schedule, "
"working_status, working_status_updated_at, "
"provider_url, provider_key, provider_model, provider_ref, "
"runtime, provider_url, provider_key, provider_model, provider_ref, "
"disallowed_tools, thinking_effort, watchdog_config, last_seen_at"
)

Expand Down Expand Up @@ -2584,14 +2619,15 @@ def _row_to_agent(self, row: tuple) -> Agent:
librarian_schedule=row[36] if len(row) > 36 and row[36] else "0 4 * * *",
working_status=row[37] if len(row) > 37 and row[37] else "idle",
working_status_updated_at=row[38] if len(row) > 38 else 0.0,
provider_url=row[39] if len(row) > 39 and row[39] else "",
provider_key=row[40] if len(row) > 40 and row[40] else "",
provider_model=row[41] if len(row) > 41 and row[41] else "",
provider_ref=row[42] if len(row) > 42 and row[42] else "",
disallowed_tools=json.loads(row[43]) if len(row) > 43 and row[43] else [],
thinking_effort=row[44] if len(row) > 44 and row[44] else "medium",
watchdog_config=json.loads(row[45]) if len(row) > 45 and row[45] else {},
last_seen_at=row[46] if len(row) > 46 else 0.0,
runtime=row[39] if len(row) > 39 and row[39] else "claude_sdk",
provider_url=row[40] if len(row) > 40 and row[40] else "",
provider_key=row[41] if len(row) > 41 and row[41] else "",
provider_model=row[42] if len(row) > 42 and row[42] else "",
provider_ref=row[43] if len(row) > 43 and row[43] else "",
disallowed_tools=json.loads(row[44]) if len(row) > 44 and row[44] else [],
thinking_effort=row[45] if len(row) > 45 and row[45] else "medium",
watchdog_config=json.loads(row[46]) if len(row) > 46 and row[46] else {},
last_seen_at=row[47] if len(row) > 47 else 0.0,
)

# ── Cost Tracking ──────────────────────────────────────
Expand Down
Loading
Loading