pelmen/kin
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'KIN-ARCH-023-debugger'

Browse source
This commit is contained in:
Gros Frumos 2026-03-18 22:27:06 +02:00
commit d6ccb468f7
4 changed files with 94 additions and 68 deletions
Download patch file Download diff file Expand all files Collapse all files

149
cli/main.py
View file

@ -616,83 +616,98 @@ def run_task(ctx, task_id, dry_run, allow_write):
is_noninteractive = os.environ.get("KIN_NONINTERACTIVE") == "1" is_noninteractive = os.environ.get("KIN_NONINTERACTIVE") == "1"
click.echo(f"Task: {task['id']} — {task['title']}") click.echo(f"Task: {task['id']} — {task['title']}")
# Step 1: PM decomposes # Step 1a: Check for pre-built steps from revise endpoint (e.g. with analyst injection).
click.echo("Running PM to decompose task...") # Decision #866: steps built in web/api.py are saved as pending_steps and consumed here.
pm_started_at = datetime.now(timezone.utc).isoformat() pending_steps = task.get("pending_steps")
pm_result = run_agent( if pending_steps:
conn, "pm", task_id, project_id, pipeline_steps = pending_steps
model="sonnet", dry_run=dry_run, models.update_task(conn, task_id, pending_steps=None)
allow_write=allow_write, noninteractive=is_noninteractive, click.echo(f"Using pre-built pipeline ({len(pipeline_steps)} steps, skipping PM)...")
) pm_result = None
pm_ended_at = datetime.now(timezone.utc).isoformat() pm_started_at = pm_ended_at = None
if is_noninteractive:
click.echo("\n[non-interactive] Auto-executing pipeline...")
elif not click.confirm("\nExecute pipeline?"):
click.echo("Aborted.")
return
else:
# Step 1b: PM decomposes
click.echo("Running PM to decompose task...")
pm_started_at = datetime.now(timezone.utc).isoformat()
pm_result = run_agent(
conn, "pm", task_id, project_id,
model="sonnet", dry_run=dry_run,
allow_write=allow_write, noninteractive=is_noninteractive,
)
pm_ended_at = datetime.now(timezone.utc).isoformat()
if dry_run: if dry_run:
click.echo("\n--- PM Prompt (dry-run) ---") click.echo("\n--- PM Prompt (dry-run) ---")
click.echo(pm_result.get("prompt", "")[:2000]) click.echo(pm_result.get("prompt", "")[:2000])
click.echo("\n(Dry-run: PM would produce a pipeline JSON)") click.echo("\n(Dry-run: PM would produce a pipeline JSON)")
return return
if not pm_result["success"]: if not pm_result["success"]:
click.echo(f"PM failed: {pm_result.get('output', 'unknown error')}", err=True) click.echo(f"PM failed: {pm_result.get('output', 'unknown error')}", err=True)
raise SystemExit(1)
# Parse PM output for pipeline
output = pm_result.get("output")
if isinstance(output, str):
try:
output = json.loads(output)
except json.JSONDecodeError:
click.echo(f"PM returned non-JSON output:\n{output[:500]}", err=True)
raise SystemExit(1) raise SystemExit(1)
if not isinstance(output, dict) or "pipeline" not in output: # Parse PM output for pipeline
click.echo(f"PM output missing 'pipeline' key:\n{json.dumps(output, indent=2)[:500]}", err=True) output = pm_result.get("output")
raise SystemExit(1) if isinstance(output, str):
try:
output = json.loads(output)
except json.JSONDecodeError:
click.echo(f"PM returned non-JSON output:\n{output[:500]}", err=True)
raise SystemExit(1)
pipeline_steps = output["pipeline"] if not isinstance(output, dict) or "pipeline" not in output:
if not isinstance(pipeline_steps, list) or not pipeline_steps: click.echo(f"PM output missing 'pipeline' key:\n{json.dumps(output, indent=2)[:500]}", err=True)
click.echo( raise SystemExit(1)
f"PM returned empty or invalid pipeline: {pipeline_steps!r}", err=True
)
raise SystemExit(1)
analysis = output.get("analysis", "")
# Save completion_mode from PM output to task (only if neither task nor project has explicit mode) pipeline_steps = output["pipeline"]
task_current = models.get_task(conn, task_id) if not isinstance(pipeline_steps, list) or not pipeline_steps:
update_fields = {} click.echo(
project = models.get_project(conn, project_id) f"PM returned empty or invalid pipeline: {pipeline_steps!r}", err=True
project_mode = project.get("execution_mode") if project else None )
if not task_current.get("execution_mode") and not project_mode: raise SystemExit(1)
pm_completion_mode = models.validate_completion_mode( analysis = output.get("analysis", "")
output.get("completion_mode", "review")
)
update_fields["execution_mode"] = pm_completion_mode
import logging
logging.getLogger("kin").info(
"PM set completion_mode=%s for task %s", pm_completion_mode, task_id
)
# Save category from PM output (only if task has no category yet) # Save completion_mode from PM output to task (only if neither task nor project has explicit mode)
if not task_current.get("category"): task_current = models.get_task(conn, task_id)
pm_category = output.get("category") update_fields = {}
if pm_category and isinstance(pm_category, str): project = models.get_project(conn, project_id)
pm_category = pm_category.upper() project_mode = project.get("execution_mode") if project else None
if pm_category in models.TASK_CATEGORIES: if not task_current.get("execution_mode") and not project_mode:
update_fields["category"] = pm_category pm_completion_mode = models.validate_completion_mode(
output.get("completion_mode", "review")
)
update_fields["execution_mode"] = pm_completion_mode
import logging
logging.getLogger("kin").info(
"PM set completion_mode=%s for task %s", pm_completion_mode, task_id
)
if update_fields: # Save category from PM output (only if task has no category yet)
models.update_task(conn, task_id, **update_fields) if not task_current.get("category"):
pm_category = output.get("category")
if pm_category and isinstance(pm_category, str):
pm_category = pm_category.upper()
if pm_category in models.TASK_CATEGORIES:
update_fields["category"] = pm_category
click.echo(f"\nAnalysis: {analysis}") if update_fields:
click.echo(f"Pipeline ({len(pipeline_steps)} steps):") models.update_task(conn, task_id, **update_fields)
for i, step in enumerate(pipeline_steps, 1):
click.echo(f" {i}. {step['role']} ({step.get('model', 'sonnet')}): {step.get('brief', '')}")
if is_noninteractive: click.echo(f"\nAnalysis: {analysis}")
click.echo("\n[non-interactive] Auto-executing pipeline...") click.echo(f"Pipeline ({len(pipeline_steps)} steps):")
elif not click.confirm("\nExecute pipeline?"): for i, step in enumerate(pipeline_steps, 1):
click.echo("Aborted.") click.echo(f" {i}. {step['role']} ({step.get('model', 'sonnet')}): {step.get('brief', '')}")
return
if is_noninteractive:
click.echo("\n[non-interactive] Auto-executing pipeline...")
elif not click.confirm("\nExecute pipeline?"):
click.echo("Aborted.")
return
# Step 2: Execute pipeline # Step 2: Execute pipeline
click.echo("\nExecuting pipeline...") click.echo("\nExecuting pipeline...")

5
core/db.py
View file

@ -65,6 +65,7 @@ CREATE TABLE IF NOT EXISTS tasks (
revise_comment TEXT, revise_comment TEXT,
revise_count INTEGER DEFAULT 0, revise_count INTEGER DEFAULT 0,
revise_target_role TEXT DEFAULT NULL, revise_target_role TEXT DEFAULT NULL,
pending_steps JSON DEFAULT NULL,
labels JSON, labels JSON,
category TEXT DEFAULT NULL, category TEXT DEFAULT NULL,
telegram_sent BOOLEAN DEFAULT 0, telegram_sent BOOLEAN DEFAULT 0,
@ -400,6 +401,10 @@ def _migrate(conn: sqlite3.Connection):
conn.execute("ALTER TABLE tasks ADD COLUMN revise_target_role TEXT DEFAULT NULL") conn.execute("ALTER TABLE tasks ADD COLUMN revise_target_role TEXT DEFAULT NULL")
conn.commit() conn.commit()
if "pending_steps" not in task_cols:
conn.execute("ALTER TABLE tasks ADD COLUMN pending_steps JSON DEFAULT NULL")
conn.commit()
if "obsidian_vault_path" not in proj_cols: if "obsidian_vault_path" not in proj_cols:
conn.execute("ALTER TABLE projects ADD COLUMN obsidian_vault_path TEXT") conn.execute("ALTER TABLE projects ADD COLUMN obsidian_vault_path TEXT")
conn.commit() conn.commit()

3
core/models.py
View file

@ -37,6 +37,7 @@ _JSON_COLUMNS: frozenset[str] = frozenset({
"tech_stack", "tech_stack",
"brief", "spec", "review", "test_result", "security_result", "labels", "brief", "spec", "review", "test_result", "security_result", "labels",
"smoke_test_result", "smoke_test_result",
"pending_steps",
"tags", "tags",
"dependencies", "dependencies",
"steps", "steps",
@ -380,7 +381,7 @@ def update_task(conn: sqlite3.Connection, id: str, **fields) -> dict:
""" """
if not fields: if not fields:
return get_task(conn, id) return get_task(conn, id)
json_cols = ("brief", "spec", "review", "test_result", "security_result", "labels", "smoke_test_result") json_cols = ("brief", "spec", "review", "test_result", "security_result", "labels", "smoke_test_result", "pending_steps")
for key in json_cols: for key in json_cols:
if key in fields: if key in fields:
fields[key] = _json_encode(fields[key]) fields[key] = _json_encode(fields[key])

5
web/api.py
View file

@ -1065,6 +1065,11 @@ def revise_task(task_id: str, body: TaskRevise):
} }
steps = [analyst_step] + list(steps) steps = [analyst_step] + list(steps)
# Persist computed steps so the subprocess can use them (avoids PM re-planning).
# Decision #866: modified pipeline steps must be saved to DB before subprocess launch.
if steps:
models.update_task(conn, task_id, pending_steps=steps)
conn.close() conn.close()
# Launch pipeline in background subprocess # Launch pipeline in background subprocess