code-context-control 2.52.0__py3-none-any.whl → 2.53.0__py3-none-any.whl

cli/c3.py

@@ -92,7 +92,7 @@ console = Console() if HAS_RICH else None
 # Config
 CONFIG_DIR = ".c3"
 CONFIG_FILE = ".c3/config.json"
-__version__ = "2.52.0"
+__version__ = "2.53.0"
 
 
 def _command_deps() -> CommandDeps:

cli/hub_server.py

@@ -1770,21 +1770,20 @@ def api_pm_task():
         task_id = (data.get("id") or "").strip()
         if not task_id:
             return jsonify({"error": "id is required"}), 400
-        res = None
-        fields = data.get("fields") or {}
-        if fields:
-            res = store.update_task(task_id, **fields)
+        if data.get("restore"):
+            res = store.restore_task(task_id, actor="hub")
             if "error" in res:
                 return jsonify(res), 400
-        move = data.get("move") or {}
-        if move:
-            res = store.move_task(task_id, status=move.get("status"),
-                                  before_id=move.get("before_id"),
-                                  after_id=move.get("after_id"))
-            if "error" in res:
-                return jsonify(res), 400
-        if res is None:
+            _pm_audit(resolved, "task", "restore", res["id"])
+            return jsonify({"updated": True, "task": res})
+        if not (data.get("fields") or data.get("move")):
             return jsonify({"error": "fields or move required"}), 400
+        res = store.mutate_task(task_id, fields=data.get("fields"),
+                                move=data.get("move"),
+                                expected_rev=data.get("expected_rev"),
+                                actor="hub")
+        if "error" in res:
+            return jsonify(res), 409 if res.get("code") == "rev_conflict" else 400
         _pm_audit(resolved, "task", "update", res["id"])
         return jsonify({"updated": True, "task": res})
 
@@ -1796,7 +1795,7 @@ def api_pm_task():
     task_id = (data.get("id") or "").strip()
     if not task_id:
         return jsonify({"error": "id is required"}), 400
-    res = store.archive_task(task_id)
+    res = store.archive_task(task_id, actor="hub")
     if "error" in res:
         return jsonify(res), 400
     _pm_audit(resolved, "task", "archive", res["id"])
@@ -1825,9 +1824,10 @@ def api_pm_milestone():
         return jsonify({"error": "id is required"}), 400
 
     if request.method == "PUT":
-        res = store.update_milestone(ms_id, **(data.get("fields") or {}))
+        res = store.update_milestone(ms_id, expected_rev=data.get("expected_rev"),
+                                     **(data.get("fields") or {}))
         if "error" in res:
-            return jsonify(res), 400
+            return jsonify(res), 409 if res.get("code") == "rev_conflict" else 400
         _pm_audit(resolved, "milestone", "update", res["id"])
         return jsonify({"updated": True, "milestone": res})
 
@@ -1860,9 +1860,10 @@ def api_pm_note():
         return jsonify({"error": "id is required"}), 400
 
     if request.method == "PUT":
-        res = store.update_note(note_id, **(data.get("fields") or {}))
+        res = store.update_note(note_id, expected_rev=data.get("expected_rev"),
+                                **(data.get("fields") or {}))
         if "error" in res:
-            return jsonify(res), 400
+            return jsonify(res), 409 if res.get("code") == "rev_conflict" else 400
         _pm_audit(resolved, "note", "update", res["id"])
         return jsonify({"updated": True, "note": res})
 
@@ -1898,6 +1899,105 @@ def api_pm_link():
     return jsonify({"task": res})
 
 
+@app.route("/api/projects/pm/events", methods=["GET"])
+def api_pm_events():
+    """PM event history for one project, newest first.
+    Query: path, entity?, id?, op?, limit?"""
+    resolved, err = _pm_resolve((request.args.get("path") or "").strip())
+    if err:
+        return err
+    try:
+        limit = max(1, min(int(request.args.get("limit") or 50), 500))
+    except ValueError:
+        limit = 50
+    return jsonify({"path": str(resolved), "events": _pm_store(resolved).history(
+        entity=(request.args.get("entity") or None),
+        item_id=(request.args.get("id") or None),
+        op=(request.args.get("op") or None),
+        limit=limit)})
+
+
+@app.route("/api/projects/pm/deps", methods=["POST"])
+def api_pm_deps():
+    """Add/remove a blocked-by dependency: {path, id, blocker, op: add|remove}."""
+    data = request.get_json(force=True) or {}
+    resolved, err = _pm_resolve((data.get("path") or "").strip())
+    if err:
+        return err
+    task_id = (data.get("id") or "").strip()
+    blocker = (data.get("blocker") or "").strip()
+    op = (data.get("op") or "add").strip()
+    if not task_id or not blocker:
+        return jsonify({"error": "id and blocker are required"}), 400
+    if op not in ("add", "remove"):
+        return jsonify({"error": "op must be add|remove"}), 400
+    store = _pm_store(resolved)
+    res = (store.add_dependency(task_id, blocker, actor="hub") if op == "add"
+           else store.remove_dependency(task_id, blocker, actor="hub"))
+    if "error" in res:
+        return jsonify(res), 400
+    _pm_audit(resolved, "deps", op, res["id"])
+    return jsonify({"task": res})
+
+
+@app.route("/api/projects/pm/report", methods=["GET"])
+def api_pm_report():
+    """PM health report for one project. Query: path"""
+    resolved, err = _pm_resolve((request.args.get("path") or "").strip())
+    if err:
+        return err
+    return jsonify({"path": str(resolved),
+                    "report": _pm_store(resolved).report()})
+
+
+def _time_tracker(path):
+    from services.time_tracker import TimeTracker
+    return TimeTracker(str(path))
+
+
+@app.route("/api/projects/time", methods=["GET"])
+def api_projects_time():
+    """Time summary for one project. Query: path"""
+    resolved, err = _pm_resolve((request.args.get("path") or "").strip())
+    if err:
+        return err
+    tracker = _time_tracker(resolved)
+    return jsonify({"path": str(resolved), "summary": tracker.summary(),
+                    "sessions": tracker.sessions()[:20],
+                    "entries": tracker.list_entries(limit=100)})
+
+
+@app.route("/api/projects/time/entry", methods=["POST", "PUT", "DELETE"])
+def api_projects_time_entry():
+    data = request.get_json(force=True) or {}
+    resolved, err = _pm_resolve((data.get("path") or "").strip())
+    if err:
+        return err
+    tracker = _time_tracker(resolved)
+    if request.method == "POST":
+        res = tracker.add_entry(data.get("minutes"), note=data.get("note", ""),
+                                date=data.get("date") or None,
+                                task_id=data.get("task_id"), created_by="hub")
+        if "error" in res:
+            return jsonify(res), 400
+        _pm_audit(resolved, "time", "create", res["id"])
+        return jsonify({"created": True, "entry": res}), 201
+    entry_id = (data.get("id") or "").strip()
+    if not entry_id:
+        return jsonify({"error": "id is required"}), 400
+    if request.method == "PUT":
+        res = tracker.update_entry(entry_id, **(data.get("fields") or {}))
+        if "error" in res:
+            return jsonify(res), 400
+        _pm_audit(resolved, "time", "update", res["id"])
+        return jsonify({"updated": True, "entry": res})
+    res = tracker.delete_entry(entry_id)
+    if "error" in res:
+        return jsonify(res), 400
+    _pm_audit(resolved, "time", "delete", entry_id)
+    return jsonify(res)
+
+
 # ── Agent artifacts: config tracking (v2.46.0) ────────────────────────────
 # Direct ArtifactStore per request (load-per-op store — no runtime build
 # needed); every mutation audited to the target project's activity log.
@@ -2012,24 +2112,47 @@ def api_pm_global():
             skipped.append({"path": ppath, "reason": "not initialized"})
             continue
         try:
-            if status_filter and status_filter != "all":
-                rows = TaskStore(ppath).list_tasks(status=status_filter, limit=1000)
-            else:
-                rows = TaskStore(ppath).list_tasks(limit=1000)
-                if status_filter != "all":
-                    rows = [t for t in rows if t.get("status") != "done"]
+            everything = TaskStore(ppath).list_tasks(include_archived=True,
+                                                     limit=1000)
         except Exception as e:
             skipped.append({"path": ppath, "reason": str(e)})
             continue
+        active = [t for t in everything
+                  if t.get("lifecycle", "active") == "active"]
+        if status_filter and status_filter != "all":
+            rows = [t for t in active if t.get("status") == status_filter]
+        elif status_filter == "all":
+            rows = active
+        else:
+            rows = [t for t in active if t.get("status") != "done"]
         if not rows:
             continue
+        # Resolve blockers server-side: the aggregate ships only open tasks,
+        # so clients cannot tell a done/archived blocker from an open one.
+        by_id = {t["id"]: t for t in everything}
+        for t in rows:
+            deps = t.get("blocked_by") or []
+            if not deps:
+                continue
+            found = [(d, by_id.get(d)) for d in deps]
+            t["blockers_open"] = sum(
+                1 for _, b in found
+                if b is not None and b.get("lifecycle", "active") == "active"
+                and b.get("status") != "done")
+            t["blocker_titles"] = [
+                (b.get("title") or d[:8]) if b is not None else d[:8]
+                for d, b in found]
         proj_info = {"name": p.get("name"), "path": ppath}
         if p.get("parent_path"):
             proj_info["parent_path"] = p["parent_path"]
         for t in rows:
             t["project"] = proj_info
         tasks.extend(rows)
-        by_project[ppath] = {"name": p.get("name"), "open": len(rows)}
+        by_project[ppath] = {
+            "name": p.get("name"),
+            "open": sum(1 for t in rows if t.get("status") != "done"),
+            "shown": len(rows),
+        }
 
     # priority asc, due asc, updated desc (stable two-stage sort)
     tasks.sort(key=lambda t: t.get("updated_at") or "", reverse=True)

cli/hub_ui/components/task_board.js

@@ -6,7 +6,9 @@
 // Shared PM primitives (PM_COLUMNS, PriorityDot, DueBadge, statusColor,
 // ...) come from ui/pm_shared.js, loaded earlier in the bundle.
 
-function TaskBoardCard({ task, mode, colTasks, index, onMoveStatus, onMoveRank, onOpenProject }) {
+let _pmDragTask = null;  // active drag payload (module-level; no useRef in this bundle)
+
+function TaskBoardCard({ task, mode, colTasks, index, onMoveStatus, onMoveRank, onOpenProject, onMoveTo, onDropOnCard, byId }) {
   const keys = PM_COLUMNS.map(c => c[0]);
   const ci = keys.indexOf(task.status);
   const navBtn = (label, title, onClick) => (
@@ -18,10 +20,15 @@ function TaskBoardCard({ task, mode, colTasks, index, onMoveStatus, onMoveRank,
     }}>{label}</button>
   );
   return (
-    <div className="fade-up" style={{
-      background: T.surface, border: `1px solid ${T.border}`, borderRadius: 8,
-      padding: '8px 10px', display: 'flex', flexDirection: 'column', gap: 6,
-    }}>
+    <div className="fade-up" draggable
+      onDragStart={() => { _pmDragTask = task; }}
+      onDragOver={e => e.preventDefault()}
+      onDrop={e => { e.preventDefault(); e.stopPropagation(); onDropOnCard(task); }}
+      style={{
+        background: T.surface, border: `1px solid ${T.border}`, borderRadius: 8,
+        padding: '8px 10px', display: 'flex', flexDirection: 'column', gap: 6,
+        cursor: 'grab',
+      }}>
       <div style={{ display: 'flex', alignItems: 'flex-start', gap: 6 }}>
         <span style={{ marginTop: 3, display: 'inline-flex', flexShrink: 0 }}>
           <PriorityDot priority={task.priority} />
@@ -37,10 +44,13 @@ function TaskBoardCard({ task, mode, colTasks, index, onMoveStatus, onMoveRank,
             <Badge color={T.purple}>{task.project.name || 'project'}</Badge>
           </span>
         )}
+        <DepsBadge task={task} byId={byId} />
         <DueBadge task={task} />
         {(task.tags || []).map(tag => <Badge key={tag} color={T.blue}>{tag}</Badge>)}
       </div>
       <div style={{ display: 'flex', alignItems: 'center', gap: 4 }}>
+        {isTaskReady(task, byId) &&
+          navBtn('✓', 'Unblocked — move to Backlog', () => onMoveTo(task, 'backlog'))}
         {ci > 0 && navBtn('◀', `Move to ${PM_COLUMNS[ci - 1][1]}`, () => onMoveStatus(task, -1))}
         {ci >= 0 && ci < keys.length - 1 &&
           navBtn('▶', `Move to ${PM_COLUMNS[ci + 1][1]}`, () => onMoveStatus(task, +1))}
@@ -61,6 +71,7 @@ function TaskBoard({ projects, onOpenDrill }) {
   const [msFilter, setMsFilter] = useState('');       // milestone id ('' = all)
   const [err, setErr] = useState('');
   const [newTitle, setNewTitle] = useState('');
+  const [timeData, setTimeData] = useState(null);
 
   const mode = scope === 'global' ? 'global' : 'project';
 
@@ -72,6 +83,10 @@ function TaskBoard({ projects, onOpenDrill }) {
         const q = msFilter ? `&milestone=${encodeURIComponent(msFilter)}` : '';
         const b = await api.get(`/api/projects/pm?path=${encodeURIComponent(scope)}${q}`);
         setBoardData(b);
+        try {
+          setTimeData(await api.get(
+            `/api/projects/time?path=${encodeURIComponent(scope)}`));
+        } catch (e2) { setTimeData(null); }
       }
       setErr('');
     } catch (e) {
@@ -85,7 +100,7 @@ function TaskBoard({ projects, onOpenDrill }) {
   }, [scope, msFilter]);
 
   // Reset per-project state when the scope changes (avoid stale board flash).
-  useEffect(() => { setBoardData(null); setMsFilter(''); setNewTitle(''); setErr(''); }, [scope]);
+  useEffect(() => { setBoardData(null); setMsFilter(''); setNewTitle(''); setErr(''); setTimeData(null); }, [scope]);
   useEffect(() => { load(); }, [load]);
   usePoll(load, 10000);
 
@@ -98,10 +113,19 @@ function TaskBoard({ projects, onOpenDrill }) {
     const path = mode === 'global' ? (task.project && task.project.path) : scope;
     if (!path) return;
     try {
-      await api.put('/api/projects/pm/task', { path, id: task.id, move: { status: next } });
+      const body = { path, id: task.id, move: { status: next } };
+      if (mode === 'project' && boardData && boardData.board && boardData.board.rev != null) {
+        body.expected_rev = boardData.board.rev;
+      }
+      await api.put('/api/projects/pm/task', body);
       notify(`Moved to ${PM_COLUMNS[ci + dir][1]}`);
       load();
-    } catch (e) { notify(e.message || 'Move failed', 'err'); }
+    } catch (e) {
+      if (e && e.status === 409) {
+        notify('Board changed elsewhere — refreshed', 'err');
+        load();
+      } else { notify(e.message || 'Move failed', 'err'); }
+    }
   };
 
   const moveRank = async (task, colTasks, index, dir) => {
@@ -109,10 +133,47 @@ function TaskBoard({ projects, onOpenDrill }) {
       ? { before_id: colTasks[index - 1].id }
       : { after_id: colTasks[index + 1].id };
     try {
-      await api.put('/api/projects/pm/task', { path: scope, id: task.id, move });
+      const body = { path: scope, id: task.id, move };
+      if (boardData && boardData.board && boardData.board.rev != null) {
+        body.expected_rev = boardData.board.rev;
+      }
+      await api.put('/api/projects/pm/task', body);
       notify(dir < 0 ? 'Moved up' : 'Moved down');
       load();
-    } catch (e) { notify(e.message || 'Reorder failed', 'err'); }
+    } catch (e) {
+      if (e && e.status === 409) {
+        notify('Board changed elsewhere — refreshed', 'err');
+        load();
+      } else { notify(e.message || 'Reorder failed', 'err'); }
+    }
+  };
+
+  const moveTo = async (task, status) => {
+    const path = mode === 'global' ? (task.project && task.project.path) : scope;
+    if (!path || task.status === status) return;
+    try {
+      await api.put('/api/projects/pm/task', { path, id: task.id, move: { status } });
+      notify(`Moved to ${(PM_COLUMNS.find(c => c[0] === status) || [status, status])[1]}`);
+      load();
+    } catch (e) { notify(e.message || 'Move failed', 'err'); }
+  };
+
+  const dropOnColumn = (key) => {
+    const t = _pmDragTask; _pmDragTask = null;
+    if (!t) return;
+    moveTo(t, key);
+  };
+
+  const dropOnCard = (target) => {
+    const t = _pmDragTask; _pmDragTask = null;
+    if (!t || t.id === target.id) return;
+    if (mode !== 'project') { moveTo(t, target.status); return; }
+    const move = t.status === target.status
+      ? { before_id: target.id }
+      : { status: target.status, before_id: target.id };
+    api.put('/api/projects/pm/task', { path: scope, id: t.id, move })
+      .then(() => { notify('Moved'); load(); })
+      .catch(e => notify(e.message || 'Move failed', 'err'));
   };
 
   const addTask = async () => {
@@ -145,7 +206,11 @@ function TaskBoard({ projects, onOpenDrill }) {
     const cols = (((boardData || {}).board) || {}).columns || {};
     PM_COLUMNS.forEach(([k]) => { columns[k] = cols[k] || []; });
   }
+  const boardById = {};
+  Object.values(columns).forEach(list =>
+    list.forEach(t => { boardById[t.id] = t; }));
   const milestones = (((boardData || {}).board) || {}).milestones || [];
+  const recovery = (((boardData || {}).board) || {}).recovery || null;
   const byProject = (globalData || {}).by_project || {};
   const projChips = Object.entries(byProject)
     .sort((a, b) => (b[1].open || 0) - (a[1].open || 0) ||
@@ -191,7 +256,16 @@ function TaskBoard({ projects, onOpenDrill }) {
         </div>
       )}
 
+      {mode === 'project' && timeData && timeData.summary && (
+        <div className="mono" style={{ fontSize: 11, color: T.textDim }}>
+          ⏱ {fmtMinutes(timeData.summary.today.total_min)} today
+          {' · '}{fmtMinutes(timeData.summary.last_7d.total_min)} last 7d
+          {' · '}{fmtMinutes(timeData.summary.last_30d.total_min)} last 30d
+          {' · '}{(timeData.entries || []).length} manual
+        </div>
+      )}
       {err && <div style={{ fontSize: 12, color: T.error }}>{err}</div>}
+      {mode === 'project' && <RecoveryBanner recovery={recovery} />}
 
       {/* Board */}
       {loadingBoard ? (
@@ -214,10 +288,13 @@ function TaskBoard({ projects, onOpenDrill }) {
                     {hiddenDone ? '—' : colTasks.length}
                   </span>
                 </div>
-                <div style={{
-                  display: 'flex', flexDirection: 'column', gap: 8,
-                  overflowY: 'auto', maxHeight: 'calc(100vh - 220px)', paddingRight: 2,
-                }}>
+                <div
+                  onDragOver={e => e.preventDefault()}
+                  onDrop={e => { e.preventDefault(); dropOnColumn(key); }}
+                  style={{
+                    display: 'flex', flexDirection: 'column', gap: 8,
+                    overflowY: 'auto', maxHeight: 'calc(100vh - 220px)', paddingRight: 2,
+                  }}>
                   {mode === 'project' && key === 'backlog' && (
                     <div style={{ display: 'flex', gap: 6 }}>
                       <input value={newTitle}
@@ -246,9 +323,10 @@ function TaskBoard({ projects, onOpenDrill }) {
                     <React.Fragment>
                       {colTasks.map((t, i) => (
                         <TaskBoardCard key={t.id} task={t} mode={mode}
-                          colTasks={colTasks} index={i}
+                          colTasks={colTasks} index={i} byId={boardById}
                           onMoveStatus={moveStatus} onMoveRank={moveRank}
-                          onOpenProject={openProject} />
+                          onOpenProject={openProject}
+                          onMoveTo={moveTo} onDropOnCard={dropOnCard} />
                       ))}
                       {colTasks.length === 0 && !(mode === 'project' && key === 'backlog') && (
                         <div style={{ fontSize: 11, color: T.textDim, fontStyle: 'italic', padding: '4px 2px' }}>

cli/mcp_server.py

@@ -88,7 +88,7 @@ def _build_instructions(ide_name: str) -> str:
         "  DISTILL terminal/log output >10 lines → c3_filter\n"
         "  EXECUTE shell (tests/git/build) → c3_shell\n"
         "  RECALL cross-session knowledge → c3_memory(action='recall') (index+fetch for large stores)\n"
-        "  TRACK durable tasks/milestones/decisions → c3_task\n"
+        "  TRACK durable tasks/milestones/decisions + time → c3_task\n"
         "  AGENT CONFIG inventory/history/diff/restore → c3_artifacts\n"
         "  SNAPSHOT before /clear → c3_session(action='snapshot')\n"
         "  HEALTH/budget checks → c3_status\n"
@@ -102,6 +102,13 @@ async def lifespan(server):
     """Initialize all services, auto-start session, start file watcher."""
     project = PROJECT_PATH
     services = build_runtime(project, ide_name=_IDE_NAME)
+    if getattr(services, "time_tracker", None) is not None:
+        try:
+            # The IDE loading the c3 MCP server marks the start of a work
+            # session for this project.
+            services.time_tracker.ping("startup")
+        except Exception:
+            pass
     transcript_index = TranscriptIndex(project)
     services.transcript_index = transcript_index
     snapshots = services.snapshots or ContextSnapshot(project)
@@ -367,6 +374,12 @@ def _finalize_response(ctx: Context, tool_name: str, args: dict,
 
     svc.session_mgr.log_tool_call(tool_name, args, summary)
     svc.activity_log.log("tool_call", {"tool": tool_name, "args": args, "result_summary": summary})
+    tracker = getattr(svc, "time_tracker", None)
+    if tracker is not None:
+        try:
+            tracker.ping("tool")  # throttled heartbeat; idle gaps close sessions
+        except Exception:
+            pass
     svc.session_mgr.track_response(tool_name, response, response_tokens=response_tokens)
 
     hybrid_cfg = svc.hybrid_config or {}
@@ -846,15 +859,24 @@ async def c3_task(
     target_date: str = "",
     query: str = "",
     limit: int = 50,
+    parent: str = "",
+    minutes: int = 0,
     ctx: Context = None,
 ) -> str:
     """TRACK WORK — durable per-project tasks, milestones, and decision notes; use when asked to create/update/complete tasks (reads safe in plan mode).
-    Tasks: add (title [+description/priority p0-p3/due_date YYYY-MM-DD/tags CSV/milestone]),
+    Tasks: add (title [+description/priority p0-p3/due_date YYYY-MM-DD/tags CSV/milestone/parent]),
       update (task_id + changed fields incl. status backlog|in_progress|blocked|done), done (task_id),
       list (filters: status/priority/tags/milestone/query), get, board (kanban columns + milestone progress), archive,
-      link/unlink (task_id + link_type file|commit|edit + ref — ties tasks to code).
+      link/unlink (task_id + link_type file|commit|edit + ref — ties tasks to code),
+      block/unblock (task_id + ref=blocking task id; cycle-safe; completing the last open blocker auto-releases dependents to backlog),
+      report (overdue, blocked chains + aging, ready-to-unblock, milestone health/at-risk, throughput).
+    Subtasks: one level via parent (add/update; update parent='none' clears).
+    Time: time_add (minutes 1-1440 [+note/due_date=date/task_id]), time_update / time_delete (ref=entry id),
+      time_list (manual entries + recent auto sessions), time_summary (today/7d/30d, auto vs manual).
+      Auto-tracking: server startup + tool calls ping .c3/time; idle gaps >15min close a session.
     Milestones: milestone_add (name [+target_date]), milestone_update, milestone_list (with progress %), milestone_archive.
     Notes: note_add (note [+kind=decision] [+task_id]), note_list.
+    History: history ([+task_id] [+limit]) — append-only event log (who/what/when, before->after), newest first.
     task_id accepts any unique id prefix (>=4 chars); milestone accepts id or unique name.
     Ephemeral session plans stay in c3_session(action='plan')."""
     svc = _svc(ctx)
@@ -868,7 +890,8 @@ async def c3_task(
         title=title, task_id=task_id, status=status, priority=priority,
         due_date=due_date, tags=tags, description=description, milestone=milestone,
         note=note, kind=kind, link_type=link_type, ref=ref, label=label,
-        name=name, target_date=target_date, query=query, limit=limit)
+        name=name, target_date=target_date, query=query, limit=limit,
+        parent=parent, minutes=minutes)
 
 
 @mcp.tool()