fix: fix conflict

Signed-off-by: samzong <samzong.lu@gmail.com>

api/migrations/versions/2026_07_22_1500-d2825e7b9c10_scope_agent_debug_conversations.py

@@ -18,31 +18,109 @@ branch_labels = None
 depends_on = None
 
 
+def _is_pg(conn) -> bool:
+    return conn.dialect.name == "postgresql"
+
+
+def _uuid_column(name: str, *, nullable: bool = False, primary_key: bool = False) -> sa.Column:
+    kwargs = {"nullable": nullable, "primary_key": primary_key}
+    if primary_key and _is_pg(op.get_bind()):
+        kwargs["server_default"] = sa.text("uuidv7()")
+    return sa.Column(name, models.types.StringUUID(), **kwargs)
+
+
+def _has_table(table_name: str) -> bool:
+    return sa.inspect(op.get_bind()).has_table(table_name)
+
+
+def _has_column(table_name: str, column_name: str) -> bool:
+    return any(
+        column["name"] == column_name for column in sa.inspect(op.get_bind()).get_columns(table_name)
+    )
+
+
+def _has_unique_constraint(table_name: str, constraint_name: str) -> bool:
+    return any(
+        constraint["name"] == constraint_name
+        for constraint in sa.inspect(op.get_bind()).get_unique_constraints(table_name)
+    )
+
+
 def upgrade():
+    if not _has_table("agent_debug_conversations"):
+        op.create_table(
+            "agent_debug_conversations",
+            _uuid_column("id", primary_key=True),
+            sa.Column("tenant_id", models.types.StringUUID(), nullable=False),
+            sa.Column("agent_id", models.types.StringUUID(), nullable=False),
+            sa.Column("app_id", models.types.StringUUID(), nullable=False),
+            sa.Column("account_id", models.types.StringUUID(), nullable=False),
+            sa.Column("conversation_id", models.types.StringUUID(), nullable=False),
+            sa.Column(
+                "draft_type",
+                sa.String(length=32),
+                nullable=False,
+                server_default=sa.text("'debug_build'"),
+            ),
+            sa.Column("created_at", sa.DateTime(), server_default=sa.func.current_timestamp(), nullable=False),
+            sa.Column("updated_at", sa.DateTime(), server_default=sa.func.current_timestamp(), nullable=False),
+            sa.PrimaryKeyConstraint("id", name=op.f("agent_debug_conversation_pkey")),
+            sa.UniqueConstraint(
+                "tenant_id",
+                "agent_id",
+                "account_id",
+                "draft_type",
+                name=op.f("agent_debug_conversation_agent_account_draft_type_unique"),
+            ),
+        )
+        op.create_index(
+            "agent_debug_conversation_conversation_idx",
+            "agent_debug_conversations",
+            ["conversation_id"],
+        )
+        op.create_index(
+            "agent_debug_conversation_account_idx",
+            "agent_debug_conversations",
+            ["tenant_id", "account_id"],
+        )
+        return
+
     # Existing pointers have always represented Build chat because the Agent
     # detail API exposes them as ``debug_conversation_id`` for that surface.
-    op.add_column(
+    if not _has_column("agent_debug_conversations", "draft_type"):
+        op.add_column(
+            "agent_debug_conversations",
+            sa.Column(
+                "draft_type",
+                sa.String(length=32),
+                nullable=False,
+                server_default=sa.text("'debug_build'"),
+            ),
+        )
+    if _has_unique_constraint(
         "agent_debug_conversations",
-        sa.Column(
-            "draft_type",
-            sa.String(length=32),
-            nullable=False,
-            server_default=sa.text("'debug_build'"),
-        ),
-    )
-    op.drop_constraint(
         "agent_debug_conversation_agent_account_unique",
+    ):
+        op.drop_constraint(
+            "agent_debug_conversation_agent_account_unique",
+            "agent_debug_conversations",
+            type_="unique",
+        )
+    if not _has_unique_constraint(
         "agent_debug_conversations",
-        type_="unique",
-    )
-    op.create_unique_constraint(
         "agent_debug_conversation_agent_account_draft_type_unique",
-        "agent_debug_conversations",
+    ):
-        ["tenant_id", "agent_id", "account_id", "draft_type"],
+        op.create_unique_constraint(
-    )
+            "agent_debug_conversation_agent_account_draft_type_unique",
+            "agent_debug_conversations",
+            ["tenant_id", "agent_id", "account_id", "draft_type"],
+        )
 
 
 def downgrade():
+    if not _has_table("agent_debug_conversations"):
+        return
+
     debug_conversations = sa.table(
         "agent_debug_conversations",
         sa.column("tenant_id", models.types.StringUUID()),
@@ -64,14 +142,23 @@ def downgrade():
             ),
         )
     )
-    op.drop_constraint(
+    if _has_unique_constraint(
+        "agent_debug_conversations",
         "agent_debug_conversation_agent_account_draft_type_unique",
+    ):
+        op.drop_constraint(
+            "agent_debug_conversation_agent_account_draft_type_unique",
+            "agent_debug_conversations",
+            type_="unique",
+        )
+    if not _has_unique_constraint(
         "agent_debug_conversations",
-        type_="unique",
-    )
-    op.create_unique_constraint(
         "agent_debug_conversation_agent_account_unique",
-        "agent_debug_conversations",
+    ):
-        ["tenant_id", "agent_id", "account_id"],
+        op.create_unique_constraint(
-    )
+            "agent_debug_conversation_agent_account_unique",
-    op.drop_column("agent_debug_conversations", "draft_type")
+            "agent_debug_conversations",
+            ["tenant_id", "agent_id", "account_id"],
+        )
+    if _has_column("agent_debug_conversations", "draft_type"):
+        op.drop_column("agent_debug_conversations", "draft_type")

api/migrations/versions/2026_07_23_1500-e9f4a1b2c3d5_merge_skill_and_agent_debug_heads.py

@@ -0,0 +1,21 @@
+"""merge skill and agent debug conversation heads
+
+Revision ID: e9f4a1b2c3d5
+Revises: a4f8d2c9e1b0, d2825e7b9c10
+Create Date: 2026-07-23 15:00:00.000000
+
+"""
+
+# revision identifiers, used by Alembic.
+revision = "e9f4a1b2c3d5"
+down_revision = ("a4f8d2c9e1b0", "d2825e7b9c10")
+branch_labels = None
+depends_on = None
+
+
+def upgrade():
+    pass
+
+
+def downgrade():
+    pass

api/services/account_service.py

@@ -1599,7 +1599,9 @@ class TenantService:
         return updated_accounts
 
     @staticmethod
-    def iter_member_account_id_batches(tenant_id: str, batch_size: int, *, session: Session) -> Iterator[list[str]]:
+    def iter_member_account_id_batches(
+        tenant_id: str, batch_size: int, *, session: Session
+    ) -> Iterator[list[str]]:
         """Yield workspace member account ids in bounded, ordered batches."""
         offset = 0
         while True:

api/services/tag_service.py

@@ -285,7 +285,9 @@ class TagService:
                 raise NotFound("Snippet not found")
         elif type == "skill":
             skill = session.scalar(
-                select(Skill).where(Skill.tenant_id == current_user.current_tenant_id, Skill.id == target_id).limit(1)
+                select(Skill)
+                .where(Skill.tenant_id == current_user.current_tenant_id, Skill.id == target_id)
+                .limit(1)
             )
             if not skill:
                 raise NotFound("Skill not found")

api/tests/unit_tests/services/test_agent_config_service.py

@@ -616,7 +616,9 @@ def test_manifest_appends_published_workspace_skills() -> None:
         kind=AgentConfigVersionKind.DRAFT,
         writable=False,
         soul=_soul(
-            config_skills=[AgentConfigSkillRefConfig(name="alpha", description="Alpha skill", file_id="tool-file-1")]
+            config_skills=[
+                AgentConfigSkillRefConfig(name="alpha", description="Alpha skill", file_id="tool-file-1")
+            ]
         ),
     )
 

packages/contracts/generated/api/console/tags/types.gen.ts

@@ -29,7 +29,7 @@ export type GetTagsData = {
   path?: never
   query?: {
     keyword?: string
-    type?: string
+    type?: '' | 'app' | 'knowledge' | 'skill' | 'snippet'
   }
   url: '/tags'
 }

packages/contracts/generated/api/console/tags/zod.gen.ts

@@ -41,7 +41,7 @@ export const zTagBasePayload = z.object({
 
 export const zGetTagsQuery = z.object({
   keyword: z.string().optional(),
-  type: z.string().optional().default(''),
+  type: z.enum(['', 'app', 'knowledge', 'skill', 'snippet']).optional().default(''),
 })
 
 /**

packages/contracts/generated/api/console/workspaces/types.gen.ts

@@ -728,10 +728,25 @@ export type SkillResponse = {
   visibility: string
 }
 
+export type SkillAssistModelPayload = {
+  model: string
+  model_settings?: { [key: string]: unknown } | null
+  plugin_id?: string | null
+  provider: string
+}
+
+export type SkillAssistAttachmentPayload = {
+  mime_type?: string | null
+  name: string
+  size?: number | null
+  tool_file_id: string
+}
+
 export type SkillAssistMessagePayload = {
   attachments?: Array<SkillAssistAttachmentPayload>
   message: string
   model?: SkillAssistModelPayload | null
+  target_path?: string | null
 }
 
 export type SkillDraftFileOperationPayload = {
@@ -1717,22 +1732,6 @@ export type SkillTagResponse = {
   tag: string
 }
 
-export type SkillAssistAttachmentPayload = {
-  mime_type?: string | null
-  name: string
-  size?: number | null
-  tool_file_id: string
-}
-
-export type SkillAssistModelPayload = {
-  model: string
-  model_settings?: {
-    [key: string]: unknown
-  } | null
-  plugin_id?: string | null
-  provider: string
-}
-
 export type SkillDraftFileOperation =
   | 'delete'
   | 'mkdir'
@@ -1752,10 +1751,10 @@ export type SkillDraftTreeItemPayload = {
 }
 
 export type SkillReferenceResponse = {
+  agent_id: string
   agent_icon?: string | null
   agent_icon_background?: string | null
   agent_icon_type?: string | null
-  agent_id: string
   app_id?: string | null
   display_name: string
   name: string

packages/contracts/generated/api/console/workspaces/zod.gen.ts

@@ -1527,6 +1527,7 @@ export const zSkillAssistMessagePayload = z.object({
   attachments: z.array(zSkillAssistAttachmentPayload).max(10).optional(),
   message: z.string().min(1).max(8000),
   model: zSkillAssistModelPayload.nullish(),
+  target_path: z.string().nullish(),
 })
 
 /**
@@ -1559,10 +1560,10 @@ export const zSkillDraftFileOperationPayload = z.object({
  * SkillReferenceResponse
  */
 export const zSkillReferenceResponse = z.object({
+  agent_id: z.string(),
   agent_icon: z.string().nullish(),
   agent_icon_background: z.string().nullish(),
   agent_icon_type: z.string().nullish(),
-  agent_id: z.string(),
   app_id: z.string().nullish(),
   display_name: z.string(),
   name: z.string(),

web/features/skills/__tests__/page.spec.tsx

@@ -422,6 +422,7 @@ describe('SkillsPage', () => {
   it('does not show export for an unpublished skill', async () => {
     const user = userEvent.setup()
     mocks.skills = [createSkill({ latest_published_version_id: null })]
+    mocks.skillPages = [mocks.skills]
     renderSkillsPage()
 
     await user.click(