Skip to content

Merge the TOCHI workflow prototype into the generalist app#171

Merged
akgohain merged 39 commits into
mainfrom
agent/generalist-prototype-sync
Jul 20, 2026
Merged

Merge the TOCHI workflow prototype into the generalist app#171
akgohain merged 39 commits into
mainfrom
agent/generalist-prototype-sync

Conversation

@akgohain

Copy link
Copy Markdown
Collaborator

What changed

This branch merges checkpoint/tochi-agentic-prototype into the current main lineage as a generalist integration candidate.

The merge preserves both product directions:

  • main's Project Manager UI, context, persistence API, discovery, and dashboards
  • the TOCHI branch's workflow state, project inspection, agent proposals, approvals, proofreading coordination, model-run lineage, evaluation, and evidence export

The three merge conflicts were reconciled intentionally:

  • client/src/api.js: retains Project Manager endpoints and workflow/file APIs under shared reverse-proxy-safe path normalization
  • client/src/views/Views.js: exposes both Workflow Progress and Project Manager surfaces
  • server_api/main.py: registers the Project Manager router alongside workflow volume/provenance infrastructure

An integration regression test now confirms the generalist Project Manager tab remains reachable from the merged app shell.

Why

The research prototype had become a large branch island while GitHub main retained a separate Project Manager implementation. This merge creates a concrete, tested reconciliation point so future work can converge on one full application instead of continuing to patch two incompatible versions.

Validation

  • python -m compileall -q server_api server_pytc scripts
  • frontend production build: passed with existing hook/bundle-size warnings
  • Project Manager backend: 6 passed
  • workflow/provenance/backend slice: 99 passed
  • complete frontend suite: 24 suites, 133 tests passed
  • git diff --check: passed

Known follow-up

  • This is intentionally a draft integration branch, not a production deployment.
  • Project Manager state and workflow project memory still coexist as separate models; a later consolidation pass should define authority and synchronization between them.
  • The API compatibility integration test inherited from the checkpoint can hang on its /files request in the current host environment and needs isolation from deployment filesystem state.
  • Existing React hook warnings, SQLAlchemy/Pydantic deprecations, and dependency-security findings remain outside this merge-resolution scope.

akgohain added 30 commits April 26, 2026 09:12
@akgohain
akgohain marked this pull request as ready for review July 20, 2026 17:44
@akgohain
akgohain merged commit a991b1b into main Jul 20, 2026
10 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant