@minimalcorp/tsunagi 0.1.3 → 0.1.5

package/dist/server/generated/prisma/models/Task.d.ts

@@ -227,7 +227,7 @@ export type TaskGroupByOutputType = {
     worktreeStatus: string;
     pullRequestUrl: string | null;
     effort: number | null;
-    order: number | null;
+    order: number;
     deletedAt: Date | null;
     createdAt: Date;
     updatedAt: Date;
@@ -256,7 +256,7 @@ export type TaskWhereInput = {
     worktreeStatus?: Prisma.StringFilter<"Task"> | string;
     pullRequestUrl?: Prisma.StringNullableFilter<"Task"> | string | null;
     effort?: Prisma.IntNullableFilter<"Task"> | number | null;
-    order?: Prisma.IntNullableFilter<"Task"> | number | null;
+    order?: Prisma.IntFilter<"Task"> | number;
     deletedAt?: Prisma.DateTimeNullableFilter<"Task"> | Date | string | null;
     createdAt?: Prisma.DateTimeFilter<"Task"> | Date | string;
     updatedAt?: Prisma.DateTimeFilter<"Task"> | Date | string;
@@ -276,7 +276,7 @@ export type TaskOrderByWithRelationInput = {
     worktreeStatus?: Prisma.SortOrder;
     pullRequestUrl?: Prisma.SortOrderInput | Prisma.SortOrder;
     effort?: Prisma.SortOrderInput | Prisma.SortOrder;
-    order?: Prisma.SortOrderInput | Prisma.SortOrder;
+    order?: Prisma.SortOrder;
     deletedAt?: Prisma.SortOrderInput | Prisma.SortOrder;
     createdAt?: Prisma.SortOrder;
     updatedAt?: Prisma.SortOrder;
@@ -299,7 +299,7 @@ export type TaskWhereUniqueInput = Prisma.AtLeast<{
     worktreeStatus?: Prisma.StringFilter<"Task"> | string;
     pullRequestUrl?: Prisma.StringNullableFilter<"Task"> | string | null;
     effort?: Prisma.IntNullableFilter<"Task"> | number | null;
-    order?: Prisma.IntNullableFilter<"Task"> | number | null;
+    order?: Prisma.IntFilter<"Task"> | number;
     deletedAt?: Prisma.DateTimeNullableFilter<"Task"> | Date | string | null;
     createdAt?: Prisma.DateTimeFilter<"Task"> | Date | string;
     updatedAt?: Prisma.DateTimeFilter<"Task"> | Date | string;
@@ -319,7 +319,7 @@ export type TaskOrderByWithAggregationInput = {
     worktreeStatus?: Prisma.SortOrder;
     pullRequestUrl?: Prisma.SortOrderInput | Prisma.SortOrder;
     effort?: Prisma.SortOrderInput | Prisma.SortOrder;
-    order?: Prisma.SortOrderInput | Prisma.SortOrder;
+    order?: Prisma.SortOrder;
     deletedAt?: Prisma.SortOrderInput | Prisma.SortOrder;
     createdAt?: Prisma.SortOrder;
     updatedAt?: Prisma.SortOrder;
@@ -345,7 +345,7 @@ export type TaskScalarWhereWithAggregatesInput = {
     worktreeStatus?: Prisma.StringWithAggregatesFilter<"Task"> | string;
     pullRequestUrl?: Prisma.StringNullableWithAggregatesFilter<"Task"> | string | null;
     effort?: Prisma.IntNullableWithAggregatesFilter<"Task"> | number | null;
-    order?: Prisma.IntNullableWithAggregatesFilter<"Task"> | number | null;
+    order?: Prisma.IntWithAggregatesFilter<"Task"> | number;
     deletedAt?: Prisma.DateTimeNullableWithAggregatesFilter<"Task"> | Date | string | null;
     createdAt?: Prisma.DateTimeWithAggregatesFilter<"Task"> | Date | string;
     updatedAt?: Prisma.DateTimeWithAggregatesFilter<"Task"> | Date | string;
@@ -362,7 +362,7 @@ export type TaskCreateInput = {
     worktreeStatus: string;
     pullRequestUrl?: string | null;
     effort?: number | null;
-    order?: number | null;
+    order?: number;
     deletedAt?: Date | string | null;
     createdAt?: Date | string;
     updatedAt?: Date | string;
@@ -382,7 +382,7 @@ export type TaskUncheckedCreateInput = {
     worktreeStatus: string;
     pullRequestUrl?: string | null;
     effort?: number | null;
-    order?: number | null;
+    order?: number;
     deletedAt?: Date | string | null;
     createdAt?: Date | string;
     updatedAt?: Date | string;
@@ -400,7 +400,7 @@ export type TaskUpdateInput = {
     worktreeStatus?: Prisma.StringFieldUpdateOperationsInput | string;
     pullRequestUrl?: Prisma.NullableStringFieldUpdateOperationsInput | string | null;
     effort?: Prisma.NullableIntFieldUpdateOperationsInput | number | null;
-    order?: Prisma.NullableIntFieldUpdateOperationsInput | number | null;
+    order?: Prisma.IntFieldUpdateOperationsInput | number;
     deletedAt?: Prisma.NullableDateTimeFieldUpdateOperationsInput | Date | string | null;
     createdAt?: Prisma.DateTimeFieldUpdateOperationsInput | Date | string;
     updatedAt?: Prisma.DateTimeFieldUpdateOperationsInput | Date | string;
@@ -420,7 +420,7 @@ export type TaskUncheckedUpdateInput = {
     worktreeStatus?: Prisma.StringFieldUpdateOperationsInput | string;
     pullRequestUrl?: Prisma.NullableStringFieldUpdateOperationsInput | string | null;
     effort?: Prisma.NullableIntFieldUpdateOperationsInput | number | null;
-    order?: Prisma.NullableIntFieldUpdateOperationsInput | number | null;
+    order?: Prisma.IntFieldUpdateOperationsInput | number;
     deletedAt?: Prisma.NullableDateTimeFieldUpdateOperationsInput | Date | string | null;
     createdAt?: Prisma.DateTimeFieldUpdateOperationsInput | Date | string;
     updatedAt?: Prisma.DateTimeFieldUpdateOperationsInput | Date | string;
@@ -439,7 +439,7 @@ export type TaskCreateManyInput = {
     worktreeStatus: string;
     pullRequestUrl?: string | null;
     effort?: number | null;
-    order?: number | null;
+    order?: number;
     deletedAt?: Date | string | null;
     createdAt?: Date | string;
     updatedAt?: Date | string;
@@ -456,7 +456,7 @@ export type TaskUpdateManyMutationInput = {
     worktreeStatus?: Prisma.StringFieldUpdateOperationsInput | string;
     pullRequestUrl?: Prisma.NullableStringFieldUpdateOperationsInput | string | null;
     effort?: Prisma.NullableIntFieldUpdateOperationsInput | number | null;
-    order?: Prisma.NullableIntFieldUpdateOperationsInput | number | null;
+    order?: Prisma.IntFieldUpdateOperationsInput | number;
     deletedAt?: Prisma.NullableDateTimeFieldUpdateOperationsInput | Date | string | null;
     createdAt?: Prisma.DateTimeFieldUpdateOperationsInput | Date | string;
     updatedAt?: Prisma.DateTimeFieldUpdateOperationsInput | Date | string;
@@ -474,7 +474,7 @@ export type TaskUncheckedUpdateManyInput = {
     worktreeStatus?: Prisma.StringFieldUpdateOperationsInput | string;
     pullRequestUrl?: Prisma.NullableStringFieldUpdateOperationsInput | string | null;
     effort?: Prisma.NullableIntFieldUpdateOperationsInput | number | null;
-    order?: Prisma.NullableIntFieldUpdateOperationsInput | number | null;
+    order?: Prisma.IntFieldUpdateOperationsInput | number;
     deletedAt?: Prisma.NullableDateTimeFieldUpdateOperationsInput | Date | string | null;
     createdAt?: Prisma.DateTimeFieldUpdateOperationsInput | Date | string;
     updatedAt?: Prisma.DateTimeFieldUpdateOperationsInput | Date | string;
@@ -601,6 +601,13 @@ export type NullableIntFieldUpdateOperationsInput = {
     multiply?: number;
     divide?: number;
 };
+export type IntFieldUpdateOperationsInput = {
+    set?: number;
+    increment?: number;
+    decrement?: number;
+    multiply?: number;
+    divide?: number;
+};
 export type NullableDateTimeFieldUpdateOperationsInput = {
     set?: Date | string | null;
 };
@@ -628,7 +635,7 @@ export type TaskCreateWithoutRepositoryInput = {
     worktreeStatus: string;
     pullRequestUrl?: string | null;
     effort?: number | null;
-    order?: number | null;
+    order?: number;
     deletedAt?: Date | string | null;
     createdAt?: Date | string;
     updatedAt?: Date | string;
@@ -646,7 +653,7 @@ export type TaskUncheckedCreateWithoutRepositoryInput = {
     worktreeStatus: string;
     pullRequestUrl?: string | null;
     effort?: number | null;
-    order?: number | null;
+    order?: number;
     deletedAt?: Date | string | null;
     createdAt?: Date | string;
     updatedAt?: Date | string;
@@ -688,7 +695,7 @@ export type TaskScalarWhereInput = {
     worktreeStatus?: Prisma.StringFilter<"Task"> | string;
     pullRequestUrl?: Prisma.StringNullableFilter<"Task"> | string | null;
     effort?: Prisma.IntNullableFilter<"Task"> | number | null;
-    order?: Prisma.IntNullableFilter<"Task"> | number | null;
+    order?: Prisma.IntFilter<"Task"> | number;
     deletedAt?: Prisma.DateTimeNullableFilter<"Task"> | Date | string | null;
     createdAt?: Prisma.DateTimeFilter<"Task"> | Date | string;
     updatedAt?: Prisma.DateTimeFilter<"Task"> | Date | string;
@@ -705,7 +712,7 @@ export type TaskCreateWithoutTabsInput = {
     worktreeStatus: string;
     pullRequestUrl?: string | null;
     effort?: number | null;
-    order?: number | null;
+    order?: number;
     deletedAt?: Date | string | null;
     createdAt?: Date | string;
     updatedAt?: Date | string;
@@ -724,7 +731,7 @@ export type TaskUncheckedCreateWithoutTabsInput = {
     worktreeStatus: string;
     pullRequestUrl?: string | null;
     effort?: number | null;
-    order?: number | null;
+    order?: number;
     deletedAt?: Date | string | null;
     createdAt?: Date | string;
     updatedAt?: Date | string;
@@ -754,7 +761,7 @@ export type TaskUpdateWithoutTabsInput = {
     worktreeStatus?: Prisma.StringFieldUpdateOperationsInput | string;
     pullRequestUrl?: Prisma.NullableStringFieldUpdateOperationsInput | string | null;
     effort?: Prisma.NullableIntFieldUpdateOperationsInput | number | null;
-    order?: Prisma.NullableIntFieldUpdateOperationsInput | number | null;
+    order?: Prisma.IntFieldUpdateOperationsInput | number;
     deletedAt?: Prisma.NullableDateTimeFieldUpdateOperationsInput | Date | string | null;
     createdAt?: Prisma.DateTimeFieldUpdateOperationsInput | Date | string;
     updatedAt?: Prisma.DateTimeFieldUpdateOperationsInput | Date | string;
@@ -773,7 +780,7 @@ export type TaskUncheckedUpdateWithoutTabsInput = {
     worktreeStatus?: Prisma.StringFieldUpdateOperationsInput | string;
     pullRequestUrl?: Prisma.NullableStringFieldUpdateOperationsInput | string | null;
     effort?: Prisma.NullableIntFieldUpdateOperationsInput | number | null;
-    order?: Prisma.NullableIntFieldUpdateOperationsInput | number | null;
+    order?: Prisma.IntFieldUpdateOperationsInput | number;
     deletedAt?: Prisma.NullableDateTimeFieldUpdateOperationsInput | Date | string | null;
     createdAt?: Prisma.DateTimeFieldUpdateOperationsInput | Date | string;
     updatedAt?: Prisma.DateTimeFieldUpdateOperationsInput | Date | string;
@@ -790,7 +797,7 @@ export type TaskCreateManyRepositoryInput = {
     worktreeStatus: string;
     pullRequestUrl?: string | null;
     effort?: number | null;
-    order?: number | null;
+    order?: number;
     deletedAt?: Date | string | null;
     createdAt?: Date | string;
     updatedAt?: Date | string;
@@ -807,7 +814,7 @@ export type TaskUpdateWithoutRepositoryInput = {
     worktreeStatus?: Prisma.StringFieldUpdateOperationsInput | string;
     pullRequestUrl?: Prisma.NullableStringFieldUpdateOperationsInput | string | null;
     effort?: Prisma.NullableIntFieldUpdateOperationsInput | number | null;
-    order?: Prisma.NullableIntFieldUpdateOperationsInput | number | null;
+    order?: Prisma.IntFieldUpdateOperationsInput | number;
     deletedAt?: Prisma.NullableDateTimeFieldUpdateOperationsInput | Date | string | null;
     createdAt?: Prisma.DateTimeFieldUpdateOperationsInput | Date | string;
     updatedAt?: Prisma.DateTimeFieldUpdateOperationsInput | Date | string;
@@ -825,7 +832,7 @@ export type TaskUncheckedUpdateWithoutRepositoryInput = {
     worktreeStatus?: Prisma.StringFieldUpdateOperationsInput | string;
     pullRequestUrl?: Prisma.NullableStringFieldUpdateOperationsInput | string | null;
     effort?: Prisma.NullableIntFieldUpdateOperationsInput | number | null;
-    order?: Prisma.NullableIntFieldUpdateOperationsInput | number | null;
+    order?: Prisma.IntFieldUpdateOperationsInput | number;
     deletedAt?: Prisma.NullableDateTimeFieldUpdateOperationsInput | Date | string | null;
     createdAt?: Prisma.DateTimeFieldUpdateOperationsInput | Date | string;
     updatedAt?: Prisma.DateTimeFieldUpdateOperationsInput | Date | string;
@@ -843,7 +850,7 @@ export type TaskUncheckedUpdateManyWithoutRepositoryInput = {
     worktreeStatus?: Prisma.StringFieldUpdateOperationsInput | string;
     pullRequestUrl?: Prisma.NullableStringFieldUpdateOperationsInput | string | null;
     effort?: Prisma.NullableIntFieldUpdateOperationsInput | number | null;
-    order?: Prisma.NullableIntFieldUpdateOperationsInput | number | null;
+    order?: Prisma.IntFieldUpdateOperationsInput | number;
     deletedAt?: Prisma.NullableDateTimeFieldUpdateOperationsInput | Date | string | null;
     createdAt?: Prisma.DateTimeFieldUpdateOperationsInput | Date | string;
     updatedAt?: Prisma.DateTimeFieldUpdateOperationsInput | Date | string;
@@ -980,7 +987,7 @@ export type $TaskPayload<ExtArgs extends runtime.Types.Extensions.InternalArgs =
         worktreeStatus: string;
         pullRequestUrl: string | null;
         effort: number | null;
-        order: number | null;
+        order: number;
         deletedAt: Date | null;
         createdAt: Date;
         updatedAt: Date;

package/dist/server/index.js

@@ -20,7 +20,11 @@ const extraOrigins = (process.env.TSUNAGI_EXTRA_CORS_ORIGINS ?? '')
     .filter(Boolean);
 const corsOrigins = ['http://localhost:2791', ...extraOrigins];
 async function start() {
-    const fastify = Fastify({ logger: true });
+    const fastify = Fastify({
+        logger: {
+            level: process.env.LOG_LEVEL || (process.env.NODE_ENV === 'production' ? 'error' : 'info'),
+        },
+    });
     await fastify.register(fastifyCors, {
         origin: corsOrigins,
         methods: ['GET', 'POST', 'PUT', 'PATCH', 'DELETE', 'OPTIONS'],
@@ -30,6 +34,7 @@ async function start() {
         cors: { origin: corsOrigins },
     });
     fastify.decorate('io', io);
+    fastify.get('/health', async () => ({ status: 'ok' }));
     await fastify.register(tasksRoutes, { prefix: '/api' });
     await fastify.register(reposRoutes, { prefix: '/api' });
     await fastify.register(envRoutes, { prefix: '/api' });

package/dist/server/lib/repositories/task.d.ts

@@ -1,4 +1,6 @@
+import { prisma } from '../db.js';
 import type { Task, Tab } from '@minimalcorp/tsunagi-shared';
+export type TxClient = Parameters<Parameters<(typeof prisma)['$transaction']>[0]>[0];
 export declare function getTasks(filter?: {
     includeDeleted?: boolean;
     status?: Task['status'] | Task['status'][];
@@ -7,9 +9,9 @@ export declare function getTasks(filter?: {
     updatedBefore?: Date;
 }): Promise<Task[]>;
 export declare function getTask(id: string): Promise<Task | null>;
-export declare function createTask(task: Omit<Task, 'id' | 'deleted' | 'deletedAt' | 'createdAt' | 'updatedAt' | 'tabs'>): Promise<Task>;
+export declare function createTask(task: Omit<Task, 'id' | 'deleted' | 'deletedAt' | 'createdAt' | 'updatedAt' | 'tabs'>, tx?: TxClient): Promise<Task>;
 export declare function updateTask(id: string, updates: Partial<Omit<Task, 'id' | 'createdAt'>>): Promise<Task | null>;
-export declare function bumpOrder(targetOrder: number, excludeTaskId?: string): Promise<void>;
+export declare function bumpOrder(targetOrder: number, excludeTaskId?: string, tx?: TxClient): Promise<void>;
 export declare function deleteTask(id: string): Promise<boolean>;
 export declare function createTab(taskId: string): Promise<Tab | null>;
 export declare function getTab(taskId: string, tab_id: string): Promise<Tab | null>;

package/dist/server/lib/repositories/task.js

@@ -16,7 +16,7 @@ export async function getTasks(filter) {
                 orderBy: { order: 'asc' },
             },
         },
-        orderBy: { createdAt: 'desc' },
+        orderBy: [{ order: 'asc' }, { createdAt: 'asc' }],
     });
     return tasks.map((task) => mapTask(task));
 }
@@ -35,8 +35,9 @@ export async function getTask(id) {
     return mapTask(task);
 }
 // タスク作成
-export async function createTask(task) {
-    const newTask = await prisma.task.create({
+export async function createTask(task, tx) {
+    const client = tx ?? prisma;
+    const newTask = await client.task.create({
         data: {
             status: task.status,
             title: task.title,
@@ -84,8 +85,9 @@ export async function updateTask(id, updates) {
     return mapTask(updatedTask);
 }
 // 指定order以上のタスクを+1ずらす（玉突き）
-export async function bumpOrder(targetOrder, excludeTaskId) {
-    await prisma.task.updateMany({
+export async function bumpOrder(targetOrder, excludeTaskId, tx) {
+    const client = tx ?? prisma;
+    await client.task.updateMany({
         where: {
             order: { gte: targetOrder },
             deletedAt: null,
@@ -213,7 +215,7 @@ function mapTask(task) {
         worktreeStatus: task.worktreeStatus,
         pullRequestUrl: task.pullRequestUrl ?? undefined,
         effort: task.effort ?? undefined,
-        order: task.order ?? undefined,
+        order: task.order,
         deletedAt: task.deletedAt?.toISOString(),
         createdAt: task.createdAt.toISOString(),
         updatedAt: task.updatedAt.toISOString(),

package/dist/server/lib/services/task-service.js

@@ -112,23 +112,33 @@ export async function createTask(params, options) {
     if (duplicateTask) {
         throw new TaskServiceError(`Branch "${branch}" already exists. Task "${duplicateTask.title}" (ID: ${duplicateTask.id}) is already using this branch.`, 'BRANCH_DUPLICATE');
     }
-    // 1. order指定時は玉突き処理
-    if (order !== undefined) {
-        await taskRepo.bumpOrder(order);
-    }
-    // 2. DBにタスク登録
-    const newTask = await taskRepo.createTask({
-        title,
-        description,
-        status,
-        owner,
-        repo,
-        branch,
-        baseBranch,
-        repoId: repository.id,
-        worktreeStatus: 'pending',
-        effort,
-        order,
+    // 1. order解決 + bumpOrder + DB登録をアトミックに実行
+    const newTask = await prisma.$transaction(async (tx) => {
+        let resolvedOrder;
+        if (order !== undefined) {
+            resolvedOrder = order;
+            await taskRepo.bumpOrder(resolvedOrder, undefined, tx);
+        }
+        else {
+            const result = await tx.task.aggregate({
+                where: { owner, repo, deletedAt: null },
+                _max: { order: true },
+            });
+            resolvedOrder = (result._max.order ?? -1) + 1;
+        }
+        return await taskRepo.createTask({
+            title,
+            description,
+            status,
+            owner,
+            repo,
+            branch,
+            baseBranch,
+            repoId: repository.id,
+            worktreeStatus: 'pending',
+            effort,
+            order: resolvedOrder,
+        }, tx);
     });
     // 3. worktree作成
     try {

package/dist/server/routes/hooks.js

@@ -1,26 +1,31 @@
 import { prisma } from '../lib/db.js';
 export const hookEvents = [];
 const sessionTasks = new Map();
-/** TaskEntryリストをTodo形式に変換 */
+/**
+ * TaskEntryリストをTodo形式に変換。
+ * 'deleted' を含めて全 status を pass-through し、表示時のフィルタは frontend 側に任せる。
+ */
 function tasksToTodos(tasks) {
     return Array.from(tasks.values()).map((t) => ({
         content: t.subject,
-        status: t.status === 'in_progress' ? 'in_progress' : t.status,
+        status: t.status,
     }));
 }
 /** DBでタブのステータス（+ todos）を直接更新する */
 async function updateTabStatus(sessionId, status, todos) {
     try {
-        await prisma.tab.updateMany({
+        const result = await prisma.tab.updateMany({
             where: { tabId: sessionId },
             data: {
                 status,
                 ...(todos !== undefined && { todos: JSON.stringify(todos) }),
             },
         });
+        return { count: result.count };
     }
     catch (err) {
         console.warn(`[hooks] Failed to update tab status in DB:`, err);
+        return { count: 0 };
     }
 }
 export async function hooksRoutes(fastify) {
@@ -64,7 +69,9 @@ export async function hooksRoutes(fastify) {
                     if (body.tool_name === 'TodoWrite' && body.tool_input) {
                         const todos = body.tool_input.todos;
                         if (Array.isArray(todos)) {
-                            await updateTabStatus(sessionId, 'running', todos);
+                            fastify.log.info({ sessionId, todosCount: todos.length }, '[hooks] TodoWrite received');
+                            const { count } = await updateTabStatus(sessionId, 'running', todos);
+                            fastify.log.info({ sessionId, updatedTabCount: count }, '[hooks] TodoWrite tab updated');
                             io.to(room).emit('todos-updated', { sessionId, todos });
                             todosUpdated = true;
                         }
@@ -87,16 +94,19 @@ export async function hooksRoutes(fastify) {
                             todosUpdated = true;
                         }
                     }
-                    // TaskUpdate: タスクのステータスを更新
+                    // TaskUpdate: タスクのステータスを更新（'deleted' 含む。Mapからは除去せず保持し、表示層で除外）
                     if (body.tool_name === 'TaskUpdate' && body.tool_response && body.tool_input) {
                         const taskId = body.tool_input.taskId;
-                        const statusChange = body.tool_response.statusChange;
+                        // tool_input.status を優先（直接入力なので確実）、フォールバックで tool_response.statusChange.to
+                        const newStatus = body.tool_input.status ??
+                            body.tool_response.statusChange?.to;
                         const tasks = sessionTasks.get(sessionId);
-                        if (tasks && taskId && statusChange?.to) {
+                        if (tasks && taskId && newStatus) {
                             const entry = tasks.get(taskId);
                             if (entry) {
-                                entry.status = statusChange.to;
+                                entry.status = newStatus;
                                 const todos = tasksToTodos(tasks);
+                                fastify.log.info({ sessionId, taskId, newStatus, mapSize: tasks.size }, '[hooks] TaskUpdate processed');
                                 await updateTabStatus(sessionId, 'running', todos);
                                 io.to(room).emit('todos-updated', { sessionId, todos });
                                 todosUpdated = true;
@@ -118,16 +128,18 @@ export async function hooksRoutes(fastify) {
                     io.to(room).emit('status-changed', { sessionId, status: 'success' });
                     break;
                 case 'StopFailure':
-                    // APIエラーでターン終了 → failure状態に更新
-                    await updateTabStatus(sessionId, 'error');
+                    // APIエラーでターン終了 → failure状態に更新、todosをクリア
+                    await updateTabStatus(sessionId, 'error', []);
                     io.to(room).emit('status-changed', { sessionId, status: 'failure' });
+                    io.to(room).emit('todos-updated', { sessionId, todos: [] });
                     break;
                 case 'SessionEnd':
-                    // セッション終了（Escキー中断・Ctrl+C・/exit等）→ idle状態に更新
+                    // セッション終了（Escキー中断・Ctrl+C・/exit等）→ idle状態に更新、todosをクリア
                     // reason: "prompt_input_exit" = ユーザー中断、"other" = プロセスkill等
                     fastify.log.info({ sessionId, reason: body.reason }, 'SessionEnd received');
-                    await updateTabStatus(sessionId, 'idle');
+                    await updateTabStatus(sessionId, 'idle', []);
                     io.to(room).emit('status-changed', { sessionId, status: 'idle' });
+                    io.to(room).emit('todos-updated', { sessionId, todos: [] });
                     break;
                 default:
                     fastify.log.debug({ eventName }, 'Unhandled hook event');

package/dist/server/routes/tasks.js

@@ -159,7 +159,7 @@ export async function tasksRoutes(fastify) {
     fastify.put('/tasks/:id', async (request, reply) => {
         try {
             const { id } = request.params;
-            const updatedTask = await updateTask({ id }, request.body);
+            const updatedTask = await updateTask({ id }, request.body, { io });
             return reply.status(200).send({ data: { task: updatedTask } });
         }
         catch (error) {
@@ -174,7 +174,7 @@ export async function tasksRoutes(fastify) {
     fastify.delete('/tasks/:id', async (request, reply) => {
         try {
             const { id } = request.params;
-            await deleteTask({ id });
+            await deleteTask({ id }, { io });
             return reply.status(200).send({ data: { success: true } });
         }
         catch (error) {

package/dist/server/routes/terminal.js

@@ -48,12 +48,13 @@ export async function terminalRoutes(fastify) {
             // PTYプロセス終了 → room全体に通知（全接続クライアントに終了を伝える）+ セッション削除
             const exitHandler = ptyProcess.onExit(({ exitCode }) => {
                 io.to(room).emit('exit', { exitCode });
-                // Ctrl+C等でClaudeが強制終了した場合にclaudeStatusをidleにリセット
+                // Ctrl+C等でClaudeが強制終了した場合にclaudeStatusをidleにリセット、todosをクリア
                 io.to(room).emit('status-changed', { sessionId, status: 'idle' });
+                io.to(room).emit('todos-updated', { sessionId, todos: [] });
                 prisma.tab
                     .updateMany({
                     where: { tabId: sessionId },
-                    data: { status: 'idle' },
+                    data: { status: 'idle', todos: '[]' },
                 })
                     .catch(() => {
                     /* DB更新失敗は無視 */

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@minimalcorp/tsunagi",
-  "version": "0.1.3",
+  "version": "0.1.5",
   "description": "Multi-repo GitHub project management with Claude AI integration, designed for visualizing and controlling AI-driven development locally.",
   "keywords": [
     "tsunagi",
@@ -36,6 +36,7 @@
   },
   "files": [
     "dist/**/*",
+    "docs/**/*",
     "prisma/schema.prisma",
     "prisma/migrations/**/*",
     "prisma.config.ts",

package/prisma/migrations/20260410000000_clear_stale_tab_todos/migration.sql

@@ -0,0 +1,4 @@
+-- session 終了時の todos クリア漏れで蓄積した stale データを一括リセット
+-- idle/error 状態のタブは次回セッション開始まで参照されないため安全にクリアできる
+-- success 状態（Stop 正常完了）のタブは累積プログレス表示のため意図的に残す
+UPDATE "tabs" SET todos = '[]' WHERE status IN ('idle', 'error');

package/prisma/migrations/20260413000000_make_task_order_non_nullable/migration.sql

@@ -0,0 +1,47 @@
+-- BackfillNullOrders
+-- 既存の NULL order を createdAt 昇順で連番付与（既存の最大値の後ろから）
+WITH ranked AS (
+  SELECT id,
+         ROW_NUMBER() OVER (ORDER BY created_at ASC) AS rn
+  FROM tasks
+  WHERE "order" IS NULL AND deleted_at IS NULL
+)
+UPDATE tasks
+SET "order" = (
+  SELECT COALESCE(MAX("order"), -1) FROM tasks WHERE "order" IS NOT NULL AND deleted_at IS NULL
+) + (SELECT rn FROM ranked WHERE ranked.id = tasks.id)
+WHERE id IN (SELECT id FROM ranked);
+
+-- 論理削除済みタスクにも 0 を入れておく（NOT NULL 制約のため）
+UPDATE tasks SET "order" = 0 WHERE "order" IS NULL;
+
+-- RedefineTables
+PRAGMA defer_foreign_keys=ON;
+PRAGMA foreign_keys=OFF;
+CREATE TABLE "new_tasks" (
+    "id" TEXT NOT NULL PRIMARY KEY,
+    "title" TEXT NOT NULL,
+    "description" TEXT NOT NULL,
+    "status" TEXT NOT NULL,
+    "owner" TEXT NOT NULL,
+    "repo" TEXT NOT NULL,
+    "branch" TEXT NOT NULL,
+    "base_branch" TEXT NOT NULL,
+    "repo_id" TEXT NOT NULL,
+    "worktree_status" TEXT NOT NULL,
+    "pull_request_url" TEXT,
+    "effort" INTEGER,
+    "order" INTEGER NOT NULL DEFAULT 0,
+    "deleted_at" DATETIME,
+    "created_at" DATETIME NOT NULL DEFAULT CURRENT_TIMESTAMP,
+    "updated_at" DATETIME NOT NULL,
+    CONSTRAINT "tasks_repo_id_fkey" FOREIGN KEY ("repo_id") REFERENCES "repositories" ("id") ON DELETE CASCADE ON UPDATE CASCADE
+);
+INSERT INTO "new_tasks" ("id", "title", "description", "status", "owner", "repo", "branch", "base_branch", "repo_id", "worktree_status", "pull_request_url", "effort", "order", "deleted_at", "created_at", "updated_at") SELECT "id", "title", "description", "status", "owner", "repo", "branch", "base_branch", "repo_id", "worktree_status", "pull_request_url", "effort", "order", "deleted_at", "created_at", "updated_at" FROM "tasks";
+DROP TABLE "tasks";
+ALTER TABLE "new_tasks" RENAME TO "tasks";
+CREATE INDEX "tasks_owner_repo_idx" ON "tasks"("owner", "repo");
+CREATE INDEX "tasks_status_idx" ON "tasks"("status");
+CREATE INDEX "tasks_deleted_at_idx" ON "tasks"("deleted_at");
+PRAGMA foreign_keys=ON;
+PRAGMA defer_foreign_keys=OFF;

package/prisma/schema.prisma

@@ -39,7 +39,7 @@ model Task {
   pullRequestUrl String?   @map("pull_request_url")
 
   effort         Int?
-  order          Int?
+  order          Int     @default(0)
   deletedAt      DateTime? @map("deleted_at")
   createdAt      DateTime  @default(now()) @map("created_at")
   updatedAt      DateTime  @updatedAt @map("updated_at")

package/tsunagi-marketplace/plugins/tsunagi-plugin/skills/tsunagi-task/SKILL.md

@@ -17,6 +17,27 @@ description: プロジェクトのタスク管理ツール。タスクの検索
 
 遷移は必ず順方向: backlog → planning → coding → reviewing → done
 
+## 実装開始時の TODO 作成（必須）
+
+`coding` に遷移したら、**即座に** Claude Code 組み込みの `TodoWrite` ツールで実装ステップを TODO として登録する。これにより tsunagi UI にプログレスバーが表示される。
+
+### 手順
+
+1. `tsunagi_update_task(status: "coding")` の直後に `TodoWrite` を呼ぶ
+2. 各 TODO は完了判断が明確な作業単位にする
+   - 例: 「○○ファイルを修正」「マイグレーション作成・適用」「lint/type-check を通す」「動作確認」
+3. ステップ完了ごとに `TodoWrite` で該当項目の status を `in_progress` → `completed` に更新する
+4. 作業中に追加ステップが判明した場合、既存 TODO に追記して `TodoWrite` で再登録する
+
+### 語彙の使い分け（混同注意）
+
+| 対象            | 使うツール             | status 語彙                            |
+| --------------- | ---------------------- | -------------------------------------- |
+| tsunagi タスク  | `tsunagi_update_task`  | backlog/planning/coding/reviewing/done |
+| tab TODO (進捗) | `TodoWrite` (組み込み) | pending/in_progress/completed          |
+
+tsunagi タスクの status に `in_progress` を渡してはいけない（「よくある間違い」表参照）。逆に TODO の進捗管理は組み込み `TodoWrite` で行う。
+
 ## 現在のタスクを特定する
 
 タスク操作には `id`, `session_id`, `cwd` のいずれかでタスクを指定する。