@gitlab/duo-ui 15.15.0 → 15.15.1

package/dist/components/chat/components/duo_chat_message_tool_approval/components/base_tool_params.js

@@ -26,6 +26,10 @@ const metadataProperties = {
     icon: 'project',
     label: projectLabel
   },
+  projectName: {
+    icon: 'project',
+    label: projectLabel
+  },
   projectPath: {
     icon: 'project',
     label: projectLabel
@@ -163,9 +167,17 @@ var script = {
     },
     metadataProperties() {
       const toolParams = this.toolParams || {};
+      const projectProperties = ['projectFullPath', 'projectPath', 'projectName', 'projectId'];
+      const preferredProjectProperty = projectProperties.find(p => toolParams[p]);
       return Object.entries(metadataProperties).filter(_ref => {
         let [property] = _ref;
-        return toolParams[property];
+        if (!toolParams[property]) return false;
+
+        // Show only the highest-priority project property to avoid redundant badges
+        if (projectProperties.includes(property)) {
+          return property === preferredProjectProperty;
+        }
+        return true;
       }).map(_ref2 => {
         let [property, styles] = _ref2;
         return {

package/dist/components/chat/components/duo_chat_message_tool_approval/components/create_commit_tool_params.js

@@ -26,13 +26,23 @@ var script = {
       var _this$toolParams;
       return (_this$toolParams = this.toolParams) === null || _this$toolParams === void 0 ? void 0 : _this$toolParams.branch;
     },
+    repository() {
+      var _this$toolParams2, _this$toolParams3, _this$toolParams4, _this$toolParams5, _this$toolParams6;
+      return ((_this$toolParams2 = this.toolParams) === null || _this$toolParams2 === void 0 ? void 0 : _this$toolParams2.projectName) || ((_this$toolParams3 = this.toolParams) === null || _this$toolParams3 === void 0 ? void 0 : _this$toolParams3.projectPath) || ((_this$toolParams4 = this.toolParams) === null || _this$toolParams4 === void 0 ? void 0 : _this$toolParams4.projectFullPath) || ((_this$toolParams5 = this.toolParams) === null || _this$toolParams5 === void 0 ? void 0 : _this$toolParams5.url) || ((_this$toolParams6 = this.toolParams) === null || _this$toolParams6 === void 0 ? void 0 : _this$toolParams6.projectId);
+    },
+    summaryMessage() {
+      if (this.branch && this.repository) return this.$options.i18n.COMMIT_SUMMARY_MESSAGE;
+      if (this.branch) return this.$options.i18n.COMMIT_SUMMARY_MESSAGE_NO_REPO;
+      if (this.repository) return this.$options.i18n.COMMIT_SUMMARY_AUTO_BRANCH_MESSAGE;
+      return this.$options.i18n.COMMIT_SUMMARY_AUTO_BRANCH_MESSAGE_NO_REPO;
+    },
     commitMessage() {
-      var _this$toolParams2;
-      return (_this$toolParams2 = this.toolParams) === null || _this$toolParams2 === void 0 ? void 0 : _this$toolParams2.commitMessage;
+      var _this$toolParams7;
+      return (_this$toolParams7 = this.toolParams) === null || _this$toolParams7 === void 0 ? void 0 : _this$toolParams7.commitMessage;
     },
     actions() {
-      var _this$toolParams3;
-      return ((_this$toolParams3 = this.toolParams) === null || _this$toolParams3 === void 0 ? void 0 : _this$toolParams3.actions) || [];
+      var _this$toolParams8;
+      return ((_this$toolParams8 = this.toolParams) === null || _this$toolParams8 === void 0 ? void 0 : _this$toolParams8.actions) || [];
     },
     actionsCount() {
       return this.actions.length;
@@ -109,8 +119,10 @@ var script = {
     }
   },
   i18n: {
-    COMMIT_SUMMARY_MESSAGE: translate('CreateCommitToolParams.commitSummaryMessage', 'Create a commit in the branch %{branch}.'),
-    COMMIT_SUMMARY_AUTO_BRANCH_MESSAGE: translate('CreateCommitToolParams.commitSummaryAutoBranchMessage', 'Create a commit in a new auto-created branch.'),
+    COMMIT_SUMMARY_MESSAGE: translate('CreateCommitToolParams.commitSummaryMessage', 'Commit and push to branch %{branch} in repository %{repository}.'),
+    COMMIT_SUMMARY_MESSAGE_NO_REPO: translate('CreateCommitToolParams.commitSummaryMessageNoRepo', 'Commit and push to branch %{branch}.'),
+    COMMIT_SUMMARY_AUTO_BRANCH_MESSAGE: translate('CreateCommitToolParams.commitSummaryAutoBranchMessage', 'Commit and push to a new branch in repository %{repository}.'),
+    COMMIT_SUMMARY_AUTO_BRANCH_MESSAGE_NO_REPO: translate('CreateCommitToolParams.commitSummaryAutoBranchMessageNoRepo', 'Commit and push to a new branch.'),
     READ_COMMIT_MESSAGE: translate('CreateCommitToolParams.readCommitMessage', 'Read commit message'),
     CREATE_FILE_ACTION_LABEL: translate('CreateCommitToolParams.createFileActionLabel', 'Create file %{filePath}'),
     UPDATE_FILE_ACTION_LABEL: translate('CreateCommitToolParams.updateFileActionLabel', 'Update file %{filePath}'),
@@ -127,9 +139,7 @@ var script = {
 const __vue_script__ = script;
 
 /* template */
-var __vue_render__ = function () {var _vm=this;var _h=_vm.$createElement;var _c=_vm._self._c||_h;return _c('base-tool-params',{attrs:{"tool-params":_vm.toolParams}},[_c('div',[_c('gl-sprintf',{attrs:{"message":_vm.branch
-          ? _vm.$options.i18n.COMMIT_SUMMARY_MESSAGE
-          : _vm.$options.i18n.COMMIT_SUMMARY_AUTO_BRANCH_MESSAGE},scopedSlots:_vm._u([(_vm.branch)?{key:"branch",fn:function(){return [_c('code',[_vm._v(_vm._s(_vm.branch))])]},proxy:true}:null],null,true)}),_vm._v("\n    "+_vm._s(_vm.actionsCountMessage)+"\n  ")],1),_vm._v(" "),_c('gl-accordion',{staticClass:"-gl-ml-2",attrs:{"header-level":3}},[(_vm.commitMessage)?_c('gl-accordion-item',{staticClass:"gl-mb-3",attrs:{"title":_vm.$options.i18n.READ_COMMIT_MESSAGE}},[_c('pre-block',{attrs:{"languages":['markdown']}},[_vm._v(_vm._s(_vm.commitMessage))])],1):_vm._e(),_vm._v(" "),(_vm.actionsCount)?_c('gl-accordion-item',{attrs:{"title":_vm.$options.i18n.EXPAND_CHANGES}},[_c('gl-accordion',{attrs:{"header-level":4}},_vm._l((_vm.actions),function(action,index){return _c('gl-accordion-item',{key:index,staticClass:"gl-mb-3",attrs:{"title":_vm.getActionTitle(action)}},[_c('pre-block',{attrs:{"languages":[_vm.getActionFileExtension(action), 'diff']}},[_vm._v(_vm._s(_vm.getActionContent(action)))])],1)}),1)],1):_vm._e()],1)],1)};
+var __vue_render__ = function () {var _vm=this;var _h=_vm.$createElement;var _c=_vm._self._c||_h;return _c('base-tool-params',{attrs:{"tool-params":_vm.toolParams}},[_c('div',[_c('gl-sprintf',{attrs:{"message":_vm.summaryMessage},scopedSlots:_vm._u([(_vm.branch)?{key:"branch",fn:function(){return [_c('code',[_vm._v(_vm._s(_vm.branch))])]},proxy:true}:null,(_vm.repository)?{key:"repository",fn:function(){return [_c('code',[_vm._v(_vm._s(_vm.repository))])]},proxy:true}:null],null,true)}),_vm._v("\n    "+_vm._s(_vm.actionsCountMessage)+"\n  ")],1),_vm._v(" "),_c('gl-accordion',{staticClass:"-gl-ml-2",attrs:{"header-level":3}},[(_vm.commitMessage)?_c('gl-accordion-item',{staticClass:"gl-mb-3",attrs:{"title":_vm.$options.i18n.READ_COMMIT_MESSAGE}},[_c('pre-block',{attrs:{"languages":['markdown']}},[_vm._v(_vm._s(_vm.commitMessage))])],1):_vm._e(),_vm._v(" "),(_vm.actionsCount)?_c('gl-accordion-item',{attrs:{"title":_vm.$options.i18n.EXPAND_CHANGES}},[_c('gl-accordion',{attrs:{"header-level":4}},_vm._l((_vm.actions),function(action,index){return _c('gl-accordion-item',{key:index,staticClass:"gl-mb-3",attrs:{"title":_vm.getActionTitle(action)}},[_c('pre-block',{attrs:{"languages":[_vm.getActionFileExtension(action), 'diff']}},[_vm._v(_vm._s(_vm.getActionContent(action)))])],1)}),1)],1):_vm._e()],1)],1)};
 var __vue_staticRenderFns__ = [];
 
   /* style */

package/dist/components/chat/components/duo_chat_message_tool_approval/message_tool_approval.js

@@ -41,6 +41,9 @@ const TOOL_PARAMS_VIEW_COMPONENTS = {
   [APPROVAL_TOOL_NAMES.runCommand]: 'RunCommandToolParams',
   [APPROVAL_TOOL_NAMES.runGitCommand]: 'RunCommandToolParams'
 };
+const TOOL_DISPLAY_TITLES = {
+  [APPROVAL_TOOL_NAMES.createCommit]: translate('MessageToolApproval.createCommitTitle', 'Commit and push to repository')
+};
 var script = {
   name: 'MessageToolApproval',
   components: {
@@ -136,6 +139,11 @@ var script = {
         return this.$options.i18n.MULTI_TOOL_TITLE.replace('%{count}', this.messages.length);
       }
 
+      // Use explicit display title when available
+      if (TOOL_DISPLAY_TITLES[this.toolName]) {
+        return TOOL_DISPLAY_TITLES[this.toolName];
+      }
+
       // Single tool: show specific tool message
       return capitalize(startCase(this.toolName));
     },

package/dist/components/chat/mock_data.js

@@ -351,6 +351,7 @@ const MOCK_REQUEST_MESSAGE_WITH_TOOL_APPROVAL_CREATE_COMMIT = {
     name: 'create_commit',
     args: {
       project_id: 35104827,
+      project_name: 'duo-ui',
       branch: 'feat/add-web-ide-duo-chat-package',
       start_branch: 'main',
       commit_message: 'feat: add web-ide-duo-chat package with TypeScript setup\n\n- Create new package @gitlab/web-ide-duo-chat\n- Set up TypeScript configuration following project patterns\n- Add src directory with index.ts entry point\n- Configure package.json with workspace dependencies\n- Add package reference to root tsconfig.json',
@@ -385,6 +386,7 @@ const MOCK_REQUEST_MESSAGE_WITH_TOOL_APPROVAL_CREATE_COMMIT_OLD_NEW_CONTENT = {
     name: 'create_commit',
     args: {
       project_id: 35104827,
+      project_name: 'duo-ui',
       branch: 'feat/add-web-ide-duo-chat-package',
       start_branch: 'main',
       commit_message: 'feat: add web-ide-duo-chat package with TypeScript setup\n\n- Create new package @gitlab/web-ide-duo-chat\n- Set up TypeScript configuration following project patterns\n- Add src directory with index.ts entry point\n- Configure package.json with workspace dependencies\n- Add package reference to root tsconfig.json',

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@gitlab/duo-ui",
-  "version": "15.15.0",
+  "version": "15.15.1",
   "description": "Duo UI Components",
   "license": "MIT",
   "main": "dist/index.js",

package/src/components/chat/components/duo_chat_message_tool_approval/components/base_tool_params.vue

@@ -27,6 +27,7 @@ const metadataProperties = {
     icon: 'project',
     label: projectLabel,
   },
+  projectName: { icon: 'project', label: projectLabel },
   projectPath: { icon: 'project', label: projectLabel },
   projectFullPath: { icon: 'project', label: projectLabel },
   groupId: { icon: 'group', label: groupLabel },
@@ -100,9 +101,20 @@ export default {
     },
     metadataProperties() {
       const toolParams = this.toolParams || {};
+      const projectProperties = ['projectFullPath', 'projectPath', 'projectName', 'projectId'];
+      const preferredProjectProperty = projectProperties.find((p) => toolParams[p]);
 
       return Object.entries(metadataProperties)
-        .filter(([property]) => toolParams[property])
+        .filter(([property]) => {
+          if (!toolParams[property]) return false;
+
+          // Show only the highest-priority project property to avoid redundant badges
+          if (projectProperties.includes(property)) {
+            return property === preferredProjectProperty;
+          }
+
+          return true;
+        })
         .map(([property, styles]) => ({
           key: property,
           value: toolParams[property],

package/src/components/chat/components/duo_chat_message_tool_approval/components/create_commit_tool_params.vue

@@ -26,6 +26,21 @@ export default {
     branch() {
       return this.toolParams?.branch;
     },
+    repository() {
+      return (
+        this.toolParams?.projectName ||
+        this.toolParams?.projectPath ||
+        this.toolParams?.projectFullPath ||
+        this.toolParams?.url ||
+        this.toolParams?.projectId
+      );
+    },
+    summaryMessage() {
+      if (this.branch && this.repository) return this.$options.i18n.COMMIT_SUMMARY_MESSAGE;
+      if (this.branch) return this.$options.i18n.COMMIT_SUMMARY_MESSAGE_NO_REPO;
+      if (this.repository) return this.$options.i18n.COMMIT_SUMMARY_AUTO_BRANCH_MESSAGE;
+      return this.$options.i18n.COMMIT_SUMMARY_AUTO_BRANCH_MESSAGE_NO_REPO;
+    },
     commitMessage() {
       return this.toolParams?.commitMessage;
     },
@@ -107,11 +122,19 @@ export default {
   i18n: {
     COMMIT_SUMMARY_MESSAGE: translate(
       'CreateCommitToolParams.commitSummaryMessage',
-      'Create a commit in the branch %{branch}.'
+      'Commit and push to branch %{branch} in repository %{repository}.'
+    ),
+    COMMIT_SUMMARY_MESSAGE_NO_REPO: translate(
+      'CreateCommitToolParams.commitSummaryMessageNoRepo',
+      'Commit and push to branch %{branch}.'
     ),
     COMMIT_SUMMARY_AUTO_BRANCH_MESSAGE: translate(
       'CreateCommitToolParams.commitSummaryAutoBranchMessage',
-      'Create a commit in a new auto-created branch.'
+      'Commit and push to a new branch in repository %{repository}.'
+    ),
+    COMMIT_SUMMARY_AUTO_BRANCH_MESSAGE_NO_REPO: translate(
+      'CreateCommitToolParams.commitSummaryAutoBranchMessageNoRepo',
+      'Commit and push to a new branch.'
     ),
     READ_COMMIT_MESSAGE: translate(
       'CreateCommitToolParams.readCommitMessage',
@@ -152,16 +175,13 @@ export default {
 <template>
   <base-tool-params :tool-params="toolParams">
     <div>
-      <gl-sprintf
-        :message="
-          branch
-            ? $options.i18n.COMMIT_SUMMARY_MESSAGE
-            : $options.i18n.COMMIT_SUMMARY_AUTO_BRANCH_MESSAGE
-        "
-      >
+      <gl-sprintf :message="summaryMessage">
         <template v-if="branch" #branch>
           <code>{{ branch }}</code>
         </template>
+        <template v-if="repository" #repository>
+          <code>{{ repository }}</code>
+        </template>
       </gl-sprintf>
       {{ actionsCountMessage }}
     </div>

package/src/components/chat/components/duo_chat_message_tool_approval/message_tool_approval.vue

@@ -68,6 +68,13 @@ const TOOL_PARAMS_VIEW_COMPONENTS = {
   [APPROVAL_TOOL_NAMES.runGitCommand]: 'RunCommandToolParams',
 };
 
+const TOOL_DISPLAY_TITLES = {
+  [APPROVAL_TOOL_NAMES.createCommit]: translate(
+    'MessageToolApproval.createCommitTitle',
+    'Commit and push to repository'
+  ),
+};
+
 export default {
   name: 'MessageToolApproval',
   components: {
@@ -164,6 +171,11 @@ export default {
         return this.$options.i18n.MULTI_TOOL_TITLE.replace('%{count}', this.messages.length);
       }
 
+      // Use explicit display title when available
+      if (TOOL_DISPLAY_TITLES[this.toolName]) {
+        return TOOL_DISPLAY_TITLES[this.toolName];
+      }
+
       // Single tool: show specific tool message
       return capitalize(startCase(this.toolName));
     },

package/src/components/chat/mock_data.js

@@ -393,6 +393,7 @@ export const MOCK_REQUEST_MESSAGE_WITH_TOOL_APPROVAL_CREATE_COMMIT = {
     name: 'create_commit',
     args: {
       project_id: 35104827,
+      project_name: 'duo-ui',
       branch: 'feat/add-web-ide-duo-chat-package',
       start_branch: 'main',
       commit_message:
@@ -437,6 +438,7 @@ export const MOCK_REQUEST_MESSAGE_WITH_TOOL_APPROVAL_CREATE_COMMIT_OLD_NEW_CONTE
     name: 'create_commit',
     args: {
       project_id: 35104827,
+      project_name: 'duo-ui',
       branch: 'feat/add-web-ide-duo-chat-package',
       start_branch: 'main',
       commit_message:

package/translations.js

@@ -76,8 +76,11 @@ export default {
   'CreateCommitToolParams.actionsCountMessage': null,
   'CreateCommitToolParams.chmodFileActionLabel': 'Change permissions for file %{filePath}',
   'CreateCommitToolParams.commitSummaryAutoBranchMessage':
-    'Create a commit in a new auto-created branch.',
-  'CreateCommitToolParams.commitSummaryMessage': 'Create a commit in the branch %{branch}.',
+    'Commit and push to a new branch in repository %{repository}.',
+  'CreateCommitToolParams.commitSummaryAutoBranchMessageNoRepo': 'Commit and push to a new branch.',
+  'CreateCommitToolParams.commitSummaryMessage':
+    'Commit and push to branch %{branch} in repository %{repository}.',
+  'CreateCommitToolParams.commitSummaryMessageNoRepo': 'Commit and push to branch %{branch}.',
   'CreateCommitToolParams.createFileActionLabel': 'Create file %{filePath}',
   'CreateCommitToolParams.deleteFileActionLabel': 'Delete file %{filePath}',
   'CreateCommitToolParams.expandFileChanges': 'Expand file changes',
@@ -167,6 +170,7 @@ export default {
   'MessageToolApproval.cancelText': 'Cancel',
   'MessageToolApproval.collapseButtonCollapsed': 'Display tool details',
   'MessageToolApproval.collapseButtonExpanded': 'Hide tool details',
+  'MessageToolApproval.createCommitTitle': 'Commit and push to repository',
   'MessageToolApproval.denialReasonLabel': 'Rejection reason',
   'MessageToolApproval.denialReasonPlaceholder':
     "Tell Duo why you're rejecting this tool execution...",