Merge branch 'dev'

Author: Predixx

CHANGELOG.md

@@ -3,6 +3,15 @@
 All notable changes to the Artemis VS Code extension will be documented in this file.
 
 
+## [0.2.4] - 2025-11-05
+
+### Changed
+
+- **Iris Chat Disclaimer**: Updated disclaimer text to accurately reflect that Iris has access to uncommitted changes
+  - Changed from "Iris only has access to your submitted code" to "Iris has access to your uncommitted changes"
+  - Added clickable settings link for quick access to privacy configuration
+  - Users can now easily toggle the uncommitted changes feature directly from the chat interface
+
 ## [0.2.3] - 2025-11-05
 
 ### Added

iris-thaumantias/CHANGELOG.md

@@ -3,6 +3,15 @@
 All notable changes to the Artemis VS Code extension will be documented in this file.
 
 
+## [0.2.4] - 2025-11-05
+
+### Changed
+
+- **Iris Chat Disclaimer**: Updated disclaimer text to accurately reflect that Iris has access to uncommitted changes
+  - Changed from "Iris only has access to your submitted code" to "Iris has access to your uncommitted changes"
+  - Added clickable settings link for quick access to privacy configuration
+  - Users can now easily toggle the uncommitted changes feature directly from the chat interface
+
 ## [0.2.3] - 2025-11-05
 
 ### Added

iris-thaumantias/package-lock.json

@@ -2,7 +2,7 @@
   "name": "iris-thaumantias",
   "displayName": "Artemis - TUM",
   "description": "Artemis brings interactive learning to life with instant, individual feedback on programming exercises, quizzes, modeling tasks, and more. This VS Code extension integrates Iris, an LLM-based virtual assistant that supports students with instant answers about exercises, lectures, and learning performance. Iris provides context-aware, personalized assistance for programming exercises, encouraging independent problem-solving through subtle hints and guiding questions instead of giving full solutions.",
-  "version": "0.2.3",
+  "version": "0.2.4",
   "publisher": "aet-tum",
   "license": "MIT",
   "icon": "media/artemis-blue.png",

iris-thaumantias/package.json

@@ -375,6 +375,11 @@ export class ChatWebviewProvider implements vscode.WebviewViewProvider, vscode.D
             case 'messageFeedback':
                 this._handleMessageFeedback(message);
                 break;
+            case 'openSettings':
+                if (message.setting) {
+                    vscode.commands.executeCommand('workbench.action.openSettings', message.setting);
+                }
+                break;
             default:
                 console.log('Unhandled message in chat view:', message);
                 break;

iris-thaumantias/src/views/provider/chatWebviewProvider.ts

@@ -1,48 +1,54 @@
-import * as vscode from 'vscode';
-import { ThemeManager } from '../../themes';
-import { IconDefinitions } from '../../utils/iconDefinitions';
-import { StyleManager } from '../styles';
+import * as vscode from "vscode";
+import { ThemeManager } from "../../themes";
+import { IconDefinitions } from "../../utils/iconDefinitions";
+import { StyleManager } from "../styles";
 
 export class IrisChatView {
-    private _themeManager: ThemeManager;
-    private _extensionContext: vscode.ExtensionContext;
-    private _styleManager: StyleManager;
-
-    constructor(extensionContext: vscode.ExtensionContext, styleManager: StyleManager) {
-        this._themeManager = new ThemeManager();
-        this._extensionContext = extensionContext;
-        this._styleManager = styleManager;
+  private _themeManager: ThemeManager;
+  private _extensionContext: vscode.ExtensionContext;
+  private _styleManager: StyleManager;
+
+  constructor(
+    extensionContext: vscode.ExtensionContext,
+    styleManager: StyleManager
+  ) {
+    this._themeManager = new ThemeManager();
+    this._extensionContext = extensionContext;
+    this._styleManager = styleManager;
+  }
+
+  public generateHtml(
+    webview?: vscode.Webview,
+    showDiagnostics: boolean = false
+  ): string {
+    const themeCSS = this._themeManager.getThemeCSS();
+    const currentTheme = this._themeManager.getCurrentTheme();
+    const styles = this._styleManager.getStyles(currentTheme, [
+      "views/iris-chat.css",
+    ]);
+
+    const trashIcon = IconDefinitions.getIcon("trash");
+    const stethoscopeIcon = IconDefinitions.getIcon("stethoscope");
+    const questionMarkIcon = IconDefinitions.getIcon("question-mark");
+    const refreshIcon = IconDefinitions.getIcon("refresh");
+    const courseIcon = IconDefinitions.getIcon("course");
+    const exerciseIcon = IconDefinitions.getIcon("exercise");
+    const lockIcon = IconDefinitions.getIcon("shield");
+    const workspaceIcon = IconDefinitions.getIcon("workspace");
+    const checkIcon = `<svg viewBox="0 0 16 16" fill="currentColor"><path d="M13.78 4.22a.75.75 0 010 1.06l-7.25 7.25a.75.75 0 01-1.06 0L2.22 9.28a.75.75 0 011.06-1.06L6 10.94l6.72-6.72a.75.75 0 011.06 0z"/></svg>`;
+    const plusIcon = `<svg viewBox="0 0 16 16" fill="currentColor"><path d="M8 2a.75.75 0 01.75.75v4.5h4.5a.75.75 0 010 1.5h-4.5v4.5a.75.75 0 01-1.5 0v-4.5h-4.5a.75.75 0 010-1.5h4.5v-4.5A.75.75 0 018 2z"/></svg>`;
+    const switchIcon = `<svg viewBox="0 0 16 16" fill="currentColor"><path d="M8 2a.75.75 0 01.75.75v4.5h4.5a.75.75 0 010 1.5h-4.5v4.5a.75.75 0 01-1.5 0v-4.5h-4.5a.75.75 0 010-1.5h4.5v-4.5A.75.75 0 018 2z"/></svg>`;
+
+    // Get the path to the iris logo image
+    let irisLogoSrc = "";
+    if (webview) {
+      const irisLogoUri = vscode.Uri.file(
+        this._extensionContext.asAbsolutePath("media/iris-logo-big-left.png")
+      );
+      irisLogoSrc = webview.asWebviewUri(irisLogoUri).toString();
     }
 
-    public generateHtml(webview?: vscode.Webview, showDiagnostics: boolean = false): string {
-        const themeCSS = this._themeManager.getThemeCSS();
-        const currentTheme = this._themeManager.getCurrentTheme();
-        const styles = this._styleManager.getStyles(currentTheme, [
-            'views/iris-chat.css'
-        ]);
-
-        const trashIcon = IconDefinitions.getIcon('trash');
-        const stethoscopeIcon = IconDefinitions.getIcon('stethoscope');
-        const questionMarkIcon = IconDefinitions.getIcon('question-mark');
-        const refreshIcon = IconDefinitions.getIcon('refresh');
-        const courseIcon = IconDefinitions.getIcon('course');
-        const exerciseIcon = IconDefinitions.getIcon('exercise');
-        const lockIcon = IconDefinitions.getIcon('shield');
-        const workspaceIcon = IconDefinitions.getIcon('workspace');
-        const checkIcon = `<svg viewBox="0 0 16 16" fill="currentColor"><path d="M13.78 4.22a.75.75 0 010 1.06l-7.25 7.25a.75.75 0 01-1.06 0L2.22 9.28a.75.75 0 011.06-1.06L6 10.94l6.72-6.72a.75.75 0 011.06 0z"/></svg>`;
-        const plusIcon = `<svg viewBox="0 0 16 16" fill="currentColor"><path d="M8 2a.75.75 0 01.75.75v4.5h4.5a.75.75 0 010 1.5h-4.5v4.5a.75.75 0 01-1.5 0v-4.5h-4.5a.75.75 0 010-1.5h4.5v-4.5A.75.75 0 018 2z"/></svg>`;
-        const switchIcon = `<svg viewBox="0 0 16 16" fill="currentColor"><path d="M8 2a.75.75 0 01.75.75v4.5h4.5a.75.75 0 010 1.5h-4.5v4.5a.75.75 0 01-1.5 0v-4.5h-4.5a.75.75 0 010-1.5h4.5v-4.5A.75.75 0 018 2z"/></svg>`;
-
-        // Get the path to the iris logo image
-        let irisLogoSrc = '';
-        if (webview) {
-            const irisLogoUri = vscode.Uri.file(
-                this._extensionContext.asAbsolutePath('media/iris-logo-big-left.png')
-            );
-            irisLogoSrc = webview.asWebviewUri(irisLogoUri).toString();
-        }
-
-        return `<!DOCTYPE html>
+    return `<!DOCTYPE html>
 <html lang="en">
 <head>
     <meta charset="UTF-8">
@@ -56,7 +62,11 @@ export class IrisChatView {
 <body class="theme-${currentTheme}">
     <div class="chat-container">
         <div class="chat-header">
-            ${irisLogoSrc ? `<img src="${irisLogoSrc}" alt="Iris Logo" class="chat-header-logo" />` : ''}
+            ${
+              irisLogoSrc
+                ? `<img src="${irisLogoSrc}" alt="Iris Logo" class="chat-header-logo" />`
+                : ""
+            }
             <h1 class="chat-title">Chat with Iris</h1>
             <button class="burger-menu" onclick="toggleSideMenu()" title="Menu">
                 <div class="burger-icon">
@@ -165,7 +175,7 @@ export class IrisChatView {
             </div>
             <div class="iris-disclaimer-banner">
                 <span class="disclaimer-text">
-                    Iris only has access to your submitted code.
+                    Iris has access to your uncommitted changes (<a href="#" onclick="openUncommittedChangesSettings(); return false;" class="settings-link">configurable</a>).
                     Iris can make mistakes. Consider verifying important information. 
                 </span>
             </div>
@@ -244,7 +254,9 @@ export class IrisChatView {
                         <div class="menu-item-description">Learn how contexts impact responses</div>
                     </div>
                 </div>
-                ${showDiagnostics ? `
+                ${
+                  showDiagnostics
+                    ? `
                 <div class="menu-item" onclick="openDiagnostics()">
                     ${stethoscopeIcon}
                     <div class="menu-item-content">
@@ -259,7 +271,9 @@ export class IrisChatView {
                         <div class="menu-item-description">View raw Artemis session data</div>
                     </div>
                 </div>
-                ` : ''}
+                `
+                    : ""
+                }
             </div>
 
             <div class="menu-section">
@@ -309,6 +323,13 @@ export class IrisChatView {
             document.getElementById('helpPopup').classList.remove('open');
         };
 
+        window.openUncommittedChangesSettings = function() {
+            vscode.postMessage({
+                command: 'openSettings',
+                setting: 'artemis.iris.sendUncommittedChanges'
+            });
+        };
+
         let irisState = {
             context: null,
             activeSessionId: null,
@@ -1078,5 +1099,5 @@ export class IrisChatView {
     </script>
 </body>
 </html>`;
-    }
+  }
 }

iris-thaumantias/src/views/templates/irisChatView.ts

@@ -115,10 +115,33 @@ cd "${ROOT_DIR}/${EXTENSION_DIR}"
 # Run the package script
 npm run package
 
+# Temporarily downgrade @types/vscode for VSIX packaging to match engines.vscode
+print_step "Temporarily adjusting @types/vscode for packaging..."
+ORIGINAL_TYPES_VERSION=$(grep -o '"@types/vscode": "[^"]*"' package.json | cut -d'"' -f4)
+if [[ "$OSTYPE" == "darwin"* ]]; then
+    sed -i '' 's/"@types\/vscode": "[^"]*"/"@types\/vscode": "1.97.0"/' package.json
+else
+    sed -i 's/"@types\/vscode": "[^"]*"/"@types\/vscode": "1.97.0"/' package.json
+fi
+
+# Install the downgraded version temporarily
+npm install --silent
+
 # Create VSIX file
 print_step "Creating VSIX package..."
 npx @vscode/vsce package
 
+# Restore original @types/vscode version
+print_step "Restoring @types/vscode to ${ORIGINAL_TYPES_VERSION}..."
+if [[ "$OSTYPE" == "darwin"* ]]; then
+    sed -i '' "s/\"@types\/vscode\": \"[^\"]*\"/\"@types\/vscode\": \"${ORIGINAL_TYPES_VERSION}\"/" package.json
+else
+    sed -i "s/\"@types\/vscode\": \"[^\"]*\"/\"@types\/vscode\": \"${ORIGINAL_TYPES_VERSION}\"/" package.json
+fi
+
+# Reinstall with original version
+npm install --silent
+
 VSIX_FILE="${ROOT_DIR}/${EXTENSION_DIR}/${EXTENSION_DIR}-${NEW_VERSION}.vsix"
 
 if [ -f "$VSIX_FILE" ]; then