feat(auth): wire prime to codex/claude oauth cli sessions
This commit is contained in:
@@ -0,0 +1,25 @@
|
||||
# Prime Auth with Existing Subscriptions (OAuth, no API keys)
|
||||
|
||||
Prime uses provider CLI OAuth sessions:
|
||||
- OpenAI planner via `codex`
|
||||
- Anthropic coder via `claude`
|
||||
|
||||
## Login on shard-host
|
||||
```bash
|
||||
source /srv/prime-core/scripts/prime-env.sh
|
||||
prime auth openai
|
||||
prime auth anthropic
|
||||
prime auth status
|
||||
```
|
||||
|
||||
### Notes
|
||||
- `prime auth openai` uses Codex device auth flow (good for SSH/headless).
|
||||
- `prime auth anthropic` opens Claude auth login flow.
|
||||
- You can sign in with Google where provider supports it in their auth UI.
|
||||
- No API keys are required for this path.
|
||||
|
||||
## Verify
|
||||
```bash
|
||||
prime status
|
||||
```
|
||||
Check `codex_login` and `claude_login` are healthy.
|
||||
@@ -1,8 +1,23 @@
|
||||
from __future__ import annotations
|
||||
import subprocess
|
||||
|
||||
|
||||
def code(task: str, plan: list[str] | None = None) -> dict:
|
||||
prompt = task
|
||||
if plan:
|
||||
prompt = f"Task: {task}\n\nPlan:\n- " + "\n- ".join(plan)
|
||||
cmd = ['claude', '--print', '--output-format', 'json', prompt]
|
||||
proc = subprocess.run(cmd, capture_output=True, text=True)
|
||||
if proc.returncode != 0:
|
||||
return {
|
||||
'provider': 'anthropic',
|
||||
'role': 'coder',
|
||||
'error': proc.stderr.strip() or proc.stdout.strip(),
|
||||
'hint': 'Run: prime auth anthropic'
|
||||
}
|
||||
return {
|
||||
'provider': 'anthropic',
|
||||
'role': 'coder',
|
||||
'task': task,
|
||||
'received_plan': plan or [],
|
||||
'result': 'Stub coder output. Wire OAuth provider call next.'
|
||||
'raw': proc.stdout.strip()
|
||||
}
|
||||
|
||||
@@ -1,12 +1,20 @@
|
||||
from __future__ import annotations
|
||||
import subprocess
|
||||
|
||||
|
||||
def plan(task: str) -> dict:
|
||||
cmd = ['codex', 'exec', '--skip-git-repo-check', '--json', task]
|
||||
proc = subprocess.run(cmd, capture_output=True, text=True)
|
||||
if proc.returncode != 0:
|
||||
return {
|
||||
'provider': 'openai',
|
||||
'role': 'planner',
|
||||
'error': proc.stderr.strip() or proc.stdout.strip(),
|
||||
'hint': 'Run: prime auth openai'
|
||||
}
|
||||
return {
|
||||
'provider': 'openai',
|
||||
'role': 'planner',
|
||||
'task': task,
|
||||
'plan': [
|
||||
'Clarify requirements',
|
||||
'Decompose into executable steps',
|
||||
'Define validation criteria',
|
||||
],
|
||||
'note': 'Stub planner output. Wire OAuth provider call next.'
|
||||
'raw': proc.stdout.strip()
|
||||
}
|
||||
|
||||
+36
-5
@@ -6,24 +6,36 @@ from .router import dispatch
|
||||
from .vault import load_tokens, VaultError
|
||||
|
||||
|
||||
def _run(cmd: list[str]) -> tuple[int, str, str]:
|
||||
p = subprocess.run(cmd, capture_output=True, text=True)
|
||||
return p.returncode, p.stdout.strip(), p.stderr.strip()
|
||||
|
||||
|
||||
def cmd_status(_: argparse.Namespace) -> int:
|
||||
try:
|
||||
t = load_tokens()
|
||||
providers = sorted(t.keys())
|
||||
except VaultError as e:
|
||||
providers = [f'vault-error: {e}']
|
||||
print(json.dumps({'prime': 'ok', 'oauth_providers': providers}, indent=2))
|
||||
|
||||
c_code, c_out, c_err = _run(['codex', 'login', 'status'])
|
||||
a_code, a_out, a_err = _run(['claude', 'auth', 'status', '--json'])
|
||||
|
||||
print(json.dumps({
|
||||
'prime': 'ok',
|
||||
'oauth_providers_vault': providers,
|
||||
'codex_login': {'code': c_code, 'out': c_out or c_err},
|
||||
'claude_login': {'code': a_code, 'out': a_out or a_err}
|
||||
}, indent=2))
|
||||
return 0
|
||||
|
||||
|
||||
def cmd_backup_now(_: argparse.Namespace) -> int:
|
||||
r = subprocess.run(['/srv/prime-core/scripts/backup.sh'])
|
||||
return r.returncode
|
||||
return subprocess.run(['/srv/prime-core/scripts/backup.sh']).returncode
|
||||
|
||||
|
||||
def cmd_restore(args: argparse.Namespace) -> int:
|
||||
r = subprocess.run(['/srv/prime-core/scripts/restore.sh', args.commit])
|
||||
return r.returncode
|
||||
return subprocess.run(['/srv/prime-core/scripts/restore.sh', args.commit]).returncode
|
||||
|
||||
|
||||
def cmd_dispatch(args: argparse.Namespace) -> int:
|
||||
@@ -32,6 +44,21 @@ def cmd_dispatch(args: argparse.Namespace) -> int:
|
||||
return 0
|
||||
|
||||
|
||||
def cmd_auth(args: argparse.Namespace) -> int:
|
||||
p = args.provider.lower()
|
||||
if p == 'openai':
|
||||
# device auth works well over SSH/headless
|
||||
return subprocess.run(['codex', 'login', '--device-auth']).returncode
|
||||
if p == 'anthropic':
|
||||
return subprocess.run(['claude', 'auth', 'login']).returncode
|
||||
if p == 'status':
|
||||
c = subprocess.run(['codex', 'login', 'status'])
|
||||
a = subprocess.run(['claude', 'auth', 'status', '--text'])
|
||||
return 0 if c.returncode == 0 and a.returncode == 0 else 1
|
||||
print('Usage: prime auth <openai|anthropic|status>')
|
||||
return 2
|
||||
|
||||
|
||||
def main() -> int:
|
||||
p = argparse.ArgumentParser(prog='prime')
|
||||
sub = p.add_subparsers(dest='cmd', required=True)
|
||||
@@ -51,6 +78,10 @@ def main() -> int:
|
||||
d.add_argument('task')
|
||||
d.set_defaults(fn=cmd_dispatch)
|
||||
|
||||
a = sub.add_parser('auth')
|
||||
a.add_argument('provider')
|
||||
a.set_defaults(fn=cmd_auth)
|
||||
|
||||
args = p.parse_args()
|
||||
return args.fn(args)
|
||||
|
||||
|
||||
Reference in New Issue
Block a user