Skip to content

armgit / alook

Public Imported from GitHub
0

Multi-Agent Collaboration for Team and Friends

fix: issue task context key

Gus989fc26cec63
diff --git a/src/shared/src/db/queries/issue.ts b/src/shared/src/db/queries/issue.ts
index 505708897..97b99490f 100644
--- a/src/shared/src/db/queries/issue.ts
+++ b/src/shared/src/db/queries/issue.ts
@@ -43,6 +43,14 @@ export async function getIssue(db: Database, id: string, workspaceId: string) {
return rows[0] ?? null;
}
+export async function getIssueByConversation(db: Database, conversationId: string, workspaceId: string) {
+ const rows = await db
+ .select()
+ .from(issue)
+ .where(and(eq(issue.conversationId, conversationId), eq(issue.workspaceId, workspaceId)));
+ return rows[0] ?? null;
+}
+
export async function listIssues(
db: Database,
workspaceId: string,
diff --git a/src/web/src/app/(app)/w/[slug]/issues/page.tsx b/src/web/src/app/(app)/w/[slug]/issues/page.tsx
index 50e771936..7573afa88 100644
--- a/src/web/src/app/(app)/w/[slug]/issues/page.tsx
+++ b/src/web/src/app/(app)/w/[slug]/issues/page.tsx
@@ -6,9 +6,9 @@ import { CircleDot, Eye, EyeOff, Loader2, Plus, Trash2 } from "lucide-react";
import type { Agent, Artifact, Issue, IssueComment, Message, WsMessage } from "@alook/shared";
import { useWorkspace } from "@/contexts/workspace-context";
import { useAgentContext } from "@/contexts/agent-context";
-import { createIssue, deleteIssue, getIssue, getTask, getTrace, getTaskMessages, listIssues, updateIssue } from "@/lib/api";
+import { createIssue, deleteIssue, getIssue, getTask, getTrace, listIssues, updateIssue } from "@/lib/api";
import type { IssueListItem, TraceTask } from "@/lib/api";
-import type { TaskApi, TaskMessage } from "@alook/shared";
+import type { TaskApi } from "@alook/shared";
import { Button } from "@/components/ui/button";
import { Badge } from "@/components/ui/badge";
import { Skeleton } from "@/components/ui/skeleton";
@@ -245,11 +245,12 @@ export default function IssuesPage() {
const [detail, setDetail] = useState<{ issue: Issue & { trace_id?: string | null }; messages: Message[]; comments: IssueComment[]; artifacts: Artifact[] } | null>(null);
const [detailLoading, setDetailLoading] = useState(false);
const [activeTask, setActiveTask] = useState<TaskApi | null>(null);
- const [taskLatestText, setTaskLatestText] = useState<string>("");
const [sidecarWidth, setSidecarWidth] = useState(SIDECAR_DEFAULT_WIDTH);
const [traceTasks, setTraceTasks] = useState<TraceTask[] | null>(null);
const [activeDragId, setActiveDragId] = useState<string | null>(null);
const pendingStatusUpdate = useRef<string | null>(null);
+ const refreshSeqRef = useRef(0);
+ const selectedIdRef = useRef<string | null>(null);
const sensors = useSensors(useSensor(PointerSensor, { activationConstraint: { distance: 8 } }));
const agentsById = useMemo(() => new Map(agents.map(a => [a.id, a])), [agents]);
@@ -276,6 +277,7 @@ export default function IssuesPage() {
async function openIssue(issueId: string) {
setSelectedId(issueId);
+ selectedIdRef.current = issueId;
setSheetOpen(true);
setDetailLoading(true);
setTraceTasks(null);
@@ -294,11 +296,35 @@ export default function IssuesPage() {
}
}
+ async function refreshIssue(issueId: string) {
+ const seq = ++refreshSeqRef.current;
+ try {
+ const res = await getIssue(workspaceId, issueId);
+ if (seq !== refreshSeqRef.current || selectedIdRef.current !== issueId) return;
+ setDetail(res);
+ if (res.issue.trace_id) {
+ getTrace(res.issue.trace_id, workspaceId)
+ .then(t => { if (seq === refreshSeqRef.current && selectedIdRef.current === issueId) setTraceTasks(t.tasks); })
+ .catch(() => {});
+ }
+ const taskId = res.issue.latest_task_id;
+ if (taskId) {
+ getTask(taskId, workspaceId)
+ .then(task => { if (seq === refreshSeqRef.current && selectedIdRef.current === issueId) setActiveTask(task); })
+ .catch(() => {});
+ }
+ } catch (err: any) {
+ if (err?.status === 404) {
+ handleSheetOpenChange(false);
+ }
+ }
+ }
+
const detailConvId = detail?.issue.conversation_id ?? null;
const detailTaskId = detail?.issue.latest_task_id ?? null;
useEffect(() => {
- if (!detailTaskId) { setActiveTask(null); setTaskLatestText(""); return; }
+ if (!detailTaskId) { setActiveTask(null); return; }
let cancelled = false;
getTask(detailTaskId, workspaceId).then((task) => {
if (!cancelled) setActiveTask(task);
@@ -307,21 +333,10 @@ export default function IssuesPage() {
}, [detailTaskId, workspaceId]);
const isTaskActive = activeTask && !["completed", "failed", "cancelled", "superseded"].includes(activeTask.status);
+ const hasActiveTraceTasks = traceTasks?.some(t =>
+ ["queued", "dispatched", "running"].includes(t.status)
+ ) ?? false;
- useEffect(() => {
- if (!isTaskActive || !detailTaskId) return;
- let cancelled = false;
- const poll = () => {
- getTaskMessages(detailTaskId, workspaceId).then((msgs) => {
- if (cancelled) return;
- const texts = msgs.filter((m: TaskMessage) => m.type === "text");
- if (texts.length > 0) setTaskLatestText(texts[texts.length - 1].content);
- }).catch(() => {});
- };
- poll();
- const interval = setInterval(poll, 3000);
- return () => { cancelled = true; clearInterval(interval); };
- }, [isTaskActive, detailTaskId, workspaceId]);
useEffect(() => {
return subscribeWs((msg: WsMessage) => {
@@ -350,7 +365,7 @@ export default function IssuesPage() {
if (msg.type === "task.updated" && (msg.status === "running" || msg.status === "completed" || msg.status === "failed")) {
if (!pendingStatusUpdate.current) {
reload();
- if (selectedId) openIssue(selectedId);
+ if (selectedId) refreshIssue(selectedId);
}
if (detailTaskId) {
getTask(detailTaskId, workspaceId).then(setActiveTask).catch(() => {});
@@ -374,6 +389,7 @@ export default function IssuesPage() {
if (values.agent_id) setRecentAgentId(values.agent_id);
setDraft({ title: "", description: "", agentId: "" });
setSelectedId(res.issue.id);
+ selectedIdRef.current = res.issue.id;
openIssue(res.issue.id);
toast.success("Issue created");
} catch (err) {
@@ -426,6 +442,7 @@ export default function IssuesPage() {
setIssues((prev) => prev.filter((i) => i.id !== issueId));
if (selectedId === issueId) {
setSelectedId(null);
+ selectedIdRef.current = null;
setSheetOpen(false);
setDetail(null);
}
@@ -439,9 +456,9 @@ export default function IssuesPage() {
setSheetOpen(open);
if (!open) {
setSelectedId(null);
+ selectedIdRef.current = null;
setDetail(null);
setActiveTask(null);
- setTaskLatestText("");
setTraceTasks(null);
}
}, []);
@@ -500,7 +517,7 @@ export default function IssuesPage() {
<h1 className="text-base font-semibold tracking-normal">Issues</h1>
</div>
<div className="flex items-center gap-2">
- <Button size="sm" className="w-full sm:w-auto" onClick={() => { setSelectedId(null); setSheetOpen(true); }}>
+ <Button size="sm" className="w-full sm:w-auto" onClick={() => { setSelectedId(null); selectedIdRef.current = null; setSheetOpen(true); }}>
<Plus className="size-4" />
New issue
</Button>
@@ -662,7 +679,6 @@ export default function IssuesPage() {
detail={detail ? { messages: detail.messages, comments: detail.comments, artifacts: detail.artifacts, traceId: detail.issue.trace_id } : null}
detailLoading={detailLoading}
activeTask={activeTask}
- taskLatestText={taskLatestText}
traceTasks={traceTasks}
submitting={creating}
defaultAgentId={recentAgentId}
diff --git a/src/web/src/app/api/issues/[id]/comments/route.ts b/src/web/src/app/api/issues/[id]/comments/route.ts
index 7b96652c6..87c75d78b 100644
--- a/src/web/src/app/api/issues/[id]/comments/route.ts
+++ b/src/web/src/app/api/issues/[id]/comments/route.ts
@@ -90,7 +90,7 @@ export const POST = withAuth(async (req: NextRequest, ctx) => {
prompt,
TASK_TYPES.ISSUE_EVENT,
{
- contextKey: issue.id,
+ contextKey: issue.conversationId,
context: { issue_id: issue.id },
traceId: existingTraceId,
parentTaskId: null,
diff --git a/src/web/src/app/api/issues/route.test.ts b/src/web/src/app/api/issues/route.test.ts
index 1ba63753f..8663194e5 100644
--- a/src/web/src/app/api/issues/route.test.ts
+++ b/src/web/src/app/api/issues/route.test.ts
@@ -104,7 +104,7 @@ describe("POST /api/issues", () => {
const res = await POST(req, {} as any);
expect(res.status).toBe(201);
expect(mockCreateConversation).toHaveBeenCalledWith({}, expect.objectContaining({ type: "issue_event", agentId: "ag_1" }));
- expect(mockEnqueueTask).toHaveBeenCalledWith("ag_1", "c1", "w1", expect.stringContaining("Fix"), "issue_event", expect.objectContaining({ contextKey: "iss_1" }));
+ expect(mockEnqueueTask).toHaveBeenCalledWith("ag_1", "c1", "w1", expect.stringContaining("Fix"), "issue_event", expect.objectContaining({ contextKey: "c1" }));
});
it("uploads attachments and includes attachment ids in the issue task context", async () => {
@@ -150,7 +150,7 @@ describe("POST /api/issues", () => {
expect.stringContaining("Fix"),
"issue_event",
expect.objectContaining({
- contextKey: "iss_1",
+ contextKey: "c1",
context: expect.objectContaining({
issue_id: "iss_1",
attachment_ids: [expect.stringContaining("art_")],
diff --git a/src/web/src/app/api/issues/route.ts b/src/web/src/app/api/issues/route.ts
index 13b1750c5..e51b6c828 100644
--- a/src/web/src/app/api/issues/route.ts
+++ b/src/web/src/app/api/issues/route.ts
@@ -197,7 +197,7 @@ export const POST = withAuth(async (req: NextRequest, ctx) => {
prompt,
TASK_TYPES.ISSUE_EVENT,
{
- contextKey: created.id,
+ contextKey: conversation.id,
context: {
issue_id: created.id,
...(artifactIds.length > 0 ? { attachment_ids: artifactIds } : {}),
diff --git a/src/web/src/components/issues/issue-sheet.tsx b/src/web/src/components/issues/issue-sheet.tsx
index 456572c2b..88ead00bd 100644
--- a/src/web/src/components/issues/issue-sheet.tsx
+++ b/src/web/src/components/issues/issue-sheet.tsx
@@ -172,7 +172,6 @@ export interface IssueSheetProps {
detail?: { messages: Message[]; comments: IssueComment[]; artifacts: Artifact[]; traceId?: string | null } | null;
detailLoading?: boolean;
activeTask?: TaskApi | null;
- taskLatestText?: string;
traceTasks?: TraceTask[] | null;
submitting?: boolean;
defaultAgentId?: string;
@@ -196,7 +195,6 @@ export function IssueSheet({
detail,
detailLoading,
activeTask,
- taskLatestText,
traceTasks,
submitting,
defaultAgentId,
@@ -434,7 +432,6 @@ export function IssueSheet({
<div className="absolute -left-4 top-2.5 size-2.5 rounded-full border-2 border-background bg-emerald-500 animate-pulse" />
<div className="rounded-md border border-emerald-500/30 bg-emerald-500/10 px-3 py-2">
<div className="flex items-center gap-2 text-xs text-emerald-600 dark:text-emerald-400">Working</div>
- {taskLatestText && <p className="mt-1 text-[11px] text-muted-foreground line-clamp-2">{taskLatestText}</p>}
</div>
</div>
);
diff --git a/src/web/src/lib/services/task.test.ts b/src/web/src/lib/services/task.test.ts
index 55126109c..c5b41d972 100644
--- a/src/web/src/lib/services/task.test.ts
+++ b/src/web/src/lib/services/task.test.ts
@@ -45,6 +45,7 @@ vi.mock("@alook/shared", () => ({
},
issue: {
getIssue: vi.fn(),
+ getIssueByConversation: vi.fn(),
updateIssue: vi.fn(),
},
},
@@ -81,6 +82,7 @@ const conversationQ = (queries as any).conversation as {
};
const issueQ = (queries as any).issue as {
getIssue: ReturnType<typeof vi.fn>;
+ getIssueByConversation: ReturnType<typeof vi.fn>;
updateIssue: ReturnType<typeof vi.fn>;
};
@@ -482,7 +484,7 @@ describe("TaskService", () => {
taskQ.failTask.mockResolvedValue(task);
taskQ.countRunningTasks.mockResolvedValue(0);
agentQ.updateAgentStatus.mockResolvedValue(undefined);
- issueQ.getIssue.mockResolvedValue({ id: "iss_1", status: "in_progress", conversationId: "c1" });
+ issueQ.getIssueByConversation.mockResolvedValue({ id: "iss_1", status: "in_progress", conversationId: "c1" });
issueQ.updateIssue.mockResolvedValue({ id: "iss_1", status: "failed", conversationId: "c1" });
await service.failTask("t1", "w1", "something went wrong");
diff --git a/src/web/src/lib/services/task.ts b/src/web/src/lib/services/task.ts
index e57ab308e..ab5d478a8 100644
--- a/src/web/src/lib/services/task.ts
+++ b/src/web/src/lib/services/task.ts
@@ -188,16 +188,16 @@ export class TaskService {
task: { id: string; type?: string | null; contextKey?: string | null; workspaceId: string; conversationId: string },
status: "failed",
) {
- if (task.type !== TASK_TYPES.ISSUE_EVENT || !task.contextKey) return;
+ if (task.type !== TASK_TYPES.ISSUE_EVENT) return;
- const issue = await issueQueries.getIssue(this.db, task.contextKey, task.workspaceId);
- if (!issue || issue.conversationId !== task.conversationId || issue.status === status) return;
+ const issue = await issueQueries.getIssueByConversation(this.db, task.conversationId, task.workspaceId);
+ if (!issue || issue.status === status) return;
const updated = await issueQueries.updateIssue(this.db, issue.id, task.workspaceId, { status });
if (!updated) return;
await messageQueries.createMessage(this.db, {
- conversationId: issue.conversationId,
+ conversationId: task.conversationId,
role: "event",
content: `Issue status changed: ${issue.status} -> ${status}`,
taskId: task.id,