Skip to content

Resolve company-context merge with agent invites#18

Merged
G9Pedro merged 6 commits intomainfrom
cursor/onboard-invite-agents-310d
Apr 28, 2026
Merged

Resolve company-context merge with agent invites#18
G9Pedro merged 6 commits intomainfrom
cursor/onboard-invite-agents-310d

Conversation

@G9Pedro
Copy link
Copy Markdown
Contributor

@G9Pedro G9Pedro commented Apr 28, 2026

Summary

  • Merge latest origin/main into the agent onboarding/invite branch.
  • Classified all surfaced conflicts as simple additive/structural conflicts:
    • README kept both agent onboarding docs and company-context browsing docs.
    • wg-cli manifest kept the required wg-graph dependency plus versioned internal deps.
    • onboard.rs kept compatibility with expanded company-context actor fields.
    • output/human.rs kept both graph-reference and invite/onboard imports.
  • No complicated/conflicting product intents were found.

Verification

  • cargo fmt --all --check
  • cargo clippy --workspace --all-targets --all-features -- -D warnings
  • cargo test --workspace
  • Focused smoke: workgraph onboard ... --agent agent:pedro-openclaw=openclaw --agent agent:pedro-hermes=hermes --json
  • Focused smoke: workgraph invite create --label openclaw --actor-id agent:pedro-openclaw --server http://127.0.0.1:8787 --json
  • Focused smoke: workgraph actor register --type person --id person:ada --title Ada --role Engineer --team-id team/platform --json
  • Focused smoke: workgraph query person --filter team_ids=team/platform --json
  • Focused smoke: workgraph show person/person:ada --json
Open in Web Open in Cursor 

cursoragent and others added 6 commits April 20, 2026 22:34
Co-authored-by: G9Pedro <G9Pedro@users.noreply.github.com>
Co-authored-by: G9Pedro <G9Pedro@users.noreply.github.com>
Co-authored-by: G9Pedro <G9Pedro@users.noreply.github.com>
Co-authored-by: G9Pedro <G9Pedro@users.noreply.github.com>
Co-authored-by: G9Pedro <G9Pedro@users.noreply.github.com>
Co-authored-by: G9Pedro <G9Pedro@users.noreply.github.com>
@G9Pedro G9Pedro marked this pull request as ready for review April 28, 2026 03:03
@G9Pedro G9Pedro merged commit 9d67d9d into main Apr 28, 2026
2 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.

2 participants