Merge pull request #3 from RedHatInsights/day-one-run

fix: polish instructions set after first day run.

Author: florkbr

.env.example

@@ -11,3 +11,22 @@ CLAUDE_CODE_USE_VERTEX=1
 ANTHROPIC_VERTEX_PROJECT_ID=your-gcp-project
 VERTEX_LOCATION=global
 ANTHROPIC_SMALL_FAST_MODEL=claude-sonnet-4-6
+
+# Git identity — used for commits (optional, uses your local git config if unset)
+# GIT_AUTHOR_NAME=platex-rehor-bot
+# GIT_AUTHOR_EMAIL=platform-experience-services@redhat.com
+# GIT_COMMITTER_NAME=platex-rehor-bot
+# GIT_COMMITTER_EMAIL=platform-experience-services@redhat.com
+
+# GPG signing key ID (optional, disables commit signing if unset)
+# GPG_SIGNING_KEY=0A22E27F31412FEE
+
+# SSH keys — route different hosts through different keys (optional)
+# BOT_SSH_KEY=.ssh/id_ed25519
+# GITLAB_SSH_KEY=~/.ssh/id_ed25519
+
+# GitHub — bot PAT for gh CLI (optional if gh auth login was used)
+# GH_TOKEN=ghp_...
+
+# GitLab — personal PAT for glab CLI (optional if glab auth login was used)
+# GITLAB_TOKEN=glpat-...

.gitignore

@@ -21,3 +21,4 @@ memory-server/src/static/assets/
 memory-server/src/static/index.html
 sa-key.json
 .ssh/
+.gitconfig

ARCHITECTURE.md

@@ -100,7 +100,7 @@ The agent communicates with external systems through [Model Context Protocol](ht
 | Server | Transport | Purpose |
 |--------|-----------|---------|
 | **mcp-atlassian** | stdio | Jira CRUD: search tickets, read/update issues, transitions, comments, sprints |
-| **bot-memory** | SSE (HTTP) | Task tracking (5 concurrent max) + RAG memory (vector search over past learnings) |
+| **bot-memory** | SSE (HTTP) | Task tracking (10 concurrent max) + RAG memory (vector search over past learnings) |
 | **chrome-devtools** | stdio | Browser automation for visual verification — navigate pages, take screenshots |
 | **hcc-patternfly-data-view** | stdio | PatternFly component docs (only loaded for frontend persona repos) |
 
@@ -386,6 +386,6 @@ Both images use Red Hat UBI9 base images:
 
 - Each bot instance handles one label (team). Multiple instances can run in parallel.
 - All instances share the memory server (cross-team learnings are possible).
-- Hard cap of 5 concurrent tasks per bot instance (enforced by memory server).
+- Hard cap of 10 concurrent tasks per bot instance (enforced by memory server).
 - Cycles are sequential within a bot — no concurrency within a single instance.
 - Idle interval (1 hour) keeps costs low when there's no work.

CLAUDE.md

@@ -1,4 +1,4 @@
-.PHONY: install run init dashboard costs costs-today costs-week seed-costs stop logs help memory-server memory-server-stop
+.PHONY: install run init dashboard costs costs-today costs-week seed-costs stop logs help memory-server memory-server-stop memory-dump memory-import
 
 LABEL ?= hcc-ai-framework
 

Makefile

@@ -308,7 +308,7 @@ Check:
 1. Are there tickets with the right primary label? Use the Jira filter above
 2. Are the tickets unassigned?
 3. Do they have a `repo:` label matching `project-repos.json`?
-4. Is the bot at the 5-task capacity limit? Check the dashboard
+4. Is the bot at the 10-task capacity limit? Check the dashboard
 
 ### MCP server fails to connect
 

OPERATIONS.md

@@ -33,6 +33,12 @@ JIRA_API_TOKEN=your-jira-api-token
 # Claude — GCP Vertex AI (service account)
 # Follow the RH internal guide to set up Vertex AI access
 # and generate a service account key file (sa-key.json).
+
+# GitHub — bot PAT for gh CLI
+GH_TOKEN=ghp_...
+
+# GitLab — personal PAT for glab CLI (api + write_repository scopes)
+GITLAB_TOKEN=glpat-...
 ```
 
 ## Quick Start
@@ -135,29 +141,23 @@ The bot is a good developer but has zero tribal knowledge. Don't assume it knows
 
 ## Adding a new repo
 
-1. Add to `project-repos.json`:
+All repos use forks by default. The bot pushes to the fork and opens PRs/MRs targeting the upstream repo.
+
+1. Fork the repo under the bot's account (e.g. `platex-rehor-bot`):
+   ```bash
+   gh repo fork RedHatInsights/my-repo --clone=false
+   ```
+2. Add to `project-repos.json`:
    ```json
    "my-repo": {
-     "url": "git@github.com:RedHatInsights/my-repo.git"
+     "url": "git@github.com:platex-rehor-bot/my-repo.git",
+     "upstream": "git@github.com:RedHatInsights/my-repo.git"
    }
    ```
-2. Add a `repo:my-repo` label to the Jira ticket
-
-The bot clones repos automatically when it picks up a ticket.
-
-### Fork repos
-
-If the bot doesn't have push access to the upstream repo, use a fork:
-
-```json
-"app-interface": {
-  "url": "git@gitlab.cee.redhat.com:youruser/app-interface.git",
-  "upstream": "git@gitlab.cee.redhat.com:service/app-interface.git",
-  "host": "gitlab"
-}
-```
+   For GitLab repos, add `"host": "gitlab"`.
+3. Add a `repo:my-repo` label to the Jira ticket.
 
-The bot clones from the fork, syncs from upstream, pushes branches to the fork, and opens MRs targeting the upstream repo.
+The bot clones repos automatically when it picks up a ticket. It fetches from `upstream`, creates branches based on the latest upstream code, pushes to `origin` (the fork), and opens PRs/MRs targeting the upstream repo.
 
 ### Persona selection
 
@@ -167,7 +167,25 @@ Personas are NOT hardcoded to repos. The bot dynamically selects the best-fit pe
 
 ### Option A: Bot on host, memory server in Docker (recommended)
 
-The recommended setup for development. The bot runs directly on your machine using your local Claude Code credentials, while the memory server runs in Docker:
+The recommended setup for development. The bot runs directly on your machine while the memory server runs in Docker.
+
+#### 1. Configure `.env`
+
+Copy `.env.example` to `.env` and fill in your credentials. All identity and auth settings are driven by `.env` — at startup, `run.py` reads these and auto-configures git and SSH.
+
+**Git identity** — set `GIT_AUTHOR_NAME`, `GIT_AUTHOR_EMAIL`, `GIT_COMMITTER_NAME`, `GIT_COMMITTER_EMAIL` to commit as the bot account. If unset, your local git config is used.
+
+**GPG signing** — import the bot's GPG key (`gpg --import <key-file>`), then set `GPG_SIGNING_KEY` to the key ID. If unset, commits are not signed.
+
+**SSH keys** — set `BOT_SSH_KEY` and/or `GITLAB_SSH_KEY` to route git traffic through specific keys per host. Paths can be absolute or relative to the repo root. If unset, your default SSH agent is used.
+
+**CLI auth** — set `GH_TOKEN` and/or `GITLAB_TOKEN`, or log in manually:
+```bash
+gh auth login                                       # GitHub
+glab auth login --hostname gitlab.cee.redhat.com    # GitLab
+```
+
+#### 2. Start the services
 
 ```bash
 # Start memory server + postgres
@@ -177,8 +195,6 @@ make memory-server
 make run LABEL=hcc-ai-framework
 ```
 
-This is the easiest way to get started — no need for service account keys or bot-specific GitHub credentials. The bot uses your local Claude Code auth and your personal gh/glab CLI sessions.
-
 ### Option B: Full stack in Docker
 
 For production-like deployments or CI — everything runs in containers with dedicated bot credentials:
@@ -258,7 +274,7 @@ Each repo has one or more personas that provide domain-specific guidelines. Pers
 
 The bot has persistent memory via MCP:
 
-- **Task tracking** — structured records of active work with status, PR links, and progress metadata. Hard cap of 5 concurrent active tasks. When interrupted mid-cycle, the bot saves progress (`last_step`, `next_step`, `files_changed`) so the next cycle resumes seamlessly.
+- **Task tracking** — structured records of active work with status, PR links, and progress metadata. Hard cap of 10 concurrent active tasks. When interrupted mid-cycle, the bot saves progress (`last_step`, `next_step`, `files_changed`) so the next cycle resumes seamlessly.
 - **RAG memory** — vector-searchable knowledge base of learnings from completed tickets, PR review feedback, and codebase patterns. The bot searches this before starting any new ticket, so it improves over time.
 
 ## Cost tracking

README.md

@@ -84,6 +84,9 @@ def _resolve_env_vars(obj):
     "SSH_PRIVATE_KEY_B64",
     "GPG_PRIVATE_KEY_B64",
     "GOOGLE_SA_KEY_B64",
+    "BOT_SSH_KEY",
+    "GITLAB_SSH_KEY",
+    "GPG_SIGNING_KEY",
 ]
 
 

bot/config.py

@@ -21,6 +21,91 @@
 DATA_DIR = SCRIPT_DIR / "data"
 
 
+def _resolve_path(p: str) -> str:
+    """Resolve a path that may be relative to SCRIPT_DIR, ~, or absolute."""
+    path = Path(p).expanduser()
+    if not path.is_absolute():
+        path = SCRIPT_DIR / path
+    return str(path.resolve())
+
+
+def setup_ssh(script_dir: Path) -> None:
+    """Generate SSH config from env vars and set GIT_SSH_COMMAND.
+
+    Reads BOT_SSH_KEY (for github.com) and GITLAB_SSH_KEY (for gitlab)
+    from the environment. Skips if neither is set.
+    """
+    bot_key = os.environ.get("BOT_SSH_KEY")
+    gitlab_key = os.environ.get("GITLAB_SSH_KEY")
+
+    if not bot_key and not gitlab_key:
+        return
+
+    ssh_dir = script_dir / ".ssh"
+    ssh_dir.mkdir(exist_ok=True)
+    config_path = ssh_dir / "config"
+
+    lines = ["# Auto-generated by bot/run.py — do not edit manually"]
+
+    if bot_key:
+        lines += [
+            "",
+            "Host github.com",
+            f"  IdentityFile {_resolve_path(bot_key)}",
+            "  IdentitiesOnly yes",
+            "  StrictHostKeyChecking accept-new",
+        ]
+
+    if gitlab_key:
+        lines += [
+            "",
+            "Host gitlab.cee.redhat.com",
+            f"  IdentityFile {_resolve_path(gitlab_key)}",
+            "  IdentitiesOnly yes",
+            "  StrictHostKeyChecking accept-new",
+        ]
+
+    config_path.write_text("\n".join(lines) + "\n")
+    config_path.chmod(0o600)
+    os.environ["GIT_SSH_COMMAND"] = f"ssh -F {config_path}"
+
+
+def setup_git(script_dir: Path) -> None:
+    """Generate a .gitconfig with identity and optional GPG signing.
+
+    Reads from env: GIT_AUTHOR_NAME, GIT_AUTHOR_EMAIL, GPG_SIGNING_KEY.
+    Sets GIT_CONFIG_GLOBAL so all repos use this config.
+    """
+    name = os.environ.get("GIT_AUTHOR_NAME")
+    email = os.environ.get("GIT_AUTHOR_EMAIL")
+
+    if not name and not email:
+        return
+
+    config_path = script_dir / ".gitconfig"
+    lines = [
+        "# Auto-generated by bot/run.py — do not edit manually",
+        "[user]",
+    ]
+    if name:
+        lines.append(f"\tname = {name}")
+    if email:
+        lines.append(f"\temail = {email}")
+
+    signing_key = os.environ.get("GPG_SIGNING_KEY")
+    if signing_key:
+        lines += [
+            f"\tsigningkey = {signing_key}",
+            "[commit]",
+            "\tgpgsign = true",
+            "[gpg]",
+            "\tformat = openpgp",
+        ]
+
+    config_path.write_text("\n".join(lines) + "\n")
+    os.environ["GIT_CONFIG_GLOBAL"] = str(config_path)
+
+
 def setup_logging() -> None:
     """Configure logging to stdout and data/bot.log."""
     DATA_DIR.mkdir(exist_ok=True)
@@ -50,6 +135,10 @@ def main() -> None:
     if gac and not os.path.isabs(gac):
         os.environ["GOOGLE_APPLICATION_CREDENTIALS"] = str(SCRIPT_DIR / gac)
 
+    # Set up SSH and git identity from env vars (no-op if not configured)
+    setup_ssh(SCRIPT_DIR)
+    setup_git(SCRIPT_DIR)
+
     parser = argparse.ArgumentParser(description="Dev bot agent loop")
     parser.add_argument(
         "--label",

bot/run.py

@@ -108,7 +108,14 @@ header {
   background: var(--surface);
   margin-bottom: 12px;
   gap: 12px;
-  flex-wrap: wrap;
+}
+.bot-banner.expanded {
+  align-items: flex-start;
+}
+.bot-banner.expanded .banner-message {
+  white-space: normal;
+  overflow: visible;
+  text-overflow: unset;
 }
 
 .bot-banner.state-working {
@@ -245,6 +252,19 @@ header {
 .banner-updated {
   color: var(--text-dim);
 }
+.banner-toggle {
+  background: none;
+  border: none;
+  color: var(--text-dim);
+  cursor: pointer;
+  font-size: 10px;
+  padding: 2px 4px;
+  line-height: 1;
+  flex-shrink: 0;
+}
+.banner-toggle:hover {
+  color: var(--text);
+}
 
 /* Tab nav */
 .tab-nav {
@@ -350,6 +370,25 @@ select:focus,
   background: rgba(248, 81, 73, 0.1);
 }
 
+.btn-unarchive {
+  background: transparent;
+  color: var(--accent);
+  border: 1px solid var(--accent);
+  padding: 6px 16px;
+  border-radius: 6px;
+  font-size: 13px;
+  cursor: pointer;
+}
+.btn-unarchive:hover {
+  background: rgba(88, 166, 255, 0.1);
+}
+
+.detail-actions {
+  display: flex;
+  gap: 8px;
+  margin-top: 16px;
+}
+
 /* Card grid */
 .card-grid {
   display: flex;
@@ -388,6 +427,10 @@ select:focus,
 .task-card.status-paused {
   border-left-color: var(--text-dim);
 }
+.task-card.status-archived {
+  border-left-color: var(--text-dim);
+  opacity: 0.7;
+}
 
 .task-card-header {
   display: flex;
@@ -427,6 +470,10 @@ select:focus,
   background: rgba(139, 148, 158, 0.2);
   color: var(--text-dim);
 }
+.status-badge.archived {
+  background: rgba(139, 148, 158, 0.15);
+  color: var(--text-dim);
+}
 
 .task-card-title {
   font-size: 14px;