Merge branch 'feat/2.6.0-beta4' into feat/2.6.0-beta4-cofco

Author: zgqgit

src/backend/bisheng/api/v1/schemas.py

@@ -394,6 +394,9 @@ class WSModel(BaseModel):
     id: str
     name: str | None = None
     displayName: str | None = None
+    # Optional one-line intro shown under the model name in the workspace
+    # model picker; hidden when empty. Length capped to keep the dropdown tidy.
+    description: str | None = Field(default=None, max_length=50)
     visual: bool | None = False
 
 

src/backend/bisheng/llm/domain/services/llm.py

@@ -133,6 +133,25 @@ def _coerce_model_id(value: Any) -> int | None:
             return None
         return model_id if model_id > 0 else None
 
+    # Credential and endpoint fields in the server config. Users pasting values with
+    # leading/trailing whitespace break the http request header(e.g. "Bearer sk-xxx ")
+    STRIP_CONFIG_KEY_SUFFIXES = ('_key', '_secret', '_base', '_url', '_endpoint', '_proxy', '_version')
+
+    @classmethod
+    def strip_config_whitespace(cls, config: Optional[dict]) -> Optional[dict]:
+        """ Strip leading/trailing whitespace from credential and endpoint fields in the server config """
+        if not isinstance(config, dict):
+            return config
+        result = {}
+        for key, value in config.items():
+            if isinstance(value, dict):
+                result[key] = cls.strip_config_whitespace(value)
+            elif isinstance(value, str) and key.endswith(cls.STRIP_CONFIG_KEY_SUFFIXES):
+                result[key] = value.strip()
+            else:
+                result[key] = value
+        return result
+
     @classmethod
     async def _aget_inherited_system_default_server_ids_for_leaf(
         cls,
@@ -486,6 +505,7 @@ async def add_llm_server(
                 raise ModelNameRepeatError.http_exception()
 
         db_server = LLMServer(**server.model_dump(exclude={"models", "share_to_children"}))
+        db_server.config = cls.strip_config_whitespace(db_server.config)
         db_server.user_id = login_user.user_id
 
         db_server = await LLMDao.ainsert_server_with_models(
@@ -711,7 +731,8 @@ async def update_llm_server(
         exist_server.limit_flag = server.limit_flag
         exist_server.limit = server.limit
         mask_maker = JsonFieldMasker()
-        exist_server.config = mask_maker.update_json_with_masked(exist_server.config, server.config)
+        exist_server.config = cls.strip_config_whitespace(
+            mask_maker.update_json_with_masked(exist_server.config, server.config))
 
         # Route share_to_children flips through the dedicated DAO helper
         # so super-admin / Root-only invariants are enforced via FGA.

src/backend/bisheng/permission/api/endpoints/resource_permission.py

@@ -1498,6 +1498,20 @@ async def authorize_resource(
         and not _is_invalid_owner_subject(revoke.subject_type, revoke.relation)
     ]
 
+    # Users cannot modify their OWN permission in the member dialog: changing your
+    # own role (e.g. owner→editor) strips your management access and locks you out
+    # of the dialog on the next reload; removing yourself is likewise disallowed.
+    # Managing OTHERS is fine. Creator rows are already locked client-side via
+    # is_creator; this is the server-side backstop for every resource type.
+    self_subject_changes = [
+        item
+        for item in (tuple_grants + tuple_revokes)
+        if getattr(item, "subject_type", None) == "user"
+        and int(getattr(item, "subject_id", 0) or 0) == int(login_user.user_id)
+    ]
+    if self_subject_changes:
+        return PermissionDeniedError.return_resp("不能修改自己的权限")
+
     # Owner and creator are decoupled: an owner may be revoked/downgraded as long
     # as another owner survives, but removing the last owner would orphan the
     # resource (INV-2). Applies to ALL owner revokes (self or someone else's), and

src/backend/test/llm/test_llm_service_config.py

@@ -0,0 +1,40 @@
+import unittest
+
+from bisheng.llm.domain.services.llm import LLMService
+
+
+class TestStripConfigWhitespace(unittest.TestCase):
+    def test_api_key_trailing_whitespace_stripped(self):
+        config = {'openai_api_key': 'sk-xxx ', 'api_key': ' sk-yyy\n'}
+        result = LLMService.strip_config_whitespace(config)
+        self.assertEqual(result['openai_api_key'], 'sk-xxx')
+        self.assertEqual(result['api_key'], 'sk-yyy')
+
+    def test_url_and_endpoint_fields_stripped(self):
+        config = {
+            'openai_api_base': ' https://api.openai.com/v1 ',
+            'base_url': 'https://example.com/v1\t',
+            'azure_endpoint': ' https://xx.openai.azure.com',
+            'openai_proxy': ' http://127.0.0.1:7890 ',
+        }
+        result = LLMService.strip_config_whitespace(config)
+        self.assertEqual(result['openai_api_base'], 'https://api.openai.com/v1')
+        self.assertEqual(result['base_url'], 'https://example.com/v1')
+        self.assertEqual(result['azure_endpoint'], 'https://xx.openai.azure.com')
+        self.assertEqual(result['openai_proxy'], 'http://127.0.0.1:7890')
+
+    def test_nested_config_stripped(self):
+        config = {'inner': {'api_key': 'sk-xxx '}}
+        result = LLMService.strip_config_whitespace(config)
+        self.assertEqual(result['inner']['api_key'], 'sk-xxx')
+
+    def test_other_fields_untouched(self):
+        config = {'description': ' keep me ', 'streaming': True, 'max_tokens': 4096, 'voice': None}
+        result = LLMService.strip_config_whitespace(config)
+        self.assertEqual(result['description'], ' keep me ')
+        self.assertEqual(result['streaming'], True)
+        self.assertEqual(result['max_tokens'], 4096)
+        self.assertIsNone(result['voice'])
+
+    def test_none_config(self):
+        self.assertIsNone(LLMService.strip_config_whitespace(None))

src/backend/test/permission/test_permission_api_integration.py

@@ -319,7 +319,9 @@ def test_authorize_api_blocks_custom_model_with_permissions_outside_caller_set(s
         assert body["status_code"] == 19000
         mock_authorize.assert_not_awaited()
 
-    def test_authorize_api_blocks_self_owner_revoke_when_it_is_the_last_owner(self):
+    def test_authorize_api_blocks_self_owner_revoke(self):
+        """Self-modification backstop: you cannot revoke your OWN owner (would lock
+        you out of the dialog), regardless of how many owners remain."""
         app = _make_app(_ViewerUser)
 
         with (
@@ -387,12 +389,15 @@ def test_authorize_api_blocks_self_owner_revoke_when_it_is_the_last_owner(self):
                 )
                 body = resp.json()
 
-        # Owner/creator decoupled: removing the last owner is now refused with the
-        # dedicated PermissionLastOwnerError (19007) instead of a generic denial.
-        assert body["status_code"] == 19007
+        # Self owner revoke is blocked by the self-modification guard (19000),
+        # which runs before the last-owner check.
+        assert body["status_code"] == 19000
         mock_authorize.assert_not_awaited()
 
-    def test_authorize_api_allows_self_owner_revoke_when_another_owner_remains(self):
+    def test_authorize_api_allows_owner_revoke_of_another_user_when_another_owner_remains(self):
+        """Revoking ANOTHER user's owner is allowed while an owner remains (caller
+        is _ViewerUser=7; we revoke user 9, leaving 7). Self-revoke is covered by
+        test_authorize_api_blocks_self_owner_revoke."""
         app = _make_app(_ViewerUser)
 
         with (
@@ -462,7 +467,7 @@ def test_authorize_api_allows_self_owner_revoke_when_another_owner_remains(self)
                         "revokes": [
                             {
                                 "subject_type": "user",
-                                "subject_id": 7,
+                                "subject_id": 9,
                                 "relation": "owner",
                             }
                         ],
@@ -816,6 +821,27 @@ def test_authorize_allows_removing_non_creator_owner_on_knowledge_space(self):
         assert body["status_code"] == 200
         mock_authorize.assert_awaited_once()
 
+    def test_authorize_blocks_modifying_own_permission(self):
+        """A user cannot change their OWN permission via the member dialog — a
+        self-downgrade (owner→editor) would strip management access and lock them
+        out. Backstop for every resource type; managing others is unaffected."""
+        app = _make_app(_AdminUser)  # user_id = 1
+        with patch(
+            "bisheng.permission.domain.services.permission_service.PermissionService.authorize",
+            new_callable=AsyncMock,
+        ) as mock_authorize:
+            with TestClient(app) as client:
+                resp = client.post(
+                    "/api/v1/permissions/resources/workflow/wf-1/authorize",
+                    json={
+                        "grants": [{"subject_type": "user", "subject_id": 1, "relation": "editor"}],
+                        "revokes": [{"subject_type": "user", "subject_id": 1, "relation": "owner"}],
+                    },
+                )
+                body = resp.json()
+        assert body["status_code"] == 19000
+        mock_authorize.assert_not_awaited()
+
     def test_permissions_list_requires_can_edit_on_resource(self):
         app = _make_app(_ViewerUser)
 

src/frontend/client/src/components/Chat/AiModelSelect.tsx

@@ -73,8 +73,15 @@ const AiModelSelect = memo(
                     the model list is already in memory via `options`. */}
                 <SelectContent auto className="bg-white w-auto min-w-[100px] max-w-[280px]">
                     {uniqueOptions.map((opt) => (
-                        <SelectItem key={opt.id + ""} value={opt.id + ""}>
-                            {opt.displayName}
+                        <SelectItem key={opt.id + ""} value={opt.id + ""} textValue={opt.displayName}>
+                            <div className="flex min-w-0 flex-col py-0.5">
+                                <span>{opt.displayName}</span>
+                                {opt.description && (
+                                    <span className="mt-0.5 whitespace-normal break-words text-xs text-gray-400">
+                                        {opt.description}
+                                    </span>
+                                )}
+                            </div>
                         </SelectItem>
                     ))}
                 </SelectContent>

src/frontend/client/src/components/Linsight/Execution/ClarifyCard.tsx

@@ -10,7 +10,7 @@
  */
 import { ArrowRight, Check, ChevronLeft, ChevronRight, X } from 'lucide-react';
 import { Outlined } from 'bisheng-icons';
-import { useEffect, useMemo, useRef, useState } from 'react';
+import { useEffect, useLayoutEffect, useMemo, useRef, useState } from 'react';
 import { Textarea } from '~/components/ui';
 import { useLocalize } from '~/hooks';
 import { cn } from '~/utils';
@@ -168,6 +168,19 @@ function ClarifyCardInteractive({ data, disabled = false, onSubmit }: ClarifyCar
         return () => window.removeEventListener('keydown', onKey);
     }, []);
 
+    // The custom-answer <textarea> is one reused DOM node across pages, and its
+    // grown height lives in an inline style set on input. On page change that
+    // stale height would leak into the next question (or a saved multi-line answer
+    // would show clipped). Re-fit it to the CURRENT question's content whenever the
+    // page changes — empty content collapses back to one row.
+    const customTaRef = useRef<HTMLTextAreaElement>(null);
+    useLayoutEffect(() => {
+        const el = customTaRef.current;
+        if (!el) return;
+        el.style.height = 'auto';
+        el.style.height = `${el.scrollHeight}px`;
+    }, [page]);
+
     return (
         <div
             className="my-3 w-full rounded-2xl border border-[#EEF2F6] bg-white p-4 shadow-[0_4px_20px_rgba(0,0,0,0.03)]"
@@ -269,52 +282,69 @@ function ClarifyCardInteractive({ data, disabled = false, onSubmit }: ClarifyCar
                         <li>
                             <div
                                 className={cn(
-                                    'flex h-9 items-center gap-2 rounded-lg px-4 transition-all duration-200',
+                                    // min-h (not fixed h) so the textarea can grow past one
+                                    // line when the user inserts Shift+Enter newlines.
+                                    // items-start: once grown, the number stays pinned to the
+                                    // FIRST line (top) instead of centering on the tall box.
+                                    // py-2 (8px) + a 20px line = 36px (h-9) when single-line.
+                                    'flex min-h-9 items-start gap-2 rounded-lg px-4 py-2 transition-all duration-200',
                                     // No box by default (matches the other options); the
                                     // input-box background only appears once it's active.
                                     customSelected ? 'bg-[#EEE]' : 'hover:bg-gray-50/80',
                                 )}
                             >
-                                <span className="shrink-0 text-sm font-medium text-[#8C8C8C]">
+                                <span className="shrink-0 text-sm font-medium leading-5 text-[#8C8C8C]">
                                     {q.options.length + 1}.
                                 </span>
-                                <input
-                                    type="text"
+                                <textarea
+                                    ref={customTaRef}
+                                    rows={1}
                                     disabled={disabled || submitted}
                                     value={customText[q.id] || ''}
-                                    placeholder={localize('com_linsight_clarify_custom')}
+                                    // Default placeholder is the short "自行输入"; once the row is
+                                    // highlighted (customSelected, i.e. focused/active) it grows the
+                                    // Shift+Enter hint — matching when the bg-[#EEE] highlight shows.
+                                    placeholder={localize(
+                                        customSelected
+                                            ? 'com_linsight_clarify_custom_active'
+                                            : 'com_linsight_clarify_custom',
+                                    )}
                                     onFocus={() => !customSelected && handleSelect(q, CUSTOM_KEY)}
                                     onChange={(e) => {
                                         setCustomText((prev) => ({ ...prev, [q.id]: e.target.value }));
                                         if (!customSelected) handleSelect(q, CUSTOM_KEY);
+                                        // Auto-grow to fit its content (Shift+Enter newlines).
+                                        e.currentTarget.style.height = 'auto';
+                                        e.currentTarget.style.height = `${e.currentTarget.scrollHeight}px`;
                                     }}
                                     onKeyDown={(e) => {
-                                        // Enter confirms the typed custom answer and advances to
-                                        // the next question (both single- AND multi-select),
-                                        // matching the "下一题 ↵" hint — the input is focused, so
-                                        // the window-level Enter handler is bypassed and this is the
-                                        // only place that can advance. Guard the IME composition
-                                        // Enter so committing pinyin doesn't skip the question.
+                                        // Enter (without Shift) confirms the typed custom answer and
+                                        // advances to the next question (both single- AND
+                                        // multi-select), matching the "下一题 ↵" hint — the field is
+                                        // focused, so the window-level Enter handler is bypassed and
+                                        // this is the only place that can advance. Shift+Enter falls
+                                        // through to the textarea's native newline. Guard the IME
+                                        // composition Enter so committing pinyin doesn't skip.
                                         if (
                                             e.key === 'Enter' &&
+                                            !e.shiftKey &&
                                             !e.nativeEvent.isComposing &&
                                             customText[q.id]?.trim()
                                         ) {
                                             e.preventDefault();
                                             handleConfirm();
                                         }
                                     }}
-                                    className={cn(
-                                        'flex-1 bg-transparent text-sm outline-none placeholder:text-[#8C8C8C]',
-                                        customSelected ? 'text-[#1A1A1A] font-medium' : 'text-[#1A1A1A]',
-                                    )}
+                                    className="flex-1 resize-none border-0 bg-transparent p-0 text-sm font-normal leading-5 text-[#1A1A1A] outline-none placeholder:text-[#8C8C8C]"
                                 />
                                 {!q.multiple && customSelected && customText[q.id]?.trim() && (
                                     <button
                                         type="button"
                                         disabled={disabled || submitted}
                                         onClick={handleConfirm}
-                                        className="flex shrink-0 items-center gap-1 text-sm font-medium text-[#8C8C8C] hover:text-[#212121] disabled:opacity-50 transition-colors"
+                                        // self-end pins 确定 to the bottom-right of the (possibly
+                                        // grown) box, while the number stays top-left.
+                                        className="flex shrink-0 self-end items-center gap-1 text-sm font-medium text-[#8C8C8C] hover:text-[#212121] disabled:opacity-50 transition-colors"
                                     >
                                         {localize('com_linsight_clarify_submit')}
                                         <Outlined.CornerDownLeft size={14} className="shrink-0" />

src/frontend/client/src/components/Linsight/Input/ModelSelector.tsx

@@ -70,10 +70,17 @@ export function ModelSelector({ value, disabled = false, onChange }: ModelSelect
                     {label}
                 </span>
             </SelectTrigger>
-            <SelectContent className="bg-white">
+            <SelectContent className="bg-white max-w-[280px]">
                 {options.map((opt: any) => (
-                    <SelectItem key={String(opt.id)} value={String(opt.id)}>
-                        {opt.displayName ?? opt.name}
+                    <SelectItem key={String(opt.id)} value={String(opt.id)} textValue={opt.displayName ?? opt.name}>
+                        <div className="flex min-w-0 flex-col py-0.5">
+                            <span>{opt.displayName ?? opt.name}</span>
+                            {opt.description && (
+                                <span className="mt-0.5 whitespace-normal break-words text-xs text-gray-400">
+                                    {opt.description}
+                                </span>
+                            )}
+                        </div>
                     </SelectItem>
                 ))}
             </SelectContent>