Skip to content

armgit / alook

Public Imported from GitHub
0

Multi-Agent Collaboration for Team and Friends

feat: decouple issue comments from conversation messages (#60)

Genercd379fc2f4b9
diff --git a/src/cli/commands/issue.test.ts b/src/cli/commands/issue.test.ts
index 2f0f7b85f..be02baecb 100644
--- a/src/cli/commands/issue.test.ts
+++ b/src/cli/commands/issue.test.ts
@@ -8,7 +8,6 @@ describe("issueCommand", () => {
const names = cmd.commands.map((c) => c.name());
expect(names).toContain("create");
expect(names).toContain("list");
- expect(names).toContain("pull");
expect(names).toContain("show");
expect(names).toContain("update");
expect(names).toContain("comment");
diff --git a/src/cli/commands/issue.ts b/src/cli/commands/issue.ts
index 497c33992..43e8513f5 100644
--- a/src/cli/commands/issue.ts
+++ b/src/cli/commands/issue.ts
@@ -29,6 +29,14 @@ interface MessageResponse {
created_at: string;
}
+interface CommentResponse {
+ id: string;
+ author_type: string;
+ author_id: string;
+ content: string;
+ created_at: string;
+}
+
function resolveClientOpts(command: Command, agentId: string) {
let root = command;
while (root.parent) root = root.parent;
@@ -61,7 +69,7 @@ function printIssue(issue: IssueResponse): void {
console.log(`${issue.id} ${issue.status.padEnd(11)} ${issue.title}`);
}
-function printIssueDetail(issue: IssueResponse, messages?: MessageResponse[]): void {
+function printIssueDetail(issue: IssueResponse, messages?: MessageResponse[], comments?: CommentResponse[]): void {
console.log(`id: ${issue.id}`);
console.log(`agent_id: ${issue.agent_id}`);
console.log(`status: ${issue.status}`);
@@ -70,10 +78,17 @@ function printIssueDetail(issue: IssueResponse, messages?: MessageResponse[]): v
console.log(`title: ${issue.title}`);
console.log("description:");
console.log(issue.description || "(no description)");
- if (messages && messages.length > 0) {
- console.log("\nconversation:");
- for (const m of messages) {
- console.log(`[${m.role}] ${m.content}`);
+ const events = messages?.filter((m) => m.role === "event") ?? [];
+ if (events.length > 0) {
+ console.log("\nevents:");
+ for (const m of events) {
+ console.log(` [${m.created_at}] ${m.content}`);
+ }
+ }
+ if (comments && comments.length > 0) {
+ console.log("\ncomments:");
+ for (const c of comments) {
+ console.log(` [${c.created_at}] (${c.author_type}) ${c.content}`);
}
}
}
@@ -139,29 +154,6 @@ export function issueCommand(): Command {
}
});
- cmd
- .command("pull")
- .description("Show the next active issue for an agent")
- .requiredOption("--agent_id <id>", "Agent ID")
- .option("--json", "Output as JSON")
- .action(async (opts, command) => {
- const { serverUrl, token, workspaceId } = resolveClientOpts(command, opts.agent_id);
- const client = new APIClient(serverUrl, token, workspaceId);
- try {
- const issues = await client.getJSON<IssueResponse[]>(`/api/issues?agentId=${encodeURIComponent(opts.agent_id)}&terminal=false`);
- const issue = issues[0] ?? null;
- if (opts.json) return printJSON(issue);
- if (!issue) {
- console.log("No active issues.");
- return;
- }
- printIssueDetail(issue);
- } catch (err) {
- console.error(`Error: ${err instanceof Error ? err.message : err}`);
- process.exit(1);
- }
- });
-
cmd
.command("show")
.description("Show issue details and conversation")
@@ -172,13 +164,13 @@ export function issueCommand(): Command {
const { serverUrl, token, workspaceId } = resolveClientOpts(command, opts.agent_id);
const client = new APIClient(serverUrl, token, workspaceId);
try {
- const res = await client.getJSON<{ issue: IssueResponse; messages: MessageResponse[] }>(`/api/issues/${opts.issue_id}?agentId=${encodeURIComponent(opts.agent_id)}`);
+ const res = await client.getJSON<{ issue: IssueResponse; messages: MessageResponse[]; comments: CommentResponse[] }>(`/api/issues/${opts.issue_id}?agentId=${encodeURIComponent(opts.agent_id)}`);
if (res.issue.agent_id !== opts.agent_id) {
console.error(`Error: issue ${res.issue.id} does not belong to agent ${opts.agent_id}`);
process.exit(1);
}
if (opts.json) return printJSON(res);
- printIssueDetail(res.issue, res.messages);
+ printIssueDetail(res.issue, res.messages, res.comments);
} catch (err) {
console.error(`Error: ${err instanceof Error ? err.message : err}`);
process.exit(1);
@@ -238,7 +230,7 @@ export function issueCommand(): Command {
const { serverUrl, token, workspaceId } = resolveClientOpts(command, opts.agent_id);
const client = new APIClient(serverUrl, token, workspaceId);
try {
- const res = await client.postJSON<{ message: MessageResponse }>(`/api/issues/${opts.issue_id}?agentId=${encodeURIComponent(opts.agent_id)}`, { content });
+ const res = await client.postJSON<{ comment: CommentResponse }>(`/api/issues/${opts.issue_id}/comments?agentId=${encodeURIComponent(opts.agent_id)}`, { content });
if (opts.json) return printJSON(res);
console.log(`Commented on ${opts.issue_id}`);
} catch (err) {
diff --git a/src/cli/daemon/prompt.ts b/src/cli/daemon/prompt.ts
index 7fbc37a78..9b40f1fff 100644
--- a/src/cli/daemon/prompt.ts
+++ b/src/cli/daemon/prompt.ts
@@ -12,8 +12,12 @@ const EMAIL_NOTICE =
" Do not wait — when the human replies, a new task will be triggered automatically and you will be woken up with their response.";
const ISSUE_NOTICE =
- "This task was triggered by an assigned issue. Use `alook issue show`, `alook issue update`, and `alook issue comment` to inspect and update the issue as you work." +
- " Move the issue to in_progress when you begin, then to review, done, closed, canceled, or failed when appropriate.";
+ "This task was triggered by an assigned issue. The issue_id is provided in this message." +
+ " Use `alook issue show --agent_id <your_agent_id> --issue_id <issue_id>` to read full context." +
+ " Use `alook issue update --agent_id <your_agent_id> --issue_id <issue_id> --status <status>` to change status." +
+ " Use `alook issue comment --agent_id <your_agent_id> --issue_id <issue_id> --body <text>` to leave a comment." +
+ " You are responsible for setting the issue status: move to in_progress when working, review when awaiting user feedback, done/closed when finished." +
+ " Always leave a comment summarizing what you did before changing status.";
function buildDmNotice(name: string, email: string): string {
return (
@@ -39,6 +43,10 @@ export function buildPrompt(task: Task, attachments?: Attachment[]): string {
}
if (task.type === "issue_event") {
obj.notice = ISSUE_NOTICE;
+ const ctx = task.context as Record<string, unknown> | undefined;
+ if (ctx?.issue_id) {
+ obj.issue_id = ctx.issue_id;
+ }
}
if (task.sender) {
obj.sender = {
diff --git a/src/shared/src/db/queries-index.ts b/src/shared/src/db/queries-index.ts
index ee09decca..402ebdd76 100644
--- a/src/shared/src/db/queries-index.ts
+++ b/src/shared/src/db/queries-index.ts
@@ -27,3 +27,4 @@ export * as conversationMap from "./queries/conversation-map";
export * as agentLink from "./queries/agent-link";
export * as inbox from "./queries/inbox";
export * as issue from "./queries/issue";
+export * as issueComment from "./queries/issue-comment";
diff --git a/src/shared/src/db/queries/issue-comment.ts b/src/shared/src/db/queries/issue-comment.ts
new file mode 100644
index 000000000..e6fcec2f3
--- /dev/null
+++ b/src/shared/src/db/queries/issue-comment.ts
@@ -0,0 +1,72 @@
+import { and, asc, eq } from "drizzle-orm";
+import { issueComment } from "../schema";
+import type { Database } from "../index";
+
+export async function createComment(
+ db: Database,
+ data: {
+ issueId: string;
+ workspaceId: string;
+ authorType: "user" | "agent";
+ authorId: string;
+ content: string;
+ }
+) {
+ const rows = await db
+ .insert(issueComment)
+ .values({
+ issueId: data.issueId,
+ workspaceId: data.workspaceId,
+ authorType: data.authorType,
+ authorId: data.authorId,
+ content: data.content,
+ })
+ .returning();
+ return rows[0]!;
+}
+
+export async function listComments(
+ db: Database,
+ issueId: string,
+ workspaceId: string
+) {
+ return db
+ .select()
+ .from(issueComment)
+ .where(
+ and(
+ eq(issueComment.issueId, issueId),
+ eq(issueComment.workspaceId, workspaceId)
+ )
+ )
+ .orderBy(asc(issueComment.createdAt));
+}
+
+export async function deleteComment(
+ db: Database,
+ id: string,
+ workspaceId: string
+) {
+ const rows = await db
+ .delete(issueComment)
+ .where(
+ and(
+ eq(issueComment.id, id),
+ eq(issueComment.workspaceId, workspaceId)
+ )
+ )
+ .returning();
+ return rows[0] ?? null;
+}
+
+export function commentToResponse(row: typeof issueComment.$inferSelect) {
+ return {
+ id: row.id,
+ issue_id: row.issueId,
+ workspace_id: row.workspaceId,
+ author_type: row.authorType as "user" | "agent",
+ author_id: row.authorId,
+ content: row.content,
+ created_at: row.createdAt,
+ };
+}
diff --git a/src/shared/src/db/schema.ts b/src/shared/src/db/schema.ts
index b9e533da9..c5f4b6a70 100644
--- a/src/shared/src/db/schema.ts
+++ b/src/shared/src/db/schema.ts
@@ -414,6 +414,27 @@ export const issue = sqliteTable(
]
);
+export const issueComment = sqliteTable(
+ "issue_comment",
+ {
+ id: text("id").primaryKey().$defaultFn(() => "ic_" + nanoid()),
+ issueId: text("issue_id")
+ .notNull()
+ .references(() => issue.id, { onDelete: "cascade" }),
+ workspaceId: text("workspace_id")
+ .notNull()
+ .references(() => workspace.id, { onDelete: "cascade" }),
+ authorType: text("author_type").notNull().default("user"),
+ authorId: text("author_id").notNull(),
+ content: text("content").notNull(),
+ createdAt: text("created_at").notNull().$defaultFn(() => new Date().toISOString()),
+ },
+ (t) => [
+ index("idx_issue_comment_issue").on(t.issueId, t.createdAt),
+ index("idx_issue_comment_workspace").on(t.workspaceId, t.issueId),
+ ]
+);
+
export const taskMessage = sqliteTable(
"task_message",
{
diff --git a/src/shared/src/index.ts b/src/shared/src/index.ts
index 8d6479266..d60c791cc 100644
--- a/src/shared/src/index.ts
+++ b/src/shared/src/index.ts
@@ -18,6 +18,7 @@ export type {
CreateAgentRequest,
CalendarEvent,
Issue,
+ IssueComment,
AgentLink,
MeetingSession,
Channel,
@@ -127,6 +128,8 @@ export {
CreateIssueRequestSchema,
UpdateIssueRequestSchema,
CreateIssueCommentRequestSchema,
+ CreateIssueCommentBodySchema,
+ IssueCommentApiSchema,
IssueApiSchema,
CreateAgentLinkRequestSchema,
UpdateAgentLinkRequestSchema,
@@ -179,6 +182,8 @@ export type {
CreateIssueRequestInput,
UpdateIssueRequestInput,
CreateIssueCommentRequestInput,
+ CreateIssueCommentBody,
+ IssueCommentApi,
IssueApi,
CreateAgentLinkRequestInput,
UpdateAgentLinkRequestInput,
diff --git a/src/shared/src/schemas.ts b/src/shared/src/schemas.ts
index 65ab0081d..1fc43ee57 100644
--- a/src/shared/src/schemas.ts
+++ b/src/shared/src/schemas.ts
@@ -376,10 +376,25 @@ export const UpdateIssueRequestSchema = z
);
export type UpdateIssueRequestInput = z.infer<typeof UpdateIssueRequestSchema>;
-export const CreateIssueCommentRequestSchema = z.object({
+export const CreateIssueCommentBodySchema = z.object({
content: z.string().min(1, "content is required").max(20_000),
});
-export type CreateIssueCommentRequestInput = z.infer<typeof CreateIssueCommentRequestSchema>;
+export type CreateIssueCommentBody = z.infer<typeof CreateIssueCommentBodySchema>;
+
+/** @deprecated Use CreateIssueCommentBodySchema instead */
+export const CreateIssueCommentRequestSchema = CreateIssueCommentBodySchema;
+export type CreateIssueCommentRequestInput = CreateIssueCommentBody;
+
+export const IssueCommentApiSchema = z.object({
+ id: z.string(),
+ issue_id: z.string(),
+ workspace_id: z.string(),
+ author_type: z.enum(["user", "agent"]),
+ author_id: z.string(),
+ content: z.string(),
+ created_at: z.string(),
+});
+export type IssueCommentApi = z.infer<typeof IssueCommentApiSchema>;
export const IssueApiSchema = z.object({
id: z.string(),
diff --git a/src/shared/src/types.ts b/src/shared/src/types.ts
index 91f7cc63b..1be304bc2 100644
--- a/src/shared/src/types.ts
+++ b/src/shared/src/types.ts
@@ -106,6 +106,16 @@ export interface Issue {
completed_at: string | null;
}
+export interface IssueComment {
+ id: string;
+ issue_id: string;
+ workspace_id: string;
+ author_type: "user" | "agent";
+ author_id: string;
+ content: string;
+ created_at: string;
+}
+
export interface Message {
id: string;
conversation_id: string;
@@ -266,6 +276,7 @@ export type WsMessage =
| { type: "followup.deleted"; conversationId: string; messageId: string }
| { type: "followup.dispatch_failed"; conversationId: string; messageId: string; error: string }
| { type: "conversation.message"; conversationId: string; message: Message }
+ | { type: "issue.comment"; issueId: string; comment: IssueComment }
| { type: "workspace.files"; agentId: string; requestId: string; requestType: "tree" | "read"; result: WorkspaceFileResult }
export interface WorkspaceFileResult {
diff --git a/src/web/migrations/0023_issue_comment.sql b/src/web/migrations/0023_issue_comment.sql
new file mode 100644
index 000000000..df9cc1887
--- /dev/null
+++ b/src/web/migrations/0023_issue_comment.sql
@@ -0,0 +1,15 @@
+CREATE TABLE IF NOT EXISTS issue_comment (
+ id TEXT PRIMARY KEY,
+ issue_id TEXT NOT NULL REFERENCES issue(id) ON DELETE CASCADE,
+ workspace_id TEXT NOT NULL REFERENCES workspace(id) ON DELETE CASCADE,
+ author_type TEXT NOT NULL DEFAULT 'user',
+ author_id TEXT NOT NULL,
+ content TEXT NOT NULL,
+ created_at TEXT NOT NULL DEFAULT (datetime('now'))
+);
+
+CREATE INDEX IF NOT EXISTS idx_issue_comment_issue
+ ON issue_comment(issue_id, created_at);
+
+CREATE INDEX IF NOT EXISTS idx_issue_comment_workspace
+ ON issue_comment(workspace_id, issue_id);
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 c7d093f02..28abc1430 100644
--- a/src/web/src/app/(app)/w/[slug]/issues/page.tsx
+++ b/src/web/src/app/(app)/w/[slug]/issues/page.tsx
@@ -3,7 +3,8 @@
import { useCallback, useEffect, useMemo, useState } from "react";
import { Check, CheckCircle2, CircleDot, ExternalLink, File as FileIcon, GitBranch, Loader2, MessageSquare, Plus, Trash2, X } from "lucide-react";
import Link from "next/link";
-import type { Agent, Artifact, Issue, Message, WsMessage } from "@alook/shared";
+import type { Agent, Artifact, Issue, IssueComment, Message, WsMessage } from "@alook/shared";
+import { isTerminalIssueStatus } from "@alook/shared";
import { useWorkspace } from "@/contexts/workspace-context";
import { useAgentContext } from "@/contexts/agent-context";
import { createIssue, deleteIssue, getIssue, getTask, getTaskMessages, listIssues } from "@/lib/api";
@@ -23,6 +24,7 @@ import { Popover, PopoverTrigger, PopoverContent } from "@/components/ui/popover
import { Sheet, SheetContent, SheetHeader, SheetTitle, SheetBody } from "@/components/ui/sheet";
import { AvatarRenderer, parseAvatarUrl } from "@/components/avatar";
import { ContextMenu, ContextMenuContent, ContextMenuItem, ContextMenuTrigger } from "@/components/ui/context-menu";
+import { Textarea } from "@/components/ui/textarea";
import { cn } from "@/lib/utils";
import { toast } from "sonner";
import { Streamdown } from "streamdown";
@@ -173,6 +175,62 @@ function MessageRow({ message }: { message: Message }) {
);
}
+function CommentRow({ comment, agents }: { comment: IssueComment; agents: Agent[] }) {
+ const authorLabel = comment.author_type === "agent"
+ ? agents.find((a) => a.id === comment.author_id)?.name ?? "Agent"
+ : "You";
+
+ return (
+ <div className="rounded-lg border border-border/60 bg-background p-3">
+ <div className="mb-1 flex items-center justify-between gap-2 text-xs text-muted-foreground">
+ <span className="font-medium">{authorLabel}</span>
+ <span>{new Date(comment.created_at).toLocaleString()}</span>
+ </div>
+ <div className="prose prose-sm dark:prose-invert max-w-none text-sm break-words">
+ <Streamdown>{comment.content}</Streamdown>
+ </div>
+ </div>
+ );
+}
+
+function CommentInput({ issueId, workspaceId, onCommented }: { issueId: string; workspaceId: string; onCommented: () => void }) {
+ const [content, setContent] = useState("");
+ const [submitting, setSubmitting] = useState(false);
+
+ const submit = async () => {
+ if (!content.trim() || submitting) return;
+ setSubmitting(true);
+ try {
+ await fetch(`/api/issues/${issueId}/comments?workspace_id=${workspaceId}`, {
+ method: "POST",
+ headers: { "Content-Type": "application/json" },
+ body: JSON.stringify({ content: content.trim() }),
+ });
+ setContent("");
+ onCommented();
+ } finally {
+ setSubmitting(false);
+ }
+ };
+
+ return (
+ <div className="border-t border-border/60 pt-3 space-y-2">
+ <Textarea
+ placeholder="Leave a comment..."
+ value={content}
+ onChange={(e) => setContent(e.target.value)}
+ className="min-h-[60px] text-sm"
+ onKeyDown={(e) => { if (e.key === "Enter" && e.metaKey) submit(); }}
+ />
+ <div className="flex justify-end">
+ <Button size="sm" onClick={submit} disabled={!content.trim() || submitting}>
+ {submitting ? "Sending..." : "Comment"}
+ </Button>
+ </div>
+ </div>
+ );
+}
+
function AttachmentList({ artifacts, workspaceId }: { artifacts: Artifact[]; workspaceId: string }) {
if (artifacts.length === 0) return null;
@@ -204,7 +262,7 @@ export default function IssuesPage() {
const [dialogOpen, setDialogOpen] = useState(false);
const [assigneeOpen, setAssigneeOpen] = useState(false);
const [selectedId, setSelectedId] = useState<string | null>(null);
- const [detail, setDetail] = useState<{ issue: Issue & { trace_id?: string | null }; messages: Message[]; artifacts: Artifact[] } | null>(null);
+ 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>("");
@@ -308,6 +366,13 @@ export default function IssuesPage() {
}
}
}
+ if (msg.type === "issue.comment" && selectedId === msg.issueId) {
+ setDetail((prev) => {
+ if (!prev) return prev;
+ if (prev.comments.some((c) => c.id === msg.comment.id)) return prev;
+ return { ...prev, comments: [...prev.comments, msg.comment] };
+ });
+ }
if (msg.type === "task.updated" && (msg.status === "running" || msg.status === "completed" || msg.status === "failed")) {
reload();
if (selectedId) openIssue(selectedId);
@@ -317,7 +382,7 @@ export default function IssuesPage() {
}
});
// eslint-disable-next-line react-hooks/exhaustive-deps
- }, [detailConvId, subscribeWs]);
+ }, [detailConvId, selectedId, subscribeWs]);
async function handleCreate() {
if (!form.title.trim() || !form.agentId) return;
@@ -651,11 +716,26 @@ export default function IssuesPage() {
</div>
<AttachmentList artifacts={detail.artifacts ?? []} workspaceId={workspaceId} />
<div className="space-y-2 border-t border-border/60 pt-4">
- {detail.messages.length === 0 && !isTaskActive ? (
- <div className="text-xs text-muted-foreground">No messages yet.</div>
- ) : (
- detail.messages.map((message) => <MessageRow key={message.id} message={message} />)
- )}
+ {(() => {
+ const events = detail.messages
+ .filter((m) => m.role === "event")
+ .map((m) => ({ kind: "event" as const, id: m.id, created_at: m.created_at, data: m }));
+ const comments = (detail.comments ?? [])
+ .map((c) => ({ kind: "comment" as const, id: c.id, created_at: c.created_at, data: c }));
+ const timeline = [...events, ...comments].sort(
+ (a, b) => new Date(a.created_at).getTime() - new Date(b.created_at).getTime()
+ );
+
+ if (timeline.length === 0 && !isTaskActive) {
+ return <div className="text-xs text-muted-foreground">No activity yet.</div>;
+ }
+
+ return timeline.map((item) =>
+ item.kind === "event"
+ ? <MessageRow key={item.id} message={item.data} />
+ : <CommentRow key={item.id} comment={item.data} agents={agents} />
+ );
+ })()}
{isTaskActive && (
<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">
@@ -668,6 +748,9 @@ export default function IssuesPage() {
</div>
)}
</div>
+ {!isTaskActive && !isTerminalIssueStatus(detail.issue.status) && (
+ <CommentInput issueId={detail.issue.id} workspaceId={workspaceId} onCommented={() => openIssue(detail.issue.id)} />
+ )}
</div>
)}
</SheetBody>
diff --git a/src/web/src/app/(app)/w/[slug]/threads/[traceId]/page.tsx b/src/web/src/app/(app)/w/[slug]/threads/[traceId]/page.tsx
index 2bd21a64b..cfa20aa6c 100644
--- a/src/web/src/app/(app)/w/[slug]/threads/[traceId]/page.tsx
+++ b/src/web/src/app/(app)/w/[slug]/threads/[traceId]/page.tsx
@@ -131,7 +131,7 @@ function TaskNode({ node, slug }: { node: TreeNode; slug: string }) {
<div className="flex-1 min-w-0">
<div className="flex items-center gap-2 min-w-0">
<span className="text-sm text-foreground truncate flex-1 min-w-0">
- {node.prompt}
+ {node.prompt.split("\n")[0]}
</span>
<span className="text-xs text-muted-foreground shrink-0 ml-2" title={new Date(node.created_at).toLocaleString()}>
{relativeTime(node.created_at)}
diff --git a/src/web/src/app/(app)/w/[slug]/threads/page.tsx b/src/web/src/app/(app)/w/[slug]/threads/page.tsx
index f45ed42a7..67ae4d874 100644
--- a/src/web/src/app/(app)/w/[slug]/threads/page.tsx
+++ b/src/web/src/app/(app)/w/[slug]/threads/page.tsx
@@ -97,7 +97,7 @@ function TraceRow({ trace, slug }: { trace: TraceListItem; slug: string }) {
<div className="flex-1 min-w-0">
<div className="flex items-center gap-2 min-w-0">
<span className="text-sm text-foreground truncate flex-1 min-w-0">
- {trace.root_prompt}
+ {trace.root_prompt.split("\n")[0]}
</span>
<span className="text-xs text-muted-foreground shrink-0 ml-2" title={new Date(trace.started_at).toLocaleString()}>
{relativeTime(trace.started_at)}
diff --git a/src/web/src/app/api/issues/[id]/comments/route.ts b/src/web/src/app/api/issues/[id]/comments/route.ts
new file mode 100644
index 000000000..1c46c8ddd
--- /dev/null
+++ b/src/web/src/app/api/issues/[id]/comments/route.ts
@@ -0,0 +1,107 @@
+import { NextRequest } from "next/server";
+import { getCloudflareContext } from "@opennextjs/cloudflare";
+import {
+ CreateIssueCommentBodySchema,
+ TASK_TYPES,
+ isTerminalIssueStatus,
+ queries,
+} from "@alook/shared";
+import { getDb } from "@/lib/db";
+import { withAuth } from "@/lib/middleware/auth";
+import { withWorkspaceMember } from "@/lib/middleware/workspace";
+import { parseBody, writeError, writeJSON } from "@/lib/middleware/helpers";
+import { broadcastToUser } from "@/lib/broadcast";
+import { TaskService } from "@/lib/services/task";
+
+export const GET = withAuth(async (req: NextRequest, ctx) => {
+ const ws = await withWorkspaceMember(req, ctx);
+ if (ws instanceof Response) return ws;
+
+ const { env } = getCloudflareContext();
+ const db = getDb((env as Env).DB);
+ const id = ctx.params?.id;
+ if (!id) return writeError("issue id is required", 400);
+
+ const issue = await queries.issue.getIssue(db, id, ws.workspaceId);
+ if (!issue) return writeError("issue not found", 404);
+
+ const comments = await queries.issueComment.listComments(db, id, ws.workspaceId);
+ return writeJSON({ comments: comments.map(queries.issueComment.commentToResponse) });
+});
+
+export const POST = withAuth(async (req: NextRequest, ctx) => {
+ const ws = await withWorkspaceMember(req, ctx);
+ if (ws instanceof Response) return ws;
+
+ const { env } = getCloudflareContext();
+ const db = getDb((env as Env).DB);
+ const id = ctx.params?.id;
+ if (!id) return writeError("issue id is required", 400);
+
+ const issue = await queries.issue.getIssue(db, id, ws.workspaceId);
+ if (!issue) return writeError("issue not found", 404);
+
+ const agentId = req.nextUrl.searchParams.get("agentId");
+ if (agentId && issue.agentId !== agentId) return writeError("issue does not belong to agent", 403);
+
+ const [body, err] = await parseBody(req, CreateIssueCommentBodySchema);
+ if (err) return err;
+
+ const authorType = agentId ? ("agent" as const) : ("user" as const);
+ const authorId = agentId ?? ctx.userId;
+
+ const comment = await queries.issueComment.createComment(db, {
+ issueId: id,
+ workspaceId: ws.workspaceId,
+ authorType,
+ authorId,
+ content: body.content,
+ });
+
+ await queries.issue.updateIssue(db, id, ws.workspaceId, {});
+
+ const response = queries.issueComment.commentToResponse(comment);
+
+ broadcastToUser(issue.creatorUserId, {
+ type: "issue.comment",
+ issueId: id,
+ comment: response,
+ }).catch(() => {});
+
+ // Re-dispatch agent when user comments on a non-terminal, non-working issue
+ if (authorType === "user" && !isTerminalIssueStatus(issue.status)) {
+ const activeTask = await queries.task.getActiveTaskByConversation(
+ db, issue.conversationId, ws.workspaceId
+ );
+ if (!activeTask) {
+ const taskService = new TaskService(db);
+ const prompt = `${issue.title}\n\nUser feedback: "${body.content}"`;
+
+
+ try {
+ const existingTraceId = issue.latestTaskId
+ ? (await queries.task.getTask(db, issue.latestTaskId, ws.workspaceId))?.traceId ?? null
+ : null;
+
+ const task = await taskService.enqueueTask(
+ issue.agentId,
+ issue.conversationId,
+ ws.workspaceId,
+ prompt,
+ TASK_TYPES.ISSUE_EVENT,
+ {
+ contextKey: issue.id,
+ context: { issue_id: issue.id },
+ traceId: existingTraceId,
+ parentTaskId: null,
+ }
+ );
+ await queries.issue.setLatestTask(db, id, ws.workspaceId, task.id);
+ } catch {
+ // Non-fatal: comment is saved, dispatch failure doesn't block
+ }
+ }
+ }
+
+ return writeJSON({ comment: response }, 201);
+});
diff --git a/src/web/src/app/api/issues/[id]/route.test.ts b/src/web/src/app/api/issues/[id]/route.test.ts
index 738cd4cd6..bb2019e7a 100644
--- a/src/web/src/app/api/issues/[id]/route.test.ts
+++ b/src/web/src/app/api/issues/[id]/route.test.ts
@@ -7,6 +7,8 @@ const mockUpdateIssue = vi.fn();
const mockDeleteIssue = vi.fn();
const mockCreateMessage = vi.fn();
const mockListArtifactsByConversation = vi.fn();
+const mockListComments = vi.fn();
+const mockCreateComment = vi.fn();
vi.mock("@opennextjs/cloudflare", () => ({
getCloudflareContext: vi.fn(() => ({ env: { DB: {} } })),
@@ -29,6 +31,11 @@ vi.mock("@alook/shared", async () => {
getTask: vi.fn().mockResolvedValue(null),
},
message: { createMessage: (...a: unknown[]) => mockCreateMessage(...a) },
+ issueComment: {
+ listComments: (...a: unknown[]) => mockListComments(...a),
+ createComment: (...a: unknown[]) => mockCreateComment(...a),
+ commentToResponse: (c: any) => ({ id: c.id, content: c.content, author_type: c.authorType ?? "user", author_id: c.authorId ?? "u1", created_at: c.createdAt ?? new Date().toISOString() }),
+ },
artifact: {
listArtifactsByConversation: (...a: unknown[]) => mockListArtifactsByConversation(...a),
artifactToResponse: (a: any) => ({ id: a.id, filename: a.filename }),
@@ -61,12 +68,14 @@ describe("GET /api/issues/[id]", () => {
it("returns issue and messages", async () => {
mockGetIssue.mockResolvedValue({ id: "iss_1", status: "todo", conversationId: "c1" });
mockListIssueMessages.mockResolvedValue([{ id: "m1", role: "event", content: "Created" }]);
+ mockListComments.mockResolvedValue([]);
mockListArtifactsByConversation.mockResolvedValue([{ id: "art_1", filename: "brief.md" }]);
const res = await GET(new NextRequest("http://localhost/api/issues/iss_1"), { params: { id: "iss_1" } } as any);
expect(res.status).toBe(200);
expect(await res.json()).toEqual({
issue: { id: "iss_1", status: "todo", conversation_id: "c1", trace_id: null },
messages: [{ id: "m1", role: "event", content: "Created" }],
+ comments: [],
artifacts: [{ id: "art_1", filename: "brief.md" }],
});
expect(mockListArtifactsByConversation).toHaveBeenCalledWith({}, "c1", "w1");
@@ -90,8 +99,8 @@ describe("PATCH /api/issues/[id]", () => {
describe("POST /api/issues/[id]", () => {
it("adds a user comment for browser callers", async () => {
- mockGetIssue.mockResolvedValue({ id: "iss_1", status: "todo", conversationId: "c1" });
- mockCreateMessage.mockResolvedValue({ id: "m1", role: "user", content: "Looks good" });
+ mockGetIssue.mockResolvedValue({ id: "iss_1", status: "todo", conversationId: "c1", agentId: "a1" });
+ mockCreateComment.mockResolvedValue({ id: "ic_1", issueId: "iss_1", workspaceId: "w1", authorType: "user", authorId: "u1", content: "Looks good", createdAt: "2026-01-01T00:00:00Z" });
mockUpdateIssue.mockResolvedValue({ id: "iss_1" });
const req = new NextRequest("http://localhost/api/issues/iss_1", {
method: "POST",
@@ -99,7 +108,7 @@ describe("POST /api/issues/[id]", () => {
});
const res = await POST(req, { params: { id: "iss_1" } } as any);
expect(res.status).toBe(201);
- expect(mockCreateMessage).toHaveBeenCalledWith({}, expect.objectContaining({ role: "user", content: "Looks good" }));
+ expect(mockCreateComment).toHaveBeenCalledWith({}, expect.objectContaining({ issueId: "iss_1", content: "Looks good", authorType: "user" }));
});
});
diff --git a/src/web/src/app/api/issues/[id]/route.ts b/src/web/src/app/api/issues/[id]/route.ts
index 1f959904d..00d4bac8a 100644
--- a/src/web/src/app/api/issues/[id]/route.ts
+++ b/src/web/src/app/api/issues/[id]/route.ts
@@ -1,7 +1,7 @@
import { NextRequest } from "next/server";
import { getCloudflareContext } from "@opennextjs/cloudflare";
import {
- CreateIssueCommentRequestSchema,
+ CreateIssueCommentBodySchema,
UpdateIssueRequestSchema,
queries,
} from "@alook/shared";
@@ -32,6 +32,7 @@ export const GET = withAuth(async (req: NextRequest, ctx) => {
}
const messages = await queries.issue.listIssueMessages(db, id, ws.workspaceId);
+ const comments = await queries.issueComment.listComments(db, id, ws.workspaceId);
const artifacts = await queries.artifact.listArtifactsByConversation(
db,
issue.conversationId,
@@ -40,6 +41,7 @@ export const GET = withAuth(async (req: NextRequest, ctx) => {
return writeJSON({
issue: { ...issueToResponse(issue), trace_id: traceId },
messages: (messages ?? []).map(messageToResponse),
+ comments: comments.map(queries.issueComment.commentToResponse),
artifacts: artifacts.map(queries.artifact.artifactToResponse),
});
});
@@ -108,16 +110,21 @@ export const POST = withAuth(async (req: NextRequest, ctx) => {
const agentId = req.nextUrl.searchParams.get("agentId");
if (agentId && issue.agentId !== agentId) return writeError("issue does not belong to agent", 403);
- const [body, err] = await parseBody(req, CreateIssueCommentRequestSchema);
+ const [body, err] = await parseBody(req, CreateIssueCommentBodySchema);
if (err) return err;
- const message = await queries.message.createMessage(db, {
- conversationId: issue.conversationId,
- role: ctx.workspaceId ? "assistant" : "user",
+ const authorType = agentId ? ("agent" as const) : ("user" as const);
+ const authorId = agentId ?? ctx.userId;
+
+ const comment = await queries.issueComment.createComment(db, {
+ issueId: id,
+ workspaceId: ws.workspaceId,
+ authorType,
+ authorId,
content: body.content,
});
await queries.issue.updateIssue(db, id, ws.workspaceId, {});
- return writeJSON({ message: messageToResponse(message) }, 201);
+ return writeJSON({ comment: queries.issueComment.commentToResponse(comment) }, 201);
});
diff --git a/src/web/src/app/api/issues/route.test.ts b/src/web/src/app/api/issues/route.test.ts
index 5b3e6bbcd..6e5bee5fa 100644
--- a/src/web/src/app/api/issues/route.test.ts
+++ b/src/web/src/app/api/issues/route.test.ts
@@ -101,7 +101,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("Issue iss_1"), "issue_event", expect.objectContaining({ contextKey: "iss_1" }));
+ expect(mockEnqueueTask).toHaveBeenCalledWith("ag_1", "c1", "w1", expect.stringContaining("Fix"), "issue_event", expect.objectContaining({ contextKey: "iss_1" }));
});
it("uploads attachments and includes attachment ids in the issue task context", async () => {
@@ -144,7 +144,7 @@ describe("POST /api/issues", () => {
"ag_1",
"c1",
"w1",
- expect.stringContaining("Issue iss_1"),
+ expect.stringContaining("Fix"),
"issue_event",
expect.objectContaining({
contextKey: "iss_1",
diff --git a/src/web/src/app/api/issues/route.ts b/src/web/src/app/api/issues/route.ts
index a22a19a17..5fa1dfb04 100644
--- a/src/web/src/app/api/issues/route.ts
+++ b/src/web/src/app/api/issues/route.ts
@@ -18,19 +18,9 @@ function sanitizeFilename(name: string): string {
return name.replace(/[/\\]/g, "_").replace(/\.\./g, "_").slice(0, 255) || "file";
}
-function buildIssuePrompt(issue: { id: string; title: string; description: string }) {
- const description = issue.description.trim() || "(no description)";
- return [
- `Issue ${issue.id}: ${issue.title}`,
- "",
- description,
- "",
- "Use the issue CLI to keep this issue updated:",
- `- alook issue show --agent_id <your_agent_id> --issue_id ${issue.id}`,
- `- alook issue update --agent_id <your_agent_id> --issue_id ${issue.id} --status in_progress`,
- `- alook issue comment --agent_id <your_agent_id> --issue_id ${issue.id} --body-file <path>`,
- `- alook issue update --agent_id <your_agent_id> --issue_id ${issue.id} --status done`,
- ].join("\n");
+function buildIssuePrompt(issue: { title: string; description: string }) {
+ const description = issue.description.trim();
+ return description ? `${issue.title}\n\n${description}` : issue.title;
}
export const GET = withAuth(async (req: NextRequest, ctx) => {
@@ -170,7 +160,6 @@ export const POST = withAuth(async (req: NextRequest, ctx) => {
});
const prompt = buildIssuePrompt({
- id: created.id,
title: created.title,
description: created.description,
});
diff --git a/src/web/src/lib/api.ts b/src/web/src/lib/api.ts
index b3cf8c253..71aadc393 100644
--- a/src/web/src/lib/api.ts
+++ b/src/web/src/lib/api.ts
@@ -19,6 +19,7 @@ import type {
UpdateAgentRequest,
Email,
Issue,
+ IssueComment,
LoginResponse,
MeetingSession,
Message,
@@ -639,6 +640,7 @@ export const deleteCalendarEvent = (
export interface IssueDetailResponse {
issue: Issue & { trace_id?: string | null };
messages: Message[];
+ comments: IssueComment[];
artifacts: Artifact[];
}
diff --git a/src/web/src/lib/services/task.test.ts b/src/web/src/lib/services/task.test.ts
index 3e16a6a3a..33f1b44ba 100644
--- a/src/web/src/lib/services/task.test.ts
+++ b/src/web/src/lib/services/task.test.ts
@@ -306,18 +306,11 @@ describe("TaskService", () => {
status: "running",
};
taskQ.startTask.mockResolvedValue(task);
- issueQ.getIssue.mockResolvedValue({ id: "iss_1", status: "todo", conversationId: "c1" });
- issueQ.updateIssue.mockResolvedValue({ id: "iss_1", status: "in_progress", conversationId: "c1" });
await service.startTask("t1", "w1");
- expect(issueQ.updateIssue).toHaveBeenCalledWith({}, "iss_1", "w1", { status: "in_progress" });
- expect(messageQ.createMessage).toHaveBeenCalledWith({}, {
- conversationId: "c1",
- role: "event",
- content: "Issue status changed: todo -> in_progress",
- taskId: "t1",
- });
+ // Agent now controls issue status via CLI — startTask no longer auto-syncs
+ expect(issueQ.updateIssue).not.toHaveBeenCalled();
});
});
@@ -403,18 +396,11 @@ describe("TaskService", () => {
taskQ.completeTask.mockResolvedValue(task);
taskQ.countRunningTasks.mockResolvedValue(0);
agentQ.updateAgentStatus.mockResolvedValue(undefined);
- issueQ.getIssue.mockResolvedValue({ id: "iss_1", status: "in_progress", conversationId: "c1" });
- issueQ.updateIssue.mockResolvedValue({ id: "iss_1", status: "done", conversationId: "c1" });
await service.completeTask("t1", "w1", JSON.stringify({}), "sess-1");
- expect(issueQ.updateIssue).toHaveBeenCalledWith({}, "iss_1", "w1", { status: "done" });
- expect(messageQ.createMessage).toHaveBeenCalledWith({}, {
- conversationId: "c1",
- role: "event",
- content: "Issue status changed: in_progress -> done",
- taskId: "t1",
- });
+ // Agent now controls issue status via CLI — completeTask no longer auto-syncs
+ expect(issueQ.updateIssue).not.toHaveBeenCalled();
});
});
diff --git a/src/web/src/lib/services/task.ts b/src/web/src/lib/services/task.ts
index 03b1237f7..c6ed5cadc 100644
--- a/src/web/src/lib/services/task.ts
+++ b/src/web/src/lib/services/task.ts
@@ -109,7 +109,6 @@ export class TaskService {
if (!task) {
throw new Error("task not in dispatched status");
}
- await this.syncIssueStatusFromTask(task, "in_progress");
return task;
}
@@ -152,7 +151,6 @@ export class TaskService {
}
await this.reconcileAgentStatus(task.agentId, task.workspaceId);
- await this.syncIssueStatusFromTask(task, "done");
await this.dispatchNextBufferedMessage(task.conversationId, task.workspaceId);
return task;
}
@@ -188,7 +186,7 @@ export class TaskService {
private async syncIssueStatusFromTask(
task: { id: string; type?: string | null; contextKey?: string | null; workspaceId: string; conversationId: string },
- status: "in_progress" | "done" | "failed",
+ status: "failed",
) {
if (task.type !== TASK_TYPES.ISSUE_EVENT || !task.contextKey) return;