Compare commits
3 Commits
main
...
f6b901dbca
| Author | SHA1 | Date | |
|---|---|---|---|
|
f6b901dbca | ||
|
|
0a224efb82 | ||
|
|
e82163b532 |
@@ -137,97 +137,6 @@ describe('AppserviceDaemon routing', () => {
|
|||||||
expect(res.status).toBe(405);
|
expect(res.status).toBe(405);
|
||||||
});
|
});
|
||||||
|
|
||||||
it('provisions a room as the AS sender with space linking', async () => {
|
|
||||||
const calls: Array<{ url: URL; body: unknown }> = [];
|
|
||||||
const fetchMock = vi.fn(async (input: URL | string, init?: RequestInit) => {
|
|
||||||
const url = new URL(String(input));
|
|
||||||
calls.push({ url, body: init?.body ? JSON.parse(String(init.body)) : undefined });
|
|
||||||
if (url.pathname.endsWith('/createRoom'))
|
|
||||||
return jsonResponse(200, { room_id: '!new:hs.example' });
|
|
||||||
return jsonResponse(200, {});
|
|
||||||
});
|
|
||||||
const daemon = new AppserviceDaemon(cfg, fetchMock as unknown as typeof fetch, () => {});
|
|
||||||
const res = await daemon.handle(
|
|
||||||
request({
|
|
||||||
method: 'POST',
|
|
||||||
path: '/bridge/v1/provision/rooms',
|
|
||||||
authorizationHeader: 'Bearer bridge-secret',
|
|
||||||
body: {
|
|
||||||
name: 'proj-x',
|
|
||||||
alias: 'mosaic-proj-x',
|
|
||||||
invite: ['@jason.woltje:hs.example'],
|
|
||||||
space_id: '!space:hs.example',
|
|
||||||
},
|
|
||||||
}),
|
|
||||||
);
|
|
||||||
expect(res.status).toBe(200);
|
|
||||||
expect(res.body.room_id).toBe('!new:hs.example');
|
|
||||||
expect(res.body.space_linked).toBe(true);
|
|
||||||
const create = calls.find((c) => c.url.pathname.endsWith('/createRoom'));
|
|
||||||
expect(create!.url.searchParams.get('user_id')).toBe('@mosaic-as:hs.example');
|
|
||||||
const body = create!.body as Record<string, unknown>;
|
|
||||||
expect(body.room_alias_name).toBe('mosaic-proj-x');
|
|
||||||
expect((body.power_level_content_override as Record<string, unknown>).users).toEqual({
|
|
||||||
'@mosaic-as:hs.example': 100,
|
|
||||||
});
|
|
||||||
expect(calls.some((c) => c.url.pathname.includes('/state/m.space.child/'))).toBe(true);
|
|
||||||
expect(calls.some((c) => c.url.pathname.includes('/state/m.space.parent/'))).toBe(true);
|
|
||||||
});
|
|
||||||
|
|
||||||
it('space-link failure still returns the room id (no orphan)', async () => {
|
|
||||||
const fetchMock = vi.fn(async (input: URL | string) => {
|
|
||||||
const url = new URL(String(input));
|
|
||||||
if (url.pathname.endsWith('/createRoom'))
|
|
||||||
return jsonResponse(200, { room_id: '!new:hs.example' });
|
|
||||||
if (url.pathname.includes('/state/m.space.child/'))
|
|
||||||
return jsonResponse(403, { errcode: 'M_FORBIDDEN', error: 'no PL in space' });
|
|
||||||
return jsonResponse(200, {});
|
|
||||||
});
|
|
||||||
const daemon = new AppserviceDaemon(cfg, fetchMock as unknown as typeof fetch, () => {});
|
|
||||||
const res = await daemon.handle(
|
|
||||||
request({
|
|
||||||
method: 'POST',
|
|
||||||
path: '/bridge/v1/provision/rooms',
|
|
||||||
authorizationHeader: 'Bearer bridge-secret',
|
|
||||||
body: { name: 'proj-x', space_id: '!space:hs.example' },
|
|
||||||
}),
|
|
||||||
);
|
|
||||||
expect(res.status).toBe(200);
|
|
||||||
expect(res.body.room_id).toBe('!new:hs.example');
|
|
||||||
expect(res.body.space_linked).toBe(false);
|
|
||||||
expect(String(res.body.space_error)).toContain('403');
|
|
||||||
});
|
|
||||||
|
|
||||||
it('invite list cap enforced', async () => {
|
|
||||||
const { daemon } = makeDaemon();
|
|
||||||
const res = await daemon.handle(
|
|
||||||
request({
|
|
||||||
method: 'POST',
|
|
||||||
path: '/bridge/v1/provision/rooms',
|
|
||||||
authorizationHeader: 'Bearer bridge-secret',
|
|
||||||
body: { name: 'x', invite: Array.from({ length: 51 }, (_, i) => `@u${i}:hs`) },
|
|
||||||
}),
|
|
||||||
);
|
|
||||||
expect(res.status).toBe(400);
|
|
||||||
});
|
|
||||||
|
|
||||||
it('provision rejects bad payloads and requires auth', async () => {
|
|
||||||
const { daemon } = makeDaemon();
|
|
||||||
const noAuth = await daemon.handle(
|
|
||||||
request({ method: 'POST', path: '/bridge/v1/provision/rooms', body: { name: 'x' } }),
|
|
||||||
);
|
|
||||||
expect(noAuth.status).toBe(403);
|
|
||||||
const bad = await daemon.handle(
|
|
||||||
request({
|
|
||||||
method: 'POST',
|
|
||||||
path: '/bridge/v1/provision/rooms',
|
|
||||||
authorizationHeader: 'Bearer bridge-secret',
|
|
||||||
body: { name: '', alias: 'BAD ALIAS' },
|
|
||||||
}),
|
|
||||||
);
|
|
||||||
expect(bad.status).toBe(400);
|
|
||||||
});
|
|
||||||
|
|
||||||
it('empty bridge token list denies everything', async () => {
|
it('empty bridge token list denies everything', async () => {
|
||||||
const daemon = new AppserviceDaemon({ ...cfg, bridgeTokens: [] }, undefined, () => {});
|
const daemon = new AppserviceDaemon({ ...cfg, bridgeTokens: [] }, undefined, () => {});
|
||||||
const res = await daemon.handle(
|
const res = await daemon.handle(
|
||||||
|
|||||||
@@ -5,7 +5,6 @@ import {
|
|||||||
TransactionHandler,
|
TransactionHandler,
|
||||||
validateBridgeMessage,
|
validateBridgeMessage,
|
||||||
validateBridgeTyping,
|
validateBridgeTyping,
|
||||||
validateProvisionRoom,
|
|
||||||
} from '@mosaicstack/appservice';
|
} from '@mosaicstack/appservice';
|
||||||
import type { AppserviceConfig, MatrixEvent } from '@mosaicstack/appservice';
|
import type { AppserviceConfig, MatrixEvent } from '@mosaicstack/appservice';
|
||||||
|
|
||||||
@@ -110,27 +109,6 @@ export class AppserviceDaemon {
|
|||||||
await this.intent.setTyping(req.body.room_id, req.body.agent, req.body.typing);
|
await this.intent.setTyping(req.body.room_id, req.body.agent, req.body.typing);
|
||||||
return { status: 200, body: {} };
|
return { status: 200, body: {} };
|
||||||
}
|
}
|
||||||
if (req.method === 'POST' && req.path === '/bridge/v1/provision/rooms') {
|
|
||||||
validateProvisionRoom(req.body);
|
|
||||||
const result = await this.intent.createRoom({
|
|
||||||
name: req.body.name,
|
|
||||||
alias: req.body.alias,
|
|
||||||
topic: req.body.topic,
|
|
||||||
invite: req.body.invite,
|
|
||||||
spaceId: req.body.space_id,
|
|
||||||
});
|
|
||||||
this.log(
|
|
||||||
`provisioned room ${result.roomId} (${req.body.name}) space_linked=${result.spaceLinked}`,
|
|
||||||
);
|
|
||||||
return {
|
|
||||||
status: 200,
|
|
||||||
body: {
|
|
||||||
room_id: result.roomId,
|
|
||||||
space_linked: result.spaceLinked,
|
|
||||||
...(result.spaceError ? { space_error: result.spaceError } : {}),
|
|
||||||
},
|
|
||||||
};
|
|
||||||
}
|
|
||||||
} catch (error) {
|
} catch (error) {
|
||||||
const message = error instanceof Error ? error.message : String(error);
|
const message = error instanceof Error ? error.message : String(error);
|
||||||
this.log(`bridge error ${req.method} ${req.path}: ${message}`);
|
this.log(`bridge error ${req.method} ${req.path}: ${message}`);
|
||||||
|
|||||||
@@ -1,101 +0,0 @@
|
|||||||
# Mission Control Plane — Feature Board
|
|
||||||
|
|
||||||
> Discussion board for the combined PRD / mission / Kanban workflow.
|
|
||||||
> Use this to decide scope before implementation.
|
|
||||||
|
|
||||||
## Board Legend
|
|
||||||
|
|
||||||
- **Must-have** — required for the first usable version
|
|
||||||
- **Should-have** — strongly preferred, but can ship after the core path
|
|
||||||
- **Could-have** — valuable later if time permits
|
|
||||||
- **Won't-have** — explicitly deferred
|
|
||||||
|
|
||||||
---
|
|
||||||
|
|
||||||
## Feature Board
|
|
||||||
|
|
||||||
| Feature Card | Need | Priority | Decision / Notes |
|
|
||||||
| ------------------------------ | ------------------------------------------------------------- | ----------- | --------------------------------------------------------------------------- |
|
|
||||||
| Canonical mission manifest | One durable root object for goal, PRD, board, session | Must-have | Mission manifest becomes the anchor for all downstream state |
|
|
||||||
| PRD generator integration | PRD should be generated from a feature idea and saved in docs | Must-have | Use Mosaic PRDy format and keep the file human-reviewable |
|
|
||||||
| Board atomization | Break PRD into assignable tasks with dependencies | Must-have | Each user story should map to one or more tasks |
|
|
||||||
| Short-cycle detector | Detect compaction churn and repeated tool loops | Must-have | Coordinator should track churn score per session |
|
|
||||||
| Handoff packet | Preserve actionable context across rotations | Must-have | Use a compact structured summary, not a raw transcript |
|
|
||||||
| Auto-resume workers | Let new sessions read mission + board on start | Should-have | Makes overnight autonomy realistic |
|
|
||||||
| Mission status view | Show current phase, blockers, and active session | Should-have | Expose through CLI first, dashboard later |
|
|
||||||
| Worktree root convention | Keep worktrees off `/tmp` and on the larger persistent drive | Should-have | Prefer `/src/<repo>-worktrees` for repo worktrees and long-lived agent work |
|
|
||||||
| Review gate | Prevent autonomous work from shipping unreviewed | Should-have | Use reviewer tasks before mission close |
|
|
||||||
| Rotation policy config | Configure thresholds per mission/profile | Could-have | Keep v1 simple, add tuning later |
|
|
||||||
| Goal decomposition suggestions | Suggest sub-goals from the PRD | Could-have | Good for planning, not necessary for core path |
|
|
||||||
| Cross-channel continuity | Continue a mission across CLI/gateway/remote channels | Could-have | Important later, not required for MVP |
|
|
||||||
| Automatic board sync | Mirror git docs into DB and back | Could-have | Nice-to-have after the file-first flow stabilizes |
|
|
||||||
| Fully autonomous closeout | Let mission finish without human intervention | Won't-have | Keep an operator-visible review step |
|
|
||||||
|
|
||||||
---
|
|
||||||
|
|
||||||
## Needs Discussion
|
|
||||||
|
|
||||||
### 1) Canonical source of truth
|
|
||||||
|
|
||||||
**Question:** Should the PRD, mission manifest, and board all live in git, or should one be the database source of truth?
|
|
||||||
|
|
||||||
**Proposed answer:** Keep the human-readable artifacts in git and sync the mission runtime state to the database.
|
|
||||||
|
|
||||||
### 2) Scope of automation
|
|
||||||
|
|
||||||
**Question:** Should the first version auto-create the board from the PRD, or require a human/orchestrator to approve the split?
|
|
||||||
|
|
||||||
**Proposed answer:** Auto-create a draft board, then let the orchestrator approve or adjust it.
|
|
||||||
|
|
||||||
### 3) Rotation triggers
|
|
||||||
|
|
||||||
**Question:** What should trigger a forced session rotation?
|
|
||||||
|
|
||||||
**Candidate signals:**
|
|
||||||
|
|
||||||
- repeated compaction
|
|
||||||
- repeated prompts for permission
|
|
||||||
- identical tool loops
|
|
||||||
- no new file/task state after several turns
|
|
||||||
- task blocked on a missing prerequisite
|
|
||||||
|
|
||||||
**Proposed answer:** Use a weighted churn score with a small hard cap on repeated compactions.
|
|
||||||
|
|
||||||
### 4) Handoff format
|
|
||||||
|
|
||||||
**Question:** What should the next session receive?
|
|
||||||
|
|
||||||
**Proposed answer:**
|
|
||||||
|
|
||||||
- Mission ID
|
|
||||||
- PRD path
|
|
||||||
- Active board task
|
|
||||||
- Completed work
|
|
||||||
- Blockers
|
|
||||||
- Next 3 actions
|
|
||||||
- Non-negotiable constraints
|
|
||||||
|
|
||||||
### 5) Operator control
|
|
||||||
|
|
||||||
**Question:** Should the operator be able to force a rotation or pause the mission?
|
|
||||||
|
|
||||||
**Proposed answer:** Yes. Human override should win.
|
|
||||||
|
|
||||||
---
|
|
||||||
|
|
||||||
## Draft Decisions
|
|
||||||
|
|
||||||
1. File-first artifacts, DB-backed runtime state.
|
|
||||||
2. PRD-first planning, board-second execution.
|
|
||||||
3. Auto-rotation on churn, but human override remains available.
|
|
||||||
4. Structured handoff packets required on every rotation.
|
|
||||||
5. Mission close requires a reviewer task.
|
|
||||||
|
|
||||||
---
|
|
||||||
|
|
||||||
## Open Questions
|
|
||||||
|
|
||||||
- What exact data fields belong in the mission manifest?
|
|
||||||
- Should rotation thresholds vary by agent profile?
|
|
||||||
- What is the minimum viable status surface for v1?
|
|
||||||
- Should the board support milestones in addition to tasks?
|
|
||||||
@@ -1,95 +0,0 @@
|
|||||||
# Mission Manifest — Mosaic Mission Control Plane
|
|
||||||
|
|
||||||
> Persistent document tracking scope, status, and handoff history for the combined PRD / mission / Kanban workflow.
|
|
||||||
|
|
||||||
## Mission
|
|
||||||
|
|
||||||
**ID:** mission-control-plane-20260506
|
|
||||||
|
|
||||||
**Statement:** Combine Mosaic PRDy, coord, and Kanban into one durable workflow so an agent can move from feature idea to PRD to mission to task board and keep working across session rotation, compaction, and restarts with minimal context loss.
|
|
||||||
|
|
||||||
**Phase:** planning — MC-01 complete, MC-02 next
|
|
||||||
|
|
||||||
**Current Milestone:** MC-02
|
|
||||||
|
|
||||||
**Progress:** 1 / 6 milestones
|
|
||||||
|
|
||||||
**Status:** active
|
|
||||||
|
|
||||||
**Last Updated:** 2026-05-06
|
|
||||||
|
|
||||||
**Parent Mission:** None — new mission
|
|
||||||
|
|
||||||
---
|
|
||||||
|
|
||||||
## Context
|
|
||||||
|
|
||||||
This mission exists because overnight autonomy breaks when the working session short-cycles. The system needs durable artifacts and a mechanical coordinator that can:
|
|
||||||
|
|
||||||
1. keep a canonical PRD,
|
|
||||||
2. atomize the PRD into board tasks,
|
|
||||||
3. track mission state separately from the chat session,
|
|
||||||
4. detect churn or compaction pressure,
|
|
||||||
5. rotate to a fresh session, and
|
|
||||||
6. re-enter from a structured handoff.
|
|
||||||
|
|
||||||
Operational convention: repo worktrees and long-lived working directories should use `/src/<repo>-worktrees` instead of `/tmp`.
|
|
||||||
|
|
||||||
Design references:
|
|
||||||
|
|
||||||
- `docs/mission-control/PRD.md` — product requirements
|
|
||||||
- `docs/mission-control/BOARD.md` — feature discussion board
|
|
||||||
- `docs/mission-control/TASKS.md` — atomized execution plan
|
|
||||||
|
|
||||||
---
|
|
||||||
|
|
||||||
## Success Criteria
|
|
||||||
|
|
||||||
- [ ] AC-1: A feature idea can be converted into a PRD, mission, and task board.
|
|
||||||
- [ ] AC-2: The coordinator can load a mission and its board from durable storage.
|
|
||||||
- [ ] AC-3: The coordinator can detect short-cycling and rotate sessions automatically.
|
|
||||||
- [ ] AC-4: A rotated session can resume from a handoff packet without manual re-prompting.
|
|
||||||
- [ ] AC-5: The board remains traceable back to the PRD user stories.
|
|
||||||
- [ ] AC-6: Operators can inspect mission state, task state, and latest handoff from one place.
|
|
||||||
- [ ] AC-7: The system can run overnight without losing the mission goal.
|
|
||||||
|
|
||||||
---
|
|
||||||
|
|
||||||
## Milestones
|
|
||||||
|
|
||||||
| # | ID | Name | Status | Branch | Started | Completed |
|
|
||||||
| --- | ----- | ---------------------------------------- | ----------- | ----------------------- | ---------- | --------- |
|
|
||||||
| 1 | MC-01 | PRD + mission schema foundation | in-progress | docs/mission-control-\* | 2026-05-06 | — |
|
|
||||||
| 2 | MC-02 | Mission runtime model | not-started | — | — | — |
|
|
||||||
| 3 | MC-03 | Board atomization and task linkage | not-started | — | — | — |
|
|
||||||
| 4 | MC-04 | Short-cycle detector and rotation engine | not-started | — | — | — |
|
|
||||||
| 5 | MC-05 | Handoff generation and re-entry | not-started | — | — | — |
|
|
||||||
| 6 | MC-06 | Operator surface and E2E validation | not-started | — | — | — |
|
|
||||||
|
|
||||||
---
|
|
||||||
|
|
||||||
## Budget
|
|
||||||
|
|
||||||
| Milestone | Est. tokens | Parallelizable? |
|
|
||||||
| --------- | ----------- | ------------------ |
|
|
||||||
| MC-01 | 16K | No |
|
|
||||||
| MC-02 | 20K | No |
|
|
||||||
| MC-03 | 24K | Mostly after MC-01 |
|
|
||||||
| MC-04 | 20K | After MC-02 |
|
|
||||||
| MC-05 | 18K | After MC-04 |
|
|
||||||
| MC-06 | 26K | After MC-04/05 |
|
|
||||||
| **Total** | **~124K** | |
|
|
||||||
|
|
||||||
---
|
|
||||||
|
|
||||||
## Session History
|
|
||||||
|
|
||||||
| Session | Date | Runtime | Outcome |
|
|
||||||
| ------- | ---------- | ------- | ------------------------------------------------------------------------ |
|
|
||||||
| S1 | 2026-05-06 | hermes | PRD, board, task plan, mission manifest, and worktree convention drafted |
|
|
||||||
|
|
||||||
---
|
|
||||||
|
|
||||||
## Next Step
|
|
||||||
|
|
||||||
Kick off MC-02: implement the durable mission runtime model and wire the mission state into the coordinator.
|
|
||||||
@@ -1,205 +0,0 @@
|
|||||||
# PRD: Mosaic Mission Control Plane
|
|
||||||
|
|
||||||
## Metadata
|
|
||||||
|
|
||||||
- **Owner:** Jason Woltje
|
|
||||||
- **Date:** 2026-05-06
|
|
||||||
- **Status:** draft
|
|
||||||
- **Framework:** Mosaic PRDy + coord + Kanban
|
|
||||||
- **Target Repo:** `git.mosaicstack.dev/mosaic/mosaic-stack`
|
|
||||||
- **Primary Modules:** `packages/prdy`, `packages/coord`, `packages/queue`, `apps/gateway`, `packages/brain`, `packages/cli`
|
|
||||||
|
|
||||||
---
|
|
||||||
|
|
||||||
## Problem Statement
|
|
||||||
|
|
||||||
Mosaic already has the ingredients for durable agent work: PRD generation (`prdy`), mission coordination (`coord`), and task execution boards (`Kanban` / `TASKS.md`). Today those systems can still drift apart:
|
|
||||||
|
|
||||||
- A PRD can exist without a mission record.
|
|
||||||
- A mission can exist without a machine-readable execution board.
|
|
||||||
- Agents can short-cycle or compact repeatedly without a durable handoff.
|
|
||||||
- The next session may know the goal, but not the exact next step.
|
|
||||||
|
|
||||||
The result is brittle overnight autonomy: work continues only as long as a single session remains healthy.
|
|
||||||
|
|
||||||
This feature unifies those layers into one durable workflow so a mission can survive session rotation, compaction, and restarts with minimal state loss.
|
|
||||||
|
|
||||||
---
|
|
||||||
|
|
||||||
## Goals
|
|
||||||
|
|
||||||
1. Create one canonical pipeline from idea → PRD → mission → board → execution.
|
|
||||||
2. Let `prdy` generate a PRD that is immediately usable as a mission input.
|
|
||||||
3. Let `coord` own mission state, handoffs, and session rotation.
|
|
||||||
4. Let the board hold atomized tasks with dependencies and assignees.
|
|
||||||
5. Let agents read the mission and board to learn the next action without extra prompting.
|
|
||||||
6. Detect short-cycling and rotate sessions before quality degrades.
|
|
||||||
7. Preserve useful context across handoffs with a structured summary packet.
|
|
||||||
8. Give operators a single place to see mission status, task state, and the current session.
|
|
||||||
|
|
||||||
---
|
|
||||||
|
|
||||||
## Non-Goals
|
|
||||||
|
|
||||||
1. Replacing the Mosaic agent runtime or gateway architecture.
|
|
||||||
2. Rewriting `prdy` or `coord` from scratch.
|
|
||||||
3. Turning the board into a general project-management system.
|
|
||||||
4. Building a full Gantt/charting product.
|
|
||||||
5. Removing human review or approval gates.
|
|
||||||
6. Allowing agents to create arbitrary mission state without schema.
|
|
||||||
|
|
||||||
---
|
|
||||||
|
|
||||||
## User Stories
|
|
||||||
|
|
||||||
### US-001: Create a mission from a feature idea
|
|
||||||
|
|
||||||
**Description:** As an orchestrator, I want to turn a feature idea into a PRD and mission so that agents can work from a durable spec instead of a chat transcript.
|
|
||||||
|
|
||||||
**Acceptance Criteria:**
|
|
||||||
|
|
||||||
- [ ] `prdy` can emit a PRD with goals, non-goals, and requirements.
|
|
||||||
- [ ] The PRD is linked to a mission ID.
|
|
||||||
- [ ] The mission manifest references the PRD path.
|
|
||||||
- [ ] The mission is readable by downstream agent sessions.
|
|
||||||
|
|
||||||
### US-002: Atomize work into a board
|
|
||||||
|
|
||||||
**Description:** As an orchestrator, I want to split a PRD into board tasks so that work can be assigned to specialists.
|
|
||||||
|
|
||||||
**Acceptance Criteria:**
|
|
||||||
|
|
||||||
- [ ] Each user story can become one or more tasks.
|
|
||||||
- [ ] Tasks have assignees, dependencies, and estimates.
|
|
||||||
- [ ] Tasks are machine-readable and durable.
|
|
||||||
- [ ] The board can be regenerated from the PRD without ambiguity.
|
|
||||||
|
|
||||||
### US-003: Rotate sessions without losing the mission
|
|
||||||
|
|
||||||
**Description:** As a coordinator, I want to restart or rotate a session when it short-cycles so that the mission continues with minimal loss.
|
|
||||||
|
|
||||||
**Acceptance Criteria:**
|
|
||||||
|
|
||||||
- [ ] The coordinator detects compaction pressure or repeated loops.
|
|
||||||
- [ ] The coordinator writes a handoff summary before rotation.
|
|
||||||
- [ ] A new session can resume from the handoff packet.
|
|
||||||
- [ ] The mission state remains intact across the rotation.
|
|
||||||
|
|
||||||
### US-004: Let workers read the next step automatically
|
|
||||||
|
|
||||||
**Description:** As a worker agent, I want to read the mission and board at startup so I can do the next useful thing without waiting for a human prompt.
|
|
||||||
|
|
||||||
**Acceptance Criteria:**
|
|
||||||
|
|
||||||
- [ ] Startup loads the active mission manifest.
|
|
||||||
- [ ] Startup loads the current board/task row.
|
|
||||||
- [ ] Startup exposes the next action clearly in the prompt.
|
|
||||||
- [ ] The agent can continue after compaction using the same mission context.
|
|
||||||
|
|
||||||
### US-005: Observe mission health from one place
|
|
||||||
|
|
||||||
**Description:** As an operator, I want a single view of mission health so that I can see progress, blocked tasks, and session churn.
|
|
||||||
|
|
||||||
**Acceptance Criteria:**
|
|
||||||
|
|
||||||
- [ ] Mission state shows current phase and progress.
|
|
||||||
- [ ] Board state shows task status by assignee.
|
|
||||||
- [ ] Short-cycle/rotation events are visible.
|
|
||||||
- [ ] Handoffs are inspectable.
|
|
||||||
|
|
||||||
---
|
|
||||||
|
|
||||||
## Functional Requirements
|
|
||||||
|
|
||||||
FR-1. The system must represent a mission as a durable object with an ID, goal, current phase, PRD path, board path, and active session ID.
|
|
||||||
|
|
||||||
FR-2. The system must represent a PRD as a markdown document with goals, user stories, functional requirements, non-goals, technical considerations, and success metrics.
|
|
||||||
|
|
||||||
FR-3. The system must represent execution work as a board of atomized tasks with status, assignee, dependency, and estimate fields.
|
|
||||||
|
|
||||||
FR-4. The coordinator must be able to derive a task board from a PRD.
|
|
||||||
|
|
||||||
FR-5. The coordinator must be able to write a handoff packet that includes goal, current state, completed work, blocked work, next steps, and constraints.
|
|
||||||
|
|
||||||
FR-6. The coordinator must detect short-cycling signals such as repeated compactions, repeated tool loops, repeated approval prompts, or no progress across several turns.
|
|
||||||
|
|
||||||
FR-7. The coordinator must rotate the session when the short-cycle threshold is exceeded.
|
|
||||||
|
|
||||||
FR-8. The coordinator must preserve mission continuity across session rotation.
|
|
||||||
|
|
||||||
FR-9. The worker session must read the mission state and board state at startup.
|
|
||||||
|
|
||||||
FR-10. The worker session must be able to resume from the last handoff summary without the operator rewriting the goal manually.
|
|
||||||
|
|
||||||
FR-11. The operator must be able to inspect the mission state, PRD, board, and latest handoff from one place.
|
|
||||||
|
|
||||||
FR-12. The mission system must keep a traceable link between PRD requirements and board tasks.
|
|
||||||
|
|
||||||
FR-13. The system must not allow a task to become active without a valid mission context.
|
|
||||||
|
|
||||||
FR-14. The system must keep durable history for rotation and handoff events.
|
|
||||||
|
|
||||||
---
|
|
||||||
|
|
||||||
## Board Discussion: Features and Needs
|
|
||||||
|
|
||||||
This is the feature discussion board that should drive the mission design.
|
|
||||||
|
|
||||||
| Card | Need | Why it matters | Proposed decision |
|
|
||||||
| ------------------------ | -------------------------------------------- | -------------------------------------------- | ------------------------------------------------------------ |
|
|
||||||
| Canonical mission record | One source of truth for goal/state | Prevents drift between chat, docs, and queue | Make mission manifest the durable root object |
|
|
||||||
| PRD → board derivation | Break feature ideas into executable work | Lets the plan be assigned and tracked | Keep PRD as the spec, generate board tasks from user stories |
|
|
||||||
| Session watchdog | Detect churn/short-cycling | Keeps overnight runs productive | Add short-cycle scoring and forced rotation |
|
|
||||||
| Structured handoff | Preserve context across session changes | Minimizes restart loss | Use a compact JSON/MD handoff packet |
|
|
||||||
| Worker auto-read | Let agents resume without human re-prompting | Reduces operator overhead | Load mission + board on session start |
|
|
||||||
| Status surface | Show progress and blockers clearly | Operators need confidence | Expose mission state via CLI and dashboard |
|
|
||||||
| Review gate | Keep quality high on autonomous work | Prevents silent regressions | Require review tasks before close |
|
|
||||||
| Recoverability | Resume after failure or restart | Mission should outlive a process | Persist session and handoff history |
|
|
||||||
|
|
||||||
---
|
|
||||||
|
|
||||||
## Design Considerations
|
|
||||||
|
|
||||||
1. The PRD should stay human-readable markdown, because the board and mission references need to be reviewable in git.
|
|
||||||
2. The board should be machine-readable enough for automation but still readable by humans.
|
|
||||||
3. The mission manifest should point to the PRD and board, not duplicate them.
|
|
||||||
4. Handoff packets should be compact and structured so they can be injected into a new session with minimal token cost.
|
|
||||||
5. The coordinator should prefer rotation over forced context growth once the session is near the compaction threshold.
|
|
||||||
6. Existing Mosaic commands should be extended, not replaced, wherever possible.
|
|
||||||
7. The same mission should be resumable across CLI, gateway, and remote channels.
|
|
||||||
|
|
||||||
---
|
|
||||||
|
|
||||||
## Technical Considerations
|
|
||||||
|
|
||||||
- Likely storage split:
|
|
||||||
- PRD/board/manifest in git-backed docs
|
|
||||||
- mission/session state in the Mosaic data layer
|
|
||||||
- runtime health in queue/session state
|
|
||||||
- Worktrees and long-lived agent working directories should live under `/src/<repo>-worktrees` rather than `/tmp` so they sit on the larger persistent drive and survive longer-running missions.
|
|
||||||
- The coordinator needs a stable session identity, even if the active session changes.
|
|
||||||
- Task dependencies must be enforced so workers do not start early.
|
|
||||||
- The handoff packet should include the top 3 immediate actions and the strongest constraints.
|
|
||||||
- Rotation triggers should be configurable per profile or per mission.
|
|
||||||
- The initial version can be file-first, with dashboard sync added later.
|
|
||||||
|
|
||||||
---
|
|
||||||
|
|
||||||
## Success Metrics
|
|
||||||
|
|
||||||
- A mission can rotate sessions without losing the active goal.
|
|
||||||
- A new session can resume from the latest handoff in under one turn.
|
|
||||||
- Board tasks remain aligned to PRD user stories.
|
|
||||||
- Short-cycling sessions are replaced before repeated compaction harms quality.
|
|
||||||
- Operators can find mission state without spelunking across multiple chat logs.
|
|
||||||
|
|
||||||
---
|
|
||||||
|
|
||||||
## Open Questions
|
|
||||||
|
|
||||||
1. What should the canonical mission ID format be?
|
|
||||||
2. Should the board live only in git, or also in the database?
|
|
||||||
3. Should rotation be automatic by default, or opt-in per mission?
|
|
||||||
4. What should the short-cycle threshold be initially?
|
|
||||||
5. Should handoffs be pure text, structured JSON, or both?
|
|
||||||
6. Which CLI command should be the primary mission entrypoint: `mosaic mission`, `mosaic coord`, or `mosaic prdy`?
|
|
||||||
@@ -1,113 +0,0 @@
|
|||||||
# Tasks — Mosaic Mission Control Plane
|
|
||||||
|
|
||||||
> Single-writer: orchestrator only. Workers read but never modify.
|
|
||||||
>
|
|
||||||
> **Mission:** mission-control-plane-20260506
|
|
||||||
> **Schema:** `| id | status | description | issue | agent | branch | depends_on | estimate | notes |`
|
|
||||||
> **Status values:** `not-started` | `in-progress` | `done` | `blocked` | `failed` | `needs-qa`
|
|
||||||
> **Agent values:** `codex` | `glm-5.1` | `haiku` | `sonnet` | `opus` | `—` (auto)
|
|
||||||
>
|
|
||||||
> Scope: this file decomposes the combined PRD / mission / board workflow into atomized tasks.
|
|
||||||
|
|
||||||
---
|
|
||||||
|
|
||||||
## Milestone 1 — PRD + mission schema foundation
|
|
||||||
|
|
||||||
Goal: create the durable doc structure and the minimal mission metadata needed to keep PRD, board, and mission aligned.
|
|
||||||
|
|
||||||
| id | status | description | issue | agent | branch | depends_on | estimate | notes |
|
|
||||||
| -------- | ----------- | -------------------------------------------------------------------------------------------------------- | ----- | ------ | ----------------------------- | ------------------ | -------- | ------------------------------------------- |
|
|
||||||
| MC-01-01 | not-started | Write `docs/mission-control/PRD.md` with goals, non-goals, functional requirements, and success metrics. | — | sonnet | docs/mission-control-prd | — | 5K | Human-readable PRD becomes the spec anchor. |
|
|
||||||
| MC-01-02 | not-started | Write `docs/mission-control/BOARD.md` as a decision board for scope, priority, and open questions. | — | haiku | docs/mission-control-board | MC-01-01 | 3K | Keeps discussion separate from the spec. |
|
|
||||||
| MC-01-03 | not-started | Write `docs/mission-control/MISSION-MANIFEST.md` linking PRD, board, tasks, and mission identity. | — | sonnet | docs/mission-control-manifest | MC-01-01, MC-01-02 | 4K | Durable mission root object. |
|
|
||||||
| MC-01-04 | not-started | Write `docs/mission-control/TASKS.md` with the atomized execution plan and dependency graph. | — | sonnet | docs/mission-control-tasks | MC-01-03 | 4K | Board-backed execution plan. |
|
|
||||||
|
|
||||||
**Milestone 1 estimate:** ~16K tokens
|
|
||||||
|
|
||||||
---
|
|
||||||
|
|
||||||
## Milestone 2 — Mission runtime model
|
|
||||||
|
|
||||||
Goal: make missions first-class runtime objects that can survive session restarts and compaction.
|
|
||||||
|
|
||||||
| id | status | description | issue | agent | branch | depends_on | estimate | notes |
|
|
||||||
| -------- | ----------- | ----------------------------------------------------------------------------------------------------------------------------------------- | -------------------------------------------------------------------------------------------------------------------------------------- | ----- | -------------------------------------- | ---------------------------------- | -------- | ------------------------------------------ | ---------------------------------------------------- |
|
|
||||||
| MC-02-01 | not-started | Define mission schema in the data layer: mission ID, goal, phase, PRD path, board path, active session ID, last handoff, and churn score. | — | codex | feat/mission-control-schema | MC-01-03 | 6K | This is the durable root state. |
|
|
||||||
| MC-02-02 | not-started | Add mission read/write services to `packages/coord` so the coordinator can load and persist mission state. | — | codex | feat/mission-control-coord-store | MC-02-01 | 6K | Keep storage simple and explicit. |
|
|
||||||
| MC-02-03 | not-started | Add mission status reporting to `mosaic mission` and `mosaic coord status`. | — | codex | feat/mission-control-status-cli | MC-02-02 | 4K | Operators need one obvious status command. |
|
|
||||||
| MC-02-04 | not-started | Add tests for mission persistence and recovery after restart. | — | haiku | feat/mission-control-persistence-tests | MC-02-02 | 4K | Verify mission survives process churn. |
|
|
||||||
| | MC-02-05 | done | Add a worktree-root convention to the mission runtime notes and startup guidance so agents prefer `/src/<repo>-worktrees` over `/tmp`. | — | haiku | docs/mission-control-worktree-root | MC-01-03 | 3K | Keep long-lived work on the larger persistent drive. |
|
|
||||||
|
|
||||||
**Milestone 2 estimate:** ~20K tokens
|
|
||||||
|
|
||||||
---
|
|
||||||
|
|
||||||
## Milestone 3 — Board atomization and task linkage
|
|
||||||
|
|
||||||
Goal: derive assignable tasks from the PRD and keep them linked to mission state.
|
|
||||||
|
|
||||||
| id | status | description | issue | agent | branch | depends_on | estimate | notes |
|
|
||||||
| -------- | ----------- | ------------------------------------------------------------------------------------------- | ----- | ------ | -------------------------------- | ------------------ | -------- | ------------------------------------------- |
|
|
||||||
| MC-03-01 | not-started | Add a PRD-to-task decomposition rule set: every user story maps to one or more board tasks. | — | sonnet | feat/mission-control-decompose | MC-01-01 | 5K | Start simple and deterministic. |
|
|
||||||
| MC-03-02 | not-started | Implement board generation from the PRD in a machine-readable format. | — | codex | feat/mission-control-board-gen | MC-03-01 | 6K | Output should be usable by the coordinator. |
|
|
||||||
| MC-03-03 | not-started | Add dependency validation so tasks cannot start before parent tasks complete. | — | codex | feat/mission-control-deps | MC-03-02 | 5K | Enforces ordering. |
|
|
||||||
| MC-03-04 | not-started | Add review-task support so a mission cannot close without a reviewer step. | — | sonnet | feat/mission-control-review-gate | MC-03-03 | 4K | Preserves quality. |
|
|
||||||
| MC-03-05 | not-started | Add tests proving the board stays traceable back to the PRD user stories. | — | haiku | feat/mission-control-trace-tests | MC-03-02, MC-03-03 | 4K | Traceability is the point. |
|
|
||||||
|
|
||||||
**Milestone 3 estimate:** ~24K tokens
|
|
||||||
|
|
||||||
---
|
|
||||||
|
|
||||||
## Milestone 4 — Short-cycle detector and rotation engine
|
|
||||||
|
|
||||||
Goal: detect when a session is stuck and rotate to a fresh session before quality falls off.
|
|
||||||
|
|
||||||
| id | status | description | issue | agent | branch | depends_on | estimate | notes |
|
|
||||||
| -------- | ----------- | ----------------------------------------------------------------------------------------------------------------------------------- | ----- | ------ | ----------------------------------- | ---------- | -------- | ---------------------------------------------- |
|
|
||||||
| MC-04-01 | not-started | Define churn signals: repeated compaction, identical tool loops, repeated permission prompts, and no progress across several turns. | — | sonnet | feat/mission-control-churn-signals | MC-02-01 | 4K | Keep the rules explicit. |
|
|
||||||
| MC-04-02 | not-started | Implement churn scoring in the coordinator with configurable thresholds. | — | codex | feat/mission-control-churn-score | MC-04-01 | 6K | Weighted score makes tuning easier. |
|
|
||||||
| MC-04-03 | not-started | Implement automatic session rotation when churn crosses the threshold. | — | codex | feat/mission-control-rotate-session | MC-04-02 | 6K | The session is disposable; the mission is not. |
|
|
||||||
| MC-04-04 | not-started | Add tests for rotation triggers and for avoiding premature rotation. | — | haiku | feat/mission-control-rotation-tests | MC-04-03 | 4K | Prevent flapping. |
|
|
||||||
|
|
||||||
**Milestone 4 estimate:** ~20K tokens
|
|
||||||
|
|
||||||
---
|
|
||||||
|
|
||||||
## Milestone 5 — Handoff generation and re-entry
|
|
||||||
|
|
||||||
Goal: preserve the best context from the old session and inject it into the new session cleanly.
|
|
||||||
|
|
||||||
| id | status | description | issue | agent | branch | depends_on | estimate | notes |
|
|
||||||
| -------- | ----------- | -------------------------------------------------------------------------------------------------------------------- | ----- | ------ | ----------------------------------- | ------------------ | -------- | ---------------------------------------- |
|
|
||||||
| MC-05-01 | not-started | Define the handoff packet schema: mission ID, session ID, completed work, blockers, next 3 actions, and constraints. | — | sonnet | feat/mission-control-handoff-schema | MC-02-01 | 4K | Keep it compact and structured. |
|
|
||||||
| MC-05-02 | not-started | Implement handoff packet writing during rotation. | — | codex | feat/mission-control-handoff-write | MC-05-01, MC-04-03 | 5K | Persist before the old session exits. |
|
|
||||||
| MC-05-03 | not-started | Implement handoff packet loading at session startup. | — | codex | feat/mission-control-handoff-load | MC-05-01, MC-04-03 | 5K | New session should know the next action. |
|
|
||||||
| MC-05-04 | not-started | Add tests proving a rotated session can continue the mission without manual re-prompting. | — | haiku | feat/mission-control-handoff-tests | MC-05-02, MC-05-03 | 4K | Resume quality is the key metric. |
|
|
||||||
|
|
||||||
**Milestone 5 estimate:** ~18K tokens
|
|
||||||
|
|
||||||
---
|
|
||||||
|
|
||||||
## Milestone 6 — Operator surface and E2E validation
|
|
||||||
|
|
||||||
Goal: expose the whole workflow through commands and verify it end-to-end.
|
|
||||||
|
|
||||||
| id | status | description | issue | agent | branch | depends_on | estimate | notes |
|
|
||||||
| -------- | ----------- | --------------------------------------------------------------------------------------------------------- | ----- | ------ | -------------------------------- | ------------------ | -------- | -------------------------------------------- |
|
|
||||||
| MC-06-01 | not-started | Add a CLI command to inspect the active mission, PRD path, board path, task statuses, and latest handoff. | — | codex | feat/mission-control-inspect-cli | MC-02-03, MC-05-03 | 5K | One place to inspect the whole stack. |
|
|
||||||
| MC-06-02 | not-started | Add a compact dashboard or TUI summary view for mission health. | — | codex | feat/mission-control-summary-ui | MC-06-01 | 6K | Nice to have, but not before the core works. |
|
|
||||||
| MC-06-03 | not-started | Build an E2E harness that simulates compaction / rotation and verifies the mission can continue. | — | sonnet | feat/mission-control-e2e-harness | MC-04-03, MC-05-03 | 8K | This is the proof that the design works. |
|
|
||||||
| MC-06-04 | not-started | Add final docs for operators explaining how PRD, mission, and board fit together. | — | haiku | feat/mission-control-ops-docs | MC-06-03 | 4K | Make it usable by humans. |
|
|
||||||
| MC-06-05 | not-started | Consolidate review findings and close the mission with a release note. | — | sonnet | chore/mission-control-close | MC-06-04 | 3K | Only after the E2E passes. |
|
|
||||||
|
|
||||||
**Milestone 6 estimate:** ~26K tokens
|
|
||||||
|
|
||||||
---
|
|
||||||
|
|
||||||
## Execution Notes
|
|
||||||
|
|
||||||
- `sonnet` is best for planning, decomposition, and the review-gate tasks.
|
|
||||||
- `codex` is best for schema, coordinator, and CLI implementation.
|
|
||||||
- `haiku` is best for validation, traceability checks, and docs.
|
|
||||||
- The first implementation pass should stay file-first and keep the runtime state thin.
|
|
||||||
- The mission should not close until the PRD, board, mission manifest, and E2E harness all agree.
|
|
||||||
@@ -1,238 +0,0 @@
|
|||||||
# Hermes-Mosaic Alignment Plan
|
|
||||||
|
|
||||||
> **For Hermes:** Use subagent-driven-development skill to implement this plan task-by-task.
|
|
||||||
|
|
||||||
**Goal:** Package Mosaic's mechanical coordination primitives as a native Hermes toolset so any Hermes profile gets mission management, task decomposition, handoff, and session continuity without depending on the Mosaic gateway or OpenClaw runtime.
|
|
||||||
|
|
||||||
**Architecture:** Extract the coordination logic from Mosaic's `packages/coord` (TypeScript, file-first) into a Hermes Python toolset that wraps the same file conventions. The Mosaic Stack repo remains the canonical upstream for the file formats (TASKS.md schema, mission.json schema, handoff packet schema). Hermes implements native Python tools that read/write those same files, plus tool-calls for churn detection and handoff generation that have no Mosaic equivalent today.
|
|
||||||
|
|
||||||
**Tech Stack:** Python (Hermes toolset), SQLite (Hermes Kanban), JSON + Markdown (Mosaic file conventions)
|
|
||||||
|
|
||||||
---
|
|
||||||
|
|
||||||
## Alignment Map
|
|
||||||
|
|
||||||
### What Mosaic has that Hermes needs
|
|
||||||
|
|
||||||
| Mosaic Component | What it does | Natural Hermes home | Why |
|
|
||||||
| -------------------------------- | --------------------------------------------------------- | -------------------------------------------- | -------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- |
|
|
||||||
| `packages/coord` (mission.ts) | Mission CRUD, session tracking, milestone state | **Hermes toolset: `mission`** | Mission state is session-scoped, not gateway-scoped. Hermes sessions already have identity, process tracking, and context windows. |
|
|
||||||
| `packages/coord` (tasks-file.ts) | Parse/write TASKS.md tables | **Hermes toolset: `mission`** (same) | Hermes already reads/writes files. The TASKS.md parser is ~300 lines of pure string manipulation — trivial Python port. |
|
|
||||||
| `packages/coord` (runner.ts) | Spawn claude/codex workers with continuation prompts | **Already covered by `delegate_task`** | Hermes delegate_task already does isolated subagent spawning with restricted toolsets. The runner's "find next task and build continuation prompt" logic moves into a tool-call. |
|
|
||||||
| `packages/coord` (status.ts) | Mission health, task progress, next task | **Hermes toolset: `mission`** (same) | Status readout fits naturally as a tool-call. No gateway needed. |
|
|
||||||
| `packages/prdy` | PRD generation wizard | **Hermes skill: `prdy`** | PRD generation is a prompt + template problem, not infrastructure. A Hermes skill with templates is the right fit. |
|
|
||||||
| `plugins/mosaic-framework` | before_agent_start + subagent_spawning hooks | **Hermes system prompt injection** | Hermes already injects system context via skills and config. The framework preamble and worktree rules become standard Hermes skills loaded by the orchestrator profile. |
|
|
||||||
| `plugins/macp` | OpenClaw ACP bridge (spawn codex/claude) | **Already covered by `delegate_task` + ACP** | Hermes already has ACP support and delegate_task. The MACP bridge is redundant when running natively in Hermes. |
|
|
||||||
| Churn detection (planned) | Detect compaction loops, repeated tool calls, no progress | **Hermes middleware** | This needs to live inside Hermes's turn loop where it can observe tool-call patterns. Mosaic can't see this from outside. |
|
|
||||||
| Handoff packet (planned) | Structured context summary for session rotation | **Hermes toolset: `mission`** | Handoff is a serialization of mission + session state. Hermes owns the session, so it should own the handoff. |
|
|
||||||
|
|
||||||
### What Hermes already has that replaces Mosaic infrastructure
|
|
||||||
|
|
||||||
| Mosaic concept | Hermes equivalent | Notes |
|
|
||||||
| -------------------- | ------------------------------------- | -------------------------------------------------------------------------------------------------------- |
|
|
||||||
| Gateway (NestJS) | Hermes gateway | Hermes already has a gateway with WebSocket, Discord, Telegram, CLI. No need for a second one. |
|
|
||||||
| Pi SDK agent runtime | Hermes agent loop | Hermes IS the agent runtime. OpenClaw's Pi SDK is a different runtime that Mosaic targets. |
|
|
||||||
| MACP ACP bridge | `delegate_task` + ACP tools | Same capability, already native. |
|
|
||||||
| Session identity | Hermes session IDs + process_registry | Hermes already tracks session identity, PIDs, and background processes. |
|
|
||||||
| Task execution board | Hermes Kanban | Fully functional SQLite-backed Kanban with dispatcher, triage, events, comments. |
|
|
||||||
| Worker spawning | Hermes dispatcher + cron | Kanban dispatcher + cron already handle this. |
|
|
||||||
| Context injection | Hermes skills + system prompt | Skills are loaded at session start and injected into context. Exactly what mosaic-framework plugin does. |
|
|
||||||
| File checkpoints | Hermes checkpoint_manager | Already tracks file mutations with shadow git. |
|
|
||||||
|
|
||||||
### What Mosaic keeps as its own entity
|
|
||||||
|
|
||||||
| Component | Why it stays in Mosaic |
|
|
||||||
| --------------------- | --------------------------------------------------- |
|
|
||||||
| `apps/gateway` | NestJS API surface — Mosaic's web platform offering |
|
|
||||||
| `apps/web` | Next.js dashboard — Mosaic's UI offering |
|
|
||||||
| `packages/types` | Shared TS contracts for Mosaic gateway plugins |
|
|
||||||
| `packages/db` | Drizzle ORM + PG — Mosaic's data layer |
|
|
||||||
| `packages/auth` | BetterAuth — Mosaic's auth system |
|
|
||||||
| `packages/brain` | PG-backed data layer for Mosaic web app |
|
|
||||||
| `packages/queue` | Valkey task queue for Mosaic gateway |
|
|
||||||
| `plugins/discord` | OpenClaw Discord plugin |
|
|
||||||
| `plugins/telegram` | OpenClaw Telegram plugin |
|
|
||||||
| `packages/mosaic` CLI | The `mosaic` CLI — Mosaic's own command surface |
|
|
||||||
|
|
||||||
---
|
|
||||||
|
|
||||||
## Architecture: `mission` Toolset for Hermes
|
|
||||||
|
|
||||||
### New files under `/opt/hermes/tools/`
|
|
||||||
|
|
||||||
```
|
|
||||||
mission_tools.py — Tool-call surface (mission_create, mission_status,
|
|
||||||
mission_next_task, mission_update_task, mission_handoff,
|
|
||||||
mission_resume)
|
|
||||||
mission_state.py — State management (read/write mission.json, parse TASKS.md,
|
|
||||||
parse MISSION-MANIFEST.md)
|
|
||||||
mission_churn.py — Churn detection (tool-loop counter, compaction counter,
|
|
||||||
progress scorer)
|
|
||||||
mission_handoff.py — Handoff packet generation and loading
|
|
||||||
```
|
|
||||||
|
|
||||||
### Tool-calls exposed to the agent
|
|
||||||
|
|
||||||
| Tool | What it does | When the agent calls it |
|
|
||||||
| --------------------- | --------------------------------------------------------------------------------- | ------------------------------------------- |
|
|
||||||
| `mission_create` | Initialize mission.json + TASKS.md + MISSION-MANIFEST.md in a project dir | When starting a new mission |
|
|
||||||
| `mission_status` | Read current mission state, milestone progress, next task, active session | At session start, or when checking progress |
|
|
||||||
| `mission_next_task` | Find the next `not-started` task whose dependencies are met, return its full spec | When the agent needs work to do |
|
|
||||||
| `mission_update_task` | Update a task row status in TASKS.md | When completing or blocking a task |
|
|
||||||
| `mission_handoff` | Generate a handoff packet from current session context + mission state | Before session rotation or at session end |
|
|
||||||
| `mission_resume` | Load a handoff packet and inject it as context for the new session | At session start after rotation |
|
|
||||||
|
|
||||||
### Toolset registration
|
|
||||||
|
|
||||||
The `mission` toolset follows the same pattern as `kanban`:
|
|
||||||
|
|
||||||
1. **Gating**: Tools are available when:
|
|
||||||
- The profile has `mission` in its toolsets config, OR
|
|
||||||
- A `HERMES_MISSION_DIR` env var is set (cron/dispatcher spawned workers)
|
|
||||||
2. **File conventions**: The toolset reads/writes the same file formats as Mosaic `packages/coord`:
|
|
||||||
- `.mosaic/orchestrator/mission.json` — mission state
|
|
||||||
- `docs/TASKS.md` — task table
|
|
||||||
- `docs/MISSION-MANIFEST.md` — mission manifest
|
|
||||||
- `docs/scratchpads/<id>.md` — session scratchpad
|
|
||||||
|
|
||||||
3. **Kanban bridge**: Optional bidirectional sync between mission TASKS.md rows and Kanban task cards, so the dashboard sees mission tasks.
|
|
||||||
|
|
||||||
### Churn detection (middleware)
|
|
||||||
|
|
||||||
Churn detection lives in Hermes's turn loop, NOT as a tool-call. It observes:
|
|
||||||
|
|
||||||
- Repeated compaction events (context window pressure)
|
|
||||||
- Identical tool-call sequences (loop detection)
|
|
||||||
- No file state changes across N turns
|
|
||||||
- Repeated permission denials
|
|
||||||
|
|
||||||
When churn score exceeds threshold:
|
|
||||||
|
|
||||||
1. `mission_handoff` is called automatically
|
|
||||||
2. Session is rotated (fresh context window)
|
|
||||||
3. `mission_resume` is called in the new session
|
|
||||||
|
|
||||||
This is new infrastructure that only Hermes can provide (Mosaic runs outside the agent loop).
|
|
||||||
|
|
||||||
---
|
|
||||||
|
|
||||||
## Implementation Tasks
|
|
||||||
|
|
||||||
### Phase 1: Core state management (Python port of coord)
|
|
||||||
|
|
||||||
| Task | Files | Estimate |
|
|
||||||
| -------------------------------------------------- | ----------------------------- | -------- |
|
|
||||||
| 1.1 Port mission.json read/write to Python | `mission_state.py` | 2h |
|
|
||||||
| 1.2 Port TASKS.md parser to Python | `mission_state.py` | 2h |
|
|
||||||
| 1.3 Port MISSION-MANIFEST.md reader to Python | `mission_state.py` | 1h |
|
|
||||||
| 1.4 Implement `mission_create` tool-call | `mission_tools.py` | 1h |
|
|
||||||
| 1.5 Implement `mission_status` tool-call | `mission_tools.py` | 1h |
|
|
||||||
| 1.6 Implement `mission_next_task` tool-call | `mission_tools.py` | 1h |
|
|
||||||
| 1.7 Implement `mission_update_task` tool-call | `mission_tools.py` | 1h |
|
|
||||||
| 1.8 Register `mission` toolset in Hermes registry | `tools/registry.py` | 30m |
|
|
||||||
| 1.9 Add `mission` to orchestrator profile toolsets | `config.yaml` | 10m |
|
|
||||||
| 1.10 Write unit tests for mission_state | `tests/test_mission_state.py` | 2h |
|
|
||||||
| 1.11 Write unit tests for TASKS.md parser | `tests/test_tasks_parser.py` | 1h |
|
|
||||||
|
|
||||||
**Phase 1 estimate:** ~13h
|
|
||||||
|
|
||||||
### Phase 2: Handoff and session continuity
|
|
||||||
|
|
||||||
| Task | Files | Estimate |
|
|
||||||
| ------------------------------------------------- | ---------------------------------------- | -------- |
|
|
||||||
| 2.1 Define handoff packet schema (JSON) | `mission_handoff.py` | 1h |
|
|
||||||
| 2.2 Implement `mission_handoff` tool-call | `mission_handoff.py`, `mission_tools.py` | 2h |
|
|
||||||
| 2.3 Implement `mission_resume` tool-call | `mission_handoff.py`, `mission_tools.py` | 2h |
|
|
||||||
| 2.4 Wire handoff into session start (auto-resume) | agent loop hook | 2h |
|
|
||||||
| 2.5 Write tests for handoff round-trip | `tests/test_mission_handoff.py` | 1h |
|
|
||||||
|
|
||||||
**Phase 2 estimate:** ~8h
|
|
||||||
|
|
||||||
### Phase 3: Churn detection
|
|
||||||
|
|
||||||
| Task | Files | Estimate |
|
|
||||||
| -------------------------------------------------------------- | ----------------------------- | -------- |
|
|
||||||
| 3.1 Define churn signal weights and thresholds | `mission_churn.py` | 1h |
|
|
||||||
| 3.2 Implement tool-loop detector (consecutive identical calls) | `mission_churn.py` | 2h |
|
|
||||||
| 3.3 Implement compaction pressure detector | `mission_churn.py` | 1h |
|
|
||||||
| 3.4 Implement progress scorer (file state delta) | `mission_churn.py` | 2h |
|
|
||||||
| 3.5 Wire churn scoring into agent turn loop | agent loop middleware | 2h |
|
|
||||||
| 3.6 Implement auto-rotation trigger | agent loop + handoff | 2h |
|
|
||||||
| 3.7 Write tests for churn scoring | `tests/test_mission_churn.py` | 1h |
|
|
||||||
|
|
||||||
**Phase 3 estimate:** ~11h
|
|
||||||
|
|
||||||
### Phase 4: Kanban bridge + CLI surface
|
|
||||||
|
|
||||||
| Task | Files | Estimate |
|
|
||||||
| ---------------------------------------------------- | ------------------------ | -------- |
|
|
||||||
| 4.1 Implement TASKS.md → Kanban sync (one-way first) | `mission_kanban_sync.py` | 2h |
|
|
||||||
| 4.2 Add `hermes mission` CLI subcommand | `mission_cli.py` | 2h |
|
|
||||||
| 4.3 Add `hermes mission status` command | `mission_cli.py` | 1h |
|
|
||||||
| 4.4 Add `hermes mission init` command | `mission_cli.py` | 1h |
|
|
||||||
| 4.5 Add `hermes mission handoff` command | `mission_cli.py` | 1h |
|
|
||||||
| 4.6 Add `hermes mission resume` command | `mission_cli.py` | 1h |
|
|
||||||
|
|
||||||
**Phase 4 estimate:** ~8h
|
|
||||||
|
|
||||||
---
|
|
||||||
|
|
||||||
## File Format Compatibility
|
|
||||||
|
|
||||||
The Python implementation MUST read and write the exact same file formats as Mosaic's TypeScript `packages/coord`. This means:
|
|
||||||
|
|
||||||
1. **mission.json** schema is identical to `Mission` type in `packages/coord/src/types.ts`
|
|
||||||
2. **TASKS.md** table format is identical to what `packages/coord/src/tasks-file.ts` parses
|
|
||||||
3. **MISSION-MANIFEST.md** is free-form markdown (no parser needed — just read the file)
|
|
||||||
4. **Handoff packets** are a new JSON format defined in this toolset (Mosaic doesn't have them yet)
|
|
||||||
|
|
||||||
This way a project can use Hermes mission tools OR Mosaic `mosaic coord` commands interchangeably. The files are the contract.
|
|
||||||
|
|
||||||
---
|
|
||||||
|
|
||||||
## Relationship Diagram
|
|
||||||
|
|
||||||
```
|
|
||||||
Mosaic Stack (TypeScript) Hermes Agent (Python)
|
|
||||||
┌─────────────────────────┐ ┌─────────────────────────┐
|
|
||||||
│ packages/coord │ │ tools/mission_tools.py │
|
|
||||||
│ ├─ mission.ts │◄──────►│ ├─ mission_state.py │
|
|
||||||
│ ├─ tasks-file.ts │ same │ ├─ mission_handoff.py │
|
|
||||||
│ ├─ status.ts │ files │ ├─ mission_churn.py │
|
|
||||||
│ └─ runner.ts │ │ └─ mission_tools.py │
|
|
||||||
│ │ │ │
|
|
||||||
│ packages/prdy │ │ skills/prdy/ │
|
|
||||||
│ └─ templates, wizard │◄──────►│ └─ SKILL.md + templates │
|
|
||||||
│ │ │ │
|
|
||||||
│ plugins/mosaic-framework│ │ skills/ (existing) │
|
|
||||||
│ └─ context injection │◄──────►│ └─ kanban-orchestrator │
|
|
||||||
│ │ │ + mosaic-coding-* │
|
|
||||||
│ plugins/macp │ │ tools/delegate_task.py │
|
|
||||||
│ └─ ACP bridge │◄──────►│ └─ already covers this │
|
|
||||||
│ │ │ │
|
|
||||||
│ (stays in Mosaic) │ │ tools/kanban_tools.py │
|
|
||||||
│ apps/gateway │ │ └─ Hermes Kanban DB │
|
|
||||||
│ apps/web │ │ │
|
|
||||||
│ packages/db │ │ tools/cronjob_tools.py │
|
|
||||||
│ packages/queue │ │ └─ already covers cron │
|
|
||||||
└─────────────────────────┘ └─────────────────────────┘
|
|
||||||
```
|
|
||||||
|
|
||||||
---
|
|
||||||
|
|
||||||
## Open Questions
|
|
||||||
|
|
||||||
1. **Should the `mission` toolset ship with Hermes core, or as a plugin?**
|
|
||||||
- Recommendation: ship as a **built-in toolset** (like `kanban`) since mission coordination is a core agent capability, not an optional integration. The file formats are stable and the code is small.
|
|
||||||
|
|
||||||
2. **Should churn detection be per-profile configurable?**
|
|
||||||
- Recommendation: yes. Add `mission.churn_threshold` and `mission.churn_weights` to profile config.yaml. Default threshold = 5 consecutive no-progress turns.
|
|
||||||
|
|
||||||
3. **Should handoff packets live in the project dir or in Hermes home?**
|
|
||||||
- Recommendation: **project dir** (`.mosaic/handoffs/<session-id>.json`). This keeps them version-controlled and accessible regardless of which agent runtime picks up the project.
|
|
||||||
|
|
||||||
4. **Bidirectional Kanban sync?**
|
|
||||||
- Recommendation: **one-way first** (TASKS.md → Kanban). Bidirectional adds conflict resolution complexity. Ship one-way, add reverse sync in v2 if needed.
|
|
||||||
|
|
||||||
5. **PRD generation — skill or tool-call?**
|
|
||||||
- Recommendation: **skill** (`prdy`). PRD generation is a prompt engineering problem with templates. Skills already handle this pattern perfectly.
|
|
||||||
@@ -1,236 +0,0 @@
|
|||||||
# Mosaic Stack ↔ Hermes Coordination Resilience
|
|
||||||
|
|
||||||
> Purpose: document the self-healing coordination patterns that emerged while implementing the Hermes mission toolset, distress-card protocol, and auto-heal watchers, so the same mechanics can be reimplemented in Mosaic Stack or any similar agent platform.
|
|
||||||
|
|
||||||
## Summary
|
|
||||||
|
|
||||||
The coordination layer should be treated as a system of mechanical recovery loops rather than a single interactive agent session.
|
|
||||||
|
|
||||||
## SIBKISS operational summary
|
|
||||||
|
|
||||||
- mission on
|
|
||||||
- heartbeat always
|
|
||||||
- resume from packet
|
|
||||||
- block with `[BLOCKED]`
|
|
||||||
- reassign
|
|
||||||
- keep tasks tiny
|
|
||||||
- auto-heal dead workers
|
|
||||||
|
|
||||||
The design has four parts:
|
|
||||||
|
|
||||||
1. Atomic task decomposition — workers operate only within a small, explicit scope.
|
|
||||||
2. Distress signaling — workers create a standardized `[BLOCKED]` card when they encounter a blocker outside their scope.
|
|
||||||
3. Mechanical fallback — if the worker cannot phone home because of rate limits or dead context, a cron-style watcher synthesizes the distress card for them.
|
|
||||||
4. Auto-heal / reassignment — stale workers are reaped, crash-loops are reset, and rate-limited work is reassigned to a different profile/provider.
|
|
||||||
|
|
||||||
## Why this exists
|
|
||||||
|
|
||||||
Observed failure modes:
|
|
||||||
|
|
||||||
- Scope creep: a worker completes the target fix, then spends the rest of its budget chasing downstream cascade work.
|
|
||||||
- Silent failure / dead worker: the worker PID is gone, but the task remains running or blocked.
|
|
||||||
- Rate-limited worker: the worker is too constrained to create a help card itself, so it spins or fails without a clean handoff.
|
|
||||||
|
|
||||||
The answer is not to raise iteration caps or ask the worker to keep trying longer. The answer is to make the coordination layer self-healing and the work items atomic.
|
|
||||||
|
|
||||||
## Core workflow
|
|
||||||
|
|
||||||
### 1) Atomic task boundaries
|
|
||||||
|
|
||||||
Every task should have:
|
|
||||||
|
|
||||||
- one concern
|
|
||||||
- explicit files/packages in scope
|
|
||||||
- explicit files/packages out of scope
|
|
||||||
- a maximum file count if possible
|
|
||||||
- a stated expected iteration budget
|
|
||||||
|
|
||||||
When a worker discovers work outside scope, it must stop fixing it and hand off.
|
|
||||||
|
|
||||||
### 2) Worker-authored distress card
|
|
||||||
|
|
||||||
If the worker can still report status, it creates a card like:
|
|
||||||
|
|
||||||
- Title: `[BLOCKED] t_<source_id> <blocker_type>`
|
|
||||||
- Assignee: `tuesday` / orchestrator role
|
|
||||||
- Status: `ready`
|
|
||||||
- Body: standardized distress template with source task, blocker type, completed work, cannot-touch scope, and needed action
|
|
||||||
|
|
||||||
The orchestrator receives the card, acts on it, and closes the loop.
|
|
||||||
|
|
||||||
## Routing rules
|
|
||||||
|
|
||||||
### Distress card routing
|
|
||||||
|
|
||||||
- Title: `[BLOCKED] t_<source_id> <blocker_type>`
|
|
||||||
- Assignee: `tuesday` / orchestrator role
|
|
||||||
- Status: `ready`
|
|
||||||
- Body: standardized distress template with source task, blocker type, completed work, cannot-touch scope, and needed action
|
|
||||||
- Source task stays linked to the distress card so the recovery trail is auditable
|
|
||||||
|
|
||||||
The orchestrator receives the card, acts on it, and closes the loop.
|
|
||||||
|
|
||||||
### 3) Mechanical fallback for rate-limited workers
|
|
||||||
|
|
||||||
If the worker is too rate-limited or unstable to create the distress card itself, a no-agent watcher must synthesize the card from the task row and failure metadata.
|
|
||||||
|
|
||||||
That watcher should:
|
|
||||||
|
|
||||||
- inspect running / blocked tasks
|
|
||||||
- detect repeated 429 / 503 / overload errors
|
|
||||||
- create the same standardized `[BLOCKED]` card on behalf of the worker
|
|
||||||
- link the distress card to the source task
|
|
||||||
- add a comment to the source task
|
|
||||||
- allow the dispatcher to pick up the new card immediately
|
|
||||||
|
|
||||||
This is the key fix for the logic issue: the worker does not need to be able to phone home if the watcher can do it mechanically.
|
|
||||||
|
|
||||||
### 4) Auto-heal for dead workers
|
|
||||||
|
|
||||||
A separate no-agent watcher should:
|
|
||||||
|
|
||||||
- reap dead PIDs stuck in `running`
|
|
||||||
- reset crash-loops whose failures are infrastructure-related
|
|
||||||
- escalate tasks that have been reset too many times
|
|
||||||
|
|
||||||
This watcher prevents stale tasks from clogging the board and keeps the dispatch queue moving.
|
|
||||||
|
|
||||||
## Distress card contract
|
|
||||||
|
|
||||||
### Canonical title
|
|
||||||
|
|
||||||
```text
|
|
||||||
[BLOCKED] t_<source_task_id> <blocker_type>
|
|
||||||
```
|
|
||||||
|
|
||||||
### Canonical blocker types
|
|
||||||
|
|
||||||
- `scope_boundary`
|
|
||||||
- `env_blocker`
|
|
||||||
- `credential_failure`
|
|
||||||
- `dependency`
|
|
||||||
- `iteration_budget`
|
|
||||||
- `rate_limited`
|
|
||||||
|
|
||||||
### Canonical body
|
|
||||||
|
|
||||||
```markdown
|
|
||||||
## Distress Signal
|
|
||||||
|
|
||||||
- Blocked task: t_xxx
|
|
||||||
- Worker: <profile_name>
|
|
||||||
- Branch: <git_branch_name>
|
|
||||||
- Workspace: <path>
|
|
||||||
- Blocker type: <type>
|
|
||||||
- Completed: <what was done>
|
|
||||||
- Cannot touch: <out-of-scope packages/files>
|
|
||||||
- Needs: <what the orchestrator should do>
|
|
||||||
- State: committed | uncommitted | stashed(<stash_name>)
|
|
||||||
|
|
||||||
## Scope Guard
|
|
||||||
|
|
||||||
DO NOT touch: anything outside diagnosing and remediating the blocker described above
|
|
||||||
Only fix: assign, split, reassign, or unblock the source task
|
|
||||||
```
|
|
||||||
|
|
||||||
## Routing rules
|
|
||||||
|
|
||||||
### Distress card routing
|
|
||||||
|
|
||||||
- `[BLOCKED]` title prefix should bypass normal triage.
|
|
||||||
- The card should go directly to the orchestration profile.
|
|
||||||
- The orchestrator should start from a clean session each time.
|
|
||||||
|
|
||||||
### Rate-limit fallback
|
|
||||||
|
|
||||||
When the source task is rate-limited:
|
|
||||||
|
|
||||||
- do not keep retrying in the worker
|
|
||||||
- let the watcher synthesize the distress card
|
|
||||||
- have the orchestrator reassign the source task to a different profile/provider combo
|
|
||||||
|
|
||||||
### Provider fallback principle
|
|
||||||
|
|
||||||
Never reassign rate-limited work back to the same provider if the failure was provider pressure. Use a different provider when possible.
|
|
||||||
|
|
||||||
### Suggested fallback order
|
|
||||||
|
|
||||||
1. Keep the current task body and scope guards intact.
|
|
||||||
2. Reassign to a different profile on a different provider.
|
|
||||||
3. If that is impossible, reassign to a different profile on the same provider only for non-rate-limit blockers.
|
|
||||||
4. If repeated failures continue, split the task into a narrower atomic card.
|
|
||||||
|
|
||||||
## Related recovery docs
|
|
||||||
|
|
||||||
- Mission packet recovery contract: `/opt/hermes/docs/mission-toolset-heartbeat.md`
|
|
||||||
- Hermes mission implementation plan: `/opt/hermes/docs/plans/mission-toolset-implementation.md`
|
|
||||||
- The same packet-first resume rule applies: inspect the latest packet before re-reading mission files.
|
|
||||||
- New-session trigger: when a profile config changes, start a fresh session or `/reset` so the updated toolset is actually loaded.
|
|
||||||
|
|
||||||
## Watchers to implement
|
|
||||||
|
|
||||||
### Auto-heal watcher
|
|
||||||
|
|
||||||
Responsibilities:
|
|
||||||
|
|
||||||
- reap stale workers
|
|
||||||
- reset dead-PID crash loops
|
|
||||||
- track reset counts
|
|
||||||
- escalate after repeated resets
|
|
||||||
|
|
||||||
### Distress synthesizer watcher
|
|
||||||
|
|
||||||
Responsibilities:
|
|
||||||
|
|
||||||
- detect rate-limited / stuck workers
|
|
||||||
- create `[BLOCKED]` cards mechanically
|
|
||||||
- link the card to the source task
|
|
||||||
- leave a comment for traceability
|
|
||||||
|
|
||||||
### Iteration-budget watcher
|
|
||||||
|
|
||||||
Responsibilities:
|
|
||||||
|
|
||||||
- detect long-running tasks and repeated failure patterns
|
|
||||||
- recommend splits when a task is clearly over-scoped
|
|
||||||
- report tasks that need human review after multiple resets
|
|
||||||
|
|
||||||
## Operational principle
|
|
||||||
|
|
||||||
If a task cannot cleanly finish within its atomic scope, the right response is to surface a smaller coordination problem, not to keep burning context.
|
|
||||||
|
|
||||||
This is what makes the system robust across compaction, rate limits, and dead workers.
|
|
||||||
|
|
||||||
## Suggested implementation order
|
|
||||||
|
|
||||||
1. Atomic task metadata in task bodies
|
|
||||||
2. Worker-authored distress card protocol
|
|
||||||
3. Mechanical distress synthesizer watcher
|
|
||||||
4. Auto-heal watcher for dead workers
|
|
||||||
5. Orchestrator routing rules for `[BLOCKED]`
|
|
||||||
6. Rate-limit fallback / model reassignment table
|
|
||||||
|
|
||||||
## Where this fits in Hermes
|
|
||||||
|
|
||||||
- Kanban = durable work graph and status engine
|
|
||||||
- Watchers = mechanical healing and distress synthesis
|
|
||||||
- Orchestrator = split / reassign / unblock decision-maker
|
|
||||||
- Workers = execution inside atomic task boundaries
|
|
||||||
|
|
||||||
## Where this fits in Mosaic Stack
|
|
||||||
|
|
||||||
- PRD / coordination infra should encode the same patterns
|
|
||||||
- Mosaic can use the same distress-card contract and watcher logic
|
|
||||||
- The coordination model should be runtime-agnostic: any agent system can use it if it can write a task card and react to a ready queue
|
|
||||||
|
|
||||||
## Cross-project takeaway
|
|
||||||
|
|
||||||
The important pattern is not the specific tool names. It is the mechanical feedback loop:
|
|
||||||
|
|
||||||
- detect failure without requiring the failing worker to succeed
|
|
||||||
- create a standardized help artifact
|
|
||||||
- route that artifact to a fresh orchestrator context
|
|
||||||
- repair the assignment graph
|
|
||||||
- continue the mission
|
|
||||||
|
|
||||||
That pattern is reusable anywhere.
|
|
||||||
@@ -1,50 +0,0 @@
|
|||||||
# Issue 536 Wrapper Login Pin Scratchpad
|
|
||||||
|
|
||||||
## Metadata
|
|
||||||
|
|
||||||
- Date: 2026-06-12
|
|
||||||
- Worktree: `/home/hermes/agent-work/536-wrapper-audit`
|
|
||||||
- Branch: `fix/536-wrapper-login-pin`
|
|
||||||
- Coordinator: `mos-claude`
|
|
||||||
- Issue: `mosaicstack/stack#536`
|
|
||||||
- Scope: Audit and fix Gitea git wrappers that hardcode or incorrectly inherit tea login/instance selection.
|
|
||||||
|
|
||||||
## Objective
|
|
||||||
|
|
||||||
Fix the framework git wrappers so Gitea issue/PR operations resolve the tea login from the target repository host instead of pinning `mosaicstack`. The fix must cover the class of bug across `packages/mosaic/framework/tools/git/`, not only `issue-close.sh`.
|
|
||||||
|
|
||||||
## Acceptance Criteria
|
|
||||||
|
|
||||||
1. `issue-close.sh` no longer uses `--login mosaicstack` for non-mosaic hosts.
|
|
||||||
2. All wrappers in `packages/mosaic/framework/tools/git/` avoid hardcoded Gitea login fallback where host-specific resolution is available.
|
|
||||||
3. Host-specific resolution works for `git.mosaicstack.dev` and `git.uscllc.com` using configured credentials / tea login data.
|
|
||||||
4. Read-only verification runs against both Gitea instances where possible.
|
|
||||||
5. Queue guard passes before push, PR is opened referencing #536, and merge is left to the coordinator.
|
|
||||||
|
|
||||||
## Progress Log
|
|
||||||
|
|
||||||
- Read required Mosaic hard-gate docs and coordinator briefing.
|
|
||||||
- Read issue #536 via Gitea API with mosaicstack credentials.
|
|
||||||
- Initial audit found hardcoded `${GITEA_LOGIN:-mosaicstack}` in issue and PR wrappers, plus shared `get_gitea_repo_args`.
|
|
||||||
- Added host-aware Gitea login resolution in `detect-platform.sh`, including exact host matching for `tea login list` entries and HTTPS remotes with embedded credentials.
|
|
||||||
- Updated Gitea issue, PR, milestone, and CI wrappers to use resolved host-specific tea login arguments instead of defaulting to `mosaicstack`.
|
|
||||||
- Added authenticated API fallbacks for close/reopen paths so wrappers can still operate when a matching `tea` login is absent but token credentials are available.
|
|
||||||
- Added regression coverage for stale `GITEA_LOGIN`, exact host matching, `--repo` override flows, USC issue close routing, mosaicstack API fallback, and PR metadata/merge fallbacks.
|
|
||||||
- Delta after PR #538 review: extended host-aware login/repo resolution to PowerShell wrappers, Bash milestone wrappers, and API-only `--repo` fallback paths.
|
|
||||||
- Delta after live USC `pr-create.sh` repro: tightened `GITEA_LOGIN` trust so stale login names are ignored unless the tea login itself matches the target host, and added USC API fallback coverage for `pr-create.sh`.
|
|
||||||
|
|
||||||
## Verification
|
|
||||||
|
|
||||||
- `bash -n packages/mosaic/framework/tools/git/*.sh`
|
|
||||||
- `packages/mosaic/framework/tools/git/test-gitea-login-resolution.sh`
|
|
||||||
- `packages/mosaic/framework/tools/git/test-pr-metadata-gitea.sh`
|
|
||||||
- `packages/mosaic/framework/tools/git/test-pr-merge-gitea-empty-uid.sh`
|
|
||||||
- `pwsh -NoProfile` parse check for all `packages/mosaic/framework/tools/git/*.ps1`
|
|
||||||
- `pnpm typecheck`
|
|
||||||
- `pnpm lint`
|
|
||||||
- `pnpm format:check`
|
|
||||||
- `pnpm --filter @mosaicstack/mosaic test -- src/commands/git-wrapper-redirects.spec.ts`
|
|
||||||
- `pnpm test` progressed past wrapper redirect assertions; local run then stopped on `apps/gateway` Postgres connection refused at `localhost:5433`, which CI provides as a service.
|
|
||||||
- Live read-only: direct Gitea API read of `mosaicstack/stack#536` with `User-Agent: curl/8`.
|
|
||||||
- Live read-only: USC temporary repo remote to `https://git.uscllc.com/USC/uconnect.git`; `issue-list.sh -n 1` resolved the USC login and returned USC issues.
|
|
||||||
- Independent Codex review final verdict: approve, no findings.
|
|
||||||
@@ -50,34 +50,3 @@ export function validateBridgeTyping(input: unknown): asserts input is BridgeTyp
|
|||||||
assertAgentSlug(o.agent);
|
assertAgentSlug(o.agent);
|
||||||
if (typeof o.typing !== 'boolean') throw new Error('typing must be a boolean');
|
if (typeof o.typing !== 'boolean') throw new Error('typing must be a boolean');
|
||||||
}
|
}
|
||||||
|
|
||||||
export interface ProvisionRoomDto {
|
|
||||||
name: string;
|
|
||||||
alias?: string;
|
|
||||||
topic?: string;
|
|
||||||
invite?: string[];
|
|
||||||
space_id?: string;
|
|
||||||
}
|
|
||||||
|
|
||||||
export function validateProvisionRoom(input: unknown): asserts input is ProvisionRoomDto {
|
|
||||||
const o = input as Partial<ProvisionRoomDto> | null | undefined;
|
|
||||||
if (!o || typeof o !== 'object') throw new Error('payload must be an object');
|
|
||||||
if (typeof o.name !== 'string' || o.name.length === 0) throw new Error('name is required');
|
|
||||||
if (o.alias !== undefined && (!/^[a-z0-9_.-]+$/.test(o.alias) || o.alias.length > 200)) {
|
|
||||||
throw new Error('alias must match [a-z0-9_.-]+ (max 200 chars)');
|
|
||||||
}
|
|
||||||
if (o.invite !== undefined) {
|
|
||||||
if (
|
|
||||||
!Array.isArray(o.invite) ||
|
|
||||||
o.invite.some((u) => typeof u !== 'string' || !u.startsWith('@'))
|
|
||||||
) {
|
|
||||||
throw new Error('invite must be a list of Matrix user ids');
|
|
||||||
}
|
|
||||||
if (o.invite.length > 50) {
|
|
||||||
throw new Error('invite list exceeds maximum of 50');
|
|
||||||
}
|
|
||||||
}
|
|
||||||
if (o.space_id !== undefined && (typeof o.space_id !== 'string' || !o.space_id.startsWith('!'))) {
|
|
||||||
throw new Error('space_id must be a Matrix room id');
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|||||||
@@ -4,12 +4,8 @@ export { TransactionHandler } from './transactions.js';
|
|||||||
export type { TransactionHandlerOptions } from './transactions.js';
|
export type { TransactionHandlerOptions } from './transactions.js';
|
||||||
export { buildRegistration, registrationToYaml } from './registration.js';
|
export { buildRegistration, registrationToYaml } from './registration.js';
|
||||||
export type { RegistrationOptions } from './registration.js';
|
export type { RegistrationOptions } from './registration.js';
|
||||||
export {
|
export { validateBridgeMessage, validateBridgeTyping } from './bridge.dto.js';
|
||||||
validateBridgeMessage,
|
export type { BridgeMessageDto, BridgeTypingDto } from './bridge.dto.js';
|
||||||
validateBridgeTyping,
|
|
||||||
validateProvisionRoom,
|
|
||||||
} from './bridge.dto.js';
|
|
||||||
export type { BridgeMessageDto, BridgeTypingDto, ProvisionRoomDto } from './bridge.dto.js';
|
|
||||||
export type {
|
export type {
|
||||||
AppserviceConfig,
|
AppserviceConfig,
|
||||||
EventHandler,
|
EventHandler,
|
||||||
|
|||||||
@@ -172,58 +172,6 @@ export class AppserviceIntent {
|
|||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
/** Create a room as the AS sender: agents get PL 50 by namespace via the
|
|
||||||
* sender (PL 100); humans invited at default PL. Optionally link into a
|
|
||||||
* space (m.space.child + m.space.parent). Returns the room id. */
|
|
||||||
async createRoom(options: {
|
|
||||||
name: string;
|
|
||||||
alias?: string;
|
|
||||||
topic?: string;
|
|
||||||
invite?: string[];
|
|
||||||
spaceId?: string;
|
|
||||||
}): Promise<{ roomId: string; spaceLinked: boolean; spaceError?: string }> {
|
|
||||||
const body: Record<string, unknown> = {
|
|
||||||
name: options.name,
|
|
||||||
preset: 'private_chat',
|
|
||||||
invite: options.invite ?? [],
|
|
||||||
power_level_content_override: {
|
|
||||||
users: { [this.senderUserId]: 100 },
|
|
||||||
// state_default 50 stays; the AS sender can grant agents as needed.
|
|
||||||
},
|
|
||||||
};
|
|
||||||
if (options.alias) body.room_alias_name = options.alias;
|
|
||||||
if (options.topic) body.topic = options.topic;
|
|
||||||
const res = await this.request('POST', '/_matrix/client/v3/createRoom', {
|
|
||||||
userId: this.senderUserId,
|
|
||||||
body,
|
|
||||||
});
|
|
||||||
const roomId = res.room_id;
|
|
||||||
if (typeof roomId !== 'string') throw new Error('createRoom returned no room_id');
|
|
||||||
if (!options.spaceId) {
|
|
||||||
return { roomId, spaceLinked: false };
|
|
||||||
}
|
|
||||||
// Space-link failures must NOT throw: the room already exists, and an
|
|
||||||
// exception would hide the room_id (orphaned room, no recovery path).
|
|
||||||
const encodedSpaceId = encodeURIComponent(options.spaceId);
|
|
||||||
const encodedRoomId = encodeURIComponent(roomId);
|
|
||||||
try {
|
|
||||||
await this.request(
|
|
||||||
'PUT',
|
|
||||||
`/_matrix/client/v3/rooms/${encodedSpaceId}/state/m.space.child/${encodedRoomId}`,
|
|
||||||
{ userId: this.senderUserId, body: { via: [this.cfg.domain], suggested: true } },
|
|
||||||
);
|
|
||||||
await this.request(
|
|
||||||
'PUT',
|
|
||||||
`/_matrix/client/v3/rooms/${encodedRoomId}/state/m.space.parent/${encodedSpaceId}`,
|
|
||||||
{ userId: this.senderUserId, body: { via: [this.cfg.domain], canonical: true } },
|
|
||||||
);
|
|
||||||
} catch (error) {
|
|
||||||
const message = error instanceof Error ? error.message : String(error);
|
|
||||||
return { roomId, spaceLinked: false, spaceError: message };
|
|
||||||
}
|
|
||||||
return { roomId, spaceLinked: true };
|
|
||||||
}
|
|
||||||
|
|
||||||
/** Set display name for an agent's virtual user. */
|
/** Set display name for an agent's virtual user. */
|
||||||
async setDisplayName(agent: string, displayName: string): Promise<void> {
|
async setDisplayName(agent: string, displayName: string): Promise<void> {
|
||||||
const userId = await this.ensureRegistered(agent);
|
const userId = await this.ensureRegistered(agent);
|
||||||
|
|||||||
@@ -34,7 +34,6 @@ At session start, additionally:
|
|||||||
10. Manual `docker build` / `docker push` for deployment is FORBIDDEN when CI/CD pipelines exist in the repository. CI is the ONLY canonical build path for container images.
|
10. Manual `docker build` / `docker push` for deployment is FORBIDDEN when CI/CD pipelines exist in the repository. CI is the ONLY canonical build path for container images.
|
||||||
11. Before ANY build or deployment action, you MUST check for existing CI/CD pipeline configuration (`.woodpecker/`, `.woodpecker.yml`, `.github/workflows/`, etc.). If pipelines exist, use them — do not build locally.
|
11. Before ANY build or deployment action, you MUST check for existing CI/CD pipeline configuration (`.woodpecker/`, `.woodpecker.yml`, `.github/workflows/`, etc.). If pipelines exist, use them — do not build locally.
|
||||||
12. The mandatory intake procedure is NOT conditional on perceived task complexity. A "simple" commit-push-deploy task has the same procedural requirements as a multi-file feature. Skipping intake because a task "seems simple" is the most common framework violation.
|
12. The mandatory intake procedure is NOT conditional on perceived task complexity. A "simple" commit-push-deploy task has the same procedural requirements as a multi-file feature. Skipping intake because a task "seems simple" is the most common framework violation.
|
||||||
13. **Merge authority (coordinated work):** when a coordinator/orchestrator session is active for the work, the post-review MERGE GO-AHEAD is the coordinator's to give — once code has passed the required review gates, request the coordinator's go-ahead and merge on their confirmation; do NOT wait on the human owner personally. Solo (uncoordinated) delivery keeps the default: merge without routine confirmation per gates 2 and 9. A "No self-merge" note on a PR means no UNREVIEWED self-merge — it does not suspend coordinator-authorized merges. (Policy: Jason, 2026-06-11.)
|
|
||||||
|
|
||||||
## Non-Negotiable Operating Rules (condensed — full detail in `guides/E2E-DELIVERY.md`)
|
## Non-Negotiable Operating Rules (condensed — full detail in `guides/E2E-DELIVERY.md`)
|
||||||
|
|
||||||
|
|||||||
@@ -88,11 +88,6 @@ For implementation work, you MUST run this cycle in order:
|
|||||||
|
|
||||||
### Post-PR Hard Gate (Execute Sequentially, No Exceptions)
|
### Post-PR Hard Gate (Execute Sequentially, No Exceptions)
|
||||||
|
|
||||||
> **Merge authority:** if a coordinator/orchestrator session is active for this
|
|
||||||
> work, obtain the coordinator's merge go-ahead after review passes, then run
|
|
||||||
> the gate (AGENTS.md hard gate "Merge authority"). Solo delivery proceeds
|
|
||||||
> without asking.
|
|
||||||
|
|
||||||
1. `~/.config/mosaic/tools/git/ci-queue-wait.sh --purpose merge -B main`
|
1. `~/.config/mosaic/tools/git/ci-queue-wait.sh --purpose merge -B main`
|
||||||
2. `~/.config/mosaic/tools/git/pr-merge.sh -n <PR_NUMBER> -m squash`
|
2. `~/.config/mosaic/tools/git/pr-merge.sh -n <PR_NUMBER> -m squash`
|
||||||
3. `~/.config/mosaic/tools/git/pr-ci-wait.sh -n <PR_NUMBER>`
|
3. `~/.config/mosaic/tools/git/pr-ci-wait.sh -n <PR_NUMBER>`
|
||||||
|
|||||||
@@ -137,7 +137,7 @@ gitea_get_branch_head_sha() {
|
|||||||
local branch="$3"
|
local branch="$3"
|
||||||
local token="$4"
|
local token="$4"
|
||||||
local url="https://${host}/api/v1/repos/${repo}/branches/${branch}"
|
local url="https://${host}/api/v1/repos/${repo}/branches/${branch}"
|
||||||
curl -fsSL -H "User-Agent: curl/8" -H "Authorization: token ${token}" "$url" | python3 -c '
|
curl -fsSL -H "Authorization: token ${token}" "$url" | python3 -c '
|
||||||
import json, sys
|
import json, sys
|
||||||
data = json.load(sys.stdin)
|
data = json.load(sys.stdin)
|
||||||
commit = data.get("commit") or {}
|
commit = data.get("commit") or {}
|
||||||
@@ -151,7 +151,7 @@ gitea_get_commit_status_json() {
|
|||||||
local sha="$3"
|
local sha="$3"
|
||||||
local token="$4"
|
local token="$4"
|
||||||
local url="https://${host}/api/v1/repos/${repo}/commits/${sha}/status"
|
local url="https://${host}/api/v1/repos/${repo}/commits/${sha}/status"
|
||||||
curl -fsSL -H "User-Agent: curl/8" -H "Authorization: token ${token}" "$url"
|
curl -fsSL -H "Authorization: token ${token}" "$url"
|
||||||
}
|
}
|
||||||
|
|
||||||
while [[ $# -gt 0 ]]; do
|
while [[ $# -gt 0 ]]; do
|
||||||
|
|||||||
@@ -55,154 +55,6 @@ function Get-GitRepoInfo {
|
|||||||
return $repoPath
|
return $repoPath
|
||||||
}
|
}
|
||||||
|
|
||||||
function Get-GitRemoteHost {
|
|
||||||
[CmdletBinding()]
|
|
||||||
param()
|
|
||||||
|
|
||||||
$remoteUrl = git remote get-url origin 2>$null
|
|
||||||
|
|
||||||
if ([string]::IsNullOrEmpty($remoteUrl)) {
|
|
||||||
Write-Error "Not a git repository or no origin remote"
|
|
||||||
return $null
|
|
||||||
}
|
|
||||||
|
|
||||||
if ($remoteUrl -match "^https?://([^/]+)/") {
|
|
||||||
$remoteHost = $Matches[1]
|
|
||||||
return ($remoteHost -replace "^.*@", "")
|
|
||||||
}
|
|
||||||
|
|
||||||
if ($remoteUrl -match "^git@([^:]+):") {
|
|
||||||
return $Matches[1]
|
|
||||||
}
|
|
||||||
|
|
||||||
return $null
|
|
||||||
}
|
|
||||||
|
|
||||||
function Get-TeaLoginList {
|
|
||||||
[CmdletBinding()]
|
|
||||||
param()
|
|
||||||
|
|
||||||
$json = tea login list --output json 2>$null
|
|
||||||
if (-not $json) {
|
|
||||||
return @()
|
|
||||||
}
|
|
||||||
|
|
||||||
try {
|
|
||||||
$items = $json | ConvertFrom-Json
|
|
||||||
} catch {
|
|
||||||
return @()
|
|
||||||
}
|
|
||||||
|
|
||||||
if ($null -eq $items) {
|
|
||||||
return @()
|
|
||||||
}
|
|
||||||
|
|
||||||
return @($items)
|
|
||||||
}
|
|
||||||
|
|
||||||
function Test-GiteaUrlMatchesHost {
|
|
||||||
[CmdletBinding()]
|
|
||||||
param(
|
|
||||||
[string]$Url,
|
|
||||||
[string]$GiteaHost
|
|
||||||
)
|
|
||||||
|
|
||||||
if ([string]::IsNullOrEmpty($Url) -or [string]::IsNullOrEmpty($GiteaHost)) {
|
|
||||||
return $false
|
|
||||||
}
|
|
||||||
|
|
||||||
try {
|
|
||||||
$uri = [Uri]$Url
|
|
||||||
return $uri.Host -eq $GiteaHost
|
|
||||||
} catch {
|
|
||||||
return $false
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
function Find-TeaLoginForHost {
|
|
||||||
[CmdletBinding()]
|
|
||||||
param([Parameter(Mandatory=$true)][string]$GiteaHost)
|
|
||||||
|
|
||||||
foreach ($login in Get-TeaLoginList) {
|
|
||||||
$name = if ($login.name) { [string]$login.name } elseif ($login.Name) { [string]$login.Name } else { "" }
|
|
||||||
$url = if ($login.url) { [string]$login.url } elseif ($login.URL) { [string]$login.URL } else { "" }
|
|
||||||
if ([string]::IsNullOrEmpty($name) -or [string]::IsNullOrEmpty($url)) {
|
|
||||||
continue
|
|
||||||
}
|
|
||||||
|
|
||||||
try {
|
|
||||||
$uri = [Uri]$url
|
|
||||||
if ($uri.Host -eq $GiteaHost) {
|
|
||||||
return $name
|
|
||||||
}
|
|
||||||
} catch {
|
|
||||||
continue
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
return $null
|
|
||||||
}
|
|
||||||
|
|
||||||
function Test-TeaLoginMatchesHost {
|
|
||||||
[CmdletBinding()]
|
|
||||||
param(
|
|
||||||
[Parameter(Mandatory=$true)][string]$LoginName,
|
|
||||||
[Parameter(Mandatory=$true)][string]$GiteaHost
|
|
||||||
)
|
|
||||||
|
|
||||||
foreach ($login in Get-TeaLoginList) {
|
|
||||||
$name = if ($login.name) { [string]$login.name } elseif ($login.Name) { [string]$login.Name } else { "" }
|
|
||||||
$url = if ($login.url) { [string]$login.url } elseif ($login.URL) { [string]$login.URL } else { "" }
|
|
||||||
if ($name -ne $LoginName -or [string]::IsNullOrEmpty($url)) {
|
|
||||||
continue
|
|
||||||
}
|
|
||||||
|
|
||||||
try {
|
|
||||||
$uri = [Uri]$url
|
|
||||||
return $uri.Host -eq $GiteaHost
|
|
||||||
} catch {
|
|
||||||
return $false
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
return $false
|
|
||||||
}
|
|
||||||
|
|
||||||
function Get-GiteaLoginForHost {
|
|
||||||
[CmdletBinding()]
|
|
||||||
param([string]$GiteaHost)
|
|
||||||
|
|
||||||
if ([string]::IsNullOrEmpty($GiteaHost)) {
|
|
||||||
$GiteaHost = Get-GitRemoteHost
|
|
||||||
}
|
|
||||||
if ([string]::IsNullOrEmpty($GiteaHost)) {
|
|
||||||
return $null
|
|
||||||
}
|
|
||||||
|
|
||||||
if ($env:GITEA_LOGIN) {
|
|
||||||
if (Test-TeaLoginMatchesHost -LoginName $env:GITEA_LOGIN -GiteaHost $GiteaHost) {
|
|
||||||
return $env:GITEA_LOGIN
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
return Find-TeaLoginForHost -GiteaHost $GiteaHost
|
|
||||||
}
|
|
||||||
|
|
||||||
function Get-GiteaRepoArgs {
|
|
||||||
[CmdletBinding()]
|
|
||||||
param()
|
|
||||||
|
|
||||||
$repo = Get-GitRepoInfo
|
|
||||||
$hostName = Get-GitRemoteHost
|
|
||||||
$login = Get-GiteaLoginForHost -GiteaHost $hostName
|
|
||||||
|
|
||||||
if ([string]::IsNullOrEmpty($repo) -or [string]::IsNullOrEmpty($login)) {
|
|
||||||
return @()
|
|
||||||
}
|
|
||||||
|
|
||||||
return @("--repo", $repo, "--login", $login)
|
|
||||||
}
|
|
||||||
|
|
||||||
function Get-GitRepoOwner {
|
function Get-GitRepoOwner {
|
||||||
[CmdletBinding()]
|
[CmdletBinding()]
|
||||||
param()
|
param()
|
||||||
|
|||||||
@@ -78,211 +78,10 @@ get_repo_slug() {
|
|||||||
get_repo_info
|
get_repo_info
|
||||||
}
|
}
|
||||||
|
|
||||||
gitea_url_matches_host() {
|
|
||||||
local url="${1:-}" host="${2:-}"
|
|
||||||
[[ -n "$url" && -n "$host" ]] || return 1
|
|
||||||
[[ "${url%/}" == "https://$host" || "${url%/}" == "http://$host" || "${url%/}" == *"//$host" ]]
|
|
||||||
}
|
|
||||||
|
|
||||||
get_gitea_service_for_host() {
|
|
||||||
local host="$1"
|
|
||||||
local cred_file="${MOSAIC_CREDENTIALS_FILE:-$HOME/src/jarvis-brain/credentials.json}"
|
|
||||||
|
|
||||||
case "$host" in
|
|
||||||
git.mosaicstack.dev)
|
|
||||||
echo "mosaicstack"
|
|
||||||
return 0
|
|
||||||
;;
|
|
||||||
git.uscllc.com)
|
|
||||||
echo "usc"
|
|
||||||
return 0
|
|
||||||
;;
|
|
||||||
esac
|
|
||||||
|
|
||||||
[[ -f "$cred_file" ]] || return 1
|
|
||||||
command -v jq >/dev/null 2>&1 || return 1
|
|
||||||
|
|
||||||
jq -r --arg host "$host" '
|
|
||||||
.gitea // {}
|
|
||||||
| to_entries[]
|
|
||||||
| select((.value.url // "" | sub("/+$"; "")) | test("https?://" + $host + "$"))
|
|
||||||
| .key
|
|
||||||
' "$cred_file" | head -n 1
|
|
||||||
}
|
|
||||||
|
|
||||||
find_tea_login_for_host() {
|
|
||||||
local host="$1"
|
|
||||||
local logins_json
|
|
||||||
|
|
||||||
command -v tea >/dev/null 2>&1 || return 1
|
|
||||||
logins_json=$(tea login list --output json 2>/dev/null) || return 1
|
|
||||||
TEA_LOGINS_JSON="$logins_json" python3 - "$host" <<'PY'
|
|
||||||
import json
|
|
||||||
import os
|
|
||||||
import sys
|
|
||||||
from urllib.parse import urlparse
|
|
||||||
|
|
||||||
host = sys.argv[1]
|
|
||||||
try:
|
|
||||||
logins = json.loads(os.environ.get("TEA_LOGINS_JSON", "[]"))
|
|
||||||
except Exception:
|
|
||||||
raise SystemExit(1)
|
|
||||||
|
|
||||||
for login in logins if isinstance(logins, list) else []:
|
|
||||||
url = str(login.get("url") or login.get("URL") or "")
|
|
||||||
name = str(login.get("name") or login.get("Name") or "")
|
|
||||||
parsed = urlparse(url)
|
|
||||||
if parsed.hostname == host and name:
|
|
||||||
print(name)
|
|
||||||
raise SystemExit(0)
|
|
||||||
|
|
||||||
raise SystemExit(1)
|
|
||||||
PY
|
|
||||||
}
|
|
||||||
|
|
||||||
tea_login_matches_host() {
|
|
||||||
local login_name="$1" host="$2"
|
|
||||||
local logins_json
|
|
||||||
|
|
||||||
command -v tea >/dev/null 2>&1 || return 1
|
|
||||||
logins_json=$(tea login list --output json 2>/dev/null) || return 1
|
|
||||||
TEA_LOGINS_JSON="$logins_json" python3 - "$login_name" "$host" <<'PY'
|
|
||||||
import json
|
|
||||||
import os
|
|
||||||
import sys
|
|
||||||
from urllib.parse import urlparse
|
|
||||||
|
|
||||||
login_name, host = sys.argv[1], sys.argv[2]
|
|
||||||
try:
|
|
||||||
logins = json.loads(os.environ.get("TEA_LOGINS_JSON", "[]"))
|
|
||||||
except Exception:
|
|
||||||
raise SystemExit(1)
|
|
||||||
|
|
||||||
for login in logins if isinstance(logins, list) else []:
|
|
||||||
url = str(login.get("url") or login.get("URL") or "")
|
|
||||||
name = str(login.get("name") or login.get("Name") or "")
|
|
||||||
parsed = urlparse(url)
|
|
||||||
if name == login_name and parsed.hostname == host:
|
|
||||||
raise SystemExit(0)
|
|
||||||
|
|
||||||
raise SystemExit(1)
|
|
||||||
PY
|
|
||||||
}
|
|
||||||
|
|
||||||
get_gitea_login_for_host() {
|
|
||||||
local host="${1:-}"
|
|
||||||
local login
|
|
||||||
|
|
||||||
if [[ -z "$host" ]]; then
|
|
||||||
host=$(get_remote_host) || return 1
|
|
||||||
fi
|
|
||||||
|
|
||||||
if [[ -n "${GITEA_LOGIN:-}" ]]; then
|
|
||||||
if tea_login_matches_host "$GITEA_LOGIN" "$host"; then
|
|
||||||
echo "$GITEA_LOGIN"
|
|
||||||
return 0
|
|
||||||
fi
|
|
||||||
fi
|
|
||||||
|
|
||||||
login=$(find_tea_login_for_host "$host" || true)
|
|
||||||
if [[ -n "$login" ]]; then
|
|
||||||
echo "$login"
|
|
||||||
return 0
|
|
||||||
fi
|
|
||||||
|
|
||||||
return 1
|
|
||||||
}
|
|
||||||
|
|
||||||
get_default_tea_login() {
|
|
||||||
local logins_json
|
|
||||||
|
|
||||||
command -v tea >/dev/null 2>&1 || return 1
|
|
||||||
logins_json=$(tea login list --output json 2>/dev/null) || return 1
|
|
||||||
TEA_LOGINS_JSON="$logins_json" python3 - <<'PY'
|
|
||||||
import json
|
|
||||||
import os
|
|
||||||
|
|
||||||
try:
|
|
||||||
logins = json.loads(os.environ.get("TEA_LOGINS_JSON", "[]"))
|
|
||||||
except Exception:
|
|
||||||
raise SystemExit(1)
|
|
||||||
|
|
||||||
if not isinstance(logins, list) or not logins:
|
|
||||||
raise SystemExit(1)
|
|
||||||
|
|
||||||
for login in logins:
|
|
||||||
if not isinstance(login, dict):
|
|
||||||
continue
|
|
||||||
is_default = str(login.get("default") or login.get("Default") or "").lower()
|
|
||||||
name = str(login.get("name") or login.get("Name") or "")
|
|
||||||
if name and is_default == "true":
|
|
||||||
print(name)
|
|
||||||
raise SystemExit(0)
|
|
||||||
|
|
||||||
for login in logins:
|
|
||||||
if not isinstance(login, dict):
|
|
||||||
continue
|
|
||||||
name = str(login.get("name") or login.get("Name") or "")
|
|
||||||
if name:
|
|
||||||
print(name)
|
|
||||||
raise SystemExit(0)
|
|
||||||
|
|
||||||
raise SystemExit(1)
|
|
||||||
PY
|
|
||||||
}
|
|
||||||
|
|
||||||
get_gitea_login_for_repo_override() {
|
|
||||||
local login
|
|
||||||
|
|
||||||
if [[ -n "${GITEA_LOGIN:-}" ]]; then
|
|
||||||
echo "$GITEA_LOGIN"
|
|
||||||
return 0
|
|
||||||
fi
|
|
||||||
|
|
||||||
login=$(get_default_tea_login || true)
|
|
||||||
if [[ -n "$login" ]]; then
|
|
||||||
echo "$login"
|
|
||||||
return 0
|
|
||||||
fi
|
|
||||||
|
|
||||||
return 1
|
|
||||||
}
|
|
||||||
|
|
||||||
get_host_from_url() {
|
|
||||||
local url="${1:-}"
|
|
||||||
[[ -n "$url" ]] || return 1
|
|
||||||
|
|
||||||
python3 - "$url" <<'PY'
|
|
||||||
import sys
|
|
||||||
from urllib.parse import urlparse
|
|
||||||
|
|
||||||
parsed = urlparse(sys.argv[1])
|
|
||||||
if parsed.hostname:
|
|
||||||
print(parsed.hostname)
|
|
||||||
raise SystemExit(0)
|
|
||||||
raise SystemExit(1)
|
|
||||||
PY
|
|
||||||
}
|
|
||||||
|
|
||||||
get_gitea_api_host_for_repo_override() {
|
|
||||||
if [[ -n "${GITEA_HOST:-}" ]]; then
|
|
||||||
echo "$GITEA_HOST"
|
|
||||||
return 0
|
|
||||||
fi
|
|
||||||
|
|
||||||
get_host_from_url "${GITEA_URL:-}"
|
|
||||||
}
|
|
||||||
|
|
||||||
get_gitea_repo_args() {
|
get_gitea_repo_args() {
|
||||||
local repo host login
|
local repo
|
||||||
repo=$(get_repo_slug) || return 1
|
repo=$(get_repo_slug) || return 1
|
||||||
host=$(get_remote_host) || return 1
|
printf -- '--repo %q --login %q' "$repo" "${GITEA_LOGIN:-mosaicstack}"
|
||||||
login=$(get_gitea_login_for_host "$host") || return 1
|
|
||||||
printf -- '--repo %q --login %q' "$repo" "$login"
|
|
||||||
}
|
|
||||||
|
|
||||||
get_gitea_login() {
|
|
||||||
get_gitea_login_for_host "$(get_remote_host)"
|
|
||||||
}
|
}
|
||||||
|
|
||||||
get_remote_host() {
|
get_remote_host() {
|
||||||
@@ -292,8 +91,7 @@ get_remote_host() {
|
|||||||
return 1
|
return 1
|
||||||
fi
|
fi
|
||||||
if [[ "$remote_url" =~ ^https?://([^/]+)/ ]]; then
|
if [[ "$remote_url" =~ ^https?://([^/]+)/ ]]; then
|
||||||
local host="${BASH_REMATCH[1]}"
|
echo "${BASH_REMATCH[1]}"
|
||||||
echo "${host##*@}"
|
|
||||||
return 0
|
return 0
|
||||||
fi
|
fi
|
||||||
if [[ "$remote_url" =~ ^git@([^:]+): ]]; then
|
if [[ "$remote_url" =~ ^git@([^:]+): ]]; then
|
||||||
|
|||||||
@@ -75,11 +75,6 @@ switch ($platform) {
|
|||||||
Write-Host "Issue #$Issue updated successfully"
|
Write-Host "Issue #$Issue updated successfully"
|
||||||
}
|
}
|
||||||
"gitea" {
|
"gitea" {
|
||||||
$repoArgs = @(Get-GiteaRepoArgs)
|
|
||||||
if ($repoArgs.Length -eq 0) {
|
|
||||||
Write-Error "Could not resolve Gitea repo/login for remote host"
|
|
||||||
exit 1
|
|
||||||
}
|
|
||||||
$needsEdit = $false
|
$needsEdit = $false
|
||||||
$cmd = @("tea", "issue", "edit", $Issue)
|
$cmd = @("tea", "issue", "edit", $Issue)
|
||||||
|
|
||||||
@@ -92,7 +87,7 @@ switch ($platform) {
|
|||||||
$needsEdit = $true
|
$needsEdit = $true
|
||||||
}
|
}
|
||||||
if ($Milestone) {
|
if ($Milestone) {
|
||||||
$milestoneList = tea milestones list @repoArgs 2>$null
|
$milestoneList = tea milestones list 2>$null
|
||||||
$milestoneId = ($milestoneList | Select-String "^\s*(\d+).*$Milestone" | ForEach-Object { $_.Matches.Groups[1].Value } | Select-Object -First 1)
|
$milestoneId = ($milestoneList | Select-String "^\s*(\d+).*$Milestone" | ForEach-Object { $_.Matches.Groups[1].Value } | Select-Object -First 1)
|
||||||
if ($milestoneId) {
|
if ($milestoneId) {
|
||||||
$cmd += @("--milestone", $milestoneId)
|
$cmd += @("--milestone", $milestoneId)
|
||||||
@@ -103,7 +98,6 @@ switch ($platform) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
if ($needsEdit) {
|
if ($needsEdit) {
|
||||||
$cmd += $repoArgs
|
|
||||||
& $cmd[0] $cmd[1..($cmd.Length-1)]
|
& $cmd[0] $cmd[1..($cmd.Length-1)]
|
||||||
Write-Host "Issue #$Issue updated successfully"
|
Write-Host "Issue #$Issue updated successfully"
|
||||||
} else {
|
} else {
|
||||||
|
|||||||
@@ -98,11 +98,7 @@ case "$PLATFORM" in
|
|||||||
;;
|
;;
|
||||||
gitea)
|
gitea)
|
||||||
# tea issue edit syntax
|
# tea issue edit syntax
|
||||||
REPO_ARGS=$(get_gitea_repo_args) || {
|
CMD="tea issue edit $ISSUE"
|
||||||
echo "Error: Could not resolve Gitea repo/login args for remote host" >&2
|
|
||||||
exit 1
|
|
||||||
}
|
|
||||||
CMD="tea issue edit $ISSUE $REPO_ARGS"
|
|
||||||
NEEDS_EDIT=false
|
NEEDS_EDIT=false
|
||||||
|
|
||||||
if [[ -n "$ASSIGNEE" ]]; then
|
if [[ -n "$ASSIGNEE" ]]; then
|
||||||
@@ -116,7 +112,7 @@ case "$PLATFORM" in
|
|||||||
NEEDS_EDIT=true
|
NEEDS_EDIT=true
|
||||||
fi
|
fi
|
||||||
if [[ -n "$MILESTONE" ]]; then
|
if [[ -n "$MILESTONE" ]]; then
|
||||||
MILESTONE_ID=$(tea milestones list $REPO_ARGS 2>/dev/null | grep -E "^\s*[0-9]+" | grep "$MILESTONE" | awk '{print $1}' | head -1)
|
MILESTONE_ID=$(tea milestones list 2>/dev/null | grep -E "^\s*[0-9]+" | grep "$MILESTONE" | awk '{print $1}' | head -1)
|
||||||
if [[ -n "$MILESTONE_ID" ]]; then
|
if [[ -n "$MILESTONE_ID" ]]; then
|
||||||
CMD="$CMD --milestone $MILESTONE_ID"
|
CMD="$CMD --milestone $MILESTONE_ID"
|
||||||
NEEDS_EDIT=true
|
NEEDS_EDIT=true
|
||||||
|
|||||||
@@ -44,43 +44,10 @@ if [[ -z "$ISSUE_NUMBER" ]]; then
|
|||||||
fi
|
fi
|
||||||
|
|
||||||
# Detect platform and close issue
|
# Detect platform and close issue
|
||||||
detect_platform >/dev/null
|
detect_platform
|
||||||
OWNER=$(get_repo_owner)
|
OWNER=$(get_repo_owner)
|
||||||
REPO=$(get_repo_name)
|
REPO=$(get_repo_name)
|
||||||
|
|
||||||
gitea_issue_comment_api() {
|
|
||||||
local host token url payload
|
|
||||||
host=$(get_remote_host) || return 1
|
|
||||||
token=$(get_gitea_token "$host") || return 1
|
|
||||||
url="https://${host}/api/v1/repos/${OWNER}/${REPO}/issues/${ISSUE_NUMBER}/comments"
|
|
||||||
payload=$(COMMENT="$COMMENT" python3 - <<'PY'
|
|
||||||
import json
|
|
||||||
import os
|
|
||||||
|
|
||||||
print(json.dumps({"body": os.environ["COMMENT"]}))
|
|
||||||
PY
|
|
||||||
)
|
|
||||||
curl -fsS -X POST \
|
|
||||||
-H "User-Agent: curl/8" \
|
|
||||||
-H "Authorization: token ${token}" \
|
|
||||||
-H "Content-Type: application/json" \
|
|
||||||
-d "$payload" \
|
|
||||||
"$url" >/dev/null
|
|
||||||
}
|
|
||||||
|
|
||||||
gitea_issue_close_api() {
|
|
||||||
local host token url
|
|
||||||
host=$(get_remote_host) || return 1
|
|
||||||
token=$(get_gitea_token "$host") || return 1
|
|
||||||
url="https://${host}/api/v1/repos/${OWNER}/${REPO}/issues/${ISSUE_NUMBER}"
|
|
||||||
curl -fsS -X PATCH \
|
|
||||||
-H "User-Agent: curl/8" \
|
|
||||||
-H "Authorization: token ${token}" \
|
|
||||||
-H "Content-Type: application/json" \
|
|
||||||
-d '{"state":"closed"}' \
|
|
||||||
"$url" >/dev/null
|
|
||||||
}
|
|
||||||
|
|
||||||
if [[ "$PLATFORM" == "github" ]]; then
|
if [[ "$PLATFORM" == "github" ]]; then
|
||||||
if [[ -n "$COMMENT" ]]; then
|
if [[ -n "$COMMENT" ]]; then
|
||||||
gh issue comment "$ISSUE_NUMBER" --body "$COMMENT"
|
gh issue comment "$ISSUE_NUMBER" --body "$COMMENT"
|
||||||
@@ -88,19 +55,10 @@ if [[ "$PLATFORM" == "github" ]]; then
|
|||||||
gh issue close "$ISSUE_NUMBER"
|
gh issue close "$ISSUE_NUMBER"
|
||||||
echo "Closed GitHub issue #$ISSUE_NUMBER"
|
echo "Closed GitHub issue #$ISSUE_NUMBER"
|
||||||
elif [[ "$PLATFORM" == "gitea" ]]; then
|
elif [[ "$PLATFORM" == "gitea" ]]; then
|
||||||
GITEA_LOGIN_NAME=$(get_gitea_login || true)
|
if [[ -n "$COMMENT" ]]; then
|
||||||
if [[ -n "$GITEA_LOGIN_NAME" ]]; then
|
tea issue comment "$ISSUE_NUMBER" "$COMMENT" --repo "$OWNER/$REPO" --login "${GITEA_LOGIN:-mosaicstack}"
|
||||||
if [[ -n "$COMMENT" ]]; then
|
|
||||||
tea issue comment "$ISSUE_NUMBER" "$COMMENT" --repo "$OWNER/$REPO" --login "$GITEA_LOGIN_NAME"
|
|
||||||
fi
|
|
||||||
tea issue close "$ISSUE_NUMBER" --repo "$OWNER/$REPO" --login "$GITEA_LOGIN_NAME"
|
|
||||||
else
|
|
||||||
echo "No tea login configured for $(get_remote_host); using authenticated Gitea API fallback." >&2
|
|
||||||
if [[ -n "$COMMENT" ]]; then
|
|
||||||
gitea_issue_comment_api
|
|
||||||
fi
|
|
||||||
gitea_issue_close_api
|
|
||||||
fi
|
fi
|
||||||
|
tea issue close "$ISSUE_NUMBER" --repo "$OWNER/$REPO" --login "${GITEA_LOGIN:-mosaicstack}"
|
||||||
echo "Closed Gitea issue #$ISSUE_NUMBER"
|
echo "Closed Gitea issue #$ISSUE_NUMBER"
|
||||||
else
|
else
|
||||||
echo "Error: Unknown platform"
|
echo "Error: Unknown platform"
|
||||||
|
|||||||
@@ -47,7 +47,7 @@ if [[ -z "$COMMENT" ]]; then
|
|||||||
exit 1
|
exit 1
|
||||||
fi
|
fi
|
||||||
|
|
||||||
detect_platform >/dev/null
|
detect_platform
|
||||||
|
|
||||||
if [[ "$PLATFORM" == "github" ]]; then
|
if [[ "$PLATFORM" == "github" ]]; then
|
||||||
gh issue comment "$ISSUE_NUMBER" --body "$COMMENT"
|
gh issue comment "$ISSUE_NUMBER" --body "$COMMENT"
|
||||||
|
|||||||
@@ -58,17 +58,12 @@ switch ($platform) {
|
|||||||
& $cmd[0] $cmd[1..($cmd.Length-1)]
|
& $cmd[0] $cmd[1..($cmd.Length-1)]
|
||||||
}
|
}
|
||||||
"gitea" {
|
"gitea" {
|
||||||
$repoArgs = @(Get-GiteaRepoArgs)
|
|
||||||
if ($repoArgs.Length -eq 0) {
|
|
||||||
Write-Error "Could not resolve Gitea repo/login for remote host"
|
|
||||||
exit 1
|
|
||||||
}
|
|
||||||
$cmd = @("tea", "issue", "create", "--title", $Title)
|
$cmd = @("tea", "issue", "create", "--title", $Title)
|
||||||
if ($Body) { $cmd += @("--description", $Body) }
|
if ($Body) { $cmd += @("--description", $Body) }
|
||||||
if ($Labels) { $cmd += @("--labels", $Labels) }
|
if ($Labels) { $cmd += @("--labels", $Labels) }
|
||||||
if ($Milestone) {
|
if ($Milestone) {
|
||||||
# Try to get milestone ID by name
|
# Try to get milestone ID by name
|
||||||
$milestoneList = tea milestones list @repoArgs 2>$null
|
$milestoneList = tea milestones list 2>$null
|
||||||
$milestoneId = ($milestoneList | Select-String "^\s*(\d+).*$Milestone" | ForEach-Object { $_.Matches.Groups[1].Value } | Select-Object -First 1)
|
$milestoneId = ($milestoneList | Select-String "^\s*(\d+).*$Milestone" | ForEach-Object { $_.Matches.Groups[1].Value } | Select-Object -First 1)
|
||||||
if ($milestoneId) {
|
if ($milestoneId) {
|
||||||
$cmd += @("--milestone", $milestoneId)
|
$cmd += @("--milestone", $milestoneId)
|
||||||
@@ -76,7 +71,6 @@ switch ($platform) {
|
|||||||
Write-Warning "Could not find milestone '$Milestone', creating without milestone"
|
Write-Warning "Could not find milestone '$Milestone', creating without milestone"
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
$cmd += $repoArgs
|
|
||||||
& $cmd[0] $cmd[1..($cmd.Length-1)]
|
& $cmd[0] $cmd[1..($cmd.Length-1)]
|
||||||
}
|
}
|
||||||
default {
|
default {
|
||||||
|
|||||||
@@ -48,7 +48,6 @@ PY
|
|||||||
|
|
||||||
url="https://${host}/api/v1/repos/${repo}/issues"
|
url="https://${host}/api/v1/repos/${repo}/issues"
|
||||||
curl -fsS -X POST \
|
curl -fsS -X POST \
|
||||||
-H "User-Agent: curl/8" \
|
|
||||||
-H "Authorization: token ${token}" \
|
-H "Authorization: token ${token}" \
|
||||||
-H "Content-Type: application/json" \
|
-H "Content-Type: application/json" \
|
||||||
-d "$payload" \
|
-d "$payload" \
|
||||||
@@ -122,12 +121,7 @@ case "$PLATFORM" in
|
|||||||
gitea)
|
gitea)
|
||||||
if command -v tea >/dev/null 2>&1; then
|
if command -v tea >/dev/null 2>&1; then
|
||||||
REPO_SLUG=$(get_repo_slug)
|
REPO_SLUG=$(get_repo_slug)
|
||||||
GITEA_LOGIN_NAME=$(get_gitea_login) || {
|
REPO_ARGS=(--repo "$REPO_SLUG" --login "${GITEA_LOGIN:-mosaicstack}")
|
||||||
echo "Warning: could not resolve Gitea login for tea; trying Gitea API fallback..." >&2
|
|
||||||
gitea_issue_create_api
|
|
||||||
exit $?
|
|
||||||
}
|
|
||||||
REPO_ARGS=(--repo "$REPO_SLUG" --login "$GITEA_LOGIN_NAME")
|
|
||||||
CMD=(tea issue create "${REPO_ARGS[@]}" --title "$TITLE")
|
CMD=(tea issue create "${REPO_ARGS[@]}" --title "$TITLE")
|
||||||
[[ -n "$BODY" ]] && CMD+=(--description "$BODY")
|
[[ -n "$BODY" ]] && CMD+=(--description "$BODY")
|
||||||
[[ -n "$LABELS" ]] && CMD+=(--labels "$LABELS")
|
[[ -n "$LABELS" ]] && CMD+=(--labels "$LABELS")
|
||||||
|
|||||||
@@ -60,7 +60,7 @@ if [[ -z "$ISSUE_NUMBER" ]]; then
|
|||||||
exit 1
|
exit 1
|
||||||
fi
|
fi
|
||||||
|
|
||||||
detect_platform >/dev/null
|
detect_platform
|
||||||
|
|
||||||
if [[ "$PLATFORM" == "github" ]]; then
|
if [[ "$PLATFORM" == "github" ]]; then
|
||||||
CMD="gh issue edit $ISSUE_NUMBER"
|
CMD="gh issue edit $ISSUE_NUMBER"
|
||||||
@@ -71,11 +71,7 @@ if [[ "$PLATFORM" == "github" ]]; then
|
|||||||
eval $CMD
|
eval $CMD
|
||||||
echo "Updated GitHub issue #$ISSUE_NUMBER"
|
echo "Updated GitHub issue #$ISSUE_NUMBER"
|
||||||
elif [[ "$PLATFORM" == "gitea" ]]; then
|
elif [[ "$PLATFORM" == "gitea" ]]; then
|
||||||
REPO_ARGS=$(get_gitea_repo_args) || {
|
CMD="tea issue edit $ISSUE_NUMBER"
|
||||||
echo "Error: Could not resolve Gitea repo/login args for remote host" >&2
|
|
||||||
exit 1
|
|
||||||
}
|
|
||||||
CMD="tea issue edit $ISSUE_NUMBER $REPO_ARGS"
|
|
||||||
[[ -n "$TITLE" ]] && CMD="$CMD --title \"$TITLE\""
|
[[ -n "$TITLE" ]] && CMD="$CMD --title \"$TITLE\""
|
||||||
[[ -n "$BODY" ]] && CMD="$CMD --description \"$BODY\""
|
[[ -n "$BODY" ]] && CMD="$CMD --description \"$BODY\""
|
||||||
[[ -n "$LABELS" ]] && CMD="$CMD --add-labels \"$LABELS\""
|
[[ -n "$LABELS" ]] && CMD="$CMD --add-labels \"$LABELS\""
|
||||||
|
|||||||
@@ -63,15 +63,9 @@ switch ($platform) {
|
|||||||
& $cmd[0] $cmd[1..($cmd.Length-1)]
|
& $cmd[0] $cmd[1..($cmd.Length-1)]
|
||||||
}
|
}
|
||||||
"gitea" {
|
"gitea" {
|
||||||
$repoArgs = @(Get-GiteaRepoArgs)
|
|
||||||
if ($repoArgs.Length -eq 0) {
|
|
||||||
Write-Error "Could not resolve Gitea repo/login for remote host"
|
|
||||||
exit 1
|
|
||||||
}
|
|
||||||
$cmd = @("tea", "issues", "list", "--state", $State, "--limit", $Limit)
|
$cmd = @("tea", "issues", "list", "--state", $State, "--limit", $Limit)
|
||||||
if ($Label) { $cmd += @("--labels", $Label) }
|
if ($Label) { $cmd += @("--labels", $Label) }
|
||||||
if ($Milestone) { $cmd += @("--milestones", $Milestone) }
|
if ($Milestone) { $cmd += @("--milestones", $Milestone) }
|
||||||
$cmd += $repoArgs
|
|
||||||
& $cmd[0] $cmd[1..($cmd.Length-1)]
|
& $cmd[0] $cmd[1..($cmd.Length-1)]
|
||||||
if ($Assignee) {
|
if ($Assignee) {
|
||||||
Write-Warning "Assignee filtering may require manual review for Gitea"
|
Write-Warning "Assignee filtering may require manual review for Gitea"
|
||||||
|
|||||||
@@ -98,18 +98,7 @@ case "$PLATFORM" in
|
|||||||
"${CMD[@]}"
|
"${CMD[@]}"
|
||||||
;;
|
;;
|
||||||
gitea)
|
gitea)
|
||||||
if [[ -n "$REPO_OVERRIDE" ]]; then
|
CMD=(tea issues list --repo "$REPO_INFO" --login "${GITEA_LOGIN:-mosaicstack}" --state "$STATE" --limit "$LIMIT")
|
||||||
GITEA_LOGIN_NAME=$(get_gitea_login_for_repo_override) || {
|
|
||||||
echo "Error: Could not resolve Gitea login for --repo override. Set GITEA_LOGIN or configure a default tea login." >&2
|
|
||||||
exit 1
|
|
||||||
}
|
|
||||||
else
|
|
||||||
GITEA_LOGIN_NAME=$(get_gitea_login) || {
|
|
||||||
echo "Error: Could not resolve Gitea login for remote host" >&2
|
|
||||||
exit 1
|
|
||||||
}
|
|
||||||
fi
|
|
||||||
CMD=(tea issues list --repo "$REPO_INFO" --login "$GITEA_LOGIN_NAME" --state "$STATE" --limit "$LIMIT")
|
|
||||||
[[ -n "$LABEL" ]] && CMD+=(--labels "$LABEL")
|
[[ -n "$LABEL" ]] && CMD+=(--labels "$LABEL")
|
||||||
[[ -n "$MILESTONE" ]] && CMD+=(--milestones "$MILESTONE")
|
[[ -n "$MILESTONE" ]] && CMD+=(--milestones "$MILESTONE")
|
||||||
# Note: tea may not support assignee filter directly in all versions.
|
# Note: tea may not support assignee filter directly in all versions.
|
||||||
|
|||||||
@@ -42,42 +42,7 @@ if [[ -z "$ISSUE_NUMBER" ]]; then
|
|||||||
exit 1
|
exit 1
|
||||||
fi
|
fi
|
||||||
|
|
||||||
detect_platform >/dev/null
|
detect_platform
|
||||||
OWNER=$(get_repo_owner)
|
|
||||||
REPO=$(get_repo_name)
|
|
||||||
|
|
||||||
gitea_issue_comment_api() {
|
|
||||||
local host token url payload
|
|
||||||
host=$(get_remote_host) || return 1
|
|
||||||
token=$(get_gitea_token "$host") || return 1
|
|
||||||
url="https://${host}/api/v1/repos/${OWNER}/${REPO}/issues/${ISSUE_NUMBER}/comments"
|
|
||||||
payload=$(COMMENT="$COMMENT" python3 - <<'PY'
|
|
||||||
import json
|
|
||||||
import os
|
|
||||||
|
|
||||||
print(json.dumps({"body": os.environ["COMMENT"]}))
|
|
||||||
PY
|
|
||||||
)
|
|
||||||
curl -fsS -X POST \
|
|
||||||
-H "User-Agent: curl/8" \
|
|
||||||
-H "Authorization: token ${token}" \
|
|
||||||
-H "Content-Type: application/json" \
|
|
||||||
-d "$payload" \
|
|
||||||
"$url" >/dev/null
|
|
||||||
}
|
|
||||||
|
|
||||||
gitea_issue_reopen_api() {
|
|
||||||
local host token url
|
|
||||||
host=$(get_remote_host) || return 1
|
|
||||||
token=$(get_gitea_token "$host") || return 1
|
|
||||||
url="https://${host}/api/v1/repos/${OWNER}/${REPO}/issues/${ISSUE_NUMBER}"
|
|
||||||
curl -fsS -X PATCH \
|
|
||||||
-H "User-Agent: curl/8" \
|
|
||||||
-H "Authorization: token ${token}" \
|
|
||||||
-H "Content-Type: application/json" \
|
|
||||||
-d '{"state":"open"}' \
|
|
||||||
"$url" >/dev/null
|
|
||||||
}
|
|
||||||
|
|
||||||
if [[ "$PLATFORM" == "github" ]]; then
|
if [[ "$PLATFORM" == "github" ]]; then
|
||||||
if [[ -n "$COMMENT" ]]; then
|
if [[ -n "$COMMENT" ]]; then
|
||||||
@@ -86,19 +51,10 @@ if [[ "$PLATFORM" == "github" ]]; then
|
|||||||
gh issue reopen "$ISSUE_NUMBER"
|
gh issue reopen "$ISSUE_NUMBER"
|
||||||
echo "Reopened GitHub issue #$ISSUE_NUMBER"
|
echo "Reopened GitHub issue #$ISSUE_NUMBER"
|
||||||
elif [[ "$PLATFORM" == "gitea" ]]; then
|
elif [[ "$PLATFORM" == "gitea" ]]; then
|
||||||
REPO_ARGS=$(get_gitea_repo_args || true)
|
if [[ -n "$COMMENT" ]]; then
|
||||||
if [[ -n "$REPO_ARGS" ]]; then
|
tea issue comment "$ISSUE_NUMBER" "$COMMENT" $(get_gitea_repo_args)
|
||||||
if [[ -n "$COMMENT" ]]; then
|
|
||||||
tea issue comment "$ISSUE_NUMBER" "$COMMENT" $REPO_ARGS
|
|
||||||
fi
|
|
||||||
tea issue reopen "$ISSUE_NUMBER" $REPO_ARGS
|
|
||||||
else
|
|
||||||
echo "No tea login configured for $(get_remote_host); using authenticated Gitea API fallback." >&2
|
|
||||||
if [[ -n "$COMMENT" ]]; then
|
|
||||||
gitea_issue_comment_api
|
|
||||||
fi
|
|
||||||
gitea_issue_reopen_api
|
|
||||||
fi
|
fi
|
||||||
|
tea issue reopen "$ISSUE_NUMBER" $(get_gitea_repo_args)
|
||||||
echo "Reopened Gitea issue #$ISSUE_NUMBER"
|
echo "Reopened Gitea issue #$ISSUE_NUMBER"
|
||||||
else
|
else
|
||||||
echo "Error: Unknown platform"
|
echo "Error: Unknown platform"
|
||||||
|
|||||||
@@ -29,9 +29,9 @@ gitea_issue_view_api() {
|
|||||||
|
|
||||||
url="https://${host}/api/v1/repos/${repo}/issues/${ISSUE_NUMBER}"
|
url="https://${host}/api/v1/repos/${repo}/issues/${ISSUE_NUMBER}"
|
||||||
if command -v python3 >/dev/null 2>&1; then
|
if command -v python3 >/dev/null 2>&1; then
|
||||||
curl -fsS -H "User-Agent: curl/8" -H "Authorization: token ${token}" "$url" | python3 -m json.tool
|
curl -fsS -H "Authorization: token ${token}" "$url" | python3 -m json.tool
|
||||||
else
|
else
|
||||||
curl -fsS -H "User-Agent: curl/8" -H "Authorization: token ${token}" "$url"
|
curl -fsS -H "Authorization: token ${token}" "$url"
|
||||||
fi
|
fi
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -61,7 +61,7 @@ if [[ -z "$ISSUE_NUMBER" ]]; then
|
|||||||
exit 1
|
exit 1
|
||||||
fi
|
fi
|
||||||
|
|
||||||
detect_platform >/dev/null
|
detect_platform
|
||||||
|
|
||||||
if [[ "$PLATFORM" == "github" ]]; then
|
if [[ "$PLATFORM" == "github" ]]; then
|
||||||
gh issue view "$ISSUE_NUMBER"
|
gh issue view "$ISSUE_NUMBER"
|
||||||
|
|||||||
@@ -36,17 +36,13 @@ if [[ -z "$TITLE" ]]; then
|
|||||||
exit 1
|
exit 1
|
||||||
fi
|
fi
|
||||||
|
|
||||||
detect_platform >/dev/null
|
detect_platform
|
||||||
|
|
||||||
if [[ "$PLATFORM" == "github" ]]; then
|
if [[ "$PLATFORM" == "github" ]]; then
|
||||||
gh api -X PATCH "/repos/{owner}/{repo}/milestones/$(gh api "/repos/{owner}/{repo}/milestones" --jq ".[] | select(.title==\"$TITLE\") | .number")" -f state=closed
|
gh api -X PATCH "/repos/{owner}/{repo}/milestones/$(gh api "/repos/{owner}/{repo}/milestones" --jq ".[] | select(.title==\"$TITLE\") | .number")" -f state=closed
|
||||||
echo "Closed GitHub milestone: $TITLE"
|
echo "Closed GitHub milestone: $TITLE"
|
||||||
elif [[ "$PLATFORM" == "gitea" ]]; then
|
elif [[ "$PLATFORM" == "gitea" ]]; then
|
||||||
REPO_ARGS=$(get_gitea_repo_args) || {
|
tea milestone close "$TITLE"
|
||||||
echo "Error: Could not resolve Gitea repo/login for remote host" >&2
|
|
||||||
exit 1
|
|
||||||
}
|
|
||||||
tea milestone close "$TITLE" $REPO_ARGS
|
|
||||||
echo "Closed Gitea milestone: $TITLE"
|
echo "Closed Gitea milestone: $TITLE"
|
||||||
else
|
else
|
||||||
echo "Error: Unknown platform"
|
echo "Error: Unknown platform"
|
||||||
|
|||||||
@@ -59,12 +59,7 @@ if ($List) {
|
|||||||
gh api repos/:owner/:repo/milestones --jq '.[] | "\(.number)`t\(.title)`t\(.state)`t\(.open_issues)/\(.closed_issues) issues"'
|
gh api repos/:owner/:repo/milestones --jq '.[] | "\(.number)`t\(.title)`t\(.state)`t\(.open_issues)/\(.closed_issues) issues"'
|
||||||
}
|
}
|
||||||
"gitea" {
|
"gitea" {
|
||||||
$repoArgs = @(Get-GiteaRepoArgs)
|
tea milestones list
|
||||||
if ($repoArgs.Length -eq 0) {
|
|
||||||
Write-Error "Could not resolve Gitea repo/login for remote host"
|
|
||||||
exit 1
|
|
||||||
}
|
|
||||||
tea milestones list @repoArgs
|
|
||||||
}
|
}
|
||||||
default {
|
default {
|
||||||
Write-Error "Could not detect git platform"
|
Write-Error "Could not detect git platform"
|
||||||
@@ -90,15 +85,9 @@ switch ($platform) {
|
|||||||
Write-Host "Milestone '$Title' created successfully"
|
Write-Host "Milestone '$Title' created successfully"
|
||||||
}
|
}
|
||||||
"gitea" {
|
"gitea" {
|
||||||
$repoArgs = @(Get-GiteaRepoArgs)
|
|
||||||
if ($repoArgs.Length -eq 0) {
|
|
||||||
Write-Error "Could not resolve Gitea repo/login for remote host"
|
|
||||||
exit 1
|
|
||||||
}
|
|
||||||
$cmd = @("tea", "milestones", "create", "--title", $Title)
|
$cmd = @("tea", "milestones", "create", "--title", $Title)
|
||||||
if ($Description) { $cmd += @("--description", $Description) }
|
if ($Description) { $cmd += @("--description", $Description) }
|
||||||
if ($Due) { $cmd += @("--deadline", $Due) }
|
if ($Due) { $cmd += @("--deadline", $Due) }
|
||||||
$cmd += $repoArgs
|
|
||||||
& $cmd[0] $cmd[1..($cmd.Length-1)]
|
& $cmd[0] $cmd[1..($cmd.Length-1)]
|
||||||
Write-Host "Milestone '$Title' created successfully"
|
Write-Host "Milestone '$Title' created successfully"
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -77,11 +77,7 @@ if [[ "$LIST_ONLY" == true ]]; then
|
|||||||
gh api repos/:owner/:repo/milestones --jq '.[] | "\(.number)\t\(.title)\t\(.state)\t\(.open_issues)/\(.closed_issues) issues"'
|
gh api repos/:owner/:repo/milestones --jq '.[] | "\(.number)\t\(.title)\t\(.state)\t\(.open_issues)/\(.closed_issues) issues"'
|
||||||
;;
|
;;
|
||||||
gitea)
|
gitea)
|
||||||
REPO_ARGS=$(get_gitea_repo_args) || {
|
tea milestones list
|
||||||
echo "Error: Could not resolve Gitea repo/login for remote host" >&2
|
|
||||||
exit 1
|
|
||||||
}
|
|
||||||
tea milestones list $REPO_ARGS
|
|
||||||
;;
|
;;
|
||||||
*)
|
*)
|
||||||
echo "Error: Could not detect git platform" >&2
|
echo "Error: Could not detect git platform" >&2
|
||||||
@@ -108,14 +104,10 @@ case "$PLATFORM" in
|
|||||||
echo "Milestone '$TITLE' created successfully"
|
echo "Milestone '$TITLE' created successfully"
|
||||||
;;
|
;;
|
||||||
gitea)
|
gitea)
|
||||||
REPO_ARGS=$(get_gitea_repo_args) || {
|
CMD="tea milestones create --title \"$TITLE\""
|
||||||
echo "Error: Could not resolve Gitea repo/login for remote host" >&2
|
[[ -n "$DESCRIPTION" ]] && CMD="$CMD --description \"$DESCRIPTION\""
|
||||||
exit 1
|
[[ -n "$DUE_DATE" ]] && CMD="$CMD --deadline \"$DUE_DATE\""
|
||||||
}
|
eval "$CMD"
|
||||||
CMD=(tea milestones create --title "$TITLE")
|
|
||||||
[[ -n "$DESCRIPTION" ]] && CMD+=(--description "$DESCRIPTION")
|
|
||||||
[[ -n "$DUE_DATE" ]] && CMD+=(--deadline "$DUE_DATE")
|
|
||||||
"${CMD[@]}" $REPO_ARGS
|
|
||||||
echo "Milestone '$TITLE' created successfully"
|
echo "Milestone '$TITLE' created successfully"
|
||||||
;;
|
;;
|
||||||
*)
|
*)
|
||||||
|
|||||||
@@ -31,16 +31,12 @@ while [[ $# -gt 0 ]]; do
|
|||||||
esac
|
esac
|
||||||
done
|
done
|
||||||
|
|
||||||
detect_platform >/dev/null
|
detect_platform
|
||||||
|
|
||||||
if [[ "$PLATFORM" == "github" ]]; then
|
if [[ "$PLATFORM" == "github" ]]; then
|
||||||
gh api "/repos/{owner}/{repo}/milestones?state=$STATE" --jq '.[] | "\(.title) (\(.state)) - \(.open_issues) open, \(.closed_issues) closed"'
|
gh api "/repos/{owner}/{repo}/milestones?state=$STATE" --jq '.[] | "\(.title) (\(.state)) - \(.open_issues) open, \(.closed_issues) closed"'
|
||||||
elif [[ "$PLATFORM" == "gitea" ]]; then
|
elif [[ "$PLATFORM" == "gitea" ]]; then
|
||||||
REPO_ARGS=$(get_gitea_repo_args) || {
|
tea milestone list
|
||||||
echo "Error: Could not resolve Gitea repo/login for remote host" >&2
|
|
||||||
exit 1
|
|
||||||
}
|
|
||||||
tea milestone list $REPO_ARGS
|
|
||||||
else
|
else
|
||||||
echo "Error: Unknown platform"
|
echo "Error: Unknown platform"
|
||||||
exit 1
|
exit 1
|
||||||
|
|||||||
@@ -11,7 +11,6 @@ PR_NUMBER=""
|
|||||||
TIMEOUT_SEC=1800
|
TIMEOUT_SEC=1800
|
||||||
INTERVAL_SEC=15
|
INTERVAL_SEC=15
|
||||||
REPO_OVERRIDE=""
|
REPO_OVERRIDE=""
|
||||||
HOST_OVERRIDE=""
|
|
||||||
|
|
||||||
usage() {
|
usage() {
|
||||||
cat <<EOF
|
cat <<EOF
|
||||||
@@ -20,7 +19,6 @@ Usage: $(basename "$0") -n <pr_number> [-t timeout_sec] [-i interval_sec]
|
|||||||
Options:
|
Options:
|
||||||
-n, --number NUMBER PR number (required)
|
-n, --number NUMBER PR number (required)
|
||||||
-r, --repo OWNER/REPO Repository slug (default: infer from git origin)
|
-r, --repo OWNER/REPO Repository slug (default: infer from git origin)
|
||||||
--host HOST Gitea host for --repo API calls (or set GITEA_HOST/GITEA_URL)
|
|
||||||
-t, --timeout SECONDS Max wait time in seconds (default: 1800)
|
-t, --timeout SECONDS Max wait time in seconds (default: 1800)
|
||||||
-i, --interval SECONDS Poll interval in seconds (default: 15)
|
-i, --interval SECONDS Poll interval in seconds (default: 15)
|
||||||
-h, --help Show this help
|
-h, --help Show this help
|
||||||
@@ -126,7 +124,7 @@ gitea_get_pr_head_sha() {
|
|||||||
local repo="$2"
|
local repo="$2"
|
||||||
local token="$3"
|
local token="$3"
|
||||||
local url="https://${host}/api/v1/repos/${repo}/pulls/${PR_NUMBER}"
|
local url="https://${host}/api/v1/repos/${repo}/pulls/${PR_NUMBER}"
|
||||||
curl -fsSL -H "User-Agent: curl/8" -H "Authorization: token ${token}" "$url" | python3 -c '
|
curl -fsSL -H "Authorization: token ${token}" "$url" | python3 -c '
|
||||||
import json, sys
|
import json, sys
|
||||||
data = json.load(sys.stdin)
|
data = json.load(sys.stdin)
|
||||||
print((data.get("head") or {}).get("sha", ""))
|
print((data.get("head") or {}).get("sha", ""))
|
||||||
@@ -139,7 +137,7 @@ gitea_get_commit_status_json() {
|
|||||||
local token="$3"
|
local token="$3"
|
||||||
local sha="$4"
|
local sha="$4"
|
||||||
local url="https://${host}/api/v1/repos/${repo}/commits/${sha}/status"
|
local url="https://${host}/api/v1/repos/${repo}/commits/${sha}/status"
|
||||||
curl -fsSL -H "User-Agent: curl/8" -H "Authorization: token ${token}" "$url"
|
curl -fsSL -H "Authorization: token ${token}" "$url"
|
||||||
}
|
}
|
||||||
|
|
||||||
while [[ $# -gt 0 ]]; do
|
while [[ $# -gt 0 ]]; do
|
||||||
@@ -152,10 +150,6 @@ while [[ $# -gt 0 ]]; do
|
|||||||
REPO_OVERRIDE="$2"
|
REPO_OVERRIDE="$2"
|
||||||
shift 2
|
shift 2
|
||||||
;;
|
;;
|
||||||
--host)
|
|
||||||
HOST_OVERRIDE="$2"
|
|
||||||
shift 2
|
|
||||||
;;
|
|
||||||
-t|--timeout)
|
-t|--timeout)
|
||||||
TIMEOUT_SEC="$2"
|
TIMEOUT_SEC="$2"
|
||||||
shift 2
|
shift 2
|
||||||
@@ -217,19 +211,7 @@ if [[ "$PLATFORM" == "github" ]]; then
|
|||||||
fi
|
fi
|
||||||
echo "[pr-ci-wait] Platform=github PR=#${PR_NUMBER} head_sha=${HEAD_SHA}"
|
echo "[pr-ci-wait] Platform=github PR=#${PR_NUMBER} head_sha=${HEAD_SHA}"
|
||||||
elif [[ "$PLATFORM" == "gitea" ]]; then
|
elif [[ "$PLATFORM" == "gitea" ]]; then
|
||||||
if [[ -n "$HOST_OVERRIDE" ]]; then
|
HOST=$(get_remote_host 2>/dev/null || echo "git.mosaicstack.dev")
|
||||||
HOST="$HOST_OVERRIDE"
|
|
||||||
elif [[ -n "$REPO_OVERRIDE" ]]; then
|
|
||||||
HOST=$(get_gitea_api_host_for_repo_override) || {
|
|
||||||
echo "Error: Gitea host is required with --repo. Pass --host or set GITEA_HOST/GITEA_URL." >&2
|
|
||||||
exit 1
|
|
||||||
}
|
|
||||||
else
|
|
||||||
HOST=$(get_remote_host) || {
|
|
||||||
echo "Error: Could not determine Gitea host from git origin." >&2
|
|
||||||
exit 1
|
|
||||||
}
|
|
||||||
fi
|
|
||||||
TOKEN=$(get_gitea_token "$HOST") || {
|
TOKEN=$(get_gitea_token "$HOST") || {
|
||||||
echo "Error: Gitea token not found. Set GITEA_TOKEN or configure ~/.git-credentials." >&2
|
echo "Error: Gitea token not found. Set GITEA_TOKEN or configure ~/.git-credentials." >&2
|
||||||
exit 1
|
exit 1
|
||||||
|
|||||||
@@ -42,7 +42,7 @@ if [[ -z "$PR_NUMBER" ]]; then
|
|||||||
exit 1
|
exit 1
|
||||||
fi
|
fi
|
||||||
|
|
||||||
detect_platform >/dev/null
|
detect_platform
|
||||||
|
|
||||||
if [[ "$PLATFORM" == "github" ]]; then
|
if [[ "$PLATFORM" == "github" ]]; then
|
||||||
if [[ -n "$COMMENT" ]]; then
|
if [[ -n "$COMMENT" ]]; then
|
||||||
|
|||||||
@@ -9,6 +9,7 @@ param(
|
|||||||
[Alias("b")]
|
[Alias("b")]
|
||||||
[string]$Body,
|
[string]$Body,
|
||||||
|
|
||||||
|
[Alias("B")]
|
||||||
[string]$Base,
|
[string]$Base,
|
||||||
|
|
||||||
[Alias("H")]
|
[Alias("H")]
|
||||||
@@ -100,11 +101,6 @@ switch ($platform) {
|
|||||||
& $cmd[0] $cmd[1..($cmd.Length-1)]
|
& $cmd[0] $cmd[1..($cmd.Length-1)]
|
||||||
}
|
}
|
||||||
"gitea" {
|
"gitea" {
|
||||||
$repoArgs = @(Get-GiteaRepoArgs)
|
|
||||||
if ($repoArgs.Length -eq 0) {
|
|
||||||
Write-Error "Could not resolve Gitea repo/login for remote host"
|
|
||||||
exit 1
|
|
||||||
}
|
|
||||||
$cmd = @("tea", "pr", "create", "--title", $Title)
|
$cmd = @("tea", "pr", "create", "--title", $Title)
|
||||||
if ($Body) { $cmd += @("--description", $Body) }
|
if ($Body) { $cmd += @("--description", $Body) }
|
||||||
if ($Base) { $cmd += @("--base", $Base) }
|
if ($Base) { $cmd += @("--base", $Base) }
|
||||||
@@ -112,7 +108,7 @@ switch ($platform) {
|
|||||||
if ($Labels) { $cmd += @("--labels", $Labels) }
|
if ($Labels) { $cmd += @("--labels", $Labels) }
|
||||||
|
|
||||||
if ($Milestone) {
|
if ($Milestone) {
|
||||||
$milestoneList = tea milestones list @repoArgs 2>$null
|
$milestoneList = tea milestones list 2>$null
|
||||||
$milestoneId = ($milestoneList | Select-String "^\s*(\d+).*$Milestone" | ForEach-Object { $_.Matches.Groups[1].Value } | Select-Object -First 1)
|
$milestoneId = ($milestoneList | Select-String "^\s*(\d+).*$Milestone" | ForEach-Object { $_.Matches.Groups[1].Value } | Select-Object -First 1)
|
||||||
if ($milestoneId) {
|
if ($milestoneId) {
|
||||||
$cmd += @("--milestone", $milestoneId)
|
$cmd += @("--milestone", $milestoneId)
|
||||||
@@ -125,7 +121,6 @@ switch ($platform) {
|
|||||||
Write-Warning "Draft PR may not be supported by your tea version"
|
Write-Warning "Draft PR may not be supported by your tea version"
|
||||||
}
|
}
|
||||||
|
|
||||||
$cmd += $repoArgs
|
|
||||||
& $cmd[0] $cmd[1..($cmd.Length-1)]
|
& $cmd[0] $cmd[1..($cmd.Length-1)]
|
||||||
}
|
}
|
||||||
default {
|
default {
|
||||||
|
|||||||
@@ -56,7 +56,6 @@ PY
|
|||||||
|
|
||||||
url="https://${host}/api/v1/repos/${repo}/pulls"
|
url="https://${host}/api/v1/repos/${repo}/pulls"
|
||||||
curl -fsS -X POST \
|
curl -fsS -X POST \
|
||||||
-H "User-Agent: curl/8" \
|
|
||||||
-H "Authorization: token ${token}" \
|
-H "Authorization: token ${token}" \
|
||||||
-H "Content-Type: application/json" \
|
-H "Content-Type: application/json" \
|
||||||
-d "$payload" \
|
-d "$payload" \
|
||||||
@@ -178,12 +177,7 @@ case "$PLATFORM" in
|
|||||||
# is unreliable in Mosaic worktrees/profile shells. Use arrays instead
|
# is unreliable in Mosaic worktrees/profile shells. Use arrays instead
|
||||||
# of eval so markdown backticks/body content are not shell-executed.
|
# of eval so markdown backticks/body content are not shell-executed.
|
||||||
REPO_SLUG=$(get_repo_slug)
|
REPO_SLUG=$(get_repo_slug)
|
||||||
GITEA_LOGIN_NAME=$(get_gitea_login) || {
|
REPO_ARGS=(--repo "$REPO_SLUG" --login "${GITEA_LOGIN:-mosaicstack}")
|
||||||
echo "Warning: could not resolve Gitea login for tea; trying Gitea API fallback..." >&2
|
|
||||||
gitea_pr_create_api
|
|
||||||
exit $?
|
|
||||||
}
|
|
||||||
REPO_ARGS=(--repo "$REPO_SLUG" --login "$GITEA_LOGIN_NAME")
|
|
||||||
CMD=(tea pr create "${REPO_ARGS[@]}" --title "$TITLE")
|
CMD=(tea pr create "${REPO_ARGS[@]}" --title "$TITLE")
|
||||||
[[ -n "$BODY" ]] && CMD+=(--description "$BODY")
|
[[ -n "$BODY" ]] && CMD+=(--description "$BODY")
|
||||||
[[ -n "$BASE_BRANCH" ]] && CMD+=(--base "$BASE_BRANCH")
|
[[ -n "$BASE_BRANCH" ]] && CMD+=(--base "$BASE_BRANCH")
|
||||||
|
|||||||
@@ -11,7 +11,6 @@ source "$SCRIPT_DIR/detect-platform.sh"
|
|||||||
PR_NUMBER=""
|
PR_NUMBER=""
|
||||||
OUTPUT_FILE=""
|
OUTPUT_FILE=""
|
||||||
REPO_OVERRIDE=""
|
REPO_OVERRIDE=""
|
||||||
HOST_OVERRIDE=""
|
|
||||||
|
|
||||||
while [[ $# -gt 0 ]]; do
|
while [[ $# -gt 0 ]]; do
|
||||||
case $1 in
|
case $1 in
|
||||||
@@ -27,17 +26,12 @@ while [[ $# -gt 0 ]]; do
|
|||||||
REPO_OVERRIDE="$2"
|
REPO_OVERRIDE="$2"
|
||||||
shift 2
|
shift 2
|
||||||
;;
|
;;
|
||||||
--host)
|
|
||||||
HOST_OVERRIDE="$2"
|
|
||||||
shift 2
|
|
||||||
;;
|
|
||||||
-h|--help)
|
-h|--help)
|
||||||
echo "Usage: pr-diff.sh -n <pr_number> [-r owner/repo] [--host host] [-o <output_file>]"
|
echo "Usage: pr-diff.sh -n <pr_number> [-r owner/repo] [-o <output_file>]"
|
||||||
echo ""
|
echo ""
|
||||||
echo "Options:"
|
echo "Options:"
|
||||||
echo " -n, --number PR number (required)"
|
echo " -n, --number PR number (required)"
|
||||||
echo " -r, --repo Repository slug (default: infer from git origin)"
|
echo " -r, --repo Repository slug (default: infer from git origin)"
|
||||||
echo " --host Gitea host for --repo API calls (or set GITEA_HOST/GITEA_URL)"
|
|
||||||
echo " -o, --output Output file (optional, prints to stdout if omitted)"
|
echo " -o, --output Output file (optional, prints to stdout if omitted)"
|
||||||
echo " -h, --help Show this help"
|
echo " -h, --help Show this help"
|
||||||
exit 0
|
exit 0
|
||||||
@@ -75,28 +69,16 @@ if [[ "$PLATFORM" == "github" ]]; then
|
|||||||
fi
|
fi
|
||||||
elif [[ "$PLATFORM" == "gitea" ]]; then
|
elif [[ "$PLATFORM" == "gitea" ]]; then
|
||||||
# tea doesn't have a direct diff command — use the API
|
# tea doesn't have a direct diff command — use the API
|
||||||
if [[ -n "$HOST_OVERRIDE" ]]; then
|
HOST=$(get_remote_host 2>/dev/null || echo "git.mosaicstack.dev")
|
||||||
HOST="$HOST_OVERRIDE"
|
|
||||||
elif [[ -n "$REPO_OVERRIDE" ]]; then
|
|
||||||
HOST=$(get_gitea_api_host_for_repo_override) || {
|
|
||||||
echo "Error: Gitea host is required with --repo. Pass --host or set GITEA_HOST/GITEA_URL." >&2
|
|
||||||
exit 1
|
|
||||||
}
|
|
||||||
else
|
|
||||||
HOST=$(get_remote_host) || {
|
|
||||||
echo "Error: Could not determine Gitea host from git origin." >&2
|
|
||||||
exit 1
|
|
||||||
}
|
|
||||||
fi
|
|
||||||
|
|
||||||
DIFF_URL="https://${HOST}/api/v1/repos/${REPO_INFO}/pulls/${PR_NUMBER}.diff"
|
DIFF_URL="https://${HOST}/api/v1/repos/${REPO_INFO}/pulls/${PR_NUMBER}.diff"
|
||||||
|
|
||||||
GITEA_API_TOKEN=$(get_gitea_token "$HOST" || true)
|
GITEA_API_TOKEN=$(get_gitea_token "$HOST" || true)
|
||||||
|
|
||||||
if [[ -n "$GITEA_API_TOKEN" ]]; then
|
if [[ -n "$GITEA_API_TOKEN" ]]; then
|
||||||
DIFF_CONTENT=$(curl -sS -H "User-Agent: curl/8" -H "Authorization: token $GITEA_API_TOKEN" "$DIFF_URL")
|
DIFF_CONTENT=$(curl -sS -H "Authorization: token $GITEA_API_TOKEN" "$DIFF_URL")
|
||||||
else
|
else
|
||||||
DIFF_CONTENT=$(curl -sS -H "User-Agent: curl/8" "$DIFF_URL")
|
DIFF_CONTENT=$(curl -sS "$DIFF_URL")
|
||||||
fi
|
fi
|
||||||
|
|
||||||
if [[ -n "$OUTPUT_FILE" ]]; then
|
if [[ -n "$OUTPUT_FILE" ]]; then
|
||||||
|
|||||||
@@ -58,11 +58,6 @@ switch ($platform) {
|
|||||||
& $cmd[0] $cmd[1..($cmd.Length-1)]
|
& $cmd[0] $cmd[1..($cmd.Length-1)]
|
||||||
}
|
}
|
||||||
"gitea" {
|
"gitea" {
|
||||||
$repoArgs = @(Get-GiteaRepoArgs)
|
|
||||||
if ($repoArgs.Length -eq 0) {
|
|
||||||
Write-Error "Could not resolve Gitea repo/login for remote host"
|
|
||||||
exit 1
|
|
||||||
}
|
|
||||||
$cmd = @("tea", "pr", "list", "--state", $State, "--limit", $Limit)
|
$cmd = @("tea", "pr", "list", "--state", $State, "--limit", $Limit)
|
||||||
|
|
||||||
if ($Label) {
|
if ($Label) {
|
||||||
@@ -72,7 +67,6 @@ switch ($platform) {
|
|||||||
Write-Warning "Author filtering may require manual review for Gitea"
|
Write-Warning "Author filtering may require manual review for Gitea"
|
||||||
}
|
}
|
||||||
|
|
||||||
$cmd += $repoArgs
|
|
||||||
& $cmd[0] $cmd[1..($cmd.Length-1)]
|
& $cmd[0] $cmd[1..($cmd.Length-1)]
|
||||||
}
|
}
|
||||||
default {
|
default {
|
||||||
|
|||||||
@@ -93,18 +93,7 @@ case "$PLATFORM" in
|
|||||||
"${CMD[@]}"
|
"${CMD[@]}"
|
||||||
;;
|
;;
|
||||||
gitea)
|
gitea)
|
||||||
if [[ -n "$REPO_OVERRIDE" ]]; then
|
CMD=(tea pr list --repo "$REPO_INFO" --login "${GITEA_LOGIN:-mosaicstack}" --state "$STATE" --limit "$LIMIT")
|
||||||
GITEA_LOGIN_NAME=$(get_gitea_login_for_repo_override) || {
|
|
||||||
echo "Error: Could not resolve Gitea login for --repo override. Set GITEA_LOGIN or configure a default tea login." >&2
|
|
||||||
exit 1
|
|
||||||
}
|
|
||||||
else
|
|
||||||
GITEA_LOGIN_NAME=$(get_gitea_login) || {
|
|
||||||
echo "Error: Could not resolve Gitea login for remote host" >&2
|
|
||||||
exit 1
|
|
||||||
}
|
|
||||||
fi
|
|
||||||
CMD=(tea pr list --repo "$REPO_INFO" --login "$GITEA_LOGIN_NAME" --state "$STATE" --limit "$LIMIT")
|
|
||||||
|
|
||||||
# tea filtering may be limited
|
# tea filtering may be limited
|
||||||
if [[ -n "$LABEL" ]]; then
|
if [[ -n "$LABEL" ]]; then
|
||||||
|
|||||||
@@ -74,11 +74,6 @@ switch ($platform) {
|
|||||||
& $cmd[0] $cmd[1..($cmd.Length-1)]
|
& $cmd[0] $cmd[1..($cmd.Length-1)]
|
||||||
}
|
}
|
||||||
"gitea" {
|
"gitea" {
|
||||||
$repoArgs = @(Get-GiteaRepoArgs)
|
|
||||||
if ($repoArgs.Length -eq 0) {
|
|
||||||
Write-Error "Could not resolve Gitea repo/login for remote host"
|
|
||||||
exit 1
|
|
||||||
}
|
|
||||||
if (-not $SkipQueueGuard) {
|
if (-not $SkipQueueGuard) {
|
||||||
$timeout = if ($env:MOSAIC_CI_QUEUE_TIMEOUT_SEC) { [int]$env:MOSAIC_CI_QUEUE_TIMEOUT_SEC } else { 900 }
|
$timeout = if ($env:MOSAIC_CI_QUEUE_TIMEOUT_SEC) { [int]$env:MOSAIC_CI_QUEUE_TIMEOUT_SEC } else { 900 }
|
||||||
$interval = if ($env:MOSAIC_CI_QUEUE_POLL_SEC) { [int]$env:MOSAIC_CI_QUEUE_POLL_SEC } else { 15 }
|
$interval = if ($env:MOSAIC_CI_QUEUE_POLL_SEC) { [int]$env:MOSAIC_CI_QUEUE_POLL_SEC } else { 15 }
|
||||||
@@ -92,7 +87,6 @@ switch ($platform) {
|
|||||||
Write-Warning "Branch deletion after merge may need to be done separately with tea"
|
Write-Warning "Branch deletion after merge may need to be done separately with tea"
|
||||||
}
|
}
|
||||||
|
|
||||||
$cmd += $repoArgs
|
|
||||||
& $cmd[0] $cmd[1..($cmd.Length-1)]
|
& $cmd[0] $cmd[1..($cmd.Length-1)]
|
||||||
}
|
}
|
||||||
default {
|
default {
|
||||||
|
|||||||
@@ -106,6 +106,34 @@ PLATFORM=$(detect_platform)
|
|||||||
OWNER=$(get_repo_owner)
|
OWNER=$(get_repo_owner)
|
||||||
REPO=$(get_repo_name)
|
REPO=$(get_repo_name)
|
||||||
|
|
||||||
|
find_tea_login_for_host() {
|
||||||
|
local host="$1"
|
||||||
|
local logins_json
|
||||||
|
|
||||||
|
command -v tea >/dev/null 2>&1 || return 1
|
||||||
|
logins_json=$(tea login list --output json 2>/dev/null) || return 1
|
||||||
|
TEA_LOGINS_JSON="$logins_json" python3 - "$host" <<'PY'
|
||||||
|
import json
|
||||||
|
import os
|
||||||
|
import sys
|
||||||
|
|
||||||
|
host = sys.argv[1]
|
||||||
|
try:
|
||||||
|
logins = json.loads(os.environ.get("TEA_LOGINS_JSON", "[]"))
|
||||||
|
except Exception:
|
||||||
|
raise SystemExit(1)
|
||||||
|
|
||||||
|
for login in logins if isinstance(logins, list) else []:
|
||||||
|
url = str(login.get("url") or login.get("URL") or "")
|
||||||
|
name = str(login.get("name") or login.get("Name") or "")
|
||||||
|
if url.rstrip("/").endswith(host) and name:
|
||||||
|
print(name)
|
||||||
|
raise SystemExit(0)
|
||||||
|
|
||||||
|
raise SystemExit(1)
|
||||||
|
PY
|
||||||
|
}
|
||||||
|
|
||||||
is_known_tea_empty_identity_failure() {
|
is_known_tea_empty_identity_failure() {
|
||||||
local error_file="$1"
|
local error_file="$1"
|
||||||
|
|
||||||
@@ -136,7 +164,6 @@ merge_gitea_with_api() {
|
|||||||
if [[ -n "$token" ]]; then
|
if [[ -n "$token" ]]; then
|
||||||
raw_code=$(curl -sS -w '%{http_code}' -o "$body_file" \
|
raw_code=$(curl -sS -w '%{http_code}' -o "$body_file" \
|
||||||
-X POST \
|
-X POST \
|
||||||
-H "User-Agent: curl/8" \
|
|
||||||
-H "Authorization: token $token" \
|
-H "Authorization: token $token" \
|
||||||
-H 'Content-Type: application/json' \
|
-H 'Content-Type: application/json' \
|
||||||
-d "$payload" \
|
-d "$payload" \
|
||||||
@@ -152,7 +179,6 @@ merge_gitea_with_api() {
|
|||||||
raw_code=$(curl -sS -w '%{http_code}' -o "$body_file" \
|
raw_code=$(curl -sS -w '%{http_code}' -o "$body_file" \
|
||||||
-X POST \
|
-X POST \
|
||||||
-u "$basic_auth" \
|
-u "$basic_auth" \
|
||||||
-H "User-Agent: curl/8" \
|
|
||||||
-H 'Content-Type: application/json' \
|
-H 'Content-Type: application/json' \
|
||||||
-d "$payload" \
|
-d "$payload" \
|
||||||
"$api_url" || true)
|
"$api_url" || true)
|
||||||
@@ -188,7 +214,7 @@ if [[ "$DRY_RUN" == true ]]; then
|
|||||||
echo "Error: Cannot determine host from origin remote URL" >&2
|
echo "Error: Cannot determine host from origin remote URL" >&2
|
||||||
exit 1
|
exit 1
|
||||||
}
|
}
|
||||||
TEA_LOGIN="$(get_gitea_login_for_host "$HOST" || true)"
|
TEA_LOGIN="${GITEA_LOGIN:-$(find_tea_login_for_host "$HOST" || true)}"
|
||||||
if [[ -n "$TEA_LOGIN" ]]; then
|
if [[ -n "$TEA_LOGIN" ]]; then
|
||||||
echo "Dry run: would merge PR #$PR_NUMBER on $HOST with tea login '$TEA_LOGIN' (base=$BASE_BRANCH, method=squash)."
|
echo "Dry run: would merge PR #$PR_NUMBER on $HOST with tea login '$TEA_LOGIN' (base=$BASE_BRANCH, method=squash)."
|
||||||
else
|
else
|
||||||
@@ -211,7 +237,7 @@ case "$PLATFORM" in
|
|||||||
echo "Error: Cannot determine host from origin remote URL" >&2
|
echo "Error: Cannot determine host from origin remote URL" >&2
|
||||||
exit 1
|
exit 1
|
||||||
}
|
}
|
||||||
TEA_LOGIN="$(get_gitea_login_for_host "$HOST" || true)"
|
TEA_LOGIN="${GITEA_LOGIN:-$(find_tea_login_for_host "$HOST" || true)}"
|
||||||
|
|
||||||
if [[ -n "$TEA_LOGIN" ]]; then
|
if [[ -n "$TEA_LOGIN" ]]; then
|
||||||
mkdir -p "${AGENT_WORK_ROOT:-/home/hermes/agent-work}"
|
mkdir -p "${AGENT_WORK_ROOT:-/home/hermes/agent-work}"
|
||||||
|
|||||||
@@ -59,7 +59,7 @@ curl_gitea_pull() {
|
|||||||
|
|
||||||
token=$(get_gitea_token "$HOST" || true)
|
token=$(get_gitea_token "$HOST" || true)
|
||||||
if [[ -n "$token" ]]; then
|
if [[ -n "$token" ]]; then
|
||||||
raw_code=$(curl -sS -w '%{http_code}' -o "$body_file" -H "User-Agent: curl/8" -H "Authorization: token $token" "$api_url" || true)
|
raw_code=$(curl -sS -w '%{http_code}' -o "$body_file" -H "Authorization: token $token" "$api_url" || true)
|
||||||
if [[ "$raw_code" =~ ^2 ]]; then
|
if [[ "$raw_code" =~ ^2 ]]; then
|
||||||
cat "$body_file"
|
cat "$body_file"
|
||||||
rm -f "$body_file"
|
rm -f "$body_file"
|
||||||
@@ -70,7 +70,7 @@ curl_gitea_pull() {
|
|||||||
|
|
||||||
basic_auth=$(get_gitea_basic_auth "$HOST" || true)
|
basic_auth=$(get_gitea_basic_auth "$HOST" || true)
|
||||||
if [[ -n "$basic_auth" ]]; then
|
if [[ -n "$basic_auth" ]]; then
|
||||||
raw_code=$(curl -sS -w '%{http_code}' -o "$body_file" -u "$basic_auth" -H "User-Agent: curl/8" "$api_url" || true)
|
raw_code=$(curl -sS -w '%{http_code}' -o "$body_file" -u "$basic_auth" "$api_url" || true)
|
||||||
if [[ "$raw_code" =~ ^2 ]]; then
|
if [[ "$raw_code" =~ ^2 ]]; then
|
||||||
cat "$body_file"
|
cat "$body_file"
|
||||||
rm -f "$body_file"
|
rm -f "$body_file"
|
||||||
@@ -80,7 +80,7 @@ curl_gitea_pull() {
|
|||||||
fi
|
fi
|
||||||
|
|
||||||
if [[ -z "${http_code:-}" ]]; then
|
if [[ -z "${http_code:-}" ]]; then
|
||||||
raw_code=$(curl -sS -w '%{http_code}' -o "$body_file" -H "User-Agent: curl/8" "$api_url" || true)
|
raw_code=$(curl -sS -w '%{http_code}' -o "$body_file" "$api_url" || true)
|
||||||
http_code="$raw_code"
|
http_code="$raw_code"
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
|||||||
@@ -53,7 +53,7 @@ if [[ -z "$ACTION" ]]; then
|
|||||||
exit 1
|
exit 1
|
||||||
fi
|
fi
|
||||||
|
|
||||||
detect_platform >/dev/null
|
detect_platform
|
||||||
|
|
||||||
if [[ "$PLATFORM" == "github" ]]; then
|
if [[ "$PLATFORM" == "github" ]]; then
|
||||||
case $ACTION in
|
case $ACTION in
|
||||||
|
|||||||
@@ -58,18 +58,7 @@ fi
|
|||||||
if [[ "$PLATFORM" == "github" ]]; then
|
if [[ "$PLATFORM" == "github" ]]; then
|
||||||
gh pr view "$PR_NUMBER" --repo "$REPO_INFO"
|
gh pr view "$PR_NUMBER" --repo "$REPO_INFO"
|
||||||
elif [[ "$PLATFORM" == "gitea" ]]; then
|
elif [[ "$PLATFORM" == "gitea" ]]; then
|
||||||
if [[ -n "$REPO_OVERRIDE" ]]; then
|
tea pr "$PR_NUMBER" --repo "$REPO_INFO" --login "${GITEA_LOGIN:-mosaicstack}"
|
||||||
GITEA_LOGIN_NAME=$(get_gitea_login_for_repo_override) || {
|
|
||||||
echo "Error: Could not resolve Gitea login for --repo override. Set GITEA_LOGIN or configure a default tea login." >&2
|
|
||||||
exit 1
|
|
||||||
}
|
|
||||||
else
|
|
||||||
GITEA_LOGIN_NAME=$(get_gitea_login) || {
|
|
||||||
echo "Error: Could not resolve Gitea login for remote host" >&2
|
|
||||||
exit 1
|
|
||||||
}
|
|
||||||
fi
|
|
||||||
tea pr "$PR_NUMBER" --repo "$REPO_INFO" --login "$GITEA_LOGIN_NAME"
|
|
||||||
else
|
else
|
||||||
echo "Error: Unknown platform"
|
echo "Error: Unknown platform"
|
||||||
exit 1
|
exit 1
|
||||||
|
|||||||
@@ -1,233 +0,0 @@
|
|||||||
#!/usr/bin/env bash
|
|
||||||
# Regression harness for host-specific Gitea tea login resolution.
|
|
||||||
|
|
||||||
set -euo pipefail
|
|
||||||
|
|
||||||
SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
|
|
||||||
WORK_DIR="${MOSAIC_TEST_WORK_DIR:-$PWD/.mosaic-test-work/gitea-login-resolution}"
|
|
||||||
REPO_DIR="$WORK_DIR/repo"
|
|
||||||
BIN_DIR="$WORK_DIR/bin"
|
|
||||||
LOG_FILE="$WORK_DIR/calls.log"
|
|
||||||
CREDENTIALS_FILE="$WORK_DIR/credentials.json"
|
|
||||||
|
|
||||||
rm -rf "$WORK_DIR"
|
|
||||||
mkdir -p "$REPO_DIR" "$BIN_DIR"
|
|
||||||
|
|
||||||
git -C "$REPO_DIR" init -q
|
|
||||||
git -C "$REPO_DIR" remote add origin https://git.uscllc.com/USC/uconnect.git
|
|
||||||
|
|
||||||
cat > "$CREDENTIALS_FILE" <<'JSON'
|
|
||||||
{
|
|
||||||
"gitea": {
|
|
||||||
"mosaicstack": {
|
|
||||||
"url": "https://git.mosaicstack.dev",
|
|
||||||
"token": "mosaic-token"
|
|
||||||
},
|
|
||||||
"usc": {
|
|
||||||
"url": "https://git.uscllc.com",
|
|
||||||
"token": "usc-token"
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
JSON
|
|
||||||
|
|
||||||
cat > "$BIN_DIR/tea" <<'SH'
|
|
||||||
#!/usr/bin/env bash
|
|
||||||
set -euo pipefail
|
|
||||||
|
|
||||||
if [[ "$*" == "login list --output json" ]]; then
|
|
||||||
cat <<'JSON'
|
|
||||||
[
|
|
||||||
{"name":"evil-usc","url":"https://evilgit.uscllc.com","user":"bad.actor"},
|
|
||||||
{"name":"usc","url":"https://git.uscllc.com","user":"jason.woltje"}
|
|
||||||
]
|
|
||||||
JSON
|
|
||||||
exit 0
|
|
||||||
fi
|
|
||||||
|
|
||||||
printf 'tea %s\n' "$*" >> "$MOSAIC_TEST_LOG"
|
|
||||||
if [[ "${MOSAIC_TEA_FAIL_PR_CREATE:-}" == "1" && "$*" == pr\ create* ]]; then
|
|
||||||
echo 'GetUserByName: simulated stale login failure' >&2
|
|
||||||
exit 1
|
|
||||||
fi
|
|
||||||
exit 0
|
|
||||||
SH
|
|
||||||
|
|
||||||
cat > "$BIN_DIR/curl" <<'SH'
|
|
||||||
#!/usr/bin/env bash
|
|
||||||
set -euo pipefail
|
|
||||||
|
|
||||||
printf 'curl %s\n' "$*" >> "$MOSAIC_TEST_LOG"
|
|
||||||
url="${*: -1}"
|
|
||||||
case "$url" in
|
|
||||||
*/pulls/*.diff)
|
|
||||||
printf 'diff --git a/file b/file\n'
|
|
||||||
;;
|
|
||||||
*/pulls/*)
|
|
||||||
printf '{"head":{"sha":"abc123"}}'
|
|
||||||
;;
|
|
||||||
*/commits/*/status)
|
|
||||||
printf '{"state":"success","statuses":[{"context":"ci/mock","status":"success"}]}'
|
|
||||||
;;
|
|
||||||
*)
|
|
||||||
printf '{}'
|
|
||||||
;;
|
|
||||||
esac
|
|
||||||
SH
|
|
||||||
|
|
||||||
chmod +x "$BIN_DIR/tea" "$BIN_DIR/curl"
|
|
||||||
|
|
||||||
run_in_repo() {
|
|
||||||
(
|
|
||||||
cd "$REPO_DIR"
|
|
||||||
PATH="$BIN_DIR:$PATH" \
|
|
||||||
MOSAIC_CREDENTIALS_FILE="$CREDENTIALS_FILE" \
|
|
||||||
MOSAIC_TEST_LOG="$LOG_FILE" \
|
|
||||||
"$@"
|
|
||||||
)
|
|
||||||
}
|
|
||||||
|
|
||||||
usc_login=$(run_in_repo bash -c '
|
|
||||||
export GITEA_LOGIN=mosaicstack
|
|
||||||
export GITEA_URL=https://git.mosaicstack.dev
|
|
||||||
source "'"$SCRIPT_DIR"'/detect-platform.sh"
|
|
||||||
get_gitea_login
|
|
||||||
')
|
|
||||||
if [[ "$usc_login" != "usc" ]]; then
|
|
||||||
echo "Expected USC host to resolve tea login 'usc' despite stale mosaicstack env; got '$usc_login'" >&2
|
|
||||||
exit 1
|
|
||||||
fi
|
|
||||||
|
|
||||||
usc_login_with_usc_url=$(run_in_repo bash -c '
|
|
||||||
export GITEA_LOGIN=mosaicstack
|
|
||||||
export GITEA_URL=https://git.uscllc.com
|
|
||||||
source "'"$SCRIPT_DIR"'/detect-platform.sh"
|
|
||||||
get_gitea_login
|
|
||||||
')
|
|
||||||
if [[ "$usc_login_with_usc_url" != "usc" ]]; then
|
|
||||||
echo "Expected USC host to reject stale GITEA_LOGIN even when GITEA_URL matches USC; got '$usc_login_with_usc_url'" >&2
|
|
||||||
exit 1
|
|
||||||
fi
|
|
||||||
|
|
||||||
usc_login_without_url=$(run_in_repo bash -c '
|
|
||||||
export GITEA_LOGIN=mosaicstack
|
|
||||||
unset GITEA_URL
|
|
||||||
source "'"$SCRIPT_DIR"'/detect-platform.sh"
|
|
||||||
get_gitea_login
|
|
||||||
')
|
|
||||||
if [[ "$usc_login_without_url" != "usc" ]]; then
|
|
||||||
echo "Expected USC host to ignore unmatched GITEA_LOGIN without URL; got '$usc_login_without_url'" >&2
|
|
||||||
exit 1
|
|
||||||
fi
|
|
||||||
|
|
||||||
git -C "$REPO_DIR" remote set-url origin https://hermes:token@git.uscllc.com/USC/uconnect.git
|
|
||||||
embedded_host=$(run_in_repo bash -c '
|
|
||||||
source "'"$SCRIPT_DIR"'/detect-platform.sh"
|
|
||||||
get_remote_host
|
|
||||||
')
|
|
||||||
if [[ "$embedded_host" != "git.uscllc.com" ]]; then
|
|
||||||
echo "Expected credential-bearing remote host to strip userinfo; got '$embedded_host'" >&2
|
|
||||||
exit 1
|
|
||||||
fi
|
|
||||||
git -C "$REPO_DIR" remote set-url origin https://git.uscllc.com/USC/uconnect.git
|
|
||||||
|
|
||||||
override_login=$(run_in_repo bash -c '
|
|
||||||
export GITEA_LOGIN=usc
|
|
||||||
source "'"$SCRIPT_DIR"'/detect-platform.sh"
|
|
||||||
get_gitea_login_for_repo_override
|
|
||||||
')
|
|
||||||
if [[ "$override_login" != "usc" ]]; then
|
|
||||||
echo "Expected --repo override path to honor explicit GITEA_LOGIN; got '$override_login'" >&2
|
|
||||||
exit 1
|
|
||||||
fi
|
|
||||||
|
|
||||||
git -C "$REPO_DIR" remote set-url origin https://git.mosaicstack.dev/mosaicstack/stack.git
|
|
||||||
: > "$LOG_FILE"
|
|
||||||
run_in_repo env GITEA_LOGIN=usc "$SCRIPT_DIR/issue-list.sh" --repo USC/uconnect -n 1
|
|
||||||
grep -q -- 'tea issues list --repo USC/uconnect --login usc' "$LOG_FILE"
|
|
||||||
git -C "$REPO_DIR" remote set-url origin https://git.uscllc.com/USC/uconnect.git
|
|
||||||
|
|
||||||
: > "$LOG_FILE"
|
|
||||||
run_in_repo "$SCRIPT_DIR/issue-close.sh" -i 42
|
|
||||||
grep -q -- 'tea issue close 42 --repo USC/uconnect --login usc' "$LOG_FILE"
|
|
||||||
if grep -q -- '--login mosaicstack' "$LOG_FILE"; then
|
|
||||||
echo "issue-close.sh used hardcoded mosaicstack login on USC host" >&2
|
|
||||||
exit 1
|
|
||||||
fi
|
|
||||||
|
|
||||||
: > "$LOG_FILE"
|
|
||||||
run_in_repo "$SCRIPT_DIR/milestone-list.sh"
|
|
||||||
grep -q -- 'tea milestone list --repo USC/uconnect --login usc' "$LOG_FILE"
|
|
||||||
|
|
||||||
: > "$LOG_FILE"
|
|
||||||
run_in_repo "$SCRIPT_DIR/milestone-create.sh" -t "0.2.0" -d "USC milestone"
|
|
||||||
grep -q -- 'tea milestones create --title 0.2.0 --description USC milestone --repo USC/uconnect --login usc' "$LOG_FILE"
|
|
||||||
|
|
||||||
: > "$LOG_FILE"
|
|
||||||
run_in_repo "$SCRIPT_DIR/milestone-close.sh" -t "0.2.0"
|
|
||||||
grep -q -- 'tea milestone close 0.2.0 --repo USC/uconnect --login usc' "$LOG_FILE"
|
|
||||||
|
|
||||||
if command -v pwsh >/dev/null 2>&1; then
|
|
||||||
: > "$LOG_FILE"
|
|
||||||
run_in_repo pwsh -NoProfile -File "$SCRIPT_DIR/issue-list.ps1" -Limit 1
|
|
||||||
grep -q -- 'tea issues list --state open --limit 1 --repo USC/uconnect --login usc' "$LOG_FILE"
|
|
||||||
|
|
||||||
: > "$LOG_FILE"
|
|
||||||
run_in_repo pwsh -NoProfile -File "$SCRIPT_DIR/issue-create.ps1" -Title "PowerShell issue"
|
|
||||||
grep -q -- 'tea issue create --title PowerShell issue --repo USC/uconnect --login usc' "$LOG_FILE"
|
|
||||||
|
|
||||||
: > "$LOG_FILE"
|
|
||||||
run_in_repo pwsh -NoProfile -File "$SCRIPT_DIR/pr-list.ps1" -Limit 1
|
|
||||||
grep -q -- 'tea pr list --state open --limit 1 --repo USC/uconnect --login usc' "$LOG_FILE"
|
|
||||||
|
|
||||||
: > "$LOG_FILE"
|
|
||||||
run_in_repo pwsh -NoProfile -File "$SCRIPT_DIR/pr-create.ps1" -Title "PowerShell PR"
|
|
||||||
grep -q -- 'tea pr create --title PowerShell PR --head master --repo USC/uconnect --login usc' "$LOG_FILE"
|
|
||||||
|
|
||||||
: > "$LOG_FILE"
|
|
||||||
run_in_repo pwsh -NoProfile -File "$SCRIPT_DIR/pr-merge.ps1" -Number 42 -SkipQueueGuard
|
|
||||||
grep -q -- 'tea pr merge 42 --style squash --repo USC/uconnect --login usc' "$LOG_FILE"
|
|
||||||
|
|
||||||
: > "$LOG_FILE"
|
|
||||||
run_in_repo pwsh -NoProfile -File "$SCRIPT_DIR/milestone-create.ps1" -List
|
|
||||||
grep -q -- 'tea milestones list --repo USC/uconnect --login usc' "$LOG_FILE"
|
|
||||||
fi
|
|
||||||
|
|
||||||
: > "$LOG_FILE"
|
|
||||||
if run_in_repo "$SCRIPT_DIR/pr-diff.sh" --repo USC/uconnect -n 7 >/dev/null 2>&1; then
|
|
||||||
echo "Expected pr-diff.sh --repo without host to fail loud" >&2
|
|
||||||
exit 1
|
|
||||||
fi
|
|
||||||
if grep -q -- 'git.mosaicstack.dev/api/v1/repos/USC/uconnect' "$LOG_FILE"; then
|
|
||||||
echo "pr-diff.sh --repo defaulted API host to git.mosaicstack.dev" >&2
|
|
||||||
exit 1
|
|
||||||
fi
|
|
||||||
|
|
||||||
: > "$LOG_FILE"
|
|
||||||
run_in_repo env GITEA_URL=https://git.uscllc.com "$SCRIPT_DIR/pr-diff.sh" --repo USC/uconnect -n 7 >/dev/null
|
|
||||||
grep -q -- 'curl .*https://git.uscllc.com/api/v1/repos/USC/uconnect/pulls/7.diff' "$LOG_FILE"
|
|
||||||
|
|
||||||
: > "$LOG_FILE"
|
|
||||||
run_in_repo "$SCRIPT_DIR/pr-ci-wait.sh" --repo USC/uconnect --host git.uscllc.com -n 9 -t 2 -i 1
|
|
||||||
grep -q -- 'curl .*https://git.uscllc.com/api/v1/repos/USC/uconnect/pulls/9' "$LOG_FILE"
|
|
||||||
grep -q -- 'curl .*https://git.uscllc.com/api/v1/repos/USC/uconnect/commits/abc123/status' "$LOG_FILE"
|
|
||||||
|
|
||||||
: > "$LOG_FILE"
|
|
||||||
run_in_repo env MOSAIC_TEA_FAIL_PR_CREATE=1 GITEA_TOKEN=usc-token GITEA_URL=https://git.uscllc.com "$SCRIPT_DIR/pr-create.sh" -t "USC API fallback" -H feature/pr-create
|
|
||||||
grep -q -- 'tea pr create --repo USC/uconnect --login usc --title USC API fallback --head feature/pr-create' "$LOG_FILE"
|
|
||||||
grep -q -- 'curl .*Authorization: token usc-token .*https://git.uscllc.com/api/v1/repos/USC/uconnect/pulls' "$LOG_FILE"
|
|
||||||
if grep -q -- 'git.mosaicstack.dev/api/v1/repos/USC/uconnect/pulls' "$LOG_FILE"; then
|
|
||||||
echo "pr-create.sh API fallback defaulted USC repo to git.mosaicstack.dev" >&2
|
|
||||||
exit 1
|
|
||||||
fi
|
|
||||||
|
|
||||||
git -C "$REPO_DIR" remote set-url origin https://git.mosaicstack.dev/mosaicstack/stack.git
|
|
||||||
: > "$LOG_FILE"
|
|
||||||
run_in_repo env GITEA_TOKEN=mosaic-token GITEA_URL=https://git.mosaicstack.dev "$SCRIPT_DIR/issue-close.sh" -i 536
|
|
||||||
grep -q -- 'curl .*https://git.mosaicstack.dev/api/v1/repos/mosaicstack/stack/issues/536' "$LOG_FILE"
|
|
||||||
if grep -q -- 'tea issue close 536 .*--login mosaicstack' "$LOG_FILE"; then
|
|
||||||
echo "issue-close.sh invented a mosaicstack tea login instead of using API fallback" >&2
|
|
||||||
exit 1
|
|
||||||
fi
|
|
||||||
|
|
||||||
echo "Gitea login resolution regression harness passed"
|
|
||||||
@@ -23,10 +23,6 @@ cat > "$MOCK_BIN/tea" <<'EOF'
|
|||||||
set -euo pipefail
|
set -euo pipefail
|
||||||
printf 'tea %q ' "$@" >> "$PR_MERGE_TEST_LOG"
|
printf 'tea %q ' "$@" >> "$PR_MERGE_TEST_LOG"
|
||||||
printf '\n' >> "$PR_MERGE_TEST_LOG"
|
printf '\n' >> "$PR_MERGE_TEST_LOG"
|
||||||
if [[ "$*" == *"login list"* ]]; then
|
|
||||||
echo '[{"name":"git.mosaicstack.dev","url":"https://git.mosaicstack.dev"}]'
|
|
||||||
exit 0
|
|
||||||
fi
|
|
||||||
if [[ "$*" == *"pr merge"* ]]; then
|
if [[ "$*" == *"pr merge"* ]]; then
|
||||||
echo 'user does not exist [uid: 0, name: ]' >&2
|
echo 'user does not exist [uid: 0, name: ]' >&2
|
||||||
exit 1
|
exit 1
|
||||||
@@ -103,7 +99,6 @@ git remote add origin https://git.mosaicstack.dev/mosaicstack/stack.git
|
|||||||
export PATH="$MOCK_BIN:$PATH"
|
export PATH="$MOCK_BIN:$PATH"
|
||||||
export PR_MERGE_TEST_LOG="$LOG_FILE"
|
export PR_MERGE_TEST_LOG="$LOG_FILE"
|
||||||
export GITEA_LOGIN="git.mosaicstack.dev"
|
export GITEA_LOGIN="git.mosaicstack.dev"
|
||||||
export GITEA_URL="https://git.mosaicstack.dev"
|
|
||||||
export GITEA_TOKEN="redacted-test-token"
|
export GITEA_TOKEN="redacted-test-token"
|
||||||
|
|
||||||
OUTPUT="$SANDBOX/output.log"
|
OUTPUT="$SANDBOX/output.log"
|
||||||
@@ -132,10 +127,6 @@ cat > "$MOCK_BIN/tea" <<'EOF'
|
|||||||
set -euo pipefail
|
set -euo pipefail
|
||||||
printf 'tea %q ' "$@" >> "$PR_MERGE_TEST_LOG"
|
printf 'tea %q ' "$@" >> "$PR_MERGE_TEST_LOG"
|
||||||
printf '\n' >> "$PR_MERGE_TEST_LOG"
|
printf '\n' >> "$PR_MERGE_TEST_LOG"
|
||||||
if [[ "$*" == *"login list"* ]]; then
|
|
||||||
echo '[{"name":"git.mosaicstack.dev","url":"https://git.mosaicstack.dev"}]'
|
|
||||||
exit 0
|
|
||||||
fi
|
|
||||||
if [[ "$*" == *"pr merge"* ]]; then
|
if [[ "$*" == *"pr merge"* ]]; then
|
||||||
echo 'tea network timeout' >&2
|
echo 'tea network timeout' >&2
|
||||||
exit 2
|
exit 2
|
||||||
|
|||||||
@@ -1,6 +1,6 @@
|
|||||||
{
|
{
|
||||||
"name": "@mosaicstack/mosaic",
|
"name": "@mosaicstack/mosaic",
|
||||||
"version": "0.0.31",
|
"version": "0.0.30",
|
||||||
"repository": {
|
"repository": {
|
||||||
"type": "git",
|
"type": "git",
|
||||||
"url": "https://git.mosaicstack.dev/mosaicstack/stack.git",
|
"url": "https://git.mosaicstack.dev/mosaicstack/stack.git",
|
||||||
|
|||||||
@@ -15,8 +15,8 @@ describe('Gitea git wrapper API calls', () => {
|
|||||||
(scriptName) => {
|
(scriptName) => {
|
||||||
const script = readGitTool(scriptName);
|
const script = readGitTool(scriptName);
|
||||||
|
|
||||||
expect(script).not.toMatch(/curl -fsS\s+(?:-H "[^"]+"\s+)*-H "Authorization: token/);
|
expect(script).not.toContain('curl -fsS -H "Authorization: token');
|
||||||
expect(script).toMatch(/curl -fsSL\s+(?:-H "[^"]+"\s+)*-H "Authorization: token/);
|
expect(script).toContain('curl -fsSL -H "Authorization: token');
|
||||||
},
|
},
|
||||||
);
|
);
|
||||||
});
|
});
|
||||||
|
|||||||
Reference in New Issue
Block a user